diff --git a/.yarn/cache/react-image-crop-npm-8.6.7-446344a049-17b82f740f.zip b/.yarn/cache/react-image-crop-npm-8.6.8-27eb7b329d-9608a28c98.zip
similarity index 78%
rename from .yarn/cache/react-image-crop-npm-8.6.7-446344a049-17b82f740f.zip
rename to .yarn/cache/react-image-crop-npm-8.6.8-27eb7b329d-9608a28c98.zip
index fe129db2e8..3cb38369cf 100644
Binary files a/.yarn/cache/react-image-crop-npm-8.6.7-446344a049-17b82f740f.zip and b/.yarn/cache/react-image-crop-npm-8.6.8-27eb7b329d-9608a28c98.zip differ
diff --git a/packages/cra-template-foundations/package.json b/packages/cra-template-foundations/package.json
index b08adce66c..975720b6d4 100644
--- a/packages/cra-template-foundations/package.json
+++ b/packages/cra-template-foundations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reapit/cra-template-foundations",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "main": "./template.json",
   "license": "MIT",
   "scripts": {
diff --git a/packages/cra-template-foundations/template.json b/packages/cra-template-foundations/template.json
index 312fac2081..95e6b97510 100644
--- a/packages/cra-template-foundations/template.json
+++ b/packages/cra-template-foundations/template.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "dependencies": {
-      "@reapit/elements": "^2.0.0-alpha.1",
+      "@reapit/elements": "^2.0.5",
       "@reapit/connect-session": "^2.3.0",
       "@reapit/foundations-ts-definitions": "^1.2.0",
       "@types/enzyme": "^3.10.8",
diff --git a/packages/elements/package.json b/packages/elements/package.json
index 603b5a7271..1bcf3a7e0b 100644
--- a/packages/elements/package.json
+++ b/packages/elements/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@reapit/elements",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "A collection of React components and utilities for building apps for Reapit Marketplace",
   "homepage": "https://github.com/reapit/foundations#readme",
   "bugs": {
@@ -17,13 +17,14 @@
   "module": "dist/elements.esm.js",
   "typings": "dist/index.d.ts",
   "files": [
-    "dist",
+    "dist/",
+    "v3/",
     "src/tests/badges"
   ],
   "scripts": {
     "build": "yarn build:v3 && yarn build:v2",
-    "build:v2": "concurrently \"cross-env NODE_ENV=production && rimraf dist && echo 'tsdx build --format=cjs,esm,umd'\" \"cross-env NODE_ENV=production && rimraf public/dist && build-storybook -o public/dist\"",
-    "build:v3": "cross-env NODE_ENV=production && rimraf v3 && rimraf dist && echo 'tsdx build --entry src/v3.tsx --name v3 --format=cjs,esm,umd && move-file dist/ v3/'",
+    "build:v2": "concurrently \"cross-env NODE_ENV=production && tsdx build --format=cjs,esm,umd\" \"cross-env NODE_ENV=production && rimraf public/dist && build-storybook -o public/dist\"",
+    "build:v3": "cross-env NODE_ENV=production && rimraf ./v3 && tsdx build --entry src/v3.tsx --name v3 --format=cjs,esm,umd && move-file dist/ v3/",
     "commit": "concurrently \"yarn test --coverage --no-cache --silent --forceExit --detectOpenHandles --runInBand --watch=false && jest-coverage-badges --input src/tests/coverage/coverage-summary.json --output src/tests/badges\" \"yarn lint\"",
     "conf": "yarn config-manager --namespace cloud --entity elements --name local --mode fetch",
     "lint": "eslint --cache --ext=ts,tsx src --fix",
diff --git a/packages/elements/src/v3.tsx b/packages/elements/src/v3.tsx
index 05ca557beb..0e6f605793 100644
--- a/packages/elements/src/v3.tsx
+++ b/packages/elements/src/v3.tsx
@@ -2,9 +2,12 @@ export * from './styles-v3/base/variables'
 export * from './styles-v3/base/spacing'
 export * from './styles-v3/base/box-alignment'
 export * from './styles-v3/base/flexbox'
-export * from './styles-v3/base/intent'
 export * from './styles-v3/base/sizing'
-export * from './styles-v3/base/states'
+export * from './styles-v3/base/borders'
+export * from './styles-v3/base/typography'
+// Not yet implemented
+// export * from './styles-v3/base/intent'
+// export * from './styles-v3/base/states'
 
 export * from './components-v3/AfterInputText'
 export * from './components-v3/Button'
diff --git a/yarn.lock b/yarn.lock
index 62541b126e..64e29afb41 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5251,7 +5251,7 @@ __metadata:
     react-google-map: ^3.1.1
     react-google-maps-loader: 4.3.0
     react-icons: ^3.11.0
-    react-image-crop: 8.6.7
+    react-image-crop: 8.6.8
     react-is: ^16.13.1
     react-table: ^7.6.3
     react-transition-group: ^4.4.1
@@ -30232,16 +30232,16 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"react-image-crop@npm:8.6.7":
-  version: 8.6.7
-  resolution: "react-image-crop@npm:8.6.7"
+"react-image-crop@npm:8.6.8":
+  version: 8.6.8
+  resolution: "react-image-crop@npm:8.6.8"
   dependencies:
     clsx: ^1.1.1
     core-js: ^3.11.0
     prop-types: ^15.7.2
   peerDependencies:
     react: ">=16.13.1"
-  checksum: 17b82f740fd5db8c89245a24ea5be1eee2c13921384af54556c8999f09720d630aaadc23e27123a3edb291998e2f6216120b123fb15795c4e0c48ddd0ed710cb
+  checksum: 9608a28c9821863ecd34d991c86bb0a8953514360ac10d0bef7938f2c5eff0df84dd171f538f3e957f99dcb12d6243f4d860be05e02d77401660563db6de167f
   languageName: node
   linkType: hard