diff --git a/packages/core/draw.mjs b/packages/core/draw.mjs
index 1b5c87e7..f42e3220 100644
--- a/packages/core/draw.mjs
+++ b/packages/core/draw.mjs
@@ -1,6 +1,6 @@
 /*
 draw.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/tone/draw.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/draw.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
@@ -13,7 +13,7 @@ export const getDrawContext = (id = 'test-canvas') => {
     canvas.id = id;
     canvas.width = window.innerWidth;
     canvas.height = window.innerHeight;
-    canvas.style = 'pointer-events:none;width:100%;height:100%;position:fixed;top:0;left:0;z-index:5';
+    canvas.style = 'pointer-events:none;width:100%;height:100%;position:fixed;top:0;left:0';
     document.body.prepend(canvas);
   }
   return canvas.getContext('2d');
diff --git a/packages/react/src/components/style.css b/packages/react/src/components/style.css
index 150c9837..6d5d0805 100644
--- a/packages/react/src/components/style.css
+++ b/packages/react/src/components/style.css
@@ -1,6 +1,6 @@
 :root {
   --background: #222;
-  --lineBackground: #22222250;
+  --lineBackground: #22222299;
   --foreground: #fff;
   --caret: #ffcc00;
   --selection: rgba(128, 203, 196, 0.5);
diff --git a/website/package.json b/website/package.json
index 3e15436f..6b8b7a6c 100644
--- a/website/package.json
+++ b/website/package.json
@@ -8,7 +8,7 @@
     "start": "astro dev",
     "check": "astro check && tsc",
     "build": "astro build",
-    "preview": "astro preview",
+    "preview": "astro preview --port 3009",
     "astro": "astro"
   },
   "dependencies": {
diff --git a/website/src/components/HeadCommon.astro b/website/src/components/HeadCommon.astro
index 9e81b0b8..23b39842 100644
--- a/website/src/components/HeadCommon.astro
+++ b/website/src/components/HeadCommon.astro
@@ -33,7 +33,7 @@ const base = BASE_URL;
 <style is:global>
   :root {
     --background: #222;
-    --lineBackground: #22222250;
+    --lineBackground: #22222299;
     --foreground: #fff;
     --caret: #ffcc00;
     --selection: rgba(128, 203, 196, 0.5);
diff --git a/website/src/repl/Repl.css b/website/src/repl/Repl.css
index 97cd7a60..ddedad6f 100644
--- a/website/src/repl/Repl.css
+++ b/website/src/repl/Repl.css
@@ -1,3 +1,15 @@
+:root {
+  --background: #222;
+  --lineBackground: #22222299;
+  --foreground: #fff;
+  --caret: #ffcc00;
+  --selection: rgba(128, 203, 196, 0.5);
+  --selectionMatch: #036dd626;
+  --lineHighlight: #00000050;
+  --gutterBackground: transparent;
+  --gutterForeground: #8a919966;
+}
+
 .darken::before {
   content: ' ';
   position: fixed;
@@ -22,3 +34,18 @@
 #code .cm-line > * {
   background: var(--lineBackground);
 }
+
+#code .cm-editor {
+  background-color: transparent !important;
+  height: 100%;
+  z-index: 11;
+}
+
+#code .cm-theme {
+  width: 100%;
+  height: 100%;
+}
+
+#code .cm-theme-light {
+  width: 100%;
+}
diff --git a/website/src/repl/themes.mjs b/website/src/repl/themes.mjs
index 87abe089..af70c9eb 100644
--- a/website/src/repl/themes.mjs
+++ b/website/src/repl/themes.mjs
@@ -80,7 +80,7 @@ export const themes = {
 export const settings = {
   strudelTheme: {
     background: '#222',
-    lineBackground: '#22222250',
+    lineBackground: '#22222299',
     foreground: '#fff',
     // foreground: '#75baff',
     caret: '#ffcc00',
@@ -99,7 +99,7 @@ export const settings = {
   terminal: terminalSettings,
   abcdef: {
     background: '#0f0f0f',
-    lineBackground: '#0f0f0f50',
+    lineBackground: '#0f0f0f99',
     foreground: '#defdef',
     caret: '#00FF00',
     selection: '#515151',
@@ -110,7 +110,7 @@ export const settings = {
   },
   androidstudio: {
     background: '#282b2e',
-    lineBackground: '#282b2e50',
+    lineBackground: '#282b2e99',
     foreground: '#a9b7c6',
     caret: '#00FF00',
     selection: '#343739',
@@ -119,7 +119,7 @@ export const settings = {
   },
   atomone: {
     background: '#272C35',
-    lineBackground: '#272C3550',
+    lineBackground: '#272C3599',
     foreground: '#9d9b97',
     caret: '#797977',
     selection: '#ffffff30',
@@ -131,7 +131,7 @@ export const settings = {
   },
   aura: {
     background: '#21202e',
-    lineBackground: '#21202e50',
+    lineBackground: '#21202e99',
     foreground: '#edecee',
     caret: '#a277ff',
     selection: '#3d375e7f',
@@ -144,7 +144,7 @@ export const settings = {
   bbedit: {
     light: true,
     background: '#FFFFFF',
-    lineBackground: '#FFFFFF50',
+    lineBackground: '#FFFFFF99',
     foreground: '#000000',
     caret: '#FBAC52',
     selection: '#FFD420',
@@ -156,7 +156,7 @@ export const settings = {
   },
   bespin: {
     background: '#28211c',
-    lineBackground: '#28211c50',
+    lineBackground: '#28211c99',
     foreground: '#9d9b97',
     caret: '#797977',
     selection: '#36312e',
@@ -167,7 +167,7 @@ export const settings = {
   },
   darcula: {
     background: '#2B2B2B',
-    lineBackground: '#2B2B2B50',
+    lineBackground: '#2B2B2B99',
     foreground: '#f8f8f2',
     caret: '#FFFFFF',
     selection: 'rgba(255, 255, 255, 0.1)',
@@ -179,7 +179,7 @@ export const settings = {
   },
   dracula: {
     background: '#282a36',
-    lineBackground: '#282a3650',
+    lineBackground: '#282a3699',
     foreground: '#f8f8f2',
     caret: '#f8f8f0',
     selection: 'rgba(255, 255, 255, 0.1)',
@@ -192,7 +192,7 @@ export const settings = {
   duotoneLight: {
     light: true,
     background: '#faf8f5',
-    lineBackground: '#faf8f550',
+    lineBackground: '#faf8f599',
     foreground: '#b29762',
     caret: '#93abdc',
     selection: '#e3dcce',
@@ -204,7 +204,7 @@ export const settings = {
   },
   duotoneDark: {
     background: '#2a2734',
-    lineBackground: '#2a273450',
+    lineBackground: '#2a273499',
     foreground: '#6c6783',
     caret: '#ffad5c',
     selection: 'rgba(255, 255, 255, 0.1)',
@@ -215,7 +215,7 @@ export const settings = {
   eclipse: {
     light: true,
     background: '#fff',
-    lineBackground: '#ffffff50',
+    lineBackground: '#ffffff99',
     foreground: '#000',
     caret: '#FFFFFF',
     selection: '#d7d4f0',
@@ -228,7 +228,7 @@ export const settings = {
   githubLight: {
     light: true,
     background: '#fff',
-    lineBackground: '#ffffff50',
+    lineBackground: '#ffffff99',
     foreground: '#24292e',
     selection: '#BBDFFF',
     selectionMatch: '#BBDFFF',
@@ -237,7 +237,7 @@ export const settings = {
   },
   githubDark: {
     background: '#0d1117',
-    lineBackground: '#0d111750',
+    lineBackground: '#0d111799',
     foreground: '#c9d1d9',
     caret: '#c9d1d9',
     selection: '#003d73',
@@ -246,7 +246,7 @@ export const settings = {
   },
   gruvboxDark: {
     background: '#282828',
-    lineBackground: '#28282850',
+    lineBackground: '#28282899',
     foreground: '#ebdbb2',
     caret: '#ebdbb2',
     selection: '#bdae93',
@@ -258,7 +258,7 @@ export const settings = {
   gruvboxLight: {
     light: true,
     background: '#fbf1c7',
-    lineBackground: '#fbf1c750',
+    lineBackground: '#fbf1c799',
     foreground: '#3c3836',
     caret: '#af3a03',
     selection: '#ebdbb2',
@@ -270,7 +270,7 @@ export const settings = {
   },
   materialDark: {
     background: '#2e3235',
-    lineBackground: '#2e323550',
+    lineBackground: '#2e323599',
     foreground: '#bdbdbd',
     caret: '#a0a4ae',
     selection: '#d7d4f0',
@@ -283,7 +283,7 @@ export const settings = {
   materialLight: {
     light: true,
     background: '#FAFAFA',
-    lineBackground: '#FAFAFA50',
+    lineBackground: '#FAFAFA99',
     foreground: '#90A4AE',
     caret: '#272727',
     selection: '#80CBC440',
@@ -296,7 +296,7 @@ export const settings = {
   noctisLilac: {
     light: true,
     background: '#f2f1f8',
-    lineBackground: '#f2f1f850',
+    lineBackground: '#f2f1f899',
     foreground: '#0c006b',
     caret: '#5c49e9',
     selection: '#d5d1f2',
@@ -307,7 +307,7 @@ export const settings = {
   },
   nord: {
     background: '#2e3440',
-    lineBackground: '#2e344050',
+    lineBackground: '#2e344099',
     foreground: '#FFFFFF',
     caret: '#FFFFFF',
     selection: '#3b4252',
@@ -319,7 +319,7 @@ export const settings = {
   },
   okaidia: {
     background: '#272822',
-    lineBackground: '#27282250',
+    lineBackground: '#27282299',
     foreground: '#FFFFFF',
     caret: '#FFFFFF',
     selection: '#49483E',
@@ -331,7 +331,7 @@ export const settings = {
   solarizedLight: {
     light: true,
     background: '#fdf6e3',
-    lineBackground: '#fdf6e350',
+    lineBackground: '#fdf6e399',
     foreground: '#657b83',
     caret: '#586e75',
     selection: '#dfd9c8',
@@ -342,7 +342,7 @@ export const settings = {
   },
   solarizedDark: {
     background: '#002b36',
-    lineBackground: '#002b3650',
+    lineBackground: '#002b3699',
     foreground: '#93a1a1',
     caret: '#839496',
     selection: '#173541',
@@ -353,7 +353,7 @@ export const settings = {
   },
   sublime: {
     background: '#303841',
-    lineBackground: '#30384150',
+    lineBackground: '#30384199',
     foreground: '#FFFFFF',
     caret: '#FBAC52',
     selection: '#4C5964',
@@ -365,7 +365,7 @@ export const settings = {
   tokyoNightDay: {
     light: true,
     background: '#e1e2e7',
-    lineBackground: '#e1e2e750',
+    lineBackground: '#e1e2e799',
     foreground: '#3760bf',
     caret: '#3760bf',
     selection: '#99a7df',
@@ -377,7 +377,7 @@ export const settings = {
   },
   tokyoNightStorm: {
     background: '#24283b',
-    lineBackground: '#24283b50',
+    lineBackground: '#24283b99',
     foreground: '#7982a9',
     caret: '#c0caf5',
     selection: '#6f7bb630',
@@ -389,7 +389,7 @@ export const settings = {
   },
   tokyoNight: {
     background: '#1a1b26',
-    lineBackground: '#1a1b2650',
+    lineBackground: '#1a1b2699',
     foreground: '#787c99',
     caret: '#c0caf5',
     selection: '#515c7e40',
@@ -401,7 +401,7 @@ export const settings = {
   },
   vscodeDark: {
     background: '#1e1e1e',
-    lineBackground: '#1e1e1e50',
+    lineBackground: '#1e1e1e99',
     foreground: '#9cdcfe',
     caret: '#c6c6c6',
     selection: '#6199ff2f',
@@ -414,7 +414,7 @@ export const settings = {
   xcodeLight: {
     light: true,
     background: '#fff',
-    lineBackground: '#ffffff50',
+    lineBackground: '#ffffff99',
     foreground: '#3D3D3D',
     selection: '#BBDFFF',
     selectionMatch: '#BBDFFF',
@@ -424,7 +424,7 @@ export const settings = {
   },
   xcodeDark: {
     background: '#292A30',
-    lineBackground: '#292A3050',
+    lineBackground: '#292A3099',
     foreground: '#CECFD0',
     caret: '#fff',
     selection: '#727377',