diff --git a/.storybook/main.ts b/.storybook/main.ts
index 737c00b72..4fdfc4949 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -1,10 +1,41 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable no-undef */
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 const require = createRequire(import.meta.url);
 export default {
 	stories: ["../stories/**/*.mdx", "../stories/**/*.stories.@(js|jsx|ts|tsx)"],
 	addons: [getAbsolutePath("@storybook/addon-links"), getAbsolutePath("@storybook/addon-docs")],
-	framework: getAbsolutePath("@storybook/web-components-vite")
+	framework: getAbsolutePath("@storybook/web-components-vite"),
+	viteFinal: (config: any, env: any) => {
+		// Only apply source aliases in dev mode for hot reload support
+		if (env.configType === "DEVELOPMENT") {
+			config.resolve.alias = config.resolve.alias || {};
+			config.resolve.alias["@nonfx/flow-core"] =
+				`${dirname(__dirname)}/packages/flow-core/src/index.ts`;
+			config.resolve.alias["@nonfx/flow-core-config"] =
+				`${dirname(__dirname)}/packages/flow-core-config/src/index.ts`;
+			config.resolve.alias["@nonfx/flow-icons"] =
+				`${dirname(__dirname)}/packages/flow-icons/src/index.ts`;
+			config.resolve.alias["@nonfx/flow-log"] =
+				`${dirname(__dirname)}/packages/flow-log/src/index.ts`;
+			config.resolve.alias["@nonfx/flow-code-editor"] =
+				`${dirname(__dirname)}/packages/flow-code-editor/src/index.ts`;
+			config.resolve.alias["@nonfx/flow-table"] =
+				`${dirname(__dirname)}/packages/flow-table/src/index.ts`;
+			config.resolve.alias["@nonfx/flow-md-editor"] =
+				`${dirname(__dirname)}/packages/flow-md-editor/src/index.ts`;
+			config.resolve.alias["@nonfx/flow-text-editor"] =
+				`${dirname(__dirname)}/packages/flow-text-editor/src/index.ts`;
+			config.resolve.alias["@nonfx/flow-form-builder"] =
+				`${dirname(__dirname)}/packages/flow-form-builder/src/index.ts`;
+			config.resolve.alias["@nonfx/flow-lineage"] =
+				`${dirname(__dirname)}/packages/flow-lineage/src/index.ts`;
+			config.resolve.alias["@nonfx/flow-dashboard"] =
+				`${dirname(__dirname)}/packages/flow-dashboard/src/index.ts`;
+		}
+		return config;
+	}
 };
 
 function getAbsolutePath(value: string) {
diff --git a/.storybook/preview.ts b/.storybook/preview.ts
index aaa2cca85..b641835af 100644
--- a/.storybook/preview.ts
+++ b/.storybook/preview.ts
@@ -1,6 +1,6 @@
 import { html } from "lit-html";
-import { register } from "@nonfx/flow-icons/src";
-import { ConfigUtil } from "@nonfx/flow-core-config";
+import { ConfigUtil } from "@nonfx/flow-core";
+import { register } from "@nonfx/flow-icons";
 import { changeRoute } from "./utils";
 import "@nonfx/flow-core";
 import "@nonfx/flow-log";
diff --git a/.storybook/tsconfig.json b/.storybook/tsconfig.json
new file mode 100644
index 000000000..cbbab3bf0
--- /dev/null
+++ b/.storybook/tsconfig.json
@@ -0,0 +1,3 @@
+{
+	"extends": "@nonfx/tsconfig"
+}
diff --git a/Makefile b/Makefile
index 6747a7941..2003b1bbe 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,13 @@ build-storybook: install
 .PHONY: build
 build: build-lib build-storybook
 
+.PHONY: clean
+clean:
+	@echo "🧹 Cleaning repo"
+	git clean -dfx
+	git gc --prune
+	@echo "✅ All clean!"
+
 .PHONY: test
 test: build-lib
 	bun run --bun --filter "*" test
diff --git a/bun.lock b/bun.lock
index 7790c66bd..9fbbbce41 100644
--- a/bun.lock
+++ b/bun.lock
@@ -16,6 +16,7 @@
         "@nonfx/flow-text-editor": "workspace:*",
         "@nonfx/tsconfig": "workspace:*",
         "d3": "^7.9.0",
+        "globals": "^16.5.0",
         "lit": "^3.2.1",
         "vite-bundle-analyzer": "^1.1.0",
       },
