diff --git a/jest.config.js b/jest.config.js
index 82b65f646..68e381bea 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -7,6 +7,7 @@ const config = {
   collectCoverage: true,
   coverageThreshold: {
     global: {
+      statements: 0,
       branches: 0,
       functions: 0,
       lines: 0,
@@ -22,7 +23,7 @@ const config = {
     '!**/e2e/**',
   ],
   transform: {
-    '^.+\\.tsx?$': '@swc/jest',
+    '^.+\\.(j|t)sx?$': '@swc/jest',
   },
   transformIgnorePatterns: ['/node_modules/(?!@openmrs)'],
   moduleDirectories: ['node_modules', '__mocks__', 'tools', __dirname],
@@ -32,13 +33,12 @@ const config = {
     '^@carbon/charts-react$': path.resolve(__dirname, '__mocks__', '@carbon__charts-react.ts'),
     '^dexie$': require.resolve('dexie'),
     '^lodash-es/(.*)$': 'lodash/$1',
+    '^lodash-es$': 'lodash',
     '^react-i18next$': path.resolve(__dirname, '__mocks__', 'react-i18next.js'),
+    '^uuid$': path.resolve(__dirname, 'node_modules', 'uuid', 'dist', 'index.js'),
   },
   testEnvironment: 'jsdom',
-  testPathIgnorePatterns: [
-    "/node_modules/",
-      "/e2e/"  // Ignore the e2e directory containing Playwright tests
-    ]
+  testPathIgnorePatterns: [path.resolve(__dirname, 'node_modules'), path.resolve(__dirname, 'e2e')],
 };
 
 module.exports = config;
diff --git a/package.json b/package.json
index 52c6e8398..733a6de5d 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,6 @@
     "webpack-dev-server": "^4.8.1"
   },
   "resolutions": {
-    "@carbon/react": "1.17.0",
     "@types/react": "^18.0.14",
     "@types/react-dom": "^18.0.5"
   },
diff --git a/packages/esm-commons-lib/src/components/data-table/o-table.component.tsx b/packages/esm-commons-lib/src/components/data-table/o-table.component.tsx
index 73ae7cbf6..aea29828c 100644
--- a/packages/esm-commons-lib/src/components/data-table/o-table.component.tsx
+++ b/packages/esm-commons-lib/src/components/data-table/o-table.component.tsx
@@ -31,7 +31,8 @@ export const OTable: React.FC<TableProps> = ({ tableHeaders, tableRows }) => {
                     {...getHeaderProps({
                       header,
                       isSortable: header.isSortable,
-                    })}>
+                    })}
+                  >
                     {header.header?.content ?? header.header}
                   </TableHeader>
                 ))}
diff --git a/packages/esm-commons-lib/src/components/empty-state/table-empty-state.component.tsx b/packages/esm-commons-lib/src/components/empty-state/table-empty-state.component.tsx
index 5ff9e2a9f..b329a7261 100644
--- a/packages/esm-commons-lib/src/components/empty-state/table-empty-state.component.tsx
+++ b/packages/esm-commons-lib/src/components/empty-state/table-empty-state.component.tsx
@@ -27,7 +27,8 @@ export const TableEmptyState: React.FC<{ tableHeaders: Array<{ key: string; head
                       {...getHeaderProps({
                         header,
                         isSortable: header.isSortable,
-                      })}>
+                      })}
+                    >
                       {header.header?.content ?? header.header}
                     </TableHeader>
                   ))}
diff --git a/packages/esm-commons-lib/src/components/encounter-list/encounter-list.component.tsx b/packages/esm-commons-lib/src/components/encounter-list/encounter-list.component.tsx
index d8f13b936..8a9e2103e 100644
--- a/packages/esm-commons-lib/src/components/encounter-list/encounter-list.component.tsx
+++ b/packages/esm-commons-lib/src/components/encounter-list/encounter-list.component.tsx
@@ -2,10 +2,18 @@ import { navigate, showModal, showSnackbar } from '@openmrs/esm-framework';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { EmptyState } from '../empty-state/empty-state.component';
-import { FormLauncherWithIntent } from '../ohri-form-launcher/ohri-form-launcher.component';
 import styles from './encounter-list.scss';
 import { OTable } from '../data-table/o-table.component';
-import { Button, Link, OverflowMenu, OverflowMenuItem, Pagination, DataTableSkeleton } from '@carbon/react';
+import {
+  Button,
+  Link,
+  OverflowMenu,
+  OverflowMenuItem,
+  Pagination,
+  DataTableSkeleton,
+  MenuButton,
+  MenuItem,
+} from '@carbon/react';
 import { Add } from '@carbon/react/icons';
 import { FormSchema } from '@openmrs/openmrs-form-engine-lib';
 import { deleteEncounter, launchEncounterForm } from './helpers';
@@ -213,7 +221,8 @@ export const EncounterList: React.FC<EncounterListProps> = ({
                   } else {
                     column.link?.getUrl && navigate({ to: column.link.getUrl() });
                   }
-                }}>
+                }}
+              >
                 {val}
               </Link>
             );
@@ -283,29 +292,38 @@ export const EncounterList: React.FC<EncounterListProps> = ({
               workspaceWindowSize,
               patientUuid,
             );
-          }}>
+          }}
+        >
           {displayText}
         </Button>
       );
     } else if (forms.length && !(hideFormLauncher ?? isDead)) {
       return (
-        <FormLauncherWithIntent
-          formJsonList={forms}
-          launchForm={(formJson, intent) =>
-            launchEncounterForm(
-              formJson,
-              moduleName,
-              'add',
-              onFormSave,
-              null,
-              '',
-              intent,
-              workspaceWindowSize,
-              patientUuid,
-            )
-          }
-          title={displayText}
-        />
+        <MenuButton label={t('add', 'Add')} kind="ghost" menuAlignment="bottom-end">
+          {formsJson
+            .filter((formJson) => formJson.availableIntents.length > 0)
+            .map((filteredItem) =>
+              filteredItem.availableIntents.map((intent, index) => (
+                <MenuItem
+                  key={index}
+                  label={intent.display}
+                  onClick={() =>
+                    launchEncounterForm(
+                      filteredItem,
+                      moduleName,
+                      'add',
+                      onFormSave,
+                      null,
+                      '',
+                      intent,
+                      workspaceWindowSize,
+                      patientUuid,
+                    )
+                  }
+                />
+              )),
+            )}
+        </MenuButton>
       );
     }
     return null;
diff --git a/packages/esm-commons-lib/src/components/encounter-list/multiple-encounter-list.component.tsx b/packages/esm-commons-lib/src/components/encounter-list/multiple-encounter-list.component.tsx
index 62f7acbef..6c666a2fa 100644
--- a/packages/esm-commons-lib/src/components/encounter-list/multiple-encounter-list.component.tsx
+++ b/packages/esm-commons-lib/src/components/encounter-list/multiple-encounter-list.component.tsx
@@ -122,7 +122,8 @@ export const MultipleEncounterList: React.FC<MultipleEncounterListProps> = ({
                   } else {
                     column.link?.getUrl && navigate({ to: column.link.getUrl() });
                   }
-                }}>
+                }}
+              >
                 {val}
               </Link>
             );
diff --git a/packages/esm-commons-lib/src/components/modals/add-patient-to-list-modal.component.tsx b/packages/esm-commons-lib/src/components/modals/add-patient-to-list-modal.component.tsx
index e0fb475ed..2e101c112 100644
--- a/packages/esm-commons-lib/src/components/modals/add-patient-to-list-modal.component.tsx
+++ b/packages/esm-commons-lib/src/components/modals/add-patient-to-list-modal.component.tsx
@@ -36,7 +36,8 @@ export const AddPatientToListOverflowMenuItem: React.FC<{
           onClick={() => setIsOpen(true)}
           style={{
             maxWidth: '100vw',
-          }}>
+          }}
+        >
           <span className="cds--overflow-menu-options__option-content">
             {displayText || t('startHTSSession', 'Start HTS Session')}
           </span>
@@ -167,7 +168,8 @@ export const AddPatientToListModal: React.FC<{
           selectedList == null ||
           isSubmitting ||
           (selectedList == 'none' && currentMemberships.length == 0)
-        }>
+        }
+      >
         <div style={{ paddingLeft: '1rem', marginBottom: '2rem' }}>
           <p style={{ marginBottom: '1rem' }}>Currently added to the list(s) below</p>
           {isLoading ? loader : alreadySubscribedLists}
@@ -180,7 +182,8 @@ export const AddPatientToListModal: React.FC<{
               legendText=""
               name="patient-lists"
               orientation="vertical"
-              onChange={(selected) => setSelectedList(selected.toString())}>
+              onChange={(selected) => setSelectedList(selected.toString())}
+            >
               {availableLists}
             </RadioButtonGroup>
           )}
diff --git a/packages/esm-commons-lib/src/components/ohri-form-launcher/launcher-with-intent.scss b/packages/esm-commons-lib/src/components/ohri-form-launcher/launcher-with-intent.scss
deleted file mode 100644
index eb6831c56..000000000
--- a/packages/esm-commons-lib/src/components/ohri-form-launcher/launcher-with-intent.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import "../../root.scss";
-
-.launchButtonWrapper {
-  width: fit-content;
-  margin: 0 spacing.$spacing-03;
-}
-
-.toggleButtons {
-  width: fit-content;
-  margin: 0 spacing.$spacing-03;
-}
-
-.actionsButtonText {
-  @include type.type-style("body-compact-01");
-  color: $interactive-01;
-}
-
-:global(.cds--tooltip--definition .cds--tooltip__trigger) {
-  border-bottom: none;
-}
diff --git a/packages/esm-commons-lib/src/components/ohri-form-launcher/ohri-form-empty-launcher.component.tsx b/packages/esm-commons-lib/src/components/ohri-form-launcher/ohri-form-empty-launcher.component.tsx
index 1ac693f2c..2829736c9 100644
--- a/packages/esm-commons-lib/src/components/ohri-form-launcher/ohri-form-empty-launcher.component.tsx
+++ b/packages/esm-commons-lib/src/components/ohri-form-launcher/ohri-form-empty-launcher.component.tsx
@@ -15,7 +15,8 @@ export const FormLauncherEmpty: React.FC<{
         onClick={(e) => {
           e.preventDefault();
           launchForm();
-        }}>
+        }}
+      >
         {t('add', 'New')}
       </Button>
     </div>
