diff --git a/next.md b/next.md
index b1a9b7afe7d..95e9df802c8 100644
--- a/next.md
+++ b/next.md
@@ -73,6 +73,7 @@ inbox
 - remove types from dir 
   - yarn tamagui-build types and commits
   - 
+- move much logic from withTamgui into TamaguiPlugin
 - TestFontTokensInVariants types not autocompleting in variants... but showing properly on hover/type property
 - if no enterStyle or exitStyle set with AnimatePresence, it doesn't exit
 - pass Size down context (see Group) is this just Themes but for individual props (css variable direct support <Theme set={{ size: '$4' }}> ?)?
diff --git a/starters/next-expo-solito/packages/ui/package.json b/starters/next-expo-solito/packages/ui/package.json
index 0a85340b4bf..28cec30803d 100644
--- a/starters/next-expo-solito/packages/ui/package.json
+++ b/starters/next-expo-solito/packages/ui/package.json
@@ -5,18 +5,14 @@
     "*.css"
   ],
   "private": true,
-  "types": "./types/index",
+  "types": "src",
+  "module:jsx": "src",
   "main": "dist/cjs",
   "module": "dist/esm",
-  "module:jsx": "dist/jsx",
   "files": [
     "types",
     "dist"
   ],
-  "scripts": {
-    "build": "tamagui-build",
-    "watch": "tamagui-build --watch"
-  },
   "dependencies": {
     "@my/config": "*",
     "tamagui": "^1.0.1-beta.220"
diff --git a/starters/next-expo-solito/yarn.lock b/starters/next-expo-solito/yarn.lock
index 6ab220c7791..0d56dc1cffb 100644
--- a/starters/next-expo-solito/yarn.lock
+++ b/starters/next-expo-solito/yarn.lock
@@ -2789,6 +2789,7 @@ __metadata:
   resolution: "@my/ui@workspace:packages/ui"
   dependencies:
     "@my/config": "*"
+<<<<<<< HEAD
 <<<<<<< HEAD
     "@tamagui/build": ^1.0.1-beta.198
     tamagui: ^1.0.1-beta.198
@@ -2796,6 +2797,13 @@ __metadata:
     "@tamagui/build": ^1.0.1-beta.220
     tamagui: ^1.0.1-beta.220
 >>>>>>> 9ad2ba8c3 (fix(core): Fix native Input placeholderTextColor)
+=======
+    "@tamagui/build": ^1.0.1-beta.220
+    tamagui: ^1.0.1-beta.220
+=======
+    tamagui: ^1.0.1-beta.219
+>>>>>>> 98656ecca (feat(starters): Remove need for build step in ui package)
+>>>>>>> b930303c9 (feat(starters): Remove need for build step in ui package)
   languageName: unknown
   linkType: soft