diff --git a/site/src/components/inline-svg.html b/site/src/components/InlineSvg.html
similarity index 100%
rename from site/src/components/inline-svg.html
rename to site/src/components/InlineSvg.html
diff --git a/site/src/components/top-nav.html b/site/src/components/TopNav.html
similarity index 98%
rename from site/src/components/top-nav.html
rename to site/src/components/TopNav.html
index cc9f0c6bd8..ffe5003f51 100644
--- a/site/src/components/top-nav.html
+++ b/site/src/components/TopNav.html
@@ -1,6 +1,6 @@
 <script>
-	import Icon from './icon.html';
-	import Logo from './logo.html';
+	import Icon from './Icon.html';
+	import Logo from './Logo.html';
 
 	export let segment;
 
diff --git a/site/src/components/debug-css.html b/site/src/components/unused/debug-css.html
similarity index 100%
rename from site/src/components/debug-css.html
rename to site/src/components/unused/debug-css.html
diff --git a/site/src/components/isometry.html b/site/src/components/unused/isometry.html
similarity index 100%
rename from site/src/components/isometry.html
rename to site/src/components/unused/isometry.html
diff --git a/site/src/components/theme-input.html b/site/src/components/unused/theme-input.html
similarity index 100%
rename from site/src/components/theme-input.html
rename to site/src/components/unused/theme-input.html
diff --git a/site/src/components/toaster.html b/site/src/components/unused/toaster.html
similarity index 100%
rename from site/src/components/toaster.html
rename to site/src/components/unused/toaster.html
diff --git a/site/src/routes/_layout.html b/site/src/routes/_layout.html
index f2dbfaec17..2f5b583e1c 100644
--- a/site/src/routes/_layout.html
+++ b/site/src/routes/_layout.html
@@ -1,20 +1,13 @@
 <script>
-	import InlineSvg from '../components/inline-svg.html';
-	import DebugCss from '../components/debug-css.html';
-	import Nav from '../components/top-nav.html';
+	import InlineSvg from '../components/InlineSvg.html';
+	import Nav from '../components/TopNav.html';
 
 	export let child;
-
-	const dev = process.env.NODE_ENV === 'development';
 </script>
 
-{#if dev}
-	<DebugCss style='bottom:4rem; right:3rem;' />
-{/if}
-
 <InlineSvg />
 <Nav segment={child.segment} />
-<main role='main'>
+<main>
 	<svelte:component this={child.component} {...child.props} />
 </main>
 
diff --git a/site/src/routes/guide/_GuideContents.html b/site/src/routes/guide/_GuideContents.html
index cf7e478a64..413700b15a 100644
--- a/site/src/routes/guide/_GuideContents.html
+++ b/site/src/routes/guide/_GuideContents.html
@@ -1,6 +1,6 @@
 <script>
 	import { onMount } from 'svelte';
-	import Icon from '../../components/icon.html';
+	import Icon from '../../components/Icon.html';
 
 	export let sections = [];
 	export let active_section = null;
diff --git a/site/src/routes/guide/index.html b/site/src/routes/guide/index.html
index 9f30d724fb..ff8bc20d73 100644
--- a/site/src/routes/guide/index.html
+++ b/site/src/routes/guide/index.html
@@ -8,7 +8,7 @@
 <script>
 	import { onMount } from 'svelte';
 	import GuideContents from './_GuideContents.html';
-	import Icon from '../../components/icon.html';
+	import Icon from '../../components/Icon.html';
 
 	// NOT YET
 	// get offset from css-vars (for smooth-scroll)
diff --git a/site/src/routes/index.html b/site/src/routes/index.html
index cf26a7c0be..426ff7718e 100644
--- a/site/src/routes/index.html
+++ b/site/src/routes/index.html
@@ -1,7 +1,6 @@
 <script>
-	import Icon from '../components/icon.html';
-	import Logo from '../components/logo.html';
-	import Iso from '../components/isometry.html';
+	import Icon from '../components/Icon.html';
+	import Logo from '../components/Logo.html';
 
 	let sy = 0;
 </script>
diff --git a/site/src/routes/repl/_components/AppControls/index.html b/site/src/routes/repl/_components/AppControls/index.html
index 7472f08585..381cc93f75 100644
--- a/site/src/routes/repl/_components/AppControls/index.html
+++ b/site/src/routes/repl/_components/AppControls/index.html
@@ -2,7 +2,7 @@
 	import * as fleece from 'golden-fleece';
 	import { createEventDispatcher } from 'svelte';
 	import UserMenu from './UserMenu.html';
-	import Icon from '../../../../components/icon.html';
+	import Icon from '../../../../components/Icon.html';
 	import * as doNotZip from 'do-not-zip';
 	import downloadBlob from '../../_utils/downloadBlob.js';
 	import { user } from '../../../../user.js';
diff --git a/site/src/routes/repl/_components/Input/ComponentSelector.html b/site/src/routes/repl/_components/Input/ComponentSelector.html
index 32be6074b1..39ce470471 100644
--- a/site/src/routes/repl/_components/Input/ComponentSelector.html
+++ b/site/src/routes/repl/_components/Input/ComponentSelector.html
@@ -1,6 +1,6 @@
 <script>
 	import { createEventDispatcher } from 'svelte';
-	import Icon from '../../../../components/icon.html';
+	import Icon from '../../../../components/Icon.html';
 	import { enter } from '../events.js';
 
 	const dispatch = createEventDispatcher();