diff --git a/components/Button.jsx b/components/Button.jsx
index c203253..4692523 100644
--- a/components/Button.jsx
+++ b/components/Button.jsx
@@ -1,4 +1,5 @@
 import clsx from 'clsx'
+
 import Link from 'next/link'
 
 const styles = {
diff --git a/components/DocsSidebarNavigation.jsx b/components/DocsSidebarNavigation.jsx
index f583256..6f469ea 100644
--- a/components/DocsSidebarNavigation.jsx
+++ b/components/DocsSidebarNavigation.jsx
@@ -1,8 +1,10 @@
-import { gql } from '@apollo/client';
 import clsx from 'clsx';
-import Link from 'next/link';
 import { useState } from 'react';
 
+import { gql } from '@apollo/client';
+import Link from 'next/link';
+
+
 DocsSidebarNavigation.fragment = gql`
   fragment DocsSidebarNavigationFragment on RootQuery {
     docsSidebarMenuItems: menuItems(
diff --git a/components/FeatureTabsLeft.jsx b/components/FeatureTabsLeft.jsx
index 01534c5..1b49015 100644
--- a/components/FeatureTabsLeft.jsx
+++ b/components/FeatureTabsLeft.jsx
@@ -1,8 +1,10 @@
+import clsx from 'clsx'
+import { useEffect, useState } from 'react'
+
 import { gql } from '@apollo/client'
 import { Tab } from '@headlessui/react'
-import clsx from 'clsx'
 import Image from 'next/image'
-import { useEffect, useState } from 'react'
+
 
 import { Container } from '@/components/Container'
 
diff --git a/components/FeatureTabsTop.jsx b/components/FeatureTabsTop.jsx
index 2966d82..963944c 100644
--- a/components/FeatureTabsTop.jsx
+++ b/components/FeatureTabsTop.jsx
@@ -1,6 +1,7 @@
+import clsx from 'clsx';
+
 import { gql } from '@apollo/client';
 import { Tab } from '@headlessui/react';
-import clsx from 'clsx';
 import Image from 'next/image';
 
 import { Container } from '@/components/Container';
diff --git a/components/Fence.jsx b/components/Fence.jsx
index 1b49d89..3832f80 100644
--- a/components/Fence.jsx
+++ b/components/Fence.jsx
@@ -1,6 +1,7 @@
-import Highlight, { defaultProps } from 'prism-react-renderer'
 import { Fragment } from 'react'
 
+import Highlight, { defaultProps } from 'prism-react-renderer'
+
 export function Fence({ children, language }) {
   return (
     <Highlight
diff --git a/components/FooterNavigation.jsx b/components/FooterNavigation.jsx
index 7ef5b5a..246c947 100644
--- a/components/FooterNavigation.jsx
+++ b/components/FooterNavigation.jsx
@@ -1,8 +1,10 @@
-import { gql } from '@apollo/client'
 import clsx from 'clsx'
-import Link from 'next/link'
 import * as React from 'react'
 
+import { gql } from '@apollo/client'
+import Link from 'next/link'
+
+
 import styles from '@/styles/footer-navigation.module.css';
 
 export function FooterNavigation({ navigation }) {
diff --git a/components/HomepageLayoutsLayoutsHeroLayout.jsx b/components/HomepageLayoutsLayoutsHeroLayout.jsx
index 2b126a4..beda46e 100644
--- a/components/HomepageLayoutsLayoutsHeroLayout.jsx
+++ b/components/HomepageLayoutsLayoutsHeroLayout.jsx
@@ -1,8 +1,10 @@
-import { gql } from '@apollo/client'
 import clsx from 'clsx'
-import Highlight, { defaultProps } from 'prism-react-renderer'
 import { Fragment } from 'react'
 
+import { gql } from '@apollo/client'
+import Highlight, { defaultProps } from 'prism-react-renderer'
+
+
 import { Button } from '@/components/Button'
 
 
diff --git a/components/HomepageLayoutsLayoutsSupportedFieldTypesLayout.jsx b/components/HomepageLayoutsLayoutsSupportedFieldTypesLayout.jsx
index bc2bf3e..abd8c4b 100644
--- a/components/HomepageLayoutsLayoutsSupportedFieldTypesLayout.jsx
+++ b/components/HomepageLayoutsLayoutsSupportedFieldTypesLayout.jsx
@@ -1,9 +1,11 @@
-import { gql } from '@apollo/client'
 import clsx from 'clsx'
+import { useEffect, useMemo, useRef, useState } from 'react'
+
+import { gql } from '@apollo/client'
 import { useInView } from 'framer-motion'
 import Image from 'next/image'
 import Link from 'next/link'
-import { useEffect, useMemo, useRef, useState } from 'react'
+
 
 import { Container } from '@/components/Container'
 
diff --git a/components/Layout.jsx b/components/Layout.jsx
index a2df06f..d4d0523 100644
--- a/components/Layout.jsx
+++ b/components/Layout.jsx
@@ -1,8 +1,10 @@
+import clsx from 'clsx'
+import { useCallback, useEffect, useState } from 'react'
+
 import { gql } from '@apollo/client'
 import { flatListToHierarchical, useFaustQuery } from '@faustwp/core'
-import clsx from 'clsx'
 import Link from 'next/link'
-import { useCallback, useEffect, useState } from 'react'
+
 
 import EditPost from './EditPost'
 
diff --git a/components/MiniGraphiQL.jsx b/components/MiniGraphiQL.jsx
index e1a87ac..411cf58 100644
--- a/components/MiniGraphiQL.jsx
+++ b/components/MiniGraphiQL.jsx
@@ -1,8 +1,9 @@
-import { createGraphiQLFetcher } from '@graphiql/toolkit';
-import { useTheme } from 'next-themes';
 import PropTypes from 'prop-types';
 import React, { useEffect, useState } from 'react';
 
+import { createGraphiQLFetcher } from '@graphiql/toolkit';
+import { useTheme } from 'next-themes';
+
 const MiniGraphiQLClient = ({ initialQuery, initialVariables, endpoint, readOnly }) => {
   const [GraphiQL, setGraphiQL] = useState(null);
   const { theme, resolvedTheme } = useTheme();
diff --git a/components/MobileNavigation.jsx b/components/MobileNavigation.jsx
index db9429f..bc1bb60 100644
--- a/components/MobileNavigation.jsx
+++ b/components/MobileNavigation.jsx
@@ -1,7 +1,8 @@
+import { useEffect, useState } from 'react'
+
 import { Dialog } from '@headlessui/react'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
-import { useEffect, useState } from 'react'
 
 import { DocsSidebarNavigation } from '@/components/DocsSidebarNavigation'
 import { Logo } from '@/components/Logo'
diff --git a/components/PrimaryNavigation.jsx b/components/PrimaryNavigation.jsx
index be3fcc5..0337468 100644
--- a/components/PrimaryNavigation.jsx
+++ b/components/PrimaryNavigation.jsx
@@ -1,6 +1,7 @@
+import * as React from 'react'
+
 import { gql } from '@apollo/client'
 import Link from 'next/link'
-import * as React from 'react'
 
 import {
   NavigationMenu,
diff --git a/components/Search.jsx b/components/Search.jsx
index c1641e3..a068220 100644
--- a/components/Search.jsx
+++ b/components/Search.jsx
@@ -1,9 +1,10 @@
-import { DocSearchModal } from "@docsearch/react";
 import clsx from 'clsx'
+import { createContext, useCallback, useContext, useEffect, useRef, useState } from "react";
+
+import { DocSearchModal } from "@docsearch/react";
 import Head from 'next/head'
 import Link from 'next/link'
 import { useRouter } from "next/router";
-import { createContext, useCallback, useContext, useEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 
 import { SearchIcon } from '@/components/icons/SearchIcon';
diff --git a/components/SiteHeader.jsx b/components/SiteHeader.jsx
index 76fc059..393bee5 100644
--- a/components/SiteHeader.jsx
+++ b/components/SiteHeader.jsx
@@ -1,7 +1,8 @@
 import clsx from 'clsx'
-import Link from 'next/link'
 import { useEffect, useState } from 'react'
 
+import Link from 'next/link'
+
 import { GitHubIcon } from '@/components/icons/GitHubIcon'
 import { WordPressIcon } from '@/components/icons/WordPressIcon'
 import { Logo } from '@/components/Logo'
diff --git a/components/ThemeProvider.jsx b/components/ThemeProvider.jsx
index 5b8da20..3dece3d 100644
--- a/components/ThemeProvider.jsx
+++ b/components/ThemeProvider.jsx
@@ -1,8 +1,9 @@
 "use client"
 
-import { ThemeProvider as NextThemesProvider } from "next-themes"
 import * as React from "react"
 
+import { ThemeProvider as NextThemesProvider } from "next-themes"
+
 export function ThemeProvider({ children, ...props }) {
   return <NextThemesProvider {...props}>{children}</NextThemesProvider>
 }
diff --git a/components/ThemeSelector.jsx b/components/ThemeSelector.jsx
index dabca58..c80ab6d 100644
--- a/components/ThemeSelector.jsx
+++ b/components/ThemeSelector.jsx
@@ -1,8 +1,9 @@
 "use client"
 
+import * as React from "react"
+
 import { MoonIcon, SunIcon } from "@radix-ui/react-icons"
 import { useTheme } from "next-themes"
-import * as React from "react"
 
 import { Button } from "@/components/ui/button"
 import {
diff --git a/components/ui/accordion.tsx b/components/ui/accordion.tsx
index 3a309e9..d9797f0 100644
--- a/components/ui/accordion.tsx
+++ b/components/ui/accordion.tsx
@@ -1,8 +1,9 @@
 "use client"
 
+import * as React from "react"
+
 import * as AccordionPrimitive from "@radix-ui/react-accordion"
 import { ChevronDownIcon } from "@radix-ui/react-icons"
-import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
diff --git a/components/ui/button.tsx b/components/ui/button.tsx
index d69fe22..8b58e22 100644
--- a/components/ui/button.tsx
+++ b/components/ui/button.tsx
@@ -1,7 +1,8 @@
-import { Slot } from '@radix-ui/react-slot'
 import { VariantProps, cva } from 'class-variance-authority'
 import * as React from 'react'
 
+import { Slot } from '@radix-ui/react-slot'
+
 import { cn } from '@/lib/utils'
 
 const buttonVariants = cva(
diff --git a/components/ui/context-menu.jsx b/components/ui/context-menu.jsx
index e909b9b..e7879db 100644
--- a/components/ui/context-menu.jsx
+++ b/components/ui/context-menu.jsx
@@ -1,6 +1,7 @@
+import * as React from "react"
+
 import * as ContextMenuPrimitive from "@radix-ui/react-context-menu"
 import { Check, ChevronRight, Circle } from "lucide-react"
-import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
diff --git a/components/ui/dropdown-menu.tsx b/components/ui/dropdown-menu.tsx
index 08a43bd..cdd502f 100644
--- a/components/ui/dropdown-menu.tsx
+++ b/components/ui/dropdown-menu.tsx
@@ -1,12 +1,13 @@
 "use client"
 
+import * as React from "react"
+
 import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
 import {
   CheckIcon,
   ChevronRightIcon,
   DotFilledIcon,
 } from "@radix-ui/react-icons"
-import * as React from "react"
 
 import { cn } from "@/lib/utils"
 
diff --git a/components/ui/label.tsx b/components/ui/label.tsx
index a6ea1e3..65a2862 100644
--- a/components/ui/label.tsx
+++ b/components/ui/label.tsx
@@ -1,9 +1,10 @@
 'use client'
 
-import * as LabelPrimitive from '@radix-ui/react-label'
 import { VariantProps, cva } from 'class-variance-authority'
 import * as React from 'react'
 
+import * as LabelPrimitive from '@radix-ui/react-label'
+
 import { cn } from '@/lib/utils'
 
 const labelVariants = cva(
diff --git a/components/ui/navigation-menu.tsx b/components/ui/navigation-menu.tsx
index b1a900c..8e8b289 100644
--- a/components/ui/navigation-menu.tsx
+++ b/components/ui/navigation-menu.tsx
@@ -1,8 +1,10 @@
-import * as NavigationMenuPrimitive from '@radix-ui/react-navigation-menu'
 import { cva } from 'class-variance-authority'
-import { ChevronDown } from 'lucide-react'
 import * as React from 'react'
 
+import * as NavigationMenuPrimitive from '@radix-ui/react-navigation-menu'
+import { ChevronDown } from 'lucide-react'
+
+
 import { cn } from '@/lib/utils'
 
 const NavigationMenu = React.forwardRef<
diff --git a/components/ui/popover.tsx b/components/ui/popover.tsx
index 67c00e3..1f3c7bc 100644
--- a/components/ui/popover.tsx
+++ b/components/ui/popover.tsx
@@ -1,8 +1,9 @@
 "use client"
 
-import * as PopoverPrimitive from "@radix-ui/react-popover"
 import * as React from "react"
 
+import * as PopoverPrimitive from "@radix-ui/react-popover"
+
 import { cn } from "@/lib/utils"
 
 const Popover = PopoverPrimitive.Root
diff --git a/components/ui/separator.tsx b/components/ui/separator.tsx
index d9dec20..dcaaade 100644
--- a/components/ui/separator.tsx
+++ b/components/ui/separator.tsx
@@ -1,8 +1,9 @@
 'use client'
 
-import * as SeparatorPrimitive from '@radix-ui/react-separator'
 import * as React from 'react'
 
+import * as SeparatorPrimitive from '@radix-ui/react-separator'
+
 import { cn } from '@/lib/utils'
 
 const Separator = React.forwardRef<
diff --git a/components/ui/tabs.js b/components/ui/tabs.js
index b383902..6c1499c 100644
--- a/components/ui/tabs.js
+++ b/components/ui/tabs.js
@@ -1,8 +1,9 @@
 'use client'
 
-import * as TabsPrimitive from '@radix-ui/react-tabs'
 import * as React from 'react'
 
+import * as TabsPrimitive from '@radix-ui/react-tabs'
+
 import { cn } from '@/lib/utils'
 
 const Tabs = TabsPrimitive.Root
diff --git a/components/ui/tabs.tsx b/components/ui/tabs.tsx
index 2c2d174..3295076 100644
--- a/components/ui/tabs.tsx
+++ b/components/ui/tabs.tsx
@@ -1,8 +1,9 @@
 "use client"
 
-import * as TabsPrimitive from "@radix-ui/react-tabs"
 import * as React from "react"
 
+import * as TabsPrimitive from "@radix-ui/react-tabs"
+
 import { cn } from "@/lib/utils"
 
 const Tabs = TabsPrimitive.Root
diff --git a/lib/highlightCode.js b/lib/highlightCode.js
index ac58645..b04ea1b 100644
--- a/lib/highlightCode.js
+++ b/lib/highlightCode.js
@@ -1,4 +1,5 @@
 import clsx from 'clsx';
+
 import { useTheme } from 'next-themes';
 import Highlight, { defaultProps } from 'prism-react-renderer';
 import Prism from 'prism-react-renderer/prism';
diff --git a/package.json b/package.json
index d3de05c..80af410 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "@docsearch/css": "^3.5.2",
     "@docsearch/react": "^3.5.2",
     "@faustwp/blocks": "^4.0.0",
-    "@faustwp/cli": "^3.0.3",
+    "@faustwp/cli": "^3.0.2",
     "@faustwp/core": "^3.0.3",
     "@graphiql/react": "^0.20.2",
     "@graphiql/toolkit": "^0.9.1",
@@ -53,7 +53,7 @@
     "focus-visible": "^5.2.0",
     "framer-motion": "7.8.1",
     "glob": "^11.0.0",
-    "glob-promise": "^6.0.7",
+    "glob-promise": "^8.0.3",
     "graphiql": "^3.0.9",
     "graphql": "^16.6.0",
     "graphql-ws": "^5.14.2",
@@ -109,9 +109,5 @@
     "prettier-plugin-tailwindcss": "^0.5.5",
     "typescript": "^5.5.4"
   },
-  "packageManager": "yarn@4.4.0",
-  "resolutions": {
-    "@faustwp/cli": "portal:/Users/jason.bahl/Sites/libs/faustjs/packages/faustwp-cli",
-    "@faustwp/core": "portal:/Users/jason.bahl/Sites/libs/faustjs/packages/faustwp-core"
-  }
+  "packageManager": "yarn@4.4.0"
 }
diff --git a/pages/_app.js b/pages/_app.js
index b93f1a1..8643b27 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -1,8 +1,9 @@
 import '@/faust.config'
+import React from 'react'
+
 import { WordPressBlocksProvider } from '@faustwp/blocks'
 import { FaustProvider } from '@faustwp/core'
 import Head from 'next/head'
-import React from 'react'
 
 import 'focus-visible'
 import '@/styles/tailwind.css'
diff --git a/tailwind.config.js b/tailwind.config.js
index 489d6ed..80896c4 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,6 +1,7 @@
+import defaultTheme from 'tailwindcss/defaultTheme';
+
 import aspectRatio from '@tailwindcss/aspect-ratio';
 import typography from '@tailwindcss/typography';
-import defaultTheme from 'tailwindcss/defaultTheme';
 
 const tailwindConfig = {
   content: [
diff --git a/wp-blocks/AcfFieldTypeConfigurationBlock.js b/wp-blocks/AcfFieldTypeConfigurationBlock.js
index be4b9d2..12da22a 100644
--- a/wp-blocks/AcfFieldTypeConfigurationBlock.js
+++ b/wp-blocks/AcfFieldTypeConfigurationBlock.js
@@ -1,6 +1,7 @@
-import { gql } from '@apollo/client';
 import React, { useState, useEffect } from 'react';
 
+import { gql } from '@apollo/client';
+
 import { Card, CardHeader } from '@/components/ui/card';
 import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';
 import { HighlightCode } from '@/lib/highlightCode';
diff --git a/wp-blocks/AcfFieldTypeSettingsBlock.js b/wp-blocks/AcfFieldTypeSettingsBlock.js
index 977957a..3b3fc53 100644
--- a/wp-blocks/AcfFieldTypeSettingsBlock.js
+++ b/wp-blocks/AcfFieldTypeSettingsBlock.js
@@ -1,6 +1,7 @@
-import { gql } from '@apollo/client';
 import React, { useState } from 'react';
 
+import { gql } from '@apollo/client';
+
 import { Button } from "@/components/ui/button";
 import { Card, CardFooter, CardHeader } from "@/components/ui/card";
 
diff --git a/wp-blocks/AcfGraphqlQuery.js b/wp-blocks/AcfGraphqlQuery.js
index 4efc631..1f583e5 100644
--- a/wp-blocks/AcfGraphqlQuery.js
+++ b/wp-blocks/AcfGraphqlQuery.js
@@ -1,7 +1,8 @@
+import React from 'react';
+
 import { gql } from '@apollo/client';
 import { getGraphqlEndpoint } from '@faustwp/core';
 import dynamic from 'next/dynamic';
-import React from 'react';
 
 const MiniGraphiQL = dynamic(
   () => import('@/components/MiniGraphiQL'),
diff --git a/wp-blocks/CoreCode.js b/wp-blocks/CoreCode.js
index 5b2819b..2300e11 100644
--- a/wp-blocks/CoreCode.js
+++ b/wp-blocks/CoreCode.js
@@ -1,5 +1,6 @@
-import { CoreBlocks } from '@faustwp/blocks'
 import slugify from '@sindresorhus/slugify'
+
+import { CoreBlocks } from '@faustwp/blocks'
 const { CoreCode: FaustCoreCode } = CoreBlocks
 
 export function CoreCode(props) {
diff --git a/wp-blocks/CoreHeading.js b/wp-blocks/CoreHeading.js
index d6f052b..62962b8 100644
--- a/wp-blocks/CoreHeading.js
+++ b/wp-blocks/CoreHeading.js
@@ -1,5 +1,6 @@
-import { CoreBlocks } from '@faustwp/blocks'
 import slugify from '@sindresorhus/slugify'
+
+import { CoreBlocks } from '@faustwp/blocks'
 const { CoreHeading: FaustCoreHeading } = CoreBlocks
 
 export function CoreHeading(props) {
diff --git a/wp-blocks/CoreQuote.js b/wp-blocks/CoreQuote.js
index 9f5863f..14a4fb1 100644
--- a/wp-blocks/CoreQuote.js
+++ b/wp-blocks/CoreQuote.js
@@ -1,5 +1,5 @@
-import { CoreBlocks } from "@faustwp/blocks";
 import {gql} from "@apollo/client";
+import { CoreBlocks } from "@faustwp/blocks";
 const { CoreQuote: FaustCoreQuote } = CoreBlocks;
 
 export function CoreQuote(props) {