From 246f7cea924fa0ed17d6c3a28603533ab5783478 Mon Sep 17 00:00:00 2001
From: Lumi Pakkanen <lumi.pakkanen@gmail.com>
Date: Mon, 11 Mar 2024 09:20:17 +0200
Subject: [PATCH] The SW3 commit

This commit swaps out the core engine from scale-workshop-core to sonic-weave.
Too many breaking changes have been introduced to maintain an incremental commit history at this juncture.
---
 CHANGELOG.md                                  |   16 +
 LICENSE                                       |    2 +-
 README.md                                     |    5 +
 cypress/e2e/basic.cy.ts                       |   12 +-
 cypress/e2e/compatibility.cy.ts               |   17 +
 index.html                                    |    6 +-
 package-lock.json                             |  510 ++------
 package.json                                  |   26 +-
 public/favicon.png                            |  Bin 17358 -> 22811 bytes
 src/App.vue                                   |  293 ++---
 src/__tests__/analysis.spec.ts                |   21 +-
 src/__tests__/midi.spec.ts                    |   10 +-
 src/__tests__/scale-workshop-one.spec.ts      |   49 +-
 src/__tests__/tempering.spec.ts               |  215 +---
 src/__tests__/url-encode.spec.ts              |   10 +-
 src/__tests__/util.spec.ts                    |   29 +-
 src/analysis.ts                               |  345 +++++-
 src/assets/base.css                           |  292 +----
 src/assets/img/spoob.png                      |  Bin 0 -> 26901 bytes
 src/assets/logo.svg                           |    2 +-
 src/assets/main.css                           |  215 ++++
 src/character-palette.json                    |   33 +
 src/components/ChordWheel.vue                 |    2 +-
 src/components/DropdownGroup.vue              |   70 ++
 src/components/ExporterButtons.vue            |  203 ++++
 src/components/GridLattice.vue                |  155 +++
 src/components/JustIntonationLattice.vue      |  201 ++++
 src/components/ModalDialog.vue                |   17 +-
 src/components/ModifyScale.vue                |  222 ++++
 src/components/NewScale.vue                   |  260 ++++
 src/components/PeriodCircle.vue               |   15 +-
 src/components/ScaleBuilder.vue               |  886 --------------
 src/components/ScaleControls.vue              |  157 +++
 src/components/ScaleLattice.vue               |  282 -----
 src/components/ScaleLineInput.vue             |   10 +-
 src/components/ScaleRule.vue                  |    9 +-
 src/components/TuningTable.vue                |   69 +-
 src/components/TuningTableRow.vue             |   21 +-
 src/components/VirtualKeyboard.vue            |    2 +-
 src/components/VirtualPiano.vue               |  284 ++++-
 src/components/VirtualTypingKeyboard.vue      |   35 +-
 src/components/modals/export/KorgExport.vue   |   11 +-
 .../modals/export/MtsSysexExport.vue          |    9 +-
 src/components/modals/export/ReaperExport.vue |   18 +-
 .../generation/CombinationProductSet.vue      |   25 +-
 .../modals/generation/ConcordanceShell.vue    |  140 +++
 .../modals/generation/CrossPolytope.vue       |   77 --
 .../modals/generation/DwarfScale.vue          |   42 -
 .../modals/generation/EnumerateChord.vue      |   30 +-
 .../modals/generation/EqualTemperament.vue    |   68 +-
 .../modals/generation/EulerGenus.vue          |   49 +-
 .../modals/generation/GeneratorSequence.vue   |  195 +++
 .../modals/generation/HarmonicSeries.vue      |   25 +-
 .../modals/generation/HistoricalScale.vue     |  148 +--
 .../modals/generation/LoadPreset.vue          |   57 +
 src/components/modals/generation/MosScale.vue |   41 +-
 src/components/modals/generation/RankTwo.vue  |  133 +-
 .../modals/generation/SpanLattice.vue         |  104 +-
 .../modals/generation/StackSteps.vue          |   61 +
 .../modals/generation/SubharmonicSeries.vue   |   35 +-
 .../modals/generation/SummonOctaplex.vue      |   33 +-
 .../modification/ApproximateByHarmonics.vue   |   47 +-
 .../modification/ApproximateByRatios.vue      |   57 +-
 .../ApproximateBySubharmonics.vue             |   39 +-
 .../modification/CoalesceDuplicates.vue       |  106 ++
 .../modals/modification/ConvertType.vue       |  156 ++-
 .../modals/modification/EnumerateScale.vue    |   86 ++
 .../modals/modification/EqualizeScale.vue     |   67 +-
 .../modals/modification/ExpandScale.vue       |   44 +
 .../modals/modification/MergeOffset.vue       |   93 --
 .../modals/modification/MergeOffsets.vue      |   76 ++
 .../modals/modification/RandomVariance.vue    |   40 +-
 .../modals/modification/RotateScale.vue       |   33 +-
 .../modals/modification/StretchScale.vue      |   37 +-
 .../modals/modification/TakeSubset.vue        |   42 +-
 .../modals/modification/TemperScale.vue       |  182 +--
 src/constants.ts                              |   50 +-
 src/exporters/__tests__/ableton.spec.ts       |   13 +-
 src/exporters/__tests__/anamark.v1.tun        |  490 ++++----
 src/exporters/__tests__/anamark.v2.tun        |  501 ++++----
 src/exporters/__tests__/deflemask.txt         |  105 +-
 src/exporters/__tests__/image-line.spec.ts    |    5 +-
 src/exporters/__tests__/kontakt.txt           |  264 ++--
 src/exporters/__tests__/korg.spec.ts          |   68 +-
 src/exporters/__tests__/max-msp.txt           |  246 ++--
 src/exporters/__tests__/mts.spec.ts           |   10 +-
 src/exporters/__tests__/pure-data.spec.ts     |    5 +-
 src/exporters/__tests__/pure-data.txt         |  128 ++
 src/exporters/__tests__/reaper.spec.ts        |    6 +-
 src/exporters/__tests__/reaper.txt            |  244 ++--
 src/exporters/__tests__/scala.spec.ts         |   14 +-
 src/exporters/__tests__/soniccouture.nka      |  136 +--
 src/exporters/__tests__/test-data.ts          |   79 +-
 src/exporters/ableton.ts                      |   31 +-
 src/exporters/anamark.ts                      |   30 +-
 src/exporters/base.ts                         |   29 +-
 src/exporters/deflemask.ts                    |    4 +-
 src/exporters/image-line.ts                   |    7 +-
 src/exporters/index.ts                        |   18 +-
 src/exporters/kontakt.ts                      |   10 +-
 src/exporters/korg.ts                         |   26 +-
 src/exporters/max-msp.ts                      |   11 +-
 src/exporters/mts-sysex.ts                    |   12 +-
 src/exporters/pure-data.ts                    |   14 +-
 src/exporters/reaper.ts                       |  101 +-
 src/exporters/scala.ts                        |   40 +-
 src/exporters/soniccouture.ts                 |   12 +-
 src/importers/__tests__/anamark.spec.ts       |   12 +-
 src/importers/__tests__/scala.spec.ts         |   25 +-
 src/importers/anamark.ts                      |   16 +-
 src/importers/base.ts                         |   11 +-
 src/importers/scala.ts                        |   20 +-
 src/main.ts                                   |    3 -
 src/midi.ts                                   |    9 +-
 src/presets.json                              | 1069 ++---------------
 src/presets.ts                                |   13 +-
 src/scale-workshop-one.ts                     |   11 +-
 src/scale.ts                                  |  111 ++
 src/stores/audio.ts                           |  222 +++-
 src/stores/grid.ts                            |  248 ++++
 src/stores/historical.ts                      |   80 +-
 src/stores/ji-lattice.ts                      |  161 +++
 src/stores/modal.ts                           |  247 +++-
 src/stores/scale.ts                           |  452 +++++++
 src/stores/state.ts                           |  177 +--
 src/stores/tempering.ts                       |   85 +-
 src/synth.ts                                  |  597 ++++-----
 src/tempering.ts                              |  167 +--
 src/utils.ts                                  |  139 ++-
 src/views/AboutView.vue                       |   52 +-
 src/views/AnalysisView.vue                    |  234 +++-
 src/views/LatticeView.vue                     |  348 +++++-
 src/views/MidiView.vue                        |   10 +-
 src/views/NotFoundView.vue                    |   60 +-
 src/views/PreferencesView.vue                 |   29 +-
 src/views/ScaleView.vue                       |  137 ++-
 src/views/SynthView.vue                       |  154 ++-
 src/views/VirtualKeyboardView.vue             |   26 +-
 src/views/VirtualQwerty.vue                   |   25 +-
 139 files changed, 8599 insertions(+), 6474 deletions(-)
 create mode 100644 cypress/e2e/compatibility.cy.ts
 create mode 100644 src/assets/img/spoob.png
 create mode 100644 src/assets/main.css
 create mode 100644 src/character-palette.json
 create mode 100644 src/components/DropdownGroup.vue
 create mode 100644 src/components/ExporterButtons.vue
 create mode 100644 src/components/GridLattice.vue
 create mode 100644 src/components/JustIntonationLattice.vue
 create mode 100644 src/components/ModifyScale.vue
 create mode 100644 src/components/NewScale.vue
 delete mode 100644 src/components/ScaleBuilder.vue
 create mode 100644 src/components/ScaleControls.vue
 delete mode 100644 src/components/ScaleLattice.vue
 create mode 100644 src/components/modals/generation/ConcordanceShell.vue
 delete mode 100644 src/components/modals/generation/CrossPolytope.vue
 delete mode 100644 src/components/modals/generation/DwarfScale.vue
 create mode 100644 src/components/modals/generation/GeneratorSequence.vue
 create mode 100644 src/components/modals/generation/LoadPreset.vue
 create mode 100644 src/components/modals/generation/StackSteps.vue
 create mode 100644 src/components/modals/modification/CoalesceDuplicates.vue
 create mode 100644 src/components/modals/modification/EnumerateScale.vue
 create mode 100644 src/components/modals/modification/ExpandScale.vue
 delete mode 100644 src/components/modals/modification/MergeOffset.vue
 create mode 100644 src/components/modals/modification/MergeOffsets.vue
 create mode 100644 src/exporters/__tests__/pure-data.txt
 create mode 100644 src/scale.ts
 create mode 100644 src/stores/grid.ts
 create mode 100644 src/stores/ji-lattice.ts
 create mode 100644 src/stores/scale.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0225e10a..1680f1a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Change log
 
+## 3.0.0-beta
+ * Feature: Core language switched to from [scale-workshop-core](https://github.com/xenharmonic-devs/scale-workshop-core) to [sonic-weave](https://github.com/xenharmonic-devs/sonic-weave)
+ * Feature: Virtual piano now supports up to 4 layers of colors
+ * Feature: Character palette with tooltips for syntax beyond ASCII [#533](https://github.com/xenharmonic-devs/scale-workshop/issues/533)
+ * Feature: Interval matrix simplified by default [#536](https://github.com/xenharmonic-devs/scale-workshop/issues/536)
+ * Feature: Convert scale to enumeration [#538](https://github.com/xenharmonic-devs/scale-workshop/issues/538)
+ * Feature: More MOS coloring options [#554](https://github.com/xenharmonic-devs/scale-workshop/issues/554)
+ * Feature: Variety and brightness signatures show in the interval matrix [#568](https://github.com/xenharmonic-devs/scale-workshop/issues/568)
+ * Feature: Periodic equally tempered grids supported on the lattice tab
+ * Feature: Lattice label sizes customizable [#581](https://github.com/xenharmonic-devs/scale-workshop/issues/581)
+ * Feature: Lattice colors inverted and scale colors incorporated [#586](https://github.com/xenharmonic-devs/scale-workshop/issues/586)
+ * Feature: Scott Dakota's prime rings on the lattice tab [#551](https://github.com/xenharmonic-devs/scale-workshop/issues/551)
+ * Feature: Tonnetz prime ellipse coordinates on the lattice tab [#588](https://github.com/xenharmonic-devs/scale-workshop/issues/588)
+ * Feature: New `latticeView()` command for displaying the order of intervals (prior to sorting) [#597](https://github.com/xenharmonic-devs/scale-workshop/issues/597)
+ * Alpha cycle issues: [#574](https://github.com/xenharmonic-devs/scale-workshop/issues/574), [#579](https://github.com/xenharmonic-devs/scale-workshop/issues/579)
+
 ## 2.4.1
  * Bug fix: Unison is no longer affected by random variance [#613](https://github.com/xenharmonic-devs/scale-workshop/issues/613)
 
diff --git a/LICENSE b/LICENSE
index 62ccc0e4..e36d9b60 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Xenharmonic Developers
+Copyright (c) 2022-2024 Xenharmonic Developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 9850164e..12880aab 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,11 @@
 
 ![Scale Workshop screenshot](https://raw.githubusercontent.com/xenharmonic-devs/scale-workshop/main/src/assets/img/opengraph-image.png)
 
+## Beta Warning!
+This release is in beta. Not everything has been implemented and documentation has not been synchronized with the new features.
+
+Some of the new features are documented over at [sonic-weave](https://github.com/xenharmonic-devs/sonic-weave).
+
 ## Description
 
 [Scale Workshop](https://scaleworkshop.plainsound.org/) allows you to design microtonal scales and play them in your web browser. Export your scales for use with VST instruments. Convert Scala files to various tuning formats.
diff --git a/cypress/e2e/basic.cy.ts b/cypress/e2e/basic.cy.ts
index a0736e16..df334961 100644
--- a/cypress/e2e/basic.cy.ts
+++ b/cypress/e2e/basic.cy.ts
@@ -8,14 +8,16 @@ describe("Basic test", () => {
 
   it("preserves the base frequency when changing tabs", () => {
     cy.visit("/");
-    cy.get(".real-valued").clear()
-    cy.get(".real-valued").type("432")
-    cy.get(".real-valued").trigger("change")
-    cy.get(".real-valued").should("have.value", "432");
+    cy.get("#auto-frequency").click()
+    cy.get("#base-frequency").clear()
+    cy.get("#base-frequency").type("432")
+    cy.get("#base-frequency").trigger("change")
+    cy.get("#base-frequency").should("have.value", "432");
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(400); // Wait for debounce to expire.
     cy.get("a").contains("Synth").click();
-    cy.url().should("contain", "f=");
+    cy.get("a").contains("Build Scale").click();
+    cy.get("#base-frequency").should("have.value", "432");
   });
 });
 
diff --git a/cypress/e2e/compatibility.cy.ts b/cypress/e2e/compatibility.cy.ts
new file mode 100644
index 00000000..d2bb8ff5
--- /dev/null
+++ b/cypress/e2e/compatibility.cy.ts
@@ -0,0 +1,17 @@
+// https://on.cypress.io/api
+
+describe("Scale Workshop 2 compatibility", () => {
+  it("ignores invalid scale lines", () => {
+    cy.visit("/?l=1_7nF74_5F4_gtFe8_bF8_2c1F1kw_pFg_1jFw_3dF1s_2F1&version=2.4.0");
+    cy.contains("h2", "Scale data");
+    cy.get("#scale-data").should('have.value', '// 1\n275/256 black\n5/4 white\n605/512 white\n11/8 black\n3025/2048 white\n25/16 black\n55/32 white\n121/64 white\n2/1 black');
+  });
+});
+
+describe("Scale Workshop 1 compatibility", () => {
+  it("supports all line types", () => {
+    cy.visit("?name=Test%20scale&data=1%2C23%0A1%5C3%0A3%2F2%0A1001.2%0A2%2F1&freq=420&midi=42&vert=5&horiz=1&colors=white%20black%20white%20black%20white&waveform=triangle&ampenv=perc-medium");
+    cy.contains("h2", "Scale data");
+    cy.get("#scale-data").should('have.value', '1.23e black\n1\\3 white\n3/2 black\n1001.2 white\n2/1 white');
+  });
+});
diff --git a/index.html b/index.html
index a21980a9..f57c7db4 100644
--- a/index.html
+++ b/index.html
@@ -4,11 +4,11 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-    <title>Scale Workshop</title>
+    <title>Scale Workshop 3</title>
     <meta name="description" content="Scale Workshop is a tool that allows you to create microtonal tunings within your web browser. You can export these tunings to your device and use them to tune various synthesizers." />
-    <meta property="og:title" content="Scale Workshop" />
+    <meta property="og:title" content="Scale Workshop 3" />
     <meta property="og:type" content="website" />
-    <meta property="og:url" content="https://sevish.com/scaleworkshop/" />
+    <meta property="og:url" content="https://sw3.lumipakkanen.com/" />
     <meta property="og:image" content="https://sevish.com/scaleworkshop.png" />
     <meta property="og:description" content="Create microtonal tunings in your web browser." />
 
diff --git a/package-lock.json b/package-lock.json
index 78111f99..ed881e13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,19 +1,21 @@
 {
   "name": "scale-workshop",
-  "version": "2.4.1",
+  "version": "3.0.0-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "scale-workshop",
-      "version": "2.4.1",
+      "version": "3.0.0-beta.1",
       "dependencies": {
         "isomorphic-qwerty": "^0.0.2",
+        "ji-lattice": "^0.0.2",
         "jszip": "^3.10.1",
-        "moment-of-symmetry": "^0.4.1",
+        "moment-of-symmetry": "^0.4.2",
         "pinia": "^2.1.7",
-        "qs": "^6.11.2",
-        "scale-workshop-core": "github:xenharmonic-devs/scale-workshop-core#v0.1.5",
+        "qs": "^6.12.0",
+        "sonic-weave": "github:xenharmonic-devs/sonic-weave#v0.0.4",
+        "sw-synth": "^0.1.0",
         "temperaments": "^0.5.3",
         "vue": "^3.3.4",
         "vue-router": "^4.3.0",
@@ -22,26 +24,26 @@
         "xen-midi": "^0.1.2"
       },
       "devDependencies": {
-        "@rushstack/eslint-patch": "^1.7.2",
-        "@tsconfig/node18": "^18.2.2",
+        "@rushstack/eslint-patch": "^1.8.0",
+        "@tsconfig/node18": "^18.2.3",
         "@types/jsdom": "^21.1.6",
-        "@types/node": "^18.19.21",
-        "@types/qs": "^6.9.12",
+        "@types/node": "^18.19.26",
+        "@types/qs": "^6.9.14",
         "@vitejs/plugin-vue": "^4.6.2",
         "@vue/eslint-config-prettier": "^8.0.0",
         "@vue/eslint-config-typescript": "^12.0.0",
-        "@vue/test-utils": "^2.4.4",
+        "@vue/test-utils": "^2.4.5",
         "@vue/tsconfig": "^0.4.0",
-        "cypress": "^13.6.6",
+        "cypress": "^13.7.1",
         "eslint": "^8.57.0",
         "eslint-plugin-cypress": "^2.15.1",
-        "eslint-plugin-vue": "^9.22.0",
+        "eslint-plugin-vue": "^9.23.0",
         "jsdom": "^22.1.0",
         "npm-run-all2": "^6.1.2",
         "prettier": "^3.2.5",
         "start-server-and-test": "^2.0.3",
         "typescript": "~5.2.0",
-        "vite": "^4.5.2",
+        "vite": "^4.5.3",
         "vitest": "^0.34.6",
         "vue-tsc": "^1.8.27"
       }
@@ -150,246 +152,6 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
-      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
-      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
-      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
-      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
-      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
-      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
-      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
-      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
-      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
-      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
-      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
-      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
-      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
-      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
-      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.18.20",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
@@ -406,102 +168,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
-      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
-      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
-      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
-      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -798,9 +464,9 @@
       }
     },
     "node_modules/@rushstack/eslint-patch": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.7.2.tgz",
-      "integrity": "sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.8.0.tgz",
+      "integrity": "sha512-0HejFckBN2W+ucM6cUOlwsByTKt9/+0tWhqUffNIcHqCXkthY/mZ7AuYPK/2IIaGWhdl0h+tICDO0ssLMd6XMQ==",
       "dev": true
     },
     "node_modules/@sideway/address": {
@@ -840,9 +506,9 @@
       }
     },
     "node_modules/@tsconfig/node18": {
-      "version": "18.2.2",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node18/-/node18-18.2.2.tgz",
-      "integrity": "sha512-d6McJeGsuoRlwWZmVIeE8CUA27lu6jLjvv1JzqmpsytOYYbVi1tHZEnwCNVOXnj4pyLvneZlFlpXUK+X9wBWyw==",
+      "version": "18.2.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node18/-/node18-18.2.3.tgz",
+      "integrity": "sha512-5GKTU9bfn4L37G9IdK8wcHfvyMijzw1uKNCd2Rs75V7fZK/l2OjGJ8Aa2myqNnESjekm/udpCnFH9qR9yPCtmw==",
       "dev": true
     },
     "node_modules/@types/chai": {
@@ -878,18 +544,18 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.19.21",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.21.tgz",
-      "integrity": "sha512-2Q2NeB6BmiTFQi4DHBzncSoq/cJMLDdhPaAoJFnFCyD9a8VPZRf7a1GAwp1Edb7ROaZc5Jz/tnZyL6EsWMRaqw==",
+      "version": "18.19.26",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.26.tgz",
+      "integrity": "sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
       }
     },
     "node_modules/@types/qs": {
-      "version": "6.9.12",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.12.tgz",
-      "integrity": "sha512-bZcOkJ6uWrL0Qb2NAWKa7TBU+mJHPzhx9jjLL1KHF+XpzEcR7EXHvjbHlGtR/IsP1vyPrehuS6XqkmaePy//mg==",
+      "version": "6.9.14",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.14.tgz",
+      "integrity": "sha512-5khscbd3SwWMhFqylJBLQ0zIu7c1K6Vz0uBIt915BI3zV0q1nfjRQD3RqSBcPaO6PHEF4ov/t9y89fSiyThlPA==",
       "dev": true
     },
     "node_modules/@types/semver": {
@@ -1423,22 +1089,13 @@
       "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g=="
     },
     "node_modules/@vue/test-utils": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-2.4.4.tgz",
-      "integrity": "sha512-8jkRxz8pNhClAf4Co4ZrpAoFISdvT3nuSkUlY6Ys6rmTpw3DMWG/X3mw3gQ7QJzgCZO9f+zuE2kW57fi09MW7Q==",
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-2.4.5.tgz",
+      "integrity": "sha512-oo2u7vktOyKUked36R93NB7mg2B+N7Plr8lxp2JBGwr18ch6EggFjixSCdIVVLkT6Qr0z359Xvnafc9dcKyDUg==",
       "dev": true,
       "dependencies": {
         "js-beautify": "^1.14.9",
-        "vue-component-type-helpers": "^1.8.21"
-      },
-      "peerDependencies": {
-        "@vue/server-renderer": "^3.0.1",
-        "vue": "^3.0.1"
-      },
-      "peerDependenciesMeta": {
-        "@vue/server-renderer": {
-          "optional": true
-        }
+        "vue-component-type-helpers": "^2.0.0"
       }
     },
     "node_modules/@vue/tsconfig": {
@@ -1594,6 +1251,15 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/aperiodic-oscillator": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/aperiodic-oscillator/-/aperiodic-oscillator-0.1.0.tgz",
+      "integrity": "sha512-i85h6R8nI03sRkNOIDcc/f1c1V5r+UcSYy3/stxhVUnBuwLAtCkA3FB9ZoIu8Z5rMkaNoEZuTCDvN2t+1ijYhw==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/frostburn"
+      }
+    },
     "node_modules/arch": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
@@ -2173,9 +1839,9 @@
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
     },
     "node_modules/cypress": {
-      "version": "13.6.6",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.6.6.tgz",
-      "integrity": "sha512-S+2S9S94611hXimH9a3EAYt81QM913ZVA03pUmGDfLTFa5gyp85NJ8dJGSlEAEmyRsYkioS1TtnWtbv/Fzt11A==",
+      "version": "13.7.1",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.7.1.tgz",
+      "integrity": "sha512-4u/rpFNxOFCoFX/Z5h+uwlkBO4mWzAjveURi3vqdSu56HPvVdyGTxGw4XKGWt399Y1JwIn9E1L9uMXQpc0o55w==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -2672,12 +2338,13 @@
       }
     },
     "node_modules/eslint-plugin-vue": {
-      "version": "9.22.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.22.0.tgz",
-      "integrity": "sha512-7wCXv5zuVnBtZE/74z4yZ0CM8AjH6bk4MQGm7hZjUC2DBppKU5ioeOk5LGSg/s9a1ZJnIsdPLJpXnu1Rc+cVHg==",
+      "version": "9.24.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.24.0.tgz",
+      "integrity": "sha512-9SkJMvF8NGMT9aQCwFc5rj8Wo1XWSMSHk36i7ZwdI614BU7sIOR28ZjuFPKp8YGymZN12BSEbiSwa7qikp+PBw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
+        "globals": "^13.24.0",
         "natural-compare": "^1.4.0",
         "nth-check": "^2.1.1",
         "postcss-selector-parser": "^6.0.15",
@@ -3748,6 +3415,18 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/ji-lattice": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/ji-lattice/-/ji-lattice-0.0.2.tgz",
+      "integrity": "sha512-nLCvHXi0zIhtYVBHaipnsFdMyZG6//xsTcnHidXtv3+r/q2IyesSQ9OSHS+F2cB7lGmaceiEEcplXTnMGY/j6w==",
+      "dependencies": {
+        "xen-dev-utils": "^0.2.7"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/frostburn"
+      }
+    },
     "node_modules/joi": {
       "version": "17.12.2",
       "resolved": "https://registry.npmjs.org/joi/-/joi-17.12.2.tgz",
@@ -4321,11 +4000,11 @@
       }
     },
     "node_modules/moment-of-symmetry": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/moment-of-symmetry/-/moment-of-symmetry-0.4.1.tgz",
-      "integrity": "sha512-uT4K/nUca6e8z/LruWbZROqi0efB+P3zZ5U4ffGWigKqkvGkUGI12pGWbssLjMobzoJHaluFgnxmD2N3fb6uGA==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/moment-of-symmetry/-/moment-of-symmetry-0.4.2.tgz",
+      "integrity": "sha512-XBzU01kDgQfN0JacGSwMOxJOk5EhwcaojbDQDDdZF/k16ze/VP9X8Cz1Gy8Hmhg+WMu0axfTVP4ufzhoFt0C4g==",
       "dependencies": {
-        "xen-dev-utils": "^0.2.7"
+        "xen-dev-utils": "^0.2.8"
       },
       "funding": {
         "type": "github",
@@ -4961,11 +4640,11 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.11.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-      "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.0.tgz",
+      "integrity": "sha512-trVZiI6RMOkO476zLGaBIzszOdFPnCCXHPG9kn0yuS1uz6xdVxPfZdB3vUig9pxPFDM9BRAgz/YUIVQ1/vuiUg==",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -5245,18 +4924,6 @@
         "node": ">=v12.22.7"
       }
     },
-    "node_modules/scale-workshop-core": {
-      "version": "0.1.5",
-      "resolved": "git+ssh://git@github.com/xenharmonic-devs/scale-workshop-core.git#77422327f9258e22635a3857994c373ee1e80eff",
-      "license": "MIT",
-      "dependencies": {
-        "xen-dev-utils": "0.2.8"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/frostburn"
-      }
-    },
     "node_modules/seedrandom": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
@@ -5392,6 +5059,25 @@
         "node": ">=8"
       }
     },
+    "node_modules/sonic-weave": {
+      "version": "0.0.4",
+      "resolved": "git+ssh://git@github.com/xenharmonic-devs/sonic-weave.git#9643f6c7958143289ad05f016287ff4ed8025ccf",
+      "license": "MIT",
+      "dependencies": {
+        "moment-of-symmetry": "^0.4.2",
+        "xen-dev-utils": "^0.2.8"
+      },
+      "bin": {
+        "sonic-weave": "bin/sonic-weave.js"
+      },
+      "engines": {
+        "node": ">=10.6.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/frostburn"
+      }
+    },
     "node_modules/source-map-js": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
@@ -5641,6 +5327,18 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/sw-synth": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/sw-synth/-/sw-synth-0.1.0.tgz",
+      "integrity": "sha512-JUUdHz5jNLlr3Q+crEY6kM6cS4Dx0KGHV7eiCU3qTJLTCKI9XUc4T1SL4kJblcf4f2cxcN/f6k0rCXX1kzfIcA==",
+      "dependencies": {
+        "aperiodic-oscillator": "^0.1.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/frostburn"
+      }
+    },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
@@ -5988,9 +5686,9 @@
       "dev": true
     },
     "node_modules/vite": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz",
-      "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz",
+      "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.18.10",
@@ -6163,9 +5861,9 @@
       }
     },
     "node_modules/vue-component-type-helpers": {
-      "version": "1.8.27",
-      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-1.8.27.tgz",
-      "integrity": "sha512-0vOfAtI67UjeO1G6UiX5Kd76CqaQ67wrRZiOe7UAb9Jm6GzlUr/fC7CV90XfwapJRjpCMaZFhv1V0ajWRmE9Dg==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.0.7.tgz",
+      "integrity": "sha512-7e12Evdll7JcTIocojgnCgwocX4WzIYStGClBQ+QuWPinZo/vQolv2EMq4a3lg16TKfwWafLimG77bxb56UauA==",
       "dev": true
     },
     "node_modules/vue-eslint-parser": {
diff --git a/package.json b/package.json
index 4c3d9f98..48d7c4cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scale-workshop",
-  "version": "2.4.1",
+  "version": "3.0.0-beta.1",
   "scripts": {
     "dev": "vite",
     "build": "run-p type-check \"build-only {@}\" --",
@@ -16,11 +16,13 @@
   },
   "dependencies": {
     "isomorphic-qwerty": "^0.0.2",
+    "ji-lattice": "^0.0.2",
     "jszip": "^3.10.1",
-    "moment-of-symmetry": "^0.4.1",
+    "moment-of-symmetry": "^0.4.2",
     "pinia": "^2.1.7",
-    "qs": "^6.11.2",
-    "scale-workshop-core": "github:xenharmonic-devs/scale-workshop-core#v0.1.5",
+    "qs": "^6.12.0",
+    "sonic-weave": "github:xenharmonic-devs/sonic-weave#v0.0.4",
+    "sw-synth": "^0.1.0",
     "temperaments": "^0.5.3",
     "vue": "^3.3.4",
     "vue-router": "^4.3.0",
@@ -29,26 +31,26 @@
     "xen-midi": "^0.1.2"
   },
   "devDependencies": {
-    "@rushstack/eslint-patch": "^1.7.2",
-    "@tsconfig/node18": "^18.2.2",
+    "@rushstack/eslint-patch": "^1.8.0",
+    "@tsconfig/node18": "^18.2.3",
     "@types/jsdom": "^21.1.6",
-    "@types/node": "^18.19.21",
-    "@types/qs": "^6.9.12",
+    "@types/node": "^18.19.26",
+    "@types/qs": "^6.9.14",
     "@vitejs/plugin-vue": "^4.6.2",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/eslint-config-typescript": "^12.0.0",
-    "@vue/test-utils": "^2.4.4",
+    "@vue/test-utils": "^2.4.5",
     "@vue/tsconfig": "^0.4.0",
-    "cypress": "^13.6.6",
+    "cypress": "^13.7.1",
     "eslint": "^8.57.0",
     "eslint-plugin-cypress": "^2.15.1",
-    "eslint-plugin-vue": "^9.22.0",
+    "eslint-plugin-vue": "^9.23.0",
     "jsdom": "^22.1.0",
     "npm-run-all2": "^6.1.2",
     "prettier": "^3.2.5",
     "start-server-and-test": "^2.0.3",
     "typescript": "~5.2.0",
-    "vite": "^4.5.2",
+    "vite": "^4.5.3",
     "vitest": "^0.34.6",
     "vue-tsc": "^1.8.27"
   }
diff --git a/public/favicon.png b/public/favicon.png
index b39986908c2f3a7345f282a2e03a5d4705da83f1..f1e427b8a7f232e70f3528af30290a6c2f176e55 100644
GIT binary patch
literal 22811
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

literal 17358
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
Zg;}i3z~)q@jX?ijR!Z?z$qVE6{|^Gl9GCzA

diff --git a/src/App.vue b/src/App.vue
index 05b46926..cc06afd0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,22 +1,26 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, reactive, watch } from 'vue'
-import { RouterLink, RouterView, useRouter, type LocationQuery } from 'vue-router'
-import { NEWLINE_TEST } from '@/constants'
+import { RouterLink, RouterView, useRouter } from 'vue-router'
+import { DEFAULT_NUMBER_OF_COMPONENTS } from '@/constants'
 import { ScaleWorkshopOneData } from '@/scale-workshop-one'
 import type { Input, Output } from 'webmidi'
 import { MidiIn, midiKeyInfo, MidiOut } from 'xen-midi'
 import { Keyboard, type CoordinateKeyboardEvent } from 'isomorphic-qwerty'
-import { decodeQuery, encodeQuery, type DecodedState } from '@/url-encode'
-import { debounce } from '@/utils'
+import { decodeQuery } from '@/url-encode'
+import { annotateColors } from '@/utils'
 import { version } from '../package.json'
 import { useAudioStore } from '@/stores/audio'
 import { useStateStore } from './stores/state'
 import { useMidiStore } from './stores/midi'
+import { useScaleStore } from './stores/scale'
+import { clamp } from 'xen-dev-utils'
+import { parseScaleWorkshop2Line, setNumberOfComponents } from 'sonic-weave'
 
 // === Pinia-managed state ===
-const audio = useAudioStore()
 const state = useStateStore()
+const scale = useScaleStore()
 const midi = useMidiStore()
+const audio = useAudioStore()
 
 // == URL path handling ==
 /**
@@ -26,159 +30,14 @@ function getPath(url: URL) {
   return url.pathname.slice(import.meta.env.BASE_URL.length)
 }
 
-// == State encoding ==
 const router = useRouter()
 
-// Flags to prevent infinite decode - watch - encode loops
-let justEncodedUrl = false
-let justDecodedUrl = false
-
-// Debounced to stagger navigation loops if the flags fail
-const encodeState = debounce(() => {
-  // Navigation loop prevention
-  if (justDecodedUrl) {
-    justDecodedUrl = false
-    return
-  }
-  justEncodedUrl = true
-
-  const decodedState: DecodedState = {
-    scaleName: state.scaleName,
-    scaleLines: state.scaleLines,
-    baseFrequency: state.scale.baseFrequency,
-    baseMidiNote: state.baseMidiNote,
-    keyColors: state.keyColors,
-    isomorphicHorizontal: state.isomorphicHorizontal,
-    isomorphicVertical: state.isomorphicVertical,
-    keyboardMode: state.keyboardMode,
-    pianoMode: state.pianoMode,
-    equaveShift: state.equaveShift,
-    degreeShift: state.degreeShift,
-    waveform: audio.waveform,
-    attackTime: audio.attackTime,
-    decayTime: audio.decayTime,
-    sustainLevel: audio.sustainLevel,
-    releaseTime: audio.releaseTime,
-    pingPongDelayTime: audio.pingPongDelayTime,
-    pingPongFeedback: audio.pingPongFeedback,
-    pingPongSeparation: audio.pingPongSeparation,
-    pingPongGain: audio.pingPongGain
-  }
-
-  const query = encodeQuery(decodedState) as LocationQuery
-  query.version = version
-
-  // XXX: There are some sporadic issues with useRoute().fullPath
-  // so we use native URL.pathname.
-  const url = new URL(window.location.href)
-
-  router.push({ path: getPath(url), query })
-}, 200)
-
-watch(
-  () => [
-    state.scaleName,
-    state.scaleLines,
-    state.scale.baseFrequency,
-    state.baseMidiNote,
-    state.keyColors,
-    state.isomorphicHorizontal,
-    state.isomorphicVertical,
-    state.keyboardMode,
-    state.pianoMode,
-    state.equaveShift,
-    state.degreeShift,
-    audio.waveform,
-    audio.attackTime,
-    audio.decayTime,
-    audio.sustainLevel,
-    audio.releaseTime,
-    audio.pingPongDelayTime,
-    audio.pingPongFeedback,
-    audio.pingPongSeparation,
-    audio.pingPongGain
-  ],
-  encodeState
-)
-
-// == State decoding ==
-router.afterEach((to, from) => {
-  if (to.fullPath === from.fullPath) {
-    return
-  }
-  // Navigation loop prevention
-  if (justEncodedUrl) {
-    justEncodedUrl = false
-    return
-  }
-
-  // XXX: There are some sporadic issues with useRoute().fullPath
-  // so we use native URL.searchParams.
-  const url = new URL(window.location.href)
-  const query = url.searchParams
-  if (query.has('version')) {
-    try {
-      const decodedState = decodeQuery(query)
-      justDecodedUrl = true
-
-      state.scaleName = decodedState.scaleName
-      state.scale.baseFrequency = decodedState.baseFrequency
-      state.baseMidiNote = decodedState.baseMidiNote
-      state.keyColors = decodedState.keyColors
-      state.isomorphicHorizontal = decodedState.isomorphicHorizontal
-      state.isomorphicVertical = decodedState.isomorphicVertical
-      state.keyboardMode = decodedState.keyboardMode
-      state.pianoMode = decodedState.pianoMode
-      state.scaleLines = decodedState.scaleLines
-      state.equaveShift = decodedState.equaveShift
-      state.degreeShift = decodedState.degreeShift
-      audio.waveform = decodedState.waveform
-      audio.attackTime = decodedState.attackTime
-      audio.decayTime = decodedState.decayTime
-      audio.sustainLevel = decodedState.sustainLevel
-      audio.releaseTime = decodedState.releaseTime
-      audio.pingPongDelayTime = decodedState.pingPongDelayTime
-      audio.pingPongFeedback = decodedState.pingPongFeedback
-      audio.pingPongSeparation = decodedState.pingPongSeparation
-      audio.pingPongGain = decodedState.pingPongGain
-    } catch (error) {
-      console.error(`Error parsing version ${query.get('version')} URL`, error)
-    }
-  }
-})
-
 // === Tuning table highlighting ===
-// We use hacks to bypass Vue state management for real-time gains
 function tuningTableKeyOn(index: number) {
-  if (index >= 0 && index < 128) {
-    let tuningTableRow = (window as any).TUNING_TABLE_ROWS[index]
-    if (tuningTableRow === undefined) {
-      tuningTableRow = { heldKeys: 0, element: null }
-    }
-    tuningTableRow.heldKeys++
-    if (tuningTableRow.element?._rawValue) {
-      tuningTableRow.element._rawValue.classList.add('active')
-    }
-    ;(window as any).TUNING_TABLE_ROWS[index] = tuningTableRow
-  }
-  // Virtual keyboard state is too complex so we take the performance hit.
   state.heldNotes.set(index, (state.heldNotes.get(index) ?? 0) + 1)
 }
 
 function tuningTableKeyOff(index: number) {
-  if (index >= 0 && index < 128) {
-    let tuningTableRow = (window as any).TUNING_TABLE_ROWS[index]
-    if (tuningTableRow === undefined) {
-      tuningTableRow = { heldKeys: 0, element: null }
-    }
-    tuningTableRow.heldKeys--
-    if (tuningTableRow.element?._rawValue) {
-      if (!tuningTableRow.heldKeys) {
-        tuningTableRow.element._rawValue.classList.remove('active')
-      }
-      ;(window as any).TUNING_TABLE_ROWS[index] = tuningTableRow
-    }
-  }
   state.heldNotes.set(index, Math.max(0, (state.heldNotes.get(index) ?? 0) - 1))
 }
 
@@ -187,6 +46,7 @@ function tuningTableKeyOff(index: number) {
 const midiOut = computed(() => new MidiOut(midi.output as Output, midi.outputChannels))
 
 function sendNoteOn(frequency: number, rawAttack: number) {
+  frequency = clamp(-24000, 24000, frequency)
   const midiOff = midiOut.value.sendNoteOn(frequency, rawAttack)
 
   if (audio.synth === null || audio.virtualSynth === null) {
@@ -212,7 +72,7 @@ function midiNoteOn(index: number, rawAttack?: number) {
   if (rawAttack === undefined) {
     rawAttack = 80
   }
-  let frequency = state.frequencies[index]
+  let frequency = scale.frequencies[index]
   if (!midi.velocityOn) {
     rawAttack = 80
   }
@@ -220,7 +80,7 @@ function midiNoteOn(index: number, rawAttack?: number) {
   // Store state to ensure consistent note off.
   const info = midiKeyInfo(index)
   const whiteMode = midi.whiteMode
-  const indices = state.whiteIndices
+  const indices = scale.whiteIndices
 
   if (whiteMode === 'off') {
     tuningTableKeyOn(index)
@@ -228,20 +88,20 @@ function midiNoteOn(index: number, rawAttack?: number) {
     if (info.whiteNumber === undefined) {
       frequency = NaN
     } else {
-      info.whiteNumber += state.whiteModeOffset
-      frequency = state.getFrequency(info.whiteNumber)
+      info.whiteNumber += scale.whiteModeOffset
+      frequency = scale.getFrequency(info.whiteNumber)
       tuningTableKeyOn(info.whiteNumber)
     }
   } else if (whiteMode === 'blackAverage') {
     if (info.whiteNumber === undefined) {
-      info.flatOf += state.whiteModeOffset
-      info.sharpOf += state.whiteModeOffset
-      frequency = Math.sqrt(state.getFrequency(info.flatOf) * state.getFrequency(info.sharpOf))
+      info.flatOf += scale.whiteModeOffset
+      info.sharpOf += scale.whiteModeOffset
+      frequency = Math.sqrt(scale.getFrequency(info.flatOf) * scale.getFrequency(info.sharpOf))
       tuningTableKeyOn(info.flatOf)
       tuningTableKeyOn(info.sharpOf)
     } else {
-      info.whiteNumber += state.whiteModeOffset
-      frequency = state.getFrequency(info.whiteNumber)
+      info.whiteNumber += scale.whiteModeOffset
+      frequency = scale.getFrequency(info.whiteNumber)
       tuningTableKeyOn(info.whiteNumber)
     }
   } else if (whiteMode === 'keyColors') {
@@ -253,12 +113,12 @@ function midiNoteOn(index: number, rawAttack?: number) {
         if (index === indices[info.sharpOf + 1]) {
           frequency = NaN
         } else {
-          frequency = state.getFrequency(index)
+          frequency = scale.getFrequency(index)
           tuningTableKeyOn(index)
         }
       } else {
         index = indices[info.whiteNumber]
-        frequency = state.getFrequency(index)
+        frequency = scale.getFrequency(index)
         tuningTableKeyOn(index)
       }
     } else {
@@ -335,7 +195,7 @@ watch(
 // === Virtual and typing keyboard ===
 function keyboardNoteOn(index: number) {
   tuningTableKeyOn(index)
-  const noteOff = sendNoteOn(state.getFrequency(index), 80)
+  const noteOff = sendNoteOn(scale.getFrequency(index), 80)
   function keyOff() {
     tuningTableKeyOff(index)
     return noteOff(80)
@@ -346,7 +206,7 @@ function keyboardNoteOn(index: number) {
 // === Typing keyboard state ===
 function windowKeydownOrUp(event: KeyboardEvent | MouseEvent) {
   // Audio context must be initialized as a response to user gesture
-  audio.initialize()
+  setTimeout(() => audio.initialize(), 1)
 
   const target = event.target
   // Keep typing activated while adjusting sliders
@@ -387,21 +247,21 @@ function windowKeydown(event: KeyboardEvent) {
 
   // "Octave" keys
   if (event.code === state.equaveUpCode) {
-    state.equaveShift++
+    scale.equaveShift++
     return
   }
   if (event.code === state.equaveDownCode) {
-    state.equaveShift--
+    scale.equaveShift--
     return
   }
 
   // "Transpose" keys
   if (event.code === state.degreeUpCode) {
-    state.degreeShift++
+    scale.degreeShift++
     return
   }
   if (event.code === state.degreeDownCode) {
-    state.degreeShift--
+    scale.degreeShift--
     return
   }
 
@@ -431,13 +291,14 @@ function typingKeydown(event: CoordinateKeyboardEvent) {
     return emptyKeyup
   }
 
-  let index = state.baseMidiNote + state.scale.size * state.equaveShift
+  let index = scale.baseMidiNote + scale.scale.size * scale.equaveShift + scale.degreeShift
 
-  if (state.keyboardMode === 'isomorphic') {
-    index += state.degreeShift + x * state.isomorphicHorizontal + (2 - y) * state.isomorphicVertical
+  if (scale.keyboardMode === 'isomorphic') {
+    index += x * state.isomorphicHorizontal + (2 - y) * state.isomorphicVertical
   } else {
-    if (state.keyboardMapping.has(event.code)) {
-      index = state.keyboardMapping.get(event.code)!
+    if (scale.qwertyMapping.has(event.code)) {
+      // QWERTY mapping incorporates shifts
+      index = scale.qwertyMapping.get(event.code)!
     } else {
       // No user mapping for the key, bail out
       return emptyKeyup
@@ -460,30 +321,33 @@ onMounted(() => {
   const url = new URL(window.location.href)
   const query = url.searchParams
 
+  // This is overriden when scale data is evaluated, but some corner cases need to be covered.
+  setNumberOfComponents(DEFAULT_NUMBER_OF_COMPONENTS)
+
   // Special handling for the empty app state so that
   // the browser's back button can undo to the clean state.
   if (![...query.keys()].length) {
     router.push({ path: getPath(url), query: { version } })
-  }
-  // Scale Workshop 1 compatibility
-  else if (!query.has('version')) {
+  } else if (!query.has('version')) {
+    // Scale Workshop 1 compatibility
     try {
       const scaleWorkshopOneData = new ScaleWorkshopOneData()
 
-      state.scaleName = scaleWorkshopOneData.name
-      state.scale.baseFrequency = scaleWorkshopOneData.freq
-      state.baseMidiNote = scaleWorkshopOneData.midi
+      scale.name = scaleWorkshopOneData.name
+      scale.baseFrequency = scaleWorkshopOneData.freq
+      scale.autoFrequency = false
+      scale.baseMidiNote = scaleWorkshopOneData.midi
       state.isomorphicHorizontal = scaleWorkshopOneData.horizontal
       state.isomorphicVertical = scaleWorkshopOneData.vertical
-      if (scaleWorkshopOneData.colors !== undefined) {
-        state.keyColors = scaleWorkshopOneData.colors.split(' ')
-      }
 
       if (scaleWorkshopOneData.data !== undefined) {
-        // Check that the scale is valid by attempting a parse
-        scaleWorkshopOneData.parseTuningData()
-        // Store raw text lines
-        state.scaleLines = scaleWorkshopOneData.data.split(NEWLINE_TEST)
+        const colors = scaleWorkshopOneData.colors ?? ''
+        const intervals = scaleWorkshopOneData.parseTuningData()
+        // Convert to raw text
+        const sourceLines = intervals.map((i) => i.toString())
+        annotateColors(sourceLines, colors.split(' '))
+        scale.sourceText = sourceLines.join('\n')
+        scale.computeScale()
       }
 
       audio.waveform = scaleWorkshopOneData.waveform || 'semisine'
@@ -491,9 +355,67 @@ onMounted(() => {
       audio.decayTime = scaleWorkshopOneData.decayTime
       audio.sustainLevel = scaleWorkshopOneData.sustainLevel
       audio.releaseTime = scaleWorkshopOneData.releaseTime
+
+      // Replace query with version 3.
+      router.push({ path: getPath(url), query: { version } })
     } catch (error) {
       console.error('Error parsing version 1 URL', error)
     }
+  } else if (query.get('version')!.startsWith('2.')) {
+    // Scale Workshop 2 compatibility
+    try {
+      const decodedState = decodeQuery(query)
+
+      let pianoMode: 'Asdf' | 'QweZxc' = 'Asdf'
+      if (decodedState.pianoMode === 'QweZxc0' || decodedState.pianoMode === 'QweZxc1') {
+        pianoMode = 'QweZxc'
+      }
+
+      scale.name = decodedState.scaleName
+      scale.baseFrequency = decodedState.baseFrequency
+      scale.autoFrequency = false
+      scale.baseMidiNote = decodedState.baseMidiNote
+      state.isomorphicHorizontal = decodedState.isomorphicHorizontal
+      state.isomorphicVertical = decodedState.isomorphicVertical
+      scale.keyboardMode = decodedState.keyboardMode
+      scale.pianoMode = pianoMode
+      scale.equaveShift = decodedState.equaveShift
+      scale.degreeShift = decodedState.degreeShift
+      audio.waveform = decodedState.waveform
+      audio.attackTime = decodedState.attackTime
+      audio.decayTime = decodedState.decayTime
+      audio.sustainLevel = decodedState.sustainLevel
+      audio.releaseTime = decodedState.releaseTime
+      audio.pingPongDelayTime = decodedState.pingPongDelayTime
+      audio.pingPongFeedback = decodedState.pingPongFeedback
+      audio.pingPongSeparation = decodedState.pingPongSeparation
+      audio.pingPongGain = decodedState.pingPongGain
+
+      // The decoder speaks Scale Workshop 2. Translate to SonicWeave.
+      const sourceLines: string[] = []
+      const invalidLines: [string, number][] = []
+      for (let i = 0; i < decodedState.scaleLines.length; ++i) {
+        const line = decodedState.scaleLines[i]
+        try {
+          const sourceLine = parseScaleWorkshop2Line(line, DEFAULT_NUMBER_OF_COMPONENTS).toString()
+          sourceLines.push(sourceLine)
+        } catch {
+          invalidLines.push([line, i])
+        }
+      }
+
+      annotateColors(sourceLines, decodedState.keyColors)
+      for (const [line, index] of invalidLines) {
+        sourceLines.splice(index, 0, '// ' + line)
+      }
+      scale.sourceText = sourceLines.join('\n')
+      scale.computeScale()
+
+      // Replace query with version 3.
+      router.push({ path: getPath(url), query: { version } })
+    } catch (error) {
+      console.error(`Error parsing version ${query.get('version')} URL`, error)
+    }
   }
 })
 
@@ -568,6 +490,7 @@ function panic() {
 
 <style>
 @import '@/assets/base.css';
+@import '@/assets/main.css';
 
 #app {
   display: flex;
diff --git a/src/__tests__/analysis.spec.ts b/src/__tests__/analysis.spec.ts
index 76c8b72e..7475856a 100644
--- a/src/__tests__/analysis.spec.ts
+++ b/src/__tests__/analysis.spec.ts
@@ -1,7 +1,9 @@
 import { describe, it, expect } from 'vitest'
-import { arraysEqual } from 'xen-dev-utils'
+import { arraysEqual, valueToCents } from 'xen-dev-utils'
 
-import { otonalFundamental, utonalFundamental } from '../analysis'
+import { alignValues, misalignment, otonalFundamental, utonalFundamental } from '../analysis'
+
+const EPSILON = 1e-4
 
 describe('Otonal balancer', () => {
   it('can figure out that the major chord in 12edo approximates 4:5:6', () => {
@@ -28,3 +30,18 @@ describe('Utonal balancer', () => {
     ).toBeTruthy()
   })
 })
+
+describe('Equal-division deviation minimizer', () => {
+  it('can figure out the optimal alignment of 4:5:6 on 12edo', () => {
+    const minimumAchievableError = alignValues([4, 5, 6], 100.0).error
+    expect(minimumAchievableError).closeTo(7.8206, EPSILON)
+
+    // Attempt (and fail) to find a counter-example
+    const pitches = [4, 5, 6].map(valueToCents)
+    for (let i = 0; i < 100; ++i) {
+      const offset = Math.random() * 1200
+      const candidate = pitches.map((pitch) => pitch + offset)
+      expect(misalignment(candidate, 100.0)).toBeGreaterThanOrEqual(minimumAchievableError)
+    }
+  })
+})
diff --git a/src/__tests__/midi.spec.ts b/src/__tests__/midi.spec.ts
index 2e607975..76c67fca 100644
--- a/src/__tests__/midi.spec.ts
+++ b/src/__tests__/midi.spec.ts
@@ -6,7 +6,6 @@ import { computeWhiteIndices } from '../midi'
 describe('White key to white color mapper', () => {
   it('reproduces a chromatic scale in the default (A minor) configuration', () => {
     const map = computeWhiteIndices(69, [
-      'white',
       'black',
       'white',
       'white',
@@ -17,7 +16,8 @@ describe('White key to white color mapper', () => {
       'white',
       'black',
       'white',
-      'black'
+      'black',
+      'white'
     ])
 
     for (let index = 69; index < 69 + 12; index++) {
@@ -32,7 +32,6 @@ describe('White key to white color mapper', () => {
 
   it('reproduces a chromatic scale in a C major configuration', () => {
     const map = computeWhiteIndices(60, [
-      'white',
       'black',
       'white',
       'black',
@@ -43,6 +42,7 @@ describe('White key to white color mapper', () => {
       'black',
       'white',
       'black',
+      'white',
       'white'
     ])
 
@@ -59,7 +59,7 @@ describe('White key to white color mapper', () => {
   it('maps smitonics opportunistically', () => {
     const map = computeWhiteIndices(
       69,
-      'white black white white black white white black white white black'.split(' ')
+      'black white white black white white black white white black white '.split(' ')
     )
 
     // The logic of App.midiNoteOn is merely emulated here.
@@ -83,7 +83,7 @@ describe('White key to white color mapper', () => {
   })
 
   it('maps a tetratonic parent scale of a heptatonic scale', () => {
-    const map = computeWhiteIndices(69, 'white black white black white black white'.split(' '))
+    const map = computeWhiteIndices(69, 'black white black white black white white'.split(' '))
 
     // White keys
     expect(map[40]).toBe(69) // A4 -> J
diff --git a/src/__tests__/scale-workshop-one.spec.ts b/src/__tests__/scale-workshop-one.spec.ts
index 04725d77..0c5705be 100644
--- a/src/__tests__/scale-workshop-one.spec.ts
+++ b/src/__tests__/scale-workshop-one.spec.ts
@@ -21,25 +21,24 @@ describe('Scale Workshop 1 compatibility layer', () => {
     expect(data.waveform).toBe('sine')
     expect(data.ampenv).toBe('pad')
 
-    const scale = data.parseTuningData()
+    const intervals = data.parseTuningData()
 
-    expect(scale.getMonzo(0).toCents()).toBeCloseTo(0)
-    expect(scale.getMonzo(1).toCents()).toBeCloseTo(75)
-    expect(scale.getMonzo(2).toCents()).toBeCloseTo(150)
-    expect(scale.getMonzo(3).toCents()).toBeCloseTo(225)
-    expect(scale.getMonzo(4).toCents()).toBeCloseTo(300)
-    expect(scale.getMonzo(5).toCents()).toBeCloseTo(375)
-    expect(scale.getMonzo(6).toCents()).toBeCloseTo(450)
-    expect(scale.getMonzo(7).toCents()).toBeCloseTo(525)
-    expect(scale.getMonzo(8).toCents()).toBeCloseTo(600)
-    expect(scale.getMonzo(9).toCents()).toBeCloseTo(675)
-    expect(scale.getMonzo(10).toCents()).toBeCloseTo(750)
-    expect(scale.getMonzo(11).toCents()).toBeCloseTo(825)
-    expect(scale.getMonzo(12).toCents()).toBeCloseTo(900)
-    expect(scale.getMonzo(13).toCents()).toBeCloseTo(975)
-    expect(scale.getMonzo(14).toCents()).toBeCloseTo(1050)
-    expect(scale.getMonzo(15).toCents()).toBeCloseTo(1125)
-    expect(scale.getMonzo(16).toCents()).toBeCloseTo(1200)
+    expect(intervals[0].totalCents()).toBeCloseTo(75)
+    expect(intervals[1].totalCents()).toBeCloseTo(150)
+    expect(intervals[2].totalCents()).toBeCloseTo(225)
+    expect(intervals[3].totalCents()).toBeCloseTo(300)
+    expect(intervals[4].totalCents()).toBeCloseTo(375)
+    expect(intervals[5].totalCents()).toBeCloseTo(450)
+    expect(intervals[6].totalCents()).toBeCloseTo(525)
+    expect(intervals[7].totalCents()).toBeCloseTo(600)
+    expect(intervals[8].totalCents()).toBeCloseTo(675)
+    expect(intervals[9].totalCents()).toBeCloseTo(750)
+    expect(intervals[10].totalCents()).toBeCloseTo(825)
+    expect(intervals[11].totalCents()).toBeCloseTo(900)
+    expect(intervals[12].totalCents()).toBeCloseTo(975)
+    expect(intervals[13].totalCents()).toBeCloseTo(1050)
+    expect(intervals[14].totalCents()).toBeCloseTo(1125)
+    expect(intervals[15].totalCents()).toBeCloseTo(1200)
   })
 
   it('can parse all line types', () => {
@@ -48,20 +47,20 @@ describe('Scale Workshop 1 compatibility layer', () => {
     )
     const data = new ScaleWorkshopOneData(url)
 
-    const scale = data.parseTuningData()
+    const intervals = data.parseTuningData()
 
-    expect(scale.getFrequency(0)).toBeCloseTo(440)
+    expect(data.freq).toBeCloseTo(440)
 
-    expect(scale.getMonzo(1).toCents()).toBeCloseTo(100)
+    expect(intervals[0].totalCents()).toBeCloseTo(100)
 
-    expect(scale.getMonzo(2).valueOf()).toBeCloseTo(1.2)
+    expect(intervals[1].valueOf()).toBeCloseTo(1.2)
 
-    expect(scale.getMonzo(3).toFraction().equals(new Fraction(3, 2))).toBeTruthy()
+    expect(intervals[2].value.toFraction().equals(new Fraction(3, 2))).toBeTruthy()
 
-    const [fractionOfEquave, equave] = scale.getMonzo(4).toEqualTemperament()
+    const { fractionOfEquave, equave } = intervals[3].value.toEqualTemperament()
     expect(fractionOfEquave.equals(new Fraction(4, 5))).toBeTruthy()
     expect(equave.equals(new Fraction(2, 1))).toBeTruthy()
 
-    expect(scale.getMonzo(5).toFraction().equals(new Fraction(2, 1))).toBeTruthy()
+    expect(intervals[4].value.toFraction().equals(new Fraction(2, 1))).toBeTruthy()
   })
 })
diff --git a/src/__tests__/tempering.spec.ts b/src/__tests__/tempering.spec.ts
index c1c453a4..d2da4220 100644
--- a/src/__tests__/tempering.spec.ts
+++ b/src/__tests__/tempering.spec.ts
@@ -1,16 +1,13 @@
 import { describe, it, expect } from 'vitest'
 
 import {
-  Mapping,
-  makeRank1,
   makeRank2FromCommas,
   makeRank2FromVals,
   mosPatternsRank2FromCommas,
   mosPatternsRank2FromVals,
   toPrimeMapping
 } from '../tempering'
-import { arraysEqual, Fraction, PRIME_CENTS, valueToCents } from 'xen-dev-utils'
-import { ExtendedMonzo, Interval, Scale } from 'scale-workshop-core'
+import { arraysEqual, PRIME_CENTS, valueToCents } from 'xen-dev-utils'
 import { Subgroup } from 'temperaments'
 import { DEFAULT_NUMBER_OF_COMPONENTS } from '../constants'
 
@@ -37,179 +34,7 @@ describe('Prime map converter', () => {
   })
 })
 
-describe('Temperament Mapping', () => {
-  it('calculates POTE meantone', () => {
-    const mapping = Mapping.fromCommas(['81/80'], 3)
-
-    const syntonicComma = new Interval(ExtendedMonzo.fromFraction(new Fraction(81, 80), 3), 'ratio')
-    const octave = new Interval(ExtendedMonzo.fromFraction(2, 3), 'ratio')
-    const fifth = new Interval(ExtendedMonzo.fromFraction(new Fraction(3, 2), 3), 'ratio')
-    expect(mapping.apply(syntonicComma).totalCents()).toBeCloseTo(0)
-    expect(mapping.apply(fifth).totalCents()).toBeCloseTo(696.239)
-    expect(mapping.apply(octave).totalCents()).toBeCloseTo(1200)
-  })
-
-  it('supports purifying octaves after tempering', () => {
-    const impureMapping = Mapping.fromCommas(['81/80'], 3, '2.3.5', {
-      temperEquaves: true
-    })
-    const octave = new Interval(ExtendedMonzo.fromFraction(2, 3), 'ratio')
-    expect(impureMapping.apply(octave).totalCents()).greaterThan(1200)
-
-    const mapping = impureMapping.pureOctaves()
-
-    const syntonicComma = new Interval(ExtendedMonzo.fromFraction(new Fraction(81, 80), 3), 'ratio')
-    const fifth = new Interval(ExtendedMonzo.fromFraction(new Fraction(3, 2), 3), 'ratio')
-    expect(mapping.apply(syntonicComma).totalCents()).toBeCloseTo(0)
-    expect(mapping.apply(fifth).totalCents()).toBeGreaterThan(695)
-    expect(mapping.apply(fifth).totalCents()).toBeLessThan(700)
-    expect(mapping.apply(octave).totalCents()).toBeCloseTo(1200)
-  })
-
-  it('can temper out multiple commas', () => {
-    const miracle = Mapping.fromCommas(['225/224', '1029/1024'], 4)
-
-    const octave = new Interval(ExtendedMonzo.fromFraction(2, 4), 'ratio')
-    const marvelComma = new Interval(ExtendedMonzo.fromFraction(new Fraction(225, 224), 4), 'ratio')
-    const gamelisma = new Interval(ExtendedMonzo.fromFraction(new Fraction(1029, 1024), 4), 'ratio')
-    expect(miracle.apply(octave).totalCents()).toBeCloseTo(1200)
-    expect(miracle.apply(marvelComma).totalCents()).toBeCloseTo(0)
-    expect(miracle.apply(gamelisma).totalCents()).toBeCloseTo(0)
-
-    const largeSecor = new Interval(ExtendedMonzo.fromFraction(new Fraction(16, 15), 4), 'ratio')
-    const smallSecor = new Interval(ExtendedMonzo.fromFraction(new Fraction(15, 14), 4), 'ratio')
-    const secorCents = miracle.apply(smallSecor).totalCents()
-    expect(miracle.apply(largeSecor).totalCents()).toBeCloseTo(secorCents)
-    expect(secorCents).toBeGreaterThan(116)
-    expect(secorCents).toBeLessThan(117)
-  })
-
-  it('can temper to rank 1', () => {
-    const tet12 = Mapping.fromCommas(['81/80', '128/125'], 3, undefined, {
-      temperEquaves: true
-    })
-    const octave = new Interval(ExtendedMonzo.fromFraction(2, 3), 'ratio')
-    const syntonicComma = new Interval(ExtendedMonzo.fromFraction(new Fraction(81, 80), 3), 'ratio')
-    const diesis = new Interval(ExtendedMonzo.fromFraction(new Fraction(128, 125), 3), 'ratio')
-    const semitone = new Interval(ExtendedMonzo.fromFraction(new Fraction(16, 15), 3), 'ratio')
-    expect(tet12.apply(syntonicComma).totalCents()).toBeCloseTo(0)
-    expect(tet12.apply(diesis).totalCents()).toBeCloseTo(0)
-    expect(tet12.apply(semitone).totalCents() * 12).toBeCloseTo(tet12.apply(octave).totalCents())
-    expect(tet12.apply(octave).totalCents()).toBeGreaterThan(1197)
-    expect(tet12.apply(octave).totalCents()).toBeLessThan(1200)
-  })
-
-  it('can temper to rank 3', () => {
-    const breed = Mapping.fromCommas(['2401/2400'], 4, 7, {
-      temperEquaves: true
-    })
-    const octave = new Interval(ExtendedMonzo.fromFraction(2, 4), 'ratio')
-    const breedsma = new Interval(ExtendedMonzo.fromFraction(new Fraction(2401, 2400), 4), 'ratio')
-    expect(breed.apply(breedsma).totalCents()).toBeCloseTo(0)
-    expect(breed.apply(octave).totalCents()).toBeGreaterThan(1200)
-    expect(breed.apply(octave).totalCents()).toBeLessThan(1200.1)
-  })
-
-  it('leaves primes outside of the subgroup alone', () => {
-    const bug = Mapping.fromCommas(['27/25'], 5)
-    const largeLimma = new Interval(ExtendedMonzo.fromFraction(new Fraction(27, 25), 5), 'ratio')
-    const minorSixth = new Interval(ExtendedMonzo.fromFraction(new Fraction(11, 7), 5), 'ratio')
-    expect(bug.apply(largeLimma).totalCents()).toBeCloseTo(0)
-    expect(bug.apply(minorSixth).monzo.toFraction().equals(new Fraction(11, 7))).toBeTruthy()
-  })
-
-  it('can construct POTE mavila from a list of vals', () => {
-    const mavila = Mapping.fromVals([9, 16], 4, '2.3.5')
-    const octave = new Interval(ExtendedMonzo.fromFraction(2, 4), 'ratio')
-    const pelogicComma = new Interval(
-      ExtendedMonzo.fromFraction(new Fraction(135, 128), 4),
-      'ratio'
-    )
-    const fifth = new Interval(ExtendedMonzo.fromFraction(new Fraction(3, 2), 4), 'ratio')
-    const seventh = new Interval(ExtendedMonzo.fromFraction(new Fraction(7, 4), 4), 'ratio')
-    expect(mavila.apply(octave).totalCents()).toBeCloseTo(1200)
-    expect(mavila.apply(pelogicComma).totalCents()).toBeCloseTo(0)
-    expect(mavila.apply(fifth).totalCents()).toBeCloseTo(679.806)
-    expect(mavila.apply(seventh).monzo.toFraction().equals(new Fraction(7, 4))).toBeTruthy()
-  })
-
-  it('can construct CTE septimal meantone from a list of vals', () => {
-    const meantone = Mapping.fromVals([12, 19], 4, 7, {
-      constraints: ['2/1']
-    })
-    const syntonicComma = new Interval(ExtendedMonzo.fromFraction(new Fraction(81, 80), 4), 'ratio')
-    const starlingComma = new Interval(
-      ExtendedMonzo.fromFraction(new Fraction(126, 125), 4),
-      'ratio'
-    )
-    const octave = new Interval(ExtendedMonzo.fromFraction(2, 4), 'ratio')
-    const tritave = new Interval(ExtendedMonzo.fromFraction(new Fraction(3, 1), 4), 'ratio')
-    const pentave = new Interval(ExtendedMonzo.fromFraction(new Fraction(5, 1), 4), 'ratio')
-    const seven = new Interval(ExtendedMonzo.fromFraction(new Fraction(7, 1), 4), 'ratio')
-    expect(meantone.apply(syntonicComma).totalCents()).toBeCloseTo(0)
-    expect(meantone.apply(starlingComma).totalCents()).toBeCloseTo(0)
-    expect(meantone.apply(octave).totalCents()).toBeCloseTo(1200)
-    expect(meantone.apply(tritave).totalCents()).toBeCloseTo(1896.9521)
-    expect(meantone.apply(pentave).totalCents()).toBeCloseTo(2787.8085)
-    expect(meantone.apply(seven).totalCents()).toBeCloseTo(3369.5214)
-  })
-
-  it('can represent pantent vals', () => {
-    const edo12 = Mapping.fromWarts(12, 5)
-    expect(edo12.vector[0]).toBeCloseTo((1200 * 12) / 12)
-    expect(edo12.vector[1]).toBeCloseTo((1200 * 19) / 12)
-    expect(edo12.vector[2]).toBeCloseTo((1200 * 28) / 12)
-
-    const fifth = new Interval(ExtendedMonzo.fromFraction(new Fraction(3, 2), 3), 'ratio')
-    expect(edo12.apply(fifth).totalCents()).toBeCloseTo((1200 * 7) / 12)
-  })
-
-  it('can represent vals with warts', () => {
-    const edo18b = Mapping.fromWarts('18b', 5)
-    expect(edo18b.vector[0]).toBeCloseTo((1200 * 18) / 18)
-    expect(edo18b.vector[1]).toBeCloseTo((1200 * 28) / 18)
-  })
-
-  it('can be applied to scales', () => {
-    const porkypine = Mapping.fromCommas(['55/54', '100/99'], 5, '2.3.5.11')
-
-    const octave = new Interval(ExtendedMonzo.fromFraction(2, 5), 'ratio')
-    const neutralSecond = new Interval(ExtendedMonzo.fromFraction(new Fraction(12, 11), 5), 'ratio')
-    const submajorSecond = new Interval(
-      ExtendedMonzo.fromFraction(new Fraction(11, 10), 5),
-      'ratio'
-    )
-
-    const porkypine8 = porkypine.apply(Scale.fromRank2(neutralSecond, octave, 8, 0))
-
-    expect(porkypine8.getMonzo(0).totalCents()).toBeCloseTo(0)
-    expect(porkypine8.getMonzo(1).totalCents()).toBeCloseTo(
-      porkypine.apply(submajorSecond).totalCents()
-    )
-    expect(porkypine8.getMonzo(7).totalCents()).toBeGreaterThan(porkypine8.getMonzo(6).totalCents())
-    expect(porkypine8.getMonzo(8).totalCents()).toBeCloseTo(1200)
-  })
-})
-
 describe('Tempered scale generation', () => {
-  it('generates TE optimal 12', () => {
-    const scale = makeRank1(12, 5)
-    expect(scale.size).toBe(12)
-    expect(scale.equave.totalCents()).toBeCloseTo(1198.44)
-  })
-
-  it('generates TE optimal 12c (mavila | superpyth)', () => {
-    const scale = makeRank1('12c', '2.3.5')
-    expect(scale.size).toBe(12)
-    expect(scale.equave.totalCents()).toBeCloseTo(1212.68)
-  })
-
-  it('generates TE optimal equalized Bohlen-Pierce', () => {
-    const scale = makeRank1(13, '3.5.7')
-    expect(scale.size).toBe(13)
-    expect(scale.equave.totalCents()).toBeCloseTo(1904.16)
-  })
-
   it('generates CTE augmented from vals', () => {
     const vals = [3, 12]
     const limit = 5
@@ -221,23 +46,9 @@ describe('Tempered scale generation', () => {
     expect(arraysEqual(sizes, [6, 9, 12, 15, 27])).toBeTruthy()
 
     const { generator, period, numPeriods } = makeRank2FromVals(vals, sizes[2], limit, options)
-    const scale = Scale.fromRank2(
-      new Interval(ExtendedMonzo.fromCents(generator, 0), 'cents'),
-      new Interval(ExtendedMonzo.fromCents(period, 0), 'cents'),
-      sizes[2],
-      0,
-      numPeriods
-    )
-
-    expect(scale.size).toBe(12)
-
-    const third = scale.getMonzo(4)
-    const fifth = scale.getMonzo(7)
-    const octave = scale.getMonzo(12)
-
-    expect(third.toCents()).toBeCloseTo(400.0)
-    expect(fifth.toCents()).toBeCloseTo(valueToCents(3 / 2))
-    expect(octave.toCents()).toBeCloseTo(1200.0)
+    expect(period).toBeCloseTo(400)
+    expect(generator + period).toBeCloseTo(valueToCents(3 / 2))
+    expect(numPeriods).toBe(3)
   })
 
   it('generates POTE meantone from a comma', () => {
@@ -247,21 +58,9 @@ describe('Tempered scale generation', () => {
     expect(arraysEqual(sizes, [2, 3, 5, 7, 12])).toBeTruthy()
 
     const { generator, period, numPeriods } = makeRank2FromCommas(commas, sizes[3])
-    const scale = Scale.fromRank2(
-      new Interval(ExtendedMonzo.fromCents(generator, 0), 'cents'),
-      new Interval(ExtendedMonzo.fromCents(period, 0), 'cents'),
-      sizes[3],
-      0,
-      numPeriods
-    )
-
-    expect(scale.size).toBe(7)
-
-    const fifth = scale.getMonzo(4)
-    const octave = scale.getMonzo(7)
-
-    expect(fifth.toCents()).toBeCloseTo(696.239)
-    expect(octave.toCents()).toBeCloseTo(1200.0)
+    expect(generator).toBeCloseTo(696.239)
+    expect(period).toBeCloseTo(1200)
+    expect(numPeriods).toBe(1)
   })
 
   it('generates frostburn from a comma', () => {
diff --git a/src/__tests__/url-encode.spec.ts b/src/__tests__/url-encode.spec.ts
index 9ab0498f..22272ddd 100644
--- a/src/__tests__/url-encode.spec.ts
+++ b/src/__tests__/url-encode.spec.ts
@@ -18,7 +18,7 @@ import {
   DecodedState
 } from '../url-encode'
 import { DEFAULT_NUMBER_OF_COMPONENTS } from '../constants'
-import { IntervalOptions, parseLine } from 'scale-workshop-core'
+import { parseScaleWorkshop2Line } from 'sonic-weave'
 
 describe('URL encoder', () => {
   it('can encode all line types', () => {
@@ -401,14 +401,10 @@ describe('Decoding of scales found in the wild', () => {
   it.each(COMMUNITY_SCALES)('Decodes %s', (name, checksum, encoded) => {
     const url = new URL('https://scaleworkshop.plainsound.org/' + encoded)
     const decoded = decodeQuery(url.searchParams)
-    const options: IntervalOptions = {
-      centsFractionDigits: 3,
-      decimalFractionDigits: 5
-    }
     const intervals = decoded.scaleLines.map((line) =>
-      parseLine(line, DEFAULT_NUMBER_OF_COMPONENTS, options)
+      parseScaleWorkshop2Line(line, DEFAULT_NUMBER_OF_COMPONENTS)
     )
-    const centsSum = intervals.reduce((total, interval) => total + interval.totalCents(), 0)
+    const centsSum = intervals.reduce((total, interval) => total + interval.value.totalCents(), 0)
     expect(decoded.scaleName).toBe(name)
     expect(checksum).toBeCloseTo(centsSum)
   })
diff --git a/src/__tests__/util.spec.ts b/src/__tests__/util.spec.ts
index e21f50dd..0cd95b97 100644
--- a/src/__tests__/util.spec.ts
+++ b/src/__tests__/util.spec.ts
@@ -1,13 +1,6 @@
 import { describe, it, expect } from 'vitest'
 
-import {
-  autoKeyColors,
-  formatExponential,
-  formatHertz,
-  gapKeyColors,
-  parseChordInput
-} from '../utils'
-import { DEFAULT_NUMBER_OF_COMPONENTS } from '../constants'
+import { autoKeyColors, formatExponential, formatHertz, gapKeyColors } from '../utils'
 
 function naiveExponential(x: number, fractionDigits = 3) {
   if (Math.abs(x) < 10000) {
@@ -99,23 +92,3 @@ describe('Gap key color algorithm', () => {
     )
   })
 })
-
-describe('Chord input parser', () => {
-  it('parses many types of intervals with many separators supported', () => {
-    const text = '3:2400.&11/3|1\\5;[-1,1> [0 0 1>-4/1'
-    const intervals = parseChordInput(text)
-    expect(intervals[0].monzo.vector.length).toBe(DEFAULT_NUMBER_OF_COMPONENTS)
-    expect(intervals[0].type).toBe('ratio')
-    expect(intervals[1].type).toBe('cents')
-    expect(intervals[2].type).toBe('ratio')
-    expect(intervals[3].type).toBe('equal temperament')
-    expect(intervals[4].type).toBe('monzo')
-
-    expect(intervals[0].totalCents()).toBeCloseTo(1901.955)
-    expect(intervals[1].totalCents()).toBeCloseTo(2400)
-    expect(intervals[2].totalCents()).toBeCloseTo(2249.36)
-    expect(intervals[3].totalCents()).toBeCloseTo(240)
-    expect(intervals[4].totalCents()).toBeCloseTo(701.955)
-    expect(intervals[5].totalCents()).toBeCloseTo(386.31)
-  })
-})
diff --git a/src/analysis.ts b/src/analysis.ts
index ef1ebcdf..5578f6c2 100644
--- a/src/analysis.ts
+++ b/src/analysis.ts
@@ -1,4 +1,5 @@
-import type { Scale } from 'scale-workshop-core'
+import { Interval, TimeMonzo } from 'sonic-weave'
+import { circleDistance, mmod, valueToCents } from 'xen-dev-utils'
 
 const EPSILON = 1e-6
 
@@ -100,13 +101,343 @@ export function utonalFundamental(frequencies: number[], maxDivisor = 23) {
   return divisor * frequencies[0]
 }
 
+/**
+ * Calculate the maximum deviation of a set of pitches from an equal grid in pitch-space.
+ * @param pitches Array of pitches measured in cents.
+ * @param gridCents The distance in cents between two grid lines of the equal division e.g. `100.0`.
+ * @returns The maximum distance in cents from a grid "line" in the set.
+ */
+export function misalignment(pitches: number[], gridCents: number) {
+  const gridPitches = pitches.map((pitch) => Math.round(pitch / gridCents) * gridCents)
+  let error = 0
+  for (let i = 0; i < pitches.length; ++i) {
+    error = Math.max(error, Math.abs(pitches[i] - gridPitches[i]))
+  }
+  return error
+}
+
+/**
+ * Align a set of pitches on an equal division of pitch-space such that the maximum absolute error is minimized.
+ * @param pitches An array of pitches measured in cents.
+ * @param gridCents The distance in cents between two grid lines of the equal division e.g. `100.0`.
+ * @returns The minimum misalignment achievable measured in cents and the pitches snapped to the grid.
+ */
+export function alignCents(pitches: number[], gridCents: number) {
+  // The error function we're trying to optimize is piecewise linear.
+
+  if (!pitches.length) {
+    return {
+      error: 0,
+      degrees: []
+    }
+  }
+
+  // Find the segment where the global optimum lies.
+  let optimalPitches: number[]
+  let minError = Infinity
+  for (let i = 0; i < pitches.length; ++i) {
+    const aligned = pitches.map((pitch) => pitch - pitches[i])
+    const error = misalignment(aligned, gridCents)
+    if (error < minError) {
+      optimalPitches = aligned
+      minError = error
+    }
+  }
+
+  // Calculate the shape of the segment.
+  const degrees = optimalPitches!.map((pitch) => Math.round(pitch / gridCents))
+  let minOffset = Infinity
+  let maxOffset = -Infinity
+  let root = Infinity
+  for (let i = 0; i < degrees.length; ++i) {
+    const offset = optimalPitches![i] - degrees[i] * gridCents
+    minOffset = Math.min(minOffset, offset)
+    maxOffset = Math.max(maxOffset, offset)
+    if (degrees[i] < root) {
+      root = degrees[i]
+    }
+  }
+
+  // Calculate minimum achievable absolute error.
+  const error = 0.5 * Math.abs(minOffset) + 0.5 * Math.abs(maxOffset)
+  // Move root to grid origin.
+  for (let i = 0; i < degrees.length; ++i) {
+    degrees[i] -= root
+  }
+  return {
+    error,
+    degrees
+  }
+}
+
+/**
+ * Align a set of ratios in frequency-space on an equal division of pitch-space such that the maximum absolute error is minimized.
+ * @param ratios An array of frequency ratios.
+ * @param gridCents The distance in cents between two grid lines of the equal division e.g. `100.0`.
+ * @returns The minimum misalignment achievable measured in cents and the pitches snapped to the grid.
+ */
+export function alignValues(ratios: number[], gridCents: number) {
+  return alignCents(ratios.map(valueToCents), gridCents)
+}
+
+/**
+ * Find an equally tempered chord that best approximates the given frequencies with the root of the chord fixed to a grid line.
+ * @param frequencies Array of frequencies in the chord with the root first.
+ * @param maxDivisions Maximum divisions of the equave.
+ * @param equaveCents The size of the equave measured in cents.
+ * @returns The minimum achievable error. The number of divisions of the given equave. The degrees of the chord.
+ */
+export function rootedEquallyTemperedChord(
+  frequencies: number[],
+  maxDivisions: number,
+  equaveCents = 1200
+) {
+  const root = valueToCents(Math.abs(frequencies[0]))
+  const pitches = frequencies.map((f) => valueToCents(Math.abs(f)) - root)
+  let bestError = Infinity
+  let bestDivisions = maxDivisions
+  for (let divisions = 1; divisions <= maxDivisions; ++divisions) {
+    const error = misalignment(pitches, equaveCents / divisions)
+    if (error + EPSILON < bestError) {
+      bestError = error
+      bestDivisions = divisions
+    }
+  }
+  const gridCents = equaveCents / bestDivisions
+  const degrees = pitches.map((pitch) => Math.round(pitch / gridCents))
+  return {
+    error: bestError,
+    divisions: bestDivisions,
+    degrees
+  }
+}
+
+/**
+ * Find an equally tempered chord that best approximates the given frequencies with the root free to move.
+ * @param frequencies Array of frequencies in the chord with the root first.
+ * @param maxDivisions Maximum divisions of the equave.
+ * @param equaveCents The size of the equave measured in cents.
+ * @returns The minimum achievable error. The number of divisions of the given equave. The degrees of the chord.
+ */
+export function freeEquallyTemperedChord(
+  frequencies: number[],
+  maxDivisions: number,
+  equaveCents = 1200
+) {
+  const root = valueToCents(Math.abs(frequencies[0]))
+  const pitches = frequencies.map((f) => valueToCents(Math.abs(f)) - root)
+  let bestError = Infinity
+  let bestDivisions = maxDivisions
+  let bestDegrees: number[] = []
+  for (let divisions = 1; divisions <= maxDivisions; ++divisions) {
+    const { error, degrees } = alignCents(pitches, equaveCents / divisions)
+    if (error + EPSILON < bestError) {
+      bestError = error
+      bestDivisions = divisions
+      bestDegrees = degrees
+    }
+  }
+  return {
+    error: bestError,
+    divisions: bestDivisions,
+    degrees: bestDegrees
+  }
+}
+
+export type Shell = {
+  harmonics: number[]
+  degrees: number[]
+}
+
+/**
+ * Fast variant of sonic-weave's vertically aligned object returning an array of harmonics.
+ */
+export function vao(
+  denominator: number,
+  maxNumerator: number,
+  divisions: number,
+  tolerance: number,
+  equaveCents: number
+) {
+  const gridCents = equaveCents / divisions
+  const witnesses: number[] = []
+  const denominatorCents = valueToCents(denominator)
+  const harmonics = []
+  const degrees = []
+  search: for (let numerator = denominator; numerator < maxNumerator; ++numerator) {
+    const cents = valueToCents(numerator) - denominatorCents
+    const degree = Math.round(cents / gridCents)
+    if (Math.abs(cents - degree * gridCents) > tolerance) {
+      continue
+    }
+    for (const existing of witnesses) {
+      if (circleDistance(cents, existing, equaveCents) < EPSILON) {
+        continue search
+      }
+    }
+    witnesses.push(cents)
+    harmonics.push(numerator)
+    degrees.push(degree)
+  }
+  return {
+    harmonics,
+    degrees
+  }
+}
+
+function subsetOf(a: number[], b: number[]) {
+  for (const value of a) {
+    if (!b.includes(value)) {
+      return false
+    }
+  }
+  return true
+}
+
+/**
+ * Vertically aligned objects that are free to offset the root to stay withing the given tolerance.
+ */
+export function freeVAOs(
+  denominator: number,
+  maxNumerator: number,
+  divisions: number,
+  tolerance: number,
+  equaveCents: number,
+  minSize = 5,
+  maxShells = 20,
+  gas = 10000
+): Shell[] {
+  const gridCents = equaveCents / divisions
+
+  // Generate the largest possible object.
+  const superShell = vao(denominator, maxNumerator, divisions, 2 * tolerance, equaveCents).harmonics
+
+  const root = superShell.shift()!
+  const result: Shell[] = []
+  function accumulate(harmonics: number[], remaining: number[], degrees: number[]) {
+    if (harmonics.length + remaining.length < minSize) {
+      return
+    }
+    if (result.length >= maxShells) {
+      return
+    }
+    let grew = false
+    while (remaining.length) {
+      if (gas-- < 0) {
+        return
+      }
+      const candidate = [...harmonics]
+      candidate.push(remaining.pop()!)
+      const { error, degrees } = alignValues(candidate, gridCents)
+      if (error <= tolerance) {
+        grew = true
+        accumulate(candidate, [...remaining], degrees)
+      }
+    }
+    if (!grew) {
+      for (const existing of result) {
+        if (subsetOf(harmonics, existing.harmonics)) {
+          return
+        }
+      }
+      result.push({
+        harmonics,
+        degrees
+      })
+    }
+  }
+  superShell.reverse()
+  accumulate([root], superShell, [0])
+  result.sort((a, b) => b.harmonics.length - a.harmonics.length)
+
+  if (!result.length) {
+    // Out of gas or something. Bail out.
+    return [vao(denominator, maxNumerator, divisions, tolerance, equaveCents)]
+  }
+
+  return result
+}
+
 // Interval matrix a.k.a the modes of a scale
-export function intervalMatrix(scale: Scale) {
-  const result = []
-  const columns = [...Array(scale.size + 1).keys()]
-  for (let i = 0; i < scale.size; ++i) {
-    const mode = scale.rotate(i)
-    result.push(columns.map((j) => mode.getInterval(j)))
+export function intervalMatrix(intervals: Interval[]) {
+  intervals = intervals.map((i) => i.shallowClone())
+  // Simplify by removing formatting.
+  for (let i = 0; i < intervals.length; ++i) {
+    intervals[i].node = undefined
+    intervals[i].color = undefined
+    intervals[i].label = ''
+  }
+  const equave = intervals[intervals.length - 1]
+  const unison = new Interval(equave.value.div(equave.value), equave.domain)
+  const result = [[unison, ...intervals]]
+  for (let i = 0; i < intervals.length - 1; ++i) {
+    const root = intervals[i].value
+    const row = []
+    for (let j = 0; j < intervals.length; ++j) {
+      let value = intervals[j].value.div(root)
+      if (j < i) {
+        value = value.mul(equave.value)
+      }
+      row[mmod(j - i, intervals.length)] = new Interval(value, intervals[j].domain)
+    }
+    row.push(equave)
+    result.push(row)
   }
   return result
 }
+
+export function constantStructureViolations(matrix: Interval[][]) {
+  const result: boolean[][] = []
+  for (let i = 0; i < matrix.length; ++i) {
+    result.push(Array(matrix[i].length).fill(false))
+  }
+  for (let i = 0; i < matrix[0].length; ++i) {
+    for (let j = 0; j < matrix.length; ++j) {
+      if (result[j][i]) {
+        continue
+      }
+      const value = matrix[j][i].value
+      for (let k = i + 1; k < matrix[0].length; ++k) {
+        for (let l = 0; l < matrix.length; ++l) {
+          if (matrix[l][k].value.strictEquals(value)) {
+            result[j][i] = true
+            result[l][k] = true
+          }
+        }
+      }
+    }
+  }
+  return result
+}
+
+export function varietySignature(matrix: Interval[][]) {
+  const result: number[] = []
+  if (!matrix.length) {
+    return result
+  }
+  for (let i = 0; i < matrix[0].length; ++i) {
+    const variants: TimeMonzo[] = [matrix[0][i].value]
+    search: for (let j = 1; j < matrix.length; ++j) {
+      const monzo = matrix[j][i].value
+      for (const variant of variants) {
+        if (variant.strictEquals(monzo)) {
+          continue search
+        }
+      }
+      variants.push(monzo)
+    }
+    result.push(variants.length)
+  }
+  return result
+}
+
+export function brightnessSignature(matrix: Interval[][]) {
+  const totals = matrix.map((row) => row.reduce((prev, cur) => prev + cur.totalCents(), 0))
+  const minimum = Math.min(...totals)
+  const maximum = Math.max(...totals)
+  if (minimum === maximum) {
+    return Array(matrix.length).fill(1)
+  }
+  const normalizer = 1 / (maximum - minimum)
+  return totals.map((t) => (t - minimum) * normalizer)
+}
diff --git a/src/assets/base.css b/src/assets/base.css
index 76bccf7b..9d782b9c 100644
--- a/src/assets/base.css
+++ b/src/assets/base.css
@@ -1,5 +1,5 @@
 :root {
-  --color-background: #fff;
+  --color-background: #fefdfe;
   --color-background-soft: #eee;
   --color-background-mute: #ddd;
   --color-background-invalid: #fee;
@@ -9,19 +9,20 @@
   --color-border-hover: #eee;
   --color-drop-shadow: rgba(0, 0, 0, 0.5);
 
-  --color-heading: #000;
+  --color-heading: #080008;
   --color-text: #000;
   --color-text-mute: #777;
 
-  --color-accent: #008080;
+  --color-accent: #803080;
   --color-accent-text: #fff;
-  --color-accent-text-btn: #008080;
-  --color-accent-mute: #6bb;
-  --color-accent-deeper: #006060;
-  --color-accent-background: #f5ffff;
+  --color-accent-text-btn: #803080;
+  --color-accent-mute: #b7b;
+  --color-accent-deeper: #603060;
+  --color-accent-background: #fffeff;
   --color-accent-dimmed: rgba(0, 20, 20, 0.7);
 
   --color-error: red;
+  --color-indicator: #c35;
 
   /* Mimic Bootstrap alert with 'danger' variant */
   --color-alert-danger: rgba(104, 35, 39, 1);
@@ -35,7 +36,7 @@
 
 /* Dark theme */
 [data-theme='dark'] {
-  --color-background: #000;
+  --color-background: #060206;
   --color-background-soft: #333;
   --color-background-mute: #222;
   --color-background-invalid: #300;
@@ -43,21 +44,22 @@
 
   --color-border: #666;
   --color-border-hover: #111;
-  --color-drop-shadow: rgba(100, 200, 200, 0.5);
+  --color-drop-shadow: rgba(200, 100, 200, 0.5);
 
-  --color-heading: #fff;
+  --color-heading: #fff8ff;
   --color-text: #fff;
   --color-text-mute: #555;
 
-  --color-accent: #008080;
+  --color-accent: #803080;
   --color-accent-text: #fff;
-  --color-accent-text-btn: #0cc;
-  --color-accent-mute: #366;
-  --color-accent-deeper: #006060;
+  --color-accent-text-btn: #a3a;
+  --color-accent-mute: #646;
+  --color-accent-deeper: #602060;
   --color-accent-background: #011;
   --color-accent-dimmed: rgba(0, 20, 20, 0.7);
 
   --color-error: red;
+  --color-indicator: #b25;
 }
 
 *,
@@ -79,253 +81,31 @@ body {
     color 0.5s,
     background-color 0.5s;
   line-height: 2;
-  font-family: sans-serif;
+  font-family:
+    Inter,
+    -apple-system,
+    BlinkMacSystemFont,
+    'Segoe UI',
+    Roboto,
+    Oxygen,
+    Ubuntu,
+    Cantarell,
+    'Fira Sans',
+    'Droid Sans',
+    'Helvetica Neue',
+    sans-serif;
   font-size: var(--base-font-size);
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
-/* Text */
-h2 {
-  border-bottom: 1px solid var(--color-border);
-  font-size: 1.1em;
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   font-weight: bold;
-  width: 100%;
-  margin-bottom: 1rem;
-}
-p {
-  line-height: var(--base-line-height);
-}
-a {
-  color: var(--color-accent);
-  transition: 0.3s;
-}
-strong {
-  font-weight: bold;
-}
-button {
-  font-size: var(--base-font-size);
-  line-height: var(--base-line-height);
-}
-.error {
-  color: var(--color-error);
-}
-code {
-  display: inline-block;
-  background-color: var(--color-background-soft);
-  padding: 0 0.3rem;
-  border-radius: 5px;
-  border-right: 1px solid var(--color-border);
-  border-bottom: 1px solid var(--color-border);
-}
-
-/* UI elements */
-input[type='text'],
-input[type='number'],
-textarea,
-select {
-  padding: 0.4rem;
-  background-color: var(--color-background-soft);
-  color: var(--color-text);
-  border: 1px solid var(--color-border);
-  border-radius: 3px;
-  width: 6rem;
-}
-optgroup {
-  font-weight: bold;
-}
-input:invalid,
-textarea:invalid,
-select:invalid {
-  background-color: var(--color-background-invalid);
-}
-select:invalid {
-  background-color: var(--color-background-invalid);
-}
-
-/* UI elements - button, button group */
-.btn-group {
-  display: flex;
-  flex-flow: row wrap;
-  gap: 0.25rem;
-}
-button,
-.btn {
-  cursor: pointer;
-  display: inline-block;
-  border-radius: 3px;
-  border: var(--color-accent-text-btn) 1px solid;
-  background-color: var(--color-accent-background);
-  padding: 0.25rem 0.5rem;
-  text-decoration: none;
-  color: var(--color-accent-text-btn);
-}
-button:hover,
-.btn:hover {
-  color: white;
-  background-color: var(--color-accent);
-  border-color: var(--color-accent);
-}
-button:disabled {
-  cursor: not-allowed;
-  color: var(--color-accent-mute);
-}
-button:disabled:hover {
-  color: var(--color-accent-mute);
-  background-color: var(--color-accent-background);
-}
-input:disabled {
-  color: var(--color-accent-mute);
-  background-color: var(--color-background-mute);
-}
-ul.btn-group,
-.btn-dropdown-group ul {
-  list-style: none;
-  padding-left: unset;
-}
-.btn-dropdown-group ul {
-  display: none;
-  position: absolute;
-  width: 16rem;
-  margin-top: -1px;
-  z-index: 10;
-  background-color: var(--color-accent-background);
-  border: 1px solid var(--color-accent-text-btn);
-}
-.btn-dropdown-group li {
-  padding: 0rem 0.5rem;
-}
-.btn-dropdown-group li.divider {
-  border-bottom: 1px solid var(--color-accent-text-btn);
-}
-
-.btn-dropdown-group:hover ul,
-.btn-dropdown-group:focus-within ul {
-  display: block;
-}
-.btn-dropdown-group ul a {
-  color: var(--color-accent-text-btn);
-}
-.btn-dropdown-group a {
-  text-decoration: none;
-}
-.btn-dropdown-group a:hover li {
-  color: white;
-  background-color: var(--color-accent);
-}
-ul.btn-group,
-.btn-dropdown-group ul {
-  list-style: none;
-  padding-left: unset;
-}
-
-/* UI elements - control, control group */
-.control-group {
-  display: flex;
-  flex-direction: column;
-  margin: 1.5rem 0rem;
-  gap: 0.5rem;
-  justify-content: space-between;
-}
-.control {
-  display: flex;
-  flex-flow: row wrap;
-  align-items: stretch;
-  gap: 0.15rem;
-}
-.control-group h2 {
-  margin-bottom: unset;
-}
-.control-group label {
-  width: 100%;
-  font-weight: bold;
-}
-.control input[type='text'],
-.control input[type='number'],
-.control textarea,
-.control select {
-  flex-grow: 1;
-}
-.control input.half {
-  flex-grow: 0.25 !important;
-}
-.control.checkbox-container {
-  flex-flow: unset;
-}
-.control.checkbox-container label {
-  font-weight: normal;
-}
-.control.radio-group {
-  gap: 0.15rem 1rem;
-}
-.control.radio-group span label {
-  font-weight: unset;
-}
-
-/* Responding to screen size */
-@media (max-width: 991px) {
-  .hidden-sm {
-    display: none !important;
-  }
-}
-
-/* UI element - expandable section */
-.section::after {
-  content: ' ▼';
-  font-size: 0.5rem;
-  color: var(--color-accent-text-btn);
-  background-color: var(--color-accent-background);
-  border: var(--color-accent-text-btn) 1px solid;
-  border-radius: 3px;
-  padding: 0.25rem 0.3rem;
-  vertical-align: middle;
-}
-.section.open::after {
-  content: ' ▲';
-}
-.section:hover::after {
-  color: var(--color-accent-text);
-  background-color: var(--color-accent);
-  border-color: var(--color-accent);
-}
-p.section {
-  font-weight: bold;
-  cursor: pointer;
-}
-
-/* UI element - question mark with tooltip on hover */
-span.info-question {
-  background: var(--color-background);
-  color: var(--color-text);
-  border-color: var(--color-text);
-  border-radius: 50%;
-  border-width: 2px;
-  border-style: solid;
-  padding-left: 4px;
-  padding-right: 4px;
-  font-size: smaller;
-
-  transition: 0.3s ease;
-}
-span.info-question::after {
-  content: '?';
-}
-span.info-question:hover {
-  background: var(--color-text);
-  color: var(--color-background);
-  transition: all 0.3s ease;
-}
-
-/* Padded box for displaying UI feedback message */
-div.alert-box-danger {
-  background: var(--color-alert-danger-background);
-  border-width: 1px;
-  border-radius: 1%;
-  border-style: solid;
-  border-color: var(--color-alert-danger-border);
-  padding: 8px;
-}
-p.alert-message-danger {
-  color: var(--color-alert-danger);
+  color: var(--color-heading);
 }
diff --git a/src/assets/img/spoob.png b/src/assets/img/spoob.png
new file mode 100644
index 0000000000000000000000000000000000000000..7010bf508664dbda20790b16bcaa78cf8c4bc714
GIT binary patch
literal 26901
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

literal 0
HcmV?d00001

diff --git a/src/assets/logo.svg b/src/assets/logo.svg
index 592b8a21..d743149c 100644
--- a/src/assets/logo.svg
+++ b/src/assets/logo.svg
@@ -55,7 +55,7 @@
      id="layer1"
      transform="translate(0,-161.53332)">
     <path
-       style="fill:#008080;fill-opacity:1;stroke:none;stroke-width:22.92934418;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="fill:#803080;fill-opacity:1;stroke:#801080;stroke-width:22.92934418;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 0,161.53333 H 135.46666 V 296.99998 H 0 Z"
        id="rect873" />
     <g
diff --git a/src/assets/main.css b/src/assets/main.css
new file mode 100644
index 00000000..c80381de
--- /dev/null
+++ b/src/assets/main.css
@@ -0,0 +1,215 @@
+/* Text */
+h2 {
+  border-bottom: 1px solid var(--color-border);
+  font-size: 1.1em;
+  width: 100%;
+  margin-bottom: 1rem;
+}
+p {
+  line-height: var(--base-line-height);
+}
+a {
+  color: var(--color-accent);
+  transition: 0.3s;
+}
+b {
+  font-weight: bold;
+}
+strong {
+  font-weight: bold;
+}
+button {
+  font-size: var(--base-font-size);
+  line-height: var(--base-line-height);
+}
+.error {
+  color: var(--color-error);
+}
+code {
+  display: inline-block;
+  background-color: var(--color-background-soft);
+  padding: 0 0.3rem;
+  border-radius: 5px;
+  border-right: 1px solid var(--color-border);
+  border-bottom: 1px solid var(--color-border);
+}
+
+/* UI elements */
+input[type='text'],
+input[type='number'],
+textarea,
+select {
+  padding: 0.4rem;
+  background-color: var(--color-background-soft);
+  color: var(--color-text);
+  border: 1px solid var(--color-border);
+  border-radius: 3px;
+  width: 6rem;
+  line-height: var(--base-line-height);
+}
+optgroup {
+  font-weight: bold;
+}
+input:invalid,
+textarea:invalid,
+select:invalid {
+  background-color: var(--color-background-invalid);
+}
+select:invalid {
+  background-color: var(--color-background-invalid);
+}
+
+/* UI elements - button, button group */
+.btn-group {
+  display: flex;
+  flex-flow: row wrap;
+  gap: 0.25rem;
+}
+button,
+.btn {
+  cursor: pointer;
+  display: inline-block;
+  border-radius: 3px;
+  border: var(--color-accent-text-btn) 1px solid;
+  background-color: var(--color-accent-background);
+  padding: 0.25rem 0.5rem;
+  text-decoration: none;
+  color: var(--color-accent-text-btn);
+}
+button:hover,
+.btn:hover {
+  color: white;
+  background-color: var(--color-accent);
+  border-color: var(--color-accent);
+}
+.btn.disabled,
+button:disabled {
+  cursor: not-allowed;
+  color: var(--color-accent-mute);
+}
+button:disabled:hover {
+  color: var(--color-accent-mute);
+  background-color: var(--color-accent-background);
+}
+input:disabled {
+  color: var(--color-accent-mute);
+  background-color: var(--color-background-mute);
+}
+ul.btn-group {
+  list-style: none;
+  padding-left: unset;
+}
+ul.btn-group {
+  list-style: none;
+  padding-left: unset;
+}
+
+/* UI elements - control, control group */
+.control-group {
+  display: flex;
+  flex-direction: column;
+  margin: 1.5rem 0rem;
+  gap: 0.5rem;
+  justify-content: space-between;
+}
+.control {
+  display: flex;
+  flex-flow: row wrap;
+  align-items: stretch;
+  gap: 0.15rem;
+}
+.control-group h2 {
+  margin-bottom: unset;
+}
+.control-group label {
+  width: 100%;
+  font-weight: bold;
+}
+.control input[type='text'],
+.control input[type='number'],
+.control textarea,
+.control select {
+  flex-grow: 1;
+}
+.control input.half {
+  flex-grow: 0.25 !important;
+}
+.control.checkbox-container {
+  flex-flow: unset;
+}
+.control.checkbox-container label {
+  font-weight: normal;
+}
+.control.radio-group {
+  gap: 0.15rem 1rem;
+}
+.control.radio-group span label {
+  font-weight: unset;
+}
+
+/* Responding to screen size */
+@media (max-width: 991px) {
+  .hidden-sm {
+    display: none !important;
+  }
+}
+
+/* UI element - expandable section */
+.section::after {
+  content: ' ▼';
+  font-size: 0.5rem;
+  color: var(--color-accent-text-btn);
+  background-color: var(--color-accent-background);
+  border: var(--color-accent-text-btn) 1px solid;
+  border-radius: 3px;
+  padding: 0.25rem 0.3rem;
+  vertical-align: middle;
+}
+.section.open::after {
+  content: ' ▲';
+}
+.section:hover::after {
+  color: var(--color-accent-text);
+  background-color: var(--color-accent);
+  border-color: var(--color-accent);
+}
+p.section {
+  font-weight: bold;
+  cursor: pointer;
+}
+
+/* UI element - question mark with tooltip on hover */
+span.info-question {
+  background: var(--color-background);
+  color: var(--color-text);
+  border-color: var(--color-text);
+  border-radius: 50%;
+  border-width: 2px;
+  border-style: solid;
+  padding-left: 4px;
+  padding-right: 4px;
+  font-size: smaller;
+
+  transition: 0.3s ease;
+}
+span.info-question::after {
+  content: '?';
+}
+span.info-question:hover {
+  background: var(--color-text);
+  color: var(--color-background);
+  transition: all 0.3s ease;
+}
+
+/* Padded box for displaying UI feedback message */
+div.alert-box-danger {
+  background: var(--color-alert-danger-background);
+  border-width: 1px;
+  border-radius: 1%;
+  border-style: solid;
+  border-color: var(--color-alert-danger-border);
+  padding: 8px;
+}
+p.alert-message-danger {
+  color: var(--color-alert-danger);
+}
diff --git a/src/character-palette.json b/src/character-palette.json
new file mode 100644
index 00000000..88aedf42
--- /dev/null
+++ b/src/character-palette.json
@@ -0,0 +1,33 @@
+{
+  "♮": "Natural sign. Signifies no change in pitch. Differentiates between augmented fourth <code>A4</code> and A natural four <code>A♮4</code>.",
+  "♯": "Sharp sign. Raises pitch by <code>2187/2048</code>. E.g. F sharp four is spelled <code>F♯4</code>.",
+  "♭": "Flat sign. Lowers pitch by <code>2187/2048</code>. E.g. B flat four is spelled <code>B♭4</code>.",
+  "𝄪": "Double sharp sign. Raises pitch by <code>4782969/4194304</code>.",
+  "𝄫": "Double flat sign. Lowers pitch by <code>4782969/4194304</code>.",
+  "𝄲": "Quarter sharp sign. Raises pitch by <code>sqrt(2187/2048)</code>.",
+  "‡": "Quarter sharp sign. Raises pitch by <code>sqrt(2187/2048)</code>.",
+  "𝄳": "Quarter flat sign. Lowers pitch by <code>sqrt(2187/2048)</code>.",
+  "½": "Semi-prefix. E.g. G semisharp four <code>G½♯4</code>, semimajor third <code>½M3</code>, neutral sesquith <code>n1½</code>.",
+  "¼": "Quarter-prefix. E.g. E quarter flat four <code>E¼♭4</code>.",
+  "¾": "Sesqui-semi-prefix. E.g. D sesqui semisharp four <code>D¾♯4</code>.",
+  "×": "Times symbol. E.g. <code>4/3 × 4/3</code> is <code>16/9</code>.",
+  "÷": "Division symbol. E.g. <code>9/8 ÷ 81/80</code> is <code>10/9</code>.",
+  "·": "Dot product. E.g. <code>3/2 · 12@</code> is <code>7</code> i.e. a fifth is seven steps of 12-tone equal temperament.",
+  "⊗": "Tensoring symbol. Calculate all products between two arrays. E.g. <code>[9/8, 4/3, 3/2]⊗[1/1, 5/4]</code>.",
+  "⊕": "Reciprocal of the sum of of reciprocals. E.g. <code>2⊕3</code>.",
+  "⊖": "Reciprocal of the difference of reciprocals. E.g. <code>9/8⊖6</code>.",
+  "α": "Interordinal nominal alpha. <code>α4</code> is a semioctave above <code>E4</code>.",
+  "β": "Interordinal nominal beta. <code>β4</code> is a semioctave above <code>F4</code>.",
+  "γ": "Interordinal nominal gamma. <code>γ4</code> is a semioctave below <code>G4</code>.",
+  "δ": "Interordinal nominal delta. <code>δ4</code> is a semioctave below <code>A♮4</code>.",
+  "ε": "Interordinal nominal epsilon. <code>ε4</code> is a semioctave below <code>B4</code>.",
+  "ζ": "Interordinal nominal zeta. <code>ζ4</code> is a semioctave above <code>C4</code>.",
+  "η": "Interordinal nominal eta. <code>η4</code> is a semioctave above <code>D4</code>.",
+  "φ": "Semiquartal nominal phi. <code>φ4</code> is a semifourth above <code>C4</code>.",
+  "χ": "Semiquartal nominal chi. <code>χ4</code> is a semifourth above <code>D4</code>.",
+  "ψ": "Semiquartal nominal psi. <code>ψ4</code> is a semifourth below <code>C5</code>.",
+  "ω": "Semiquartal nominal omega. <code>ω4</code> is a semifourth below <code>D5</code>.",
+  "¢": "Cent. <code>¢</code> is equal to <code>1\\1200</code>.",
+  "€": "Reciprocal cent. <code>¢ · €</code> is <code>1</code>.",
+  "µ": "Metric prefix micro. E.g. Period of oscillation <code>2000 µs</code> corresponds to frequency of oscillation <code>500 Hz</code>."
+}
diff --git a/src/components/ChordWheel.vue b/src/components/ChordWheel.vue
index 2671ce99..95b21072 100644
--- a/src/components/ChordWheel.vue
+++ b/src/components/ChordWheel.vue
@@ -157,7 +157,7 @@ function draw(time: DOMHighResTimeStamp) {
   if (props.type === 'otonal') {
     text = chord.join(':')
   } else {
-    text = '1/(' + chord.join(':') + ')'
+    text = '/' + chord.join(':')
   }
   const textWidth = ctx.measureText(text).width
   if (textWidth * 10 < width * 8) {
diff --git a/src/components/DropdownGroup.vue b/src/components/DropdownGroup.vue
new file mode 100644
index 00000000..7334299c
--- /dev/null
+++ b/src/components/DropdownGroup.vue
@@ -0,0 +1,70 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+
+defineProps<{
+  title: string
+}>()
+defineEmits(['mouseenter'])
+const element = ref<HTMLLIElement | null>(null)
+function blur() {
+  if (!element.value) {
+    return
+  }
+  element.value.blur()
+
+  // XXX: This should recurse to grandchildren
+  for (const child of element.value.children) {
+    if (child instanceof HTMLElement) {
+      child.blur()
+    }
+  }
+}
+defineExpose({ blur })
+</script>
+<template>
+  <li ref="element" class="btn-dropdown-group" @mouseenter="$emit('mouseenter')">
+    <a class="btn" href="#">{{ title }} ▼</a>
+    <slot></slot>
+  </li>
+</template>
+<style>
+.btn-dropdown-group ul {
+  list-style: none;
+  padding-left: unset;
+}
+.btn-dropdown-group ul {
+  display: none;
+  position: absolute;
+  width: 16rem;
+  margin-top: -1px;
+  z-index: 10;
+  background-color: var(--color-accent-background);
+  border: 1px solid var(--color-accent-text-btn);
+}
+.btn-dropdown-group li {
+  padding: 0rem 0.5rem;
+}
+.btn-dropdown-group li.divider {
+  border-bottom: 1px solid var(--color-accent-text-btn);
+}
+
+.btn-dropdown-group.active ul,
+.btn-dropdown-group:hover ul,
+.btn-dropdown-group:focus-within ul {
+  display: block;
+}
+.btn-dropdown-group ul a {
+  color: var(--color-accent-text-btn);
+}
+.btn-dropdown-group a {
+  text-decoration: none;
+}
+.btn-dropdown-group a:hover li {
+  color: white;
+  background-color: var(--color-accent);
+}
+.btn-dropdown-group ul {
+  list-style: none;
+  padding-left: unset;
+}
+</style>
diff --git a/src/components/ExporterButtons.vue b/src/components/ExporterButtons.vue
new file mode 100644
index 00000000..58868255
--- /dev/null
+++ b/src/components/ExporterButtons.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts">
+import { APP_TITLE } from '@/constants'
+import { exportFile, type ExporterKey } from '@/exporters'
+import type { ExporterParams } from '@/exporters/base'
+import { useScaleStore } from '@/stores/scale'
+import { useStateStore } from '@/stores/state'
+import { sanitizeFilename } from '@/utils'
+import { defineAsyncComponent, ref } from 'vue'
+
+const KorgExportModal = defineAsyncComponent(
+  () => import('@/components/modals/export/KorgExport.vue')
+)
+const MtsSysexExportModal = defineAsyncComponent(
+  () => import('@/components/modals/export/MtsSysexExport.vue')
+)
+const ReaperExportModal = defineAsyncComponent(
+  () => import('@/components/modals/export/ReaperExport.vue')
+)
+
+const state = useStateStore()
+const scale = useScaleStore()
+
+const exportTextClipboard = ref('[URL sharing disabled]')
+const showKorgExportModal = ref(false)
+const showMtsSysexExportModal = ref(false)
+const showReaperExportModal = ref(false)
+
+function copyToClipboard() {
+  exportTextClipboard.value = 'No!'
+  window.setTimeout(() => {
+    exportTextClipboard.value = '[URL sharing disabled]'
+  }, 5000)
+  /*
+  window.navigator.clipboard.writeText(window.location.href)
+  exportTextClipboard.value = '[Copied URL to clipboard]'
+  window.setTimeout(() => {
+    exportTextClipboard.value = "Copy this scale's unique URL to clipboard"
+  }, 5000)
+  */
+}
+
+function doExport(exporter: ExporterKey) {
+  const params: ExporterParams = {
+    newline: state.newline,
+    name: scale.name,
+    scaleUrl: window.location.href,
+    filename: sanitizeFilename(scale.name),
+    relativeIntervals: scale.relativeIntervals,
+    baseFrequency: scale.baseFrequency,
+    baseMidiNote: scale.baseMidiNote,
+    scale: scale.scale,
+    labels: scale.labels,
+    midiOctaveOffset: -1,
+    description: scale.name,
+    sourceText: scale.sourceText,
+    appTitle: APP_TITLE,
+    date: new Date()
+  }
+
+  exportFile(exporter, params)
+}
+</script>
+<template>
+  <Teleport to="body">
+    <KorgExportModal
+      v-if="showKorgExportModal"
+      @confirm="showKorgExportModal = false"
+      @cancel="showKorgExportModal = false"
+      :newline="state.newline"
+      :scaleName="scale.name"
+      :baseMidiNote="scale.baseMidiNote"
+      :baseFrequency="scale.baseFrequency"
+      :relativeIntervals="scale.relativeIntervals"
+      :midiOctaveOffset="-1"
+      :scale="scale.scale"
+      :labels="scale.labels"
+    />
+
+    <MtsSysexExportModal
+      v-if="showMtsSysexExportModal"
+      @confirm="showMtsSysexExportModal = false"
+      @cancel="showMtsSysexExportModal = false"
+      :newline="state.newline"
+      :scaleName="scale.name"
+      :baseMidiNote="scale.baseMidiNote"
+      :baseFrequency="scale.baseFrequency"
+      :relativeIntervals="scale.relativeIntervals"
+      :midiOctaveOffset="-1"
+      :scale="scale.scale"
+      :labels="scale.labels"
+    />
+
+    <ReaperExportModal
+      v-if="showReaperExportModal"
+      @confirm="showReaperExportModal = false"
+      @cancel="showReaperExportModal = false"
+      :newline="state.newline"
+      :scaleName="scale.name"
+      :baseMidiNote="scale.baseMidiNote"
+      :baseFrequency="scale.baseFrequency"
+      :relativeIntervals="scale.relativeIntervals"
+      :midiOctaveOffset="-1"
+      :scale="scale.scale"
+      :labels="scale.labels"
+    />
+  </Teleport>
+  <h2>Export current settings</h2>
+  <a href="#" class="btn disabled" @click="copyToClipboard">
+    <p><strong>Share scale</strong></p>
+    <p>{{ exportTextClipboard }}</p>
+  </a>
+  <a href="#" class="btn" @click="doExport('anamarkv1')">
+    <p><strong>AnaMark v1 tuning (.tun)</strong></p>
+    <p>Tuning file for various synths</p>
+  </a>
+  <a href="#" class="btn" @click="doExport('anamarkv2')">
+    <p><strong>AnaMark v2 tuning (.tun)</strong></p>
+    <p>Tuning file for various synths</p>
+  </a>
+  <a href="#" class="btn" @click="doExport('scalascl')">
+    <p><strong>Scala scale (.scl)</strong></p>
+    <p>
+      Scale file for various synths.<br />If you use this file without an accompanying .kbm file,
+      most synths will assume your scale starts on C ~261Hz
+    </p>
+  </a>
+  <a href="#" class="btn" @click="doExport('scalakbm')">
+    <p><strong>Scala keyboard mapping (.kbm)</strong></p>
+    <p>Maps an accompanying .scl file to start on a specific MIDI note and frequency</p>
+  </a>
+  <a href="#" class="btn" @click="doExport('ableton')">
+    <p><strong>Ableton scale (.ascl)</strong></p>
+    <p>Scale file for Ableton Live 12</p>
+  </a>
+  <a href="#" class="btn" @click="doExport('maxmsp')">
+    <p><strong>Max/MSP coll tuning (.txt)</strong></p>
+    <p>List of frequencies (Hz) in a text file to load into a Max/MSP coll object</p>
+  </a>
+  <a href="#" class="btn" @click="doExport('puredata')">
+    <p><strong>PureData text tuning (.txt)</strong></p>
+    <p>List of frequencies (Hz) in a text file to load into a PureData text object</p>
+  </a>
+  <a href="#" class="btn" @click="doExport('kontakt')">
+    <p><strong>Kontakt tuning script (.txt)</strong></p>
+    <p>
+      Tuning script for Native Instruments Kontakt. Some instrument libraries allow this custom
+      script
+    </p>
+  </a>
+  <a href="#" class="btn" @click="doExport('soniccouture')">
+    <p><strong>Soniccouture tuning file (.nka)</strong></p>
+    <p>For Soniccouture sample libraries</p>
+  </a>
+  <a href="#" class="btn" @click="doExport('harmor')">
+    <p><strong>Harmor pitch map (.fnv)</strong></p>
+    <p>Envelope state file for the pitch envelope in Image-Line Harmor</p>
+  </a>
+  <a href="#" class="btn" @click="doExport('sytrus')">
+    <p><strong>Sytrus pitch map (.fnv)</strong></p>
+    <p>Envelope state file for the pitch envelope in Image-Line Sytrus</p>
+  </a>
+  <a href="#" class="btn" @click="showKorgExportModal = true">
+    <p><strong>Korg Sound Librarian scale (.mnlgtuns + others)</strong></p>
+    <p>Tuning formats for use with Monologue, Minilogue, Minilogue XD, and Prologue synthesizers</p>
+  </a>
+  <a href="#" class="btn" @click="doExport('deflemask')">
+    <p><strong>Deflemask reference (.txt)</strong></p>
+    <p>List of 'fine tune' values for Deflemask</p>
+  </a>
+  <a href="#" class="btn" @click="showReaperExportModal = true">
+    <p><strong>Reaper note name map (.txt)</strong></p>
+    <p>Displays custom note names on Reaper's piano roll</p>
+  </a>
+  <a href="#" class="btn" @click="showMtsSysexExportModal = true">
+    <p><strong>MTS Sysex Bulk Tuning Dump (.syx)</strong></p>
+    <p>Binary data of a Bulk Tuning Dump SysEx message</p>
+  </a>
+  <h3>Documentation</h3>
+  <p>
+    You can read about the new syntax
+    <a
+      href="https://github.com/xenharmonic-devs/sonic-weave?tab=readme-ov-file#sonic-weave"
+      target="_blank"
+      >here</a
+    >.
+  </p>
+  <p>
+    Remember to check out the
+    <a href="https://github.com/xenharmonic-devs/sonic-weave/tree/main/examples" target="_blank"
+      >examples</a
+    >
+    too.
+  </p>
+</template>
+
+<style scoped>
+.btn {
+  width: 100%;
+  display: block;
+  margin-bottom: 1rem;
+  margin-left: 0;
+}
+</style>
diff --git a/src/components/GridLattice.vue b/src/components/GridLattice.vue
new file mode 100644
index 00000000..30ec36e9
--- /dev/null
+++ b/src/components/GridLattice.vue
@@ -0,0 +1,155 @@
+<script setup lang="ts">
+import { useGridStore } from '@/stores/grid'
+import { debounce } from '@/utils'
+import { spanGrid } from 'ji-lattice'
+import { type Interval } from 'sonic-weave'
+import { computed, ref, watch } from 'vue'
+
+const store = useGridStore()
+
+const props = defineProps<{
+  relativeIntervals: Interval[]
+  labels: string[]
+  colors: string[]
+  heldNotes: Set<number>
+}>()
+
+const svgElement = ref<SVGSVGElement | null>(null)
+
+const steps = computed(() => {
+  const result: number[] = []
+  for (const interval of props.relativeIntervals) {
+    result.push(interval.dot(store.val).valueOf())
+  }
+  return result
+})
+
+// Multi-label offsets
+function lx(n: number, num: number) {
+  if (num < 3) {
+    return 0
+  }
+  if (num & 1) {
+    // Odd counts exploit a different starting angle.
+    return store.labelOffset * store.size * Math.cos((2 * Math.PI * n) / num)
+  }
+  // Text tends to extend horizontally so we draw an ellipse.
+  return 1.5 * store.labelOffset * store.size * Math.sin((2 * Math.PI * n) / num)
+}
+function ly(n: number, num: number) {
+  if (num === 1) {
+    return -store.labelOffset * store.size
+  }
+  if (num & 1) {
+    // Odd counts exploit a different starting angle.
+    return store.labelOffset * store.size * Math.sin((2 * Math.PI * n) / num)
+  }
+  return -store.labelOffset * store.size * Math.cos((2 * Math.PI * n) / num)
+}
+
+const grid = computed(() => {
+  const result = spanGrid(steps.value, store.gridOptions)
+  return result
+})
+
+const gridLines = computed(() => grid.value.edges.filter((e) => e.type === 'gridline'))
+const edges = computed(() => grid.value.edges.filter((e) => e.type !== 'gridline'))
+
+const viewBox = computed(
+  () =>
+    `${store.viewCenterX - store.viewScale} ${store.viewCenterY - store.viewScale} ${store.viewScale * 2} ${store.viewScale * 2}`
+)
+
+function computeGridExtent() {
+  const element = svgElement.value
+  if (!element) {
+    return
+  }
+  const portAspectRatio = element.clientWidth / element.clientHeight
+  // The grid extent is much larger than the view port to reach long custom connecting edges.
+  const s = 2 * store.viewScale
+  if (portAspectRatio >= 1) {
+    store.minY = store.viewCenterY - s
+    store.maxY = store.viewCenterY + s
+    store.minX = store.viewCenterX - portAspectRatio * s
+    store.maxX = store.viewCenterX + portAspectRatio * s
+  } else {
+    store.minY = store.viewCenterY - s / portAspectRatio
+    store.maxY = store.viewCenterY + s / portAspectRatio
+    store.minX = store.viewCenterX - s
+    store.maxX = store.viewCenterX + s
+  }
+}
+
+const computeExtent = debounce(computeGridExtent)
+
+watch(svgElement, (element) => {
+  if (!element) {
+    return
+  }
+  computeGridExtent()
+  const observer = new ResizeObserver(computeExtent)
+  observer.observe(element)
+})
+
+watch(() => store.modulus, computeExtent)
+</script>
+
+<template>
+  <svg
+    ref="svgElement"
+    class="lattice"
+    xmlns="http://www.w3.org/2000/svg"
+    :viewBox="viewBox"
+    preserveAspectRatio="xMidYMid meet"
+  >
+    <line
+      v-for="(e, i) of gridLines"
+      :key="i"
+      v-bind="e"
+      :class="`edge ${e.type}`"
+      :stroke-width="store.size * 0.1"
+    />
+    <line
+      v-for="(e, i) of edges"
+      :key="i"
+      v-bind="e"
+      :class="`edge ${e.type}`"
+      :stroke-width="store.size * 0.2"
+    />
+    <circle
+      v-for="(v, i) of grid.vertices"
+      :key="i"
+      :class="{ node: true, held: v.indices.some((idx) => heldNotes.has(idx)) }"
+      :cx="v.x"
+      :cy="v.y"
+      :r="store.size"
+      :fill="colors[v.indices[0]] ?? 'none'"
+      :stroke="colors[v.indices[0]] ?? 'none'"
+      :stroke-width="store.size * 0.1"
+    />
+    <template v-if="store.showLabels">
+      <template v-for="(v, i) of grid.vertices" :key="i">
+        <text
+          v-for="(idx, j) of v.indices"
+          :key="idx"
+          class="node-label"
+          :x="v.x + lx(j, v.indices.length)"
+          :y="v.y + ly(j, v.indices.length)"
+          :font-size="`${2.5 * store.size}px`"
+          :stroke-width="store.size * 0.05"
+          dominant-baseline="middle"
+        >
+          {{ labels[idx] }}
+        </text>
+      </template>
+    </template>
+  </svg>
+</template>
+
+<style scoped>
+svg {
+  border: dashed 2px var(--color-background-soft);
+  border-radius: 4px;
+}
+</style>
diff --git a/src/components/JustIntonationLattice.vue b/src/components/JustIntonationLattice.vue
new file mode 100644
index 00000000..ea24e7d9
--- /dev/null
+++ b/src/components/JustIntonationLattice.vue
@@ -0,0 +1,201 @@
+<script setup lang="ts">
+import { useJiLatticeStore } from '@/stores/ji-lattice'
+import { spanLattice } from 'ji-lattice'
+import { type Interval } from 'sonic-weave'
+import { computed, nextTick, reactive, ref, watch } from 'vue'
+import { dot } from 'xen-dev-utils'
+
+const store = useJiLatticeStore()
+
+const props = defineProps<{
+  relativeIntervals: Interval[]
+  labels: string[]
+  colors: string[]
+  heldNotes: Set<number>
+}>()
+
+const svgElement = ref<SVGSVGElement | null>(null)
+
+const viewBox = reactive([-1, -1, 2, 2])
+
+const monzos = computed(() => {
+  const numComponents = store.horizontalCoordinates.length
+  const result: number[][] = []
+  for (const interval of props.relativeIntervals) {
+    const value = interval.value.clone()
+    value.numberOfComponents = numComponents
+    const monzo = interval.value.primeExponents.map((pe) => pe.valueOf())
+    result.push(monzo)
+  }
+  return result
+})
+
+const lattice = computed(() => {
+  const result = spanLattice(monzos.value, store.latticeOptions)
+  // Put aux vertices and lines behind the primary ones.
+  result.vertices.reverse()
+  result.edges.reverse()
+  if (store.rotation) {
+    const s = Math.sin((2 * Math.PI * store.rotation) / 360)
+    const c = Math.cos((2 * Math.PI * store.rotation) / 360)
+    for (const vertex of result.vertices) {
+      const { x, y } = vertex
+      vertex.x = c * x - s * y
+      vertex.y = c * y + s * x
+    }
+    for (const edge of result.edges) {
+      const { x1, y1, x2, y2 } = edge
+      edge.x1 = c * x1 - s * y1
+      edge.y1 = c * y1 + s * x1
+      edge.x2 = c * x2 - s * y2
+      edge.y2 = c * y2 + s * x2
+    }
+  }
+  if (store.grayExtras) {
+    for (const edge of result.edges) {
+      if (edge.type === 'custom') {
+        ;(edge as any).type = 'border'
+      }
+    }
+  }
+  return result
+})
+
+const arrows = computed(() => {
+  if (!store.drawArrows) {
+    return []
+  }
+  const s = Math.sin((2 * Math.PI * store.rotation) / 360)
+  const c = Math.cos((2 * Math.PI * store.rotation) / 360)
+  const coords: [number, number][] = []
+  for (const monzo of monzos.value) {
+    const x = dot(store.horizontalCoordinates, monzo)
+    const y = dot(store.verticalCoordinates, monzo)
+    coords.push([c * x - s * y, c * y + s * x])
+  }
+  const result = []
+  for (let i = 1; i < coords.length; ++i) {
+    const x1 = coords[i - 1][0]
+    const y1 = coords[i - 1][1]
+    const x2 = coords[i][0]
+    const y2 = coords[i][1]
+    let u = x2 - x1
+    let v = y2 - y1
+    const r = Math.hypot(u, v)
+    u = (u / r) * store.size * 2
+    v = (v / r) * store.size * 2
+    result.push({ d: `M ${x1} ${y1} A ${r * 2.5} ${r * 2.5} 0 0 ${i % 2} ${x2 - u} ${y2 - v}` })
+  }
+  return result
+})
+
+watch(
+  () => [
+    svgElement.value,
+    lattice.value,
+    props.labels,
+    store.labelOffset,
+    store.size,
+    store.showLabels
+  ],
+  (dependencies) => {
+    const element = dependencies[0] as unknown as SVGSVGElement
+    if (!element) {
+      return
+    }
+    // Must wait for Vue to render elements before calculating bounding boxes
+    nextTick(() => {
+      viewBox[0] = Infinity
+      viewBox[1] = Infinity
+      let maxX = -Infinity
+      let maxY = -Infinity
+      for (const el of element.children as unknown as SVGCircleElement[]) {
+        const { x, y, width, height } = el.getBBox({
+          stroke: true,
+          fill: true
+        })
+        viewBox[0] = Math.min(viewBox[0], x)
+        viewBox[1] = Math.min(viewBox[1], y)
+        maxX = Math.max(maxX, x + width)
+        maxY = Math.max(maxY, y + height)
+      }
+      viewBox[2] = maxX - viewBox[0]
+      viewBox[3] = maxY - viewBox[1]
+      viewBox[0] -= store.size * 0.5
+      viewBox[1] -= store.size * 0.5
+      viewBox[2] += store.size
+      viewBox[3] += store.size
+    })
+  }
+)
+
+// Note that the template below abuses Set and Array behavior w.r.t. undefined.
+</script>
+
+<template>
+  <svg
+    ref="svgElement"
+    class="lattice"
+    xmlns="http://www.w3.org/2000/svg"
+    :viewBox="viewBox.join(' ')"
+    preserveAspectRatio="xMidYMid meet"
+  >
+    <defs>
+      <!-- A marker to be used as an arrowhead -->
+      <marker
+        id="arrow"
+        viewBox="0 0 10 10"
+        refX="5"
+        refY="5"
+        markerWidth="10"
+        markerHeight="10"
+        orient="auto-start-reverse"
+      >
+        <path d="M 0 0 L 10 5 L 0 10 z" />
+      </marker>
+    </defs>
+
+    <line
+      v-for="(e, i) of lattice.edges"
+      :key="i"
+      v-bind="e"
+      :class="`edge ${e.type}`"
+      :stroke-width="store.size * 0.2"
+    />
+
+    <path
+      v-for="(a, i) of arrows"
+      :key="i"
+      v-bind="a"
+      :stroke-width="store.size * 0.2"
+      class="arrow"
+      marker-end="url(#arrow)"
+    />
+
+    <circle
+      v-for="(v, i) of lattice.vertices"
+      :key="i"
+      :class="{ node: true, held: heldNotes.has(v.index!), auxiliary: v.index === undefined }"
+      :cx="v.x"
+      :cy="v.y"
+      :r="v.index === undefined ? 0.4 * store.size : store.size"
+      :fill="colors[v.index!] ?? 'none'"
+      :stroke="colors[v.index!] ?? 'none'"
+      :stroke-width="store.size * 0.1"
+    />
+    <template v-if="store.showLabels">
+      <text
+        v-for="(v, i) of lattice.vertices"
+        :key="i"
+        class="node-label"
+        dominant-baseline="middle"
+        :x="v.x"
+        :y="v.y - store.labelOffset * store.size"
+        :font-size="`${3 * store.size}px`"
+        :stroke-width="store.size * 0.08"
+      >
+        {{ labels[v.index!] }}
+      </text>
+    </template>
+  </svg>
+</template>
diff --git a/src/components/ModalDialog.vue b/src/components/ModalDialog.vue
index 8a44c14f..bf95d913 100644
--- a/src/components/ModalDialog.vue
+++ b/src/components/ModalDialog.vue
@@ -9,6 +9,10 @@ const props = defineProps({
   extraStyle: {
     default: '',
     type: String
+  },
+  right: {
+    default: false,
+    type: Boolean
   }
 })
 
@@ -73,7 +77,7 @@ watch(
 
 <template>
   <Transition name="modal">
-    <div v-if="show" class="modal-mask" @mousedown.self="$emit('cancel')">
+    <div v-if="show" :class="{ 'modal-mask': true, right }" @mousedown.self="$emit('cancel')">
       <div class="modal-wrapper">
         <div class="modal-container" :style="extraStyle">
           <div class="modal-header">
@@ -112,6 +116,12 @@ watch(
   background-color: var(--color-accent-dimmed);
   transition: opacity 0.3s ease;
 }
+/* Content layout (medium) */
+@media screen and (min-width: 600px) {
+  .modal-mask.right {
+    justify-content: right;
+  }
+}
 .modal-wrapper {
   vertical-align: middle;
 }
@@ -120,8 +130,8 @@ watch(
   background-color: var(--color-background);
   box-shadow: var(--color-drop-shadow) 0px 0px 200px;
   max-height: 100vh;
-  max-width: 100vw;
-  width: 20rem;
+  max-width: 22rem;
+  min-width: 20rem;
   transition: all 0.3s ease;
   display: flex;
   flex-flow: column;
@@ -131,6 +141,7 @@ watch(
 }
 .modal-body {
   overflow-y: auto;
+  padding-right: 0.5rem;
 }
 .modal-footer {
   border-top: 1px solid var(--color-border);
diff --git a/src/components/ModifyScale.vue b/src/components/ModifyScale.vue
new file mode 100644
index 00000000..2ede7768
--- /dev/null
+++ b/src/components/ModifyScale.vue
@@ -0,0 +1,222 @@
+<script setup lang="ts">
+import { defineAsyncComponent, ref } from 'vue'
+import { useScaleStore } from '@/stores/scale'
+import { useModalStore } from '@/stores/modal'
+import { useApproximateByRatiosStore } from '@/stores/approximate-by-ratios'
+import DropdownGroup from '@/components/DropdownGroup.vue'
+
+const emit = defineEmits(['done', 'mouseenter'])
+
+const scale = useScaleStore()
+const modal = useModalStore()
+const approx = useApproximateByRatiosStore()
+
+const ApproximateByHarmonicsModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/ApproximateByHarmonics.vue')
+)
+
+const ApproximateByRatiosModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/ApproximateByRatios.vue')
+)
+
+const ApproximateBySubharmonicsModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/ApproximateBySubharmonics.vue')
+)
+
+const CoalesceModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/CoalesceDuplicates.vue')
+)
+
+const ConvertModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/ConvertType.vue')
+)
+
+const EnumerateModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/EnumerateScale.vue')
+)
+
+const EqualizeModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/EqualizeScale.vue')
+)
+
+const ExpandModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/ExpandScale.vue')
+)
+
+const MergeOffsetsModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/MergeOffsets.vue')
+)
+
+const RandomModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/RandomVariance.vue')
+)
+
+const RotateModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/RotateScale.vue')
+)
+
+const StretchModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/StretchScale.vue')
+)
+
+const SubsetModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/TakeSubset.vue')
+)
+
+const TemperModal = defineAsyncComponent(
+  () => import('@/components/modals/modification/TemperScale.vue')
+)
+
+const element = ref<typeof DropdownGroup | null>(null)
+
+const showApproximateByHarmonicsModal = ref(false)
+const showApproximateByRatiosModal = ref(false)
+const showApproximateBySubharmonicsModal = ref(false)
+const showConvertModal = ref(false)
+const showCoalesceModal = ref(false)
+const showEnumerateModal = ref(false)
+const showEqualizeModal = ref(false)
+const showExpandModal = ref(false)
+const showMergeOffsetsModal = ref(false)
+const showRandomModal = ref(false)
+const showRotateModal = ref(false)
+const showStretchModal = ref(false)
+const showSubsetModal = ref(false)
+const showTemperModal = ref(false)
+
+function closeModals() {
+  showApproximateByHarmonicsModal.value = false
+  showApproximateByRatiosModal.value = false
+  showApproximateBySubharmonicsModal.value = false
+  showConvertModal.value = false
+  showCoalesceModal.value = false
+  showEnumerateModal.value = false
+  showEqualizeModal.value = false
+  showExpandModal.value = false
+  showMergeOffsetsModal.value = false
+  showRandomModal.value = false
+  showRotateModal.value = false
+  showStretchModal.value = false
+  showSubsetModal.value = false
+  showTemperModal.value = false
+  emit('done')
+}
+
+function expandAndQuit() {
+  const { visitor, defaults } = scale.getVisitors()
+  scale.sourceText = visitor.expand(defaults)
+  scale.computeScale()
+  emit('done')
+}
+
+function sort() {
+  scale.sourceText += ';sort()'
+  expandAndQuit()
+}
+
+function reduce() {
+  scale.sourceText += ';reduce()'
+  expandAndQuit()
+}
+
+function retrovert() {
+  scale.sourceText += ';retrovert()'
+  expandAndQuit()
+}
+
+function clickRotate() {
+  modal.initialize(scale.scale.size)
+  showRotateModal.value = true
+}
+
+function clickSubset() {
+  modal.initialize(scale.scale.size)
+  showSubsetModal.value = true
+}
+
+function clickApproximateByRatios() {
+  approx.initialize()
+  showApproximateByRatiosModal.value = true
+}
+
+function blur() {
+  if (!element.value) {
+    return
+  }
+  element.value.blur()
+}
+
+defineExpose({ blur })
+</script>
+<template>
+  <DropdownGroup ref="element" title="Modify scale" @mouseenter="$emit('mouseenter')">
+    <ul>
+      <a href="#" @click="showExpandModal = true"><li>Expand/simplify lines</li></a>
+      <a href="#" @click="sort"><li>Sort ascending</li></a>
+      <a href="#" @click="reduce"><li>Reduce</li></a>
+      <a href="#" @click="retrovert"><li>Retrovert</li></a>
+      <a href="#" @click="clickRotate"><li>Rotate</li></a>
+      <a href="#" @click="clickSubset"><li>Subset</li></a>
+      <a href="#" @click="showStretchModal = true"><li>Stretch/compress</li></a>
+      <a href="#" @click="showRandomModal = true"><li>Random variance</li></a>
+      <a href="#" @click="showEnumerateModal = true"><li>Enumerate</li></a>
+      <a href="#" @click="showCoalesceModal = true"><li>Coalesce duplicates</li></a>
+      <a href="#" @click="clickApproximateByRatios"><li>Approximate by ratios</li></a>
+      <a href="#" @click="showApproximateByHarmonicsModal = true"
+        ><li>Approximate by harmonics</li></a
+      >
+      <a href="#" @click="showApproximateBySubharmonicsModal = true"
+        ><li>Approximate by subharmonics</li></a
+      >
+      <a href="#" @click="showEqualizeModal = true"><li>Equalize</li></a>
+      <a href="#" @click="showTemperModal = true"><li>Temper</li></a>
+      <a href="#" @click="showMergeOffsetsModal = true"><li>Merge offsets</li></a>
+      <a href="#" @click="showConvertModal = true"><li>Convert interval values</li></a>
+    </ul>
+  </DropdownGroup>
+
+  <Teleport to="body">
+    <ApproximateByHarmonicsModal
+      v-if="showApproximateByHarmonicsModal"
+      @done="closeModals"
+      @cancel="showApproximateByHarmonicsModal = false"
+    />
+    <ApproximateByRatiosModal
+      v-if="showApproximateByRatiosModal"
+      @done="closeModals"
+      @cancel="showApproximateByRatiosModal = false"
+    />
+    <ApproximateBySubharmonicsModal
+      v-if="showApproximateBySubharmonicsModal"
+      @done="closeModals"
+      @cancel="showApproximateBySubharmonicsModal = false"
+    />
+    <CoalesceModal
+      v-if="showCoalesceModal"
+      @done="closeModals"
+      @cancel="showCoalesceModal = false"
+    />
+    <ConvertModal v-if="showConvertModal" @done="closeModals" @cancel="showConvertModal = false" />
+    <EnumerateModal
+      v-if="showEnumerateModal"
+      @done="closeModals"
+      @cancel="showEnumerateModal = false"
+    />
+    <EqualizeModal
+      v-if="showEqualizeModal"
+      @done="closeModals"
+      @cancel="showEqualizeModal = false"
+    />
+    <ExpandModal v-if="showExpandModal" @done="closeModals" @cancel="showExpandModal = false" />
+    <MergeOffsetsModal
+      v-if="showMergeOffsetsModal"
+      @done="closeModals"
+      @cancel="showMergeOffsetsModal = false"
+    />
+    <RandomModal v-if="showRandomModal" @done="closeModals" @cancel="showRandomModal = false" />
+    <RotateModal v-if="showRotateModal" @done="closeModals" @cancel="showRotateModal = false" />
+    <StretchModal v-if="showStretchModal" @done="closeModals" @cancel="showStretchModal = false" />
+    <SubsetModal v-if="showSubsetModal" @done="closeModals" @cancel="showSubsetModal = false" />
+    <TemperModal v-if="showTemperModal" @done="closeModals" @cancel="showTemperModal = false" />
+  </Teleport>
+</template>
diff --git a/src/components/NewScale.vue b/src/components/NewScale.vue
new file mode 100644
index 00000000..a2a3b121
--- /dev/null
+++ b/src/components/NewScale.vue
@@ -0,0 +1,260 @@
+<script setup lang="ts">
+import { defineAsyncComponent, ref } from 'vue'
+import { useScaleStore } from '@/stores/scale'
+import DropdownGroup from '@/components/DropdownGroup.vue'
+import { importFile, type ImporterKey } from '@/importers'
+
+const emit = defineEmits(['done', 'mouseenter'])
+
+const scale = useScaleStore()
+
+const ConcordanceShellModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/ConcordanceShell.vue')
+)
+const CpsModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/CombinationProductSet.vue')
+)
+const EnumerateModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/EnumerateChord.vue')
+)
+const EqualTemperamentModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/EqualTemperament.vue')
+)
+const EulerGenusModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/EulerGenus.vue')
+)
+const GeneratorSequenceModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/GeneratorSequence.vue')
+)
+const HarmonicSeriesModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/HarmonicSeries.vue')
+)
+const HistoricalModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/HistoricalScale.vue')
+)
+const LatticeModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/SpanLattice.vue')
+)
+const MosModal = defineAsyncComponent(() => import('@/components/modals/generation/MosScale.vue'))
+const PresetModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/LoadPreset.vue')
+)
+const RankTwoModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/RankTwo.vue')
+)
+const StackModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/StackSteps.vue')
+)
+const SubharmonicSeriesModal = defineAsyncComponent(
+  () => import('@/components/modals/generation/SubharmonicSeries.vue')
+)
+
+const element = ref<typeof DropdownGroup | null>(null)
+const scalaFile = ref<HTMLInputElement | null>(null)
+const anamarkFile = ref<HTMLInputElement | null>(null)
+
+const showConcordanceShellModal = ref(false)
+const showCpsModal = ref(false)
+const showEnumerateModal = ref(false)
+const showEqualTemperamentModal = ref(false)
+const showEulerGenusModal = ref(false)
+const showGeneratorSequenceModal = ref(false)
+const showHarmonicModal = ref(false)
+const showHistoricalModal = ref(false)
+const showLatticeModal = ref(false)
+const showMosModal = ref(false)
+const showPresetModal = ref(false)
+const showRankTwoModal = ref(false)
+const showStackModal = ref(false)
+const showSubharmonicModal = ref(false)
+
+function updateSourceAndHideModals(source: string) {
+  scale.sourceText = source
+  showConcordanceShellModal.value = false
+  showCpsModal.value = false
+  showEnumerateModal.value = false
+  showEqualTemperamentModal.value = false
+  showEulerGenusModal.value = false
+  showGeneratorSequenceModal.value = false
+  showHarmonicModal.value = false
+  showHistoricalModal.value = false
+  showLatticeModal.value = false
+  showMosModal.value = false
+  showPresetModal.value = false
+  showRankTwoModal.value = false
+  showStackModal.value = false
+  showSubharmonicModal.value = false
+  scale.computeScale()
+  emit('done')
+}
+
+function clearScale() {
+  scale.name = ''
+  scale.sourceText = ''
+  scale.computeScale()
+  emit('done')
+}
+
+async function doImport(importerKey: ImporterKey, event: Event) {
+  const result = await importFile(importerKey, event)
+  scale.sourceText = result.sourceText
+  if (result.baseFrequency !== undefined) {
+    scale.userBaseFrequency = result.baseFrequency
+    scale.autoFrequency = false
+  }
+  if (result.name !== undefined) {
+    scale.name = result.name
+  }
+  if (result.baseMidiNote !== undefined) {
+    scale.baseMidiNote = result.baseMidiNote
+  }
+  scale.computeScale()
+  emit('done')
+}
+
+function blur() {
+  if (!element.value) {
+    return
+  }
+  element.value.blur()
+}
+
+function updateBaseFrequency(value: number) {
+  scale.baseFrequency = value
+  scale.autoFrequency = false
+}
+
+defineExpose({ blur })
+</script>
+<template>
+  <DropdownGroup ref="element" title="New scale" @mouseenter="$emit('mouseenter')">
+    <ul>
+      <a href="#" @click="showEqualTemperamentModal = true"><li>Equal temperament</li></a>
+      <a href="#" @click="showRankTwoModal = true"><li>Rank-2 temperament</li></a>
+      <a href="#" @click="showHarmonicModal = true"><li>Harmonic series segment</li></a>
+      <a href="#" @click="showSubharmonicModal = true"><li>Subharmonic series segment</li></a>
+      <a href="#" @click="showEnumerateModal = true"><li>Enumerate chord</li></a>
+      <a href="#" @click="showStackModal = true"><li>Stack steps</li></a>
+      <a href="#" @click="showCpsModal = true"><li>Combination product set</li></a>
+      <a href="#" @click="showMosModal = true"><li>Moment of symmetry scale</li></a>
+      <a href="#" @click="showHistoricalModal = true"><li>Historical temperament</li></a>
+      <a href="#" @click="showEulerGenusModal = true"><li>Euler-Fokker genus</li></a>
+      <a href="#" @click="showLatticeModal = true"><li>Parallelotope</li></a>
+      <a href="#" @click="showGeneratorSequenceModal = true"><li>Generator sequence</li></a>
+      <a href="#" @click="showConcordanceShellModal = true"><li>Concordance shell</li></a>
+      <li class="divider"></li>
+      <a href="#" @click="scalaFile!.click()"><li>Import .scl</li></a>
+      <a href="#" @click="anamarkFile!.click()"><li>Import .tun</li></a>
+      <li class="divider"></li>
+      <a href="#" @click="clearScale"><li>Clear scale</li></a>
+      <a href="#" @click="showPresetModal = true"><li>Load preset scale</li></a>
+    </ul>
+  </DropdownGroup>
+
+  <!-- Hidden file inputs for importers -->
+  <input
+    type="file"
+    ref="scalaFile"
+    accept=".scl"
+    style="display: none"
+    @change="doImport('scalascl', $event)"
+  />
+  <input
+    type="file"
+    ref="anamarkFile"
+    accept=".tun"
+    style="display: none"
+    @change="doImport('anamark', $event)"
+  />
+
+  <Teleport to="body">
+    <EnumerateModal
+      v-if="showEnumerateModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showEnumerateModal = false"
+    />
+    <EqualTemperamentModal
+      v-if="showEqualTemperamentModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showEqualTemperamentModal = false"
+    />
+    <EulerGenusModal
+      v-if="showEulerGenusModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showEulerGenusModal = false"
+    />
+    <GeneratorSequenceModal
+      v-if="showGeneratorSequenceModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showGeneratorSequenceModal = false"
+    />
+    <ConcordanceShellModal
+      v-if="showConcordanceShellModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showConcordanceShellModal = false"
+    />
+    <CpsModal
+      v-if="showCpsModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showCpsModal = false"
+    />
+    <HarmonicSeriesModal
+      v-if="showHarmonicModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showHarmonicModal = false"
+    />
+    <HistoricalModal
+      v-if="showHistoricalModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @update:baseFrequency="updateBaseFrequency"
+      @update:baseMidiNote="scale.baseMidiNote = $event"
+      @cancel="showHistoricalModal = false"
+    />
+    <LatticeModal
+      v-if="showLatticeModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showLatticeModal = false"
+    />
+    <MosModal
+      v-if="showMosModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showMosModal = false"
+    />
+    <PresetModal
+      v-if="showPresetModal"
+      @update:scaleName="scale.name = $event"
+      @update:baseFrequency="updateBaseFrequency"
+      @update:baseMidiNote="scale.baseMidiNote = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showPresetModal = false"
+    />
+    <RankTwoModal
+      v-if="showRankTwoModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showRankTwoModal = false"
+    />
+    <StackModal
+      v-if="showStackModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showStackModal = false"
+    />
+    <SubharmonicSeriesModal
+      v-if="showSubharmonicModal"
+      @update:scaleName="scale.name = $event"
+      @update:source="updateSourceAndHideModals"
+      @cancel="showSubharmonicModal = false"
+    />
+  </Teleport>
+</template>
diff --git a/src/components/PeriodCircle.vue b/src/components/PeriodCircle.vue
index 52bf63ef..0fff68cf 100644
--- a/src/components/PeriodCircle.vue
+++ b/src/components/PeriodCircle.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import { LEFT_MOUSE_BTN } from '@/constants'
 import { generatorRanges } from 'moment-of-symmetry'
-import type { Scale } from 'scale-workshop-core'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { mmod } from 'xen-dev-utils'
+import type { Scale } from '@/scale'
+import { valueToCents } from 'xen-dev-utils'
 
 const TAU = 2 * Math.PI
 const CIRCLE_RADIUS = 40
@@ -13,6 +14,7 @@ const GENERATOR_TICK_HEIGHT = 5
 
 const props = defineProps<{
   scale: Scale | null
+  labels: string[] | null
   generatorCents: number | null
   periodCents: number | null
   size: number
@@ -57,7 +59,7 @@ const periodCents = computed(() => {
     return props.periodCents
   }
   if (props.scale !== null) {
-    return props.scale.equave.totalCents()
+    return valueToCents(Math.abs(props.scale.equaveRatio))
   }
   return 1200
 })
@@ -79,10 +81,7 @@ const scaleTickDirections = computed(() => {
   if (props.scale === null) {
     return []
   }
-  const result = []
-  for (let i = 1; i < props.scale.size + 1; ++i) {
-    result.push(props.scale.getMonzo(i).totalCents())
-  }
+  const result = props.scale.intervalRatios.map((r) => valueToCents(Math.abs(r)))
   const angleScale = (2 * Math.PI) / periodCents.value
   return result
     .map((cents) => cents * angleScale)
@@ -106,9 +105,9 @@ const scaleTickCoords = computed(() => {
 
 const scaleLabels = computed(() => {
   const result = []
-  let i = 1
+  let i = 0
   for (const [sin, cos] of scaleTickDirections.value) {
-    const name = props.scale!.getName(i++)
+    const name = props.labels ? props.labels[i++] : '·'
     const radius = CIRCLE_RADIUS - 2 * SCALE_TICK_HEIGHT
     result.push({
       x: `${50 + radius * sin}`,
diff --git a/src/components/ScaleBuilder.vue b/src/components/ScaleBuilder.vue
deleted file mode 100644
index d901e6ac..00000000
--- a/src/components/ScaleBuilder.vue
+++ /dev/null
@@ -1,886 +0,0 @@
-<script setup lang="ts">
-import { computed, defineAsyncComponent, ref } from 'vue'
-import TuningTable from '@/components/TuningTable.vue'
-import { debounce, autoKeyColors } from '@/utils'
-import ScaleRule from '@/components/ScaleRule.vue'
-import { APP_TITLE } from '@/constants'
-import { sanitizeFilename, midiNoteNumberToName } from '@/utils'
-import { exportFile, type ExporterKey } from '@/exporters'
-import Modal from '@/components/ModalDialog.vue'
-import { presets, presetsByGroup } from '@/presets'
-import { importFile, type ImporterKey } from '@/importers'
-import { mtof } from 'xen-dev-utils'
-import type { Scale } from 'scale-workshop-core'
-import { useStateStore } from '@/stores/state'
-import { useModalStore } from '@/stores/modal'
-import { useApproximateByRatiosStore } from '@/stores/approximate-by-ratios'
-
-// Export
-const KorgExportModal = defineAsyncComponent(
-  () => import('@/components/modals/export/KorgExport.vue')
-)
-const MtsSysexExportModal = defineAsyncComponent(
-  () => import('@/components/modals/export/MtsSysexExport.vue')
-)
-const ReaperExportModal = defineAsyncComponent(
-  () => import('@/components/modals/export/ReaperExport.vue')
-)
-const ShareUrlModal = defineAsyncComponent(() => import('@/components/modals/ShareUrl.vue'))
-// Generation
-const CpsModal = defineAsyncComponent(
-  () => import('@/components/modals/generation/CombinationProductSet.vue')
-)
-const CrossPolytopeModal = defineAsyncComponent(
-  () => import('@/components/modals/generation/CrossPolytope.vue')
-)
-const DwarfModal = defineAsyncComponent(
-  () => import('@/components/modals/generation/DwarfScale.vue')
-)
-const EnumerateChordModal = defineAsyncComponent(
-  () => import('@/components/modals/generation/EnumerateChord.vue')
-)
-const EqualTemperamentModal = defineAsyncComponent(
-  () => import('@/components/modals/generation/EqualTemperament.vue')
-)
-const EulerGenusModal = defineAsyncComponent(
-  () => import('@/components/modals/generation/EulerGenus.vue')
-)
-const HarmonicSeriesModal = defineAsyncComponent(
-  () => import('@/components/modals/generation/HarmonicSeries.vue')
-)
-const HistoricalModal = defineAsyncComponent(
-  () => import('@/components/modals/generation/HistoricalScale.vue')
-)
-const LatticeModal = defineAsyncComponent(
-  () => import('@/components/modals/generation/SpanLattice.vue')
-)
-const MosModal = defineAsyncComponent(() => import('@/components/modals/generation/MosScale.vue'))
-const RankTwoModal = defineAsyncComponent(
-  () => import('@/components/modals/generation/RankTwo.vue')
-)
-const SubharmonicSeriesModal = defineAsyncComponent(
-  () => import('@/components/modals/generation/SubharmonicSeries.vue')
-)
-// Modification
-const ApproximateByHarmonicsModal = defineAsyncComponent(
-  () => import('@/components/modals/modification/ApproximateByHarmonics.vue')
-)
-const ApproximateByRatiosModal = defineAsyncComponent(
-  () => import('@/components/modals/modification/ApproximateByRatios.vue')
-)
-const ApproximateBySubharmonicsModal = defineAsyncComponent(
-  () => import('@/components/modals/modification/ApproximateBySubharmonics.vue')
-)
-const ConvertModal = defineAsyncComponent(
-  () => import('@/components/modals/modification/ConvertType.vue')
-)
-const EqualizeModal = defineAsyncComponent(
-  () => import('@/components/modals/modification/EqualizeScale.vue')
-)
-const OffsetModal = defineAsyncComponent(
-  () => import('@/components/modals/modification/MergeOffset.vue')
-)
-const RandomVarianceModal = defineAsyncComponent(
-  () => import('@/components/modals/modification/RandomVariance.vue')
-)
-const RotateModal = defineAsyncComponent(
-  () => import('@/components/modals/modification/RotateScale.vue')
-)
-const StretchModal = defineAsyncComponent(
-  () => import('@/components/modals/modification/StretchScale.vue')
-)
-const SubsetModal = defineAsyncComponent(
-  () => import('@/components/modals/modification/TakeSubset.vue')
-)
-const TemperModal = defineAsyncComponent(
-  () => import('@/components/modals/modification/TemperScale.vue')
-)
-
-const state = useStateStore()
-const modal = useModalStore()
-const approx = useApproximateByRatiosStore()
-
-const joinedLines = computed({
-  get() {
-    return state.scaleLines.join('\n')
-  },
-  set: debounce((newValue: string) => {
-    state.scaleLines = newValue.split('\n')
-  })
-})
-
-const joinedKeyColors = computed({
-  get() {
-    return state.keyColors.join(' ')
-  },
-  set: debounce((newValue: string) => {
-    state.keyColors = newValue.split(' ')
-  })
-})
-
-const baseFrequency = computed({
-  get: () => state.scale.baseFrequency,
-  set: debounce((newValue: number) => {
-    if (typeof newValue === 'number' && !isNaN(newValue) && isFinite(newValue)) {
-      state.scale.baseFrequency = newValue
-    }
-  })
-})
-
-const baseMidiNote = computed({
-  get: () => state.baseMidiNote,
-  set: debounce((newValue: number) => {
-    if (typeof newValue === 'number' && !isNaN(newValue)) {
-      state.baseMidiNote = newValue
-    }
-  })
-})
-
-const midiNoteNumber = ref<HTMLInputElement | null>(null)
-
-function autoFrequency() {
-  let baseMidiNote = state.baseMidiNote
-  if (midiNoteNumber.value !== null) {
-    // Circumvent debouncing for this simple click
-    baseMidiNote = parseInt(midiNoteNumber.value.value)
-    if (isNaN(baseMidiNote)) {
-      return
-    }
-  }
-
-  state.scale.baseFrequency = mtof(baseMidiNote)
-}
-
-function doExport(exporter: ExporterKey) {
-  const params = {
-    newline: state.newline,
-    name: state.scaleName,
-    scaleUrl: window.location.href,
-    scale: state.scale,
-    filename: sanitizeFilename(state.scaleName),
-    baseMidiNote: state.baseMidiNote,
-    midiOctaveOffset: state.midiOctaveOffset,
-    description: state.scaleName,
-    lines: state.scaleLines,
-    appTitle: APP_TITLE,
-    date: new Date()
-  }
-
-  exportFile(exporter, params)
-}
-
-const showKorgExportModal = ref(false)
-const showReaperExportModal = ref(false)
-const showMtsSysexExportModal = ref(false)
-const showShareUrlModal = ref(false)
-const shareUrlModal = ref<any>(null)
-
-const presetGroups = presetsByGroup()
-const presetSelect = ref<HTMLSelectElement | null>(null)
-const showPresetModal = ref(false)
-function selectPreset() {
-  const preset = presets[presetSelect.value!.value]
-  state.scaleName = preset.name
-  state.scaleLines = preset.lines
-  state.scale.baseFrequency = preset.baseFrequency
-  state.baseMidiNote = preset.baseMidiNote
-  state.keyColors = preset.keyColors
-}
-
-const showEqualTemperamentModal = ref(false)
-const showHarmonicSeriesModal = ref(false)
-const showMosModal = ref(false)
-const showSubharmonicSeriesModal = ref(false)
-const showEnumerateChordModal = ref(false)
-const showCpsModal = ref(false)
-const showLatticeModal = ref(false)
-const showEulerGenusModal = ref(false)
-const showDwarfModal = ref(false)
-const showRankTwoModal = ref(false)
-const showCrossPolytopeModal = ref(false)
-const showHistoricalModal = ref(false)
-
-const showRotateModal = ref(false)
-const showSubsetModal = ref(false)
-const showStretchModal = ref(false)
-const showRandomVarianceModal = ref(false)
-const showApproximateByHarmonicsModal = ref(false)
-const showApproximateBySubharmonicsModal = ref(false)
-const showTemperModal = ref(false)
-const showEqualizeModal = ref(false)
-const showOffsetModal = ref(false)
-const showConvertModal = ref(false)
-const showApproximateByRatiosModal = ref(false)
-
-const scaleDataArea = ref<HTMLTextAreaElement | null>(null)
-const subsetModal = ref<any>(null)
-
-const scalaFile = ref<HTMLInputElement | null>(null)
-const anamarkFile = ref<HTMLInputElement | null>(null)
-
-const exportTextClipboard = ref("Copy this scale's unique URL to clipboard")
-
-async function doImport(importerKey: ImporterKey, event: Event) {
-  const result = await importFile(importerKey, event)
-  state.scaleLines = result.scale.toStrings()
-  if (importerKey != 'scalascl') {
-    state.scale.baseFrequency = result.scale.baseFrequency
-  }
-  if (result.name !== undefined) {
-    state.scaleName = result.name
-  }
-  if (result.baseMidiNote !== undefined) {
-    state.baseMidiNote = result.baseMidiNote
-  }
-}
-
-function copyToClipboard() {
-  window.navigator.clipboard.writeText(window.location.href)
-  exportTextClipboard.value = '[Copied URL to clipboard]'
-  window.setTimeout(() => {
-    exportTextClipboard.value = "Copy this scale's unique URL to clipboard"
-  }, 5000)
-}
-
-// Actions that would take multiple lines in template code and get ruined by auto-formatting
-
-function clearScale() {
-  state.scaleName = ''
-  joinedLines.value = ''
-  scaleDataArea.value!.focus()
-}
-
-function sortAscending() {
-  state.scale = state.scale.sorted()
-  scaleDataArea.value!.focus()
-}
-
-function clickReduce() {
-  state.scale = state.scale.reduce()
-  scaleDataArea.value!.focus()
-}
-
-function clickInvert() {
-  state.scale = state.scale.invert()
-  scaleDataArea.value!.focus()
-}
-
-function clickRotate() {
-  modal.initialize(state.scale.size)
-  showRotateModal.value = true
-}
-
-function clickSubset() {
-  modal.initialize(state.scale.size)
-  showSubsetModal.value = true
-}
-
-function clickApproximateByRatios() {
-  approx.initialize()
-  showApproximateByRatiosModal.value = true
-}
-
-function clickShareUrl() {
-  showShareUrlModal.value = true
-  shareUrlModal.value.initialize()
-}
-
-function updateScaleAndHideModals(scale: Scale) {
-  state.scale = scale
-  showRankTwoModal.value = false
-  showEqualTemperamentModal.value = false
-  showHarmonicSeriesModal.value = false
-  showMosModal.value = false
-  showSubharmonicSeriesModal.value = false
-  showEnumerateChordModal.value = false
-  showCpsModal.value = false
-  showEulerGenusModal.value = false
-  showDwarfModal.value = false
-  showCrossPolytopeModal.value = false
-  showLatticeModal.value = false
-  showHistoricalModal.value = false
-  showRotateModal.value = false
-  showSubsetModal.value = false
-  showStretchModal.value = false
-  showRandomVarianceModal.value = false
-  showApproximateByHarmonicsModal.value = false
-  showApproximateBySubharmonicsModal.value = false
-  showEqualizeModal.value = false
-  showTemperModal.value = false
-  showOffsetModal.value = false
-  showConvertModal.value = false
-}
-
-function confirmPreset() {
-  showPresetModal.value = false
-  selectPreset()
-}
-</script>
-
-<template>
-  <div id="tab-build-scale" class="columns-container">
-    <div class="column scale-builder">
-      <textarea
-        id="scale-name"
-        rows="1"
-        placeholder="Untitled scale"
-        v-model="state.scaleName"
-      ></textarea>
-
-      <ul class="btn-group">
-        <li class="btn-dropdown-group">
-          <a class="btn" href="#">New scale ▼</a>
-          <ul>
-            <a href="#" @click="showEqualTemperamentModal = true"><li>Equal temperament</li></a>
-            <a href="#" @click="showRankTwoModal = true"><li>Rank-2 temperament</li></a>
-            <a href="#" @click="showHarmonicSeriesModal = true"><li>Harmonic series segment</li></a>
-            <a href="#" @click="showSubharmonicSeriesModal = true"
-              ><li>Subharmonic series segment</li></a
-            >
-            <a href="#" @click="showEnumerateChordModal = true"><li>Enumerate chord</li></a>
-            <a href="#" @click="showCpsModal = true"><li>Combination product set</li></a>
-            <a href="#" @click="showMosModal = true"><li>Moment of symmetry scale</li></a>
-            <a href="#" @click="showHistoricalModal = true"><li>Historical temperament</li></a>
-            <a href="#" @click="showEulerGenusModal = true"><li>Euler-Fokker genus</li></a>
-            <a href="#" @click="showDwarfModal = true"><li>Dwarf scale</li></a>
-            <a href="#" @click="showCrossPolytopeModal = true"><li>Cross-polytope</li></a>
-            <a href="#" @click="showLatticeModal = true"><li>Span lattice</li></a>
-            <li class="divider"></li>
-            <a href="#" @click="scalaFile?.click()"><li>Import .scl</li></a>
-            <a href="#" @click="anamarkFile?.click()"><li>Import .tun</li></a>
-            <li class="divider"></li>
-            <a href="#" @click="clearScale"><li>Clear scale</li></a>
-            <a href="#" @click="showPresetModal = true"><li>Load preset scale</li></a>
-          </ul>
-        </li>
-        <li class="btn-dropdown-group">
-          <a class="btn" href="#">Modify scale ▼</a>
-          <ul>
-            <a href="#" @click="sortAscending"><li>Sort ascending</li></a>
-            <a href="#" @click="clickReduce"><li>Reduce</li></a>
-            <a href="#" @click="clickInvert"><li>Invert</li></a>
-            <a href="#" @click="clickRotate"><li>Rotate</li></a>
-            <a href="#" @click="clickSubset"><li>Subset</li></a>
-            <a href="#" @click="showStretchModal = true"><li>Stretch/compress</li></a>
-            <a href="#" @click="showRandomVarianceModal = true"><li>Random variance</li></a>
-            <a href="#" @click="clickApproximateByRatios"><li>Approximate by ratios</li></a>
-            <a href="#" @click="showApproximateByHarmonicsModal = true"
-              ><li>Approximate by harmonics</li></a
-            >
-            <a href="#" @click="showApproximateBySubharmonicsModal = true"
-              ><li>Approximate by subharmonics</li></a
-            >
-            <a href="#" @click="showEqualizeModal = true"><li>Equalize</li></a>
-            <a href="#" @click="showTemperModal = true"><li>Temper</li></a>
-            <a href="#" @click="showOffsetModal = true"><li>Merge offset</li></a>
-            <a href="#" @click="showConvertModal = true"><li>Convert interval values</li></a>
-          </ul>
-        </li>
-      </ul>
-
-      <div class="control-group">
-        <h2>Scale data</h2>
-        <div class="control">
-          <textarea
-            id="scale-data"
-            ref="scaleDataArea"
-            rows="12"
-            autocapitalize="off"
-            autocomplete="off"
-            autocorrect="off"
-            spellcheck="false"
-            v-model="joinedLines"
-          ></textarea>
-        </div>
-      </div>
-
-      <ScaleRule :scale="state.scale" />
-
-      <div class="control-group">
-        <h2>Tuning</h2>
-
-        <div class="control">
-          <label>Base frequency</label>
-          <input
-            class="real-valued"
-            type="number"
-            min="0.1"
-            step="0.1"
-            max="1000000"
-            v-model="baseFrequency"
-          />
-          <button @click="autoFrequency">Auto</button>
-          <span>Hz</span>
-        </div>
-
-        <div class="control">
-          <label>MIDI note for base frequency</label>
-          <input
-            type="number"
-            ref="midiNoteNumber"
-            min="0"
-            max="127"
-            step="1"
-            v-model="baseMidiNote"
-          />
-          <span>{{ midiNoteNumberToName(baseMidiNote, state.midiOctaveOffset) }}</span>
-        </div>
-
-        <!-- This control is for the 3rd field that is found at the top of kbm files -->
-        <!--<div class="control">
-          <label>MIDI note for 1/1</label>
-          <input
-            class="real-valued"
-            type="number"
-            min="0"
-            step="1"
-            max="127"
-          />
-          <span>A5</span>
-        </div>-->
-      </div>
-
-      <div class="control-group">
-        <h2>Key colors</h2>
-        <div class="control">
-          <p>
-            A list of key colors, ascending from 1/1. Key colors are cosmetic only; they do not
-            affect mapping.
-          </p>
-          <textarea v-model="joinedKeyColors"></textarea>
-        </div>
-        <div class="control">
-          <button @click="state.keyColors = autoKeyColors(state.scale.size)">Auto</button>
-        </div>
-      </div>
-    </div>
-    <TuningTable
-      :scale="state.scale"
-      :frequencies="state.frequencies"
-      :lines="state.scaleLines"
-      :baseMidiNote="state.baseMidiNote"
-      :keyColors="state.keyColors"
-    />
-    <div class="column exporters">
-      <h2>Export current settings</h2>
-      <a href="#" class="btn" @click="copyToClipboard">
-        <p><strong>Share scale</strong></p>
-        <p>{{ exportTextClipboard }}</p>
-      </a>
-      <a href="#" class="btn" @click="doExport('anamarkv1')">
-        <p><strong>AnaMark v1 tuning (.tun)</strong></p>
-        <p>Tuning file for various synths</p>
-      </a>
-      <a href="#" class="btn" @click="doExport('anamarkv2')">
-        <p><strong>AnaMark v2 tuning (.tun)</strong></p>
-        <p>Tuning file for various synths</p>
-      </a>
-      <a href="#" class="btn" @click="doExport('scalascl')">
-        <p><strong>Scala scale (.scl)</strong></p>
-        <p>
-          Scale file for various synths.<br />If you use this file without an accompanying .kbm
-          file, most synths will assume your scale starts on C ~261Hz
-        </p>
-      </a>
-      <a href="#" class="btn" @click="doExport('scalakbm')">
-        <p><strong>Scala keyboard mapping (.kbm)</strong></p>
-        <p>Maps an accompanying .scl file to start on a specific MIDI note and frequency</p>
-      </a>
-      <a href="#" class="btn" @click="doExport('ableton')">
-        <p><strong>Ableton scale (.ascl)</strong></p>
-        <p>Scale file for Ableton Live 12</p>
-      </a>
-      <a href="#" class="btn" @click="doExport('maxmsp')">
-        <p><strong>Max/MSP coll tuning (.txt)</strong></p>
-        <p>List of frequencies (Hz) in a text file to load into a Max/MSP coll object</p>
-      </a>
-      <a href="#" class="btn" @click="doExport('puredata')">
-        <p><strong>PureData text tuning (.txt)</strong></p>
-        <p>List of frequencies (Hz) in a text file to load into a PureData text object</p>
-      </a>
-      <a href="#" class="btn" @click="doExport('kontakt')">
-        <p><strong>Kontakt tuning script (.txt)</strong></p>
-        <p>
-          Tuning script for Native Instruments Kontakt. Some instrument libraries allow this custom
-          script
-        </p>
-      </a>
-      <a href="#" class="btn" @click="doExport('soniccouture')">
-        <p><strong>Soniccouture tuning file (.nka)</strong></p>
-        <p>For Soniccouture sample libraries</p>
-      </a>
-      <a href="#" class="btn" @click="doExport('harmor')">
-        <p><strong>Harmor pitch map (.fnv)</strong></p>
-        <p>Envelope state file for the pitch envelope in Image-Line Harmor</p>
-      </a>
-      <a href="#" class="btn" @click="doExport('sytrus')">
-        <p><strong>Sytrus pitch map (.fnv)</strong></p>
-        <p>Envelope state file for the pitch envelope in Image-Line Sytrus</p>
-      </a>
-      <a href="#" class="btn" @click="showKorgExportModal = true">
-        <p><strong>Korg Sound Librarian scale (.mnlgtuns + others)</strong></p>
-        <p>Tuning formats for use with Monologue, Minilogue,</p>
-        <p>Minilogue XD, and Prologue synthesizers</p>
-      </a>
-      <a href="#" class="btn" @click="doExport('deflemask')">
-        <p><strong>Deflemask reference (.txt)</strong></p>
-        <p>List of 'fine tune' values for Deflemask</p>
-      </a>
-      <a href="#" class="btn" @click="showReaperExportModal = true">
-        <p><strong>Reaper note name map (.txt)</strong></p>
-        <p>Displays custom note names on Reaper's piano roll</p>
-      </a>
-      <a href="#" class="btn" @click="showMtsSysexExportModal = true">
-        <p><strong>MTS Sysex Bulk Tuning Dump (.syx)</strong></p>
-        <p>Binary data of a Bulk Tuning Dump SysEx message</p>
-      </a>
-      <a href="#" class="btn" @click="clickShareUrl">
-        <p><strong>Share scale (email etc.)</strong></p>
-        <p>Conveniently share this scale's unique URL</p>
-      </a>
-    </div>
-  </div>
-
-  <!-- Hidden file inputs for importers -->
-  <input
-    type="file"
-    ref="scalaFile"
-    accept=".scl"
-    style="display: none"
-    @change="doImport('scalascl', $event)"
-  />
-  <input
-    type="file"
-    ref="anamarkFile"
-    accept=".tun"
-    style="display: none"
-    @change="doImport('anamark', $event)"
-  />
-
-  <Teleport to="body">
-    <KorgExportModal
-      v-if="showKorgExportModal"
-      @confirm="showKorgExportModal = false"
-      @cancel="showKorgExportModal = false"
-      :newline="state.newline"
-      :scaleName="state.scaleName"
-      :baseMidiNote="baseMidiNote"
-      :midiOctaveOffset="state.midiOctaveOffset"
-      :scale="state.scale"
-    />
-
-    <ReaperExportModal
-      v-if="showReaperExportModal"
-      @confirm="showReaperExportModal = false"
-      @cancel="showReaperExportModal = false"
-      :newline="state.newline"
-      :scaleName="state.scaleName"
-      :baseMidiNote="baseMidiNote"
-      :midiOctaveOffset="state.midiOctaveOffset"
-      :scale="state.scale"
-    />
-
-    <MtsSysexExportModal
-      v-if="showMtsSysexExportModal"
-      @confirm="showMtsSysexExportModal = false"
-      @cancel="showMtsSysexExportModal = false"
-      :newline="state.newline"
-      :scaleName="state.scaleName"
-      :baseMidiNote="baseMidiNote"
-      :midiOctaveOffset="state.midiOctaveOffset"
-      :scale="state.scale"
-    />
-
-    <RankTwoModal
-      v-if="showRankTwoModal"
-      :centsFractionDigits="state.centsFractionDigits"
-      :scale="state.scale"
-      @update:scaleName="state.scaleName = $event"
-      @update:scale="updateScaleAndHideModals"
-      @update:keyColors="state.keyColors = $event"
-      @cancel="showRankTwoModal = false"
-    />
-
-    <HistoricalModal
-      v-if="showHistoricalModal"
-      :centsFractionDigits="state.centsFractionDigits"
-      :accidentalStyle="state.accidentalPreference"
-      @update:scaleName="state.scaleName = $event"
-      @update:scale="updateScaleAndHideModals"
-      @update:baseFrequency="state.scale.baseFrequency = $event"
-      @update:baseMidiNote="state.baseMidiNote = $event"
-      @update:keyColors="state.keyColors = $event"
-      @cancel="showHistoricalModal = false"
-    />
-
-    <ShareUrlModal
-      ref="shareUrlModal"
-      v-if="showShareUrlModal"
-      :scaleName="state.scaleName"
-      :newline="state.newline"
-      @confirm="showShareUrlModal = false"
-      @cancel="showShareUrlModal = false"
-    />
-
-    <EqualTemperamentModal
-      v-if="showEqualTemperamentModal"
-      :centsFractionDigits="state.centsFractionDigits"
-      :decimalFractionDigits="state.decimalFractionDigits"
-      @update:scaleName="state.scaleName = $event"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showEqualTemperamentModal = false"
-    />
-
-    <HarmonicSeriesModal
-      v-if="showHarmonicSeriesModal"
-      @update:scaleName="state.scaleName = $event"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showHarmonicSeriesModal = false"
-    />
-
-    <MosModal
-      v-if="showMosModal"
-      @update:scaleName="state.scaleName = $event"
-      @update:scale="updateScaleAndHideModals"
-      @update:keyColors="state.keyColors = $event"
-      @cancel="showMosModal = false"
-    />
-
-    <SubharmonicSeriesModal
-      v-if="showSubharmonicSeriesModal"
-      @update:scaleName="state.scaleName = $event"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showSubharmonicSeriesModal = false"
-    />
-
-    <EnumerateChordModal
-      v-if="showEnumerateChordModal"
-      @update:scaleName="state.scaleName = $event"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showEnumerateChordModal = false"
-    />
-
-    <CpsModal
-      v-if="showCpsModal"
-      @update:scaleName="state.scaleName = $event"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showCpsModal = false"
-    />
-
-    <EulerGenusModal
-      v-if="showEulerGenusModal"
-      @update:scaleName="state.scaleName = $event"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showEulerGenusModal = false"
-    />
-
-    <DwarfModal
-      v-if="showDwarfModal"
-      @update:scaleName="state.scaleName = $event"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showDwarfModal = false"
-    />
-
-    <CrossPolytopeModal
-      v-if="showCrossPolytopeModal"
-      @update:scaleName="state.scaleName = $event"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showCrossPolytopeModal = false"
-    />
-    <LatticeModal
-      v-if="showLatticeModal"
-      :centsFractionDigits="state.centsFractionDigits"
-      @update:scaleName="state.scaleName = $event"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showLatticeModal = false"
-    />
-
-    <Modal :show="showPresetModal" @confirm="confirmPreset" @cancel="showPresetModal = false">
-      <template #header>
-        <h2>Load preset scale</h2>
-      </template>
-      <template #body>
-        <div class="control-group">
-          <div class="control">
-            <select ref="presetSelect" size="10" class="control">
-              <optgroup v-for="group of presetGroups" :key="group.name" :label="group.name">
-                <option v-for="preset of group.members" :key="preset.id" :value="preset.id">
-                  {{ preset.title }}
-                </option>
-              </optgroup>
-            </select>
-          </div>
-        </div>
-      </template>
-    </Modal>
-
-    <RotateModal
-      v-if="showRotateModal"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showRotateModal = false"
-      :scale="state.scale"
-    />
-
-    <SubsetModal
-      ref="subsetModal"
-      v-if="showSubsetModal"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showSubsetModal = false"
-      :scale="state.scale"
-    />
-
-    <StretchModal
-      v-if="showStretchModal"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showStretchModal = false"
-      :scale="state.scale"
-      :centsFractionDigits="state.centsFractionDigits"
-      :decimalFractionDigits="state.decimalFractionDigits"
-    />
-
-    <RandomVarianceModal
-      v-if="showRandomVarianceModal"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showRandomVarianceModal = false"
-      :scale="state.scale"
-      :centsFractionDigits="state.centsFractionDigits"
-      :decimalFractionDigits="state.decimalFractionDigits"
-    />
-
-    <ApproximateByRatiosModal
-      v-if="showApproximateByRatiosModal"
-      @update:scale="state.scale = $event"
-      @cancel="showApproximateByRatiosModal = false"
-      :scale="state.scale"
-    />
-
-    <ApproximateByHarmonicsModal
-      v-if="showApproximateByHarmonicsModal"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showApproximateByHarmonicsModal = false"
-      :scale="state.scale"
-    />
-
-    <ApproximateBySubharmonicsModal
-      v-if="showApproximateBySubharmonicsModal"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showApproximateBySubharmonicsModal = false"
-      :scale="state.scale"
-    />
-
-    <EqualizeModal
-      v-if="showEqualizeModal"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showEqualizeModal = false"
-      :scale="state.scale"
-    />
-
-    <TemperModal
-      v-if="showTemperModal"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showTemperModal = false"
-      :scale="state.scale"
-      :centsFractionDigits="state.centsFractionDigits"
-    />
-
-    <OffsetModal
-      v-if="showOffsetModal"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showOffsetModal = false"
-      :scale="state.scale"
-    />
-
-    <ConvertModal
-      v-if="showConvertModal"
-      @update:scale="updateScaleAndHideModals"
-      @cancel="showConvertModal = false"
-      :scale="state.scale"
-      :centsFractionDigits="state.centsFractionDigits"
-      :decimalFractionDigits="state.decimalFractionDigits"
-    />
-  </Teleport>
-</template>
-
-<style scoped>
-/* Content layout (small) */
-div.columns-container {
-  height: 100%;
-  overflow-y: auto;
-  background-color: var(--color-border);
-}
-div.column {
-  background-color: var(--color-background);
-  overflow-x: hidden;
-}
-div.scale-builder {
-  padding: 1rem;
-}
-div.tuning-table {
-  padding: 0rem;
-}
-div.exporters {
-  padding: 1rem;
-}
-
-/* Content layout (medium) */
-@media screen and (min-width: 600px) {
-  div.columns-container {
-    column-count: 2;
-    column-gap: 1px;
-    overflow: hidden;
-  }
-  div.column {
-    overflow-y: auto;
-  }
-  div.scale-builder {
-    width: 100%;
-    height: 100%;
-  }
-  div.tuning-table {
-    width: 100%;
-    height: 66%;
-  }
-  div.exporters {
-    width: 100%;
-    height: 34%;
-    border-top: 1px solid var(--color-border);
-  }
-}
-
-/* Content layout (large) */
-@media screen and (min-width: 1100px) {
-  div.columns-container {
-    column-count: 3;
-  }
-  div.column {
-    height: 100%;
-  }
-  div.exporters {
-    border: none;
-  }
-}
-
-/* UI elements */
-#scale-name {
-  width: 100%;
-  font-size: 1.4em;
-  margin-bottom: 1rem;
-  padding: 0.3rem;
-  font-family: sans-serif;
-  resize: vertical;
-}
-div.exporters .btn {
-  width: 100%;
-  display: block;
-  margin-bottom: 1rem;
-  margin-left: 0;
-}
-
-select optgroup + optgroup {
-  margin-top: 1em;
-}
-
-.real-valued:invalid {
-  background-color: var(--color-background);
-}
-</style>
diff --git a/src/components/ScaleControls.vue b/src/components/ScaleControls.vue
new file mode 100644
index 00000000..a5df3f1c
--- /dev/null
+++ b/src/components/ScaleControls.vue
@@ -0,0 +1,157 @@
+<script setup lang="ts">
+import { useScaleStore } from '@/stores/scale'
+import { debounce } from '@/utils'
+import { ref } from 'vue'
+import ScaleRule from './ScaleRule.vue'
+import palette from '@/character-palette.json'
+
+const scale = useScaleStore()
+
+const updateScale = debounce(scale.computeScale)
+
+const sourceEditor = ref<HTMLTextAreaElement | null>(null)
+
+const paletteInfo = ref('')
+
+function updatePaletteInfo(event: Event) {
+  const character = (event.target as HTMLButtonElement).textContent!
+  paletteInfo.value = (palette as Record<string, string>)[character] ?? ''
+}
+
+function clearPaletteInfo() {
+  paletteInfo.value = ''
+}
+
+function insertFromPalette(event: Event) {
+  if (!sourceEditor.value) {
+    return
+  }
+  const character = (event.target as HTMLButtonElement).textContent
+  const start = sourceEditor.value.selectionStart
+  const end = sourceEditor.value.selectionEnd
+  scale.sourceText =
+    scale.sourceText.substring(0, start) +
+    character +
+    scale.sourceText.substring(end, scale.sourceText.length)
+}
+
+function focus() {
+  if (!sourceEditor.value) {
+    return
+  }
+  sourceEditor.value.focus()
+}
+
+defineExpose({ focus, clearPaletteInfo })
+</script>
+
+<template>
+  <div class="control-group">
+    <div class="control">
+      <label for="base-midi-note">MIDI note for base frequency</label>
+      <input
+        id="base-midi-note"
+        type="number"
+        step="1"
+        v-model="scale.baseMidiNote"
+        @input="updateScale"
+      />
+    </div>
+    <div class="control">
+      <label for="enharmonic">Pythagorean enharmonic</label>
+      <select id="enharmonic" v-model="scale.enharmonic" @input="updateScale">
+        <option v-for="e of scale.enharmonics" :key="e" :value="e">{{ e }}</option>
+      </select>
+    </div>
+
+    <div class="control">
+      <label for="base-frequency">Base frequency</label>
+      <input
+        id="base-frequency"
+        type="number"
+        step="any"
+        v-model="scale.baseFrequency"
+        :disabled="scale.autoFrequency"
+        @input="updateScale"
+      />
+    </div>
+    <div class="control checkbox-container">
+      <input
+        id="auto-frequency"
+        type="checkbox"
+        v-model="scale.autoFrequency"
+        @input="updateScale"
+      /><label for="auto-frequency">Automatic base frequency</label>
+    </div>
+    <div class="control radio-group">
+      <label>Automatic Colors</label>
+      <span>
+        <input
+          type="radio"
+          id="colors-silver"
+          value="silver"
+          v-model="scale.autoColors"
+          @input="updateScale"
+        />
+        <label for="colors-silver"> Silver </label>
+      </span>
+
+      <span>
+        <input
+          type="radio"
+          id="colors-cents"
+          value="cents"
+          v-model="scale.autoColors"
+          @input="updateScale"
+        />
+        <label for="colors-cents"> Cents </label>
+      </span>
+
+      <span>
+        <input
+          type="radio"
+          id="colors-factors"
+          value="factors"
+          v-model="scale.autoColors"
+          @input="updateScale"
+        />
+        <label for="colors-factors"> Factors </label>
+      </span>
+    </div>
+  </div>
+
+  <div class="control-group">
+    <h2>Scale data</h2>
+    <div class="control">
+      <textarea
+        id="scale-data"
+        ref="sourceEditor"
+        rows="20"
+        v-model="scale.sourceText"
+        @input="updateScale"
+        @focus="clearPaletteInfo"
+      ></textarea>
+    </div>
+    <ScaleRule :scale="scale.scale" />
+    <p class="error">{{ scale.error }}</p>
+    <h3>Character palette</h3>
+    <div class="control">
+      <button
+        v-for="(_, character, i) of palette"
+        :key="i"
+        @click="insertFromPalette"
+        @mouseenter="updatePaletteInfo"
+      >
+        {{ character }}
+      </button>
+    </div>
+    <p class="info" v-html="paletteInfo"></p>
+  </div>
+</template>
+
+<style scoped>
+.info {
+  height: 3em;
+  overflow-y: hidden;
+}
+</style>
diff --git a/src/components/ScaleLattice.vue b/src/components/ScaleLattice.vue
deleted file mode 100644
index 93415498..00000000
--- a/src/components/ScaleLattice.vue
+++ /dev/null
@@ -1,282 +0,0 @@
-<script setup lang="ts">
-import type { Interval, Scale } from 'scale-workshop-core'
-import { computed, onMounted, type ComputedRef, ref, onUnmounted } from 'vue'
-import { monzoEuclideanDistance } from '@/utils'
-import { dot, kCombinations } from 'xen-dev-utils'
-const props = defineProps<{
-  scale: Scale
-  heldScaleDegrees: Set<number>
-}>()
-
-type Node = {
-  x: number
-  y: number
-  label: string
-  index: number
-  fill: string
-}
-
-// Based on Kraig Grady's coordinate system https://anaphoria.com/wilsontreasure.html
-// X-coordinates for every prime up to 23.
-const horizontalCoords = [-23, 40, 0, 13, -14, -8, -5, 7, 20]
-// Y-coordinates for every prime up to 23.
-const verticalCoords = [-45, 0, -40, -11, -18, -4, -32, -25, -6]
-
-const container = ref<HTMLDivElement | null>(null)
-
-const adjustLatticeSize = () => {
-  if (container.value) {
-    const containerBox = container.value.getBoundingClientRect()
-    const containerHeight = window.innerHeight - containerBox.top
-    const image: HTMLElement | null = container.value.querySelector('#lattice')
-
-    if (container.value && image) {
-      image.style.width = `100%`
-      image.style.height = `${containerHeight}px`
-    }
-  }
-}
-
-onMounted(() => {
-  adjustLatticeSize()
-  window.addEventListener('resize', adjustLatticeSize)
-})
-
-onUnmounted(() => {
-  window.removeEventListener('resize', adjustLatticeSize)
-})
-
-// === Computed state ===
-
-const canLatticePrimes = computed(() => {
-  try {
-    return props.scale.intervals.reduce(
-      (canLattice: boolean, interval: Interval) =>
-        canLattice &&
-        interval.monzo
-          .toIntegerMonzo()
-          .slice(9) // hardcoded for now to the 23-limit
-          .reduce((isZero: boolean, component: number) => isZero && component === 0, true),
-      true
-    )
-  } catch {
-    return false
-  }
-})
-
-function maybeGetPrimeEquave(equave: Interval): number | null {
-  try {
-    const intergerMonzo: number[] = equave.monzo.toIntegerMonzo()
-    return intergerMonzo.reduce(
-      (primeIndex: number | null, component: number, i: number): number | null => {
-        if (component === 1 && !primeIndex) {
-          return i
-        }
-        if (component !== 0) {
-          throw new Error('Equave is not a prime number')
-        }
-        if (component === 0) {
-          return primeIndex
-        }
-        return null
-      },
-      null
-    )
-  } catch {
-    return null
-  }
-}
-
-const equavePrimeIndex = computed(() => maybeGetPrimeEquave(props.scale.equave))
-
-const nodes: ComputedRef<Node[] | string> = computed(() => {
-  try {
-    if (equavePrimeIndex.value === null) {
-      return 'The lattice only supports scales with a prime equave'
-    }
-    if (props.scale.intervals.length <= 1) {
-      return 'A scale must contain at least two intervals'
-    }
-    return props.scale.intervals.map(({ monzo, name: label }, index: number) => {
-      const vector = monzo.toIntegerMonzo()
-      // Make the interval of equivalence disappear.
-      vector[equavePrimeIndex.value!] = 0
-      return {
-        label,
-        x: dot(horizontalCoords, vector),
-        y: dot(verticalCoords, vector),
-        fill: 'white',
-        index
-      }
-    })
-  } catch {
-    return 'Cannot make lattice of non JI scale.'
-  }
-})
-
-const nodesByLabel: ComputedRef<{ [key: string]: Node }> = computed(() =>
-  Array.isArray(nodes.value)
-    ? nodes.value.reduce((acc, node) => ({ ...acc, [node.label]: node }), {})
-    : {}
-)
-
-const edges = computed(() => {
-  try {
-    if (!Array.isArray(nodes.value)) {
-      return []
-    }
-
-    const combinations = kCombinations(props.scale.intervals, 2)
-    return combinations
-      .map(([a, b]) => {
-        return {
-          distance: monzoEuclideanDistance(
-            equavePrimeIndex.value ?? -1, //adding a type check outside of this map doesn't seem to work so passing in -1
-            a.monzo.toIntegerMonzo(),
-            b.monzo.toIntegerMonzo()
-          ),
-          pair: [a.name, b.name]
-        }
-      })
-      .filter(({ distance }) => distance === 1)
-  } catch {
-    return []
-  }
-})
-
-const svgElement = ref<HTMLElement | null>(null)
-
-const viewBox = computed(() => {
-  if (svgElement.value) {
-    return [
-      ...svgElement.value.querySelectorAll('text'),
-      ...svgElement.value.querySelectorAll('circle')
-    ].reduce(
-      ({ minX, maxX, minY, maxY }, el) => {
-        const { x, y, width, height } = el.getBBox({
-          stroke: true,
-          fill: true
-        })
-        return {
-          minX: Math.min(minX, x),
-          minY: Math.min(minY, y),
-          maxX: Math.max(maxX, x + width),
-          maxY: Math.max(maxY, y + height)
-        }
-      },
-      {
-        minX: Infinity,
-        minY: Infinity,
-        maxX: -Infinity,
-        maxY: -Infinity
-      }
-    )
-  }
-  return {
-    minX: 0,
-    minY: 0,
-    maxX: 0,
-    maxY: 0
-  }
-})
-
-function isNodeErrorMessage(nodeValue: any): nodeValue is string {
-  return typeof nodeValue === 'string'
-}
-
-const error = computed(() => {
-  if (!canLatticePrimes.value) {
-    return 'Can only make lattice of JI scales up to 23-limit'
-  }
-  if (isNodeErrorMessage(nodes.value)) {
-    return (
-      nodes.value ||
-      'There was an unknown error while making this lattice, please try again or with another scale.'
-    )
-  }
-  return null
-})
-</script>
-
-<template>
-  <div ref="container" class="container">
-    <div v-if="error">
-      <p>{{ error }}</p>
-    </div>
-    <div v-else>
-      <svg
-        v-if="Array.isArray(nodes)"
-        ref="svgElement"
-        id="lattice"
-        xmlns="http://www.w3.org/2000/svg"
-        preserveAspectRatio="xMidYMid meet"
-        :viewBox="
-          [
-            viewBox.minX,
-            viewBox.minY,
-            viewBox.maxX - viewBox.minX,
-            viewBox.maxY - viewBox.minY
-          ].join(' ')
-        "
-      >
-        <line
-          v-for="edge of edges"
-          class="edge"
-          :key="edge.pair.join()"
-          :x1="nodesByLabel[edge.pair[0]].x"
-          :x2="nodesByLabel[edge.pair[1]].x"
-          :y1="nodesByLabel[edge.pair[0]].y"
-          :y2="nodesByLabel[edge.pair[1]].y"
-        />
-        <circle
-          v-for="(node, index) of nodes"
-          :key="index"
-          :cx="node.x"
-          :cy="node.y"
-          r="2.5"
-          :class="{ node: true, heldDegree: heldScaleDegrees.has(node.index) }"
-        />
-        <!-- Separating the iteration of the labels so that circles don't overlap any text -->
-        <text
-          v-for="(node, index) of nodes"
-          :key="index"
-          class="node-text"
-          :x="node.x"
-          :y="node.y - 4"
-        >
-          {{ node.label }}
-        </text>
-      </svg>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-.container {
-  flex-grow: 1;
-}
-svg {
-  background-color: transparent;
-}
-.edge {
-  stroke: var(--color-text);
-  stroke-width: 0.5;
-}
-
-.node {
-  fill: var(--color-text);
-}
-
-.node.heldDegree {
-  fill: var(--color-accent);
-}
-
-.node-text {
-  font-family: sans-serif;
-  font-size: 7px;
-  fill: var(--color-accent-text-btn);
-  text-anchor: middle;
-  stroke: var(--color-background);
-  stroke-width: 0.2;
-}
-</style>
diff --git a/src/components/ScaleLineInput.vue b/src/components/ScaleLineInput.vue
index c44f827f..203117f8 100644
--- a/src/components/ScaleLineInput.vue
+++ b/src/components/ScaleLineInput.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import { DEFAULT_NUMBER_OF_COMPONENTS } from '@/constants'
-import { computedAndError, setAndReportValidity } from '@/utils'
-import { parseLine, type Interval } from 'scale-workshop-core'
+import { computedAndError, parseInterval, setAndReportValidity } from '@/utils'
+import { type Interval } from 'sonic-weave'
 import { ref, watch } from 'vue'
 
 const props = defineProps<{
@@ -13,10 +12,7 @@ const props = defineProps<{
 const emit = defineEmits(['update:value', 'update:modelValue'])
 
 const element = ref<HTMLInputElement | null>(null)
-const [value, error] = computedAndError(
-  () => parseLine(props.modelValue, DEFAULT_NUMBER_OF_COMPONENTS),
-  props.defaultValue
-)
+const [value, error] = computedAndError(() => parseInterval(props.modelValue), props.defaultValue)
 watch(value, (newValue) => emit('update:value', newValue), { immediate: true })
 watch(element, (newElement) => setAndReportValidity(newElement, error.value), { immediate: true })
 watch(error, (newError) => setAndReportValidity(element.value, newError), { immediate: true })
diff --git a/src/components/ScaleRule.vue b/src/components/ScaleRule.vue
index 890d2588..bccfca2a 100644
--- a/src/components/ScaleRule.vue
+++ b/src/components/ScaleRule.vue
@@ -1,18 +1,18 @@
 <script setup lang="ts">
-import type { Scale } from 'scale-workshop-core'
+import type { Scale } from '@/scale'
 import { computed } from 'vue'
-import { mmod } from 'xen-dev-utils'
+import { mmod, valueToCents } from 'xen-dev-utils'
 
 const props = defineProps<{
   scale: Scale
 }>()
 
 const ticksAndColors = computed(() => {
-  const equaveCents = props.scale.equave.totalCents()
+  const equaveCents = valueToCents(props.scale.equaveRatio)
   const result = []
 
   for (let i = 0; i < props.scale.size; ++i) {
-    const cents = props.scale.getMonzo(i).toCents()
+    const cents = valueToCents(props.scale.intervalRatios[i])
     const tick = cents / equaveCents
     let color = 'var(--color-text)'
     if (tick < 0) {
@@ -21,6 +21,7 @@ const ticksAndColors = computed(() => {
       color = 'red'
     }
     if (!isNaN(tick) && isFinite(tick)) {
+      // mmod(1, 1) === 0 so we don't have to push the unison tick
       result.push([`${0.5 + 99 * mmod(tick, 1)}%`, color])
     }
   }
diff --git a/src/components/TuningTable.vue b/src/components/TuningTable.vue
index 554e9ef4..6f036179 100644
--- a/src/components/TuningTable.vue
+++ b/src/components/TuningTable.vue
@@ -2,61 +2,64 @@
 import { computed } from 'vue'
 import TuningTableRow from '@/components/TuningTableRow.vue'
 import { mmod } from 'xen-dev-utils'
-import type { Scale } from 'scale-workshop-core'
 
 const props = defineProps<{
-  scale: Scale
-  frequencies: number[]
+  baseFrequency: number
+  frequencies: number[] // All 128 frequencies
+  centss: number[] // All 128 cents values
+  heldNotes: Map<number, number>
   baseMidiNote: number
-  keyColors: string[]
+  labels: string[] // Labels from #1 to the equave
+  colors: string[] // Colors from #1 to the equave
 }>()
 
 const rows = computed(() => {
-  const colors = props.keyColors.length ? props.keyColors : ['white']
+  const inverseBaseFreq = 1 / props.baseFrequency
   return props.frequencies.map((frequency, i) => {
+    const active = (props.heldNotes.get(i) ?? 0) > 0
     const index = i - props.baseMidiNote
+    const ratio = frequency * inverseBaseFreq
+    const cents = props.centss[i]
     return {
       index: i,
-      frequency: frequency,
-      cents: props.scale.getCents(index),
-      ratio: props.scale.getRatio(index),
-      name: props.scale.getName(index),
-      keyColor: colors[mmod(index, colors.length)],
+      active,
+      frequency,
+      cents,
+      ratio: ratio,
+      label: props.labels[mmod(index - 1, props.labels.length)],
+      color: props.colors[mmod(index - 1, props.colors.length)],
       isRoot: index === 0,
-      equave: mmod(index, props.scale.size) === 0
+      equave: mmod(index, props.labels.length) === 0
     }
   })
 })
 </script>
 
 <template>
-  <div class="column tuning-table">
-    <table>
-      <thead>
-        <tr>
-          <th>&nbsp;</th>
-          <th>#</th>
-          <th>Freq</th>
-          <th>Cents</th>
-          <th>Ratio</th>
-          <th>Name</th>
-        </tr>
-      </thead>
-      <tbody>
-        <TuningTableRow v-for="row of rows" :key="row.index" v-bind="row" />
-      </tbody>
-    </table>
-  </div>
+  <table>
+    <thead>
+      <tr>
+        <th>&nbsp;</th>
+        <th>#</th>
+        <th>Freq</th>
+        <th>Cents</th>
+        <th>Ratio</th>
+        <th>Label</th>
+      </tr>
+    </thead>
+    <tbody>
+      <TuningTableRow v-for="row of rows" :key="row.index" v-bind="row" />
+    </tbody>
+  </table>
 </template>
 
-<style>
-/* Tuning table */
-.tuning-table table {
+<style scoped>
+table {
   width: 100%;
   text-align: center;
   border-spacing: 0px;
 }
-.tuning-table table th {
+table th {
   position: sticky;
   top: 0;
   z-index: 1;
@@ -64,7 +67,7 @@ const rows = computed(() => {
   border-bottom: 1px solid var(--color-border);
   font-weight: bold;
 }
-.tuning-table table tr:nth-of-type(2n) {
+table table tr:nth-of-type(2n) {
   background-color: var(--color-background-soft);
 }
 </style>
diff --git a/src/components/TuningTableRow.vue b/src/components/TuningTableRow.vue
index 16657ba5..fe3213e6 100644
--- a/src/components/TuningTableRow.vue
+++ b/src/components/TuningTableRow.vue
@@ -7,25 +7,16 @@ const props = defineProps<{
   frequency: number
   cents: number
   ratio: number
-  name: string
-  keyColor: string
+  label: string
+  color: string
+  active: boolean
   isRoot: boolean
   equave: boolean
 }>()
 
 const element = ref<HTMLTableRowElement | null>(null)
 
-// Application state is not suited for real-time display
-// se we use hacks to bypass it.
 onMounted(() => {
-  const rows = (window as any).TUNING_TABLE_ROWS
-  const heldKeys = rows[props.index]?.heldKeys || 0
-  rows[props.index] = { heldKeys, element }
-
-  if (heldKeys) {
-    ;(element as any)._rawValue.classList.add('active')
-  }
-
   const isMediumOrLarger = window.matchMedia('screen and (min-width: 600px)').matches
 
   if (props.isRoot && isMediumOrLarger) {
@@ -35,13 +26,13 @@ onMounted(() => {
 </script>
 
 <template>
-  <tr ref="element" :class="{ equave }" :style="'background-color:' + keyColor + ';'">
-    <td class="key-color" :style="'background-color:' + keyColor + ' !important;'"></td>
+  <tr ref="element" :class="{ active, equave }" :style="'background-color:' + color + ';'">
+    <td class="key-color" :style="'background-color:' + color + ' !important;'"></td>
     <td>{{ index }}</td>
     <td>{{ formatHertz(frequency) }}</td>
     <td>{{ formatExponential(cents) }}</td>
     <td>{{ formatExponential(ratio) }}</td>
-    <td>{{ name }}</td>
+    <td>{{ label }}</td>
   </tr>
 </template>
 
diff --git a/src/components/VirtualKeyboard.vue b/src/components/VirtualKeyboard.vue
index e350334e..482c2670 100644
--- a/src/components/VirtualKeyboard.vue
+++ b/src/components/VirtualKeyboard.vue
@@ -36,7 +36,7 @@ const virtualKeys = computed(() => {
         x,
         y,
         index,
-        color: colors[mmod(index - props.baseMidiNote, colors.length)]
+        color: colors[mmod(index - props.baseMidiNote - 1, colors.length)]
       })
     }
     result.push([y, row])
diff --git a/src/components/VirtualPiano.vue b/src/components/VirtualPiano.vue
index 1a00f76b..dea89fd0 100644
--- a/src/components/VirtualPiano.vue
+++ b/src/components/VirtualPiano.vue
@@ -1,15 +1,19 @@
 <script setup lang="ts">
 import { LEFT_MOUSE_BTN } from '@/constants'
 import { computed, onMounted, onUnmounted, ref } from 'vue'
-import { mmod } from 'xen-dev-utils'
 
 type NoteOff = () => void
 type NoteOnCallback = (index: number) => NoteOff
+type ColorMap = (index: number) => string
 
 const props = defineProps<{
-  baseMidiNote: number
-  baseIndex: number // Should incorporate equave shift
-  keyColors: string[]
+  baseIndex: number
+  colorMap: ColorMap
+  splitAccidentals: boolean
+  accidentalColor: string
+  lowAccidentalColor: string
+  middleAccidentalColor: string
+  highAccidentalColor: string
   noteOn: NoteOnCallback
   heldNotes: Map<number, number>
 }>()
@@ -25,57 +29,225 @@ type VirtualKey = {
 type VirtualBlackKey = {
   x: number
   index: number
+  color: string
+}
+
+type VirtualSplitKey = {
+  x: number
+  y: string
+  height: string
+  index: number
+  color: string
 }
 
 const NUM_KEYS = 30
 
+// Percentages of SVG height
+const TOP_Y = 20
+const SPLIT_BOTTOM_Y = 60
+
 const noteOffs: Map<number, NoteOff> = new Map()
 
 const whiteKeys = computed(() => {
-  const colors = props.keyColors.length ? props.keyColors : ['white']
+  const low = props.lowAccidentalColor.toLowerCase()
+  const middle = props.middleAccidentalColor.toLowerCase()
+  const high = props.highAccidentalColor.toLowerCase()
+  const black = props.accidentalColor.toLowerCase()
+
   const result: VirtualKey[] = []
-  for (let x = 0; x < NUM_KEYS; ++x) {
-    const index = props.baseIndex + x
-    const colorIndex = index - props.baseMidiNote
-    const color = colors[mmod(colorIndex, colors.length)]
-    if (color.toLowerCase() !== 'black') {
-      let left = 0
-      while (colors[mmod(colorIndex - 1 - left, colors.length)].toLowerCase() === 'black') {
-        left++
+
+  if (props.splitAccidentals) {
+    const mainSeen = new Set<string>()
+    let x = 0
+    for (let i = 0; i < 3 * NUM_KEYS; ++i) {
+      const index = props.baseIndex + i
+      const color = props.colorMap(index)
+      if (color === low || color === middle || color === high) {
+        if (mainSeen.has(color)) {
+          x++
+          mainSeen.clear()
+        }
+        mainSeen.add(color)
+      } else {
+        const seen = new Set<string>()
+        let j = 0
+        let left = 0
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+          const acc = props.colorMap(index - 1 - j)
+          if (acc !== low && acc !== middle && acc !== high) {
+            break
+          }
+          if (seen.has(acc)) {
+            left++
+            seen.clear()
+          }
+          seen.add(acc)
+          j++
+        }
+        if (seen.size) {
+          left++
+        }
+
+        j = 0
+        let right = 0
+        seen.clear()
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+          const acc = props.colorMap(index + 1 + j)
+          if (acc !== low && acc !== middle && acc !== high) {
+            break
+          }
+          if (seen.has(acc)) {
+            right++
+            seen.clear()
+          }
+          seen.add(acc)
+          j++
+        }
+        if (seen.size) {
+          right++
+        }
+
+        if (mainSeen.size) {
+          x++
+        }
+        mainSeen.clear()
+        result.push({
+          x,
+          left,
+          right,
+          index,
+          color
+        })
+        x++
       }
-      let right = 0
-      while (colors[mmod(colorIndex + 1 + right, colors.length)].toLowerCase() === 'black') {
-        right++
+    }
+  } else {
+    for (let x = 0; x < NUM_KEYS; ++x) {
+      const index = props.baseIndex + x
+      const color = props.colorMap(index)
+      if (color !== black) {
+        let left = 0
+        while (props.colorMap(index - 1 - left) === black) {
+          left++
+        }
+        let right = 0
+        while (props.colorMap(index + 1 + right) == black) {
+          right++
+        }
+        result.push({
+          x,
+          left,
+          right,
+          index,
+          color
+        })
       }
-      result.push({
-        x,
-        left,
-        right,
-        index,
-        color
-      })
     }
   }
   return result
 })
 
 const blackKeys = computed(() => {
-  const colors = props.keyColors.length ? props.keyColors : ['white']
+  const black = props.accidentalColor.toLowerCase()
   const result: VirtualBlackKey[] = []
   for (let x = 0; x < NUM_KEYS; ++x) {
     const index = props.baseIndex + x
-    const colorIndex = index - props.baseMidiNote
-    const color = colors[mmod(colorIndex, colors.length)]
-    if (color.toLowerCase() === 'black') {
+    const color = props.colorMap(index)
+    if (color === black) {
       result.push({
         x,
-        index
+        index,
+        color
       })
     }
   }
   return result
 })
 
+const splitKeys = computed(() => {
+  const low = props.lowAccidentalColor.toLowerCase()
+  const middle = props.middleAccidentalColor.toLowerCase()
+  const high = props.highAccidentalColor.toLowerCase()
+  const result: VirtualSplitKey[] = []
+  let lowKey: VirtualSplitKey | undefined
+  let middleKey: VirtualSplitKey | undefined
+  let highKey: VirtualSplitKey | undefined
+  let x = 0
+
+  function pushKeys() {
+    let y = TOP_Y
+    if (lowKey || middleKey || highKey) {
+      x++
+    }
+    if (highKey) {
+      let height = SPLIT_BOTTOM_Y - y
+      if (middleKey && lowKey) {
+        height /= 3
+      } else if (middleKey || lowKey) {
+        height /= 2
+      } else {
+        height *= 0.8
+      }
+      highKey.height = `${height}%`
+      result.push(highKey)
+      highKey = undefined
+      y += height
+    }
+    if (middleKey) {
+      let height = SPLIT_BOTTOM_Y - y
+      if (lowKey) {
+        height /= 2
+      }
+      middleKey.y = `${y}%`
+      middleKey.height = `${height}%`
+      result.push(middleKey)
+      middleKey = undefined
+      y += height
+    }
+    if (lowKey) {
+      const height = SPLIT_BOTTOM_Y - y
+      lowKey.y = `${y}%`
+      lowKey.height = `${height}%`
+      result.push(lowKey)
+      lowKey = undefined
+    }
+  }
+
+  for (let i = 0; i < 3 * NUM_KEYS; ++i) {
+    const index = props.baseIndex + i
+    const color = props.colorMap(index)
+    if (color === low) {
+      if (lowKey) {
+        pushKeys()
+      }
+      lowKey = {
+        x,
+        index,
+        color,
+        y: '',
+        height: ''
+      }
+    } else if (color === middle) {
+      if (middleKey) {
+        pushKeys()
+      }
+      middleKey = { x, index, color, y: '', height: '' }
+    } else if (color === high) {
+      if (highKey) {
+        pushKeys()
+      }
+      highKey = { x, index, color, y: `${TOP_Y}%`, height: '' }
+    } else {
+      x++
+      pushKeys()
+    }
+  }
+  pushKeys()
+  return result
+})
+
 const isMousePressed = ref(false)
 
 function start(index: number) {
@@ -175,22 +347,44 @@ onUnmounted(() => {
       height="55%"
       :style="'fill:' + key.color + ';'"
     />
-    <rect
-      v-for="(key, i) of blackKeys"
-      :key="i"
-      @touchstart="onTouchStart($event, key.index)"
-      @touchend="onTouchEnd($event, key.index)"
-      @touchcancel="onTouchEnd($event, key.index)"
-      @mousedown="onMouseDown($event, key.index)"
-      @mouseup="onMouseUp($event, key.index)"
-      @mouseenter="onMouseEnter($event, key.index)"
-      @mouseleave="onMouseLeave($event, key.index)"
-      :class="{ black: true, active: (heldNotes.get(key.index) || 0) > 0 }"
-      :x="4 * key.x + '%'"
-      y="20%"
-      width="4%"
-      height="30%"
-    />
+    <template v-if="splitAccidentals">
+      <rect
+        v-for="(key, i) of splitKeys"
+        :key="i"
+        @touchstart="onTouchStart($event, key.index)"
+        @touchend="onTouchEnd($event, key.index)"
+        @touchcancel="onTouchEnd($event, key.index)"
+        @mousedown="onMouseDown($event, key.index)"
+        @mouseup="onMouseUp($event, key.index)"
+        @mouseenter="onMouseEnter($event, key.index)"
+        @mouseleave="onMouseLeave($event, key.index)"
+        :class="{ black: true, active: (heldNotes.get(key.index) || 0) > 0 }"
+        :x="4 * key.x + '%'"
+        :y="key.y"
+        :height="key.height"
+        :style="'fill:' + key.color + ';'"
+        width="4%"
+      />
+    </template>
+    <template v-else>
+      <rect
+        v-for="(key, i) of blackKeys"
+        :key="i"
+        @touchstart="onTouchStart($event, key.index)"
+        @touchend="onTouchEnd($event, key.index)"
+        @touchcancel="onTouchEnd($event, key.index)"
+        @mousedown="onMouseDown($event, key.index)"
+        @mouseup="onMouseUp($event, key.index)"
+        @mouseenter="onMouseEnter($event, key.index)"
+        @mouseleave="onMouseLeave($event, key.index)"
+        :class="{ black: true, active: (heldNotes.get(key.index) || 0) > 0 }"
+        :x="4 * key.x + '%'"
+        y="20%"
+        width="4%"
+        height="30%"
+        :style="'fill:' + key.color + ';'"
+      />
+    </template>
   </svg>
 </template>
 
@@ -212,6 +406,6 @@ svg rect.black {
   stroke-opacity: 0.5;
 }
 svg rect.black.active {
-  fill: green;
+  fill: green !important;
 }
 </style>
diff --git a/src/components/VirtualTypingKeyboard.vue b/src/components/VirtualTypingKeyboard.vue
index efdb7e3f..3ee358fc 100644
--- a/src/components/VirtualTypingKeyboard.vue
+++ b/src/components/VirtualTypingKeyboard.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, reactive, ref } from 'vue'
-import { mmod } from 'xen-dev-utils'
 import type { Keyboard, CoordinateKeyboardEvent } from 'isomorphic-qwerty'
 import { CODES_LAYER_1, COORDS_BY_CODE } from 'isomorphic-qwerty'
 import { LEFT_MOUSE_BTN } from '@/constants'
@@ -13,14 +12,15 @@ import { LEFT_MOUSE_BTN } from '@/constants'
 
 type NoteOff = () => void
 type NoteOnCallback = (index: number) => NoteOff
+type ColorMap = (index: number) => string
 
 const props = defineProps<{
-  baseIndex: number // Should incorporate equave shift
-  baseMidiNote: number
-  keyColors: string[]
+  baseIndex: number // Should incorporate shifts
+  colorMap: ColorMap
   keyboardMode: 'isomorphic' | 'piano'
   colorScheme: 'light' | 'dark'
-  keyboardMapping: Map<string, number>
+  qwertyMapping: Map<string, number>
+  hasLeftOfZ: boolean
   isomorphicHorizontal: number
   isomorphicVertical: number
   noteOn: NoteOnCallback
@@ -58,12 +58,10 @@ const activeKeys = reactive(new Set())
 const disabledFill = computed(() => (props.colorScheme === 'light' ? 'whitesmoke' : 'gray'))
 
 const rows = computed(() => {
-  const colors = props.keyColors.length ? props.keyColors : ['white']
   const horizontal = props.isomorphicHorizontal
   const vertical = props.isomorphicVertical
   const base = props.baseIndex
-  const midi = props.baseMidiNote
-  const mapping = props.keyboardMapping
+  const mapping = props.qwertyMapping
 
   const result: VirtualKey[][] = []
 
@@ -76,23 +74,30 @@ const rows = computed(() => {
       if (code === null || code === 'Backquote') {
         continue
       }
-      let index
+      let index: number | undefined = base
       if (props.keyboardMode === 'isomorphic') {
         const [x, y] = COORDS_BY_CODE.get(code)!
-        index = base + x * horizontal + (2 - y) * vertical
+        index += base + x * horizontal + (2 - y) * vertical
       } else {
-        index = mapping!.get(code)
+        index = mapping.get(code)
       }
-      const color =
-        index === undefined ? disabledFill.value : colors[mmod(index - midi, colors.length)]
+      let color = index === undefined ? disabledFill.value : props.colorMap(index)
       const black = color.toLowerCase() === 'black'
+      let stroke = 'dimgray'
+      if (index === undefined) {
+        stroke = disabledFill.value
+      }
+      if (code === 'IntlBackslash' && !props.hasLeftOfZ) {
+        stroke = 'red'
+        color = disabledFill.value
+      }
       row.push({
         key: code,
         x: offsets[j] + 100 * i,
         y: 100 + 100 * j,
         index,
-        color: color,
-        stroke: index === undefined ? disabledFill.value : 'dimgray',
+        color,
+        stroke,
         class: {
           black,
           white: !black && index !== undefined,
diff --git a/src/components/modals/export/KorgExport.vue b/src/components/modals/export/KorgExport.vue
index fc0122df..32d23bf3 100644
--- a/src/components/modals/export/KorgExport.vue
+++ b/src/components/modals/export/KorgExport.vue
@@ -3,14 +3,18 @@ import { KorgModels, KorgExporter, getKorgModelInfo } from '@/exporters/korg'
 import { sanitizeFilename } from '@/utils'
 import { computed, ref } from 'vue'
 import Modal from '@/components/ModalDialog.vue'
-import type { Scale } from 'scale-workshop-core'
 import type { ExporterParams } from '@/exporters/base'
+import type { Interval } from 'sonic-weave'
+import type { Scale } from '@/scale'
 
 const props = defineProps<{
   newline: string
   scaleName: string
   baseMidiNote: number
+  baseFrequency: number
   midiOctaveOffset: number
+  relativeIntervals: Interval[]
+  labels: string[]
   scale: Scale
 }>()
 
@@ -28,7 +32,7 @@ const useOctaveFormat = ref(false)
 
 const dialogErrorMessage = computed(() => {
   if (useOctaveFormat.value) {
-    const message = KorgExporter.getOctaveFormatErrorMessage(props.scale)
+    const message = KorgExporter.getOctaveFormatErrorMessage(props.relativeIntervals)
     if (message.length > 0) return message
   }
   // Can check for other errors here...
@@ -44,6 +48,9 @@ async function doExport() {
   const params: ExporterParams = {
     newline: props.newline,
     scale: props.scale,
+    relativeIntervals: props.relativeIntervals,
+    labels: props.labels,
+    baseFrequency: props.baseFrequency,
     filename: sanitizeFilename(props.scaleName),
     baseMidiNote: props.baseMidiNote,
     midiOctaveOffset: props.midiOctaveOffset
diff --git a/src/components/modals/export/MtsSysexExport.vue b/src/components/modals/export/MtsSysexExport.vue
index 9dea7f27..4b345373 100644
--- a/src/components/modals/export/MtsSysexExport.vue
+++ b/src/components/modals/export/MtsSysexExport.vue
@@ -3,16 +3,20 @@ import MtsSysexExporter from '@/exporters/mts-sysex'
 import { sanitizeFilename } from '@/utils'
 import { ref, watch } from 'vue'
 import Modal from '@/components/ModalDialog.vue'
-import type { Scale } from 'scale-workshop-core'
 import { clamp } from 'xen-dev-utils'
 import type { ExporterParams } from '@/exporters/base'
+import type { Scale } from '@/scale'
+import type { Interval } from 'sonic-weave'
 
 const props = defineProps<{
   newline: string
   scaleName: string
   baseMidiNote: number
+  baseFrequency: number
   midiOctaveOffset: number
+  relativeIntervals: Interval[]
   scale: Scale
+  labels: string[]
 }>()
 
 const emit = defineEmits(['confirm', 'cancel'])
@@ -55,7 +59,10 @@ function doExport() {
     scale: props.scale,
     filename: sanitizeFilename(props.scaleName),
     baseMidiNote: props.baseMidiNote,
+    baseFrequency: props.baseFrequency,
+    relativeIntervals: props.relativeIntervals,
     midiOctaveOffset: props.midiOctaveOffset,
+    labels: props.labels,
     name: name.value,
     presetIndex: parseInt(presetIndex.value)
   }
diff --git a/src/components/modals/export/ReaperExport.vue b/src/components/modals/export/ReaperExport.vue
index 64278f6a..3dea79f5 100644
--- a/src/components/modals/export/ReaperExport.vue
+++ b/src/components/modals/export/ReaperExport.vue
@@ -3,28 +3,31 @@ import ReaperExporter from '@/exporters/reaper'
 import { sanitizeFilename } from '@/utils'
 import { ref } from 'vue'
 import Modal from '@/components/ModalDialog.vue'
-import type { Scale } from 'scale-workshop-core'
-import type { ExporterParams } from '@/exporters/base'
+import type { ExporterParams, LineFormat } from '@/exporters/base'
+import type { Scale } from '@/scale'
+import type { Interval } from 'sonic-weave'
 
 const props = defineProps<{
   newline: string
   scaleName: string
   baseMidiNote: number
+  baseFrequency: number
   midiOctaveOffset: number
+  relativeIntervals: Interval[]
   scale: Scale
+  labels: string[]
 }>()
 
 const emit = defineEmits(['confirm', 'cancel'])
 
-type Format = 'name' | 'cents' | 'frequency' | 'decimal' | 'degree'
-const formats = [
-  ['name', 'Scale data'],
+const formats: [LineFormat, string][] = [
+  ['label', 'Scale data'],
   ['cents', 'Cents'],
   ['frequency', 'Frequencies'],
   ['decimal', 'Decimal ratios'],
   ['degree', 'Scale degrees']
 ]
-const format = ref<Format>('name')
+const format = ref<LineFormat>('label')
 const basePeriod = ref(0)
 const baseDegree = ref(0)
 const centsRoot = ref(0)
@@ -37,7 +40,10 @@ function doExport() {
     scale: props.scale,
     filename: sanitizeFilename(props.scaleName),
     baseMidiNote: props.baseMidiNote,
+    baseFrequency: props.baseFrequency,
     midiOctaveOffset: props.midiOctaveOffset,
+    relativeIntervals: props.relativeIntervals,
+    labels: props.labels,
     format: format.value,
     basePeriod: basePeriod.value,
     baseDegree: baseDegree.value,
diff --git a/src/components/modals/generation/CombinationProductSet.vue b/src/components/modals/generation/CombinationProductSet.vue
index 1a3deabb..0115f36a 100644
--- a/src/components/modals/generation/CombinationProductSet.vue
+++ b/src/components/modals/generation/CombinationProductSet.vue
@@ -3,11 +3,11 @@ import { ref, watch } from 'vue'
 import Modal from '@/components/ModalDialog.vue'
 import ScaleLineInput from '@/components/ScaleLineInput.vue'
 import { OCTAVE } from '@/constants'
-import { Scale } from 'scale-workshop-core'
 import { useModalStore } from '@/stores/modal'
 import { setAndReportValidity } from '@/utils'
+import { arrayToString, expandCode } from '@/utils'
 
-const emit = defineEmits(['update:scale', 'update:scaleName', 'cancel'])
+const emit = defineEmits(['update:scaleName', 'update:source', 'cancel'])
 
 const modal = useModalStore()
 
@@ -20,14 +20,12 @@ watch(
 // It's not obvious that combination count depends on a parsed text element.
 // I think it's better that the user can try using invalid values and see red.
 
-function generate() {
+function generate(expand = true) {
   try {
-    const scale = Scale.fromCombinations(
-      modal.factors,
-      modal.numElements,
-      modal.addUnity,
-      modal.equave
-    )
+    let source = `cps(${arrayToString(modal.factors)}, ${modal.numElements}, ${modal.equave.toString()}, ${modal.addUnity.toString()})`
+    if (expand) {
+      source = expandCode(source)
+    }
     let name = `CPS (${modal.numElements} of ${modal.factorsString}`
     if (modal.addUnity) {
       name += ' with 1/1'
@@ -37,7 +35,7 @@ function generate() {
     }
     name += ')'
     emit('update:scaleName', name)
-    emit('update:scale', scale)
+    emit('update:source', source)
   } catch (error) {
     if (error instanceof Error) {
       alert(error.message)
@@ -92,5 +90,12 @@ function generate() {
         </div>
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="generate(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="generate(false)">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
diff --git a/src/components/modals/generation/ConcordanceShell.vue b/src/components/modals/generation/ConcordanceShell.vue
new file mode 100644
index 00000000..eac310e8
--- /dev/null
+++ b/src/components/modals/generation/ConcordanceShell.vue
@@ -0,0 +1,140 @@
+<script setup lang="ts">
+import Modal from '@/components/ModalDialog.vue'
+import ScaleLineInput from '@/components/ScaleLineInput.vue'
+import { OCTAVE } from '@/constants'
+import { useModalStore } from '@/stores/modal'
+import { expandCode } from '@/utils'
+import { linear } from 'sonic-weave'
+import { mmod } from 'xen-dev-utils'
+
+const emit = defineEmits(['update:source', 'update:scaleName', 'cancel'])
+
+const modal = useModalStore()
+
+function generate(shell = true, expand = true) {
+  const selectedVao = modal.vaos[modal.vaoIndex]
+  let source = ''
+  if (shell) {
+    const data: [number, string][] = []
+    collecting: for (let i = 0; i < selectedVao.degrees.length; ++i) {
+      const harmonic = selectedVao.harmonics[i]
+      const degree = selectedVao.degrees[i]
+      const reducedDegree = mmod(degree, modal.largeDivisions) || modal.largeDivisions
+      for (let j = 0; j < data.length; ++j) {
+        if (data[j][0] === reducedDegree) {
+          data[j][1] += ' & ' + harmonic.toString()
+          continue collecting
+        }
+      }
+      data.push([reducedDegree, harmonic.toString()])
+    }
+    data.sort((a, b) => a[0] - b[0])
+    if (!data.length || data[data.length - 1][0] !== modal.largeDivisions) {
+      data.push([modal.largeDivisions, ''])
+    }
+    let postfix = `\\${modal.largeDivisions}`
+    if (modal.equave.compare(OCTAVE)) {
+      postfix += `<${linear(modal.equave).toString()}>`
+    }
+    for (const [degree, label] of data) {
+      source += `${degree}${postfix} "${label}"\n`
+    }
+  } else {
+    source = selectedVao.harmonics.join(':')
+  }
+  if (expand) {
+    source = expandCode(source)
+  }
+  emit('update:scaleName', `VAO ${selectedVao.harmonics.join(':')}`)
+  emit('update:source', source)
+}
+</script>
+
+<template>
+  <Modal @confirm="generate" @cancel="$emit('cancel')">
+    <template #header>
+      <h2>Generate VAO / concordance shell</h2>
+    </template>
+    <template #body>
+      <div class="control-group">
+        <div class="control">
+          <label for="denominator">Denominator</label>
+          <input
+            id="denominator"
+            type="number"
+            min="1"
+            class="control"
+            v-model="modal.mediumInteger"
+          />
+        </div>
+        <div class="control">
+          <label for="maximum-numerator">Maximum numerator</label>
+          <input
+            id="maximum-numerator"
+            type="number"
+            :min="modal.mediumInteger"
+            class="control"
+            v-model="modal.largeInteger"
+          />
+        </div>
+        <div class="control">
+          <label for="divisions">Number of equal divisions</label>
+          <input
+            id="divisions"
+            type="number"
+            min="1"
+            class="control"
+            v-model="modal.largeDivisions"
+          />
+        </div>
+        <div class="control">
+          <label for="tolerance">Tolerance in cents</label>
+          <input
+            id="tolerance"
+            type="number"
+            min="0"
+            step="0.5"
+            class="control"
+            v-model="modal.tolerance"
+          />
+        </div>
+        <div class="control">
+          <label for="equave">Equave</label>
+          <ScaleLineInput
+            id="equave"
+            @update:value="modal.equave = $event"
+            v-model="modal.equaveString"
+            :defaultValue="OCTAVE"
+          />
+        </div>
+        <div class="control radio-group">
+          <label>Error model</label>
+          <span>
+            <input type="radio" id="error-rooted" value="rooted" v-model="modal.errorModel" />
+            <label for="error-rooted"> Rooted </label>
+          </span>
+          <span>
+            <input type="radio" id="error-free" value="free" v-model="modal.errorModel" />
+            <label for="error-free"> Free </label>
+          </span>
+        </div>
+        <div class="control">
+          <label for="vao">Vertically aligned object</label>
+          <select id="vao" v-model="modal.vaoIndex">
+            <option v-for="(vao, i) of modal.vaos" :key="i" :value="i">
+              {{ vao.harmonics.join(':') }}
+            </option>
+          </select>
+        </div>
+      </div>
+    </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="() => generate(false, true)">VAO</button>
+        <button @click="() => generate(true, true)">Shell</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="() => generate(false, false)">Raw VAO</button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/src/components/modals/generation/CrossPolytope.vue b/src/components/modals/generation/CrossPolytope.vue
deleted file mode 100644
index 3691f8e0..00000000
--- a/src/components/modals/generation/CrossPolytope.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<script setup lang="ts">
-import { ref, watch } from 'vue'
-import Modal from '@/components/ModalDialog.vue'
-import ScaleLineInput from '@/components/ScaleLineInput.vue'
-import { OCTAVE } from '@/constants'
-import { Scale } from 'scale-workshop-core'
-import { useModalStore } from '@/stores/modal'
-import { setAndReportValidity } from '@/utils'
-
-const emit = defineEmits(['update:scale', 'update:scaleName', 'cancel'])
-
-const modal = useModalStore()
-
-const basisElement = ref<HTMLInputElement | null>(null)
-watch(
-  () => modal.factorsError,
-  (newError) => setAndReportValidity(basisElement.value, newError)
-)
-
-function generate() {
-  try {
-    const scale = Scale.fromCrossPolytope(modal.factors, modal.addUnity, modal.equave)
-    let name = `Cross-polytope (${modal.factorsString}`
-    if (modal.addUnity) {
-      name += ' with 1/1'
-    }
-    if (!modal.equave.equals(OCTAVE)) {
-      name += ` over ${modal.equave.toString()}`
-    }
-    name += ')'
-    emit('update:scaleName', name)
-    emit('update:scale', scale)
-  } catch (error) {
-    if (error instanceof Error) {
-      alert(error.message)
-    } else {
-      alert(error)
-    }
-  }
-}
-</script>
-
-<template>
-  <Modal @confirm="generate" @cancel="$emit('cancel')">
-    <template #header>
-      <h2>Generate cross-polytope (hyperoctahedron)</h2>
-    </template>
-    <template #body>
-      <div class="control-group">
-        <div class="control">
-          <label for="basis">Basis</label>
-          <input
-            ref="basisElement"
-            id="basis"
-            type="text"
-            class="control"
-            placeholder="3 5 7 11"
-            v-model="modal.factorsString"
-          />
-        </div>
-        <div class="control checkbox-container">
-          <input type="checkbox" id="add-unity" v-model="modal.addUnity" />
-          <label for="add-unity">Include 1/1 (origin)</label>
-        </div>
-        <div class="control">
-          <label for="equave">Equave</label>
-          <ScaleLineInput
-            id="equave"
-            @update:value="modal.equave = $event"
-            v-model="modal.equaveString"
-            :defaultValue="OCTAVE"
-          />
-        </div>
-      </div>
-    </template>
-  </Modal>
-</template>
diff --git a/src/components/modals/generation/DwarfScale.vue b/src/components/modals/generation/DwarfScale.vue
deleted file mode 100644
index 19845a8e..00000000
--- a/src/components/modals/generation/DwarfScale.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<script setup lang="ts">
-import { DEFAULT_NUMBER_OF_COMPONENTS } from '@/constants'
-import Modal from '@/components/ModalDialog.vue'
-import { clamp } from 'xen-dev-utils'
-import { Scale } from 'scale-workshop-core'
-import { useModalStore } from '@/stores/modal'
-
-const emit = defineEmits(['update:scale', 'update:scaleName', 'cancel'])
-
-const modal = useModalStore()
-
-function generate() {
-  const clampedVal = clamp(1, 512, modal.val)
-  const scale = Scale.fromDwarf(clampedVal, modal.integerEquave, DEFAULT_NUMBER_OF_COMPONENTS)
-  let name = `Dwarf scale ${clampedVal}`
-  if (modal.integerEquave !== 2) {
-    name += `<${modal.integerEquave}>`
-  }
-  emit('update:scaleName', name)
-  emit('update:scale', scale)
-}
-</script>
-
-<template>
-  <Modal @confirm="generate" @cancel="$emit('cancel')">
-    <template #header>
-      <h2>Generate dwarf scale</h2>
-    </template>
-    <template #body>
-      <div class="control-group">
-        <div class="control">
-          <label for="val">Patent val</label>
-          <input id="val" type="number" min="1" max="512" class="control" v-model="modal.val" />
-        </div>
-        <div class="control">
-          <label for="equave">Equave</label>
-          <input id="equave" type="number" min="2" class="control" v-model="modal.integerEquave" />
-        </div>
-      </div>
-    </template>
-  </Modal>
-</template>
diff --git a/src/components/modals/generation/EnumerateChord.vue b/src/components/modals/generation/EnumerateChord.vue
index c0ed97f1..9a62f26b 100644
--- a/src/components/modals/generation/EnumerateChord.vue
+++ b/src/components/modals/generation/EnumerateChord.vue
@@ -1,22 +1,23 @@
 <script setup lang="ts">
 import Modal from '@/components/ModalDialog.vue'
-import { parseChordInput } from '@/utils'
-import { Scale } from 'scale-workshop-core'
+import { expandCode } from '@/utils'
 import { useModalStore } from '@/stores/modal'
 
-const emit = defineEmits(['update:scale', 'update:scaleName', 'cancel'])
+const emit = defineEmits(['update:source', 'update:scaleName', 'cancel'])
 
 const modal = useModalStore()
 
-function generate() {
+function generate(expand = true) {
   try {
-    const intervals = parseChordInput(modal.chord)
-    const scale = Scale.fromChord(intervals)
+    let source = modal.chordIntervals.map((i) => i.toString()).join(':')
     emit('update:scaleName', `Chord ${modal.chord}`)
-    if (modal.invertChord) {
-      emit('update:scale', scale.invert())
+    if (modal.retrovertChord) {
+      source = `retroverted(${source})`
+    }
+    if (expand) {
+      emit('update:source', expandCode(source))
     } else {
-      emit('update:scale', scale)
+      emit('update:source', source)
     }
   } catch (error) {
     if (error instanceof Error) {
@@ -46,10 +47,17 @@ function generate() {
           />
         </div>
         <div class="control checkbox-container">
-          <input type="checkbox" id="integrate-period" v-model="modal.invertChord" />
-          <label for="integrate-period">Invert chord</label>
+          <input type="checkbox" id="integrate-period" v-model="modal.retrovertChord" />
+          <label for="integrate-period">Retrovert chord (negative harmony)</label>
         </div>
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="() => generate(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="() => generate(false)">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
diff --git a/src/components/modals/generation/EqualTemperament.vue b/src/components/modals/generation/EqualTemperament.vue
index 34db2ec4..f47ec9cd 100644
--- a/src/components/modals/generation/EqualTemperament.vue
+++ b/src/components/modals/generation/EqualTemperament.vue
@@ -1,19 +1,15 @@
 <script setup lang="ts">
-import { DEFAULT_NUMBER_OF_COMPONENTS, OCTAVE } from '@/constants'
+import { OCTAVE } from '@/constants'
 import { ref, watch } from 'vue'
 import Modal from '@/components/ModalDialog.vue'
 import ScaleLineInput from '@/components/ScaleLineInput.vue'
-import { ExtendedMonzo, Interval, Scale } from 'scale-workshop-core'
 import { useModalStore } from '@/stores/modal'
 import { setAndReportValidity } from '@/utils'
+import { useStateStore } from '@/stores/state'
 
-const props = defineProps<{
-  centsFractionDigits: number
-  decimalFractionDigits: number
-}>()
-
-const emit = defineEmits(['update:scale', 'update:scaleName', 'cancel'])
+const emit = defineEmits(['update:source', 'update:scaleName', 'cancel'])
 
+const state = useStateStore()
 const modal = useModalStore()
 
 const divisionsElement = ref<HTMLInputElement | null>(null)
@@ -29,33 +25,32 @@ watch(
   }
 )
 
-function generate() {
-  const lineOptions = {
-    centsFractionDigits: props.centsFractionDigits,
-    decimalFractionDigits: props.decimalFractionDigits
-  }
+function generate(expand = true) {
   if (modal.singleStepOnly) {
-    const stepCents = modal.equave.totalCents() / modal.divisions
-    const scale = Scale.fromIntervalArray([
-      new Interval(
-        ExtendedMonzo.fromCents(stepCents, DEFAULT_NUMBER_OF_COMPONENTS),
-        'cents',
-        undefined,
-        lineOptions
-      )
-    ])
-    emit('update:scaleName', `${scale.equave.name} cET`)
-    emit('update:scale', scale)
+    const stepCents = modal.equave.value.totalCents() / modal.divisions
+    const line = stepCents.toFixed(state.centsFractionDigits)
+    emit('update:scaleName', `${line} cET`)
+    emit('update:source', line)
   } else {
-    // Implicit use of safeScaleSize. Note that small subsets of huge EDOs cause no issues.
-    const scale = Scale.fromEqualTemperamentSubset(
-      modal.degrees,
-      modal.equave.mergeOptions(lineOptions)
-    )
-    // Obtain effective divisions from the scale just generated.
-    const effectiveDivisions = scale.getInterval(0).options.preferredEtDenominator
-    emit('update:scaleName', `${effectiveDivisions} equal divisions of ${modal.equave.toString()}`)
-    emit('update:scale', scale)
+    emit('update:scaleName', `${modal.divisions} equal divisions of ${modal.equaveString}`)
+    let source: string
+    if (modal.equave.equals(OCTAVE)) {
+      const edo = modal.divisions
+      if (expand || !modal.simpleEd) {
+        source = modal.degrees.map((steps) => `${steps}\\${edo}`).join('\n')
+      } else {
+        source = `ed(${edo})`
+      }
+    } else {
+      const ed = modal.divisions
+      const ji = modal.equave.toString()
+      if (expand || !modal.simpleEd) {
+        source = modal.degrees.map((steps) => `${steps}\\${ed}<${ji}>`).join('\n')
+      } else {
+        source = `ed(${ed}, ${ji})`
+      }
+    }
+    emit('update:source', source)
   }
 }
 </script>
@@ -107,6 +102,13 @@ function generate() {
         </div>
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="() => generate(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="() => generate(false)" :disabled="!modal.simpleEd">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
 
diff --git a/src/components/modals/generation/EulerGenus.vue b/src/components/modals/generation/EulerGenus.vue
index 2a33a0f8..1a753fb7 100644
--- a/src/components/modals/generation/EulerGenus.vue
+++ b/src/components/modals/generation/EulerGenus.vue
@@ -1,23 +1,36 @@
 <script setup lang="ts">
-import { DEFAULT_NUMBER_OF_COMPONENTS } from '@/constants'
 import Modal from '@/components/ModalDialog.vue'
 import { clamp } from 'xen-dev-utils'
-import { Scale } from 'scale-workshop-core'
 import { useModalStore } from '@/stores/modal'
+import { expandCode } from '@/utils'
 
-const emit = defineEmits(['update:scale', 'update:scaleName', 'cancel'])
+const emit = defineEmits(['update:source', 'update:scaleName', 'cancel'])
 
 const modal = useModalStore()
 
-function generate() {
-  const clampedTone = Math.round(clamp(1, 1000000000, modal.guideTone))
-  const scale = Scale.fromEulerGenus(clampedTone, modal.integerEquave, DEFAULT_NUMBER_OF_COMPONENTS)
-  let name = `Euler-Fokker genus ${clampedTone}`
+function generate(expand = true) {
+  const clampedGuide = Math.round(clamp(1, 1000000000, modal.guideTone))
+  const clampedRoot = Math.round(clamp(1, 1000000000, modal.rootTone))
+  let name = `Euler-Fokker genus ${clampedGuide}`
+  let source = `eulerGenus(${clampedGuide}`
+  if (clampedRoot !== 1) {
+    name += ` on ${clampedRoot}`
+    source += `, ${clampedRoot}`
+  }
   if (modal.integerEquave !== 2) {
-    name += `<${modal.integerEquave}>`
+    name += ` against ${modal.integerEquave}`
+    if (clampedRoot === 1) {
+      source += ', niente'
+    }
+    source += `, ${modal.integerEquave}`
   }
+  source += ')'
   emit('update:scaleName', name)
-  emit('update:scale', scale)
+  if (expand) {
+    emit('update:source', expandCode(source))
+  } else {
+    emit('update:source', source)
+  }
 }
 </script>
 
@@ -39,11 +52,29 @@ function generate() {
             v-model="modal.guideTone"
           />
         </div>
+        <div class="control">
+          <label for="guide-tone">Root Tone</label>
+          <input
+            id="root-tone"
+            type="number"
+            min="1"
+            max="1000000000"
+            class="control"
+            v-model="modal.rootTone"
+          />
+        </div>
         <div class="control">
           <label for="equave">Equave</label>
           <input id="equave" type="number" min="2" class="control" v-model="modal.integerEquave" />
         </div>
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="() => generate(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="() => generate(false)">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
diff --git a/src/components/modals/generation/GeneratorSequence.vue b/src/components/modals/generation/GeneratorSequence.vue
new file mode 100644
index 00000000..8b800799
--- /dev/null
+++ b/src/components/modals/generation/GeneratorSequence.vue
@@ -0,0 +1,195 @@
+<script setup lang="ts">
+import Modal from '@/components/ModalDialog.vue'
+import ScaleLineInput from '@/components/ScaleLineInput.vue'
+import { arrayToString, debounce, expandCode } from '@/utils'
+import { useModalStore } from '@/stores/modal'
+import { OCTAVE } from '@/constants'
+import { ref, watch } from 'vue'
+
+const emit = defineEmits(['update:source', 'update:scaleName', 'cancel'])
+
+const modal = useModalStore()
+
+const generatorsElement = ref<HTMLInputElement | null>(null)
+watch(
+  () => modal.generatorsError,
+  (newError) => generatorsElement.value!.setCustomValidity(newError)
+)
+
+const presets = {
+  zarlino: { name: 'Zarlino', generators: '5/4, 6/5', size: 7 },
+  diasem: { name: 'Tas/Diasem', generators: '7/6, 8/7', size: 9 },
+  zil: {
+    name: 'Zil',
+    generators: '8/7, 7/6, 8/7, 7/6, 8/7, 7/6, 8/7, 189/160, 8/7, 7/6',
+    size: 14
+  },
+  porcusmine: { name: 'Porcusmine', generators: '9/5, 50/27', size: 8 },
+  mavila: { name: 'Mavila detemper', generators: '3/2, 3/2, 64/45', size: 9 },
+  rhombi: { name: 'Rhombi', generators: '14/9, 11/7, 52/33, 81/52', size: 14 },
+  dwyn: {
+    name: 'Dwyn',
+    generators: '25/24, 21/20, 22/21, 23/22, 24/23, 21/20, 22/21, 23/22, 24/23',
+    size: 16
+  },
+  magic: { name: 'Magic detemper', generators: '16/13, 20/16, 25/20, 31/25, 39/31', size: 10 },
+  porcupine: { name: 'Porcupine detemper', generators: '10/9, 11/10, 12/11', size: 7 },
+  bleu: { name: 'Bleu detemper', generators: '24/22, 26/24, 28/26, 31/28, 33/31', size: 9 },
+  machine: { name: 'Machine detemper', generators: '8/7, 9/8, 112/99, 9/8', size: 11 },
+  slendric: { name: 'Slendric detemper', generators: '8/7, 147/128, 8/7', size: 6 }
+}
+
+const selectedPreset = ref<keyof typeof presets | ''>('')
+
+const updateCS = debounce(() => modal.computeConstantStructureSizes(20))
+
+const moreCS = debounce(() => modal.computeConstantStructureSizes(modal.maxSizeComputed + 15))
+
+watch(selectedPreset, (newValue) => {
+  if (!newValue) {
+    return
+  }
+  const preset = presets[newValue]
+  modal.generatorsString = preset.generators
+  modal.size = preset.size
+  modal.periodString = '2/1'
+  modal.period = OCTAVE
+  modal.numPeriods = 1
+  updateCS()
+})
+
+function generate(kind: 'expanded' | 'raw' | 'lattice' = 'expanded') {
+  let name = `Generator sequence ${modal.generatorsString}`
+  if (!modal.period.equals(OCTAVE) || modal.numPeriods !== 1) {
+    name += ` over ${modal.periodString}`
+  }
+  let source = ''
+  if (kind === 'lattice') {
+    source = modal.generators.map((g) => g.toString()).join(';')
+    source += '\n'
+    const s = Math.round(modal.size / modal.numPeriods) - 1
+    const repeats = Math.floor(s / modal.generators.length)
+    if (repeats) {
+      source += `flatRepeat(${repeats})\n`
+    }
+    const remaining = s - repeats * modal.generators.length
+    if (remaining) {
+      source += modal.generators
+        .slice(0, remaining)
+        .map((g) => g.toString())
+        .join(';')
+      source += '\n'
+    }
+    source += 'stack()\n'
+    source += modal.period.toString()
+    source += '\n'
+    source += 'reduce()\n'
+    if (modal.numPeriods !== 1) {
+      source += `repeat(${modal.numPeriods})\n`
+    }
+    source += 'unshift(pop())\n'
+    source += 'latticeView()\n'
+    source += 'sort()\n'
+  } else {
+    source = `gs(${arrayToString(modal.generators)}, ${modal.size}`
+    if (!modal.period.equals(OCTAVE) || modal.numPeriods !== 1) {
+      source += `, ${modal.period.toString()}, ${modal.numPeriods}`
+    }
+    source += ')'
+  }
+  emit('update:scaleName', name)
+  if (kind === 'expanded') {
+    emit('update:source', expandCode(source))
+  } else {
+    emit('update:source', source)
+  }
+}
+</script>
+
+<template>
+  <Modal @confirm="generate" @cancel="$emit('cancel')">
+    <template #header>
+      <h2>Generator sequence</h2>
+    </template>
+    <template #body>
+      <div class="control-group">
+        <div class="control">
+          <label for="generators">Generators</label>
+          <input
+            ref="generatorsElement"
+            id="generators"
+            type="text"
+            class="control"
+            placeholder="5/4, 6/5"
+            v-model="modal.generatorsString"
+            @input="updateCS"
+          />
+        </div>
+        <div class="control">
+          <label for="size">Scale size</label>
+          <input
+            id="size"
+            type="number"
+            :min="modal.numPeriods"
+            max="999"
+            :step="modal.numPeriods"
+            v-model="modal.size"
+          />
+        </div>
+        <label>Sizes of constant structure</label>
+        <div class="btn-group">
+          <button
+            v-for="size of modal.constantStructureSizes"
+            :key="size"
+            @click="modal.size = size"
+          >
+            {{ size }}
+          </button>
+          <button v-if="modal.generators.length" @click="moreCS">
+            More ({{ modal.maxSizeComputed * modal.numPeriods }}+)
+          </button>
+          <button v-else disabled>(No generators)</button>
+        </div>
+        <div class="control">
+          <label for="preset">Presets</label>
+          <select v-model="selectedPreset">
+            <option value="">--Select preset--</option>
+            <option v-for="(preset, key) of presets" :key="key" :value="key">
+              {{ preset.name }}
+            </option>
+          </select>
+        </div>
+        <div class="control">
+          <label for="period">Period</label>
+          <ScaleLineInput
+            id="period"
+            placeholder="2/1"
+            v-model="modal.periodString"
+            @update:value="modal.period = $event"
+            @input="updateCS"
+            :defaultValue="OCTAVE"
+          />
+        </div>
+        <div class="control">
+          <label for="num-periods">Number of periods</label>
+          <input
+            id="num-periods"
+            type="number"
+            min="1"
+            max="99"
+            v-model="modal.numPeriods"
+            @input="updateCS"
+          />
+        </div>
+      </div>
+    </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="() => generate('expanded')">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="() => generate('lattice')">Lattice</button>
+        <button @click="() => generate('raw')">Raw</button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/src/components/modals/generation/HarmonicSeries.vue b/src/components/modals/generation/HarmonicSeries.vue
index ec4c191d..7ba6da1d 100644
--- a/src/components/modals/generation/HarmonicSeries.vue
+++ b/src/components/modals/generation/HarmonicSeries.vue
@@ -1,28 +1,26 @@
 <script setup lang="ts">
-import { DEFAULT_NUMBER_OF_COMPONENTS } from '@/constants'
 import Modal from '@/components/ModalDialog.vue'
 import { clamp } from 'xen-dev-utils'
-import { Scale } from 'scale-workshop-core'
 import { useModalStore } from '@/stores/modal'
+import { expandCode } from '@/utils'
 
-const emit = defineEmits(['update:scale', 'update:scaleName', 'cancel'])
+const emit = defineEmits(['update:source', 'update:scaleName', 'cancel'])
 
 const modal = useModalStore()
 
-function generate() {
+function generate(expand = true) {
   const denominator = Math.max(1, Math.round(modal.lowInteger))
   const greatestNumerator = clamp(
     denominator + 1,
     denominator + 1000,
     Math.round(modal.highInteger)
   )
-  const scale = Scale.fromHarmonicSeries(
-    denominator,
-    greatestNumerator,
-    DEFAULT_NUMBER_OF_COMPONENTS
-  )
+  let source = `${denominator}::${greatestNumerator}`
+  if (expand) {
+    source = expandCode(source)
+  }
   emit('update:scaleName', `Harmonics ${denominator}-${greatestNumerator}`)
-  emit('update:scale', scale)
+  emit('update:source', source)
 }
 </script>
 
@@ -55,5 +53,12 @@ function generate() {
         </div>
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="() => generate(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="() => generate(false)">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
diff --git a/src/components/modals/generation/HistoricalScale.vue b/src/components/modals/generation/HistoricalScale.vue
index 5b320b23..7f9b2a3c 100644
--- a/src/components/modals/generation/HistoricalScale.vue
+++ b/src/components/modals/generation/HistoricalScale.vue
@@ -1,33 +1,31 @@
 <script setup lang="ts">
-import { ExtendedMonzo, Interval, Scale } from 'scale-workshop-core'
 import Modal from '@/components/ModalDialog.vue'
 import { computed } from 'vue'
 import { DEFAULT_NUMBER_OF_COMPONENTS, FIFTH, OCTAVE } from '@/constants'
 import ScaleLineInput from '@/components/ScaleLineInput.vue'
-import { circleDifference } from 'xen-dev-utils'
+import { circleDifference, mmod } from 'xen-dev-utils'
 import { mosSizes } from 'moment-of-symmetry'
-import { spineLabel as spineLabel_, type AccidentalStyle } from '@/utils'
+import { spineLabel as spineLabel_, parseInterval, expandCode } from '@/utils'
 import { useHistoricalStore } from '@/stores/historical'
-
-const props = defineProps<{
-  centsFractionDigits: number
-  accidentalStyle: AccidentalStyle
-}>()
+import { useStateStore } from '@/stores/state'
+import { Interval, TimeMonzo } from 'sonic-weave'
+import { useScaleStore } from '@/stores/scale'
 
 const emit = defineEmits([
   'update:scaleName',
-  'update:scale',
-  'update:keyColors',
+  'update:source',
   'update:baseFrequency',
   'update:baseMidiNote',
   'cancel'
 ])
 
+const state = useStateStore()
+const scale = useScaleStore()
 const historical = useHistoricalStore()
 
 // The presets default to middle C when there's an 'F' in the scale i.e. down >= 1
 const KEY_COLORS_C = [
-  'white',
+  // 'white', // Implicit unison
   'black',
   'white',
   'black',
@@ -38,7 +36,8 @@ const KEY_COLORS_C = [
   'black',
   'white',
   'black',
-  'white'
+  'white',
+  'white' // Unison
 ]
 
 const MIDI_NOTE_C = 60
@@ -48,17 +47,17 @@ const MAX_SIZE = 99
 const MAX_LENGTH = 10
 
 const HARMONIC_SEVENTH = new Interval(
-  ExtendedMonzo.fromFraction('7/4', DEFAULT_NUMBER_OF_COMPONENTS),
-  'ratio'
+  TimeMonzo.fromFraction('7/4', DEFAULT_NUMBER_OF_COMPONENTS),
+  'linear'
 )
 
 const SYNTONIC = new Interval(
-  ExtendedMonzo.fromFraction('81/80', DEFAULT_NUMBER_OF_COMPONENTS),
-  'ratio'
+  TimeMonzo.fromFraction('81/80', DEFAULT_NUMBER_OF_COMPONENTS),
+  'linear'
 )
 
 function spineLabel(up: number) {
-  return spineLabel_(up, props.accidentalStyle)
+  return spineLabel_(up, scale.accidentalPreference)
 }
 
 const mosSizeList = computed(() => {
@@ -90,30 +89,18 @@ const strengthSlider = computed({
 })
 
 const temperedGenerator = computed(() => {
-  const lineOptions = { centsFractionDigits: props.centsFractionDigits }
   if (historical.method === 'simple') {
-    return historical.generator.mergeOptions(lineOptions)
+    return historical.generator
   }
-  return historical.pureGenerator
-    .mergeOptions(lineOptions)
-    .add(
-      new Interval(
-        ExtendedMonzo.fromCents(
-          historical.tempering * historical.temperingStrength,
-          DEFAULT_NUMBER_OF_COMPONENTS
-        ),
-        'cents',
-        undefined,
-        lineOptions
-      )
-    )
-    .asType('any')
+  const cents =
+    historical.pureGenerator.totalCents() + historical.tempering * historical.temperingStrength
+  return parseInterval(cents.toFixed(state.centsFractionDigits))
 })
 
 const enharmonicCents = computed(() => {
   const ws = historical.wellIntervals
   return circleDifference(ws[ws.length - 1].totalCents(), ws[0].totalCents()).toFixed(
-    props.centsFractionDigits
+    state.centsFractionDigits
   )
 })
 
@@ -125,77 +112,64 @@ function onWellCommaInput(event: Event, i: number) {
   historical.selectedWellPreset = 'none'
 }
 
-function generate() {
-  const lineOptions = { centsFractionDigits: props.centsFractionDigits }
-
-  // Check if the scale can be centered around C
-  if (
-    historical.size === 12 &&
-    historical.down >= 1 &&
-    (historical.method === 'simple' || historical.method === 'well temperament')
-  ) {
-    emit('update:baseFrequency', FREQUENCY_C)
-    emit('update:baseMidiNote', MIDI_NOTE_C)
-    emit('update:keyColors', KEY_COLORS_C)
-  }
-
+function generate(expand = true) {
+  let source: string
   if (historical.method === 'simple') {
-    const scale = Scale.fromRank2(
-      temperedGenerator.value,
-      OCTAVE.mergeOptions(lineOptions),
-      historical.size,
-      historical.down
-    )
+    source = `rank2(${temperedGenerator.value.toString()}, ${historical.up}, ${historical.down})`
 
     if (historical.selectedPreset in historical.presets) {
       emit('update:scaleName', historical.presets[historical.selectedPreset].name)
     } else {
       emit('update:scaleName', `Rank 2 temperament (${historical.generatorString})`)
     }
-
-    if (historical.format === 'cents') {
-      emit('update:scale', scale.asType('cents'))
-    } else {
-      emit('update:scale', scale)
-    }
   } else if (historical.method === 'target') {
-    const scale = Scale.fromRank2(
-      temperedGenerator.value,
-      historical.period.mergeOptions(lineOptions),
-      historical.size,
-      historical.down
-    )
+    source = `rank2(${temperedGenerator.value.toString()}, ${historical.up}, ${historical.down}, ${historical.period.toString()})`
 
     let genString = temperedGenerator.value.toString()
     if (historical.format === 'cents') {
-      emit('update:scale', scale.asType('cents'))
-      genString = temperedGenerator.value.totalCents().toFixed(props.centsFractionDigits)
-    } else {
-      emit('update:scale', scale)
+      genString = temperedGenerator.value.totalCents().toFixed(state.centsFractionDigits)
     }
     emit('update:scaleName', `Rank 2 temperament (${genString}, ${historical.periodString})`)
   } else {
-    const scale = new Scale(
-      historical.wellIntervals.slice(0, historical.size),
-      OCTAVE,
-      440
-    ).mergeOptions(lineOptions)
-    scale.sortInPlace()
-    if (historical.format === 'cents') {
-      emit('update:scale', scale.asType('cents'))
-    } else {
-      emit('update:scale', scale)
-    }
+    const commaFractions = historical.wellCommaFractions
+      .slice(0, -1)
+      .map((f) => f.toFraction())
+      .join(', ')
+    source = `wellTemperament([${commaFractions}], ${historical.wellComma.toString()}, ${historical.down})`
     if (historical.selectedWellPreset in historical.wellPresets) {
       emit('update:scaleName', historical.wellPresets[historical.selectedWellPreset].name)
     } else {
       emit('update:scaleName', 'Custom Well Temperament')
     }
   }
+  if (historical.format === 'cents') {
+    source += `\ni => cents(i, ${state.centsFractionDigits})`
+  }
+  // Check if the scale can be centered around C
+  if (
+    historical.size === 12 &&
+    historical.down >= 1 &&
+    (historical.method === 'simple' || historical.method === 'well temperament')
+  ) {
+    emit('update:baseFrequency', FREQUENCY_C)
+    emit('update:baseMidiNote', MIDI_NOTE_C)
+    source += `\nlabel([${KEY_COLORS_C.join(', ')}])`
+    const labels: string[] = []
+    for (let i = 0; i < historical.size; ++i) {
+      labels[mmod(7 * (i - historical.down) - 1, historical.size)] = JSON.stringify(
+        spineLabel(i - historical.down)
+      )
+    }
+    source += `\nlabel([${labels.join(', ')}])`
+  }
+  if (expand) {
+    source = expandCode(source)
+  }
+  emit('update:source', source)
 }
 </script>
 <template>
-  <Modal extraStyle="width: 25rem" @confirm="generate" @cancel="$emit('cancel')">
+  <Modal @confirm="generate" @cancel="$emit('cancel')">
     <template #header>
       <h2>Generate historical temperament</h2>
     </template>
@@ -329,7 +303,8 @@ function generate() {
                 :key="candidate.exponent"
                 :value="candidate.exponent"
               >
-                {{ candidate.exponent }} / {{ candidate.tempering.toFixed(centsFractionDigits) }} ¢
+                {{ candidate.exponent }} /
+                {{ candidate.tempering.toFixed(state.centsFractionDigits) }} ¢
               </option>
             </select>
           </div>
@@ -462,6 +437,13 @@ function generate() {
         </span>
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="() => generate(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="() => generate(false)">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
 <style scoped>
diff --git a/src/components/modals/generation/LoadPreset.vue b/src/components/modals/generation/LoadPreset.vue
new file mode 100644
index 00000000..150598a5
--- /dev/null
+++ b/src/components/modals/generation/LoadPreset.vue
@@ -0,0 +1,57 @@
+<script setup lang="ts">
+import Modal from '@/components/ModalDialog.vue'
+import { presets, presetsByGroup } from '@/presets'
+import { expandCode } from '@/utils'
+import { ref } from 'vue'
+
+const emit = defineEmits([
+  'update:source',
+  'update:scaleName',
+  'update:baseFrequency',
+  'update:baseMidiNote',
+  'cancel'
+])
+
+const presetGroups = presetsByGroup()
+const presetSelect = ref<HTMLSelectElement | null>(null)
+
+function confirm(expand = true) {
+  const preset = presets[presetSelect.value!.value]
+  emit('update:scaleName', preset.name)
+  emit('update:baseFrequency', preset.baseFrequency)
+  emit('update:baseMidiNote', preset.baseMidiNote)
+  if (expand) {
+    emit('update:source', expandCode(preset.source))
+  } else {
+    emit('update:source', preset.source)
+  }
+}
+</script>
+
+<template>
+  <Modal @confirm="confirm" @cancel="$emit('cancel')">
+    <template #header>
+      <h2>Load preset scale</h2>
+    </template>
+    <template #body>
+      <div class="control-group">
+        <div class="control">
+          <select ref="presetSelect" size="10" class="control">
+            <optgroup v-for="group of presetGroups" :key="group.name" :label="group.name">
+              <option v-for="preset of group.members" :key="preset.id" :value="preset.id">
+                {{ preset.title }}
+              </option>
+            </optgroup>
+          </select>
+        </div>
+      </div>
+    </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="confirm(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="confirm(false)">Raw</button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/src/components/modals/generation/MosScale.vue b/src/components/modals/generation/MosScale.vue
index d9c5831f..608ca46c 100644
--- a/src/components/modals/generation/MosScale.vue
+++ b/src/components/modals/generation/MosScale.vue
@@ -11,9 +11,9 @@ import {
 } from 'moment-of-symmetry'
 import Modal from '@/components/ModalDialog.vue'
 import ScaleLineInput from '@/components/ScaleLineInput.vue'
-import { Scale } from 'scale-workshop-core'
 import { useModalStore } from '@/stores/modal'
 
+// Note: There are configured accidental colors, but the user might want to have a lower row be lower in pitch instead of simply "flat".
 const COLORS = {
   parent: 'white',
   sharp: 'navy',
@@ -22,13 +22,14 @@ const COLORS = {
   unknown: 'indigo'
 }
 
-const emit = defineEmits(['update:scale', 'update:scaleName', 'update:keyColors', 'cancel'])
+const emit = defineEmits(['update:source', 'update:scaleName', 'cancel'])
 
 const modal = useModalStore()
 
 function generate() {
   let name: string
   let steps: number[]
+  let colors: string[] = []
   if (modal.colorMethod === 'none') {
     steps = mos(modal.safeNumLarge, modal.safeNumSmall, {
       sizeOfLargeStep: modal.safeSizeLarge,
@@ -44,9 +45,7 @@ function generate() {
     })
     steps = [...map.keys()]
     steps.sort((a, b) => a - b)
-    const colors = steps.map((step) => (map.get(step) ? 'white' : 'black'))
-    colors.unshift(colors.pop()!)
-    emit('update:keyColors', colors)
+    colors = steps.map((s) => (map.get(s) ? 'white' : 'black'))
   } else {
     let accidentals = modal.daughterColorAccidentals
     if (accidentals === 'all') {
@@ -66,16 +65,7 @@ function generate() {
       steps = [...map.keys()]
       steps.sort((a, b) => a - b)
     }
-    let colors: string[]
-    if (modal.daughterColorAccidentals === 'sharp' || modal.daughterColorAccidentals === 'flat') {
-      // Piano-style layers expect black & white
-      colors = steps.map((step) => (map.get(step) === 'parent' ? 'white' : 'black'))
-    } else {
-      // Multi-layer piano not implemented in v2 series
-      colors = steps.map((s) => COLORS[map.get(s) ?? 'unknown'])
-    }
-    colors.unshift(colors.pop()!)
-    emit('update:keyColors', colors)
+    colors = steps.map((s) => COLORS[map.get(s) ?? 'unknown'])
   }
 
   if (modal.colorMethod === 'parent') {
@@ -106,8 +96,15 @@ function generate() {
   }
   emit('update:scaleName', name)
 
-  const scale = Scale.fromEqualTemperamentSubset(steps, modal.equave)
-  emit('update:scale', scale)
+  const projector = modal.equave.compare(OCTAVE) ? `<${modal.equave.toString()}>` : ''
+  const divisions = steps[steps.length - 1]
+  let source = ''
+  for (let i = 0; i < steps.length; ++i) {
+    const color = colors[i] ? ' ' + colors[i] : ''
+    source += `${steps[i]}\\${divisions}${projector}${color}\n`
+  }
+
+  emit('update:source', source)
 }
 
 // Actions that would take multiple lines in template code and get ruined by auto-formatting
@@ -137,7 +134,11 @@ function edoClick(info: MosScaleInfo) {
 </script>
 
 <template>
-  <Modal extraStyle="width: 40rem" @confirm="generate" @cancel="$emit('cancel')">
+  <Modal
+    extraStyle="min-width: 40rem;max-width: 41rem"
+    @confirm="generate"
+    @cancel="$emit('cancel')"
+  >
     <template #header>
       <h2>Generate MOS scale</h2>
     </template>
@@ -168,7 +169,7 @@ function edoClick(info: MosScaleInfo) {
             id="number-of-large-steps"
             type="number"
             min="1"
-            max="1000"
+            max="999"
             v-model="modal.numberOfLargeSteps"
           />
         </div>
@@ -178,7 +179,7 @@ function edoClick(info: MosScaleInfo) {
             id="number-of-small-steps"
             type="number"
             min="1"
-            max="1000"
+            max="999"
             v-model="modal.numberOfSmallSteps"
           />
         </div>
diff --git a/src/components/modals/generation/RankTwo.vue b/src/components/modals/generation/RankTwo.vue
index 3cfcba46..094f21ce 100644
--- a/src/components/modals/generation/RankTwo.vue
+++ b/src/components/modals/generation/RankTwo.vue
@@ -1,22 +1,21 @@
 <script setup lang="ts">
-import { DEFAULT_NUMBER_OF_COMPONENTS, FIFTH, OCTAVE } from '@/constants'
+import { FIFTH, OCTAVE } from '@/constants'
 import { makeRank2FromVals, makeRank2FromCommas, type Rank2Params } from '@/tempering'
 import { ref, watch } from 'vue'
 import Modal from '@/components/ModalDialog.vue'
 import PeriodCircle from '@/components/PeriodCircle.vue'
-import { gapKeyColors, setAndReportValidity } from '@/utils'
+import { expandCode, gapKeyColors, parseCents, setAndReportValidity } from '@/utils'
 import ScaleLineInput from '@/components/ScaleLineInput.vue'
-import { ExtendedMonzo, Interval, Scale } from 'scale-workshop-core'
 import { useRank2Store } from '@/stores/tempering'
+import { useStateStore } from '@/stores/state'
+import { Interval, timeMonzoAs } from 'sonic-weave'
+import { useScaleStore } from '@/stores/scale'
 
-const props = defineProps<{
-  centsFractionDigits: number
-  scale: Scale
-}>()
-
+const state = useStateStore()
+const scale = useScaleStore()
 const rank2 = useRank2Store()
 
-const emit = defineEmits(['update:scaleName', 'update:scale', 'update:keyColors', 'cancel'])
+const emit = defineEmits(['update:scaleName', 'update:source', 'cancel'])
 
 const commasInput = ref<HTMLInputElement | null>(null)
 const valsInput = ref<HTMLInputElement | null>(null)
@@ -26,17 +25,12 @@ const subgroupInput = ref<HTMLInputElement | null>(null)
 
 // Consolidate circle method's fine tuning to hard values when changing "tabs"
 function consolidateCircle() {
-  const options = { centsFractionDigits: props.centsFractionDigits }
-  rank2.period = new Interval(
-    ExtendedMonzo.fromCents(rank2.circlePeriodCents, DEFAULT_NUMBER_OF_COMPONENTS),
-    'cents'
-  ).mergeOptions(options)
+  rank2.period = parseCents(rank2.circlePeriodCents, state.centsFractionDigits)
   rank2.periodString = rank2.period.toString()
-  rank2.generator = new Interval(
-    ExtendedMonzo.fromCents(rank2.circleGeneratorCents, DEFAULT_NUMBER_OF_COMPONENTS),
-    'cents'
-  ).mergeOptions(options)
+
+  rank2.generator = parseCents(rank2.circleGeneratorCents, state.centsFractionDigits)
   rank2.generatorString = rank2.generator.toString()
+
   rank2.periodStretch = '0'
   rank2.generatorFineCents = '0'
 }
@@ -55,6 +49,15 @@ watch(
   (newValue) => setAndReportValidity(subgroupInput.value, newValue)
 )
 
+watch(
+  () => rank2.commasError,
+  (newValue) => setAndReportValidity(commasInput.value, newValue)
+)
+watch(
+  () => rank2.valsError,
+  (newValue) => setAndReportValidity(valsInput.value, newValue)
+)
+
 watch(
   () => rank2.mosPatternsError,
   (newValue) => {
@@ -79,11 +82,9 @@ watch(
 // === Methods ===
 
 function flipGenerator() {
-  rank2.generator = rank2.generator.neg().mmod(
-    rank2.period.mergeOptions({
-      centsFractionDigits: props.centsFractionDigits
-    })
-  )
+  const g = rank2.generator
+  const value = g.value.inverse().reduce(rank2.period.value)
+  rank2.generator = new Interval(value, g.domain, timeMonzoAs(value, g.node), g)
   rank2.generatorString = rank2.generator.toString()
 }
 
@@ -96,74 +97,66 @@ function selectMosSize(mosSize: number) {
     } else {
       params = makeRank2FromCommas(rank2.commas, mosSize, rank2.subgroup, rank2.options)
     }
-    const lineOptions = { centsFractionDigits: props.centsFractionDigits }
-    rank2.generator = new Interval(
-      ExtendedMonzo.fromCents(params.generator, DEFAULT_NUMBER_OF_COMPONENTS),
-      'cents',
-      undefined,
-      lineOptions
-    )
-    rank2.generatorString = rank2.generator.toString()
-    rank2.period = new Interval(
-      ExtendedMonzo.fromCents(params.period, DEFAULT_NUMBER_OF_COMPONENTS),
-      'cents',
-      undefined,
-      lineOptions
-    )
-    rank2.periodString = rank2.period.toString()
+
     rank2.numPeriods = params.numPeriods
     rank2.method = 'generator'
+
+    rank2.period = parseCents(params.period, state.centsFractionDigits)
+    rank2.periodString = rank2.period.toString()
+
+    rank2.generator = parseCents(params.generator, state.centsFractionDigits)
+    rank2.generatorString = rank2.generator.toString()
   }
 }
 
 function updateCircleGenerator(value: number) {
-  rank2.generator = new Interval(
-    ExtendedMonzo.fromCents(value, DEFAULT_NUMBER_OF_COMPONENTS),
-    'cents'
-  ).mergeOptions({ centsFractionDigits: props.centsFractionDigits })
+  rank2.generator = parseCents(value, state.centsFractionDigits)
   rank2.generatorString = rank2.generator.toString()
   rank2.generatorFineCents = '0'
   rank2.expensiveMosPatterns = []
 }
 
-function generate() {
+function generate(expand = true) {
   // Clear error for the next time the modal is opened
   rank2.error = ''
   try {
     if (rank2.method === 'circle') {
       consolidateCircle()
     }
-    const lineOptions = { centsFractionDigits: props.centsFractionDigits }
-    let size_ = rank2.safeSize
-    let down_ = rank2.down
+    let size = rank2.safeSize
+    let up = rank2.safeUp
+    let down = rank2.down
     const n = rank2.safeNumPeriods
+
+    let labelString = ''
+
     // The option to fill in colors is not shown in circle UI so it's ignored here.
     if (rank2.colorMethod === 'gaps' && rank2.method !== 'circle') {
       const colors = Array(n)
         .fill(
           gapKeyColors(
             rank2.generator.totalCents() / rank2.period.totalCents(),
-            size_ / n,
-            down_ / n,
+            size / n,
+            down / n,
             rank2.colorAccidentals === 'flat'
           )
         )
-        .flat()
-      size_ = colors.length
+        .flat() as ('black' | 'white')[]
+      size = colors.length
       if (rank2.colorAccidentals === 'flat') {
-        down_ = size_ - n - rank2.up
+        down = size - n - rank2.up
+      } else {
+        up = size - n - rank2.down
       }
-      emit('update:keyColors', colors)
+      labelString = `\nlabel([${colors.join(', ')}])`
     }
-    const scale = Scale.fromRank2(
-      rank2.generator.mergeOptions(lineOptions),
-      rank2.period.mergeOptions(lineOptions),
-      size_,
-      down_,
-      n
-    )
+    const source = `rank2(${rank2.generator.toString()}, ${up}, ${down}, ${rank2.period.toString()}, ${n})${labelString}`
     emit('update:scaleName', `Rank 2 temperament (${rank2.generatorString}, ${rank2.periodString})`)
-    emit('update:scale', scale)
+    if (expand) {
+      emit('update:source', expandCode(source))
+    } else {
+      emit('update:source', source)
+    }
   } catch (error_) {
     console.error(error_)
     if (error_ instanceof Error) {
@@ -176,7 +169,11 @@ function generate() {
 </script>
 
 <template>
-  <Modal extraStyle="width: 30rem" @confirm="generate" @cancel="$emit('cancel')">
+  <Modal
+    extraStyle="min-width: 30rem;max-width: 31rem"
+    @confirm="generate"
+    @cancel="$emit('cancel')"
+  >
     <template #header>
       <h2>Generate rank 2 temperament</h2>
     </template>
@@ -315,7 +312,8 @@ function generate() {
         <div class="control-group" v-show="rank2.method === 'circle'">
           <div class="square">
             <PeriodCircle
-              :scale="scale"
+              :scale="scale.scale"
+              :labels="scale.labels"
               :generatorCents="rank2.circleGeneratorCents"
               :periodCents="rank2.circlePeriodCents"
               :size="rank2.generatorsPerPeriod"
@@ -447,10 +445,19 @@ function generate() {
     </template>
     <template #footer>
       <div class="btn-group">
-        <button @click="generate" :disabled="rank2.method === 'vals' || rank2.method === 'commas'">
+        <button
+          @click="generate(true)"
+          :disabled="rank2.method === 'vals' || rank2.method === 'commas'"
+        >
           OK
         </button>
         <button @click="$emit('cancel')">Cancel</button>
+        <button
+          @click="generate(false)"
+          :disabled="rank2.method === 'vals' || rank2.method === 'commas'"
+        >
+          Raw
+        </button>
         <span class="error" v-show="rank2.error.length">⚠</span>
         <i>{{ rank2.previewMosPattern }}</i>
       </div>
diff --git a/src/components/modals/generation/SpanLattice.vue b/src/components/modals/generation/SpanLattice.vue
index 549d5fd9..46264119 100644
--- a/src/components/modals/generation/SpanLattice.vue
+++ b/src/components/modals/generation/SpanLattice.vue
@@ -2,19 +2,18 @@
 import { ref, watch } from 'vue'
 import Modal from '@/components/ModalDialog.vue'
 import ScaleLineInput from '@/components/ScaleLineInput.vue'
-import { DEFAULT_NUMBER_OF_COMPONENTS, OCTAVE } from '@/constants'
+import { OCTAVE } from '@/constants'
 import Temperament from 'temperaments'
-import { ExtendedMonzo, Interval, Scale, type IntervalOptions } from 'scale-workshop-core'
 import { useLatticeStore } from '@/stores/tempering'
 import { setAndReportValidity } from '@/utils'
+import { useStateStore } from '@/stores/state'
+import { arrayToString, expandCode, parseInterval } from '@/utils'
+import { Interval, timeMonzoAs } from 'sonic-weave'
 
-const props = defineProps<{
-  centsFractionDigits: number
-}>()
-
-const emit = defineEmits(['update:scale', 'update:scaleName', 'cancel'])
+const emit = defineEmits(['update:source', 'update:scaleName', 'cancel'])
 
 const lattice = useLatticeStore()
+const state = useStateStore()
 
 const basisElement = ref<HTMLInputElement | null>(null)
 watch(
@@ -22,18 +21,6 @@ watch(
   (newError) => setAndReportValidity(basisElement.value, newError)
 )
 
-function fromCents(cents: number) {
-  const options: IntervalOptions = {
-    centsFractionDigits: props.centsFractionDigits
-  }
-  return new Interval(
-    ExtendedMonzo.fromCents(cents, DEFAULT_NUMBER_OF_COMPONENTS),
-    'cents',
-    undefined,
-    options
-  )
-}
-
 function calculateGenerators() {
   let temperament: Temperament
   if (lattice.method === 'vals') {
@@ -41,54 +28,61 @@ function calculateGenerators() {
   } else {
     temperament = Temperament.fromCommas(lattice.commas, lattice.subgroup)
   }
-  const generators = temperament.periodGenerators(lattice.options)
-  if (!generators.length) {
+  let periodGenerators: number[]
+  try {
+    periodGenerators = temperament.periodGenerators(lattice.options)
+  } catch {
     alert('Unable to calculate generators.')
     return
   }
 
-  lattice.equave = fromCents(generators[0])
-  lattice.equaveString = lattice.equave.centsString()
+  lattice.equaveString = periodGenerators[0].toFixed(state.centsFractionDigits)
+  lattice.equave = parseInterval(lattice.equaveString)
 
-  lattice.basisString = generators
+  lattice.basisString = periodGenerators
     .slice(1)
-    .map((generator) => fromCents(generator).centsString())
+    .map((g) => g.toFixed(state.centsFractionDigits))
     .join(' ')
-
   lattice.method = 'generators'
 }
 
-function updateDimension(index: number, event: Event) {
+function updateUps(index: number, event: Event) {
+  const value = parseInt((event.target as HTMLInputElement).value)
+  lattice.ups[index] = value
+}
+
+function updateDowns(index: number, event: Event) {
   const value = parseInt((event.target as HTMLInputElement).value)
-  lattice.dimensions[index] = value
+  lattice.downs[index] = value
 }
 
 function flip(index: number) {
-  const generator = lattice.basis[index].neg().mmod(
-    lattice.equave.mergeOptions({
-      centsFractionDigits: props.centsFractionDigits
-    })
-  )
+  const b = lattice.basis[index]
+  const domain = b.domain
+  const generator = b.value.inverse().reduce(lattice.equave.value)
+  const node = timeMonzoAs(generator, b.node)
   const newBasis = [...lattice.basis]
-  newBasis.splice(index, 1, generator)
+  newBasis.splice(index, 1, new Interval(generator, domain, node, b))
   lattice.basisString = newBasis.map((gen) => gen.toString()).join(' ')
 }
 
-function generate() {
+function generate(expand = true) {
   try {
-    const scale = Scale.fromLattice(lattice.basis, lattice.dimensions, lattice.equave)
-    let name = `Lattice (${lattice.dimensions.slice(0, lattice.basis.length)} of ${
-      lattice.basisString
-    }`
+    const source = `parallelotope(${arrayToString(lattice.basis)}, ${arrayToString(lattice.ups)}, ${arrayToString(lattice.downs)}, ${lattice.equave.toString()})`
+    let name = `Parallelotope (${lattice.dimensions} of ${lattice.basisString}`
     if (lattice.basis.length === 0) {
-      name = 'Lattice (unison'
+      name = 'Parallelotope (unison'
     }
     if (!lattice.equave.equals(OCTAVE)) {
       name += ` over ${lattice.equave.toString()}`
     }
     name += ')'
     emit('update:scaleName', name)
-    emit('update:scale', scale)
+    if (expand) {
+      emit('update:source', expandCode(source))
+    } else {
+      emit('update:source', source)
+    }
   } catch (error) {
     if (error instanceof Error) {
       alert(error.message)
@@ -102,7 +96,7 @@ function generate() {
 <template>
   <Modal @confirm="generate" @cancel="$emit('cancel')">
     <template #header>
-      <h2>Generate lattice</h2>
+      <h2>Generate parallelotope</h2>
     </template>
     <template #body>
       <div class="control-group">
@@ -140,20 +134,23 @@ function generate() {
               v-model="lattice.basisString"
             />
           </div>
-          <label>Generators up from 1/1</label>
-          <div
-            class="control"
-            v-for="(dimension, i) of lattice.dimensions.slice(0, lattice.basis.length)"
-            :key="i"
-          >
-            <label>Generator {{ lattice.basis[i] }}</label>
+          <label>Generators up/down from 1/1</label>
+          <div class="control" v-for="(_, i) of lattice.basis" :key="i">
+            <label>Generator {{ lattice.basis[i].toString() }}</label>
             <button @click="flip(i)">Flip</button>
             <input
               type="number"
-              min="1"
+              min="0"
+              max="99"
+              :value="lattice.ups[i]"
+              @input="updateUps(i, $event)"
+            />
+            <input
+              type="number"
+              min="0"
               max="99"
-              :value="dimension"
-              @input="updateDimension(i, $event)"
+              :value="lattice.downs[i]"
+              @input="updateDowns(i, $event)"
             />
           </div>
           <div class="control">
@@ -238,8 +235,9 @@ function generate() {
     </template>
     <template #footer>
       <div class="btn-group">
-        <button @click="generate" :disabled="lattice.method !== 'generators'">OK</button>
+        <button @click="generate(true)" :disabled="lattice.method !== 'generators'">OK</button>
         <button @click="$emit('cancel')">Cancel</button>
+        <button @click="generate(false)" :disabled="lattice.method !== 'generators'">Raw</button>
       </div>
     </template>
   </Modal>
diff --git a/src/components/modals/generation/StackSteps.vue b/src/components/modals/generation/StackSteps.vue
new file mode 100644
index 00000000..d4482df7
--- /dev/null
+++ b/src/components/modals/generation/StackSteps.vue
@@ -0,0 +1,61 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import Modal from '@/components/ModalDialog.vue'
+import { debounce, expandCode } from '@/utils'
+import { evaluateExpression } from 'sonic-weave'
+
+const emit = defineEmits(['update:source', 'update:scaleName', 'cancel'])
+
+const scaleData = ref('')
+const total = ref('1/1')
+
+function computeTotal() {
+  const source = scaleData.value + '\nstr(sanitize(prod($)))'
+  try {
+    total.value = evaluateExpression(source) as string
+  } catch {
+    /* empty */
+  }
+}
+
+const updateTotal = debounce(computeTotal)
+
+function generate(expand = true) {
+  const source = scaleData.value + '\nstack()\ni => simplify(i) if isLinear(i) else i'
+  if (expand) {
+    emit('update:source', expandCode(source))
+  } else {
+    emit('update:source', source)
+  }
+  emit('update:scaleName', 'Custom steps')
+}
+</script>
+
+<template>
+  <Modal @confirm="generate" @cancel="$emit('cancel')">
+    <template #header>
+      <h2>Stack relative scale steps</h2>
+    </template>
+    <template #body>
+      <div class="control-group">
+        <h3>Scale data</h3>
+        <div class="control">
+          <textarea
+            rows="20"
+            v-model="scaleData"
+            placeholder="9/8&#10;10/9&#10;6/5&#10;10/9&#10;6/5"
+            @input="updateTotal"
+          ></textarea>
+        </div>
+        <label>Total: {{ total }}</label>
+      </div>
+    </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="() => generate(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="() => generate(false)">Raw</button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/src/components/modals/generation/SubharmonicSeries.vue b/src/components/modals/generation/SubharmonicSeries.vue
index aac24c19..6efe93e8 100644
--- a/src/components/modals/generation/SubharmonicSeries.vue
+++ b/src/components/modals/generation/SubharmonicSeries.vue
@@ -1,28 +1,22 @@
 <script setup lang="ts">
-import { DEFAULT_NUMBER_OF_COMPONENTS } from '@/constants'
 import Modal from '@/components/ModalDialog.vue'
 import { clamp } from 'xen-dev-utils'
-import { Scale } from 'scale-workshop-core'
 import { useModalStore } from '@/stores/modal'
+import { expandCode } from '@/utils'
 
-const emit = defineEmits(['update:scale', 'update:scaleName', 'cancel'])
+const emit = defineEmits(['update:source', 'update:scaleName', 'cancel'])
 
 const modal = useModalStore()
 
-function generate() {
-  const leastDenominator = Math.max(1, Math.round(modal.lowInteger))
-  const numerator = clamp(
-    leastDenominator + 1,
-    leastDenominator + 1000,
-    Math.round(modal.highInteger)
-  )
-  const scale = Scale.fromSubharmonicSeries(
-    numerator,
-    leastDenominator,
-    DEFAULT_NUMBER_OF_COMPONENTS
-  )
-  emit('update:scaleName', `Subharmonics ${leastDenominator}-${numerator}`)
-  emit('update:scale', scale)
+function generate(expand = true) {
+  const numerator = Math.max(1, Math.round(modal.lowInteger))
+  const greatestDenominator = clamp(numerator + 1, numerator + 1000, Math.round(modal.highInteger))
+  let source = `/${greatestDenominator}::${numerator}`
+  if (expand) {
+    source = expandCode(source)
+  }
+  emit('update:scaleName', `Subharmonics ${numerator}-${greatestDenominator}`)
+  emit('update:source', source)
 }
 </script>
 
@@ -55,5 +49,12 @@ function generate() {
         </div>
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="() => generate(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="() => generate(false)">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
diff --git a/src/components/modals/generation/SummonOctaplex.vue b/src/components/modals/generation/SummonOctaplex.vue
index 3eb78c95..f6b50a40 100644
--- a/src/components/modals/generation/SummonOctaplex.vue
+++ b/src/components/modals/generation/SummonOctaplex.vue
@@ -3,14 +3,10 @@ import { ref, watch } from 'vue'
 import Modal from '@/components/ModalDialog.vue'
 import ScaleLineInput from '@/components/ScaleLineInput.vue'
 import { OCTAVE } from '@/constants'
-import { computedAndError, parseChordInput, setAndReportValidity } from '@/utils'
-import { Scale } from 'scale-workshop-core'
+import { computedAndError, expandCode, setAndReportValidity } from '@/utils'
+import { parseChord } from 'sonic-weave'
 
-const props = defineProps<{
-  show: boolean
-}>()
-
-const emit = defineEmits(['update:scale', 'update:scaleName', 'cancel'])
+const emit = defineEmits(['update:source', 'update:scaleName', 'cancel'])
 
 const basisString = ref('3 5 7 11')
 const addUnity = ref(false)
@@ -18,10 +14,7 @@ const equaveString = ref('2/1')
 const equave = ref(OCTAVE)
 const basisElement = ref<HTMLInputElement | null>(null)
 const [basis, basisError] = computedAndError(() => {
-  if (!props.show) {
-    return []
-  }
-  const chord = parseChordInput(basisString.value)
+  const chord = parseChord(basisString.value)
   if (chord.length !== 4) {
     throw new Error('Need exactly four basis vectors')
   }
@@ -29,9 +22,12 @@ const [basis, basisError] = computedAndError(() => {
 }, [])
 watch(basisError, (newError) => setAndReportValidity(basisElement.value, newError))
 
-function generate() {
+function generate(expand = true) {
   try {
-    const scale = Scale.fromOctaplex(basis.value, addUnity.value, equave.value)
+    let source = `octaplex(${basis.value.map((b) => b.toString()).join(', ')}, ${equave.value.toString()}, ${addUnity.value.toString()})`
+    if (expand) {
+      source = expandCode(source)
+    }
     let name = `The Octaplex (${basisString.value}`
     if (addUnity.value) {
       name += ' with 1/1'
@@ -41,7 +37,7 @@ function generate() {
     }
     name += ')'
     emit('update:scaleName', name)
-    emit('update:scale', scale)
+    emit('update:source', source)
   } catch (error) {
     if (error instanceof Error) {
       alert(error.message)
@@ -53,7 +49,7 @@ function generate() {
 </script>
 
 <template>
-  <Modal :show="show" @confirm="generate" @cancel="$emit('cancel')">
+  <Modal @confirm="generate" @cancel="$emit('cancel')">
     <template #header>
       <h2>Generate octaplex (24-cell)</h2>
     </template>
@@ -83,5 +79,12 @@ function generate() {
         </div>
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="generate(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="generate(false)">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
diff --git a/src/components/modals/modification/ApproximateByHarmonics.vue b/src/components/modals/modification/ApproximateByHarmonics.vue
index 28d3a33b..6d2d5aba 100644
--- a/src/components/modals/modification/ApproximateByHarmonics.vue
+++ b/src/components/modals/modification/ApproximateByHarmonics.vue
@@ -1,28 +1,41 @@
 <script setup lang="ts">
 import Modal from '@/components/ModalDialog.vue'
-import type { Scale } from 'scale-workshop-core'
 import { useModalStore } from '@/stores/modal'
 import { computed } from 'vue'
-import { centsToValue } from 'xen-dev-utils'
+import { useScaleStore } from '@/stores/scale'
+import { valueToCents } from 'xen-dev-utils'
 
-const props = defineProps<{
-  scale: Scale
-}>()
-
-const emit = defineEmits(['update:scale', 'cancel'])
+const emit = defineEmits(['done', 'cancel'])
 
 const modal = useModalStore()
+const scale = useScaleStore()
 
 const maxDenominator = computed(() => {
-  let maxCents = 0
-  for (let i = 0; i < props.scale.size; ++i) {
-    maxCents = Math.max(Math.abs(props.scale.getCents(i)))
+  let maxRatio = 1
+  for (const ratio of scale.scale.intervalRatios) {
+    maxRatio = Math.max(maxRatio, Math.abs(ratio), 1 / Math.abs(ratio))
+  }
+  return Math.floor(Number.MAX_SAFE_INTEGER / maxRatio)
+})
+
+const error = computed(() => {
+  let result = 0
+  for (const ratio of scale.scale.intervalRatios) {
+    const approximand = Math.abs(ratio * modal.largeInteger)
+    const harmonic = Math.round(approximand)
+    result = Math.max(result, Math.abs(valueToCents(approximand / harmonic)))
   }
-  return Math.floor(Number.MAX_SAFE_INTEGER / centsToValue(maxCents))
+  return result
 })
 
-function modify() {
-  emit('update:scale', props.scale.approximateHarmonics(modal.largeInteger))
+function modify(expand = true) {
+  scale.sourceText += `\ntoHarmonics(${modal.largeInteger})`
+  if (expand) {
+    const { visitor, defaults } = scale.getVisitors()
+    scale.sourceText = visitor.expand(defaults)
+  }
+  scale.computeScale()
+  emit('done')
 }
 </script>
 
@@ -44,6 +57,14 @@ function modify() {
             v-model="modal.largeInteger"
           />
         </div>
+        <p>Error: {{ error.toFixed(5) }} c</p>
+      </div>
+    </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="modify(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="modify(false)">Raw</button>
       </div>
     </template>
   </Modal>
diff --git a/src/components/modals/modification/ApproximateByRatios.vue b/src/components/modals/modification/ApproximateByRatios.vue
index 351eb895..728396d7 100644
--- a/src/components/modals/modification/ApproximateByRatios.vue
+++ b/src/components/modals/modification/ApproximateByRatios.vue
@@ -9,20 +9,16 @@ import {
   PRIMES,
   valueToCents
 } from 'xen-dev-utils'
-import { DEFAULT_NUMBER_OF_COMPONENTS } from '@/constants'
-import { fractionToString, ExtendedMonzo, Interval, type Scale } from 'scale-workshop-core'
 import { useApproximateByRatiosStore } from '@/stores/approximate-by-ratios'
 import { setAndReportValidity } from '@/utils'
+import { useScaleStore } from '@/stores/scale'
 
 const MAX_LENGTH = 128
 
-const props = defineProps<{
-  scale: Scale
-}>()
-
-const emit = defineEmits(['update:scale', 'cancel'])
+const emit = defineEmits(['done', 'cancel'])
 
 const approx = useApproximateByRatiosStore()
+const scale = useScaleStore()
 
 const approximationSelect = ref<HTMLSelectElement | null>(null)
 
@@ -33,11 +29,11 @@ type Approximation = {
 }
 
 const approximationsWithErrorsAndLimits = computed<Approximation[]>(() => {
-  const selected = props.scale.getMonzo(approx.degree)
-  const selectedCents = selected.totalCents()
+  const selected = Math.abs(scale.scale.getRatio(scale.baseMidiNote + approx.degree))
+  const selectedCents = valueToCents(selected)
   if (approx.method === 'convergents') {
     const approximations = getConvergents(
-      selected.valueOf(),
+      selected,
       undefined,
       2 * MAX_LENGTH, // Extra length buffer
       approx.includeSemiconvergents,
@@ -108,22 +104,27 @@ watch(approximationsWithErrorsAndLimits, (newValue) => {
 function modifyAndAdvance() {
   if (!approximationsWithErrorsAndLimits.value.length) {
     alert('No approximation satisfying criteria found!')
+  } else {
+    const fraction = approximationsWithErrorsAndLimits.value[approx.approximationIndex].fraction
+    const i = approx.degree - 1
+    scale.sourceText += `\n$[${i}] = ${fraction.toFraction()} colorOf($[${i}]) labelOf($[${i}])`
   }
-  const replacement = new Interval(
-    ExtendedMonzo.fromFraction(
-      approximationsWithErrorsAndLimits.value[approx.approximationIndex].fraction,
-      DEFAULT_NUMBER_OF_COMPONENTS
-    ),
-    'ratio'
-  )
-  emit('update:scale', props.scale.replaceDegree(approx.degree, replacement))
-  approx.degree = Math.min(props.scale.size, approx.degree + 1)
+  approx.degree = Math.min(scale.scale.size, approx.degree + 1)
   approx.approximationIndex = 0
 }
+
+function modify(expand = true) {
+  if (expand) {
+    const { visitor, defaults } = scale.getVisitors()
+    scale.sourceText = visitor.expand(defaults)
+  }
+  scale.computeScale()
+  emit('done')
+}
 </script>
 
 <template>
-  <Modal @confirm="modifyAndAdvance" @cancel="$emit('cancel')">
+  <Modal @confirm="modify(true)" @cancel="modify(false)">
     <template #header>
       <h2>Approximate by ratios</h2>
     </template>
@@ -132,11 +133,17 @@ function modifyAndAdvance() {
         <p>Select scale degrees and apply rational replacements one by one.</p>
         <div class="control">
           <label for="degree">Scale Degree</label>
-          <input type="number" id="degree" min="1" :max="scale.size" v-model="approx.degree" />
+          <input
+            type="number"
+            id="degree"
+            min="1"
+            :max="scale.scale.size"
+            v-model="approx.degree"
+          />
         </div>
         <div class="control">
           <label for="interval">Interval</label>
-          <input type="text" id="interval" disabled :value="scale.getName(approx.degree)" />
+          <input type="text" id="interval" disabled :value="scale.labels[approx.degree - 1]" />
         </div>
         <div class="control">
           <label for="approximation">Approximation</label>
@@ -151,8 +158,7 @@ function modifyAndAdvance() {
               :key="i"
               :value="i"
             >
-              {{ fractionToString(approximation.fraction) }} |
-              {{ approximation.error.toFixed(5) }} |
+              {{ approximation.fraction.toFraction() }} | {{ approximation.error.toFixed(5) }} |
               {{ approximation.limit }}
             </option>
           </select>
@@ -227,7 +233,8 @@ function modifyAndAdvance() {
     <template #footer>
       <div class="btn-group">
         <button @click="modifyAndAdvance">Apply</button>
-        <button @click="$emit('cancel')">Close</button>
+        <button @click="modify(true)">Close</button>
+        <button @click="modify(false)">Raw</button>
       </div>
     </template>
   </Modal>
diff --git a/src/components/modals/modification/ApproximateBySubharmonics.vue b/src/components/modals/modification/ApproximateBySubharmonics.vue
index 2ce6c925..943c9b79 100644
--- a/src/components/modals/modification/ApproximateBySubharmonics.vue
+++ b/src/components/modals/modification/ApproximateBySubharmonics.vue
@@ -1,18 +1,33 @@
 <script setup lang="ts">
 import Modal from '@/components/ModalDialog.vue'
-import type { Scale } from 'scale-workshop-core'
 import { useModalStore } from '@/stores/modal'
+import { useScaleStore } from '@/stores/scale'
+import { computed } from 'vue'
+import { valueToCents } from 'xen-dev-utils'
 
-const props = defineProps<{
-  scale: Scale
-}>()
-
-const emit = defineEmits(['update:scale', 'cancel'])
+const emit = defineEmits(['done', 'cancel'])
 
 const modal = useModalStore()
+const scale = useScaleStore()
+
+const error = computed(() => {
+  let result = 0
+  for (const ratio of scale.scale.intervalRatios) {
+    const denominator = Math.round(modal.largeInteger / ratio)
+    const approximation = modal.largeInteger / denominator
+    result = Math.max(result, Math.abs(valueToCents(Math.abs(approximation / ratio))))
+  }
+  return result
+})
 
-function modify() {
-  emit('update:scale', props.scale.approximateSubharmonics(modal.largeInteger))
+function modify(expand = true) {
+  scale.sourceText += `\ntoSubharmonics(${modal.largeInteger})`
+  if (expand) {
+    const { visitor, defaults } = scale.getVisitors()
+    scale.sourceText = visitor.expand(defaults)
+  }
+  scale.computeScale()
+  emit('done')
 }
 </script>
 
@@ -34,6 +49,14 @@ function modify() {
             v-model="modal.largeInteger"
           />
         </div>
+        <p>Error: {{ error.toFixed(5) }} c</p>
+      </div>
+    </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="modify(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="modify(false)">Raw</button>
       </div>
     </template>
   </Modal>
diff --git a/src/components/modals/modification/CoalesceDuplicates.vue b/src/components/modals/modification/CoalesceDuplicates.vue
new file mode 100644
index 00000000..456b7b78
--- /dev/null
+++ b/src/components/modals/modification/CoalesceDuplicates.vue
@@ -0,0 +1,106 @@
+<script setup lang="ts">
+import Modal from '@/components/ModalDialog.vue'
+import { useModalStore } from '@/stores/modal'
+import { useScaleStore } from '@/stores/scale'
+import { centString } from '@/utils'
+
+const emit = defineEmits(['done', 'cancel'])
+
+const modal = useModalStore()
+const scale = useScaleStore()
+
+function modify(expand = true) {
+  scale.sourceText += `\ncoalesce(${centString(modal.tolerance)}, '${modal.coalescingAction}')`
+  if (expand) {
+    const { visitor, defaults } = scale.getVisitors()
+    scale.sourceText = visitor.expand(defaults)
+  }
+  scale.computeScale()
+  emit('done')
+}
+</script>
+
+<template>
+  <Modal @confirm="modify" @cancel="$emit('cancel')">
+    <template #header>
+      <h2>Coalesce duplicates</h2>
+    </template>
+    <template #body>
+      <div class="control-group">
+        <p>
+          Coalesce groups of intervals within the given tolerance to a single interval based on the
+          given rule.
+        </p>
+        <div class="control">
+          <label for="tolerance">Tolerance in cents</label>
+          <input
+            id="tolerance"
+            type="number"
+            min="0"
+            step="0.5"
+            class="control"
+            v-model="modal.tolerance"
+          />
+        </div>
+        <div class="control radio-group">
+          <label>How to convert duplicates to a single interval:</label>
+          <label>Keep (which)</label>
+          <span>
+            <input
+              type="radio"
+              id="action-simplest"
+              value="simplest"
+              v-model="modal.coalescingAction"
+            />
+            <label for="action-simplest"> Simplest </label>
+          </span>
+
+          <span>
+            <input
+              type="radio"
+              id="action-lowest"
+              value="lowest"
+              v-model="modal.coalescingAction"
+            />
+            <label for="action-lowest"> Lowest </label>
+          </span>
+
+          <span>
+            <input
+              type="radio"
+              id="action-highest"
+              value="highest"
+              v-model="modal.coalescingAction"
+            />
+            <label for="action-highest"> Highest </label>
+          </span>
+          <label>Replace with (which) average</label>
+          <span>
+            <input type="radio" id="action-avg" value="avg" v-model="modal.coalescingAction" />
+            <label for="action-avg"> Arithmetic </label>
+          </span>
+          <span>
+            <input type="radio" id="action-havg" value="havg" v-model="modal.coalescingAction" />
+            <label for="action-havg"> Harmonic </label>
+          </span>
+          <span>
+            <input
+              type="radio"
+              id="action-geoavg"
+              value="geoavg"
+              v-model="modal.coalescingAction"
+            />
+            <label for="action-geoavg"> Geometric </label>
+          </span>
+        </div>
+      </div>
+    </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="modify(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="modify(false)">Raw</button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/src/components/modals/modification/ConvertType.vue b/src/components/modals/modification/ConvertType.vue
index d11775d8..340f7f0f 100644
--- a/src/components/modals/modification/ConvertType.vue
+++ b/src/components/modals/modification/ConvertType.vue
@@ -1,50 +1,48 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
 import Modal from '@/components/ModalDialog.vue'
-import { Fraction } from 'xen-dev-utils'
-import type { IntervalOptions, Scale } from 'scale-workshop-core'
 import { useModalStore } from '@/stores/modal'
+import { useStateStore } from '@/stores/state'
+import { useScaleStore } from '@/stores/scale'
+import { centString } from '@/utils'
 
-const props = defineProps<{
-  scale: Scale
-  centsFractionDigits: number
-  decimalFractionDigits: number
-}>()
-
-const emit = defineEmits(['update:scale', 'cancel'])
+const emit = defineEmits(['done', 'cancel'])
 
 const modal = useModalStore()
+const scale = useScaleStore()
+const state = useStateStore()
 
 const myCentsFractionDigits = ref(3)
 const myDecimalFractionDigits = ref(5)
 
 onMounted(() => {
-  myCentsFractionDigits.value = props.centsFractionDigits
-  myDecimalFractionDigits.value = props.decimalFractionDigits
+  myCentsFractionDigits.value = state.centsFractionDigits
+  myDecimalFractionDigits.value = state.decimalFractionDigits
 })
 
-function modify() {
-  const options: IntervalOptions = {
-    centsFractionDigits: myCentsFractionDigits.value,
-    decimalFractionDigits: myDecimalFractionDigits.value
-  }
-  if (modal.preferredNumerator) {
-    options.preferredNumerator = modal.preferredNumerator
-  }
-  if (modal.preferredDenominator) {
-    options.preferredDenominator = modal.preferredDenominator
-  }
-  if (modal.preferredEtDenominator) {
-    options.preferredEtDenominator = modal.preferredEtDenominator
+function modify(expand = false) {
+  scale.sourceText += '\n'
+  if (modal.type === 'decimal') {
+    scale.sourceText += `interval => decimal(interval, ${myDecimalFractionDigits.value})`
+  } else if (modal.type === 'fraction') {
+    if (modal.fractionTolerance || modal.preferredNumerator || modal.preferredEtEquaveDenominator) {
+      scale.sourceText += `interval => interval lest fraction(interval, ${modal.fractionTolerance ? centString(modal.fractionTolerance) : 'niente'}, ${modal.preferredNumerator}, ${modal.preferredDenominator})`
+    } else {
+      scale.sourceText += 'interval => interval lest fraction(interval)'
+    }
+  } else if (modal.type === 'nedji') {
+    scale.sourceText += `interval => interval lest nedji(interval, ${modal.preferredEtNumerator}, ${modal.preferredEtDenominator}, ${modal.preferredEtEquaveNumerator}, ${modal.preferredEtEquaveDenominator})`
+  } else if (modal.type === 'cents') {
+    scale.sourceText += `interval => cents(interval, ${myCentsFractionDigits.value})`
+  } else {
+    scale.sourceText += `interval => interval lest ${modal.type}(interval)`
   }
-  if (modal.preferredEtEquaveNumerator) {
-    options.preferredEtEquave = new Fraction(
-      modal.preferredEtEquaveNumerator,
-      modal.preferredEtEquaveDenominator
-    )
+  if (expand) {
+    const { visitor, defaults } = scale.getVisitors()
+    scale.sourceText = visitor.expand(defaults)
   }
-
-  emit('update:scale', props.scale.asType(modal.type, options))
+  scale.computeScale()
+  emit('done')
 }
 </script>
 
@@ -59,10 +57,12 @@ function modify() {
         <div class="control">
           <label for="type">Interval type</label>
           <select id="type" class="control" v-model="modal.type">
-            <option value="cents">Cents</option>
-            <option value="ratio">Ratio</option>
-            <option value="equal temperament">Equal temperament</option>
             <option value="decimal">Decimal ratio</option>
+            <option value="fraction">Fraction</option>
+            <option value="nedji">NEDJI</option>
+            <option value="cents">Cents</option>
+            <option value="FJS">Functional Just System</option>
+            <option value="absoluteFJS">Absolute FJS</option>
             <option value="monzo">Monzo</option>
           </select>
         </div>
@@ -77,42 +77,68 @@ function modify() {
           <input id="decimal-digits" type="number" min="0" v-model="myDecimalFractionDigits" />
         </div>
 
-        <div class="control" v-if="modal.type === 'ratio'">
-          <label for="numerator">Preferred numerator *</label>
-          <input id="numerator" type="number" min="0" v-model="modal.preferredNumerator" />
-        </div>
-        <div class="control" v-if="modal.type === 'ratio'">
-          <label for="denominator">Preferred denominator *</label>
-          <input id="denominator" type="number" min="0" v-model="modal.preferredDenominator" />
-        </div>
+        <template v-if="modal.type === 'fraction'">
+          <div class="control">
+            <label for="tolerance">Tolerance in cents</label>
+            <input
+              id="tolerance"
+              type="number"
+              min="0"
+              step="0.5"
+              class="control"
+              v-model="modal.fractionTolerance"
+            />
+          </div>
+          <div class="control">
+            <label for="numerator">Preferred numerator *</label>
+            <input id="numerator" type="number" min="0" v-model="modal.preferredNumerator" />
+          </div>
+          <div class="control">
+            <label for="denominator">Preferred denominator *</label>
+            <input id="denominator" type="number" min="0" v-model="modal.preferredDenominator" />
+          </div>
+        </template>
 
-        <div class="control" v-if="modal.type === 'equal temperament'">
-          <label for="edo">Preferred EDO *</label>
-          <input id="edo" type="number" min="0" v-model="modal.preferredEtDenominator" />
-        </div>
-        <div class="control" v-if="modal.type === 'equal temperament'">
-          <label for="eq-numerator">Preferred equave numerator *</label>
-          <input
-            id="eq-numeraotr"
-            type="number"
-            min="0"
-            v-model="modal.preferredEtEquaveNumerator"
-          />
-        </div>
-        <div class="control" v-if="modal.type === 'equal temperament'">
-          <label for="eq-denominator">Preferred equave denominator</label>
-          <input
-            id="eq-denominator"
-            type="number"
-            min="1"
-            v-model="modal.preferredEtEquaveDenominator"
-          />
-        </div>
+        <template v-if="modal.type === 'nedji'">
+          <div class="control">
+            <label for="steps">Preferred number of steps *</label>
+            <input id="steps" type="number" min="0" v-model="modal.preferredEtNumerator" />
+          </div>
+          <div class="control">
+            <label for="edo">Preferred divisions (EDO) *</label>
+            <input id="edo" type="number" min="0" v-model="modal.preferredEtDenominator" />
+          </div>
+          <div class="control" v-if="modal.type === 'nedji'">
+            <label for="eq-numerator">Preferred equave numerator *</label>
+            <input
+              id="eq-numerator"
+              type="number"
+              min="0"
+              v-model="modal.preferredEtEquaveNumerator"
+            />
+          </div>
+          <div class="control" v-if="modal.type === 'nedji'">
+            <label for="eq-denominator">Preferred equave denominator</label>
+            <input
+              id="eq-denominator"
+              type="number"
+              min="0"
+              v-model="modal.preferredEtEquaveDenominator"
+            />
+          </div>
+        </template>
 
-        <i v-if="modal.type === 'ratio' || modal.type === 'equal temperament'"
+        <i v-if="modal.type === 'fraction' || modal.type === 'nedji'"
           >*) Value of 0 means no preference.</i
         >
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="modify(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="modify(false)">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
diff --git a/src/components/modals/modification/EnumerateScale.vue b/src/components/modals/modification/EnumerateScale.vue
new file mode 100644
index 00000000..84831c7b
--- /dev/null
+++ b/src/components/modals/modification/EnumerateScale.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import Modal from '@/components/ModalDialog.vue'
+import { useScaleStore } from '@/stores/scale'
+
+const emit = defineEmits(['done', 'cancel'])
+
+const scale = useScaleStore()
+
+function overtonal() {
+  scale.sourceText += ';elevate();simplify;repr'
+  const { visitor, defaults } = scale.getVisitors()
+  const overtones = visitor.mutables.get('$') as unknown as string[]
+  visitor.mutables.set('$', [])
+  scale.sourceText = visitor.expand(defaults)
+  if (scale.sourceText) {
+    scale.sourceText += '\n'
+  }
+  scale.sourceText += overtones.join(':')
+  scale.computeScale()
+  emit('done')
+}
+
+function undertonal() {
+  scale.sourceText += ';reflect();elevate();simplify;repr'
+  const { visitor, defaults } = scale.getVisitors()
+  const undertones = visitor.mutables.get('$') as unknown as string[]
+  visitor.mutables.set('$', [])
+  scale.sourceText = visitor.expand(defaults)
+  if (scale.sourceText) {
+    scale.sourceText += '\n'
+  }
+  scale.sourceText += '/' + undertones.join(':')
+  scale.computeScale()
+  emit('done')
+}
+
+function retroversion() {
+  scale.sourceText += ';retrovert();elevate();simplify;repr'
+  const { visitor, defaults } = scale.getVisitors()
+  const tones = visitor.mutables.get('$') as unknown as string[]
+  visitor.mutables.set('$', [])
+  scale.sourceText = visitor.expand(defaults)
+  if (scale.sourceText) {
+    scale.sourceText += '\n'
+  }
+  scale.sourceText += 'retroverted(' + tones.join(':') + ')'
+  scale.computeScale()
+  emit('done')
+}
+
+function revposition() {
+  scale.sourceText += ';revpose();elevate();simplify;repr'
+  const { visitor, defaults } = scale.getVisitors()
+  const tones = visitor.mutables.get('$') as unknown as string[]
+  visitor.mutables.set('$', [])
+  scale.sourceText = visitor.expand(defaults)
+  if (scale.sourceText) {
+    scale.sourceText += '\n'
+  }
+  scale.sourceText += 'revposed(' + tones.join(':') + ')'
+  scale.computeScale()
+  emit('done')
+}
+</script>
+
+<template>
+  <Modal @confirm="$emit('done')" @cancel="$emit('cancel')">
+    <template #header>
+      <h2>Enumerate</h2>
+    </template>
+    <template #body>
+      <div class="control-group">
+        <p>Convert your scale to an enumeration.</p>
+        <button @click="overtonal">Overtonal</button>
+        <button @click="undertonal">Undertonal</button>
+        <button @click="retroversion">Retroversion</button>
+        <button @click="revposition">Reversed overtonal</button>
+      </div>
+    </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="$emit('cancel')">Cancel</button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/src/components/modals/modification/EqualizeScale.vue b/src/components/modals/modification/EqualizeScale.vue
index 9539ef93..74a8808a 100644
--- a/src/components/modals/modification/EqualizeScale.vue
+++ b/src/components/modals/modification/EqualizeScale.vue
@@ -1,18 +1,50 @@
 <script setup lang="ts">
+import { alignCents, misalignment } from '@/analysis'
 import Modal from '@/components/ModalDialog.vue'
-import type { Scale } from 'scale-workshop-core'
+import { OCTAVE } from '@/constants'
 import { useModalStore } from '@/stores/modal'
+import { useScaleStore } from '@/stores/scale'
+import { computed } from 'vue'
+import { valueToCents } from 'xen-dev-utils'
+import { linear } from 'sonic-weave'
 
-const props = defineProps<{
-  scale: Scale
-}>()
-
-const emit = defineEmits(['update:scale', 'cancel'])
+const emit = defineEmits(['done', 'cancel'])
 
 const modal = useModalStore()
+const scale = useScaleStore()
+
+const equalizedScaleData = computed(() => {
+  const pitches = [...Array(scale.scale.size).keys()].map((i) =>
+    valueToCents(Math.abs(scale.scale.getRatio(i + scale.baseMidiNote)))
+  )
+  const gridCents = valueToCents(scale.scale.equaveRatio) / modal.largeDivisions
+  if (modal.errorModel === 'rooted') {
+    const error = misalignment(pitches, gridCents)
+    return { error, degrees: [] }
+  }
+  return alignCents(pitches, gridCents)
+})
 
-function modify() {
-  emit('update:scale', props.scale.approximateEqualTemperament(modal.largeDivisions))
+function modify(expand = true) {
+  if (modal.errorModel === 'rooted') {
+    scale.sourceText += `\nequalize(${modal.largeDivisions})`
+    if (expand) {
+      const { visitor, defaults } = scale.getVisitors()
+      scale.sourceText = visitor.expand(defaults)
+    }
+  } else {
+    const degrees = [...equalizedScaleData.value.degrees]
+    degrees.shift()
+    degrees.push(modal.largeDivisions)
+    let postfix = `\\${modal.largeDivisions}`
+    const equave = scale.relativeIntervals[scale.relativeIntervals.length - 1]
+    if (equave.compare(OCTAVE)) {
+      postfix += `<${linear(equave).toString()}>`
+    }
+    scale.sourceText = degrees.map((d) => `${d}${postfix}`).join('\n')
+  }
+  scale.computeScale()
+  emit('done')
 }
 </script>
 
@@ -37,6 +69,25 @@ function modify() {
             v-model="modal.largeDivisions"
           />
         </div>
+        <div class="control radio-group">
+          <label>Error model</label>
+          <span>
+            <input type="radio" id="error-rooted" value="rooted" v-model="modal.errorModel" />
+            <label for="error-rooted"> Rooted </label>
+          </span>
+          <span>
+            <input type="radio" id="error-free" value="free" v-model="modal.errorModel" />
+            <label for="error-free"> Free </label>
+          </span>
+        </div>
+        <p>Error: {{ equalizedScaleData.error.toFixed(5) }} c</p>
+      </div>
+    </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="modify(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="modify(false)" :disabled="modal.errorModel === 'free'">Raw</button>
       </div>
     </template>
   </Modal>
diff --git a/src/components/modals/modification/ExpandScale.vue b/src/components/modals/modification/ExpandScale.vue
new file mode 100644
index 00000000..5bde53a0
--- /dev/null
+++ b/src/components/modals/modification/ExpandScale.vue
@@ -0,0 +1,44 @@
+<script setup lang="ts">
+import Modal from '@/components/ModalDialog.vue'
+import { useModalStore } from '@/stores/modal'
+import { useScaleStore } from '@/stores/scale'
+
+const emit = defineEmits(['done', 'cancel'])
+
+const scale = useScaleStore()
+const modal = useModalStore()
+
+function modify() {
+  if (modal.simplify) {
+    scale.sourceText += ';simplify'
+  }
+  if (modal.bleach) {
+    scale.sourceText += ';bleach'
+  }
+  const { visitor, defaults } = scale.getVisitors()
+  scale.sourceText = visitor.expand(defaults)
+  scale.computeScale()
+  emit('done')
+}
+</script>
+
+<template>
+  <Modal @confirm="modify" @cancel="$emit('cancel')">
+    <template #header>
+      <h2>Expand</h2>
+    </template>
+    <template #body>
+      <div class="control-group">
+        <p>Expand your scale to individual lines.</p>
+        <div class="control checkbox-container">
+          <input type="checkbox" id="simplify" v-model="modal.simplify" />
+          <label for="simplify"> Remove formatting</label>
+        </div>
+        <div class="control checkbox-container">
+          <input type="checkbox" id="bleach" v-model="modal.bleach" />
+          <label for="bleach"> Remove colors and labels</label>
+        </div>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/src/components/modals/modification/MergeOffset.vue b/src/components/modals/modification/MergeOffset.vue
deleted file mode 100644
index a8c3cf7e..00000000
--- a/src/components/modals/modification/MergeOffset.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<script setup lang="ts">
-import Modal from '@/components/ModalDialog.vue'
-import ScaleLineInput from '@/components/ScaleLineInput.vue'
-import { Interval, type Scale } from 'scale-workshop-core'
-import { useModalStore } from '@/stores/modal'
-import { THIRD } from '@/constants'
-
-const props = defineProps<{
-  scale: Scale
-}>()
-
-const emit = defineEmits(['update:scale', 'cancel'])
-
-const modal = useModalStore()
-
-function modify() {
-  let transposed = props.scale.transpose(modal.offset)
-  if (modal.overflowType === 'filter') {
-    transposed = transposed.filter()
-  } else if (modal.overflowType === 'reduce') {
-    transposed = transposed.reduce()
-  }
-  let scale: Scale
-  if (modal.overflowType === 'intuitive') {
-    scale = props.scale.variant([...props.scale.intervals])
-    let unison: Interval
-    if (scale.intervals.length) {
-      unison = scale.intervals.shift()!
-      scale = props.scale.merge(transposed)
-      if (scale.intervals.length) {
-        const highest = scale.intervals.pop()!
-        const equave = scale.equave
-        if (highest.compare(equave) > 0) {
-          scale.intervals.push(equave)
-          scale.equave = highest
-          scale.sortInPlace()
-        }
-      }
-      scale.intervals.unshift(unison!)
-    } else {
-      scale = props.scale.merge(transposed)
-    }
-  } else {
-    scale = props.scale.merge(transposed)
-  }
-  emit('update:scale', scale)
-}
-</script>
-
-<template>
-  <Modal @confirm="modify" @cancel="$emit('cancel')">
-    <template #header>
-      <h2>Merge an offset copy of the scale</h2>
-    </template>
-    <template #body>
-      <div class="control-group">
-        <p>Clone the scale, transpose it by the offset and merge back in with the original.</p>
-        <div class="control">
-          <label for="offset">Offset</label>
-          <ScaleLineInput
-            id="offset"
-            placeholder="5/4"
-            v-model="modal.offsetString"
-            :defaultValue="THIRD"
-            @update:value="modal.offset = $event"
-          />
-        </div>
-        <div class="control radio-group">
-          <label>Overflow</label>
-          <span>
-            <input
-              type="radio"
-              id="overflow-intuitive"
-              value="intuitive"
-              v-model="modal.overflowType"
-            />
-            <label for="overflow-intuitive"> Keep </label>
-          </span>
-
-          <span>
-            <input type="radio" id="overflow-filter" value="filter" v-model="modal.overflowType" />
-            <label for="method-vals"> Drop </label>
-          </span>
-
-          <span>
-            <input type="radio" id="overflow-reduce" value="reduce" v-model="modal.overflowType" />
-            <label for="overflow-reduce"> Wrap </label>
-          </span>
-        </div>
-      </div>
-    </template>
-  </Modal>
-</template>
diff --git a/src/components/modals/modification/MergeOffsets.vue b/src/components/modals/modification/MergeOffsets.vue
new file mode 100644
index 00000000..adc6a8b9
--- /dev/null
+++ b/src/components/modals/modification/MergeOffsets.vue
@@ -0,0 +1,76 @@
+<script setup lang="ts">
+import Modal from '@/components/ModalDialog.vue'
+import { useModalStore } from '@/stores/modal'
+import { useScaleStore } from '@/stores/scale'
+import { arrayToString } from '@/utils'
+import { ref, watch } from 'vue'
+
+const emit = defineEmits(['done', 'cancel'])
+
+const modal = useModalStore()
+const scale = useScaleStore()
+
+const offsetsElement = ref<HTMLInputElement | null>(null)
+watch(
+  () => modal.offsetsError,
+  (newError) => offsetsElement.value!.setCustomValidity(newError)
+)
+
+function modify(expand = true) {
+  scale.sourceText += `\nmergeOffset(${arrayToString(modal.offsets)}, '${modal.overflowType}')`
+  if (expand) {
+    const { visitor, defaults } = scale.getVisitors()
+    scale.sourceText = visitor.expand(defaults)
+  }
+  scale.computeScale()
+  emit('done')
+}
+</script>
+
+<template>
+  <Modal @confirm="modify" @cancel="$emit('cancel')">
+    <template #header>
+      <h2>Merge offset copies of the scale</h2>
+    </template>
+    <template #body>
+      <div class="control-group">
+        <p>Clone the scale, transpose it by the offsets and merge back in with the original.</p>
+        <div class="control">
+          <label for="offsets">Offsets</label>
+          <input
+            ref="offsetsElement"
+            id="offsets"
+            type="text"
+            class="control"
+            placeholder="5/4"
+            v-model="modal.offsetsString"
+          />
+        </div>
+        <div class="control radio-group">
+          <label>Overflow</label>
+          <span>
+            <input type="radio" id="overflow-keep" value="keep" v-model="modal.overflowType" />
+            <label for="overflow-keep"> Keep </label>
+          </span>
+
+          <span>
+            <input type="radio" id="overflow-drop" value="drop" v-model="modal.overflowType" />
+            <label for="overflow-drop"> Drop </label>
+          </span>
+
+          <span>
+            <input type="radio" id="overflow-wrap" value="wrap" v-model="modal.overflowType" />
+            <label for="overflow-wrap"> Wrap </label>
+          </span>
+        </div>
+      </div>
+    </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="modify(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="modify(false)">Raw</button>
+      </div>
+    </template>
+  </Modal>
+</template>
diff --git a/src/components/modals/modification/RandomVariance.vue b/src/components/modals/modification/RandomVariance.vue
index 9a55861e..20f2587a 100644
--- a/src/components/modals/modification/RandomVariance.vue
+++ b/src/components/modals/modification/RandomVariance.vue
@@ -1,36 +1,35 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import Modal from '@/components/ModalDialog.vue'
-import type { Scale } from 'scale-workshop-core'
 import { useModalStore } from '@/stores/modal'
+import { useScaleStore } from '@/stores/scale'
+import { centString } from '@/utils'
+import { useStateStore } from '@/stores/state'
 
 const EPSILON = 1e-6
 
-const props = defineProps<{
-  scale: Scale
-  centsFractionDigits: number
-  decimalFractionDigits: number
-}>()
-
-const emit = defineEmits(['update:scale', 'cancel'])
+const emit = defineEmits(['done', 'cancel'])
 
 const modal = useModalStore()
+const scale = useScaleStore()
+const state = useStateStore()
 
 const equave = computed(() => {
-  if (Math.abs(props.scale.equave.totalCents() - 1200) < EPSILON) {
+  // Biased compared to cents, but who cares.
+  if (Math.abs(scale.scale.equaveRatio - 2) < EPSILON) {
     return 'octave'
   }
   return 'equave'
 })
 
-function modify() {
-  emit(
-    'update:scale',
-    props.scale.vary(modal.varianceAmount, modal.varyEquave).mergeOptions({
-      centsFractionDigits: props.centsFractionDigits,
-      decimalFractionDigits: props.decimalFractionDigits
-    })
-  )
+function modify(expand = true) {
+  scale.sourceText += `\nrandomVariance(${centString(modal.varianceAmount)}, ${modal.varyEquave})\ninterval => cents(interval, ${state.centsFractionDigits})`
+  if (expand) {
+    const { visitor, defaults } = scale.getVisitors()
+    scale.sourceText = visitor.expand(defaults)
+  }
+  scale.computeScale()
+  emit('done')
 }
 </script>
 
@@ -52,5 +51,12 @@ function modify() {
         </div>
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="modify(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="modify(false)">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
diff --git a/src/components/modals/modification/RotateScale.vue b/src/components/modals/modification/RotateScale.vue
index 81c74708..f99f48ce 100644
--- a/src/components/modals/modification/RotateScale.vue
+++ b/src/components/modals/modification/RotateScale.vue
@@ -1,18 +1,21 @@
 <script setup lang="ts">
 import Modal from '@/components/ModalDialog.vue'
-import type { Scale } from 'scale-workshop-core'
 import { useModalStore } from '@/stores/modal'
+import { useScaleStore } from '@/stores/scale'
 
-const props = defineProps<{
-  scale: Scale
-}>()
-
-const emit = defineEmits(['update:scale', 'cancel'])
+const emit = defineEmits(['done', 'cancel'])
 
 const modal = useModalStore()
+const scale = useScaleStore()
 
-function modify() {
-  emit('update:scale', props.scale.rotate(modal.newUnison))
+function modify(expand = true) {
+  scale.sourceText += `\nrotate(${modal.newUnison + 1})`
+  if (expand) {
+    const { visitor, defaults } = scale.getVisitors()
+    scale.sourceText = visitor.expand(defaults)
+  }
+  scale.computeScale()
+  emit('done')
 }
 </script>
 
@@ -24,16 +27,22 @@ function modify() {
     <template #body>
       <div class="control-group">
         <div class="control">
-          <p>Rotates the mode of your scale.</p>
-          <p>The resulting scale will be sorted in ascending order.</p>
+          <p>Rotate the mode of your scale.</p>
           <label for="new-unison">New 1/1</label>
           <select id="new-unison" class="control" v-model="modal.newUnison">
-            <option v-for="i of props.scale.size - 1" :key="i" :value="i">
-              {{ props.scale.getName(i) }}
+            <option v-for="(label, i) of scale.labels" :key="i" :value="i">
+              {{ label }}
             </option>
           </select>
         </div>
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="modify(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="modify(false)">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
diff --git a/src/components/modals/modification/StretchScale.vue b/src/components/modals/modification/StretchScale.vue
index f2ed6822..72a6dda3 100644
--- a/src/components/modals/modification/StretchScale.vue
+++ b/src/components/modals/modification/StretchScale.vue
@@ -1,28 +1,26 @@
 <script setup lang="ts">
 import Modal from '@/components/ModalDialog.vue'
 import ScaleLineInput from '@/components/ScaleLineInput.vue'
-import { type Scale } from 'scale-workshop-core'
 import { FIFTH, FIFTH_12TET } from '@/constants'
 import { useModalStore } from '@/stores/modal'
+import { useScaleStore } from '@/stores/scale'
+import { useStateStore } from '@/stores/state'
+import { decimalString } from '@/utils'
 
-const props = defineProps<{
-  scale: Scale
-  centsFractionDigits: number
-  decimalFractionDigits: number
-}>()
-
-const emit = defineEmits(['update:scale', 'cancel'])
+const emit = defineEmits(['done', 'cancel'])
 
 const modal = useModalStore()
+const scale = useScaleStore()
+const state = useStateStore()
 
-function modify() {
-  emit(
-    'update:scale',
-    props.scale.stretch(modal.stretchAmount).mergeOptions({
-      centsFractionDigits: props.centsFractionDigits,
-      decimalFractionDigits: props.decimalFractionDigits
-    })
-  )
+function modify(expand = true) {
+  scale.sourceText += `\nstretch(${decimalString(modal.stretchAmount)})\ninterval => cents(interval, ${state.centsFractionDigits})`
+  if (expand) {
+    const { visitor, defaults } = scale.getVisitors()
+    scale.sourceText = visitor.expand(defaults)
+  }
+  scale.computeScale()
+  emit('done')
 }
 </script>
 
@@ -74,6 +72,13 @@ function modify() {
         </div>
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="modify(true)">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="modify(false)">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
 
diff --git a/src/components/modals/modification/TakeSubset.vue b/src/components/modals/modification/TakeSubset.vue
index 6fafb875..5bcdd94e 100644
--- a/src/components/modals/modification/TakeSubset.vue
+++ b/src/components/modals/modification/TakeSubset.vue
@@ -1,21 +1,22 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import Modal from '@/components/ModalDialog.vue'
-import type { Scale } from 'scale-workshop-core'
 import { useModalStore } from '@/stores/modal'
+import { useScaleStore } from '@/stores/scale'
+import { arrayToString } from '@/utils'
 
-const props = defineProps<{
-  scale: Scale
-}>()
-
-const emit = defineEmits(['update:scale', 'cancel'])
+const emit = defineEmits(['done', 'cancel'])
 
+const scale = useScaleStore()
 const modal = useModalStore()
 
 const mode = computed(() => {
+  if (!modal.selected.size) {
+    return '(nothing selected)'
+  }
   const degrees = [...modal.selected.values()]
   degrees.sort((a, b) => a - b)
-  degrees.push(props.scale.size)
+  degrees.push(scale.scale.size)
   const result = []
   for (let i = 1; i < degrees.length; ++i) {
     result.push(degrees[i] - degrees[i - 1])
@@ -24,16 +25,24 @@ const mode = computed(() => {
 })
 
 const degrees = computed(() => {
+  if (!modal.selected.size) {
+    return '(nothing selected)'
+  }
   const degrees = [...modal.selected.values()]
   degrees.sort((a, b) => a - b)
-  degrees.shift()
-  return degrees.map((degree) => degree.toString()).join(', ') + `, (${props.scale.size})`
+  return degrees.map((degree) => degree.toString()).join(', ') + `, (${scale.scale.size})`
 })
 
-function modify() {
+function modify(expand = true) {
   const subset = [...modal.selected.values()]
   subset.sort((a, b) => a - b)
-  emit('update:scale', props.scale.subset(subset))
+  scale.sourceText += `\nsubset(${arrayToString(subset)})`
+  if (expand) {
+    const { visitor, defaults } = scale.getVisitors()
+    scale.sourceText = visitor.expand(defaults)
+  }
+  scale.computeScale()
+  emit('done')
 }
 </script>
 
@@ -48,19 +57,26 @@ function modify() {
         <label>Selected intervals</label>
         <div class="control">
           <button
-            v-for="i of props.scale.size - 1"
+            v-for="(_, i) of scale.scale.size"
             :key="i"
             class="degree"
             :class="{ selected: modal.selected.has(i) }"
             @click="modal.toggleSelected(i)"
           >
-            {{ scale.getName(i) }}
+            {{ i === 0 ? '(root)' : scale.labels[i - 1] }}
           </button>
         </div>
         <div class="control"><label>Mode </label>{{ mode }}</div>
         <div class="control"><label>Degrees </label>{{ degrees }}</div>
       </div>
     </template>
+    <template #footer>
+      <div class="btn-group">
+        <button @click="modify(true)" :disabled="!modal.selected.size">OK</button>
+        <button @click="$emit('cancel')">Cancel</button>
+        <button @click="modify(false)" :disabled="!modal.selected.size">Raw</button>
+      </div>
+    </template>
   </Modal>
 </template>
 
diff --git a/src/components/modals/modification/TemperScale.vue b/src/components/modals/modification/TemperScale.vue
index 17e3834a..5de3c4e9 100644
--- a/src/components/modals/modification/TemperScale.vue
+++ b/src/components/modals/modification/TemperScale.vue
@@ -1,139 +1,78 @@
 <script setup lang="ts">
-import { DEFAULT_NUMBER_OF_COMPONENTS } from '@/constants'
-import { Mapping, stretchToEdo, toPrimeMapping } from '@/tempering'
 import { ref, watch } from 'vue'
 import Modal from '@/components/ModalDialog.vue'
-import { Fraction, PRIME_CENTS } from 'xen-dev-utils'
-import { mapByVal, resolveMonzo, tenneyVals, vanishCommas } from 'temperaments'
-import { ExtendedMonzo, Interval, Scale, type IntervalOptions } from 'scale-workshop-core'
-import { setAndReportValidity, splitText } from '@/utils'
+import { Temperament, tenneyVals, vanishCommas } from 'temperaments'
 import { useTemperStore } from '@/stores/tempering'
+import { useScaleStore } from '@/stores/scale'
+import { useStateStore } from '@/stores/state'
+import { setAndReportValidity } from '@/utils'
 
-const props = defineProps<{
-  scale: Scale
-  centsFractionDigits: number
-}>()
-
-const emit = defineEmits(['update:scale', 'cancel'])
+const emit = defineEmits(['done', 'cancel'])
 
 const temper = useTemperStore()
+const scale = useScaleStore()
+const state = useStateStore()
 
+const valsInput = ref<HTMLInputElement | null>(null)
+const commasInput = ref<HTMLInputElement | null>(null)
 const subgroupInput = ref<HTMLInputElement | null>(null)
 
+watch(
+  () => temper.valsError,
+  (newValue) => setAndReportValidity(valsInput.value, newValue)
+)
+watch(
+  () => temper.commasError,
+  (newValue) => setAndReportValidity(commasInput.value, newValue)
+)
 watch(
   () => temper.subgroupError,
   (newValue) => setAndReportValidity(subgroupInput.value, newValue)
 )
 
-function modify() {
-  try {
-    if (temper.method === 'vals' && !temper.edoUnavailable && !temper.subgroupString.length) {
-      const monzos = [...Array(props.scale.size + 1).keys()].map((i) =>
-        temper.toLongMonzo(props.scale.getMonzo(i))
-      )
-      const octave = new Fraction(2)
-      monzos.push(resolveMonzo(octave))
-      const steps = mapByVal(monzos, temper.vals[0])
-      const edo = steps.pop()
-      let scale: Scale
-      if (temper.convertToEdoSteps) {
-        const options: IntervalOptions = {
-          preferredEtDenominator: edo,
-          preferredEtEquave: octave
-        }
-        const equave = new Interval(
-          ExtendedMonzo.fromEqualTemperament(
-            new Fraction(steps.pop()!, edo),
-            octave,
-            DEFAULT_NUMBER_OF_COMPONENTS
-          ),
-          'equal temperament',
-          undefined,
-          options
-        )
-        scale = new Scale(
-          steps.map(
-            (step) =>
-              new Interval(
-                ExtendedMonzo.fromEqualTemperament(
-                  new Fraction(step, edo),
-                  octave,
-                  DEFAULT_NUMBER_OF_COMPONENTS
-                ),
-                'equal temperament',
-                undefined,
-                options
-              )
-          ),
-          equave,
-          props.scale.baseFrequency
-        )
-      } else {
-        scale = stretchToEdo(props.scale, steps, edo!)
-      }
-      emit('update:scale', scale.mergeOptions({ centsFractionDigits: props.centsFractionDigits }))
+function modify(expand = true) {
+  let mapping: number[] | undefined
+  if (temper.method === 'vals') {
+    if (temper.edoAvailable && temper.convertToEdoSteps) {
+      scale.sourceText += `\n${temper.vals[0][0]}@${temper.subgroupString}`
     } else {
-      let mapping: Mapping
-      if (temper.method === 'mapping') {
-        const vector = splitText(temper.mappingString).map((component) => parseFloat(component))
-        while (vector.length < DEFAULT_NUMBER_OF_COMPONENTS) {
-          vector.push(PRIME_CENTS[vector.length])
-        }
-        mapping = new Mapping(vector.slice(0, DEFAULT_NUMBER_OF_COMPONENTS))
-      } else if (temper.method === 'vals') {
-        if (temper.constraintsDisabled) {
-          // Subgroup is too large to use geometric methods. Use O(n²) projection instead.
-          const weights = temper.options.weights
-          // True constraints are not supported so CTE is interpreted as POTE.
-          const temperEquaves = temper.options.temperEquaves && temper.tempering !== 'CTE'
-          const jip = temper.subgroup.jip()
-          const valVectors = temper.vals.map((val) => temper.subgroup.fromWarts(val))
-          let mappingVector = tenneyVals(valVectors, jip, weights)
-          if (!temperEquaves) {
-            mappingVector = mappingVector.map((m) => (jip[0] * m) / mappingVector[0])
-          }
-          mapping = new Mapping(toPrimeMapping(mappingVector, temper.subgroup))
-        } else {
-          mapping = Mapping.fromVals(
-            temper.vals,
-            DEFAULT_NUMBER_OF_COMPONENTS,
-            temper.subgroup,
-            temper.options
-          )
-        }
+      if (temper.constraintsAvailable) {
+        const temperament = Temperament.fromVals(temper.vals, temper.subgroup)
+        mapping = temperament.getMapping(temper.options)
       } else {
-        if (temper.constraintsDisabled) {
-          // Subgroup is too large to use geometric methods. Use O(n) gradient descent instead.
-          // True constraints are not supported so CTE is interpreted as pure equaves.
-          const temperEquaves = temper.options.temperEquaves && temper.tempering !== 'CTE'
-          const weights = temper.options.weights
-          const jip = temper.subgroup.jip()
-          const commaMonzos = temper.rawCommas.map(
-            (comma) => temper.subgroup.toMonzoAndResidual(comma)[0]
-          )
-          const mappingVector = vanishCommas(commaMonzos, jip, weights, temperEquaves)
-          mapping = new Mapping(toPrimeMapping(mappingVector, temper.subgroup))
-        } else {
-          mapping = Mapping.fromCommas(
-            temper.commas,
-            DEFAULT_NUMBER_OF_COMPONENTS,
-            temper.subgroup,
-            temper.options
-          )
-        }
+        mapping = temper.subgroup.toPrimeMapping(
+          tenneyVals(temper.vals, temper.subgroup, temper.weights, 'cents')
+        )
       }
-      emit(
-        'update:scale',
-        mapping.apply(props.scale).mergeOptions({ centsFractionDigits: props.centsFractionDigits })
-      )
     }
-  } catch (error_) {
-    if (error_ instanceof Error) {
-      temper.error = error_.message
+  } else if (temper.method === 'commas') {
+    if (temper.constraintsAvailable) {
+      const temperament = Temperament.fromCommas(temper.commas, temper.subgroup, true)
+      mapping = temperament.getMapping(temper.options)
     } else {
-      temper.error = '' + error_
+      const temperEquaves = temper.options.temperEquaves && temper.tempering !== 'CTE'
+      mapping = temper.subgroup.toPrimeMapping(
+        vanishCommas(
+          temper.commas.map((c) => temper.subgroup.primeMonzoToSubgroupMonzo(c)),
+          temper.subgroup,
+          temper.weights,
+          temperEquaves,
+          'cents'
+        )
+      )
     }
   }
+  if (temper.method === 'mapping') {
+    scale.sourceText += `\nPrimeMapping(${temper.mappingString})`
+  } else if (mapping) {
+    scale.sourceText += `\nPrimeMapping(${mapping.map((c) => c.toFixed(state.centsFractionDigits)).join(', ')})`
+  }
+  if (expand) {
+    const { visitor, defaults } = scale.getVisitors()
+    scale.sourceText = visitor.expand(defaults)
+  }
+  scale.computeScale()
+  emit('done')
 }
 </script>
 
@@ -192,6 +131,7 @@ function modify() {
           <div class="control" v-show="temper.method === 'vals'">
             <label for="vals">Vals</label>
             <input
+              ref="valsInput"
               type="text"
               id="vals"
               placeholder="12 & 17c"
@@ -205,10 +145,10 @@ function modify() {
                 <input
                   type="checkbox"
                   id="edo-steps"
-                  :disabled="temper.edoUnavailable"
+                  :disabled="!temper.edoAvailable"
                   v-model="temper.convertToEdoSteps"
                 />
-                <label for="edo-steps" :class="{ disabled: temper.edoUnavailable }">
+                <label for="edo-steps" :class="{ disabled: !temper.edoAvailable }">
                   Convert to edo-steps</label
                 >
               </span>
@@ -218,6 +158,7 @@ function modify() {
           <div class="control" v-show="temper.method === 'commas'">
             <label for="commas">Comma list</label>
             <input
+              ref="commasInput"
               type="text"
               id="commas"
               placeholder="225/224, 1029/1024"
@@ -229,8 +170,8 @@ function modify() {
           <div class="control" v-show="temper.method === 'vals' || temper.method === 'commas'">
             <label for="subgroup">Subgroup / Prime limit</label>
             <input
-              type="text"
               ref="subgroupInput"
+              type="text"
               id="subgroup"
               :placeholder="temper.method === 'vals' ? '2.3.5' : ''"
               @focus="temper.error = ''"
@@ -275,7 +216,7 @@ function modify() {
                 id="tempering-CTE"
                 value="CTE"
                 @focus="temper.error = ''"
-                :disabled="temper.constraintsDisabled"
+                :disabled="!temper.constraintsAvailable"
                 v-model="temper.tempering"
               />
               <label for="tempering-CTE"> CTE </label>
@@ -287,7 +228,7 @@ function modify() {
             <textarea
               id="constraints"
               @focus="temper.error = ''"
-              :disabled="temper.constraintsDisabled"
+              :disabled="!temper.constraintsAvailable"
               v-model="temper.constraintsString"
             ></textarea>
           </div>
@@ -305,8 +246,9 @@ function modify() {
     </template>
     <template #footer>
       <div class="btn-group">
-        <button @click="modify" :disabled="temper.error.length !== 0">OK</button>
+        <button @click="modify(true)" :disabled="temper.error.length !== 0">OK</button>
         <button @click="$emit('cancel')">Cancel</button>
+        <button @click="modify(false)">Raw</button>
         <span class="error" v-show="temper.error.length">⚠</span>
       </div>
     </template>
diff --git a/src/constants.ts b/src/constants.ts
index 52767f2c..ad43d567 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,5 +1,6 @@
-import { ExtendedMonzo, Interval } from 'scale-workshop-core'
+import { Interval, TimeMonzo } from 'sonic-weave'
 import { version } from '../package.json'
+import { Fraction } from 'xen-dev-utils'
 
 // GLOBALS
 export const APP_TITLE = `Scale Workshop ${version}`
@@ -22,20 +23,51 @@ export const MAX_INTERACTIVE_SUBGROUP_SIZE = 6
 // Anything larger than this uses O(n²) methods (if available) instead of O(exp(n))
 export const MAX_GEO_SUBGROUP_SIZE = 9
 
+export const SEMITONE_12TET = 2 ** (1 / 12)
+
+export const TET12 = [...Array(12).keys()].map((i) => SEMITONE_12TET ** (i + 1))
+
+export const MIDI_NOTE_NAMES = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B']
+
+export const MIDI_NOTE_COLORS = [
+  'white',
+  'black',
+  'white',
+  'black',
+  'white',
+  'white',
+  'black',
+  'white',
+  'black',
+  'white',
+  'black',
+  'white'
+]
+
 // Some often used intervals
 export const OCTAVE = new Interval(
-  ExtendedMonzo.fromFraction(2, DEFAULT_NUMBER_OF_COMPONENTS),
-  'ratio'
+  TimeMonzo.fromFraction(2, DEFAULT_NUMBER_OF_COMPONENTS),
+  'linear',
+  { type: 'FractionLiteral', numerator: 2n, denominator: 1n }
 )
 export const FIFTH = new Interval(
-  ExtendedMonzo.fromFraction('3/2', DEFAULT_NUMBER_OF_COMPONENTS),
-  'ratio'
+  TimeMonzo.fromFraction('3/2', DEFAULT_NUMBER_OF_COMPONENTS),
+  'linear',
+  { type: 'FractionLiteral', numerator: 3n, denominator: 2n }
 )
 export const THIRD = new Interval(
-  ExtendedMonzo.fromFraction('5/4', DEFAULT_NUMBER_OF_COMPONENTS),
-  'ratio'
+  TimeMonzo.fromFraction('5/4', DEFAULT_NUMBER_OF_COMPONENTS),
+  'linear'
 )
 export const FIFTH_12TET = new Interval(
-  ExtendedMonzo.fromEqualTemperament('7/12', '2/1', DEFAULT_NUMBER_OF_COMPONENTS),
-  'equal temperament'
+  TimeMonzo.fromEqualTemperament('7/12', 2, DEFAULT_NUMBER_OF_COMPONENTS),
+  'logarithmic'
+)
+
+export const INTERVALS_12TET = [...Array(12).keys()].map(
+  (i) =>
+    new Interval(
+      TimeMonzo.fromEqualTemperament(new Fraction(i + 1, 12), 2, DEFAULT_NUMBER_OF_COMPONENTS),
+      'logarithmic'
+    )
 )
diff --git a/src/exporters/__tests__/ableton.spec.ts b/src/exporters/__tests__/ableton.spec.ts
index 982f25a9..b7731578 100644
--- a/src/exporters/__tests__/ableton.spec.ts
+++ b/src/exporters/__tests__/ableton.spec.ts
@@ -2,9 +2,9 @@ import { describe, it, expect } from 'vitest'
 
 import AbletonAsclExporter from '../ableton'
 import { getTestData } from './test-data'
-import { NEWLINE_TEST, UNIX_NEWLINE, WINDOWS_NEWLINE } from '../../constants';
+import { NEWLINE_TEST, UNIX_NEWLINE, WINDOWS_NEWLINE } from '../../constants'
 
-const NEWLINE = process.platform === 'linux' ? UNIX_NEWLINE : WINDOWS_NEWLINE;
+const NEWLINE = process.platform === 'linux' ? UNIX_NEWLINE : WINDOWS_NEWLINE
 
 describe('Scala exporters', () => {
   it('can handle all line types', () => {
@@ -19,19 +19,20 @@ describe('Scala exporters', () => {
       !
       ! default tuning: degree 0 = 440.00000000 Hz
       !
-      6
+      7
       !
       100.00000000 ! 100.
+      6/5 ! C5_5
       960.00000000 ! 4\\5
       5/3 ! 5/3
-      531.23404907 ! 1,3591409142295225
+      531.23404907 ! 1,3591409142295225r
       107.53144798 ! 3486784401/3276800000
       2/1 ! 2/1
       !
-      ! @ABL NOTE_NAMES "2/1" "100." "4\\5" "5/3" "1,3591409142295225" "3486784401/3276800000"
+      ! @ABL NOTE_NAMES "2/1" "100." "C5_5" "4\\5" "5/3" "1,3591409142295225r" "3486784401/3276800000"
       ! @ABL REFERENCE_PITCH 4 0 440.00000000
       ! @ABL SOURCE Scale Workshop / Xenharmonic developers
-      ! @ABL LINK https://sevish.com/scaleworkshop/
+      ! @ABL LINK https://scaleworkshop.plainsound.org/
     `
         .split(NEWLINE_TEST)
         .map((l) => l.trim())
diff --git a/src/exporters/__tests__/anamark.v1.tun b/src/exporters/__tests__/anamark.v1.tun
index cc8792b9..8a0eb483 100644
--- a/src/exporters/__tests__/anamark.v1.tun
+++ b/src/exporters/__tests__/anamark.v1.tun
@@ -1,138 +1,138 @@
 ; VAZ Plus/AnaMark softsynth tuning file
 ; Test Scale
 ;
-; https://sevish.com/scaleworkshop/
+; https://scaleworkshop.plainsound.org/
 ;
 ; VAZ Plus section
 [Tuning]
-note 0=-6616
-note 1=-6969
-note 2=-7392
-note 3=-6300
-note 4=-6200
-note 5=-5340
-note 6=-5416
-note 7=-5769
-note 8=-6192
-note 9=-5100
-note 10=-5000
-note 11=-4140
-note 12=-4216
-note 13=-4569
-note 14=-4992
-note 15=-3900
-note 16=-3800
-note 17=-2940
-note 18=-3016
-note 19=-3369
-note 20=-3792
-note 21=-2700
-note 22=-2600
-note 23=-1740
-note 24=-1816
-note 25=-2169
-note 26=-2592
-note 27=-1500
-note 28=-1400
-note 29=-540
-note 30=-616
-note 31=-969
-note 32=-1392
-note 33=-300
-note 34=-200
-note 35=660
-note 36=584
-note 37=231
-note 38=-192
-note 39=900
-note 40=1000
-note 41=1860
-note 42=1784
-note 43=1431
-note 44=1008
-note 45=2100
-note 46=2200
-note 47=3060
-note 48=2984
-note 49=2631
-note 50=2208
-note 51=3300
-note 52=3400
-note 53=4260
-note 54=4184
-note 55=3831
-note 56=3408
-note 57=4500
-note 58=4600
-note 59=5460
-note 60=5384
-note 61=5031
-note 62=4608
-note 63=5700
-note 64=5800
+note 0=-5000
+note 1=-4784
+note 2=-4140
+note 3=-4216
+note 4=-4569
+note 5=-4992
+note 6=-3900
+note 7=-3800
+note 8=-3584
+note 9=-2940
+note 10=-3016
+note 11=-3369
+note 12=-3792
+note 13=-2700
+note 14=-2600
+note 15=-2384
+note 16=-1740
+note 17=-1816
+note 18=-2169
+note 19=-2592
+note 20=-1500
+note 21=-1400
+note 22=-1184
+note 23=-540
+note 24=-616
+note 25=-969
+note 26=-1392
+note 27=-300
+note 28=-200
+note 29=16
+note 30=660
+note 31=584
+note 32=231
+note 33=-192
+note 34=900
+note 35=1000
+note 36=1216
+note 37=1860
+note 38=1784
+note 39=1431
+note 40=1008
+note 41=2100
+note 42=2200
+note 43=2416
+note 44=3060
+note 45=2984
+note 46=2631
+note 47=2208
+note 48=3300
+note 49=3400
+note 50=3616
+note 51=4260
+note 52=4184
+note 53=3831
+note 54=3408
+note 55=4500
+note 56=4600
+note 57=4816
+note 58=5460
+note 59=5384
+note 60=5031
+note 61=4608
+note 62=5700
+note 63=5800
+note 64=6016
 note 65=6660
 note 66=6584
 note 67=6231
 note 68=5808
 note 69=6900
 note 70=7000
-note 71=7860
-note 72=7784
-note 73=7431
-note 74=7008
-note 75=8100
-note 76=8200
-note 77=9060
-note 78=8984
-note 79=8631
-note 80=8208
-note 81=9300
-note 82=9400
-note 83=10260
-note 84=10184
-note 85=9831
-note 86=9408
-note 87=10500
-note 88=10600
-note 89=11460
-note 90=11384
-note 91=11031
-note 92=10608
-note 93=11700
-note 94=11800
-note 95=12660
-note 96=12584
-note 97=12231
-note 98=11808
-note 99=12900
-note 100=13000
-note 101=13860
-note 102=13784
-note 103=13431
-note 104=13008
-note 105=14100
-note 106=14200
-note 107=15060
-note 108=14984
-note 109=14631
-note 110=14208
-note 111=15300
-note 112=15400
-note 113=16260
-note 114=16184
-note 115=15831
-note 116=15408
-note 117=16500
-note 118=16600
-note 119=17460
-note 120=17384
-note 121=17031
-note 122=16608
-note 123=17700
-note 124=17800
-note 125=18660
-note 126=18584
-note 127=18231
+note 71=7216
+note 72=7860
+note 73=7784
+note 74=7431
+note 75=7008
+note 76=8100
+note 77=8200
+note 78=8416
+note 79=9060
+note 80=8984
+note 81=8631
+note 82=8208
+note 83=9300
+note 84=9400
+note 85=9616
+note 86=10260
+note 87=10184
+note 88=9831
+note 89=9408
+note 90=10500
+note 91=10600
+note 92=10816
+note 93=11460
+note 94=11384
+note 95=11031
+note 96=10608
+note 97=11700
+note 98=11800
+note 99=12016
+note 100=12660
+note 101=12584
+note 102=12231
+note 103=11808
+note 104=12900
+note 105=13000
+note 106=13216
+note 107=13860
+note 108=13784
+note 109=13431
+note 110=13008
+note 111=14100
+note 112=14200
+note 113=14416
+note 114=15060
+note 115=14984
+note 116=14631
+note 117=14208
+note 118=15300
+note 119=15400
+note 120=15616
+note 121=16260
+note 122=16184
+note 123=15831
+note 124=15408
+note 125=16500
+note 126=16600
+note 127=16816
 
 ; AnaMark section
 [Scale Begin]
@@ -149,133 +149,133 @@ Date= "2022-02-22"
 Editor= "Anamark exporter unit test v0.0.0"
 
 [Exact Tuning]
-note 0= -6615.641287
-note 1= -6968.765951
-note 2= -7392.468552
-note 3= -6300.000000
-note 4= -6200.000000
-note 5= -5340.000000
-note 6= -5415.641287
-note 7= -5768.765951
-note 8= -6192.468552
-note 9= -5100.000000
-note 10= -5000.000000
-note 11= -4140.000000
-note 12= -4215.641287
-note 13= -4568.765951
-note 14= -4992.468552
-note 15= -3900.000000
-note 16= -3800.000000
-note 17= -2940.000000
-note 18= -3015.641287
-note 19= -3368.765951
-note 20= -3792.468552
-note 21= -2700.000000
-note 22= -2600.000000
-note 23= -1740.000000
-note 24= -1815.641287
-note 25= -2168.765951
-note 26= -2592.468552
-note 27= -1500.000000
-note 28= -1400.000000
-note 29= -540.000000
-note 30= -615.641287
-note 31= -968.765951
-note 32= -1392.468552
-note 33= -300.000000
-note 34= -200.000000
-note 35= 660.000000
-note 36= 584.358713
-note 37= 231.234049
-note 38= -192.468552
-note 39= 900.000000
-note 40= 1000.000000
-note 41= 1860.000000
-note 42= 1784.358713
-note 43= 1431.234049
-note 44= 1007.531448
-note 45= 2100.000000
-note 46= 2200.000000
-note 47= 3060.000000
-note 48= 2984.358713
-note 49= 2631.234049
-note 50= 2207.531448
-note 51= 3300.000000
-note 52= 3400.000000
-note 53= 4260.000000
-note 54= 4184.358713
-note 55= 3831.234049
-note 56= 3407.531448
-note 57= 4500.000000
-note 58= 4600.000000
-note 59= 5460.000000
-note 60= 5384.358713
-note 61= 5031.234049
-note 62= 4607.531448
-note 63= 5700.000000
-note 64= 5800.000000
+note 0= -5000.000000
+note 1= -4784.358713
+note 2= -4140.000000
+note 3= -4215.641287
+note 4= -4568.765951
+note 5= -4992.468552
+note 6= -3900.000000
+note 7= -3800.000000
+note 8= -3584.358713
+note 9= -2940.000000
+note 10= -3015.641287
+note 11= -3368.765951
+note 12= -3792.468552
+note 13= -2700.000000
+note 14= -2600.000000
+note 15= -2384.358713
+note 16= -1740.000000
+note 17= -1815.641287
+note 18= -2168.765951
+note 19= -2592.468552
+note 20= -1500.000000
+note 21= -1400.000000
+note 22= -1184.358713
+note 23= -540.000000
+note 24= -615.641287
+note 25= -968.765951
+note 26= -1392.468552
+note 27= -300.000000
+note 28= -200.000000
+note 29= 15.641287
+note 30= 660.000000
+note 31= 584.358713
+note 32= 231.234049
+note 33= -192.468552
+note 34= 900.000000
+note 35= 1000.000000
+note 36= 1215.641287
+note 37= 1860.000000
+note 38= 1784.358713
+note 39= 1431.234049
+note 40= 1007.531448
+note 41= 2100.000000
+note 42= 2200.000000
+note 43= 2415.641287
+note 44= 3060.000000
+note 45= 2984.358713
+note 46= 2631.234049
+note 47= 2207.531448
+note 48= 3300.000000
+note 49= 3400.000000
+note 50= 3615.641287
+note 51= 4260.000000
+note 52= 4184.358713
+note 53= 3831.234049
+note 54= 3407.531448
+note 55= 4500.000000
+note 56= 4600.000000
+note 57= 4815.641287
+note 58= 5460.000000
+note 59= 5384.358713
+note 60= 5031.234049
+note 61= 4607.531448
+note 62= 5700.000000
+note 63= 5800.000000
+note 64= 6015.641287
 note 65= 6660.000000
 note 66= 6584.358713
 note 67= 6231.234049
 note 68= 5807.531448
 note 69= 6900.000000
 note 70= 7000.000000
-note 71= 7860.000000
-note 72= 7784.358713
-note 73= 7431.234049
-note 74= 7007.531448
-note 75= 8100.000000
-note 76= 8200.000000
-note 77= 9060.000000
-note 78= 8984.358713
-note 79= 8631.234049
-note 80= 8207.531448
-note 81= 9300.000000
-note 82= 9400.000000
-note 83= 10260.000000
-note 84= 10184.358713
-note 85= 9831.234049
-note 86= 9407.531448
-note 87= 10500.000000
-note 88= 10600.000000
-note 89= 11460.000000
-note 90= 11384.358713
-note 91= 11031.234049
-note 92= 10607.531448
-note 93= 11700.000000
-note 94= 11800.000000
-note 95= 12660.000000
-note 96= 12584.358713
-note 97= 12231.234049
-note 98= 11807.531448
-note 99= 12900.000000
-note 100= 13000.000000
-note 101= 13860.000000
-note 102= 13784.358713
-note 103= 13431.234049
-note 104= 13007.531448
-note 105= 14100.000000
-note 106= 14200.000000
-note 107= 15060.000000
-note 108= 14984.358713
-note 109= 14631.234049
-note 110= 14207.531448
-note 111= 15300.000000
-note 112= 15400.000000
-note 113= 16260.000000
-note 114= 16184.358713
-note 115= 15831.234049
-note 116= 15407.531448
-note 117= 16500.000000
-note 118= 16600.000000
-note 119= 17460.000000
-note 120= 17384.358713
-note 121= 17031.234049
-note 122= 16607.531448
-note 123= 17700.000000
-note 124= 17800.000000
-note 125= 18660.000000
-note 126= 18584.358713
-note 127= 18231.234049
+note 71= 7215.641287
+note 72= 7860.000000
+note 73= 7784.358713
+note 74= 7431.234049
+note 75= 7007.531448
+note 76= 8100.000000
+note 77= 8200.000000
+note 78= 8415.641287
+note 79= 9060.000000
+note 80= 8984.358713
+note 81= 8631.234049
+note 82= 8207.531448
+note 83= 9300.000000
+note 84= 9400.000000
+note 85= 9615.641287
+note 86= 10260.000000
+note 87= 10184.358713
+note 88= 9831.234049
+note 89= 9407.531448
+note 90= 10500.000000
+note 91= 10600.000000
+note 92= 10815.641287
+note 93= 11460.000000
+note 94= 11384.358713
+note 95= 11031.234049
+note 96= 10607.531448
+note 97= 11700.000000
+note 98= 11800.000000
+note 99= 12015.641287
+note 100= 12660.000000
+note 101= 12584.358713
+note 102= 12231.234049
+note 103= 11807.531448
+note 104= 12900.000000
+note 105= 13000.000000
+note 106= 13215.641287
+note 107= 13860.000000
+note 108= 13784.358713
+note 109= 13431.234049
+note 110= 13007.531448
+note 111= 14100.000000
+note 112= 14200.000000
+note 113= 14415.641287
+note 114= 15060.000000
+note 115= 14984.358713
+note 116= 14631.234049
+note 117= 14207.531448
+note 118= 15300.000000
+note 119= 15400.000000
+note 120= 15615.641287
+note 121= 16260.000000
+note 122= 16184.358713
+note 123= 15831.234049
+note 124= 15407.531448
+note 125= 16500.000000
+note 126= 16600.000000
+note 127= 16815.641287
 
 [Scale End]
diff --git a/src/exporters/__tests__/anamark.v2.tun b/src/exporters/__tests__/anamark.v2.tun
index aaec12b5..87368d36 100644
--- a/src/exporters/__tests__/anamark.v2.tun
+++ b/src/exporters/__tests__/anamark.v2.tun
@@ -1,138 +1,138 @@
 ; VAZ Plus/AnaMark softsynth tuning file
 ; Test Scale
 ;
-; https://sevish.com/scaleworkshop/
+; https://scaleworkshop.plainsound.org/
 ;
 ; VAZ Plus section
 [Tuning]
-note 0=-6616
-note 1=-6969
-note 2=-7392
-note 3=-6300
-note 4=-6200
-note 5=-5340
-note 6=-5416
-note 7=-5769
-note 8=-6192
-note 9=-5100
-note 10=-5000
-note 11=-4140
-note 12=-4216
-note 13=-4569
-note 14=-4992
-note 15=-3900
-note 16=-3800
-note 17=-2940
-note 18=-3016
-note 19=-3369
-note 20=-3792
-note 21=-2700
-note 22=-2600
-note 23=-1740
-note 24=-1816
-note 25=-2169
-note 26=-2592
-note 27=-1500
-note 28=-1400
-note 29=-540
-note 30=-616
-note 31=-969
-note 32=-1392
-note 33=-300
-note 34=-200
-note 35=660
-note 36=584
-note 37=231
-note 38=-192
-note 39=900
-note 40=1000
-note 41=1860
-note 42=1784
-note 43=1431
-note 44=1008
-note 45=2100
-note 46=2200
-note 47=3060
-note 48=2984
-note 49=2631
-note 50=2208
-note 51=3300
-note 52=3400
-note 53=4260
-note 54=4184
-note 55=3831
-note 56=3408
-note 57=4500
-note 58=4600
-note 59=5460
-note 60=5384
-note 61=5031
-note 62=4608
-note 63=5700
-note 64=5800
+note 0=-5000
+note 1=-4784
+note 2=-4140
+note 3=-4216
+note 4=-4569
+note 5=-4992
+note 6=-3900
+note 7=-3800
+note 8=-3584
+note 9=-2940
+note 10=-3016
+note 11=-3369
+note 12=-3792
+note 13=-2700
+note 14=-2600
+note 15=-2384
+note 16=-1740
+note 17=-1816
+note 18=-2169
+note 19=-2592
+note 20=-1500
+note 21=-1400
+note 22=-1184
+note 23=-540
+note 24=-616
+note 25=-969
+note 26=-1392
+note 27=-300
+note 28=-200
+note 29=16
+note 30=660
+note 31=584
+note 32=231
+note 33=-192
+note 34=900
+note 35=1000
+note 36=1216
+note 37=1860
+note 38=1784
+note 39=1431
+note 40=1008
+note 41=2100
+note 42=2200
+note 43=2416
+note 44=3060
+note 45=2984
+note 46=2631
+note 47=2208
+note 48=3300
+note 49=3400
+note 50=3616
+note 51=4260
+note 52=4184
+note 53=3831
+note 54=3408
+note 55=4500
+note 56=4600
+note 57=4816
+note 58=5460
+note 59=5384
+note 60=5031
+note 61=4608
+note 62=5700
+note 63=5800
+note 64=6016
 note 65=6660
 note 66=6584
 note 67=6231
 note 68=5808
 note 69=6900
 note 70=7000
-note 71=7860
-note 72=7784
-note 73=7431
-note 74=7008
-note 75=8100
-note 76=8200
-note 77=9060
-note 78=8984
-note 79=8631
-note 80=8208
-note 81=9300
-note 82=9400
-note 83=10260
-note 84=10184
-note 85=9831
-note 86=9408
-note 87=10500
-note 88=10600
-note 89=11460
-note 90=11384
-note 91=11031
-note 92=10608
-note 93=11700
-note 94=11800
-note 95=12660
-note 96=12584
-note 97=12231
-note 98=11808
-note 99=12900
-note 100=13000
-note 101=13860
-note 102=13784
-note 103=13431
-note 104=13008
-note 105=14100
-note 106=14200
-note 107=15060
-note 108=14984
-note 109=14631
-note 110=14208
-note 111=15300
-note 112=15400
-note 113=16260
-note 114=16184
-note 115=15831
-note 116=15408
-note 117=16500
-note 118=16600
-note 119=17460
-note 120=17384
-note 121=17031
-note 122=16608
-note 123=17700
-note 124=17800
-note 125=18660
-note 126=18584
-note 127=18231
+note 71=7216
+note 72=7860
+note 73=7784
+note 74=7431
+note 75=7008
+note 76=8100
+note 77=8200
+note 78=8416
+note 79=9060
+note 80=8984
+note 81=8631
+note 82=8208
+note 83=9300
+note 84=9400
+note 85=9616
+note 86=10260
+note 87=10184
+note 88=9831
+note 89=9408
+note 90=10500
+note 91=10600
+note 92=10816
+note 93=11460
+note 94=11384
+note 95=11031
+note 96=10608
+note 97=11700
+note 98=11800
+note 99=12016
+note 100=12660
+note 101=12584
+note 102=12231
+note 103=11808
+note 104=12900
+note 105=13000
+note 106=13216
+note 107=13860
+note 108=13784
+note 109=13431
+note 110=13008
+note 111=14100
+note 112=14200
+note 113=14416
+note 114=15060
+note 115=14984
+note 116=14631
+note 117=14208
+note 118=15300
+note 119=15400
+note 120=15616
+note 121=16260
+note 122=16184
+note 123=15831
+note 124=15408
+note 125=16500
+note 126=16600
+note 127=16816
 
 ; AnaMark section
 [Scale Begin]
@@ -149,142 +149,143 @@ Date= "2022-02-22"
 Editor= "Anamark exporter unit test v0.0.0"
 
 [Exact Tuning]
-note 0= -6615.641287
-note 1= -6968.765951
-note 2= -7392.468552
-note 3= -6300.000000
-note 4= -6200.000000
-note 5= -5340.000000
-note 6= -5415.641287
-note 7= -5768.765951
-note 8= -6192.468552
-note 9= -5100.000000
-note 10= -5000.000000
-note 11= -4140.000000
-note 12= -4215.641287
-note 13= -4568.765951
-note 14= -4992.468552
-note 15= -3900.000000
-note 16= -3800.000000
-note 17= -2940.000000
-note 18= -3015.641287
-note 19= -3368.765951
-note 20= -3792.468552
-note 21= -2700.000000
-note 22= -2600.000000
-note 23= -1740.000000
-note 24= -1815.641287
-note 25= -2168.765951
-note 26= -2592.468552
-note 27= -1500.000000
-note 28= -1400.000000
-note 29= -540.000000
-note 30= -615.641287
-note 31= -968.765951
-note 32= -1392.468552
-note 33= -300.000000
-note 34= -200.000000
-note 35= 660.000000
-note 36= 584.358713
-note 37= 231.234049
-note 38= -192.468552
-note 39= 900.000000
-note 40= 1000.000000
-note 41= 1860.000000
-note 42= 1784.358713
-note 43= 1431.234049
-note 44= 1007.531448
-note 45= 2100.000000
-note 46= 2200.000000
-note 47= 3060.000000
-note 48= 2984.358713
-note 49= 2631.234049
-note 50= 2207.531448
-note 51= 3300.000000
-note 52= 3400.000000
-note 53= 4260.000000
-note 54= 4184.358713
-note 55= 3831.234049
-note 56= 3407.531448
-note 57= 4500.000000
-note 58= 4600.000000
-note 59= 5460.000000
-note 60= 5384.358713
-note 61= 5031.234049
-note 62= 4607.531448
-note 63= 5700.000000
-note 64= 5800.000000
+note 0= -5000.000000
+note 1= -4784.358713
+note 2= -4140.000000
+note 3= -4215.641287
+note 4= -4568.765951
+note 5= -4992.468552
+note 6= -3900.000000
+note 7= -3800.000000
+note 8= -3584.358713
+note 9= -2940.000000
+note 10= -3015.641287
+note 11= -3368.765951
+note 12= -3792.468552
+note 13= -2700.000000
+note 14= -2600.000000
+note 15= -2384.358713
+note 16= -1740.000000
+note 17= -1815.641287
+note 18= -2168.765951
+note 19= -2592.468552
+note 20= -1500.000000
+note 21= -1400.000000
+note 22= -1184.358713
+note 23= -540.000000
+note 24= -615.641287
+note 25= -968.765951
+note 26= -1392.468552
+note 27= -300.000000
+note 28= -200.000000
+note 29= 15.641287
+note 30= 660.000000
+note 31= 584.358713
+note 32= 231.234049
+note 33= -192.468552
+note 34= 900.000000
+note 35= 1000.000000
+note 36= 1215.641287
+note 37= 1860.000000
+note 38= 1784.358713
+note 39= 1431.234049
+note 40= 1007.531448
+note 41= 2100.000000
+note 42= 2200.000000
+note 43= 2415.641287
+note 44= 3060.000000
+note 45= 2984.358713
+note 46= 2631.234049
+note 47= 2207.531448
+note 48= 3300.000000
+note 49= 3400.000000
+note 50= 3615.641287
+note 51= 4260.000000
+note 52= 4184.358713
+note 53= 3831.234049
+note 54= 3407.531448
+note 55= 4500.000000
+note 56= 4600.000000
+note 57= 4815.641287
+note 58= 5460.000000
+note 59= 5384.358713
+note 60= 5031.234049
+note 61= 4607.531448
+note 62= 5700.000000
+note 63= 5800.000000
+note 64= 6015.641287
 note 65= 6660.000000
 note 66= 6584.358713
 note 67= 6231.234049
 note 68= 5807.531448
 note 69= 6900.000000
 note 70= 7000.000000
-note 71= 7860.000000
-note 72= 7784.358713
-note 73= 7431.234049
-note 74= 7007.531448
-note 75= 8100.000000
-note 76= 8200.000000
-note 77= 9060.000000
-note 78= 8984.358713
-note 79= 8631.234049
-note 80= 8207.531448
-note 81= 9300.000000
-note 82= 9400.000000
-note 83= 10260.000000
-note 84= 10184.358713
-note 85= 9831.234049
-note 86= 9407.531448
-note 87= 10500.000000
-note 88= 10600.000000
-note 89= 11460.000000
-note 90= 11384.358713
-note 91= 11031.234049
-note 92= 10607.531448
-note 93= 11700.000000
-note 94= 11800.000000
-note 95= 12660.000000
-note 96= 12584.358713
-note 97= 12231.234049
-note 98= 11807.531448
-note 99= 12900.000000
-note 100= 13000.000000
-note 101= 13860.000000
-note 102= 13784.358713
-note 103= 13431.234049
-note 104= 13007.531448
-note 105= 14100.000000
-note 106= 14200.000000
-note 107= 15060.000000
-note 108= 14984.358713
-note 109= 14631.234049
-note 110= 14207.531448
-note 111= 15300.000000
-note 112= 15400.000000
-note 113= 16260.000000
-note 114= 16184.358713
-note 115= 15831.234049
-note 116= 15407.531448
-note 117= 16500.000000
-note 118= 16600.000000
-note 119= 17460.000000
-note 120= 17384.358713
-note 121= 17031.234049
-note 122= 16607.531448
-note 123= 17700.000000
-note 124= 17800.000000
-note 125= 18660.000000
-note 126= 18584.358713
-note 127= 18231.234049
+note 71= 7215.641287
+note 72= 7860.000000
+note 73= 7784.358713
+note 74= 7431.234049
+note 75= 7007.531448
+note 76= 8100.000000
+note 77= 8200.000000
+note 78= 8415.641287
+note 79= 9060.000000
+note 80= 8984.358713
+note 81= 8631.234049
+note 82= 8207.531448
+note 83= 9300.000000
+note 84= 9400.000000
+note 85= 9615.641287
+note 86= 10260.000000
+note 87= 10184.358713
+note 88= 9831.234049
+note 89= 9407.531448
+note 90= 10500.000000
+note 91= 10600.000000
+note 92= 10815.641287
+note 93= 11460.000000
+note 94= 11384.358713
+note 95= 11031.234049
+note 96= 10607.531448
+note 97= 11700.000000
+note 98= 11800.000000
+note 99= 12015.641287
+note 100= 12660.000000
+note 101= 12584.358713
+note 102= 12231.234049
+note 103= 11807.531448
+note 104= 12900.000000
+note 105= 13000.000000
+note 106= 13215.641287
+note 107= 13860.000000
+note 108= 13784.358713
+note 109= 13431.234049
+note 110= 13007.531448
+note 111= 14100.000000
+note 112= 14200.000000
+note 113= 14415.641287
+note 114= 15060.000000
+note 115= 14984.358713
+note 116= 14631.234049
+note 117= 14207.531448
+note 118= 15300.000000
+note 119= 15400.000000
+note 120= 15615.641287
+note 121= 16260.000000
+note 122= 16184.358713
+note 123= 15831.234049
+note 124= 15407.531448
+note 125= 16500.000000
+note 126= 16600.000000
+note 127= 16815.641287
 
 [Functional Tuning]
 note 1="#=0 % 100.000000"
-note 2="#=0 % 960.000000"
-note 3="#=0 % 884.358713"
-note 4="#=0 % 531.234049"
-note 5="#=0 % 107.531448"
-note 6="#>-6 % 1200.000000 ~999"
+note 2="#=0 % 315.641287"
+note 3="#=0 % 960.000000"
+note 4="#=0 % 884.358713"
+note 5="#=0 % 531.234049"
+note 6="#=0 % 107.531448"
+note 7="#>-7 % 1200.000000 ~999"
 
 ; Set reference key to absolute frequency (not scale note but midi key)
 note 69="! 440.000000"
diff --git a/src/exporters/__tests__/deflemask.txt b/src/exporters/__tests__/deflemask.txt
index 8aa5c9a2..d9c07bc7 100644
--- a/src/exporters/__tests__/deflemask.txt
+++ b/src/exporters/__tests__/deflemask.txt
@@ -1,53 +1,60 @@
 A scale for testing if the exporter works
 Reference for Deflemask note input - generated by Deflemask exporter unit test v0.0.0
 
-https://sevish.com/scaleworkshop/
+https://scaleworkshop.plainsound.org/
 
-[G-0 xx] [xx E5 4D] ..... -34: 11.97 Hz / -6240.00 cents
-[F#0 xx] [xx E5 6C] ..... -33: 11.46 Hz / -6315.64 cents
-[D-0 xx] [xx E5 A8] ..... -32: 9.34 Hz / -6668.77 cents
-[A-0 xx] [xx E5 80] ..... -30: 13.75 Hz / -6000.00 cents
-[A#0 xx] [xx E5 80] ..... -29: 14.57 Hz / -5900.00 cents
-[G-1 xx] [xx E5 4D] ..... -28: 23.94 Hz / -5040.00 cents
-[F#1 xx] [xx E5 6C] ..... -27: 22.92 Hz / -5115.64 cents
-[D-1 xx] [xx E5 A8] ..... -26: 18.69 Hz / -5468.77 cents
-[A#0 xx] [xx E5 8A] ..... -25: 14.63 Hz / -5892.47 cents
-[A-1 xx] [xx E5 80] ..... -24: 27.50 Hz / -4800.00 cents
-[A#1 xx] [xx E5 80] ..... -23: 29.14 Hz / -4700.00 cents
-[G-2 xx] [xx E5 4D] ..... -22: 47.88 Hz / -3840.00 cents
-[F#2 xx] [xx E5 6C] ..... -21: 45.83 Hz / -3915.64 cents
-[D-2 xx] [xx E5 A8] ..... -20: 37.38 Hz / -4268.77 cents
-[A#1 xx] [xx E5 8A] ..... -19: 29.26 Hz / -4692.47 cents
-[A-2 xx] [xx E5 80] ..... -18: 55.00 Hz / -3600.00 cents
-[A#2 xx] [xx E5 80] ..... -17: 58.27 Hz / -3500.00 cents
-[G-3 xx] [xx E5 4D] ..... -16: 95.76 Hz / -2640.00 cents
-[F#3 xx] [xx E5 6C] ..... -15: 91.67 Hz / -2715.64 cents
-[D-3 xx] [xx E5 A8] ..... -14: 74.75 Hz / -3068.77 cents
-[A#2 xx] [xx E5 8A] ..... -13: 58.52 Hz / -3492.47 cents
-[A-3 xx] [xx E5 80] ..... -12: 110.00 Hz / -2400.00 cents
-[A#3 xx] [xx E5 80] ..... -11: 116.54 Hz / -2300.00 cents
-[G-4 xx] [xx E5 4D] ..... -10: 191.52 Hz / -1440.00 cents
-[F#4 xx] [xx E5 6C] ..... -9: 183.33 Hz / -1515.64 cents
-[D-4 xx] [xx E5 A8] ..... -8: 149.51 Hz / -1868.77 cents
-[A#3 xx] [xx E5 8A] ..... -7: 117.05 Hz / -2292.47 cents
-[A-4 xx] [xx E5 80] ..... -6: 220.00 Hz / -1200.00 cents
-[A#4 xx] [xx E5 80] ..... -5: 233.08 Hz / -1100.00 cents
-[G-5 xx] [xx E5 4D] ..... -4: 383.04 Hz / -240.00 cents
-[F#5 xx] [xx E5 6C] ..... -3: 366.67 Hz / -315.64 cents
-[D-5 xx] [xx E5 A8] ..... -2: 299.01 Hz / -668.77 cents
-[A#4 xx] [xx E5 8A] ..... -1: 234.10 Hz / -1092.47 cents
-[A-5 xx] [xx E5 80] ..... 0: 440.00 Hz / 0.00 cents
-[A#5 xx] [xx E5 80] ..... 1: 466.16 Hz / 100.00 cents
-[G-6 xx] [xx E5 4D] ..... 2: 766.08 Hz / 960.00 cents
-[F#6 xx] [xx E5 6C] ..... 3: 733.33 Hz / 884.36 cents
-[D-6 xx] [xx E5 A8] ..... 4: 598.02 Hz / 531.23 cents
-[A#5 xx] [xx E5 8A] ..... 5: 468.20 Hz / 107.53 cents
-[A-6 xx] [xx E5 80] ..... 6: 880.00 Hz / 1200.00 cents
-[A#6 xx] [xx E5 80] ..... 7: 932.33 Hz / 1300.00 cents
-[G-7 xx] [xx E5 4D] ..... 8: 1532.17 Hz / 2160.00 cents
-[F#7 xx] [xx E5 6C] ..... 9: 1466.67 Hz / 2084.36 cents
-[D-7 xx] [xx E5 A8] ..... 10: 1196.04 Hz / 1731.23 cents
-[A#6 xx] [xx E5 8A] ..... 11: 936.39 Hz / 1307.53 cents
-[A-7 xx] [xx E5 80] ..... 12: 1760.00 Hz / 2400.00 cents
-[A#7 xx] [xx E5 80] ..... 13: 1864.66 Hz / 2500.00 cents
-[A#7 xx] [xx E5 8A] ..... 17: 1872.78 Hz / 2507.53 cents
+[G-0 xx] [xx E5 4D] ..... 30: 11.97 Hz / -6240.00 cents
+[F#0 xx] [xx E5 6C] ..... 31: 11.46 Hz / -6315.64 cents
+[D-0 xx] [xx E5 A8] ..... 32: 9.34 Hz / -6668.77 cents
+[A-0 xx] [xx E5 80] ..... 34: 13.75 Hz / -6000.00 cents
+[A#0 xx] [xx E5 80] ..... 35: 14.57 Hz / -5900.00 cents
+[C-1 xx] [xx E5 94] ..... 36: 16.50 Hz / -5684.36 cents
+[G-1 xx] [xx E5 4D] ..... 37: 23.94 Hz / -5040.00 cents
+[F#1 xx] [xx E5 6C] ..... 38: 22.92 Hz / -5115.64 cents
+[D-1 xx] [xx E5 A8] ..... 39: 18.69 Hz / -5468.77 cents
+[A#0 xx] [xx E5 8A] ..... 40: 14.63 Hz / -5892.47 cents
+[A-1 xx] [xx E5 80] ..... 41: 27.50 Hz / -4800.00 cents
+[A#1 xx] [xx E5 80] ..... 42: 29.14 Hz / -4700.00 cents
+[C-2 xx] [xx E5 94] ..... 43: 33.00 Hz / -4484.36 cents
+[G-2 xx] [xx E5 4D] ..... 44: 47.88 Hz / -3840.00 cents
+[F#2 xx] [xx E5 6C] ..... 45: 45.83 Hz / -3915.64 cents
+[D-2 xx] [xx E5 A8] ..... 46: 37.38 Hz / -4268.77 cents
+[A#1 xx] [xx E5 8A] ..... 47: 29.26 Hz / -4692.47 cents
+[A-2 xx] [xx E5 80] ..... 48: 55.00 Hz / -3600.00 cents
+[A#2 xx] [xx E5 80] ..... 49: 58.27 Hz / -3500.00 cents
+[C-3 xx] [xx E5 94] ..... 50: 66.00 Hz / -3284.36 cents
+[G-3 xx] [xx E5 4D] ..... 51: 95.76 Hz / -2640.00 cents
+[F#3 xx] [xx E5 6C] ..... 52: 91.67 Hz / -2715.64 cents
+[D-3 xx] [xx E5 A8] ..... 53: 74.75 Hz / -3068.77 cents
+[A#2 xx] [xx E5 8A] ..... 54: 58.52 Hz / -3492.47 cents
+[A-3 xx] [xx E5 80] ..... 55: 110.00 Hz / -2400.00 cents
+[A#3 xx] [xx E5 80] ..... 56: 116.54 Hz / -2300.00 cents
+[C-4 xx] [xx E5 94] ..... 57: 132.00 Hz / -2084.36 cents
+[G-4 xx] [xx E5 4D] ..... 58: 191.52 Hz / -1440.00 cents
+[F#4 xx] [xx E5 6C] ..... 59: 183.33 Hz / -1515.64 cents
+[D-4 xx] [xx E5 A8] ..... 60: 149.51 Hz / -1868.77 cents
+[A#3 xx] [xx E5 8A] ..... 61: 117.05 Hz / -2292.47 cents
+[A-4 xx] [xx E5 80] ..... 62: 220.00 Hz / -1200.00 cents
+[A#4 xx] [xx E5 80] ..... 63: 233.08 Hz / -1100.00 cents
+[C-5 xx] [xx E5 94] ..... 64: 264.00 Hz / -884.36 cents
+[G-5 xx] [xx E5 4D] ..... 65: 383.04 Hz / -240.00 cents
+[F#5 xx] [xx E5 6C] ..... 66: 366.67 Hz / -315.64 cents
+[D-5 xx] [xx E5 A8] ..... 67: 299.01 Hz / -668.77 cents
+[A#4 xx] [xx E5 8A] ..... 68: 234.10 Hz / -1092.47 cents
+[A-5 xx] [xx E5 80] ..... 69: 440.00 Hz / 0.00 cents
+[A#5 xx] [xx E5 80] ..... 70: 466.16 Hz / 100.00 cents
+[C-6 xx] [xx E5 94] ..... 71: 528.00 Hz / 315.64 cents
+[G-6 xx] [xx E5 4D] ..... 72: 766.08 Hz / 960.00 cents
+[F#6 xx] [xx E5 6C] ..... 73: 733.33 Hz / 884.36 cents
+[D-6 xx] [xx E5 A8] ..... 74: 598.02 Hz / 531.23 cents
+[A#5 xx] [xx E5 8A] ..... 75: 468.20 Hz / 107.53 cents
+[A-6 xx] [xx E5 80] ..... 76: 880.00 Hz / 1200.00 cents
+[A#6 xx] [xx E5 80] ..... 77: 932.33 Hz / 1300.00 cents
+[C-7 xx] [xx E5 94] ..... 78: 1056.00 Hz / 1515.64 cents
+[G-7 xx] [xx E5 4D] ..... 79: 1532.17 Hz / 2160.00 cents
+[F#7 xx] [xx E5 6C] ..... 80: 1466.67 Hz / 2084.36 cents
+[D-7 xx] [xx E5 A8] ..... 81: 1196.04 Hz / 1731.23 cents
+[A#6 xx] [xx E5 8A] ..... 82: 936.39 Hz / 1307.53 cents
+[A-7 xx] [xx E5 80] ..... 83: 1760.00 Hz / 2400.00 cents
+[A#7 xx] [xx E5 80] ..... 84: 1864.66 Hz / 2500.00 cents
+[A#7 xx] [xx E5 8A] ..... 89: 1872.78 Hz / 2507.53 cents
diff --git a/src/exporters/__tests__/image-line.spec.ts b/src/exporters/__tests__/image-line.spec.ts
index 5d44b05b..24c06794 100644
--- a/src/exporters/__tests__/image-line.spec.ts
+++ b/src/exporters/__tests__/image-line.spec.ts
@@ -13,8 +13,9 @@ describe('Image-line exporters', () => {
 
     // Raw binary files are inconvenient so we're content with hashes.
     expect(createHash('sha256').update(content).digest('base64')).toBe(
-      'xptUh5uz/VHYwQ4xfalMQJJdI3Iqd/pSy+/kfnfKO1s='
+      'Apibe/Ma4u4Sfd/ZIiTr+Tw4D7hesZD4pNUD9KewMys='
     )
+    // Note that the contents are floating-point sensitive to minor changes in frequency calculation
   })
 
   it('can handle all line types (Sytrus)', () => {
@@ -23,7 +24,7 @@ describe('Image-line exporters', () => {
     const content = exporter.getFileContents(4)
 
     expect(createHash('sha256').update(content).digest('base64')).toBe(
-      'cExG3YK8wwzPLW6TDq/T2E8FEUZewHk/JLF9hixvRqo='
+      'kyrHUaGRCFUZUp1+1/gI3v4Fi6vqLMWlGjfZukLG58s='
     )
   })
 })
diff --git a/src/exporters/__tests__/kontakt.txt b/src/exporters/__tests__/kontakt.txt
index bf5a419a..1d9cf43c 100644
--- a/src/exporters/__tests__/kontakt.txt
+++ b/src/exporters/__tests__/kontakt.txt
@@ -3,7 +3,7 @@ Test Scale
 MIDI note 69 (A5) = 440 Hz
 Created using Kontakt tuning script exporter unit test v0.0.0
 
-https://sevish.com/scaleworkshop/
+https://scaleworkshop.plainsound.org/
 ****************************************}
 
 on init
@@ -70,78 +70,78 @@ declare $key
 %tune[27] := 0
 %keynum[28] := 28
 %tune[28] := 0
-%keynum[29] := 29
-%tune[29] := 0
-%keynum[30] := 30
-%tune[30] := 0
-%keynum[31] := 31
-%tune[31] := 0
-%keynum[32] := 32
-%tune[32] := 0
+%keynum[29] := 0
+%tune[29] := 15641
+%keynum[30] := 7
+%tune[30] := -40000
+%keynum[31] := 6
+%tune[31] := -15641
+%keynum[32] := 2
+%tune[32] := 31234
 %keynum[33] := 33
 %tune[33] := 0
-%keynum[34] := 34
+%keynum[34] := 9
 %tune[34] := 0
-%keynum[35] := 7
-%tune[35] := -40000
-%keynum[36] := 6
-%tune[36] := -15641
-%keynum[37] := 2
-%tune[37] := 31234
-%keynum[38] := 38
-%tune[38] := 0
-%keynum[39] := 9
-%tune[39] := 0
+%keynum[35] := 10
+%tune[35] := 0
+%keynum[36] := 12
+%tune[36] := 15641
+%keynum[37] := 19
+%tune[37] := -40000
+%keynum[38] := 18
+%tune[38] := -15641
+%keynum[39] := 14
+%tune[39] := 31234
 %keynum[40] := 10
-%tune[40] := 0
-%keynum[41] := 19
-%tune[41] := -40000
-%keynum[42] := 18
-%tune[42] := -15641
-%keynum[43] := 14
-%tune[43] := 31234
-%keynum[44] := 10
-%tune[44] := 7531
-%keynum[45] := 21
-%tune[45] := 0
-%keynum[46] := 22
-%tune[46] := 0
-%keynum[47] := 31
-%tune[47] := -40000
-%keynum[48] := 30
-%tune[48] := -15641
-%keynum[49] := 26
-%tune[49] := 31234
-%keynum[50] := 22
-%tune[50] := 7531
-%keynum[51] := 33
-%tune[51] := 0
-%keynum[52] := 34
-%tune[52] := 0
-%keynum[53] := 43
-%tune[53] := -40000
-%keynum[54] := 42
-%tune[54] := -15641
-%keynum[55] := 38
-%tune[55] := 31234
-%keynum[56] := 34
-%tune[56] := 7531
-%keynum[57] := 45
-%tune[57] := 0
-%keynum[58] := 46
-%tune[58] := 0
-%keynum[59] := 55
-%tune[59] := -40000
-%keynum[60] := 54
-%tune[60] := -15641
-%keynum[61] := 50
-%tune[61] := 31234
-%keynum[62] := 46
-%tune[62] := 7531
-%keynum[63] := 57
+%tune[40] := 7531
+%keynum[41] := 21
+%tune[41] := 0
+%keynum[42] := 22
+%tune[42] := 0
+%keynum[43] := 24
+%tune[43] := 15641
+%keynum[44] := 31
+%tune[44] := -40000
+%keynum[45] := 30
+%tune[45] := -15641
+%keynum[46] := 26
+%tune[46] := 31234
+%keynum[47] := 22
+%tune[47] := 7531
+%keynum[48] := 33
+%tune[48] := 0
+%keynum[49] := 34
+%tune[49] := 0
+%keynum[50] := 36
+%tune[50] := 15641
+%keynum[51] := 43
+%tune[51] := -40000
+%keynum[52] := 42
+%tune[52] := -15641
+%keynum[53] := 38
+%tune[53] := 31234
+%keynum[54] := 34
+%tune[54] := 7531
+%keynum[55] := 45
+%tune[55] := 0
+%keynum[56] := 46
+%tune[56] := 0
+%keynum[57] := 48
+%tune[57] := 15641
+%keynum[58] := 55
+%tune[58] := -40000
+%keynum[59] := 54
+%tune[59] := -15641
+%keynum[60] := 50
+%tune[60] := 31234
+%keynum[61] := 46
+%tune[61] := 7531
+%keynum[62] := 57
+%tune[62] := 0
+%keynum[63] := 58
 %tune[63] := 0
-%keynum[64] := 58
-%tune[64] := 0
+%keynum[64] := 60
+%tune[64] := 15641
 %keynum[65] := 67
 %tune[65] := -40000
 %keynum[66] := 66
@@ -154,72 +154,72 @@ declare $key
 %tune[69] := 0
 %keynum[70] := 70
 %tune[70] := 0
-%keynum[71] := 79
-%tune[71] := -40000
-%keynum[72] := 78
-%tune[72] := -15641
-%keynum[73] := 74
-%tune[73] := 31234
-%keynum[74] := 70
-%tune[74] := 7531
-%keynum[75] := 81
-%tune[75] := 0
-%keynum[76] := 82
+%keynum[71] := 72
+%tune[71] := 15641
+%keynum[72] := 79
+%tune[72] := -40000
+%keynum[73] := 78
+%tune[73] := -15641
+%keynum[74] := 74
+%tune[74] := 31234
+%keynum[75] := 70
+%tune[75] := 7531
+%keynum[76] := 81
 %tune[76] := 0
-%keynum[77] := 91
-%tune[77] := -40000
-%keynum[78] := 90
-%tune[78] := -15641
-%keynum[79] := 86
-%tune[79] := 31234
-%keynum[80] := 82
-%tune[80] := 7531
-%keynum[81] := 93
-%tune[81] := 0
-%keynum[82] := 94
-%tune[82] := 0
-%keynum[83] := 103
-%tune[83] := -40000
-%keynum[84] := 102
-%tune[84] := -15641
-%keynum[85] := 98
-%tune[85] := 31234
-%keynum[86] := 94
-%tune[86] := 7531
-%keynum[87] := 105
-%tune[87] := 0
-%keynum[88] := 106
-%tune[88] := 0
-%keynum[89] := 115
-%tune[89] := -40000
-%keynum[90] := 114
-%tune[90] := -15641
-%keynum[91] := 110
-%tune[91] := 31234
-%keynum[92] := 106
-%tune[92] := 7531
-%keynum[93] := 117
-%tune[93] := 0
-%keynum[94] := 118
-%tune[94] := 0
-%keynum[95] := 127
-%tune[95] := -40000
-%keynum[96] := 126
-%tune[96] := -15641
-%keynum[97] := 122
-%tune[97] := 31234
+%keynum[77] := 82
+%tune[77] := 0
+%keynum[78] := 84
+%tune[78] := 15641
+%keynum[79] := 91
+%tune[79] := -40000
+%keynum[80] := 90
+%tune[80] := -15641
+%keynum[81] := 86
+%tune[81] := 31234
+%keynum[82] := 82
+%tune[82] := 7531
+%keynum[83] := 93
+%tune[83] := 0
+%keynum[84] := 94
+%tune[84] := 0
+%keynum[85] := 96
+%tune[85] := 15641
+%keynum[86] := 103
+%tune[86] := -40000
+%keynum[87] := 102
+%tune[87] := -15641
+%keynum[88] := 98
+%tune[88] := 31234
+%keynum[89] := 94
+%tune[89] := 7531
+%keynum[90] := 105
+%tune[90] := 0
+%keynum[91] := 106
+%tune[91] := 0
+%keynum[92] := 108
+%tune[92] := 15641
+%keynum[93] := 115
+%tune[93] := -40000
+%keynum[94] := 114
+%tune[94] := -15641
+%keynum[95] := 110
+%tune[95] := 31234
+%keynum[96] := 106
+%tune[96] := 7531
+%keynum[97] := 117
+%tune[97] := 0
 %keynum[98] := 118
-%tune[98] := 7531
-%keynum[99] := 99
-%tune[99] := 0
-%keynum[100] := 100
-%tune[100] := 0
-%keynum[101] := 101
-%tune[101] := 0
-%keynum[102] := 102
-%tune[102] := 0
-%keynum[103] := 103
-%tune[103] := 0
+%tune[98] := 0
+%keynum[99] := 120
+%tune[99] := 15641
+%keynum[100] := 127
+%tune[100] := -40000
+%keynum[101] := 126
+%tune[101] := -15641
+%keynum[102] := 122
+%tune[102] := 31234
+%keynum[103] := 118
+%tune[103] := 7531
 %keynum[104] := 104
 %tune[104] := 0
 %keynum[105] := 105
diff --git a/src/exporters/__tests__/korg.spec.ts b/src/exporters/__tests__/korg.spec.ts
index 3085902d..be5569b3 100644
--- a/src/exporters/__tests__/korg.spec.ts
+++ b/src/exporters/__tests__/korg.spec.ts
@@ -1,18 +1,22 @@
 import { createHash } from 'crypto'
 import type { JSZipObject } from 'jszip'
-import { DEFAULT_NUMBER_OF_COMPONENTS } from '../../constants'
-import { ExtendedMonzo, Interval, Scale } from 'scale-workshop-core'
 import { describe, it, expect } from 'vitest'
 
 import { KorgExporter, KorgModels, KorgExporterError } from '../korg'
 
 import { getTestData } from './test-data'
+import { Scale } from '../../scale'
+import { Interval, TimeMonzo } from 'sonic-weave'
 
 describe('Korg exporters', () => {
   it('can export a scale encountered while debugging issue #393', async () => {
     const params = getTestData("Korg 'logue exporter unit test")
     params.baseMidiNote = 60
-    params.scale = Scale.fromSubharmonicSeries(24, 12, DEFAULT_NUMBER_OF_COMPONENTS, 256)
+    params.scale = new Scale(
+      [...Array(12).keys()].map((i) => 24 / (23 - i)),
+      256,
+      60
+    )
 
     const exporter = new KorgExporter(params, KorgModels.MINILOGUE, false)
     const [zip, fileType] = exporter.getFileContents()
@@ -58,7 +62,7 @@ describe('Korg exporters', () => {
       if (path.endsWith('bin')) {
         const content = await file.async('uint8array')
         expect(createHash('sha256').update(content).digest('base64')).toBe(
-          'z7mQ6pS8tVYimN2B5V3WIgN7NR4lFMwrlIjxKJkWEss='
+          'NLwkn1HRQKdNAyYdxl6RQwfz0JvFyShWaB0DHHtPVZo='
         )
       } else {
         const content = await file.async('string')
@@ -79,7 +83,10 @@ describe('Korg exporters', () => {
 
   it('throws error if 12-note octave tuning is selected, but equave is not 2/1', () => {
     const params = getTestData("Korg 'logue exporter unit test v0.0.0")
-    params.scale.equave = new Interval(ExtendedMonzo.fromCents(100.0, 3), 'cents')
+    params.relativeIntervals.push(new Interval(TimeMonzo.fromCents(100.0, 3), 'logarithmic'))
+    params.sourceText += '\n100.'
+    const ratios = params.relativeIntervals.map((i) => i.value.valueOf())
+    params.scale = new Scale(ratios, 440, 69)
     expect(() => new KorgExporter(params, KorgModels.MINILOGUE, true)).toThrowError(
       KorgExporterError.OCTAVE_INVALID_EQUAVE
     )
@@ -94,11 +101,24 @@ describe('Korg exporters', () => {
 
   it('throws error if 12-note octave tuning is selected, but scale contains an interval that is below unison', () => {
     const params = getTestData("Korg 'logue exporter unit test v0.0.0")
-    params.scale.intervals.splice(1, 0, new Interval(ExtendedMonzo.fromCents(-500.0, 3), 'cents'))
+    params.relativeIntervals.splice(
+      0,
+      0,
+      new Interval(TimeMonzo.fromCents(-500.0, 3), 'logarithmic')
+    )
+    params.sourceText = '-500.\n' + params.sourceText
 
     // Make sure there's 12 notes in the test scale
-    while (params.scale.intervals.length < 12)
-      params.scale.intervals.splice(1, 0, new Interval(ExtendedMonzo.fromCents(100.0, 3), 'cents'))
+    while (params.relativeIntervals.length < 12) {
+      params.relativeIntervals.splice(
+        0,
+        0,
+        new Interval(TimeMonzo.fromCents(100.0, 3), 'logarithmic')
+      )
+      params.sourceText += '100.\n' + params.sourceText
+    }
+    const ratios = params.relativeIntervals.map((i) => i.value.valueOf())
+    params.scale = new Scale(ratios, 440, 69)
 
     expect(() => new KorgExporter(params, KorgModels.MINILOGUE, true)).toThrowError(
       KorgExporterError.OCTAVE_INVALID_INTERVAL
@@ -107,11 +127,23 @@ describe('Korg exporters', () => {
 
   it('throws error if 12-note octave tuning is selected, but scale contains an interval that is greater than an octave', () => {
     const params = getTestData("Korg 'logue exporter unit test v0.0.0")
-    params.scale.intervals.splice(1, 0, new Interval(ExtendedMonzo.fromCents(1300.0, 3), 'cents'))
+    params.relativeIntervals.splice(
+      0,
+      0,
+      new Interval(TimeMonzo.fromCents(1300.0, 3), 'logarithmic')
+    )
 
     // Make sure there's 12 notes in the test scale
-    while (params.scale.intervals.length < 12)
-      params.scale.intervals.splice(1, 0, new Interval(ExtendedMonzo.fromCents(100.0, 3), 'cents'))
+    while (params.relativeIntervals.length < 12) {
+      params.relativeIntervals.splice(
+        0,
+        0,
+        new Interval(TimeMonzo.fromCents(100.0, 3), 'logarithmic')
+      )
+      params.sourceText += '100.\n' + params.sourceText
+    }
+    const ratios = params.relativeIntervals.map((i) => i.value.valueOf())
+    params.scale = new Scale(ratios, 440, 69)
 
     expect(() => new KorgExporter(params, KorgModels.MINILOGUE, true)).toThrowError(
       KorgExporterError.OCTAVE_INVALID_INTERVAL
@@ -122,8 +154,16 @@ describe('Korg exporters', () => {
     const params = getTestData("Korg 'logue exporter unit test v0.0.0")
 
     // Make sure there's 12 notes in the test scale
-    while (params.scale.intervals.length < 12)
-      params.scale.intervals.splice(1, 0, new Interval(ExtendedMonzo.fromCents(100.0, 3), 'cents'))
+    while (params.relativeIntervals.length < 12) {
+      params.relativeIntervals.splice(
+        0,
+        0,
+        new Interval(TimeMonzo.fromCents(100.0, 3), 'logarithmic')
+      )
+      params.sourceText += '100.\n' + params.sourceText
+    }
+    const ratios = params.relativeIntervals.map((i) => i.value.valueOf())
+    params.scale = new Scale(ratios, 440, 69)
 
     const exporter = new KorgExporter(params, KorgModels.MINILOGUE, true)
     const [zip, fileType] = exporter.getFileContents()
@@ -142,7 +182,7 @@ describe('Korg exporters', () => {
       if (path.endsWith('bin')) {
         const content = await file.async('uint8array')
         expect(createHash('sha256').update(content).digest('base64')).toBe(
-          'XwQptSiZLUa8LL/41LEeN1fUNvFr8GUptkga2k+tYJE='
+          'Ev0ERTzsaj9wOZa46chFBQ/HMGmZ9oKsdA+bVQgzAPU='
         )
       } else {
         const content = await file.async('string')
diff --git a/src/exporters/__tests__/max-msp.txt b/src/exporters/__tests__/max-msp.txt
index 929a1a6f..2a015dd9 100644
--- a/src/exporters/__tests__/max-msp.txt
+++ b/src/exporters/__tests__/max-msp.txt
@@ -1,133 +1,133 @@
 # Tuning file for Max/MSP coll objects. - Created using Max/MSP exporter unit test v0.0.0
 # Test Scale
 #
-# https://sevish.com/scaleworkshop/
+# https://scaleworkshop.plainsound.org/
 #
-0, 0.1790365;
-1, 0.1460015;
-2, 0.1143057;
-3, 0.2148438;
-4, 0.2276190;
-5, 0.3740647;
-6, 0.3580729;
-7, 0.2920029;
-8, 0.2286114;
-9, 0.4296875;
-10, 0.4552380;
-11, 0.7481294;
-12, 0.7161458;
-13, 0.5840059;
-14, 0.4572228;
-15, 0.8593750;
-16, 0.9104761;
-17, 1.4962588;
-18, 1.4322917;
-19, 1.1680117;
-20, 0.9144456;
-21, 1.7187500;
-22, 1.8209522;
-23, 2.9925176;
-24, 2.8645833;
-25, 2.3360234;
-26, 1.8288912;
-27, 3.4375000;
-28, 3.6419044;
-29, 5.9850351;
-30, 5.7291667;
-31, 4.6720469;
-32, 3.6577824;
-33, 6.8750000;
-34, 7.2838088;
-35, 11.9700702;
-36, 11.4583333;
-37, 9.3440938;
-38, 7.3155648;
-39, 13.7500000;
-40, 14.5676175;
-41, 23.9401405;
-42, 22.9166667;
-43, 18.6881876;
-44, 14.6311296;
-45, 27.5000000;
-46, 29.1352351;
-47, 47.8802810;
-48, 45.8333333;
-49, 37.3763751;
-50, 29.2622592;
-51, 55.0000000;
-52, 58.2704702;
-53, 95.7605620;
-54, 91.6666667;
-55, 74.7527503;
-56, 58.5245184;
-57, 110.0000000;
-58, 116.5409404;
-59, 191.5211239;
-60, 183.3333333;
-61, 149.5055006;
-62, 117.0490369;
-63, 220.0000000;
-64, 233.0818808;
+0, 0.4552380;
+1, 0.5156250;
+2, 0.7481294;
+3, 0.7161458;
+4, 0.5840059;
+5, 0.4572228;
+6, 0.8593750;
+7, 0.9104761;
+8, 1.0312500;
+9, 1.4962588;
+10, 1.4322917;
+11, 1.1680117;
+12, 0.9144456;
+13, 1.7187500;
+14, 1.8209522;
+15, 2.0625000;
+16, 2.9925176;
+17, 2.8645833;
+18, 2.3360234;
+19, 1.8288912;
+20, 3.4375000;
+21, 3.6419044;
+22, 4.1250000;
+23, 5.9850351;
+24, 5.7291667;
+25, 4.6720469;
+26, 3.6577824;
+27, 6.8750000;
+28, 7.2838088;
+29, 8.2500000;
+30, 11.9700702;
+31, 11.4583333;
+32, 9.3440938;
+33, 7.3155648;
+34, 13.7500000;
+35, 14.5676175;
+36, 16.5000000;
+37, 23.9401405;
+38, 22.9166667;
+39, 18.6881876;
+40, 14.6311296;
+41, 27.5000000;
+42, 29.1352351;
+43, 33.0000000;
+44, 47.8802810;
+45, 45.8333333;
+46, 37.3763751;
+47, 29.2622592;
+48, 55.0000000;
+49, 58.2704702;
+50, 66.0000000;
+51, 95.7605620;
+52, 91.6666667;
+53, 74.7527503;
+54, 58.5245184;
+55, 110.0000000;
+56, 116.5409404;
+57, 132.0000000;
+58, 191.5211239;
+59, 183.3333333;
+60, 149.5055006;
+61, 117.0490369;
+62, 220.0000000;
+63, 233.0818808;
+64, 264.0000000;
 65, 383.0422479;
 66, 366.6666667;
 67, 299.0110011;
 68, 234.0980738;
 69, 440.0000000;
 70, 466.1637615;
-71, 766.0844957;
-72, 733.3333333;
-73, 598.0220023;
-74, 468.1961476;
-75, 880.0000000;
-76, 932.3275230;
-77, 1532.1689914;
-78, 1466.6666667;
-79, 1196.0440045;
-80, 936.3922952;
-81, 1760.0000000;
-82, 1864.6550461;
-83, 3064.3379828;
-84, 2933.3333333;
-85, 2392.0880090;
-86, 1872.7845904;
-87, 3520.0000000;
-88, 3729.3100921;
-89, 6128.6759656;
-90, 5866.6666667;
-91, 4784.1760181;
-92, 3745.5691808;
-93, 7040.0000000;
-94, 7458.6201843;
-95, 12257.3519312;
-96, 11733.3333333;
-97, 9568.3520362;
-98, 7491.1383615;
-99, 14080.0000000;
-100, 14917.2403686;
-101, 24514.7038624;
-102, 23466.6666667;
-103, 19136.7040724;
-104, 14982.2767230;
-105, 28160.0000000;
-106, 29834.4807372;
-107, 49029.4077248;
-108, 46933.3333333;
-109, 38273.4081447;
-110, 29964.5534461;
-111, 56320.0000000;
-112, 59668.9614743;
-113, 98058.8154497;
-114, 93866.6666667;
-115, 76546.8162894;
-116, 59929.1068922;
-117, 112640.0000000;
-118, 119337.9229486;
-119, 196117.6308994;
-120, 187733.3333333;
-121, 153093.6325788;
-122, 119858.2137844;
-123, 225280.0000000;
-124, 238675.8458973;
-125, 392235.2617987;
-126, 375466.6666667;
-127, 306187.2651576;
+71, 528.0000000;
+72, 766.0844957;
+73, 733.3333333;
+74, 598.0220023;
+75, 468.1961476;
+76, 880.0000000;
+77, 932.3275230;
+78, 1056.0000000;
+79, 1532.1689914;
+80, 1466.6666667;
+81, 1196.0440045;
+82, 936.3922952;
+83, 1760.0000000;
+84, 1864.6550461;
+85, 2112.0000000;
+86, 3064.3379828;
+87, 2933.3333333;
+88, 2392.0880090;
+89, 1872.7845904;
+90, 3520.0000000;
+91, 3729.3100921;
+92, 4224.0000000;
+93, 6128.6759656;
+94, 5866.6666667;
+95, 4784.1760181;
+96, 3745.5691808;
+97, 7040.0000000;
+98, 7458.6201843;
+99, 8448.0000000;
+100, 12257.3519312;
+101, 11733.3333333;
+102, 9568.3520362;
+103, 7491.1383615;
+104, 14080.0000000;
+105, 14917.2403686;
+106, 16896.0000000;
+107, 24514.7038624;
+108, 23466.6666667;
+109, 19136.7040724;
+110, 14982.2767230;
+111, 28160.0000000;
+112, 29834.4807372;
+113, 33792.0000000;
+114, 49029.4077248;
+115, 46933.3333333;
+116, 38273.4081447;
+117, 29964.5534461;
+118, 56320.0000000;
+119, 59668.9614743;
+120, 67584.0000000;
+121, 98058.8154497;
+122, 93866.6666667;
+123, 76546.8162894;
+124, 59929.1068922;
+125, 112640.0000000;
+126, 119337.9229486;
+127, 135168.0000000;
diff --git a/src/exporters/__tests__/mts.spec.ts b/src/exporters/__tests__/mts.spec.ts
index c7a616ea..ef6e2851 100644
--- a/src/exporters/__tests__/mts.spec.ts
+++ b/src/exporters/__tests__/mts.spec.ts
@@ -13,7 +13,7 @@ describe('MTS exporter', () => {
 
     const scaleData = exporter.getBulkTuningData()
     expect(createHash('sha256').update(scaleData).digest('base64')).toBe(
-      'z7mQ6pS8tVYimN2B5V3WIgN7NR4lFMwrlIjxKJkWEss='
+      'NLwkn1HRQKdNAyYdxl6RQwfz0JvFyShWaB0DHHtPVZo='
     )
 
     // Name is padded with spaces
@@ -22,7 +22,7 @@ describe('MTS exporter', () => {
 
     const sysExMsg = exporter.buildSysExDump()
     expect(createHash('sha256').update(sysExMsg).digest('base64')).toBe(
-      'WYM++7Jej+d9FhBWw0hqKyj/YMhgtSbCfFA6QryKhdI='
+      'Ghut5DZnxeRXQE0TbOJl6Sh66xI2x1QouHhVhIdQXrQ='
     )
   })
 
@@ -35,7 +35,7 @@ describe('MTS exporter', () => {
 
     const scaleData = exporter.getBulkTuningData()
     expect(createHash('sha256').update(scaleData).digest('base64')).toBe(
-      'z7mQ6pS8tVYimN2B5V3WIgN7NR4lFMwrlIjxKJkWEss='
+      'NLwkn1HRQKdNAyYdxl6RQwfz0JvFyShWaB0DHHtPVZo='
     )
 
     // Name is truncated
@@ -46,9 +46,7 @@ describe('MTS exporter', () => {
 
     const sysExMsg = exporter.buildSysExDump()
     expect(createHash('sha256').update(sysExMsg).digest('base64')).toBe(
-      'vrtx5APwYW8zLF0CVgkcBE3z/kGSXYKfDHDrd0oh8xI='
+      'T1Zs8dZGlznhsgEqRxZJFvLT3yc3UAbtWSanZZ1pvHU='
     )
   })
-
-  return
 })
diff --git a/src/exporters/__tests__/pure-data.spec.ts b/src/exporters/__tests__/pure-data.spec.ts
index f058c56c..35feb32d 100644
--- a/src/exporters/__tests__/pure-data.spec.ts
+++ b/src/exporters/__tests__/pure-data.spec.ts
@@ -4,10 +4,13 @@ import PureDataExporter from '../pure-data'
 
 import { getTestData } from './test-data'
 
+// @ts-ignore
+import EXPECTED_CONTENT from './pure-data.txt?raw'
+
 describe('PureData exporter', () => {
   it('can handle all line types', () => {
     const params = getTestData('')
     const exporter = new PureDataExporter(params)
-    expect(exporter.getFileContents().match(/\n/g) || []).toHaveLength(128)
+    expect(exporter.getFileContents()).toBe(EXPECTED_CONTENT)
   })
 })
diff --git a/src/exporters/__tests__/pure-data.txt b/src/exporters/__tests__/pure-data.txt
new file mode 100644
index 00000000..652e565e
--- /dev/null
+++ b/src/exporters/__tests__/pure-data.txt
@@ -0,0 +1,128 @@
+0.4552380;
+0.5156250;
+0.7481294;
+0.7161458;
+0.5840059;
+0.4572228;
+0.8593750;
+0.9104761;
+1.0312500;
+1.4962588;
+1.4322917;
+1.1680117;
+0.9144456;
+1.7187500;
+1.8209522;
+2.0625000;
+2.9925176;
+2.8645833;
+2.3360234;
+1.8288912;
+3.4375000;
+3.6419044;
+4.1250000;
+5.9850351;
+5.7291667;
+4.6720469;
+3.6577824;
+6.8750000;
+7.2838088;
+8.2500000;
+11.9700702;
+11.4583333;
+9.3440938;
+7.3155648;
+13.7500000;
+14.5676175;
+16.5000000;
+23.9401405;
+22.9166667;
+18.6881876;
+14.6311296;
+27.5000000;
+29.1352351;
+33.0000000;
+47.8802810;
+45.8333333;
+37.3763751;
+29.2622592;
+55.0000000;
+58.2704702;
+66.0000000;
+95.7605620;
+91.6666667;
+74.7527503;
+58.5245184;
+110.0000000;
+116.5409404;
+132.0000000;
+191.5211239;
+183.3333333;
+149.5055006;
+117.0490369;
+220.0000000;
+233.0818808;
+264.0000000;
+383.0422479;
+366.6666667;
+299.0110011;
+234.0980738;
+440.0000000;
+466.1637615;
+528.0000000;
+766.0844957;
+733.3333333;
+598.0220023;
+468.1961476;
+880.0000000;
+932.3275230;
+1056.0000000;
+1532.1689914;
+1466.6666667;
+1196.0440045;
+936.3922952;
+1760.0000000;
+1864.6550461;
+2112.0000000;
+3064.3379828;
+2933.3333333;
+2392.0880090;
+1872.7845904;
+3520.0000000;
+3729.3100921;
+4224.0000000;
+6128.6759656;
+5866.6666667;
+4784.1760181;
+3745.5691808;
+7040.0000000;
+7458.6201843;
+8448.0000000;
+12257.3519312;
+11733.3333333;
+9568.3520362;
+7491.1383615;
+14080.0000000;
+14917.2403686;
+16896.0000000;
+24514.7038624;
+23466.6666667;
+19136.7040724;
+14982.2767230;
+28160.0000000;
+29834.4807372;
+33792.0000000;
+49029.4077248;
+46933.3333333;
+38273.4081447;
+29964.5534461;
+56320.0000000;
+59668.9614743;
+67584.0000000;
+98058.8154497;
+93866.6666667;
+76546.8162894;
+59929.1068922;
+112640.0000000;
+119337.9229486;
+135168.0000000;
diff --git a/src/exporters/__tests__/reaper.spec.ts b/src/exporters/__tests__/reaper.spec.ts
index 6ff86341..ec826cb4 100644
--- a/src/exporters/__tests__/reaper.spec.ts
+++ b/src/exporters/__tests__/reaper.spec.ts
@@ -8,13 +8,13 @@ import { getTestData } from './test-data'
 
 describe('Reaper exporter', () => {
   it('can handle all line types', () => {
-    const params = getTestData('Max/MSP exporter unit test v0.0.0')
-    params.format = 'name'
+    const params = getTestData('Reaper exporter unit test v0.0.0')
+    params.format = 'label'
     params.integratePeriod = true
     params.displayPeriod = true
     const exporter = new ReaperExporter(params)
     const [contents, suffix] = exporter.getFileContentsAndSuffix()
     expect(contents).toBe(EXPECTED_CONTENT)
-    expect(suffix).toBe(' NoteNames_name_p_exact')
+    expect(suffix).toBe(' NoteNames_label_p_exact')
   })
 })
diff --git a/src/exporters/__tests__/reaper.txt b/src/exporters/__tests__/reaper.txt
index 60300843..2e811fe7 100644
--- a/src/exporters/__tests__/reaper.txt
+++ b/src/exporters/__tests__/reaper.txt
@@ -1,129 +1,129 @@
 # MIDI note / CC name map
-127 695,880 (9)
-126 2560/3 (9)
-125 49\5 (9)
-124 10900. (9)
-123 512/1 (9)
-122 3486784401/12800000 (8)
-121 347,940 (8)
-120 1280/3 (8)
-119 44\5 (8)
-118 9700. (8)
-117 256/1 (8)
-116 3486784401/25600000 (7)
-115 173,970 (7)
-114 640/3 (7)
-113 39\5 (7)
-112 8500. (7)
-111 128/1 (7)
-110 3486784401/51200000 (6)
-109 86,985 (6)
-108 320/3 (6)
-107 34\5 (6)
-106 7300. (6)
-105 64/1 (6)
-104 3486784401/102400000 (5)
-103 43,493 (5)
-102 160/3 (5)
-101 29\5 (5)
-100 6100. (5)
-99 32/1 (5)
-98 3486784401/204800000 (4)
-97 21,746 (4)
-96 80/3 (4)
-95 24\5 (4)
-94 4900. (4)
-93 16/1 (4)
-92 3486784401/409600000 (3)
-91 10,873 (3)
-90 40/3 (3)
-89 19\5 (3)
-88 3700. (3)
-87 8/1 (3)
-86 3486784401/819200000 (2)
-85 5,437 (2)
-84 20/3 (2)
-83 14\5 (2)
-82 2500. (2)
-81 4/1 (2)
-80 3486784401/1638400000 (1)
-79 2,718 (1)
-78 10/3 (1)
-77 9\5 (1)
-76 1300. (1)
-75 2/1 (1)
-74 3486784401/3276800000 (0)
-73 1,3591409142295225 (0)
-72 5/3 (0)
-71 4\5 (0)
+127 1\1<1536/5> (8)
+126 9700. (8)
+125 256/1 (8)
+124 446308403328/3276800000 (7)
+123 173,970 (7)
+122 640/3 (7)
+121 39\5 (7)
+120 1\1<768/5> (7)
+119 8500. (7)
+118 128/1 (7)
+117 223154201664/3276800000 (6)
+116 86,985 (6)
+115 320/3 (6)
+114 34\5 (6)
+113 1\1<384/5> (6)
+112 7300. (6)
+111 64/1 (6)
+110 111577100832/3276800000 (5)
+109 43,493 (5)
+108 160/3 (5)
+107 29\5 (5)
+106 1\1<192/5> (5)
+105 6100. (5)
+104 32/1 (5)
+103 55788550416/3276800000 (4)
+102 21,746 (4)
+101 80/3 (4)
+100 24\5 (4)
+99 1\1<96/5> (4)
+98 4900. (4)
+97 16/1 (4)
+96 27894275208/3276800000 (3)
+95 10,873 (3)
+94 40/3 (3)
+93 19\5 (3)
+92 1\1<48/5> (3)
+91 3700. (3)
+90 8/1 (3)
+89 13947137604/3276800000 (2)
+88 5,437 (2)
+87 20/3 (2)
+86 14\5 (2)
+85 1\1<24/5> (2)
+84 2500. (2)
+83 4/1 (2)
+82 6973568802/3276800000 (1)
+81 2,718 (1)
+80 10/3 (1)
+79 9\5 (1)
+78 1\1<12/5> (1)
+77 1300. (1)
+76 2/1 (1)
+75 3486784401/3276800000 (0)
+74 1,3591409142295225r (0)
+73 5/3 (0)
+72 4\5 (0)
+71 C5_5 (0)
 70 100. (0)
 69 1/1 (0)
 68 3486784401/6553600000 (-1)
 67 0,680 (-1)
 66 5/6 (-1)
 65 -1\5 (-1)
-64 -1100. (-1)
-63 1/2 (-1)
-62 3486784401/13107200000 (-2)
-61 0,340 (-2)
-60 5/12 (-2)
-59 -6\5 (-2)
-58 -2300. (-2)
-57 1/4 (-2)
-56 3486784401/26214400000 (-3)
-55 0,170 (-3)
-54 5/24 (-3)
-53 -11\5 (-3)
-52 -3500. (-3)
-51 1/8 (-3)
-50 3486784401/52428800000 (-4)
-49 0,085 (-4)
-48 5/48 (-4)
-47 -16\5 (-4)
-46 -4700. (-4)
-45 1/16 (-4)
-44 3486784401/104857600000 (-5)
-43 0,042 (-5)
-42 5/96 (-5)
-41 -21\5 (-5)
-40 -5900. (-5)
-39 1/32 (-5)
-38 3486784401/209715200000 (-6)
-37 0,021 (-6)
-36 5/192 (-6)
-35 -26\5 (-6)
-34 -7100. (-6)
-33 1/64 (-6)
-32 3486784401/419430400000 (-7)
-31 0,011 (-7)
-30 5/384 (-7)
-29 -31\5 (-7)
-28 -8300. (-7)
-27 1/128 (-7)
-26 3486784401/838860800000 (-8)
-25 0,005 (-8)
-24 5/768 (-8)
-23 -36\5 (-8)
-22 -9500. (-8)
-21 1/256 (-8)
-20 3486784401/1677721600000 (-9)
-19 0,003 (-9)
-18 5/1536 (-9)
-17 -41\5 (-9)
-16 -10700. (-9)
-15 1/512 (-9)
-14 3486784401/3355443200000 (-10)
-13 0,001 (-10)
-12 5/3072 (-10)
-11 -46\5 (-10)
-10 -11900. (-10)
-9 1/1024 (-10)
-8 3486784401/6710886400000 (-11)
-7 0,001 (-11)
-6 5/6144 (-11)
-5 -51\5 (-11)
-4 -13100. (-11)
-3 1/2048 (-11)
-2 3486784401/13421772800000 (-12)
-1 0,000 (-12)
-0 5/12288 (-12)
+64 -1\1<5/3> (-1)
+63 -1100. (-1)
+62 1/2 (-1)
+61 3486784401/13107200000 (-2)
+60 0,340 (-2)
+59 5/12 (-2)
+58 -6\5 (-2)
+57 -1\1<10/3> (-2)
+56 -2300. (-2)
+55 1/4 (-2)
+54 3486784401/26214400000 (-3)
+53 0,170 (-3)
+52 5/24 (-3)
+51 -11\5 (-3)
+50 -1\1<20/3> (-3)
+49 -3500. (-3)
+48 1/8 (-3)
+47 3486784401/52428800000 (-4)
+46 0,085 (-4)
+45 5/48 (-4)
+44 -16\5 (-4)
+43 -1\1<40/3> (-4)
+42 -4700. (-4)
+41 1/16 (-4)
+40 3486784401/104857600000 (-5)
+39 0,042 (-5)
+38 5/96 (-5)
+37 -21\5 (-5)
+36 -1\1<80/3> (-5)
+35 -5900. (-5)
+34 1/32 (-5)
+33 3486784401/209715200000 (-6)
+32 0,021 (-6)
+31 5/192 (-6)
+30 -26\5 (-6)
+29 -1\1<160/3> (-6)
+28 -7100. (-6)
+27 1/64 (-6)
+26 3486784401/419430400000 (-7)
+25 0,011 (-7)
+24 5/384 (-7)
+23 -31\5 (-7)
+22 -1\1<320/3> (-7)
+21 -8300. (-7)
+20 1/128 (-7)
+19 3486784401/838860800000 (-8)
+18 0,005 (-8)
+17 5/768 (-8)
+16 -36\5 (-8)
+15 -1\1<640/3> (-8)
+14 -9500. (-8)
+13 1/256 (-8)
+12 3486784401/1677721600000 (-9)
+11 0,003 (-9)
+10 5/1536 (-9)
+9 -41\5 (-9)
+8 -1\1<1280/3> (-9)
+7 -10700. (-9)
+6 1/512 (-9)
+5 3486784401/3355443200000 (-10)
+4 0,001 (-10)
+3 5/3072 (-10)
+2 -46\5 (-10)
+1 -1\1<2560/3> (-10)
+0 -11900. (-10)
diff --git a/src/exporters/__tests__/scala.spec.ts b/src/exporters/__tests__/scala.spec.ts
index e21be3d3..9b3a1376 100644
--- a/src/exporters/__tests__/scala.spec.ts
+++ b/src/exporters/__tests__/scala.spec.ts
@@ -2,9 +2,9 @@ import { describe, it, expect } from 'vitest'
 
 import { ScalaSclExporter, ScalaKbmExporter } from '../scala'
 import { getTestData } from './test-data'
-import { UNIX_NEWLINE, WINDOWS_NEWLINE } from '../../constants';
+import { UNIX_NEWLINE, WINDOWS_NEWLINE } from '../../constants'
 
-const NEWLINE = process.platform === 'linux' ? UNIX_NEWLINE : WINDOWS_NEWLINE;
+const NEWLINE = process.platform === 'linux' ? UNIX_NEWLINE : WINDOWS_NEWLINE
 
 describe('Scala exporters', () => {
   it('can handle all line types', () => {
@@ -14,12 +14,13 @@ describe('Scala exporters', () => {
       '! test.scl',
       '! Created using Scala exporter unit test v0.0.0',
       '!',
-      '! https://sevish.com/scaleworkshop/',
+      '! https://scaleworkshop.plainsound.org/',
       '!',
       'Test Scale',
-      ' 6',
+      ' 7',
       '!',
       ' 100.000000',
+      ' 6/5',
       ' 960.000000',
       ' 5/3',
       ' 531.234049',
@@ -34,7 +35,7 @@ describe('Scala exporters', () => {
       '! Template for a keyboard mapping',
       '!',
       '! Size of map. The pattern repeats every so many keys:',
-      '6',
+      '7',
       '! First MIDI note number to retune:',
       '0',
       '! Last MIDI note number to retune:',
@@ -47,7 +48,7 @@ describe('Scala exporters', () => {
       '440',
       '! Scale degree to consider as formal octave (determines difference in pitch',
       '! between adjacent mapping patterns):',
-      '6',
+      '7',
       '! Mapping.',
       '! The numbers represent scale degrees mapped to keys. The first entry is for',
       '! the given middle note, the next for subsequent higher keys.',
@@ -58,6 +59,7 @@ describe('Scala exporters', () => {
       '3',
       '4',
       '5',
+      '6',
       ''
     ].join(NEWLINE)
 
diff --git a/src/exporters/__tests__/soniccouture.nka b/src/exporters/__tests__/soniccouture.nka
index c5e52f80..32c4fd76 100644
--- a/src/exporters/__tests__/soniccouture.nka
+++ b/src/exporters/__tests__/soniccouture.nka
@@ -28,76 +28,81 @@
 0
 0
 0
-0
-0
-0
-0
-0
-0
--28
+-29
+-23
+-25
 -30
--35
 0
--30
--30
--22
--24
--29
--34
--24
+-25
+-25
 -24
--16
--18
--23
--28
--18
 -18
+-20
+-25
+-30
+-20
+-20
+-19
+-13
+-15
+-20
+-25
+-15
+-15
+-14
+-8
 -10
--12
--17
--22
--12
--12
+-15
+-20
+-10
+-10
+-9
+-3
+-5
+-10
+-15
+-5
+-5
 -4
--6
--11
--16
--6
--6
 2
 0
 -5
 -10
 0
 0
-8
-6
 1
--4
-6
-6
-14
-12
 7
-2
-12
+5
+0
+-5
+5
+5
+6
 12
+10
+5
+0
+10
+10
+11
+17
+15
+10
+5
+15
+15
+16
+22
 20
-18
-13
-8
-18
-18
-26
-24
-19
-14
-24
-24
-32
-30
+15
+10
+20
+20
+21
+27
 25
 20
+15
 0
 0
 0
@@ -151,77 +156,77 @@
 0
 0
 0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+1564
 -4000
 -1564
 3123
 0
 0
 0
+1564
 -4000
 -1564
 3123
 753
 0
 0
+1564
 -4000
 -1564
 3123
 753
 0
 0
+1564
 -4000
 -1564
 3123
 753
 0
 0
+1564
 -4000
 -1564
 3123
 753
 0
 0
+1564
 -4000
 -1564
 3123
 753
 0
 0
+1564
 -4000
 -1564
 3123
 753
 0
 0
+1564
 -4000
 -1564
 3123
 753
 0
 0
+1564
 -4000
 -1564
 3123
 753
 0
 0
+1564
 -4000
 -1564
 3123
 753
 0
 0
+1564
 -4000
 -1564
 3123
@@ -251,8 +256,3 @@
 0
 0
 0
-0
-0
-0
-0
-0
diff --git a/src/exporters/__tests__/test-data.ts b/src/exporters/__tests__/test-data.ts
index fe7bf504..e8582b93 100644
--- a/src/exporters/__tests__/test-data.ts
+++ b/src/exporters/__tests__/test-data.ts
@@ -1,32 +1,85 @@
+import { Interval, TimeMonzo, getSourceVisitor, parseAST, relative } from 'sonic-weave'
 import type { ExporterParams } from '../base'
 import { UNIX_NEWLINE, WINDOWS_NEWLINE } from '../../constants'
-import { ExtendedMonzo, Interval, Scale } from 'scale-workshop-core'
+import { Scale } from '../../scale'
 import { Fraction } from 'xen-dev-utils'
 
 export function getTestData(appTitle: string) {
-  const intervals = [
-    new Interval(ExtendedMonzo.fromCents(100, 3), 'cents'),
+  const absoluteC5 = new Interval(TimeMonzo.fromFractionalFrequency(528, 3), 'logarithmic', {
+    type: 'AbsoluteFJS',
+    pitch: {
+      type: 'AbsolutePitch',
+      nominal: 'C',
+      accidentals: [],
+      octave: 5n
+    },
+    ups: 0,
+    lifts: 0,
+    superscripts: [],
+    subscripts: [[5, '']]
+  })
+  const visitor = getSourceVisitor()
+  visitor.visit(parseAST('a4 = 440 Hz').body[0])
+  const ev = visitor.createExpressionVisitor()
+  const relativeC5 = relative.bind(ev)(absoluteC5)
+
+  const relativeIntervals = [
+    new Interval(TimeMonzo.fromEqualTemperament('100/1200', 2, 3), 'logarithmic', {
+      type: 'CentsLiteral',
+      whole: 100n,
+      fractional: ''
+    }),
+    relativeC5,
     new Interval(
-      ExtendedMonzo.fromEqualTemperament(new Fraction(4, 5), new Fraction(2), 3),
-      'equal temperament'
+      TimeMonzo.fromEqualTemperament(new Fraction(4, 5), new Fraction(2), 3),
+      'logarithmic',
+      {
+        type: 'NedjiLiteral',
+        numerator: 4,
+        denominator: 5,
+        equaveNumerator: null,
+        equaveDenominator: null
+      }
     ),
-    new Interval(ExtendedMonzo.fromFraction(new Fraction(5, 3), 3), 'ratio'),
-    new Interval(ExtendedMonzo.fromValue(Math.E / 2, 3), 'decimal'),
-    new Interval(ExtendedMonzo.fromFraction(new Fraction(81, 80), 3).mul(5), 'ratio'),
-    new Interval(ExtendedMonzo.fromFraction(2, 3), 'ratio')
+    new Interval(TimeMonzo.fromFraction(new Fraction(5, 3), 3), 'linear', {
+      type: 'FractionLiteral',
+      numerator: 5n,
+      denominator: 3n
+    }),
+    new Interval(TimeMonzo.fromValue(Math.E / 2, 3), 'linear', {
+      type: 'DecimalLiteral',
+      whole: 1n,
+      fractional: '3591409142295225',
+      flavor: 'r',
+      exponent: null
+    }),
+    new Interval(TimeMonzo.fromFraction(new Fraction(81, 80), 3).pow(5), 'linear', {
+      type: 'FractionLiteral',
+      numerator: 3486784401n,
+      denominator: 3276800000n
+    }),
+    new Interval(TimeMonzo.fromFraction(2, 3), 'linear', {
+      type: 'FractionLiteral',
+      numerator: 2n,
+      denominator: 1n
+    })
   ]
-  const scale = Scale.fromIntervalArray(intervals)
+  const ratios = relativeIntervals.map((i) => i.value.valueOf())
+  const scale = new Scale(ratios, 440, 69)
   const params: ExporterParams = {
     filename: 'test',
     newline: process.platform === 'linux' ? UNIX_NEWLINE : WINDOWS_NEWLINE,
-    scaleUrl: 'https://sevish.com/scaleworkshop/',
+    scaleUrl: 'https://scaleworkshop.plainsound.org/',
     name: 'Test Scale',
-    scale: scale,
+    relativeIntervals,
+    scale,
     appTitle,
     description: 'A scale for testing if the exporter works',
     baseMidiNote: 69,
+    baseFrequency: 440,
     midiOctaveOffset: 0,
-    lines: ['100.', '4\\5', '5/3', 'invalid', '1,3591409142295225', '3486784401/3276800000', '2/1'],
+    sourceText: '100.\nC5_5\n4\\5\n5/3\n1,3591409142295225r\n3486784401/3276800000\n2/1',
+    labels: ['100.', 'C5_5', '4\\5', '5/3', '1,3591409142295225r', '3486784401/3276800000', '2/1'],
     date: new Date('2022-02-22T20:22Z')
   }
   return params
diff --git a/src/exporters/ableton.ts b/src/exporters/ableton.ts
index f4928c57..3f69926f 100644
--- a/src/exporters/ableton.ts
+++ b/src/exporters/ableton.ts
@@ -1,27 +1,25 @@
 import { APP_TITLE } from '@/constants'
 import { BaseExporter, type ExporterParams } from '@/exporters/base'
-import { fractionToString } from 'scale-workshop-core'
 import { ftom } from 'xen-dev-utils'
 
 export default class AbletonAsclExporter extends BaseExporter {
   // Make sure .ascl is valid .scl
   static maxInteger = 2147483647
 
-  params: ExporterParams
   name: string
   appTitle: string
 
   constructor(params: ExporterParams) {
-    super()
-    this.params = params
+    super(params)
     this.name = params.name || 'Untitled tuning'
     this.appTitle = params.appTitle || APP_TITLE
   }
 
   getFileContents() {
     const newline = this.params.newline
-    const scale = this.params.scale
-    const referenceFrequency = this.params.scale.baseFrequency.toFixed(8)
+    const intervals = this.params.relativeIntervals
+    const labels = this.params.labels
+    const referenceFrequency = this.params.baseFrequency.toFixed(8)
     // assemble the .ascl file contents
     let file = '! ' + this.params.filename + '.ascl' + newline
     file += '! Created using ' + this.appTitle + newline
@@ -30,21 +28,20 @@ export default class AbletonAsclExporter extends BaseExporter {
     file += '!' + newline
     file += `! default tuning: degree 0 = ${referenceFrequency} Hz` + newline
     file += '!' + newline
-    file += scale.size.toString() + newline
+    file += intervals.length.toString() + newline
     file += '!' + newline
 
     const names: string[] = []
 
-    for (let i = 1; i <= scale.size; i++) {
-      const interval = scale.getInterval(i)
-      const monzo = interval.monzo
+    for (let i = 0; i < intervals.length; i++) {
+      const monzo = intervals[i].value.abs()
       if (monzo.isFractional()) {
-        const ratio = monzo.toFraction()
+        const { numerator, denominator } = monzo.toBigNumeratorDenominator()
         if (
-          ratio.n <= AbletonAsclExporter.maxInteger &&
-          ratio.d <= AbletonAsclExporter.maxInteger
+          numerator <= AbletonAsclExporter.maxInteger &&
+          denominator <= AbletonAsclExporter.maxInteger
         ) {
-          file += fractionToString(ratio)
+          file += `${numerator}/${denominator}`
         } else {
           // The intended accuracy is undocumented, but a sample file had 8 decimals
           file += monzo.toCents().toFixed(8)
@@ -53,8 +50,8 @@ export default class AbletonAsclExporter extends BaseExporter {
         // Incidentally cent accuracy is undocumented in Scala as well, so I guess this is fine
         file += monzo.toCents().toFixed(8)
       }
-      file += ' ! ' + interval.name + newline
-      names.push('"' + interval.name + '"')
+      file += ' ! ' + labels[i] + newline
+      names.push('"' + labels[i].replace('"', '“') + '"') // XXX: Hax
     }
     if (names.length) {
       // Put unison's name first
@@ -62,7 +59,7 @@ export default class AbletonAsclExporter extends BaseExporter {
     }
 
     // It's unclear what "octave number" means in the spec
-    const octave = Math.floor(ftom(scale.baseFrequency)[0] / 12) - 1
+    const octave = Math.floor(ftom(this.params.baseFrequency)[0] / 12) - 1
 
     file += '!' + newline
     file += '! @ABL NOTE_NAMES ' + names.join(' ') + newline
diff --git a/src/exporters/anamark.ts b/src/exporters/anamark.ts
index 86e32cd7..65d9087a 100644
--- a/src/exporters/anamark.ts
+++ b/src/exporters/anamark.ts
@@ -1,4 +1,4 @@
-import { APP_TITLE } from '@/constants'
+import { APP_TITLE, NEWLINE_TEST } from '@/constants'
 import { BaseExporter, type ExporterParams } from '@/exporters/base'
 import { mtof, valueToCents } from 'xen-dev-utils'
 
@@ -6,22 +6,20 @@ class AnaMarkExporter extends BaseExporter {
   static tuningMaxSize = 128
   static baseFrequency = mtof(0)
 
-  params: ExporterParams
   version: number
   appTitle: string
   date: Date
-  lines: string[]
+  sourceText: string
 
   constructor(params: ExporterParams, version: number) {
-    if (params.lines === undefined) {
+    super(params)
+    if (params.sourceText === undefined) {
       throw new Error('Missing text lines')
     }
-    super()
-    this.params = params
     this.version = version
     this.appTitle = params.appTitle || APP_TITLE
     this.date = params.date || new Date()
-    this.lines = params.lines
+    this.sourceText = params.sourceText
   }
 
   getFileContents() {
@@ -30,6 +28,7 @@ class AnaMarkExporter extends BaseExporter {
 
     // Assemble the .tun file contents:
     const newline = this.params.newline
+    const intervals = this.params.relativeIntervals
     const scale = this.params.scale
     const filename = this.params.filename
 
@@ -46,9 +45,9 @@ class AnaMarkExporter extends BaseExporter {
     }
     // If version before 200 and URL is too long, fall back to an alternative way of displaying the original scale data.
     else {
-      this.lines.forEach((line) => {
+      for (const line of this.sourceText.split(NEWLINE_TEST)) {
         file += '; ' + line + newline
-      })
+      }
     }
 
     file += ';' + newline
@@ -56,7 +55,7 @@ class AnaMarkExporter extends BaseExporter {
     file += '[Tuning]' + newline
 
     for (let i = 0; i < AnaMarkExporter.tuningMaxSize; i++) {
-      const freq = scale.getFrequency(i - this.params.baseMidiNote)
+      const freq = scale.getFrequency(i)
       const cents = valueToCents(freq / AnaMarkExporter.baseFrequency)
       file += 'note ' + i.toString() + '=' + Math.round(cents).toString() + newline
     }
@@ -77,7 +76,7 @@ class AnaMarkExporter extends BaseExporter {
     file += '[Exact Tuning]' + newline
 
     for (let i = 0; i < AnaMarkExporter.tuningMaxSize; i++) {
-      const freq = scale.getFrequency(i - this.params.baseMidiNote)
+      const freq = scale.getFrequency(i)
       const cents = valueToCents(freq / AnaMarkExporter.baseFrequency)
       file += 'note ' + i + '= ' + cents.toFixed(6) + newline
     }
@@ -86,19 +85,20 @@ class AnaMarkExporter extends BaseExporter {
     if (this.version >= 200) {
       file += newline + '[Functional Tuning]' + newline
 
-      for (let i = 1; i <= scale.size; i++) {
-        if (i == scale.size) {
+      for (let i = 1; i <= intervals.length; i++) {
+        if (i === intervals.length) {
           file +=
             'note ' +
             i +
             '="#>-' +
             i +
             ' % ' +
-            scale.getMonzo(i).toCents().toFixed(6) +
+            intervals[i - 1].totalCents().toFixed(6) +
             ' ~999"' +
             newline
         } else {
-          file += 'note ' + i + '="#=0 % ' + scale.getMonzo(i).toCents().toFixed(6) + '"' + newline
+          file +=
+            'note ' + i + '="#=0 % ' + intervals[i - 1].totalCents().toFixed(6) + '"' + newline
         }
       }
 
diff --git a/src/exporters/base.ts b/src/exporters/base.ts
index dcea5f8f..5eb2e1a8 100644
--- a/src/exporters/base.ts
+++ b/src/exporters/base.ts
@@ -1,18 +1,24 @@
-import type { Scale } from 'scale-workshop-core'
+import type { Scale } from '@/scale'
+import type { Interval } from 'sonic-weave'
+
+export type LineFormat = 'label' | 'cents' | 'frequency' | 'decimal' | 'degree'
 
 export type ExporterParams = {
   newline: string
-  scale: Scale
   filename: string
+  relativeIntervals: Interval[]
+  baseFrequency: number
   baseMidiNote: number
   midiOctaveOffset: number
+  scale: Scale
+  labels: string[]
   name?: string
   scaleUrl?: string
   description?: string
-  lines?: string[] // May contain invalid lines
+  sourceText?: string // May contain invalid lines
   appTitle?: string
   date?: Date
-  format?: 'name' | 'cents' | 'frequency' | 'decimal' | 'degree'
+  format?: LineFormat
   basePeriod?: number
   baseDegree?: number
   centsRoot?: number
@@ -22,6 +28,21 @@ export type ExporterParams = {
 }
 
 export class BaseExporter {
+  params: ExporterParams
+
+  constructor(params: ExporterParams) {
+    this.params = params
+    this.validateParams()
+  }
+
+  validateParams() {
+    for (const interval of this.params.relativeIntervals) {
+      if (!interval.isRelative()) {
+        throw new Error('Intervals must be given relative to the base frequency.')
+      }
+    }
+  }
+
   saveFile(filename: string, contents: any, raw = false, mimeType = 'application/octet-stream,') {
     const link = document.createElement('a')
     link.download = filename
diff --git a/src/exporters/deflemask.ts b/src/exporters/deflemask.ts
index 6ccef109..038952c3 100644
--- a/src/exporters/deflemask.ts
+++ b/src/exporters/deflemask.ts
@@ -11,12 +11,10 @@ export default class DeflemaskExporter extends BaseExporter {
   static minNote = 1
   static maxNote = 95
 
-  params: ExporterParams
   appTitle: string
 
   constructor(params: ExporterParams) {
-    super()
-    this.params = params
+    super(params)
     this.appTitle = params.appTitle || APP_TITLE
   }
 
diff --git a/src/exporters/image-line.ts b/src/exporters/image-line.ts
index fba87815..b94f0cf1 100644
--- a/src/exporters/image-line.ts
+++ b/src/exporters/image-line.ts
@@ -13,14 +13,14 @@ class ImageLineExporter extends BaseExporter {
   params: ExporterParams
 
   constructor(params: ExporterParams) {
-    super()
+    super(params)
     this.params = params
   }
 
   getFileContents(range: number) {
     const scale = this.params.scale
 
-    const baseFreqOffset = Math.log2(scale.baseFrequency / 440) // in number of octaves
+    const baseFreqOffset = Math.log2(this.params.baseFrequency / 440) // in number of octaves
 
     // construct point data
     const points = new ArrayBuffer(121 * 24)
@@ -28,8 +28,7 @@ class ImageLineExporter extends BaseExporter {
     const pointsUint32 = new Uint32Array(points)
     for (let i = 0; i < ImageLineExporter.numberOfNotes; i++) {
       const edo12cents = (i - 69) * 100
-      const offset =
-        frequencyToCentOffset(scale.getFrequency(i - this.params.baseMidiNote)) - edo12cents
+      const offset = frequencyToCentOffset(scale.getFrequency(i)) - edo12cents
       const normalizedOffset = ((offset / 1200 + baseFreqOffset) / range) * 0.5 + 0.5
       const yCoord = clamp(0, 1, normalizedOffset)
       pointsDoubles[i * 3 + 1] = yCoord
diff --git a/src/exporters/index.ts b/src/exporters/index.ts
index 022dbf8d..d9bd939a 100644
--- a/src/exporters/index.ts
+++ b/src/exporters/index.ts
@@ -1,27 +1,27 @@
 import type { ExporterParams } from '@/exporters/base'
+import { ScalaSclExporter, ScalaKbmExporter } from '@/exporters/scala'
 import { AnaMarkV1Exporter, AnaMarkV2Exporter } from '@/exporters/anamark'
+import KontaktExporter from '@/exporters/kontakt'
 import DeflemaskExporter from '@/exporters/deflemask'
 import { HarmorExporter, SytrusExporter } from '@/exporters/image-line'
-import KontaktExporter from '@/exporters/kontakt'
-import MaxMSPExporter from '@/exporters/max-msp'
 import PureDataExporter from '@/exporters/pure-data'
-import { ScalaSclExporter, ScalaKbmExporter } from '@/exporters/scala'
 import SoniccoutureExporter from '@/exporters/soniccouture'
 import AbletonAsclExporter from '@/exporters/ableton'
+import MaxMSPExporter from '@/exporters/max-msp'
 
 const EXPORTERS = {
-  anamarkv1: AnaMarkV1Exporter,
-  anamarkv2: AnaMarkV2Exporter,
   scalascl: ScalaSclExporter,
   scalakbm: ScalaKbmExporter,
-  maxmsp: MaxMSPExporter,
-  puredata: PureDataExporter,
+  anamarkv1: AnaMarkV1Exporter,
+  anamarkv2: AnaMarkV2Exporter,
   kontakt: KontaktExporter,
-  soniccouture: SoniccoutureExporter,
   harmor: HarmorExporter,
   sytrus: SytrusExporter,
   deflemask: DeflemaskExporter,
-  ableton: AbletonAsclExporter
+  ableton: AbletonAsclExporter,
+  puredata: PureDataExporter,
+  soniccouture: SoniccoutureExporter,
+  maxmsp: MaxMSPExporter
 }
 
 export type ExporterKey = keyof typeof EXPORTERS
diff --git a/src/exporters/kontakt.ts b/src/exporters/kontakt.ts
index 0f954f70..eac0a663 100644
--- a/src/exporters/kontakt.ts
+++ b/src/exporters/kontakt.ts
@@ -7,15 +7,13 @@ export default class KontaktExporter extends BaseExporter {
   static tuningMaxSize = 128
   static baseFrequency = mtof(0)
 
-  params: ExporterParams
   appTitle: string
 
   constructor(params: ExporterParams) {
-    if (params.lines === undefined) {
+    super(params)
+    if (params.sourceText === undefined) {
       throw new Error('Missing text lines')
     }
-    super()
-    this.params = params
     this.appTitle = params.appTitle || APP_TITLE
   }
 
@@ -32,7 +30,7 @@ export default class KontaktExporter extends BaseExporter {
       ' (' +
       midiNoteNumberToName(baseMidiNote, this.params.midiOctaveOffset) +
       ') = ' +
-      this.params.scale.baseFrequency.toString() +
+      this.params.baseFrequency.toString() +
       ' Hz' +
       newline
     file += 'Created using ' + this.appTitle + newline + newline
@@ -46,7 +44,7 @@ export default class KontaktExporter extends BaseExporter {
     file += 'declare $key' + newline + newline
 
     for (let i = 0; i < KontaktExporter.tuningMaxSize; i++) {
-      const [noteNumber, cents] = ftom(this.params.scale.getFrequency(i - baseMidiNote))
+      const [noteNumber, cents] = ftom(this.params.scale.getFrequency(i))
 
       // if we're out of range of the default Kontakt tuning, leave note as default tuning
       if (noteNumber < 0 || noteNumber >= KontaktExporter.tuningMaxSize) {
diff --git a/src/exporters/korg.ts b/src/exporters/korg.ts
index e8528d10..c289b828 100644
--- a/src/exporters/korg.ts
+++ b/src/exporters/korg.ts
@@ -2,7 +2,7 @@ import JSZip from 'jszip'
 import { BaseExporter, type ExporterParams } from '@/exporters/base'
 import { Fraction, mtof } from 'xen-dev-utils'
 import { frequencyTableToBinaryData } from './mts-sysex'
-import { ExtendedMonzo, Interval, Scale } from 'scale-workshop-core'
+import { Interval, TimeMonzo } from 'sonic-weave'
 
 // This exporter converts tuning data into a zip-compressed file for use with
 // Korg's Sound Librarian software, supporting their 'logue series of synthesizers.
@@ -74,36 +74,34 @@ export function getKorgModelInfo(modelName: string) {
 }
 
 export class KorgExporter extends BaseExporter {
-  params: ExporterParams
   modelName: string
   useOctaveFormat: boolean
 
   constructor(params: ExporterParams, modelName: string, useOctaveFormat: boolean) {
-    super()
-    this.params = params
+    super(params)
     this.modelName = modelName
     this.useOctaveFormat = useOctaveFormat
 
     if (this.useOctaveFormat) {
-      const errorMessage = KorgExporter.getOctaveFormatErrorMessage(params.scale)
+      const errorMessage = KorgExporter.getOctaveFormatErrorMessage(params.relativeIntervals)
       if (errorMessage !== '') throw new Error(errorMessage)
     }
   }
 
-  static getOctaveFormatErrorMessage(scale: Scale): string {
-    const octave = new Interval(ExtendedMonzo.fromFraction(new Fraction(2, 1), 3), 'ratio')
+  static getOctaveFormatErrorMessage(intervals: Interval[]): string {
+    const octave = new Interval(TimeMonzo.fromFraction(new Fraction(2, 1), 3), 'linear')
 
-    if (scale.equave.compare(octave) !== 0) {
+    if (intervals[intervals.length - 1].compare(octave) !== 0) {
       return KorgExporterError.OCTAVE_INVALID_EQUAVE
     }
 
-    if (scale.intervals.length !== 12) {
+    if (intervals.length !== 12) {
       return KorgExporterError.OCTAVE_INVALID_SIZE
     }
 
-    const unison = new Interval(ExtendedMonzo.fromFraction(new Fraction(1, 1), 3), 'ratio')
+    const unison = new Interval(TimeMonzo.fromFraction(new Fraction(1, 1), 3), 'linear')
 
-    for (const interval of scale.intervals) {
+    for (const interval of intervals) {
       if (interval.compare(unison) < 0 || interval.compare(octave) > 0) {
         return KorgExporterError.OCTAVE_INVALID_INTERVAL
       }
@@ -165,12 +163,12 @@ export class KorgExporter extends BaseExporter {
     let frequencies: number[]
     if (this.useOctaveFormat) {
       const rootFreq = mtof(0)
-      const transposeRatio = rootFreq / scale.baseFrequency
+      const transposeRatio = rootFreq / this.params.baseFrequency
       frequencies = scale
-        .getFrequencyRange(0, OCTAVE_FORMAT_SIZE)
+        .getFrequencyRange(baseMidiNote, baseMidiNote + OCTAVE_FORMAT_SIZE)
         .map((f: number) => f * transposeRatio)
     } else {
-      frequencies = scale.getFrequencyRange(-baseMidiNote, SCALE_FORMAT_SIZE - baseMidiNote)
+      frequencies = scale.getFrequencyRange(0, SCALE_FORMAT_SIZE)
     }
 
     const binaryData = frequencyTableToBinaryData(frequencies)
diff --git a/src/exporters/max-msp.ts b/src/exporters/max-msp.ts
index 4f927234..9c01b623 100644
--- a/src/exporters/max-msp.ts
+++ b/src/exporters/max-msp.ts
@@ -4,12 +4,10 @@ import { BaseExporter, type ExporterParams } from '@/exporters/base'
 export default class MaxMSPExporter extends BaseExporter {
   static tuningMaxSize = 128
 
-  params: ExporterParams
   appTitle: string
 
   constructor(params: ExporterParams) {
-    super()
-    this.params = params
+    super(params)
     this.appTitle = params.appTitle || APP_TITLE
   }
 
@@ -25,12 +23,7 @@ export default class MaxMSPExporter extends BaseExporter {
     file += '#' + this.params.newline
 
     for (let i = 0; i < MaxMSPExporter.tuningMaxSize; i++) {
-      file +=
-        i +
-        ', ' +
-        this.params.scale.getFrequency(i - this.params.baseMidiNote).toFixed(7) +
-        ';' +
-        this.params.newline
+      file += i + ', ' + this.params.scale.getFrequency(i).toFixed(7) + ';' + this.params.newline
     }
 
     return file
diff --git a/src/exporters/mts-sysex.ts b/src/exporters/mts-sysex.ts
index c57c3219..c8fa6232 100644
--- a/src/exporters/mts-sysex.ts
+++ b/src/exporters/mts-sysex.ts
@@ -1,5 +1,5 @@
 import { clamp, frequencyToMtsBytes } from 'xen-dev-utils'
-import { BaseExporter, type ExporterParams } from './base'
+import { BaseExporter } from './base'
 
 export function frequencyTableToBinaryData(frequencyTableIn: number[]): Uint8Array {
   const dataSize = frequencyTableIn.length * 3
@@ -24,18 +24,10 @@ export function getSysexChecksum(data: number[]): number {
 }
 
 export default class MtsSysexExporter extends BaseExporter {
-  params: ExporterParams
-
-  constructor(params: ExporterParams) {
-    super()
-    this.params = params
-  }
-
   getBulkTuningData() {
     const scale = this.params.scale
-    const baseMidiNote = this.params.baseMidiNote
 
-    const frequencies = scale.getFrequencyRange(-baseMidiNote, 128 - baseMidiNote)
+    const frequencies = scale.getFrequencyRange(0, 128)
 
     const scaleData = frequencyTableToBinaryData(frequencies)
     return scaleData
diff --git a/src/exporters/pure-data.ts b/src/exporters/pure-data.ts
index 7a0cda30..1b664efc 100644
--- a/src/exporters/pure-data.ts
+++ b/src/exporters/pure-data.ts
@@ -1,23 +1,13 @@
-import { BaseExporter, type ExporterParams } from '@/exporters/base'
+import { BaseExporter } from '@/exporters/base'
 
 export default class PureDataExporter extends BaseExporter {
   static tuningMaxSize = 128
 
-  params: ExporterParams
-
-  constructor(params: ExporterParams) {
-    super()
-    this.params = params
-  }
-
   // assemble the text file contents
   getFileContents() {
     let file = ''
     for (let i = 0; i < PureDataExporter.tuningMaxSize; i++) {
-      file +=
-        this.params.scale.getFrequency(i - this.params.baseMidiNote).toFixed(7) +
-        ';' +
-        this.params.newline
+      file += this.params.scale.getFrequency(i).toFixed(7) + ';' + this.params.newline
     }
 
     return file
diff --git a/src/exporters/reaper.ts b/src/exporters/reaper.ts
index d372e799..442ffc12 100644
--- a/src/exporters/reaper.ts
+++ b/src/exporters/reaper.ts
@@ -1,53 +1,26 @@
-import { BaseExporter, type ExporterParams } from '@/exporters/base'
-import {
-  ExtendedMonzo,
-  getLineType,
-  Interval,
-  LINE_TYPE,
-  fractionToString
-} from 'scale-workshop-core'
-import { mmod } from 'xen-dev-utils'
+import { BaseExporter } from '@/exporters/base'
+import { Interval, timeMonzoAs } from 'sonic-weave'
+import { mmod, valueToCents } from 'xen-dev-utils'
 
 export default class ReaperExporter extends BaseExporter {
   static tuningMaxSize = 128
   static fractionDigits = 3
 
-  params: ExporterParams
-
-  constructor(params: ExporterParams) {
-    super()
-    this.params = params
-  }
-
   getFileContentsAndSuffix() {
+    const digits = ReaperExporter.fractionDigits
     const scale = this.params.scale
+    const labels = this.params.labels
+    const baseFrequency = this.params.baseFrequency
     const format = this.params.format
     const basePeriod = this.params.basePeriod || 0
     const baseDegree = this.params.baseDegree || 0
     const modBySize = !this.params.integratePeriod
-    const centsRoot = new Interval(
-      ExtendedMonzo.fromCents(this.params.centsRoot || 0, scale.equave.monzo.numberOfComponents),
-      'cents'
-    )
-    let lineTypes: (LINE_TYPE | 'frequency')[]
-    if (format === 'name') {
-      lineTypes = []
-      for (let i = 0; i < scale.size; ++i) {
-        lineTypes.push(getLineType(scale.getName(i)))
-      }
-    }
-    if (format === 'cents') {
-      lineTypes = Array(scale.size).fill(LINE_TYPE.CENTS)
-    }
-    if (format === 'frequency') {
-      lineTypes = Array(scale.size).fill('frequency')
-    }
-    if (format === 'decimal') {
-      lineTypes = Array(scale.size).fill(LINE_TYPE.DECIMAL)
-    }
-    if (format === undefined) {
-      throw new Error('No export format given')
+
+    const intervals = this.params.relativeIntervals
+    if (!intervals.length) {
+      throw new Error('Cannot export empty scale.')
     }
+    const equave = intervals[intervals.length - 1].value
 
     let file = '# MIDI note / CC name map' + this.params.newline
 
@@ -60,33 +33,45 @@ export default class ReaperExporter extends BaseExporter {
         index = mmod(index, scale.size)
       }
 
-      if (format === 'name' && ((index > 0 && index <= scale.size) || modBySize)) {
-        file += scale.getName(index)
+      if (format === 'label' && index > 0 && index <= labels.length) {
+        file += labels[index - 1]
       } else if (format === 'degree') {
         file += `${index + baseDegree}/${scale.size}`
       } else {
-        const digits = ReaperExporter.fractionDigits
-        const lineType = lineTypes![mmod(index, scale.size)]
-        switch (lineType) {
-          case LINE_TYPE.CENTS:
-            file += scale.getInterval(index).add(centsRoot).centsString()
-            break
-          case LINE_TYPE.DECIMAL:
-            file += scale.getMonzo(index).valueOf().toFixed(digits).replace('.', ',')
-            break
-          case LINE_TYPE.RATIO:
-            file += fractionToString(scale.getMonzo(index).toFraction())
+        const frequency = scale.getFrequency(i)
+        const ratio = frequency / baseFrequency
+
+        switch (format) {
+          case 'cents':
+            file += valueToCents(ratio).toFixed(digits)
             break
-          case LINE_TYPE.N_OF_EDO:
-            file += scale.getInterval(index).equalTemperamentString()
+          case 'decimal':
+            file += ratio.toFixed(digits)
             break
           case 'frequency':
-            file += scale.getFrequency(index).toFixed(digits)
+            file += frequency.toFixed(digits)
             break
-          case LINE_TYPE.INVALID:
-            throw new Error('Cannot export invalid line')
-          default:
-            throw new Error(`Unrecognized line type ${lineType}`)
+        }
+        if (format === 'label' || format === undefined) {
+          // XXX: We'd like to use the original intervals here, but that would require changes to the scale store and access to the SonicWeave root context.
+          // Leave it for now until someone requests better labels.
+          const interval = intervals[mmod(index - 1, intervals.length)]
+          const numEquaves = Math.floor((index - 1) / intervals.length)
+          const value = interval.value.mul(equave.pow(numEquaves))
+          if (interval.value.cents) {
+            if (interval.domain === 'linear') {
+              file += value.valueOf().toFixed(digits).replace('.', ',')
+            } else {
+              file += value.totalCents().toFixed(digits)
+            }
+          } else {
+            file += new Interval(
+              value,
+              interval.domain,
+              timeMonzoAs(value, interval.node),
+              interval
+            ).toString()
+          }
         }
       }
 
diff --git a/src/exporters/scala.ts b/src/exporters/scala.ts
index d04c19ae..f4b88271 100644
--- a/src/exporters/scala.ts
+++ b/src/exporters/scala.ts
@@ -1,24 +1,21 @@
 import { APP_TITLE } from '@/constants'
 import { BaseExporter, type ExporterParams } from '@/exporters/base'
-import { fractionToString } from 'scale-workshop-core'
 
 export class ScalaSclExporter extends BaseExporter {
-  static maxInteger = 2147483647
+  static maxInteger = 2147483647n
 
-  params: ExporterParams
   name: string
   appTitle: string
 
   constructor(params: ExporterParams) {
-    super()
-    this.params = params
+    super(params)
     this.name = params.name || 'Untitled tuning'
     this.appTitle = params.appTitle || APP_TITLE
   }
 
   getFileContents() {
     const newline = this.params.newline
-    const scale = this.params.scale
+    const intervals = this.params.relativeIntervals
     // assemble the .scl file contents
     let file = '! ' + this.params.filename + '.scl' + newline
     file += '! Created using ' + this.appTitle + newline
@@ -28,16 +25,19 @@ export class ScalaSclExporter extends BaseExporter {
     file += this.name
     file += newline + ' '
 
-    file += scale.size.toString() + newline
+    file += intervals.length.toString() + newline
     file += '!' + newline
 
-    for (let i = 1; i <= scale.size; i++) {
-      const monzo = scale.getMonzo(i)
+    for (let i = 0; i < intervals.length; i++) {
+      const monzo = intervals[i].value.abs()
       file += ' '
       if (monzo.isFractional()) {
-        const ratio = monzo.toFraction()
-        if (ratio.n <= ScalaSclExporter.maxInteger && ratio.d <= ScalaSclExporter.maxInteger) {
-          file += fractionToString(ratio)
+        const { numerator, denominator } = monzo.toBigNumeratorDenominator()
+        if (
+          numerator <= ScalaSclExporter.maxInteger &&
+          denominator <= ScalaSclExporter.maxInteger
+        ) {
+          file += `${numerator}/${denominator}`
         } else {
           file += monzo.toCents().toFixed(6)
         }
@@ -56,21 +56,19 @@ export class ScalaSclExporter extends BaseExporter {
 }
 
 export class ScalaKbmExporter extends BaseExporter {
-  params: ExporterParams
-
   constructor(params: ExporterParams) {
-    super()
-    this.params = params
+    super(params)
   }
 
   getFileContents() {
     const newline = this.params.newline
-    const scale = this.params.scale
+    const intervals = this.params.relativeIntervals
+    const baseFrequency = this.params.baseFrequency
     // assemble the .kbm file contents
     let file = '! Template for a keyboard mapping' + newline
     file += '!' + newline
     file += '! Size of map. The pattern repeats every so many keys:' + newline
-    file += scale.size.toString() + newline
+    file += intervals.length.toString() + newline
     file += '! First MIDI note number to retune:' + newline
     file += '0' + newline
     file += '! Last MIDI note number to retune:' + newline
@@ -80,17 +78,17 @@ export class ScalaKbmExporter extends BaseExporter {
     file += '! Reference note for which frequency is given:' + newline
     file += this.params.baseMidiNote.toString() + newline
     file += '! Frequency to tune the above note to' + newline
-    file += scale.baseFrequency.toString() + newline
+    file += baseFrequency.toString() + newline
     file += '! Scale degree to consider as formal octave (determines difference in pitch' + newline
     file += '! between adjacent mapping patterns):' + newline
-    file += scale.size.toString() + newline
+    file += intervals.length.toString() + newline
     file += '! Mapping.' + newline
     file += '! The numbers represent scale degrees mapped to keys. The first entry is for' + newline
     file += '! the given middle note, the next for subsequent higher keys.' + newline
     file +=
       '! For an unmapped key, put in an "x". At the end, unmapped keys may be left out.' + newline
 
-    for (let i = 0; i < scale.size; i++) {
+    for (let i = 0; i < intervals.length; i++) {
       file += i + newline
     }
 
diff --git a/src/exporters/soniccouture.ts b/src/exporters/soniccouture.ts
index 27ec945d..30cfdc00 100644
--- a/src/exporters/soniccouture.ts
+++ b/src/exporters/soniccouture.ts
@@ -1,20 +1,12 @@
-import { BaseExporter, type ExporterParams } from '@/exporters/base'
+import { BaseExporter } from '@/exporters/base'
 import { ftom } from 'xen-dev-utils'
 
 export default class SoniccoutureExporter extends BaseExporter {
   static tuningMaxSize = 128
 
-  params: ExporterParams
-
-  constructor(params: ExporterParams) {
-    super()
-    this.params = params
-  }
-
   // assemble the nka contents
   getFileContents() {
     const newline = this.params.newline
-    const baseMidiNote = this.params.baseMidiNote
     const tuningMaxSize = SoniccoutureExporter.tuningMaxSize
 
     // first line should always be "%XenSetup"
@@ -23,7 +15,7 @@ export default class SoniccoutureExporter extends BaseExporter {
     let centsOffsetPart = ''
     // loop through 128 notes to get semitone offset
     for (let i = 0; i < tuningMaxSize; i++) {
-      const [noteNumber, cents] = ftom(this.params.scale.getFrequency(i - baseMidiNote))
+      const [noteNumber, cents] = ftom(this.params.scale.getFrequency(i))
 
       // if we're out of MIDI note range, leave semitone offset as default
       if (noteNumber < 0 || noteNumber >= tuningMaxSize) {
diff --git a/src/importers/__tests__/anamark.spec.ts b/src/importers/__tests__/anamark.spec.ts
index 538ec3b3..40e023d4 100644
--- a/src/importers/__tests__/anamark.spec.ts
+++ b/src/importers/__tests__/anamark.spec.ts
@@ -7,14 +7,16 @@ import UNIT_TEST_SCALE from './unittestscale.tun?raw'
 describe('Anamark importer', () => {
   it('can parse text', () => {
     const importer = new AnaMarkImporter()
-    const { scale, name, baseMidiNote } = importer.parseText(UNIT_TEST_SCALE, 'unittestscale.tun')
+    const { sourceText, name, baseMidiNote, baseFrequency } = importer.parseText(
+      UNIT_TEST_SCALE,
+      'unittestscale.tun'
+    )
+    const lines = sourceText.split('\n')
 
-    expect(scale.getMonzo(0).totalCents()).toBe(0)
-
-    expect(scale.getMonzo(1).toCents()).toBeCloseTo(111)
+    expect(lines[0]).toBe('111.00000')
 
     expect(name).toBe('Unit Test Scale')
-    expect(scale.baseFrequency).toBeCloseTo(444)
+    expect(baseFrequency).toBeCloseTo(444)
     expect(baseMidiNote).toBe(68)
   })
 })
diff --git a/src/importers/__tests__/scala.spec.ts b/src/importers/__tests__/scala.spec.ts
index f9875776..48eb5cab 100644
--- a/src/importers/__tests__/scala.spec.ts
+++ b/src/importers/__tests__/scala.spec.ts
@@ -29,30 +29,31 @@ describe('Scala importer', () => {
     ].join('\n')
 
     const importer = new ScalaImporter()
-    const { scale } = importer.parseText(text)
+    const { sourceText } = importer.parseText(text)
+    const lines = sourceText.split('\n')
 
-    expect(scale.getMonzo(0).totalCents()).toBe(0)
+    expect(lines[0]).toBe('91.44607 "C#"')
 
-    expect(scale.getMonzo(1).toCents()).toBeCloseTo(91.44607)
+    expect(lines[3]).toBe('5/4 "E"')
 
-    expect(scale.getMonzo(4).valueOf()).toBe(1.25)
-
-    expect(scale.getMonzo(12).valueOf()).toBe(2)
+    expect(lines[11]).toBe('2 "C"')
   })
 
   it('can handle the shang user test scale', () => {
     const importer = new ScalaImporter()
-    const { scale } = importer.parseText(SHANG_TEST_SCALE)
+    const { sourceText } = importer.parseText(SHANG_TEST_SCALE)
+    const lines = sourceText.split('\n')
 
-    expect(scale.getMonzo(1).valueOf()).toBeCloseTo(1.125)
-    expect(scale.size).toBe(5)
+    expect(lines[0]).toBe('9/8 "gong"')
+    expect(lines).toHaveLength(5)
   })
 
   it('can handle the zhi user test scale', () => {
     const importer = new ScalaImporter()
-    const { scale } = importer.parseText(ZHI_TEST_SCALE)
+    const { sourceText } = importer.parseText(ZHI_TEST_SCALE)
+    const lines = sourceText.split('\n')
 
-    expect(scale.getMonzo(3).valueOf()).toBeCloseTo(1.5)
-    expect(scale.size).toBe(5)
+    expect(lines[2]).toBe('3/2 "gong宮"')
+    expect(lines).toHaveLength(5)
   })
 })
diff --git a/src/importers/anamark.ts b/src/importers/anamark.ts
index c28e761e..fc0f1695 100644
--- a/src/importers/anamark.ts
+++ b/src/importers/anamark.ts
@@ -1,5 +1,4 @@
-import { DEFAULT_NUMBER_OF_COMPONENTS, NEWLINE_TEST } from '@/constants'
-import { getLineType, LINE_TYPE, parseLine, Interval, Scale } from 'scale-workshop-core'
+import { NEWLINE_TEST } from '@/constants'
 import { TextImporter, type ImportResult } from '@/importers/base'
 
 export class AnaMarkImporter extends TextImporter {
@@ -48,25 +47,20 @@ export class AnaMarkImporter extends TextImporter {
       }
     }
 
-    const intervals: Interval[] = []
+    const sourceLines: string[] = []
     functionalLines.forEach((line) => {
       if (!line.length) {
         return
       }
-      const lineType = getLineType(line)
-      if (lineType === LINE_TYPE.INVALID) {
-        throw new Error(`Failed to parse line ${line}`)
-      }
-      intervals.push(parseLine(line, DEFAULT_NUMBER_OF_COMPONENTS))
+      sourceLines.push(line)
     })
-    const scale = Scale.fromIntervalArray(intervals)
 
-    const result: ImportResult = { scale, name }
+    const result: ImportResult = { sourceText: sourceLines.join('\n'), name }
 
     // get base frequency and MIDI note
     for (let i = firstLineIndex + 1; i < lines.length; i++) {
       if (lines[i].includes('!')) {
-        scale.baseFrequency = parseFloat(
+        result.baseFrequency = parseFloat(
           lines[i].substring(lines[i].indexOf('!') + 2, lines[i].length - 2)
         )
         result.baseMidiNote = parseInt(
diff --git a/src/importers/base.ts b/src/importers/base.ts
index 474c6ada..2d2b2898 100644
--- a/src/importers/base.ts
+++ b/src/importers/base.ts
@@ -1,9 +1,8 @@
-import type { Scale } from 'scale-workshop-core'
-
 export type ImportResult = {
-  scale: Scale
+  sourceText: string
   name?: string
   baseMidiNote?: number
+  baseFrequency?: number
 }
 
 export abstract class TextImporter {
@@ -30,8 +29,10 @@ export abstract class TextImporter {
     const reader = new FileReader()
 
     return new Promise<ImportResult>((resolve, reject) => {
-      reader.onload = () => resolve(this.parseText(reader.result as string, files[0].name))
-      reader.onerror = reject
+      reader.addEventListener('load', () =>
+        resolve(this.parseText(reader.result as string, files[0].name))
+      )
+      reader.addEventListener('error', reject)
       reader.readAsText(files[0])
     })
   }
diff --git a/src/importers/scala.ts b/src/importers/scala.ts
index 40374ef8..3b5b944c 100644
--- a/src/importers/scala.ts
+++ b/src/importers/scala.ts
@@ -1,25 +1,25 @@
-import { DEFAULT_NUMBER_OF_COMPONENTS, NEWLINE_TEST } from '@/constants'
+import { NEWLINE_TEST } from '@/constants'
 import { TextImporter, type ImportResult } from '@/importers/base'
-import { getLineType, LINE_TYPE, parseLine, Scale, type Interval } from 'scale-workshop-core'
 
 export class ScalaImporter extends TextImporter {
   parseText(input: string): ImportResult {
     const lines = input.split(NEWLINE_TEST)
     const firstLine = lines.lastIndexOf('!') + 1
-    const intervals: Interval[] = []
+    const sourceLines: string[] = []
     lines.slice(firstLine).forEach((line) => {
       line = line.trim()
       if (!line.length) {
         return
       }
-      line = line.split(/\s/)[0]
-      const lineType = getLineType(line)
-      if (lineType === LINE_TYPE.INVALID) {
-        throw new Error(`Failed to parse line ${line}`)
+      const parts = line.split(/\s/)
+      if (parts.length === 1) {
+        // Valid .scl is valid SonicWeave
+        sourceLines.push(parts[0])
+      } else if (parts.length > 1) {
+        // Unofficially labeled .scl is valid SonicWeave if quoted
+        sourceLines.push(parts[0] + ' ' + JSON.stringify(parts.slice(1).join('')))
       }
-      intervals.push(parseLine(line, DEFAULT_NUMBER_OF_COMPONENTS, undefined, true, false))
     })
-    const scale = Scale.fromIntervalArray(intervals)
-    return { scale }
+    return { sourceText: sourceLines.join('\n') }
   }
 }
diff --git a/src/main.ts b/src/main.ts
index e3296273..c74443cb 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,9 +3,6 @@ import { createPinia } from 'pinia'
 import App from '@/App.vue'
 import router from '@/router'
 
-// Hack to bypass Vue state management for real-time gains in table row highlighting.
-;(window as any).TUNING_TABLE_ROWS = Array(128)
-
 const app = createApp(App)
 
 app.use(createPinia())
diff --git a/src/midi.ts b/src/midi.ts
index e30fec11..f7e9015a 100644
--- a/src/midi.ts
+++ b/src/midi.ts
@@ -2,12 +2,11 @@ import { mmod } from 'xen-dev-utils'
 import { midiKeyInfo } from 'xen-midi'
 
 /**
- * Computes a mapping from white MIDI notes to white-colored scale degrees.
+ * Computes a mapping from white MIDI notes to non-black scale degrees.
  *
  * If the base note is a black one the next white one will be used instead.
  *
  * Assumes that the size of the scale and number of colors is equal.
- * The user can violate this assumption, but that's just how SW is...
  */
 export function computeWhiteIndices(baseMidiNote: number, colors: string[]) {
   const info = midiKeyInfo(baseMidiNote)
@@ -15,8 +14,8 @@ export function computeWhiteIndices(baseMidiNote: number, colors: string[]) {
 
   let index = baseMidiNote
   let whiteIndex = info.whiteNumber === undefined ? info.sharpOf + 1 : info.whiteNumber
-  let colorIndex = 0
-  const result = []
+  let colorIndex = -1
+  const result: number[] = []
   while (whiteIndex >= 0 && index > -1024) {
     if (colors[mmod(colorIndex--, colors.length)] !== 'black') {
       result[whiteIndex--] = index
@@ -25,7 +24,7 @@ export function computeWhiteIndices(baseMidiNote: number, colors: string[]) {
   }
   index = baseMidiNote
   whiteIndex = info.whiteNumber === undefined ? info.sharpOf + 1 : info.whiteNumber
-  colorIndex = 0
+  colorIndex = -1
   while (whiteIndex < 75 && index < 1024) {
     if (colors[mmod(colorIndex++, colors.length)] !== 'black') {
       result[whiteIndex++] = index
diff --git a/src/presets.json b/src/presets.json
index 037db66d..b7648ab4 100644
--- a/src/presets.json
+++ b/src/presets.json
@@ -2,1163 +2,356 @@
   "pelog": {
     "title": "Pelog",
     "name": "Normalised Pelog, Kunst, 1949. Average of 39 Javanese gamelans",
-    "lines": ["120.", "270.", "540.", "670.", "785.", "950.", "1215."],
-    "categories": ["traditional"],
-    "keyColors": ["gray", "white", "white", "white", "white", "white", "white"]
+    "source": "120. white\n270. white\n540. white\n670. white\n785. white\n950. white\n1215. gray\n",
+    "categories": ["traditional"]
   },
   "slendro": {
     "title": "Slendro",
     "name": "Average of 30 measured slendro gamelans, W. Surjodiningrat et al., 1993.",
-    "lines": ["231.", "474.", "717.", "955.", "1208."],
-    "categories": ["traditional"],
-    "keyColors": ["gray", "white", "white", "white", "white"]
+    "source": "231. white\n474. white\n717. white\n955. white\n1208. gray\n",
+    "categories": ["traditional"]
   },
   "ragabageshri": {
     "name": "Raga Bageshri",
-    "lines": ["10/9", "32/27", "4/3", "3/2", "5/3", "16/9", "2/1"],
-    "categories": ["traditional", "just intonation"],
-    "keyColors": ["white", "black", "white", "white", "white", "black", "white"]
+    "source": "54 white:\n60 black:\n64 white:\n72 white:\n81 white:\n90 black:\n96 white:\n108 '2/1'\n\nsimplify\n",
+    "categories": ["traditional", "just intonation"]
   },
   "ragabhairavi": {
     "name": "Raga Bhairavi",
-    "lines": ["16/15", "9/8", "6/5", "27/20", "3/2", "8/5", "9/5", "2/1"],
-    "categories": ["traditional", "just intonation"],
-    "keyColors": ["white", "black", "white", "gray", "gray", "white", "gray", "gray"]
+    "source": "eulerGenus(135, 5)\n$[5] = 16/15\nsort()\nlabel([black, white, black, black, white, black, black, white])\n",
+    "categories": ["traditional", "just intonation"]
   },
   "ragakafi": {
     "name": "Raga Kafi",
-    "lines": ["9/8", "32/27", "4/3", "3/2", "5/3", "16/9", "2/1"],
-    "categories": ["traditional", "just intonation"],
-    "keyColors": ["white", "white", "white", "white", "white", "black", "white"]
+    "source": "rank2(3/2 white, 2, 3, 2/1 gray)\ninsert(5/3 yellow)\n",
+    "categories": ["traditional", "just intonation"]
   },
   "ragatodi": {
     "name": "Raga Todi",
-    "lines": ["256/243", "32/27", "45/32", "3/2", "128/81", "15/8", "2/1"],
-    "categories": ["traditional", "just intonation"],
-    "keyColors": ["white", "white", "white", "black", "white", "white", "black"]
+    "source": "rank2(3/2 white, 1, 5, 2/1 white)\n$[2] *~= 135/128 black\n$[5] *~= 135/128 black\n",
+    "categories": ["traditional", "just intonation"]
   },
   "ragayaman": {
     "name": "Raga Yaman",
-    "lines": ["9/8", "5/4", "45/32", "3/2", "27/16", "15/8", "2/1"],
-    "categories": ["traditional", "just intonation"],
-    "keyColors": ["white", "white", "gray", "black", "white", "white", "black"]
+    "source": "gs(geodiff(4:5 yellow:6 white), 7, 2/1 white)\n",
+    "categories": ["traditional", "just intonation"]
   },
   "22shruti": {
     "name": "22 Shruti",
-    "lines": [
-      "256/243",
-      "16/15",
-      "10/9",
-      "9/8",
-      "32/27",
-      "6/5",
-      "5/4",
-      "81/64",
-      "4/3",
-      "27/20",
-      "45/32",
-      "729/512",
-      "3/2",
-      "128/81",
-      "8/5",
-      "5/3",
-      "27/16",
-      "16/9",
-      "9/5",
-      "15/8",
-      "243/128",
-      "2/1"
-    ],
-    "categories": ["traditional", "just intonation"],
-    "keyColors": [
-      "white",
-      "white",
-      "black",
-      "blue",
-      "white",
-      "white",
-      "black",
-      "blue",
-      "white",
-      "white",
-      "black",
-      "blue",
-      "white",
-      "white",
-      "white",
-      "black",
-      "blue",
-      "white",
-      "white",
-      "black",
-      "blue",
-      "white"
-    ]
+    "source": "rank2(3/2 white, 4, 0, 2/1 white)\nmergeOffset([10/9 yellow, 16/15 green, 256/243 white, 9/8 white], 'wrap')\nsimplify\n",
+    "categories": ["traditional", "just intonation"]
   },
   "hirajoshi": {
-    "name": "Hirajoshi",
-    "lines": ["185.", "337.", "683.", "790.", "1200."],
-    "categories": ["traditional"],
-    "keyColors": ["gray", "white", "white", "white", "white"]
+    "title": "Hirajoshi",
+    "name": "Observed Japanese pentatonic koto scale. Helmholtz/Ellis p.519, nr.112",
+    "source": "185. white\n337. white\n683. white\n790. white\n1200. gray\n",
+    "categories": ["traditional"]
+  },
+  "hirajoshi-ji": {
+    "title": "Hirajoshi just",
+    "name": "Japanese pentatonic koto scale, theoretical. Helmholz/Ellis p.519, nr.110",
+    "source": "9/8 white\neulerGenus(15 white, 5, 2 gray)\n",
+    "categories": ["traditional", "just intonation"]
   },
   "balafon": {
     "title": "Balafon 1",
     "name": "Observed balafon tuning from Patna, Helmholtz/Ellis p. 518, nr.81",
-    "lines": ["187.", "356.", "526.", "672.", "856.", "985.", "1222."],
-    "categories": ["traditional"],
-    "keyColors": ["gray", "white", "white", "white", "white", "white", "white"]
+    "source": "187. white\n356. white\n526. white\n672. white\n856. white\n985. white\n1222. gray\n",
+    "categories": ["traditional"]
   },
   "balafon2": {
     "title": "Balafon 2",
     "name": "Observed balafon tuning from West-Africa, Helmholtz/Ellis p. 518, nr.86",
-    "lines": ["152.", "287.", "533.", "724.", "890.", "1029.", "1200."],
-    "categories": ["traditional"],
-    "keyColors": ["gray", "white", "white", "white", "white", "white", "white"]
+    "source": "152. white\n287. white\n533. white\n724. white\n890. white\n1029. white\n1200. gray\n",
+    "categories": ["traditional"]
   },
   "balafon3": {
     "title": "Balafon 3",
     "name": "Pitt-River's balafon tuning from West-Africa, Helmholtz/Ellis p. 518, nr.87",
-    "lines": ["195.", "289.", "513.", "686.", "796.", "1008.", "1209."],
-    "categories": ["traditional"],
-    "keyColors": ["gray", "white", "white", "white", "white", "white", "white"]
+    "source": "195. white\n289. white\n513. white\n686. white\n796. white\n1008. white\n1209. gray\n",
+    "categories": ["traditional"]
   },
   "balafon4": {
     "title": "Balafon 4",
     "name": "Mandinka balafon scale from Gambia",
-    "lines": ["151.", "345.", "526.", "660.", "861.", "1025.", "1141."],
-    "categories": ["traditional"],
-    "keyColors": ["gray", "white", "white", "white", "white", "white", "white"]
+    "source": "151. white\n345. white\n526. white\n660. white\n861. white\n1025. white\n1141. gray\n",
+    "categories": ["traditional"]
   },
   "balafon5": {
     "title": "Balafon 5",
     "name": "An observed balafon tuning from Singapore, Helmholtz/Ellis p. 518, nr.82",
-    "lines": ["169.", "350.", "543.", "709.", "894.", "1040.", "1205."],
-    "categories": ["traditional"],
-    "keyColors": ["gray", "white", "white", "white", "white", "white", "white"]
+    "source": "169. white\n350. white\n543. white\n709. white\n894. white\n1040. white\n1205. gray\n",
+    "categories": ["traditional"]
   },
   "balafon6": {
     "title": "Balafon 6",
     "name": "Observed balafon tuning from Burma, Helmholtz/Ellis p. 518, nr.84",
-    "lines": ["114.", "350.", "550.", "687.", "838.", "1032.", "1196."],
-    "categories": ["traditional"],
-    "keyColors": ["gray", "white", "white", "white", "white", "white", "white"]
+    "source": "114. white\n350. white\n550. white\n687. white\n838. white\n1032. white\n1196. gray\n",
+    "categories": ["traditional"]
   },
   "balafon7": {
     "title": "Balafon 7",
     "name": "Observed South Pacific pentatonic balafon tuning, Helmholtz/Ellis p. 518, nr.93",
-    "lines": ["202.", "370.", "685.", "903.", "1200."],
-    "categories": ["traditional"],
-    "keyColors": ["gray", "white", "white", "white", "white"]
+    "source": "202. white\n370. white\n685. white\n903. white\n1200. gray\n",
+    "categories": ["traditional"]
   },
   "5edo": {
     "title": "Equal pentatonic",
     "name": "Equal pentatonic (5edo)",
-    "lines": ["1\\5", "2\\5", "3\\5", "4\\5", "5\\5"],
-    "categories": ["traditional", "equal temperament"],
-    "keyColors": ["gray", "white", "white", "white", "white"]
+    "source": "ed(5)\nlabel([white, white, white, white, gray])\n",
+    "categories": ["traditional", "equal temperament"]
   },
   "7edo": {
     "title": "Equal heptatonic",
     "name": "Equal heptatonic (7edo)",
-    "lines": ["1\\7", "2\\7", "3\\7", "4\\7", "5\\7", "6\\7", "7\\7"],
-    "categories": ["traditional", "equal temperament"],
-    "keyColors": ["white", "black", "white", "white", "white", "black", "white"]
+    "source": "ed(7)\ni => i white\npop() gray\n",
+    "categories": ["traditional", "equal temperament"]
   },
   "archytasdiatonic": {
     "name": "Archytas Diatonic",
-    "lines": ["28/27", "32/27", "4/3", "3/2", "14/9", "16/9", "2/1"],
-    "categories": ["traditional", "just intonation"],
-    "keyColors": ["white", "black", "white", "white", "white", "black", "white"]
+    "source": "3/2 white\n2/1 white\nmergeOffset([28/27 blue, 32/27 white, 4/3 white])\nsimplify\n",
+    "categories": ["traditional", "just intonation"]
   },
   "archytasenharmonic": {
     "name": "Archytas Enharmonic",
-    "lines": ["28/27", "16/15", "4/3", "3/2", "14/9", "8/5", "2/1"],
-    "categories": ["traditional", "just intonation"],
-    "keyColors": ["white", "black", "gray", "white", "white", "black", "gray"]
+    "source": "3/2 white\n2/1 white\nmergeOffset([28/27 blue, 16/15 green, 4/3 white])\nsimplify\n",
+    "categories": ["traditional", "just intonation"]
   },
   "didymuschromatic": {
     "name": "Didymus Chromatic",
-    "lines": ["16/15", "10/9", "4/3", "3/2", "8/5", "5/3", "2/1"],
-    "categories": ["traditional", "just intonation"],
-    "keyColors": ["white", "black", "gray", "white", "white", "black", "gray"]
+    "source": "3/2 white\n2/1 white\nmergeOffset([16/15 green, 10/9 yellow, 4/3 white])\nsimplify\n",
+    "categories": ["traditional", "just intonation"]
   },
   "ptolemydiatonicditoniaion": {
     "name": "Ptolemy Diatonic Ditoniaion",
-    "lines": ["256/243", "32/27", "4/3", "3/2", "128/81", "16/9", "2/1"],
-    "categories": ["traditional", "just intonation"],
-    "keyColors": ["gray", "white", "white", "white", "white", "white", "white"]
+    "source": "rank2(3/2 white, 1, 5, 2/1 gray)\n",
+    "categories": ["traditional", "just intonation"]
   },
   "ptolemydiatonichemiolion": {
     "name": "Ptolemy Diatonic Hemiolion",
-    "lines": ["12/11", "6/5", "4/3", "3/2", "18/11", "9/5", "2/1"],
-    "categories": ["traditional", "just intonation"],
-    "keyColors": ["white", "black", "gray", "white", "white", "black", "gray"]
+    "source": "3/2 white\n2/1 white\nmergeOffset([12/11 black, 6/5 green, 4/3 white])\nsimplify\n",
+    "categories": ["traditional", "just intonation"]
   },
   "pythagorean": {
     "name": "Pythagorean",
-    "lines": [
-      "256/243",
-      "9/8",
-      "32/27",
-      "81/64",
-      "4/3",
-      "1024/729",
-      "3/2",
-      "128/81",
-      "27/16",
-      "16/9",
-      "4096/2187",
-      "2/1"
-    ],
+    "source": "labeled(['F', 'C', 'G', 'D', 'A', 'E', 'B'], [3^i rdc 2 white for i of [-2..4]])\nlabeled(['G♭', 'D♭', 'A♭', 'E♭', 'B♭'], [3^i rdc 2 black for i of [-7..-3]])\nsort()\n",
     "categories": ["traditional", "just intonation"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black"
-    ],
     "baseMidiNote": 67,
     "baseFrequency": 391
   },
   "werckmeisteriii": {
     "name": "Werckmeister III (1691)",
-    "lines": [
-      "107.82",
-      "203.91",
-      "311.72",
-      "401.955",
-      "503.91",
-      "605.865",
-      "701.955",
-      "809.775",
-      "900.",
-      "1007.82",
-      "1103.91",
-      "1200."
-    ],
+    "source": "701.955 white 'C'\n701.955 white 'G'\n701.955 - 5.865 white 'D'\n701.955 white 'A'\n701.955 white 'E'\n701.955 white 'B'\n701.955 black 'F♯'\n701.955 black 'C♯'\n701.955 black 'G♯'\n701.955 - 5.865 black 'D♯'\n701.955 - 5.865 black 'A♯'\nstack()\n\n1200. white 'F'\nreduce()\nsort()\n",
     "categories": ["traditional"],
-    "keyColors": [
-      "white",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black"
-    ],
-    "baseMidiNote": 64,
-    "baseFrequency": 329
+    "baseMidiNote": 65,
+    "baseFrequency": 349
   },
   "young1799": {
     "name": "Young (1799)",
-    "lines": [
-      "106.",
-      "198.",
-      "306.2",
-      "400.1",
-      "502.",
-      "604.",
-      "697.9",
-      "806.1",
-      "898.1",
-      "1004.1",
-      "1102.",
-      "1200."
-    ],
+    "source": "697.9 white 'C'\n700.1 white 'G'\n700.1 white 'D'\n702.0 white 'A'\n701.9 white 'E'\n702.0 white 'B'\n702.0 black 'F♯'\n700.1 black 'C♯'\n700.1 black 'G♯'\n697.9 black 'D♯'\n697.9 black 'A♯'\nstack()\n\n1200. 'F'\nreduce()\nsort()\n",
     "categories": ["traditional"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black"
-    ],
-    "baseMidiNote": 67,
-    "baseFrequency": 392
+    "baseMidiNote": 65,
+    "baseFrequency": 349
   },
   "12edo": {
     "name": "12-tone equal temperament",
-    "lines": [
-      "100.",
-      "200.",
-      "300.",
-      "400.",
-      "500.",
-      "600.",
-      "700.",
-      "800.",
-      "900.",
-      "1000.",
-      "1100.",
-      "1200."
-    ],
-    "categories": ["traditional", "equal temperament"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black"
-    ]
+    "source": "100. black 'B♭'\n200. white 'B'\n300. white 'C'\n400. black 'C♯'\n500. white 'D'\n600. black 'E♭'\n700. white 'E'\n800. white 'F'\n900. black 'F♯'\n1000. white 'G'\n1100. black 'G♯'\n1200. white 'A'\n",
+    "categories": ["traditional", "equal temperament"]
   },
   "partch43": {
     "name": "Harry Partch 43-tone",
-    "lines": [
-      "81/80",
-      "33/32",
-      "21/20",
-      "16/15",
-      "12/11",
-      "11/10",
-      "10/9",
-      "9/8",
-      "8/7",
-      "7/6",
-      "32/27",
-      "6/5",
-      "11/9",
-      "5/4",
-      "14/11",
-      "9/7",
-      "21/16",
-      "4/3",
-      "27/20",
-      "11/8",
-      "7/5",
-      "10/7",
-      "16/11",
-      "40/27",
-      "3/2",
-      "32/21",
-      "14/9",
-      "11/7",
-      "8/5",
-      "18/11",
-      "5/3",
-      "27/16",
-      "12/7",
-      "7/4",
-      "16/9",
-      "9/5",
-      "20/11",
-      "11/6",
-      "15/8",
-      "40/21",
-      "64/33",
-      "160/81",
-      "2/1"
-    ],
-    "categories": ["just intonation"],
-    "keyColors": [
-      "white",
-      "green",
-      "pink",
-      "teal",
-      "green",
-      "plum",
-      "black",
-      "yellow",
-      "white",
-      "red",
-      "blue",
-      "white",
-      "green",
-      "pink",
-      "yellow",
-      "black",
-      "red",
-      "blue",
-      "white",
-      "green",
-      "pink",
-      "teal",
-      "orange",
-      "plum",
-      "yellow",
-      "white",
-      "red",
-      "blue",
-      "black",
-      "green",
-      "plum",
-      "yellow",
-      "white",
-      "red",
-      "blue",
-      "white",
-      "green",
-      "black",
-      "pink",
-      "yellow",
-      "orange",
-      "plum",
-      "yellow"
-    ]
+    "source": "[\n n % d white\n  for n of [1..11]\n  for d of [1..11]\n]\n\n1 gray:15:21:27:33\n/1 black:15:21:27:33\n\n5 olive:21:27:81\n/5 gold:21:27:81\n\n2\nreduce()\nsort()\nkeepUnique()\n",
+    "categories": ["just intonation"]
   },
   "carlossuperjust": {
     "name": "Wendy Carlos Super Just",
-    "lines": [
-      "17/16",
-      "9/8",
-      "6/5",
-      "5/4",
-      "4/3",
-      "11/8",
-      "3/2",
-      "13/8",
-      "5/3",
-      "7/4",
-      "15/8",
-      "2/1"
-    ],
+    "source": "[3,5..17]\nlabel([white, yellow, blue, white, lavender, chocolate, yellow, indigo])\n1/3 white\n3/5 green\n5/3 yellow\n2 white\nreduce()\nsort()\n",
     "baseFrequency": 264,
     "baseMidiNote": 60,
-    "categories": ["just intonation"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "black",
-      "gray",
-      "white",
-      "black",
-      "white",
-      "black",
-      "gray",
-      "black",
-      "gray"
-    ]
+    "categories": ["just intonation"]
   },
   "gradycentaur": {
     "title": "Kraig Grady Centaur (7-limit)",
     "name": "Kraig Grady Centaur",
-    "lines": [
-      "21/20",
-      "9/8",
-      "7/6",
-      "5/4",
-      "4/3",
-      "7/5",
-      "3/2",
-      "14/9",
-      "5/3",
-      "7/4",
-      "15/8",
-      "2/1"
-    ],
+    "source": "gs(geodiff(12:14 blue:15 yellow:18 white), 10, 2/1 white)\nrotate(6)\ninsert(21/20 cyan)\ninsert(7/5 cyan)\n",
     "baseFrequency": 264,
     "baseMidiNote": 60,
-    "categories": ["just intonation"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "black",
-      "gray",
-      "white",
-      "black",
-      "white",
-      "black",
-      "gray",
-      "black",
-      "gray"
-    ]
+    "categories": ["just intonation"]
   },
   "gradycentauras": {
     "title": "Kraig Grady Centaura Subharmonic (11-limit)",
     "name": "Kraig Grady Centaura Subharmonic",
-    "lines": [
-      "15/14",
-      "10/9",
-      "40/33",
-      "5/4",
-      "4/3",
-      "10/7",
-      "3/2",
-      "45/28",
-      "5/3",
-      "20/11",
-      "15/8",
-      "2/1"
-    ],
+    "source": "4/3 white\n3/2 white\n2/1 white\nmergeOffset([15/14 cyan, 5/4 yellow, 20/11 black, 5/3 yellow], 'wrap')\nvoid(pop($, 5))\n",
     "baseFrequency": 264,
     "baseMidiNote": 60,
-    "categories": ["just intonation"],
-    "keyColors": [
-      "white",
-      "black",
-      "gray",
-      "black",
-      "gray",
-      "white",
-      "black",
-      "white",
-      "black",
-      "gray",
-      "black",
-      "gray"
-    ]
+    "categories": ["just intonation"]
   },
   "gradycentaurah": {
     "title": "Kraig Grady Centaura Harmonic (11-limit)",
     "name": "Kraig Grady Centaura Harmonic",
-    "lines": [
-      "33/32",
-      "9/8",
-      "7/6",
-      "5/4",
-      "4/3",
-      "11/8",
-      "3/2",
-      "14/9",
-      "5/3",
-      "7/4",
-      "15/8",
-      "2/1"
-    ],
+    "source": "4/3 white\n3/2 white\n2/1 white\nmergeOffset([7/6 blue, 5/4 yellow, 11/8 lavender, 3/2 white], 'wrap')\nvoid(pop($, 11))\nsimplify\n",
     "baseFrequency": 264,
     "baseMidiNote": 60,
-    "categories": ["just intonation"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "black",
-      "gray",
-      "white",
-      "black",
-      "white",
-      "black",
-      "gray",
-      "black",
-      "gray"
-    ]
+    "categories": ["just intonation"]
   },
   "11machine6": {
     "name": "11edo machine[6]",
-    "lines": ["2\\11", "4\\11", "6\\11", "8\\11", "10\\11", "11\\11"],
-    "categories": ["MOS", "equal temperament"],
-    "keyColors": ["black", "white", "white", "white", "white", "white"]
+    "source": "rank2(9/8 white, 5, 0, 2/1 gray)\n11@2.9.7.11\n",
+    "categories": ["MOS", "equal temperament"]
   },
   "13glacial7": {
     "name": "13edo glacial[7]",
-    "lines": ["2\\13", "4\\13", "6\\13", "8\\13", "10\\13", "12\\13", "13\\13"],
-    "categories": ["MOS", "equal temperament"],
-    "keyColors": ["black", "white", "white", "white", "white", "white", "white"]
+    "source": "rank2(11/10 white, 6, 0, 2/1 gray)\n13@2.9.5.11.13\n",
+    "categories": ["MOS", "equal temperament"]
   },
-  "13father8": {
-    "name": "13edo father[8]",
-    "lines": ["2\\13", "4\\13", "5\\13", "7\\13", "9\\13", "10\\13", "12\\13", "13\\13"],
-    "categories": ["MOS", "equal temperament"],
-    "keyColors": ["black", "white", "white", "black", "white", "white", "black", "white"]
+  "13oneirotonic": {
+    "name": "13edo oneirotonic (5L 3s)",
+    "source": "mos(5, 3)\nlabel([white, black, white, white, black, white, black, white])\n",
+    "categories": ["MOS", "equal temperament"]
   },
   "15blackwood10": {
     "name": "15edo blackwood[10]",
-    "lines": [
-      "2\\15",
-      "3\\15",
-      "5\\15",
-      "6\\15",
-      "8\\15",
-      "9\\15",
-      "11\\15",
-      "12\\15",
-      "14\\15",
-      "15\\15"
-    ],
-    "categories": ["MOS", "equal temperament"],
-    "keyColors": ["white", "black"]
+    "source": "rank2(5/1 black, 5, 0, 1\\5 white, 5)\n15@\n",
+    "categories": ["MOS", "equal temperament"]
   },
   "16mavila7": {
     "name": "16edo mavila[7]",
-    "lines": ["2\\16", "4\\16", "7\\16", "9\\16", "11\\16", "13\\16", "16\\16"],
-    "categories": ["MOS", "equal temperament"],
-    "keyColors": ["white", "white", "black", "white", "white", "white", "black"]
+    "source": "rank2(3/2 white, 5, 1, 2/1 gray)\n16@",
+    "categories": ["MOS", "equal temperament"]
   },
   "17superpyth12": {
     "name": "17edo superpyth[12]",
-    "lines": [
-      "1\\17",
-      "2\\17",
-      "4\\17",
-      "5\\17",
-      "7\\17",
-      "8\\17",
-      "9\\17",
-      "11\\17",
-      "12\\17",
-      "14\\17",
-      "15\\17",
-      "17\\17"
-    ],
+    "source": "[3^i rdc 2 for i of concat([0 white..6], [7 black..11])]\nlabel(['F', 'C', 'G', 'D', 'A', 'E', 'B', 'F♯', 'C♯', 'G♯', 'D♯', 'A♯'])\nsort()\n17@",
     "categories": ["MOS", "equal temperament"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black"
-    ]
+    "baseMidiNote": 65,
+    "baseFrequency": 349
   },
   "17rast": {
     "name": "17edo Rast",
-    "lines": ["3\\17", "5\\17", "7\\17", "10\\17", "13\\17", "15\\17", "17\\17"],
-    "categories": ["equal temperament"],
-    "keyColors": ["white", "white", "black", "white", "white", "white", "black"]
+    "source": "M2 white\nn3 gray\nP4 white\nP5 white\nM6 white\nn7 gray\nP8 white\nlabel(map(str))\n17@\n",
+    "categories": ["MOS", "equal temperament"]
   },
   "22porcupine8": {
     "name": "22edo porcupine[8]",
-    "lines": ["3\\22", "6\\22", "9\\22", "12\\22", "15\\22", "18\\22", "21\\22", "22\\22"],
-    "categories": ["MOS", "equal temperament"],
-    "keyColors": ["black", "white", "white", "white", "white", "white", "white", "white"]
+    "source": "rank2(27/25 white, 7, 0, 2/1 gray)\n22@\n",
+    "categories": ["MOS", "equal temperament"]
   },
   "22orwell9": {
     "name": "22edo orwell[9]",
-    "lines": [
-      "2\\22",
-      "5\\22",
-      "7\\22",
-      "10\\22",
-      "12\\22",
-      "15\\22",
-      "17\\22",
-      "20\\22",
-      "22\\22"
-    ],
-    "categories": ["MOS", "equal temperament"],
-    "keyColors": ["white", "black", "white", "black", "white", "black", "white", "black", "white"]
+    "source": "rank2(7/6, 4, 4)\nlabel([black, white, black, white, white, black, white, black, white])\n22@\n",
+    "categories": ["MOS", "equal temperament"]
   },
   "22pajara12": {
     "name": "22edo pajara[12]",
-    "lines": [
-      "2\\22",
-      "4\\22",
-      "6\\22",
-      "8\\22",
-      "10\\22",
-      "11\\22",
-      "13\\22",
-      "15\\22",
-      "17\\22",
-      "19\\22",
-      "21\\22",
-      "22\\22"
-    ],
-    "categories": ["MOS", "equal temperament"],
-    "keyColors": ["black", "white", "white", "white", "white", "white"]
+    "source": "rank2(3/2 white, 10, 0, 1\\2 gray, 2)\n22@\n",
+    "categories": ["MOS", "equal temperament"]
   },
   "26lemba10": {
     "name": "26edo lemba[10]",
-    "lines": [
-      "3\\26",
-      "5\\26",
-      "8\\26",
-      "10\\26",
-      "13\\26",
-      "16\\26",
-      "18\\26",
-      "21\\26",
-      "23\\26",
-      "26\\26"
-    ],
-    "categories": ["MOS", "equal temperament"],
-    "keyColors": ["white", "white", "black", "white", "black"]
+    "source": "rank2(8/7 white, 4, 4, 7/5 gray, 2)\n26@",
+    "categories": ["MOS", "equal temperament"]
   },
   "26flattone12": {
     "name": "26edo flattone[12]",
-    "lines": [
-      "1\\26",
-      "4\\26",
-      "5\\26",
-      "8\\26",
-      "11\\26",
-      "12\\26",
-      "15\\26",
-      "16\\26",
-      "19\\26",
-      "22\\26",
-      "23\\26",
-      "26\\26"
-    ],
+    "source": "C=4 = 265 Hz\nC#4 black\nD=4 white\nD#4 black\nE=4 white\nF=4 white\nF#4 black\nG=4 white\nG#4 black\nA=4 white\nBb4 black\nB=4 white\nC=5 white\nlabel(map(i => str(i)[..1]))\n26@\n",
     "categories": ["MOS", "equal temperament"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black"
-    ],
     "baseMidiNote": 60,
     "baseFrequency": 265
   },
   "31meantone19": {
     "name": "31edo meantone[19]",
-    "lines": [
-      "1\\31",
-      "3\\31",
-      "4\\31",
-      "6\\31",
-      "8\\31",
-      "9\\31",
-      "11\\31",
-      "13\\31",
-      "14\\31",
-      "16\\31",
-      "17\\31",
-      "19\\31",
-      "21\\31",
-      "22\\31",
-      "24\\31",
-      "26\\31",
-      "27\\31",
-      "29\\31",
-      "31\\31"
-    ],
-    "categories": ["MOS", "equal temperament"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white"
-    ]
+    "source": "A♮4 = 440 Hz\nA♯4 navy\nB♭4 maroon\nB♮4 white\nC♭5 maroon\nC♮5 white\nC♯5 navy\nD♭5 maroon\nD♮5 white\nD♯5 navy\nE♭5 maroon\nE♮5 white\nE♯5 navy\nF♮5 white\nF♯5 navy\nG♭5 maroon\nG♮5 white\nG♯5 navy\nA♭5 maroon\nA♮5 white\nlabel(map(i => str(i)[..1]))\n31@\n",
+    "categories": ["MOS", "equal temperament"]
   },
   "46sensi11": {
     "name": "46edo sensi[11]",
-    "lines": [
-      "5\\46",
-      "10\\46",
-      "15\\46",
-      "17\\46",
-      "22\\46",
-      "27\\46",
-      "32\\46",
-      "34\\46",
-      "39\\46",
-      "44\\46",
-      "46\\46"
-    ],
-    "categories": ["MOS", "equal temperament"],
-    "keyColors": [
-      "black",
-      "white",
-      "white",
-      "white",
-      "black",
-      "white",
-      "white",
-      "white",
-      "black",
-      "white",
-      "white"
-    ]
+    "source": "rank2(9/7, 10)\nlabel([white, white, black, white, white, white, black, white, white, black, white])\n46@",
+    "categories": ["MOS", "equal temperament"]
   },
   "362barbados9": {
     "name": "362edo barbados[9]",
-    "lines": [
-      "62\\362",
-      "75\\362",
-      "137\\362",
-      "150\\362",
-      "212\\362",
-      "225\\362",
-      "287\\362",
-      "300\\362",
-      "362\\362"
-    ],
-    "categories": ["MOS", "equal temperament"],
-    "keyColors": ["white", "white", "black", "white", "black", "white", "black", "white", "black"]
+    "source": "rank2(15/13 white, 4, 4, 2/1 gray)\n362@",
+    "categories": ["MOS", "equal temperament"]
   },
   "bohlenpierceeq": {
     "name": "Bohlen-Pierce equal (13ed3)",
-    "lines": [
-      "1\\13<3>",
-      "2\\13<3>",
-      "3\\13<3>",
-      "4\\13<3>",
-      "5\\13<3>",
-      "6\\13<3>",
-      "7\\13<3>",
-      "8\\13<3>",
-      "9\\13<3>",
-      "10\\13<3>",
-      "11\\13<3>",
-      "12\\13<3>",
-      "13\\13<3>"
-    ],
-    "categories": ["non-octave", "equal temperament"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "white",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white"
-    ]
+    "source": "27/25 black 'C♯/D♭'\n25/21 white 'D'\n9/7 white 'E'\n7/5 white 'F'\n75/49 black 'F♯/G♭'\n5/3 white 'G'\n9/5 white 'H'\n49/25 black 'H♯/J♭'\n15/7 white 'J'\n7/3 white 'A'\n63/25 black 'A♯/B♭'\n25/9 white 'B'\n3/1 white 'C'\nb13@\n",
+    "categories": ["non-octave", "equal temperament"]
   },
   "bohlenpierceji": {
     "name": "Bohlen-Pierce just",
-    "lines": [
-      "27/25",
-      "25/21",
-      "9/7",
-      "7/5",
-      "75/49",
-      "5/3",
-      "9/5",
-      "49/25",
-      "15/7",
-      "7/3",
-      "63/25",
-      "25/9",
-      "3/1"
-    ],
-    "categories": ["non-octave", "just intonation"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "white",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white"
-    ]
+    "source": "27/25 black 'C♯/D♭'\n25/21 white 'D'\n9/7 white 'E'\n7/5 white 'F'\n75/49 black 'F♯/G♭'\n5/3 white 'G'\n9/5 white 'H'\n49/25 black 'H♯/J♭'\n15/7 white 'J'\n7/3 white 'A'\n63/25 black 'A♯/B♭'\n25/9 white 'B'\n3/1 white 'C'\n",
+    "categories": ["non-octave", "just intonation"]
   },
   "carlosalpha": {
     "name": "Wendy Carlos Alpha",
-    "lines": ["78.", "156.", "234.", "312.", "390.", "468.", "546.", "624.", "702."],
-    "categories": ["non-octave", "equal temperament"],
-    "keyColors": ["white", "white", "white", "black", "white", "white", "white", "white", "black"]
+    "source": "78.\nrepeat(9)\nlabel([black, black, black, white, white, black, black, black, white])\n",
+    "categories": ["non-octave", "equal temperament"]
   },
   "carlosbeta": {
     "name": "Wendy Carlos Beta",
-    "lines": [
-      "63.8",
-      "127.6",
-      "191.4",
-      "255.2",
-      "319.0",
-      "382.8",
-      "446.6",
-      "510.4",
-      "574.2",
-      "638.0",
-      "701.8"
-    ],
-    "categories": ["non-octave", "equal temperament"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white"
-    ]
+    "source": "63.8\nrepeat(11)\nlabel([black, black, white, black, white, white, black, white, black, black, white])\n",
+    "categories": ["non-octave", "equal temperament"]
   },
   "carlosgamma": {
     "name": "Wendy Carlos Gamma",
-    "lines": [
-      "35.1",
-      "70.2",
-      "105.3",
-      "140.4",
-      "175.5",
-      "210.6",
-      "245.7",
-      "280.8",
-      "315.9",
-      "351.0",
-      "386.1",
-      "421.2",
-      "456.3",
-      "491.4",
-      "526.5",
-      "561.6",
-      "596.7",
-      "631.8",
-      "666.9",
-      "702.0"
-    ],
-    "categories": ["non-octave", "equal temperament"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black"
-    ]
+    "source": "35.1\nrepeat(20)\nlabel([black, black, gray, black, black, white, black, black, white, black, white, black, black, white, black, black, gray, black, black, white])\n",
+    "categories": ["non-octave", "equal temperament"]
   },
   "65cet": {
     "name": "65 cent Equal Temperament",
-    "lines": ["65.0"],
-    "categories": ["non-octave", "equal temperament"],
-    "keyColors": ["white"]
+    "source": "65.0 white",
+    "categories": ["non-octave", "equal temperament"]
   },
   "88cet": {
     "name": "88 cent Equal Temperament",
-    "lines": ["88.0"],
-    "categories": ["non-octave", "equal temperament"],
-    "keyColors": ["white"]
+    "source": "88.0 white",
+    "categories": ["non-octave", "equal temperament"]
   },
   "blackdye": {
     "title": "Blackdye GO",
     "name": "Blackdye",
-    "lines": [
-      "1\\27",
-      "5\\27",
-      "7\\27",
-      "11\\27",
-      "12\\27",
-      "16\\27",
-      "18\\27",
-      "22\\27",
-      "23\\27",
-      "27\\27"
-    ],
-    "categories": ["GO", "MV4", "equal temperament"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "white",
-      "white",
-      "black",
-      "white"
-    ]
+    "source": "rank2(3/2 black, 4, 0, 2/1 black)\nmergeOffset(10/9 white)\nrotate(3)\n27@",
+    "categories": ["GO", "MV4", "equal temperament"]
   },
   "diasem": {
     "title": "Diasem MV3 GO",
     "name": "Diasem",
-    "lines": [
-      "2\\31",
-      "7\\31",
-      "8\\31",
-      "13\\31",
-      "15\\31",
-      "20\\31",
-      "21\\31",
-      "26\\31",
-      "31\\31"
-    ],
+    "source": "gs([7/6 white, 8/7 white], 9, 2/1 gray)\n31@",
     "categories": ["MV3", "GO", "equal temperament"],
-    "keyColors": ["white", "white", "black", "white", "white", "white", "black", "white", "white"],
     "baseMidiNote": 71,
     "baseFrequency": 493
   },
   "zarlino": {
     "title": "Zarlino MV3 GO",
     "name": "Zarlino",
-    "lines": ["5\\29", "9\\29", "14\\29", "17\\29", "22\\29", "26\\29", "29\\29"],
+    "source": "gs([5/4 white, 6/5 white], 7, 2/1 gray)\n29@",
     "categories": ["MV3", "GO", "equal temperament"],
-    "keyColors": ["gray", "white", "white", "white", "white", "white", "white"],
     "baseMidiNote": 65,
     "baseFrequency": 355
   },
   "superzarlino": {
     "title": "Superzarlino MV3 GO",
     "name": "Superzarlino",
-    "lines": [
-      "3\\34",
-      "4\\34",
-      "6\\34",
-      "9\\34",
-      "11\\34",
-      "12\\34",
-      "15\\34",
-      "17\\34",
-      "18\\34",
-      "20\\34",
-      "23\\34",
-      "24\\34",
-      "26\\34",
-      "29\\34",
-      "31\\34",
-      "32\\34",
-      "34\\34"
-    ],
-    "categories": ["MV3", "GO", "equal temperament"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "gray",
-      "white",
-      "black",
-      "gray",
-      "white",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "gray",
-      "white"
-    ]
+    "source": "gs([5/4, 6/5], 17)\nlabel([black, black, white, black, white, black, black, white, black, white, black, black, white, black, white, black, white])\n34@",
+    "categories": ["MV3", "GO", "equal temperament"]
   },
   "marveldene": {
     "title": "Marveldene TE",
     "name": "The Marveldene, a 2.3.5.7 classic. Septimal Aeolian minor oriented.",
-    "lines": [
-      "116.01264",
-      "232.02527",
-      "316.92766",
-      "432.94029",
-      "499.84142",
-      "615.85405",
-      "700.75644",
-      "816.76907",
-      "932.78170",
-      "999.68282",
-      "1133.69672",
-      "1200.59784"
-    ],
-    "categories": ["TE", "rank 3"],
-    "keyColors": [
-      "white",
-      "gray",
-      "black",
-      "gray",
-      "black",
-      "white",
-      "gray",
-      "white",
-      "gray",
-      "black",
-      "white",
-      "black"
-    ]
+    "source": "eulerGenus(675 white, 15, 2 gray)\nPrimeMapping(1200.5978, 1901.3543, 2785.0245, 3369.7682)\n",
+    "categories": ["TE", "rank 3"]
   },
   "meantone": {
     "title": "Meantone CTE",
     "name": "Meantone[12], TE optimized with a 2/1 constraint.",
-    "lines": [
-      "113.9284",
-      "194.4286",
-      "308.3571",
-      "388.8573",
-      "502.7857",
-      "583.2859",
-      "697.2143",
-      "811.1427",
-      "891.6429",
-      "1005.5713",
-      "1086.0716",
-      "1200.0000"
-    ],
-    "categories": ["MOS", "CTE", "rank 2"],
-    "keyColors": [
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black",
-      "white",
-      "white",
-      "black",
-      "white",
-      "black"
-    ]
+    "source": "A♮4 = 440Hz\nB♭4 black\nB♮4 white\nC♮5 white\nC♯5 black\nD♮5 white\nE♭5 black\nE♮5 white\nF♮5 white\nF♯5 black\nG♮5 white\nG♯5 black\nA♮5 white\nlabel(map(i => str(i)[..1]))\nPrimeMapping(1200.000, 1897.214, 2788.857)\n",
+    "categories": ["MOS", "CTE", "rank 2"]
   },
   "orgone": {
     "title": "Orgone POTE",
     "name": "Orgone[7], a 2.7.11 classic. POTE optimized.",
-    "lines": ["229.8849", "323.3717", "553.2566", "646.7434", "876.6283", "970.1151", "1200.0000"],
-    "categories": ["MOS", "POTE", "rank 2"],
-    "keyColors": ["white", "white", "black", "white", "black", "white", "black"]
+    "source": "rank2(77/64 white, 3, 3, 2/1 gray)\nPrimeMapping(1200.000, niente, niente, 3370.115, 4153.257)\n",
+    "categories": ["MOS", "POTE", "rank 2"]
   }
 }
diff --git a/src/presets.ts b/src/presets.ts
index b260cd94..f2c15a27 100644
--- a/src/presets.ts
+++ b/src/presets.ts
@@ -1,9 +1,8 @@
-import { autoKeyColors } from '@/utils'
 import PRESETS from '@/presets.json'
 
 type PresetFragment = {
   name: string
-  lines: string[]
+  source: string
   categories: string[]
   title?: string
   baseFrequency?: number
@@ -14,11 +13,10 @@ export type Preset = {
   name: string
   title: string
   id: string
-  lines: string[]
+  source: string
   categories: string[]
   baseFrequency: number
   baseMidiNote: number
-  keyColors: string[]
 }
 
 export type PresetGroup = {
@@ -27,13 +25,14 @@ export type PresetGroup = {
 }
 
 function normalized(id: string): Preset {
-  const result: any = Object.assign({}, (PRESETS as { [key: string]: PresetFragment })[id])
+  const result: any = Object.assign(
+    {},
+    (PRESETS as unknown as { [key: string]: PresetFragment })[id]
+  )
   result.id = id
   result.title = result.title || result.name
   result.baseFrequency = result.baseFrequency || 440
   result.baseMidiNote = result.baseMidiNote === undefined ? 69 : result.baseMidiNote
-  result.keyColors =
-    result.keyColors === undefined ? autoKeyColors(result.lines.length) : result.keyColors
   return result
 }
 
diff --git a/src/scale-workshop-one.ts b/src/scale-workshop-one.ts
index 1086f624..6a903334 100644
--- a/src/scale-workshop-one.ts
+++ b/src/scale-workshop-one.ts
@@ -1,5 +1,5 @@
 import { DEFAULT_NUMBER_OF_COMPONENTS, NEWLINE_TEST, UNIX_NEWLINE } from '@/constants'
-import { getLineType, LINE_TYPE, parseLine, Scale, type Interval } from 'scale-workshop-core'
+import { Interval, parseScaleWorkshop2Line } from 'sonic-weave'
 
 // decodes HTML entities
 function decodeHTML(input: string): string {
@@ -111,14 +111,9 @@ export class ScaleWorkshopOneData {
       if (!line.length) {
         return
       }
-      const lineType = getLineType(line)
-      if (lineType === LINE_TYPE.INVALID) {
-        throw new Error(`Failed to parse line ${line}`)
-      }
-      intervals.push(parseLine(line, DEFAULT_NUMBER_OF_COMPONENTS))
+      intervals.push(parseScaleWorkshop2Line(line, DEFAULT_NUMBER_OF_COMPONENTS))
     })
-    const scale = Scale.fromIntervalArray(intervals, this.freq)
-    return scale
+    return intervals
   }
 
   get attackTime() {
diff --git a/src/scale.ts b/src/scale.ts
new file mode 100644
index 00000000..bc4c424c
--- /dev/null
+++ b/src/scale.ts
@@ -0,0 +1,111 @@
+import { mmod, valueToCents } from 'xen-dev-utils'
+
+/** Musical scale designed to calculate frequencies repeated at octaves or generic equaves. */
+export class Scale {
+  intervalRatios: number[]
+  baseFrequency: number
+  baseMidiNote: number
+
+  /**
+   * Construct a new musical scale.
+   * @param intervalRatios Intervals of the scale excluding 1/1, ending with the interval of equivalence.
+   * @param baseFrequency Base frequency of 1/1.
+   * @param baseMidiNote MIDI note corresponfing to base frequency
+   */
+  constructor(intervalRatios: number[], baseFrequency: number, baseMidiNote: number) {
+    this.intervalRatios = intervalRatios
+    this.baseFrequency = baseFrequency
+    this.baseMidiNote = baseMidiNote
+  }
+
+  /** Number of intervals in the scale. */
+  get size() {
+    return this.intervalRatios.length
+  }
+
+  get equaveRatio() {
+    return this.intervalRatios[this.intervalRatios.length - 1]
+  }
+
+  get equaveCents() {
+    return valueToCents(this.equaveRatio)
+  }
+
+  /**
+   * Obtain the ratio agains the base MIDI note.
+   * @param index MIDI index of a note.
+   * @returns Ratio associated with the MIDI index.
+   */
+  getRatio(index: number) {
+    // Deal with implicit 1/1
+    index -= 1
+    // Center on base MIDI note
+    index -= this.baseMidiNote
+
+    const baseIndex = mmod(index, this.size)
+    const numEquaves = (index - baseIndex) / this.size
+    return this.intervalRatios[baseIndex] * this.equaveRatio ** numEquaves
+  }
+
+  /**
+   * Obtain the frequency of an interval in the scale (repeats at equaves).
+   * @param index MIDI index of a note.
+   * @returns The frequency of an interval in the scale with equaves factored in as necessary.
+   */
+  getFrequency(index: number) {
+    return this.baseFrequency * this.getRatio(index)
+  }
+
+  /**
+   * Obtain a range of frequencies in the scale.
+   * More efficient to compute than getting individual frequencies.
+   * @param start The MIDI index of the lowest note to include.
+   * @param end The MIDI index of the end point (`end` itself not included in the result).
+   * @returns An array of frequencies corresponding to the specified range.
+   */
+  getFrequencyRange(start: number, end: number) {
+    // Deal with implicit 1/1
+    start -= 1
+    end -= 1
+    // Center on base MIDI note
+    start -= this.baseMidiNote
+    end -= this.baseMidiNote
+    const numEquaves = Math.floor(start / this.size)
+    let referenceFrequency = this.baseFrequency * this.equaveRatio ** numEquaves
+    let index = start - numEquaves * this.size
+    const result = []
+    for (let i = start; i < end; ++i) {
+      result.push(referenceFrequency * this.intervalRatios[index])
+      index++
+      if (index >= this.size) {
+        index -= this.size
+        referenceFrequency *= this.equaveRatio
+      }
+    }
+    return result
+  }
+
+  getCentsRange(start: number, end: number) {
+    // Deal with implicit 1/1
+    start -= 1
+    end -= 1
+    // Center on base MIDI note
+    start -= this.baseMidiNote
+    end -= this.baseMidiNote
+    const equaveCents = this.equaveCents
+    const intervalCents = this.intervalRatios.map(valueToCents)
+    const numEquaves = Math.floor(start / this.size)
+    let referenceCents = this.equaveCents * numEquaves
+    let index = start - numEquaves * this.size
+    const result = []
+    for (let i = start; i < end; ++i) {
+      result.push(referenceCents + intervalCents[index])
+      index++
+      if (index >= this.size) {
+        index -= this.size
+        referenceCents += equaveCents
+      }
+    }
+    return result
+  }
+}
diff --git a/src/stores/audio.ts b/src/stores/audio.ts
index b7ee2f93..00e710e0 100644
--- a/src/stores/audio.ts
+++ b/src/stores/audio.ts
@@ -1,19 +1,72 @@
-import { computed, ref, watch } from 'vue'
+import { computed, ref, watch, type Ref } from 'vue'
 import { defineStore } from 'pinia'
-import { Synth, initializeCustomWaveforms, PingPongDelay } from '../synth'
+import {
+  APERIODIC_WAVEFORMS,
+  APERIODIC_WAVES,
+  BASIC_WAVEFORMS,
+  CUSTOM_WAVEFORMS,
+  initializeCustomWaves,
+  PERIODIC_WAVES,
+  PingPongDelay
+} from '../synth'
 import { VirtualSynth } from '../virtual-synth'
+import {
+  AperiodicSynth,
+  Synth,
+  UnisonSynth,
+  type OscillatorVoiceParams,
+  type UnisonVoiceParams,
+  type VoiceBaseParams,
+  type AperiodicVoiceParams,
+  AperiodicWave
+} from 'sw-synth'
 
-export const useAudioStore = defineStore('audio', () => {
+// The compiler chokes on this store so we need an explicit type annotation
+type AudioStore = {
+  initialize: () => void
+  unintialize: () => Promise<void>
+  context: Ref<AudioContext>
+  mainVolume: Ref<number>
+  waveform: Ref<string>
+  attackTime: Ref<number>
+  decayTime: Ref<number>
+  sustainLevel: Ref<number>
+  releaseTime: Ref<number>
+  stackSize: Ref<number>
+  spread: Ref<number>
+  aperiodicWaveform: Ref<string>
+  audioDelay: Ref<number>
+  maxPolyphony: Ref<number>
+  synth: Ref<Synth | UnisonSynth | AperiodicSynth | null>
+  synthType: Ref<'none' | 'oscillator' | 'unison' | 'aperiodic'>
+  virtualSynth: Ref<VirtualSynth>
+  pingPongDelay: Ref<PingPongDelay>
+  pingPongDelayTime: Ref<number>
+  pingPongFeedback: Ref<number>
+  pingPongGain: Ref<number>
+  pingPongSeparation: Ref<number>
+  mainGain: Ref<GainNode>
+  mainLowpass: Ref<BiquadFilterNode>
+  mainHighpass: Ref<BiquadFilterNode>
+}
+
+export const useAudioStore = defineStore<'audio', AudioStore>('audio', () => {
   const context = ref<AudioContext | null>(null)
   // Chromium has some issues with audio nodes as props
   // so we need this extra ref and the associated watcher.
-  const mainVolume = ref(0.175)
+  const mainVolume = ref(0.18)
   // Protect the user's audio system by limiting
   // the gain and frequency response.
   const mainGain = ref<GainNode | null>(null)
   const mainLowpass = ref<BiquadFilterNode | null>(null)
   const mainHighpass = ref<BiquadFilterNode | null>(null)
-  const synth = ref<Synth | null>(null)
+  const synth = ref<Synth | UnisonSynth | AperiodicSynth | null>(null)
+  const synthType = ref<'none' | 'oscillator' | 'unison' | 'aperiodic'>('none')
+
+  // One of these gets swapped in the ref.
+  let oscillatorSynth: Synth
+  let unisonSynth: UnisonSynth
+  let aperiodicSynth: AperiodicSynth
 
   // Synth params
   const waveform = ref('semisine')
@@ -21,6 +74,9 @@ export const useAudioStore = defineStore('audio', () => {
   const decayTime = ref(0.3)
   const sustainLevel = ref(0.8)
   const releaseTime = ref(0.01)
+  const stackSize = ref(3)
+  const spread = ref(2.5)
+  const aperiodicWaveform = ref('steel')
   // Fix Firefox issues with audioContext.currentTime being in the past using a delay.
   // This is a locally stored user preference, but shown on the Synth tab.
   const audioDelay = ref(0.001)
@@ -47,6 +103,31 @@ export const useAudioStore = defineStore('audio', () => {
     }
   }
 
+  const _voiceBase: VoiceBaseParams = {
+    audioDelay: audioDelay.value,
+    attackTime: attackTime.value,
+    decayTime: decayTime.value,
+    sustainLevel: sustainLevel.value,
+    releaseTime: releaseTime.value
+  }
+
+  const oscillatorVoiceParams: OscillatorVoiceParams = {
+    ..._voiceBase,
+    type: 'triangle',
+    periodicWave: undefined
+  }
+
+  const unisonVoiceParams: UnisonVoiceParams = {
+    ...oscillatorVoiceParams,
+    spread: spread.value,
+    stackSize: stackSize.value
+  }
+
+  const aperiodicVoiceParams: AperiodicVoiceParams = {
+    ..._voiceBase,
+    aperiodicWave: null as unknown as AperiodicWave // Pacifies the type checker. Set properly during init.
+  }
+
   const maxPolyphony = computed({
     get() {
       if (synth.value === null) {
@@ -112,19 +193,29 @@ export const useAudioStore = defineStore('audio', () => {
     // Intended point of audio connection
     const audioDestination = highpass
 
-    initializeCustomWaveforms(context.value)
+    initializeCustomWaves(context.value)
+
+    oscillatorVoiceParams.type = 'custom'
+    oscillatorVoiceParams.periodicWave = PERIODIC_WAVES['semisine'].value
+    unisonVoiceParams.type = 'custom'
+    unisonVoiceParams.periodicWave = PERIODIC_WAVES['semisine'].value
+    aperiodicVoiceParams.aperiodicWave = APERIODIC_WAVES['steel'].value
+
+    // These all should start with polyphony 0 to save resources
+    oscillatorSynth = new Synth(context.value, audioDestination)
+    unisonSynth = new UnisonSynth(context.value, audioDestination)
+    aperiodicSynth = new AperiodicSynth(context.value, audioDestination)
+
+    // The content of these references will be manipulated in-place
+    oscillatorSynth.voiceParams = oscillatorVoiceParams
+    unisonSynth.voiceParams = unisonVoiceParams
+    aperiodicSynth.voiceParams = aperiodicVoiceParams
 
-    synth.value = new Synth(
-      context.value,
-      audioDestination,
-      audioDelay.value,
-      waveform.value,
-      attackTime.value,
-      decayTime.value,
-      sustainLevel.value,
-      releaseTime.value,
-      maxPolyphony.value
-    )
+    const storedMaxPolyphony = maxPolyphony.value
+
+    synthType.value = 'oscillator'
+    synth.value = oscillatorSynth
+    synth.value.maxPolyphony = storedMaxPolyphony
 
     virtualSynth.value = new VirtualSynth(context.value)
   }
@@ -158,45 +249,92 @@ export const useAudioStore = defineStore('audio', () => {
 
   watch(audioDelay, (newValue) => {
     window.localStorage.setItem('audioDelay', newValue.toString())
-    if (!synth.value) {
-      return
+    oscillatorVoiceParams.audioDelay = newValue
+    unisonVoiceParams.audioDelay = newValue
+    aperiodicVoiceParams.audioDelay = newValue
+  })
+
+  watch(synthType, (newValue) => {
+    const storedMaxPolyphony = maxPolyphony.value
+    switch (newValue) {
+      case 'none':
+        synth.value = null
+        oscillatorSynth.maxPolyphony = 0
+        unisonSynth.maxPolyphony = 0
+        aperiodicSynth.maxPolyphony = 0
+        break
+      case 'oscillator':
+        synth.value = oscillatorSynth
+        oscillatorSynth.maxPolyphony = storedMaxPolyphony
+        unisonSynth.maxPolyphony = 0
+        aperiodicSynth.maxPolyphony = 0
+        break
+      case 'unison':
+        synth.value = unisonSynth
+        oscillatorSynth.maxPolyphony = 0
+        unisonSynth.maxPolyphony = storedMaxPolyphony
+        aperiodicSynth.maxPolyphony = 0
+        break
+      case 'aperiodic':
+        synth.value = aperiodicSynth
+        oscillatorSynth.maxPolyphony = 0
+        unisonSynth.maxPolyphony = 0
+        aperiodicSynth.maxPolyphony = storedMaxPolyphony
+        break
     }
-    synth.value.audioDelay = newValue
   })
 
   watch(waveform, (newValue) => {
-    if (!synth.value) {
-      return
+    if (BASIC_WAVEFORMS.includes(newValue)) {
+      oscillatorVoiceParams.type = unisonVoiceParams.type = newValue as any
+      oscillatorVoiceParams.periodicWave = unisonVoiceParams.periodicWave = undefined
+    } else if (CUSTOM_WAVEFORMS.includes(newValue)) {
+      oscillatorVoiceParams.type = unisonVoiceParams.type = 'custom'
+      oscillatorVoiceParams.periodicWave = unisonVoiceParams.periodicWave =
+        PERIODIC_WAVES[newValue].value
     }
-    synth.value.waveform = newValue
   })
 
-  watch(attackTime, (newValue) => {
-    if (!synth.value) {
-      return
+  watch(aperiodicWaveform, (newValue) => {
+    if (APERIODIC_WAVEFORMS.includes(newValue)) {
+      aperiodicVoiceParams.aperiodicWave = APERIODIC_WAVES[newValue].value
     }
-    synth.value.attackTime = newValue
+  })
+
+  watch(attackTime, (newValue) => {
+    oscillatorVoiceParams.attackTime =
+      unisonVoiceParams.attackTime =
+      aperiodicVoiceParams.attackTime =
+        newValue
   })
 
   watch(decayTime, (newValue) => {
-    if (!synth.value) {
-      return
-    }
-    synth.value.decayTime = newValue
+    oscillatorVoiceParams.decayTime =
+      unisonVoiceParams.decayTime =
+      aperiodicVoiceParams.decayTime =
+        newValue
   })
 
   watch(sustainLevel, (newValue) => {
-    if (!synth.value) {
-      return
-    }
-    synth.value.sustainLevel = newValue
+    oscillatorVoiceParams.sustainLevel =
+      unisonVoiceParams.sustainLevel =
+      aperiodicVoiceParams.sustainLevel =
+        newValue
   })
 
   watch(releaseTime, (newValue) => {
-    if (!synth.value) {
-      return
-    }
-    synth.value.releaseTime = newValue
+    oscillatorVoiceParams.releaseTime =
+      unisonVoiceParams.releaseTime =
+      aperiodicVoiceParams.releaseTime =
+        newValue
+  })
+
+  watch(stackSize, (newValue) => {
+    unisonVoiceParams.stackSize = newValue
+  })
+
+  watch(spread, (newValue) => {
+    unisonVoiceParams.spread = newValue
   })
 
   // Ping pong delay parameter watchers
@@ -238,9 +376,13 @@ export const useAudioStore = defineStore('audio', () => {
     decayTime,
     sustainLevel,
     releaseTime,
+    stackSize,
+    spread,
+    aperiodicWaveform,
     audioDelay,
     maxPolyphony,
     synth,
+    synthType,
     virtualSynth,
     pingPongDelay,
     pingPongDelayTime,
@@ -252,5 +394,5 @@ export const useAudioStore = defineStore('audio', () => {
     mainGain,
     mainLowpass,
     mainHighpass
-  }
+  } as AudioStore
 })
diff --git a/src/stores/grid.ts b/src/stores/grid.ts
new file mode 100644
index 00000000..3624b7d0
--- /dev/null
+++ b/src/stores/grid.ts
@@ -0,0 +1,248 @@
+import { computed, ref } from 'vue'
+import { defineStore } from 'pinia'
+import { shortestEdge, type GridOptions } from 'ji-lattice'
+import { LOG_PRIMES, mmod } from 'xen-dev-utils'
+import { Val, evaluateExpression, parseChord } from 'sonic-weave'
+import { computedAndError } from '@/utils'
+
+const TWELVE = evaluateExpression('12@', false) as Val
+
+export const useGridStore = defineStore('grid', () => {
+  // View
+  const size = ref(0.15)
+  const viewCenterX = ref(0)
+  const viewCenterY = ref(-0.1)
+  const viewScale = ref(2.5)
+  const labelOffset = ref(2)
+  const showLabels = ref(true)
+
+  // Elements
+  const valString = ref('12p')
+  const edgesString = ref('')
+
+  const delta1 = ref(7)
+  const delta1X = ref(1)
+  const delta1Y = ref(0)
+  const delta2 = ref(4)
+  const delta2X = ref(0)
+  const delta2Y = ref(-1)
+  const minX = ref(-3.1)
+  const maxX = ref(3.1)
+  const minY = ref(-2.1)
+  const maxY = ref(2.1)
+  const gridlines1 = ref(true)
+  const gridlines2 = ref(true)
+  const diagonals1 = ref(false)
+  const diagonals2 = ref(false)
+
+  const val = computed<Val>(() => {
+    try {
+      const val = evaluateExpression(valString.value)
+      if (val instanceof Val) {
+        return val
+      }
+    } catch {
+      /* empty */
+    }
+    try {
+      const val = evaluateExpression(valString.value.trim() + '@')
+      if (val instanceof Val) {
+        return val
+      }
+    } catch {
+      /* empty */
+    }
+    return TWELVE
+  })
+
+  const modulus = computed(() => val.value.divisions.round().valueOf())
+
+  const [edges, edgesError] = computedAndError(() => {
+    return parseChord(edgesString.value)
+  }, [])
+
+  const edgeVectors = computed(() => {
+    const options: GridOptions = {
+      modulus: modulus.value,
+      delta1: delta1.value,
+      delta1X: delta1X.value,
+      delta1Y: delta1Y.value,
+      delta2: delta2.value,
+      delta2X: delta2X.value,
+      delta2Y: delta2Y.value,
+      minX: minX.value,
+      maxX: maxX.value,
+      minY: minY.value,
+      maxY: maxY.value
+    }
+
+    const result: number[][] = []
+    try {
+      for (const edge of edges.value) {
+        const step = edge.dot(val.value).valueOf()
+        result.push(shortestEdge(step, options))
+      }
+    } catch {
+      return []
+    }
+
+    return result
+  })
+
+  const gridOptions = computed<GridOptions>(() => {
+    return {
+      modulus: modulus.value,
+      delta1: delta1.value,
+      delta1X: delta1X.value,
+      delta1Y: delta1Y.value,
+      delta2: delta2.value,
+      delta2X: delta2X.value,
+      delta2Y: delta2Y.value,
+      minX: minX.value,
+      maxX: maxX.value,
+      minY: minY.value,
+      maxY: maxY.value,
+      edgeVectors: edgeVectors.value,
+      gridLines: {
+        delta1: gridlines1.value,
+        delta2: gridlines2.value,
+        diagonal1: diagonals1.value,
+        diagonal2: diagonals2.value
+      },
+      mergeEdges: true
+    }
+  })
+
+  function resetBounds() {
+    minX.value = -3.1
+    maxX.value = 3.1
+    minY.value = -2.1
+    maxY.value = 2.1
+  }
+
+  function square(divisions: number) {
+    resetBounds()
+
+    size.value = 0.15
+    viewScale.value = 3.1
+    viewCenterX.value = 0
+    viewCenterY.value = -0.1
+
+    valString.value = `${divisions}p`
+    delta1.value = mmod(Math.round((divisions * LOG_PRIMES[1]) / LOG_PRIMES[0]), divisions)
+    delta1X.value = 1
+    delta1Y.value = 0
+    delta2.value = mmod(Math.round((divisions * LOG_PRIMES[2]) / LOG_PRIMES[0]), divisions)
+    delta2X.value = 0
+    delta2Y.value = -1
+    gridlines1.value = true
+    gridlines2.value = true
+    diagonals1.value = false
+    diagonals2.value = false
+    edgesString.value = '3/2 5/4'
+  }
+
+  function squareBP(divisions: number) {
+    resetBounds()
+
+    size.value = 0.15
+    viewScale.value = 3.1
+    viewCenterX.value = 0
+    viewCenterY.value = -0.1
+
+    valString.value = `b${divisions}p`
+    delta1.value = mmod(Math.round((divisions * LOG_PRIMES[2]) / LOG_PRIMES[1]), divisions)
+    delta1X.value = 1
+    delta1Y.value = 0
+    delta2.value = mmod(Math.round((divisions * LOG_PRIMES[3]) / LOG_PRIMES[1]), divisions)
+    delta2X.value = 0
+    delta2Y.value = -1
+    gridlines1.value = true
+    gridlines2.value = true
+    diagonals1.value = false
+    diagonals2.value = false
+    edgesString.value = '5/3 7/3'
+  }
+
+  function tonnetz(divisions: number) {
+    resetBounds()
+
+    size.value = 1
+    viewScale.value = 30.1
+    viewCenterX.value = 0
+    viewCenterY.value = 0
+
+    valString.value = `${divisions}p`
+    delta1.value = mmod(Math.round((divisions * LOG_PRIMES[1]) / LOG_PRIMES[0]), divisions)
+    delta1X.value = 6
+    delta1Y.value = 0
+    delta2.value = mmod(Math.round((divisions * LOG_PRIMES[2]) / LOG_PRIMES[0]), divisions)
+    delta2X.value = 3
+    delta2Y.value = -5
+    gridlines1.value = true
+    gridlines2.value = true
+    diagonals1.value = true
+    diagonals2.value = false
+    edgesString.value = '3/2 5/4 6/5'
+  }
+
+  function preset311() {
+    resetBounds()
+
+    size.value = 8
+    viewScale.value = 200
+    viewCenterX.value = 0
+    viewCenterY.value = 0
+
+    valString.value = '311p'
+    delta1.value = 296
+    delta1X.value = 28
+    delta1Y.value = 2
+    delta2.value = 242
+    delta2X.value = 15
+    delta2Y.value = -8
+    gridlines1.value = true
+    gridlines2.value = true
+    diagonals1.value = false
+    diagonals2.value = false
+    edgesString.value = '3/2 5/4 6/5 7/4 11/8 13/8'
+  }
+
+  return {
+    // State
+    size,
+    viewCenterX,
+    viewCenterY,
+    viewScale,
+    labelOffset,
+    showLabels,
+    valString,
+    edgesString,
+    delta1,
+    delta1X,
+    delta1Y,
+    delta2,
+    delta2X,
+    delta2Y,
+    minX,
+    maxX,
+    minY,
+    maxY,
+    gridlines1,
+    gridlines2,
+    diagonals1,
+    diagonals2,
+    // Computed state
+    edges,
+    edgesError,
+    edgeVectors,
+    val,
+    modulus,
+    gridOptions,
+    // Methods
+    square,
+    squareBP,
+    tonnetz,
+    preset311
+  }
+})
diff --git a/src/stores/historical.ts b/src/stores/historical.ts
index 67bf85fb..be661240 100644
--- a/src/stores/historical.ts
+++ b/src/stores/historical.ts
@@ -2,7 +2,8 @@ import { computed, reactive, ref, watch } from 'vue'
 import { defineStore } from 'pinia'
 import { DEFAULT_NUMBER_OF_COMPONENTS, FIFTH, OCTAVE } from '@/constants'
 import { Fraction, centsToValue, circleDifference, lcm } from 'xen-dev-utils'
-import { parseLine } from 'scale-workshop-core'
+import { Interval, TimeMonzo } from 'sonic-weave'
+import { parseInterval } from '@/utils'
 
 export const useHistoricalStore = defineStore('historical', () => {
   const method = ref<'simple' | 'target' | 'well temperament'>('simple')
@@ -18,7 +19,9 @@ export const useHistoricalStore = defineStore('historical', () => {
 
   const pureGenerator = ref(FIFTH)
   const pureGeneratorString = ref('3/2')
-  const target = ref(parseLine('7/4', DEFAULT_NUMBER_OF_COMPONENTS))
+  const target = ref(
+    new Interval(TimeMonzo.fromFraction('7/4', DEFAULT_NUMBER_OF_COMPONENTS), 'linear')
+  )
   const targetString = ref('7/4')
   const searchRange = ref(11)
   const period = ref(OCTAVE)
@@ -26,7 +29,9 @@ export const useHistoricalStore = defineStore('historical', () => {
   const pureExponent = ref(10)
   const temperingStrength = ref(1)
 
-  const wellComma = ref(parseLine('531441/524288', DEFAULT_NUMBER_OF_COMPONENTS))
+  const wellComma = ref(
+    new Interval(TimeMonzo.fromFraction('531441/524288', DEFAULT_NUMBER_OF_COMPONENTS), 'linear')
+  )
   const wellCommaString = ref('531441/524288')
   const wellCommaFractionStrings = reactive<Map<number, string>>(
     new Map([
@@ -46,6 +51,8 @@ export const useHistoricalStore = defineStore('historical', () => {
 
   const selectedWellPreset = ref('vallotti')
 
+  const up = computed(() => size.value - 1 - down.value)
+
   type Candidate = {
     exponent: number
     tempering: number
@@ -81,9 +88,9 @@ export const useHistoricalStore = defineStore('historical', () => {
   })
 
   const wellIntervals = computed(() => {
-    const comma = wellComma.value.asType('any')
+    const comma = wellComma.value.value
     // Not a generator in the strictest sense. It accumulates offsets along the way.
-    let generator = FIFTH.mul(0).asType('any')
+    let generator = FIFTH.value.pow(0)
 
     // Unison
     const result = [generator]
@@ -94,23 +101,23 @@ export const useHistoricalStore = defineStore('historical', () => {
       try {
         frac = new Fraction(wellCommaFractionStrings.get(-i - 1) ?? '0')
       } catch {
-        /* empty */
+        // empty
       }
-      generator = generator.sub(FIFTH).sub(comma.mul(frac)).mmod(OCTAVE)
+      generator = generator.div(FIFTH.value).div(comma.pow(frac)).reduce(OCTAVE.value)
       result.unshift(generator)
     }
 
     // Along the spiral of fifths
-    generator = FIFTH.mul(0).asType('any')
+    generator = FIFTH.value.pow(0)
     // Note that this intentionally overshoots by one to reach the enharmonic
     for (let i = 0; i < size.value - down.value; ++i) {
       let frac = new Fraction(0)
       try {
         frac = new Fraction(wellCommaFractionStrings.get(i) ?? '0')
       } catch {
-        /* empty */
+        // empty
       }
-      generator = generator.add(FIFTH).add(comma.mul(frac)).mmod(OCTAVE)
+      generator = generator.mul(FIFTH.value).mul(comma.pow(frac)).reduce(OCTAVE.value)
       result.push(generator)
     }
 
@@ -119,31 +126,36 @@ export const useHistoricalStore = defineStore('historical', () => {
 
   const ZERO = new Fraction(0)
 
-  const allWellCommasAreZero = computed(() => {
-    const d = down.value
+  const wellCommaFractions = computed(() => {
+    const result: Fraction[] = []
     for (let i = 0; i < size.value; ++i) {
-      let frac: Fraction
+      let frac = ZERO
       try {
-        frac = new Fraction(wellCommaFractionStrings.get(i) ?? '0')
+        frac = new Fraction(wellCommaFractionStrings.get(i - down.value) ?? '0')
       } catch {
-        return false
-      }
-      if (wellCommaFractionStrings.has(i - d) && !ZERO.equals(frac)) {
-        return false
+        // Empty
       }
+      result.push(frac)
     }
-    return true
+    return result
+  })
+
+  const allWellCommasAreZero = computed(() => {
+    return wellCommaFractions.value.every((f) => f.n === 0)
   })
 
   // This is a simplified and linearized model of beating
   function equalizeBeating() {
-    const monzo = generator.value.monzo
+    const monzo = generator.value.value
     const g = monzo.valueOf()
     let multiGenExponent = 1
     if (!monzo.cents) {
-      multiGenExponent = monzo.vector.reduce((denom, component) => lcm(component.d, denom), 1)
+      multiGenExponent = monzo.primeExponents.reduce(
+        (denom, component) => lcm(component.d, denom),
+        1
+      )
     }
-    const t = target.value.monzo.valueOf()
+    const t = target.value.valueOf()
 
     const generatorMaxBeats = Math.abs(g * (1 - centsToValue(tempering.value * multiGenExponent)))
     const targetMaxBeats = Math.abs(t * (1 - centsToValue(tempering.value * pureExponent.value)))
@@ -185,7 +197,7 @@ export const useHistoricalStore = defineStore('historical', () => {
       name: 'Helmholtz aka Schismatic',
       down: 11,
       size: 24,
-      generator: '3/2 - 1\\8<32805/32768>'
+      generator: '3/2 % 32805/32768/^8'
     },
     twelve: {
       name: '12-tone equal temperament',
@@ -194,33 +206,33 @@ export const useHistoricalStore = defineStore('historical', () => {
     },
     eight: {
       name: '1/8-comma Meantone',
-      generator: '3/2 - 1\\8<531441/524288>',
+      generator: '3/2 % 531441/524288/^8',
       down: 5
     },
     sixth: {
       name: '1/6-comma Meantone',
       down: 5,
-      generator: '3/2 - 1\\6<531441/524288>'
+      generator: '3/2 % 531441/524288/^6'
     },
     fifth: {
       name: '1/5-comma Meantone',
       down: 3,
-      generator: '3/2 - 1\\5<81/80>'
+      generator: '3/2 % 81/80/^5'
     },
     quarter: {
       name: '1/4-comma Meantone',
       down: 3,
-      generator: '3/2 - 1\\4<81/80>'
+      generator: '3/2 % 81/80/^4'
     },
     twosevenths: {
       name: '2/7-comma Meantone',
       down: 3,
-      generator: '3/2 - 2\\7<81/80>'
+      generator: '3/2 % 81/80^2/7'
     },
     third: {
       name: '1/3-comma Meantone',
       down: 3,
-      generator: '3/2 - 1\\3<81/80>'
+      generator: '3/2 % 81/80/^3'
     }
   }
 
@@ -354,8 +366,8 @@ export const useHistoricalStore = defineStore('historical', () => {
   // Sort by wideness of the generator
   presetKeys.sort(
     (a, b) =>
-      parseLine(presets[b].generator, DEFAULT_NUMBER_OF_COMPONENTS).totalCents() -
-      parseLine(presets[a].generator, DEFAULT_NUMBER_OF_COMPONENTS).totalCents()
+      parseInterval(presets[b].generator).totalCents() -
+      parseInterval(presets[a].generator).totalCents()
   )
 
   const wellPresetKeys: string[] = [...Object.keys(wellPresets)]
@@ -394,7 +406,7 @@ export const useHistoricalStore = defineStore('historical', () => {
     const preset = presets[value]
     size.value = preset.size ?? 12
     down.value = preset.down
-    generator.value = parseLine(preset.generator, DEFAULT_NUMBER_OF_COMPONENTS)
+    generator.value = parseInterval(preset.generator)
     generatorString.value = preset.generator
   }
 
@@ -408,7 +420,7 @@ export const useHistoricalStore = defineStore('historical', () => {
     size.value = 12
     down.value = preset.down
     wellCommaString.value = preset.comma
-    wellComma.value = parseLine(preset.comma, DEFAULT_NUMBER_OF_COMPONENTS)
+    wellComma.value = parseInterval(preset.comma)
     const fracs = preset.commaFractions.split(',')
     wellCommaFractionStrings.clear()
     for (let i = 0; i < fracs.length; ++i) {
@@ -429,6 +441,7 @@ export const useHistoricalStore = defineStore('historical', () => {
     generatorString,
     size,
     down,
+    up,
     format,
     selectedPreset,
     pureGenerator,
@@ -443,6 +456,7 @@ export const useHistoricalStore = defineStore('historical', () => {
     wellComma,
     wellCommaString,
     wellCommaFractionStrings,
+    wellCommaFractions,
     selectedWellPreset,
     candidates,
     tempering,
diff --git a/src/stores/ji-lattice.ts b/src/stores/ji-lattice.ts
new file mode 100644
index 00000000..3a19accc
--- /dev/null
+++ b/src/stores/ji-lattice.ts
@@ -0,0 +1,161 @@
+import { computed, reactive, ref, watch } from 'vue'
+import { defineStore } from 'pinia'
+import { kraigGrady9, type LatticeOptions, scottDakota24, primeRing72, align } from 'ji-lattice'
+import { LOG_PRIMES, mmod } from 'xen-dev-utils'
+import { computedAndError } from '@/utils'
+import { parseChord } from 'sonic-weave'
+
+export const useJiLatticeStore = defineStore('ji-lattice', () => {
+  // Kraig Grady's coordinates only go up to 23-limit, but it was the default in Scale Workshop 2.
+  const opts = kraigGrady9()
+  const horizontalCoordinates = reactive(opts.horizontalCoordinates)
+  const verticalCoordinates = reactive(opts.verticalCoordinates)
+  const maxDistance = ref(1)
+  const edgesString = ref('')
+  const size = ref(2)
+  const labelOffset = ref(2)
+  const showLabels = ref(true)
+  const rotation = ref(0)
+  const drawArrows = ref(false)
+  const grayExtras = ref(false)
+
+  const [edges, edgesError] = computedAndError(() => {
+    return parseChord(edgesString.value)
+  }, [])
+
+  // XXX: Janky
+  const horizontals = computed({
+    get() {
+      return horizontalCoordinates.join(' ')
+    },
+    set(value: string) {
+      horizontalCoordinates.length = 0
+      horizontalCoordinates.push(
+        ...value.split(' ').map((v) => {
+          const i = parseInt(v)
+          return isNaN(i) ? 0 : i
+        })
+      )
+    }
+  })
+  const verticals = computed({
+    get() {
+      return verticalCoordinates.join(' ')
+    },
+    set(value: string) {
+      verticalCoordinates.length = 0
+      verticalCoordinates.push(
+        ...value.split(' ').map((v) => {
+          const i = parseInt(v)
+          return isNaN(i) ? 0 : i
+        })
+      )
+    }
+  })
+
+  const edgeMonzos = computed(() => {
+    const numComponents = horizontalCoordinates.length
+    const result: number[][] = []
+    for (const interval of edges.value) {
+      const value = interval.value.clone()
+      value.numberOfComponents = numComponents
+      const monzo = interval.value.primeExponents.map((pe) => pe.valueOf())
+      result.push(monzo)
+    }
+    return result
+  })
+
+  const latticeOptions = computed<LatticeOptions>(() => {
+    return {
+      horizontalCoordinates,
+      verticalCoordinates,
+      maxDistance: maxDistance.value,
+      edgeMonzos: edgeMonzos.value,
+      mergeEdges: true
+    }
+  })
+
+  watch(rotation, (newValue) => {
+    if (newValue < 0 || newValue >= 360) {
+      rotation.value = mmod(newValue, 360)
+    }
+  })
+
+  function kraigGrady(equaveIndex = 0) {
+    size.value = 2
+    const kg = kraigGrady9(equaveIndex)
+    horizontalCoordinates.length = 0
+    horizontalCoordinates.push(...kg.horizontalCoordinates)
+    verticalCoordinates.length = 0
+    verticalCoordinates.push(...kg.verticalCoordinates)
+    edgesString.value = ''
+  }
+
+  function scott24(equaveIndex = 0) {
+    size.value = 2
+    const logs = LOG_PRIMES.slice(0, 24)
+    if (equaveIndex !== 0) {
+      logs.unshift(logs.splice(equaveIndex, 1)[0])
+    }
+    const sd = scottDakota24(logs)
+    horizontalCoordinates.length = 0
+    horizontalCoordinates.push(...sd.horizontalCoordinates)
+    verticalCoordinates.length = 0
+    verticalCoordinates.push(...sd.verticalCoordinates)
+    edgesString.value = '6/5'
+  }
+
+  function pr72(equaveIndex = 0) {
+    size.value = 4
+    const logs = LOG_PRIMES.slice(0, 72)
+    if (equaveIndex !== 0) {
+      logs.unshift(logs.splice(equaveIndex, 1)[0])
+    }
+    const pr = primeRing72(logs)
+    horizontalCoordinates.length = 0
+    horizontalCoordinates.push(...pr.horizontalCoordinates)
+    verticalCoordinates.length = 0
+    verticalCoordinates.push(...pr.verticalCoordinates)
+    edgesString.value = '6/5'
+  }
+
+  function pe72(equaveIndex = 0) {
+    size.value = 4
+    const logs = LOG_PRIMES.slice(0, 72)
+    if (equaveIndex !== 0) {
+      logs.unshift(logs.splice(equaveIndex, 1)[0])
+    }
+    const pr = primeRing72(logs, false)
+    align(pr, 1, 2)
+    horizontalCoordinates.length = 0
+    horizontalCoordinates.push(...pr.horizontalCoordinates.map(Math.round))
+    verticalCoordinates.length = 0
+    verticalCoordinates.push(...pr.verticalCoordinates.map(Math.round))
+    edgesString.value = '6/5'
+  }
+
+  return {
+    // State
+    horizontalCoordinates,
+    verticalCoordinates,
+    maxDistance,
+    size,
+    labelOffset,
+    edgesString,
+    showLabels,
+    rotation,
+    drawArrows,
+    grayExtras,
+    // Computed state
+    edgeMonzos,
+    edgesError,
+    horizontals,
+    verticals,
+    latticeOptions,
+    // Methods
+    kraigGrady,
+    scott24,
+    pr72,
+    pe72
+  }
+})
diff --git a/src/stores/modal.ts b/src/stores/modal.ts
index 67c280df..9086a4e8 100644
--- a/src/stores/modal.ts
+++ b/src/stores/modal.ts
@@ -1,8 +1,8 @@
 import { computed, reactive, ref, watch } from 'vue'
 import { defineStore } from 'pinia'
-import { FIFTH, FIFTH_12TET, OCTAVE, THIRD } from '@/constants'
-import { computedAndError, parseChordInput, splitText } from '@/utils'
-import { clamp, gcd } from 'xen-dev-utils'
+import { FIFTH, FIFTH_12TET, OCTAVE } from '@/constants'
+import { computedAndError, splitText } from '@/utils'
+import { Fraction, clamp, gcd, mmod } from 'xen-dev-utils'
 import {
   anyForEdo,
   makeEdoMap,
@@ -11,40 +11,35 @@ import {
   getHardness,
   allForEdo
 } from 'moment-of-symmetry'
-import { type IntervalType } from 'scale-workshop-core'
+import { TimeMonzo, hasConstantStructure, parseChord } from 'sonic-weave'
+import { freeVAOs, vao } from '@/analysis'
 
 export const useModalStore = defineStore('modal', () => {
   // Generic
   const equaveString = ref('2/1')
   const equave = ref(OCTAVE)
 
-  // CPS / Cross-polytype
+  // CPS
   const factorsString = ref('')
   const addUnity = ref(false)
   const [factors, factorsError] = computedAndError(() => {
-    return parseChordInput(factorsString.value)
+    return parseChord(factorsString.value)
   }, [])
-
-  // Dwarf / Euler genus
-  const integerEquave = ref(2)
+  const numElements = ref(2)
+  const maxElements = computed(() => Math.max(1, factors.value.length))
 
   // Harmonics / Subharmonics
   const lowInteger = ref(8)
   const highInteger = ref(16)
 
-  // CPS
-  const numElements = ref(2)
-  const maxElements = computed(() => Math.max(1, factors.value.length))
-
-  // Dwarf
-  const val = ref(12)
-
   // Enumerate chord
   const chord = ref('')
-  const invertChord = ref(false)
+  const retrovertChord = ref(false)
+  const chordIntervals = computed(() => parseChord(chord.value))
 
   // Equal temperament
   const divisions = ref(5)
+  const simpleEd = ref(true)
   const jumpsString = ref('1 1 1 1 1')
   const degreesString = ref('1 2 3 4 5')
   const singleStepOnly = computed(
@@ -59,6 +54,7 @@ export const useModalStore = defineStore('modal', () => {
       jumpsString.value = ''
       degreesString.value = ''
     } else {
+      simpleEd.value = true
       jumpsString.value = Array(safeScaleSize.value).fill('1').join(' ')
       degreesString.value = [...Array(safeScaleSize.value).keys()]
         .map((k) => (k + 1).toString())
@@ -76,6 +72,7 @@ export const useModalStore = defineStore('modal', () => {
       degree += jump
       degrees_.push(degree.toString())
     })
+    simpleEd.value = false
     divisions.value = degree
     degreesString.value = degrees_.join(' ')
   }
@@ -90,12 +87,112 @@ export const useModalStore = defineStore('modal', () => {
       jumps_.push((degree - previous).toString())
       previous = degree
     })
+    simpleEd.value = false
     divisions.value = previous
     jumpsString.value = jumps_.join(' ')
   }
 
   // Euler genus
+  const integerEquave = ref(2)
   const guideTone = ref(45)
+  const rootTone = ref(3)
+
+  watch(rootTone, (newValue, oldValue) => {
+    let redo = newValue < 1 || newValue > guideTone.value
+    newValue = clamp(1, guideTone.value, newValue)
+    const step = oldValue < newValue ? 1 : -1
+    while (guideTone.value % newValue) {
+      newValue += step
+      redo = true
+    }
+    if (redo) {
+      rootTone.value = newValue
+    }
+  })
+
+  watch(guideTone, (newValue) => {
+    if (newValue % rootTone.value) {
+      rootTone.value = rootTone.value - 1
+    }
+  })
+
+  // Generator sequence
+  const periodString = ref('2/1')
+  const period = ref(OCTAVE)
+  const numPeriods = ref(1)
+  const size = ref(5)
+  const generatorsString = ref('')
+  const [generators, generatorsError] = computedAndError(() => {
+    let source = generatorsString.value
+    // Enumerated chords mean something different in the context of GS
+    if (source.includes(':')) {
+      source = 'geodiff(' + source + ')'
+    }
+    return parseChord(source)
+  }, [])
+  const constantStructureSizes = reactive<number[]>([])
+  // These sizes are per period.
+  const maxSizeComputed = ref(2)
+  function computeConstantStructureSizes(maxSize: number) {
+    if (isNaN(numPeriods.value)) {
+      return
+    }
+    if (maxSize <= maxSizeComputed.value) {
+      return
+    }
+    const p = period.value.value
+    if (p.timeExponent.n) {
+      return
+    }
+    const monzos = generators.value.map((g) => g.value)
+    if (!monzos.length) {
+      return
+    }
+    for (const monzo of monzos) {
+      if (monzo.timeExponent.n) {
+        return
+      }
+    }
+    const scale: TimeMonzo[] = [p]
+    let accumulator = new TimeMonzo(new Fraction(0), [])
+    for (let j = 0; j < maxSizeComputed.value; ++j) {
+      accumulator = accumulator.mul(monzos[mmod(j, monzos.length)])
+      scale.push(accumulator.reduce(p, true))
+    }
+    for (let i = maxSizeComputed.value; i < maxSize; ++i) {
+      accumulator = accumulator.mul(monzos[mmod(i, monzos.length)])
+      scale.push(accumulator.reduce(p, true))
+      scale.sort((a, b) => a.compare(b))
+      if (hasConstantStructure(scale)) {
+        // These sizes are for the full scale.
+        constantStructureSizes.push(scale.length * numPeriods.value)
+      }
+    }
+    maxSizeComputed.value = maxSize
+  }
+  watch([generators, period, numPeriods], () => {
+    maxSizeComputed.value = 2
+    constantStructureSizes.length = 0
+  })
+  watch(size, (newValue) => {
+    newValue = parseInt(newValue as unknown as string, 10)
+    if (isNaN(newValue) || isNaN(numPeriods.value)) {
+      return
+    }
+    if (newValue % numPeriods.value) {
+      size.value = Math.ceil(newValue / numPeriods.value) * numPeriods.value
+    }
+    if (newValue < 1) {
+      size.value = 1
+    }
+  })
+  watch(numPeriods, (newValue) => {
+    newValue = parseInt(newValue as unknown as string, 10)
+    if (isNaN(newValue) || isNaN(size.value)) {
+      return
+    }
+    size.value = Math.ceil(size.value / newValue) * newValue
+  })
 
   // === MOS ===
   // State required to generate MOS
@@ -219,28 +316,33 @@ export const useModalStore = defineStore('modal', () => {
   const largeInteger = ref(128)
 
   // Convert type
-  const type = ref<IntervalType>('cents')
+  const type = ref<
+    'decimal' | 'fraction' | 'radical' | 'cents' | 'FJS' | 'absoluteFJS' | 'nedji' | 'monzo'
+  >('cents')
+  const fractionTolerance = ref<number>(0)
   const preferredNumerator = ref<number>(0)
   const preferredDenominator = ref<number>(0)
+  const preferredEtNumerator = ref<number>(0)
   const preferredEtDenominator = ref<number>(0)
   const preferredEtEquaveNumerator = ref<number>(0)
-  const preferredEtEquaveDenominator = ref<number>(1)
+  const preferredEtEquaveDenominator = ref<number>(0)
 
   // Equalize
   const largeDivisions = ref(22)
 
   // Merge offset
-  const offset = ref(THIRD)
-  const offsetString = ref('')
-  // Overflow = "none" is too similar to "reduce" to be included in the UI.
-  const overflowType = ref<'none' | 'intuitive' | 'filter' | 'reduce'>('filter')
+  const overflowType = ref<'keep' | 'drop' | 'wrap'>('drop')
+  const offsetsString = ref('')
+  const [offsets, offsetsError] = computedAndError(() => {
+    return parseChord(offsetsString.value)
+  }, [])
 
   // Random variance
   const varianceAmount = ref(10)
   const varyEquave = ref(false)
 
   // Rotate scale
-  const newUnison = ref(1)
+  const newUnison = ref(0)
 
   // Stretch
   const stretchAmount = ref(1.005)
@@ -252,12 +354,13 @@ export const useModalStore = defineStore('modal', () => {
   const target = ref(FIFTH)
 
   function calculateStretchAmount() {
-    const calculated = target.value.totalCents() / reference.value.totalCents()
+    const calculated = target.value.value.totalCents() / reference.value.value.totalCents()
     if (calculated >= 0.001 && calculated <= 999.999) {
       stretchAmount.value = calculated
     }
   }
 
+  // Subset
   const selected = reactive<Set<number>>(new Set())
 
   function toggleSelected(index: number) {
@@ -269,7 +372,7 @@ export const useModalStore = defineStore('modal', () => {
   }
 
   function initialize(size: number) {
-    newUnison.value = clamp(newUnison.value, 1, size - 1)
+    newUnison.value = clamp(0, size - 1, newUnison.value)
     selected.clear()
     selected.add(0)
     for (let i = 1; i < size; ++i) {
@@ -277,34 +380,69 @@ export const useModalStore = defineStore('modal', () => {
     }
   }
 
+  // Coalesce
+  const tolerance = ref(3.5)
+  const coalescingAction = ref<'avg' | 'havg' | 'geoavg' | 'lowest' | 'highest' | 'simplest'>(
+    'simplest'
+  )
+
+  // Concordance shell
+  const mediumInteger = ref(32)
+  const errorModel = ref<'rooted' | 'free'>('rooted')
+  const vaoIndex = ref(0)
+  const vaos = computed(() => {
+    if (errorModel.value === 'rooted') {
+      return [
+        vao(
+          mediumInteger.value,
+          largeInteger.value,
+          largeDivisions.value,
+          tolerance.value,
+          equave.value.totalCents()
+        )
+      ]
+    }
+    return freeVAOs(
+      mediumInteger.value,
+      largeInteger.value,
+      largeDivisions.value,
+      tolerance.value,
+      equave.value.totalCents()
+    )
+  })
+
+  watch([mediumInteger, largeInteger, largeDivisions, tolerance, equave, errorModel], () => {
+    vaoIndex.value = 0
+  })
+
+  // Expand
+  const simplify = ref(false)
+  const bleach = ref(false)
+
   return {
     // Generic
     equaveString,
     equave,
 
-    // CPS / Cross-polytype
+    // CPS
     factorsString,
     addUnity,
     factors,
     factorsError,
+    numElements,
+    maxElements,
 
-    // Dwarf / Euler genus
+    // Euler genus
     integerEquave,
 
     // Harmonics / Subharmonics
     lowInteger,
     highInteger,
 
-    // CPS
-    numElements,
-    maxElements,
-
-    // Dwarf
-    val,
-
     // Enumerate chord
     chord,
-    invertChord,
+    retrovertChord,
+    chordIntervals,
 
     // Equal temperament
     divisions,
@@ -314,12 +452,26 @@ export const useModalStore = defineStore('modal', () => {
     safeScaleSize,
     jumps,
     degrees,
+    simpleEd,
     updateFromDivisions,
     updateFromJumps,
     updateFromDegrees,
 
     // Euler genus
     guideTone,
+    rootTone,
+
+    // Generator sequence
+    periodString,
+    period,
+    numPeriods,
+    size,
+    generatorsString,
+    generators,
+    generatorsError,
+    constantStructureSizes,
+    maxSizeComputed,
+    computeConstantStructureSizes,
 
     // MOS
     numberOfLargeSteps,
@@ -357,13 +509,21 @@ export const useModalStore = defineStore('modal', () => {
     sortBySize,
     moreForEdo,
 
+    // Concordance shell
+    mediumInteger,
+    vaoIndex,
+    vaos,
+    errorModel,
+
     // Approximate by harmonics/subharmonics
     largeInteger,
 
     // Convert type
     type,
+    fractionTolerance,
     preferredNumerator,
     preferredDenominator,
+    preferredEtNumerator,
     preferredEtDenominator,
     preferredEtEquaveNumerator,
     preferredEtEquaveDenominator,
@@ -372,8 +532,9 @@ export const useModalStore = defineStore('modal', () => {
     largeDivisions,
 
     // Merge offset
-    offset,
-    offsetString,
+    offsets,
+    offsetsString,
+    offsetsError,
     overflowType,
 
     // Random variance
@@ -394,6 +555,14 @@ export const useModalStore = defineStore('modal', () => {
     // Subset
     selected,
     toggleSelected,
-    initialize
+    initialize,
+
+    // Coalesce
+    tolerance,
+    coalescingAction,
+
+    // Expand
+    simplify,
+    bleach
   }
 })
diff --git a/src/stores/scale.ts b/src/stores/scale.ts
new file mode 100644
index 00000000..2567a5a3
--- /dev/null
+++ b/src/stores/scale.ts
@@ -0,0 +1,452 @@
+import { Scale } from '@/scale'
+import { midiNoteNumberToEnharmonics, type AccidentalStyle } from '@/utils'
+import { defineStore } from 'pinia'
+import { computed, ref, watch } from 'vue'
+import { mmod, mtof } from 'xen-dev-utils'
+import {
+  getSourceVisitor,
+  parseAST,
+  relative,
+  Interval,
+  TimeMonzo,
+  str,
+  centsColor,
+  factorColor,
+  type SonicWeaveValue,
+  StatementVisitor,
+  ExpressionVisitor,
+  builtinNode
+} from 'sonic-weave'
+import {
+  DEFAULT_NUMBER_OF_COMPONENTS,
+  INTERVALS_12TET,
+  MIDI_NOTE_COLORS,
+  MIDI_NOTE_NAMES,
+  NUMBER_OF_NOTES,
+  TET12
+} from '@/constants'
+import { pianoMap } from 'isomorphic-qwerty'
+import { computeWhiteIndices } from '@/midi'
+import { midiKeyInfo } from 'xen-midi'
+
+// Colors from #1 to #12 inclusive.
+function defaultColors(base: number) {
+  return [...Array(12).keys()].map((i) => MIDI_NOTE_COLORS[mmod(base + 1 + i, 12)])
+}
+
+// Labels from #1 to #12 inclusive.
+function defaultLabels(base: number, accidentalStyle: AccidentalStyle) {
+  const result = [...Array(12).keys()].map((i) => MIDI_NOTE_NAMES[mmod(base + 1 + i, 12)])
+  if (accidentalStyle === 'ASCII') {
+    return result
+  }
+  return result.map((n) => n.replace('#', '♯'))
+}
+
+export const useScaleStore = defineStore('scale', () => {
+  // Note that most of these values are debounce-computed due to being expensive.
+  // The second party is responsible for debouncing `computeScale`.
+  const accidentalPreference = ref<AccidentalStyle>(
+    (localStorage.getItem('accidentalPreference') as AccidentalStyle) ?? 'double'
+  )
+  // Some keyboards like FI have a handy key left of 'Z'
+  const hasLeftOfZ = ref(localStorage.getItem('hasLeftOfZ') === 'true')
+
+  // Computational budget to prevent tab hanging.
+  const gas = ref(parseInt(localStorage.getItem('gas') ?? '10000', 10))
+
+  const name = ref('')
+  const baseMidiNote = ref(60)
+  const enharmonics = computed(() =>
+    midiNoteNumberToEnharmonics(baseMidiNote.value, accidentalPreference.value)
+  )
+  const enharmonic = ref(enharmonics.value[0])
+  const userBaseFrequency = ref(261.63)
+  const autoFrequency = ref(true)
+  const baseFrequency = computed({
+    get() {
+      return autoFrequency.value ? mtof(baseMidiNote.value) : userBaseFrequency.value
+    },
+    set(value: number) {
+      userBaseFrequency.value = value
+    }
+  })
+  const autoColors = ref<'silver' | 'cents' | 'factors'>('silver')
+  const sourceText = ref('')
+  const relativeIntervals = ref(INTERVALS_12TET)
+  const latticeIntervals = ref(INTERVALS_12TET)
+  const scale = ref(new Scale(TET12, baseFrequency.value, baseMidiNote.value))
+  const colors = ref(defaultColors(baseMidiNote.value))
+  const labels = ref(defaultLabels(baseMidiNote.value, accidentalPreference.value))
+  const error = ref('')
+
+  // Keyboard mode affects both physical qwerty and virtual keyboards
+  const keyboardMode = ref<'isomorphic' | 'piano'>('isomorphic')
+  // QWERTY mapping is coupled to equave and degree shifts
+  const equaveShift = ref(0)
+  const degreeShift = ref(0)
+  // QWERTY physical layout mimics a piano layout
+  // Asdf: Non-black keys on ASDF-row black keys on QWERTY row
+  // QweZxc: Two octaves similar to 'Asdf'
+  // Zxc: Generic keys on ZXCV-row, maroon keys on ASDF, navy keys on QWERTY, indigo keys on digits row
+  const pianoMode = ref<'Asdf' | 'QweZxc' | 'Zxc'>('Asdf')
+  const accidentalColor = ref('black')
+  const lowAccidentalColor = ref('maroon')
+  const middleAccidentalColor = ref('navy')
+  const highAccidentalColor = ref('indigo')
+
+  // === Computed state ===
+  const sourcePrefix = computed(() => {
+    const base = `numComponents(${DEFAULT_NUMBER_OF_COMPONENTS})\n`
+    if (autoFrequency.value) {
+      return `${base}${enharmonic.value} = mtof(_) = 1/1`
+    }
+    return `${base}${enharmonic.value} = baseFrequency = 1/1`
+  })
+
+  const frequencies = computed(() => scale.value.getFrequencyRange(0, NUMBER_OF_NOTES))
+  const centss = computed(() => scale.value.getCentsRange(0, NUMBER_OF_NOTES))
+
+  const latticePermutation = computed(() => {
+    const intervals = relativeIntervals.value
+    const result: number[] = []
+    tracking: for (let i = 0; i < intervals.length; ++i) {
+      for (const id of intervals[i].trackingIds) {
+        if (id < 1) {
+          result.push(-id)
+          continue tracking
+        }
+      }
+      result.push(i)
+    }
+    return result
+  })
+
+  const inverseLatticePermutation = computed(() => {
+    const result: number[] = []
+    for (let i = 0; i < latticePermutation.value.length; ++i) {
+      // XXX: JS is one wild language.
+      result[latticePermutation.value[i]] = i
+    }
+    return result
+  })
+
+  const latticeLabels = computed(() => inverseLatticePermutation.value.map((i) => labels.value[i]))
+  const latticeColors = computed(() => inverseLatticePermutation.value.map((i) => colors.value[i]))
+
+  /**
+   * Obtain the lowercased color corresponding to specified MIDI index
+   * @param index MIDI index
+   */
+  function colorForIndex(index: number) {
+    // Colors have the same period as the scale so equave shift can be ignored here
+    return colors.value[mmod(index - baseMidiNote.value - 1, colors.value.length)].toLowerCase()
+  }
+
+  /**
+   * Obtain the label corresponding to specified MIDI index
+   * @param index MIDI index
+   */
+  function labelForIndex(index: number) {
+    return labels.value[mmod(index - baseMidiNote.value - 1, labels.value.length)]
+  }
+
+  // QWERTY mapping is coupled to key colors
+  const qwertyMapping = computed<Map<string, number>>(() => {
+    const black = accidentalColor.value.toLowerCase()
+    let firstIndex = baseMidiNote.value + degreeShift.value + scale.value.size * equaveShift.value
+    if (pianoMode.value === 'Asdf') {
+      if (colorForIndex(firstIndex - 1) === black) {
+        firstIndex--
+      }
+
+      // Max = 30 overshoots quite a bit, but it's a nice round number.
+      const ys: number[] = []
+      for (let i = firstIndex; i < firstIndex + 30; ++i) {
+        ys.push(colorForIndex(i) === black ? 1 : 2)
+      }
+      const { indexByCode } = pianoMap(ys)
+      for (const [code, index] of indexByCode) {
+        indexByCode.set(code, index + firstIndex)
+      }
+      return indexByCode
+    } else if (pianoMode.value === 'QweZxc') {
+      const ys: number[] = []
+      // ZXCV & ASDF
+      if (!hasLeftOfZ.value) {
+        if (colorForIndex(firstIndex - 1) === black) {
+          firstIndex--
+        }
+        ys.push(3) // Dummy filler for the missing key
+      }
+      for (let i = firstIndex; i < firstIndex + 30; ++i) {
+        ys.push(colorForIndex(i) === black ? 2 : 3)
+      }
+      const { indexByCode } = pianoMap(ys)
+      if (!hasLeftOfZ.value) {
+        firstIndex-- // Correct for the dummy
+      }
+      for (const [code, index] of indexByCode) {
+        indexByCode.set(code, index + firstIndex)
+      }
+
+      // QWERTY & digits
+      firstIndex =
+        baseMidiNote.value + degreeShift.value + scale.value.size * (equaveShift.value + 1)
+      if (colorForIndex(firstIndex - 1) === black) {
+        firstIndex--
+      }
+      ys.length = 0
+      for (let i = firstIndex; i < firstIndex + 30; ++i) {
+        ys.push(colorForIndex(i) === black ? 0 : 1)
+      }
+      const { indexByCode: qMap } = pianoMap(ys)
+      for (const [code, index] of qMap) {
+        indexByCode.set(code, index + firstIndex)
+      }
+
+      return indexByCode
+    } else if (pianoMode.value === 'Zxc') {
+      const low = lowAccidentalColor.value.toLowerCase()
+      const middle = middleAccidentalColor.value.toLowerCase()
+      const high = highAccidentalColor.value.toLowerCase()
+      const ys: number[] = []
+      if (!hasLeftOfZ.value) {
+        if ([low, middle, high].includes(colorForIndex(firstIndex - 1))) {
+          firstIndex--
+        }
+        ys.push(3) // Dummy filler for the missing key
+      }
+      for (let i = firstIndex; i < firstIndex + 60; ++i) {
+        const color = colorForIndex(i)
+        if (color === low) {
+          ys.push(2)
+        } else if (color === middle) {
+          ys.push(1)
+        } else if (color === high) {
+          ys.push(0)
+        } else {
+          ys.push(3)
+        }
+      }
+      const { indexByCode } = pianoMap(ys)
+      if (!hasLeftOfZ.value) {
+        firstIndex-- // Correct for the dummy
+      }
+      for (const [code, index] of indexByCode) {
+        indexByCode.set(code, index + firstIndex)
+      }
+      return indexByCode
+    } else {
+      pianoMode.value satisfies never
+      throw new Error(`Unknown piano mode ${pianoMode.value}`)
+    }
+  })
+
+  const splitAccidentals = computed(() => pianoMode.value === 'Zxc')
+
+  // For midi mapping
+  const whiteIndices = computed(() => computeWhiteIndices(baseMidiNote.value, colors.value))
+
+  // Offset such that base MIDI note doesn't move in "simple" white mode.
+  const whiteModeOffset = computed(() => {
+    const baseInfo = midiKeyInfo(baseMidiNote.value)
+    if (baseInfo.whiteNumber === undefined) {
+      return baseMidiNote.value - baseInfo.sharpOf - 1
+    }
+    return baseMidiNote.value - baseInfo.whiteNumber
+  })
+
+  // State synchronization
+  watch([baseMidiNote, accidentalPreference], () => {
+    enharmonic.value = enharmonics.value[0]
+  })
+
+  // Sanity watchers
+  watch(baseMidiNote, (newValue) => {
+    if (isNaN(newValue)) {
+      baseMidiNote.value = 60
+    } else if (Math.round(newValue) != newValue) {
+      baseMidiNote.value = Math.round(newValue)
+    }
+  })
+
+  // Local storage watchers
+  watch(accidentalPreference, (newValue) => localStorage.setItem('accidentalPreference', newValue))
+  watch(hasLeftOfZ, (newValue) => window.localStorage.setItem('hasLeftOfZ', newValue.toString()))
+  watch(gas, (newValue) => window.localStorage.setItem('gas', newValue.toString()))
+
+  function latticeView(this: ExpressionVisitor) {
+    const scale = this.getCurrentScale()
+    for (let i = 0; i < scale.length; ++i) {
+      scale[i] = scale[i].shallowClone()
+      // XXX: Abuses the fact that SonicWeave tracking ids are positive.
+      scale[i].trackingIds.add(-i)
+    }
+    const rel = relative.bind(this)
+    latticeIntervals.value = scale.map((i) => rel(i))
+  }
+  latticeView.__doc__ = 'Store the current scale to be displayed in the lattice tab.'
+  latticeView.__node__ = builtinNode(latticeView)
+
+  // Local helpers
+  function getGlobalVisitor() {
+    // Inject global variables
+    const _ = Interval.fromInteger(baseMidiNote.value)
+    const baseFreq = new Interval(TimeMonzo.fromArbitraryFrequency(baseFrequency.value), 'linear')
+    const extraBuiltins: Record<string, SonicWeaveValue> = {
+      scaleName: name.value,
+      _,
+      baseMidiNote: _,
+      baseFrequency: baseFreq,
+      latticeView
+    }
+    const visitor = getSourceVisitor(true, extraBuiltins)
+    visitor.rootContext.gas = gas.value
+
+    // Declare base nominal and unison frequency
+    const prefixAst = parseAST(sourcePrefix.value)
+    for (const statement of prefixAst.body) {
+      visitor.visit(statement)
+    }
+
+    return visitor
+  }
+
+  // Methods
+  function getVisitors() {
+    const globalVisitor = getGlobalVisitor()
+    const visitor = new StatementVisitor(globalVisitor.rootContext, globalVisitor)
+    const defaults = visitor.rootContext.clone()
+    defaults.gas = gas.value
+
+    const ast = parseAST(sourceText.value)
+    for (const statement of ast.body) {
+      const interupt = visitor.visit(statement)
+      if (interupt) {
+        throw new Error('Illegal statement.')
+      }
+    }
+    return {
+      defaults,
+      visitor
+    }
+  }
+
+  function computeScale() {
+    try {
+      latticeIntervals.value = []
+      const globalVisitor = getGlobalVisitor()
+      const visitor = new StatementVisitor(globalVisitor.rootContext, globalVisitor)
+      const ast = parseAST(sourceText.value)
+      for (const statement of ast.body) {
+        const interupt = visitor.visit(statement)
+        if (interupt) {
+          throw new Error('Illegal statement.')
+        }
+      }
+
+      const intervals = visitor.getCurrentScale()
+      const ev = visitor.createExpressionVisitor()
+      const rel = relative.bind(ev)
+      relativeIntervals.value = intervals.map((i) => rel(i))
+      if (!latticeIntervals.value.length) {
+        latticeIntervals.value = relativeIntervals.value
+      }
+      const ratios = relativeIntervals.value.map((i) => i.value.valueOf())
+      let visitorBaseFrequency = mtof(baseMidiNote.value)
+      if (visitor.rootContext.unisonFrequency) {
+        visitorBaseFrequency = visitor.rootContext.unisonFrequency.valueOf()
+      }
+      if (ratios.length) {
+        const name = str.bind(ev)
+        scale.value = new Scale(ratios, visitorBaseFrequency, baseMidiNote.value)
+        if (autoColors.value === 'silver') {
+          colors.value = intervals.map(
+            (interval, i) =>
+              interval.color?.value ?? (i === intervals.length - 1 ? 'gray' : 'silver')
+          )
+        } else if (autoColors.value === 'cents') {
+          colors.value = intervals.map(
+            (interval) => interval.color?.value ?? centsColor(interval).value
+          )
+        } else {
+          colors.value = intervals.map(
+            (interval) => interval.color?.value ?? factorColor(interval).value
+          )
+        }
+        labels.value = intervals.map((interval) => interval.label || name(interval))
+        error.value = ''
+      } else {
+        scale.value = new Scale(TET12, visitorBaseFrequency, baseMidiNote.value)
+        colors.value = defaultColors(baseMidiNote.value)
+        labels.value = defaultLabels(baseMidiNote.value, accidentalPreference.value)
+        error.value = 'Empty scale defaults to 12-tone equal temperament.'
+      }
+    } catch (e) {
+      if (e instanceof Error) {
+        error.value = e.message
+      } else if (typeof e === 'string') {
+        error.value = e
+      }
+    }
+  }
+
+  function getFrequency(index: number) {
+    if (index >= 0 && index < frequencies.value.length) {
+      return frequencies.value[index]
+    } else {
+      // Support more than 128 notes with some additional computational cost
+      return scale.value.getFrequency(index)
+    }
+  }
+
+  return {
+    // Live state
+    name,
+    baseMidiNote,
+    enharmonics,
+    enharmonic,
+    userBaseFrequency,
+    autoFrequency,
+    autoColors,
+    baseFrequency,
+    sourcePrefix,
+    sourceText,
+    scale,
+    relativeIntervals,
+    colors,
+    labels,
+    latticePermutation,
+    inverseLatticePermutation,
+    latticeIntervals,
+    latticeColors,
+    latticeLabels,
+    error,
+    keyboardMode,
+    equaveShift,
+    degreeShift,
+    pianoMode,
+    accidentalColor,
+    lowAccidentalColor,
+    middleAccidentalColor,
+    highAccidentalColor,
+    // Presistent state
+    accidentalPreference,
+    hasLeftOfZ,
+    gas,
+    // Computed state
+    frequencies,
+    centss,
+    qwertyMapping,
+    splitAccidentals,
+    whiteIndices,
+    whiteModeOffset,
+    // Methods
+    getVisitors,
+    computeScale,
+    getFrequency,
+    colorForIndex,
+    labelForIndex
+  }
+})
diff --git a/src/stores/state.ts b/src/stores/state.ts
index 11c98bb6..11e99800 100644
--- a/src/stores/state.ts
+++ b/src/stores/state.ts
@@ -1,50 +1,16 @@
-import { computed, reactive, ref, watch } from 'vue'
+import { reactive, ref, watch } from 'vue'
 import { defineStore } from 'pinia'
-import {
-  Interval,
-  Scale,
-  parseLine,
-  type IntervalOptions,
-  reverseParseScale
-} from 'scale-workshop-core'
-import { DEFAULT_NUMBER_OF_COMPONENTS, NUMBER_OF_NOTES, UNIX_NEWLINE } from '@/constants'
-import { computeWhiteIndices } from '@/midi'
-import { mapWhiteAsdfBlackQwerty, mapWhiteQweZxcBlack123Asd } from '@/keyboard-mapping'
-import { arraysEqual } from 'xen-dev-utils'
-import type { AccidentalStyle } from '@/utils'
-import { midiKeyInfo } from 'xen-midi'
+import { UNIX_NEWLINE } from '@/constants'
 
 export const useStateStore = defineStore('state', () => {
-  // Nonpersistent state of the application
-  const scaleName = ref('')
-  const scaleLines = ref<string[]>([])
-  const scale = reactive(Scale.fromIntervalArray([parseLine('1/1', DEFAULT_NUMBER_OF_COMPONENTS)]))
-  const baseMidiNote = ref(69)
-  const keyColors = ref([
-    'white',
-    'black',
-    'white',
-    'white',
-    'black',
-    'white',
-    'black',
-    'white',
-    'white',
-    'black',
-    'white',
-    'black'
-  ])
   const isomorphicVertical = ref(5)
   const isomorphicHorizontal = ref(1)
-  // Keyboard mode affects both physical qwerty and virtual keyboards
-  const keyboardMode = ref<'isomorphic' | 'piano'>('isomorphic')
-  // Physical layout mimics a piano layout in one or two layers
-  const pianoMode = ref<'Asdf' | 'QweZxc0' | 'QweZxc1'>('Asdf')
-  const equaveShift = ref(0)
-  const degreeShift = ref(0)
+  // Mapping from MIDI index to number of interfaces currently pressing the key down
   const heldNotes = reactive(new Map<number, number>())
   const typingActive = ref(true)
 
+  const latticeType = ref<'ji' | 'et'>('et')
+
   // These user preferences are fetched from local storage.
   const storage = window.localStorage
   const newline = ref(storage.getItem('newline') ?? UNIX_NEWLINE)
@@ -57,11 +23,7 @@ export const useStateStore = defineStore('state', () => {
   const centsFractionDigits = ref(parseInt(storage.getItem('centsFractionDigits') ?? '3', 10))
   const decimalFractionDigits = ref(parseInt(storage.getItem('decimalFractionDigits') ?? '5', 10))
   const showVirtualQwerty = ref(storage.getItem('showVirtualQwerty') === 'true')
-  const midiOctaveOffset = ref(parseInt(storage.getItem('midiOctaveOffset') ?? '-1', 10))
   const intervalMatrixIndexing = ref(parseInt(storage.getItem('intervalMatrixIndexing') ?? '0', 10))
-  const accidentalPreference = ref<AccidentalStyle>(
-    (localStorage.getItem('accidentalPreference') as AccidentalStyle) ?? 'double'
-  )
 
   // Special keyboard codes also from local storage.
   const deactivationCode = ref(storage.getItem('deactivationCode') ?? 'Backquote')
@@ -70,88 +32,6 @@ export const useStateStore = defineStore('state', () => {
   const degreeUpCode = ref(storage.getItem('degreeUpCode') ?? 'NumpadAdd')
   const degreeDownCode = ref(storage.getItem('degreeDownCode') ?? 'NumpadSubtract')
 
-  // === Computed state ===
-  const frequencies = computed(() =>
-    scale.getFrequencyRange(-baseMidiNote.value, NUMBER_OF_NOTES - baseMidiNote.value)
-  )
-
-  const baseIndex = computed(
-    () => baseMidiNote.value + equaveShift.value * scale.size + degreeShift.value
-  )
-
-  // Offset such that base MIDI note doesn't move in "simple" white mode.
-  const whiteModeOffset = computed(() => {
-    const baseInfo = midiKeyInfo(baseMidiNote.value)
-    if (baseInfo.whiteNumber === undefined) {
-      return baseMidiNote.value - baseInfo.sharpOf - 1
-    }
-    return baseMidiNote.value - baseInfo.whiteNumber
-  })
-
-  // For midi mapping
-  const whiteIndices = computed(() => computeWhiteIndices(baseMidiNote.value, keyColors.value))
-
-  const keyboardMapping = computed<Map<string, number>>(() => {
-    const size = scale.size
-    const baseIndex = baseMidiNote.value + equaveShift.value * size + degreeShift.value
-    if (pianoMode.value === 'Asdf') {
-      return mapWhiteAsdfBlackQwerty(keyColors.value, baseMidiNote.value, baseIndex)
-    } else if (pianoMode.value === 'QweZxc0') {
-      return mapWhiteQweZxcBlack123Asd(keyColors.value, size, baseMidiNote.value, baseIndex, 0)
-    } else {
-      return mapWhiteQweZxcBlack123Asd(keyColors.value, size, baseMidiNote.value, baseIndex, 1)
-    }
-  })
-
-  // === State updates ===
-  function updateFromScaleLines(lines: string[]) {
-    if (arraysEqual(lines, scaleLines.value)) {
-      return
-    }
-    scaleLines.value = lines
-    const intervals: Interval[] = []
-    const options: IntervalOptions = {
-      centsFractionDigits: centsFractionDigits.value,
-      decimalFractionDigits: decimalFractionDigits.value
-    }
-    lines.forEach((line) => {
-      try {
-        const interval = parseLine(line, DEFAULT_NUMBER_OF_COMPONENTS, options)
-        intervals.push(interval)
-      } catch {
-        /* empty */
-      }
-    })
-    if (!intervals.length) {
-      intervals.push(parseLine('1/1', DEFAULT_NUMBER_OF_COMPONENTS, options))
-    }
-
-    const surrogate = Scale.fromIntervalArray(intervals)
-    scale.intervals = surrogate.intervals
-    scale.equave = surrogate.equave
-  }
-
-  function updateFromScale(surrogate: Scale) {
-    scale.intervals = surrogate.intervals
-    scale.equave = surrogate.equave
-    scaleLines.value = reverseParseScale(scale)
-  }
-
-  // Computed wrappers to avoid triggering a watcher loop.
-  const scaleWrapper = computed({
-    get() {
-      return scale
-    },
-    set: updateFromScale
-  })
-
-  const scaleLinesWrapper = computed({
-    get() {
-      return scaleLines.value
-    },
-    set: updateFromScaleLines
-  })
-
   // Local storage watchers
   watch(newline, (newValue) => window.localStorage.setItem('newline', newValue))
   watch(
@@ -171,13 +51,9 @@ export const useStateStore = defineStore('state', () => {
   watch(showVirtualQwerty, (newValue) =>
     window.localStorage.setItem('showVirtualQwerty', newValue.toString())
   )
-  watch(midiOctaveOffset, (newValue) =>
-    window.localStorage.setItem('midiOctaveOffset', newValue.toString())
-  )
   watch(intervalMatrixIndexing, (newValue) =>
     window.localStorage.setItem('intervalMatrixIndexing', newValue.toString())
   )
-  watch(accidentalPreference, (newValue) => localStorage.setItem('accidentalPreference', newValue))
   // Store keymaps
   watch(deactivationCode, (newValue) => window.localStorage.setItem('deactivationCode', newValue))
   watch(equaveUpCode, (newValue) => window.localStorage.setItem('equaveUpCode', newValue))
@@ -185,63 +61,24 @@ export const useStateStore = defineStore('state', () => {
   watch(degreeUpCode, (newValue) => window.localStorage.setItem('degreeUpCode', newValue))
   watch(degreeDownCode, (newValue) => window.localStorage.setItem('degreeDownCode', newValue))
 
-  // Sanity watchers
-  watch(baseMidiNote, (newValue) => {
-    if (isNaN(newValue)) {
-      baseMidiNote.value = 69
-    } else if (Math.round(newValue) != newValue) {
-      baseMidiNote.value = Math.round(newValue)
-    }
-  })
-
-  // Methods
-  function getFrequency(index: number) {
-    if (index >= 0 && index < frequencies.value.length) {
-      return frequencies.value[index]
-    } else {
-      // Support more than 128 notes with some additional computational cost
-      return scale.getFrequency(index - baseMidiNote.value)
-    }
-  }
-
   return {
     // Live state
-    scaleName,
-    scaleLinesRaw: scaleLines,
-    scaleLines: scaleLinesWrapper,
-    scaleRaw: scale,
-    scale: scaleWrapper,
-    baseMidiNote,
-    keyColors,
     isomorphicVertical,
     isomorphicHorizontal,
-    keyboardMode,
-    pianoMode,
-    equaveShift,
-    degreeShift,
     heldNotes,
     typingActive,
+    latticeType,
     // Persistent state
     newline,
     colorScheme,
     centsFractionDigits,
     decimalFractionDigits,
     showVirtualQwerty,
-    midiOctaveOffset,
     intervalMatrixIndexing,
     deactivationCode,
     equaveUpCode,
     equaveDownCode,
     degreeUpCode,
-    degreeDownCode,
-    accidentalPreference,
-    // Computed state
-    frequencies,
-    baseIndex,
-    whiteModeOffset,
-    whiteIndices,
-    keyboardMapping,
-    // Methods
-    getFrequency
+    degreeDownCode
   }
 })
diff --git a/src/stores/tempering.ts b/src/stores/tempering.ts
index 6617ae19..c4773638 100644
--- a/src/stores/tempering.ts
+++ b/src/stores/tempering.ts
@@ -1,22 +1,16 @@
 import { FIFTH, MAX_GEO_SUBGROUP_SIZE, MAX_INTERACTIVE_SUBGROUP_SIZE, OCTAVE } from '@/constants'
 import { mosPatternsRank2FromCommas, mosPatternsRank2FromVals } from '@/tempering'
-import { computedAndError, parseChordInput, splitText } from '@/utils'
+import { computedAndError, splitText } from '@/utils'
 import { isBright, mosPatterns as getMosPatterns, type MosInfo } from 'moment-of-symmetry'
 import { defineStore } from 'pinia'
-import { ExtendedMonzo, fractionToString } from 'scale-workshop-core'
+import { parseChord, parseVals, type TimeMonzo } from 'sonic-weave'
 import { Subgroup, resolveMonzo, type TuningOptions } from 'temperaments'
 import { computed, ref, watch, type Ref, reactive } from 'vue'
 import { add } from 'xen-dev-utils'
 
-// Split text into (non-extended) monzos
+// Split text into (non-time) monzos
 function splitCommas(text: string) {
-  try {
-    return parseChordInput(text).map((interval) =>
-      interval.monzo.vector.map((component) => component.valueOf())
-    )
-  } catch {
-    return []
-  }
+  return parseChord(text).map((interval) => interval.value.toIntegerMonzo())
 }
 
 // The modals have subtly different semantics so we make copies of this state for each
@@ -34,10 +28,13 @@ function makeState(method: Ref, subgroupStringDefault = '') {
   const constraintsString = ref('')
 
   // === Computed state ===
-  const vals = computed(() => splitText(valsString.value))
 
-  const rawCommas = computed(() => splitText(commasString.value))
-  const commas = computed(() => splitCommas(commasString.value))
+  const [vals, valsError] = computedAndError(
+    () => parseVals(valsString.value, subgroupString.value),
+    []
+  )
+
+  const [commas, commasError] = computedAndError(() => splitCommas(commasString.value), [])
 
   const subgroupDefault = new Subgroup(subgroupStringDefault || [])
   const [subgroup, subgroupError] = computedAndError(() => {
@@ -66,20 +63,30 @@ function makeState(method: Ref, subgroupStringDefault = '') {
 
   const constraints = computed(() => splitText(constraintsString.value))
 
+  const baseOptions: TuningOptions = {
+    primeMapping: true,
+    units: 'cents'
+  }
+
   const options = computed<TuningOptions>(() => {
     if (tempering.value === 'CTE') {
       return {
+        ...baseOptions,
         temperEquaves: true,
         constraints: constraints.value,
         weights: weights.value
       }
     } else if (tempering.value === 'TE') {
       return {
+        ...baseOptions,
         temperEquaves: true,
         weights: weights.value
       }
     } else {
-      return { weights: weights.value }
+      return {
+        ...baseOptions,
+        weights: weights.value
+      }
     }
   })
 
@@ -88,12 +95,12 @@ function makeState(method: Ref, subgroupStringDefault = '') {
   watch(subgroup, (newValue, oldValue) => {
     if (
       !constraintsString.value.length ||
-      (oldValue.basis.length && constraintsString.value === fractionToString(oldValue.basis[0]))
+      (oldValue.basis.length && constraintsString.value === oldValue.basis[0].toFraction())
     ) {
       if (!newValue.basis.length) {
         constraintsString.value = ''
       } else {
-        constraintsString.value = fractionToString(newValue.basis[0])
+        constraintsString.value = newValue.basis[0].toFraction()
       }
     }
   })
@@ -107,8 +114,9 @@ function makeState(method: Ref, subgroupStringDefault = '') {
     tempering,
     constraintsString,
     vals,
-    rawCommas,
+    valsError,
     commas,
+    commasError,
     subgroup,
     weights,
     options
@@ -354,31 +362,45 @@ export const useLatticeStore = defineStore('lattice', () => {
   const state = makeState(method)
   // method: "generators"
   const basisString = ref('')
-  const dimensions = reactive<number[]>([])
+  const ups = reactive<number[]>([])
+  const downs = reactive<number[]>([])
   const equaveString = ref('2/1')
   const equave = ref(OCTAVE)
   const showAdvanced = ref(false)
 
   const [basis, basisError] = computedAndError(() => {
-    return parseChordInput(basisString.value)
+    return parseChord(basisString.value)
   }, [])
 
   watch(basis, () => {
-    while (dimensions.length < basis.value.length) {
-      dimensions.push(2)
+    while (ups.length < basis.value.length) {
+      ups.push(1)
+    }
+    while (downs.length < basis.value.length) {
+      downs.push(0)
+    }
+  })
+
+  const dimensions = computed(() => {
+    const result: number[] = []
+    for (let i = 0; i < basis.value.length; ++i) {
+      result.push(1 + ups[i] + downs[i])
     }
+    return result
   })
 
   return {
     ...state,
     method,
     basisString,
-    dimensions,
+    ups,
+    downs,
     equaveString,
     equave,
     showAdvanced,
     basis,
-    basisError
+    basisError,
+    dimensions
   }
 })
 
@@ -388,7 +410,7 @@ export const useTemperStore = defineStore('temper', () => {
   const error = ref('')
   const state = makeState(method)
   // method: "mapping"
-  const mappingString = ref('1200, 1897.2143, 2788.8573')
+  const mappingString = ref('1200., 1897.2143, 2788.8573')
   // method: "vals"
   const convertToEdoSteps = ref(false)
   // Advanced
@@ -397,19 +419,16 @@ export const useTemperStore = defineStore('temper', () => {
   // === Computed state ===
   const vals = state.vals
   const subgroup = state.subgroup
-  const edoUnavailable = computed(() => vals.value.length !== 1)
+  const edoAvailable = computed(() => vals.value.length === 1)
 
-  const constraintsDisabled = computed(() => subgroup.value.basis.length > MAX_GEO_SUBGROUP_SIZE)
+  const constraintsAvailable = computed(() => subgroup.value.basis.length <= MAX_GEO_SUBGROUP_SIZE)
 
   // === Methods ===
 
   // Expand out the residual in the `ExtendedMonzo` and ignore cents offsets
-  function toLongMonzo(monzo: ExtendedMonzo) {
+  function toLongMonzo(monzo: TimeMonzo) {
     const base = resolveMonzo(monzo.residual)
-    return add(
-      base,
-      monzo.vector.map((component) => component.valueOf())
-    )
+    return add(base, monzo.toIntegerMonzo())
   }
 
   return {
@@ -419,8 +438,8 @@ export const useTemperStore = defineStore('temper', () => {
     mappingString,
     convertToEdoSteps,
     showAdvanced,
-    edoUnavailable,
-    constraintsDisabled,
+    edoAvailable,
+    constraintsAvailable,
     toLongMonzo
   }
 })
diff --git a/src/synth.ts b/src/synth.ts
index 046e2f82..43873bed 100644
--- a/src/synth.ts
+++ b/src/synth.ts
@@ -1,11 +1,12 @@
-// Exponential approach conversion, smaller value results in more eager envelopes
-const TIME_CONSTANT = 0.5
+// Classic variants are from Scale Workshop 2, they're softer on SW3.
 
-// Large but finite number to signify voices that are off
-const EXPIRED = 10000
+import { AperiodicWave } from 'sw-synth'
+import { centsToValue, valueToCents } from 'xen-dev-utils'
+import { ceilPow2 } from './utils'
+import { computed, type ComputedRef } from 'vue'
 
 export const BASIC_WAVEFORMS = ['sine', 'square', 'sawtooth', 'triangle']
-export const WAVEFORMS = BASIC_WAVEFORMS.concat([
+export const CUSTOM_WAVEFORMS = [
   'warm1',
   'warm2',
   'warm3',
@@ -19,51 +20,97 @@ export const WAVEFORMS = BASIC_WAVEFORMS.concat([
   'didacus',
   'bohlen',
   'glass',
-  'boethius'
-])
-const CUSTOM_WAVEFORMS: Record<string, PeriodicWave> = {}
-
-export function initializeCustomWaveforms(audioContext: AudioContext) {
-  CUSTOM_WAVEFORMS.warm1 = audioContext.createPeriodicWave(
-    new Float32Array([0, 10, 2, 2, 2, 1, 1, 0.5]),
-    new Float32Array([0, 0, 0, 0, 0, 0, 0, 0])
+  'boethius',
+  'gold',
+  'rich-classic',
+  'slender-classic',
+  'didacus-classic',
+  'bohlen-classic',
+  'glass-classic',
+  'boethius-classic'
+]
+export const WAVEFORMS = BASIC_WAVEFORMS.concat(CUSTOM_WAVEFORMS)
+export const PERIODIC_WAVES: Record<string, ComputedRef<PeriodicWave>> = {}
+
+export const APERIODIC_WAVEFORMS = [
+  'tin',
+  'bronze',
+  'steel',
+  'silver',
+  'platinum',
+  'pelog',
+  'slendro',
+  '12-TET'
+]
+export const APERIODIC_WAVES: Record<string, ComputedRef<AperiodicWave>> = {}
+
+export function initializePeriodic(audioContext: BaseAudioContext) {
+  PERIODIC_WAVES.warm1 = computed(() =>
+    audioContext.createPeriodicWave(
+      new Float32Array([0, 10, 2, 2, 2, 1, 1, 0.5]),
+      new Float32Array([0, 0, 0, 0, 0, 0, 0, 0])
+    )
   )
 
-  CUSTOM_WAVEFORMS.warm2 = audioContext.createPeriodicWave(
-    new Float32Array([0, 10, 5, 3.33, 2, 1]),
-    new Float32Array([0, 0, 0, 0, 0, 0])
+  PERIODIC_WAVES.warm2 = computed(() =>
+    audioContext.createPeriodicWave(
+      new Float32Array([0, 10, 5, 3.33, 2, 1]),
+      new Float32Array([0, 0, 0, 0, 0, 0])
+    )
   )
-  CUSTOM_WAVEFORMS.warm3 = audioContext.createPeriodicWave(
-    new Float32Array([0, 10, 5, 5, 3]),
-    new Float32Array([0, 0, 0, 0, 0])
+  PERIODIC_WAVES.warm3 = computed(() =>
+    audioContext.createPeriodicWave(
+      new Float32Array([0, 10, 5, 5, 3]),
+      new Float32Array([0, 0, 0, 0, 0])
+    )
   )
-  CUSTOM_WAVEFORMS.warm4 = audioContext.createPeriodicWave(
-    new Float32Array([0, 10, 2, 2, 1]),
-    new Float32Array([0, 0, 0, 0, 0])
+  PERIODIC_WAVES.warm4 = computed(() =>
+    audioContext.createPeriodicWave(
+      new Float32Array([0, 10, 2, 2, 1]),
+      new Float32Array([0, 0, 0, 0, 0])
+    )
   )
-  CUSTOM_WAVEFORMS.octaver = audioContext.createPeriodicWave(
-    new Float32Array([0, 1000, 500, 0, 333, 0, 0, 0, 250, 0, 0, 0, 0, 0, 0, 0, 166]),
-    new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
+  PERIODIC_WAVES.octaver = computed(() =>
+    audioContext.createPeriodicWave(
+      new Float32Array([0, 1000, 500, 0, 333, 0, 0, 0, 250, 0, 0, 0, 0, 0, 0, 0, 166]),
+      new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
+    )
   )
-  CUSTOM_WAVEFORMS.brightness = audioContext.createPeriodicWave(
-    new Float32Array([0, 10, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 0.75, 0.5, 0.2, 0.1]),
-    new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
+  PERIODIC_WAVES.brightness = computed(() =>
+    audioContext.createPeriodicWave(
+      new Float32Array([
+        0, 10, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 0.75, 0.5, 0.2, 0.1
+      ]),
+      new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
+    )
   )
-  CUSTOM_WAVEFORMS.harmonicbell = audioContext.createPeriodicWave(
-    new Float32Array([0, 10, 2, 2, 2, 2, 0, 0, 0, 0, 0, 7]),
-    new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
+  PERIODIC_WAVES.harmonicbell = computed(() =>
+    audioContext.createPeriodicWave(
+      new Float32Array([0, 10, 2, 2, 2, 2, 0, 0, 0, 0, 0, 7]),
+      new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
+    )
   )
 
   // DC-blocked semisine
-  const semisineSineComponents = new Float32Array(64)
-  const semisineCosineComponents = new Float32Array(64)
-  for (let n = 1; n < 64; ++n) {
-    semisineCosineComponents[n] = 1 / (1 - 4 * n * n)
-  }
-  CUSTOM_WAVEFORMS.semisine = audioContext.createPeriodicWave(
-    semisineCosineComponents,
-    semisineSineComponents
-  )
+  PERIODIC_WAVES.semisine = computed(() => {
+    const semisineSineComponents = new Float32Array(64)
+    const semisineCosineComponents = new Float32Array(64)
+    for (let n = 1; n < 64; ++n) {
+      semisineCosineComponents[n] = 1 / (1 - 4 * n * n)
+    }
+    return audioContext.createPeriodicWave(semisineCosineComponents, semisineSineComponents)
+  })
+
+  const zeros = new Float32Array(101)
+
+  // N squared waveform (harmonic entry in the metallic series)
+  PERIODIC_WAVES.gold = computed(() => {
+    const goldComponents = new Float32Array(101)
+    for (let n = 1; n <= 10; ++n) {
+      goldComponents[n * n] = n ** -0.75
+    }
+    return audioContext.createPeriodicWave(zeros, goldComponents)
+  })
 
   // Subgroup optimized waveforms
   // Name     | Factors
@@ -74,260 +121,258 @@ export function initializeCustomWaveforms(audioContext: AudioContext) {
   // glass    | 2,7,11
   // boethius | 2,3,19
 
-  const zeros = new Float32Array(101)
-  const rich = new Float32Array(101)
-  const slender = new Float32Array(101)
-  const didacus = new Float32Array(101)
-  const bohlen = new Float32Array(101)
-  const glass = new Float32Array(101)
-  const boethius = new Float32Array(101)
-
-  // No multiples of 13, 17 or primes above 23
-  const lowPrimeHarmonics = [
-    1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 18, 19, 20, 21, 22, 24, 25, 27, 28, 30, 32,
-    33, 35, 36, 38, 40, 42, 44, 45, 48, 49, 50, 54, 55, 56, 57, 60, 63, 64, 66, 70, 72, 75, 76, 77,
-    80, 81, 84, 88, 90, 95, 96, 98, 99, 100
-  ]
-
-  lowPrimeHarmonics.forEach((n) => {
-    const m = 1 / n
-    if (n % 11 && n % 19) {
-      if (n % 7) {
-        rich[n] = m
-      }
-      if (n % 5) {
-        slender[n] = m
-      }
-      if (n % 3) {
-        didacus[n] = m
-      }
-      if (n % 2) {
-        bohlen[n] = m
+  const subgroupWaveforms = computed(() => {
+    const rich = new Float32Array(101)
+    const richClassic = new Float32Array(101)
+    const slender = new Float32Array(101)
+    const slenderClassic = new Float32Array(101)
+    const didacus = new Float32Array(101)
+    const didacusClassic = new Float32Array(101)
+    const bohlen = new Float32Array(101)
+    const bohlenClassic = new Float32Array(101)
+    const glass = new Float32Array(101)
+    const glassClassic = new Float32Array(101)
+    const boethius = new Float32Array(101)
+    const boethiusClassic = new Float32Array(101)
+
+    // No multiples of 13, 17 or primes above 23
+    const lowPrimeHarmonics = [
+      1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 18, 19, 20, 21, 22, 24, 25, 27, 28, 30, 32,
+      33, 35, 36, 38, 40, 42, 44, 45, 48, 49, 50, 54, 55, 56, 57, 60, 63, 64, 66, 70, 72, 75, 76,
+      77, 80, 81, 84, 88, 90, 95, 96, 98, 99, 100
+    ]
+
+    lowPrimeHarmonics.forEach((n) => {
+      // Classics are saw-like
+      const m = 1 / n
+      // Modern is softer and "pink"
+      const p = n ** -1.5
+      if (n % 11 && n % 19) {
+        if (n % 7) {
+          richClassic[n] = m
+          rich[n] = p
+        }
+        if (n % 5) {
+          slenderClassic[n] = m
+          slender[n] = p
+        }
+        if (n % 3) {
+          didacusClassic[n] = m
+          didacus[n] = p
+        }
+        if (n % 2) {
+          bohlenClassic[n] = m
+          bohlen[n] = p
+        }
       }
-    }
-    if (n % 3 && n % 5 && n % 19) {
-      if (n % 7 && n % 11) {
-        glass[n] = m
-      } else {
-        glass[n] = 2 * m
+      if (n % 3 && n % 5 && n % 19) {
+        if (n % 7 && n % 11) {
+          glassClassic[n] = m
+          glass[n] = p
+        } else {
+          glassClassic[n] = 2 * m
+          glass[n] = 2 * p
+        }
       }
-    }
-    if (n % 5 && n % 7 && n % 11) {
-      if (n % 19) {
-        boethius[n] = m
-      } else {
-        boethius[n] = 2 * m
+      if (n % 5 && n % 7 && n % 11) {
+        if (n % 19) {
+          boethiusClassic[n] = m
+          boethius[n] = p
+        } else {
+          boethiusClassic[n] = 2 * m
+          boethius[n] = 2 * p
+        }
       }
+    })
+    return {
+      richClassic,
+      rich,
+      slenderClassic,
+      slender,
+      didacusClassic,
+      didacus,
+      bohlenClassic,
+      bohlen,
+      glassClassic,
+      glass,
+      boethiusClassic,
+      boethius
     }
   })
 
-  CUSTOM_WAVEFORMS.rich = audioContext.createPeriodicWave(zeros, rich)
-  CUSTOM_WAVEFORMS.slender = audioContext.createPeriodicWave(zeros, slender)
-  CUSTOM_WAVEFORMS.didacus = audioContext.createPeriodicWave(zeros, didacus)
-  CUSTOM_WAVEFORMS.bohlen = audioContext.createPeriodicWave(zeros, bohlen)
-  CUSTOM_WAVEFORMS.glass = audioContext.createPeriodicWave(zeros, glass)
-  CUSTOM_WAVEFORMS.boethius = audioContext.createPeriodicWave(zeros, boethius)
+  PERIODIC_WAVES['rich-classic'] = computed(() =>
+    audioContext.createPeriodicWave(zeros, subgroupWaveforms.value.richClassic)
+  )
+  PERIODIC_WAVES.rich = computed(() =>
+    audioContext.createPeriodicWave(zeros, subgroupWaveforms.value.rich)
+  )
+  PERIODIC_WAVES['slender-classic'] = computed(() =>
+    audioContext.createPeriodicWave(zeros, subgroupWaveforms.value.slenderClassic)
+  )
+  PERIODIC_WAVES.slender = computed(() =>
+    audioContext.createPeriodicWave(zeros, subgroupWaveforms.value.slender)
+  )
+  PERIODIC_WAVES['didacus-classic'] = computed(() =>
+    audioContext.createPeriodicWave(zeros, subgroupWaveforms.value.didacusClassic)
+  )
+  PERIODIC_WAVES.didacus = computed(() =>
+    audioContext.createPeriodicWave(zeros, subgroupWaveforms.value.didacus)
+  )
+  PERIODIC_WAVES['bohlen-classic'] = computed(() =>
+    audioContext.createPeriodicWave(zeros, subgroupWaveforms.value.bohlenClassic)
+  )
+  PERIODIC_WAVES.bohlen = computed(() =>
+    audioContext.createPeriodicWave(zeros, subgroupWaveforms.value.bohlen)
+  )
+  PERIODIC_WAVES['glass-classic'] = computed(() =>
+    audioContext.createPeriodicWave(zeros, subgroupWaveforms.value.glassClassic)
+  )
+  PERIODIC_WAVES.glass = computed(() =>
+    audioContext.createPeriodicWave(zeros, subgroupWaveforms.value.glass)
+  )
+  PERIODIC_WAVES['boethius-classic'] = computed(() =>
+    audioContext.createPeriodicWave(zeros, subgroupWaveforms.value.boethiusClassic)
+  )
+  PERIODIC_WAVES.boethius = computed(() =>
+    audioContext.createPeriodicWave(zeros, subgroupWaveforms.value.boethius)
+  )
 }
 
-// Tracking numbers for voice stealing
-// Technically we could run out of note identifiers,
-// but who is going to play 9007199254740991 notes in one session?
-let NOTE_ID = 1
-
-// Tracking numbers for logging purposes
-let VOICE_ID = 1
-
-// Simple combination of envelope and oscillator
-class Voice {
-  age: number
-  audioContext: AudioContext
-  oscillator: OscillatorNode
-  envelope: GainNode
-  log: (msg: string) => void
-  noteId: number
-  voiceId: number
-  lastNoteOff?: () => void
-
-  constructor(audioContext: AudioContext, destination: AudioNode, log: (msg: string) => void) {
-    this.age = EXPIRED
-    this.audioContext = audioContext
-
-    this.oscillator = this.audioContext.createOscillator()
-    this.envelope = this.audioContext.createGain()
-    this.oscillator.connect(this.envelope).connect(destination)
-    const now = this.audioContext.currentTime
-    this.envelope.gain.setValueAtTime(0, now)
-    this.oscillator.start(now)
-    this.oscillator.addEventListener('ended', () => {
-      this.envelope.disconnect()
-      this.oscillator.disconnect()
-    })
-
-    this.log = log
-
-    this.noteId = 0
-    this.voiceId = VOICE_ID++
-  }
-
-  noteOn(
-    audioDelay: number,
-    frequency: number,
-    velocity: number,
-    waveform: string,
-    attackTime: number,
-    decayTime: number,
-    sustainLevel: number,
-    releaseTime: number,
-    noteId: number
-  ) {
-    this.log(`Voice ${this.voiceId}: Age = ${this.age}, note = ${noteId}, frequency = ${frequency}`)
-    this.age = 0
-    this.noteId = noteId
-
-    if (BASIC_WAVEFORMS.includes(waveform)) {
-      this.oscillator.type = waveform as OscillatorType
-    } else {
-      this.oscillator.setPeriodicWave(CUSTOM_WAVEFORMS[waveform])
-    }
+function initializeAperiodic(audioContext: BaseAudioContext) {
+  const ns = [...Array(129).keys()]
+  ns.shift()
+  const amplitudes = ns.map((n) => 0.3 * n ** -1.5)
+  const maxNumberOfVoices = 7
+  const tolerance = 0.1 // In cents
+  APERIODIC_WAVES['tin'] = computed(
+    () =>
+      new AperiodicWave(
+        audioContext,
+        ns.map((n) => n ** (8 / 9)),
+        amplitudes,
+        maxNumberOfVoices,
+        tolerance
+      )
+  )
+  APERIODIC_WAVES['steel'] = computed(
+    () =>
+      new AperiodicWave(
+        audioContext,
+        ns.map((n) => n ** 1.5),
+        amplitudes,
+        maxNumberOfVoices,
+        tolerance
+      )
+  )
+  APERIODIC_WAVES['bronze'] = computed(
+    () =>
+      new AperiodicWave(
+        audioContext,
+        ns.map((n) => n ** (4 / 3)),
+        amplitudes,
+        maxNumberOfVoices,
+        tolerance
+      )
+  )
+  APERIODIC_WAVES['silver'] = computed(
+    () =>
+      new AperiodicWave(
+        audioContext,
+        ns.map((n) => n ** (5 / 3)),
+        amplitudes,
+        maxNumberOfVoices,
+        tolerance
+      )
+  )
+  APERIODIC_WAVES['platinum'] = computed(
+    () =>
+      new AperiodicWave(
+        audioContext,
+        ns.slice(0, 32).map((n) => n ** 2.5),
+        amplitudes.slice(0, 32),
+        maxNumberOfVoices,
+        tolerance
+      )
+  )
 
-    const now = this.audioContext.currentTime + audioDelay
-    this.log(`Voice ${this.voiceId}: On time = ${now}, sustain time = ${now + attackTime}`)
-    this.oscillator.frequency.setValueAtTime(frequency, now)
-    this.envelope.gain.setValueAtTime(0, now)
-    this.envelope.gain.linearRampToValueAtTime(velocity, now + attackTime)
-    this.envelope.gain.setTargetAtTime(
-      velocity * sustainLevel,
-      now + attackTime,
-      decayTime * TIME_CONSTANT
+  APERIODIC_WAVES['pelog'] = computed(() => {
+    const pelogSpectrum = [
+      0, 670, 1215, 1885, 2430, 2700, 3380, 4315, 4430, 4980, 5645, 5810, 6075, 6195, 6345, 6615,
+      6745, 6860, 7025, 7290, 7410, 7560, 7830, 7960, 8075, 8240
+    ].map((c) => centsToValue(0.999 * c))
+    const pelogAmplitudes = pelogSpectrum.map((_, i) => (i + 1) ** -1.2)
+    pelogAmplitudes[1] = 0.1
+    pelogAmplitudes[4] = 0.3
+    pelogAmplitudes[6] = 0.2
+    pelogAmplitudes[10] = 0.15
+    pelogSpectrum.push(9)
+    pelogAmplitudes.push(0.15)
+    pelogSpectrum.push(16)
+    pelogAmplitudes.push(0.09)
+    pelogSpectrum.push(64)
+    pelogAmplitudes.push(0.06)
+    return new AperiodicWave(
+      audioContext,
+      pelogSpectrum,
+      pelogAmplitudes.map((a) => 0.33 * a),
+      maxNumberOfVoices,
+      tolerance
     )
+  })
 
-    const noteOff = () => {
-      // Do nothing if the voice has been stolen or already released.
-      if (this.noteId !== noteId) {
-        this.log(`Voice ${this.voiceId} had been stolen. Ignoring note off`)
-        return
+  APERIODIC_WAVES['slendro'] = computed(() => {
+    const slendroSpectrum = [
+      0, 717, 1208, 1682, 1925, 2416, 2647, 3371, 3624, 4579, 4832, 5063, 5549, 5787, 6040, 6271,
+      6514, 6757, 6995, 7248, 7479, 7722, 7965, 8203
+    ].map(centsToValue)
+    const slendroAmplitudes = slendroSpectrum.map((_, i) => (i + 1) ** -1.5)
+    slendroAmplitudes[1] = 0.01
+    for (let h = 2; h < 128; ++h) {
+      for (let i = 0; i < slendroSpectrum.length; ++i) {
+        if (Math.abs(Math.log(slendroSpectrum[i] / h)) < 0.01) {
+          slendroSpectrum[i] = Math.cbrt(h * slendroSpectrum[i] ** 2)
+          slendroAmplitudes[i] = 1.5 * (i + 1) ** -0.9
+          break
+        }
       }
-      this.age = EXPIRED
-      const then = this.audioContext.currentTime
-      this.log(`Voice ${this.voiceId}: Off time = ${then}`)
-      this.envelope.gain.cancelScheduledValues(then)
-      // NOTE: Canceling scheduled values doesn't hold intermediate values of linear ramps
-      if (then < now + attackTime) {
-        // Calculate correct linear ramp hold value
-        this.envelope.gain.setValueAtTime((velocity * (then - now)) / attackTime, then)
-      }
-      this.envelope.gain.setTargetAtTime(0, then, releaseTime * TIME_CONSTANT)
-
-      // We're done here.
-      this.noteId = -1
     }
+    return new AperiodicWave(
+      audioContext,
+      slendroSpectrum,
+      slendroAmplitudes.map((a) => 0.3 * a),
+      maxNumberOfVoices,
+      tolerance
+    )
+  })
 
-    this.lastNoteOff = noteOff
-
-    return noteOff
-  }
-
-  dispose() {
-    this.oscillator.stop()
-  }
-}
-
-// Simple web audio synth of finite polyphony.
-export class Synth {
-  audioContext: AudioContext
-  destination: AudioNode
-  audioDelay: number
-  waveform: string
-  attackTime: number
-  decayTime: number
-  sustainLevel: number
-  releaseTime: number
-  log: (msg: string) => void
-  voices: Voice[]
-
-  constructor(
-    audioContext: AudioContext,
-    destination: AudioNode,
-    audioDelay = 0.001,
-    waveform = 'semisine',
-    attackTime = 0.01,
-    decayTime = 0.3,
-    sustainLevel = 0.8,
-    releaseTime = 0.01,
-    maxPolyphony = 6,
-    log?: (msg: string) => void
-  ) {
-    this.audioContext = audioContext
-    this.destination = destination
-    this.audioDelay = audioDelay
-    this.waveform = waveform
-    this.attackTime = attackTime
-    this.decayTime = decayTime
-    this.sustainLevel = sustainLevel
-    this.releaseTime = releaseTime
-    if (log === undefined) {
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      this.log = (msg: string) => {}
-    } else {
-      this.log = log
-    }
-
-    this.voices = []
-    this.setPolyphony(maxPolyphony)
-  }
-
-  setPolyphony(maxPolyphony: number) {
-    while (this.voices.length > maxPolyphony) {
-      this.voices.pop()?.dispose()
-    }
-    while (this.voices.length < maxPolyphony) {
-      this.voices.push(new Voice(this.audioContext, this.destination, this.log))
-    }
-  }
-
-  get maxPolyphony() {
-    return this.voices.length
-  }
-  set maxPolyphony(value: number) {
-    this.setPolyphony(value)
-  }
-
-  noteOn(frequency: number, velocity: number) {
-    // Allocate voices based on age.
-    // Boils down to:
-    // a) Pick the oldest released voice.
-    // b) If there are no released voices, replace the oldest currently playing voice.
-    let oldestVoice: Voice | undefined
-    for (const voice of this.voices) {
-      voice.age++
-      if (oldestVoice === undefined || voice.age > oldestVoice.age) {
-        oldestVoice = voice
+  APERIODIC_WAVES['12-TET'] = computed(() => {
+    const twelveSpectrumCents: number[] = []
+    const twelveAmplitudes: number[] = []
+    for (let h = 1; h <= 128; ++h) {
+      const cents = valueToCents(h)
+      const closest = Math.round(cents / 100) * 100
+      if (Math.abs(cents - closest) < 15) {
+        twelveSpectrumCents.push((3 * closest + cents) / 4)
+        if (h === ceilPow2(h)) {
+          twelveAmplitudes.push(0.3 * h ** -2)
+        } else {
+          twelveAmplitudes.push(0.6 * h ** -1.5)
+        }
       }
     }
-    if (oldestVoice === undefined) {
-      return () => {}
-    }
-
-    return oldestVoice.noteOn(
-      this.audioDelay,
-      frequency,
-      velocity,
-      this.waveform,
-      this.attackTime,
-      this.decayTime,
-      this.sustainLevel,
-      this.releaseTime,
-      NOTE_ID++
+    return new AperiodicWave(
+      audioContext,
+      twelveSpectrumCents.map(centsToValue),
+      twelveAmplitudes,
+      maxNumberOfVoices,
+      tolerance
     )
-  }
+  })
+}
 
-  allNotesOff() {
-    for (const voice of this.voices) {
-      if (voice.lastNoteOff !== undefined) {
-        voice.lastNoteOff()
-      }
-    }
-  }
+export function initializeCustomWaves(audioContext: BaseAudioContext) {
+  initializePeriodic(audioContext)
+  initializeAperiodic(audioContext)
 }
 
 // Simple feedback loop bouncing sound between left and right channels.
diff --git a/src/tempering.ts b/src/tempering.ts
index 32af8c59..4c0fdac4 100644
--- a/src/tempering.ts
+++ b/src/tempering.ts
@@ -4,14 +4,10 @@ import {
   type SubgroupValue,
   Temperament,
   type TuningOptions,
-  fromWarts,
-  type Weights,
-  Subgroup,
-  type JipOrLimit
+  Subgroup
 } from 'temperaments'
 import { DEFAULT_NUMBER_OF_COMPONENTS } from './constants'
-import { PRIME_CENTS, valueToCents, type FractionValue, type Monzo } from 'xen-dev-utils'
-import { Interval, Scale } from 'scale-workshop-core'
+import { PRIME_CENTS, type FractionValue, type Monzo } from 'xen-dev-utils'
 
 export function toPrimeMapping(mapping: number[], subgroup: Subgroup) {
   const result = subgroup.toPrimeMapping(mapping)
@@ -25,129 +21,6 @@ export function toPrimeMapping(mapping: number[], subgroup: Subgroup) {
   return result as number[]
 }
 
-export class Mapping {
-  vector: number[]
-
-  constructor(vector: number[]) {
-    this.vector = vector
-  }
-
-  static fromVals(
-    vals: (Val | number | string)[],
-    numberOfComponents: number,
-    subgroup: SubgroupValue,
-    options?: TuningOptions
-  ) {
-    const temperament = Temperament.fromVals(vals, subgroup)
-    return Mapping.fromTemperament(temperament, numberOfComponents, options)
-  }
-
-  static fromCommas(
-    commaList: (Monzo | FractionValue)[],
-    numberOfComponents: number,
-    subgroup?: SubgroupValue,
-    options?: TuningOptions
-  ) {
-    const temperament = Temperament.fromCommas(commaList, subgroup, true)
-    return Mapping.fromTemperament(temperament, numberOfComponents, options)
-  }
-
-  static fromTemperament(
-    temperament: Temperament,
-    numberOfComponents: number,
-    options?: TuningOptions
-  ) {
-    options = Object.assign({}, options || {})
-    options.primeMapping = true
-    options.units = 'cents'
-    const mapping = temperament.getMapping(options)
-    if (mapping.length > numberOfComponents) {
-      throw new Error('Not enough components to represent mapping')
-    }
-    while (mapping.length < numberOfComponents) {
-      mapping.push(PRIME_CENTS[mapping.length])
-    }
-
-    return new Mapping(mapping)
-  }
-
-  static fromWarts(wartToken: number | string, jipOrLimit: JipOrLimit, equaveCents?: number) {
-    // XXX: There's something weird going on with how fromWarts gets transpiled
-    let mapping: Val
-    if (typeof jipOrLimit === 'number') {
-      mapping = fromWarts(wartToken, jipOrLimit)
-    } else {
-      mapping = fromWarts(wartToken, jipOrLimit)
-    }
-    if (!mapping.length) {
-      throw new Error('Failed to produce mapping')
-    }
-    if (equaveCents === undefined) {
-      if (Array.isArray(jipOrLimit)) {
-        equaveCents = jipOrLimit[0]
-      } else {
-        equaveCents = 1200
-      }
-    }
-    const vector: number[] = []
-    mapping.forEach((steps) => {
-      vector.push((equaveCents! * steps) / mapping[0])
-    })
-    return new Mapping(vector)
-  }
-
-  get size() {
-    return this.vector.length
-  }
-
-  pureOctaves() {
-    const purifier = 1200 / this.vector[0]
-    return new Mapping(this.vector.map((component) => component * purifier))
-  }
-
-  apply(interval: Interval): Interval
-  apply(scale: Scale): Scale
-  apply(intervalOrScale: Interval | Scale): Interval | Scale {
-    if (intervalOrScale instanceof Interval) {
-      const interval = intervalOrScale
-      const monzo = interval.monzo
-      const totalCents = monzo.totalCents()
-      if (!totalCents) {
-        return interval
-      }
-      const cents =
-        monzo.vector
-          .map((component, i) => component.valueOf() * this.vector[i])
-          .reduce((a, b) => a + b) +
-        valueToCents(monzo.residual.valueOf()) +
-        monzo.cents
-      const tempered = monzo.stretch(cents / totalCents)
-      return new Interval(tempered, interval.type, interval.name, interval.options)
-    }
-    const scale = intervalOrScale
-    const intervals = scale.intervals.map((interval) => this.apply(interval))
-    return new Scale(intervals, this.apply(scale.equave), scale.baseFrequency)
-  }
-}
-
-// (TE-)optimized equal temperaments
-export function makeRank1(val: Val | string | number, subgroup: SubgroupValue, weights?: Weights) {
-  subgroup = new Subgroup(subgroup)
-  if (typeof val === 'number' || typeof val === 'string') {
-    val = subgroup.fromWarts(val)
-  }
-
-  const equave = subgroup.basis[0]
-  const divisions = val[0]
-  const scale = Scale.fromEqualTemperament(divisions, equave, DEFAULT_NUMBER_OF_COMPONENTS)
-
-  const mapping = Mapping.fromVals([val], DEFAULT_NUMBER_OF_COMPONENTS, subgroup, {
-    temperEquaves: true,
-    weights
-  })
-  return mapping.apply(scale)
-}
-
 function mosPatternsRank2(
   temperament: Temperament,
   maxSize?: number,
@@ -247,39 +120,3 @@ export function makeRank2FromCommas(
   }
   return makeRank2(temperament, size, options)
 }
-
-export function stretchToEdo(interval: Interval, steps: number, edo: number): Interval
-export function stretchToEdo(scale: Scale, steps: number[], edo: number): Scale
-export function stretchToEdo(
-  intervalOrScale: Interval | Scale,
-  steps: number | number[],
-  edo: number
-): Interval | Scale {
-  if (intervalOrScale instanceof Interval) {
-    if (Array.isArray(steps)) {
-      throw new Error('Steps must be a single number')
-    }
-    const interval = intervalOrScale
-    const monzo = interval.monzo
-    const totalCents = monzo.totalCents()
-    if (!totalCents) {
-      return interval
-    }
-    const targetCents = (1200.0 * steps) / edo + monzo.cents
-    const tempered = monzo.stretch(targetCents / totalCents)
-    return new Interval(tempered, interval.type, interval.name, interval.options)
-  }
-  if (!Array.isArray(steps)) {
-    throw new Error('Steps must be an array of numbers')
-  }
-  const scale = intervalOrScale
-  if (steps.length !== scale.size + 1) {
-    throw new Error('Steps must align with the scale')
-  }
-  const intervals = scale.intervals.map((interval, i) => stretchToEdo(interval, steps[i], edo))
-  return new Scale(
-    intervals,
-    stretchToEdo(scale.equave, steps[steps.length - 1], edo),
-    scale.baseFrequency
-  )
-}
diff --git a/src/utils.ts b/src/utils.ts
index 78affe6d..8e0ee026 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,7 +1,56 @@
-import { parseChord } from 'scale-workshop-core'
 import { computed, type ComputedRef } from 'vue'
 import { gcd, mmod } from 'xen-dev-utils'
-import { DEFAULT_NUMBER_OF_COMPONENTS } from './constants'
+import {
+  evaluateExpression,
+  getSourceVisitor,
+  Interval,
+  parseAST,
+  repr,
+  StatementVisitor
+} from 'sonic-weave'
+
+/**
+ * Calculate the smallest power of two greater or equal to the input value.
+ * @param x Integer to compare to.
+ * @returns Smallest `2**n` such that `x <= 2**n`.
+ */
+export function ceilPow2(x: number) {
+  return 1 << (32 - Math.clz32(x - 1))
+}
+
+export function parseInterval(input: string) {
+  if (!input.trim()) {
+    throw new Error('No input')
+  }
+  const result = evaluateExpression(input)
+  if (result instanceof Interval) {
+    return result
+  }
+  throw new Error('Must evaluate to an interval')
+}
+
+export function decimalString(amount: number) {
+  const result = amount.toString()
+  if (result.includes('e')) {
+    return result
+  }
+  return result + 'e'
+}
+
+export function centString(cents: number, fractionDigits?: number) {
+  const result = fractionDigits === undefined ? cents.toString() : cents.toFixed(fractionDigits)
+  if (result.includes('e')) {
+    return result + ' c'
+  }
+  if (!result.includes('.')) {
+    return result + '.'
+  }
+  return result
+}
+
+export function parseCents(cents: number, fractionDigits?: number) {
+  return parseInterval(centString(cents, fractionDigits))
+}
 
 // Split at whitespace, pipes, amps, colons, semicolons and commas
 export const SEPARATOR_RE = /\s|\||&|:|;|,/
@@ -10,8 +59,32 @@ export function splitText(text: string) {
   return text.split(SEPARATOR_RE).filter((token) => token.length)
 }
 
-export function parseChordInput(input: string) {
-  return parseChord(input, DEFAULT_NUMBER_OF_COMPONENTS, SEPARATOR_RE)
+export function expandCode(source: string) {
+  const globalVisitor = getSourceVisitor()
+  const defaults = globalVisitor.rootContext.clone()
+  const visitor = new StatementVisitor(globalVisitor.rootContext, globalVisitor)
+  const ast = parseAST(source)
+  for (const statement of ast.body) {
+    const interupt = visitor.visit(statement)
+    if (interupt) {
+      throw new Error('Illegal statement.')
+    }
+  }
+  return visitor.expand(defaults)
+}
+
+export function arrayToString(values: Interval[] | number[] | string[]) {
+  if (!values.length) {
+    return '[]'
+  }
+  if (typeof values[0] === 'number') {
+    return `[${values.map((v) => v.toString()).join(', ')}]`
+  }
+  if (typeof values[0] === 'string') {
+    return `[${values.map((v) => JSON.stringify(v)).join(', ')}]`
+  }
+  const visitor = getSourceVisitor().createExpressionVisitor()
+  return repr.bind(visitor)(values as Interval[])
 }
 
 export function debounce(func: (...args: any[]) => void, timeout = 300) {
@@ -182,7 +255,7 @@ export function autoKeyColors(size: number) {
 export function gapKeyColors(generatorPerPeriod: number, size: number, down: number, flats = true) {
   const scale = [...Array(size).keys()].map((i) => mmod(generatorPerPeriod * (i - down), 1))
   scale.sort((a, b) => a - b)
-  const colors = Array(size).fill('white')
+  const colors: ('white' | 'black')[] = Array(size).fill('white')
 
   let i = size - down
   let delta = 1
@@ -313,3 +386,59 @@ export function spineLabel(fifthsUp: number, style: AccidentalStyle = 'double'):
   }
   return label
 }
+
+const ENHARMONICS = [
+  ['C=', 'B#', 'Dbb'],
+  ['C#', 'Db'],
+  ['D=', 'C##', 'Ebb'],
+  ['Eb', 'D#'],
+  ['E=', 'Fb', 'D##'],
+  ['F=', 'E#', 'Gbb'],
+  ['F#', 'Gb'],
+  ['G=', 'F##', 'Abb'],
+  ['G#', 'Ab'],
+  ['A=', 'G##', 'Bbb'],
+  ['Bb', 'A#'],
+  ['B=', 'Cb', 'A##']
+]
+
+// Find a set of Pythagorean enharmonics corresponding to a MIDI note number
+export function midiNoteNumberToEnharmonics(
+  noteNumber: number,
+  style: AccidentalStyle = 'double',
+  octaveOffset = -1
+) {
+  const remainder = mmod(noteNumber, 12)
+  const quotient = (noteNumber - remainder) / 12 + octaveOffset
+  const enharmonics = ENHARMONICS[remainder]
+  const result = []
+  for (let enharmonic of enharmonics) {
+    if (style === 'double') {
+      enharmonic = enharmonic.replace('bb', '𝄫')
+      enharmonic = enharmonic.replace('##', '𝄪')
+    }
+    if (style === 'single' || style === 'double') {
+      enharmonic = enharmonic.replace(/b/g, '♭')
+      enharmonic = enharmonic.replace(/#/g, '♯')
+      enharmonic = enharmonic.replace('=', '♮')
+    }
+    let octave = quotient.toString()
+    if (enharmonic.startsWith('B') && enharmonics[0].startsWith('C')) {
+      octave = (quotient - 1).toString()
+    }
+    if (enharmonic.startsWith('C') && enharmonics[0].startsWith('B')) {
+      octave = (quotient + 1).toString()
+    }
+    result.push(enharmonic + octave)
+  }
+  return result
+}
+
+export function annotateColors(sourceLines: string[], keyColors: string[]) {
+  if (!keyColors.length) {
+    return
+  }
+  for (let i = 0; i < sourceLines.length; ++i) {
+    sourceLines[i] += ' ' + keyColors[mmod(i + 1, keyColors.length)].replace(/%/g, '')
+  }
+}
diff --git a/src/views/AboutView.vue b/src/views/AboutView.vue
index 8edf7f76..9d1fcb82 100644
--- a/src/views/AboutView.vue
+++ b/src/views/AboutView.vue
@@ -1,10 +1,31 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+
+const TAGLINES = [
+  ['Because there are more than 12 notes.', 'Sean Archibald'],
+  ['Electric Tunaloo', ''],
+  ['Powered by SonicWeave', ''],
+  ['We are friends now, right?', 'dotuXil'],
+  ["Any JI scale is a NEJI if you're brave enough.", 'fredg999'],
+  ['Ranting about ordinals is such a 0st world problem...', 'Lumi Pakkanen'],
+  ['You should put spoob in the credits as well.', 'Puhts'],
+  ['yknow, if you just changed how long a second is, everything can become 432hz', 'Ropal'],
+  ['some eyes are exotemperaments', 'akselai'],
+
+  ['Also Try Scala!', ''],
+  ['Also Try XenPaper!', ''],
+  ['Also Try Xen-calc!', '']
+]
+
+const tagline = computed(() => TAGLINES[Math.floor(Math.random() * TAGLINES.length)])
+</script>
+
 <template>
   <div class="about">
     <img alt="Scale Workshop logo" class="logo" src="@/assets/logo.svg" width="100" height="100" />
-    <h1>Scale Workshop 2</h1>
-    <p>
-      <em>Because there are more than 12 notes</em>
-    </p>
+    <h1>Scale Workshop 3</h1>
+    <blockquote :class="{ cited: !!tagline[1] }">{{ tagline[0] }}</blockquote>
+    <cite v-if="tagline[1]">&mdash; {{ tagline[1] }}</cite>
     <div class="control-group">
       <div class="control centered">
         <a
@@ -32,7 +53,13 @@
         Videco - <i>developer</i> <br />
         Inthar - <i>developer</i> <br />
         Kraig Grady - <i>lattice advisor</i> <br />
-        Abnormality - <i>quality assurance</i>
+        Abnormality - <i>quality assurance</i> <br />
+        Kite Giedraitis - <i>notation advisor</i> <br />
+        Scott Dakota - <i>lattice advisor / generator sequence advisor</i> <br />
+        Richie Greene - <i>quality assurance</i> <br />
+        Akselai - <i>mathematics advisor</i> <br />
+        <span class="spoob">Spoob<img src="@/assets/img/spoob.png" /></span> -
+        <i>emotional support</i>
       </p>
     </div>
   </div>
@@ -50,6 +77,12 @@
 .centered {
   justify-content: center;
 }
+.cited::before {
+  content: open-quote;
+}
+.cited::after {
+  content: close-quote;
+}
 hr {
   width: 100%;
   margin-bottom: 1rem;
@@ -61,4 +94,13 @@ hr {
   border: unset;
   text-align: center;
 }
+.spoob > img {
+  display: none;
+}
+.spoob:hover > img {
+  display: inline;
+  position: absolute;
+  bottom: 0;
+  z-index: 1;
+}
 </style>
diff --git a/src/views/AnalysisView.vue b/src/views/AnalysisView.vue
index c6a7b541..80e5c3c4 100644
--- a/src/views/AnalysisView.vue
+++ b/src/views/AnalysisView.vue
@@ -1,21 +1,38 @@
 <script setup lang="ts">
-import { intervalMatrix } from '@/analysis'
+import {
+  brightnessSignature,
+  constantStructureViolations,
+  freeEquallyTemperedChord,
+  intervalMatrix,
+  rootedEquallyTemperedChord,
+  varietySignature
+} from '@/analysis'
 import ChordWheel from '@/components/ChordWheel.vue'
-import { computed, ref } from 'vue'
-import { reverseParseInterval, type Interval, type IntervalOptions } from 'scale-workshop-core'
+import ScaleLineInput from '@/components/ScaleLineInput.vue'
+import { computed, reactive, ref } from 'vue'
 import { useAudioStore } from '@/stores/audio'
 import { useStateStore } from '@/stores/state'
+import type { Interval } from 'sonic-weave'
+import { useScaleStore } from '@/stores/scale'
+import { mmod } from 'xen-dev-utils'
+import { OCTAVE } from '@/constants'
 
 const MAX_SCALE_SIZE = 100
 
 const audio = useAudioStore()
 const state = useStateStore()
+const scale = useScaleStore()
 
 const cellFormat = ref<'best' | 'cents' | 'decimal'>('best')
 const trailLongevity = ref(70)
 const maxOtonalRoot = ref(16)
 const maxUtonalRoot = ref(23)
 
+const maxDivisions = ref(31)
+const equave = ref(OCTAVE)
+const equaveString = ref('2/1')
+const errorModel = ref<'rooted' | 'free'>('rooted')
+
 const intervalMatrixIndexingRadio = computed({
   get: () => state.intervalMatrixIndexing.toString(),
   set: (newValue: string) => (state.intervalMatrixIndexing = parseInt(newValue, 10))
@@ -31,9 +48,9 @@ const backgroundRBG = computed<[number, number, number]>(() => {
     .getPropertyValue('--color-background')
     .trim()
     .toLowerCase()
-  if (css === '#fff') {
+  if (css === '#fff' || css === '#fefdfe') {
     return [255, 255, 255]
-  } else if (css === '#000') {
+  } else if (css === '#000' || css === '#060206') {
     return [0, 0, 0]
   } else {
     throw new Error('General color parsing not implemented')
@@ -50,59 +67,133 @@ const strokeStyle = computed(() => {
 // While interval.name suffices for the tuning table
 // we want more accurate results here.
 function formatMatrixCell(interval: Interval) {
-  // We don't have much space so let's not waste it on insignificant digits.
-  const options: IntervalOptions = {
-    centsFractionDigits: 1,
-    decimalFractionDigits: 3
-  }
-  interval = interval.mergeOptions(options)
-
   if (cellFormat.value === 'cents') {
-    return interval.centsString()
+    return interval.totalCents().toFixed(1)
   }
   if (cellFormat.value === 'decimal') {
     // Consistent with tuning table localization.
-    return interval.decimalString().replace(',', '.')
+    return interval.valueOf().toFixed(3)
   }
 
-  // Monzos are too long.
-  if (interval.type === 'monzo') {
-    return interval.centsString()
+  return interval.toString()
+}
+
+const highlights = reactive<boolean[][]>([])
+
+const matrix = computed(() => intervalMatrix(scale.relativeIntervals))
+
+const matrixRows = computed(() => matrix.value.map((row) => row.map(formatMatrixCell)))
+
+const violations = computed(() => constantStructureViolations(matrix.value))
+
+const variety = computed(() => varietySignature(matrix.value))
+
+const brightness = computed(() => brightnessSignature(matrix.value).map((b) => Math.round(100 * b)))
+
+const heldScaleDegrees = computed(() => {
+  const result: Set<number> = new Set()
+  for (const midiIndex of state.heldNotes.keys()) {
+    if (state.heldNotes.get(midiIndex)! > 0) {
+      result.add(mmod(midiIndex - scale.baseMidiNote, scale.scale.size))
+    }
   }
-  // Composite intervals are too long or not accurate.
-  if (interval.isComposite()) {
-    return interval.centsString()
+  return result
+})
+
+const equallyTemperedChordData = computed(() => {
+  if (!audio.virtualSynth) {
+    return {
+      error: 0,
+      degrees: [],
+      divisions: 1
+    }
   }
-  // If we're here the name should faithfully represent the interval.
-  // Reverse parsing takes care of obscure corner cases.
-  return reverseParseInterval(interval)
-}
+  const frequencies = audio.virtualSynth.voices.map((voice) => voice.frequency)
+  const equaveCents = equave.value.totalCents()
+  if (errorModel.value === 'rooted') {
+    return rootedEquallyTemperedChord(frequencies, maxDivisions.value, equaveCents)
+  }
+  return freeEquallyTemperedChord(frequencies, maxDivisions.value, equaveCents)
+})
 
-const matrix = computed(() => {
-  return intervalMatrix(
-    state.scale.head(MAX_SCALE_SIZE).mergeOptions({
-      centsFractionDigits: 1,
-      decimalFractionDigits: 3
-    })
-  ).map((row) => row.map(formatMatrixCell))
+const nedjiProjector = computed(() => {
+  if (equave.value.equals(OCTAVE)) {
+    return ''
+  }
+  return `<${equave.value.toString()}>`
 })
+
+function highlight(y?: number, x?: number) {
+  if (highlights.length !== matrix.value.length) {
+    highlights.length = 0
+    for (let i = 0; i < matrix.value.length; ++i) {
+      highlights.push(Array(matrix.value[i].length).fill(false))
+    }
+  }
+  // Look at other violators
+  if (y !== undefined && x !== undefined && violations.value[y][x]) {
+    const value = matrix.value[y][x].value
+    for (let i = 0; i < matrix.value.length; ++i) {
+      for (let j = 0; j < matrix.value[i].length; ++j) {
+        if (violations.value[i][j]) {
+          highlights[i][j] = matrix.value[i][j].value.strictEquals(value)
+        } else {
+          highlights[i][j] = false
+        }
+      }
+    }
+    return
+  }
+
+  // Reset highlights
+  for (let i = 0; i < matrix.value.length; ++i) {
+    for (let j = 0; j < matrix.value[i].length; ++j) {
+      highlights[i][j] = false
+    }
+  }
+  if (y === undefined || x === undefined) {
+    return
+  }
+
+  // Look at own column
+  const value = matrix.value[y][x].value
+  for (let i = 0; i < matrix.value.length; ++i) {
+    highlights[i][x] = matrix.value[i][x].value.strictEquals(value)
+  }
+}
 </script>
 
 <template>
   <main>
     <h2>Interval matrix (modes)</h2>
     <div class="control-group interval-matrix">
-      <table>
+      <table @mouseleave="highlight()">
         <tr>
           <th></th>
-          <th v-for="i of Math.min(state.scale.size, MAX_SCALE_SIZE)" :key="i">
+          <th v-for="i of Math.min(scale.scale.size, MAX_SCALE_SIZE)" :key="i">
             {{ i - 1 + state.intervalMatrixIndexing }}
           </th>
-          <th>({{ state.scale.size + state.intervalMatrixIndexing }})</th>
+          <th>({{ scale.scale.size + state.intervalMatrixIndexing }})</th>
+          <th class="brightness">Bright %</th>
         </tr>
-        <tr v-for="(row, i) of matrix" :key="i">
-          <th>{{ formatMatrixCell(state.scale.getInterval(i)) }}</th>
-          <td v-for="(name, j) of row" :key="j">{{ name }}</td>
+        <tr v-for="(row, i) of matrixRows" :key="i">
+          <th :class="{ held: heldScaleDegrees.has(i) }">
+            {{ scale.labels[mmod(i - 1, scale.labels.length)] }}
+          </th>
+          <td
+            v-for="(name, j) of row"
+            :key="j"
+            :class="{ violator: violations[i][j], highlight: (highlights[i] ?? [])[j] }"
+            @mouseover="highlight(i, j)"
+          >
+            {{ name }}
+          </td>
+          <td class="brightness">{{ brightness[i] }}</td>
+        </tr>
+        <tr class="variety">
+          <th>Var</th>
+          <td v-for="(v, i) of variety" :key="i">{{ v }}</td>
+          <td class="brightness"></td>
         </tr>
       </table>
     </div>
@@ -190,14 +281,10 @@ const matrix = computed(() => {
               v-model="trailLongevity"
             />
           </div>
-        </div>
-        <div class="control-group">
           <div class="control">
             <label for="otonal-root">Maximum root (otonal)</label>
             <input id="otonal-root" type="number" class="control" min="1" v-model="maxOtonalRoot" />
           </div>
-        </div>
-        <div class="control-group">
           <div class="control">
             <label for="utonal-root">Maximum root (utonal)</label>
             <input id="utonal-root" type="number" class="control" min="1" v-model="maxUtonalRoot" />
@@ -205,6 +292,44 @@ const matrix = computed(() => {
         </div>
       </div>
     </div>
+    <div class="bicolumns-container">
+      <h2>Equally tempered chord</h2>
+      <div class="column">
+        <p class="chord-data">
+          <b>Chord:</b> [{{ equallyTemperedChordData.degrees.join(',') }}] \
+          {{ equallyTemperedChordData.divisions }}{{ nedjiProjector }}
+        </p>
+        <p class="chord-data"><b>Error:</b> {{ equallyTemperedChordData.error.toFixed(5) }} c</p>
+      </div>
+      <div class="column">
+        <div class="control-group">
+          <div class="control">
+            <label for="divisions">Maximum divisions of the equave</label>
+            <input id="divisions" type="number" class="control" min="1" v-model="maxDivisions" />
+          </div>
+          <div class="control">
+            <label for="equave">Equave</label>
+            <ScaleLineInput
+              id="equave"
+              @update:value="equave = $event"
+              v-model="equaveString"
+              :defaultValue="OCTAVE"
+            />
+          </div>
+          <div class="control radio-group">
+            <label>Error model</label>
+            <span>
+              <input type="radio" id="error-rooted" value="rooted" v-model="errorModel" />
+              <label for="error-rooted"> Rooted </label>
+            </span>
+            <span>
+              <input type="radio" id="error-free" value="free" v-model="errorModel" />
+              <label for="error-free"> Free </label>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
   </main>
 </template>
 
@@ -236,9 +361,29 @@ main {
   border-collapse: collapse;
   text-align: center;
 }
+.variety {
+  border-top: 2px solid;
+}
+.brightness {
+  border-left: 2px solid !important;
+}
+.violator {
+  color: red;
+}
+.highlight {
+  text-decoration: underline;
+}
+.violator.highlight {
+  background-color: rgba(255, 255, 100, 0.8);
+}
+.held {
+  background-color: var(--color-accent);
+  color: var(--color-accent-text);
+}
 
 /* Content layout (medium) */
-div.columns-container {
+div.columns-container,
+div.bicolumns-container {
   column-count: 2;
   column-gap: 1rem;
   overflow: hidden;
@@ -263,4 +408,9 @@ div.column {
   max-width: 100%;
   height: auto;
 }
+
+/* Equally tempered chord */
+.chord-data {
+  font-size: 1.2em;
+}
 </style>
diff --git a/src/views/LatticeView.vue b/src/views/LatticeView.vue
index d15c470c..f3dba428 100644
--- a/src/views/LatticeView.vue
+++ b/src/views/LatticeView.vue
@@ -1,35 +1,363 @@
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { mmod } from 'xen-dev-utils'
-import ScaleLattice from '@/components/ScaleLattice.vue'
+// import ScaleLattice from '@/components/ScaleLattice.vue'
+import GridLattice from '@/components/GridLattice.vue'
+import JustIntonationLattice from '@/components/JustIntonationLattice.vue'
+import Modal from '@/components/ModalDialog.vue'
 import { useStateStore } from '@/stores/state'
+import { useScaleStore } from '@/stores/scale'
+import { useJiLatticeStore } from '@/stores/ji-lattice'
+import { useGridStore } from '@/stores/grid'
+import { setAndReportValidity } from '@/utils'
 
 const state = useStateStore()
+const scale = useScaleStore()
+const jiLattice = useJiLatticeStore()
+const grid = useGridStore()
 
-const heldScaleDegrees = computed(() => {
+const showConfig = ref(false)
+const jiPreset = ref<'nothing' | 'grady' | 'grady3' | 'dakota' | 'pr72' | 'pe72'>('grady')
+const etPreset = ref<'nothing' | '12' | '53' | '311' | 'b13'>('12')
+
+const extraEdgesElement = ref<HTMLInputElement | null>(null)
+watch(extraEdgesElement, (newElement) => setAndReportValidity(newElement, jiLattice.edgesError), {
+  immediate: true
+})
+watch(
+  () => jiLattice.edgesError,
+  (newError) => setAndReportValidity(extraEdgesElement.value, newError),
+  { immediate: true }
+)
+
+const edgesElement = ref<HTMLInputElement | null>(null)
+watch(edgesElement, (newElement) => setAndReportValidity(newElement, grid.edgesError), {
+  immediate: true
+})
+watch(
+  () => grid.edgesError,
+  (newError) => setAndReportValidity(edgesElement.value, newError),
+  { immediate: true }
+)
+
+const heldNotes = computed(() => {
+  const perm = scale.latticePermutation
   const result: Set<number> = new Set()
-  for (const tableIndex of state.heldNotes.keys()) {
-    if (state.heldNotes.get(tableIndex)! > 0) {
-      result.add(mmod(tableIndex - state.baseMidiNote, state.scale.size))
+  for (const midiIndex of state.heldNotes.keys()) {
+    if (state.heldNotes.get(midiIndex)! > 0) {
+      // Offset by 1 to match relativeIntervals
+      result.add(perm[mmod(midiIndex - scale.baseMidiNote - 1, scale.scale.size)])
     }
   }
   return result
 })
+
+watch(jiPreset, (newValue) => {
+  switch (newValue) {
+    case 'grady':
+      jiLattice.kraigGrady()
+      return
+    case 'grady3':
+      jiLattice.kraigGrady(1)
+      return
+    case 'dakota':
+      jiLattice.scott24()
+      return
+    case 'pr72':
+      jiLattice.pr72()
+      return
+    case 'pe72':
+      jiLattice.pe72()
+      return
+  }
+})
+
+watch(etPreset, (newValue) => {
+  switch (newValue) {
+    case '12':
+      grid.square(12)
+      return
+    case '53':
+      grid.tonnetz(53)
+      return
+    case '311':
+      grid.preset311()
+      return
+    case 'b13':
+      grid.squareBP(13)
+      return
+  }
+})
 </script>
 
 <template>
-  <main>
+  <main class="lattice-container">
     <h2>Lattice visualization</h2>
-    <ScaleLattice :scale="state.scale" :heldScaleDegrees="heldScaleDegrees" />
+    <JustIntonationLattice
+      v-if="state.latticeType === 'ji'"
+      :labels="scale.latticeLabels"
+      :colors="scale.latticeColors"
+      :relativeIntervals="scale.latticeIntervals"
+      :heldNotes="heldNotes"
+    />
+    <GridLattice
+      v-else
+      :labels="scale.latticeLabels"
+      :colors="scale.latticeColors"
+      :relativeIntervals="scale.latticeIntervals"
+      :heldNotes="heldNotes"
+    />
+    <button @click="showConfig = true">Configure</button>
+    <Modal
+      :show="showConfig"
+      @confirm="showConfig = false"
+      @cancel="showConfig = false"
+      :right="true"
+    >
+      <template #header>
+        <h2>Lattice configuration</h2>
+      </template>
+      <template #body>
+        <div class="control-group">
+          <div class="control radio-group">
+            <label>Lattice type</label>
+            <span>
+              <input type="radio" id="ji" value="ji" v-model="state.latticeType" />
+              <label for="ji"> Just intonation </label>
+            </span>
+            <span>
+              <input type="radio" id="et" value="et" v-model="state.latticeType" />
+              <label for="et"> Equal temperament </label>
+            </span>
+          </div>
+          <template v-if="state.latticeType === 'ji'">
+            <div class="control">
+              <label for="preset">Preset</label>
+              <select id="preset" v-model="jiPreset">
+                <option value="nothing">--Select preset--</option>
+                <option value="grady">Kraig Grady</option>
+                <option value="dakota">Scott Dakota's PR24</option>
+                <option value="pr72">Scott Dakota's PR72</option>
+                <option value="pe72">Prime Ellipse 72</option>
+                <option value="grady3">K. Grady tritaves</option>
+              </select>
+            </div>
+            <div class="control">
+              <label for="max-distance">Maximum connection distance</label>
+              <input
+                id="max-distance"
+                type="number"
+                min="0"
+                max="2"
+                v-model="jiLattice.maxDistance"
+              />
+            </div>
+            <div class="control">
+              <label for="size">Text size</label>
+              <input id="size" type="number" min="0.5" step="0.5" v-model="jiLattice.size" />
+            </div>
+            <div class="control">
+              <label for="label-offset">Text offset</label>
+              <input id="label-offset" type="number" step="0.1" v-model="jiLattice.labelOffset" />
+            </div>
+            <div class="control checkbox-container">
+              <input type="checkbox" id="show-labels" v-model="jiLattice.showLabels" />
+              <label for="show-labels"> Show labels</label>
+            </div>
+            <div class="control checkbox-container">
+              <input type="checkbox" id="draw-arrows" v-model="jiLattice.drawArrows" />
+              <label for="draw-arrows"> Indicate order w/ arrows</label>
+            </div>
+            <div class="control checkbox-container">
+              <input type="checkbox" id="gray-extras" v-model="jiLattice.grayExtras" />
+              <label for="gray-extras"> Gray extra edges</label>
+            </div>
+            <div class="control">
+              <label for="extra-edges">Extra edges</label>
+              <input
+                ref="extraEdgesElement"
+                id="extra-edges"
+                type="text"
+                class="control"
+                placeholder="6/5"
+                v-model="jiLattice.edgesString"
+              />
+            </div>
+            <div class="control">
+              <label for="rotation">Rotation</label>
+              <input type="number" id="rotation" step="15" v-model="jiLattice.rotation" />
+            </div>
+            <div class="control">
+              <label for="horizontals">Horizontal coordinates</label>
+              <input id="horizontals" type="text" v-model="jiLattice.horizontals" />
+            </div>
+            <div class="control">
+              <label for="verticals">Vertical coordinates</label>
+              <input id="verticals" type="text" v-model="jiLattice.verticals" />
+            </div>
+          </template>
+          <template v-else>
+            <div class="control">
+              <label for="Preset">Preset</label>
+              <select v-model="etPreset">
+                <option value="nothing">--Select preset--</option>
+                <option value="12">Square-12p</option>
+                <option value="53">Tonnetz-53p</option>
+                <option value="311">13-limit 311p</option>
+                <option value="b13">Square-b13p</option>
+              </select>
+            </div>
+            <div class="control">
+              <label for="val">Val</label>
+              <input type="text" id="val" placeholder="17[^5]" v-model="grid.valString" />
+            </div>
+            <hr />
+            <div class="control">
+              <label for="delta1">Offset 1</label>
+              <input type="number" id="delta1" v-model="grid.delta1" />
+            </div>
+            <div class="control">
+              <label for="delta1X">x1</label>
+              <input type="number" id="delta1X" v-model="grid.delta1X" />
+            </div>
+            <div class="control">
+              <label for="delta1Y">y1</label>
+              <input type="number" id="delta1Y" v-model="grid.delta1Y" />
+            </div>
+            <hr />
+            <div class="control">
+              <label for="delta2">Offset 2</label>
+              <input type="number" id="delta2" v-model="grid.delta2" />
+            </div>
+            <div class="control">
+              <label for="delta2X">x2</label>
+              <input type="number" id="delta2X" v-model="grid.delta2X" />
+            </div>
+            <div class="control">
+              <label for="delta2Y">y2</label>
+              <input type="number" id="delta2Y" v-model="grid.delta2Y" />
+            </div>
+            <hr />
+            <div class="control">
+              <label for="edges">Edges</label>
+              <input
+                ref="edgesElement"
+                id="edges"
+                type="text"
+                class="control"
+                placeholder="3/2 5/4"
+                v-model="grid.edgesString"
+              />
+            </div>
+            <div class="control checkbox-container">
+              <input type="checkbox" id="gridlines-1" v-model="grid.gridlines1" />
+              <label for="gridlines-1"> Gridlines 1</label>
+            </div>
+            <div class="control checkbox-container">
+              <input type="checkbox" id="gridlines-2" v-model="grid.gridlines2" />
+              <label for="gridlines-2"> Gridlines 2</label>
+            </div>
+            <div class="control checkbox-container">
+              <input type="checkbox" id="diagonals-1" v-model="grid.diagonals1" />
+              <label for="diagonals-1"> Diagonals 1</label>
+            </div>
+            <div class="control checkbox-container">
+              <input type="checkbox" id="diagonals-2" v-model="grid.diagonals2" />
+              <label for="diagonals-2"> Diagonals 2</label>
+            </div>
+            <div class="control">
+              <label for="size">Text size</label>
+              <input id="size" type="number" min="0.05" step="0.05" v-model="grid.size" />
+            </div>
+            <div class="control">
+              <label for="label-offset">Text offset</label>
+              <input id="label-offset" type="number" step="0.1" v-model="grid.labelOffset" />
+            </div>
+            <div class="control checkbox-container">
+              <input type="checkbox" id="show-labels" v-model="grid.showLabels" />
+              <label for="show-labels"> Show labels</label>
+            </div>
+            <div class="control">
+              <label for="view-scale">View scale</label>
+              <input id="view-scale" type="number" min="0.1" step="0.1" v-model="grid.viewScale" />
+            </div>
+            <div class="control">
+              <label for="view-x">View center x</label>
+              <input id="view-x" type="number" step="0.1" v-model="grid.viewCenterX" />
+            </div>
+            <div class="control">
+              <label for="view-y">View center y</label>
+              <input id="view-y" type="number" step="0.1" v-model="grid.viewCenterY" />
+            </div>
+          </template>
+        </div>
+      </template>
+      <template #footer>
+        <div class="btn-group">
+          <button @click="showConfig = false">Done</button>
+        </div>
+      </template>
+    </Modal>
   </main>
 </template>
 
-<style scoped>
+<style>
 /* View */
-main {
+main.lattice-container {
   padding: 1rem;
   overflow-y: auto !important;
   display: flex;
   flex-direction: column;
 }
+/* Components */
+svg.lattice {
+  background-color: transparent;
+  flex-grow: 1;
+  min-height: 10em;
+}
+
+line.edge.gridline {
+  stroke: var(--color-background-soft);
+}
+line.edge.primary {
+  stroke: var(--color-accent);
+}
+line.edge.custom {
+  stroke: var(--color-accent-deeper);
+}
+line.edge.border {
+  stroke: var(--color-border);
+}
+line.edge.auxiliary {
+  stroke: var(--color-accent-mute);
+  stroke-dasharray: 3 1;
+}
+
+marker#arrow {
+  fill: var(--color-indicator);
+}
+
+path.arrow {
+  fill: none;
+  stroke: var(--color-indicator);
+  stroke-dasharray: 1;
+}
+
+circle.node:not(.held) {
+  stroke: var(--color-text);
+}
+circle.node.held {
+  fill: var(--color-accent);
+}
+circle.node.auxiliary {
+  stroke: none;
+  fill: var(--color-drop-shadow);
+}
+
+text.node-label {
+  font-family: sans-serif;
+  fill: var(--color-text);
+  text-anchor: middle;
+  stroke: var(--color-background);
+}
 </style>
diff --git a/src/views/MidiView.vue b/src/views/MidiView.vue
index 593a1578..9e15dabe 100644
--- a/src/views/MidiView.vue
+++ b/src/views/MidiView.vue
@@ -2,14 +2,14 @@
 import { onMounted, onUnmounted, reactive, ref } from 'vue'
 import { Input, Output, WebMidi, type NoteMessageEvent, type MessageEvent } from 'webmidi'
 import MidiPiano from '@/components/MidiPiano.vue'
-import { useStateStore } from '@/stores/state'
 import { useMidiStore } from '@/stores/midi'
+import { useScaleStore } from '@/stores/scale'
 
 const props = defineProps<{
   midiInputChannels: Set<number>
 }>()
 
-const state = useStateStore()
+const scale = useScaleStore()
 const midi = useMidiStore()
 
 const inputs = reactive<Input[]>([])
@@ -204,10 +204,10 @@ onUnmounted(() => {
         </div>
         <div class="piano-container">
           <MidiPiano
-            :baseMidiNote="state.baseMidiNote"
-            :whiteModeOffset="state.whiteModeOffset"
+            :whiteModeOffset="scale.whiteModeOffset"
+            :baseMidiNote="scale.baseMidiNote"
             :midiWhiteMode="midi.whiteMode"
-            :keyColors="state.keyColors"
+            :keyColors="scale.colors"
             :activeKeys="activeKeys"
           />
         </div>
diff --git a/src/views/NotFoundView.vue b/src/views/NotFoundView.vue
index 1a784be3..e58ea5a3 100644
--- a/src/views/NotFoundView.vue
+++ b/src/views/NotFoundView.vue
@@ -4,58 +4,20 @@
  */
 
 import OctaplexPortal from '@/components/modals/generation/SummonOctaplex.vue'
-import { encodeQuery } from '@/url-encode'
-import type { Scale } from 'scale-workshop-core'
-import { nextTick, ref } from 'vue'
-import { useRouter, type LocationQuery } from 'vue-router'
-import { version } from '../../package.json'
-import { useAudioStore } from '@/stores/audio'
-import { useStateStore } from '@/stores/state'
+import { useRouter } from 'vue-router'
+import { useScaleStore } from '@/stores/scale'
+import { ref } from 'vue'
 
 const ritualInProgress = ref(false)
 
 const router = useRouter()
+const scale = useScaleStore()
 
-const state = useStateStore()
-
-const audio = useAudioStore()
-
-function openTheGates(scale: Scale) {
-  state.scale = scale
-
-  // Unfortunately we need to encode the state here.
-  // Simply navigating to "/" triggers decoding of the default empty state.
-  nextTick(() => {
-    const encodedState = {
-      scaleName: state.scaleName,
-      scaleLines: state.scaleLines,
-      baseFrequency: state.scale.baseFrequency,
-      baseMidiNote: state.baseMidiNote,
-      keyColors: state.keyColors,
-      isomorphicHorizontal: state.isomorphicHorizontal,
-      isomorphicVertical: state.isomorphicVertical,
-      keyboardMode: state.keyboardMode,
-      pianoMode: state.pianoMode,
-      equaveShift: state.equaveShift,
-      degreeShift: state.degreeShift,
-
-      waveform: audio.waveform,
-      attackTime: audio.attackTime,
-      decayTime: audio.decayTime,
-      sustainLevel: audio.sustainLevel,
-      releaseTime: audio.releaseTime,
-
-      pingPongDelayTime: audio.pingPongDelayTime,
-      pingPongFeedback: audio.pingPongFeedback,
-      pingPongSeparation: audio.pingPongSeparation,
-      pingPongGain: audio.pingPongGain
-    }
-
-    const query = encodeQuery(encodedState) as LocationQuery
-    query.version = version
-
-    router.push({ path: '/', query })
-  })
+function openTheGates(source: string) {
+  scale.sourceText = source
+  scale.computeScale()
+  ritualInProgress.value = false
+  router.push({ path: '/' })
 }
 </script>
 
@@ -71,8 +33,8 @@ function openTheGates(scale: Scale) {
     <Teleport to="body">
       <OctaplexPortal
         :show="ritualInProgress"
-        @update:scaleName="state.scaleName = $event"
-        @update:scale="openTheGates"
+        @update:scaleName="scale.name = $event"
+        @update:source="openTheGates"
         @cancel="ritualInProgress = false"
       />
     </Teleport>
diff --git a/src/views/PreferencesView.vue b/src/views/PreferencesView.vue
index d8f2ec0f..4210dcf2 100644
--- a/src/views/PreferencesView.vue
+++ b/src/views/PreferencesView.vue
@@ -2,8 +2,10 @@
 import { UNIX_NEWLINE, WINDOWS_NEWLINE } from '@/constants'
 
 import { useStateStore } from '@/stores/state'
+import { useScaleStore } from '@/stores/scale'
 
 const state = useStateStore()
+const scale = useScaleStore()
 </script>
 
 <template>
@@ -25,12 +27,23 @@ const state = useStateStore()
             </select>
           </div>
         </div>
+        <h2>QWERTY layout</h2>
+        <div class="control-group">
+          <div class="control checkbox-container">
+            <input id="has-left-of-z" type="checkbox" v-model="scale.hasLeftOfZ" />
+            <label for="has-left-of-z"> There's a key between left Shift and 'Z'</label>
+          </div>
+        </div>
         <h2>Advanced</h2>
         <div class="control-group">
           <div class="control checkbox-container">
             <input id="virtual-qwerty" type="checkbox" v-model="state.showVirtualQwerty" />
             <label for="virtual-qwerty"> Virtual QWERTY in top menu</label>
           </div>
+          <div class="control">
+            <input id="gas" type="number" min="1" v-model="scale.gas" />
+            <label for="gas">Computational budget (gas)</label>
+          </div>
         </div>
       </div>
       <div class="column">
@@ -47,16 +60,6 @@ const state = useStateStore()
               <label for="scheme-dark"> Dark </label>
             </span>
           </div>
-          <div class="control">
-            <label for="midiOctaveOffset">MIDI octave offset</label>
-            <input
-              id="midiOctaveOffset"
-              type="number"
-              class="control"
-              step="1"
-              v-model="state.midiOctaveOffset"
-            />
-          </div>
           <h3>Accidentals</h3>
           <div class="control radio-group">
             <span>
@@ -64,7 +67,7 @@ const state = useStateStore()
                 type="radio"
                 id="accidentals-double"
                 value="double"
-                v-model="state.accidentalPreference"
+                v-model="scale.accidentalPreference"
               />
               <label for="accidentals-double"> Double 𝄫/𝄪</label>
             </span>
@@ -73,7 +76,7 @@ const state = useStateStore()
                 type="radio"
                 id="accidentals-single"
                 value="single"
-                v-model="state.accidentalPreference"
+                v-model="scale.accidentalPreference"
               />
               <label for="accidentals-single"> Single ♭♭/♯♯</label>
             </span>
@@ -82,7 +85,7 @@ const state = useStateStore()
                 type="radio"
                 id="accidentals-ascii"
                 value="ASCII"
-                v-model="state.accidentalPreference"
+                v-model="scale.accidentalPreference"
               />
               <label for="accidentals-single"> ASCII bb/##</label>
             </span>
diff --git a/src/views/ScaleView.vue b/src/views/ScaleView.vue
index b967bc53..89ce7caf 100644
--- a/src/views/ScaleView.vue
+++ b/src/views/ScaleView.vue
@@ -1,9 +1,142 @@
 <script setup lang="ts">
-import ScaleBuilder from '@/components/ScaleBuilder.vue'
+import NewScale from '@/components/NewScale.vue'
+import ModifyScale from '@/components/ModifyScale.vue'
+import ScaleControls from '@/components/ScaleControls.vue'
+import TuningTable from '@/components/TuningTable.vue'
+import ExporterButtons from '@/components/ExporterButtons.vue'
+import { DEFAULT_NUMBER_OF_COMPONENTS } from '@/constants'
+import { useScaleStore } from '@/stores/scale'
+import { useStateStore } from '@/stores/state'
+import { debounce } from '@/utils'
+import { getSourceVisitor, setNumberOfComponents } from 'sonic-weave'
+import { onMounted, ref } from 'vue'
+
+const scale = useScaleStore()
+const state = useStateStore()
+
+const controls = ref<typeof ScaleControls | null>(null)
+const newScale = ref<typeof NewScale | null>(null)
+const modifyScale = ref<typeof ModifyScale | null>(null)
+
+const updateScale = debounce(scale.computeScale)
+
+onMounted(() => {
+  // Initialize SonicWeave stdlib
+  setNumberOfComponents(DEFAULT_NUMBER_OF_COMPONENTS)
+  setTimeout(() => getSourceVisitor(), 1)
+})
 </script>
 
 <template>
   <main>
-    <ScaleBuilder />
+    <div class="columns-container">
+      <div class="column scale-builder">
+        <textarea
+          id="scale-name"
+          rows="1"
+          placeholder="Untitled scale"
+          v-model="scale.name"
+          @focus="controls!.clearPaletteInfo"
+          @update="updateScale"
+        ></textarea>
+        <ul class="btn-group">
+          <NewScale ref="newScale" @done="controls!.focus()" @mouseenter="modifyScale!.blur()" />
+          <ModifyScale ref="modifyScale" @done="controls!.focus()" @mouseenter="newScale!.blur()" />
+        </ul>
+        <ScaleControls ref="controls" />
+      </div>
+      <div class="column tuning-table">
+        <TuningTable
+          :heldNotes="state.heldNotes"
+          :frequencies="scale.frequencies"
+          :centss="scale.centss"
+          :baseFrequency="scale.baseFrequency"
+          :baseMidiNote="scale.baseMidiNote"
+          :colors="scale.colors"
+          :labels="scale.labels"
+        />
+      </div>
+      <div class="column exporters">
+        <ExporterButtons />
+      </div>
+    </div>
   </main>
 </template>
+
+<style scoped>
+/* Content layout (small) */
+div.columns-container {
+  height: 100%;
+  overflow-y: auto;
+  background-color: var(--color-border);
+}
+div.column {
+  background-color: var(--color-background);
+  overflow-x: hidden;
+}
+div.scale-builder {
+  padding: 1rem;
+}
+div.tuning-table {
+  padding: 0rem;
+}
+div.exporters {
+  padding: 1rem;
+}
+
+/* Content layout (medium) */
+@media screen and (min-width: 600px) {
+  div.columns-container {
+    column-count: 2;
+    column-gap: 1px;
+    overflow: hidden;
+  }
+  div.column {
+    overflow-y: auto;
+  }
+  div.scale-builder {
+    width: 100%;
+    height: 100%;
+  }
+  div.tuning-table {
+    width: 100%;
+    height: 66%;
+  }
+  div.exporters {
+    width: 100%;
+    height: 34%;
+    border-top: 1px solid var(--color-border);
+  }
+}
+
+/* Content layout (large) */
+@media screen and (min-width: 1100px) {
+  div.columns-container {
+    column-count: 3;
+  }
+  div.column {
+    height: 100%;
+  }
+  div.exporters {
+    border: none;
+  }
+}
+
+/* UI elements */
+#scale-name {
+  width: 100%;
+  font-size: 1.4em;
+  margin-bottom: 1rem;
+  padding: 0.3rem;
+  font-family: sans-serif;
+  resize: vertical;
+}
+
+select optgroup + optgroup {
+  margin-top: 1em;
+}
+
+.real-valued:invalid {
+  background-color: var(--color-background);
+}
+</style>
diff --git a/src/views/SynthView.vue b/src/views/SynthView.vue
index 1b77591f..ae78c8f5 100644
--- a/src/views/SynthView.vue
+++ b/src/views/SynthView.vue
@@ -2,13 +2,15 @@
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import TimeDomainVisualizer from '@/components/TimeDomainVisualizer.vue'
 import Modal from '@/components/ModalDialog.vue'
-import { WAVEFORMS } from '@/synth'
+import { APERIODIC_WAVEFORMS, WAVEFORMS } from '@/synth'
 import { useAudioStore } from '@/stores/audio'
 import { useStateStore } from '@/stores/state'
+import { useScaleStore } from '@/stores/scale'
 
 const emit = defineEmits(['panic'])
 
 const state = useStateStore()
+const scale = useScaleStore()
 
 const audio = useAudioStore()
 
@@ -92,6 +94,18 @@ const releaseTime = computed({
   }
 })
 
+const unisonSpread = computed({
+  get: () => audio.spread,
+  set(newValue: number) {
+    if (typeof newValue !== 'number') {
+      newValue = parseFloat(newValue)
+    }
+    if (!isNaN(newValue)) {
+      audio.spread = newValue
+    }
+  }
+})
+
 const pingPongDelayTime = computed({
   get: () => audio.pingPongDelayTime,
   set(newValue: number) {
@@ -237,9 +251,56 @@ onUnmounted(() => {
           <button @click="emit('panic')" style="max-width: 12rem" title="Stop all sound at once">
             Panic
           </button>
+          <div class="control radio-group">
+            <label>Synth type</label>
+            <span>
+              <input
+                type="radio"
+                id="type-oscillator"
+                value="oscillator"
+                v-model="audio.synthType"
+              />
+              <label for="type-oscillator"> Oscillator </label>
+            </span>
+
+            <span>
+              <input type="radio" id="type-unison" value="unison" v-model="audio.synthType" />
+              <label for="type-unison"> Unison </label>
+            </span>
+
+            <span>
+              <input type="radio" id="type-aperiodic" value="aperiodic" v-model="audio.synthType" />
+              <label for="type-aperiodic"> Aperiodic </label>
+            </span>
+          </div>
+          <template v-if="audio.synthType === 'unison'">
+            <div class="control">
+              <label for="stack-size">Unison stack size</label>
+              <input id="stack-size" min="2" max="9" type="number" v-model="audio.stackSize" />
+            </div>
+            <label for="unison-spread">Unison spread</label>
+            <input
+              id="unison-spread"
+              class="control"
+              type="range"
+              min="0.01"
+              max="100"
+              step="any"
+              v-model="unisonSpread"
+            />
+          </template>
           <div class="control">
             <label for="waveform">Waveform</label>
-            <select id="waveform" class="control" v-model="audio.waveform">
+            <select
+              v-if="audio.synthType === 'aperiodic'"
+              class="control"
+              v-model="audio.aperiodicWaveform"
+            >
+              <option v-for="waveform of APERIODIC_WAVEFORMS" :value="waveform" :key="waveform">
+                {{ waveform }}
+              </option>
+            </select>
+            <select v-else id="waveform" class="control" v-model="audio.waveform">
               <option v-for="waveform of WAVEFORMS" :value="waveform" :key="waveform">
                 {{ waveform }}
               </option>
@@ -364,53 +425,35 @@ onUnmounted(() => {
                 type="radio"
                 id="mode-isomorphic"
                 value="isomorphic"
-                v-model="state.keyboardMode"
+                v-model="scale.keyboardMode"
               />
               <label for="mode-isomorphic"> Isomorphic </label>
             </span>
             <span>
-              <input type="radio" id="mode-piano" value="piano" v-model="state.keyboardMode" />
+              <input type="radio" id="mode-piano" value="piano" v-model="scale.keyboardMode" />
               <label for="mode-piano"> Piano-style layers </label>
             </span>
           </div>
-          <template v-if="state.keyboardMode === 'piano'">
+          <template v-if="scale.keyboardMode === 'piano'">
             <div class="control radio-group">
               <span>
-                <input type="radio" id="mode-asdf" value="Asdf" v-model="state.pianoMode" />
-                <label for="mode-asdf"> ASDF & QWERTY </label>
+                <input type="radio" id="mode-asdf" value="Asdf" v-model="scale.pianoMode" />
+                <label for="mode-asdf"> White on ASDF & black on QWERTY </label>
               </span>
               <span>
-                <input type="radio" id="mode-qwezxc1" value="QweZxc1" v-model="state.pianoMode" />
-                <label for="mode-qwezxc1"> ZXCV & ASDF + QWERTY & 1234 </label>
+                <input type="radio" id="mode-qwe-zxc" value="QweZxc" v-model="scale.pianoMode" />
+                <label for="mode-qwe-zxc">
+                  QWERTY & digits + ZXCV & ASDF separated by an equave</label
+                >
               </span>
               <span>
-                <input type="radio" id="mode-qwezxc0" value="QweZxc0" v-model="state.pianoMode" />
-                <label for="mode-qwezxc0"> ZXCV etc. (shifted left) </label>
+                <input type="radio" id="mode-zxc" value="Zxc" v-model="scale.pianoMode" />
+                <label for="mode-zxc"> ZXCV with split accidentals above</label>
               </span>
             </div>
           </template>
         </div>
-        <h2>Keyboard equave shift</h2>
-        <div class="control-group">
-          <p>
-            Trigger lower or higher notes. (Default shortcut keys: numpad
-            <code>/</code> and <code>*</code>)
-          </p>
-          <div class="control">
-            <input type="number" v-model="state.equaveShift" />
-          </div>
-        </div>
-        <h2>Keyboard degree shift</h2>
-        <div class="control-group">
-          <p>
-            Shift down/up by one scale degree. (Default shortcut keys: numpad
-            <code>-</code> and <code>+</code>).
-          </p>
-          <div class="control">
-            <input type="number" v-model="state.degreeShift" />
-          </div>
-        </div>
-        <template v-if="state.keyboardMode === 'isomorphic'">
+        <template v-if="scale.keyboardMode === 'isomorphic'">
           <h2>Isomorphic key mapping</h2>
           <p>
             Distance between adjacent keys on the horizontal/vertical axes, in scale degrees.
@@ -430,6 +473,53 @@ onUnmounted(() => {
             </div>
           </div>
         </template>
+        <template v-else>
+          <h2>Accidental colors</h2>
+          <p>These color(s) in your scale will be used to assemble the piano layout.</p>
+          <div v-if="scale.pianoMode === 'Zxc'" class="control-group">
+            <div class="control">
+              <label for="high-accidental-color">high</label>
+              <input type="text" id="high-accidental-color" v-model="scale.highAccidentalColor" />
+            </div>
+            <div class="control">
+              <label for="middle-accidental-color">Middle</label>
+              <input
+                type="text"
+                id="middle-accidental-color"
+                v-model="scale.middleAccidentalColor"
+              />
+            </div>
+            <div class="control">
+              <label for="low-accidental-color">Low</label>
+              <input type="text" id="low-accidental-color" v-model="scale.lowAccidentalColor" />
+            </div>
+          </div>
+          <div v-else class="control-group">
+            <div class="control">
+              <input type="text" id="accidental-color" v-model="scale.accidentalColor" />
+            </div>
+          </div>
+        </template>
+        <h2>Keyboard equave shift</h2>
+        <div class="control-group">
+          <p>
+            Trigger lower or higher notes. (Default shortcut keys: numpad
+            <code>/</code> and <code>*</code>)
+          </p>
+          <div class="control">
+            <input type="number" v-model="scale.equaveShift" />
+          </div>
+        </div>
+        <h2>Keyboard degree shift</h2>
+        <div class="control-group">
+          <p>
+            Shift down/up by one scale degree. (Default shortcut keys: numpad
+            <code>-</code> and <code>+</code>).
+          </p>
+          <div class="control">
+            <input type="number" v-model="scale.degreeShift" />
+          </div>
+        </div>
         <h2>Keyboard shortcuts</h2>
         <div class="control-group">
           <p><code>Shift</code> sustain currently held keys after release</p>
diff --git a/src/views/VirtualKeyboardView.vue b/src/views/VirtualKeyboardView.vue
index c41271d2..e34ee474 100644
--- a/src/views/VirtualKeyboardView.vue
+++ b/src/views/VirtualKeyboardView.vue
@@ -2,12 +2,19 @@
 import VirtualKeyboard from '@/components/VirtualKeyboard.vue'
 import VirtualPiano from '@/components/VirtualPiano.vue'
 import { useStateStore } from '@/stores/state'
+import { useScaleStore } from '@/stores/scale'
+import { computed } from 'vue'
 
 defineProps<{
   noteOn: NoteOnCallback
 }>()
 
 const state = useStateStore()
+const scale = useScaleStore()
+
+const baseIndex = computed(
+  () => scale.baseMidiNote + scale.equaveShift * scale.scale.size + scale.degreeShift
+)
 
 type NoteOff = () => void
 type NoteOnCallback = (index: number) => NoteOff
@@ -16,20 +23,25 @@ type NoteOnCallback = (index: number) => NoteOff
 <template>
   <main>
     <VirtualPiano
-      v-if="state.keyboardMode === 'piano'"
-      :baseIndex="state.baseIndex"
-      :baseMidiNote="state.baseMidiNote"
-      :keyColors="state.keyColors"
+      v-if="scale.keyboardMode === 'piano'"
+      :baseIndex="baseIndex"
+      :baseMidiNote="scale.baseMidiNote"
+      :colorMap="scale.colorForIndex"
+      :splitAccidentals="scale.splitAccidentals"
+      :accidentalColor="scale.accidentalColor"
+      :lowAccidentalColor="scale.lowAccidentalColor"
+      :middleAccidentalColor="scale.middleAccidentalColor"
+      :highAccidentalColor="scale.highAccidentalColor"
       :noteOn="noteOn"
       :heldNotes="state.heldNotes"
     ></VirtualPiano>
     <VirtualKeyboard
       v-else
-      :baseIndex="state.baseIndex"
-      :baseMidiNote="state.baseMidiNote"
+      :baseIndex="baseIndex"
+      :baseMidiNote="scale.baseMidiNote"
       :isomorphicHorizontal="state.isomorphicHorizontal"
       :isomorphicVertical="state.isomorphicVertical"
-      :keyColors="state.keyColors"
+      :keyColors="scale.colors"
       :noteOn="noteOn"
       :heldNotes="state.heldNotes"
     ></VirtualKeyboard>
diff --git a/src/views/VirtualQwerty.vue b/src/views/VirtualQwerty.vue
index a8d6e524..6e0271bd 100644
--- a/src/views/VirtualQwerty.vue
+++ b/src/views/VirtualQwerty.vue
@@ -2,8 +2,11 @@
 import VirtualTypingKeyboard from '@/components/VirtualTypingKeyboard.vue'
 import type { Keyboard } from 'isomorphic-qwerty'
 import { useStateStore } from '@/stores/state'
+import { useScaleStore } from '@/stores/scale'
+import { computed } from 'vue'
 
 const state = useStateStore()
+const scale = useScaleStore()
 
 type NoteOff = () => void
 type NoteOnCallback = (index: number) => NoteOff
@@ -13,20 +16,22 @@ defineProps<{
   typingKeyboard: Keyboard
 }>()
 
-defineEmits(['update:equaveShift', 'update:degreeShift'])
+const baseIndex = computed(
+  () => scale.baseMidiNote + scale.equaveShift * scale.scale.size + scale.degreeShift
+)
 </script>
 
 <template>
   <main>
     <VirtualTypingKeyboard
-      :baseIndex="state.baseIndex"
-      :baseMidiNote="state.baseMidiNote"
+      :baseIndex="baseIndex"
       :isomorphicHorizontal="state.isomorphicHorizontal"
-      :keyboardMode="state.keyboardMode"
+      :keyboardMode="scale.keyboardMode"
       :colorScheme="state.colorScheme"
-      :keyboardMapping="state.keyboardMapping"
+      :qwertyMapping="scale.qwertyMapping"
+      :hasLeftOfZ="scale.hasLeftOfZ"
       :isomorphicVertical="state.isomorphicVertical"
-      :keyColors="state.keyColors"
+      :colorMap="scale.colorForIndex"
       :noteOn="noteOn"
       :heldNotes="state.heldNotes"
       :typingKeyboard="typingKeyboard"
@@ -35,10 +40,10 @@ defineEmits(['update:equaveShift', 'update:degreeShift'])
       :equaveDownCode="state.equaveDownCode"
       :degreeUpCode="state.degreeUpCode"
       :degreeDownCode="state.degreeDownCode"
-      :equaveShift="state.equaveShift"
-      :degreeShift="state.degreeShift"
-      @update:equaveShift="state.equaveShift = $event"
-      @update:degreeShift="state.degreeShift = $event"
+      :equaveShift="scale.equaveShift"
+      :degreeShift="scale.degreeShift"
+      @update:equaveShift="scale.equaveShift = $event"
+      @update:degreeShift="scale.degreeShift = $event"
     ></VirtualTypingKeyboard>
   </main>
 </template>