diff --git a/packages/esm-commons-lib/src/components/ohri-form-launcher/ohri-form-launcher.component.tsx b/packages/esm-commons-lib/src/components/ohri-form-launcher/ohri-form-launcher.component.tsx
deleted file mode 100644
index 0bb844250..000000000
--- a/packages/esm-commons-lib/src/components/ohri-form-launcher/ohri-form-launcher.component.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import { Add } from '@carbon/react/icons';
-import styles from './launcher-with-intent.scss';
-import { useTranslation } from 'react-i18next';
-import { OHRIOverflowMenu } from '../overflow-menu-button/ohri-overflow-menu.component';
-
-export const FormLauncherWithIntent: React.FC<{
-  launchForm: (formJson?: any, intent?: string) => void;
-  title?: string;
-  formJsonList?: Array<any>;
-}> = ({ launchForm, formJsonList, title }) => {
-  const { t } = useTranslation();
-  return (
-    <div style={{ paddingTop: '.3rem' }}>
-      <OHRIOverflowMenu
-        menuTitle={
-          <>
-            <span className={styles.actionsButtonText}>{title || t('add', 'Add')}</span>{' '}
-            <Add size={16} style={{ marginLeft: '0.5rem' }} />
-          </>
-        }
-        overflowItems={formJsonList.map((item) => {
-          return { formJson: item, availableIntents: item.availableIntents };
-        })}
-        launchForm={launchForm}
-      />
-    </div>
-  );
-};
diff --git a/packages/esm-commons-lib/src/components/overflow-menu-button/ohri-overflow-menu.component.tsx b/packages/esm-commons-lib/src/components/overflow-menu-button/ohri-overflow-menu.component.tsx
deleted file mode 100644
index d77c190f3..000000000
--- a/packages/esm-commons-lib/src/components/overflow-menu-button/ohri-overflow-menu.component.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import React, { useState, useCallback, useEffect, useRef } from 'react';
-import { applyFormIntent } from '@openmrs/openmrs-form-engine-lib';
-import { Button } from '@carbon/react';
-import styles from './ohri-overflow-menu.scss';
-
-interface OverflowMenuProps {
-  menuTitle: React.ReactNode;
-  overflowItems: Array<any>;
-  launchForm?: (formJson?: any, intent?: string) => void;
-}
-
-export const OHRIOverflowMenu: React.FC<OverflowMenuProps> = ({ menuTitle, overflowItems, launchForm }) => {
-  const [showMenu, setShowMenu] = useState(false);
-  const wrapperRef = useRef(null);
-  const toggleShowMenu = useCallback(() => setShowMenu((state) => !state), []);
-  useEffect(() => {
-    /**
-     * Toggle showMenu if clicked on outside of element
-     */
-    function handleClickOutside(event: MouseEvent) {
-      if (wrapperRef.current && !wrapperRef.current.contains(event.target)) {
-        setShowMenu(false);
-      }
-    }
-
-    // Bind the event listener
-    document.addEventListener('mousedown', handleClickOutside);
-    return () => {
-      // Unbind the event listener on clean up
-      document.removeEventListener('mousedown', handleClickOutside);
-    };
-  }, [wrapperRef]);
-
-  return (
-    <div className={`cds--overflow-menu ${styles.overflowMenuContainer}`} ref={wrapperRef}>
-      {overflowItems.length > 1 ? (
-        <>
-          <button
-            className={`cds--overflow-menu__trigger ${showMenu && 'cds--overflow-menu--open'}`}
-            aria-haspopup="true"
-            aria-expanded={showMenu}
-            id="custom-actions-overflow-menu-trigger"
-            aria-controls="custom-actions-overflow-menu"
-            onClick={toggleShowMenu}
-            style={{
-              width: 'auto',
-              height: 'auto',
-              padding: '1rem',
-              color: '#0f62fe',
-              outline: '2rem solid transparent',
-              boxShadow: showMenu ? '0 2px 6px 0 rgb(0 0 0 / 30%)' : 'none',
-            }}>
-            {menuTitle}
-          </button>
-          <div
-            className="cds--overflow-menu-options cds--overflow-menu--flip"
-            tabIndex={0}
-            data-floating-menu-direction="bottom"
-            role="menu"
-            aria-labelledby="custom-actions-overflow-menu-trigger"
-            id="custom-actions-overflow-menu"
-            style={{
-              display: showMenu ? 'block' : 'none',
-              top: '3.125rem',
-              minWidth: 'initial',
-              left: 'auto',
-              right: '0',
-              backgroundColor: '#f4f4f4',
-              marginRight: '0.2rem',
-              boxShadow: '0 6px 6px rgb(0 0 0 / 30%)',
-              width: '13rem',
-            }}>
-            <ul className="cds--overflow-menu-options__content">
-              {overflowItems.map((item) => {
-                return item.availableIntents.map((intent, index) => {
-                  return (
-                    <li className="cds--overflow-menu-options__option" id={'item-' + index} key={index}>
-                      <button
-                        id={'menuItem-' + index}
-                        className="cds--overflow-menu-options__btn"
-                        role="menuitem"
-                        title={intent.display}
-                        onClick={(e) => {
-                          e.preventDefault();
-                          const processedForm = applyFormIntent(intent, item.formJson);
-                          launchForm(processedForm, intent.display);
-                          setShowMenu(false);
-                        }}
-                        style={{
-                          maxWidth: '100vw',
-                        }}>
-                        <span className="cds--overflow-menu-options__option-content">{intent.display}</span>
-                      </button>
-                    </li>
-                  );
-                });
-              })}
-            </ul>
-            <span />
-          </div>
-        </>
-      ) : (
-        <Button
-          size="small"
-          kind="ghost"
-          onClick={(e) => {
-            e.preventDefault();
-            launchForm(overflowItems[0].formJson, overflowItems[0].intent);
-          }}
-          style={{
-            width: 'auto',
-            height: 'auto',
-            padding: '1rem',
-            color: '#0f62fe',
-            outline: '2rem solid transparent',
-            boxShadow: showMenu ? '0 2px 6px 0 rgb(0 0 0 / 30%)' : 'none',
-          }}>
-          {menuTitle}
-        </Button>
-      )}
-    </div>
-  );
-};
diff --git a/packages/esm-commons-lib/src/components/overflow-menu-button/ohri-overflow-menu.scss b/packages/esm-commons-lib/src/components/overflow-menu-button/ohri-overflow-menu.scss
deleted file mode 100644
index 160bdf0d3..000000000
--- a/packages/esm-commons-lib/src/components/overflow-menu-button/ohri-overflow-menu.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-@use '@carbon/styles/scss/spacing';
-@use '@carbon/styles/scss/type';
-@import "../../root.scss";
-
-.actionsButtonText {
-  @include type.type-style("body-compact-01");
-  color: $interactive-01;
-}
-
-:global(.cds--tooltip--definition .cds--tooltip__trigger) {
-  border-bottom: none;
-}
-
-.overflowMenuContainer {
-  width: auto;
-  height: auto;
-  margin-bottom: -1.5rem;
-  margin-top: -1.25rem;
-  margin-right: 0.5rem;
-}
diff --git a/packages/esm-commons-lib/src/components/patient-table/patient-table.component.tsx b/packages/esm-commons-lib/src/components/patient-table/patient-table.component.tsx
index 043cfdf28..7da7807f1 100644
--- a/packages/esm-commons-lib/src/components/patient-table/patient-table.component.tsx
+++ b/packages/esm-commons-lib/src/components/patient-table/patient-table.component.tsx
@@ -250,7 +250,8 @@ export const PatientTable: React.FC<PatientTableProps> = ({
                             header,
                             isSortable: header.isSortable,
                           })}
-                          className={isDesktop(layout) ? styles.desktopHeader : styles.tabletHeader}>
+                          className={isDesktop(layout) ? styles.desktopHeader : styles.tabletHeader}
+                        >
                           {header.header?.content ?? header.header}
                         </TableHeader>
                       ))}
@@ -264,7 +265,8 @@ export const PatientTable: React.FC<PatientTableProps> = ({
                         <TableRow
                           {...getRowProps({ row })}
                           className={isDesktop(layout) ? styles.desktopRow : styles.tabletRow}
-                          key={row.id}>
+                          key={row.id}
+                        >
                           {row.cells.map((cell) => (
                             <TableCell key={cell.id}>{cell.value?.content ?? cell.value}</TableCell>
                           ))}
diff --git a/packages/esm-commons-lib/src/dashboards/DashboardExtension.tsx b/packages/esm-commons-lib/src/dashboards/DashboardExtension.tsx
index 756a87171..a9620df49 100644
--- a/packages/esm-commons-lib/src/dashboards/DashboardExtension.tsx
+++ b/packages/esm-commons-lib/src/dashboards/DashboardExtension.tsx
@@ -27,7 +27,8 @@ export const DashboardExtension = ({
     <div key={path}>
       <ConfigurableLink
         to={`${basePath}/${encodeURIComponent(path)}`}
-        className={`cds--side-nav__link ${path === navLink && 'active-left-nav-link'}`}>
+        className={`cds--side-nav__link ${path === navLink && 'active-left-nav-link'}`}
+      >
         {linkText || t(title)}
       </ConfigurableLink>
     </div>
diff --git a/packages/esm-commons-lib/src/hooks/usePatientList.tsx b/packages/esm-commons-lib/src/hooks/usePatientList.tsx
index 93a740801..1abec8a3a 100644
--- a/packages/esm-commons-lib/src/hooks/usePatientList.tsx
+++ b/packages/esm-commons-lib/src/hooks/usePatientList.tsx
@@ -23,7 +23,8 @@ export function usePatientList(offSet: number, pageSize: number, searchTerm?: st
           return (
             <ConfigurableLink
               to={`/openmrs/spa/patient/${patient.resource.id}/chart`}
-              style={{ textDecoration: 'inherit' }}>
+              style={{ textDecoration: 'inherit' }}
+            >
               {patientName}
             </ConfigurableLink>
           );
diff --git a/packages/esm-commons-lib/src/index.ts b/packages/esm-commons-lib/src/index.ts
index 36e228097..2bbd2e033 100644
--- a/packages/esm-commons-lib/src/index.ts
+++ b/packages/esm-commons-lib/src/index.ts
@@ -18,10 +18,8 @@ export * from './components/identifier-generator/identifier-generator.component'
 export * from './components/loading/loading.component';
 export * from './components/modals/add-patient-to-list-modal.component';
 export * from './components/ohri-form-launcher/ohri-form-empty-launcher.component';
-export * from './components/ohri-form-launcher/ohri-form-launcher.component';
 export * from './components/ohri-home/ohri-home-component';
 export * from './components/ohri-home/welcome-section/ohri-welcome-section.component';
-export * from './components/overflow-menu-button/ohri-overflow-menu.component';
 export * from './components/patient-banner/patient-banner.component';
 export * from './components/patient-chart/ohri-patient-chart-sidenav.meta';
 export * from './components/patient-list-tabs/ohri-patient-list-tabs.component';
@@ -56,7 +54,7 @@ export * from './hooks/useLastEncounter';
 // Workspace registration moved to the index.ts and routes.json
 const options = {
   featureName: 'ohri-forms-workspace-item',
-  moduleName: "@ohri/openmrs-esm-ohri-commons-lib",
+  moduleName: '@ohri/openmrs-esm-ohri-commons-lib',
 };
 
 // t('ohriForms', "OHRI Forms")
diff --git a/packages/esm-commons-lib/src/root.scss b/packages/esm-commons-lib/src/root.scss
index a3f7b89ff..f07879489 100644
--- a/packages/esm-commons-lib/src/root.scss
+++ b/packages/esm-commons-lib/src/root.scss
@@ -113,4 +113,8 @@ div[class*='-esm-login__styles__center'] > img {
   &:hover {
     background-color: #e0e0e0;
   }
-} 
\ No newline at end of file
+} 
+
+:global(.cds--side-nav--ux .cds--side-nav__item) {
+  list-style: none;
+}
\ No newline at end of file
diff --git a/packages/esm-commons-lib/src/utils/createNewOHRIDashboardLink.tsx b/packages/esm-commons-lib/src/utils/createNewOHRIDashboardLink.tsx
index 08316ba86..ac760d580 100644
--- a/packages/esm-commons-lib/src/utils/createNewOHRIDashboardLink.tsx
+++ b/packages/esm-commons-lib/src/utils/createNewOHRIDashboardLink.tsx
@@ -31,7 +31,8 @@ function NewDashboardExtension({ dashboardLinkConfig }: { dashboardLinkConfig: D
         e.preventDefault();
         navigate({ to: `${spaBasePath}/${name}` });
       }}
-      className={navLink.match(name) ? styles.currentNavItem : ''}>
+      className={navLink.match(name) ? styles.currentNavItem : ''}
+    >
       {title}
     </SideNavLink>
   );
diff --git a/packages/esm-commons-lib/src/utils/createOHRIDashboardLink.tsx b/packages/esm-commons-lib/src/utils/createOHRIDashboardLink.tsx
index b5063668d..d4af86fde 100644
--- a/packages/esm-commons-lib/src/utils/createOHRIDashboardLink.tsx
+++ b/packages/esm-commons-lib/src/utils/createOHRIDashboardLink.tsx
@@ -35,7 +35,8 @@ export const createOHRIDashboardLink = (meta) => {
             e.preventDefault();
             navigate({ to: `${window.spaBase}/dashboard/${meta.name}` });
           }}
-          className={isSelected ? styles.currentNavItem : ''}>
+          className={isSelected ? styles.currentNavItem : ''}
+        >
           {meta.title}
         </SideNavLink>
       );
@@ -47,7 +48,8 @@ export const createOHRIDashboardLink = (meta) => {
             e.preventDefault();
             navigate({ to: `${window.spaBase}/dashboard/${meta.name}` });
           }}
-          className={isSelected ? styles.currentNavItem : ''}>
+          className={isSelected ? styles.currentNavItem : ''}
+        >
           {meta.title}
         </SideNavMenuItem>
       );
