diff --git a/nx-dev/nx-dev/tailwind.config.js b/nx-dev/nx-dev/tailwind.config.js
index 15fce8c93488e9..876ca005986b90 100644
--- a/nx-dev/nx-dev/tailwind.config.js
+++ b/nx-dev/nx-dev/tailwind.config.js
@@ -7,10 +7,6 @@ const {
   default: flattenColorPalette,
 } = require('tailwindcss/lib/util/flattenColorPalette');
 
-const {
-  default: flattenColorPalette,
-} = require('tailwindcss/lib/util/flattenColorPalette');
-
 if (!createGlobPatternsForDependencies(__dirname).length)
   throw Error('GRAPH ISSUE: No dependency found when many are expected.');
 
diff --git a/nx-dev/ui-cloud/src/lib/agent-number-over-time.tsx b/nx-dev/ui-cloud/src/lib/agent-number-over-time.tsx
index 82e62399238a54..39a7f5f1b32ca9 100644
--- a/nx-dev/ui-cloud/src/lib/agent-number-over-time.tsx
+++ b/nx-dev/ui-cloud/src/lib/agent-number-over-time.tsx
@@ -1,5 +1,5 @@
 'use client';
-import { SectionHeading } from '@nx/nx-dev/ui-common/src/lib/section-tags';
+import { SectionHeading } from '@nx/nx-dev/ui-common';
 import { motion } from 'framer-motion';
 import { useEffect, useState } from 'react';
 interface Agent {
diff --git a/nx-dev/ui-cloud/src/lib/automated-agents-management.tsx b/nx-dev/ui-cloud/src/lib/automated-agents-management.tsx
index 068d33beb8f42e..649fec4e09a675 100644
--- a/nx-dev/ui-cloud/src/lib/automated-agents-management.tsx
+++ b/nx-dev/ui-cloud/src/lib/automated-agents-management.tsx
@@ -5,9 +5,9 @@ import {
   CircleStackIcon,
   CodeBracketSquareIcon,
 } from '@heroicons/react/24/outline';
-import { SectionHeading } from '@nx/nx-dev/ui-common/src/lib/section-tags';
+import { SectionHeading } from '@nx/nx-dev/ui-common';
 import { motion } from 'framer-motion';
-import { NxCloudIcon } from '@nx/nx-dev/ui-common';
+import { NxCloudIcon } from '@nx/nx-dev/ui-icons';
 
 export function AutomatedAgentsManagement(): JSX.Element {
   const variants = {
diff --git a/nx-dev/ui-cloud/src/lib/elements/moving-border.tsx b/nx-dev/ui-cloud/src/lib/elements/moving-border.tsx
deleted file mode 100644
index 3a4703a912efe0..00000000000000
--- a/nx-dev/ui-cloud/src/lib/elements/moving-border.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import {
-  motion,
-  useAnimationFrame,
-  useMotionTemplate,
-  useMotionValue,
-  useTransform,
-} from 'framer-motion';
-import { ReactNode, useRef } from 'react';
-
-export const MovingBorder = ({
-  children,
-  duration = 2000,
-  rx,
-  ry,
-  ...otherProps
-}: {
-  children: ReactNode;
-  duration?: number;
-  rx?: string;
-  ry?: string;
-  [key: string]: any;
-}) => {
-  const pathRef = useRef<any>();
-  const progress = useMotionValue<number>(0);
-
-  useAnimationFrame((time) => {
-    const length = pathRef.current?.getTotalLength();
-    if (length) {
-      const pxPerMillisecond = length / duration;
-      progress.set((time * pxPerMillisecond) % length);
-    }
-  });
-
-  const x = useTransform(
-    progress,
-    (val) => pathRef.current?.getPointAtLength(val).x
-  );
-  const y = useTransform(
-    progress,
-    (val) => pathRef.current?.getPointAtLength(val).y
-  );
-
-  const transform = useMotionTemplate`translateX(${x}px) translateY(${y}px) translateX(-50%) translateY(-50%)`;
-
-  return (
-    <>
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        preserveAspectRatio="none"
-        className="absolute h-full w-full"
-        width="100%"
-        height="100%"
-        {...otherProps}
-      >
-        <rect
-          fill="none"
-          width="100%"
-          height="100%"
-          rx={rx}
-          ry={ry}
-          ref={pathRef}
-        />
-      </svg>
-      <motion.div
-        style={{
-          position: 'absolute',
-          top: 0,
-          left: 0,
-          display: 'inline-block',
-          transform,
-        }}
-      >
-        {children}
-      </motion.div>
-    </>
-  );
-};
diff --git a/nx-dev/ui-cloud/src/lib/enhance-with-ai.tsx b/nx-dev/ui-cloud/src/lib/enhance-with-ai.tsx
index 2054c708752c6f..57bde23b5a5fec 100644
--- a/nx-dev/ui-cloud/src/lib/enhance-with-ai.tsx
+++ b/nx-dev/ui-cloud/src/lib/enhance-with-ai.tsx
@@ -4,7 +4,7 @@ import {
   RectangleGroupIcon,
   ServerStackIcon,
 } from '@heroicons/react/24/outline';
-import { SectionHeading } from '@nx/nx-dev/ui-common/src/lib/section-tags';
+import { SectionHeading } from '@nx/nx-dev/ui-common';
 
 const features = [
   {
diff --git a/nx-dev/ui-cloud/src/lib/hero.tsx b/nx-dev/ui-cloud/src/lib/hero.tsx
index 235e3ce43fd4fc..7740cbfeb0e9c2 100644
--- a/nx-dev/ui-cloud/src/lib/hero.tsx
+++ b/nx-dev/ui-cloud/src/lib/hero.tsx
@@ -4,9 +4,8 @@ import { cx } from '@nx/nx-dev/ui-primitives';
 import { PlayIcon } from '@heroicons/react/24/outline';
 import { motion } from 'framer-motion';
 import { ComponentProps, Fragment, useState } from 'react';
-import { ButtonLink } from '@nx/nx-dev/ui-common';
-import { SectionHeading } from '@nx/nx-dev/ui-common/src/lib/section-tags';
-import { MovingBorder } from './elements/moving-border';
+import { ButtonLink, SectionHeading } from '@nx/nx-dev/ui-common';
+import { MovingBorder } from '@nx/nx-dev/ui-animations';
 import Image from 'next/image';
 
 export function Hero(): JSX.Element {
diff --git a/nx-dev/ui-cloud/src/lib/statistics.tsx b/nx-dev/ui-cloud/src/lib/statistics.tsx
index 77f09e3759d954..771fcf35bcde86 100644
--- a/nx-dev/ui-cloud/src/lib/statistics.tsx
+++ b/nx-dev/ui-cloud/src/lib/statistics.tsx
@@ -1,7 +1,7 @@
 'use client';
 import { motion } from 'framer-motion';
 import { useEffect, useState } from 'react';
-import { SectionHeading } from '@nx/nx-dev/ui-common/src/lib/section-tags';
+import { SectionHeading } from '@nx/nx-dev/ui-common';
 
 /**
  * Calculate the total number of years worth of compute.
diff --git a/nx-dev/ui-cloud/src/lib/trusted-by.tsx b/nx-dev/ui-cloud/src/lib/trusted-by.tsx
index 87659ea586cc23..7dec4ff039f39a 100644
--- a/nx-dev/ui-cloud/src/lib/trusted-by.tsx
+++ b/nx-dev/ui-cloud/src/lib/trusted-by.tsx
@@ -7,7 +7,7 @@ import {
   ShopifyIcon,
   StorybookIcon,
   VmwareIcon,
-} from '@nx/nx-dev/ui-common';
+} from '@nx/nx-dev/ui-icons';
 export function TrustedBy(): JSX.Element {
   return (
     <section className="">
diff --git a/nx-dev/ui-cloud/src/lib/understand-workspace.tsx b/nx-dev/ui-cloud/src/lib/understand-workspace.tsx
index d950b11974b0d1..b56132a3f348fe 100644
--- a/nx-dev/ui-cloud/src/lib/understand-workspace.tsx
+++ b/nx-dev/ui-cloud/src/lib/understand-workspace.tsx
@@ -9,7 +9,7 @@ import {
   LockClosedIcon,
   SparklesIcon,
 } from '@heroicons/react/24/outline';
-import { SectionHeading } from '@nx/nx-dev/ui-common/src/lib/section-tags';
+import { SectionHeading } from '@nx/nx-dev/ui-common';
 import { BentoGrid, BentoGridItem } from './elements/bento-grid';
 import { cx } from '@nx/nx-dev/ui-primitives';
 import { animate, motion, useMotionValue, useTransform } from 'framer-motion';