diff --git a/docs/index.html b/docs/index.html
index a92a221..5c2887f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -18,23 +18,14 @@
     <meta name="theme-color" content="#ffffff" />
 
     <!-- Startup styles of water.css, so styles don't have to wait until JS is loaded -->
-    <!-- <link
-      rel="preload"
-      as="style"
-      href="https://cdn.jsdelivr.net/gh/kognise/water.css/dist/dark-legacy.standalone.min.css"
-    />
+    <link rel="preload" as="style" href="../dark-legacy.standalone.min.css" />
     <link
       rel="preload"
       as="style"
-      href="https://cdn.jsdelivr.net/gh/kognise/water.css/dist/dark-legacy.standalone.min.css"
       media="(prefers-color-scheme: dark)"
+      href="../dark-legacy.standalone.min.css"
     />
-    <link
-      rel="stylesheet"
-      href="https://cdn.jsdelivr.net/gh/kognise/water.css/dist/dark-legacy.min.css"
-    /> -->
-    <!-- TODO: Remove once water.css v2 is hosted so the above links work -->
-    <link rel="stylesheet" id="js-startup-stylesheet" href="../dark.min.css" />
+    <link rel="stylesheet" id="js-startup-stylesheet" href="../dark-legacy.min.css" />
 
     <!-- Dynamic version of water.css, overwrites startup styles. JavaScript sets & updates href -->
     <link rel="stylesheet" id="js-stylesheet" />
diff --git a/docs/script.js b/docs/script.js
index 014f24a..a9ca9ac 100644
--- a/docs/script.js
+++ b/docs/script.js
@@ -122,7 +122,7 @@ const createColorSchemeListener = (scheme, queryHandler) => {
 const themeFromParams = queryParams.get('theme')
 /** @type {VersionOptions} */
 const initialVersionOptions = {
-  theme: /** @type {Theme} */ (/^(dark|light)$/.test(themeFromParams) ? themeFromParams : 'dark'),
+  theme: themeFromParams === 'dark' || themeFromParams === 'light' ? themeFromParams : 'dark',
   isLegacy: queryParams.has('legacy') || !supportsCssVars,
   isStandalone: queryParams.has('standalone'),
 }
diff --git a/gulpfile.js b/gulpfile.js
index 2de0315..ff7b749 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -58,13 +58,16 @@ function style() {
   const excludeModern = filter(file => isLegacy(file.path), { restore: true })
   const excludeLegacy = filter(file => !isLegacy(file.path), { restore: true })
 
+  // Don't inline minified versions, so builds can lazily import them at runtime
+  const cssImportOptions = { filter: path => !/\.min/.test(path) }
+
   return (
     gulp
       .src(paths.styles.src)
       // Add sourcemaps
       .pipe(sourcemaps.init())
       // Resolve imports and calculated colors
-      .pipe(postcss([postcssImport(), postcssColorModFunction()]))
+      .pipe(postcss([postcssImport(cssImportOptions), postcssColorModFunction()]))
 
       // * Process legacy builds *
       .pipe(excludeModern)
diff --git a/src/builds/dark-legacy.css b/src/builds/dark-legacy.css
index 85c00b9..7d51f27 100755
--- a/src/builds/dark-legacy.css
+++ b/src/builds/dark-legacy.css
@@ -5,6 +5,5 @@
  * if a system-wide theme preference is set on the user's device.
  */
 
-@import url('https://cdn.jsdelivr.net/gh/kognise/water.css@latest/dist/dark-legacy.standalone.min.css');
-@import url('https://cdn.jsdelivr.net/gh/kognise/water.css@latest/dist/light-legacy.standalone.min.css')
-(prefers-color-scheme: light);
+@import url('./dark-legacy.standalone.min.css');
+@import url('./light-legacy.standalone.min.css') (prefers-color-scheme: light);
diff --git a/src/builds/light-legacy.css b/src/builds/light-legacy.css
index 588a32d..1a3eef3 100755
--- a/src/builds/light-legacy.css
+++ b/src/builds/light-legacy.css
@@ -5,6 +5,5 @@
  * if a system-wide theme preference is set on the user's device.
  */
 
-@import url('https://cdn.jsdelivr.net/gh/kognise/water.css@latest/dist/light-legacy.standalone.min.css');
-@import url('https://cdn.jsdelivr.net/gh/kognise/water.css@latest/dist/dark-legacy.standalone.min.css')
-(prefers-color-scheme: dark);
+@import url('./light-legacy.standalone.min.css');
+@import url('./dark-legacy.standalone.min.css') (prefers-color-scheme: dark);