diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index f850785f..947fbbf3 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -96,3 +96,10 @@ jobs:
           npm i
           npm run build
           npm run check
+
+      - name: Validate Solid
+        working-directory: templates/solid
+        run: |
+          npm i
+          npm run build
+          npm run compile
diff --git a/docs/.vitepress/components/Icon.vue b/docs/.vitepress/components/Icon.vue
index 7d898f4d..7daa3736 100644
--- a/docs/.vitepress/components/Icon.vue
+++ b/docs/.vitepress/components/Icon.vue
@@ -1,17 +1,19 @@
 <script lang="ts" setup>
-defineProps<{
+import { computed } from 'vue';
+
+const props = defineProps<{
   name: string;
   icon?: string;
 }>();
+
+const src = computed(() => {
+  if (props.icon) return props.icon;
+  return `https://raw.githubusercontent.com/PKief/vscode-material-icon-theme/main/icons/${props.name.toLowerCase()}.svg`;
+});
 </script>
 
 <template>
-  <img
-    :src="`https://raw.githubusercontent.com/PKief/vscode-material-icon-theme/main/icons/${
-      name?.toLowerCase() ?? icon
-    }.svg`"
-    :alt="`${name} Logo`"
-  />
+  <img :src="src" :alt="`${name} Logo`" />
 </template>
 
 <style scoped>
diff --git a/docs/get-started/installation.md b/docs/get-started/installation.md
index c6531a72..6b9b2db5 100644
--- a/docs/get-started/installation.md
+++ b/docs/get-started/installation.md
@@ -24,12 +24,13 @@ npx wxt@latest init
 
 There are several starting templates available.
 
-| TypeScript                                                                                           |
-| ---------------------------------------------------------------------------------------------------- |
-| <Icon name="TypeScript" /> [`vanilla`](https://github.com/aklinker1/wxt/tree/main/templates/vanilla) |
-| <Icon name="Vue" /> [`vue`](https://github.com/aklinker1/wxt/tree/main/templates/vue)                |
-| <Icon name="React" /> [`react`](https://github.com/aklinker1/wxt/tree/main/templates/react)          |
-| <Icon name="Svelte" /> [`svelte`](https://github.com/aklinker1/wxt/tree/main/templates/svelte)       |
+| TypeScript                                                                                                                                                |
+| --------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| <Icon name="TypeScript" /> [`vanilla`](https://github.com/aklinker1/wxt/tree/main/templates/vanilla)                                                      |
+| <Icon name="Vue" /> [`vue`](https://github.com/aklinker1/wxt/tree/main/templates/vue)                                                                     |
+| <Icon name="React" /> [`react`](https://github.com/aklinker1/wxt/tree/main/templates/react)                                                               |
+| <Icon name="Svelte" /> [`svelte`](https://github.com/aklinker1/wxt/tree/main/templates/svelte)                                                            |
+| <Icon name="Solid" icon="https://www.solidjs.com/img/favicons/favicon-32x32.png" /> [`solid`](https://github.com/aklinker1/wxt/tree/main/templates/solid) |
 
 > All templates are in TypeScript. WXT does not support JS at this time.
 
diff --git a/templates/solid/.npmrc b/templates/solid/.npmrc
new file mode 100644
index 00000000..bf2e7648
--- /dev/null
+++ b/templates/solid/.npmrc
@@ -0,0 +1 @@
+shamefully-hoist=true
diff --git a/templates/solid/README.md b/templates/solid/README.md
new file mode 100644
index 00000000..4be124af
--- /dev/null
+++ b/templates/solid/README.md
@@ -0,0 +1,3 @@
+# WXT + SolidJS
+
+This template should help get you started developing with SolidJS in WXT.
diff --git a/templates/solid/_gitignore b/templates/solid/_gitignore
new file mode 100644
index 00000000..b694a278
--- /dev/null
+++ b/templates/solid/_gitignore
@@ -0,0 +1,23 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+.output
+artifacts
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/templates/solid/assets/solid.svg b/templates/solid/assets/solid.svg
new file mode 100644
index 00000000..8a8988c4
--- /dev/null
+++ b/templates/solid/assets/solid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 166 155.3"><defs><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="27.5" y1="3" x2="152" y2="63.5"><stop offset=".1" stop-color="#76b3e1"/><stop offset=".3" stop-color="#dcf2fd"/><stop offset="1" stop-color="#76b3e1"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="95.8" y1="32.6" x2="74" y2="105.2"><stop offset="0" stop-color="#76b3e1"/><stop offset=".5" stop-color="#4377bb"/><stop offset="1" stop-color="#1f3b77"/></linearGradient><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="18.4" y1="64.2" x2="144.3" y2="149.8"><stop offset="0" stop-color="#315aa9"/><stop offset=".5" stop-color="#518ac8"/><stop offset="1" stop-color="#315aa9"/></linearGradient><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="75.2" y1="74.5" x2="24.4" y2="260.8"><stop offset="0" stop-color="#4377bb"/><stop offset=".5" stop-color="#1a336b"/><stop offset="1" stop-color="#1a336b"/></linearGradient></defs><path d="M163 35S110-4 69 5l-3 1c-6 2-11 5-14 9l-2 3-15 26 26 5c11 7 25 10 38 7l46 9 18-30z" fill="#76b3e1"/><path d="M163 35S110-4 69 5l-3 1c-6 2-11 5-14 9l-2 3-15 26 26 5c11 7 25 10 38 7l46 9 18-30z" opacity=".3" fill="url(#a)"/><path d="M52 35l-4 1c-17 5-22 21-13 35 10 13 31 20 48 15l62-21S92 26 52 35z" fill="#518ac8"/><path d="M52 35l-4 1c-17 5-22 21-13 35 10 13 31 20 48 15l62-21S92 26 52 35z" opacity=".3" fill="url(#b)"/><path d="M134 80a45 45 0 00-48-15L24 85 4 120l112 19 20-36c4-7 3-15-2-23z" fill="url(#c)"/><path d="M114 115a45 45 0 00-48-15L4 120s53 40 94 30l3-1c17-5 23-21 13-34z" fill="url(#d)"/></svg>
\ No newline at end of file
diff --git a/templates/solid/entrypoints/background.ts b/templates/solid/entrypoints/background.ts
new file mode 100644
index 00000000..f96fa480
--- /dev/null
+++ b/templates/solid/entrypoints/background.ts
@@ -0,0 +1,3 @@
+export default defineBackground(() => {
+  console.log('Hello background!', { id: browser.runtime.id });
+});
diff --git a/templates/solid/entrypoints/popup/App.css b/templates/solid/entrypoints/popup/App.css
new file mode 100644
index 00000000..613607d4
--- /dev/null
+++ b/templates/solid/entrypoints/popup/App.css
@@ -0,0 +1,27 @@
+#root {
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+}
+
+.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+  transition: filter 300ms;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.solid:hover {
+  filter: drop-shadow(0 0 2em #61dafbaa);
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
+}
diff --git a/templates/solid/entrypoints/popup/App.tsx b/templates/solid/entrypoints/popup/App.tsx
new file mode 100644
index 00000000..fcf09b3d
--- /dev/null
+++ b/templates/solid/entrypoints/popup/App.tsx
@@ -0,0 +1,35 @@
+import { createSignal } from 'solid-js';
+import solidLogo from '@/assets/solid.svg';
+import wxtLogo from '/wxt.svg';
+import './App.css';
+
+function App() {
+  const [count, setCount] = createSignal(0);
+
+  return (
+    <>
+      <div>
+        <a href="https://wxt.dev" target="_blank">
+          <img src={wxtLogo} class="logo" alt="WXT logo" />
+        </a>
+        <a href="https://solidjs.com" target="_blank">
+          <img src={solidLogo} class="logo solid" alt="Solid logo" />
+        </a>
+      </div>
+      <h1>WXT + Solid</h1>
+      <div class="card">
+        <button onClick={() => setCount((count) => count + 1)}>
+          count is {count()}
+        </button>
+        <p>
+          Edit <code>popup/App.tsx</code> and save to test HMR
+        </p>
+      </div>
+      <p class="read-the-docs">
+        Click on the WXT and Solid logos to learn more
+      </p>
+    </>
+  );
+}
+
+export default App;
diff --git a/templates/solid/entrypoints/popup/index.css b/templates/solid/entrypoints/popup/index.css
new file mode 100644
index 00000000..2c3fac68
--- /dev/null
+++ b/templates/solid/entrypoints/popup/index.css
@@ -0,0 +1,69 @@
+:root {
+  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-text-size-adjust: 100%;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+  line-height: 1.1;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover {
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+  a:hover {
+    color: #747bff;
+  }
+  button {
+    background-color: #f9f9f9;
+  }
+}
diff --git a/templates/solid/entrypoints/popup/index.html b/templates/solid/entrypoints/popup/index.html
new file mode 100644
index 00000000..79f9a1e0
--- /dev/null
+++ b/templates/solid/entrypoints/popup/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Default Popup Title</title>
+    <meta name="manifest.type" content="browser_action" />
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="./index.tsx"></script>
+  </body>
+</html>
diff --git a/templates/solid/entrypoints/popup/index.tsx b/templates/solid/entrypoints/popup/index.tsx
new file mode 100644
index 00000000..5f34023b
--- /dev/null
+++ b/templates/solid/entrypoints/popup/index.tsx
@@ -0,0 +1,6 @@
+import { render } from 'solid-js/web';
+
+import './index.css';
+import App from './App';
+
+render(() => <App />, document.getElementById('root')!);
diff --git a/templates/solid/package.json b/templates/solid/package.json
new file mode 100644
index 00000000..62fbe9d9
--- /dev/null
+++ b/templates/solid/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "wxt-starter",
+  "description": "manifest.json description",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "wxt",
+    "dev:firefox": "wxt -b firefox",
+    "build": "wxt build",
+    "build:firefox": "wxt build -b firefox",
+    "compile": "tsc --noEmit",
+    "postinstall": "wxt prepare"
+  },
+  "dependencies": {
+    "solid-js": "^1.7.8"
+  },
+  "devDependencies": {
+    "typescript": "^5.1.6",
+    "vite-plugin-solid": "^2.7.0",
+    "wxt": "^0.3.0"
+  }
+}
diff --git a/templates/solid/public/icon/128.png b/templates/solid/public/icon/128.png
new file mode 100644
index 00000000..9e35d130
Binary files /dev/null and b/templates/solid/public/icon/128.png differ
diff --git a/templates/solid/public/icon/16.png b/templates/solid/public/icon/16.png
new file mode 100644
index 00000000..cd09f8cf
Binary files /dev/null and b/templates/solid/public/icon/16.png differ
diff --git a/templates/solid/public/icon/32.png b/templates/solid/public/icon/32.png
new file mode 100644
index 00000000..f51ce1b5
Binary files /dev/null and b/templates/solid/public/icon/32.png differ
diff --git a/templates/solid/public/icon/48.png b/templates/solid/public/icon/48.png
new file mode 100644
index 00000000..cb7a4494
Binary files /dev/null and b/templates/solid/public/icon/48.png differ
diff --git a/templates/solid/public/icon/96.png b/templates/solid/public/icon/96.png
new file mode 100644
index 00000000..c28ad52d
Binary files /dev/null and b/templates/solid/public/icon/96.png differ
diff --git a/templates/solid/public/wxt.svg b/templates/solid/public/wxt.svg
new file mode 100644
index 00000000..0e763206
--- /dev/null
+++ b/templates/solid/public/wxt.svg
@@ -0,0 +1,15 @@
+<svg width="72" height="72" viewBox="0 0 72 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_305_516)">
+<g clip-path="url(#clip1_305_516)">
+<path d="M49.0229 69.1875C54.1272 69.1875 58.265 65.0497 58.265 59.9454V50.7033H59.9454C65.0497 50.7033 69.1875 46.5655 69.1875 41.4612C69.1875 36.357 65.0497 32.2191 59.9454 32.2191H58.265V22.9771C58.265 17.8728 54.1272 13.735 49.0229 13.735H39.7809V12.0546C39.7809 6.95032 35.643 2.8125 30.5388 2.8125C25.4345 2.8125 21.2967 6.95032 21.2967 12.0546V13.735H12.0546C6.95032 13.735 2.8125 17.8728 2.8125 22.9771V32.2191H4.49288C9.59714 32.2191 13.735 36.357 13.735 41.4612C13.735 46.5655 9.59714 50.7033 4.49288 50.7033H2.8125V69.1875H21.2967V67.5071C21.2967 62.4029 25.4345 58.265 30.5388 58.265C35.643 58.265 39.7809 62.4029 39.7809 67.5071V69.1875H49.0229Z" stroke="#67D55E" stroke-width="5.625"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_305_516">
+<rect width="72" height="72" fill="white"/>
+</clipPath>
+<clipPath id="clip1_305_516">
+<rect width="72" height="72" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/templates/solid/tsconfig.json b/templates/solid/tsconfig.json
new file mode 100644
index 00000000..db3e3142
--- /dev/null
+++ b/templates/solid/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./.wxt/tsconfig.json",
+  "compilerOptions": {
+    "jsx": "preserve",
+    "jsxImportSource": "solid-js"
+  }
+}
diff --git a/templates/solid/wxt.config.ts b/templates/solid/wxt.config.ts
new file mode 100644
index 00000000..ec2694b5
--- /dev/null
+++ b/templates/solid/wxt.config.ts
@@ -0,0 +1,21 @@
+import { defineConfig } from 'wxt';
+import Solid from 'vite-plugin-solid';
+
+// See https://wxt.dev/config.html
+export default defineConfig({
+  manifest: {
+    icons: {
+      '16': 'icon/16.png',
+      '32': 'icon/32.png',
+      '48': 'icon/48.png',
+      '96': 'icon/96.png',
+      '128': 'icon/128.png',
+    },
+  },
+  vite: {
+    build: {
+      target: 'esnext',
+    },
+    plugins: [Solid()],
+  },
+});