@@ -68,7 +69,7 @@
     },
     "packages/flow-code-editor": {
       "name": "@nonfx/flow-code-editor",
-      "version": "1.3.1",
+      "version": "1.3.2",
       "dependencies": {
         "@nonfx/flow-core": "workspace:*",
         "@nonfx/flow-core-config": "workspace:*",
@@ -96,7 +97,7 @@
     },
     "packages/flow-core": {
       "name": "@nonfx/flow-core",
-      "version": "5.1.3",
+      "version": "6.0.2",
       "dependencies": {
         "@emoji-mart/data": "^1.2.1",
         "@floating-ui/dom": "^1.6.13",
@@ -131,12 +132,12 @@
         "web-component-analyzer": "^2.0.0",
       },
       "peerDependencies": {
-        "@nonfx/flow-core-config": "^1.3.2",
+        "@nonfx/flow-core-config": "^1.3.3",
       },
     },
     "packages/flow-core-config": {
       "name": "@nonfx/flow-core-config",
-      "version": "1.3.2",
+      "version": "1.3.3",
       "devDependencies": {
         "typescript": "^5.7.3",
         "vite": "^6.2.0",
@@ -144,7 +145,7 @@
     },
     "packages/flow-dashboard": {
       "name": "@nonfx/flow-dashboard",
-      "version": "4.0.3",
+      "version": "5.0.2",
       "dependencies": {
         "@nonfx/flow-core": "workspace:*",
         "@nonfx/flow-core-config": "workspace:*",
@@ -174,7 +175,7 @@
     },
     "packages/flow-form-builder": {
       "name": "@nonfx/flow-form-builder",
-      "version": "6.0.3",
+      "version": "7.0.2",
       "dependencies": {
         "@nonfx/flow-core": "workspace:*",
         "@nonfx/flow-core-config": "workspace:*",
@@ -203,7 +204,7 @@
     },
     "packages/flow-icons": {
       "name": "@nonfx/flow-icons",
-      "version": "5.5.0",
+      "version": "6.0.1",
       "dependencies": {
         "@nonfx/flow-core": "workspace:^",
         "@nonfx/flow-core-config": "workspace:^",
@@ -223,7 +224,7 @@
     },
     "packages/flow-lineage": {
       "name": "@nonfx/flow-lineage",
-      "version": "3.4.1",
+      "version": "3.4.2",
       "dependencies": {
         "@nonfx/flow-core": "workspace:*",
         "@nonfx/flow-core-config": "workspace:*",
@@ -253,7 +254,7 @@
     },
     "packages/flow-log": {
       "name": "@nonfx/flow-log",
-      "version": "2.3.1",
+      "version": "2.3.2",
       "dependencies": {
         "@nonfx/flow-core": "workspace:*",
         "@nonfx/flow-core-config": "workspace:*",
@@ -283,7 +284,7 @@
     },
     "packages/flow-md-editor": {
       "name": "@nonfx/flow-md-editor",
-      "version": "6.0.1",
+      "version": "7.0.1",
       "dependencies": {
         "@nonfx/flow-core": "workspace:^",
         "@nonfx/flow-core-config": "workspace:^",
@@ -312,7 +313,7 @@
     },
     "packages/flow-table": {
       "name": "@nonfx/flow-table",
-      "version": "2.7.1",
+      "version": "2.7.2",
       "dependencies": {
         "@nonfx/flow-core": "workspace:*",
         "@nonfx/flow-core-config": "workspace:*",
@@ -339,7 +340,7 @@
     },
     "packages/flow-text-editor": {
       "name": "@nonfx/flow-text-editor",
-      "version": "0.2.1",
+      "version": "0.2.2",
       "dependencies": {
         "@nonfx/flow-core": "workspace:*",
         "@nonfx/flow-core-config": "workspace:*",
@@ -1683,7 +1684,7 @@
 
     "glob-parent": ["glob-parent@6.0.2", "", { "dependencies": { "is-glob": "^4.0.3" } }, "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="],
 
-    "globals": ["globals@14.0.0", "", {}, "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ=="],
+    "globals": ["globals@16.5.0", "", {}, "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ=="],
 
     "globby": ["globby@11.0.4", "", { "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", "fast-glob": "^3.1.1", "ignore": "^5.1.4", "merge2": "^1.3.0", "slash": "^3.0.0" } }, "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="],
 
@@ -2571,6 +2572,8 @@
 
     "@eslint-community/eslint-utils/eslint-visitor-keys": ["eslint-visitor-keys@3.4.3", "", {}, "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="],
 
+    "@eslint/eslintrc/globals": ["globals@14.0.0", "", {}, "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ=="],
+
     "@eslint/eslintrc/ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
 
     "@esm-bundle/chai/@types/chai": ["@types/chai@4.3.20", "", {}, "sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ=="],
diff --git a/package.json b/package.json
index 2ba510a9b..59a50d737 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
     "@nonfx/flow-text-editor": "workspace:*",
     "@nonfx/tsconfig": "workspace:*",
     "d3": "^7.9.0",
+    "globals": "^16.5.0",
     "lit": "^3.2.1",
     "vite-bundle-analyzer": "^1.1.0"
   },
diff --git a/packages/flow-code-editor/CHANGELOG.md b/packages/flow-code-editor/CHANGELOG.md
index fad61e724..a9aa8d258 100644
--- a/packages/flow-code-editor/CHANGELOG.md
+++ b/packages/flow-code-editor/CHANGELOG.md
@@ -1,5 +1,14 @@
 <h4 className="margin-btm-8">Release Notes</h4>
 
+## 1.3.2
+
+### Patch Changes
+
+- build cleanup
+- Updated dependencies
+  - @nonfx/flow-core-config@1.3.3
+  - @nonfx/flow-core@6.0.2
+
 ## 1.3.1
 
 ### Patch Changes
diff --git a/packages/flow-code-editor/package.json b/packages/flow-code-editor/package.json
index 3cc566146..7f47bf2fa 100644
--- a/packages/flow-code-editor/package.json
+++ b/packages/flow-code-editor/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nonfx/flow-code-editor",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Code editor component for flow library",
   "type": "module",
   "module": "dist/flow-code-editor.es.js",
-  "types": "dist/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "bash ./compile.sh",
     "build:watch": "concurrently --kill-others \"vite build --emptyOutDir --watch\" \"tsc --watch\"",
diff --git a/packages/flow-code-editor/tsconfig.json b/packages/flow-code-editor/tsconfig.json
index b917ab83f..035b0e3aa 100644
--- a/packages/flow-code-editor/tsconfig.json
+++ b/packages/flow-code-editor/tsconfig.json
@@ -1,8 +1,8 @@
 {
 	"extends": "@nonfx/tsconfig",
 	"compilerOptions": {
-		"rootDir": ".",
-		"outDir": "./dist"
+		"rootDir": "src",
+		"declarationDir": "./dist"
 	},
 	"include": ["src/**/*"],
 	"exclude": ["**/*.test.ts", "**/dist", "dist"]
diff --git a/packages/flow-core-config/CHANGELOG.md b/packages/flow-core-config/CHANGELOG.md
index 390b66039..83f37b741 100644
--- a/packages/flow-core-config/CHANGELOG.md
+++ b/packages/flow-core-config/CHANGELOG.md
@@ -1,5 +1,11 @@
 <h4 class="margin-btm-8">Release Notes</h4>
 
+## 1.3.3
+
+### Patch Changes
+
+- build cleanup
+
 ## 1.3.2
 
 ### Patch Changes
diff --git a/packages/flow-core-config/package.json b/packages/flow-core-config/package.json
index b1357b2c9..f7d38da9f 100644
--- a/packages/flow-core-config/package.json
+++ b/packages/flow-core-config/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@nonfx/flow-core-config",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Shared configuration for the Flow UI library",
   "type": "module",
-  "module": "dist/index.es.js",
-  "types": "dist/src/index.d.ts",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "build": "vite build --emptyOutDir"
+    "build": "tsc --outDir dist --declaration true --emitDeclarationOnly false"
   },
   "dependencies": {},
   "devDependencies": {
diff --git a/packages/flow-core-config/tsconfig.json b/packages/flow-core-config/tsconfig.json
index b917ab83f..035b0e3aa 100644
--- a/packages/flow-core-config/tsconfig.json
+++ b/packages/flow-core-config/tsconfig.json
@@ -1,8 +1,8 @@
 {
 	"extends": "@nonfx/tsconfig",
 	"compilerOptions": {
-		"rootDir": ".",
-		"outDir": "./dist"
+		"rootDir": "src",
+		"declarationDir": "./dist"
 	},
 	"include": ["src/**/*"],
 	"exclude": ["**/*.test.ts", "**/dist", "dist"]
diff --git a/packages/flow-core/CHANGELOG.md b/packages/flow-core/CHANGELOG.md
index fbbaaf16a..e4104fe3a 100644
--- a/packages/flow-core/CHANGELOG.md
+++ b/packages/flow-core/CHANGELOG.md
@@ -1,5 +1,19 @@
 <h4 className="margin-btm-8">Release Notes</h4>
 
+## 6.0.2
+
+### Patch Changes
+
+- build cleanup
+- Updated dependencies
+  - @nonfx/flow-core-config@1.3.3
+
+## 6.0.1
+
+### Patch Changes
+
+- fixes
+
 ## 6.0.0
 
 ### Major Changes
diff --git a/packages/flow-core/package.json b/packages/flow-core/package.json
index 3d2f7fbde..96f0038a4 100644
--- a/packages/flow-core/package.json
+++ b/packages/flow-core/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nonfx/flow-core",
-  "version": "6.0.0",
+  "version": "6.0.2",
   "description": "Core package of flow design system",
   "type": "module",
   "module": "dist/flow-core.es.js",
-  "types": "dist/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "bash ./compile.sh",
     "build:watch": "concurrently --kill-others \"vite build --emptyOutDir --watch\" \"tsc --watch\"",
@@ -56,7 +56,7 @@
     "web-component-analyzer": "^2.0.0"
   },
   "peerDependencies": {
-    "@nonfx/flow-core-config": "^1.3.2"
+    "@nonfx/flow-core-config": "^1.3.3"
   },
   "repository": {
     "type": "git",
diff --git a/packages/flow-core/src/components/f-color-picker/f-color-picker.ts b/packages/flow-core/src/components/f-color-picker/f-color-picker.ts
index c019b9b3c..dbd037372 100644
--- a/packages/flow-core/src/components/f-color-picker/f-color-picker.ts
+++ b/packages/flow-core/src/components/f-color-picker/f-color-picker.ts
@@ -175,11 +175,12 @@ export class FColorPicker extends FRoot {
 				<f-div slot="icon-tooltip"><slot name="icon-tooltip"></slot></f-div>
 				<f-div slot="help"><slot name="help"></slot></f-div>
 			</f-form-field>
+
 			<f-popover
 				id="f-color-picker-popover"
 				@overlay-click=${this.handleOverlayClick}
 				@keydown=${this.handleKeydown}
-				.overlay=${false}
+				.overlay=${true}
 				.open=${this.isOpen}
 				size="small"
 			>
diff --git a/packages/flow-core/src/components/f-emoji-picker/f-emoji-picker.ts b/packages/flow-core/src/components/f-emoji-picker/f-emoji-picker.ts
index 939f6da72..b58fed024 100644
--- a/packages/flow-core/src/components/f-emoji-picker/f-emoji-picker.ts
+++ b/packages/flow-core/src/components/f-emoji-picker/f-emoji-picker.ts
@@ -366,32 +366,12 @@ export class FEmojiPicker extends FRoot {
 	}
 
 	/**
-	 *
-	 * @param e mMouseEvent
-	 * @param element emoji-picker component
+	 * Handle overlay click from popover
 	 */
-	closeEmojiPicker(e: MouseEvent, element: FEmojiPicker) {
-		if (!element.contains(e.target as HTMLInputElement) && element.emojiPickerPopover.open) {
-			element.emojiPickerPopover.open = false;
-		}
-	}
-
-	outsideClick = (e: MouseEvent) => {
-		this.closeEmojiPicker(e, this);
+	handleOverlayClick = () => {
+		this.toggleEmojiPicker(false);
 	};
 
-	connectedCallback(): void {
-		super.connectedCallback();
-		/**
-		 * click outside the f-select wrapper area
-		 */
-		window.addEventListener("mouseup", this.outsideClick);
-	}
-	disconnectedCallback(): void {
-		super.disconnectedCallback();
-
-		window.removeEventListener("mouseup", this.outsideClick);
-	}
 	protected willUpdate(changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void {
 		super.willUpdate(changedProperties);
 		this.role = "textbox";
@@ -508,12 +488,15 @@ export class FEmojiPicker extends FRoot {
 				</div>
 				<f-div direction="column" id="f-emoji-picker-error"><slot name="help"></slot> </f-div>
 			</f-div>
+
 			<f-popover
 				data-qa-emoji-popover=${this.getAttribute("data-qa-element-id")}
 				class="f-emoji-picker-popover"
-				.overlay=${false}
-				><f-div>${this.picker}</f-div></f-popover
+				.overlay=${true}
+				@overlay-click=${this.handleOverlayClick}
 			>
+				<f-div>${this.picker}</f-div>
+			</f-popover>
 		`;
 	}
 
diff --git a/packages/flow-core/src/components/f-icon/f-icon.test.ts b/packages/flow-core/src/components/f-icon/f-icon.test.ts
index 19177cabf..c3f1b279c 100644
--- a/packages/flow-core/src/components/f-icon/f-icon.test.ts
+++ b/packages/flow-core/src/components/f-icon/f-icon.test.ts
@@ -1,7 +1,7 @@
 import { html, fixture, expect, elementUpdated } from "@open-wc/testing";
 import loadingSVG from "./../../mixins/svg/loader";
 import notFound from "../../mixins/svg/not-found";
-import { ConfigUtil } from "@nonfx/flow-core-config";
+import { ConfigUtil } from "@nonfx/flow-core";
 
 // import all flow -core components
 import "@nonfx/flow-core";
diff --git a/packages/flow-core/src/components/f-popover/f-popover.ts b/packages/flow-core/src/components/f-popover/f-popover.ts
index 2578dad82..bd02ee40c 100644
--- a/packages/flow-core/src/components/f-popover/f-popover.ts
+++ b/packages/flow-core/src/components/f-popover/f-popover.ts
@@ -318,6 +318,7 @@ export class FPopover extends FRoot {
 			};
 		}
 	}
+
 	disconnectedCallback() {
 		if (this.cleanup) {
 			this.cleanup();
@@ -332,7 +333,7 @@ export class FPopover extends FRoot {
 		if (this.targetElement) {
 			this.targetElement.style.removeProperty("z-index");
 		}
-		window.removeEventListener("click", this.outsideClick);
+		window.removeEventListener("click", this.outsideClick, true);
 	}
 
 	connectedCallback() {
@@ -342,8 +343,9 @@ export class FPopover extends FRoot {
 		/**
 		 * click outside the f-popover area
 		 */
-		window.addEventListener("click", this.outsideClick);
+		window.addEventListener("click", this.outsideClick, true);
 	}
+
 	dispatchEsc() {
 		if (this.isEscapeClicked && this.closeOnEscape) {
 			const event = new CustomEvent("esc", {
@@ -377,18 +379,31 @@ export class FPopover extends FRoot {
 	}
 
 	outsideClick = (e: MouseEvent) => {
-		if (this.open && e?.target === this) {
-			const rect = this.getBoundingClientRect();
-			const isInsideClick =
-				e.clientX > rect.left &&
-				e.clientX < rect.left + rect.width &&
-				e.clientY > rect.top &&
-				e.clientY < rect.top + rect.height;
-
-			if (!isInsideClick) {
-				this.overlayClick();
+		if (!this.open) return;
+
+		const path = e.composedPath();
+
+		// Check if click is on the target element (trigger)
+		if (this.targetElement && path.includes(this.targetElement)) return;
+
+		// Check if click is inside the popover's visual bounds
+		const rect = this.getBoundingClientRect();
+		const isInsideClick =
+			e.clientX > rect.left &&
+			e.clientX < rect.left + rect.width &&
+			e.clientY > rect.top &&
+			e.clientY < rect.top + rect.height;
+
+		if (isInsideClick) {
+			// Inside popover bounds, check if it's in actual content
+			if (path.includes(this)) {
+				// Popover is in the path, this is internal content
+				return;
 			}
 		}
+
+		// Any other click (including on overlay pseudo-element or outside) triggers overlay click
+		this.overlayClick();
 	};
 
 	protected willUpdate(changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void {
diff --git a/packages/flow-core/tsconfig.json b/packages/flow-core/tsconfig.json
index e88de9142..035b0e3aa 100644
--- a/packages/flow-core/tsconfig.json
+++ b/packages/flow-core/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"extends": "@nonfx/tsconfig",
 	"compilerOptions": {
-		"rootDir": ".",
-		"outDir": "./dist"
+		"rootDir": "src",
+		"declarationDir": "./dist"
 	},
-	"include": ["src/**/*", "package.json"],
+	"include": ["src/**/*"],
 	"exclude": ["**/*.test.ts", "**/dist", "dist"]
 }
diff --git a/packages/flow-dashboard/CHANGELOG.md b/packages/flow-dashboard/CHANGELOG.md
index 96e639bba..f5f1591d0 100644
--- a/packages/flow-dashboard/CHANGELOG.md
+++ b/packages/flow-dashboard/CHANGELOG.md
@@ -1,5 +1,21 @@
 <h4 className="margin-btm-8">Release Notes</h4>
 
+## 5.0.2
+
+### Patch Changes
+
+- build cleanup
+- Updated dependencies
+  - @nonfx/flow-core-config@1.3.3
+  - @nonfx/flow-core@6.0.2
+
+## 5.0.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @nonfx/flow-core@6.0.1
+
 ## 5.0.0
 
 ### Patch Changes
diff --git a/packages/flow-dashboard/package.json b/packages/flow-dashboard/package.json
index 7535369d7..5b0cf8a6f 100644
--- a/packages/flow-dashboard/package.json
+++ b/packages/flow-dashboard/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nonfx/flow-dashboard",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "description": "Dashboard as code",
   "type": "module",
   "module": "dist/flow-dashboard.es.js",
-  "types": "dist/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "bash ./compile.sh",
     "build:watch": "concurrently --kill-others \"vite build --emptyOutDir --watch\" \"tsc --watch\"",
diff --git a/packages/flow-dashboard/tsconfig.json b/packages/flow-dashboard/tsconfig.json
index b917ab83f..035b0e3aa 100644
--- a/packages/flow-dashboard/tsconfig.json
+++ b/packages/flow-dashboard/tsconfig.json
@@ -1,8 +1,8 @@
 {
 	"extends": "@nonfx/tsconfig",
 	"compilerOptions": {
-		"rootDir": ".",
-		"outDir": "./dist"
+		"rootDir": "src",
+		"declarationDir": "./dist"
 	},
 	"include": ["src/**/*"],
 	"exclude": ["**/*.test.ts", "**/dist", "dist"]
diff --git a/packages/flow-form-builder/CHANGELOG.md b/packages/flow-form-builder/CHANGELOG.md
index 9aefdb29d..ec2775044 100644
--- a/packages/flow-form-builder/CHANGELOG.md
+++ b/packages/flow-form-builder/CHANGELOG.md
@@ -1,5 +1,21 @@
 <h4 class="margin-btm-8">Release Notes</h4>
 
+## 7.0.2
+
+### Patch Changes
+
+- build cleanup
+- Updated dependencies
+  - @nonfx/flow-core-config@1.3.3
+  - @nonfx/flow-core@6.0.2
+
+## 7.0.1
+
+### Patch Changes
+
+- Updated dependencies
+  - @nonfx/flow-core@6.0.1
+
 ## 7.0.0
 
 ### Patch Changes
diff --git a/packages/flow-form-builder/package.json b/packages/flow-form-builder/package.json
index f31dee9cf..238cab789 100644
--- a/packages/flow-form-builder/package.json
+++ b/packages/flow-form-builder/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nonfx/flow-form-builder",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "Form builder for the flow design system",
   "type": "module",
   "module": "dist/flow-form-builder.es.js",
-  "types": "dist/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "./compile.sh",
     "build:watch": "concurrently --kill-others \"vite build --emptyOutDir --watch\" \"tsc --watch\"",
diff --git a/packages/flow-form-builder/tsconfig.json b/packages/flow-form-builder/tsconfig.json
index b917ab83f..035b0e3aa 100644
--- a/packages/flow-form-builder/tsconfig.json
+++ b/packages/flow-form-builder/tsconfig.json
@@ -1,8 +1,8 @@
 {
 	"extends": "@nonfx/tsconfig",
 	"compilerOptions": {
-		"rootDir": ".",
-		"outDir": "./dist"
+		"rootDir": "src",
+		"declarationDir": "./dist"
 	},
 	"include": ["src/**/*"],
 	"exclude": ["**/*.test.ts", "**/dist", "dist"]
diff --git a/packages/flow-icons/CHANGELOG.md b/packages/flow-icons/CHANGELOG.md
index 8c0b79a54..1f03c269d 100644
--- a/packages/flow-icons/CHANGELOG.md
+++ b/packages/flow-icons/CHANGELOG.md
@@ -1,5 +1,14 @@
 <h4 className="margin-btm-8">Release Notes</h4>
 
+## 6.0.1
+
+### Patch Changes
+
+- build cleanup
+- Updated dependencies
+  - @nonfx/flow-core-config@1.3.3
+  - @nonfx/flow-core@6.0.2
+
 ## 6.0.0
 
 ### Patch Changes
diff --git a/packages/flow-icons/compile.sh b/packages/flow-icons/compile.sh
index b12eb8893..0b098d464 100644
--- a/packages/flow-icons/compile.sh
+++ b/packages/flow-icons/compile.sh
@@ -5,7 +5,5 @@ HERE=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
 cd "$HERE"
 
-
-
 echo "building library..."
 bun vite build --emptyOutDir
diff --git a/packages/flow-icons/package-builder/download-icons.ts b/packages/flow-icons/package-builder/download-icons.ts
index 84e4c92e6..c7a1618c9 100644
--- a/packages/flow-icons/package-builder/download-icons.ts
+++ b/packages/flow-icons/package-builder/download-icons.ts
@@ -41,7 +41,7 @@ for (let p = 0; p < config.packages.length; p++) {
 
 export default async function downloadIcons(nodeId: string, pkg: string) {
 	const indexFileImports = new Set();
-	indexFileImports.add('import { ConfigUtil } from "@nonfx/flow-core-config";');
+	indexFileImports.add('import { ConfigUtil } from "@nonfx/flow-core";');
 	indexFileImports.add('import IconPack from "./icon-pack" ;');
 
 	const iconPackExports = new Set();
diff --git a/packages/flow-icons/package.json b/packages/flow-icons/package.json
index 1c291fb7a..60061ac81 100644
--- a/packages/flow-icons/package.json
+++ b/packages/flow-icons/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nonfx/flow-icons",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Flow icons package",
   "type": "module",
   "module": "dist/flow-icons.es.js",
-  "types": "dist/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "download-icons": "bun package-builder/download-icons.ts",
     "build": "bash ./compile.sh",
diff --git a/packages/flow-icons/src/flow-aws-icon/index.ts b/packages/flow-icons/src/flow-aws-icon/index.ts
index f5fcdc7ce..2b7fa097d 100644
--- a/packages/flow-icons/src/flow-aws-icon/index.ts
+++ b/packages/flow-icons/src/flow-aws-icon/index.ts
@@ -1,4 +1,4 @@
-import { ConfigUtil } from "@nonfx/flow-core-config";
+import { ConfigUtil } from "@nonfx/flow-core";
 import IconPack from "./icon-pack";
 
 ConfigUtil.setConfig({ iconPack: { ...IconPack, ...ConfigUtil.getConfig().iconPack } });
diff --git a/packages/flow-icons/src/flow-azure-icon/index.ts b/packages/flow-icons/src/flow-azure-icon/index.ts
index f5fcdc7ce..2b7fa097d 100644
--- a/packages/flow-icons/src/flow-azure-icon/index.ts
+++ b/packages/flow-icons/src/flow-azure-icon/index.ts
@@ -1,4 +1,4 @@
-import { ConfigUtil } from "@nonfx/flow-core-config";
+import { ConfigUtil } from "@nonfx/flow-core";
 import IconPack from "./icon-pack";
 
 ConfigUtil.setConfig({ iconPack: { ...IconPack, ...ConfigUtil.getConfig().iconPack } });
diff --git a/packages/flow-icons/src/flow-gcp-icon/index.ts b/packages/flow-icons/src/flow-gcp-icon/index.ts
index f5fcdc7ce..2b7fa097d 100644
--- a/packages/flow-icons/src/flow-gcp-icon/index.ts
+++ b/packages/flow-icons/src/flow-gcp-icon/index.ts
@@ -1,4 +1,4 @@
-import { ConfigUtil } from "@nonfx/flow-core-config";
+import { ConfigUtil } from "@nonfx/flow-core";
 import IconPack from "./icon-pack";
 
 ConfigUtil.setConfig({ iconPack: { ...IconPack, ...ConfigUtil.getConfig().iconPack } });
diff --git a/packages/flow-icons/src/flow-nonfx-icon/index.ts b/packages/flow-icons/src/flow-nonfx-icon/index.ts
index f5fcdc7ce..2b7fa097d 100644
--- a/packages/flow-icons/src/flow-nonfx-icon/index.ts
+++ b/packages/flow-icons/src/flow-nonfx-icon/index.ts
@@ -1,4 +1,4 @@
-import { ConfigUtil } from "@nonfx/flow-core-config";
+import { ConfigUtil } from "@nonfx/flow-core";
 import IconPack from "./icon-pack";
 
 ConfigUtil.setConfig({ iconPack: { ...IconPack, ...ConfigUtil.getConfig().iconPack } });
diff --git a/packages/flow-icons/src/flow-policy-icon/index.ts b/packages/flow-icons/src/flow-policy-icon/index.ts
index f5fcdc7ce..2b7fa097d 100644
--- a/packages/flow-icons/src/flow-policy-icon/index.ts
+++ b/packages/flow-icons/src/flow-policy-icon/index.ts
@@ -1,4 +1,4 @@
-import { ConfigUtil } from "@nonfx/flow-core-config";
+import { ConfigUtil } from "@nonfx/flow-core";
 import IconPack from "./icon-pack";
 
 ConfigUtil.setConfig({ iconPack: { ...IconPack, ...ConfigUtil.getConfig().iconPack } });
diff --git a/packages/flow-icons/src/flow-product-icon/index.ts b/packages/flow-icons/src/flow-product-icon/index.ts
index f5fcdc7ce..2b7fa097d 100644
--- a/packages/flow-icons/src/flow-product-icon/index.ts
+++ b/packages/flow-icons/src/flow-product-icon/index.ts
@@ -1,4 +1,4 @@
-import { ConfigUtil } from "@nonfx/flow-core-config";
+import { ConfigUtil } from "@nonfx/flow-core";
 import IconPack from "./icon-pack";
 
 ConfigUtil.setConfig({ iconPack: { ...IconPack, ...ConfigUtil.getConfig().iconPack } });
diff --git a/packages/flow-icons/src/flow-system-icon/index.ts b/packages/flow-icons/src/flow-system-icon/index.ts
index f5fcdc7ce..2b7fa097d 100644
--- a/packages/flow-icons/src/flow-system-icon/index.ts
+++ b/packages/flow-icons/src/flow-system-icon/index.ts
@@ -1,4 +1,4 @@
-import { ConfigUtil } from "@nonfx/flow-core-config";
+import { ConfigUtil } from "@nonfx/flow-core";
 import IconPack from "./icon-pack";
 
 ConfigUtil.setConfig({ iconPack: { ...IconPack, ...ConfigUtil.getConfig().iconPack } });
diff --git a/packages/flow-icons/src/index.ts b/packages/flow-icons/src/index.ts
index 3165775f1..82c0bbad3 100644
--- a/packages/flow-icons/src/index.ts
+++ b/packages/flow-icons/src/index.ts
@@ -1,4 +1,4 @@
-import { ConfigUtil } from "@nonfx/flow-core-config";
+import { ConfigUtil } from "@nonfx/flow-core";
 import { version } from "./../package.json";
 
 const ICON_PACK_MAP: Record<IconPackNames, () => Promise<Record<string, string>>> = {
diff --git a/packages/flow-icons/tsconfig.json b/packages/flow-icons/tsconfig.json
index 9a9f99461..035b0e3aa 100644
--- a/packages/flow-icons/tsconfig.json
+++ b/packages/flow-icons/tsconfig.json
@@ -1,9 +1,9 @@
 {
 	"extends": "@nonfx/tsconfig",
 	"compilerOptions": {
-		"rootDir": ".",
-		"outDir": "./dist"
+		"rootDir": "src",
+		"declarationDir": "./dist"
 	},
-	"include": ["src/**/*", "./package.json"],
+	"include": ["src/**/*"],
 	"exclude": ["**/*.test.ts", "**/dist", "dist"]
 }
diff --git a/packages/flow-lineage/CHANGELOG.md b/packages/flow-lineage/CHANGELOG.md
index 97638a44d..e41f77ab3 100644
--- a/packages/flow-lineage/CHANGELOG.md
+++ b/packages/flow-lineage/CHANGELOG.md
@@ -1,5 +1,14 @@
 <h4 class="margin-btm-8">Release Notes</h4>
 
+## 3.4.2
+
+### Patch Changes
+
+- build cleanup
+- Updated dependencies
+  - @nonfx/flow-core-config@1.3.3
+  - @nonfx/flow-core@6.0.2
+
 ## 3.4.1
 
 ### Patch Changes
diff --git a/packages/flow-lineage/package.json b/packages/flow-lineage/package.json
index 0ee33378c..72480aff6 100644
--- a/packages/flow-lineage/package.json
+++ b/packages/flow-lineage/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nonfx/flow-lineage",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "Lineage dependency for flow design system",
   "type": "module",
   "module": "dist/flow-lineage.es.js",
-  "types": "dist/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "bash ./compile.sh",
     "build:watch": "concurrently --kill-others \"vite build --emptyOutDir --watch\" \"tsc --watch\"",
diff --git a/packages/flow-lineage/tsconfig.json b/packages/flow-lineage/tsconfig.json
index a7b701d1a..d9760f23d 100644
--- a/packages/flow-lineage/tsconfig.json
+++ b/packages/flow-lineage/tsconfig.json
@@ -1,10 +1,10 @@
 {
 	"extends": "@nonfx/tsconfig",
 	"compilerOptions": {
-		"rootDir": ".",
-		"outDir": "./dist",
+		"rootDir": "src",
+		"declarationDir": "./dist",
 		"allowJs": true
 	},
-	"include": ["src/**/*", "package.json"],
+	"include": ["src/**/*"],
 	"exclude": ["**/*.test.ts", "**/dist", "dist"]
 }
diff --git a/packages/flow-log/CHANGELOG.md b/packages/flow-log/CHANGELOG.md
index 8389d16d9..11663b2ce 100644
--- a/packages/flow-log/CHANGELOG.md
+++ b/packages/flow-log/CHANGELOG.md
@@ -1,5 +1,14 @@
 <h4 className="margin-btm-8">Release Notes</h4>
 
+## 2.3.2
+
+### Patch Changes
+
+- build cleanup
+- Updated dependencies
+  - @nonfx/flow-core-config@1.3.3
+  - @nonfx/flow-core@6.0.2
+
 ## 2.3.1
 
 ### Patch Changes
diff --git a/packages/flow-log/package.json b/packages/flow-log/package.json
index 420798ae7..e2e56540c 100644
--- a/packages/flow-log/package.json
+++ b/packages/flow-log/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nonfx/flow-log",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "Code editor component for flow library",
   "type": "module",
   "module": "dist/flow-log.es.js",
-  "types": "dist/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "bash ./compile.sh",
     "build:watch": "concurrently --kill-others \"vite build --emptyOutDir --watch\" \"tsc --watch\"",
diff --git a/packages/flow-log/tsconfig.json b/packages/flow-log/tsconfig.json
index b917ab83f..035b0e3aa 100644
--- a/packages/flow-log/tsconfig.json
+++ b/packages/flow-log/tsconfig.json
@@ -1,8 +1,8 @@
 {
 	"extends": "@nonfx/tsconfig",
 	"compilerOptions": {
-		"rootDir": ".",
-		"outDir": "./dist"
+		"rootDir": "src",
+		"declarationDir": "./dist"
 	},
 	"include": ["src/**/*"],
 	"exclude": ["**/*.test.ts", "**/dist", "dist"]
diff --git a/packages/flow-md-editor/CHANGELOG.md b/packages/flow-md-editor/CHANGELOG.md
index 728bc11ed..05be9e145 100644
--- a/packages/flow-md-editor/CHANGELOG.md
+++ b/packages/flow-md-editor/CHANGELOG.md
@@ -1,5 +1,14 @@
 <h4 className="margin-btm-8">Release Notes</h4>
 
+## 7.0.1
+
+### Patch Changes
+
+- build cleanup
+- Updated dependencies
+  - @nonfx/flow-core-config@1.3.3
+  - @nonfx/flow-core@6.0.2
+
 ## 7.0.0
 
 ### Patch Changes
diff --git a/packages/flow-md-editor/package.json b/packages/flow-md-editor/package.json
index c625ae708..85a1ae6b3 100644
--- a/packages/flow-md-editor/package.json
+++ b/packages/flow-md-editor/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nonfx/flow-md-editor",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Code editor component for flow library",
   "type": "module",
   "module": "dist/flow-md-editor.es.js",
-  "types": "dist/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "bash ./compile.sh",
     "build:watch": "concurrently --kill-others \"vite build --emptyOutDir --watch\" \"tsc --watch\"",
diff --git a/packages/flow-md-editor/tsconfig.json b/packages/flow-md-editor/tsconfig.json
index b917ab83f..035b0e3aa 100644
--- a/packages/flow-md-editor/tsconfig.json
+++ b/packages/flow-md-editor/tsconfig.json
@@ -1,8 +1,8 @@
 {
 	"extends": "@nonfx/tsconfig",
 	"compilerOptions": {
-		"rootDir": ".",
-		"outDir": "./dist"
+		"rootDir": "src",
+		"declarationDir": "./dist"
 	},
 	"include": ["src/**/*"],
 	"exclude": ["**/*.test.ts", "**/dist", "dist"]
diff --git a/packages/flow-table/CHANGELOG.md b/packages/flow-table/CHANGELOG.md
index 77fa76c1d..d802a749d 100644
--- a/packages/flow-table/CHANGELOG.md
+++ b/packages/flow-table/CHANGELOG.md
@@ -1,5 +1,14 @@
 <h4 className="margin-btm-8">Release Notes</h4>
 
+## 2.7.2
+
+### Patch Changes
+
+- build cleanup
+- Updated dependencies
+  - @nonfx/flow-core-config@1.3.3
+  - @nonfx/flow-core@6.0.2
+
 ## 2.7.1
 
 ### Patch Changes
diff --git a/packages/flow-table/package.json b/packages/flow-table/package.json
index 76d1f020c..98bd7f568 100644
--- a/packages/flow-table/package.json
+++ b/packages/flow-table/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nonfx/flow-table",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "description": "Table component for flow library",
   "type": "module",
   "module": "dist/flow-table.es.js",
-  "types": "dist/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "bash ./compile.sh",
     "build:watch": "concurrently --kill-others \"vite build --emptyOutDir --watch\" \"tsc --watch\"",
diff --git a/packages/flow-table/tsconfig.json b/packages/flow-table/tsconfig.json
index b917ab83f..035b0e3aa 100644
--- a/packages/flow-table/tsconfig.json
+++ b/packages/flow-table/tsconfig.json
@@ -1,8 +1,8 @@
 {
 	"extends": "@nonfx/tsconfig",
 	"compilerOptions": {
-		"rootDir": ".",
-		"outDir": "./dist"
+		"rootDir": "src",
+		"declarationDir": "./dist"
 	},
 	"include": ["src/**/*"],
 	"exclude": ["**/*.test.ts", "**/dist", "dist"]
diff --git a/packages/flow-text-editor/CHANGELOG.md b/packages/flow-text-editor/CHANGELOG.md
index 9ba2384ed..db81f12fa 100644
--- a/packages/flow-text-editor/CHANGELOG.md
+++ b/packages/flow-text-editor/CHANGELOG.md
@@ -1,5 +1,14 @@
 <h4 className="margin-btm-8">Release Notes</h4>
 
+## 0.2.2
+
+### Patch Changes
+
+- build cleanup
+- Updated dependencies
+  - @nonfx/flow-core-config@1.3.3
+  - @nonfx/flow-core@6.0.2
+
 ## 0.2.1
 
 ### Patch Changes
diff --git a/packages/flow-text-editor/package.json b/packages/flow-text-editor/package.json
index b48645b62..7f42fa29f 100644
--- a/packages/flow-text-editor/package.json
+++ b/packages/flow-text-editor/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@nonfx/flow-text-editor",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Code editor component for flow library",
   "type": "module",
   "module": "dist/flow-text-editor.es.js",
-  "types": "dist/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "bash ./compile.sh",
     "build:watch": "concurrently --kill-others \"vite build --emptyOutDir --watch\" \"tsc --watch\"",
diff --git a/packages/flow-text-editor/tsconfig.json b/packages/flow-text-editor/tsconfig.json
index b917ab83f..035b0e3aa 100644
--- a/packages/flow-text-editor/tsconfig.json
+++ b/packages/flow-text-editor/tsconfig.json
@@ -1,8 +1,8 @@
 {
 	"extends": "@nonfx/tsconfig",
 	"compilerOptions": {
-		"rootDir": ".",
-		"outDir": "./dist"
+		"rootDir": "src",
+		"declarationDir": "./dist"
 	},
 	"include": ["src/**/*"],
 	"exclude": ["**/*.test.ts", "**/dist", "dist"]
diff --git a/stories/flow-core/f-popover.mdx b/stories/flow-core/f-popover.mdx
index 51dfcc689..c66988c48 100644
--- a/stories/flow-core/f-popover.mdx
+++ b/stories/flow-core/f-popover.mdx
@@ -3,7 +3,7 @@ import { html } from "lit-html";
 import fPopoverAnatomy from "../svg/i-fpopover-anatomy.js";
 import { unsafeSVG } from "lit-html/directives/unsafe-svg.js";
 import { useArgs, useState } from "storybook/preview-api";
-import { ConfigUtil } from "@nonfx/flow-core-config";
+import { ConfigUtil } from "@nonfx/flow-core";
 import { createRef, ref } from "lit/directives/ref.js";
 import * as FPopoverStories from "./f-popover.stories";
 
diff --git a/stories/flow-icons/icon-packs.stories.ts b/stories/flow-icons/icon-packs.stories.ts
index 4f62a4ccc..87d61ceee 100644
--- a/stories/flow-icons/icon-packs.stories.ts
+++ b/stories/flow-icons/icon-packs.stories.ts
@@ -1,13 +1,26 @@
 import { html } from "lit-html";
-import flowAwsIcon from "@nonfx/flow-icons/src/flow-aws-icon/icon-pack";
-import flowGCPIcon from "@nonfx/flow-icons/src/flow-gcp-icon/icon-pack";
-import flowProductIcon from "@nonfx/flow-icons/src/flow-product-icon/icon-pack";
-import flowPolicyIcon from "@nonfx/flow-icons/src/flow-policy-icon/icon-pack";
-import flowAzureIcon from "@nonfx/flow-icons/src/flow-azure-icon/icon-pack";
-import flowNonfxIcon from "@nonfx/flow-icons/src/flow-nonfx-icon/icon-pack";
+import { register, type IconPackNames } from "@nonfx/flow-icons";
 import { customElement, property } from "lit/decorators.js";
 import { LitElement } from "lit";
 
+let iconPackBundle: Awaited<ReturnType<typeof register>>;
+
+async function setupIconPacks() {
+	if (!iconPackBundle) {
+		const allPacks: IconPackNames[] = [
+			"aws",
+			"gcp",
+			"product",
+			"system",
+			"policy",
+			"azure",
+			"nonfx"
+		];
+		iconPackBundle = await register(allPacks);
+	}
+	return iconPackBundle;
+}
+
 export default {
 	title: "@nonfx/flow-icons",
 
@@ -15,7 +28,12 @@ export default {
 		controls: {
 			hideNoControlsWarning: true
 		}
-	}
+	},
+	loaders: [
+		async () => {
+			await setupIconPacks();
+		}
+	]
 };
 
 @customElement("icon-pack")
@@ -88,8 +106,9 @@ export class IconPackElement extends LitElement {
 
 export const Aws = {
 	render: () => {
-		const searchTerm = "";
-		return html` <icon-pack .packName=${"aws"} .icons=${flowAwsIcon}> </icon-pack> `;
+		const bundle = iconPackBundle;
+		const awsPack = bundle.find(b => b.packName === "aws");
+		return html` <icon-pack .packName=${"aws"} .icons=${awsPack?.pack}> </icon-pack> `;
 	},
 
 	name: "aws"
@@ -97,8 +116,9 @@ export const Aws = {
 
 export const Gcp = {
 	render: () => {
-		const searchTerm = "";
-		return html` <icon-pack .packName=${"gcp"} .icons=${flowGCPIcon}> </icon-pack> `;
+		const bundle = iconPackBundle;
+		const gcpPack = bundle.find(b => b.packName === "gcp");
+		return html` <icon-pack .packName=${"gcp"} .icons=${gcpPack?.pack}> </icon-pack> `;
 	},
 
 	name: "gcp"
@@ -106,16 +126,18 @@ export const Gcp = {
 
 export const Product = {
 	render: () => {
-		const searchTerm = "";
-		return html` <icon-pack .packName=${"product"} .icons=${flowProductIcon}> </icon-pack> `;
+		const bundle = iconPackBundle;
+		const productPack = bundle.find(b => b.packName === "product");
+		return html` <icon-pack .packName=${"product"} .icons=${productPack?.pack}> </icon-pack> `;
 	},
 
 	name: "product"
 };
 export const Policy = {
 	render: () => {
-		const searchTerm = "";
-		return html` <icon-pack .packName=${"policy"} .icons=${flowPolicyIcon}> </icon-pack> `;
+		const bundle = iconPackBundle;
+		const policyPack = bundle.find(b => b.packName === "policy");
+		return html` <icon-pack .packName=${"policy"} .icons=${policyPack?.pack}> </icon-pack> `;
 	},
 
 	name: "policy"
@@ -123,8 +145,9 @@ export const Policy = {
 
 export const Azure = {
 	render: () => {
-		const searchTerm = "";
-		return html` <icon-pack .packName=${"azure"} .icons=${flowAzureIcon}> </icon-pack> `;
+		const bundle = iconPackBundle;
+		const azurePack = bundle.find(b => b.packName === "azure");
+		return html` <icon-pack .packName=${"azure"} .icons=${azurePack?.pack}> </icon-pack> `;
 	},
 
 	name: "azure"
@@ -132,8 +155,9 @@ export const Azure = {
 
 export const Nonfx = {
 	render: () => {
-		const searchTerm = "";
-		return html` <icon-pack .packName=${"nonfx"} .icons=${flowNonfxIcon}> </icon-pack> `;
+		const bundle = iconPackBundle;
+		const nonfxPack = bundle.find(b => b.packName === "nonfx");
+		return html` <icon-pack .packName=${"nonfx"} .icons=${nonfxPack?.pack}> </icon-pack> `;
 	},
 
 	name: "nonfx"
diff --git a/tsconfig.json b/tsconfig.json
index 204d065d5..6140a06ec 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -38,6 +38,9 @@
 		},
 		{
 			"path": "./packages/flow-icons"
+		},
+		{
+			"path": "./.storybook"
 		}
 	]
 }