diff --git a/packages/ui/README.md b/packages/ui/README.md
index 4b449f0..fbeb0d6 100644
--- a/packages/ui/README.md
+++ b/packages/ui/README.md
@@ -30,12 +30,12 @@ We're looking for maintainers and contributors!
 - [ ] Make sure all native Web Components are properly working
   - [x] Demo all components
   - [x] Add all missing events
-  - [ ] Add theming (design tokens) through Tailwind (i.e. remove all ts-ignores)
+  - [ ] [Need help] Add theming (design tokens) through Tailwind (i.e. remove all ts-ignores) (https://github.com/grayhatdevelopers/material-web-components-react/pull/2)
 - [x] Resolve SSR/SSG issues, make compatible with NextJS (i.e. remove all dynamic imports)
 - [x] Separate the demo from the actual UI code
 - [x] Make installable as a package.
-- [ ] Make installable as code-in-project, like shadcn/ui, so developers have more control
-- [ ] Add better TypeScript support
+- [ ] [Need help] Make installable as code-in-project, like shadcn/ui, so developers have more control (https://github.com/grayhatdevelopers/material-web-components-react/pull/11)
+- [ ] [Need help] Add better TypeScript support (https://github.com/grayhatdevelopers/material-web-components-react/issues/12)
 - [ ] Sync with upstream (i.e. https://github.com/material-components/material-web/blob/main/docs/intro.md) through webhooks and automations
   - [ ] Use [Copybara](https://github.com/google/copybara) (or good ol' GitHub webhooks) to automate syncing with upstream
   - [ ] Use [lit-analyzer](https://www.npmjs.com/package/lit-analyzer) to see which Web Components changed. Perhaps mix with an LLM to compare existing and newly autogenerated code.
diff --git a/packages/ui/src/app-bar/index.tsx b/packages/ui/src/app-bar/index.tsx
index 1bfe51d..7ef2c1f 100644
--- a/packages/ui/src/app-bar/index.tsx
+++ b/packages/ui/src/app-bar/index.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from "react";
 import { twMerge } from "tailwind-merge";
-import { findSlotProp, removeSlotProps } from "../utils";
+import { findSlotProp, removeSlotProps } from "../utils/index.js";
 
 const AppBar = ({
   className,
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
index e1e973f..9f1e78d 100644
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "outDir": "dist"
   },
-  "include": ["**/*"],
+  "include": ["**/*", "*.cjs"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/packages/ui/tsconfig.lint.json b/packages/ui/tsconfig.lint.json
index 0973ecd..2f1b5eb 100644
--- a/packages/ui/tsconfig.lint.json
+++ b/packages/ui/tsconfig.lint.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "outDir": "dist"
   },
-  "include": ["src", "turbo", "./*.ts"],
+  "include": ["src", "turbo", "**/*.ts*", "*.cjs"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/packages/ui/tsup.config.ts b/packages/ui/tsup.config.ts
index d1c6b59..fc06e99 100644
--- a/packages/ui/tsup.config.ts
+++ b/packages/ui/tsup.config.ts
@@ -1,9 +1,8 @@
 import glob from "tiny-glob";
 import { defineConfig } from "tsup";
-import tailwind from "tailwindcss";
-import autoprefixer from "autoprefixer";
 
 export default defineConfig(async (options) => ({
+  clean: true,
   entry: await glob("./src/**/!(*.d|*.spec).tsx"),
   splitting: true,
   target: "es5",
@@ -11,7 +10,7 @@ export default defineConfig(async (options) => ({
   // dts: true,
   treeshake: true,
   bundle: true,
+  // sourcemap: true,
   outDir: "./dist",
   minify: !options.watch,
-  plugins: [tailwind(), autoprefixer()],
 }));