diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 50b4feb..681ae7d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -96,7 +96,7 @@ jobs:
         run: yarn check:all
 
       - name: Build
-        run: yarn lerna run build
+        run: yarn build
       - name: Version
         run: yarn lerna version --force-publish --yes
       - name: 'NPM Identity'
diff --git a/.yarnrc.yml b/.yarnrc.yml
index 98b5516..ebe8f83 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,4 +1,3 @@
 nodeLinker: node-modules
 
 yarnPath: .yarn/releases/yarn-4.1.1.cjs
-nmHoistingLimits: 'workspaces'
diff --git a/package.json b/package.json
index bb16360..0145abb 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,8 @@
     "check:all": "yarn check:lint && yarn check:type && yarn check:test",
     "check:lint": "eslint packages --ext .ts,.tsx,.js,.jsx --max-warnings=0 --cache",
     "check:type": "tsc --noEmit",
-    "check:test": "echo skip",
-    "build": "lerna run check:all"
+    "check:test": "jest",
+    "build": "lerna run prepack"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.1.0",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a79732b..9617f16 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -7,7 +7,7 @@
   "module": "dist/esm/index.mjs",
   "types": "dist/types/index.d.ts",
   "scripts": {
-    "build": "rm -rf dist && tsup src --format esm --shims"
+    "prepack": "rm -rf dist && tsup src --format esm --shims"
   },
   "dependencies": {
     "bundle-n-require": "^1.0.1",
diff --git a/packages/core/package.json b/packages/core/package.json
index 028cb89..9c0dce2 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -6,9 +6,8 @@
   "types": "lib/typescript/src/index.d.ts",
   "homepage": "https://github.com/mj-studio-library/react-native-styled-system",
   "scripts": {
-    "build": "bob build",
     "gen": "node bin/theme-gen.js bin/theme.ts bin/ret.d.ts",
-    "prepare": "bob build"
+    "prepack": "bob build"
   },
   "repository": {
     "type": "git",
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
index d4c095d..cb4f82f 100644
--- a/packages/core/tsconfig.json
+++ b/packages/core/tsconfig.json
@@ -1,35 +1,7 @@
 {
+  "extends": "../../tsconfig",
   "compilerOptions": {
     "rootDir": ".",
-    "allowUnreachableCode": false,
-    "allowUnusedLabels": false,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "jsx": "react",
-    "lib": ["esnext"],
-    "module": "esnext",
-    "moduleResolution": "node",
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitReturns": false,
-    "noImplicitUseStrict": false,
-    "noImplicitAny": false,
-    "noStrictGenericChecks": false,
-    "noUncheckedIndexedAccess": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "resolveJsonModule": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "target": "esnext",
-    "verbatimModuleSyntax": true,
-    "types": ["node", "jest"]
-  },
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.tsx",
-  ],
-  "exclude": [
-    "**/*.test.*",
-    "node_modules"
-  ]
+    "outDir": "./lib/typescript"
+  }
 }
\ No newline at end of file