diff --git a/bun.lockb b/bun.lockb
index 5dbf326..3e0773e 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/index.html b/index.html
deleted file mode 100644
index bff1342..0000000
--- a/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/src/app/icon.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta
-      name="description"
-      content="Update your comma device to the latest software"
-    />
-    <!--ssr-style-outlet-->
-    <title>flash.comma.ai</title>
-  </head>
-  <body>
-    <div id="root"><!--ssr-outlet--></div>
-    <script type="module" src="/src/entry-client.jsx"></script>
-    <script
-      defer
-      data-domain="flash.comma.ai"
-      src="https://plausible.io/js/script.outbound-links.js"
-    ></script>
-  </body>
-</html>
diff --git a/package.json b/package.json
index 067f6ce..ae67038 100644
--- a/package.json
+++ b/package.json
@@ -4,12 +4,9 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "node server",
-    "build": "npm run build:client && npm run build:server",
-    "build:client": "vite build --outDir dist/client",
-    "build:server": "vite build --outDir dist/server --ssr src/entry-server.jsx",
-    "serve": "NODE_ENV=production node server",
-    "start": "vite preview",
+    "dev": "vite",
+    "build": "vite build",
+    "start": "vite build && vite preview",
     "lint": "eslint . --ext js,jsx --report-unused-disable-directives",
     "test": "vitest"
   },
@@ -38,14 +35,12 @@
     "eslint-plugin-react": "^7.34.2",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-react-refresh": "^0.4.7",
-    "express": "^4.19.2",
     "jsdom": "^22.1.0",
     "postcss": "^8.4.38",
-    "react-router-dom": "^6.24.1",
     "tailwindcss": "^3.4.3",
+    "vike": "^0.4.179",
+    "vike-react": "^0.4.17",
     "vite": "^5.2.12",
-    "vite-plugin-ssr": "^0.4.142",
-    "vite-plugin-style-import": "^2.0.0",
     "vite-svg-loader": "^5.1.0",
     "vitest": "^1.6.0"
   }