diff --git a/packages/esm-commons-lib/src/utils/createOHRIGroupedLink.tsx b/packages/esm-commons-lib/src/utils/createOHRIGroupedLink.tsx
index c802ba29c..dbf9336e0 100644
--- a/packages/esm-commons-lib/src/utils/createOHRIGroupedLink.tsx
+++ b/packages/esm-commons-lib/src/utils/createOHRIGroupedLink.tsx
@@ -39,7 +39,8 @@ function DashboardExtension({ dashboardLinkConfig }: { dashboardLinkConfig: Dash
             className={classNames('cds--side-nav__link', {
               'active-left-nav-link': navLink.match(name),
             })}
-            to={`${spaBasePath}/${name}`}>
+            to={`${spaBasePath}/${name}`}
+          >
             {t(title)}
           </ConfigurableLink>
           {Array.isArray(childLinks) &&
@@ -49,7 +50,8 @@ function DashboardExtension({ dashboardLinkConfig }: { dashboardLinkConfig: Dash
                 className={classNames('cds--side-nav__link', {
                   'active-left-nav-link': navLink.match(childLink.name),
                 })}
-                to={`${spaBasePath}/${childLink.name}`}>
+                to={`${spaBasePath}/${childLink.name}`}
+              >
                 {t(childLink.title)}
               </ConfigurableLink>
             ))}
@@ -63,7 +65,8 @@ function DashboardExtension({ dashboardLinkConfig }: { dashboardLinkConfig: Dash
           className={classNames('cds--side-nav__link', {
             'active-left-nav-link': navLink.match(name),
           })}
-          to={`${spaBasePath}/${name}`}>
+          to={`${spaBasePath}/${name}`}
+        >
           {t(title)}
         </ConfigurableLink>
       </SideNavItems>
diff --git a/packages/esm-commons-lib/src/utils/sidenav-links.tsx b/packages/esm-commons-lib/src/utils/sidenav-links.tsx
index d4d87eb10..e1a974801 100644
--- a/packages/esm-commons-lib/src/utils/sidenav-links.tsx
+++ b/packages/esm-commons-lib/src/utils/sidenav-links.tsx
@@ -10,12 +10,14 @@ export const createDashboardLink = (db) => {
       <SideNavMenu title="HIV" className={styles.noMarker} defaultExpanded={true}>
         <SideNavMenuItem
           className={isActiveLink(db.hts.name) ? styles.currentNavItem : ''}
-          href={`${basePath}/${db.hts.name}`}>
+          href={`${basePath}/${db.hts.name}`}
+        >
           {db.hts.title}
         </SideNavMenuItem>
         <SideNavMenuItem
           className={isActiveLink(db.caretreament.name) ? styles.currentNavItem : ''}
-          href={`${basePath}/${db.caretreament.name}`}>
+          href={`${basePath}/${db.caretreament.name}`}
+        >
           {db.caretreament.title}
         </SideNavMenuItem>
         <SideNavMenuItem>{db.pmtct.title}</SideNavMenuItem>
diff --git a/packages/esm-commons-lib/src/workspace/patient-list-workspace.tsx b/packages/esm-commons-lib/src/workspace/patient-list-workspace.tsx
index 1ab03cf3d..47eb6b731 100644
--- a/packages/esm-commons-lib/src/workspace/patient-list-workspace.tsx
+++ b/packages/esm-commons-lib/src/workspace/patient-list-workspace.tsx
@@ -53,14 +53,16 @@ const Overflow: React.FC<
                 paddingTop: '11px',
                 paddingBottom: '11px',
                 paddingLeft: '16px',
-              }}>
+              }}
+            >
               <Breadcrumb>
                 <BreadcrumbItem className={''}>
                   <a
                     href="/#"
                     onClick={(event) => {
                       event.preventDefault();
-                    }}>
+                    }}
+                  >
                     Patient Lists
                   </a>
                 </BreadcrumbItem>
@@ -69,14 +71,16 @@ const Overflow: React.FC<
                   onClick={(event) => {
                     event.preventDefault();
                   }}
-                  isCurrentPage>
+                  isCurrentPage
+                >
                   {header}
                 </BreadcrumbItem>
               </Breadcrumb>
             </div>
             <div
               className={styles.patientListRow}
-              style={{ borderBottom: '1px solid #e0e0e0', paddingBottom: '4px', paddingRight: '1rem' }}>
+              style={{ borderBottom: '1px solid #e0e0e0', paddingBottom: '4px', paddingRight: '1rem' }}
+            >
               <div className={styles.flexRow}>
                 <span className={styles.bannerTitle}>{meta.subTitle}</span>
               </div>
diff --git a/packages/esm-covid-app/src/index.ts b/packages/esm-covid-app/src/index.ts
index 1e3795dba..b9b1c1391 100644
--- a/packages/esm-covid-app/src/index.ts
+++ b/packages/esm-covid-app/src/index.ts
@@ -1,9 +1,7 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
+import { defineConfigSchema, getSyncLifecycle } from '@openmrs/esm-framework';
 import CovidVaccinations from './views/covid-vaccinations.component';
 import CovidLabResults from './views/lab-results.component';
 import CovidAssessment from './views/case-assessment.component';
