diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa418da..6be68eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # waft-design-system
 
+## 0.0.4
+
+### Patch Changes
+
+- Build target bump to es2021 and make import more specific
+
 ## 0.0.3
 
 ### Patch Changes
diff --git a/package.json b/package.json
index a11b7cf..c5fa9d8 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.3",
+  "version": "0.0.4",
   "type": "module",
   "main": "dist/waft.js",
   "module": "dist/waft.js",
diff --git a/src/components/button/button.mdx b/src/components/button/button.mdx
index 0216a78..f52d489 100644
--- a/src/components/button/button.mdx
+++ b/src/components/button/button.mdx
@@ -1,6 +1,6 @@
 import { Meta } from '@storybook/blocks';
 import { parts } from './index.ts';
-import { componentTokensToWebTokens } from '../../design-tokens';
+import { componentTokensToWebTokens } from '../../design-tokens/index.ts';
 
 <Meta title="Web/Labs/Button/Extra" />
 
diff --git a/src/components/button/button.ts b/src/components/button/button.ts
index 1303f7f..653db50 100644
--- a/src/components/button/button.ts
+++ b/src/components/button/button.ts
@@ -1,7 +1,7 @@
 import { LitElement, unsafeCSS, css, html } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
 import { classMap } from 'lit/directives/class-map.js';
-import { getWebTokenValue } from '../../design-tokens';
+import { getWebTokenValue } from '../../design-tokens/index.ts';
 
 type Type = 'button' | 'submit' | 'reset';
 type Appearance = 'accent' | 'default';
diff --git a/src/components/index.ts b/src/components/index.ts
index eaf5eea..73759ac 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -1 +1 @@
-export * from './button';
+export * from './button/index.ts';
diff --git a/src/docs/component-contribution-process.mdx b/src/docs/component-contribution-process.mdx
index f6550e8..63ead1b 100644
--- a/src/docs/component-contribution-process.mdx
+++ b/src/docs/component-contribution-process.mdx
@@ -1,4 +1,4 @@
-import { Meta } from "@storybook/blocks";
+import { Meta } from '@storybook/blocks';
 
 <Meta title="Contribution/Component" />
 
diff --git a/src/docs/design-principles.mdx b/src/docs/design-principles.mdx
index aeb62c1..bf0550e 100644
--- a/src/docs/design-principles.mdx
+++ b/src/docs/design-principles.mdx
@@ -1,4 +1,4 @@
-import { Meta } from "@storybook/blocks";
+import { Meta } from '@storybook/blocks';
 
 <Meta title="Foundations/Design principles" />
 
diff --git a/src/docs/guides-styling.mdx b/src/docs/guides-styling.mdx
index 65b80cd..5bedc0b 100644
--- a/src/docs/guides-styling.mdx
+++ b/src/docs/guides-styling.mdx
@@ -1,4 +1,4 @@
-import { Meta } from "@storybook/blocks";
+import { Meta } from '@storybook/blocks';
 
 <Meta title="Guides/Styling components" />
 
diff --git a/src/docs/web-components-introduction.mdx b/src/docs/web-components-introduction.mdx
index aacdf7b..e07e58a 100644
--- a/src/docs/web-components-introduction.mdx
+++ b/src/docs/web-components-introduction.mdx
@@ -1,4 +1,4 @@
-import { Meta } from "@storybook/blocks";
+import { Meta } from '@storybook/blocks';
 
 <Meta title="Web/Components/Introduction" />
 
diff --git a/src/docs/web-css-variables.mdx b/src/docs/web-css-variables.mdx
index 234854d..8fed2d2 100644
--- a/src/docs/web-css-variables.mdx
+++ b/src/docs/web-css-variables.mdx
@@ -1,5 +1,5 @@
 import { Meta, Source } from '@storybook/blocks';
-import { renderTokens, isGlobalToken, transformTokenNameToWebTokenName } from '../design-tokens';
+import { renderTokens, isGlobalToken, transformTokenNameToWebTokenName } from '../design-tokens/index.ts';
 
 <Meta title="Web/CSS variables" />
 
diff --git a/src/docs/web-get-started.mdx b/src/docs/web-get-started.mdx
index 96a9a35..e806f47 100644
--- a/src/docs/web-get-started.mdx
+++ b/src/docs/web-get-started.mdx
@@ -1,5 +1,5 @@
 import { Meta, Source } from '@storybook/blocks';
-import { generateWebGlobalStyles } from '../design-tokens';
+import { generateWebGlobalStyles } from '../design-tokens/index.ts';
 
 <Meta title="Web/Get started" />
 
diff --git a/src/docs/web-labs-introduction.mdx b/src/docs/web-labs-introduction.mdx
index dace65d..ab1df6c 100644
--- a/src/docs/web-labs-introduction.mdx
+++ b/src/docs/web-labs-introduction.mdx
@@ -1,4 +1,4 @@
-import { Meta } from "@storybook/blocks";
+import { Meta } from '@storybook/blocks';
 
 <Meta title="Web/Labs/Introduction" />
 
diff --git a/tsconfig.json b/tsconfig.json
index 029ca81..56ca178 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ES2021",
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
     "module": "ESNext",
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "lib": ["ES2021", "DOM", "DOM.Iterable"],
     "skipLibCheck": true,
 
     /* Bundler mode */
@@ -19,12 +19,13 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
-    "declaration": true
+    "declaration": true,
+    "declarationMap": true
   },
   "include": ["src"],
   /* Remove Storybook files */
   "exclude": [
-    "../src/**/*.mdx", 
+    "../src/**/*.mdx",
     "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"
   ]
 }