diff --git a/package.json b/package.json
index bba8d3350..c3f6bd147 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
       "url": "https://github.com/juanrgm"
     }
   ],
+  "type": "module",
   "workspaces": [
     "scripts",
     "packages/*"
diff --git a/packages/base/package.json b/packages/base/package.json
index 2c0a6224b..e0b5b8cb1 100644
--- a/packages/base/package.json
+++ b/packages/base/package.json
@@ -10,6 +10,7 @@
     "unstyled",
     "ui"
   ],
+  "type": "module",
   "main": "index.jsx",
   "scripts": {
     "build": "tsc --build tsconfig.build.json",
diff --git a/packages/css/package.json b/packages/css/package.json
index a115a66bf..dfdab7713 100644
--- a/packages/css/package.json
+++ b/packages/css/package.json
@@ -7,6 +7,7 @@
     "css",
     "css-in-js"
   ],
+  "type": "module",
   "scripts": {
     "build": "tsc --build tsconfig.build.json",
     "clean": "tsc --build --clean tsconfig.build.json",
diff --git a/packages/icons-material/package.json b/packages/icons-material/package.json
index 1fe41757d..bdd40bcd6 100644
--- a/packages/icons-material/package.json
+++ b/packages/icons-material/package.json
@@ -11,6 +11,7 @@
     "material design",
     "icons"
   ],
+  "type": "module",
   "main": "index.jsx",
   "scripts": {
     "build": "tsc --build",
diff --git a/packages/material/package.json b/packages/material/package.json
index 53d025cf0..77451e6ad 100644
--- a/packages/material/package.json
+++ b/packages/material/package.json
@@ -12,6 +12,7 @@
     "material design",
     "ui"
   ],
+  "type": "module",
   "main": "index.jsx",
   "scripts": {
     "build": "tsc --build tsconfig.build.json",
diff --git a/packages/material/src/Paper/Paper.test.tsx b/packages/material/src/Paper/Paper.test.tsx
index 148a39528..d6810b303 100644
--- a/packages/material/src/Paper/Paper.test.tsx
+++ b/packages/material/src/Paper/Paper.test.tsx
@@ -8,9 +8,7 @@ describe("Paper", () => {
       <Paper data-testid="e" component="form" />
     ));
     const e = screen.getByTestId("e");
-    // [fix] https://github.com/swordev/suid/issues/234
-    // expect(e.nodeName).toBe("form");
-    expect(e.nodeName).toBe("DIV");
+    expect(e.nodeName).toBe("FORM");
     unmount();
   });
 });
diff --git a/packages/material/src/Paper/Paper.tsx b/packages/material/src/Paper/Paper.tsx
index 13d012a68..dddf915b8 100644
--- a/packages/material/src/Paper/Paper.tsx
+++ b/packages/material/src/Paper/Paper.tsx
@@ -97,6 +97,7 @@ const Paper = $.component(function Paper({
   return (
     <PaperRoot
       {...otherProps}
+      as={otherProps.component}
       ownerState={allProps}
       class={clsx(classes.root, allProps.class)}
     >
diff --git a/packages/styled-engine/package.json b/packages/styled-engine/package.json
index 7d9f72ba7..92a3e76ac 100644
--- a/packages/styled-engine/package.json
+++ b/packages/styled-engine/package.json
@@ -11,6 +11,7 @@
     "css",
     "css-in-js"
   ],
+  "type": "module",
   "main": "index.jsx",
   "scripts": {
     "build": "tsc --build tsconfig.build.json",
diff --git a/packages/system/package.json b/packages/system/package.json
index 387c76b37..d8dc65f48 100644
--- a/packages/system/package.json
+++ b/packages/system/package.json
@@ -9,6 +9,7 @@
     "mui",
     "system"
   ],
+  "type": "module",
   "main": "index.jsx",
   "scripts": {
     "build": "tsc --build tsconfig.build.json",
diff --git a/packages/types/package.json b/packages/types/package.json
index 64d9bad29..026e09fa9 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -9,6 +9,7 @@
     "mui",
     "types"
   ],
+  "type": "module",
   "scripts": {
     "build": "tsc --build tsconfig.build.json",
     "clean": "tsc --build --clean tsconfig.build.json",
diff --git a/packages/utils/package.json b/packages/utils/package.json
index bc46ff949..28a868805 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -5,6 +5,7 @@
   "keywords": [
     "utils"
   ],
+  "type": "module",
   "scripts": {
     "build": "tsc --build tsconfig.build.json",
     "clean": "tsc --build --clean tsconfig.build.json",