-import CovidHomePatientTabs from './views/dashboard/patient-list-tabs/covid-patient-list-tabs.component';
-import CovidSummaryTiles from './views/dashboard/summary-tiles/covid-summary-tiles.component';
 import {
   covidAssessmentsDashboardMeta,
   covidLabTestsDashboardMeta,
@@ -12,7 +10,7 @@ import {
   covid19CasesDashboardMeta,
   covidPatientChartMeta,
 } from './dashboard.meta';
-import { createOHRIDashboardLink, createOHRIGroupedLink, OHRIHome, OHRIWelcomeSection } from '@ohri/openmrs-esm-ohri-commons-lib';
+import { createOHRIDashboardLink, createOHRIGroupedLink } from '@ohri/openmrs-esm-ohri-commons-lib';
 import { createDashboardGroup, createDashboardLink } from '@openmrs/esm-patient-common-lib';
 import { configSchema } from './config-schema';
 import rootComponent from './root.component';
@@ -51,18 +49,7 @@ export const covidLabResultsDashboardLink = getSyncLifecycle(
   createDashboardLink({ ...covidLabTestsDashboardMeta, moduleName }),
   options,
 );
-export const covidDashboardHeader = getSyncLifecycle(OHRIWelcomeSection, {
-  featureName: 'covid-home-header',
-  moduleName,
-});
-export const covidDashboardTiles = getSyncLifecycle(CovidSummaryTiles, {
-  featureName: 'covid-home-tiles',
-  moduleName,
-});
-export const covidDashboardTabs = getSyncLifecycle(CovidHomePatientTabs, {
-  featureName: 'covid-home-tabs',
-  moduleName,
-});
+
 export const covidAssessmentsDashboard = getSyncLifecycle(CovidAssessment, {
   featureName: 'covid-assessment',
   moduleName,
diff --git a/packages/esm-covid-app/src/routes.json b/packages/esm-covid-app/src/routes.json
index e6dbba5f7..f7a8a6f3f 100644
--- a/packages/esm-covid-app/src/routes.json
+++ b/packages/esm-covid-app/src/routes.json
@@ -16,21 +16,6 @@
         "title": "COVID"
       }
     },
-    {
-      "name": "covid-home-header-ext",
-      "slot": "covid-home-header-slot",
-      "component": "covidDashboardHeader"
-    },
-    {
-      "name": "covid-home-tiles-ext",
-      "slot": "covid-home-tiles-slot",
-      "component": "covidDashboardTiles"
-    },
-    {
-      "name": "covid-home-tabs-ext",
-      "slot": "covid-home-tabs-slot",
-      "component": "covidDashboardTabs"
-    },
     {
       "name": "ohri-covid",
       "slot": "patient-chart-dashboard-slot",
diff --git a/packages/esm-form-render-app/src/render/forms-render-test.component.tsx b/packages/esm-form-render-app/src/render/forms-render-test.component.tsx
index 1fc3442ba..f62fd9d14 100644
--- a/packages/esm-form-render-app/src/render/forms-render-test.component.tsx
+++ b/packages/esm-form-render-app/src/render/forms-render-test.component.tsx
@@ -153,7 +153,8 @@ function FormRenderTest() {
                     onSubmit={(e) => {
                       e.preventDefault();
                       handleFormSubmission(e);
-                    }}>
+                    }}
+                  >
                     <AceEditor
                       key={key}
                       mode="json"
@@ -217,7 +218,8 @@ function FormRenderTest() {
                       renderIcon={Run}
                       className="form-group"
                       style={{ marginTop: '1em', marginLeft: '10px' }}
-                      disabled={!selectedFormIntent}>
+                      disabled={!selectedFormIntent}
+                    >
                       {t('render', 'Render')}
                     </Button>
                   </Form>
diff --git a/packages/esm-hiv-app/src/index.ts b/packages/esm-hiv-app/src/index.ts
index 68bc900ea..15ed58f73 100644
--- a/packages/esm-hiv-app/src/index.ts
+++ b/packages/esm-hiv-app/src/index.ts
@@ -1,11 +1,5 @@
 import { defineConfigSchema, getSyncLifecycle } from '@openmrs/esm-framework';
 import ServiceSummaryOverviewList from './views/service-summary/encounter-list/service-summary-encounter-list.component';
-import HTSSummaryTiles from './views/hts/home/summary-tiles/hts-summary-tiles.component';
-import OHRIPatientTabs from './views/hts/home/patient-tabs/ohri-patient-tabs.component';
-import CTSummaryTiles from './views/hts/care-and-treatment/summary-tiles/ct-summary-tiles.component';
-import CTHomePatientTabs from './views/hts/patient-list-tabs/ct-patient-list-tabs.component';
-import LabResultsSummaryTiles from './views/hts/lab-results/lab-results-summary-tiles.component';
-import LabResultsSummary from './views/hts/lab-results/lab-results-summary.component';
 import HTSPreventionSummary from './views/hiv-testing-services/hts-prevention-summary.component';
 import ProgramManagementSummary from './views/program-management/program-management-summary.component';
 import VisitsSummary from './views/visits/visits-summary.component';
@@ -14,16 +8,12 @@ import PartnerNotificationServices from './views/partner-notification-services/p
 import {
   createOHRIDashboardLink,
   PatientStatusBannerTag,
-  OHRIHome,
-  OHRIWelcomeSection,
   createOHRIGroupedLink,
 } from '@ohri/openmrs-esm-ohri-commons-lib';
 import { createDashboardGroup, createDashboardLink } from '@openmrs/esm-patient-common-lib';
 
 import {
   hivCareAndTreatmentFolderDashboardMeta,
-  careAndTreatmentDashboardMeta,
-  htsDashboardMeta,
   htsSummaryDashboardMeta,
   hivPreventionDashboardMeta,
   hivCareAndTreatmentDashboardDMeta,
@@ -61,36 +51,6 @@ export const htsServiceSummaryList = getSyncLifecycle(ServiceSummaryOverviewList
   moduleName,
 });
 
-export const htsHomeHeader = getSyncLifecycle(OHRIWelcomeSection, {
-  featureName: 'hts-home-header',
-  moduleName,
-});
-
-export const htsHomeTiles = getSyncLifecycle(HTSSummaryTiles, {
-  featureName: 'hts-home-tiles',
-  moduleName,
-});
-
-export const htsHomeTabs = getSyncLifecycle(OHRIPatientTabs, {
-  featureName: 'hts-home-tabs',
-  moduleName,
-});
-
-export const ctHomeHeader = getSyncLifecycle(OHRIWelcomeSection, {
-  featureName: 'ct-home-header',
-  moduleName,
-});
-
-export const ctHomeTiles = getSyncLifecycle(CTSummaryTiles, {
-  featureName: 'ct-home-tiles',
-  moduleName,
-});
-
-export const ctHomeTabs = getSyncLifecycle(CTHomePatientTabs, {
-  featureName: 'ct-home-tabs',
-  moduleName,
-});
-
 export const hivCareAndTreatmentFolderLink = getSyncLifecycle(
   createOHRIDashboardLink(hivCareAndTreatmentFolderDashboardMeta),
   options,
@@ -111,22 +71,6 @@ export const hivPreventionDashboardLink = getSyncLifecycle(
 );
 export const hivPreventionDashboard = getSyncLifecycle(htsRootComponent, options);
 
-// Lab Results
-export const labResultsHomeHeader = getSyncLifecycle(OHRIWelcomeSection, {
-  featureName: 'lab-results-home-header',
-  moduleName,
-});
-
-export const labResultsHomeTiles = getSyncLifecycle(LabResultsSummaryTiles, {
-  featureName: 'lab-results-home-tiles',
-  moduleName,
-});
-
-export const labResultsHomeTabs = getSyncLifecycle(LabResultsSummary, {
-  featureName: 'lab-results-tabs',
-  moduleName,
-});
-
 // Patient Chart
 export const patientChartHIVPreventionDashboard = getSyncLifecycle(
   createDashboardGroup(hivPreventionDashboardMeta),
diff --git a/packages/esm-hiv-app/src/routes.json b/packages/esm-hiv-app/src/routes.json
index 98a109545..2726107e8 100644
--- a/packages/esm-hiv-app/src/routes.json
+++ b/packages/esm-hiv-app/src/routes.json
@@ -37,21 +37,6 @@
       "slot": "hts-dashboard-slot",
       "component": "hivPreventionDashboard"
     },
-    {
-      "name": "hts-home-header-ext",
-      "slot": "hts-home-header-slot",
-      "component": "htsHomeHeader"
-    },
-    {
-      "name": "hts-home-tiles-ext",
-      "slot": "hts-home-tiles-slot",
-      "component": "htsHomeTiles"
-    },
-    {
-      "name": "hts-home-tabs-ext",
-      "slot": "hts-home-tabs-slot",
-      "component": "htsHomeTabs"
-    },
     {
       "name": "hiv-care-and-treatment-dashboard-link",
       "slot": "dashboard-slot",
@@ -78,37 +63,6 @@
       "slot": "ct-dashboard-slot",
       "component": "hivCareAndTreatmentDashboard"
     },
-    {
-      "name": "ct-home-header-ext",
-      "slot": "ct-home-header-slot",
-      "component": "ctHomeHeader"
-    },
-    {
-      "name": "ct-home-tiles-ext",
-      "slot": "ct-home-tiles-slot",
-      "component": "ctHomeTiles"
-    },
-    {
-      "name": "ct-home-tabs-ext",
-      "slot": "ct-home-tabs-slot",
-      "component": "ctHomeTabs"
-    },
-    {
-      "name": "lab-results-home-header-ext",
-      "slot": "lab-results-home-header-slot",
-      "component": "labResultsHomeHeader"
-    },
-    {
-      "name": "lab-results-home-tiles-ext",
-      "slot": "lab-results-home-tiles-slot",
-      "component": "labResultsHomeTiles"
-    },
-    {
-      "name": "lab-results-tabs-ext",
-      "slot": "lab-results-home-tabs-slot",
-      "component": "labResultsHomeTabs"
-    },
-
     {
       "name": "ohri-hiv-care-and-treatment",
       "slot": "patient-chart-dashboard-slot",
diff --git a/packages/esm-hiv-app/src/views/hts/client-linkage/client-linkage-form-section.component.tsx b/packages/esm-hiv-app/src/views/hts/client-linkage/client-linkage-form-section.component.tsx
index dfaa4877f..50439dc6a 100644
--- a/packages/esm-hiv-app/src/views/hts/client-linkage/client-linkage-form-section.component.tsx
+++ b/packages/esm-hiv-app/src/views/hts/client-linkage/client-linkage-form-section.component.tsx
@@ -23,7 +23,8 @@ const ClientLinkage = () => {
                 iconDescription="New"
                 onClick={(e) => {
                   e.preventDefault();
-                }}>
+                }}
+              >
                 {t('add', 'Add')}
               </Button>
             </div>
diff --git a/packages/esm-hiv-app/src/views/hts/lab-results/tabs/cd4-results.component.tsx b/packages/esm-hiv-app/src/views/hts/lab-results/tabs/cd4-results.component.tsx
index 8bf769660..0cabf768f 100644
--- a/packages/esm-hiv-app/src/views/hts/lab-results/tabs/cd4-results.component.tsx
+++ b/packages/esm-hiv-app/src/views/hts/lab-results/tabs/cd4-results.component.tsx
@@ -68,7 +68,8 @@ const CD4ResultsList: React.FC<CD4ResultsListProps> = ({ patientUuid }) => {
           form={{ package: 'hiv', name: 'cd4_lab_results' }}
           patientUuid={patient.resource.id}
           encounterUuid={lastCd4EncounterUuid}
-          patientUrl={getPatientURL(patient.resource.id)}></LabresultsFormViewer>
+          patientUrl={getPatientURL(patient.resource.id)}
+        ></LabresultsFormViewer>
       );
 
       rows.push({
diff --git a/packages/esm-hiv-app/src/views/hts/lab-results/tabs/viral-load-results.component.tsx b/packages/esm-hiv-app/src/views/hts/lab-results/tabs/viral-load-results.component.tsx
index 8584cd3db..833d4460b 100644
--- a/packages/esm-hiv-app/src/views/hts/lab-results/tabs/viral-load-results.component.tsx
+++ b/packages/esm-hiv-app/src/views/hts/lab-results/tabs/viral-load-results.component.tsx
@@ -68,7 +68,8 @@ const ViralLoadResultsList: React.FC<ViralLoadResultsListProps> = () => {
           form={{ package: 'hiv', name: 'viral_load_results' }}
           patientUuid={patient.resource.id}
           encounterUuid={lastViralLoadEncounterUuid}
-          patientUrl={getPatientURL(patient.resource.id)}></LabresultsFormViewer>
+          patientUrl={getPatientURL(patient.resource.id)}
+        ></LabresultsFormViewer>
       );
 
       rows.push({
diff --git a/packages/esm-ohri-pmtct-app/src/index.ts b/packages/esm-ohri-pmtct-app/src/index.ts
index 7097e1e25..0eaf0eea4 100644
--- a/packages/esm-ohri-pmtct-app/src/index.ts
+++ b/packages/esm-ohri-pmtct-app/src/index.ts
@@ -1,9 +1,6 @@
 import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
-import MaternalSummary from './views/mch-summary/mch-summary.component';
 import MaternalHealthList from './views/maternal-health/maternal-health.component';
 import ChildHealthList from './views/child-health/child-health.component';
-import MaternalChildSummaryTiles from './views/summary-tabs/maternal-child-summary-tiles.component';
-import LabResultsSummary from './views/summary-tabs/mother-child-summary-tabs.component';
 import {
   mchSummaryDashboardMeta,
   maternalVisitsDashboardMeta,
@@ -16,10 +13,8 @@ import {
   createConditionalDashboardLink,
   createNewOHRIDashboardLink,
   OHRIHome,
-  OHRIWelcomeSection,
   createConditionalDashboardGroup,
 } from '@ohri/openmrs-esm-ohri-commons-lib';
-import { generateInfantPTrackerId } from './utils/pmtct-helpers';
 import { configSchema } from './config-schema';
 import rootComponent from './root.component';
 import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
@@ -97,17 +92,3 @@ export const maternalChildDashboard = getSyncLifecycle(OHRIHome, {
   featureName: 'mother child health results dashboard',
   moduleName,
 });
-export const pmtctDashboardHeader = getSyncLifecycle(OHRIWelcomeSection, {
-  featureName: 'pmtct-home-header',
-  moduleName,
-});
-
-export const pmtctDashboardTiles = getSyncLifecycle(MaternalChildSummaryTiles, {
-  featureName: 'pmtct-home-tiles',
-  moduleName,
-});
-
-export const pmtctDashboardTabs = getSyncLifecycle(LabResultsSummary, {
-  featureName: 'pmtct-home-tabs',
-  moduleName,
-});
diff --git a/packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/current-pregnancy.component.tsx b/packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/current-pregnancy.component.tsx
index c1b1419a2..bd8c2262e 100644
--- a/packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/current-pregnancy.component.tsx
+++ b/packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/current-pregnancy.component.tsx
@@ -187,7 +187,8 @@ const CurrentPregnancy: React.FC<PatientChartProps> = ({ patientUuid }) => {
             onClick={(e) => {
               e.preventDefault();
               navigate({ to: `${basePath}${relative.personB.uuid}/chart` });
-            }}>
+            }}
+          >
             {relative.personB.display}
           </Link>
         );
diff --git a/packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/hiv-exposed-infant.component.tsx b/packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/hiv-exposed-infant.component.tsx
index 5d10e26ff..f7c75a4ba 100644
--- a/packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/hiv-exposed-infant.component.tsx
+++ b/packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/hiv-exposed-infant.component.tsx
@@ -162,7 +162,8 @@ const HivExposedInfant: React.FC<{
           onClick={(e) => {
             e.preventDefault();
             navigate({ to: `${basePath}${relative.personA.uuid}/chart` });
-          }}>
+          }}
+        >
           {relative.personA.display}
         </Link>
       );
diff --git a/packages/esm-tb-app/src/index.ts b/packages/esm-tb-app/src/index.ts
index b187b5b60..43c24f3f2 100644
--- a/packages/esm-tb-app/src/index.ts
+++ b/packages/esm-tb-app/src/index.ts
@@ -1,10 +1,5 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
-import {
-  createOHRIDashboardLink,
-  OHRIHome,
-  OHRIWelcomeSection,
-  createOHRIGroupedLink,
-} from '@ohri/openmrs-esm-ohri-commons-lib';
+import { defineConfigSchema, getSyncLifecycle } from '@openmrs/esm-framework';
+import { createOHRIDashboardLink, createOHRIGroupedLink } from '@ohri/openmrs-esm-ohri-commons-lib';
 import { createDashboardGroup, createDashboardLink } from '@openmrs/esm-patient-common-lib';
 import {
   tbPatientChartMeta,
@@ -24,12 +19,8 @@ import TBSummaryOverviewList from './views/patient-summary/tb-patient-summary.co
 import ProgramManagementSummary from './views/program-management/maternal-health.component';
 import TbTreatmentFollowUpList from './views/treatment-and-follow-up/tb-treatment-follow-up.component';
 import TbContactTracingList from './views/tb-contact-listing/tb-contact-list.component';
-import TbSummaryTiles from './views/dashboard/summary-tiles/tb-summary-tiles.component';
-import TbHomePatientTabs from './views/dashboard/patient-list-tabs/tb-patient-list-tabs.component';
 import tptProgramManagementSummary from './views/tpt/program-management/tpt-program-management';
 import tptPatientSummary from './views/tpt/patient-summary/patient-summary.component';
-import TptPreventionSummaryTiles from './views/dashboard/summary-tiles/tpt-summary-tiles.component';
-import TptPatientListTabs from './views/dashboard/patient-list-tabs/tpt-patient-list-tabs.component';
 import rootComponent from './root.component';
 import TptHomeComponent from './tpt-home.component';
 
@@ -87,31 +78,6 @@ export const tbContactListingDashboard = getSyncLifecycle(TbContactTracingList,
   featureName: 'tb-contact-listing-summary',
   moduleName,
 });
-export const tbDashboardHeader = getSyncLifecycle(OHRIWelcomeSection, {
-  featureName: 'tb-home-header',
-  moduleName,
-});
-
-export const tbDashboardTiles = getSyncLifecycle(TbSummaryTiles, {
-  featureName: 'tb-home-tiles',
-  moduleName,
-});
-export const tbDashboardTabs = getSyncLifecycle(TbHomePatientTabs, {
-  featureName: 'tb-home-tabs',
-  moduleName,
-});
-export const tptDashboardHeader = getSyncLifecycle(OHRIWelcomeSection, {
-  featureName: 'tpt-home-header',
-  moduleName,
-});
-export const tptDashboardTiles = getSyncLifecycle(TptPreventionSummaryTiles, {
-  featureName: 'tpt-home-tiles',
-  moduleName,
-});
-export const tptDashboardTabs = getSyncLifecycle(TptPatientListTabs, {
-  featureName: 'tpt-home-tabs',
-  moduleName,
-});
 
 export const tptPatientSummaryDashboardLink = getSyncLifecycle(
   createDashboardLink({ ...tptPatientSummaryMeta, moduleName }),
diff --git a/packages/esm-tb-app/src/routes.json b/packages/esm-tb-app/src/routes.json
index 741077094..4970eb4c2 100644
--- a/packages/esm-tb-app/src/routes.json
+++ b/packages/esm-tb-app/src/routes.json
@@ -150,37 +150,6 @@
         "title": "Tuberculosis"
       }
     },
-    
-    {
-      "name": "tb-home-header-ext",
-      "slot": "tb-home-header-slot",
-      "component": "tbDashboardHeader"
-    },
-    {
-      "name": "tb-home-tiles-ext",
-      "slot": "tb-home-tiles-slot",
-      "component": "tbDashboardTiles"
-    },
-    {
-      "name": "tb-home-tabs-ext",
-      "slot": "tb-home-tabs-slot",
-      "component": "tbDashboardTabs"
-    },
-    {
-      "name": "tpt-home-header-ext",
-      "slot": "tpt-home-header-slot",
-      "component": "tptDashboardHeader"
-    },
-    {
-      "name": "tpt-home-tiles-ext",
-      "slot": "tpt-home-tiles-slot",
-      "component": "tptDashboardTiles"
-    },
-    {
-      "name": "tpt-home-tabs-ext",
-      "slot": "tpt-home-tabs-slot",
-      "component": "tptDashboardTabs"
-    },
     {
       "name": "tb-cases-dashboard-ext",
       "slot": "homepage-dashboard-slot",
diff --git a/prettier.config.js b/prettier.config.js
index 3e3db4d36..99e9f3d28 100644
--- a/prettier.config.js
+++ b/prettier.config.js
@@ -1,9 +1,8 @@
 module.exports = {
+  bracketSpacing: true,
   printWidth: 120,
+  semi: true,
   singleQuote: true,
+  tabWidth: 2,
   trailingComma: 'all',
-  bracketSpacing: true,
-  parser: 'typescript',
-  semi: true,
-  jsxBracketSameLine: true,
 };
diff --git a/tsconfig.json b/tsconfig.json
index 3de51c23d..4bac816bf 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,27 +1,29 @@
 {
-    "compilerOptions": {
-      "esModuleInterop": true,
-      "module": "esnext",
-      "allowSyntheticDefaultImports": true,
-      "jsx": "react",
-      "skipLibCheck": true,
-      "moduleResolution": "node",
-      "lib": [
-        "dom",
-        "es5",
-        "es6",
-        "scripthost",
-        "es2015",
-        "es2015.promise",
-        "es2016.array.include",
-        "es2018",
-        "es2020"
-      ],
-      "resolveJsonModule": true,
-      "noEmit": true,
-      "target": "esnext",
-      "paths": {
-        "@openmrs/*": ["./node_modules/@openmrs/*"]
-      }
-    }
-  }
+  "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "jsx": "react",
+    "lib": [
+      "dom",
+      "es5",
+      "scripthost",
+      "es2015",
+      "es2015.promise",
+      "es2016.array.include",
+      "es2018",
+      "es2020"
+    ],
+    "module": "esnext",
+    "moduleResolution": "node",
+    "noEmit": true,
+    "paths": {
+      "@openmrs/*": ["./node_modules/@openmrs/*"],
+      "__mocks__": ["./__mocks__"],
+      "tools": ["./tools"],
+    },
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "target": "esnext",
+    "typeRoots": ["./node_modules/@types", "./node_modules/testing-library"]
+  },
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 40e1a4de5..665c5b7d4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1310,7 +1310,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.5, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.1, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.5, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
   version: 7.20.6
   resolution: "@babel/runtime@npm:7.20.6"
   dependencies:
@@ -1319,6 +1319,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.22.15":
+  version: 7.24.5
+  resolution: "@babel/runtime@npm:7.24.5"
+  dependencies:
+    regenerator-runtime: "npm:^0.14.0"
+  checksum: e0f4f4d4503f7338749d1dd92361ad132d683bde64e6b61d6c855e100dcd01592295fcfdcc960c946b85ef7908dc2f501080da58447c05812cf3cd80c599bb62
+  languageName: node
+  linkType: hard
+
 "@babel/runtime@npm:^7.19.0":
   version: 7.23.8
   resolution: "@babel/runtime@npm:7.23.8"
@@ -1429,33 +1438,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/colors@npm:^11.8.0":
-  version: 11.8.0
-  resolution: "@carbon/colors@npm:11.8.0"
-  checksum: 3d79046b23e5652af31fd2f8c6986ac582003b90c9c3e64ac0702312517a890837f6e4aa2fc99da00e1ec59a06984c64fb40250b8451e22ecbfa71d0a4894f8e
+"@carbon/colors@npm:^11.22.0":
+  version: 11.22.0
+  resolution: "@carbon/colors@npm:11.22.0"
+  dependencies:
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 0b57a1aefa1b4dbd30cc6a9375e8998ba94c412515bd3fa08b387ed9d48b47552890ce1add228c34a0f6f093ace7deb796c967b76dadf27d0189eee26e88c05d
   languageName: node
   linkType: hard
 
-"@carbon/feature-flags@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "@carbon/feature-flags@npm:0.9.0"
-  checksum: 12d5eb32cad00262fa53d1bcaf53eb9a8d7c3e6f80b9b718a83a77264df5aff936fdebe7cec9505d0e470930a6015e3dde9f18beebe1eed14d44a65641a2352a
+"@carbon/feature-flags@npm:^0.16.0":
+  version: 0.16.0
+  resolution: "@carbon/feature-flags@npm:0.16.0"
+  checksum: d509cfe9d2a1188c0f1f510dd83d204ff55fbd21a1760eeb008ac0c4deba39e55f6c902b826639643b5ca7aa3cd83ee9a1b05cb44b3ee06d72c1efb6bcfa503f
   languageName: node
   linkType: hard
 
-"@carbon/grid@npm:^11.7.0":
-  version: 11.7.0
-  resolution: "@carbon/grid@npm:11.7.0"
+"@carbon/feature-flags@npm:^0.20.0":
+  version: 0.20.0
+  resolution: "@carbon/feature-flags@npm:0.20.0"
   dependencies:
-    "@carbon/layout": "npm:^11.7.0"
-  checksum: 9b81430a59d6e3a21174dd65f4030cee7f770ee184623be5a3d1bf60e9f13885e900ec4678fdbbf9d001ce5471ae33fe786881bd96276b812bfa9d9d3be91a38
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 490b336aa1fbd95191afce31e563e76dcfec53189703371aaf0728ae43070f43fc8149327edf1edaa7c9c942c6bd6adc9581c230217c7694b795282edf6eb1d4
   languageName: node
   linkType: hard
 
-"@carbon/icon-helpers@npm:^10.34.0":
-  version: 10.34.0
-  resolution: "@carbon/icon-helpers@npm:10.34.0"
-  checksum: 025209788ea59a5328e988fed63ab718c4f75a781d157c2849ed901b9c521f9a6e4c8e8d33868d969d8e3c623ec9531567429586a3034fac90b50dc57d40e84f
+"@carbon/grid@npm:^11.23.0":
+  version: 11.23.0
+  resolution: "@carbon/grid@npm:11.23.0"
+  dependencies:
+    "@carbon/layout": "npm:^11.22.0"
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 07971dda3662fa1d7933d39bf008894bc636c6990edbce6efd1081b04789d4121b0d73cda0d7f10ad39a3922fae92b287ce5f85e47559a913e3fac49df0f48ed
   languageName: node
   linkType: hard
 
@@ -1466,6 +1480,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@carbon/icon-helpers@npm:^10.48.0":
+  version: 10.48.0
+  resolution: "@carbon/icon-helpers@npm:10.48.0"
+  dependencies:
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 361b72df213c72f5f052a2da53bf3e673f92ee205404baa44e2a1d08d138d763f3660bc1fdc52f63345ed744bcb6d89568b54f4e129df8cb9cd3745e178930f2
+  languageName: node
+  linkType: hard
+
 "@carbon/icons-react@npm:11.26.0":
   version: 11.26.0
   resolution: "@carbon/icons-react@npm:11.26.0"
@@ -1479,46 +1502,85 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/icons-react@npm:^11.11.0":
-  version: 11.11.0
-  resolution: "@carbon/icons-react@npm:11.11.0"
+"@carbon/icons-react@npm:^11.26.0, @carbon/icons-react@npm:^11.41.0":
+  version: 11.41.0
+  resolution: "@carbon/icons-react@npm:11.41.0"
   dependencies:
-    "@carbon/icon-helpers": "npm:^10.34.0"
-    "@carbon/telemetry": "npm:0.1.0"
+    "@carbon/icon-helpers": "npm:^10.48.0"
+    "@ibm/telemetry-js": "npm:^1.5.0"
     prop-types: "npm:^15.7.2"
   peerDependencies:
     react: ">=16"
-  checksum: 5fed117ad0ec17bf3b5f238eb1146249a927bf0bc6c5770616e75ab0248685298daf4c1cc12d69c886a135f43cbdbf55c70878a27be15d1967e14cf3f2a4b2c9
+  checksum: adf5cdcaed3cb0809a4afe57d1648925abafeb71e1c33d6f998aee61573219df92a5c5859768059822afb46bdc7911b21a87caab9006f4aa5a9b0d4e19b7af3c
   languageName: node
   linkType: hard
 
-"@carbon/layout@npm:^11.7.0":
-  version: 11.7.0
-  resolution: "@carbon/layout@npm:11.7.0"
-  checksum: 5462443b282ad2e6eac66fb0002a6f4c709bfc3093bc47835d5ffd4504236499df6da4dd6073a8834bb9e3b481a7ed772ea8d79968cf8e2ca6d35a1e98bd9ba6
+"@carbon/layout@npm:^11.19.0, @carbon/layout@npm:^11.22.0":
+  version: 11.22.0
+  resolution: "@carbon/layout@npm:11.22.0"
+  dependencies:
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 71aae4e3421fa364a4320522a142edababd571a8239d78c73ab6246b32db2702158a3f4b38c0b57bfb165130d2a416a9347b197bff08bab748f412b0b164fe02
   languageName: node
   linkType: hard
 
-"@carbon/motion@npm:^11.5.0":
-  version: 11.5.0
-  resolution: "@carbon/motion@npm:11.5.0"
-  checksum: 4effb6d24af445820e2ec76a9de3976b178fc746759b48afa28f6dfbfe464e410079befb690c7e09371f20ab5f681cd35c013f37ba39f982eec9cbfd85707fb0
+"@carbon/motion@npm:^11.18.0":
+  version: 11.18.0
+  resolution: "@carbon/motion@npm:11.18.0"
+  dependencies:
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 4dceff7a9e58284ee9233cec84a48d99abe48c2260abf8d72c4803485a0c49c839561c9aff06138042b5d67de1f45132a83313ff66fe166ce80979649046f41c
   languageName: node
   linkType: hard
 
-"@carbon/react@npm:1.17.0":
-  version: 1.17.0
-  resolution: "@carbon/react@npm:1.17.0"
+"@carbon/react@npm:^1.12.0, @carbon/react@npm:^1.13.0":
+  version: 1.57.0
+  resolution: "@carbon/react@npm:1.57.0"
   dependencies:
     "@babel/runtime": "npm:^7.18.3"
-    "@carbon/feature-flags": "npm:^0.9.0"
-    "@carbon/icons-react": "npm:^11.11.0"
-    "@carbon/layout": "npm:^11.7.0"
-    "@carbon/styles": "npm:^1.17.0"
+    "@carbon/feature-flags": "npm:^0.20.0"
+    "@carbon/icons-react": "npm:^11.41.0"
+    "@carbon/layout": "npm:^11.22.0"
+    "@carbon/styles": "npm:^1.57.0"
+    "@floating-ui/react": "npm:^0.26.0"
+    "@ibm/telemetry-js": "npm:^1.5.0"
+    classnames: "npm:2.5.1"
+    copy-to-clipboard: "npm:^3.3.1"
+    downshift: "npm:8.5.0"
+    flatpickr: "npm:4.6.13"
+    invariant: "npm:^2.2.3"
+    lodash.debounce: "npm:^4.0.8"
+    lodash.findlast: "npm:^4.5.0"
+    lodash.isequal: "npm:^4.5.0"
+    lodash.omit: "npm:^4.5.0"
+    lodash.throttle: "npm:^4.1.1"
+    prop-types: "npm:^15.7.2"
+    react-is: "npm:^18.2.0"
+    tabbable: "npm:^6.2.0"
+    use-resize-observer: "npm:^6.0.0"
+    wicg-inert: "npm:^3.1.1"
+    window-or-global: "npm:^1.0.1"
+  peerDependencies:
+    react: ^16.8.6 || ^17.0.1 || ^18.2.0
+    react-dom: ^16.8.6 || ^17.0.1 || ^18.2.0
+    sass: ^1.33.0
+  checksum: 704be82f7bdb2a3e61c37bd3657cc7542c3508fb42e36be4e72db1529ce217e2235e725de900e5e06f520fb19be2e9120ff6f95573e98abd52c0553be840e4ec
+  languageName: node
+  linkType: hard
+
+"@carbon/react@npm:~1.37.0":
+  version: 1.37.0
+  resolution: "@carbon/react@npm:1.37.0"
+  dependencies:
+    "@babel/runtime": "npm:^7.18.3"
+    "@carbon/feature-flags": "npm:^0.16.0"
+    "@carbon/icons-react": "npm:^11.26.0"
+    "@carbon/layout": "npm:^11.19.0"
+    "@carbon/styles": "npm:^1.37.0"
     "@carbon/telemetry": "npm:0.1.0"
     classnames: "npm:2.3.2"
     copy-to-clipboard: "npm:^3.3.1"
-    downshift: "npm:5.2.1"
+    downshift: "npm:8.1.0"
     flatpickr: "npm:4.6.9"
     invariant: "npm:^2.2.3"
     lodash.debounce: "npm:^4.0.8"
@@ -1527,33 +1589,37 @@ __metadata:
     lodash.omit: "npm:^4.5.0"
     lodash.throttle: "npm:^4.1.1"
     prop-types: "npm:^15.7.2"
-    react-is: "npm:^17.0.2"
+    react-is: "npm:^18.2.0"
     use-resize-observer: "npm:^6.0.0"
     wicg-inert: "npm:^3.1.1"
     window-or-global: "npm:^1.0.1"
   peerDependencies:
-    react: ^16.8.6 || ^17.0.1
-    react-dom: ^16.8.6 || ^17.0.1
+    react: ^16.8.6 || ^17.0.1 || ^18.2.0
+    react-dom: ^16.8.6 || ^17.0.1 || ^18.2.0
     sass: ^1.33.0
-  checksum: bd7f1f23de404065f65249505b2ca89dc6ac71f129db440a427898a0d3d52988eb0089acb4d3e680a171eb6c5a4ff7e6cc5893f60f7c8efd093290debf8a5708
+  checksum: ea3963d6b3c13edcbc5fdbaf58071fe7635ea0b8c0f42dfdb50d92763ed6548308f2916bfc12667d031ce01cebc9897b6172f2bedfa8b98f57b88cf56e3e5a08
   languageName: node
   linkType: hard
 
-"@carbon/styles@npm:^1.17.0":
-  version: 1.17.0
-  resolution: "@carbon/styles@npm:1.17.0"
-  dependencies:
-    "@carbon/colors": "npm:^11.8.0"
-    "@carbon/feature-flags": "npm:^0.9.0"
-    "@carbon/grid": "npm:^11.7.0"
-    "@carbon/layout": "npm:^11.7.0"
-    "@carbon/motion": "npm:^11.5.0"
-    "@carbon/themes": "npm:^11.12.0"
-    "@carbon/type": "npm:^11.11.0"
+"@carbon/styles@npm:^1.37.0, @carbon/styles@npm:^1.57.0":
+  version: 1.57.0
+  resolution: "@carbon/styles@npm:1.57.0"
+  dependencies:
+    "@carbon/colors": "npm:^11.22.0"
+    "@carbon/feature-flags": "npm:^0.20.0"
+    "@carbon/grid": "npm:^11.23.0"
+    "@carbon/layout": "npm:^11.22.0"
+    "@carbon/motion": "npm:^11.18.0"
+    "@carbon/themes": "npm:^11.35.0"
+    "@carbon/type": "npm:^11.27.0"
     "@ibm/plex": "npm:6.0.0-next.6"
+    "@ibm/telemetry-js": "npm:^1.5.0"
   peerDependencies:
     sass: ^1.33.0
-  checksum: 96715736ffe3b93bfa53f2d6b83d687aeb2209cb04c0e83655fae43cf1fb17e5481ca6860ca9ae7a415a6cbe22f725d6d4dbc5af6a04dd5db7538d5e4c628f57
+  peerDependenciesMeta:
+    sass:
+      optional: true
+  checksum: 741e3846255794f4b7216380ddb17d4e9f0f5683b0fc5cd91e2fdfc878aa349b59684425a0754bca2ca9dbe600f314cf0e847edd7ca8a8288bc4ed30fa38a208
   languageName: node
   linkType: hard
 
@@ -1566,25 +1632,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@carbon/themes@npm:^11.12.0":
-  version: 11.12.0
-  resolution: "@carbon/themes@npm:11.12.0"
+"@carbon/themes@npm:^11.35.0":
+  version: 11.35.0
+  resolution: "@carbon/themes@npm:11.35.0"
   dependencies:
-    "@carbon/colors": "npm:^11.8.0"
-    "@carbon/layout": "npm:^11.7.0"
-    "@carbon/type": "npm:^11.11.0"
+    "@carbon/colors": "npm:^11.22.0"
+    "@carbon/layout": "npm:^11.22.0"
+    "@carbon/type": "npm:^11.27.0"
+    "@ibm/telemetry-js": "npm:^1.5.0"
     color: "npm:^4.0.0"
-  checksum: 12027370e96b4b42388a0ec4ae2dc085c9342bea08fa8fdd25b739f17da983d5499ee852a5dd639edfbf41a663687b7c11be983f8233ccb44ed33d40a01c5bbb
+  checksum: 1610f3fe87ea7673d720fbf5a4041b8481600f19c58d3de4ed0e06bc610516b62b2c7d412c7768d915a180ef6ad2206adcc89eec8cac460dece1cf7a112b0769
   languageName: node
   linkType: hard
 
-"@carbon/type@npm:^11.11.0":
-  version: 11.11.0
-  resolution: "@carbon/type@npm:11.11.0"
+"@carbon/type@npm:^11.27.0":
+  version: 11.27.0
+  resolution: "@carbon/type@npm:11.27.0"
   dependencies:
-    "@carbon/grid": "npm:^11.7.0"
-    "@carbon/layout": "npm:^11.7.0"
-  checksum: 096da18b9be7ae0d4ac8a3ef5cbce4751cc52b4eb8bc648132c3f0b1a8697ab8aa87dfe2d2feb3d5577ef6ebe66033de3408973056fba07194c18ac928c6fc25
+    "@carbon/grid": "npm:^11.23.0"
+    "@carbon/layout": "npm:^11.22.0"
+    "@ibm/telemetry-js": "npm:^1.5.0"
+  checksum: 3a658f07dca562acde1995578b83df6be11120c48f2088e4a87a2f1430732c28d05d89af5a06fea4878b9634862e7f3f2fa7472f9047837c98beaacb9f7d21d5
   languageName: node
   linkType: hard
 
@@ -1644,6 +1712,58 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@floating-ui/core@npm:^1.0.0":
+  version: 1.6.2
+  resolution: "@floating-ui/core@npm:1.6.2"
+  dependencies:
+    "@floating-ui/utils": "npm:^0.2.0"
+  checksum: 5c940ef3d397aa23f859ecb033bda408dde20820af3f82090a889c35a99826cfaa7864e8131b9906a26b2c04f31fa468538a28d0715b34de541e0776e0f82d03
+  languageName: node
+  linkType: hard
+
+"@floating-ui/dom@npm:^1.0.0":
+  version: 1.6.5
+  resolution: "@floating-ui/dom@npm:1.6.5"
+  dependencies:
+    "@floating-ui/core": "npm:^1.0.0"
+    "@floating-ui/utils": "npm:^0.2.0"
+  checksum: d421e7f239e9af5a2a4c7a560c29b8ce1f29398c411c8e3bd0c33a2ce800e13a378749a1606e4f6b460830f4007c459792534821013262d24d1385476b1ba48d
+  languageName: node
+  linkType: hard
+
+"@floating-ui/react-dom@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@floating-ui/react-dom@npm:2.1.0"
+  dependencies:
+    "@floating-ui/dom": "npm:^1.0.0"
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: 15be0714379c271ff01347e7c9bcdba96d6b39f3960697380e23de9b9d59fb91ba07bc75b8bdb12d72da7a9272191a9ce73f843a0d5f89939caa9f3137acd8ec
+  languageName: node
+  linkType: hard
+
+"@floating-ui/react@npm:^0.26.0":
+  version: 0.26.16
+  resolution: "@floating-ui/react@npm:0.26.16"
+  dependencies:
+    "@floating-ui/react-dom": "npm:^2.1.0"
+    "@floating-ui/utils": "npm:^0.2.0"
+    tabbable: "npm:^6.0.0"
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: 4d5216ba10c05f08a94730c0899578ead75a6cdfa9e531461e8d7ef7fea43d6b5818869c38a3c30c36f2e557c0af58b52b2325248d19029e2a89f34bfcc8c421
+  languageName: node
+  linkType: hard
+
+"@floating-ui/utils@npm:^0.2.0":
+  version: 0.2.2
+  resolution: "@floating-ui/utils@npm:0.2.2"
+  checksum: 28d900d2f0876b40c7090f55724700eeac608862e59110b7b14731223218cf7ce125b2091f34103edf4b0f779166151bbca21256b856236235a2be996548ed38
+  languageName: node
+  linkType: hard
+
 "@formatjs/ecma402-abstract@npm:1.17.0":
   version: 1.17.0
   resolution: "@formatjs/ecma402-abstract@npm:1.17.0"
@@ -1732,6 +1852,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ibm/telemetry-js@npm:^1.5.0":
+  version: 1.5.2
+  resolution: "@ibm/telemetry-js@npm:1.5.2"
+  bin:
+    ibmtelemetry: dist/collect.js
+  checksum: 1dcc971e78a927baba382a7179f75bc2b6fb1b237d8e9e88941c6410810e716a862e9135c709887a245daaf0e3e158ac3d01bf7e830457933ec91afffc479146
+  languageName: node
+  linkType: hard
+
 "@internationalized/date@npm:^3.5.0, @internationalized/date@npm:^3.5.1":
   version: 3.5.1
   resolution: "@internationalized/date@npm:3.5.1"
@@ -2971,9 +3100,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@openmrs/esm-api@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-api@npm:5.5.1-pre.1769"
+"@openmrs/esm-api@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-api@npm:5.6.1-pre.1806"
   dependencies:
     "@types/fhir": "npm:0.0.31"
     lodash-es: "npm:^4.17.21"
@@ -2982,17 +3111,17 @@ __metadata:
     "@openmrs/esm-error-handling": 5.x
     "@openmrs/esm-navigation": 5.x
     "@openmrs/esm-offline": 5.x
-  checksum: 5de78e792906f58dd25c13061c218fb5c793e8b0bb73cf93427ca76f665e1ac9be75c7baa35c8525073146a403a966751f47d9b284ea2555b7a0e110ccb8abe7
+  checksum: b9802f661e9a9f0a5aff343cdcd64ac5921c5c8261f0e8e32d75bc50f7d8fcbb685d402244c4b44a833ae83591fdae92a512d3f24c7d96c2f9fd05a0c11449f9
   languageName: node
   linkType: hard
 
-"@openmrs/esm-app-shell@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-app-shell@npm:5.5.1-pre.1769"
+"@openmrs/esm-app-shell@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-app-shell@npm:5.6.1-pre.1806"
   dependencies:
     "@carbon/react": "npm:~1.37.0"
-    "@openmrs/esm-framework": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-styleguide": "npm:5.5.1-pre.1769"
+    "@openmrs/esm-framework": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-styleguide": "npm:5.6.1-pre.1806"
     dayjs: "npm:^1.10.4"
     dexie: "npm:^3.0.3"
     html-webpack-plugin: "npm:^5.5.0"
@@ -3017,56 +3146,56 @@ __metadata:
     workbox-strategies: "npm:^6.1.5"
     workbox-webpack-plugin: "npm:^6.1.5"
     workbox-window: "npm:^6.1.5"
-  checksum: 88f8bcad82ef8d21cbd3f99084832db938353570c4b76f1de8a46bdb61f146d2c9032240a17b2495285ca1ed0a4d1a814a39cb17289016eb9508b032a1fa756f
+  checksum: b486689ffe16a17cc95f9b395d32c85e79b824c00c13d18041230fd663faf7108197a17ecd9440d03bf473c05a6bb87848d594297ede68a1141b012b5ff7c3f2
   languageName: node
   linkType: hard
 
-"@openmrs/esm-config@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-config@npm:5.5.1-pre.1769"
+"@openmrs/esm-config@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-config@npm:5.6.1-pre.1806"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 22eec2a2a569cc7eb5baa600c0739f4d887421dfc120c1ba760e5da0b41ef851eaa4194a12a2b4c0e77d3f3494e558f5fba56bc50b7f1dc08e873126fa0cd4d1
+  checksum: d19e6fc79440c683f237358e9c44980889b2442c44cdb7763126f3015d891c2a38151adacc45a1e14ef7cfaeb0359a09b34ee21410b7f9ed0e787a3ba939db4c
   languageName: node
   linkType: hard
 
-"@openmrs/esm-context@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-context@npm:5.5.1-pre.1769"
+"@openmrs/esm-context@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-context@npm:5.6.1-pre.1806"
   dependencies:
     immer: "npm:^10.0.4"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
-  checksum: 102b958f66a423e8d7e7cb8faa91dcfe1884d66c0862720d5a535036b2bc9539a4fd8ff06669da2ad4c614939154929047207fa5b6ba1510667e6aa96ea0cd13
+  checksum: 7a51505f3717107de8d818abd1113f1217a8b7de98d51fe1874918ebbf11231b6bbd15d1c3b8445d1505cd247581bf2f23019185a29fd77ec0f03ccddcff9b8a
   languageName: node
   linkType: hard
 
-"@openmrs/esm-dynamic-loading@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-dynamic-loading@npm:5.5.1-pre.1769"
+"@openmrs/esm-dynamic-loading@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-dynamic-loading@npm:5.6.1-pre.1806"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: e905170063a82a727954c07d2af1f235788254b58cdb76f3384ef83ac7ec9b48a0a63a9e0cc22c9c4aa355b1b0130503627f767189ae4248f4a0c63548e83ed0
+  checksum: 0ebfa0bd54e5f9830f1fa539cb837e96bd56e65efa11ec279682519976573195b369b0e658627d849ba479e293147fc3a182b719e807b0571961e6899e0874f6
   languageName: node
   linkType: hard
 
-"@openmrs/esm-error-handling@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-error-handling@npm:5.5.1-pre.1769"
+"@openmrs/esm-error-handling@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-error-handling@npm:5.6.1-pre.1806"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: 1fb4e7d4e8ab16b24bd188aab9960c5bb19f7bd98e828ef10975e609ff3dfbbd0af1c87a819bd2918cc476998cf27fe9ef80f52b883fdde8c5b8332f3ddf30d2
+  checksum: d577092f20189f1f05b86fa3e2f05bc780d46cfeaeff209963c72eae57fb9a5427edb9e92f6e2cd7d53098dc8d22956a77fc490be50f383aabeba09ebae81f11
   languageName: node
   linkType: hard
 
-"@openmrs/esm-extensions@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-extensions@npm:5.5.1-pre.1769"
+"@openmrs/esm-extensions@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-extensions@npm:5.6.1-pre.1806"
   dependencies:
     lodash-es: "npm:^4.17.21"
   peerDependencies:
@@ -3076,43 +3205,43 @@ __metadata:
     "@openmrs/esm-state": 5.x
     "@openmrs/esm-utils": 5.x
     single-spa: 5.x
-  checksum: 70d33d6330fde2e40aae30a76fb49128d1df1f784f6e73304cbc9b0755bbb9416384fe3faf3870fa76184d1dbd2ac5a738a80ebbe0039d6a18329f190af8158c
+  checksum: 3def551864316a0a0c5417210a5e9e7590ac9f818bb1008a1d97f3504e1684857024c74d58b15605fda877f0f71aacaec4d23da272216c5efa88503a5fe8e357
   languageName: node
   linkType: hard
 
-"@openmrs/esm-feature-flags@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-feature-flags@npm:5.5.1-pre.1769"
+"@openmrs/esm-feature-flags@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-feature-flags@npm:5.6.1-pre.1806"
   dependencies:
     ramda: "npm:^0.26.1"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     single-spa: 5.x
-  checksum: 0938b6331ae104a21b4178e5248b5df77d840bec1c7ed8c4b89609114ec44a26f47785f83ef3d1680ff231172470300c45bf6c5687c2981c4877dc9a5151ffca
-  languageName: node
-  linkType: hard
-
-"@openmrs/esm-framework@npm:5.5.1-pre.1769, @openmrs/esm-framework@npm:next":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-framework@npm:5.5.1-pre.1769"
-  dependencies:
-    "@openmrs/esm-api": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-config": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-context": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-dynamic-loading": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-error-handling": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-extensions": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-feature-flags": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-globals": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-navigation": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-offline": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-react-utils": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-routes": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-state": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-styleguide": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-translations": "npm:5.5.1-pre.1769"
-    "@openmrs/esm-utils": "npm:5.5.1-pre.1769"
+  checksum: beb3fb7907d33dd8acc62aecaad2b8cd59a274064aa7953e4dfd8a027f89e2f9927d505c53146334333d83efb84d4e4be50aeecb6146b42dbd481fec4ebacb09
+  languageName: node
+  linkType: hard
+
+"@openmrs/esm-framework@npm:5.6.1-pre.1806, @openmrs/esm-framework@npm:next":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-framework@npm:5.6.1-pre.1806"
+  dependencies:
+    "@openmrs/esm-api": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-config": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-context": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-dynamic-loading": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-error-handling": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-extensions": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-feature-flags": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-globals": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-navigation": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-offline": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-react-utils": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-routes": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-state": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-styleguide": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-translations": "npm:5.6.1-pre.1806"
+    "@openmrs/esm-utils": "npm:5.6.1-pre.1806"
     dayjs: "npm:^1.10.7"
   peerDependencies:
     dayjs: 1.x
@@ -3123,33 +3252,33 @@ __metadata:
     rxjs: 6.x
     single-spa: 5.x
     swr: 2.x
-  checksum: bbea553a029bc74b39e801fa770d6854e6a394433364668be6d898403cd2ef55ea935ca25934497d32b9096c1a35beb953ffe079be549efcb9fd1d00295fca6a
+  checksum: f08be314f34c8426296707823e9be3a7b2a65b95274baba429d362f3f5bb13e49937d6883ffc876ce2d6cd3187920854736f8091c4460ad313802a08a3779ff2
   languageName: node
   linkType: hard
 
-"@openmrs/esm-globals@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-globals@npm:5.5.1-pre.1769"
+"@openmrs/esm-globals@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-globals@npm:5.6.1-pre.1806"
   peerDependencies:
     single-spa: 5.x
-  checksum: 1a01906a255f59c85cd90524679fa5a752b2eda4ad63bc0c25bf4419b51afc29689b23a3687079724eda2dffef271f019ad0947f246013f45b05e64b947fa4fb
+  checksum: 8c4dbd3e6ebbbf728352d6dced15d791663c22b670bdaa7e8c4ed56bf1cfe9f61307eceb47e71ebd67babfdbb3d77df876d2b9b69af21467d7a5659552c1d641
   languageName: node
   linkType: hard
 
-"@openmrs/esm-navigation@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-navigation@npm:5.5.1-pre.1769"
+"@openmrs/esm-navigation@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-navigation@npm:5.6.1-pre.1806"
   dependencies:
     path-to-regexp: "npm:6.1.0"
   peerDependencies:
     "@openmrs/esm-state": 5.x
-  checksum: 02fd6ada4acda4f59ed7e33c96c7ded7d25b3a6fcbb5c7ecb4f8b464997127644e17f8eca31915846818a50928208c54f46d8b17a66f7b4b1318282f276b9186
+  checksum: ad93edcfd0210a5a3007f8eb5c724bc478395ad867caed17760f6576d9114c53854dc1521a0b9c634f062cb4713ad182072dc363c56733cc3caf80d23eea9709
   languageName: node
   linkType: hard
 
-"@openmrs/esm-offline@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-offline@npm:5.5.1-pre.1769"
+"@openmrs/esm-offline@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-offline@npm:5.6.1-pre.1806"
   dependencies:
     dexie: "npm:^3.0.3"
     lodash-es: "npm:^4.17.21"
@@ -3160,13 +3289,13 @@ __metadata:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-state": 5.x
     rxjs: 6.x
-  checksum: 82b1d086f142bd0fc49aa30c3f4cf273881e4ca4d141be86b60723bac8892b0d4e56240d7aece75b38b2e0d07809176ea1e02bd95c42626405be7cb365bf1a98
+  checksum: 426699d6340f30643ce00988da1f9c060b7ab2ad425f1e3fb3dd0c9b29f74ce5da071f5b884cc43add3cd53b308c240f9f988f1fd8e96c61c93ca0f9e47a8fc6
   languageName: node
   linkType: hard
 
 "@openmrs/esm-patient-common-lib@npm:next":
-  version: 7.1.1-pre.4529
-  resolution: "@openmrs/esm-patient-common-lib@npm:7.1.1-pre.4529"
+  version: 8.0.2-pre.4556
+  resolution: "@openmrs/esm-patient-common-lib@npm:8.0.2-pre.4556"
   dependencies:
     "@carbon/react": "npm:^1.12.0"
     lodash-es: "npm:^4.17.21"
@@ -3175,13 +3304,13 @@ __metadata:
     "@openmrs/esm-framework": 5.x
     react: 18.x
     single-spa: 6.x
-  checksum: 4818d001f47d95e083b0bf65628ca92130ec7c9eb78d46124a8dc7bc5d9b9794c66765f9b4844f48cce70a53a4743970d732f4ac0641092c67acb477c152a095
+  checksum: a2cf3987d744eed09d416c1ef45725e61d5f23617b99d34e63cfd779cf6e276c9fc8a163a8b775819eecdb575662efeda3d55c81f7e3c0edd9e4f91ca9c9c3f0
   languageName: node
   linkType: hard
 
-"@openmrs/esm-react-utils@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-react-utils@npm:5.5.1-pre.1769"
+"@openmrs/esm-react-utils@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-react-utils@npm:5.6.1-pre.1806"
   dependencies:
     lodash-es: "npm:^4.17.21"
     single-spa-react: "npm:^6.0.0"
@@ -3202,34 +3331,34 @@ __metadata:
     react-i18next: 11.x
     rxjs: 6.x
     swr: 2.x
-  checksum: d6769358c78280c86ce1b0db709c50b7f3da00598385adff573dffbc98598fe3309e1eca962c38ba341d973bdaa75e2cf25f0d61c9c985c348f8f4972200a8f4
+  checksum: ae1fb1aced2a59b006bd3d8336141325b1d949032ca1cfdaa4315ea79cd768acc4fa4cb157ef1e11339298a7dc6c6cf47cc97bf8f8aef5ce6effb1af5c5c828f
   languageName: node
   linkType: hard
 
-"@openmrs/esm-routes@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-routes@npm:5.5.1-pre.1769"
+"@openmrs/esm-routes@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-routes@npm:5.6.1-pre.1806"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     "@openmrs/esm-utils": 5.x
-  checksum: 72cf64fee8981c6f1512bae42606aad84f5a7068084234c9220968197ae61b46218094b9a6bdc349bbc5455af4a4aab2a0bedec0f3295c27376034521a69b99b
+  checksum: 2dda1b5c62d299f3930a543c32c6b736ece9e504cf648e7973402222167cde538847b1cd928b0e78019ed837a4c71120bde0a6c8a50d2b64d0602bea72b104e5
   languageName: node
   linkType: hard
 
-"@openmrs/esm-state@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-state@npm:5.5.1-pre.1769"
+"@openmrs/esm-state@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-state@npm:5.6.1-pre.1806"
   dependencies:
     zustand: "npm:^4.3.6"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
-  checksum: ebd0df55438d20b67b44d83f781d0d3cb7851b553a0b613eb276010bcddb14e8442cb53794310050470f94a05fdba14b71ee3f202307f74ec0739822b155d3c2
+  checksum: 42ae1316001bc551caa7f901487bd13ee2fdc595f417baaf2a9404693a03461765bfced5728cc99a8657cd61caccb966cb0c23fc3ab56a2cdfd4e795a1c3f486
   languageName: node
   linkType: hard
 
-"@openmrs/esm-styleguide@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-styleguide@npm:5.5.1-pre.1769"
+"@openmrs/esm-styleguide@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-styleguide@npm:5.6.1-pre.1806"
   dependencies:
     "@carbon/charts": "npm:^1.12.0"
     "@carbon/react": "npm:~1.37.0"
@@ -3254,32 +3383,33 @@ __metadata:
     react: 18.x
     react-dom: 18.x
     rxjs: 6.x
-  checksum: 4c466fd8869b32ae475e70f7e9dcb921cfad84382be2cab376212c3b77cf62a398e1c6311b6b530b15074078d9c9964d97fcd74edc552dfc22ca6083729fb1e4
+  checksum: 00268ef8fc651665cd4bd6923399410c1e3dec4ccf913f09ea1e9813031b90b7de0c1a59aa62fdf9aeede6de2e0da7802f2f8db32447daeb1b8d3e5ba26073ee
   languageName: node
   linkType: hard
 
-"@openmrs/esm-translations@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-translations@npm:5.5.1-pre.1769"
+"@openmrs/esm-translations@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-translations@npm:5.6.1-pre.1806"
   dependencies:
     i18next: "npm:21.10.0"
   peerDependencies:
     i18next: 21.x
-  checksum: a7287e8f7fc34423c8ddd4722e0a48c7618c7c498329d661a3d80388ffad5624269628913aa10c5cfe877a26ece335e464e08949c8f28ca5bebda474f86409a5
+  checksum: b4ae816c08c7d596e29a0aad629424a700df684299408deb77bc9264491c30ce3e8ef9ac341b9518bd3176f8ea5f64b80d4fccdcdbb9bfc50bff0b3058061dcf
   languageName: node
   linkType: hard
 
-"@openmrs/esm-utils@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/esm-utils@npm:5.5.1-pre.1769"
+"@openmrs/esm-utils@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/esm-utils@npm:5.6.1-pre.1806"
   dependencies:
+    "@internationalized/date": "npm:^3.5.0"
     semver: "npm:7.3.2"
   peerDependencies:
     "@openmrs/esm-globals": 5.x
     dayjs: 1.x
     i18next: 21.x
     rxjs: 6.x
-  checksum: 32ad2f95a35a2e2c1520347150bb6928335a9fb3e734d4c74e844dfabe012a04ef5697527cd40d9f2a03c2bcff97658daf3f6d3396fc091d2ff33ba59f61c280
+  checksum: da50be18458fe539b5f7ded14ffcf829df47e7062b0f14c42cb492740b967385937780b1ec367f2a2953b83092d58a53aa2a624ec7ae45fba2996feff401bf23
   languageName: node
   linkType: hard
 
@@ -3311,9 +3441,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openmrs/webpack-config@npm:5.5.1-pre.1769":
-  version: 5.5.1-pre.1769
-  resolution: "@openmrs/webpack-config@npm:5.5.1-pre.1769"
+"@openmrs/webpack-config@npm:5.6.1-pre.1806":
+  version: 5.6.1-pre.1806
+  resolution: "@openmrs/webpack-config@npm:5.6.1-pre.1806"
   dependencies:
     "@swc/core": "npm:^1.3.58"
     clean-webpack-plugin: "npm:^4.0.0"
@@ -3330,7 +3460,7 @@ __metadata:
     webpack-stats-plugin: "npm:^1.0.3"
   peerDependencies:
     webpack: 5.x
-  checksum: 9797f66876137a575ae3d8f743d39d8af109062b0daeae8ae4bede18bbd31e8f391ae17eb090d115ff375d79f76ed42160243e540bae2deb208acd8cbcf67fab
+  checksum: 345b3a0bfa6df52e22d331d887532ae36d689faf18627e2f1dbc1e3c8aa1f41294d9748359269df76eebc8af029eee980b4979a10ec38fac052ca672cdeefa69
   languageName: node
   linkType: hard
 
@@ -6845,7 +6975,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"classnames@npm:^2.5.1":
+"classnames@npm:2.5.1, classnames@npm:^2.5.1":
   version: 2.5.1
   resolution: "classnames@npm:2.5.1"
   checksum: 58eb394e8817021b153bb6e7d782cfb667e4ab390cb2e9dac2fc7c6b979d1cc2b2a733093955fc5c94aa79ef5c8c89f11ab77780894509be6afbb91dddd79d15
@@ -7157,10 +7287,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compute-scroll-into-view@npm:^1.0.13":
-  version: 1.0.20
-  resolution: "compute-scroll-into-view@npm:1.0.20"
-  checksum: a72e2595ccab57ca61bb14b368738c7473ebb96da6c85f4dbe00cb810570f71f52d9c26b4463f6092663cbf917d0693881eef4f8e8d4204d7581a83bef082afe
+"compute-scroll-into-view@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "compute-scroll-into-view@npm:2.0.4"
+  checksum: a9015cbf464ed852d3c459c1777d5890e26925dd2e99ad438dc8cb6a0154f33f0ce6856f6c50de9dd176168d315e7223d08c4bae1e5dbe82b056dd5216c0bcc6
+  languageName: node
+  linkType: hard
+
+"compute-scroll-into-view@npm:^3.0.3":
+  version: 3.1.0
+  resolution: "compute-scroll-into-view@npm:3.1.0"
+  checksum: cc5211d49bced5ad23385da5c2eaf69b6045628581b0dcb9f4dd407bfee51bbd26d2bce426be26edf2feaf8c243706f5a7c3759827d89cc5a01a5cf7d299a5eb
   languageName: node
   linkType: hard
 
@@ -8503,17 +8640,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"downshift@npm:5.2.1":
-  version: 5.2.1
-  resolution: "downshift@npm:5.2.1"
+"downshift@npm:8.1.0":
+  version: 8.1.0
+  resolution: "downshift@npm:8.1.0"
   dependencies:
-    "@babel/runtime": "npm:^7.9.1"
-    compute-scroll-into-view: "npm:^1.0.13"
+    "@babel/runtime": "npm:^7.14.8"
+    compute-scroll-into-view: "npm:^2.0.4"
     prop-types: "npm:^15.7.2"
-    react-is: "npm:^16.13.1"
+    react-is: "npm:^17.0.2"
+    tslib: "npm:^2.3.0"
   peerDependencies:
-    react: ">=0.14.9"
-  checksum: 5ea8784bedca4106ab38a64dbd429785e2a0c682f9d2b3fe84681223426702b3a03333fb05f5759c766197cb4c917eeb21471e8f8c65163d7b2c94761c27cb19
+    react: ">=16.12.0"
+  checksum: 5607a1aa48bdc2c4e22e4582b3727af4cb94246fb5d5777cf1f45bca82c4a308fc3863607ea6a6b34235a79efce1417b4c54dedb69e04fc7bc78986c94c6e264
+  languageName: node
+  linkType: hard
+
+"downshift@npm:8.5.0":
+  version: 8.5.0
+  resolution: "downshift@npm:8.5.0"
+  dependencies:
+    "@babel/runtime": "npm:^7.22.15"
+    compute-scroll-into-view: "npm:^3.0.3"
+    prop-types: "npm:^15.8.1"
+    react-is: "npm:^18.2.0"
+    tslib: "npm:^2.6.2"
+  peerDependencies:
+    react: ">=16.12.0"
+  checksum: 275f2b6868bf61aae276780c54e7511b2e4b3966c568ad9760df00bf306fef3a8aa76eae56a66d09526b062d8747a17358d21d9d8f60107f87e9f7398c85c92d
   languageName: node
   linkType: hard
 
@@ -9520,6 +9673,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"flatpickr@npm:4.6.13":
+  version: 4.6.13
+  resolution: "flatpickr@npm:4.6.13"
+  checksum: 0e32f2fbd427aa8d838da8fb0cf2e56b65efc22783dcebcc32c11b7fbb6bbc8c3532f9410915f3acb7dc0feebb49202bea03e49cc80b9d4d11b3bdce49488bc0
+  languageName: node
+  linkType: hard
+
 "flatpickr@npm:4.6.9":
   version: 4.6.9
   resolution: "flatpickr@npm:4.6.9"
@@ -13634,12 +13794,12 @@ __metadata:
   linkType: hard
 
 "openmrs@npm:next":
-  version: 5.5.1-pre.1769
-  resolution: "openmrs@npm:5.5.1-pre.1769"
+  version: 5.6.1-pre.1806
+  resolution: "openmrs@npm:5.6.1-pre.1806"
   dependencies:
     "@carbon/icons-react": "npm:11.26.0"
-    "@openmrs/esm-app-shell": "npm:5.5.1-pre.1769"
-    "@openmrs/webpack-config": "npm:5.5.1-pre.1769"
+    "@openmrs/esm-app-shell": "npm:5.6.1-pre.1806"
+    "@openmrs/webpack-config": "npm:5.6.1-pre.1806"
     "@pnpm/npm-conf": "npm:^2.1.0"
     "@swc/core": "npm:^1.3.58"
     autoprefixer: "npm:^10.4.2"
@@ -13659,6 +13819,7 @@ __metadata:
     postcss: "npm:^8.4.6"
     postcss-loader: "npm:^6.2.1"
     rimraf: "npm:^3.0.2"
+    semver: "npm:^7.3.4"
     swc-loader: "npm:^0.2.3"
     tar: "npm:^6.0.5"
     typescript: "npm:^4.6.4"
@@ -13670,7 +13831,7 @@ __metadata:
     yargs: "npm:^17.6.2"
   bin:
     openmrs: ./dist/cli.js
-  checksum: 2461da3532a470f7b892cd70ce63634e68c0a53ac675281493f282bf12dcb84838dfb7cfc52659ee94f3377097e85f5a99206a89f526f4f28ba349b61b469958
+  checksum: 2482f4ebf1d32cfbc3cc884413458cc24fdc065de23ad2188150e9cad69897f31cd65e8d7fa3016677485b7e752879999b985b5c884a686039e5ba80adb49e35
   languageName: node
   linkType: hard
 
@@ -14993,6 +15154,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-is@npm:^18.2.0":
+  version: 18.3.1
+  resolution: "react-is@npm:18.3.1"
+  checksum: d5f60c87d285af24b1e1e7eaeb123ec256c3c8bdea7061ab3932e3e14685708221bf234ec50b21e10dd07f008f1b966a2730a0ce4ff67905b3872ff2042aec22
+  languageName: node
+  linkType: hard
+
 "react-markdown@npm:^7.1.0":
   version: 7.1.2
   resolution: "react-markdown@npm:7.1.2"
@@ -16633,6 +16801,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tabbable@npm:^6.0.0, tabbable@npm:^6.2.0":
+  version: 6.2.0
+  resolution: "tabbable@npm:6.2.0"
+  checksum: 980fa73476026e99dcacfc0d6e000d41d42c8e670faf4682496d30c625495e412c4369694f2a15cf1e5252d22de3c396f2b62edbe8d60b5dadc40d09e3f2dde3
+  languageName: node
+  linkType: hard
+
 "tapable@npm:^1.0.0":
   version: 1.1.3
   resolution: "tapable@npm:1.1.3"
@@ -16982,7 +17157,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.4.0, tslib@npm:^2.6.2":
+"tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.6.2":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
   checksum: bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca