punctuation is more readable

Import samples

README.md

@@ -1,9 +1,9 @@
 # Topos: A Web-Based Algorithmic Sequencer
 
 <p align="center"> | 
-  <a href="https://discord.gg/aPgV7mSFZh">Discord</a> | 
+  <a href="https://discord.gg/aPgV7mSFZh">Discord</a> |
-  <a href="https://raphaelforment.fr/">BuboBubo</a> | 
+  <a href="https://raphaelforment.fr/">BuboBubo</a> |
-  <a href="about:blank">Amiika</a> | 
+  <a href="https://github.com/amiika">Amiika</a> |
   <a href="https://toplap.org/">About Live Coding</a> |
   <br><br>
   <h2 align="center"><b>Contributors</b></h2>
@@ -12,15 +12,32 @@
     <img src="https://contrib.rocks/image?repo=bubobubobubobubo/Topos" />
     </a>
   </p>
+  <p align="center">
+  <a href='https://ko-fi.com/I2I2RSBHF' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://storage.ko-fi.com/cdn/kofi3.png?v=3' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
+  </p>
 </p>
 
-Topos is a web-based live coding environment. It lives [here](https://topos.live). Documentation is directly embedded in the application itself. Topos is an emulation and extension of the [Monome Teletype](https://monome.org/docs/teletype/) that gradually evolved into something a bit more personal.
+---
+
+Topos is a web based live coding environment. Topos is capable of many things:
+
+- it is a music sequencer made for improvisation and composition alike
+- it is a synthesizer capable of additive, substractive, FM and wavetable
+  synthesis, backed up by a [powerful web based audio engine](https://www.npmjs.com/package/superdough)
+- it can also generate video thanks to [Hydra](https://hydra.ojack.xyz/) and
+  custom oscilloscopes, frequency visualizers and image sequencing capabilities
+- it can be used to sequence other MIDI devices (and soon.. OSC!)
+- it is made to be used without the need of installing anything, always ready at
+  [https://topos.live](https://topos.live)
+- Topos is also an emulation and personal extension of the [Monome Teletype](https://monome.org/docs/teletype/)
+
+---
 
 ![Screenshot](https://github.com/Bubobubobubobubo/Topos/blob/main/img/topos_gif.gif)
 
 ## Disclaimer
 
-**Topos** is a fairly young project developed by two part time hobbyists :) Do not expect stable features and/or user support in the initial development stage. Contributors and curious people are welcome! The software is working quite well and we are continuously striving to improve it.
+**Topos** is still a young project developed by two hobbyists :) Contributions are welcome! We wish to be as inclusive and welcoming as possible to your ideas and suggestions! The software is working quite well and we are continuously striving to improve it.
 
 ## Installation (for devs and contributors)
 

ToposServer/OSCtoTopos.js

@@ -0,0 +1,36 @@
+const WebSocket = require("ws");
+const osc = require("osc");
+
+const cleanIncomingOSC = (oscMsg) => {
+  let data = oscMsg.args;
+  // Remove information about type of data
+  data = data.map((item) => {
+    return item.value;
+  });
+  return { data: data, address: oscMsg.address };
+};
+
+// ==============================================
+// Receiving and forwarding OSC UDP messages
+// Create an osc.js UDP Port listening on port 57121.
+console.log("> OSC Input: 127.0.0.1:30000");
+const wss = new WebSocket.Server({ port: 3001 });
+var udpPort = new osc.UDPPort({
+  localAddress: "0.0.0.0",
+  localPort: 30000,
+  metadata: true,
+});
+udpPort.on("message", function (oscMsg, timeTag, info) {
+  console.log(
+    `> Incoming OSC to ${oscMsg.address}:`,
+    oscMsg.args.map((item) => {
+      return item.value;
+    }),
+  );
+  wss.clients.forEach((client) => {
+    if (client.readyState === WebSocket.OPEN) {
+      client.send(JSON.stringify(cleanIncomingOSC(oscMsg)));
+    }
+  });
+});
+udpPort.open();

ToposServer/ToposToOSC.js

@@ -0,0 +1,83 @@
+const WebSocket = require("ws");
+const osc = require("osc");
+
+// Listening to WebSocket messages
+const wss = new WebSocket.Server({ port: 3000 });
+
+// Setting up for message broadcasting
+wss.on("connection", function (ws) {
+  console.log("> Client connected");
+  ws.on("message", function (data) {
+    try {
+      const message = JSON.parse(data);
+      sendOscMessage(
+        formatAndTypeMessage(message),
+        message.address,
+        message.port,
+      );
+      console.log(
+        `> Message sent to ${message.address}:${message.port}: ${JSON.stringify(
+          message.args,
+        )}`,
+      );
+    } catch (error) {
+      console.error("> Error processing message:", error);
+    }
+  });
+});
+
+wss.on("error", function (error) {
+  console.error("> Server error:", error);
+});
+
+wss.on("close", function () {
+  // Close the websocket server
+  wss.close();
+  console.log("> Closing websocket server");
+});
+
+let udpPort = new osc.UDPPort({
+  localAddress: "0.0.0.0",
+  localPort: 3000,
+  metadata: true,
+  remoteAddress: "0.0.0.0",
+  remotePort: 57120,
+});
+udpPort.on("error", function (error) {
+  console.error("> UDP Port error:", error);
+});
+udpPort.on("ready", function () {
+  //console.log(`> UDP Receive: ${udpPort.options.localPort}`);
+  console.log("> WebSocket server: 127.0.0.1:3000");
+});
+
+udpPort.open();
+
+function sendOscMessage(message, address, port) {
+  try {
+    udpPort.options.remotePort = port;
+    message.address = address;
+    udpPort.send(message);
+  } catch (error) {
+    console.error("> Error sending OSC message:", error);
+  }
+}
+
+const formatAndTypeMessage = (message) => {
+  let newMessage = {};
+  delete message.args["address"];
+  delete message.args["port"];
+  newMessage.address = message.address;
+  newMessage.timestamp = osc.timeTag(message.timetag);
+
+  args = [...Object.entries(message.args)].flat().map((arg) => {
+    if (typeof arg === "string") return { type: "s", value: arg };
+    if (typeof arg === "number") return { type: "f", value: arg };
+    if (typeof arg === "boolean")
+      return value ? { type: "s", value: 1 } : { type: "s", value: 0 };
+  });
+
+  newMessage.args = args;
+
+  return newMessage;
+};

ToposServer/banner.js

@@ -0,0 +1,14 @@
+var pjson = require("./package.json");
+let banner = `
+┏┳┓         ┏┓┏┓┏┓
+ ┃ ┏┓┏┓┏┓┏  ┃┃┗┓┃ 
+ ┻ ┗┛┣┛┗┛┛  ┗┛┗┛┗┛
+     ┛            
+             ${pjson.version}\n`;
+function greet() {
+  console.log(banner);
+}
+
+module.exports = {
+  greet: greet,
+};

ToposServer/package-lock.json

@@ -0,0 +1,332 @@
+{
+  "name": "topos-server",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "topos-server",
+      "version": "1.0.0",
+      "license": "GPL-3.0-or-later",
+      "dependencies": {
+        "osc": "^2.4.4",
+        "ws": "^8.14.2"
+      }
+    },
+    "node_modules/@serialport/binding-mock": {
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-10.2.2.tgz",
+      "integrity": "sha512-HAFzGhk9OuFMpuor7aT5G1ChPgn5qSsklTFOTUX72Rl6p0xwcSVsRtG/xaGp6bxpN7fI9D/S8THLBWbBgS6ldw==",
+      "optional": true,
+      "dependencies": {
+        "@serialport/bindings-interface": "^1.2.1",
+        "debug": "^4.3.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@serialport/bindings-cpp": {
+      "version": "10.8.0",
+      "resolved": "https://registry.npmjs.org/@serialport/bindings-cpp/-/bindings-cpp-10.8.0.tgz",
+      "integrity": "sha512-OMQNJz5kJblbmZN5UgJXLwi2XNtVLxSKmq5VyWuXQVsUIJD4l9UGHnLPqM5LD9u3HPZgDI5w7iYN7gxkQNZJUw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "@serialport/bindings-interface": "1.2.2",
+        "@serialport/parser-readline": "^10.2.1",
+        "debug": "^4.3.2",
+        "node-addon-api": "^5.0.0",
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=12.17.0 <13.0 || >=14.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/serialport/donate"
+      }
+    },
+    "node_modules/@serialport/bindings-interface": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@serialport/bindings-interface/-/bindings-interface-1.2.2.tgz",
+      "integrity": "sha512-CJaUd5bLvtM9c5dmO9rPBHPXTa9R2UwpkJ0wdh9JCYcbrPWsKz+ErvR0hBLeo7NPeiFdjFO4sonRljiw4d2XiA==",
+      "optional": true,
+      "engines": {
+        "node": "^12.22 || ^14.13 || >=16"
+      }
+    },
+    "node_modules/@serialport/parser-byte-length": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-10.5.0.tgz",
+      "integrity": "sha512-eHhr4lHKboq1OagyaXAqkemQ1XyoqbLQC8XJbvccm95o476TmEdW5d7AElwZV28kWprPW68ZXdGF2VXCkJgS2w==",
+      "optional": true,
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/serialport/donate"
+      }
+    },
+    "node_modules/@serialport/parser-cctalk": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-10.5.0.tgz",
+      "integrity": "sha512-Iwsdr03xmCKAiibLSr7b3w6ZUTBNiS+PwbDQXdKU/clutXjuoex83XvsOtYVcNZmwJlVNhAUbkG+FJzWwIa4DA==",
+      "optional": true,
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/serialport/donate"
+      }
+    },
+    "node_modules/@serialport/parser-delimiter": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-10.5.0.tgz",
+      "integrity": "sha512-/uR/yT3jmrcwnl2FJU/2ySvwgo5+XpksDUR4NF/nwTS5i3CcuKS+FKi/tLzy1k8F+rCx5JzpiK+koqPqOUWArA==",
+      "optional": true,
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/serialport/donate"
+      }
+    },
+    "node_modules/@serialport/parser-inter-byte-timeout": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-10.5.0.tgz",
+      "integrity": "sha512-WPvVlSx98HmmUF9jjK6y9mMp3Wnv6JQA0cUxLeZBgS74TibOuYG3fuUxUWGJALgAXotOYMxfXSezJ/vSnQrkhQ==",
+      "optional": true,
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/serialport/donate"
+      }
+    },
+    "node_modules/@serialport/parser-packet-length": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/@serialport/parser-packet-length/-/parser-packet-length-10.5.0.tgz",
+      "integrity": "sha512-jkpC/8w4/gUBRa2Teyn7URv1D7T//0lGj27/4u9AojpDVXsR6dtdcTG7b7dNirXDlOrSLvvN7aS5/GNaRlEByw==",
+      "optional": true,
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/@serialport/parser-readline": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-10.5.0.tgz",
+      "integrity": "sha512-0aXJknodcl94W9zSjvU+sLdXiyEG2rqjQmvBWZCr8wJZjWEtv3RgrnYiWq4i2OTOyC8C/oPK8ZjpBjQptRsoJQ==",
+      "optional": true,
+      "dependencies": {
+        "@serialport/parser-delimiter": "10.5.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/serialport/donate"
+      }
+    },
+    "node_modules/@serialport/parser-ready": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-10.5.0.tgz",
+      "integrity": "sha512-QIf65LTvUoxqWWHBpgYOL+soldLIIyD1bwuWelukem2yDZVWwEjR288cLQ558BgYxH4U+jLAQahhqoyN1I7BaA==",
+      "optional": true,
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/serialport/donate"
+      }
+    },
+    "node_modules/@serialport/parser-regex": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-10.5.0.tgz",
+      "integrity": "sha512-9jnr9+PCxRoLjtGs7uxwsFqvho+rxuJlW6ZWSB7oqfzshEZWXtTJgJRgac/RuLft4hRlrmRz5XU40i3uoL4HKw==",
+      "optional": true,
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/serialport/donate"
+      }
+    },
+    "node_modules/@serialport/parser-slip-encoder": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/@serialport/parser-slip-encoder/-/parser-slip-encoder-10.5.0.tgz",
+      "integrity": "sha512-wP8m+uXQdkWSa//3n+VvfjLthlabwd9NiG6kegf0fYweLWio8j4pJRL7t9eTh2Lbc7zdxuO0r8ducFzO0m8CQw==",
+      "optional": true,
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/serialport/donate"
+      }
+    },
+    "node_modules/@serialport/parser-spacepacket": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/@serialport/parser-spacepacket/-/parser-spacepacket-10.5.0.tgz",
+      "integrity": "sha512-BEZ/HAEMwOd8xfuJSeI/823IR/jtnThovh7ils90rXD4DPL1ZmrP4abAIEktwe42RobZjIPfA4PaVfyO0Fjfhg==",
+      "optional": true,
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/serialport/donate"
+      }
+    },
+    "node_modules/@serialport/stream": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/@serialport/stream/-/stream-10.5.0.tgz",
+      "integrity": "sha512-gbcUdvq9Kyv2HsnywS7QjnEB28g+6OGB5Z8TLP7X+UPpoMIWoUsoQIq5Kt0ZTgMoWn3JGM2lqwTsSHF+1qhniA==",
+      "optional": true,
+      "dependencies": {
+        "@serialport/bindings-interface": "1.2.2",
+        "debug": "^4.3.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/serialport/donate"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "optional": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/long": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
+      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "optional": true
+    },
+    "node_modules/node-addon-api": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
+      "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==",
+      "optional": true
+    },
+    "node_modules/node-gyp-build": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.7.0.tgz",
+      "integrity": "sha512-PbZERfeFdrHQOOXiAKOY0VPbykZy90ndPKk0d+CFDegTKmWp1VgOTz2xACVbr1BjCWxrQp68CXtvNsveFhqDJg==",
+      "optional": true,
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
+    "node_modules/osc": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/osc/-/osc-2.4.4.tgz",
+      "integrity": "sha512-YJr2bUCQMc9BIaq1LXgqYpt5Ii7wNy2n0e0BkQiCSziMNrrsYHhH5OlExNBgCrQsum60EgXZ32lFsvR4aUf+ew==",
+      "dependencies": {
+        "long": "4.0.0",
+        "slip": "1.0.2",
+        "wolfy87-eventemitter": "5.2.9",
+        "ws": "8.13.0"
+      },
+      "optionalDependencies": {
+        "serialport": "10.5.0"
+      }
+    },
+    "node_modules/osc/node_modules/ws": {
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/serialport": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/serialport/-/serialport-10.5.0.tgz",
+      "integrity": "sha512-7OYLDsu5i6bbv3lU81pGy076xe0JwpK6b49G6RjNvGibstUqQkI+I3/X491yBGtf4gaqUdOgoU1/5KZ/XxL4dw==",
+      "optional": true,
+      "dependencies": {
+        "@serialport/binding-mock": "10.2.2",
+        "@serialport/bindings-cpp": "10.8.0",
+        "@serialport/parser-byte-length": "10.5.0",
+        "@serialport/parser-cctalk": "10.5.0",
+        "@serialport/parser-delimiter": "10.5.0",
+        "@serialport/parser-inter-byte-timeout": "10.5.0",
+        "@serialport/parser-packet-length": "10.5.0",
+        "@serialport/parser-readline": "10.5.0",
+        "@serialport/parser-ready": "10.5.0",
+        "@serialport/parser-regex": "10.5.0",
+        "@serialport/parser-slip-encoder": "10.5.0",
+        "@serialport/parser-spacepacket": "10.5.0",
+        "@serialport/stream": "10.5.0",
+        "debug": "^4.3.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/serialport/donate"
+      }
+    },
+    "node_modules/slip": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/slip/-/slip-1.0.2.tgz",
+      "integrity": "sha512-XrcHe3NAcyD3wO+O4I13RcS4/3AF+S9RvGNj9JhJeS02HyImwD2E3QWLrmn9hBfL+fB6yapagwxRkeyYzhk98g=="
+    },
+    "node_modules/wolfy87-eventemitter": {
+      "version": "5.2.9",
+      "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.9.tgz",
+      "integrity": "sha512-P+6vtWyuDw+MB01X7UeF8TaHBvbCovf4HPEMF/SV7BdDc1SMTiBy13SRD71lQh4ExFTG1d/WNzDGDCyOKSMblw=="
+    },
+    "node_modules/ws": {
+      "version": "8.14.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
+      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    }
+  }
+}

ToposServer/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "topos-server",
+  "version": "0.0.1",
+  "description": "Topos OSC Server",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Raphaël Forment",
+  "license": "GPL-3.0-or-later",
+  "dependencies": {
+    "osc": "^2.4.4",
+    "ws": "^8.14.2"
+  }
+}

ToposServer/server.js

@@ -0,0 +1,8 @@
+const WebSocket = require("ws");
+const osc = require("osc");
+
+require("./banner").greet();
+// Topos to OSC
+require("./ToposToOSC");
+// OSC to Topos
+require("./OSCtoTopos");

index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+  <!doctype html>
 <html lang="en">
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -11,15 +11,13 @@
     <link rel="mask-icon" href="favicon/safari-pinned-tab.svg" color="#5bbad5">
     <meta name="msapplication-TileColor" content="#da532c">
     <meta name="theme-color" content="#ffffff">
-    <link rel="stylesheet" href="/src/output.css" />
     <link rel="stylesheet" href='/fonts/index.css' >
+    <link rel="stylesheet" href="/src/output.css" />
     <script src="https://unpkg.com/hydra-synth"></script>
   </head>
   <style>
-
     body {
       font-family: "Arial";
-      background-color: #111827;
 			overflow: hidden;
 			position: fixed;
 			width: 100vw;
@@ -28,11 +26,10 @@
       padding: 0;
     }
 
-    .fluid-bg-transition {
+    .fluid-transition {
       transition: background-color 0.05s ease-in-out;
     }
 
-
     .fullscreencanvas {
       position: fixed; /* ignore margins */
       top: 0px;
@@ -66,60 +63,89 @@
 			z-index: 0;
     }
 
+    .bar_button {
+      @apply mx-2 px-2 py-2 flex inline rounded-lg bg-background text-foreground  hover:bg-foreground hover:text-background
+    }
+
+    .side_button {
+      @apply px-2 py-2 bg-background text-foreground rounded-lg hover:bg-foreground hover:text-background
+    }
+
+    .subtitle {
+      @apply bg-selection_foreground text-sm lg:text-xl border-b py-4 text-foreground
+    }
+    
+    .tab_panel {
+      @apply inline-block lg:px-4 px-8 py-1 text-brightwhite
+    }
+
+    .doc_header {
+      @apply pl-2 pr-2 lg:text-xl text-sm py-1 my-1 rounded-lg text-white hover:text-brightwhite hover:bg-brightblack
+    }
+
+    .doc_subheader {
+      @apply pl-2 pr-2 lg:text-xl text-sm ml-6 py-1 my-1 rounded-lg text-white hover:text-brightwhite hover:bg-brightblack
+    }
+
+
   </style>
-  <body id="all" class="z-0 bg-neutral-800 overflow-y-hidden">
 
+  <body id="all" class="z-0 overflow-y-hidden bg-black">
 		<!-- The header is hidden on smaller devices -->
-    <header class="py-0 block text-white bg-neutral-900">
+    <header class="py-0 block">
-      <div id="topbar" class="mx-auto flex flex-wrap pl-2 py-1 flex-row items-center">
+      <div id="topbar" class="mx-auto flex flex-wrap pl-2 py-1 flex-row items-center bg-background">
-        <a class="flex title-font font-medium items-center text-black mb-0">
+        <a class="flex title-font font-medium items-center mb-0">
-          <img id="topos-logo" src="topos_frog.svg" class="w-12 h-12 text-black p-2 bg-white rounded-full" alt="Topos Frog Logo" />
+          <img id="topos-logo" src="topos_frog.svg" class="w-12 h-12 text-selection_foreground p-2 rounded-full bg-foreground" alt="Topos Frog Logo"/>
-         <input id="universe-viewer" class="hidden bg-transparent xl:block ml-4 text-2xl text-white placeholder-white" id="renamer" type="text" placeholder="Topos">
+         <input id="universe-viewer" class="hidden transparent xl:block ml-4 text-2xl bg-background text-brightwhite placeholder-brightwhite" id="renamer" type="text" placeholder="Topos">
-
         </a>
         <nav class="py-2 flex flex-wrap items-center text-base absolute right-0">
-         <a title="Play button (Ctrl+P)" id="play-button-1" class="flex flex-row mr-2 hover:bg-gray-800 px-2 py-2 rounded-lg">
+         <!-- Play Button -->
+         <a title="Play button (Ctrl+P)" id="play-button-1" class="bar_button">
 							<svg id="play-icon" class="w-7 h-7" fill="currentColor" viewBox="0 0 14 16">
 								<path d="M0 .984v14.032a1 1 0 0 0 1.506.845l12.006-7.016a.974.974 0 0 0 0-1.69L1.506.139A1 1 0 0 0 0 .984Z"/>
 							</svg>
-							<svg id="pause-icon" class="hidden w-7 h-7 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
+							<svg id="pause-icon" class="hidden w-7 h-7" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
     <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9 13a1 1 0 0 1-2 0V7a1 1 0 0 1 2 0v6Zm4 0a1 1 0 0 1-2 0V7a1 1 0 0 1 2 0v6Z"/>
   </svg>
-							<p id="play-label" class="hidden lg:block text-xl pl-2 text-white inline-block">Play</p>
+							<p id="play-label" class="hidden lg:block text-xl pl-2 inline-block">Play</p>
           </a>
-          <a title="Stop button (Ctrl+R)" id="stop-button-1" class="flex flex-row mr-2 hover:bg-gray-800 px-2 py-2 rounded-lg">
+
-						<svg class="w-7 h-7 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
+          <!-- Stop button -->
+          <a title="Stop button (Ctrl+R)" id="stop-button-1" class="bar_button">
+						<svg class="w-7 h-7 " aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
   <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5Z"/>
-  <rect x="6.5" y="6.5" width="7" height="7" fill="black" rx="1" ry="1"/>
+  <rect x="6.5" y="6.5" width="7" height="7" fill="selection_background" rx="1" ry="1"/>
 </svg>
-						<p class="hidden lg:block text-xl pl-2 text-white inline-block">Stop</p>
+						<p class="hidden lg:block text-xl pl-2 inline-block">Stop</p>
           </a>
-          <a title="Eval button (Ctrl+Enter)" id="eval-button-1" class="flex flex-row mr-2 hover:text-gray-900 hover:bg-gray-800 px-2 py-2 rounded-lg">
+
-						<svg class="w-7 h-7 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 20">
+          <!-- Eval button -->
+          <a title="Eval button (Ctrl+Enter)" id="eval-button-1" class="bar_button">
+						<svg class="w-7 h-7 " aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 20">
     <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M16 1v5h-5M2 19v-5h5m10-4a8 8 0 0 1-14.947 3.97M1 10a8 8 0 0 1 14.947-3.97"/>
   </svg>
-					<p class="hidden lg:block text-xl pl-2 text-white inline-block">Eval</p>
+					<p class="hidden lg:block text-xl pl-2 inline-block">Eval</p>
           </a>
 
-          <a title="Clear button" id="clear-button-1" class="flex flex-row mr-2 hover:text-gray-900 hover:bg-gray-800 px-2 py-2 rounded-lg">
+          <a title="Clear button" id="clear-button-1" class="bar_button">
-						<svg class="w-7 h-7 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 18 20">
+						<svg class="w-7 h-7 " aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 18 20">
     <path d="M17 4h-4V2a2 2 0 0 0-2-2H7a2 2 0 0 0-2 2v2H1a1 1 0 0 0 0 2h1v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V6h1a1 1 0 1 0 0-2ZM7 2h4v2H7V2Zm1 14a1 1 0 1 1-2 0V8a1 1 0 0 1 2 0v8Zm4 0a1 1 0 0 1-2 0V8a1 1 0 0 1 2 0v8Z"/>
   </svg>
-						<p class="hidden lg:block text-xl pl-2 text-white inline-block">Clear</p>
+						<p class="hidden lg:block text-xl pl-2 inline-block">Clear</p>
           </a>
 
-          <a title="Share button" id="share-button" class="flex flex-row mr-2 hover:text-gray-900 hover:bg-gray-800 px-2 py-2 rounded-lg">
+          <a title="Share button" id="share-button" class="bar_button">
-						<svg class="w-7 h-7 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 19 19">
+						<svg class="w-7 h-7 " aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 19 19">
     <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11.013 7.962a3.519 3.519 0 0 0-4.975 0l-3.554 3.554a3.518 3.518 0 0 0 4.975 4.975l.461-.46m-.461-4.515a3.518 3.518 0 0 0 4.975 0l3.553-3.554a3.518 3.518 0 0 0-4.974-4.975L10.3 3.7"/>
   </svg>
-						<p class="hidden lg:block text-xl pl-2 text-white inline-block">Share</p>
+						<p class="hidden lg:block text-xl pl-2 inline-block">Share</p>
           </a>
 
-          <a title="Open Documentation (Ctrl+D)" id="doc-button-1" class="flex flex-row hover:text-gray-900 hover:bg-gray-800 px-2 py-2 rounded-lg">
+          <a title="Open Documentation (Ctrl+D)" id="doc-button-1" class="bar_button">
-						<svg class="w-7 h-7 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
+						<svg class="w-7 h-7 " aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
     <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z"/>
   </svg>
-						<p class="hidden lg:block text-xl pl-2 text-white inline-block">Docs</p>
+						<p class="hidden lg:block text-xl pl-2 inline-block">Docs</p>
           </a>
  
         </nav>
@@ -128,121 +154,133 @@
     </header>
 
     <div id="documentation" class="hidden">
-      <div id="documentation-page" class="flex flex-row bg-transparent">
+      <div id="documentation-page" class="flex flex-row transparent">
-        <aside class="w-1/8 flex-shrink-0 h-screen overflow-y-auto p-1 lg:p-6 bg-neutral-900 text-white">
+        <aside class="w-1/8 flex-shrink-0 h-screen overflow-y-auto p-1 lg:p-6 bg-background">
-          <nav class="text-xl sm:text-sm overflow-y-scroll mb-24">
+          <nav class="text-xl sm:text-sm overflow-y-scroll mb-24 bg-background">
-            <details class="" open=true>
+            <details class="" open>
               <summary class="font-semibold lg:text-xl text-orange-300">Basics</summary>
               <div class="flex flex-col">
-                <p rel="noopener noreferrer" id="docs_introduction" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Welcome </p>
+                <p rel="noopener noreferrer" id="docs_introduction" class="doc_header">Welcome </p>
-                <p rel="noopener noreferrer" id="docs_interface" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Interface</p>
+                <p rel="noopener noreferrer" id="docs_interface" class="doc_header">Interface</p>
-                <p rel="noopener noreferrer" id="docs_interaction" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Interaction</p>
+                <p rel="noopener noreferrer" id="docs_interaction" class="doc_header">Interaction</p>
-                <p rel="noopener noreferrer" id="docs_shortcuts" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Keyboard</p>
+                <p rel="noopener noreferrer" id="docs_shortcuts" class="doc_header">Keyboard</p>
-                <p rel="noopener noreferrer" id="docs_mouse" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Mouse</p>
+                <p rel="noopener noreferrer" id="docs_mouse" class="doc_header">Mouse</p>
-                <p rel="noopener noreferrer" id="docs_code" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Coding</p>
+                <p rel="noopener noreferrer" id="docs_code" class="doc_header">Coding</p>
 							</div>
 						</details>
-            <details class="space-y-2" open=true>
+            <details class="space-y-2" open>
               <summary class="font-semibold lg:text-xl pb-1 pt-1 text-orange-300">Learning</summary>
               <div class="flex flex-col">
-
                 <!-- Time -->
-                <details class="space-y-2" open=false>
+                <details class="space-y-2">
-                  <summary class="ml-2 lg:text-xl pb-1 pt-1 text-white">Time</summary>
+                  <summary class="ml-2 lg:text-xl pb-1 pt-1 doc_header">Time</summary>
                   <div class="flex flex-col">
-                    <p rel="noopener noreferrer" id="docs_time" class="ml-8 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Dealing with time</p>
+                    <p rel="noopener noreferrer" id="docs_time" class="doc_subheader">Dealing with time</p>
-                    <p rel="noopener noreferrer" id="docs_linear" class="ml-8 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Time & Transport</p>
+                    <p rel="noopener noreferrer" id="docs_linear" class="doc_subheader">Time & Transport</p>
-                    <p rel="noopener noreferrer" id="docs_cyclic" class="ml-8 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Time & Cycles</p>
+                    <p rel="noopener noreferrer" id="docs_cyclic" class="doc_subheader">Time & Cycles</p>
-                    <p rel="noopener noreferrer" id="docs_longform" class="ml-8 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Time & Structure</p>
+                    <p rel="noopener noreferrer" id="docs_longform" class="doc_subheader">Time & Structure</p>
-                  </div>
-                </details>
-
-                <!-- Samples -->
-                <details class="space-y-2" open=false>
-                  <summary class="ml-2 lg:text-xl pb-1 pt-1 text-white">Audio Engine</summary>
-                  <div class="flex flex-col">
-                    <p rel="noopener noreferrer" id="docs_audio_basics" class="ml-8 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Playing a sound</p>
-                    <p rel="noopener noreferrer" id="docs_amplitude" class="ml-8 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Amplitude</p>
-                    <p rel="noopener noreferrer" id="docs_sampler" class="ml-8 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Sampler</p>
-                    <p rel="noopener noreferrer" id="docs_synths" class="ml-8 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Synths</p>
-                    <p rel="noopener noreferrer" id="docs_reverb_delay" class="ml-8 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Effects</p>
                   </div>
                 </details>
 
                 <!-- Audio Engine -->
-                <details class="space-y-2" open=false>
+                <details class="space-y-2">
-                  <summary class="ml-2 lg:text-xl pb-1 pt-1 text-white">Samples</summary>
+                  <summary class="ml-2 lg:text-xl pb-1 pt-1 doc_header">Audio Engine</summary>
                   <div class="flex flex-col">
-                    <p rel="noopener noreferrer" id="docs_sample_list" class="ml-8 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">List of samples</p>
+                    <p rel="noopener noreferrer" id="docs_audio_basics" class="doc_subheader">Playing a sound</p>
-                    <p rel="noopener noreferrer" id="docs_loading_samples" class="ml-8 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Loading Samples</p>
+                    <p rel="noopener noreferrer" id="docs_amplitude" class="doc_subheader">Amplitude</p>
+                    <p rel="noopener noreferrer" id="docs_sampler" class="doc_subheader">Sampler</p>
+                    <p rel="noopener noreferrer" id="docs_synths" class="doc_subheader">Synths</p>
+                    <p rel="noopener noreferrer" id="docs_filters" class="doc_subheader">Filters</p>
+                    <p rel="noopener noreferrer" id="docs_effects" class="doc_subheader">Effects</p>
                   </div>
                 </details>
 
-                <p rel="noopener noreferrer" id="docs_patterns" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Patterns</p>
+                <!-- Samples -->
-                <p rel="noopener noreferrer" id="docs_midi" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">MIDI</p>
+                <details class="space-y-2">
+                  <summary class="ml-2 lg:text-xl pb-1 pt-1 doc_header ">Samples</summary>
+                  <div class="flex flex-col">
+                    <p rel="noopener noreferrer" id="docs_sample_list" class="doc_subheader">List of samples</p>
+                    <p rel="noopener noreferrer" id="docs_loading_samples" class="doc_subheader">External samples</p>
+                  </div>
+                </details>
+                <p rel="noopener noreferrer" id="docs_midi" class="doc_header">MIDI</p>
+                <p rel="noopener noreferrer" id="docs_osc" class="doc_header">OSC</p>
 							</div>
 						</details>
-            <details class="space-y-2" open=true>
+            <details class="space-y-2" open>
               <summary class="font-semibold lg:text-xl pb-1 pt-1 text-orange-300">Patterns</summary>
               <div class="flex flex-col">
-                
+
-                <p rel="noopener noreferrer" id="docs_variables" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Global Variables</p>
+                <p rel="noopener noreferrer" id="docs_patterns" class="pl-2 pr-2 lg:text-xl text-sm hover:neutral-800 py-1 my-1 rounded-lg doc_header">Array patterns</p>
-                <p rel="noopener noreferrer" id="docs_lfos" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Low Freq Oscs.</p>
+                <!-- Ziffers -->
-                <p rel="noopener noreferrer" id="docs_probabilities" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Probabilities</p>
+                <details class="space-y-2">
-                <p rel="noopener noreferrer" id="docs_chaining" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Chaining</p>
+                  <summary class="doc_header">Ziffers</summary>
-                <p rel="noopener noreferrer" id="docs_functions" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Functions</p>
+                  <div class="flex flex-col">
-                <p rel="noopener noreferrer" id="docs_ziffers" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Ziffers</p>
+                    <p rel="noopener noreferrer" id="docs_ziffers_basics" class="doc_subheader">Basics</p>
-								<!--
+                    <p rel="noopener noreferrer" id="docs_ziffers_scales" class="doc_subheader">Scales</p>
-                <p rel="noopener noreferrer" id="docs_reference" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Reference</p>
+                    <p rel="noopener noreferrer" id="docs_ziffers_rhythm" class="doc_subheader">Rhythm</p>
-								-->
+                    <p rel="noopener noreferrer" id="docs_ziffers_algorithmic" class="doc_subheader">Algorithmic</p>
+                    <p rel="noopener noreferrer" id="docs_ziffers_tonnetz" class="doc_subheader">Tonnetz</p>
+                    <p rel="noopener noreferrer" id="docs_ziffers_syncing" class="doc_subheader">Syncing</p>
+                  </div>
+                </details>
+                <p rel="noopener noreferrer" id="docs_variables" class="doc_header">Global Variables</p>
+                <p rel="noopener noreferrer" id="docs_lfos" class="doc_header">Low Freq Oscs.</p>
+                <p rel="noopener noreferrer" id="docs_probabilities" class="doc_header">Probabilities</p>
+                <p rel="noopener noreferrer" id="docs_chaining" class="doc_header">Chaining</p>
+                <p rel="noopener noreferrer" id="docs_functions" class="doc_header">Functions</p>
+                <p rel="noopener noreferrer" id="docs_generators" class="doc_header">Generators</p>
               </div>
             </details>
-            <details class="space-y-2" open=true>
+            <details class="space-y-2" open>
-              <summary class="font-semibold lg:text-xl text-orange-300">More</summary>
+              <summary class="font-semibold lg:text-xl doc_header">More</summary>
               <div class="flex flex-col">
-                <a rel="noopener noreferrer" id="docs_synchronisation" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Synchronisation</a>
+                <a rel="noopener noreferrer" id="docs_synchronisation" class="doc_subheader">Synchronisation</a>
-                <a rel="noopener noreferrer" id="docs_oscilloscope" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Oscilloscope</a>
+                <a rel="noopener noreferrer" id="docs_oscilloscope" class="doc_subheader">Oscilloscope</a>
-                <a rel="noopener noreferrer" id="docs_bonus" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">Bonus/Trivia</a>
+                <a rel="noopener noreferrer" id="docs_bonus" class="doc_header">Bonus/Trivia</a>
-                <a rel="noopener noreferrer" id="docs_about" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg">About Topos</a>
+                <a rel="noopener noreferrer" id="docs_about" class="doc_header">About Topos</a>
               </div>
             </details>
-            <details class="" open=true>
+            <details class="" open>
               <summary class="font-semibold lg:text-xl text-orange-300">Community</summary>
                 <form action="https://github.com/Bubobubobubobubo/topos">
-                  <input rel="noopener noreferrer" id="docs_introduction" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg" type="submit" value="GitHub" />
+                  <input rel="noopener noreferrer" id="github_link" class="doc_header" type="submit" value="GitHub" />
                 </form>
                 <form action="https://discord.gg/6T67DqBNNT">
-                  <input rel="noopener noreferrer" id="docs_introduction" class="pl-2 pr-2 lg:text-xl text-sm hover:bg-neutral-800 py-1 my-1 rounded-lg" type="submit" value="Discord" />
+                  <input rel="noopener noreferrer" id="discord_link" class="doc_header" type="submit" value="Discord" />
+                </form>
+                <form action="https://ko-fi.com/raphaelbubo">
+                  <input rel="noopener noreferrer" id="support_link" class="doc_header" type="submit" value="Support" />
                 </form>
             </details>
          </nav>
         </aside>
-        <div id="documentation-content" class="w-full flex-grow-1 h-screen overflow-y-scroll lg:px-12 mx-2 my-2 break-words pb-32 bg-transparent"></div>
+        <div id="documentation-content" class="w-full flex-grow-1 h-screen overflow-y-scroll lg:px-12 mx-2 my-2 break-words pb-32 transparent"></div>
         </div>
       </div>
     </div>
 
     <div id="app">
       <!-- This modal is used for switching between buffers -->
-      <div id="modal-buffers" class="invisible bg-gray-900 bg-opacity-50 flex justify-center items-center absolute top-0 right-0 bottom-0 left-0">
+      <div id="modal-buffers" class="invisible flex justify-center items-center absolute top-0 right-0 bottom-0 left-0">
-        <div id="start-button" class="lg:px-16 px-4 lg:pt-4 lg:pb-4 pt-2 pb-2 rounded-md text-center bg-white">
+        <div id="start-button" class="lg:px-16 px-4 lg:pt-4 lg:pb-4 pt-2 pb-2 rounded-md text-center bg-foreground">
-					<p class="text-semibold lg:text-2xl text-sm pb-4">Known universes</p>
+					<p class="text-semibold lg:text-2xl text-sm pb-4 text-selection_foreground">Known universes</p>
 					<p id="existing-universes" class="text-normal lg:h-auto h-48 overflow-y-auto mb-2"></p>
           <div id="disclaimer" class="pb-4">
           <form id="universe-creator">
-            <label for="search" class="mb-2 text-sm font-medium text-gray-900 sr-only text-white">Search</label>
+            <label for="search" class="mb-2 text-sm font-medium sr-only ">Search</label>
             <div class="relative">
             <div class="absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none">
-            <svg class="w-4 h-4 text-gray-500 text-gray-400" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
+            <svg class="w-4 h-4" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
                 <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z"/>
             </svg>
         </div>
-                <input name="universe" minlength="2" autocomplete="off" type="text" id="buffer-search" class="block w-full p-4 pl-10 text-sm border border-neutral-800 outline-0 rounded-lg bg-neutral-800 text-white" placeholder="Buffer..." required>
+                <input name="universe" minlength="2" autocomplete="off" type="text" id="buffer-search" class="block w-full p-4 pl-10 text-sm border border-neutral-800 outline-0 rounded-lg neutral-800 " placeholder="Buffer..." required>
-                <button id="load-universe-button" class="text-black absolute right-2.5 bottom-2.5 bg-white hover:bg-white focus:outline-none font-medium rounded-lg text-sm px-4 py-2">Go</button>
+                <button id="load-universe-button" class="bg-background text-selection_background absolute right-2.5 bottom-2.5 focus:outline-none font-medium rounded-lg text-sm px-4 py-2">Go</button>
             </div>
           </form>
-              <div class="mt-2 flex space-x-6 border-t border-gray-200 rounded-b dark:border-gray-600 border-spacing-y-4">
+              <div class="mt-2 flex space-x-6 border-t  rounded-b  border-spacing-y-4">
-                <button id="close-universes-button" data-modal-hide="defaultModal" type="button" class="mt-2 hover:bg-neutral-700 bg-neutral-800 text-white focus:ring-4  font-medium rounded-lg text-sm px-5 py-2.5 text-center">Close</button>
+                <button id="close-universes-button" data-modal-hide="defaultModal" type="button" class="mt-2 focus:ring-4 font-medium rounded-lg text-sm px-5 py-2.5 text-center bg-background text-selection_background">Close</button>
               </div>
 
           </div>
@@ -251,29 +289,26 @@
 
       <!-- This modal is used for settings -->
       <div id="modal-settings" class="invisible flex
-              absolute lg:justify-center lg:items-center 
+              absolute lg:justify-center lg:items-center
               lg:overflow-y-auto lg:overflow-x-auto
               overflow-y-scroll owerflow-x-scroll
               md:top-0 md:bottom-0 h-screen w-full"
       >
         <div class="grid w-full grid-col-3">
-          <div class="bg-white rounded-lg lg:mx-48 mx-0 lg:space-y-8 space-y-4 lg:px-8">
+          <div class="white rounded-lg lg:mx-48 mx-0 lg:space-y-8 space-y-4 lg:px-8 bg-foreground">
-          <h1 class="lg:mt-12 mt-6 font-semibold rounded-lg
+          <h1 class="lg:mt-12 mt-6 font-semibold rounded-lg justify-center lg:text-center lg:pl-0 pl-8 mx-4 subtitle">Topos Application Settings</h1>
-                     bg-gray-800 justify-center lg:text-center lg:pl-0 pl-8 text-white mx-4
-                     text-sm lg:text-xl border-b border-gray-300 py-4">Topos Application Settings</h1>
             <div class="flex lg:flex-row flex-col mr-4 ml-4">
             <!-- Font Size Selection -->
-              <div class="bg-gray-200 rounded-lg ml-0 lg:w-1/3 w-full pt-2 pb-1 mb-2">
+              <div class="rounded-lg ml-0 lg:w-1/3 w-full pt-2 pb-1 mb-2 bg-selection_foreground">
-                <p class="font-bold lg:text-xl text-sm ml-4 lg:pb-4 pb-2 underline underline-offset-4">Font Settings</p>
+                <p class="font-bold lg:text-xl text-sm ml-4 lg:pb-4 pb-2 underline underline-offset-4 text-selection_background">Theme Settings</p>
                 <div class="mb-6 mx-4 font-semibold">
-                  <label for="default-input" class="block mb-2 ml-1 font-normal sd:text-sm">Size:</label>
+                  <label for="default-input" class="block mb-2 ml-1 font-normal sd:text-sm text-foreground">Size:</label>
-                  <input type="text" id="font-size-input" type="number" class="bg-gray-50 border border-gray-300 text-gray-900 
+                  <input type="text" id="font-size-input" type="number" class="border
-                  text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 
+                  text-sm rounded-lg  focus:border-blue-500 block w-full p-2.5 focus:border-blue-500">
-                  dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500">
                 </div>
-                <label for="font" class="block ml-5 mb-2 font-medium sd:text-sm">Font:</label>
+                <label for="font" class="block ml-5 mb-2 font-medium sd:text-sm text-foreground">Font:</label>
-                  <select id="font-family" class="bg-gray-50 ml-4 border border-gray-300 mb-2
+                  <select id="font-family" class=" ml-4 border mb-2
-                  text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block  p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white">
+                  text-sm rounded-lg  focus:border-blue-500 block  p-2.5">
                     <option value="IBM Plex Mono">IBM Plex Mono</option>
                     <option value="Jet Brains">Jet Brains</option>
                     <option value="Courier">Courier</option>
@@ -285,186 +320,199 @@
                     <option value="Steps Mono">Steps Mono</option>
                     <option value="Steps Mono Thin">Steps Mono Thin</option>
                   </select>
+              <div class="rounded-lg ml-0 lg:w-1/3 w-full pt-2 pb-1 mb-2">
+                <label for="theme" class="block ml-5 mb-2 font-medium sd:text-sm text-foreground">Theme:</label>
+                  <select id="theme-selector" class="ml-4 border mb-2
+                  text-sm rounded-lg block  p-2.5">
+                  </select>
+                  <div id="theme-previewer"></div>
+              </div>
               </div>
               <!-- Editor mode selection -->
-            <div class="bg-gray-200 rounded-lg lg:ml-4 lg:w-1/3 w-full pt-2 pb-1 mb-2">
+            <div class="rounded-lg lg:ml-4 lg:w-1/3 w-full pt-2 pb-1 mb-2 bg-selection_foreground">
-              <p class="font-bold lg:text-xl text-sm ml-4 pb-4 underline underline-offset-4">Editor options</p>
+              <p class="font-bold lg:text-xl text-sm ml-4 pb-4 underline underline-offset-4 text-selection_background">Editor options</p>
               <!-- Checkboxes  -->
   					  <div class="pr-4">
 							  <div  class="flex items-center mb-4 ml-5">
-            	    <input id="vim-mode" type="checkbox" value="" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+            	    <input id="vim-mode" type="checkbox" value="" class="w-4 h-4 text-blue-600 rounded focus:ring-blue-600">
-             	    <label for="default-checkbox" class="ml-2 text-sm font-medium text-dark">Vim Mode</label>
+             	    <label for="default-checkbox" class="ml-2 text-sm font-medium text-selection_background">Vim Mode</label>
              	  </div>
 							  <div class="flex items-center mb-4 ml-5">
-             	    <input id="show-line-numbers" type="checkbox" value="" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+             	    <input id="show-line-numbers" type="checkbox" value="" class="w-4 h-4 text-blue-600 rounded  focus:ring-blue-600 focus:ring-2">
-             	    <label for="default-checkbox" class="ml-2 text-sm font-medium text-dark">Show Line Numbers</label>
+             	    <label for="default-checkbox" class="ml-2 text-sm font-medium text-foreground">Show Line Numbers</label>
              	  </div>
              	  <div class="flex items-center mb-4 ml-5">
-             	    <input id="show-time-position" type="checkbox" value="" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+             	    <input id="show-time-position" type="checkbox" value="" class="w-4 h-4 text-blue-600 rounded focus:ring-blue-600 focus:ring-2">
-             	    <label for="default-checkbox" class="ml-2 text-sm font-medium text-dark">Show Time Position</label>
+             	    <label for="default-checkbox" class="ml-2 text-sm font-medium text-foreground">Show Time Position</label>
              	  </div>
              	  <div class="flex items-center mb-4 ml-5">
-             	    <input id="show-tips" type="checkbox" value="" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+             	    <input id="show-tips" type="checkbox" value="" class="w-4 h-4 text-blue-600 rounded  focus:ring-blue-600 focus:ring-2">
-             	    <label for="default-checkbox" class="ml-2 text-sm font-medium text-dark">Show Hovering Tips</label>
+             	    <label for="default-checkbox" class="ml-2 text-sm font-medium text-foreground">Show Hovering Tips</label>
              	  </div>
              	  <div class="flex items-center mb-4 ml-5">
-             	    <input id="show-completions" type="checkbox" value="" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+             	    <input id="show-completions" type="checkbox" value="" class="w-4 h-4 text-blue-600 rounded focus:ring-blue-600 focus:ring-2">
-             	    <label for="default-checkbox" class="ml-2 text-sm font-medium text-dark">Show Completions</label>
+             	    <label for="default-checkbox" class="ml-2 text-sm font-medium text-foreground">Show Completions</label>
              	  </div>
              	  <div class="flex items-center mb-4 ml-5">
-             	    <input id="load-demo-songs" type="checkbox" value="" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+             	    <input id="load-demo-songs" type="checkbox" value="" class="w-4 h-4 text-blue-600 rounded focus:ring-blue-600">
-             	    <label for="default-checkbox" class="ml-2 text-sm font-medium text-dark">Load Demo Song</label>
+             	    <label for="default-checkbox" class="ml-2 text-sm font-medium text-foreground">Load Demo Song</label>
              	  </div>
 						  </div>
             </div>
 
-            <div class="bg-gray-200 rounded-lg lg:ml-4 lg:w-1/3 w-full pt-2 pb-1 mb-2">
+            <div class="rounded-lg lg:ml-4 lg:w-1/3 w-full pt-2 pb-1 mb-2 bg-selection_foreground">
-              <p class="font-bold lg:text-xl text-sm ml-4 pb-4 underline underline-offset-4">File Management</p>
+              <p class="font-bold lg:text-xl text-sm ml-4 pb-4 underline underline-offset-4 text-selection_background">File Management</p>
               <div class="flex flex-col space-y-2 pb-2">
-                <button id="download-universes" class="bg-gray-800 hover:bg-gray-900 text-white font-bold lg:py-4 lg:px-2 px-1 py-2 rounded-lg inline-flex items-center mx-4">
+                <button id="download-universes" class="bg-brightwhite font-bold lg:py-4 lg:px-2 px-1 py-2 rounded-lg inline-flex items-center mx-4 text-selection_background">
                   <svg class="fill-current w-4 h-6 mr-2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M13 8V2H7v6H2l8 8 8-8h-5zM0 18h20v2H0v-2z"/></svg>
-                  <span>Download universes</span>
+                  <span class="text-selection_foreground">Download universes</span>
                 </button>
-                <button id="upload-universes" class="bg-gray-800 hover:bg-gray-900 text-white font-bold lg:py-4 lg:px-2 px-1 py-2 rounded-lg inline-flex items-center mx-4">
+                <button id="upload-universes" class="bg-brightwhite font-bold lg:py-4 lg:px-2 px-1 py-2 rounded-lg inline-flex items-center mx-4 text-selection_background">
                   <svg class="rotate-180 fill-current w-4 h-6 mr-2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M13 8V2H7v6H2l8 8 8-8h-5zM0 18h20v2H0v-2z"/></svg>
-                  <span>Upload universes</span>
+                  <span class="text-selection_foreground">Upload universes</span>
                 </button>
-                <button id="destroy-universes" class="bg-red-800 hover:bg-red-900 text-white font-bold lg:px-2 px-1 py-2 rounded-lg inline-flex items-center mx-4">
+                <button id="destroy-universes" class="bg-brightwhite font-bold lg:px-2 px-1 py-2 rounded-lg inline-flex items-center mx-4">
                   <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-6 mr-2">
                   <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z" />
                   </svg>
-                  <span>Destroy universes</span>
+                  <span class="text-selection_foreground">Destroy universes</span>
                 </button>
+                <!-- Upload audio samples -->
+                <p class="font-bold lg:text-xl text-sm ml-4 pb-2 pt-2 underline underline-offset-4 text-selection_background">Audio samples</p>
+
+                <label class="bg-brightwhite font-bold lg:py-4 lg:px-2 px-1 py-2 rounded-lg inline-flex items-center mx-4 text-selection_background">
+                  <svg class="rotate-180 fill-current w-4 h-6 mr-2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M13 8V2H7v6H2l8 8 8-8h-5zM0 18h20v2H0v-2z"/></svg>
+                  <input id="upload-samples" type="file" class="hidden" accept="file" webkitdirectory directory multiple>
+                  <span id="sample-indicator" class="text-selection_foreground">Import samples</span>
+                </label>
               </div>
             </div>
           </div>
 
             <!-- Midi settings -->
-            <div id="midi-settings-container" class="bg-gray-200 rounded-lg flex lg:flex-row flex-col mx-4 my-4 pt-4">
+            <div id="midi-settings-container" class="rounded-lg flex lg:flex-row flex-col mx-4 my-4 pt-4 bg-color bg-selection_foreground">
             <div class="lg:flex lg:flex-row w-fit">
-            <p class="font-bold lg:text-xl text-sm ml-4 pb-4 underline underline-offset-4">MIDI I/O Settings</p>
+            <p class="font-bold lg:text-xl text-sm ml-4 pb-4 underline underline-offset-4 text-selection_background">MIDI I/O Settings</p>
               <div class="flex items-center mb-4 ml-6">
-                <label for="default-checkbox" class="ml-2 text-sm font-medium text-dark">MIDI Clock:&nbsp;</label>
+                <label for="default-checkbox" class="ml-2 text-sm font-medium text-foreground">MIDI Clock:&nbsp;</label>
-                <select id="midi-clock-input" class="w-32 h-8 text-sm font-medium text-black bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2">
+                <select id="midi-clock-input" class="w-32 h-8 text-sm font-medium text-black rounded focus:ring-blue-600">
                   <option value="-1">Internal</option>
                 </select>
               </div>
               <div class="lg:flex block items-center mb-4 ml-6">
-                <label for="default-checkbox" class="ml-2 text-sm font-medium text-dark">Clock PPQN:&nbsp;</label>
+                <label for="default-checkbox" class="ml-2 mr-2 text-sm font-medium text-foreground">Clock PPQN:&nbsp;</label>
-                <select id="midi-clock-ppqn-input" class="w-32 h-8 text-sm font-medium text-black bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2">
+                <select id="midi-clock-ppqn-input" class="w-32 h-8 text-sm font-medium text-black rounded focus:ring-blue-600">
                   <option value="24">24</option>
                   <option value="48">48</option>
                 </select>
               </div>
               <div class="lg:flex block items-center mb-4 ml-6">
-                  <input id="send-midi-clock" type="checkbox" value="" class="lg:w-8 lg:h-8 h-4 w-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+                  <input id="send-midi-clock" type="checkbox" value="" class="lg:w-8 lg:h-8 h-4 w-4 text-blue-600 rounded  focus:ring-blue-600 focus:ring-2">
-                  <label for="default-checkbox" class="ml-2 text-sm font-medium text-dark">Send MIDI Clock</label>
+                  <label for="default-checkbox" class="ml-2 text-sm font-medium text-foreground">Send MIDI Clock</label>
               </div>
             </div>
             <div class="lg:flex block flex-row">
               <div class="flex items-center mb-4 ml-6">
-                <label for="default-checkbox" class="ml-2 text-sm font-medium text-dark">MIDI input:&nbsp;</label>
+                <label for="default-checkbox" class="ml-2 mr-2 text-sm font-medium text-foreground">MIDI input:&nbsp;</label>
-                <select id="default-midi-input" class="w-32 h-8 text-sm font-medium text-black bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2">
+                <select id="default-midi-input" class="w-32 h-8 text-sm font-medium text-black rounded  focus:ring-blue-600 focus:ring-2">
                   <option value="-1">None</option>
                 </select>
               </div>
               <div class="lg:flex block items-center mb-4 ml-6">
-                <input id="midi-channels-scripts" type="checkbox" value="" class="lg:w-8 lg:h-8 h-4 w-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600">
+                <input id="midi-channels-scripts" type="checkbox" value="" class="lg:w-8 lg:h-8 h-4 w-4 text-blue-600 rounded focus:ring-blue-600">
-                <label for="default-checkbox" class="ml-2 text-sm font-medium text-dark">Route channels to scripts</label>
+                <label for="default-checkbox" class="ml-2 text-sm font-medium text-foreground">Route channels to scripts</label>
               </div>
             </div>
           </div>
 
           <!-- Audio nudge slider -->
-          <div id="midi-settings-container" class="bg-gray-200 rounded-lg flex flex-col mx-4 my-4 pt-4 pb-2">
+          <div id="midi-settings-container" class="rounded-lg flex flex-col mx-4 my-4 pt-4 pb-2 bg-selection_foreground">
-            <p class="font-bold lg:text-xl text-sm ml-4 pb-4 underline underline-offset-4">Audio/Event Nudging</p>
+            <p class="font-bold lg:text-xl text-sm ml-4 pb-4 underline underline-offset-4 text-selection_background">Audio/Event Nudging</p> <div class="flex flex-column pb-2">
-            <div class="flex flex-column pb-2">
+              <p class="pt-0.5 ml-4 text-foreground">Clock:</p>
-              <p class="pt-0.5 ml-4">Clock:</p>
               <input
                 type="range" id="audio_nudge"
                 name="audiorangeInput"
                 min="-200" max="200"
                 value="0"
-                class="w-full ml-4"
+                class="w-full ml-4 text-red"
                 oninput="nudgenumber.value=audio_nudge.value"
               >
               <output 
                 name="nudgenumber" 
                 id="nudgenumber" 
                 for="audiorangeInput" 
-                class="bg-gray-500 rounded-lg ml-2 mr-4 px-4 py-1 text-white"
+                class="rounded-lg ml-2 mr-4 px-4 py-1 text-foreground"
               >0</output>
             </div>
 
             <div class="flex flex-column">
 
-              <p class="pt-0.5 ml-4">Audio:</p>
+              <p class="pt-0.5 ml-4 text-foreground">Audio:</p>
               <input
                 type="range" id="dough_nudge"
                 name="doughrangeInput"
                 min="0" max="100"
                 value="0"
-                class="w-full ml-4"
+                class="w-full ml-4 text-foreground"
                 oninput="doughnumber.value=dough_nudge.value"
               >
               <output 
                 name="doughnumber" 
                 id="doughnumber" 
                 for="doughrangeInput" 
-                class="bg-gray-500 rounded-lg ml-2 mr-4 px-4 py-1 text-white"
+                class="rounded-lg ml-2 mr-4 px-4 py-1 text-foreground"
               >0</output>
             </div>
 
           </div>
 
-          <div class="flex space-x-6 border-t border-gray-200 rounded-b dark:border-gray-600 mx-4 border-spacing-y-4 pb-36 lg:pb-0">
+          <div class="flex space-x-6 border-t rounded-b mx-4 border-spacing-y-4 pb-36 lg:pb-0">
             <button id="close-settings-button" data-modal-hide="defaultModal" type="button" class="
-            hover:bg-gray-700 bg-gray-800 mt-4 mb-4 text-white focus:ring-4
+            hover:bg-background bg-background mt-4 mb-4 focus:ring-4
-            font-medium rounded-lg text-sm px-5 py-2.5 text-center">OK</button>
+            font-medium rounded-lg text-sm px-5 py-2.5 text-center text-selection_background">OK</button>
           </div>
         </div>
       </div>
     </div>
 
       <div class="flex flex-row max-h-fit">
-
 				<!-- This is a lateral bar that will inherit the header buttons if the window is too small. -->
         <aside id="sidebar" class="
 					flex flex-col items-center w-14
 					h-screen py-2 border-r 
 					rtl:border-l max-h-fit
-					rtl:border-r-0 bg-neutral-900
+					rtl:border-r-0 bg-background
-					dark:border-neutral-700 border-none"
+					border-neutral-700 border-none"
 				>
         <nav class="flex flex-col space-y-6">
-            <a title="Local Scripts (Ctrl + L)" id="local-button" class="pl-2 p-1.5 focus:outline-nones transition-colors duration-200 rounded-lg text-white hover:bg-gray-800">
+            <a title="Local Scripts (Ctrl + L)" id="local-button" class="side_button">
-							<svg class="w-8 h-8 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 18 18">
+							<svg class="w-8 h-8 " aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 18 18">
     <path d="M18 5H0v11a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V5Zm-7.258-2L9.092.8a2.009 2.009 0 0 0-1.6-.8H2.049a2 2 0 0 0-2 2v1h10.693Z"/>
   </svg>
                      </svg>
             </a>
           
-            <a title="Global Script (Ctrl + G)" id="global-button" class="pl-2 p-1.5 text-white focus:outline-nones transition-colors duration-200 rounded-lg hover:bg-gray-800">
+            <a title="Global Script (Ctrl + G)" id="global-button" class="side_button">
-							<svg class="w-8 h-8 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 18 16">
+							<svg class="w-8 h-8 " aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 18 16">
     <path d="M14.316.051A1 1 0 0 0 13 1v8.473A4.49 4.49 0 0 0 11 9c-2.206 0-4 1.525-4 3.4s1.794 3.4 4 3.4 4-1.526 4-3.4a2.945 2.945 0 0 0-.067-.566c.041-.107.064-.22.067-.334V2.763A2.974 2.974 0 0 1 16 5a1 1 0 0 0 2 0C18 1.322 14.467.1 14.316.051ZM10 3H1a1 1 0 0 1 0-2h9a1 1 0 1 1 0 2Z"/>
     <path d="M10 7H1a1 1 0 0 1 0-2h9a1 1 0 1 1 0 2Zm-5 4H1a1 1 0 0 1 0-2h4a1 1 0 1 1 0 2Z"/>
   </svg>
                    </a>
           
-            <a title="Initialisation Script (Ctrl + I)" id="init-button" class="pl-2 p-1.5 focus:outline-nones transition-colors duration-200 rounded-lg text-white hover:bg-gray-800">
+            <a title="Initialisation Script (Ctrl + I)" id="init-button" class="side_button">
-							<svg class="w-8 h-8 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 14">
+							<svg class="w-8 h-8 " aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 14">
     <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 1v12m0 0 4-4m-4 4L1 9"/>
   </svg>
                    </a>
 
-            <a title="Project notes (Ctrl + N)" id="note-button" class="pl-2 p-1.5 text-white focus:outline-nones transition-colors duration-200 rounded-lg text-white hover:bg-gray-800">
+            <a title="Project notes (Ctrl + N)" id="note-button" class="side_button">
-							<svg class="w-8 h-8 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
+							<svg class="w-8 h-8 " aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
     <path d="m13.835 7.578-.005.007-7.137 7.137 2.139 2.138 7.143-7.142-2.14-2.14Zm-10.696 3.59 2.139 2.14 7.138-7.137.007-.005-2.141-2.141-7.143 7.143Zm1.433 4.261L2 12.852.051 18.684a1 1 0 0 0 1.265 1.264L7.147 18l-2.575-2.571Zm14.249-14.25a4.03 4.03 0 0 0-5.693 0L11.7 2.611 17.389 8.3l1.432-1.432a4.029 4.029 0 0 0 0-5.689Z"/>
   </svg>
 			      </a>
 
-            <a title="Application Settings" id="settings-button" class="pl-2 p-1.5 text-white focus:outline-nones transition-colors duration-200 rounded-lg text-white hover:bg-gray-800">
+            <a title="Application Settings" id="settings-button" class="side_button">
-							<svg class="w-8 h-8 text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
+							<svg class="w-8 h-8 " aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
                   <path stroke-linecap="round" stroke-linejoin="round" d="M10.343 3.94c.09-.542.56-.94 1.11-.94h1.093c.55 0 1.02.398 1.11.94l.149.894c.07.424.384.764.78.93.398.164.855.142 1.205-.108l.737-.527a1.125 1.125 0 011.45.12l.773.774c.39.389.44 1.002.12 1.45l-.527.737c-.25.35-.272.806-.107 1.204.165.397.505.71.93.78l.893.15c.543.09.94.56.94 1.109v1.094c0 .55-.397 1.02-.94 1.11l-.893.149c-.425.07-.765.383-.93.78-.165.398-.143.854.107 1.204l.527.738c.32.447.269 1.06-.12 1.45l-.774.773a1.125 1.125 0 01-1.449.12l-.738-.527c-.35-.25-.806-.272-1.203-.107-.397.165-.71.505-.781.929l-.149.894c-.09.542-.56.94-1.11.94h-1.094c-.55 0-1.019-.398-1.11-.94l-.148-.894c-.071-.424-.384-.764-.781-.93-.398-.164-.854-.142-1.204.108l-.738.527c-.447.32-1.06.269-1.45-.12l-.773-.774a1.125 1.125 0 01-.12-1.45l.527-.737c.25-.35.273-.806.108-1.204-.165-.397-.505-.71-.93-.78l-.894-.15c-.542-.09-.94-.56-.94-1.109v-1.094c0-.55.398-1.02.94-1.11l.894-.149c.424-.07.765-.383.93-.78.165-.398.143-.854-.107-1.204l-.527-.738a1.125 1.125 0 01.12-1.45l.773-.773a1.125 1.125 0 011.45-.12l.737.527c.35.25.807.272 1.204.107.397-.165.71-.505.78-.929l.15-.894z" />
                   <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
@@ -478,55 +526,55 @@
 
         <!-- Tabs for local files -->
         <div class="min-w-screen flex grow flex-col">
-          <ul id="local-script-tabs" class=" flex text-xl font-medium text-center text-white bg-neutral-900 space-x-1 lg:space-x-8">
+          <ul id="local-script-tabs" class=" flex text-xl font-medium text-center bg-background space-x-1 lg:space-x-8">
             <li class="pl-5">
-                <a title="Local Script 1 (F1)" id="tab-1" class="bg-orange-300 inline-block lg:px-4 px-2 py-1 text-white hover:bg-gray-800">1</a>
+                <a title="Local Script 1 (F1)" id="tab-1" class="tab_panel">1</a>
             </li>
             <li class="">
-                <a title="Local Script 2 (F2)" id="tab-2" class="inline-block lg:px-4 px-2 py-1 hover:bg-gray-800">2</a>
+                <a title="Local Script 2 (F2)" id="tab-2" class="tab_panel">2</a>
             </li>
             <li class="">
-                <a title="Local Script 3 (F3)" id="tab-3" class="inline-block lg:px-4 px-2 py-1 hover:bg-gray-800">3</a>
+                <a title="Local Script 3 (F3)" id="tab-3" class="tab_panel">3</a>
             </li>
             <li class="">
-                <a title="Local Script 4 (F4)" id="tab-4" class="inline-block lg:px-4 px-2 py-1 hover:bg-gray-800">4</a>
+                <a title="Local Script 4 (F4)" id="tab-4" class="tab_panel">4</a>
             </li>
             <li class="">
-                <a title="Local Script 5 (F5)" id="tab-5" class="inline-block lg:px-4 px-2 py-1 hover:bg-gray-800">5</a>
+                <a title="Local Script 5 (F5)" id="tab-5" class="tab_panel">5</a>
             </li>
             <li class="">
-                <a title="Local Script 6 (F6)" id="tab-6" class="inline-block lg:px-4 px-2 py-1 hover:bg-gray-800">6</a>
+                <a title="Local Script 6 (F6)" id="tab-6" class="tab_panel">6</a>
             </li>
             <li class="">
-                <a title="Local Script 7 (F7)" id="tab-7" class="inline-block lg:px-4 px-2 py-1 hover:bg-gray-800">7</a>
+                <a title="Local Script 7 (F7)" id="tab-7" class="tab_panel">7</a>
             </li>
             <li class="">
-                <a title="Local Script 8 (F8)" id="tab-8" class="inline-block lg:px-4 px-2 py-1 hover:bg-gray-800">8</a>
+                <a title="Local Script 8 (F8)" id="tab-8" class="tab_panel">8</a>
             </li>
             <li class="">
-                <a title="Local Script 9 (F9)" id="tab-9" class="inline-block lg:px-4 px-2 py-1 hover:bg-gray-800">9</a>
+                <a title="Local Script 9 (F9)" id="tab-9" class="tab_panel">9</a>
             </li>
- 
          </ul>
          <!-- Here comes the editor itself -->
           <div id="editor" class="relative flex flex-row h-screen overflow-y-hidden">
-            <canvas id="hydra-bg" class="fullscreencanvas"></canvas>
             <canvas id="scope" class="fullscreencanvas"></canvas>
+            <canvas id="hydra-bg" class="fullscreencanvas"></canvas>
             <canvas id="feedback" class="fullscreencanvas"></canvas>
+            <canvas id="drawings" class="fullscreencanvas"></canvas>
 					</div>
-          <p id="error_line" class="hidden text-red-400 w-screen bg-neutral-900 font-mono absolute bottom-0 pl-2 py-2">Hello kids</p>
+          <p id="error_line" class="hidden w-screen bg-background font-mono absolute bottom-0 pl-2 py-2">Hello kids</p>
         </div>
       </div>
       <script type="module" src="/src/main.ts"></script>
 
       <template id="ui-known-universe-item-template">
         <!-- A known universe button in "opening" interface -->
-        <li class="hover:fill-black hover:bg-white py-2 hover:text-black flex justify-between px-4">
+        <li class="py-2 px-4 flex justify-between text-brightwhite hover:bg-selection_background hover:text-selection_foreground">
           <button class="universe-name load-universe" title="Load this universe">Universe Name</button>
           <button class="delete-universe" title="Delete this universe">🗑</button>
         </li>
       </template>
   </body>
-	<p id="timeviewer" class="rounded-lg px-2 py-2 font-bold bg-white cursor-textpointer-events-none select-none text-black text-sm absolute bottom-2 right-2"></p>
+	<p id="timeviewer" class="rounded-lg px-2 py-2 font-bold  cursor-textpointer-events-none select-none text-sm absolute bottom-2 right-2 bg-foreground text-background"></p>
-	<p id="fillviewer" class="invisible rounded-lg px-2 py-2 font-bold bg-white cursor-textpointer-events-none select-none text-black text-sm absolute right-2 bottom-12">/////// Fill ///////</p>
+	<p id="fillviewer" class="invisible rounded-lg px-2 py-2 font-bold cursor-textpointer-events-none select-none text-sm absolute right-2 bottom-12 bg-foreground text-background">/////// Fill ///////</p>
 </html>

package.json

@@ -30,19 +30,21 @@
     "autoprefixer": "^10.4.14",
     "codemirror": "^6.0.1",
     "fflate": "^0.8.0",
+    "highlight.js": "^11.9.0",
     "jisg": "^0.9.7",
     "lru-cache": "^10.0.1",
     "marked": "^7.0.3",
+    "osc": "^2.4.4",
     "postcss": "^8.4.27",
     "showdown": "^2.1.0",
     "showdown-highlight": "^3.1.0",
-    "superdough": "^0.9.11",
+    "superdough": "^0.9.12",
     "tailwind-highlightjs": "^2.0.1",
     "tailwindcss": "^3.3.3",
     "tone": "^14.8.49",
     "unique-names-generator": "^4.7.1",
     "vite-plugin-markdown": "^2.1.0",
-    "zifferjs": "^0.0.44",
+    "zifferjs": "^0.0.55",
     "zyklus": "^0.1.4",
     "zzfx": "^1.2.0"
   }

src/API.ts

@@ -1,5 +1,7 @@
 import { EditorView } from "@codemirror/view";
+import { sendToServer, type OSCMessage, oscMessages } from "./IO/OSC";
 import { getAllScaleNotes, nearScales, seededRandom } from "zifferjs";
+import colorschemes from "./colors.json";
 import {
   MidiCCEvent,
   MidiConnection,
@@ -12,6 +14,7 @@ import { SoundEvent } from "./classes/SoundEvent";
 import { MidiEvent, MidiParams } from "./classes/MidiEvent";
 import { LRUCache } from "lru-cache";
 import { InputOptions, Player } from "./classes/ZPlayer";
+import { isGenerator, isGeneratorFunction } from "./Utils/Generic";
 import {
   loadUniverse,
   openUniverseModal,
@@ -85,7 +88,9 @@ export class UserAPI {
   public randomGen = Math.random;
   public currentSeed: string | undefined = undefined;
   public localSeeds = new Map<string, Function>();
-  public patternCache = new LRUCache({ max: 1000, ttl: 1000 * 60 * 5 });
+  public patternCache = new LRUCache({ max: 10000, ttl: 10000 * 60 * 5 });
+  public invalidPatterns: {[key: string]: boolean} = {};
+  public cueTimes: { [key: string]: number } = {};
   private errorTimeoutID: number = 0;
   private printTimeoutID: number = 0;
   public MidiConnection: MidiConnection;
@@ -142,6 +147,7 @@ export class UserAPI {
         ? code
         : (this.app.selectedExample as string);
     }
+    this.clearPatternCache();
     this.stop();
     this.play();
   };
@@ -153,6 +159,7 @@ export class UserAPI {
       current_universe.example.candidate! = "";
       current_universe.example.committed! = "";
     }
+    this.clearPatternCache();
     this.stop();
   };
 
@@ -162,6 +169,7 @@ export class UserAPI {
       current_universe.example.candidate! = "";
       current_universe.example.committed! = "";
     }
+    this.clearPatternCache();
     this.stop();
     this.play();
     this.app.exampleIsPlaying = true;
@@ -213,7 +221,7 @@ export class UserAPI {
     clearTimeout(this.printTimeoutID);
     clearTimeout(this.errorTimeoutID);
     this.app.interface.error_line.innerHTML = message as string;
-    this.app.interface.error_line.style.color = "white";
+    this.app.interface.error_line.style.color = "red";
     this.app.interface.error_line.classList.remove("hidden");
     // @ts-ignore
     this.printTimeoutID = setTimeout(
@@ -696,7 +704,7 @@ export class UserAPI {
   };
 
   // =============================================================
-  // Ziffers related functions
+  // Cache functions
   // =============================================================
 
   public generateCacheKey = (...args: any[]): string => {
@@ -707,10 +715,74 @@ export class UserAPI {
     this.patternCache.forEach((player) => (player as Player).reset());
   };
 
+  public clearPatternCache = (): void => {
+    this.patternCache.clear();
+  }
+
   public removePatternFromCache = (id: string): void => {
     this.patternCache.delete(id);
   };
 
+  maybeToNumber = (something: any): number|any => {
+    // If something is BigInt
+    if(typeof something === "bigint") {
+      return Number(something);
+    } else {
+      return something;
+    }
+  }
+  
+  cache = (key: string, value: any) => {
+    /**
+     * Gets or sets a value in the cache.
+     *
+     * @param key - The key of the value to get or set
+     * @param value - The value to set
+     * @returns The value of the key
+     */
+    if(value !== undefined) {
+      if(isGenerator(value)) {
+          if(this.patternCache.has(key)) {
+            const cachedValue = (this.patternCache.get(key) as Generator<any>).next().value
+            if(cachedValue!==0 && !cachedValue) {
+              const generator = value as unknown as Generator<any>
+              this.patternCache.set(key, generator);
+              return this.maybeToNumber(generator.next().value);
+            }
+            return this.maybeToNumber(cachedValue);
+          } else {
+            const generator = value as unknown as Generator<any>
+            this.patternCache.set(key, generator);
+            return this.maybeToNumber(generator.next().value);
+          }
+        } else if(isGeneratorFunction(value)) {
+          if(this.patternCache.has(key)) {
+            const cachedValue = (this.patternCache.get(key) as Generator<any>).next().value;
+            if(cachedValue || cachedValue===0 || cachedValue===0n) {
+              return this.maybeToNumber(cachedValue);
+            } else {
+              const generator = value();
+              this.patternCache.set(key, generator);
+              return this.maybeToNumber(generator.next().value);
+            }
+          } else {
+            const generator = value();
+            this.patternCache.set(key, generator);
+            return this.maybeToNumber(generator.next().value);
+          }
+        } else {
+          this.patternCache.set(key, value);
+          return this.maybeToNumber(value);
+        }
+    } else {
+      return this.maybeToNumber(this.patternCache.get(key));
+    }
+  }
+
+  // =============================================================
+  // Ziffers related functions
+  // =============================================================
+
   public z = (
     input: string | Generator<number>,
     options: InputOptions = {},
@@ -719,34 +791,54 @@ export class UserAPI {
     const zid = "z" + id.toString();
     const key = id === "" ? this.generateCacheKey(input, options) : zid;
 
+    const validSyntax = typeof input === "string" && !this.invalidPatterns[input]
+
     let player;
+    let replace = false;
 
     if (this.app.api.patternCache.has(key)) {
       player = this.app.api.patternCache.get(key) as Player;
-      if (typeof input === "string" && player.input !== input) {
+
-        player = undefined;
+      if (typeof input === "string" && 
+          player.input !== input && 
+          player.atTheBeginning()) {
+          replace = true;
       }
     }
 
-    if (!player) {
+    if ((typeof input !== "string" || validSyntax) && (!player || replace)) {
-      player = new Player(input, options, this.app, zid);
+      const newPlayer = new Player(input, options, this.app, zid);
-      this.app.api.patternCache.set(key, player);
+      if(newPlayer.isValid()) {
+        player = newPlayer
+        this.patternCache.set(key, player);
+      } else if(typeof input === "string") {
+        this.invalidPatterns[input] = true;
+      }
     }
 
-    if (player.ziffers.generator && player.ziffers.generatorDone) {
+    if(player) {
-      this.removePatternFromCache(key);
+
+      if(player.atTheBeginning()) {
+        if(typeof input === "string" && !validSyntax) this.app.api.log(`Invalid syntax: ${input}`);
+      }
+
+      if (player.ziffers.generator && player.ziffers.generatorDone) {
+        this.removePatternFromCache(key);
+      }
+
+      if (typeof id === "number") player.zid = zid;
+
+      player.updateLastCallTime();
+
+      if (id !== "" && zid !== "z0") {
+        // Sync named patterns to z0 by default
+        player.sync("z0", false);
+      }
+
+      return player;
+    } else {
+      throw new Error(`Invalid syntax: ${input}`);
     }
-
-    if (typeof id === "number") player.zid = zid;
-
-    player.updateLastCallTime();
-
-    if (id !== "" && zid !== "z0") {
-      // Sync named patterns to z0 by default
-      player.sync("z0");
-    }
-
-    return player;
   };
 
   public z0 = (input: string, opts: InputOptions = {}) =>
@@ -1298,7 +1390,7 @@ export class UserAPI {
     const results: boolean[] = nArray.map(
       (value) =>
         (this.app.clock.pulses_since_origin - Math.floor(nudge * this.ppqn())) %
-        Math.floor(value * this.ppqn()) ===
+          Math.floor(value * this.ppqn()) ===
         0,
     );
     return results.some((value) => value === true);
@@ -1318,7 +1410,7 @@ export class UserAPI {
     const results: boolean[] = nArray.map(
       (value) =>
         (this.app.clock.pulses_since_origin - nudgeInPulses) %
-        Math.floor(value * barLength) ===
+          Math.floor(value * barLength) ===
         0,
     );
     return results.some((value) => value === true);
@@ -1916,7 +2008,7 @@ export class UserAPI {
   // =============================================================
 
   register = (name: string, operation: EventOperation<AbstractEvent>): void => {
-    AbstractEvent.prototype[name] = function(
+    AbstractEvent.prototype[name] = function (
       this: AbstractEvent,
       ...args: any[]
     ) {
@@ -2095,6 +2187,317 @@ export class UserAPI {
     }, real_duration * 1000);
   };
 
+  // =============================================================
+  // Canvas Functions
+  // =============================================================
+
+  public clear = (): void => {
+    /**
+     * Clears the canvas after a given timeout.
+     * @param timeout - The timeout in seconds
+     */
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+      const ctx = canvas.getContext("2d")!;
+      ctx.clearRect(0, 0, canvas.width, canvas.height);
+  }
+
+  public width = (): number => {
+    /**
+     * Returns the width of the canvas.
+     * @returns The width of the canvas
+     */
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+    return canvas.width;
+  }
+
+  public height = (): number => {
+    /**
+     * Returns the height of the canvas.
+     * @returns The height of the canvas
+     */
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+    return canvas.height;
+  }
+
+  public background = (color: string|number, ...gb:number[]): void => {
+    /**
+     * Set background color of the canvas.
+     * @param color - The color to set. String or 3 numbers representing RGB values.
+     */
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+    const ctx = canvas.getContext("2d")!;
+    if(typeof color === "number") color = `rgb(${color},${gb[0]},${gb[1]})`;
+    ctx.fillStyle = color;
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+  }
+
+  public linearGradient = (x1: number, y1: number, x2: number, y2: number, ...stops: (number|string)[]) => {
+    /**
+     * Set linear gradient on the canvas.
+     * @param x1 - The x-coordinate of the start point
+     * @param y1 - The y-coordinate of the start point
+     * @param x2 - The x-coordinate of the end point
+     * @param y2 - The y-coordinate of the end point
+     * @param stops - The stops to set. Pairs of numbers representing the position and color of the stop.
+     */
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+    const ctx = canvas.getContext("2d")!;
+    const gradient = ctx.createLinearGradient(x1, y1, x2, y2);
+    // Parse pairs of values from stops
+    for(let i=0; i<stops.length; i+=2) {
+      let color = stops[i+1];
+      if(typeof color === "number") color = `rgb(${color},${stops[i+2]},${stops[i+3]})`;
+      gradient.addColorStop((stops[i] as number), color);
+    }
+    return gradient;
+  }
+
+  public radialGradient = (x1: number, y1: number, r1: number, x2: number, y2: number, r2: number, ...stops: (number|string)[]) => {
+    /**
+     * Set radial gradient on the canvas.
+     * @param x1 - The x-coordinate of the start circle
+     * @param y1 - The y-coordinate of the start circle
+     * @param r1 - The radius of the start circle
+     * @param x2 - The x-coordinate of the end circle
+     * @param y2 - The y-coordinate of the end circle
+     * @param r2 - The radius of the end circle
+     * @param stops - The stops to set. Pairs of numbers representing the position and color of the stop.
+     */
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+    const ctx = canvas.getContext("2d")!;
+    const gradient = ctx.createRadialGradient(x1, y1, r1, x2, y2, r2);
+    for(let i=0; i<stops.length; i+=2) {
+      let color = stops[i+1];
+      if(typeof color === "number") color = `rgb(${color},${stops[i+2]},${stops[i+3]})`;
+      gradient.addColorStop((stops[i] as number), color);
+    }
+    return gradient;
+  }
+
+  public conicGradient = (x: number, y: number, angle: number, ...stops: (number|string)[]) => {
+    /**
+     * Set conic gradient on the canvas.
+     * @param x - The x-coordinate of the center of the gradient
+     * @param y - The y-coordinate of the center of the gradient
+     * @param angle - The angle of the gradient, in radians
+     * @param stops - The stops to set. Pairs of numbers representing the position and color of the stop.
+     */
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+    const ctx = canvas.getContext("2d")!;
+    const gradient = ctx.createConicGradient(x, y, angle);
+    for(let i=0; i<stops.length; i+=2) {
+      let color = stops[i+1];
+      if(typeof color === "number") color = `rgb(${color},${stops[i+2]},${stops[i+3]})`;
+      gradient.addColorStop((stops[i] as number), color);
+    }
+    return gradient;
+  }
+
+  public draw = (func: Function): void => {
+    /**
+     * Draws on the canvas.
+     * @param func - The function to execute
+     */
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+    const ctx = canvas.getContext("2d")!;
+    func(ctx);
+  }
+
+  public circle = (
+    x: number,
+    y: number,
+    radius: number,
+    fillStyle: string,
+  ): void => {
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+    const ctx = canvas.getContext("2d")!;
+    ctx.beginPath();
+    ctx.arc(x, y, radius, 0, 2 * Math.PI);
+    ctx.fillStyle = fillStyle;
+    ctx.fill();
+  };
+
+  public triangular = (
+    x: number,
+    y: number,
+    radius: number,
+    fillStyle: string,
+    rotate: number
+  ): void => {
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+    const ctx = canvas.getContext("2d")!;
+    ctx.save();
+    ctx.translate(x, y);
+    ctx.rotate((rotate * Math.PI) / 180);
+    ctx.beginPath();
+    ctx.moveTo(0, -radius);
+    ctx.lineTo(radius, radius);
+    ctx.lineTo(-radius, radius);
+    ctx.closePath();
+    ctx.fillStyle = fillStyle;
+    ctx.fill();
+    ctx.restore();
+  }
+
+  public star = (
+    x: number,
+    y: number,
+    radius: number,
+    points: number = 5,
+    fillStyle: string = "white",
+    outerRadius: number = 1.0,
+    rotate: number = 0,
+  ): void => {
+     const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+     if(points<1) return this.circle(x, y, radius+outerRadius, fillStyle);
+     if(points==1) return this.triangular(x, y, radius, fillStyle, 0);
+     const ctx = canvas.getContext("2d")!;
+      ctx.save();
+      ctx.translate(x, y);
+      ctx.rotate((rotate * Math.PI) / 180);
+      ctx.beginPath();
+      ctx.moveTo(0, -radius);
+      for (let i = 0; i < points; i++) {
+        ctx.rotate(Math.PI / points);
+        ctx.lineTo(0, -(radius * outerRadius));
+        ctx.rotate(Math.PI / points);
+        ctx.lineTo(0, -radius);
+      }
+      ctx.closePath();
+      ctx.fillStyle = fillStyle;
+      ctx.fill();
+      ctx.restore();
+  };
+
+  public stroke = (
+    x1: number,
+    y1: number,
+    x2: number,
+    y2: number,
+    fillStyle: string,
+    width: number = 1,
+  ): void => {
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+    const ctx = canvas.getContext("2d")!;
+    ctx.beginPath();
+    ctx.moveTo(x1, y1);
+    ctx.lineTo(x2, y2);
+    ctx.strokeStyle = fillStyle;
+    ctx.lineWidth = width;
+    ctx.stroke();
+  };
+
+  public rectangle = (
+    x: number,
+    y: number,
+    width: number,
+    height: number,
+    fillStyle: string,
+    rotate: number = 0,
+  ): void => {
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+    const ctx = canvas.getContext("2d")!;
+    ctx.save();
+    ctx.translate(x, y);
+    ctx.rotate((rotate * Math.PI) / 180);
+    ctx.fillStyle = fillStyle;
+    ctx.fillRect(0, 0, width, height);
+    ctx.restore();
+  }
+
+  public smiley = (
+    x: number,
+    y: number,
+    radius: number,
+    fillStyle: string,
+    eyeSize: number = 1.0,
+    happiness: number = 0.0,
+    rotation: number = 0
+  ): void => {
+    const canvas: HTMLCanvasElement = this.app.interface.drawings as HTMLCanvasElement;
+    const ctx = canvas.getContext("2d")!;
+    // Map the rotation value to an angle within the range of -PI to PI
+    const rotationAngle = rotation/100 * Math.PI;
+    ctx.save();
+    ctx.translate(x, y);
+    ctx.rotate(rotationAngle);
+
+    // Draw face
+    ctx.beginPath();
+    ctx.arc(0, 0, radius, 0, 2 * Math.PI);
+    ctx.fillStyle = fillStyle;
+    ctx.fill();
+    ctx.lineWidth = radius / 20;
+    ctx.strokeStyle = "black";
+    ctx.stroke();
+
+    // Draw eyes
+    const eyeY = -radius / 5;
+    const eyeXOffset = radius / 2.5;
+    const eyeRadiusX = radius / 8;
+    const eyeRadiusY = eyeSize * radius / 10;
+
+    ctx.beginPath();
+    ctx.ellipse(-eyeXOffset, eyeY, eyeRadiusX, eyeRadiusY, 0, 0, 2 * Math.PI);
+    ctx.fillStyle = "black";
+    ctx.fill();
+
+    ctx.beginPath();
+    ctx.ellipse(eyeXOffset, eyeY, eyeRadiusX, eyeRadiusY, 0, 0, 2 * Math.PI);
+    ctx.fillStyle = "black";
+    ctx.fill();
+
+    // Draw mouth with happiness number -1.0 to 1.0. 0.0 Should be a straight line.
+    const mouthY = radius / 2;
+    const mouthLength = radius * 0.9;
+    const smileFactor = 0.25; // Adjust for the smile curvature
+  
+    let controlPointX = 0;
+    let controlPointY = 0;
+  
+    if (happiness >= 0) {
+      controlPointY = mouthY + happiness * smileFactor * radius / 2;
+    } else {
+      controlPointY = mouthY + happiness * smileFactor * radius / 2;
+    }
+  
+    ctx.beginPath();
+    ctx.moveTo(-mouthLength / 2, mouthY);
+    ctx.quadraticCurveTo(controlPointX, controlPointY, mouthLength / 2, mouthY);
+    ctx.lineWidth = 10;
+    ctx.strokeStyle = "black";
+    ctx.stroke();
+    ctx.restore();
+
+  }
+
+
+  // =============================================================
+  // OSC Functions
+  // =============================================================
+
+  public osc = (address: string, port: number, ...args: any[]): void => {
+    sendToServer({
+      address: address,
+      port: port,
+      args: args,
+      timetag: Math.round(Date.now() + (this.app.clock.nudge - this.app.clock.deviation)),
+    } as OSCMessage);
+  };
+
+  public getOSC = (address?: string): any[] => {
+    /**
+     * Give access to incoming OSC messages. If no address is specified, returns the raw oscMessages array. If an address is specified, returns only the messages who contain the address and filter the address itself.
+     */
+    if (address) {
+      let messages = oscMessages.filter((msg) => msg.address === address);
+      messages = messages.map((msg) => msg.data);
+      return messages;
+    } else {
+      return oscMessages;
+    }
+  };
+
   // =============================================================
   // Transport functions
   // =============================================================
@@ -2149,4 +2552,40 @@ export class UserAPI {
      */
     this.app.clock.time_signature = [numerator, denominator];
   };
+
+  public cue = (functionName: string|Function): void => {
+    functionName = typeof functionName === "function" ? functionName.name : functionName;
+    this.cueTimes[functionName] = this.app.clock.pulses_since_origin;
+  };
+
+  public theme = (color_scheme: string): void => {
+    this.app.readTheme(color_scheme);
+    console.log("Changing color scheme for: ", color_scheme)
+  }
+
+  public themeName = (): string => {
+    return this.app.currentThemeName;
+  }
+
+  public randomTheme = (): void => {
+    let theme_names = this.getThemes();
+    let selected_theme = theme_names[Math.floor(Math.random() * theme_names.length)];
+    this.app.readTheme(selected_theme);
+    this.app.api.log(selected_theme);
+  }
+
+  public nextTheme = (): void => {
+    let theme_names = this.getThemes();
+    let current_theme = this.app.api.themeName();
+    let current_theme_idx = theme_names.indexOf(current_theme);
+    let next_theme_idx = (current_theme_idx + 1) % theme_names.length;
+    let next_theme = theme_names[next_theme_idx];
+    this.app.readTheme(next_theme);
+    this.app.api.log(next_theme);
+  }
+
+  public getThemes = (): string[] => {
+    return Object.keys(colorschemes);
+  }
+
 }

src/Clock.ts

@@ -1,11 +1,7 @@
+// @ts-ignore
+import { TransportNode } from "./TransportNode";
+import TransportProcessor from "./TransportProcessor?worker&url";
 import { Editor } from "./main";
-import { tryEvaluate } from "./Evaluator";
-// @ts-ignore
-import { getAudioContext } from "superdough";
-// @ts-ignore
-import "zyklus";
-const zeroPad = (num: number, places: number) =>
-  String(num).padStart(places, "0");
 
 export interface TimePosition {
   /**
@@ -22,29 +18,35 @@ export interface TimePosition {
 
 export class Clock {
   /**
+   * The Clock Class is responsible for keeping track of the current time.
+   * It is also responsible for starting and stopping the Clock TransportNode.
    *
-   * @param app - main application instance
+   * @param app - The main application instance
-   * @param clock - zyklus clock
+   * @param ctx - The current AudioContext used by app
-   * @param ctx - current AudioContext used by app
+   * @param transportNode - The TransportNode helper
-   * @param bpm - current beats per minute value
+   * @param bpm - The current beats per minute value
-   * @param time_signature - time signature
+   * @param time_signature - The time signature
-   * @param time_position - current time position
+   * @param time_position - The current time position
-   * @param ppqn - pulses per quarter note
+   * @param ppqn - The pulses per quarter note
-   * @param tick - current tick since origin
+   * @param tick - The current tick since origin
    * @param running - Is the clock running?
+   * @param lastPauseTime - The last time the clock was paused
+   * @param lastPlayPressTime - The last time the clock was started
+   * @param totalPauseTime - The total time the clock has been paused / stopped
    */
 
-  private _bpm: number;
-  private _ppqn: number;
-  clock: any;
   ctx: AudioContext;
   logicalTime: number;
+  transportNode: TransportNode | null;
+  private _bpm: number;
   time_signature: number[];
   time_position: TimePosition;
+  private _ppqn: number;
   tick: number;
   running: boolean;
-  timeviewer: HTMLElement;
+  lastPauseTime: number;
-  deadline: number;
+  lastPlayPressTime: number;
+  totalPauseTime: number;
 
   constructor(
     public app: Editor,
@@ -56,58 +58,31 @@ export class Clock {
     this.tick = 0;
     this._bpm = 120;
     this._ppqn = 48;
+    this.transportNode = null;
     this.ctx = ctx;
     this.running = true;
-    this.deadline = 0;
+    this.lastPauseTime = 0;
-    this.timeviewer = document.getElementById("timeviewer")!;
+    this.lastPlayPressTime = 0;
-    this.clock = getAudioContext().createClock(
+    this.totalPauseTime = 0;
-      this.clockCallback,
+    ctx.audioWorklet
-      this.pulse_duration,
+      .addModule(TransportProcessor)
-    );
+      .then((e) => {
+        this.transportNode = new TransportNode(ctx, {}, this.app);
+        this.transportNode.connect(ctx.destination);
+        return e;
+      })
+      .catch((e) => {
+        console.log("Error loading TransportProcessor.js:", e);
+      });
   }
 
-  // @ts-ignore
-  clockCallback = (time: number, duration: number, tick: number) => {
-    /**
-     * Callback function for the zyklus clock. Updates the clock info and sends a 
-     * MIDI clock message if the setting is enabled. Also evaluates the global buffer.
-     * 
-     * @param time - precise AudioContext time when the tick should happen
-     * @param duration -  seconds between each tick
-     * @param tick - count of the current tick
-     */
-    let deadline = time - getAudioContext().currentTime;
-    this.deadline = deadline;
-    this.tick = tick;
-    if (this.app.clock.running) {
-      if (this.app.settings.send_clock) {
-        this.app.api.MidiConnection.sendMidiClock();
-      }
-      const futureTimeStamp = this.app.clock.convertTicksToTimeposition(
-        this.app.clock.tick,
-      );
-      this.app.clock.time_position = futureTimeStamp;
-      if (futureTimeStamp.pulse % this.app.clock.ppqn == 0) {
-        this.timeviewer.innerHTML = `${zeroPad(futureTimeStamp.bar, 2)}:${futureTimeStamp.beat + 1
-          } / ${this.app.clock.bpm}`;
-      }
-      if (this.app.exampleIsPlaying) {
-        tryEvaluate(this.app, this.app.example_buffer);
-      } else {
-        tryEvaluate(this.app, this.app.global_buffer);
-      }
-    }
-
-    // Implement TransportNode clock callback and update clock info with it
-  };
-
   convertTicksToTimeposition(ticks: number): TimePosition {
     /**
-     * Converts ticks to a time position. 
+     * Converts ticks to a TimePosition object.
-     * 
+     * @param ticks The number of ticks to convert.
-     * @param ticks - ticks to convert
+     * @returns The TimePosition object representing the converted ticks.
-     * @returns TimePosition
      */
+
     const beatsPerBar = this.app.clock.time_signature[0];
     const ppqnPosition = ticks % this.app.clock.ppqn;
     const beatNumber = Math.floor(ticks / this.app.clock.ppqn);
@@ -118,9 +93,10 @@ export class Clock {
 
   get ticks_before_new_bar(): number {
     /**
-     * Calculates the number of ticks before the next bar.
+     * This function returns the number of ticks separating the current moment
-     * 
+     * from the beginning of the next bar.
-     * @returns number - ticks before the next bar
+     *
+     * @returns number of ticks until next bar
      */
     const ticskMissingFromBeat = this.ppqn - this.time_position.pulse;
     const beatsMissingFromBar = this.beats_per_bar - this.time_position.beat;
@@ -129,9 +105,10 @@ export class Clock {
 
   get next_beat_in_ticks(): number {
     /**
-     * Calculates the number of ticks before the next beat.
+     * This function returns the number of ticks separating the current moment
-     * 
+     * from the beginning of the next beat.
-     * @returns number - ticks before the next beat
+     *
+     * @returns number of ticks until next beat
      */
     return this.app.clock.pulses_since_origin + this.time_position.pulse;
   }
@@ -139,8 +116,6 @@ export class Clock {
   get beats_per_bar(): number {
     /**
      * Returns the number of beats per bar.
-     * 
-     * @returns number - beats per bar
      */
     return this.time_signature[0];
   }
@@ -148,8 +123,8 @@ export class Clock {
   get beats_since_origin(): number {
     /**
      * Returns the number of beats since the origin.
-     * 
+     *
-     * @returns number - beats since the origin
+     * @returns number of beats since origin
      */
     return Math.floor(this.tick / this.ppqn);
   }
@@ -157,8 +132,8 @@ export class Clock {
   get pulses_since_origin(): number {
     /**
      * Returns the number of pulses since the origin.
-     * 
+     *
-     * @returns number - pulses since the origin
+     * @returns number of pulses since origin
      */
     return this.tick;
   }
@@ -166,112 +141,119 @@ export class Clock {
   get pulse_duration(): number {
     /**
      * Returns the duration of a pulse in seconds.
-     * @returns number - duration of a pulse in seconds
      */
     return 60 / this.bpm / this.ppqn;
   }
 
   public pulse_duration_at_bpm(bpm: number = this.bpm): number {
     /**
-     * Returns the duration of a pulse in seconds at a given bpm.
+     * Returns the duration of a pulse in seconds at a specific bpm.
-     * 
-     * @param bpm - bpm to calculate the pulse duration for
-     * @returns number - duration of a pulse in seconds
      */
     return 60 / bpm / this.ppqn;
   }
 
   get bpm(): number {
-    /**
-     * Returns the current bpm.
-     * @returns number - current bpm
-     */
     return this._bpm;
   }
 
-  get tickDuration(): number {
+  set nudge(nudge: number) {
-    /**
+    this.transportNode?.setNudge(nudge);
-     * Returns the duration of a tick in seconds.
-     * @returns number - duration of a tick in seconds
-     */
-    return 1 / this.ppqn;
   }
 
   set bpm(bpm: number) {
-    /**
-     * Sets the bpm.
-     * @param bpm - bpm to set
-     */
     if (bpm > 0 && this._bpm !== bpm) {
+      this.transportNode?.setBPM(bpm);
       this._bpm = bpm;
-      this.clock.setDuration(() => (this.tickDuration * 60) / this.bpm);
+      this.logicalTime = this.realTime;
     }
   }
 
   get ppqn(): number {
-    /**
-     * Returns the current ppqn.
-     * @returns number - current ppqn
-     */
     return this._ppqn;
   }
 
+  get realTime(): number {
+    return this.app.audioContext.currentTime - this.totalPauseTime;
+  }
+
+  get deviation(): number {
+    return Math.abs(this.logicalTime - this.realTime);
+  }
+
   set ppqn(ppqn: number) {
-    /**
-     * Sets the ppqn.
-     * @param ppqn - ppqn to set
-     * @returns number - current ppqn
-     */
     if (ppqn > 0 && this._ppqn !== ppqn) {
       this._ppqn = ppqn;
+      this.transportNode?.setPPQN(ppqn);
+      this.logicalTime = this.realTime;
     }
   }
 
+  public incrementTick(bpm: number) {
+    this.tick++;
+    this.logicalTime += this.pulse_duration_at_bpm(bpm);
+  }
+
   public nextTickFrom(time: number, nudge: number): number {
+    /**
+     * Compute the time remaining before the next clock tick.
+     * @param time - audio context currentTime
+     * @param nudge - nudge in the future (in seconds)
+     * @returns remainingTime
+     */
     const pulseDuration = this.pulse_duration;
     const nudgedTime = time + nudge;
     const nextTickTime = Math.ceil(nudgedTime / pulseDuration) * pulseDuration;
     const remainingTime = nextTickTime - nudgedTime;
+
     return remainingTime;
   }
 
   public convertPulseToSecond(n: number): number {
+    /**
+     * Converts a pulse to a second.
+     */
     return n * this.pulse_duration;
   }
 
   public start(): void {
     /**
-     * Start the clock
+     * Starts the TransportNode (starts the clock).
-     * 
+     *
      * @remark also sends a MIDI message if a port is declared
      */
     this.app.audioContext.resume();
     this.running = true;
     this.app.api.MidiConnection.sendStartMessage();
-    this.clock.start();
+    this.lastPlayPressTime = this.app.audioContext.currentTime;
+    this.totalPauseTime += this.lastPlayPressTime - this.lastPauseTime;
+    this.transportNode?.start();
   }
 
   public pause(): void {
     /**
-     * Pause the clock.
+     * Pauses the TransportNode (pauses the clock).
-     * 
+     *
      * @remark also sends a MIDI message if a port is declared
      */
     this.running = false;
+    this.transportNode?.pause();
     this.app.api.MidiConnection.sendStopMessage();
-    this.clock.pause();
+    this.lastPauseTime = this.app.audioContext.currentTime;
+    this.logicalTime = this.realTime;
   }
 
   public stop(): void {
     /**
-     * Stops the clock.
+     * Stops the TransportNode (stops the clock).
      *
      * @remark also sends a MIDI message if a port is declared
      */
     this.running = false;
     this.tick = 0;
+    this.lastPauseTime = this.app.audioContext.currentTime;
+    this.logicalTime = this.realTime;
     this.time_position = { bar: 0, beat: 0, pulse: 0 };
     this.app.api.MidiConnection.sendStopMessage();
-    this.clock.stop();
+    this.transportNode?.stop();
   }
-}
+}

src/Documentation.ts

@@ -1,13 +1,13 @@
 import { type Editor } from "./main";
 // Basics
 import { introduction } from "./documentation/basics/welcome";
-import { loading_samples } from "./documentation/samples/loading_samples";
+import { loading_samples } from "./documentation/learning/samples/loading_samples";
-import { amplitude } from "./documentation/audio_engine/amplitude";
+import { amplitude } from "./documentation/learning/audio_engine/amplitude";
-import { reverb } from "./documentation/audio_engine/reverb_delay";
+import { effects } from "./documentation/learning/audio_engine/effects";
-import { sampler } from "./documentation/audio_engine/sampler";
+import { sampler } from "./documentation/learning/audio_engine/sampler";
-import { sample_banks } from "./documentation/samples/sample_banks";
+import { sample_banks } from "./documentation/learning/samples/sample_banks";
-import { audio_basics } from "./documentation/audio_engine/audio_basics";
+import { audio_basics } from "./documentation/learning/audio_engine/audio_basics";
-import { sample_list } from "./documentation/samples/sample_list";
+import { sample_list } from "./documentation/learning/samples/sample_list";
 import { software_interface } from "./documentation/basics/interface";
 import { shortcuts } from "./documentation/basics/keyboard";
 import { code } from "./documentation/basics/code";
@@ -17,30 +17,37 @@ import { oscilloscope } from "./documentation/more/oscilloscope";
 import { synchronisation } from "./documentation/more/synchronisation";
 import { about } from "./documentation/more/about";
 import { bonus } from "./documentation/more/bonus";
-import { chaining } from "./documentation/chaining";
+import { chaining } from "./documentation/patterns/chaining";
-import { interaction } from "./documentation/interaction";
+import { interaction } from "./documentation/basics/interaction";
-import { time } from "./documentation/time/time";
+import { time } from "./documentation/learning/time/time";
-import { linear_time } from "./documentation/time/linear_time";
+import { linear_time } from "./documentation/learning/time/linear_time";
-import { cyclical_time } from "./documentation/time/cyclical_time";
+import { cyclical_time } from "./documentation/learning/time/cyclical_time";
-import { long_forms } from "./documentation/long_forms";
+import { long_forms } from "./documentation/learning/time/long_forms";
-import { midi } from "./documentation/midi";
+import { midi } from "./documentation/learning/midi";
-import { sound } from "./documentation/engine";
+import { osc } from "./documentation/learning/osc";
-import { patterns } from "./documentation/patterns";
+import { patterns } from "./documentation/patterns/patterns";
-import { functions } from "./documentation/functions";
+import { functions } from "./documentation/patterns/functions";
-import { variables } from "./documentation/variables";
+import { generators } from "./documentation/patterns/generators";
-import { probabilities } from "./documentation/probabilities";
+import { variables } from "./documentation/patterns/variables";
-import { lfos } from "./documentation/lfos";
+import { probabilities } from "./documentation/patterns/probabilities";
-import { ziffers } from "./documentation/ziffers";
+import { lfos } from "./documentation/patterns/lfos";
-import { synths } from "./documentation/synths";
+import { ziffers_basics } from "./documentation/patterns/ziffers/ziffers_basics";
-
+import { ziffers_scales } from "./documentation/patterns/ziffers/ziffers_scales";
+import { ziffers_rhythm } from "./documentation/patterns/ziffers/ziffers_rhythm";
+import { ziffers_algorithmic } from "./documentation/patterns/ziffers/ziffers_algorithmic";
+import { ziffers_tonnetz } from "./documentation/patterns/ziffers/ziffers_tonnetz";
+import { ziffers_syncing } from "./documentation/patterns/ziffers/ziffers_syncing";
+import { synths } from "./documentation/learning/audio_engine/synths";
 // Setting up the Markdown converter with syntax highlighting
 import showdown from "showdown";
 import showdownHighlight from "showdown-highlight";
+import "highlight.js/styles/atom-one-dark-reasonable.min.css";
 import { createDocumentationStyle } from "./DomElements";
+import { filters } from "./documentation/learning/audio_engine/filters";
 showdown.setFlavor("github");
 
 export const key_shortcut = (shortcut: string): string => {
-  return `<kbd class="lg:px-2 lg:py-1.5 px-1 py-1 lg:text-sm text-xs font-semibold text-gray-800 bg-gray-100 border border-gray-200 rounded-lg dark:bg-gray-600 dark:text-gray-100 dark:border-gray-500">${shortcut}</kbd>`;
+  return `<kbd class="lg:px-2 lg:py-1.5 px-1 py-1 lg:text-sm text-xs font-semibold text-brightwhite bg-brightblack border border-black rounded-lg">${shortcut}</kbd>`;
 };
 
 export const makeExampleFactory = (application: Editor): Function => {
@@ -56,13 +63,11 @@ export const makeExampleFactory = (application: Editor): Function => {
     return `
 <details ${open ? "open" : ""}>
   <summary >${description}
-    <button class="ml-4 py-1 align-top text-base px-4 hover:bg-green-700 bg-emerald-600 inline-block" onclick="app.api._playDocExample(app.api.codeExamples['${codeId}'])">▶️ Play</button>
+    <button class="ml-4 py-1 align-top text-base px-4 hover:bg-brightgreen bg-green inline-block text-selection_foreground" onclick="app.api._playDocExample(app.api.codeExamples['${codeId}'])">▶️ Play</button>
-    <button class="py-1 text-base px-4 hover:bg-neutral-600 bg-neutral-500 inline-block " onclick="app.api._stopDocExample()">&#x23f8;&#xFE0F; Pause</button>
+    <button class="py-1 text-base px-4 hover:brightyellow bg-yellow text-selection_foreground inline-block" onclick="app.api._stopDocExample()">&#x23f8;&#xFE0F; Pause</button>
-    <button class="py-1 text-base px-4 hover:bg-neutral-900 bg-neutral-800 inline-block " onclick="navigator.clipboard.writeText(app.api.codeExamples['${codeId}'])">📎 Copy</button>
+    <button class="py-1 text-base px-4 hover:bg-brightmagenta bg-magenta text-selection_foreground inline-block" onclick="navigator.clipboard.writeText(app.api.codeExamples['${codeId}'])">📎 Copy</button>
   </summary>
-  \`\`\`javascript
+  <pre><code class="hljs language-javascript">${code.trim()}</code></pre>
-  ${code}
-  \`\`\`
 </details>
 `;
   };
@@ -86,19 +91,26 @@ export const documentation_factory = (application: Editor) => {
     linear: linear_time(application),
     cyclic: cyclical_time(application),
     longform: long_forms(application),
-    sound: sound(application),
     synths: synths(application),
+    filters: filters(application),
     chaining: chaining(application),
     patterns: patterns(application),
-    ziffers: ziffers(application),
+    ziffers_basics: ziffers_basics(application),
+    ziffers_scales: ziffers_scales(application),
+    ziffers_algorithmic: ziffers_algorithmic(application),
+    ziffers_rhythm: ziffers_rhythm(application),
+    ziffers_tonnetz: ziffers_tonnetz(application),
+    ziffers_syncing: ziffers_syncing(application),
     midi: midi(application),
+    osc: osc(application),
     lfos: lfos(application),
     variables: variables(application),
     probabilities: probabilities(application),
     functions: functions(application),
+    generators: generators(application),
     shortcuts: shortcuts(application),
     amplitude: amplitude(application),
-    reverb_delay: reverb(application),
+    effects: effects(application),
     sampler: sampler(application),
     mouse: mouse(application),
     oscilloscope: oscilloscope(application),
@@ -126,13 +138,17 @@ export const showDocumentation = (app: Editor) => {
     document.getElementById("documentation")?.classList.remove("hidden");
     // Load and convert Markdown content from the documentation file
     let style = createDocumentationStyle(app);
-    let bindings = Object.keys(style).map((key) => ({
+
-      type: "output",
+    function update_and_assign(callback: Function) {
-      regex: new RegExp(`<${key}([^>]*)>`, "g"),
+      let bindings = Object.keys(style).map((key) => ({
-      //@ts-ignore
+        type: "output",
-      replace: (match, p1) => `<${key} class="${style[key]}" ${p1}>`,
+        regex: new RegExp(`<${key}([^>]*)>`, "g"),
-    }));
+        //@ts-ignore
-    updateDocumentationContent(app, bindings);
+        replace: (match, p1) => `<${key} class="${style[key]}" ${p1}>`,
+      }));
+      callback(bindings)
+    }
+    update_and_assign((e: Object) => updateDocumentationContent(app, e));
   }
 };
 
@@ -153,15 +169,31 @@ export const updateDocumentationContent = (app: Editor, bindings: any) => {
    * @param app - The editor application.
    * @param bindings - Additional bindings for the showdown converter.
    */
+  let loading_message: string = "<h1 class='border-4 py-2 px-2 mx-48 mt-48 text-center text-2xl text-brightwhite'>Loading! <b class='text-red'>Clic to refresh!</b></h1>";
   const converter = new showdown.Converter({
     emoji: true,
     moreStyling: true,
     backslashEscapesHTMLTags: true,
-    extensions: [showdownHighlight({ auto_detection: true }), ...bindings],
+    extensions: [showdownHighlight({
+      pre: true, 
+      auto_detection: false
+    }), ...bindings],
   });
-  const converted_markdown = converter.makeHtml(
+  console.log(app.currentDocumentationPane);
-    app.docs[app.currentDocumentationPane],
+
-  );
+  function _update_and_assign(callback: Function) {
-  document.getElementById("documentation-content")!.innerHTML =
+    const converted_markdown = converter.makeHtml(
-    converted_markdown;
+      app.docs[app.currentDocumentationPane],
-};
+    );
+    callback(converted_markdown)
+  }
+  _update_and_assign((e: string)=> { 
+    let display_content = e === undefined ? loading_message : e;
+    document.getElementById("documentation-content")!.innerHTML = display_content; 
+  })
+  if (document.getElementById("documentation-content")!.innerHTML.replace(/"/g, "'") == loading_message.replace(/"/g, "'")) {
+    setTimeout(() => {
+      updateDocumentationContent(app, bindings);
+    }, 100);
+  }
+}

src/DomElements.ts

@@ -18,6 +18,8 @@ export const singleElements = {
   load_universe_button: "load-universe-button",
   download_universe_button: "download-universes",
   upload_universe_button: "upload-universes",
+  upload_samples_button: "upload-samples",
+  sample_indicator: "sample-indicator",
   destroy_universes_button: "destroy-universes",
   documentation_button: "doc-button-1",
   eval_button: "eval-button-1",
@@ -43,6 +45,8 @@ export const singleElements = {
   midi_clock_checkbox: "send-midi-clock",
   midi_channels_scripts: "midi-channels-scripts",
   midi_clock_ppqn: "midi-clock-ppqn-input",
+  theme_selector: "theme-selector",
+  theme_previewer: "theme-previewer",
   load_demo_songs: "load-demo-songs",
   normal_mode_button: "normal-mode",
   vim_mode_button: "vim-mode",
@@ -52,6 +56,7 @@ export const singleElements = {
   error_line: "error_line",
   hydra_canvas: "hydra-bg",
   feedback: "feedback",
+  drawings: "drawings",
   scope: "scope",
 };
 
@@ -70,30 +75,30 @@ export const createDocumentationStyle = (app: Editor) => {
    */
 
   return {
-    h1: "text-white lg:text-4xl text-xl lg:ml-4 lg:mx-4 mx-2 lg:my-4 my-2 lg:mb-4 mb-4 border-b-4 pt-4 pb-3 px-2",
+    h1: "text-brightwhite lg:text-4xl text-xl lg:ml-4 lg:mx-4 mx-2 lg:my-4 my-2 lg:mb-4 mb-4 border-b-4 pt-4 pb-3 px-2",
-    h2: "text-white lg:text-3xl text-xl lg:ml-4 lg:mx-4 mx-2 lg:my-4 my-2 lg:mb-4 mb-4 border-b-2 pt-12 pb-3 px-2",
+    h2: "text-brightwhite lg:text-3xl text-xl lg:ml-4 lg:mx-4 mx-2 lg:my-4 my-2 lg:mb-4 mb-4 border-b-2 pt-12 pb-3 px-2",
-    h3: "text-white lg:text-2xl text-xl lg:ml-4 lg:mx-4 mx-2 lg:my-4 my-2 border-l-2 border-b-2 lg:mb-4 mb-4 pb-2 px-2 lg:mt-16",
+    h3: "text-brightwhite lg:text-2xl text-xl lg:ml-4 lg:mx-4 mx-2 lg:my-4 my-2 border-l-2 border-b-2 lg:mb-4 mb-4 pb-2 px-2 lg:mt-16",
     ul: "text-underline ml-12",
     li: "list-disc lg:text-2xl text-base text-white lg:mx-4 mx-2 my-4 my-2 leading-normal",
     p: "lg:text-2xl text-base text-white lg:mx-6 mx-2 my-4 leading-normal",
     warning:
-      "animate-pulse lg:text-2xl font-bold text-rose-600 lg:mx-6 mx-2 my-4 leading-normal",
+      "animate-pulse lg:text-2xl font-bold text-brightred lg:mx-6 mx-2 my-4 leading-normal",
-    a: "lg:text-2xl text-base text-orange-300",
+    a: "lg:text-2xl text-base text-white",
     code: `lg:my-4 sm:my-1 text-base lg:text-xl block whitespace-pre overflow-x-hidden`,
     icode:
-      "lg:my-1 my-1 lg:text-xl sm:text-xs text-white font-mono bg-neutral-600",
+      "lg:my-1 my-1 lg:text-xl sm:text-xs text-brightwhite font-mono bg-brightblack",
-    ic: "lg:my-1 my-1 lg:text-xl sm:text-xs text-white font-mono bg-neutral-600",
+    ic: "lg:my-1 my-1 lg:text-xl sm:text-xs text-brightwhite font-mono bg-brightblack",
-    blockquote: "text-neutral-200 border-l-4 border-neutral-500 pl-4 my-4 mx-4",
+    blockquote: "text-brightwhite border-l-4 border-white pl-4 my-4 mx-4",
     details:
-      "lg:mx-20 py-2 px-6 lg:text-2xl text-white border-l-8 box-border bg-neutral-900",
+      "lg:mx-20 py-2 px-6 lg:text-2xl text-white border-l-8 box-border bg-selection_foreground",
     summary: "font-semibold text-xl",
     table:
       "justify-center lg:my-12 my-2 lg:mx-12 mx-2 lg:text-2xl text-base w-full text-left text-white border-collapse",
     thead:
-      "text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400",
+      "text-xs text-gray-700 uppercase",
     th: "",
     td: "",
     tr: "",
-    box: "border bg-red-500",
+    box: "border bg-red",
   };
 };

src/EditorSetup.ts

@@ -1,5 +1,6 @@
 import { Prec } from "@codemirror/state";
 import { indentWithTab } from "@codemirror/commands";
+import { tags as t } from "@lezer/highlight";
 import {
   keymap,
   lineNumbers,
@@ -7,8 +8,6 @@ import {
   drawSelection,
   highlightActiveLine,
   dropCursor,
-  // rectangularSelection,
-  // crosshairCursor,
   highlightActiveLineGutter,
 } from "@codemirror/view";
 import { Extension, EditorState } from "@codemirror/state";
@@ -18,6 +17,7 @@ import {
   syntaxHighlighting,
   indentOnInput,
   bracketMatching,
+  HighlightStyle,
 } from "@codemirror/language";
 import { defaultKeymap, historyKeymap, history } from "@codemirror/commands";
 import { searchKeymap, highlightSelectionMatches } from "@codemirror/search";
@@ -30,12 +30,212 @@ import { lintKeymap } from "@codemirror/lint";
 import { Compartment } from "@codemirror/state";
 import { Editor } from "./main";
 import { EditorView } from "codemirror";
-import { toposTheme } from "./themes/toposTheme";
 import { javascript } from "@codemirror/lang-javascript";
 import { inlineHoveringTips } from "./documentation/inlineHelp";
 import { toposCompletions, soundCompletions } from "./documentation/inlineHelp";
 import { javascriptLanguage } from "@codemirror/lang-javascript";
 
+export const getCodeMirrorTheme = (theme: {[key: string]: string}): Extension => {
+  // @ts-ignore
+  const black = theme["black"],
+        red = theme["red"],
+        green = theme["green"],
+        yellow = theme["yellow"],
+        blue = theme["blue"],
+        magenta = theme["magenta"],
+        cyan = theme["cyan"],
+        white = theme["white"],
+        // @ts-ignore
+        brightblack = theme["brightblack"],
+        // @ts-ignore
+        brightred = theme["brightred"],
+        brightgreen = theme["brightgreen"],
+        // @ts-ignore
+        brightyellow = theme["brightyellow"],
+        // @ts-ignore
+        brightblue = theme["brightblue"],
+        // @ts-ignore
+        brightmagenta = theme["brightmagenta"],
+        // @ts-ignore
+        brightcyan = theme["brightcyan"],
+        brightwhite = theme["brightwhite"],
+        background = theme["background"],
+        selection_foreground = theme["selection_foreground"],
+        cursor = theme["cursor"],
+        foreground = theme["foreground"],
+        selection_background = theme["selection_background"];
+  const toposTheme = EditorView.theme( {
+      "&": {
+        color: background,
+        // backgroundColor: background,
+        backgroundColor: "transparent",
+        fontSize: "24px",
+        fontFamily: "IBM Plex Mono",
+      },
+      ".cm-content": {
+        caretColor: cursor,
+        fontFamily: "IBM Plex Mono",
+      },
+      ".cm-cursor, .cm-dropCursor": {
+        borderLeftColor: cursor,
+      },
+      "&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":
+        {
+          backgroundColor: brightwhite,
+          border: `1px solid ${brightwhite}`,
+        },
+      ".cm-panels": {
+        backgroundColor: selection_background,
+        color: red,
+      },
+      ".cm-panels.cm-panels-top": { borderBottom: "2px solid black" },
+      ".cm-panels.cm-panels-bottom": { borderTop: "2px solid black" },
+      ".cm-search.cm-panel": { backgroundColor: "transparent" },
+      ".cm-searchMatch": {
+        outline: `1px solid ${magenta}`,
+      },
+      ".cm-searchMatch.cm-searchMatch-selected": {
+        backgroundColor: red,
+      },
+      ".cm-activeLine": {
+        backgroundColor: `rgba(${(parseInt(selection_background.slice(1,3), 16))}, ${(parseInt(selection_background.slice(3,5), 16))}, ${(parseInt(selection_background.slice(5,7), 16))}, 0.25)`,
+      },
+      ".cm-selectionMatch": {
+        backgroundColor: `rgba(${(parseInt(selection_background.slice(1,3), 16))}, ${(parseInt(selection_background.slice(3,5), 16))}, ${(parseInt(selection_background.slice(5,7), 16))}, 0.25)`,
+        outline: `1px solid ${brightwhite}`,
+      },
+      "&.cm-focused .cm-matchingBracket": {
+        color: `rgba(${(parseInt(selection_background.slice(1,3), 16))}, ${(parseInt(selection_background.slice(3,5), 16))}, ${(parseInt(selection_background.slice(5,7), 16))}, 0.25)`,
+      },
+      "&.cm-focused .cm-nonmatchingBracket": {
+        color: yellow,
+      },
+
+      ".cm-gutters": {
+        //backgroundColor: base00,
+        backgroundColor: "transparent",
+        color: foreground,
+      },
+      ".cm-activeLineGutter": {
+        backgroundColor: selection_background,
+        color: selection_foreground,
+      },
+
+      ".cm-foldPlaceholder": {
+        border: "none",
+        color: `${blue}`,
+      },
+      ".cm-tooltip": {
+        border: "none",
+        backgroundColor: background,
+      },
+      ".cm-tooltip .cm-tooltip-arrow:before": {},
+      ".cm-tooltip .cm-tooltip-arrow:after": {
+        borderTopColor: background,
+        borderBottomColor: background,
+      },
+      ".cm-tooltip-autocomplete": {
+        "& > ul > li[aria-selected]": {
+          backgroundColor: background,
+          color: background,
+        },
+      },
+    },
+    { dark: true },
+  );
+
+  let toposHighlightStyle = HighlightStyle.define([
+    { tag: t.paren, color: brightwhite },
+    { tag: [t.propertyName, t.punctuation, t.variableName], color: brightwhite },
+    { tag: t.keyword, color: yellow },
+    { tag: [t.name, t.deleted, t.character, t.macroName], color: red, },
+    { tag: [t.function(t.variableName)], color: blue },
+    { tag: [t.labelName], color: brightwhite },
+    { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: cyan, },
+    { tag: [t.definition(t.name), t.separator], color: brightwhite },
+    { tag: [t.brace], color: white },
+    { tag: [t.annotation], color: blue, },
+    { tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: yellow, },
+    { tag: [t.typeName, t.className], color: magenta, },
+    { tag: [t.operator, t.operatorKeyword], color: blue, },
+    { tag: [t.tagName], color: blue, },
+    { tag: [t.squareBracket], color: blue, },
+    { tag: [t.angleBracket], color: blue, },
+    { tag: [t.attributeName], color: red, },
+    { tag: [t.regexp], color: brightgreen, },
+    { tag: [t.quote], color: green, },
+    { tag: [t.string], color: green },
+    {
+      tag: t.link,
+      color: green,
+      textDecoration: "underline",
+      textUnderlinePosition: "under",
+    },
+    {
+      tag: [t.url, t.escape, t.special(t.string)],
+      color: green,
+    },
+    { tag: [t.meta], color: brightwhite },
+    { tag: [t.comment], color: brightwhite, fontStyle: "italic" },
+    { tag: t.monospace, color: brightwhite },
+    { tag: t.strong, fontWeight: "bold", color: white },
+    { tag: t.emphasis, fontStyle: "italic", color: white },
+    { tag: t.strikethrough, textDecoration: "line-through" },
+    { tag: t.heading, fontWeight: "bold", color: white },
+    { tag: t.heading1, fontWeight: "bold", color: white },
+    {
+      tag: [t.heading2, t.heading3, t.heading4],
+      fontWeight: "bold",
+      color: yellow,
+    },
+    {
+      tag: [t.heading5, t.heading6],
+      color: red,
+    },
+    { tag: [t.atom, t.bool, t.special(t.variableName)], color: green},
+    {
+      tag: [t.processingInstruction, t.inserted],
+      color: green,
+    },
+    {
+      tag: [t.contentSeparator],
+      color: green,
+    },
+    { tag: t.invalid, color: red, borderBottom: `1px dotted ${red}` },
+  ]);
+  return [ toposTheme, syntaxHighlighting(toposHighlightStyle),
+]
+}
+
+// const debugTheme = EditorView.theme({
+//   ".cm-line span": {
+//     position: "relative",
+//   },
+//   ".cm-line span:hover::after": {
+//     position: "absolute",
+//     bottom: "100%",
+//     left: 0,
+//     background: "black",
+//     color: "white",
+//     border: "solid 2px",
+//     borderRadius: "5px",
+//     content: "var(--tags)",
+//     width: `max-content`,
+//     padding: "1px 4px",
+//     zIndex: 10,
+//     pointerEvents: "none",
+//   },
+// });
+// 
+// const debugHighlightStyle = HighlightStyle.define(
+//   // @ts-ignore
+//   Object.entries(t).map(([key, value]) => {
+//     return { tag: value, "--tags": `"tag.${key}"` };
+//   })
+// );
+// const debug = [debugTheme, syntaxHighlighting(debugHighlightStyle)];
+
+
 export const jsCompletions = javascriptLanguage.data.of({
   autocomplete: toposCompletions,
 });
@@ -70,6 +270,7 @@ export const editorSetup: Extension = (() => [
 export const installEditor = (app: Editor) => {
   app.vimModeCompartment = new Compartment();
   app.hoveringCompartment = new Compartment();
+  app.themeCompartment = new Compartment();
   app.completionsCompartment = new Compartment();
   app.withLineNumbers = new Compartment();
   app.chosenLanguage = new Compartment();
@@ -99,7 +300,10 @@ export const installEditor = (app: Editor) => {
       app.settings.completions ? [jsCompletions, toposSoundCompletions] : [],
     ),
     editorSetup,
-    toposTheme,
+    app.themeCompartment.of(
+      getCodeMirrorTheme(app.getColorScheme("Tomorrow Night Burns")),
+      // debug
+    ),
     app.chosenLanguage.of(javascript()),
   ];
   app.dynamicPlugins = new Compartment();

src/FileManagement.ts

@@ -136,7 +136,7 @@ export class AppSettings {
    */
 
   public vimMode: boolean = false;
-  public theme: string = "toposTheme";
+  public theme: string = "Everblush";
   public font: string = "IBM Plex Mono";
   public font_size: number = 24;
   public universes: Universes;

src/IO/OSC.ts

@@ -0,0 +1,62 @@
+export interface OSCMessage {
+  address: string;
+  port: number;
+  args: object;
+  timetag: number;
+}
+
+// Send/receive messages from websocket
+export let outputSocket = new WebSocket("ws://localhost:3000");
+export let inputSocket = new WebSocket("ws://localhost:3001");
+
+export let oscMessages: any[] = [];
+inputSocket.addEventListener("message", (event) => {
+  let data = JSON.parse(event.data);
+  if (oscMessages.length >= 1000) {
+    oscMessages.shift();
+  }
+  oscMessages.push(data);
+});
+
+// @ts-ignore
+outputSocket.onopen = function (event) {
+  console.log("Connected to WebSocket Server");
+  // Send an OSC-like message
+  outputSocket.send(
+    JSON.stringify({
+      address: "/successful_connexion",
+      port: 3000,
+      args: {},
+    }),
+  );
+
+  outputSocket.onerror = function (error) {
+    console.log("Websocket Error:", error);
+  };
+
+  outputSocket.onmessage = function (event) {
+    console.log("Received: ", event.data);
+  };
+};
+
+export function sendToServer(message: OSCMessage) {
+  if (outputSocket.readyState === WebSocket.OPEN) {
+    outputSocket.send(JSON.stringify(message));
+  } else {
+    console.log("WebSocket is not open. Attempting to reconnect...");
+    if (
+      outputSocket.readyState === WebSocket.CONNECTING ||
+      outputSocket.readyState === WebSocket.OPEN
+    ) {
+      outputSocket.close();
+    }
+
+    // Create a new WebSocket connection
+    outputSocket = new WebSocket("ws://localhost:3000");
+
+    // Send the message once the socket is open
+    outputSocket.onopen = () => {
+      outputSocket.send(JSON.stringify(message));
+    };
+  }
+}

src/IO/SampleLoading.ts

@@ -0,0 +1,155 @@
+/**
+ * This code is taken from https://github.com/tidalcycles/strudel/pull/839. The logic is written by 
+ * daslyfe (Jade Rose Rowland). I have tweaked it a bit to fit the needs of this project (TypeScript),
+ * etc... Many thanks for this piece of code! This code is initially part of the Strudel project:
+ * https://github.com/tidalcycles/strudel.
+ */
+
+// @ts-ignore
+import { registerSound, onTriggerSample }  from "superdough";
+
+export const isAudioFile = (filename: string) => ['wav', 'mp3'].includes(filename.split('.').slice(-1)[0]);
+
+interface samplesDBConfig {
+    dbName: string,
+    table: string,
+    columns: string[],
+    version: number
+}
+
+export const samplesDBConfig = {
+    dbName: 'samples',
+    table: 'usersamples',
+    columns: ['data_url', 'title'],
+    version: 1
+}
+
+async function bufferToDataUrl(buf: Buffer) {
+  return new Promise((resolve) => {
+    var blob = new Blob([buf], { type: 'application/octet-binary' });
+    var reader = new FileReader();
+    reader.onload = function (event: Event) {
+      // @ts-ignore
+      resolve(event.target.result);
+    };
+    reader.readAsDataURL(blob);
+  });
+}
+
+const processFilesForIDB = async (files: FileList) => {
+  return await Promise.all(
+    Array.from(files)
+      .map(async (s: File) => {
+        const title = s.name;
+        if (!isAudioFile(title)) {
+          return;
+        }
+        //create obscured url to file system that can be fetched
+        const sUrl = URL.createObjectURL(s);
+        //fetch the sound and turn it into a buffer array
+        const buf = await fetch(sUrl).then((res) => res.arrayBuffer());
+        //create a url blob containing all of the buffer data
+        // @ts-ignore
+        // TODO: conversion to do here, remove ts-ignore
+        const base64 = await bufferToDataUrl(buf);
+        return {
+          title,
+          blob: base64,
+          id: s.webkitRelativePath,
+        };
+      })
+      .filter(Boolean),
+  ).catch((error) => {
+    console.log('Something went wrong while processing uploaded files', error);
+  });
+};
+
+
+export const registerSamplesFromDB = (config: samplesDBConfig, onComplete = () => {}) => {
+  openDB(config, (objectStore: IDBObjectStore) => {
+    let query = objectStore.getAll();
+    query.onsuccess = (event: Event) => {
+      // @ts-ignore
+      const soundFiles = event.target.result;
+      if (!soundFiles?.length) {
+        return;
+      }
+      const sounds = new Map();
+      [...soundFiles]
+        .sort((a, b) => a.title.localeCompare(b.title, undefined, { numeric: true, sensitivity: 'base' }))
+        .forEach((soundFile) => {
+          const title = soundFile.title;
+          if (!isAudioFile(title)) {
+            return;
+          }
+          const splitRelativePath = soundFile.id?.split('/');
+          const parentDirectory = splitRelativePath[splitRelativePath.length - 2];
+          const soundPath = soundFile.blob;
+          const soundPaths = sounds.get(parentDirectory) ?? new Set();
+          soundPaths.add(soundPath);
+          sounds.set(parentDirectory, soundPaths);
+        });
+
+      sounds.forEach((soundPaths, key) => {
+        const value = Array.from(soundPaths);
+        // @ts-ignore
+        registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, value), {
+          type: 'sample',
+          samples: value,
+          baseUrl: undefined,
+          prebake: false,
+          tag: "user",
+        });
+      });
+      onComplete();
+    };
+  });
+};
+
+export const openDB = (config: samplesDBConfig, onOpened: Function) => {
+    const { dbName, version, table, columns } = config
+
+    if (!('indexedDB' in window)) {
+        console.log('This browser doesn\'t support IndexedDB')
+        return
+    }
+    const dbOpen = indexedDB.open(dbName, version);
+
+
+    dbOpen.onupgradeneeded = (_event) => {
+      const db = dbOpen.result;
+      const objectStore = db.createObjectStore(table, { keyPath: 'id', autoIncrement: false });
+      columns.forEach((c: any) => {
+        objectStore.createIndex(c, c, { unique: false });
+      });
+    };
+    dbOpen.onerror = function (err: Event) {
+        console.log('Error opening DB: ', (err.target as IDBOpenDBRequest).error);
+    }
+    dbOpen.onsuccess = function (_event: Event) {
+        const db = dbOpen.result;
+        db.onversionchange = function() {
+            db.close();
+            alert("Database is outdated, please reload the page.")
+        };
+        const writeTransaction = db.transaction([table], 'readwrite'),
+              objectStore = writeTransaction.objectStore(table);
+        // Writing in the database here!
+        onOpened(objectStore)
+    }
+}
+
+export const uploadSamplesToDB = async (config: samplesDBConfig, files: FileList) => {
+  await processFilesForIDB(files).then((files) => {
+    const onOpened = (objectStore: IDBObjectStore, _db: IDBDatabase) => {
+            // @ts-ignore
+            files.forEach((file: File) => {
+                if (file == null) {
+                    return;
+                }
+                objectStore.put(file);
+            });
+        };
+        openDB(config, onOpened);
+  });
+};

src/InterfaceLogic.ts

@@ -1,6 +1,7 @@
 import { EditorView } from "codemirror";
 import { vim } from "@replit/codemirror-vim";
 import { type Editor } from "./main";
+import colors from "./colors.json";
 import {
   documentation_factory,
   hideDocumentation,
@@ -24,6 +25,7 @@ import { lineNumbers } from "@codemirror/view";
 import { jsCompletions } from "./EditorSetup";
 import { createDocumentationStyle } from "./DomElements";
 import { saveState } from "./WindowBehavior";
+import { registerSamplesFromDB, samplesDBConfig, uploadSamplesToDB } from "./IO/SampleLoading";
 
 export const installInterfaceLogic = (app: Editor) => {
   // Initialize style
@@ -57,9 +59,11 @@ export const installInterfaceLogic = (app: Editor) => {
   for (let i = 0; i < tabs.length; i++) {
     tabs[i].addEventListener("click", (event) => {
       // Updating the CSS accordingly
-      tabs[i].classList.add("bg-orange-300");
+      tabs[i].classList.add("bg-foreground");
+      tabs[i].classList.add("text-selection_foreground");
       for (let j = 0; j < tabs.length; j++) {
-        if (j != i) tabs[j].classList.remove("bg-orange-300");
+        if (j != i) tabs[j].classList.remove("bg-foreground");
+        if (j != i) tabs[j].classList.remove("text-selection_foreground");
       }
       app.currentFile().candidate = app.view.state.doc.toString();
 
@@ -156,6 +160,21 @@ export const installInterfaceLogic = (app: Editor) => {
     );
   });
 
+  app.interface.upload_samples_button.addEventListener("input", async (event) => {
+    let fileInput = event.target as HTMLInputElement;
+    if (!fileInput.files?.length) {
+      return;
+    }
+    app.interface.sample_indicator.innerText = "Loading...";
+    app.interface.sample_indicator.classList.add("animate-pulse");
+    await uploadSamplesToDB(samplesDBConfig, fileInput.files).then(() => {
+        registerSamplesFromDB(samplesDBConfig, () => {
+          app.interface.sample_indicator.innerText = "Import samples";
+          app.interface.sample_indicator.classList.remove("animate-pulse");
+        });
+    });
+  });
+
   app.interface.upload_universe_button.addEventListener("click", () => {
     const fileInput = document.createElement("input");
     fileInput.type = "file";
@@ -289,6 +308,18 @@ export const installInterfaceLogic = (app: Editor) => {
     });
   });
 
+  app.interface.theme_selector.addEventListener("change", () => {
+    app.settings.theme = (app.interface.theme_selector as HTMLSelectElement).value;
+    app.readTheme(app.settings.theme);
+    // @ts-ignore
+    let selected_theme = colors[app.settings.theme as string];
+    let theme_preview = "";
+    for (const [key, _] of Object.entries(selected_theme)) {
+      theme_preview += `<p class="inline text-${key} bg-${key}">█</div>`;
+    }
+    app.interface.theme_previewer.innerHTML = theme_preview;
+  });
+
   app.interface.settings_button.addEventListener("click", () => {
     // Populate the font selector
     const fontFamilySelect = document.getElementById(
@@ -298,6 +329,26 @@ export const installInterfaceLogic = (app: Editor) => {
       fontFamilySelect.value = app.settings.font;
     }
 
+    app.interface.theme_selector.innerHTML = "";
+    let all_themes = Object.keys(colors);
+    all_themes.sort((a, b) => {
+      return a.toLowerCase().localeCompare(b.toLowerCase());
+    });
+    app.interface.theme_selector.innerHTML = all_themes.map((color) => {
+      return `<option value="${color}">${color}</option>`
+    }).join("");
+    // Set the selected theme in the selector to app.settings.theme
+    // @ts-ignore
+    app.interface.theme_selector.value = app.settings.theme;
+
+    // @ts-ignore
+    let selected_theme = colors[app.settings.theme as string];
+    let theme_preview = "<div class='ml-6'>";
+    for (const [key, _] of Object.entries(selected_theme)) {
+      theme_preview += `<p class="inline text-${key} bg-${key}">█</p>`;
+    }
+    theme_preview += "</div>";
+    app.interface.theme_previewer.innerHTML = theme_preview;
     // Populate the font family selector
     const doughNudgeRange = app.interface.dough_nudge_range as HTMLInputElement;
     doughNudgeRange.value = app.dough_nudge.toString();
@@ -491,7 +542,8 @@ export const installInterfaceLogic = (app: Editor) => {
     "sampler",
     "amplitude",
     "audio_basics",
-    "reverb_delay",
+    "filters",
+    "effects",
     "interface",
     "interaction",
     "code",
@@ -499,13 +551,19 @@ export const installInterfaceLogic = (app: Editor) => {
     "linear",
     "cyclic",
     "longform",
-    // "sound",
     "synths",
     "chaining",
     "patterns",
-    "ziffers",
+    "ziffers_basics",
+    "ziffers_scales",
+    "ziffers_rhythm",
+    "ziffers_algorithmic",
+    "ziffers_tonnetz",
+    "ziffers_syncing",
     "midi",
+    "osc",
     "functions",
+    "generators",
     "lfos",
     "probabilities",
     "variables",
@@ -519,18 +577,25 @@ export const installInterfaceLogic = (app: Editor) => {
     "loading_samples",
   ].forEach((e) => {
     let name = `docs_` + e;
-    document.getElementById(name)!.addEventListener("click", async () => {
+
-      if (name !== "docs_samples") {
+    // Check if the element exists
-        app.currentDocumentationPane = e;
+    let element = document.getElementById(name);
-        updateDocumentationContent(app, bindings);
+    if (element) {
-      } else {
+      element.addEventListener("click", async () => {
-        console.log("Loading samples!");
+        if (name !== "docs_sample_list") {
-        await loadSamples().then(() => {
-          app.docs = documentation_factory(app);
           app.currentDocumentationPane = e;
           updateDocumentationContent(app, bindings);
-        });
+        } else {
-      }
+          console.log("Loading samples!");
-    });
+          await loadSamples().then(() => {
+            app.docs = documentation_factory(app);
+            app.currentDocumentationPane = e;
+            updateDocumentationContent(app, bindings);
+          });
+        }
+      });
+    } else {
+      console.log("Could not find element " + name);
+    }
   });
-};
+};

src/KeyActions.ts

@@ -109,6 +109,15 @@ export const registerOnKeyDown = (app: Editor) => {
       app.flashBackground("#404040", 200);
     }
 
+    // Force eval with clearing cache
+    if (event.ctrlKey && event.shiftKey && (event.key === "Backspace" || event.key === "Delete")) {
+      event.preventDefault();
+      app.api.clearPatternCache();
+      app.currentFile().candidate = app.view.state.doc.toString();
+      tryEvaluate(app, app.currentFile());
+      app.flashBackground("#404040", 200);
+    }
+
     // app is the modal to switch between universes
     if (event.ctrlKey && event.key === "b") {
       event.preventDefault();

src/TransportNode.js

@@ -0,0 +1,65 @@
+import { tryEvaluate } from "./Evaluator";
+const zeroPad = (num, places) => String(num).padStart(places, "0");
+
+export class TransportNode extends AudioWorkletNode {
+  constructor(context, options, application) {
+    super(context, "transport", options);
+    this.app = application;
+    this.port.addEventListener("message", this.handleMessage);
+    this.port.start();
+    this.timeviewer = document.getElementById("timeviewer");
+  }
+
+  /** @type {(this: MessagePort, ev: MessageEvent<any>) => any} */
+  handleMessage = (message) => {
+    if(message.data) {
+      if (message.data.type === "bang") {
+        if(this.app.clock.running) {
+          if (this.app.settings.send_clock) {
+            this.app.api.MidiConnection.sendMidiClock();
+          }
+          const futureTimeStamp = this.app.clock.convertTicksToTimeposition(
+            this.app.clock.tick
+          );
+          this.app.clock.time_position = futureTimeStamp;
+          this.timeviewer.innerHTML = `${zeroPad(futureTimeStamp.bar, 2)}:${futureTimeStamp.beat + 1
+            }:${zeroPad(futureTimeStamp.pulse, 2)} / ${this.app.clock.bpm}`;
+          if (this.app.exampleIsPlaying) {
+            tryEvaluate(this.app, this.app.example_buffer);
+          } else {
+            tryEvaluate(this.app, this.app.global_buffer);
+          }
+          this.app.clock.incrementTick(message.data.bpm);
+        }
+      }
+    }
+  };
+
+  start() {
+    this.port.postMessage({ type: "start" });
+  }
+
+  pause() {
+    this.port.postMessage({ type: "pause" });
+  }
+
+  resume() {
+    this.port.postMessage({ type: "resume" });
+  }
+
+  setBPM(bpm) {
+    this.port.postMessage({ type: "bpm", value: bpm });
+  }
+
+  setPPQN(ppqn) {
+    this.port.postMessage({ type: "ppqn", value: ppqn });
+  }
+
+  setNudge(nudge) {
+    this.port.postMessage({ type: "nudge", value: nudge });
+  }
+
+  stop() {
+    this.port.postMessage({type: "stop" });
+  }
+}

src/TransportProcessor.js

@@ -0,0 +1,47 @@
+class TransportProcessor extends AudioWorkletProcessor {
+    constructor(options) {
+      super(options);
+      this.port.addEventListener("message", this.handleMessage);
+      this.port.start();
+      this.nudge = 0;
+      this.started = false;
+      this.bpm = 120;
+      this.ppqn = 48;
+      this.currentPulsePosition = 0;
+    }
+  
+    handleMessage = (message) => {
+      if (message.data && message.data.type === "ping") {
+        this.port.postMessage(message.data);
+      } else if (message.data.type === "start") {
+        this.started = true;
+      } else if (message.data.type === "pause") {
+        this.started = false;
+      } else if (message.data.type === "stop") {
+        this.started = false;
+      } else if (message.data.type === "bpm") {
+        this.bpm = message.data.value;
+        this.currentPulsePosition = currentTime;
+      } else if (message.data.type === "ppqn") {
+        this.ppqn = message.data.value;
+        this.currentPulsePosition = currentTime;
+      } else if (message.data.type === "nudge") {
+        this.nudge = message.data.value;
+      }
+    };
+  
+    process(inputs, outputs, parameters) {
+      if (this.started) {
+        const adjustedCurrentTime = currentTime + this.nudge / 100;
+        const beatNumber = adjustedCurrentTime / (60 / this.bpm);
+        const currentPulsePosition = Math.ceil(beatNumber * this.ppqn);
+        if (currentPulsePosition > this.currentPulsePosition) {
+          this.currentPulsePosition = currentPulsePosition;
+          this.port.postMessage({ type: "bang", bpm: this.bpm });
+        }
+      }
+      return true;
+    }
+  }
+  
+  registerProcessor("transport", TransportProcessor);

src/Utils/Generic.ts

@@ -69,6 +69,15 @@ export function arrayOfObjectsToObjectWithArrays<T extends Record<string, any>>(
   );
 }
 
+export function maybeAtomic<T>(value: T): T | T[] {
+  /*
+    * Returns first value of array if array of length 1, otherwise returns value
+    * @param {any} value - Value to check
+    * @returns {any} Value or array
+    */
+  return Array.isArray(value) && value.length === 1 ? value[0] : value;
+}
+
 export function filterObject(
   obj: Record<string, any>,
   filter: string[],
@@ -85,3 +94,8 @@ export function filterObject(
     Object.entries(obj).filter(([key]) => filter.includes(key)),
   );
 }
+
+export const GeneratorType = (function*(){yield undefined;}).constructor;
+export const GeneratorIteratorType = (function*(){yield undefined;}).prototype.constructor;
+export const isGenerator = (v:any) => Object.prototype.toString.call(v) === '[object Generator]';
+export const isGeneratorFunction = (v:any) => Object.prototype.toString.call(v) === '[object GeneratorFunction]';

src/WindowBehavior.ts

@@ -1,4 +1,5 @@
 import { type Editor } from "./main";
+import { outputSocket, inputSocket } from "./IO/OSC";
 
 const handleResize = (canvas: HTMLCanvasElement) => {
   if (!canvas) return;
@@ -26,6 +27,9 @@ export const saveBeforeExit = (app: Editor): null => {
   app.currentFile().candidate = app.view.state.doc.toString();
   app.currentFile().committed = app.view.state.doc.toString();
   app.settings.saveApplicationToLocalStorage(app.universes, app.settings);
+  // Close the websocket
+  inputSocket.close();
+  outputSocket.close();
   return null;
 };
 
@@ -40,6 +44,9 @@ export const installWindowBehaviors = (
   window.addEventListener("resize", () =>
     handleResize(app.interface.feedback as HTMLCanvasElement),
   );
+  window.addEventListener("resize", () =>
+  handleResize(app.interface.drawings as HTMLCanvasElement),
+);
   window.addEventListener("beforeunload", (event) => {
     event.preventDefault();
     saveBeforeExit(app);

src/classes/AbstractEvents.ts

@@ -7,6 +7,9 @@ import {
   safeScale,
 } from "zifferjs";
 import { SkipEvent } from "./SkipEvent";
+import { SoundParams } from "./SoundEvent";
+import { centsToSemitones, edoToSemitones, ratiosToSemitones } from "zifferjs/src/scale";
+import { safeMod } from "zifferjs/src/utils";
 
 export type EventOperation<T> = (instance: T, ...args: any[]) => void;
 
@@ -208,9 +211,14 @@ export class AbstractEvent {
      * @param func - The function to be applied to the Event
      * @returns The transformed Event
      */
-    return this.modify(func);
+    return this.modify(func).update();
   };
 
+  mod = (value: number): AbstractEvent => {
+    this.values.originalPitch = safeMod(this.values.originalPitch, value);
+    return this.update();
+  }
+
   noteLength = (
     value: number | number[],
     ...kwargs: number[]
@@ -222,18 +230,60 @@ export class AbstractEvent {
       value = Array.isArray(value) ? value.concat(kwargs) : [value, ...kwargs];
     }
     if (Array.isArray(value)) {
-      this.values["noteLength"] = value;
       this.values.dur = value.map((v) =>
         this.app.clock.convertPulseToSecond(v * 4 * this.app.clock.ppqn),
       );
     } else {
-      this.values["noteLength"] = value;
       this.values.dur = this.app.clock.convertPulseToSecond(
         value * 4 * this.app.clock.ppqn,
       );
     }
+    if(this.current) {
+      value = Array.isArray(value) ? value[this.index%value.length] : value;
+      this.current.duration = value;
+    }
     return this;
   };
+
+  protected processSound = (
+    sound: string | string[] | SoundParams | SoundParams[],
+  ): SoundParams => {
+    if (Array.isArray(sound) && typeof sound[0] === "string") {
+      const s: string[] = [];
+      const n: number[] = [];
+      sound.forEach((str) => {
+        const parts = (str as string).split(":");
+        s.push(parts[0]);
+        if (parts[1]) {
+          n.push(parseInt(parts[1]));
+        }
+      });
+      return {
+        s,
+        n: n.length > 0 ? n : undefined,
+        dur: this.app.clock.convertPulseToSecond(this.app.clock.ppqn),
+      };
+    } else if (typeof sound === "object") {
+      const validatedObj: SoundParams = {
+        dur: this.app.clock.convertPulseToSecond(this.app.clock.ppqn),
+        ...(sound as Partial<SoundParams>),
+      };
+      return validatedObj;
+    } else {
+      if (sound.includes(":")) {
+        const vals = sound.split(":");
+        const s = vals[0];
+        const n = parseInt(vals[1]);
+        return {
+          s,
+          n,
+          dur: this.app.clock.convertPulseToSecond(this.app.clock.ppqn),
+        };
+      } else {
+        return { s: sound, dur: 0.5 };
+      }
+    }
+  };
 }
 
 export abstract class AudibleEvent extends AbstractEvent {
@@ -251,8 +301,9 @@ export abstract class AudibleEvent extends AbstractEvent {
       value = Array.isArray(value) ? value.concat(kwargs) : [value, ...kwargs];
     }
     this.values["pitch"] = value;
-    if (this.values.key && this.values.parsedScale) this.update();
+    this.values["originalPitch"] = value;
-    return this;
+    this.defaultPitchKeyScale();
+    return this.update();
   };
 
   pc = this.pitch;
@@ -266,13 +317,15 @@ export abstract class AudibleEvent extends AbstractEvent {
     if (kwargs.length > 0) {
       value = Array.isArray(value) ? value.concat(kwargs) : [value, ...kwargs];
     }
-    this.values["octave"] = value;
+    this.values["paramOctave"] = value;
     if (
       this.values.key &&
       (this.values.pitch || this.values.pitch === 0) &&
       this.values.parsedScale
-    )
+    ) {
-      this.update();
+      return this.update();
+    }
+
     return this;
   };
 
@@ -289,11 +342,19 @@ export abstract class AudibleEvent extends AbstractEvent {
     if (
       (this.values.pitch || this.values.pitch === 0) &&
       this.values.parsedScale
-    )
+    ) {
-      this.update();
+      return this.update();
+    }
+
     return this;
   };
 
+  defaultPitchKeyScale() {
+    if (!this.values.key) this.values.key = 60;
+    if (!(this.values.pitch || this.values.pitch === 0)) this.values.pitch = 0;
+    if (!this.values.parsedScale) this.values.parsedScale = safeScale("major");
+  }
+
   scale = (
     value: string | number | (number | string)[],
     ...kwargs: (string | number)[]
@@ -311,12 +372,38 @@ export abstract class AudibleEvent extends AbstractEvent {
     } else if (Array.isArray(value)) {
       this.values.parsedScale = value.map((v) => safeScale(v));
     }
-    if (this.values.key && (this.values.pitch || this.values.pitch === 0)) {
+    this.defaultPitchKeyScale();
-      this.update();
+    return this.update();
-    }
-    return this;
   };
 
+  semitones(values: number|number[], ...rest: number[]) {
+    const scaleValues = typeof values === "number" ? [values, ...rest] : values;
+    this.values.parsedScale = safeScale(scaleValues);
+    this.defaultPitchKeyScale();
+    return this.update();
+  }
+  steps = this.semitones;
+
+  cents(values: number|number[], ...rest: number[]) {
+    const scaleValues = typeof values === "number" ? [values, ...rest] : values;
+    this.values.parsedScale = safeScale(centsToSemitones(scaleValues));
+    this.defaultPitchKeyScale();
+    return this.update();
+  }
+
+  ratios(values: number|number[], ...rest: number[]) {
+    const scaleValues = typeof values === "number" ? [values, ...rest] : values;
+    this.values.parsedScale = safeScale(ratiosToSemitones(scaleValues));
+    this.defaultPitchKeyScale();
+    return this.update();
+  }
+
+  edo(value: number, intervals: string|number[] = new Array(value).fill(1)) {
+    this.values.parsedScale = edoToSemitones(value, intervals);
+    this.defaultPitchKeyScale();
+    return this.update();
+  } 
+
   protected updateValue<T>(key: string, value: T | T[] | null): this {
     if (value == null) return this;
     this.values[key] = value;
@@ -348,6 +435,7 @@ export abstract class AudibleEvent extends AbstractEvent {
   };
 
   public invert = (howMany: number = 0) => {
+    if(howMany === 0) return this;
     if (this.values.note) {
       let notes = [...this.values.note];
       notes = howMany < 0 ? [...notes].reverse() : notes;
@@ -360,6 +448,35 @@ export abstract class AudibleEvent extends AbstractEvent {
     }
   };
 
+  public log = (key: string|string[], ...args: string[]) => {
+    /*
+     * Log values from values using log()
+     *
+     * @param key - The key(s) to log
+     * @returns this and logs the values
+     */
+    if (typeof key === "string") {
+      if(args && args.length > 0) {
+        this.app.api.log([key, ...args].map((k) => this.values[k]));
+      } else {
+         this.app.api.log(this.values[key]);
+      }
+    } else {
+      this.app.api.log([...key, ...args].map((k) => this.values[k]));
+    }
+    return this;
+  }
+
+  public draw = (lambda: Function) => {
+    lambda(this.values, (this.app.interface.drawings as HTMLCanvasElement).getContext("2d"));
+    return this;
+  }
+
+  public clear = () => {
+    this.app.api.clear();
+    return this;
+  }
+
   freq = (value: number | number[], ...kwargs: number[]): this => {
     /*
      * This function is used to set the frequency of the Event.
@@ -395,7 +512,13 @@ export abstract class AudibleEvent extends AbstractEvent {
     return this;
   };
 
-  update = (): void => {
+  update = (): this => {
     // Overwrite in subclasses
+    return this;
   };
+
+  cue = (functionName: string|Function): this => {
+    this.app.api.cue(functionName);
+    return this;
+  }
 }

src/classes/MidiEvent.ts

@@ -1,11 +1,12 @@
 import { AudibleEvent } from "./AbstractEvents";
 import { type Editor } from "../main";
 import { MidiConnection } from "../IO/MidiConnection";
-import { noteFromPc } from "zifferjs";
+import { resolvePitchClass } from "zifferjs";
 import {
   filterObject,
   arrayOfObjectsToObjectWithArrays,
   objectWithArraysToArrayOfObjects,
+  maybeAtomic,
 } from "../Utils/Generic";
 
 export type MidiParams = {
@@ -66,8 +67,7 @@ export class MidiEvent extends AudibleEvent {
       return funcResult;
     } else {
       func(this.values);
-      this.update();
+      return this.update();
-      return this;
     }
   };
 
@@ -83,34 +83,36 @@ export class MidiEvent extends AudibleEvent {
     return this;
   };
 
-  update = (): void => {
+  update = (): this => {
-    // Get key, pitch, parsedScale and octave from this.values object
     const filteredValues = filterObject(this.values, [
       "key",
       "pitch",
+      "originalPitch",
       "parsedScale",
-      "octave",
+      "addedOctave"
     ]);
 
     const events = objectWithArraysToArrayOfObjects(filteredValues, [
       "parsedScale",
     ]);
 
-    events.forEach((event) => {
+    events.forEach((soundEvent) => {
-      const [note, bend] = noteFromPc(
+      const resolvedPitchClass = resolvePitchClass(
-        (event.key as number) || "C4",
+        (soundEvent.key || "C4"),
-        (event.pitch as number) || 0,
+        (soundEvent.originalPitch || soundEvent.pitch || 0),
-        (event.parsedScale as number[]) || event.scale || "MAJOR",
+        (soundEvent.parsedScale || soundEvent.scale || "MAJOR"),
-        (event.octave as number) || 0,
+        (soundEvent.addedOctave || 0)
       );
-      event.note = note;
+      soundEvent.note = resolvedPitchClass.note;
-      if (bend) event.bend = bend;
+      soundEvent.pitch = resolvedPitchClass.pitch;
+      soundEvent.octave = resolvedPitchClass.octave;
     });
 
     const newArrays = arrayOfObjectsToObjectWithArrays(events) as MidiParams;
-
+    
-    this.values.note = newArrays.note;
+    this.values.note = maybeAtomic(newArrays.note);
-    if (newArrays.bend) this.values.bend = newArrays.bend;
+    if (newArrays.bend) this.values.bend = maybeAtomic(newArrays.bend);
+    return this;
   };
 
   out = (): void => {

src/classes/SoundEvent.ts

@@ -1,11 +1,13 @@
 import { type Editor } from "../main";
 import { AudibleEvent } from "./AbstractEvents";
+import { sendToServer, type OSCMessage } from "../IO/OSC";
 import {
   filterObject,
   arrayOfObjectsToObjectWithArrays,
   objectWithArraysToArrayOfObjects,
+  maybeAtomic,
 } from "../Utils/Generic";
-import { midiToFreq, noteFromPc } from "zifferjs";
+import { midiToFreq, resolvePitchClass } from "zifferjs";
 
 import {
   superdough,
@@ -21,10 +23,13 @@ export type SoundParams = {
   note?: number | number[];
   freq?: number | number[];
   pitch?: number | number[];
+  originalPitch?: number | number[];
   key?: string;
   scale?: string;
   parsedScale?: number[];
   octave?: number | number[];
+  addedOctave?: number | number[];
+  pitchOctave?: number | number[];
 };
 
 export class SoundEvent extends AudibleEvent {
@@ -42,6 +47,8 @@ export class SoundEvent extends AudibleEvent {
     pitchJumpTime: ["pitchJumpTime", "pjt"],
     lfo: ["lfo"],
     znoise: ["znoise"],
+    address: ["address", "add"],
+    port: ["port"],
     noise: ["noise"],
     zmod: ["zmod"],
     zcrush: ["zcrush"],
@@ -308,7 +315,7 @@ export class SoundEvent extends AudibleEvent {
       self.updateValue("roomsize", value);
       return self;
     },
-    comp: ["compressor", "cmp"],
+    comp: ["comp","compressor", "cmp"],
     ratio: function (self: SoundEvent, value: number) {
       self.updateValue("compressorRatio", value);
       return self;
@@ -366,46 +373,6 @@ export class SoundEvent extends AudibleEvent {
     this.values = this.processSound(sound);
   }
 
-  private processSound = (
-    sound: string | string[] | SoundParams | SoundParams[],
-  ): SoundParams => {
-    if (Array.isArray(sound) && typeof sound[0] === "string") {
-      const s: string[] = [];
-      const n: number[] = [];
-      sound.forEach((str) => {
-        const parts = (str as string).split(":");
-        s.push(parts[0]);
-        if (parts[1]) {
-          n.push(parseInt(parts[1]));
-        }
-      });
-      return {
-        s,
-        n: n.length > 0 ? n : undefined,
-        dur: this.app.clock.convertPulseToSecond(this.app.clock.ppqn),
-      };
-    } else if (typeof sound === "object") {
-      const validatedObj: SoundParams = {
-        dur: this.app.clock.convertPulseToSecond(this.app.clock.ppqn),
-        ...(sound as Partial<SoundParams>),
-      };
-      return validatedObj;
-    } else {
-      if (sound.includes(":")) {
-        const vals = sound.split(":");
-        const s = vals[0];
-        const n = parseInt(vals[1]);
-        return {
-          s,
-          n,
-          dur: this.app.clock.convertPulseToSecond(this.app.clock.ppqn),
-        };
-      } else {
-        return { s: sound, dur: 0.5 };
-      }
-    }
-  };
-
   // ================================================================================
   // AbstactEvent overrides
   // ================================================================================
@@ -415,36 +382,44 @@ export class SoundEvent extends AudibleEvent {
     if (funcResult instanceof Object) return funcResult;
     else {
       func(this.values);
-      this.update();
+      return this.update();
-      return this;
     }
   };
 
-  update = (): void => {
+  update = (): this => {
     const filteredValues = filterObject(this.values, [
       "key",
       "pitch",
+      "originalPitch",
       "parsedScale",
+      "addedOctave",
       "octave",
+      "paramOctave"
     ]);
     const events = objectWithArraysToArrayOfObjects(filteredValues, [
       "parsedScale",
     ]);
-    events.forEach((event) => {
+    events.forEach((soundEvent) => {
-      const [note, _] = noteFromPc(
+      const resolvedPitchClass = resolvePitchClass(
-        (event.key as number) || "C4",
+        (soundEvent.key || "C4"),
-        (event.pitch as number) || 0,
+        (soundEvent.originalPitch || soundEvent.pitch || 0),
-        (event.parsedScale as number[]) || event.scale || "MAJOR",
+        (soundEvent.parsedScale || soundEvent.scale || "MAJOR"),
-        (event.octave as number) || 0,
+        (soundEvent.paramOctave || 0)+(soundEvent.addedOctave || 0)
       );
-      event.note = note;
+      soundEvent.note = resolvedPitchClass.note;
-      event.freq = midiToFreq(note);
+      soundEvent.freq = midiToFreq(resolvedPitchClass.note);
+      soundEvent.pitch = resolvedPitchClass.pitch;
+      soundEvent.octave = resolvedPitchClass.octave;
     });
 
     const newArrays = arrayOfObjectsToObjectWithArrays(events) as SoundParams;
 
-    this.values.note = newArrays.note;
+    this.values.note = maybeAtomic(newArrays.note);
-    this.values.freq = newArrays.freq;
+    this.values.freq = maybeAtomic(newArrays.freq);
+    this.values.pitch = maybeAtomic(newArrays.pitch);
+    this.values.octave = maybeAtomic(newArrays.octave);
+    this.values.pitchOctave = maybeAtomic(newArrays.pitchOctave);
+    return this;
   };
 
   out = (orbit?: number | number[]): void => {
@@ -462,14 +437,36 @@ export class SoundEvent extends AudibleEvent {
       if (filteredEvent.freq) {
         delete filteredEvent.note;
       }
-      if (this.values["debug"]) {
+      superdough(
-        if (this.values["debugFunction"]) {
+        filteredEvent,  
-          this.values["debugFunction"](filteredEvent);
+        this.nudge - this.app.clock.deviation,
-        } else {
+        filteredEvent.dur
-          console.log(filteredEvent);
+      );
-        }
+    }
+  };
+
+  osc = (orbit?: number | number[]): void => {
+    if (orbit) this.values["orbit"] = orbit;
+    const events = objectWithArraysToArrayOfObjects(this.values, [
+      "parsedScale",
+    ]);
+    for (const event of events) {
+      const filteredEvent = event;
+
+      let oscAddress = "address" in event ? event.address : "/topos";
+      oscAddress = oscAddress?.startsWith("/") ? oscAddress : "/" + oscAddress;
+
+      let oscPort = "port" in event ? event.port : 57120;
+
+      if (filteredEvent.freq) {
+        delete filteredEvent.note;
       }
-      superdough(filteredEvent, this.app.clock.deadline, filteredEvent.dur);
+      sendToServer({
+        address: oscAddress,
+        port: oscPort,
+        args: event,
+        timetag: Math.round(Date.now() + (this.nudge - this.app.clock.deviation)),
+      } as OSCMessage);
     }
   };
 }

src/classes/ZPlayer.ts

@@ -5,7 +5,7 @@ import { SkipEvent } from "./SkipEvent";
 import { SoundEvent, SoundParams } from "./SoundEvent";
 import { MidiEvent, MidiParams } from "./MidiEvent";
 import { RestEvent } from "./RestEvent";
-import { arrayOfObjectsToObjectWithArrays } from "../Utils/Generic";
+import { arrayOfObjectsToObjectWithArrays, isGenerator } from "../Utils/Generic";
 import { TonnetzSpaces } from "zifferjs/src/tonnetz";
 
 export type InputOptions = { [key: string]: string | number };
@@ -17,6 +17,7 @@ export class Player extends AbstractEvent {
   startCallTime: number = 0;
   lastCallTime: number = 0;
   waitTime = 0;
+  cueName: string|undefined = undefined;
   played: boolean = false;
   current!: Pitch | Chord | ZRest;
   retro: boolean = false;
@@ -39,13 +40,19 @@ export class Player extends AbstractEvent {
     } else if (typeof input === "number") {
       this.input = input;
       this.ziffers = Ziffers.fromNumber(input, options);
-    } else {
+    } else if (isGenerator(input)) {
       this.ziffers = Ziffers.fromGenerator(input, options);
       this.input = this.ziffers.input;
+    } else {
+      throw new Error("Invalid input");
     }
     this.zid = zid;
   }
 
+  isValid() {
+    return this.ziffers.values.length > 0;
+  }
+
   reset() {
     this.initCallTime = 0;
     this.startCallTime = 0;
@@ -125,11 +132,13 @@ export class Player extends AbstractEvent {
 
     const patternIsStarting =
       this.notStarted() &&
-      (this.pulse() === 0 || this.origin() >= this.nextBeatInTicks()) &&
+      this.waitTime >= 0 &&
-      this.origin() >= this.waitTime;
+      this.origin() >= this.waitTime &&
+      (this.pulse() === 0 || this.origin() >= this.nextBeatInTicks());
 
     const timeToPlayNext =
       this.current &&
+      this.waitTime >= 0 &&
       this.pulseToSecond(this.origin()) >=
         this.pulseToSecond(this.lastCallTime) +
           this.pulseToSecond(this.current.duration * 4 * this.app.clock.ppqn) &&
@@ -155,40 +164,64 @@ export class Player extends AbstractEvent {
     return areWeThereYet;
   };
 
-  sound(name?: string) {
+  checkCue() {
+    if(this.ziffers.atLast()) {
+      if(this.cueName && this.app.api.cueTimes[this.cueName]) {
+        delete this.app.api.cueTimes[this.cueName];
+        this.cueName = undefined;
+        this.waitTime = -1;
+      }
+    }
+  }
+
+  sound(name?: string | string[] | SoundParams | SoundParams[]) {
     if (this.areWeThereYet()) {
+      this.checkCue();
       const event = this.next() as Pitch | Chord | ZRest;
       const noteLengthInSeconds = this.app.clock.convertPulseToSecond(
         event.duration * 4 * this.app.clock.ppqn,
       );
       if (event instanceof Pitch) {
-        const obj = event.getExisting(
+        let obj = event.getExisting(
           "freq",
           "note",
           "pitch",
+          "originalPitch",
           "key",
           "scale",
           "octave",
+          "pitchOctave",
+          "addedOctave",
           "parsedScale",
         ) as SoundParams;
+        
         if (event.sound) name = event.sound as string;
+        if(name) obj = {...obj, ...this.processSound(name)};
+        else obj.s = "sine";
+
         if (event.soundIndex) obj.n = event.soundIndex as number;
         obj.dur = noteLengthInSeconds;
-        return new SoundEvent(obj, this.app).sound(name || "sine");
+        return new SoundEvent(obj, this.app);
       } else if (event instanceof Chord) {
         const pitches = event.pitches.map((p) => {
           return p.getExisting(
             "freq",
             "note",
             "pitch",
+            "originalPitch",
             "key",
             "scale",
             "octave",
+            "pitchOctave",
+            "addedOctave",
             "parsedScale",
           );
         }) as SoundParams[];
-        const add = { dur: noteLengthInSeconds } as SoundParams;
+
-        if (name) add.s = name;
+        let add = { dur: noteLengthInSeconds} as SoundParams;
+        if(name) add = {...add, ...this.processSound(name)};
+        else add.s = "sine";
+
         let sound = arrayOfObjectsToObjectWithArrays(
           pitches,
           add,
@@ -204,14 +237,18 @@ export class Player extends AbstractEvent {
 
   midi(value: number | undefined = undefined) {
     if (this.areWeThereYet()) {
+      this.checkCue();
       const event = this.next() as Pitch | Chord | ZRest;
       const obj = event.getExisting(
         "note",
         "pitch",
+        "originalPitch",
         "bend",
         "key",
         "scale",
         "octave",
+        "pitchOctave",
+        "addedOctave",
         "parsedScale",
       ) as MidiParams;
       if (event instanceof Pitch) {
@@ -230,11 +267,34 @@ export class Player extends AbstractEvent {
     }
   }
 
-  scale(name: string) {
+  scale(name: string|number[]) {
     if (this.atTheBeginning()) this.ziffers.scale(name);
     return this;
   }
 
+  semitones(values: number|number[], ...rest: number[]) {
+    values = typeof values === "number" ? [values, ...rest] : values;
+    if (this.atTheBeginning()) this.ziffers.semitones(values);
+    return this;
+  }
+
+  cents(values: number|number[], ...rest: number[]) {
+    values = typeof values === "number" ? [values, ...rest] : values;
+    if (this.atTheBeginning()) this.ziffers.cents(values);
+    return this;
+  }
+
+  ratios(values: number|number[], ...rest: number[]) {
+    values = typeof values === "number" ? [values, ...rest] : values;
+    if (this.atTheBeginning()) this.ziffers.ratios(values);
+    return this;
+  }
+
+  edo(value: number, scale: string|number[] = new Array(value).fill(1)) {
+    if (this.atTheBeginning()) this.ziffers.edo(value, scale);
+    return this;
+  }
+
   key(name: string) {
     if (this.atTheBeginning()) this.ziffers.key(name);
     return this;
@@ -261,18 +321,18 @@ export class Player extends AbstractEvent {
     return this;
   }
 
-  octaCycle(tonnetz: TonnetzSpaces = [3, 4, 5]) {
+  octaCycle(tonnetz: TonnetzSpaces = [3, 4, 5], repeats: number = 4) {
-    if (this.atTheBeginning()) this.ziffers.octaCycle(tonnetz);
+    if (this.atTheBeginning()) this.ziffers.octaCycle(tonnetz, repeats);
     return this;
   }
 
-  hexaCycle(tonnetz: TonnetzSpaces = [3, 4, 5]) {
+  hexaCycle(tonnetz: TonnetzSpaces = [3, 4, 5], repeats: number = 3) {
-    if (this.atTheBeginning()) this.ziffers.hexaCycle(tonnetz);
+    if (this.atTheBeginning()) this.ziffers.hexaCycle(tonnetz, repeats);
     return this;
   }
 
-  enneaCycle(tonnetz: TonnetzSpaces = [3, 4, 5]) {
+  enneaCycle(tonnetz: TonnetzSpaces = [3, 4, 5], repeats: number = 3) {
-    if (this.atTheBeginning()) this.ziffers.enneaCycle(tonnetz);
+    if (this.atTheBeginning()) this.ziffers.enneaCycle(tonnetz, repeats);
     return this;
   }
 
@@ -288,6 +348,12 @@ export class Player extends AbstractEvent {
 
   lead = () => this.voiceleading();
 
+  arpeggio(indexes: string|number[], ...rest: number[]) {
+    if(typeof indexes === "number") indexes = [indexes, ...rest];
+    if (this.atTheBeginning()) this.ziffers.arpeggio(indexes);
+    return this;
+  }
+
   invert = (n: number) => {
     if (this.atTheBeginning()) {
       this.ziffers.invert(n);
@@ -300,25 +366,65 @@ export class Player extends AbstractEvent {
     return this;
   }
 
-  wait(value: number | Function) {
+  listen(value: string) {
+    if(typeof value === "string") {
+      const cueTime = this.app.api.cueTimes[value];
+      this.cueName = value;
+      if(cueTime && this.app.clock.pulses_since_origin <= cueTime) {
+        this.waitTime = cueTime;
+      } else {
+          this.waitTime = -1;
+      }
+      return this;
+    }
+  }
+
+  wait(value: number | string | Function) {
+
+    if(typeof value === "string") {
+      const cueTime = this.app.api.cueTimes[value];
+      this.cueName = value;
+      if(cueTime && this.app.clock.pulses_since_origin <= cueTime) {
+        this.waitTime = cueTime;
+      } else if(this.atTheBeginning()){
+          this.waitTime = -1;
+      }
+      return this;
+    }
+
     if (this.atTheBeginning()) {
       if (typeof value === "function") {
         const refPat = this.app.api.patternCache.get(value.name) as Player;
         if (refPat) this.waitTime = refPat.nextEndTime();
         return this;
+      } else if(typeof value === "number") {
+        this.waitTime =
+          this.origin() + Math.ceil(value * 4 * this.app.clock.ppqn);
+        return this;
       }
-      this.waitTime =
-        this.origin() + Math.ceil(value * 4 * this.app.clock.ppqn);
     }
+
     return this;
   }
 
-  sync(value: string | Function) {
+  sync(value: string | Function, manualSync: boolean = true) {
+    
+    if(typeof value === "string") {
+      if(manualSync) {
+        const cueTime = this.app.api.cueTimes[value];
+        if(cueTime) {
+          this.waitTime = cueTime;
+        } else {
+          this.waitTime = -1;
+        }
+      }
+      return this;
+    }
+
     if (this.atTheBeginning() && this.notStarted()) {
       const origin = this.app.clock.pulses_since_origin;
-      const syncId = typeof value === "function" ? value.name : value;
       if (origin > 0) {
-        const syncPattern = this.app.api.patternCache.get(syncId) as Player;
+        const syncPattern = this.app.api.patternCache.get(value.name) as Player;
         if (syncPattern) {
           const syncPatternDuration = syncPattern.ziffers.duration;
           const syncPatternStart = syncPattern.startCallTime;
@@ -330,6 +436,13 @@ export class Player extends AbstractEvent {
     return this;
   }
 
+  log(key: string, ...args: string[]) {
+    this.app.api.log(this.ziffers.evaluated.map((p) => {
+      return Object.values(p.getExisting(...[key,...args]));
+    }).join(" "));
+    return this;
+  }
+
   out = (): void => {
     // TODO?
   };

src/documentation/basics/interaction.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../main";
+import { type Editor } from "../../main";
-import { makeExampleFactory } from "../Documentation";
+import { makeExampleFactory } from "../../Documentation";
 
 // @ts-ignore
 export const interaction = (application: Editor): string => {

src/documentation/basics/keyboard.ts

@@ -49,6 +49,9 @@ Topos is made to be controlled entirely with a keyboard. It is recommanded to st
 |Force Eval|${key_shortcut(
     "Ctrl + Shift + Enter",
   )}|Force evaluation of the current script|
+  |Clear cache & Eval|${key_shortcut(
+    "Ctrl + Shift + Backspace (Delete)",
+  )}|Clears cache and forces evaluation to update cached scripts|
 	
 ### Special
 

src/documentation/basics/welcome.ts

@@ -68,5 +68,10 @@ Topos is deeply inspired by the [Monome Teletype](https://monome.org/). The Tele
 Reloading the application will get you one random song example to study every time. Press ${key_shortcut(
     "F5",
   )} and listen to them all! The demo songs are also used a bit everywhere in the documentation to illustrate some of the working principles :).
+
+## Support
+
+<p>You can <a href='https://ko-fi.com/I2I2RSBHF' target='_blank'><img height='36' style='display: inline; border:0px;height:36px;' src='https://storage.ko-fi.com/cdn/kofi3.png?v=3' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a> to support the development :) </p>
+
 `;
 };

src/documentation/engine.ts

@@ -1,91 +0,0 @@
-import { type Editor } from "../main";
-import { makeExampleFactory } from "../Documentation";
-
-export const sound = (application: Editor): string => {
-  const makeExample = makeExampleFactory(application);
-  return `
-
-
-## Sample Controls
-
-There are some basic controls over the playback of each sample. This allows you to get into more serious sampling if you take the time to really work with your audio materials.
-	
-| Method  | Alias | Description                                            |
-|---------|-------|--------------------------------------------------------|
-| <ic>n</ic>       |       | Select a sample in the current folder (from <ic>0</ic> to infinity)                 |
-| <ic>begin</ic>   |       | Beginning of the sample playback (between <ic>0</ic> and <ic>1</ic>)     |
-| <ic>end</ic>     |       | End of the sample (between <ic>0</ic> and <ic>1</ic>)                    |
-| <ic>loopBegin</ic> |     | Beginning of the loop section (between <ic>0</ic> and <ic>1</ic>)        |
-| <ic>loopEnd</ic> |     | End of the loop section (between <ic>0</ic> and <ic>1</ic>)        |
-| <ic>loop</ic>    |       | Whether to loop or not the audio sample          |
-| <ic>stretch</ic>    |       | Stretches the audio playback rate of a sample over <ic>n</ic> beats          |
-| <ic>speed</ic>   |       | Playback speed (<ic>2</ic> = twice as fast)         |
-| <ic>cut</ic>     |       | Set with <ic>0</ic> or <ic>1</ic>. Will cut the sample as soon as another sample is played on the same bus |
-| <ic>clip</ic>    |       | Multiply the duration of the sample with the given number |
-| <ic>pan</ic>     |       | Stereo position of the audio playback (<ic>0</ic> = left, <ic>1</ic> = right)|
-	
-${makeExample(
-  "Complex sampling duties",
-  `
-// Using some of the modifiers described above :)
-beat(.5)::snd('pad').begin(0.2)
-  .speed([1, 0.9, 0.8].beat(4))
-  .n(2).pan(usine(.5))
-  .end(rand(0.3,0.8))
-  .room(0.8).size(0.5)
-  .clip(1).out()
-	`,
-  true,
-)};
-	
-${makeExample(
-  "Playing an amen break",
-  `
-// Note that stretch has the same value as beat
-beat(4) :: sound('amen1').n(11).stretch(4).out()
-beat(1) :: sound('kick').shape(0.35).out()`,
-  true,
-)};
-
-	
-## Filters
-	
-There are three basic filters: a _lowpass_, _highpass_ and _bandpass_ filters with rather soft slope. Each of them can take up to two arguments. You can also use only the _cutoff_ frequency and the resonance will stay to its default nominal value. You will learn more about the usage of filters in the synths page!
-	
-| Method     | Alias | Description                             |
-|------------|-------|-----------------------------------------|
-| <ic>cutoff</ic>     | lpf   | Cutoff frequency of the lowpass filter  |
-| <ic>resonance</ic>  | lpq   | Resonance of the lowpass filter         |
-| <ic>hcutoff</ic>    | hpf   | Cutoff frequency of the highpass filter |
-| <ic>hresonance</ic> | hpq   | Resonance of the highpass filter        |
-| <ic>bandf</ic>      | bpf   | Cutoff frequency of the bandpass filter |
-| <ic>bandq</ic>      | bpq   | Resonance of the bandpass filter        |
-| <ic>vowel</ic> |       | Formant filter with (vocal quality)     |
-
-${makeExample(
-  "Filter sweep using a low frequency oscillator",
-  `
-beat(.5) && snd('sawtooth')
-  .cutoff([2000,500].pick() + usine(.5) * 4000)
-  .resonance(0.9).freq([100,150].pick())
-  .out()
-	`,
-  true,
-)};
-	
-	
-## Compression
-
-This effect is leveraging the basic WebAudio compressor. More information can be found about it on the [DynamicsCompressorNode](https://developer.mozilla.org/en-US/docs/Web/API/DynamicsCompressorNode?retiredLocale=de#instance_properties) page. This can be come quite complex :)
-
-| Method     | Alias     | Description                     |
-|------------|-----------|---------------------------------|
-| <ic>comp</ic>     | cmp | Compressor threshold value (dB) over which compressor operates |
-| <ic>ratio</ic>     | rt | Compressor ratio: input amount in dB needed for 1dB change in the output   |
-| <ic>knee</ic>     | kn | dB value defining the range over which the signal transitions to compressed section |
-| <ic>compAttack</ic>     | cmpa | In seconds, time to decrease the gain by 10db |
-| <ic>compRelease</ic>     | cmpr | In seconds, time to increase the gain by 10db |
-
-
-`;
-};

src/documentation/inlineHelp.ts

@@ -898,12 +898,6 @@ const completionDatabase: CompletionDatabase = {
     description: "Detects if the Alt key is pressed",
     example: "fill() ? 1 : 0.5",
   },
-  comp: {
-    name: "comp",
-    category: "synthesis",
-    description: "Compressor threshold (dB)",
-    example: "sound('sine').comp(-4).out()",
-  },
   ratio: {
     name: "ratio",
     category: "synthesis",

src/documentation/learning/audio_engine/amplitude.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../../main";
+import { type Editor } from "../../../main";
-import { makeExampleFactory } from "../../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
 
 export const amplitude = (application: Editor): string => {
   // @ts-ignore
@@ -33,42 +33,43 @@ beat(.5)::snd('cp').vel($(1)%10 / 10).out()`,
 | <ic>decay</ic>   | dec   | Decay value (time to decay to sustain level)  |
 | <ic>sustain</ic> | sus   | Sustain value (gain when sound is held)       |
 | <ic>release</ic> | rel   | Release value (time for the sound to die off) |
+| <ic>adsr</ic>    |       | Shortcut that combines all the parameters together |
 	
 Note that the **sustain** value is not a duration but an amplitude value (how loud). The other values are the time for each stage to take place. Here is a fairly complete example using the <ic>sawtooth</ic> basic waveform.
 	
 ${makeExample(
   "Simple synthesizer",
   `
-let smooth = (sound) => {
+register("smooth", x => x.cutoff(r(100,500))
-  return sound.cutoff(r(100,500))
+  .lpadsr(usaw(1/8) * 8, 0.05, .125, 0, 0)
-       .lpadsr(usaw(1/8) * 8, 0.05, .125, 0, 0)
+  .gain(r(0.25, 0.4)).adsr(0, r(.2,.4), r(0,0.5), 0)
-       .gain(r(0.25, 0.4)).adsr(0, r(.2,.4), r(0,0.5), 0)
+  .room(0.9).size(2).o(2).vib(r(2,8)).vibmod(0.125))
-       .room(0.9).size(2).o(2).vib(r(2,8)).vibmod(0.125)
+beat(.25)::sound('sawtooth')
-}
+.note([50,57,55,60].beat(1))
-beat(.25)::smooth(sound('sawtooth')
+.smooth().out();
-  .note([50,57,55,60].beat(1))).out();
+beat(.25)::sound('sawtooth')
-beat(.25)::smooth(sound('sawtooth')
+.note([50,57,55,60].add(12).beat(1.5))
-  .note([50,57,55,60].add(12).beat(1.5))).out();
+.smooth().out();
 	`,
   true,
 )};
-	
+
 Sometimes, using a full ADSR envelope is a bit overkill. There are other simpler controls to manipulate the envelope like the <ic>.ad</ic> method:
 
 
 ${makeExample(
   "Replacing .adsr by .ad",
   `
-let smooth = (sound) => {
+register("smooth", x => x.cutoff(r(100,500))
-  return sound.cutoff(r(100,500))
+  .lpadsr(usaw(1/8) * 8, 0.05, .125, 0, 0)
-       .lpadsr(usaw(1/8) * 8, 0.05, .125, 0, 0)
+  .gain(r(0.25, 0.4)).ad(0, 0.25)
-       .gain(r(0.25, 0.4)).ad(0, .25)
+  .room(0.9).size(2).o(2).vib(r(2,8)).vibmod(0.125))
-       .room(0.9).size(2).o(2).vib(r(2,8)).vibmod(0.125)
+beat(.25)::sound('sawtooth')
-}
+.note([50,57,55,60].beat(1))
-beat(.25)::smooth(sound('sawtooth')
+.smooth().out();
-  .note([50,57,55,60].beat(1))).out();
+beat(.25)::sound('sawtooth')
-beat(.25)::smooth(sound('sawtooth')
+.note([50,57,55,60].add(12).beat(1.5))
-  .note([50,57,55,60].add(12).beat(1.5))).out();
+.smooth().out();
 	`,
   true,
 )};

src/documentation/learning/audio_engine/audio_basics.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../../main";
+import { type Editor } from "../../../main";
-import { makeExampleFactory } from "../../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
 
 export const audio_basics = (application: Editor): string => {
   // @ts-ignore

src/documentation/learning/audio_engine/distortion.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../../main";
+import { type Editor } from "../../../main";
-import { makeExampleFactory } from "../../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
 
 export const distortion = (application: Editor): string => {
   // @ts-ignore

src/documentation/learning/audio_engine/effects.ts

@@ -1,7 +1,7 @@
-import { type Editor } from "../../main";
+import { type Editor } from "../../../main";
-import { makeExampleFactory } from "../../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
 
-export const reverb = (application: Editor): string => {
+export const effects = (application: Editor): string => {
   // @ts-ignore
   const makeExample = makeExampleFactory(application);
   return `
@@ -90,5 +90,34 @@ beat(.5)::snd('pad').crush([16, 8, 4].beat(2)).clip(.5).out()
 	`,
   true,
 )};
+
+## Vibrato
+
+You can also add some amount of vibrato to the sound using the <ic>vib</ic> and <ic>vibmod</ic> methods. These can turn any oscillator into something more lively and/or into a sound effect when used with a high amount of modulation.
+
+${makeExample(
+  "Different vibrato settings",
+  `
+tempo(140);
+beat(1) :: sound('triangle')
+  .freq(400).release(0.2)
+  .vib([1/2, 1, 2, 4].beat())
+  .vibmod([1,2,4,8].beat(2))
+  .out()`,
+  true,
+)}
+
+## Compression
+
+This effect is leveraging the basic WebAudio compressor. More information can be found about it on the [DynamicsCompressorNode](https://developer.mozilla.org/en-US/docs/Web/API/DynamicsCompressorNode?retiredLocale=de#instance_properties) page. This can be come quite complex :)
+
+| Method     | Alias     | Description                     |
+|------------|-----------|---------------------------------|
+| <ic>comp</ic>     | cmp | Compressor threshold value (dB) over which compressor operates |
+| <ic>ratio</ic>     | rt | Compressor ratio: input amount in dB needed for 1dB change in the output   |
+| <ic>knee</ic>     | kn | dB value defining the range over which the signal transitions to compressed section |
+| <ic>compAttack</ic>     | cmpa | In seconds, time to decrease the gain by 10db |
+| <ic>compRelease</ic>     | cmpr | In seconds, time to increase the gain by 10db |
+
 `;
 };

src/documentation/learning/audio_engine/filters.ts

@@ -0,0 +1,145 @@
+import { type Editor } from "../../../main";
+import { makeExampleFactory } from "../../../Documentation";
+
+export const filters = (application: Editor): string => {
+  const makeExample = makeExampleFactory(application);
+  return `
+# Filters
+
+Filters can be applied to both synthesizers and samples. They are used to shape the sound by removing or emphasizing certain frequencies. They are also used to create movement in the sound by modulating the cutoff frequency of the filter over time. 
+
+- **lowpass filter**: filters the high frequencies, keeping the low frequencies.
+- **highpass filter**: filtering the low frequencies, keeping the high frequencies.
+- **bandpass filter**: filters the low and high frequencies around a frequency band, keeping what's in the middle.
+
+${makeExample(
+  "Filtering the high frequencies of an oscillator",
+  `beat(.5) :: sound('sawtooth').cutoff(50 + usine(1/8) * 2000).out()`,
+  true,
+)}
+
+These filters all come with their own set of parameters. Note that we are describing the parameters of the three different filter types here. Choose the right parameters depending on the filter type you are using:
+
+
+### Lowpass filter
+
+| Method     | Alias     | Description                     |
+|------------|-----------|---------------------------------|
+| <ic>cutoff</ic>     | <ic>lpf</ic>       | cutoff frequency of the lowpass filter |
+| <ic>resonance</ic>  | <ic>lpq</ic>       | resonance of the lowpass filter (0-1) |
+
+${makeExample(
+  "Filtering a bass",
+  `beat(.5) :: sound('jvbass').lpf([250,1000,8000].beat()).out()`,
+  true,
+)}
+
+### Highpass filter
+
+| Method     | Alias     | Description                     |
+|------------|-----------|---------------------------------|
+| <ic>hcutoff</ic>     | <ic>hpf</ic>       | cutoff frequency of the highpass filter |
+| <ic>hresonance</ic>  | <ic>hpq</ic>       | resonance of the highpass filter (0-1) |
+
+${makeExample(
+  "Filtering a noise source",
+  `beat(.5) :: sound('gtr').hpf([250,1000, 2000, 3000, 4000].beat()).end(0.5).out()`,
+  true,
+)}
+
+### Bandpass filter
+
+| Method     | Alias     | Description                     |
+|------------|-----------|---------------------------------|
+| <ic>bandf</ic>      | <ic>bpf</ic>       | cutoff frequency of the bandpass filter |
+| <ic>bandq</ic>      | <ic>bpq</ic>       | resonance of the bandpass filter (0-1) |
+
+${makeExample(
+  "Sweeping the filter on the same guitar sample",
+  `beat(.5) :: sound('gtr').bandf(100 + usine(1/8) * 4000).end(0.5).out()`,
+  true,
+)}
+
+Alternatively, <ic>lpf</ic>, <ic>hpf</ic> and <ic>bpf</ic> can take a second argument, the **resonance**.
+
+## Filter order (type)
+
+You can also use the <ic>ftype</ic> method to change the filter type (order). There are two types by default, <ic>12db</ic> for a gentle slope or <ic>24db</ic> for a really steep filtering slope. The <ic>24db</ic> type is particularly useful for substractive synthesis if you are trying to emulate some of the Moog or Prophet sounds:
+
+- <ic>ftype(type: string)</ic>: sets the filter type (order), either <ic>12db</ic> or <ic>24db</ic>.
+
+${makeExample(
+  "Filtering a bass",
+  `beat(.5) :: sound('jvbass').ftype(['12db', '24db'].beat(4)).lpf([250,1000,8000].beat()).out()`,
+  true,
+)}
+
+## Filter envelopes
+
+The examples we have studied so far are static. They filter the sound around a fixed cutoff frequency. To make the sound more interesting, you can use the ADSR filter envelopes to shape the filter cutoff frequency over time. You will always find amplitude and filter envelopes on most commercial synthesizers. This is done using the following methods:
+
+### Lowpass envelope
+
+| Method     | Alias     | Description                     |
+|------------|-----------|---------------------------------|
+| <ic>lpenv</ic>      | <ic>lpe</ic>       | lowpass frequency modulation amount (negative or positive) |
+| <ic>lpattack</ic>   | <ic>lpa</ic>       | attack of the lowpass filter    |
+| <ic>lpdecay</ic>    | <ic>lpd</ic>       | decay of the lowpass filter     |
+| <ic>lpsustain</ic>  | <ic>lps</ic>       | sustain of the lowpass filter   |
+| <ic>lprelease</ic>  | <ic>lpr</ic>       | release of the lowpass filter   |
+| <ic>lpadsr</ic>     |                    | (**takes five arguments**) set all the parameters  |
+
+
+${makeExample(
+  "Filtering a sawtooth wave dynamically",
+  `beat(.5) :: sound('sawtooth').note([48,60].beat())
+  .cutoff(5000).lpa([0.05, 0.25, 0.5].beat(2))
+  .lpenv(-8).lpq(10).out()`,
+  true,
+)}
+
+### Highpass envelope
+
+| Method     | Alias     | Description                     |
+|------------|-----------|---------------------------------|
+| <ic>hpenv</ic>      | <ic>hpe</ic>       | highpass frequency modulation amount (negative or positive) |
+| <ic>hpattack</ic>   | <ic>hpa</ic>       | attack of the highpass filter    |
+| <ic>hpdecay</ic>    | <ic>hpd</ic>       | decay of the highpass filter     |
+| <ic>hpsustain</ic>  | <ic>hps</ic>       | sustain of the highpass filter   |
+| <ic>hprelease</ic>  | <ic>hpr</ic>       | release of the highpass filter   |
+| <ic>hpadsr</ic>     |           | (**takes five arguments**) set all the parameters  |
+
+
+${makeExample(
+  "Let's use another filter using the same example",
+  `beat(.5) :: sound('sawtooth').note([48,60].beat())
+  .hcutoff(1000).hpa([0.05, 0.25, 0.5].beat(2))
+  .hpenv(8).hpq(10).out()`,
+  true,
+)}
+
+### Bandpass envelope
+
+| Method     | Alias     | Description                     |
+|------------|-----------|---------------------------------|
+| <ic>bpenv</ic>      | <ic>bpe</ic>       | bandpass frequency modulation amount (negative or positive) |
+| <ic>bpattack</ic>   | <ic>bpa</ic>       | attack of the bandpass filter    |
+| <ic>bpdecay</ic>    | <ic>bpd</ic>       | decay of the bandpass filter     |
+| <ic>bpsustain</ic>  | <ic>bps</ic>       | sustain of the bandpass filter   |
+| <ic>bprelease</ic>  | <ic>bpr</ic>       | release of the bandpass filter   |
+| <ic>bpadsr</ic>     |           | (**takes five arguments**) set all the parameters  |
+
+
+${makeExample(
+  "And the bandpass filter, just for fun",
+  `beat(.5) :: sound('sawtooth').note([48,60].beat())
+  .bandf([500,1000,2000].beat(2))
+  .bpa([0.25, 0.125, 0.5].beat(2) * 4)
+  .bpenv(-4).release(2).out()
+  `,
+  true,
+)}
+
+
+`;
+};

src/documentation/learning/audio_engine/sampler.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../../main";
+import { type Editor } from "../../../main";
-import { makeExampleFactory } from "../../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
 
 export const sampler = (application: Editor): string => {
   // @ts-ignore

src/documentation/learning/audio_engine/synths.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../main";
+import { type Editor } from "../../../main";
-import { makeExampleFactory } from "../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
 
 export const synths = (application: Editor): string => {
   const makeExample = makeExampleFactory(application);
@@ -22,7 +22,6 @@ beat(.5) && snd(['sine', 'triangle', 'sawtooth', 'square'].beat()).freq(100).out
 
 Note that you can also use noise if you do not want to use a periodic oscillator:
 
-
 ${makeExample(
   "Listening to the different types of noise",
   `
@@ -69,43 +68,9 @@ ${makeExample(
     beat(.5) && snd('triangle').chord(60,64,67,72).invert([1,-3,4,-5].pick()).adsr(0,.2).out()
 `,
   true,
-)}  
-
-## Vibrato
-
-You can also add some amount of vibrato to the sound using the <ic>vib</ic> and <ic>vibmod</ic> methods. These can turn any oscillator into something more lively and/or into a sound effect when used with a high amount of modulation.
-
-${makeExample(
-  "Different vibrato settings",
-  `
-tempo(140);
-beat(1) :: sound('triangle')
-  .freq(400).release(0.2)
-  .vib([1/2, 1, 2, 4].beat())
-  .vibmod([1,2,4,8].beat(2))
-  .out()`,
-  true,
 )}
 
-## Noise
+# Controlling amplitude
-
-A certain amount of brown noise can be added by using the <ic>.noise</ic> key:
-
-${makeExample(
-  "Different vibrato settings",
-  `
-tempo(140);
-beat(1) :: sound('triangle')
-  .freq(400).release(0.2)
-  .noise([0.2,0.4,0.5].bar())
-  .vib([1/2, 1, 2, 4].beat())
-  .vibmod([1,2,4,8].beat(2))
-  .out()`,
-  true,
-)}
-
-
-## Controlling the amplitude
 
 Controlling the amplitude and duration of the sound can be done using various techniques. The most important thing to learn is probably how set the amplitude (volume) of your synthesizer:
 - <ic>gain(gain: number)</ic>: sets the gain of the oscillator.
@@ -123,6 +88,8 @@ ${makeExample(
   true,
 )}
 
+## Envelopes
+
 <div class="mt-4 mb-4 lg:grid lg:grid-cols-4 lg:gap-4">
   <img class="col-span-1 lg:ml-12 bg-gray-100 rounded-lg px-2 py-2", src="https://upload.wikimedia.org/wikipedia/commons/thumb/e/ef/ADSR_Envelope_Graph.svg/1280px-ADSR_Envelope_Graph.svg.png" width="400" />
   <z class="pl-8 lg:text-2xl text-base text-white lg:mx-6 mx-2 my-4 leading-normal col-span-3 ">Synthesizers typically come with an amplitude envelope that can help you to shape the sound with a slow attack or long release. This is done in Topos using the amplitude envelope, composed of four parameters: <ic>attack</ic>, <ic>decay</ic>, <ic>sustain</ic> and <ic>release</ic>:</z> 
@@ -178,9 +145,7 @@ beat(0.5) :: sound('wt_piano')
 
 The most basic synthesis technique used since the 1970s is called substractive synthesis. This technique is based on the use of rich sound sources (oscillators) as a base to build rich and moving timbres. Because rich sources contain a lot of different harmonics, you might want to filter some of them to obtain the timbre you are looking for. To do so, Topos comes with a set of basic filters that can be used to shape the sound exactly to your liking. There are three filter types by defaut, with more to be added in the future:
 
-- **lowpass filter**: filters the high frequencies, keeping the low frequencies.
+See the Filters page for details on lowpass, highpass and bandpass filters. I also encourage you to study these simple examples to get more familiar with the construction of basic substractive synthesizers:
-- **highpass filter**: filtering the low frequencies, keeping the high frequencies.
-- **bandpass filter**: filters the low and high frequencies around a frequency band, keeping what's in the middle.
 
 ${makeExample(
   "Filtering the high frequencies of an oscillator",
@@ -188,64 +153,6 @@ ${makeExample(
   true,
 )}
 
-These filters all come with their own set of parameters. Note that we are describing the parameters of the three different filter types here. Choose the right parameters depending on the filter type you are using:
-
-
-### Lowpass filter
-
-| Method     | Alias     | Description                     |
-|------------|-----------|---------------------------------|
-| <ic>cutoff</ic>     | <ic>lpf</ic>       | cutoff frequency of the lowpass filter |
-| <ic>resonance</ic>  | <ic>lpq</ic>       | resonance of the lowpass filter (0-1) |
-
-${makeExample(
-  "Filtering a bass",
-  `beat(.5) :: sound('jvbass').lpf([250,1000,8000].beat()).out()`,
-  true,
-)}
-
-### Highpass filter
-
-| Method     | Alias     | Description                     |
-|------------|-----------|---------------------------------|
-| <ic>hcutoff</ic>     | <ic>hpf</ic>       | cutoff frequency of the highpass filter |
-| <ic>hresonance</ic>  | <ic>hpq</ic>       | resonance of the highpass filter (0-1) |
-
-${makeExample(
-  "Filtering a noise source",
-  `beat(.5) :: sound('gtr').hpf([250,1000, 2000, 3000, 4000].beat()).end(0.5).out()`,
-  true,
-)}
-
-### Bandpass filter
-
-| Method     | Alias     | Description                     |
-|------------|-----------|---------------------------------|
-| <ic>bandf</ic>      | <ic>bpf</ic>       | cutoff frequency of the bandpass filter |
-| <ic>bandq</ic>      | <ic>bpq</ic>       | resonance of the bandpass filter (0-1) |
-
-${makeExample(
-  "Sweeping the filter on the same guitar sample",
-  `beat(.5) :: sound('gtr').bandf(100 + usine(1/8) * 4000).end(0.5).out()`,
-  true,
-)}
-
-Alternatively, <ic>lpf</ic>, <ic>hpf</ic> and <ic>bpf</ic> can take a second argument, the **resonance**.
-
-## Filter order (type)
-
-You can also use the <ic>ftype</ic> method to change the filter type (order). There are two types by default, <ic>12db</ic> for a gentle slope or <ic>24db</ic> for a really steep filtering slope. The <ic>24db</ic> type is particularly useful for substractive synthesis if you are trying to emulate some of the Moog or Prophet sounds:
-
-- <ic>ftype(type: string)</ic>: sets the filter type (order), either <ic>12db</ic> or <ic>24db</ic>.
-
-${makeExample(
-  "Filtering a bass",
-  `beat(.5) :: sound('jvbass').ftype(['12db', '24db'].beat(4)).lpf([250,1000,8000].beat()).out()`,
-  true,
-)}
-
-I also encourage you to study these simple examples to get more familiar with the construction of basic substractive synthesizers:
-
 ${makeExample(
   "Simple synthesizer voice with filter",
   `
@@ -282,73 +189,23 @@ beat(1/8)::sound('sine')
   false,
 )}
 
-## Filter envelopes
+## Noise
-
-The examples we have studied so far are static. They filter the sound around a fixed cutoff frequency. To make the sound more interesting, you can use the ADSR filter envelopes to shape the filter cutoff frequency over time. You will always find amplitude and filter envelopes on most commercial synthesizers. This is done using the following methods:
-
-### Lowpass envelope
-
-| Method     | Alias     | Description                     |
-|------------|-----------|---------------------------------|
-| <ic>lpenv</ic>      | <ic>lpe</ic>       | lowpass frequency modulation amount (negative or positive) |
-| <ic>lpattack</ic>   | <ic>lpa</ic>       | attack of the lowpass filter    |
-| <ic>lpdecay</ic>    | <ic>lpd</ic>       | decay of the lowpass filter     |
-| <ic>lpsustain</ic>  | <ic>lps</ic>       | sustain of the lowpass filter   |
-| <ic>lprelease</ic>  | <ic>lpr</ic>       | release of the lowpass filter   |
-| <ic>lpadsr</ic>     |                    | (**takes five arguments**) set all the parameters  |
 
+A certain amount of brown noise can be added by using the <ic>.noise</ic> key:
 
 ${makeExample(
-  "Filtering a sawtooth wave dynamically",
+  "Different vibrato settings",
-  `beat(.5) :: sound('sawtooth').note([48,60].beat())
+  `
-  .cutoff(5000).lpa([0.05, 0.25, 0.5].beat(2))
+tempo(140);
-  .lpenv(-8).lpq(10).out()`,
+beat(1) :: sound('triangle')
+  .freq(400).release(0.2)
+  .noise([0.2,0.4,0.5].bar())
+  .vib([1/2, 1, 2, 4].beat())
+  .vibmod([1,2,4,8].beat(2))
+  .out()`,
   true,
 )}
 
-### Highpass envelope
-
-| Method     | Alias     | Description                     |
-|------------|-----------|---------------------------------|
-| <ic>hpenv</ic>      | <ic>hpe</ic>       | highpass frequency modulation amount (negative or positive) |
-| <ic>hpattack</ic>   | <ic>hpa</ic>       | attack of the highpass filter    |
-| <ic>hpdecay</ic>    | <ic>hpd</ic>       | decay of the highpass filter     |
-| <ic>hpsustain</ic>  | <ic>hps</ic>       | sustain of the highpass filter   |
-| <ic>hprelease</ic>  | <ic>hpr</ic>       | release of the highpass filter   |
-| <ic>hpadsr</ic>     |           | (**takes five arguments**) set all the parameters  |
-
-
-${makeExample(
-  "Let's use another filter using the same example",
-  `beat(.5) :: sound('sawtooth').note([48,60].beat())
-  .hcutoff(1000).hpa([0.05, 0.25, 0.5].beat(2))
-  .hpenv(8).hpq(10).out()`,
-  true,
-)}
-
-### Bandpass envelope
-
-| Method     | Alias     | Description                     |
-|------------|-----------|---------------------------------|
-| <ic>bpenv</ic>      | <ic>bpe</ic>       | bandpass frequency modulation amount (negative or positive) |
-| <ic>bpattack</ic>   | <ic>bpa</ic>       | attack of the bandpass filter    |
-| <ic>bpdecay</ic>    | <ic>bpd</ic>       | decay of the bandpass filter     |
-| <ic>bpsustain</ic>  | <ic>bps</ic>       | sustain of the bandpass filter   |
-| <ic>bprelease</ic>  | <ic>bpr</ic>       | release of the bandpass filter   |
-| <ic>bpadsr</ic>     |           | (**takes five arguments**) set all the parameters  |
-
-
-${makeExample(
-  "And the bandpass filter, just for fun",
-  `beat(.5) :: sound('sawtooth').note([48,60].beat())
-  .bandf([500,1000,2000].beat(2))
-  .bpa([0.25, 0.125, 0.5].beat(2) * 4)
-  .bpenv(-4).release(2).out()
-  `,
-  true,
-)}
-
-
 ## Wavetable synthesis
 
 Topos can also do wavetable synthesis. Wavetable synthesis allows you to use any sound file as a source to build an oscillator. By default, Topos comes with more than 1000 waveforms thanks to the awesome [AKWF](https://www.adventurekid.se/akrt/waveforms/adventure-kid-waveforms/) pack made by Kristoffer Ekstrand. Any sample name that contains <ic>wt_</ic> as a prefix will be interpreted by the sampler as a wavetable and thus as an oscillator. See for yourself:

src/documentation/learning/midi.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../main";
+import { type Editor } from "../../main";
-import { makeExampleFactory, key_shortcut } from "../Documentation";
+import { makeExampleFactory, key_shortcut } from "../../Documentation";
 
 export const midi = (application: Editor): string => {
   const makeExample = makeExampleFactory(application);

src/documentation/learning/osc.ts

@@ -0,0 +1,75 @@
+import { type Editor } from "../../main";
+import { makeExampleFactory } from "../../Documentation";
+
+export const osc = (application: Editor): string => {
+  // @ts-ignore
+  const makeExample = makeExampleFactory(application);
+  return `
+# Open Sound Control
+
+Topos is a sandboxed web application. It cannot speak with your computer directly or only through a secure connexion. You can use the [Open Sound Control](https://en.wikipedia.org/wiki/Open_Sound_Control) protocol to send and receive data from your computer. This protocol is used by many softwares and hardware devices. You can use it to control your favorite DAW, your favorite synthesizer, your favorite robot, or anything really! To use **OSC** with Topos, you will need to download the <ic>ToposServer</ic> by [following this link](https://github.com/Bubobubobubobubo/Topos). You can download everything as a zip file or clone the project if you know what you are doing. Here is a quick guide to get you started:
+
+- 1) Download <ic>Topos</ic> and navigate to the <ic>ToposServer</ic> folder.
+- 2) Install the dependencies using <ic>npm install</ic>. Start the server using <ic>npm start</ic>.
+- 3) Open the <ic>Topos</ic> application in your web browser (server first, then application).
+
+The <ic>ToposServer</ic> server is used both for **OSC** _input_ and _output_.
+
+## Input
+
+Send an **OSC** message to the server from another application or device at the address <ic>localhost:30000</ic>. Topos will store the last 1000 messages in a queue. You can access this queue using the <ic>getOsc()</ic> function.
+
+### Unfiltered messages
+
+You can access the last 1000 messages using the <ic>getOsc()</ic> function without any argument. This is raw data, you will need to parse it yourself:
+
+${makeExample(
+  "Reading the last OSC messages",
+  `
+beat(1)::getOsc()
+// 0 : {data: Array(2), address: '/lala'}
+// 1 : {data: Array(2), address: '/lala'}
+// 2 : {data: Array(2), address: '/lala'}`,
+  true,
+)}
+
+### Filtered messages
+
+The <ic>getOsc()</ic> can receive an address filter as an argument. This will return only the messages that match the filter:
+
+${makeExample(
+  "Reading the last OSC messages (filtered)",
+  `
+beat(1)::getOsc("/lala")
+// 0 : (2) [89, 'bob']
+// 1 : (2) [84, 'bob']
+// 2 : (2) [82, 'bob']
+         `,
+  true,
+)}
+
+## Output
+
+Once the server is loaded, you are ready to send an **OSC** message:
+
+${makeExample(
+  "Sending a simple OSC message",
+  `
+beat(1)::sound('cp').speed(2).vel(0.5).osc()
+    `,
+  true,
+)}
+
+This is a simple **OSC** message that will inherit all the properties of the sound. You can also send customized OSC messages using the <ic>osc()</ic> function:
+
+${makeExample(
+  "Sending a customized OSC message",
+  `
+// osc(address, port, ...message)
+osc('/my/osc/address', 5000, 1, 2, 3)
+    `,
+  true,
+)}
+
+`;
+};

src/documentation/learning/samples/loading_samples.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../../main";
+import { type Editor } from "../../../main";
-import { makeExampleFactory } from "../../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
 
 export const loading_samples = (application: Editor): string => {
   // @ts-ignore

src/documentation/learning/samples/sample_banks.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../../main";
+import { type Editor } from "../../../main";
-import { makeExampleFactory } from "../../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
 
 export const sample_banks = (application: Editor): string => {
   // @ts-ignore

src/documentation/learning/samples/sample_list.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../../main";
+import { type Editor } from "../../../main";
-import { makeExampleFactory } from "../../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
 
 export const samples_to_markdown = (
   application: Editor,
@@ -32,7 +32,7 @@ export const samples_to_markdown = (
 
     markdownList += `
 <button 
-	class="hover:bg-neutral-500 inline px-4 py-2 bg-neutral-700 text-orange-300 text-xl"
+	class="hover:bg-foreground inline px-4 py-2 bg-black text-brightwhite hover:text-background text-xl"
 	onclick="app.api._playDocExampleOnce(app.api.codeExamples['${codeId}'])"
 >
 ${keys[i]}
@@ -75,7 +75,7 @@ beat(0.5)::sound('wt_stereo').n([0, 1].pick()).ad(0, .25).out()
 
 Pick one folder and spend some time exploring it. There is a lot of different waveforms.
 
-<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-neutral-600 mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
+<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-background mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
 ${samples_to_markdown(application, "Waveforms")}
 </div>
 
@@ -94,7 +94,7 @@ beat(0.5)::sound(['bd', 'cp'].pick()).bank("AkaiLinn").out()
 Here is the complete list of available machines:
 
 
-<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-neutral-600 mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
+<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-background mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
 ${samples_to_markdown(application, "Machines")}
 </div>
 
@@ -102,7 +102,7 @@ ${samples_to_markdown(application, "Machines")}
 
 The default sample pack used by Ryan Kirkbride's [FoxDot](https://github.com/Qirky/FoxDot). It is a nice curated sample pack that covers all the basic sounds you could want.
 
-<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-neutral-600 mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
+<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-background mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
 ${samples_to_markdown(application, "FoxDot")}
 </div>
 
@@ -110,7 +110,7 @@ ${samples_to_markdown(application, "FoxDot")}
 
 This set of audio samples is taken from [this wonderful collection](https://archive.org/details/AmigaSoundtrackerSamplePacksst-xx) of **Ultimate Tracker Amiga samples**. They were initially made by Karsten Obarski. These files were processed: pitched down one octave, gain down 6db. The audio has been processed with [SoX](https://github.com/chirlu/sox). The script used to do so is also included in this repository.
 
-<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-neutral-600 mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
+<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-background mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
 ${samples_to_markdown(application, "Amiga")}
 </div>
 
@@ -128,7 +128,7 @@ beat(4)::sound('amen1').stretch(4).out()
 
 The stretch should be adapted based on the length of each amen break.
 
-<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-neutral-600 mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
+<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-background mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
 ${samples_to_markdown(application, "Amen")}
 </div>
 
@@ -137,7 +137,7 @@ ${samples_to_markdown(application, "Amen")}
 Many live coders are expecting to find the Tidal sample library wherever they go, so here it is :)
 
 
-<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-neutral-600 mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
+<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-background mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
 ${samples_to_markdown(application, "Tidal")}
 </div>
 
@@ -145,8 +145,16 @@ ${samples_to_markdown(application, "Tidal")}
 
 This sample pack is only one folder full of french phonems! It sounds super nice.
 
-<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-neutral-600 mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
+<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-background mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
 ${samples_to_markdown(application, "Juliette")}
 </div>
+
+## Your samples
+
+These samples are the one you have loaded for the duration of the session using the <ic>Import Samples</ic> button in the configuration menu.
+
+<div class="lg:pl-6 lg:pr-6 w-fit rounded-lg bg-background mx-6 mt-2 my-6 px-2 py-2 max-h-96 flex flex-row flex-wrap gap-x-2 gap-y-2 overflow-y-scroll">
+${samples_to_markdown(application, "user")}
+</div>
 `;
 };

src/documentation/learning/time/cyclical_time.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../../main";
+import { type Editor } from "../../../main";
-import { makeExampleFactory } from "../../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
 
 export const cyclical_time = (app: Editor): string => {
   // @ts-ignore

src/documentation/learning/time/linear_time.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../../main";
+import { type Editor } from "../../../main";
-import { makeExampleFactory } from "../../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
 import pulses from "./pulses.svg";
 
 export const linear_time = (app: Editor): string => {

src/documentation/learning/time/long_forms.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../main";
+import { type Editor } from "../../../main";
-import { makeExampleFactory } from "../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
 
 export const long_forms = (app: Editor): string => {
   // @ts-ignore

src/documentation/learning/time/time.ts

@@ -1,5 +1,5 @@
-import { makeExampleFactory } from "../../Documentation";
+import { makeExampleFactory } from "../../../Documentation";
-import { type Editor } from "../../main";
+import { type Editor } from "../../../main";
 import times from "./times.svg";
 
 export const time = (application: Editor): string => {

src/documentation/more/about.ts

@@ -14,6 +14,21 @@ Topos is an experimental web based algorithmic sequencer programmed by **BuboBub
 
 Topos is a free and open-source software distributed under [GPL-3.0](https://github.com/Bubobubobubobubo/Topos/blob/main/LICENSE) licence. We welcome all contributions and ideas. You can find the source code on [GitHub](https://github.com/Bubobubobubobubo/topos). You can also join us on [Discord](https://discord.gg/dnUTPbu6bN) to discuss about the project and live coding in general.
 	 
+## Support the project
+
+You can support the project by making a small donation on [Kofi](https://ko-fi.com/Manage/).
+
+<div style="display: flex; justify-content: center;">
+  <iframe
+    id='kofiframe'
+    src='https://ko-fi.com/raphaelbubo/?hidefeed=true&widget=true&embed=true&preview=true' 
+    style='border:none;width:40%;padding:4px;background:#f9f9f9;' 
+    height='590'
+    title='raphaelbubo'>
+  </iframe>
+</div>
+
+
 ## Credits
 
 - Felix Roos for the [SuperDough](https://www.npmjs.com/package/superdough) audio engine.

src/documentation/more/bonus.ts

@@ -9,6 +9,24 @@ export const bonus = (application: Editor): string => {
 
 Some features have been included as a bonus. These features are often about patterning over things that are not directly related to sound: pictures, video, etc.
 
+## Editor theme configuration
+
+The editor theme can be changed using the <ic>theme</ic> and <ic>randomTheme</ic> functions. The following example will use a random color scheme for every beat:
+
+${makeExample(
+  "Random theme on each beat",
+  `
+beat(1)::randomTheme()
+`, true)}
+
+You can also pick a theme using the <ic>theme</ic> function with a string as only argument:
+
+${makeExample(
+  "Picking a theme",
+  `
+beat(1)::theme("Batman")
+`, true)}
+
 ## Hydra Visual Live Coding
 
 <div class="mx-12 bg-neutral-600 rounded-lg flex flex-col items-center justify-center">

src/documentation/patterns/chaining.ts

@@ -1,5 +1,5 @@
-import { makeExampleFactory } from "../Documentation";
+import { makeExampleFactory } from "../../Documentation";
-import { type Editor } from "../main";
+import { type Editor } from "../../main";
 
 export const chaining = (application: Editor): string => {
   const makeExample = makeExampleFactory(application);
@@ -54,6 +54,25 @@ rhythm(.25, [6, 8].beat(), 12)::sound('sine')
   true,
 )}
 
+## Logging values from the chain
+
+You can use the <ic>log()</ic> function to print values from the current event. This can be useful to debug your code. Useful parameters to log could be **note**, **pitch**, **dur**, **octave** etc...
+
+${makeExample(
+  "Logging values from the chain",
+  `
+  beat(1) :: sound("sine").pitch(rI(1,6)).log("note").out()
+  `,
+  true,
+)}
+
+${makeExample(
+  "Logging values from ziffers pattern",
+  `
+  z1("0 3 2 5").scale("rocritonic").sound("sine").log("pitch","note","key").out()
+  `,
+  true,
+)}
 
 ## Conditional chaining
 

src/documentation/patterns/functions.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../main";
+import { type Editor } from "../../main";
-import { makeExampleFactory } from "../Documentation";
+import { makeExampleFactory } from "../../Documentation";
 
 export const functions = (application: Editor): string => {
   const makeExample = makeExampleFactory(application);

src/documentation/patterns/generators.ts

@@ -0,0 +1,119 @@
+import { type Editor } from "../../main";
+import { makeExampleFactory } from "../../Documentation";
+
+export const generators = (application: Editor): string => {
+  const makeExample = makeExampleFactory(application);
+  return `
+# Generator functions
+
+JavaScript <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Generator" target="_blank">generators</a> are powerful functions for generating value sequences. They can be used to generate melodies, rhythms or control parameters.
+
+In Topos generator functions should be called using the <ic>cache(key, function)</ic> function to store the current state of the generator. This function takes two arguments: the name for the cache and the generator instance. 
+
+Once the generator is cached the values will be returned from the named cache even if the generator function is modified. To clear the current cache and to re-evaluate the modified generator use the **Shift+Ctrl+Backspace** shortcut. Alternatively you can cache the modified generator using a different name.
+
+The resulted values can be played using either <ic>pitch()</ic> or <ic>freq()</ic> or as Ziffers patterns. When playing the values using <ic>pitch()</ic> different scales and chained methods can be used to alter the result, for example <ic>mod(value: number)</ic> to limit the integer range or <ic>scale(name: string)</ic> etc. to change the resulting note.
+
+${makeExample(
+"Simple looping generator function",
+`
+function* simple() {
+    let x = 0;
+    while (x < 12) {
+        yield x+x;
+        x+=1;
+    }
+}
+
+beat(.25) && sound("triangle").pitch(cache("simple",simple())).scale("minor").out()
+`,
+true,
+)};
+
+${makeExample(
+"Infinite frequency generator",
+`
+    function* poly(x=0) {
+     while (true) {
+        const s = Math.tan(x/10)+Math.sin(x/20);
+        yield 2 * Math.pow(s, 3) - 6 * Math.pow(s, 2) + 5 * s + 200;
+        x++;
+     }  
+    }
+    
+    beat(.125) && sound("triangle").freq(cache("mathyshit",poly())).out()
+`,
+true,
+)};
+
+${makeExample(
+  "Truly scale free chaos inspired by Lorentz attractor",
+  `
+  function* strange(x = 0.1, y = 0, z = 0, rho = 28, beta = 8 / 3, zeta = 10) {
+    while (true) {
+      const dx = 10 * (y - x);
+      const dy = x * (rho - z) - y;
+      const dz = x * y - beta * z;
+  
+      x += dx * 0.01;
+      y += dy * 0.01;
+      z += dz * 0.01;
+  
+      const value = 300 + 30 * (Math.sin(x) + Math.tan(y) + Math.cos(z))
+      yield value;
+    }
+  }
+  
+  beat(0.25) :: sound("triangle")
+    .freq(cache("stranger",strange(3,5,2)))
+    .adsr(.15,.1,.1,.1)
+    .log("freq").out()
+  `,
+  true,
+)};
+
+## OEIS integer sequences
+
+To find some inspiration - or to enter into the void - one can visit <a href="https://oeis.org/" target="_blank">The On-Line Encyclopedia of Integer Sequences (OEIS)</a> to find some interesting integer sequences. 
+
+Many of the sequences are implemented by <a href="https://github.com/acerix/jisg/tree/main/src/oeis" target="_blank">JISG</a> (Javascript Integer Sequence Generators) project. Those sequences can be referenced directly with the identifiers using the cache function.
+
+One of these implemented generators is the Inventory sequence <a href="https://github.com/acerix/jisg/blob/main/src/oeis/A342585.ts" target="_blank">A342585</a> made famous by <a href="https://www.youtube.com/watch?v=rBU9E-ZOZAI" target="_blank">Neil Sloane</a>.
+
+${makeExample(
+    "Inventory sequence",
+    `
+    rhythm(0.5,[8,7,5,6].bar(4),9) :: sound("triangle")
+    .pitch(cache("Inventory",A342585))
+    .mod(11).scale("minor")
+    .adsr(.25,.05,.5,.5)
+    .room(2.0).size(0.5)
+    .gain(1).out()
+    `,
+    true,
+    )};
+
+## Using generators with Ziffers
+
+Alternatively generators can be used with Ziffers to generate longer patterns. In this case the generator function should be passed as an argument to the ziffers function. Ziffers patterns are cached separately so there is no need for using **cache()** function. Ziffers expects values from the generators to be integers or strings in ziffers syntax.
+
+${makeExample(
+    "Ziffers patterns using a generator functions",
+`
+function* poly(x) {
+    while (true) {
+      yield 64 * Math.pow(x, 6) - 480 * Math.pow(x, 4) + 720 * Math.pow(x, 2);
+      x++;
+    }
+  }
+  
+z0(poly(1)).noteLength(0.5).semitones(2,2,3,2,2,2).sound("sine").out()
+z1(poly(8)).noteLength(0.25).semitones(2,1,2,1,2,2).sound("sine").out()
+z2(poly(-3)).noteLength(1.0).semitones(2,2,2,1,3,2).sound("sine").out()
+`,
+    true,
+  )};
+
+
+`
+};

src/documentation/patterns/lfos.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../main";
+import { type Editor } from "../../main";
-import { makeExampleFactory } from "../Documentation";
+import { makeExampleFactory } from "../../Documentation";
 
 export const lfos = (application: Editor): string => {
   const makeExample = makeExampleFactory(application);

src/documentation/patterns/patterns.ts

@@ -1,10 +1,10 @@
-import { type Editor } from "../main";
+import { type Editor } from "../../main";
-import { makeExampleFactory } from "../Documentation";
+import { makeExampleFactory } from "../../Documentation";
 
 export const patterns = (application: Editor): string => {
   const makeExample = makeExampleFactory(application);
   return `
-# Patterns
+# Array patterns
 
 **Topos** is using arrays as a way to make dynamic patterns of data (rhythms, melodies, etc). 
 It means that the following:
@@ -122,7 +122,6 @@ beat(1)::sound(['kick', 'fsnare'].dur(3, 1))
 
 ## Manipulating notes and scales
 
-
 - <ic>pitch()</ic>: convert a list of integers to pitch classes
 
 ${makeExample(
@@ -136,7 +135,62 @@ beat(0.25) :: snd('sine')
   true,
 )}
 
-  - <ic>scale(scale: string, base note: number)</ic>: Map each element of the list to the closest note of the slected scale. [0, 2, 3, 5 ].scale("major", 50) returns [50, 52, <ic>54</ic>, 55]. You can use western scale names like (Major, Minor, Minor pentatonic ...) or [zeitler](https://ianring.com/musictheory/scales/traditions/zeitler) scale names. Alternatively you can also use the integers as used by Ian Ring in his [study of scales](https://ianring.com/musictheory/scales/).
+- <ic>semitones(number[], ...args?)</ic>: Create scale from semitone intervals.
+
+${makeExample(
+  "Play pitches from scale created from semitone intervals",
+  `
+  beat(1) :: sound('gtr').pitch([0, 4, 3, 2].beat()).key(64)
+  .semitones(1, 1, 3, 1, 1, 2, 3).out()
+`,
+  true,
+)}
+
+- <ic>cents(number[], ...args?)</ic>: Create scale from cent intervals.
+
+${makeExample(
+  "Play pitches from scale created from cent intervals",
+  `
+  rhythm([0.5,0.25].beat(1),14,16) :: sound('pluck')
+  .stretch(r(1,5)).pitch(r(0,6)).key(57)
+.cents(120,270,540,670,785,950,1215).out()
+`,
+  true,
+)}
+
+- <ic>ratios(number[], ...args?)</ic>: Create scale from ratios.
+
+${makeExample(
+  "Play pitches from scale created from ratios",
+  `
+  rhythm([0.5,0.25].beat(0.25),5,7) :: sound('east:3')
+  .pitch([0,1,2,3,4,5,6,7,8,9,10,11].beat(0.25)).key(67)
+.ratios(2/11,4/11,6/11,8/11,10/11,11/11).out()
+`,
+  true,
+)}
+
+- <ic>edo(number, scale?: string|number[])</ic>: Create scale from equal divisions of the octave. Creates chromatic scale by default.
+
+${makeExample(
+  "Play pitches from scale created from equal divisions of the octave",
+  `
+  z0("e bd bd <bd bd [bd bd] [bd bd bd bd]>").sound().out()
+flipbar(1) :: rhythm(.25,14,16) :: sound("ST10:30").stretch(3).gain(0.5)
+.pitch([0,10,r(20,40),r(100,200),r(-200,200),r(200,300),200,r(3,666)].beat([1.0,0.5,0.25].bar(6)))
+    .octave(r(-6,6))
+    .edo(666,"rocritonic")
+    .out()
+rhythm(2.0,26,32) :: sound("ST20").n([22,5,24,34,31,5,11,19].pick()).stretch(rI(1,6))
+.pitch(rI(127,300))
+    .edo(666)
+    .out()
+`,
+  true,
+)}
+
+
+- <ic>scale(scale: string, base note: number)</ic>: Map each element of the list to the closest note of the slected scale. [0, 2, 3, 5 ].scale("major", 50) returns [50, 52, <ic>54</ic>, 55]. You can use western scale names like (Major, Minor, Minor pentatonic ...) or [zeitler](https://ianring.com/musictheory/scales/traditions/zeitler) scale names. Alternatively you can also use the integers as used by Ian Ring in his [study of scales](https://ianring.com/musictheory/scales/).
 
 ${makeExample(
   "Mapping the note array to the E3 major scale",

src/documentation/patterns/probabilities.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../main";
+import { type Editor } from "../../main";
-import { makeExampleFactory } from "../Documentation";
+import { makeExampleFactory } from "../../Documentation";
 
 export const probabilities = (application: Editor): string => {
   const makeExample = makeExampleFactory(application);

src/documentation/patterns/variables.ts

@@ -1,5 +1,5 @@
-import { type Editor } from "../main";
+import { type Editor } from "../../main";
-import { makeExampleFactory } from "../Documentation";
+import { makeExampleFactory } from "../../Documentation";
 
 export const variables = (application: Editor): string => {
   const makeExample = makeExampleFactory(application);

src/documentation/patterns/ziffers/ziffers_algorithmic.ts

@@ -0,0 +1,85 @@
+import { type Editor } from "../../../main";
+import { makeExampleFactory } from "../../../Documentation";
+
+export const ziffers_algorithmic = (application: Editor): string => {
+  const makeExample = makeExampleFactory(application);
+  return `
+# Algorithmic operations
+
+  Ziffers provides shorthands for **many** numeric and algorithimic operations such as evaluating random numbers and creating sequences using list operations:
+  
+  * **List operations:** Cartesian operation (_e.g._ <ic>(3 2 1)+(2 5)</ic>) using the <ic>+</ic> operator. All the arithmetic operators are supported.
+  
+  ${makeExample(
+    "Element-wise operations for melodic generation",
+    `
+  z1("1/8 _ 0 (0 1 3)+(1 2) 0 (2 3 5)-(1 2)").sound('sine')
+    .scale('pentatonic').fmi([0.25,0.5].beat(2)).fmh([2,4].beat(2))
+    .room(0.9).size(0.9).sustain(0.1).delay(0.125)
+    .delayfb(0.25).out();
+  `,
+    true,
+  )}
+
+  ${makeExample(
+    "List operations",
+    `
+    z1('q (0 3 1 5)+(2 5) e (0 5 2)*(2 1) (0 5 2)%(2 3)')
+    .sound('sine')
+    .room(.5).size(1.0).adsr(.15,.15,.25,.1)
+    .scale("Bebop major")
+    .out()
+  `,
+    true,
+  )}
+  
+  * **Random numbers:** <ic>(4,6)</ic> Random number between 4 and 6
+  
+  ${makeExample(
+    "Random numbers, true computer music at last!",
+    `
+  z1("s _ (0,8) 0 0 (0,5) 0 0").sound('sine')
+    .adsr(0, .1, 0, 0).scale('minor')
+    .fmdec(0.25).fmi(2).fmh([0.5, 0.25].beat(2))
+    .room(0.9).size(0.5).sustain(0.1) .delay(0.5)
+    .delay(0.125).delayfb(0.25).out();
+  beat(.5) :: snd(['kick', 'hat'].beat(.5)).out()
+  `,
+    true,
+  )}
+  
+## Variables
+
+  * <ic>A=(0 2 3 (1,4))</ic> Assign pre-evaluated list to a variable
+  * <ic>B~(0 2 3 (1,4))</ic> Assign list with operations to a variable
+
+  ${makeExample(
+    "Assign lists to variables",
+    `
+z1("s A=(0 (1,4)) B~(2 (3,8)) A B A B A")
+  .scale("modimic")
+  .sound("triangle")
+  .adsr(0.01,0.15,0.25,0)
+  .gain(0.5)
+  .out()
+  `,
+    true,
+  )}
+
+  ${makeExample(
+    "Combine variables into lists and do operations",
+    `
+    z1("s A=(0 3) B=(3 8) C=(((A+B)+A)*B) D=(C-B) A A+C D")
+    .sound("sawtooth")
+    .ad(0.05,1.0)
+    .gain(0.5)
+    .out()    
+  `,
+    true,
+  )}
+
+
+
+
+`;
+};

src/documentation/patterns/ziffers/ziffers_basics.ts

@@ -0,0 +1,296 @@
+import { type Editor } from "../../../main";
+import { makeExampleFactory } from "../../../Documentation";
+
+export const ziffers_basics = (application: Editor): string => {
+  const makeExample = makeExampleFactory(application);
+  return `
+# Ziffers
+	
+Ziffers is a **musical number based notation** tuned for _live coding_. It is a very powerful and flexible notation for describing musical patterns in very few characters. Number based musical notation has a long history and has been used for centuries as a shorthand technique for music notation. Amiika has written [papers](https://zenodo.org/record/7841945) and other documents describing his system. It is currently implemented for many live coding platforms including [Sardine](https://sardine.raphaelforment.fr) (Raphaël Forment) and [Sonic Pi](https://sonic-pi.net/) (Sam Aaron). Ziffers can be used for:
+
+- composing melodies using using **classical music notation and concepts**.
+- exploring **generative / aleatoric / stochastic** melodies and applying them to sounds and synths.
+- embracing a different mindset and approach to time and **patterning**.
+
+${makeExample(
+  "Super Fancy Ziffers example",
+  `
+z1('1/8 024!3 035 024 0124').sound('wt_stereo')
+  .adsr(0, .4, 0.5, .4).gain(0.1)
+  .lpadsr(4, 0, .2, 0, 0)
+  .cutoff(5000 + usine(1/2) * 2000)
+  .n([1,2,4].beat(4)).out()
+z2('<1/8 1/16> __ 0 <(^) (^ ^)> (0,8)').sound('wt_stereo')
+  .adsr(0, .5, 0.5, .4).gain(0.2)
+  .lpadsr(4, 0, .2, 0, 0).n(14)
+  .cutoff(200 + usine(1/2) * 4000)
+  .n([1,2,4].beat(4)).o(2).room(0.9).out()
+let osci = 1500 + usine(1/2) * 2000;
+z3('can can:2').sound().gain(1).cutoff(osci).out()
+z4('1/4 kick kick snare kick').sound().gain(1).cutoff(osci).out()
+`,
+  true,
+)}
+
+## Notation
+
+The basic Ziffer notation is entirely written in JavaScript strings (_e.g_ <ic>"0 1 2"</ic>). It consists mostly of numbers and letters. The whitespace character is used as a separator. Instead of note names, Ziffer is using numbers to represent musical pitch and letters to represent musical durations. Alternatively, _floating point numbers_ can also be used to represent durations.
+
+| Syntax        | Symbol | Description            |
+|------------   |--------|------------------------|
+| **Pitches**   | <ic>0-9</ic> <ic>{10 11 21}</ic> | Numbers or escaped numbers in curly brackets |
+| **Duration**  | <ic>0.25</ic>, <ic>0.5</ic> | Floating point numbers can also be used as durations |
+| **Duration**  | <ic>1/4</ic>, <ic>1/16</ic> | Fractions can be used as durations |
+| **Subdivision** | <ic>[1 [2 3]]</ic> | Durations can be subdivided using square brackets |
+| **Cycles**    | <ic>1 <2 4></ic> | Cycle values within the pattern |
+| **Octave**    | <ic>^ _</ic> | <ic>^</ic> for octave up and <ic>_</ic> for octave down |
+| **Accidentals** | <ic># b</ic> | Sharp and flats, just like with regular music notation :smile: |
+| **Rest**      |  <ic>r</ic> | Rest / silences |
+| **Repeat**    | <ic>!1-9</ic> | Repeat the item 1 to 9 times  |
+| **Chords**    | <ic>[1-9]+ / [iv]+ / [AG]+name</ic> | Multiple pitches grouped together, roman numerals or named chords |
+| **Samples**   | <ic>[a-z0-9_]+</ic> | Samples can be used pitched or unpitched | 
+| **Index/Channel** | <ic>[a-z0-9]+:[0-9]*</ic> | Samples or midi channel can be changed using a colon |
+
+**Note:** Some features are experimental and some are still unsupported. For full / prior syntax see article about <a href="https://zenodo.org/record/7841945" target="_blank">Ziffers</a>.
+
+${makeExample(
+  "Pitches from 0 to 9",
+  `
+z1('0.25 0 1 2 3 4 5 6 7 8 9').sound('wt_stereo')
+  .adsr(0, .1, 0, 0).out()`,
+  true,
+)}
+
+${makeExample(
+  "Escaped pitches using curly brackets",
+  `z1('_ _ 0 {9 10 11} 4 {12 13 14}')
+  .sound('wt_05').pan(r(0,1))
+  .cutoff(usaw(1/2) * 4000)
+  .room(0.9).size(0.9).out()`,
+  false,
+)}
+
+${makeExample(
+  "Durations using fractions and floating point numbers",
+  `
+z1('1/8 0 2 4 0 2 4 1/4 0 3 5 0.25 _ 0 7 0 7')
+  .sound('square').delay(0.5).delayt(1/8)
+  .adsr(0, .1, 0, 0).delayfb(0.45).out()
+`,
+  false,
+)}
+
+${makeExample(
+  "Disco was invented thanks to Ziffers",
+  `
+z1('e _ _ 0 ^ 0 _ 0 ^ 0').sound('jvbass').out()
+beat(1)::snd('bd').out(); beat(2)::snd('sd').out()
+beat(3) :: snd('cp').room(0.5).size(0.5).orbit(2).out()
+`,
+  false,
+)}
+
+${makeExample(
+  "Accidentals and rests for nice melodies",
+  `
+z1('^ 1/8 0 1 b2 3 4 _ 4 b5 4 3 b2 1 0')
+  .scale('major').sound('triangle')
+  .cutoff(500).lpadsr(5, 0, 1/12, 0, 0)
+  .fmi(0.5).fmh(2).delay(0.5).delayt(1/3)
+  .adsr(0, .1, 0, 0).out()
+`,
+  false,
+)}
+
+${makeExample(
+  "Repeat items n-times",
+  `
+z1('1/8 _ _ 0!4 3!4 4!4 3!4')
+  .scale('major').sound('wt_oboe')
+  .shape(0.2).sustain(0.1).out()
+z2('1/8 _ 0!4 5!4 4!2 7!2')
+  .scale('major').sound('wt_oboe')
+  .shape(0.2).sustain(0.1).out()
+`,
+  false,
+)}
+
+${makeExample(
+  "Subdivided durations",
+  `
+z1('w [0 [5 [3 7]]] h [0 4]')
+  .scale('major').sound('sine')
+  .fmi(usine(.5)).fmh(2).out()
+`,
+  false,
+)}
+
+## Rests
+
+${makeExample(
+  "Rest and octaves",
+  `
+z1('q 0 ^ e0 r _ 0 _ r 4 ^4 4')
+.sound('sine').scale("godian").out()
+`,
+  true,
+)}
+
+${makeExample(
+  "Rests with durations",
+  `
+ z1('q 0 4 e^r 3 e3 0.5^r h4 1/4^r e 5 r 0.125^r 0')
+ .sound('sine').scale("aeryptian").out()
+ `,
+  true,
+)}
+
+## Chords
+
+  Chords can be build by grouping pitches or using roman numeral notation, or by using named chords.
+  
+  ${makeExample(
+    "Chords from pitches",
+    `
+  z1('1.0 024 045 058 046 014')
+    .sound('sine').adsr(0.5, 1, 0, 0)
+    .room(0.5).size(0.9)
+    .scale("minor").out()
+  `,
+  true
+  )}
+  
+  ${makeExample(
+    "Chords from roman numerals",
+    `
+  z1('2/4 i vi ii v')
+    .sound('triangle').adsr(0.2, 0.3, 0, 0)
+    .room(0.5).size(0.9).scale("major").out()
+  `,
+  true
+  )}
+  
+  ${makeExample(
+    "Named chords with repeats",
+    `
+  z1('0.25 Bmaj7!2 D7!2 _ Gmaj7!2 Bb7!2 ^ Ebmaj7!2')
+    .sound('square').room(0.5).cutoff(500)
+    .lpadsr(4, 0, .4, 0, 0).size(0.9)
+    .scale("major").out()
+  `,
+  true
+  )}
+  
+  ${makeExample(
+    "Transposing chords",
+    `
+  z1('q Amin!2').key(["A2", "E2"].beat(4))
+    .sound('sawtooth').cutoff(500)
+    .lpadsr(2, 0, .5, 0, 0, 0).out()`,
+  )}
+  
+  ${makeExample(
+    "Chord inversions with roman numerals",
+    `
+  z1('i i v%-4 v%-2 vi%-5 vi%-3 iv%-2 iv%-1')
+    .sound('triangle').adsr(1/16, 1/5, 0.1, 0)
+    .delay(0.5).delayt([1/8, 1/4].beat(4))
+    .delayfb(0.5).out()
+  beat(4) :: sound('breaks165').stretch(4).out()
+  `,
+  )}
+  
+  ${makeExample(
+    "Chord inversion with named chords",
+    `
+  z1('1/4 Cmin!3 Fmin!3 Fmin%-1 Fmin%-2 Fmin%-1')
+    .sound("sine").bpf(500 + usine(1/4) * 2000)
+    .out()
+  `,
+  )}
+  
+  ${makeExample(
+    "Programmatic inversions",
+    `
+  z1('1/6 i v 1/3 vi iv').invert([1,-1,-2,0].beat(4))
+    .sound("sawtooth").cutoff(1000)
+    .lpadsr(2, 0, .2, 0, 0).out()
+    `,
+  )}
+
+## Arpeggios
+
+Chords can be arpeggiated using the @-character within the ziffers notation or by using <ic>arpeggio</ic> method.
+
+${makeExample(
+  "Arpeggio using the mini-notation",
+  `
+  z1("(i v vi%-3 iv%-2)@(s 0 2 0 1 2 1 0 2)")
+  .sound("sine").out()
+  `,
+)}
+
+${makeExample(
+  "Arpeggio from named chords with durations",
+  `
+z1("_ Gm7 ^ C9 D7 Gm7")
+  .arpeggio("e 0 2 q 3 e 1 2")
+  .sound("sine").out()
+  `,
+)}
+
+${makeExample(
+  "Arpeggio from roman chords with inversions",
+  `
+  z1("i v%-1 vi%-1 iv%-2")
+    .arpeggio(0,2,1,2)
+    .noteLength(0.125)
+    .sound("sine").out()
+  `,
+)}
+
+## Chaining
+	
+- Basic notation
+	
+${makeExample(
+  "Simple method chaining",
+  `
+z1('0 1 2 3').key('G3')
+  .scale('minor').sound('sine').out()
+`,
+  true,
+)}
+
+${makeExample(
+  "More complex chaining",
+  `
+z1('0 1 2 3 4').key('G3').scale('minor').sound('sine').often(n => n.pitch+=3).rarely(s => s.delay(0.5)).out()
+`,
+  true,
+)}
+
+${makeExample(
+  "Alternative way for inputting options",
+  `
+z1('0 3 2 4',{key: 'D3', scale: 'minor pentatonic'}).sound('sine').out()
+`,
+  true,
+)}
+
+## String prototypes
+
+You can also use string prototypes as an alternative syntax for creating Ziffers patterns
+
+${makeExample(
+  "String prototypes",
+  `
+  "q 0 e 5 2 6 2 q 3".z0().sound('sine').out()
+  "q 2 7 8 6".z1().octave(-1).sound('sine').out()
+  "q 2 7 8 6".z2({key: "C2", scale: "aeolian"}).sound('sine').scale("minor").out()
+`,
+  true,
+)}  
+
+`;
+};

src/documentation/patterns/ziffers/ziffers_rhythm.ts

@@ -0,0 +1,157 @@
+import { type Editor } from "../../../main";
+import { makeExampleFactory } from "../../../Documentation";
+
+export const ziffers_rhythm = (application: Editor): string => {
+  const makeExample = makeExampleFactory(application);
+  return `
+# Rhythm
+
+Ziffers combines rhythmic and melodic notation into a single pattern language. This means that you can use the same pattern to describe both the rhythm and the melody of a musical phrase similarly to the way it is done in traditional music notation.
+
+${makeExample(
+  "Duration chars",
+  `
+  z1('q 0 0 4 4 5 5 h4 q 3 3 2 2 1 1 h0').sound('sine').out()
+`,
+  true,
+)}
+
+${makeExample(
+  "Fraction durations",
+  `
+  z1('1/4 0 0 4 4 5 5 2/4 4 1/4 3 3 2 2 1 1 2/4 0')
+  .sound('sine').out()
+`,
+  true,
+)}
+
+${makeExample(
+  "Decimal durations",
+  `
+z1('0.25 5 1 2 6 0.125 3 8 0.5 4 1.0 0')
+.sound('sine').scale("galian").out()
+`,
+  true,
+)}
+
+## List of all duration characters
+
+Ziffers maps the following duration characters to the corresponding note lengths.
+
+|	Character	|	Fraction | Duration |	Name (US)	|	Name (UK)	|
+| ----- | ----- | ------- | ----- |
+| m..   | 14/1  | 14.0    | Double dotted maxima | Double dotted Large
+| m.    | 12/1  | 12.0    | Dotted maxima | Dotted Large |
+|	m	    |	8/1   | 8.0	    |	Maxima	|	Large	|
+| l..   | 7/1   | 7.0     | Double dotted long note | Double dotted longa |
+| l.    | 6/1   | 6.0     | Long dotted note | Longa dotted |
+|	l	    |	4/1   | 4.0	    |	Long	|	Longa |
+| d..   | 7/2   | 3.5     | Double dotted long note | Double dotted breve |
+| d.    | 3/3   | 3.0     | Dotted whole note | Double breve |
+|	n     |	8/3   | 2.6666	|	Triplet Long	|	Triplet longa	|
+|	d	    |	2/1   | 2.0	    |	Double whole note	|	Breve	|
+| w..   | 7/4   | 1.75    | Double dotted whole note | Double dotted breve |
+| w.    | 3/2   | 1.5     | Dotted whole note | Dotted breve |
+|	k	    |	4/3   | 1.3333  |	Triplet double whole  |	Triplet breve	|
+|	w	    |	1/1   | 1.0	    |	Whole note	|	Semibreve	|
+| h..   | 7/8   | 0.875   | Double dotted half note | Double dotted minim |
+| h.    | 3/4   | 0.75    | Dotted half note | Dotted minim |
+|	c     |	2/3   | 0.6666	|	Triplet whole	|	Triplet semibreve	|
+|	h	    |	1/2   | 0.5	    |	Half note 	|	Minim	|
+|	p     |	1/3   | 0.3333	|	Triplet half	|	Triplet minim	|
+| q..   | 7/16  | 0.4375  | Double dotted quarter note | Double dotted crotchet |
+| q.    | 3/8   | 0.375   | Dotted quarter note | Dotted crotchet |
+|	q	    |	1/4   | 0.25  	|	Quarter note	|	Crotchet	|
+| e..   | 7/32  | 0.2187  | Double dotted 8th | Double dotted quaver |
+| e.    | 3/16  | 0.1875  | Dotted 8th | Dotted quaver |
+|	g     |	1/6   | 0.1666	|	Triplet quarter	|	Triplet crochet 	|
+|	e	    |	1/8   | 0.125	  |	8th note	|	Quaver	|
+| s..   | 7/64  | 0.1093  | Double dotted 16th | Double dotted semiquaver |
+|	a     |	1/12  | 0.0833	|	Triplet 8th	|	Triplet quaver	|
+| s.    | 3/32  | 0.0937  | Dotted 16th | Dotted semiquaver |
+|	s	    |	1/16  | 0.0625	|	16th note	|	Semiquaver	|
+| t..   | 7/128 | 0.0546  | Double dotted 32th | Double dotted demisemiquaver |
+| t.    | 3/64  | 0.0468  | Dotted 32th | Dotted demisemiquaver |
+|	f     |	1/24  | 0.0416	|	Triplet 16th	|	Triplet semiquaver	|
+|	t	    |	1/32  | 0.0312	|	32th note	|	Demisemiquaver	|
+| u..   | 7/256 | 0.0273  | Double dotted 64th | Double dotted hemidemisemiquaver |
+| u.    | 3/128 | 0.0234  | Dotted 64th | Dotted hemidemisemiquaver |
+|	x     |	1/48  | 0.0208	|	Triplet 32th	|	Triplet demi-semiquaver	|
+|	u	    |	1/64  | 0.0156	|	64th note	|	Hemidemisemiquaver	|
+| o..   | 7/512 | 0.0136  | Double dotted 128th note | Double dotted semihemidemisemiquaver |
+| y     |	1/96  | 0.0104	|	Triplet 64th	|	Triplet hemidemisemiquaver	|
+| o.    | 3/256 | 0.0117  | Dotted 128th note | Dotted semihemidemisemiquaver |
+|	o	    |	1/128 | 0.0078	|	128th note	|	Semihemidemisemiquaver	|
+|	j     |	1/192 | 0.0052	|	Triplet 128th | Triplet semihemidemisemiquaver	|
+|	z	    |	0/1   | 0.0	    |	No length	|	No length	|
+
+## Samples
+
+Samples can be patterned using the sample names or using <c>@</c>-operator for assigning sample to a pitch. Sample index can be changed using the <c>:</c> operator.
+
+${makeExample(
+  "Sampled drums",
+  `
+  z1('bd [hh hh]').octave(-2).sound('sine').out()
+  `,
+  true,
+)}
+
+${makeExample(
+  "More complex pattern",
+  `
+  z1('bd [hh <hh <cp cp:2>>]').octave(-2).sound('sine').out()
+  `,
+  true,
+)}
+
+${makeExample(
+  "Pitched samples",
+  `
+  z1('0@sax 3@sax 2@sax 6@sax')
+    .octave(-1).sound()
+    .adsr(0.25,0.125,0.125,0.25).out()
+  `,
+  true,
+)}
+
+${makeExample(
+  "Pitched samples from list operation",
+  `
+  z1('e (0 3 -1 4)+(-1 0 2 1)@sine')
+  .key('G4')
+  .scale('110 220 320 450')
+  .sound().out()
+  `,
+  true,
+)}
+
+${makeExample(
+  "Pitched samples with list notation",
+  `
+  z1('e (0 2 6 3 5 -2)@sax (0 2 6 3 5 -2)@arp')
+    .octave(-1).sound()
+    .adsr(0.25,0.125,0.125,0.25).out()
+  `,
+  true,
+)}
+
+${makeExample(
+  "Sample indices",
+  `
+  z1('e 1:2 4:3 6:2')
+  .octave(-1).sound("east").out()
+  `,
+  true,
+)}
+
+${makeExample(
+  "Pitched samples with sample indices",
+  `
+z1('_e 1@east:2 4@bd:3 6@arp:2 9@baa').sound().out()
+`,
+  true,
+)}
+
+`;
+};

src/documentation/patterns/ziffers/ziffers_scales.ts

@@ -0,0 +1,101 @@
+import { type Editor } from "../../../main";
+import { makeExampleFactory } from "../../../Documentation";
+
+export const ziffers_scales = (application: Editor): string => {
+  const makeExample = makeExampleFactory(application);
+  return `
+# Scales
+
+  Ziffers supports all the keys and scales. Keys can be defined by using [scientific pitch notation](https://en.wikipedia.org/wiki/Scientific_pitch_notation), for example <ic>F3</ic>. Western style (1490 scales) can be with scale names named after greek modes and extended by <a href="https://allthescales.org/intro.php" target="_blank">William Zeitler</a>. You will never really run out of scales to play with using Ziffers. Here is a short list of some possible scales that you can play with:
+  
+  | Scale name | Intervals              |
+  |------------|------------------------|
+  | Lydian     | <ic>2221221</ic> |
+  | Mixolydian | <ic>2212212</ic> |
+  | Aeolian    | <ic>2122122</ic> |
+  | Locrian    | <ic>1221222</ic> |
+  | Ionian     | <ic>2212221</ic> |
+  | Dorian     | <ic>2122212</ic> |
+  | Phrygian   | <ic>1222122</ic> |
+  | Soryllic   | <ic>11122122</ic>|
+  | Modimic    | <ic>412122</ic>  |
+  | Ionalian   | <ic>1312122</ic> |
+  | ... | And it goes on for   <a href="https://ianring.com/musictheory/scales/traditions/zeitler" target="_blank">**1490** scales (See full list here)</a>. |
+  
+  ${makeExample(
+    "What the hell is the Modimic scale?",
+    `
+  z1("s (0,8) 0 0 (0,5) 0 0").sound('sine')
+    .scale('modimic').fmi(2).fmh(2).room(0.5)
+      .size(0.5).sustain(0.1) .delay(0.5)
+      .delay(0.125).delayfb(0.25).out();
+  beat(.5) :: snd(['kick', 'hat'].beat(.5)).out()
+  `,
+    true,
+  )}
+
+  You can also use more traditional <a href="https://ianring.com/musictheory/scales/traditions/western" target="_blank">western names</a>:
+  
+  | Scale name | Intervals              |
+  |------------|------------------------|
+  | Major      | <ic>2212221</ic> |
+  | Minor      | <ic>2122122</ic> |
+  | Minor pentatonic   | <ic>32232</ic>  |
+  | Harmonic minor     | <ic>2122131</ic>|
+  | Harmonic major     | <ic>2212131</ic>|
+  | Melodic minor      | <ic>2122221</ic>|
+  | Melodic major      | <ic>2212122</ic>|
+  | Whole              | <ic>222222</ic> |
+  | Blues minor        | <ic>321132</ic> |
+  | Blues major        | <ic>211323</ic> |
+  
+  ${makeExample(
+    "Let's fall back to a classic blues minor scale",
+    `
+  z1("s (0,8) 0 0 (0,5) 0 0").sound('sine')
+    .scale('blues minor').fmi(2).fmh(2).room(0.5)
+      .size(0.5).sustain(0.25).delay(0.25)
+      .delay(0.25).delayfb(0.5).out();
+  beat(1, 1.75) :: snd(['kick', 'hat'].beat(1)).out()
+  `,
+    true,
+  )}
+  
+  Microtonal scales can be defined using <a href="https://www.huygens-fokker.org/scala/scl_format.html" target="_blank">Scala format</a> or by extended notation defined by Sevish <a href="https://sevish.com/scaleworkshop/" target="_blank">Scale workshop</a>, for example:
+  
+  - **Young:** 106. 198. 306.2 400.1 502. 604. 697.9 806.1 898.1 1004.1 1102. 1200.
+  - **Wendy carlos:** 17/16 9/8 6/5 5/4 4/3 11/8 3/2 13/8 5/3 7/4 15/8 2/1
+  
+  
+  ${makeExample(
+    "Wendy Carlos, here we go!",
+    `
+  z1("s ^ (0,8) 0 0 _ (0,5) 0 0").sound('sine')
+    .scale('17/16 9/8 6/5 5/4 4/3 11/8 3/2 13/8 5/3 7/4 15/8 2/1').fmi(2).fmh(2).room(0.5)
+      .size(0.5).sustain(0.15).delay(0.1)
+      .delay(0.25).delayfb(0.5).out();
+  beat(1, 1.75) :: snd(['kick', 'hat'].beat(1)).out()
+  `,
+    true,
+  )}
+
+${makeExample(
+  "Werckmeister scale in Scala format",
+  `
+  const werckmeister = "107.82 203.91 311.72 401.955 503.91 605.865 701.955 809.775 900. 1007.82 1103.91 1200."
+
+  z0('s (0,3) ^ 0 3 ^ 0 (3,6) 0 _ (3,5) 0 _ 3 ^ 0 (3,5) ^ 0 6 0 _ 3 0')
+    .key('C3')
+    .scale(werckmeister)
+    .sound('sine')
+    .fmi(1 + usine(0.5) * irand(1,10))
+    .cutoff(100 + usine(.5) * 100) 
+    .out()
+  
+  onbeat(1,1.5,3) :: sound('bd').cutoff(100 + usine(.25) * 1000).out()
+`,
+  true,
+)}
+
+`;
+};

src/documentation/patterns/ziffers/ziffers_syncing.ts

@@ -0,0 +1,112 @@
+import { type Editor } from "../../../main";
+import { makeExampleFactory } from "../../../Documentation";
+
+export const ziffers_syncing = (application: Editor): string => {
+  const makeExample = makeExampleFactory(application);
+  return `
+# Synchronization
+
+Ziffers patterns can be synced to any event by using **cue**, **sync**, **wait** and **listen** methods.
+
+## Sync with cue
+
+The <ic>cue(name: string)</ic> methods can be used to send cue messages for ziffers patterns. The <ic>wait(name: string)</ic> method is used to wait for the cue message to be received before starting the next cycle.
+
+${makeExample(
+"Sending cue from event and wait",
+`
+beat(4.0) :: sound("bd").cue("foo").out()
+z1("e 0 3 2 1 2 1").wait("foo").sound("sine").out()
+`,
+true,
+)}
+
+The <ic>sync(name: string)</ic> method is used to sync the ziffers pattern to the cue message. 
+
+    ${makeExample(
+        "Delayed start using individual cue",
+        `
+        register('christmas', n=>n.room(0.25).size(2).speed([0.5, 0.25, 0.125])
+            .delay(0.5).delayt(1/3).delayfb(0.5).bpf(200+usine(1/3)*500).out())
+        onbar(1) :: cue("bar")
+        onbar(2) :: cue('baz')
+        z1("<0.25 0.125> 0 4 2 -2").sync("bar").sound("ST40:25").christmas()
+        z2("<0.25 0.125> 0 6 4 -4").sync("baz").sound("ST40:25").christmas()
+        `,
+        true,
+    )}
+
+The <ic>listen(name: string)</ic> method can be used to listen for the cue messages and play one event from the pattern for every cue.
+
+    ${makeExample(
+        "Delayed start using individual cue",
+        `
+        beat(1.0) :: cue("boom")
+
+        z1("bd <hh ho>").listen("boom")
+          .sound().out()        
+        `,
+        true,
+    )}
+
+
+## Sync with beat
+
+Patterns can also be synced using beat and setting the note length of events to zero using **z** duration character or <ic>noteLength(number)</ic> method.
+
+${makeExample(
+    "Syncing with beat",
+    `
+beat(.5) :: z1("<bd sn:3> hh:5").noteLength(0)
+    .sound().out()
+  
+beat([2.0,0.5,1.5].bar(1)) :: 
+    z2("z _ 0 0 <2 1>").sound("bass:5")
+    .dur(0.5).out()
+    `,
+    true,
+)}
+
+## Automatic sync for ziffers patterns
+
+   Numbered methods **(z0-z16)** are synced automatically to **z0** method if it exsists. Syncing can also be done manually by using either the <ic>wait</ic> method, which will always wait for the current pattern to finish before starting the next cycle, or the <ic>sync</ic> method will only wait for the synced pattern to finish on the first time.
+  
+  ${makeExample(
+    "Automatic sync to z0",
+    `
+  z0('w 0 8').sound('peri').out()
+  z1('e 0 4 5 9').sound('bell').out()
+  `,
+    true,
+  )}
+
+## Syncing patterns to each other
+
+   Patterns can also be synced together using the <ic>sync(name: Function)</ic> method. This will sync the pattern to the start of the referenced pattern. Copy this example and first run z1 and then z2 at random position.
+  
+   ${makeExample(
+    "Sync on first run",
+    `
+    z1('w __ 0 5 9 3').sound('bin').out()
+    z2('q __ 4 2 e 6 3 q 6').sync(z1).sound('east').out()
+  `,
+    true,
+  )}
+
+## Sync with wait
+
+   Syncing can also be done using <ic>wait(name: Function)</ic> method. This will wait for the referenced pattern to finish before starting the next cycle.
+  
+  ${makeExample(
+    "Sync with wait",
+    `
+  z1('w 0 5').sound('pluck').release(0.1).sustain(0.25).out()
+  z2('q 6 3').wait(z1).sound('sine').release(0.16).sustain(0.55).out()
+  `,
+    true,
+  )}
+
+`;
+};
+
+

src/documentation/patterns/ziffers/ziffers_tonnetz.ts

@@ -0,0 +1,283 @@
+import { type Editor } from "../../../main";
+import { makeExampleFactory } from "../../../Documentation";
+
+export const ziffers_tonnetz = (application: Editor): string => {
+    const makeExample = makeExampleFactory(application);
+    return `
+# Tonnetz
+
+The Riemannian Tonnetz is a geometric representation of tonal relationships for applying mathematical operations to analyze harmonic and melodic relationships in tonal music. Ziffers includes an implementation of live coding tonnetz developed together with <a href="https://github.com/edelveart/TypeScriptTonnetz" target="_blank">Edgar Delgado Vega</a>. Live coding tonnetz implementation **combines 67 transformations** to **new explorative notation** that includes all of the traditional triad transformations (PLR functions), extended PLR* transformations, film music transformations and seventh transformations (PLRQ, PLRQ*, ST).
+
+Tonnetz can be visualized as an <a href="https://numeric-tonnetz-ziffers-6f7c9299bb4e1292f6891b9aceba16d81409236.gitlab.io/" target="_blank">numeric lattice</a> that represents the twelve pitch classes of the chromatic scale. The numeric visualization is a fork of <a href="https://hal.science/hal-03250334/" target="_blank">Web tonnetz</a> by Corentin Guichaou et al. (2021). The lattice can be arranged into multiple tonal pitch spaces which are all supported in Ziffers implementation.
+
+In addition, we have included common graphs and cycles in Neo-Riemmanian theory: HexaCycles (<ic>pl</ic>), OctaCycles (<ic>pr</ic>), Enneacycles (seventh chords), Weitzmann Regions (triad chords), Boretz Regions (triad chords) and OctaTowers (tetrachords). You can explore each of these graphs in great generality over different Tonnetz.
+
+## Explorative notation
+
+Ziffers implements explorative live coding notation that indexes all of the transformations for triad and seventh chords. For more detailed transformations see Triad and Tetra chapters.
+
+Transformations are applied by grouping operations into a **parameter string** which applies the **transformations** to the chord. The parameter string is a **sequence** of transformations **separated by whitespace**, for example <ic>plr rl2 p3lr</ic>. The numbers after the characters defines the **index for the operation**, as there can be multiple operations of the same type.
+
+Indexed transformations <ic>[plrfsntq][1-9]*</ic>:
+
+* p: Parallel
+* l: Leading-tone exchange
+* r: Relative
+* f: Film transformation - Far-fifth
+* n: Film transformation - Near-fifth (Nebenverdwandt) or PLRQ* transformation
+* s: Film transformation - Slide
+* h: Film transformation - Hexatonic Pole
+* t: Film transformation - Tritone transposition
+* q: PLR* transformation or PLRQ* transformation
+
+### Examples:
+
+${makeExample(
+        "Explorative transformations with roman chords",
+        `
+z1('i i7').tonnetz("p1 p2 plr2")
+  .sound('wt_stereo')
+  .adsr(0, .1, 0, 0)
+  .out()`,
+        true,
+    )}
+
+${makeExample(
+        "Arpeggiated explorative transformations",
+        `
+z1("i7")
+  .tonnetz("p l2 r3 rp4l")
+  .arpeggio("e _ 0 1 s ^ 0 2 1 3 h _ 012 s ^ 2 1")
+  .sound("sine")
+  .out()`,
+        true,
+    )}
+
+${makeExample(
+        "Arpeggios and note lengths with parameters",
+        `
+z1("024")
+  .tonnetz("p lr rp lrp")
+  .arpeggio(0,2,1,2)
+  .noteLength(1/16,1/8)
+  .sound("sine")
+  .out()`,
+        true,
+    )}
+
+## Triad transformations
+
+Triad transformations can be defined explicitly using the <ic>triadTonnetz(transformation: string, tonnetz: number[])</ic> method. This method will only apply specific transformations to triad chords.
+
+In the table below, we write the transformations types available for triads followed by the **transposition in semitones (+/-)** that we must perform to the **root of the chord**: <ic>0,4,3,7,5,1,8,6</ic>.
+
+Second, you should know that the numbers next to the names of the transformations represent the **chord types to be exchanged**: <ic>1 = major, 2 = minor, 3 = diminished, 4 = augmented</ic>.
+
+In fact, the functions <ic>p,l,r</ic> and the so-called [**film music transformations**](https://alpof.wordpress.com/2021/10/09/neo-riemannian-examples-in-music/), could have the numbers <ic>p12, l12, r12, f12 </ic> and so on, since they transform major and minor chords with their respective root transpositions. It must be clarified that the <ic>t6</ic> function is the only one among all that maintains the same type of chord.
+
+Therefore, you will see that paying attention to the examples will allow you to infer whether you should **raise or lower the root** depending on the **type of chord**.
+
+| Function |           Function type           | Root transposition |    Example    |
+| :------: | :-------------------------------: | :----------------: | :-----------: |
+|    p     |             Parallel              |         0          |   C <-> Cm    |
+|    l     |           Leading-tone            |         4          |   C <-> Em    |
+|    r     |             Relative              |         3          |   C <-> Am    |
+|    f     |        Film music: Far-fifth      |         7          |   C <-> Gm    |
+|    n     |    Film music: Near-fifth         |         5          |   C <-> Fm    |
+|    s     |         Film music: Slide         |         1          |   C <-> C#m   |
+|    h     |    Film music: Hexatonic pole     |         8          |   C <-> G#m   |
+|    t6    | Film music: Tritone Transposition |         6          |   C <-> F#    |
+|   p32    |             Parallel              |         0          |  Cdim <-> Cm  |
+|   p41    |             Parallel              |         0          |  Caug <-> C   |
+|   lt13   |           Leading-tone            |         4          |  C <-> Edim   |
+|   l41    |           Leading-tone            |         4          | Caug <-> Edim |
+|   l14    |           Leading-tone            |         4          |  C <-> Eaug   |
+|   rt23   |             Relative              |         3          |  Cm <-> Adim  |
+|   rt42   |             Relative              |         3          |  Caug <-> Am  |
+|   q13    |               PLR*                |         1          |  C <-> C#dim  |
+|   q42    |               PLR*                |         1          | Caug <-> C#m  |
+|   n42    |               PLR*                |         5          |  Caug <-> Fm  |
+
+* Remark A: We add <ic>t</ic> to <ic>l.13</ic>, <ic>r.23</ic>, <ic>r.42</ic> because we have similar syntax for sevenths transformations <ic>l13</ic>, <ic>r23</ic> and <ic>r42</ic>, although the meaning of the numbers (chord types) is different. See in the next section.
+* Remark B: For those curious about mathematics, what we have implemented at Ziffers is the group called **PLR\*** [(Cannas, 2018, pp. 93-100)](https://publication-theses.unistra.fr/public/theses_doctorat/2018/CANNAS_Sonia_2018_ED269.pdf).
+
+### Examples:
+${makeExample(
+        "Synthetic 'Morton'",
+        `
+z0('3/4 0 _ q 6 h 4 3 w 2 0 3/4 ^^ 0 _q 6 h 4 3 3/4 2 5/4 0 w r')
+  .scale("minor").sound('sawtooth').key("A")
+  .room(0.9).size(9).phaser(0.25).phaserDepth(0.8)
+  .vib(4).vibmod(0.15).out()
+
+z1('w 904')
+  .scale("chromatic")
+  .tonnetz('o f l l o f l l o')
+  .sound('sine').adsr(0.1, 1, 1, 1.9).out()
+
+z2('w 904')
+  .scale("chromatic")
+  .tonnetz('o f l l o f l l o')
+  .arpeggio('s 0 2 1 0 1 2 1 0 2 1 0 1 2 0 1 0')
+  .sound('sine').pan(rand(1, 0)).adsr(0, 0.125, 0.15, 0.25).out()
+
+z3('e __ 4 s 0 e 1 2 s')
+  .sound('hat').delay(0.5).delayfb(0.35).out()`,
+    )}
+
+## Different Tonnetz
+
+At Ziffers we have strived to have fun and inspire you by exploring new sounds that Neo-Riemannian functions can offer you by changing only one parameter: The Tonnetz in which your chords move. By default, the Tonnetz has this form: <ic>[3, 4, 5]</ic>. Let's try an example as it will clarify this idea for us.
+
+The <ic>Cm</ic> chord has the tone classes: <ic>037</ic>. Notice that the distance between the third of the chord and the root of the chord is <ic>3</ic> <ic>(3-0)</ic>. In turn, the distance of the fifth from the third is <ic>4</ic> semitones <ic>(7-3)</ic>. Finally, the distance left to get from the fifth to the root is <ic>5</ic> <ic>(7+5=0)</ic>. These distances are known as **intervalic structure**. In this regard, the array <ic>[x = 3, y = 4, z = 5]</ic> of a Tonnetz tells us the intervallic structure of the chords to which we apply the Neo-Riemannian functions.
+
+:warning: To have a geometric intuition of the chords that we are going to describe, we suggest you see the <a href="https://numeric-tonnetz-ziffers-6f7c9299bb4e1292f6891b9aceba16d81409236.gitlab.io/" target="_blank">numerical Tonnetz.</a>
+
+In the next three Tonnetz we consider that we go from a minor chord to a major one by inversion (we change <ic>x</ic> and <ic>y</ic>).
+
+* For the Tonnetz <ic>[3, 4, 5]</ic> we have minor chords <ic>037</ic> and major chords <ic>047</ic>
+* For a Tonnetz <ic>[2, 3, 7]</ic> we have the "minor" chords <ic>025</ic> and the "major" chords <ic>035</ic>
+* For a Tonnetz <ic>[1, 4, 7]</ic> we have the "minor" chords <ic>015</ic> and the "major" chords <ic>045</ic>
+
+Are those all the Tonnetz? In fact, there are <ic>12</ic> spaces that comply with symmetries by **transposition and inversion**:
+
+   <ic>[3, 4, 5], [1, 1, 10], [1, 2, 9], [1, 3, 8], [1, 4, 7], [1, 5, 6], [ 2, 3, 7], [ 2, 5, 5]</ic>
+
+   <ic>[2, 4, 6], [2, 2, 8], [3, 3, 6], [4, 4, 4]</ic>
+
+What do augmented chords or seventh chords sound like on a Tonnetz <ic>[1,5,6]</ic>? It is up to you to **explore all the transformations in different spaces**.
+
+What if I want to place another type of Tonnetz that is not on the list? No problem, everyone is invited to the party.
+
+* Remark C: If you want to know more about the topology and mathematics behind Tonnetz, you can refer to [Bigo (2013)](https://theses.hal.science/tel-01326827).
+
+## Tetra transformations
+
+Did you want to experiment with more functions? At Ziffers we have brought you Neo-Riemannian functions for seventh chords. The possibilities of sound exploration increase considerably, even more so if you **include different Tonnetz**.
+
+Tetra transformations can be applied to seventh chords using the <ic>tetraTonnetz(transformation: string, tonnetz: number[])</ic> method. This method will apply specific transformations to certain type of chords. If the **chord is not the correct type**, the **transformation will not be applied**.
+
+:warning: If you are here without having read the **triad chords transformations section**, we highly suggest you skip to it. The ideas and notation shown in this section are nothing more than an extension of what was developed above.
+
+First, here we will deal with **9 interchangeable chord types** to which we will assign a number:
+
+<ic>1 = 7, 2 = m7, 3 = hdim7, 4 = maj7, 5 = dim7, 6 = minMaj7, 7 = maj7#5, 8 = 7#5, 9 = 7b5</ic>.
+
+Second, the **transpositions** that carry out the functions <ic>p = 0, l = 4, r = 3, q = 1, n = 5</ic>, raise or lower the **root of the chord** in semitones in equal measure. However, there are two new types of functions whose transpositions are the following: <ic>rr = 6</ic> and <ic>qq = 2</ic>.
+
+You are ready, these have been all the requirements. Now a couple of examples will be enough for you to know how these functions operate.
+
+* The <ic>p14</ic> function **does not move the root (0 semitones)** and changes a dominant 7th chord to a major 7th chord. For example: <ic>C7 <-> Cmaj7</ic>.
+* The <ic>rr39</ic> function **moves the root 6 semitones** and swaps an hdim7 chord for a 7b5 chord. For example: <ic>Cm7b5 <-> F#7b5</ic>.
+
+So that you can incorporate this new musical machinery into your game, all the possible transformations according to the type of seventh chord are listed below. You already know what each one will do.
+
+* Remark D: For those curious about the mathematics behind it, we have implemented a group called **PLRQ** and another group called **PLRQ\*** extended [(Cannas, 2018, pp. 71-92)](https://publication-theses.unistra.fr/public/theses_doctorat/2018/CANNAS_Sonia_2018_ED269.pdf).
+
+| Chord type |    P functions     |  L functions  |          R functions           | Q functions | N functions |
+| :--------: | :----------------: | :-----------: | :----------------------------: | :---------: | :---------: |
+|     7      | p12, p14, p18, p19 | l13, l15, l71 |           r12, rr19            |  q15, qq51  |     n51     |
+|     m7     |   p12, p23, p26    |      l42      |         r12, r23, r42          |     q62     |             |
+|   hdim7    |   p23, p35, p39    |      l13      | r23, r35, r53, r63, rr35, rr39 |  q43, qq38  |             |
+|    maj7    |   p14, p47, p64    |      l42      |              r42               |     q43     |             |
+|    dim7    |        p35         |      l15      |            r35, r53            |  q15, qq51  |     n51     |
+|  minMaj7   |      p26, p64      |               |         r63, r76, r86          |  q62, q76   |             |
+|   maj7#5   |      p47, p87      |      l71      |              r76               |     q76     |             |
+|   dom7#5   |   p18, p87, p98    |      l89      |           r86, rr98            | qq38, qq98  |             |
+|   dom7b5   |   p19, p39, p98    |      l89      |        rr19, rr39, rr98        |    qq98     |             |
+
+### Examples
+
+${makeExample(
+        "Transform seventh chord from chromatic scale",
+        `
+z1("1.0 047{10}")
+  .scale('chromatic')
+  .tetraTonnetz("o p18 q15 l13 n51 p19 q15")
+  .sound("sawtooth")
+  .cutoff(500 + usine(1/8) * 2000)
+  .adsr(.5,0.05,0.25,0.5)
+  .dur(2.0)
+  .out()`,
+        true,
+    )}
+
+## Cyclic methods
+
+In addition to the transformations, Ziffers implements cyclic methods that can be used to cycle through the tonnetz space. Cyclic methods turns individual pitch classes to chords using the tonnetz. The cyclic methods are:
+
+* <ic>hexaCycle(tonnetz: number[], repeats: number = 3)</ic>: Cycles through chords in the hexa cycle
+* <ic>octaCycle(tonnetz: number[], repeats: number = 4)</ic>: Cycles through chords in the octa cycle
+* <ic>enneaCycle(tonnetz: number[], repeats: number = 3)</ic>: Cycles through chords in the ennea cycle
+
+HexaCycles  are sequences of major and minor triads generated by the <ic>p</ic> and <ic>l</ic> transformations . Let's take the following example starting with a <ic>C</ic> chord: <ic>C -> Cm -> Ab -> Abm -> E -> Em</ic>. You can start on the chord of your choice.
+
+OctaCycles  are sequences of major and minor triads generated using <ic>p</ic> and <ic>r</ic> transformations. Starting at <ic>C</ic>, we have the following sequence: <ic>C -> Cm -> Eb -> Ebm -> F# -> F#m -> A -> Am</ic>.
+
+Unlike HexaCycles and OctaCycles, EnneaCycles  are four-note chord sequences. Considering the functions implemented for tetrachords in Ziffers, we can interpret these sequences as generated by <ic>p12, p23, and l13</ic> transformations repeatedly: <ic>C7 -> Cm7 -> Cm7b5 -> Ab7 -> Abm7 -> Abm7b5 -> E7 -> Em7 -> Em7b5</ic>.
+
+### Examples:
+
+${makeExample(
+        "Arpeggio with ennea cycle",
+        `
+z1("0 2 -1 3")
+  .enneaCycle()
+  .arpeggio(0,2,1)
+  .scale("modimic")
+  .noteLength(0.15,0.05,0.05,0.25)
+  .sound("sine")
+  .adsr(0.1,0.15,0.25,0.1)
+  .out()`,
+        true,
+    )}
+
+${makeExample(
+        "Variating arpeggios",
+        `
+z1("s 0 3 2 1")
+  .octaCycle()
+  .arpeggio([0,[0,2],[1,0],[0,1,2]].beat(0.15))
+  .sound("triangle")
+  .adsr(0.1,0.1,0.13,0.15)
+  .out()`,
+        true,
+    )}
+
+## Cycles with vitamins and repetitions
+
+Finally, cyclic methods in Ziffers can also be vitaminized with doses of different Tonnetz. However, this opens the way to different behavior with cycles.
+
+We have the Tonnetz <ic>[2, 3, 7]</ic>, so <ic>hexaCycle([2, 3, 7])</ic>. The generated chords we hear are:
+
+<ic>035 -> 025 -> 902 -> 9{11}2 -> 69{11} -> 68{11} </ic>
+
+Apparently, everything operates as we expect: six chords and we return to the first. However, here comes the unexpected and perhaps somewhat obscure question:
+
+* If we look at the graphs of the [numeric Tonnetz](https://numeric-tonnetz-ziffers-6f7c9299bb4e1292f6891b9aceba16d81409236.gitlab.io/), our hexaCycle over <ic>[2, 3, 7]</ic> which starts with the chord <ic>035</ic> goes through all the intermediate chords generated by <ic>p</ic> and <ic>l</ic> functions until reaching <ic>035</ic> again?
+
+As you can verify it manually, you will see that this is not the case. Upon reaching the <ic>68{11} </ic> chord, the cycle makes a jump of two chords (<ic>368 358</ic>) towards the <ic>035</ic> chord. This does not happen with the cycles in the Tonnetz <ic>[3, 4, 5]</ic>, since all the intermediate chords are played there.
+
+To play the chords without jumps in our hexaCycle (although the prefix "hexa" would no longer have a precise meaning), we add a number of repetitions.
+
+${makeExample(
+        "HexaCycles with vitamins",
+        `
+z1("0")
+  .scale("chromatic")
+  .hexaCycle([2,3,7],4)
+  .sound("sine").out()
+`,
+        true
+    )}
+
+By default hexaCycles and enneaCycles have <ic>3</ic> repetitions, while octaCycles has <ic>4</ic> repetitions. We have specified a **chromatic scale** although this is the **default scale**. Try changing the **repeats and scales** when playing with different Tonnetz.
+
+* Remark E: These cycles in Tonnetz <ic>[3, 4, 5]</ic> are implemented based on the work of [Douthett & Steinbach (1998, pp. 245-247)](https://www.jstor.org/stable/843877)
+
+## :construction: Regions and OctaTowers
+
+ TBD: Implement and write about Weitzmann Regions, Boretz Regions, OctaTowers
+
+`;
+};

src/documentation/ziffers.ts

@@ -1,554 +0,0 @@
-import { type Editor } from "../main";
-import { makeExampleFactory } from "../Documentation";
-
-export const ziffers = (application: Editor): string => {
-  const makeExample = makeExampleFactory(application);
-  return `
-# Ziffers
-	
-Ziffers is a **musical number based notation** tuned for _live coding_. It is a very powerful and flexible notation for describing musical patterns in very few characters. Number based musical notation has a long history and has been used for centuries as a shorthand technique for music notation. Amiika has written [papers](https://zenodo.org/record/7841945) and other documents describing his system. It is currently implemented for many live coding platforms including [Sardine](https://sardine.raphaelforment.fr) (Raphaël Forment) and [Sonic Pi](https://sonic-pi.net/) (Sam Aaron). Ziffers can be used for:
-
-- composing melodies using using **classical music notation and concepts**.
-- exploring **generative / aleatoric / stochastic** melodies and applying them to sounds and synths.
-- embracing a different mindset and approach to time and **patterning**.
-
-${makeExample(
-  "Super Fancy Ziffers example",
-  `
-z1('1/8 024!3 035 024 0124').sound('wt_stereo')
-  .adsr(0, .4, 0.5, .4).gain(0.1)
-  .lpadsr(4, 0, .2, 0, 0)
-  .cutoff(5000 + usine(1/2) * 2000)
-  .n([1,2,4].beat(4)).out()
-z2('<1/8 1/16> __ 0 <(^) (^ ^)> (0,8)').sound('wt_stereo')
-  .adsr(0, .5, 0.5, .4).gain(0.2)
-  .lpadsr(4, 0, .2, 0, 0).n(14)
-  .cutoff(200 + usine(1/2) * 4000)
-  .n([1,2,4].beat(4)).o(2).room(0.9).out()
-let osci = 1500 + usine(1/2) * 2000;
-z3('can can:2').sound().gain(1).cutoff(osci).out()
-z4('1/4 kick kick snare kick').sound().gain(1).cutoff(osci).out()
-`,
-  true,
-)}
-
-## Notation
-
-The basic Ziffer notation is entirely written in JavaScript strings (_e.g_ <ic>"0 1 2"</ic>). It consists mostly of numbers and letters. The whitespace character is used as a separator. Instead of note names, Ziffer is using numbers to represent musical pitch and letters to represent musical durations. Alternatively, _floating point numbers_ can also be used to represent durations.
-
-| Syntax        | Symbol | Description            |
-|------------   |--------|------------------------|
-| **Pitches**   | <ic>0-9</ic> <ic>{10 11 21}</ic> | Numbers or escaped numbers in curly brackets |
-| **Duration**  | <ic>0.25</ic>, <ic>0.5</ic> | Floating point numbers can also be used as durations |
-| **Duration**  | <ic>1/4</ic>, <ic>1/16</ic> | Fractions can be used as durations |
-| **Subdivision** | <ic>[1 [2 3]]</ic> | Durations can be subdivided using square brackets |
-| **Octave**    | <ic>^ _</ic> | <ic>^</ic> for octave up and <ic>_</ic> for octave down |
-| **Accidentals** | <ic># b</ic> | Sharp and flats, just like with regular music notation :smile: |
-| **Rest**      |  <ic>r</ic> | Rest / silences |
-| **Repeat**    | <ic>!1-9</ic> | Repeat the item 1 to 9 times  |
-| **Chords**    | <ic>[1-9]+ / [iv]+ / [AG]+name</ic> | Multiple pitches grouped together, roman numerals or named chords |
-| **Samples**   | <ic>[a-z0-9_]+</ic> | Samples can be used pitched or unpitched | 
-| **Index/Channel** | <ic>[a-z0-9]+:[0-9]*</ic> | Samples or midi channel can be changed using a colon |
-
-**Note:** Some features are experimental and some are still unsupported. For full / prior syntax see article about <a href="https://zenodo.org/record/7841945" target="_blank">Ziffers</a>.
-
-${makeExample(
-  "Pitches from 0 to 9",
-  `
-z1('0.25 0 1 2 3 4 5 6 7 8 9').sound('wt_stereo')
-  .adsr(0, .1, 0, 0).out()`,
-  true,
-)}
-
-${makeExample(
-  "Escaped pitches using curly brackets",
-  `z1('_ _ 0 {9 10 11} 4 {12 13 14}')
-  .sound('wt_05').pan(r(0,1))
-  .cutoff(usaw(1/2) * 4000)
-  .room(0.9).size(0.9).out()`,
-  false,
-)}
-
-${makeExample(
-  "Durations using fractions and floating point numbers",
-  `
-z1('1/8 0 2 4 0 2 4 1/4 0 3 5 0.25 _ 0 7 0 7')
-  .sound('square').delay(0.5).delayt(1/8)
-  .adsr(0, .1, 0, 0).delayfb(0.45).out()
-`,
-  false,
-)}
-
-${makeExample(
-  "Disco was invented thanks to Ziffers",
-  `
-z1('e _ _ 0 ^ 0 _ 0 ^ 0').sound('jvbass').out()
-beat(1)::snd('bd').out(); beat(2)::snd('sd').out()
-beat(3) :: snd('cp').room(0.5).size(0.5).orbit(2).out()
-`,
-  false,
-)}
-
-${makeExample(
-  "Accidentals and rests for nice melodies",
-  `
-z1('^ 1/8 0 1 b2 3 4 _ 4 b5 4 3 b2 1 0')
-  .scale('major').sound('triangle')
-  .cutoff(500).lpadsr(5, 0, 1/12, 0, 0)
-  .fmi(0.5).fmh(2).delay(0.5).delayt(1/3)
-  .adsr(0, .1, 0, 0).out()
-`,
-  false,
-)}
-
-${makeExample(
-  "Repeat items n-times",
-  `
-z1('1/8 _ _ 0!4 3!4 4!4 3!4')
-  .scale('major').sound('wt_oboe')
-  .shape(0.2).sustain(0.1).out()
-z2('1/8 _ 0!4 5!4 4!2 7!2')
-  .scale('major').sound('wt_oboe')
-  .shape(0.2).sustain(0.1).out()
-`,
-  false,
-)}
-
-${makeExample(
-  "Subdivided durations",
-  `
-z1('w [0 [5 [3 7]]] h [0 4]')
-  .scale('major').sound('sine')
-  .fmi(usine(.5)).fmh(2).out()
-`,
-  false,
-)}
-
-## Chords
-
-Chords can be build by grouping pitches or using roman numeral notation, or by using named chords.
-
-${makeExample(
-  "Chords from pitches",
-  `
-z1('1.0 024 045 058 046 014')
-  .sound('sine').adsr(0.5, 1, 0, 0)
-  .room(0.5).size(0.9)
-  .scale("minor").out()
-`,
-)}
-
-${makeExample(
-  "Chords from roman numerals",
-  `
-z1('2/4 i vi ii v')
-  .sound('triangle').adsr(0.2, 0.3, 0, 0)
-  .room(0.5).size(0.9).scale("major").out()
-`,
-)}
-
-${makeExample(
-  "Named chords with repeats",
-  `
-z1('0.25 Bmaj7!2 D7!2 _ Gmaj7!2 Bb7!2 ^ Ebmaj7!2')
-  .sound('square').room(0.5).cutoff(500)
-  .lpadsr(4, 0, .4, 0, 0).size(0.9)
-  .scale("major").out()
-`,
-)}
-
-${makeExample(
-  "Transposing chords",
-  `
-z1('q Amin!2').key(["A2", "E2"].beat(4))
-  .sound('sawtooth').cutoff(500)
-  .lpadsr(2, 0, .5, 0, 0, 0).out()`,
-)}
-
-${makeExample(
-  "Chord transposition with roman numerals",
-  `
-z1('i i v%-4 v%-2 vi%-5 vi%-3 iv%-2 iv%-1')
-  .sound('triangle').adsr(1/16, 1/5, 0.1, 0)
-  .delay(0.5).delayt([1/8, 1/4].beat(4))
-  .delayfb(0.5).out()
-beat(4) :: sound('breaks165').stretch(4).out()
-`,
-)}
-
-${makeExample(
-  "Chord transposition with named chords",
-  `
-z1('1/4 Cmin!3 Fmin!3 Fmin%-1 Fmin%-2 Fmin%-1')
-  .sound("sine").bpf(500 + usine(1/4) * 2000)
-  .out()
-`,
-)}
-
-${makeExample(
-  "Programmatic inversions",
-  `
-z1('1/6 i v 1/3 vi iv').invert([1,-1,-2,0].beat(4))
-  .sound("sawtooth").cutoff(1000)
-  .lpadsr(2, 0, .2, 0, 0).out()
-  `,
-)}
-
-## Algorithmic operations
-
-Ziffers provides shorthands for **many** numeric and algorithimic operations such as evaluating random numbers and creating sequences using list operations:
-
-* **List operations:** Cartesian operation (_e.g._ <ic>(3 2 1)+(2 5)</ic>) using the <ic>+</ic> operator. All the arithmetic operators are supported.
-
-${makeExample(
-  "Element-wise operations for melodic generation",
-  `
-z1("1/8 _ 0 (0 1 3)+(1 2) 0 (2 3 5)-(1 2)").sound('sine')
-  .scale('pentatonic').fmi([0.25,0.5].beat(2)).fmh([2,4].beat(2))
-  .room(0.9).size(0.9).sustain(0.1).delay(0.5).delay(0.125)
-  .delayfb(0.25).out();
-`,
-  true,
-)}
-
-* **Random numbers:** <ic>(4,6)</ic> Random number between 4 and 6
-
-${makeExample(
-  "Random numbers, true computer music at last!",
-  `
-z1("s _ (0,8) 0 0 (0,5) 0 0").sound('sine')
-  .adsr(0, .1, 0, 0).scale('minor')
-  .fmdec(0.25).fmi(2).fmh([0.5, 0.25].beat(2))
-  .room(0.9).size(0.5).sustain(0.1) .delay(0.5)
-  .delay(0.125).delayfb(0.25).out();
-beat(.5) :: snd(['kick', 'hat'].beat(.5)).out()
-`,
-  true,
-)}
-
-## Keys and scales
-
-Ziffers supports all the keys and scales. Keys can be defined by using [scientific pitch notation](https://en.wikipedia.org/wiki/Scientific_pitch_notation), for example <ic>F3</ic>. Western style (1490 scales) can be with scale names named after greek modes and extended by [William Zeitler](https://ianring.com/musictheory/scales/traditions/zeitler). You will never really run out of scales to play with using Ziffers. Here is a short list of some possible scales that you can play with:
-
-| Scale name | Intervals              |
-|------------|------------------------|
-| Lydian     | <ic>2221221</ic> |
-| Mixolydian | <ic>2212212</ic> |
-| Aeolian    | <ic>2122122</ic> |
-| Locrian    | <ic>1221222</ic> |
-| Ionian     | <ic>2212221</ic> |
-| Dorian     | <ic>2122212</ic> |
-| Phrygian   | <ic>1222122</ic> |
-| Soryllic   | <ic>11122122</ic>|
-| Modimic    | <ic>412122</ic>  |
-| Ionalian   | <ic>1312122</ic> |
-| ... | And it goes on for **1490** scales |
-
-${makeExample(
-  "What the hell is the Modimic scale?",
-  `
-z1("s (0,8) 0 0 (0,5) 0 0").sound('sine')
-  .scale('modimic').fmi(2).fmh(2).room(0.5)
-	.size(0.5).sustain(0.1) .delay(0.5)
-	.delay(0.125).delayfb(0.25).out();
-beat(.5) :: snd(['kick', 'hat'].beat(.5)).out()
-`,
-  true,
-)}
-
-
-
-<ic></ic>
-
-You can also use more traditional <a href="https://ianring.com/musictheory/scales/traditions/western" target="_blank">western names</a>:
-
-
-| Scale name | Intervals              |
-|------------|------------------------|
-| Major      | <ic>2212221</ic> |
-| Minor      | <ic>2122122</ic> |
-| Minor pentatonic   | <ic>32232</ic>  |
-| Harmonic minor     | <ic>2122131</ic>|
-| Harmonic major     | <ic>2212131</ic>|
-| Melodic minor      | <ic>2122221</ic>|
-| Melodic major      | <ic>2212122</ic>|
-| Whole              | <ic>222222</ic> |
-| Blues minor        | <ic>321132</ic> |
-| Blues major        | <ic>211323</ic> |
-
-
-${makeExample(
-  "Let's fall back to a classic blues minor scale",
-  `
-z1("s (0,8) 0 0 (0,5) 0 0").sound('sine')
-  .scale('blues minor').fmi(2).fmh(2).room(0.5)
-	.size(0.5).sustain(0.25).delay(0.25)
-	.delay(0.25).delayfb(0.5).out();
-beat(1, 1.75) :: snd(['kick', 'hat'].beat(1)).out()
-`,
-  true,
-)}
-
-Microtonal scales can be defined using <a href="https://www.huygens-fokker.org/scala/scl_format.html" target="_blank">Scala format</a> or by extended notation defined by Sevish <a href="https://sevish.com/scaleworkshop/" target="_blank">Scale workshop</a>, for example:
-
-- **Young:** 106. 198. 306.2 400.1 502. 604. 697.9 806.1 898.1 1004.1 1102. 1200.
-- **Wendy carlos:** 17/16 9/8 6/5 5/4 4/3 11/8 3/2 13/8 5/3 7/4 15/8 2/1
-
-
-${makeExample(
-  "Wendy Carlos, here we go!",
-  `
-z1("s ^ (0,8) 0 0 _ (0,5) 0 0").sound('sine')
-  .scale('17/16 9/8 6/5 5/4 4/3 11/8 3/2 13/8 5/3 7/4 15/8 2/1').fmi(2).fmh(2).room(0.5)
-	.size(0.5).sustain(0.15).delay(0.1)
-	.delay(0.25).delayfb(0.5).out();
-beat(1, 1.75) :: snd(['kick', 'hat'].beat(1)).out()
-`,
-  true,
-)}
-
-## Synchronization
-
-Ziffers numbered methods **(z0-z16)** can be used to parse and play patterns. Each method is individually cached and can be used to play multiple patterns simultaneously. By default, each Ziffers expression can have a different duration. This system is thus necessary to make everything fit together in a loop-based environment like Topos.
-
-Numbered methods are synced automatically to **z0** method if it exsists. Syncing can also be done manually by using either the <ic>wait</ic> method, which will always wait for the current pattern to finish before starting the next cycle, or the <ic>sync</ic> method will only wait for the synced pattern to finish on the first time.
-
-${makeExample(
-  "Automatic sync to z0",
-  `
-z0('w 0 8').sound('peri').out()
-z1('e 0 4 5 9').sound('bell').out()
-`,
-  true,
-)}
-
-${makeExample(
-  "Sync with wait",
-  `
-z1('w 0 5').sound('pluck').release(0.1).sustain(0.25).out()
-z2('q 6 3').wait(z1).sound('sine').release(0.16).sustain(0.55).out()
-`,
-  true,
-)}
-
-${makeExample(
-  "Sync on first run",
-  `
-  z1('w __ 0 5 9 3').sound('bin').out()
-  z2('q __ 4 2 e 6 3 q 6').sync(z1).sound('east').out()
-`,
-  true,
-)}
-
-## Examples
-	
-- Basic notation
-	
-${makeExample(
-  "Simple method chaining",
-  `
-z1('0 1 2 3').key('G3')
-  .scale('minor').sound('sine').out()
-`,
-  true,
-)}
-
-${makeExample(
-  "More complex chaining",
-  `
-z1('0 1 2 3 4').key('G3').scale('minor').sound('sine').often(n => n.pitch+=3).rarely(s => s.delay(0.5)).out()
-`,
-  true,
-)}
-
-${makeExample(
-  "Simple options",
-  `
-z1('0 3 2 4',{key: 'D3', scale: 'minor pentatonic'}).sound('sine').out()
-`,
-  true,
-)}
-
-${makeExample(
-  "Duration chars",
-  `
-  z1('q 0 0 4 4 5 5 h4 q 3 3 2 2 1 1 h0').sound('sine').out()
-`,
-  true,
-)}
-
-${makeExample(
-  "Fraction durations",
-  `
-  z1('1/4 0 0 4 4 5 5 2/4 4 1/4 3 3 2 2 1 1 2/4 0')
-  .sound('sine').out()
-`,
-  true,
-)}
-
-${makeExample(
-  "Decimal durations",
-  `
-z1('0.25 5 1 2 6 0.125 3 8 0.5 4 1.0 0')
-.sound('sine').scale("galian").out()
-`,
-  true,
-)}
-
-${makeExample(
-  "Rest and octaves",
-  `
-z1('q 0 ^ e0 r _ 0 _ r 4 ^4 4')
-.sound('sine').scale("godian").out()
-`,
-  true,
-)}
-
-${makeExample(
-  "Rests with durations",
-  `
- z1('q 0 4 e^r 3 e3 0.5^r h4 1/4^r e 5 r 0.125^r 0')
- .sound('sine').scale("aeryptian").out()
- `,
-  true,
-)}
-
-- Scales
-
-${makeExample(
-  "Microtonal scales",
-  `
-z1('q 0 3 {10 14} e 8 4 {5 10 12 14 7 0}').sound('sine')
-.fmi([1,2,4,8].pick())
-.scale("17/16 9/8 6/5 5/4 4/3 11/8 3/2 13/8 5/3 7/4 15/8 2/1")
-.out()
-`,
-  true,
-)}
-
-${makeExample(
-  "Scala scale from variable",
-  `
-  const werckmeister = "107.82 203.91 311.72 401.955 503.91 605.865 701.955 809.775 900. 1007.82 1103.91 1200."
-
-  z0('s (0,3) ^ 0 3 ^ 0 (3,6) 0 _ (3,5) 0 _ 3 ^ 0 (3,5) ^ 0 6 0 _ 3 0')
-    .key('C3')
-    .scale(werckmeister)
-    .sound('sine')
-    .fmi(1 + usine(0.5) * irand(1,10))
-    .cutoff(100 + usine(.5) * 100) 
-    .out()
-  
-  onbeat(1,1.5,3) :: sound('bd').cutoff(100 + usine(.25) * 1000).out()
-`,
-  true,
-)}
-
-- Algorithmic operations
-
-${makeExample(
-  "Random numbers",
-  `
-z1('q 0 (2,4) 4 (5,9)').sound('sine')
-.scale("Bebop minor")
-.out()
-`,
-  true,
-)}
-
-${makeExample(
-  "List operations",
-  `
-z1('q (0 3 1 5)+(2 5) e (0 5 2)*(2 3) (0 5 2)>>(2 3) (0 5 2)%(2 3)').sound('sine')
-.scale("Bebop major")
-.out()
-`,
-  true,
-)}
-
-## Samples
-
-Samples can be patterned using the sample names or using <c>@</c>-operator for assigning sample to a pitch. Sample index can be changed using the <c>:</c> operator.
-
-${makeExample(
-  "Sampled drums",
-  `
-  z1('bd [hh hh]').octave(-2).sound('sine').out()
-  `,
-  true,
-)}
-
-${makeExample(
-  "More complex pattern",
-  `
-  z1('bd [hh <hh <cp cp:2>>]').octave(-2).sound('sine').out()
-  `,
-  true,
-)}
-
-${makeExample(
-  "Pitched samples",
-  `
-  z1('0@sax 3@sax 2@sax 6@sax')
-    .octave(-1).sound()
-    .adsr(0.25,0.125,0.125,0.25).out()
-  `,
-  true,
-)}
-
-${makeExample(
-  "Pitched samples from list operation",
-  `
-  z1('e (0 3 -1 4)+(-1 0 2 1)@sine')
-  .key('G4')
-  .scale('110 220 320 450')
-  .sound().out()
-  `,
-  true,
-)}
-
-${makeExample(
-  "Pitched samples with list notation",
-  `
-  z1('e (0 2 6 3 5 -2)@sax (0 2 6 3 5 -2)@arp')
-    .octave(-1).sound()
-    .adsr(0.25,0.125,0.125,0.25).out()
-  `,
-  true,
-)}
-
-${makeExample(
-  "Sample indices",
-  `
-  z1('e 1:2 4:3 6:2')
-  .octave(-1).sound("east").out()
-  `,
-  true,
-)}
-
-${makeExample(
-  "Pitched samples with sample indices",
-  `
-z1('_e 1@east:2 4@bd:3 6@arp:2 9@baa').sound().out()
-`,
-  true,
-)}
-
-
-
-## String prototypes
-
-You can also use string prototypes as an alternative syntax for creating Ziffers patterns
-
-${makeExample(
-  "String prototypes",
-  `
-  "q 0 e 5 2 6 2 q 3".z0().sound('sine').out()
-  "q 2 7 8 6".z1().octave(-1).sound('sine').out()
-  "q 2 7 8 6".z2({key: "C2", scale: "aeolian"}).sound('sine').scale("minor").out()
-`,
-  true,
-)}  
-
-`;
-};

src/main.ts

@@ -4,6 +4,8 @@ import { scriptBlinkers } from "./Visuals/Blinkers";
 import { javascript } from "@codemirror/lang-javascript";
 import { markdown } from "@codemirror/lang-markdown";
 import { Extension } from "@codemirror/state";
+import { outputSocket } from "./IO/OSC";
+import { getCodeMirrorTheme } from "./EditorSetup";
 import {
   initializeSelectedUniverse,
   AppSettings,
@@ -31,6 +33,7 @@ import { installWindowBehaviors } from "./WindowBehavior";
 import { makeNumberExtensions } from "./extensions/NumberExtensions";
 // @ts-ignore
 import { registerSW } from "virtual:pwa-register";
+import colors from "./colors.json";
 
 if ("serviceWorker" in navigator) {
   registerSW();
@@ -50,6 +53,7 @@ export class Editor {
   hidden_interface: boolean = false;
   fontSize!: Compartment;
   withLineNumbers!: Compartment;
+  themeCompartment!: Compartment;
   vimModeCompartment!: Compartment;
   hoveringCompartment!: Compartment;
   completionsCompartment!: Compartment;
@@ -67,6 +71,7 @@ export class Editor {
   public _mouseX: number = 0;
   public _mouseY: number = 0;
   show_error: boolean = false;
+  currentThemeName: string = "Everblush";
   buttonElements: Record<string, HTMLButtonElement[]> = {};
   interface: ElementMap = {};
   blinkTimeouts: Record<number, number> = {};
@@ -93,6 +98,9 @@ export class Editor {
   manualPlay: boolean = false;
   isPlaying: boolean = false;
 
+  // OSC
+  outputSocket: WebSocket = outputSocket;
+
   // Hydra
   public hydra_backend: any;
   public hydra: any;
@@ -119,6 +127,7 @@ export class Editor {
     this.initializeButtonGroups();
     this.setCanvas(this.interface.feedback as HTMLCanvasElement);
     this.setCanvas(this.interface.scope as HTMLCanvasElement);
+    this.setCanvas(this.interface.drawings as HTMLCanvasElement);
     try {
       this.loadHydraSynthAsync();
     } catch (error) {
@@ -201,6 +210,15 @@ export class Editor {
 
     // Loading universe from URL (if needed)
     loadUniverserFromUrl(this);
+
+    // Set the color scheme for the application
+    let available_themes = Object.keys(colors);
+    if (this.settings.theme in available_themes) {
+      this.readTheme(this.settings.theme);
+    } else {
+      this.settings.theme = "Everblush";
+      this.readTheme(this.settings.theme);
+    }
   }
 
   private getBuffer(type: string): any {
@@ -256,7 +274,7 @@ export class Editor {
 
     let list = document.createElement("ul");
     list.className =
-      "lg:h-80 lg:text-normal text-sm h-auto lg:w-80 w-auto lg:pb-2 lg:pt-2 overflow-y-scroll text-white lg:mb-4 border rounded-lg bg-neutral-800";
+      "lg:h-80 lg:text-normal text-normal h-auto lg:w-80 w-auto lg:pb-2 lg:pt-2 overflow-y-scroll text-brightwhite bg-background lg:mb-4 border rounded-lg";
     list.append(
       ...Object.keys(this.universes).map((it) => {
         let item = itemTemplate.content.cloneNode(true) as DocumentFragment;
@@ -288,9 +306,9 @@ export class Editor {
      */
     const tabs = document.querySelectorAll('[id^="tab-"]');
     const tab = tabs[i] as HTMLElement;
-    tab.classList.add("bg-orange-300");
+    tab.classList.add("bg-foreground");
     for (let j = 0; j < tabs.length; j++) {
-      if (j != i) tabs[j].classList.remove("bg-orange-300");
+      if (j != i) tabs[j].classList.remove("bg-foreground");
     }
     let tab_id = tab.id.split("-")[1];
     this.local_index = parseInt(tab_id);
@@ -313,15 +331,15 @@ export class Editor {
     let changeColor = (button: HTMLElement) => {
       interface_buttons.forEach((button) => {
         let svg = button.children[0] as HTMLElement;
-        if (svg.classList.contains("text-orange-300")) {
+        if (svg.classList.contains("text-foreground_selection")) {
-          svg.classList.remove("text-orange-300");
+          svg.classList.remove("text-foreground_selection");
-          button.classList.remove("text-orange-300");
+          button.classList.remove("text-foreground_selection");
         }
       });
       button.children[0].classList.remove("text-white");
-      button.children[0].classList.add("text-orange-300");
+      button.children[0].classList.add("text-foreground_selection");
-      button.classList.add("text-orange-300");
+      button.classList.add("text-foreground_selection");
-      button.classList.add("fill-orange-300");
+      button.classList.add("fill-foreground_selection");
     };
 
     switch (mode) {
@@ -436,7 +454,7 @@ export class Editor {
 
   unfocusPlayButtons() {
     document.querySelectorAll('[id^="play-button-"]').forEach((button) => {
-      button.children[0].classList.remove("fill-orange-300");
+      button.children[0].classList.remove("fill-foreground_selection");
       button.children[0].classList.remove("animate-pulse");
     });
   }
@@ -565,6 +583,45 @@ export class Editor {
       ctx.scale(dpr, dpr);
     }
   }
+
+  private updateInterfaceTheme(selected_theme: {[key: string]: string}): void {
+    function hexToRgb(hex: string): {r: number, g: number, b: number} | null {
+      let result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+          return result ? {
+            r: parseInt(result[1], 16),
+            g: parseInt(result[2], 16),
+            b: parseInt(result[3], 16)
+          } : null;
+        };
+        for (const [key, value] of Object.entries(selected_theme)) {
+          let color = hexToRgb(value);
+          if (color) {
+            let colorString = `${color.r} ${color.g} ${color.b}`
+            document.documentElement.style.setProperty("--" + key, colorString);
+          }
+        }
+      }
+
+      getColorScheme(theme_name: string): {[key: string]: string} {
+    // Check if the theme exists in colors.json
+    let themes: Record<string, { [key: string]: any }> = colors;
+    return themes[theme_name];
+  }
+
+  readTheme(theme_name: string): void {
+    // Check if the theme exists in colors.json
+    let themes: Record<string, { [key: string]: any }> = colors;
+    let selected_theme = themes[theme_name];
+    if (selected_theme) {
+      this.currentThemeName = theme_name;
+      this.updateInterfaceTheme(selected_theme);
+      let codeMirrorTheme = getCodeMirrorTheme(selected_theme);
+      // Reconfigure the view with the new theme
+      this.view.dispatch({
+        effects: this.themeCompartment.reconfigure(codeMirrorTheme),
+      });
+    }
+  }
 }
 
 let app = new Editor();

src/tailwind.css

@@ -0,0 +1,29 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@layer base {
+    :root {
+        --black: 40 42 54;
+        --red: 68 71 90;
+        --green: 248 248 242;
+        --yellow: 98 114 164;
+        --blue: 139 233 253;
+        --magenta: 80 250 123;
+        --cyan: 255 184 108;
+        --white: 255 121 198;
+        --brightblack: 189 147 249;
+        --brightred: 255 85 85;
+        --brightgreen: 241 250 140;
+        --brightyellow: 139 233 253;
+        --brightblue: 80 250 123;
+        --brightmagenta: 255 184 108;
+        --brightcyan: 255 121 198;
+        --brightwhite: 189 147 249;
+        --background: 40 42 54;
+        --selection_foreground: 68 71 90;
+        --cursor: 139 233 253;
+        --foreground: 248 248 242;
+        --selection_background: 189 147 249;
+    }
+}

src/themes/toposTheme.ts

@@ -1,221 +0,0 @@
-import { EditorView } from "@codemirror/view";
-import { Extension } from "@codemirror/state";
-import { HighlightStyle, syntaxHighlighting } from "@codemirror/language";
-import { tags as t } from "@lezer/highlight";
-
-const base00 = "#262626",
-  base01 = "#3B4252",
-  base02 = "#BBBBBB",
-  base03 = "#4C566A",
-  base04 = "#D8DEE9",
-  base05 = "#E5E9F0",
-  base07 = "#8FBCBB",
-  base_red = "#BF616A",
-  base_deeporange = "#D08770",
-  base_pink = "#B48EAD",
-  base_cyan = "#FBCF8B",
-  base_yellow = "#88C0D0",
-  base_orange = "#D08770",
-  base_indigo = "#5E81AC",
-  base_purple = "#B48EAD",
-  base_green = "#A3BE8C",
-  base_lightgreen = "#A3BE8C";
-
-const invalid = base_red,
-  darkBackground = "#262626",
-  highlightBackground = "#252525",
-  // background = base00,
-  tooltipBackground = base01,
-  cursor = base04;
-
-/// The editor theme styles for Material Dark.
-export const toposDarkTheme = EditorView.theme(
-  {
-    "&": {
-      color: base05,
-      // backgroundColor: background,
-      backgroundColor: "transparent",
-      fontSize: "24px",
-      fontFamily: "IBM Plex Mono",
-    },
-    ".cm-content": {
-      caretColor: cursor,
-      fontFamily: "IBM Plex Mono",
-    },
-    ".cm-cursor, .cm-dropCursor": {
-      borderLeftColor: cursor,
-    },
-    "&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":
-      {
-        backgroundColor: base00,
-        border: `0.5px solid ${base00}`,
-      },
-    ".cm-panels": {
-      backgroundColor: darkBackground,
-      color: base05,
-    },
-    ".cm-panels.cm-panels-top": { borderBottom: "2px solid black" },
-    ".cm-panels.cm-panels-bottom": { borderTop: "2px solid black" },
-    ".cm-search.cm-panel": { backgroundColor: "transparent" },
-    ".cm-searchMatch": {
-      outline: `1px solid ${base_cyan}`,
-    },
-    ".cm-searchMatch.cm-searchMatch-selected": {
-      backgroundColor: highlightBackground,
-    },
-    ".cm-activeLine": {
-      // backgroundColor: highlightBackground
-      backgroundColor: "rgb(76,76,106, 0.1)",
-    },
-    ".cm-selectionMatch": {
-      backgroundColor: base04,
-      outline: `1px solid ${base_red}`,
-    },
-
-    "&.cm-focused .cm-matchingBracket": {
-      color: base02,
-      // outline: `1px solid ${base02}`,
-    },
-
-    "&.cm-focused .cm-nonmatchingBracket": {
-      color: base_red,
-    },
-
-    ".cm-gutters": {
-      //backgroundColor: base00,
-      backgroundColor: "transparent",
-      color: base02,
-    },
-
-    ".cm-activeLineGutter": {
-      backgroundColor: highlightBackground,
-      color: base02,
-    },
-
-    ".cm-foldPlaceholder": {
-      border: "none",
-      color: `${base07}`,
-    },
-
-    ".cm-tooltip": {
-      border: "none",
-      backgroundColor: tooltipBackground,
-    },
-    ".cm-tooltip .cm-tooltip-arrow:before": {},
-    ".cm-tooltip .cm-tooltip-arrow:after": {
-      borderTopColor: tooltipBackground,
-      borderBottomColor: tooltipBackground,
-    },
-    ".cm-tooltip-autocomplete": {
-      "& > ul > li[aria-selected]": {
-        backgroundColor: highlightBackground,
-        color: base03,
-      },
-    },
-  },
-  { dark: true },
-);
-
-/// The highlighting style for code in the Material Dark theme.
-export const toposDarkHighlightStyle = HighlightStyle.define([
-  { tag: t.keyword, color: base_purple },
-  {
-    tag: [t.name, t.deleted, t.character, t.macroName],
-    color: base_cyan,
-  },
-  { tag: [t.propertyName], color: base_yellow },
-  { tag: [t.variableName], color: base05 },
-  { tag: [t.function(t.variableName)], color: base_cyan },
-  { tag: [t.labelName], color: base_purple },
-  {
-    tag: [t.color, t.constant(t.name), t.standard(t.name)],
-    color: base_yellow,
-  },
-  { tag: [t.definition(t.name), t.separator], color: base_pink },
-  { tag: [t.brace], color: base_purple },
-  {
-    tag: [t.annotation],
-    color: invalid,
-  },
-  {
-    tag: [t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace],
-    color: base_orange,
-  },
-  {
-    tag: [t.typeName, t.className],
-    color: base_orange,
-  },
-  {
-    tag: [t.operator, t.operatorKeyword],
-    color: base_indigo,
-  },
-  {
-    tag: [t.tagName],
-    color: base_deeporange,
-  },
-  {
-    tag: [t.squareBracket],
-    color: base_red,
-  },
-  {
-    tag: [t.angleBracket],
-    color: base02,
-  },
-  {
-    tag: [t.attributeName],
-    color: base05,
-  },
-  {
-    tag: [t.regexp],
-    color: invalid,
-  },
-  {
-    tag: [t.quote],
-    color: base_green,
-  },
-  { tag: [t.string], color: base_lightgreen },
-  {
-    tag: t.link,
-    color: base_cyan,
-    textDecoration: "underline",
-    textUnderlinePosition: "under",
-  },
-  {
-    tag: [t.url, t.escape, t.special(t.string)],
-    color: base_yellow,
-  },
-  { tag: [t.meta], color: base03 },
-  { tag: [t.comment], color: base02, fontStyle: "italic" },
-  { tag: t.monospace, color: base05 },
-  { tag: t.strong, fontWeight: "bold", color: base_red },
-  { tag: t.emphasis, fontStyle: "italic", color: base_lightgreen },
-  { tag: t.strikethrough, textDecoration: "line-through" },
-  { tag: t.heading, fontWeight: "bold", color: base_yellow },
-  { tag: t.heading1, fontWeight: "bold", color: base_yellow },
-  {
-    tag: [t.heading2, t.heading3, t.heading4],
-    fontWeight: "bold",
-    color: base_yellow,
-  },
-  {
-    tag: [t.heading5, t.heading6],
-    color: base_yellow,
-  },
-  { tag: [t.atom, t.bool, t.special(t.variableName)], color: base_cyan },
-  {
-    tag: [t.processingInstruction, t.inserted],
-    color: base_red,
-  },
-  {
-    tag: [t.contentSeparator],
-    color: base_cyan,
-  },
-  { tag: t.invalid, color: base02, borderBottom: `1px dotted ${base_red}` },
-]);
-
-/// Extension to enable the Material Dark theme (both the editor theme and
-/// the highlight style).
-export const toposTheme: Extension = [
-  toposDarkTheme,
-  syntaxHighlighting(toposDarkHighlightStyle),
-];

tailwind.config.js

@@ -1,21 +1,33 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-  content: ["./index.html", "./src/**/*.{js,ts,jsx,tsx}"],
+  content: ["./src/**/*.html", "./index.html", "./src/**/*.{js,ts,jsx,tsx}"],
-  safelist: [
-    {
-      pattern: /hljs+/,
-    },
-  ],
   theme: {
-    extend: {},
+      colors: {
-    hljs: {
+          black: "rgb(var(--black) / <alpha-value>)",
-      theme: "nord",
+          red: "rgb(var(--red) / <alpha-value>)",
-      custom: {
+          green: "rgb(var(--green) / <alpha-value>)",
-        general: {
+          yellow: "rgb(var(--yellow) / <alpha-value>)",
-          comment: "#FEFEFE",
+          blue: "rgb(var(--blue) / <alpha-value>)",
-        },
+          magenta: "rgb(var(--magenta) / <alpha-value>)",
-      },
+          cyan: "rgb(var(--cyan) / <alpha-value>)",
-    },
+          white: "rgb(var(--white) / <alpha-value>)",
-  },
+          brightblack: "rgb(var(--brightblack) / <alpha-value>)",
-  plugins: [require("tailwind-highlightjs")],
+          brightred: "rgb(var(--brightred) / <alpha-value>)",
+          brightgreen: "rgb(var(--brightgreen) / <alpha-value>)",
+          brightyellow: "rgb(var(--brightyellow) / <alpha-value>)",
+          brightblue: "rgb(var(--brightblue) / <alpha-value>)",
+          brightmagenta: "rgb(var(--brightmagenta) / <alpha-value>)",
+          brightcyan: "rgb(var(--brightcyan) / <alpha-value>)",
+          brightwhite: "rgb(var(--brightwhite) / <alpha-value>)",
+          background: "rgb(var(--background) / <alpha-value>)",
+          selection_foreground: "rgb(var(--selection_foreground) / <alpha-value>)",
+          cursor: "rgb(var(--cursor) / <alpha-value>)",
+          foreground: "rgb(var(--foreground) / <alpha-value>)",
+          selection_background: "rgb(var(--selection_background) / <alpha-value>)",
+      }
+   },
+  extend: {},
+  safelist: [{
+    pattern: /(bg|text|border)-(transparent|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|color10|color11|color12|color13|color14|color15|background|selection_background|cursor|foreground|selection_background)/,
+  }],
 };

vite.config.js

@@ -10,11 +10,10 @@ const vitePWAconfiguration = {
 
   workbox: {
     sourcemap: false,
-    cleanupOutdatedCaches: true,
+    cleanupOutdatedCaches: false,
     globPatterns: [
-      "**/*.{js,css,html,gif,png,json,woff,woff2,json,ogg,wav,mp3,ico,png,svg}",
+      "**/*.{js,js.gz,css,html,gif,png,json,woff,woff2,json,ogg,wav,mp3,ico,png,svg}",
     ],
-    // Thanks Froos :)
     runtimeCaching: [
       {
         urlPattern: ({ url }) =>

yarn.lock

@@ -1362,6 +1362,90 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
+"@serialport/binding-mock@10.2.2":
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/@serialport/binding-mock/-/binding-mock-10.2.2.tgz#d322a8116a97806addda13c62f50e73d16125874"
+  integrity sha512-HAFzGhk9OuFMpuor7aT5G1ChPgn5qSsklTFOTUX72Rl6p0xwcSVsRtG/xaGp6bxpN7fI9D/S8THLBWbBgS6ldw==
+  dependencies:
+    "@serialport/bindings-interface" "^1.2.1"
+    debug "^4.3.3"
+
+"@serialport/bindings-cpp@10.8.0":
+  version "10.8.0"
+  resolved "https://registry.yarnpkg.com/@serialport/bindings-cpp/-/bindings-cpp-10.8.0.tgz#79507b57022ac264e963e7fbf3647a3821569a20"
+  integrity sha512-OMQNJz5kJblbmZN5UgJXLwi2XNtVLxSKmq5VyWuXQVsUIJD4l9UGHnLPqM5LD9u3HPZgDI5w7iYN7gxkQNZJUw==
+  dependencies:
+    "@serialport/bindings-interface" "1.2.2"
+    "@serialport/parser-readline" "^10.2.1"
+    debug "^4.3.2"
+    node-addon-api "^5.0.0"
+    node-gyp-build "^4.3.0"
+
+"@serialport/bindings-interface@1.2.2", "@serialport/bindings-interface@^1.2.1":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@serialport/bindings-interface/-/bindings-interface-1.2.2.tgz#c4ae9c1c85e26b02293f62f37435478d90baa460"
+  integrity sha512-CJaUd5bLvtM9c5dmO9rPBHPXTa9R2UwpkJ0wdh9JCYcbrPWsKz+ErvR0hBLeo7NPeiFdjFO4sonRljiw4d2XiA==
+
+"@serialport/parser-byte-length@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-byte-length/-/parser-byte-length-10.5.0.tgz#f3d4c1c7923222df2f3d3c7c8aaaa207fe373b49"
+  integrity sha512-eHhr4lHKboq1OagyaXAqkemQ1XyoqbLQC8XJbvccm95o476TmEdW5d7AElwZV28kWprPW68ZXdGF2VXCkJgS2w==
+
+"@serialport/parser-cctalk@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-cctalk/-/parser-cctalk-10.5.0.tgz#0ee88db0768a361b7cfb9a394b74e480c38e1992"
+  integrity sha512-Iwsdr03xmCKAiibLSr7b3w6ZUTBNiS+PwbDQXdKU/clutXjuoex83XvsOtYVcNZmwJlVNhAUbkG+FJzWwIa4DA==
+
+"@serialport/parser-delimiter@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-delimiter/-/parser-delimiter-10.5.0.tgz#b0d93100cdfd0619d020a427d652495073f3b828"
+  integrity sha512-/uR/yT3jmrcwnl2FJU/2ySvwgo5+XpksDUR4NF/nwTS5i3CcuKS+FKi/tLzy1k8F+rCx5JzpiK+koqPqOUWArA==
+
+"@serialport/parser-inter-byte-timeout@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-10.5.0.tgz#8665ee5e6138f794ac055e83ef2d1c3653a577c0"
+  integrity sha512-WPvVlSx98HmmUF9jjK6y9mMp3Wnv6JQA0cUxLeZBgS74TibOuYG3fuUxUWGJALgAXotOYMxfXSezJ/vSnQrkhQ==
+
+"@serialport/parser-packet-length@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-packet-length/-/parser-packet-length-10.5.0.tgz#4c4d733bdff8cc4749f2bd750e42e66f8f478def"
+  integrity sha512-jkpC/8w4/gUBRa2Teyn7URv1D7T//0lGj27/4u9AojpDVXsR6dtdcTG7b7dNirXDlOrSLvvN7aS5/GNaRlEByw==
+
+"@serialport/parser-readline@10.5.0", "@serialport/parser-readline@^10.2.1":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-readline/-/parser-readline-10.5.0.tgz#df23365ae7f45679b1735deae26f72ba42802862"
+  integrity sha512-0aXJknodcl94W9zSjvU+sLdXiyEG2rqjQmvBWZCr8wJZjWEtv3RgrnYiWq4i2OTOyC8C/oPK8ZjpBjQptRsoJQ==
+  dependencies:
+    "@serialport/parser-delimiter" "10.5.0"
+
+"@serialport/parser-ready@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-ready/-/parser-ready-10.5.0.tgz#1d9029f57b1abd664cb468e21bfccf7b44c6e8ea"
+  integrity sha512-QIf65LTvUoxqWWHBpgYOL+soldLIIyD1bwuWelukem2yDZVWwEjR288cLQ558BgYxH4U+jLAQahhqoyN1I7BaA==
+
+"@serialport/parser-regex@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-regex/-/parser-regex-10.5.0.tgz#f98eab6e3d9bc99086269e9acf39a82db36d245f"
+  integrity sha512-9jnr9+PCxRoLjtGs7uxwsFqvho+rxuJlW6ZWSB7oqfzshEZWXtTJgJRgac/RuLft4hRlrmRz5XU40i3uoL4HKw==
+
+"@serialport/parser-slip-encoder@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-slip-encoder/-/parser-slip-encoder-10.5.0.tgz#cb79ac0fda1fc87f049690ff7b498c787da67991"
+  integrity sha512-wP8m+uXQdkWSa//3n+VvfjLthlabwd9NiG6kegf0fYweLWio8j4pJRL7t9eTh2Lbc7zdxuO0r8ducFzO0m8CQw==
+
+"@serialport/parser-spacepacket@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@serialport/parser-spacepacket/-/parser-spacepacket-10.5.0.tgz#2fc077c0ec16a9532c511ad5f2ab12d588796bc7"
+  integrity sha512-BEZ/HAEMwOd8xfuJSeI/823IR/jtnThovh7ils90rXD4DPL1ZmrP4abAIEktwe42RobZjIPfA4PaVfyO0Fjfhg==
+
+"@serialport/stream@10.5.0":
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/@serialport/stream/-/stream-10.5.0.tgz#cda8fb3e8d03094b0962a3d14b73adfcd591be58"
+  integrity sha512-gbcUdvq9Kyv2HsnywS7QjnEB28g+6OGB5Z8TLP7X+UPpoMIWoUsoQIq5Kt0ZTgMoWn3JGM2lqwTsSHF+1qhniA==
+  dependencies:
+    "@serialport/bindings-interface" "1.2.2"
+    debug "^4.3.2"
+
 "@strudel.cycles/core@0.8.2":
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/@strudel.cycles/core/-/core-0.8.2.tgz#62e957a3636b39938d1c4ecc3fd766d02fc523bb"
@@ -1885,7 +1969,7 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.3, debug@^4.3.4:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -2392,6 +2476,11 @@ highlight.js@^11.5.0:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.8.0.tgz#966518ea83257bae2e7c9a48596231856555bb65"
   integrity sha512-MedQhoqVdr0U6SSnWPzfiadUcDHfN/Wzq25AkXiQv9oiOO/sG0S7XkvpFIqWBl9Yq1UYyYOOVORs5UW2XlPyzg==
 
+highlight.js@^11.9.0:
+  version "11.9.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.9.0.tgz#04ab9ee43b52a41a047432c8103e2158a1b8b5b0"
+  integrity sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==
+
 html-encoder-decoder@^1.3.9:
   version "1.3.9"
   resolved "https://registry.yarnpkg.com/html-encoder-decoder/-/html-encoder-decoder-1.3.9.tgz#d5ec7d249cd525709f7640ae9340f482cc86e94a"
@@ -2718,6 +2807,11 @@ lodash@^4.17.20:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
+long@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
+  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
+
 lru-cache@^10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
@@ -2814,6 +2908,11 @@ nanostores@^0.8.1:
   resolved "https://registry.yarnpkg.com/nanostores/-/nanostores-0.8.1.tgz#963577028ac10eeb50bec376535f4762ab5af9be"
   integrity sha512-1ZCfQtII2XeFDrtqXL2cdQ/diGrLxzRB3YMyQjn8m7GSGQrJfGST2iuqMpWnS/ZlifhtjgR/SX0Jy6Uij6lRLA==
 
+node-addon-api@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762"
+  integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==
+
 node-fetch@^2.6.1:
   version "2.6.13"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.13.tgz#a20acbbec73c2e09f9007de5cda17104122e0010"
@@ -2821,6 +2920,11 @@ node-fetch@^2.6.1:
   dependencies:
     whatwg-url "^5.0.0"
 
+node-gyp-build@^4.3.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.7.0.tgz#749f0033590b2a89ac8edb5e0775f95f5ae86d15"
+  integrity sha512-PbZERfeFdrHQOOXiAKOY0VPbykZy90ndPKk0d+CFDegTKmWp1VgOTz2xACVbr1BjCWxrQp68CXtvNsveFhqDJg==
+
 node-releases@^2.0.13:
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
@@ -2873,6 +2977,18 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
+osc@^2.4.4:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/osc/-/osc-2.4.4.tgz#52b2e914253b04a792d28ee892b0fa1ca8bdc1a2"
+  integrity sha512-YJr2bUCQMc9BIaq1LXgqYpt5Ii7wNy2n0e0BkQiCSziMNrrsYHhH5OlExNBgCrQsum60EgXZ32lFsvR4aUf+ew==
+  dependencies:
+    long "4.0.0"
+    slip "1.0.2"
+    wolfy87-eventemitter "5.2.9"
+    ws "8.13.0"
+  optionalDependencies:
+    serialport "10.5.0"
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -3149,6 +3265,26 @@ serialize-javascript@^4.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+serialport@10.5.0:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/serialport/-/serialport-10.5.0.tgz#b85f614def6e8914e5865c798b0555330903a0f8"
+  integrity sha512-7OYLDsu5i6bbv3lU81pGy076xe0JwpK6b49G6RjNvGibstUqQkI+I3/X491yBGtf4gaqUdOgoU1/5KZ/XxL4dw==
+  dependencies:
+    "@serialport/binding-mock" "10.2.2"
+    "@serialport/bindings-cpp" "10.8.0"
+    "@serialport/parser-byte-length" "10.5.0"
+    "@serialport/parser-cctalk" "10.5.0"
+    "@serialport/parser-delimiter" "10.5.0"
+    "@serialport/parser-inter-byte-timeout" "10.5.0"
+    "@serialport/parser-packet-length" "10.5.0"
+    "@serialport/parser-readline" "10.5.0"
+    "@serialport/parser-ready" "10.5.0"
+    "@serialport/parser-regex" "10.5.0"
+    "@serialport/parser-slip-encoder" "10.5.0"
+    "@serialport/parser-spacepacket" "10.5.0"
+    "@serialport/stream" "10.5.0"
+    debug "^4.3.3"
+
 set-function-length@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
@@ -3193,6 +3329,11 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
+slip@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/slip/-/slip-1.0.2.tgz#ba45a923034d6cf41b1a27aebe7128282c8d551f"
+  integrity sha512-XrcHe3NAcyD3wO+O4I13RcS4/3AF+S9RvGNj9JhJeS02HyImwD2E3QWLrmn9hBfL+fB6yapagwxRkeyYzhk98g==
+
 source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
@@ -3319,10 +3460,10 @@ sucrase@^3.32.0:
     pirates "^4.0.1"
     ts-interface-checker "^0.1.9"
 
-superdough@^0.9.11:
+superdough@^0.9.12:
-  version "0.9.11"
+  version "0.9.12"
-  resolved "https://registry.yarnpkg.com/superdough/-/superdough-0.9.11.tgz#3a3842a47d6340477f77d39077303f05e15274dd"
+  resolved "https://registry.yarnpkg.com/superdough/-/superdough-0.9.12.tgz#455f8860bc13cffbe1d8f391919e8f1dba1ff0b5"
-  integrity sha512-s0SNSg/EJHwp2sUnE2A7pTZ0G2luiSEq9NVKJvodjJw11Tn0fOp9XcnegNXINYz3U6mAsUYRoeaj4NmuTL13fA==
+  integrity sha512-rsdCoYk5rLYster4tE5mSGjotf/TNP3gPpsuK4hxTZNxL92TkdEcbPFLnJfky5oMQJtpRY1XqAXUx3htLbHEZA==
   dependencies:
     nanostores "^0.8.1"
 
@@ -3709,6 +3850,11 @@ which-typed-array@^1.1.11, which-typed-array@^1.1.13:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
+wolfy87-eventemitter@5.2.9:
+  version "5.2.9"
+  resolved "https://registry.yarnpkg.com/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.9.tgz#e879f770b30fbb6512a8afbb330c388591099c2a"
+  integrity sha512-P+6vtWyuDw+MB01X7UeF8TaHBvbCovf4HPEMF/SV7BdDc1SMTiBy13SRD71lQh4ExFTG1d/WNzDGDCyOKSMblw==
+
 workbox-background-sync@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-7.0.0.tgz#2b84b96ca35fec976e3bd2794b70e4acec46b3a5"
@@ -3872,6 +4018,11 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
+ws@8.13.0:
+  version "8.13.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
+  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+
 yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
@@ -3882,10 +4033,10 @@ yaml@^2.1.1:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
   integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
 
-zifferjs@^0.0.44:
+zifferjs@^0.0.55:
-  version "0.0.44"
+  version "0.0.55"
-  resolved "https://registry.yarnpkg.com/zifferjs/-/zifferjs-0.0.44.tgz#c6b425166488ec05e349867e3de2460b74204449"
+  resolved "https://registry.yarnpkg.com/zifferjs/-/zifferjs-0.0.55.tgz#ff7d08c9afde6cb78649f585b5a2c97ee4c97f22"
-  integrity sha512-Q+0affxeUZwl+oJpsa1nb4hqHV6V4VX+pkejCQq/e9+/0H6ooTpcDQ9IDopvrWBnhA8E11k0tbwUee5TJtE8UQ==
+  integrity sha512-QO/xWN3RugMbusIYxB7H1aHSm1w8OD1leEseJcDwxBx9VxTBWZF9SrxGbNdRowFAIfFg9b4hpOYmMSQYqi87EA==
 
 zyklus@^0.1.4:
   version "0.1.4"