diff --git a/vuu-ui/sample-apps/feature-basket-trading/src/useBasketTrading.tsx b/vuu-ui/sample-apps/feature-basket-trading/src/useBasketTrading.tsx
index c0f8301cc..90d2f5992 100644
--- a/vuu-ui/sample-apps/feature-basket-trading/src/useBasketTrading.tsx
+++ b/vuu-ui/sample-apps/feature-basket-trading/src/useBasketTrading.tsx
@@ -1,5 +1,5 @@
-import { DataSource, TableSchema } from "packages/vuu-data/src";
-import { useViewContext } from "packages/vuu-layout/src";
+import { DataSource, TableSchema } from "@finos/vuu-data";
+import { useViewContext } from "@finos/vuu-layout";
 import { useCallback, useMemo, useState } from "react";
 import { NewBasketPanel } from "./new-basket-panel";
 
diff --git a/vuu-ui/showcase/src/examples/Apps/NewTheme.examples.tsx b/vuu-ui/showcase/src/examples/Apps/NewTheme.examples.tsx
index e9d2d941a..e3a46a6f8 100644
--- a/vuu-ui/showcase/src/examples/Apps/NewTheme.examples.tsx
+++ b/vuu-ui/showcase/src/examples/Apps/NewTheme.examples.tsx
@@ -3,7 +3,7 @@ import {
   registerComponent,
   useLayoutContextMenuItems,
 } from "@finos/vuu-layout";
-import { ContextMenuProvider, Dialog } from "@finos/vuu-popups";
+import { ContextMenuProvider, Dialog, useDialog } from "@finos/vuu-popups";
 import {
   FeatureConfig,
   FeatureProps,
@@ -94,12 +94,9 @@ const tableFeatures: FeatureProps<FilterTableFeatureProps>[] = Object.values(
   }));
 
 const ShellWithNewTheme = () => {
-  const {
-    buildMenuOptions,
-    dialogContent,
-    handleCloseDialog,
-    handleMenuAction,
-  } = useLayoutContextMenuItems();
+  const { dialog, setDialogState } = useDialog();
+  const { buildMenuOptions, handleMenuAction } =
+    useLayoutContextMenuItems(setDialogState);
 
   return (
     <ContextMenuProvider
@@ -127,15 +124,7 @@ const ShellWithNewTheme = () => {
           } as CSSProperties
         }
       >
-        <Dialog
-          isOpen={dialogContent !== undefined}
-          onClose={handleCloseDialog}
-          style={{ maxHeight: 500, borderColor: "#6d188b" }}
-          title={"Save Layout"}
-          hideCloseButton
-        >
-          {dialogContent}
-        </Dialog>
+        {dialog}
       </Shell>
     </ContextMenuProvider>
   );