diff --git a/src/app/favicon.ico b/public/favicon.ico
similarity index 100%
rename from src/app/favicon.ico
rename to public/favicon.ico
diff --git a/src/app/icon.png b/public/icon.png
similarity index 100%
rename from src/app/icon.png
rename to public/icon.png
diff --git a/src/app/icon.svg b/public/icon.svg
similarity index 100%
rename from src/app/icon.svg
rename to public/icon.svg
diff --git a/server.js b/server.js
deleted file mode 100644
index e0b0a62..0000000
--- a/server.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-import { fileURLToPath } from 'url'
-import express from 'express'
-import { createServer as createViteServer } from 'vite'
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-
-async function createServer() {
-  const app = express()
-
-  const vite = await createViteServer({
-    server: { middlewareMode: true },
-    appType: 'custom'
-  })
-
-  app.use(vite.middlewares)
-
-  app.use('*', async (req, res) => {
-    const url = req.originalUrl
-
-    try {
-      let template = fs.readFileSync(
-        path.resolve(__dirname, 'index.html'),
-        'utf-8'
-      )
-
-      const styleModule = await vite.ssrLoadModule('/src/index.css')
-      const css = styleModule.default
-
-      template = await vite.transformIndexHtml(url, template)
-      template = template.replace(
-        '<!--ssr-style-outlet-->',
-        `<style>${css}</style>`
-      )
-
-      const { render } = await vite.ssrLoadModule('/src/entry-server.jsx')
-      const appHtml = await render(url)
-
-      let html = template.replace(`<!--ssr-outlet-->`, appHtml)
-
-      res.status(200).set({ 'Content-Type': 'text/html' }).end(html)
-    } catch (e) {
-      vite.ssrFixStacktrace(e)
-      console.error(e)
-      res.status(500).end(e.message)
-    }
-  })
-
-  app.listen(5173)
-}
-
-createServer()
diff --git a/src/app/Flash.client.jsx b/src/components/Flash.jsx
similarity index 99%
rename from src/app/Flash.client.jsx
rename to src/components/Flash.jsx
index 614fa09..4c8ce09 100644
--- a/src/app/Flash.client.jsx
+++ b/src/components/Flash.jsx
@@ -237,12 +237,8 @@ export default function Flash() {
       <div className="w-full max-w-3xl px-8 transition-opacity duration-300" style={{ opacity: progress === -1 ? 0 : 1 }}>
         <LinearProgress value={progress * 100} barColor={bgColor} />
       </div>
-      <span className={`text-3xl dark:text-white font-mono font-light`}>
-        {title}
-      </span>
-      <span className={`text-xl dark:text-white px-8 max-w-xl`}>
-        {description}
-      </span>
+      <span className={`text-3xl dark:text-white font-mono font-light`}>{title}</span>
+      <span className={`text-xl dark:text-white px-8 max-w-xl`}>{description}</span>
       {error && (
         <button
           className="px-4 py-2 rounded-md bg-gray-200 hover:bg-gray-300 dark:bg-gray-700 dark:hover:bg-gray-600 text-gray-800 dark:text-gray-200 transition-colors"
diff --git a/src/entry-client.jsx b/src/entry-client.jsx
deleted file mode 100644
index 66ddb84..0000000
--- a/src/entry-client.jsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react'
-import ReactDOM from 'react-dom/client'
-import App from './app/App'
-
-// import '@fontsource-variable/inter'
-// import '@fontsource-variable/jetbrains-mono'
-
-ReactDOM.hydrateRoot(
-  document.getElementById('root'),
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>
-)
diff --git a/src/entry-server.jsx b/src/entry-server.jsx
deleted file mode 100644
index ff903c3..0000000
--- a/src/entry-server.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import './index.css'
-import React from 'react'
-import ReactDOMServer from 'react-dom/server'
-import { StaticRouter } from 'react-router-dom/server'
-import App from './app/App'
-
-export function render(url) {
-  return ReactDOMServer.renderToString(
-    <React.StrictMode>
-      <StaticRouter location={url}>
-        <App />
-      </StaticRouter>
-    </React.StrictMode>
-  )
-}
diff --git a/src/layouts/Head.jsx b/src/layouts/Head.jsx
new file mode 100644
index 0000000..f9e1f25
--- /dev/null
+++ b/src/layouts/Head.jsx
@@ -0,0 +1,13 @@
+import React from 'react'
+import iconUrl from '../../public/icon.svg'
+
+export default function HeadDefault() {
+  return (
+    <>
+      <meta name="viewport" content="width=device-width, initial-scale=1" />
+      <meta name="description" content="Update your comma device to the latest software" />
+      <link rel="icon" type="image/svg+xml" href={iconUrl} />
+      <script defer data-domain="flash.comma.ai" src="https://plausible.io/js/script.outbound-links.js"></script>
+    </>
+  );
+}
diff --git a/src/layouts/Layout.jsx b/src/layouts/Layout.jsx
new file mode 100644
index 0000000..7febf1b
--- /dev/null
+++ b/src/layouts/Layout.jsx
@@ -0,0 +1,9 @@
+import '../index.css'
+
+import React from 'react'
+
+export default function Layout({ children }) {
+  return (
+    <React.StrictMode>{children}</React.StrictMode>
+  )
+}
diff --git a/src/pages/+config.js b/src/pages/+config.js
new file mode 100644
index 0000000..5a49bba
--- /dev/null
+++ b/src/pages/+config.js
@@ -0,0 +1,11 @@
+import vikeReact from 'vike-react/config'
+import Head from '../layouts/Head'
+import Layout from '../layouts/Layout'
+
+export default {
+  Head,
+  Layout,
+  title: "flash.comma.ai",
+  extends: vikeReact,
+}
+
diff --git a/src/app/App.jsx b/src/pages/index/+Page.jsx
similarity index 92%
rename from src/app/App.jsx
rename to src/pages/index/+Page.jsx
index f62c5e9..c02e311 100644
--- a/src/app/App.jsx
+++ b/src/pages/index/+Page.jsx
@@ -1,15 +1,14 @@
-import { Suspense, lazy } from 'react'
+import Flash from '../../components/Flash'
 
-import comma from '../assets/comma.svg'
-import fastbootPorts from '../assets/fastboot-ports.svg'
-import zadigCreateNewDevice from '../assets/zadig_create_new_device.png'
-import zadigForm from '../assets/zadig_form.png'
+import comma from '../../assets/comma.svg'
+import fastbootPorts from '../../assets/fastboot-ports.svg'
+import zadigCreateNewDevice from '../../assets/zadig_create_new_device.png'
+import zadigForm from '../../assets/zadig_form.png'
 
-const Flash = lazy(() => import('./Flash.client'));
 
 export default function App() {
-  const version = import.meta.env.VITE_PUBLIC_GIT_SHA || 'dev'
-  console.info(`flash.comma.ai version: ${version}`);
+  const version = import.meta?.env?.VITE_PUBLIC_GIT_SHA ?? 'dev'
+  console.info(`flash.comma.ai version: ${version}`)
   return (
     <div className="flex flex-col lg:flex-row flex-wrap">
       <main className="p-12 md:p-16 lg:p-20 xl:p-24 w-screen max-w-none lg:max-w-prose lg:w-auto h-auto lg:h-screen lg:overflow-y-auto prose dark:prose-invert prose-green bg-white dark:bg-gray-900">
@@ -149,9 +148,7 @@ export default function App() {
       </main>
 
       <div className="lg:flex-1 h-[700px] lg:h-screen bg-gray-100 dark:bg-gray-800">
-        <Suspense>
-          <Flash />
-        </Suspense>
+        <Flash />
       </div>
 
       <div className="w-screen max-w-none p-12 md:p-16 prose dark:prose-invert bg-white dark:bg-gray-900 lg:hidden">
diff --git a/src/app/App.test.jsx b/src/pages/index/Page.test.jsx
similarity index 100%
rename from src/app/App.test.jsx
rename to src/pages/index/Page.test.jsx
diff --git a/src/utils/fastboot.js b/src/utils/fastboot.js
index 5142b4b..5171e5c 100644
--- a/src/utils/fastboot.js
+++ b/src/utils/fastboot.js
@@ -103,7 +103,7 @@ export function useFastboot() {
   /** @type {React.RefObject<Image[]>} */
   const manifest = useRef(null)
 
-  const initializePromise = useRef(null);
+  const initializePromise = useRef(null)
 
   function setMessage(message = '') {
     if (message) console.info('[fastboot]', message)
diff --git a/vite.config.js b/vite.config.js
index e379ad4..8d0a0c1 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,26 +1,19 @@
-import { fileURLToPath, URL } from 'node:url';
+import { fileURLToPath, URL } from 'node:url'
 import { defineConfig } from 'vite'
 import react from '@vitejs/plugin-react'
-import tailwindcss from 'tailwindcss'
-import autoprefixer from 'autoprefixer'
+import vike from 'vike/plugin'
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [
     react(),
+    vike({
+      prerender: true,
+    }),
   ],
-  build: {
-    ssr: true,
-    rollupOptions: {
-      input: {
-        server: '/src/entry-server.jsx',
-      },
-    },
-  },
-  css: {
-    postcss: {
-      plugins: [tailwindcss, autoprefixer],
-    },
+  publicDir: 'public',
+  preview: {
+    port: 5173
   },
   resolve: {
     alias: [
