diff --git a/.changeset/chilled-sheep-promise.md b/.changeset/chilled-sheep-promise.md
new file mode 100644
index 0000000000..305315c266
--- /dev/null
+++ b/.changeset/chilled-sheep-promise.md
@@ -0,0 +1,7 @@
+---
+"tinacms": patch
+"@tinacms/app": patch
+"@tinacms/cli": patch
+---
+
+Revert "✨ Visual element highlighting between iframe and form (#6211)"
diff --git a/.changeset/witty-rings-wink.md b/.changeset/witty-rings-wink.md
new file mode 100644
index 0000000000..e3cf7e547e
--- /dev/null
+++ b/.changeset/witty-rings-wink.md
@@ -0,0 +1,5 @@
+---
+"tinacms": patch
+---
+
+Branch selector - added ability to filter based off PR number
diff --git a/packages/@tinacms/app/src/lib/graphql-reducer.ts b/packages/@tinacms/app/src/lib/graphql-reducer.ts
index 034f9dc623..c3cef43834 100644
--- a/packages/@tinacms/app/src/lib/graphql-reducer.ts
+++ b/packages/@tinacms/app/src/lib/graphql-reducer.ts
@@ -526,17 +526,9 @@ export const useGraphQLReducer = (
         const [queryId, eventFieldName] = event.data.fieldName.split('---');
         const result = results.find((res) => res.id === queryId);
         if (result?.data) {
-          const { formId, fieldName } = getFormAndFieldNameFromMetadata(
-            result.data,
-            eventFieldName
-          );
           cms.dispatch({
             type: 'forms:set-active-field-name',
-            value: { formId: formId, fieldName: fieldName },
-          });
-          cms.events.dispatch({
-            ...event.data,
-            type: 'field:focus',
+            value: getFormAndFieldNameFromMetadata(result.data, eventFieldName),
           });
         }
         cms.dispatch({
@@ -544,30 +536,6 @@ export const useGraphQLReducer = (
           value: 'openOrFull',
         });
       }
-      if (event.data.type === 'field:hovered') {
-        if (event.data.fieldName) {
-          const [queryId, eventFieldName] = event.data.fieldName.split('---');
-          const result = results.find((res) => res.id === queryId);
-          if (result?.data) {
-            const fieldData = getFormAndFieldNameFromMetadata(
-              result.data,
-              eventFieldName
-            );
-            cms.dispatch({
-              type: 'forms:set-hovered-field-name',
-              value: fieldData,
-            });
-          }
-        } else {
-          // Clear hover state when fieldName is null
-          cms.forms.all().forEach((form) => {
-            cms.dispatch({
-              type: 'forms:set-hovered-field-name',
-              value: { formId: form.id, fieldName: null },
-            });
-          });
-        }
-      }
       if (event.data.type === 'close') {
         const payloadSchema = z.object({ id: z.string() });
         const { id } = payloadSchema.parse(event.data);
@@ -630,33 +598,6 @@ export const useGraphQLReducer = (
     });
   }, [cms.state.sidebarDisplayState]);
 
-  // Compute the active field name to send to iframe
-  const activeFieldName = React.useMemo(() => {
-    const activeForm = cms.state.forms.find(
-      (form: any) => form.tinaForm.id === cms.state.activeFormId
-    );
-    if (!activeForm) {
-      return null;
-    }
-    const fieldName = activeForm.activeFieldName;
-    if (fieldName === null) {
-      return null;
-    }
-    const queries = activeForm.tinaForm.queries;
-    if (queries && queries.length > 0) {
-      const queryId = queries[queries.length - 1];
-      return `${queryId}---${fieldName}`;
-    }
-    return null;
-  }, [cms.state.forms, cms.state.activeFormId]);
-
-  React.useEffect(() => {
-    iframe.current?.contentWindow?.postMessage({
-      type: 'field:set-focused',
-      fieldName: activeFieldName,
-    });
-  }, [activeFieldName, iframe]);
-
   React.useEffect(() => {
     cms.dispatch({ type: 'set-edit-mode', value: 'visual' });
     if (iframe) {
diff --git a/packages/@tinacms/app/src/lib/types.ts b/packages/@tinacms/app/src/lib/types.ts
index e7d09a8893..be4a844928 100644
--- a/packages/@tinacms/app/src/lib/types.ts
+++ b/packages/@tinacms/app/src/lib/types.ts
@@ -5,7 +5,6 @@ export type PostMessage =
       data: object;
     }
   | { type: 'field:selected'; fieldName: string }
-  | { type: 'field:hovered'; fieldName: string | null }
   | { type: 'quick-edit'; value: boolean }
   | { type: 'user-select-form'; formId: string }
   | { type: 'url-changed' };
diff --git a/packages/@tinacms/cli/src/next/vite/tailwind.ts b/packages/@tinacms/cli/src/next/vite/tailwind.ts
index cf312ded79..25f596cedb 100644
--- a/packages/@tinacms/cli/src/next/vite/tailwind.ts
+++ b/packages/@tinacms/cli/src/next/vite/tailwind.ts
@@ -175,7 +175,7 @@ export const tinaTailwind = (
             },
             boxShadow: {
               xs: '0 0 0 1px rgba(0, 0, 0, 0.05)',
-              outline: '0 0 0 3px rgba(194, 65, 12, 0.2)',
+              outline: '0 0 0 3px rgba(66, 153, 225, 0.5)',
             },
             colors: {
               blue: {
@@ -232,7 +232,7 @@ export const tinaTailwind = (
               'accent-foreground': '#171717',
               destructive: '#FF3B3B',
               'destructive-foreground': '#FAFAFA',
-              ring: '#C2410C',
+              ring: '#0A0A0A',
             },
             fontFamily: {
               sans: ['Inter', ...defaultTheme.fontFamily.sans],
diff --git a/packages/tinacms/src/react.tsx b/packages/tinacms/src/react.tsx
index 04125db959..af65ea0af8 100644
--- a/packages/tinacms/src/react.tsx
+++ b/packages/tinacms/src/react.tsx
@@ -50,15 +50,6 @@ export function useTina<T extends object>(props: {
           outline: 2px solid rgba(34,150,254,1);
           cursor: pointer;
         }
-        [data-tina-field-focused] {
-          outline: 2px dashed #C2410C !important;
-          box-shadow: none !important;
-        }
-        [data-tina-field-focused]:hover {
-          box-shadow: inset 100vi 100vh rgba(194, 65, 12, 0.3) !important;
-          outline: 2px solid #C2410C !important;
-          cursor: pointer;
-        }
         [data-tina-field-overlay] {
           outline: 2px dashed rgba(34,150,254,0.5);
           position: relative;
@@ -79,16 +70,10 @@ export function useTina<T extends object>(props: {
         [data-tina-field-overlay]:hover::after {
           opacity: 1;
         }
-        [data-tina-field-overlay][data-tina-field-focused]::after {
-          background-color: rgba(194, 65, 12, 0.3);
-          opacity: 1;
-        }
       `;
       document.head.appendChild(style);
       document.body.classList.add('__tina-quick-editing-enabled');
 
-      let lastHoveredField: string | null = null;
-
       function mouseDownHandler(e) {
         const attributeNames = e.target.getAttributeNames();
         // If multiple attributes start with data-tina-field, only the first is used
@@ -118,16 +103,6 @@ export function useTina<T extends object>(props: {
           }
         }
         if (fieldName) {
-          // Clear hover state on click
-          if (lastHoveredField !== null) {
-            lastHoveredField = null;
-            if (isInTinaIframe) {
-              parent.postMessage(
-                { type: 'field:hovered', fieldName: null },
-                window.location.origin
-              );
-            }
-          }
           if (isInTinaIframe) {
             parent.postMessage(
               { type: 'field:selected', fieldName: fieldName },
@@ -144,51 +119,10 @@ export function useTina<T extends object>(props: {
           }
         }
       }
-
-      function mouseEnterHandler(e) {
-        if (!(e.target instanceof Element)) {
-          return;
-        }
-        const attributeNames = e.target.getAttributeNames();
-        const tinaAttribute = attributeNames.find((name) =>
-          name.startsWith('data-tina-field')
-        );
-
-        let fieldName;
-        if (tinaAttribute) {
-          fieldName = e.target.getAttribute(tinaAttribute);
-        } else {
-          const ancestor = e.target.closest(
-            '[data-tina-field], [data-tina-field-overlay]'
-          );
-          if (ancestor) {
-            const attributeNames = ancestor.getAttributeNames();
-            const tinaAttribute = attributeNames.find((name) =>
-              name.startsWith('data-tina-field')
-            );
-            if (tinaAttribute) {
-              fieldName = ancestor.getAttribute(tinaAttribute);
-            }
-          }
-        }
-
-        if (fieldName && fieldName !== lastHoveredField) {
-          lastHoveredField = fieldName;
-          if (isInTinaIframe) {
-            parent.postMessage(
-              { type: 'field:hovered', fieldName: fieldName },
-              window.location.origin
-            );
-          }
-        }
-      }
-
       document.addEventListener('click', mouseDownHandler, true);
-      document.addEventListener('mouseenter', mouseEnterHandler, true);
 
       return () => {
         document.removeEventListener('click', mouseDownHandler, true);
-        document.removeEventListener('mouseenter', mouseEnterHandler, true);
         document.body.classList.remove('__tina-quick-editing-enabled');
         style.remove();
       };
@@ -204,8 +138,6 @@ export function useTina<T extends object>(props: {
     }
   }, [id]);
 
-  const lastFocusedFieldRef = React.useRef<string | null>(null);
-
   React.useEffect(() => {
     const { experimental___selectFormByFormId, ...rest } = props;
     parent.postMessage({ type: 'open', ...rest, id }, window.location.origin);
@@ -235,63 +167,6 @@ export function useTina<T extends object>(props: {
           );
         }
       }
-
-      // Handle field focus to add data attribute for orange styling
-      if (event.data.type === 'field:set-focused') {
-        const newFieldName = event.data.fieldName;
-
-        // Only process if the focused field has actually changed
-        if (newFieldName === lastFocusedFieldRef.current) {
-          return;
-        }
-
-        lastFocusedFieldRef.current = newFieldName;
-
-        // Remove focused attribute from all elements
-        const allTinaFields = document.querySelectorAll('[data-tina-field]');
-        allTinaFields.forEach((el) => {
-          el.removeAttribute('data-tina-field-focused');
-        });
-
-        // Add focused attribute to the clicked field
-        if (newFieldName) {
-          // Try exact match first
-          let targetElement = document.querySelector(
-            `[data-tina-field="${newFieldName}"]`
-          );
-
-          // If not found, try to find by searching for elements whose data-tina-field ends with this value
-          if (!targetElement) {
-            const allFields = Array.from(allTinaFields);
-            targetElement = allFields.find((el) => {
-              const fieldValue = el.getAttribute('data-tina-field');
-              // Match if the field value ends with the fieldName we're looking for
-              return (
-                fieldValue && fieldValue.endsWith(newFieldName.split('---')[1])
-              );
-            }) as Element | undefined;
-          }
-
-          if (targetElement) {
-            targetElement.setAttribute('data-tina-field-focused', 'true');
-
-            // Scroll the element into view if it's not visible
-            const rect = targetElement.getBoundingClientRect();
-            const isInViewport =
-              rect.top >= 0 &&
-              rect.left >= 0 &&
-              rect.bottom <= window.innerHeight &&
-              rect.right <= window.innerWidth;
-
-            if (!isInViewport) {
-              targetElement.scrollIntoView({
-                behavior: 'smooth',
-                block: 'center',
-              });
-            }
-          }
-        }
-      }
     };
 
     window.addEventListener('message', handleMessage);
diff --git a/packages/tinacms/src/toolkit/components/active-field-indicator.tsx b/packages/tinacms/src/toolkit/components/active-field-indicator.tsx
index 2c473e799c..0391073c70 100644
--- a/packages/tinacms/src/toolkit/components/active-field-indicator.tsx
+++ b/packages/tinacms/src/toolkit/components/active-field-indicator.tsx
@@ -46,12 +46,10 @@ const BelowViewportIndicator = () => {
   );
 };
 
-const useScrollToFocusedField = (enabled: boolean) => {
+const useScrollToFocusedField = () => {
   const { subscribe } = useEvent<FieldFocusEvent>('field:focus');
-  React.useEffect(() => {
-    if (!enabled) return;
-
-    return subscribe(({ fieldName }) => {
+  React.useEffect(() =>
+    subscribe(({ fieldName }) => {
       const ele = document.querySelector<HTMLElement>(
         `[data-tinafield="${fieldName}"]`
       );
@@ -99,55 +97,18 @@ const useScrollToFocusedField = (enabled: boolean) => {
           });
         }
       }
-    });
-  }, [enabled, subscribe]);
-};
-
-type FieldIndicatorProps = {
-  eventType: 'field:focus' | 'field:hover';
-  checkFocusedAttribute?: boolean;
-  scrollToField?: boolean;
+    })
+  );
 };
 
-const FieldIndicator = ({
-  eventType,
-  checkFocusedAttribute = false,
-  scrollToField = false,
-}: FieldIndicatorProps) => {
-  const [fieldName, setFieldName] = React.useState<string | null>(null);
+export const ActiveFieldIndicator = () => {
+  const [activeFieldName, setActiveFieldName] = React.useState<string | null>(
+    null
+  );
   const [display, setDisplay] = React.useState<boolean>(false);
   const [position, setPosition] = React.useState<any>(false);
   const [iframePosition, setIframePosition] = React.useState<any>({ left: 0 });
-  const [isFocused, setIsFocused] = React.useState(false);
-  const activeEle = useFieldReference(fieldName);
-
-  const { subscribe: subscribeFocus } =
-    useEvent<FieldFocusEvent>('field:focus');
-  const { subscribe: subscribeHover } =
-    useEvent<FieldHoverEvent>('field:hover');
-
-  React.useEffect(() => {
-    const subscribe =
-      eventType === 'field:focus' ? subscribeFocus : subscribeHover;
-    return subscribe(({ fieldName: eventFieldName, id }) => {
-      setFieldName(`${id}#${eventFieldName}`);
-      if (eventType === 'field:focus' && checkFocusedAttribute) {
-        setIsFocused(true);
-      }
-    });
-  }, [eventType, subscribeFocus, subscribeHover, checkFocusedAttribute]);
-
-  // Check if the active element has the focused attribute and update state
-  React.useEffect(() => {
-    if (!checkFocusedAttribute) return;
-
-    if (activeEle) {
-      const hasFocusedAttr = activeEle.hasAttribute('data-tina-field-focused');
-      setIsFocused(hasFocusedAttr);
-    } else {
-      setIsFocused(false);
-    }
-  }, [activeEle, fieldName, checkFocusedAttribute]);
+  const activeEle = useFieldReference(activeFieldName);
 
   React.useEffect(() => {
     let displayTimeout;
@@ -181,7 +142,15 @@ const FieldIndicator = ({
     };
   }, []);
 
-  useScrollToFocusedField(scrollToField);
+  const { subscribe } = useEvent<FieldHoverEvent>('field:hover');
+
+  React.useEffect(() =>
+    subscribe(({ fieldName, id }) => {
+      setActiveFieldName(`${id}#${fieldName}`);
+    })
+  );
+
+  useScrollToFocusedField();
 
   if (!display) return null;
 
@@ -191,18 +160,15 @@ const FieldIndicator = ({
   const viewportBottomY = window.innerHeight + window.scrollY;
 
   if (eleTopY > viewportBottomY) {
+    // element is below the viewport
     return <BelowViewportIndicator />;
   }
 
   if (eleBottomY < viewportTopY) {
+    // element is above the viewport
     return <AboveViewportIndicator />;
   }
 
-  const outlineColor =
-    checkFocusedAttribute && isFocused
-      ? '2px dashed #C2410C'
-      : '2px dashed var(--tina-color-indicator)';
-
   return (
     <div
       style={{
@@ -212,7 +178,7 @@ const FieldIndicator = ({
         left: position.left + window.scrollX + iframePosition.left,
         width: position.width,
         height: position.height,
-        outline: outlineColor,
+        outline: '2px dashed var(--tina-color-indicator)',
         borderRadius: 'var(--tina-radius-small)',
         transition: display
           ? activeEle
@@ -224,15 +190,3 @@ const FieldIndicator = ({
     ></div>
   );
 };
-
-export const ActiveFieldIndicator = () => (
-  <FieldIndicator
-    eventType='field:focus'
-    checkFocusedAttribute={true}
-    scrollToField={true}
-  />
-);
-
-export const HoveredFieldIndicator = () => (
-  <FieldIndicator eventType='field:hover' />
-);
diff --git a/packages/tinacms/src/toolkit/components/tina-ui.tsx b/packages/tinacms/src/toolkit/components/tina-ui.tsx
index 1c5fafd6a0..e09aa4bad7 100644
--- a/packages/tinacms/src/toolkit/components/tina-ui.tsx
+++ b/packages/tinacms/src/toolkit/components/tina-ui.tsx
@@ -10,10 +10,7 @@ import { SidebarProvider, SidebarPosition } from '@toolkit/react-sidebar';
 import { useCMS } from '../react-tinacms/use-cms';
 import { Alerts } from '@toolkit/react-alerts';
 import { MediaManager } from './media';
-import {
-  ActiveFieldIndicator,
-  HoveredFieldIndicator,
-} from './active-field-indicator';
+import { ActiveFieldIndicator } from './active-field-indicator';
 import { MutationSignalProvider } from './mutation-signal';
 
 export interface TinaUIProps {
@@ -40,7 +37,6 @@ export const TinaUI: React.FC<TinaUIProps> = ({ children, position }) => {
           />
         )}
         <ActiveFieldIndicator />
-        <HoveredFieldIndicator />
         {/* Dragging across the iframe causes mouse events to stop propagating so there's a laggy feeling without this */}
         <div className={`${resizingSidebar ? 'pointer-events-none' : ''}`}>
           {children}
diff --git a/packages/tinacms/src/toolkit/fields/components/checkbox-group.tsx b/packages/tinacms/src/toolkit/fields/components/checkbox-group.tsx
index 46a71ab591..ab55a1840d 100644
--- a/packages/tinacms/src/toolkit/fields/components/checkbox-group.tsx
+++ b/packages/tinacms/src/toolkit/fields/components/checkbox-group.tsx
@@ -83,7 +83,7 @@ export const CheckboxGroup: React.FC<CheckboxGroupProps> = ({
           <span
             className={`relative h-[18px] w-[18px] rounded border text-indigo-600 focus:ring-indigo-500 transition ease-out duration-150 ${
               checked
-                ? 'border-tina-orange-dark bg-tina-orange shadow-sm group-hover:bg-tina-orange group-hover:border-tina-orange-dark'
+                ? 'border-blue-500 bg-blue-500 shadow-sm group-hover:bg-blue-400 group-hover:border-blue-400'
                 : 'border-gray-200 bg-white shadow-inner group-hover:bg-gray-100'
             }`}
           >
diff --git a/packages/tinacms/src/toolkit/fields/components/image-upload/image-upload.tsx b/packages/tinacms/src/toolkit/fields/components/image-upload/image-upload.tsx
index d75fd46bb0..ab5497abef 100644
--- a/packages/tinacms/src/toolkit/fields/components/image-upload/image-upload.tsx
+++ b/packages/tinacms/src/toolkit/fields/components/image-upload/image-upload.tsx
@@ -77,7 +77,7 @@ export const ImageUpload = React.forwardRef<
             }`}
           >
             <button
-              className='flex-shrink min-w-0 focus-within:shadow-outline focus-within:border-tina-orange-dark rounded outline-none overflow-visible cursor-pointer border-none hover:opacity-60 transition ease-out duration-100'
+              className='flex-shrink min-w-0 focus-within:shadow-outline focus-within:border-blue-500 rounded outline-none overflow-visible cursor-pointer border-none hover:opacity-60 transition ease-out duration-100'
               onClick={onClick}
               ref={ref}
             >
diff --git a/packages/tinacms/src/toolkit/fields/components/password-field.tsx b/packages/tinacms/src/toolkit/fields/components/password-field.tsx
index de16a7ad88..04170d0e11 100644
--- a/packages/tinacms/src/toolkit/fields/components/password-field.tsx
+++ b/packages/tinacms/src/toolkit/fields/components/password-field.tsx
@@ -10,7 +10,7 @@ export interface PasswordFieldProps extends a {
 }
 
 export const passwordFieldClasses =
-  'shadow-inner focus:shadow-outline focus:border-tina-orange-dark focus:outline-none block text-base placeholder:text-gray-300 px-3 py-2 text-gray-600 w-full bg-white border border-gray-200 transition-all ease-out duration-150 focus:text-gray-900 rounded';
+  'shadow-inner focus:shadow-outline focus:border-blue-500 focus:outline-none block text-base placeholder:text-gray-300 px-3 py-2 text-gray-600 w-full bg-white border border-gray-200 transition-all ease-out duration-150 focus:text-gray-900 rounded';
 const disabledClasses = 'opacity-50 pointer-events-none cursor-not-allowed';
 const errorClasses =
   'border-red-500 focus:border-red-500 focus:shadow-outline-red';
diff --git a/packages/tinacms/src/toolkit/fields/components/radio-group.tsx b/packages/tinacms/src/toolkit/fields/components/radio-group.tsx
index e1449a07bb..205f990d3f 100644
--- a/packages/tinacms/src/toolkit/fields/components/radio-group.tsx
+++ b/packages/tinacms/src/toolkit/fields/components/radio-group.tsx
@@ -98,7 +98,7 @@ const RadioOption = ({ checked, htmlFor, children, ...props }) => (
     <span
       className={`relative h-[19px] w-[19px] rounded border text-indigo-600 focus:ring-indigo-500 transition ease-out duration-150 ${
         checked
-          ? 'border-tina-orange-dark bg-tina-orange shadow-sm group-hover:bg-tina-orange group-hover:border-tina-orange-dark'
+          ? 'border-blue-500 bg-blue-500 shadow-sm group-hover:bg-blue-400 group-hover:border-blue-400'
           : 'border-gray-200 bg-white shadow-inner group-hover:bg-gray-100'
       }`}
     >
diff --git a/packages/tinacms/src/toolkit/fields/components/select.tsx b/packages/tinacms/src/toolkit/fields/components/select.tsx
index 04437967d8..125310c2f4 100644
--- a/packages/tinacms/src/toolkit/fields/components/select.tsx
+++ b/packages/tinacms/src/toolkit/fields/components/select.tsx
@@ -24,7 +24,7 @@ export interface SelectProps {
 }
 
 export const selectFieldClasses =
-  'shadow appearance-none h-full bg-white block pl-3 pr-8 py-2 truncate w-full text-base cursor-pointer border border-gray-200 focus:outline-none focus:shadow-outline focus:ring-tina-orange-dark focus:border-tina-orange-dark sm:text-sm rounded';
+  'shadow appearance-none h-full bg-white block pl-3 pr-8 py-2 truncate w-full text-base cursor-pointer border border-gray-200 focus:outline-none focus:shadow-outline focus:ring-blue-500 focus:border-blue-500 sm:text-sm rounded';
 
 export const Select: React.FC<SelectProps> = ({
   input,
@@ -35,13 +35,10 @@ export const Select: React.FC<SelectProps> = ({
   const selectOptions = options || field.options;
   const ref = React.useRef(null);
   React.useEffect(() => {
-    const focusIntent = field?.focusIntent;
-    const shouldFocus = !!focusIntent;
-
-    if (ref.current && shouldFocus) {
+    if (ref.current && field?.experimental_focusIntent) {
       ref.current.focus();
     }
-  }, [field?.focusIntent, ref]);
+  }, [field?.experimental_focusIntent, ref]);
 
   return (
     <div className='relative group w-full h-fit md:w-auto'>
diff --git a/packages/tinacms/src/toolkit/fields/components/text-field.tsx b/packages/tinacms/src/toolkit/fields/components/text-field.tsx
index fa18008eff..f9268cf537 100644
--- a/packages/tinacms/src/toolkit/fields/components/text-field.tsx
+++ b/packages/tinacms/src/toolkit/fields/components/text-field.tsx
@@ -10,7 +10,7 @@ export interface TextFieldProps extends a {
 }
 
 export const textFieldClasses =
-  'shadow-inner focus:shadow-outline focus:border-tina-orange-dark focus-visible:ring-0 focus:outline-none focus:ring-2 block text-base placeholder:text-gray-300 px-3 py-2 text-gray-600 w-full bg-white border border-gray-200 transition-all ease-out duration-150 focus:text-gray-900 rounded';
+  'shadow-inner focus:shadow-outline focus:border-blue-500 focus:outline-none block text-base placeholder:text-gray-300 px-3 py-2 text-gray-600 w-full bg-white border border-gray-200 transition-all ease-out duration-150 focus:text-gray-900 rounded';
 const disabledClasses = 'opacity-50 pointer-events-none cursor-not-allowed';
 export const BaseTextField = React.forwardRef<
   HTMLInputElement,
diff --git a/packages/tinacms/src/toolkit/fields/components/textarea.tsx b/packages/tinacms/src/toolkit/fields/components/textarea.tsx
index 3d73709c47..30f49e2c62 100644
--- a/packages/tinacms/src/toolkit/fields/components/textarea.tsx
+++ b/packages/tinacms/src/toolkit/fields/components/textarea.tsx
@@ -16,7 +16,7 @@ export const TextArea = React.forwardRef<
   return (
     <textarea
       {...props}
-      className='shadow-inner text-base px-3 py-2 text-gray-600 resize-y focus:shadow-outline focus:outline-none focus:border-tina-orange-dark block w-full border border-gray-200 focus:text-gray-900 rounded'
+      className='shadow-inner text-base px-3 py-2 text-gray-600 resize-y focus:shadow-outline focus:border-blue-500 block w-full border border-gray-200 focus:text-gray-900 rounded'
       ref={ref}
       style={{ minHeight: '160px' }}
     />
diff --git a/packages/tinacms/src/toolkit/fields/components/toggle.tsx b/packages/tinacms/src/toolkit/fields/components/toggle.tsx
index 94a56a792b..2f8912e44d 100644
--- a/packages/tinacms/src/toolkit/fields/components/toggle.tsx
+++ b/packages/tinacms/src/toolkit/fields/components/toggle.tsx
@@ -67,7 +67,7 @@ export const Toggle: FC<ToggleProps> = ({
             <span
               className={`absolute rounded-3xl left-0.5 top-1/2 w-[22px] h-[22px] shadow border transition-all ease-out duration-150 ${
                 checked
-                  ? 'bg-tina-orange border-tina-orange-dark'
+                  ? 'bg-blue-500 border-blue-600'
                   : 'bg-gray-250 border-gray-300'
               }`}
               style={{
diff --git a/packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/block-selector-big.tsx b/packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/block-selector-big.tsx
index 6aff021034..cb6156f34f 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/block-selector-big.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/blocks-field-plugin/block-selector-big.tsx
@@ -146,7 +146,7 @@ export const BlockSelectorBig = ({
                           <input
                             type='text'
                             className={
-                              'shadow-inner focus:shadow-outline focus:border-tina-orange-dark focus:outline-none block text-sm pl-2.5 pr-8 py-1.5 text-gray-600 w-full bg-white border border-gray-200 focus:text-gray-900 rounded placeholder-gray-400 hover:placeholder-gray-600 transition-all ease-out duration-150'
+                              'shadow-inner focus:shadow-outline focus:border-blue-400 focus:outline-none block text-sm pl-2.5 pr-8 py-1.5 text-gray-600 w-full bg-white border border-gray-200 focus:text-gray-900 rounded placeholder-gray-400 hover:placeholder-gray-600 transition-all ease-out duration-150'
                             }
                             onClick={(event: any) => {
                               event.stopPropagation();
diff --git a/packages/tinacms/src/toolkit/fields/plugins/date-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/date-field-plugin.tsx
index 52c4a2f3f5..bb05094aa3 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/date-field-plugin.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/date-field-plugin.tsx
@@ -21,11 +21,11 @@ export const DateField = wrapFieldsWithMeta<InputProps, DatetimepickerProps>(
     const inputRef = React.useRef(null);
 
     React.useEffect(() => {
-      if (inputRef.current && rest.focusIntent) {
+      if (inputRef.current && rest.experimental_focusIntent) {
         inputRef.current.focus();
         inputRef.current.open();
       }
-    }, [rest.focusIntent]);
+    }, [rest.experimental_focusIntent]);
 
     const getTimeFormat = useCallback(() => {
       if (timeFormat === false) {
diff --git a/packages/tinacms/src/toolkit/fields/plugins/group-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/group-field-plugin.tsx
index 1074fe3d4d..87d49bcf81 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/group-field-plugin.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/group-field-plugin.tsx
@@ -116,7 +116,7 @@ const Header = ({ onClick, children }) => {
     <div className='pt-1 mb-5'>
       <button
         onClick={onClick}
-        className='group px-4 py-3 bg-white hover:bg-gray-50 shadow focus:shadow-outline focus:border-tina-orange-dark w-full border border-gray-100 hover:border-gray-200 text-gray-500 hover:text-tina-orange-dark focus:text-tina-orange-dark rounded flex justify-between items-center gap-2'
+        className='group px-4 py-3 bg-white hover:bg-gray-50 shadow focus:shadow-outline focus:border-blue-500 w-full border border-gray-100 hover:border-gray-200 text-gray-500 hover:text-blue-400 focus:text-blue-500 rounded flex justify-between items-center gap-2'
       >
         <span className='text-left text-base font-medium overflow-hidden text-ellipsis whitespace-nowrap flex-1'>
           {children}
diff --git a/packages/tinacms/src/toolkit/fields/plugins/image-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/image-field-plugin.tsx
index 5ed91d8edf..62a47ee231 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/image-field-plugin.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/image-field-plugin.tsx
@@ -26,13 +26,10 @@ export const ImageField = wrapFieldsWithMeta<InputProps, ImageProps>(
     }
 
     React.useEffect(() => {
-      const focusIntent = props.field.focusIntent;
-      const shouldFocus = !!focusIntent;
-
-      if (ref.current && shouldFocus) {
+      if (ref.current && props.field.experimental_focusIntent) {
         ref.current.focus();
       }
-    }, [props.field.focusIntent, ref]);
+    }, [props.field.experimental_focusIntent, ref]);
 
     async function onChange(media?: Media | Media[]) {
       if (media) {
diff --git a/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/index.tsx
index 668e7450fe..d01c7b347a 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/index.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/index.tsx
@@ -122,7 +122,7 @@ export const MdxFieldPluginExtendible = {
       >
         <div
           className={
-            'min-h-[100px] max-w-full tina-prose relative shadow-inner focus-within:shadow-outline focus-within:border-tina-orange-dark block w-full bg-white border border-gray-200 text-gray-600 focus-within:text-gray-900 rounded pt-0 py-2'
+            'min-h-[100px] max-w-full tina-prose relative shadow-inner focus-within:shadow-outline focus-within:border-blue-500 block w-full bg-white border border-gray-200 text-gray-600 focus-within:text-gray-900 rounded pt-0 py-2'
           }
         >
           {props.rawMode ? props.rawEditor : <RichEditor {...props} />}
diff --git a/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/monaco/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/monaco/index.tsx
index b97b84876d..f1b6b59c0f 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/monaco/index.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/monaco/index.tsx
@@ -201,7 +201,7 @@ const Button = (props) => {
     <button
       className={`${
         props.align === 'left' ? 'rounded-l border-r-0' : 'rounded-r border-l-0'
-      } shadow rounded bg-white cursor-pointer relative inline-flex items-center px-2 py-2 border border-gray-200 hover:text-white text-sm font-medium transition-all ease-out duration-150 hover:bg-tina-orange focus:z-10 focus:outline-none focus:ring-1 focus:ring-tina-orange-dark focus:border-tina-orange-dark`}
+      } shadow rounded bg-white cursor-pointer relative inline-flex items-center px-2 py-2 border border-gray-200 hover:text-white text-sm font-medium transition-all ease-out duration-150 hover:bg-blue-500 focus:z-10 focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500`}
       type='button'
       onClick={props.onClick}
     >
diff --git a/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/index.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/index.tsx
index 801d584382..5a32bed154 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/index.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/index.tsx
@@ -43,13 +43,13 @@ export const RichEditor = ({ input, tinaForm, field }: RichTextType) => {
         const plateElement = ref.current?.querySelector(
           '[role="textbox"]'
         ) as HTMLElement;
-        if (field.focusIntent && plateElement) {
+        if (field.experimental_focusIntent && plateElement) {
           if (plateElement) plateElement.focus();
         }
         // Slate takes a second to mount
       }, 100);
     }
-  }, [field.focusIntent, ref]);
+  }, [field.experimental_focusIntent, ref]);
   //
   return (
     <div ref={ref}>
diff --git a/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx
index 5b3ffaa41a..7d7e97b088 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-img-plugin/component.tsx
@@ -39,8 +39,8 @@ export const ImgEmbed = ({
         >
           <button
             type='button'
-            className={`flex-shrink min-w-0 focus-within:shadow-outline focus-within:border-tina-orange-dark rounded outline-none overflow-visible cursor-pointer border-none hover:opacity-60 transition ease-out duration-100 ${
-              selected ? 'shadow-outline border-tina-orange-dark' : ''
+            className={`flex-shrink min-w-0 focus-within:shadow-outline focus-within:border-blue-500 rounded outline-none overflow-visible cursor-pointer border-none hover:opacity-60 transition ease-out duration-100 ${
+              selected ? 'shadow-outline border-blue-500' : ''
             }`}
             onClick={handleSelect}
           >
diff --git a/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/component.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/component.tsx
index d88d736e9b..2712938410 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/component.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/create-mdx-plugins/component.tsx
@@ -207,7 +207,7 @@ const DotMenu = ({ onOpen, onRemove }) => {
     <Popover as='span' className='-ml-px relative block'>
       <PopoverButton
         as='span'
-        className='cursor-pointer h-full relative inline-flex items-center px-1 py-0.5 rounded-r border border-gray-200 bg-white text-gray-500 hover:bg-gray-50 focus:outline-none focus:ring-1 focus:ring-tina-orange-dark focus:border-tina-orange-dark'
+        className='cursor-pointer h-full relative inline-flex items-center px-1 py-0.5 rounded-r border border-gray-200 bg-white text-gray-500 hover:bg-gray-50 focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500'
       >
         <EllipsisIcon title='Open options' />
       </PopoverButton>
diff --git a/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/dropdown.tsx b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/dropdown.tsx
index ce094f8e01..1a21e139ec 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/dropdown.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/mdx-field-plugin/plate/plugins/ui/dropdown.tsx
@@ -23,7 +23,7 @@ export function Dropdown({
   return (
     <Menu as='div' className='relative inline-block text-left z-20'>
       <div>
-        <MenuButton className='inline-flex justify-center w-full rounded border border-gray-300 shadow-sm px-2 py-1 bg-white text-xs font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-tina-orange-dark'>
+        <MenuButton className='inline-flex justify-center w-full rounded border border-gray-300 shadow-sm px-2 py-1 bg-white text-xs font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-blue-500'>
           {label}
           <ChevronDownIcon className='-mr-1 ml-2 h-4 w-4' aria-hidden='true' />
         </MenuButton>
diff --git a/packages/tinacms/src/toolkit/fields/plugins/tags-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/tags-field-plugin.tsx
index ac3cb76280..a0af0cc404 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/tags-field-plugin.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/tags-field-plugin.tsx
@@ -27,13 +27,10 @@ export const TagsField = wrapFieldsWithMeta<
   const items = input.value || [];
   const ref = React.useRef(null);
   React.useEffect(() => {
-    const focusIntent = field.focusIntent;
-    const shouldFocus = !!focusIntent;
-
-    if (ref.current && shouldFocus) {
+    if (ref.current && field.experimental_focusIntent) {
       ref.current.focus();
     }
-  }, [field.focusIntent, ref]);
+  }, [field.experimental_focusIntent, ref]);
 
   return (
     <>
diff --git a/packages/tinacms/src/toolkit/fields/plugins/text-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/text-field-plugin.tsx
index 11580b1a5b..c387b47900 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/text-field-plugin.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/text-field-plugin.tsx
@@ -11,13 +11,10 @@ export const TextField = wrapFieldsWithMeta<{}, InputProps & ExtraProps>(
   (props) => {
     const ref = React.useRef(null);
     React.useEffect(() => {
-      const focusIntent = props.field.focusIntent;
-      const shouldFocus = !!focusIntent;
-
-      if (ref.current && shouldFocus) {
+      if (ref.current && props.field.experimental_focusIntent) {
         ref.current.focus();
       }
-    }, [props.field.focusIntent, ref]);
+    }, [props.field.experimental_focusIntent, ref]);
 
     return (
       <BaseTextField
diff --git a/packages/tinacms/src/toolkit/fields/plugins/textarea-field-plugin.tsx b/packages/tinacms/src/toolkit/fields/plugins/textarea-field-plugin.tsx
index bd882e9ced..a6b505cd50 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/textarea-field-plugin.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/textarea-field-plugin.tsx
@@ -6,16 +6,13 @@ import { parse } from './text-format';
 const TextareaField = wrapFieldsWithMeta<{ input: InputProps }>((props) => {
   const ref = React.useRef(null);
   React.useEffect(() => {
-    const focusIntent = props.field.focusIntent;
-    const shouldFocus = !!focusIntent;
-
-    if (ref.current && shouldFocus) {
+    if (ref.current && props.field.experimental_focusIntent) {
       const el = ref.current;
       el.focus();
       // Move the cursor to the end of the text
       el.setSelectionRange(el.value.length, el.value.length);
     }
-  }, [props.field.focusIntent, ref]);
+  }, [props.field.experimental_focusIntent, ref]);
 
   return <TextArea ref={ref} {...props.input} />;
 });
diff --git a/packages/tinacms/src/toolkit/fields/plugins/wrap-field-with-meta.tsx b/packages/tinacms/src/toolkit/fields/plugins/wrap-field-with-meta.tsx
index 4e3e5fceb9..57f6a0a683 100644
--- a/packages/tinacms/src/toolkit/fields/plugins/wrap-field-with-meta.tsx
+++ b/packages/tinacms/src/toolkit/fields/plugins/wrap-field-with-meta.tsx
@@ -25,8 +25,6 @@ export function wrapFieldsWithMeta<ExtraFieldProps = {}, InputProps = {}>(
         index={props.index}
         tinaForm={props.tinaForm}
         field={props.field}
-        focusIntent={props.field.focusIntent}
-        hoverIntent={props.field.hoverIntent}
       >
         <Field {...props} />
       </FieldMeta>
@@ -51,8 +49,6 @@ export function wrapFieldWithNoHeader<ExtraFieldProps = {}, InputProps = {}>(
         error={props.meta.error}
         index={props.index}
         tinaForm={props.tinaForm}
-        focusIntent={props.field.focusIntent}
-        hoverIntent={props.field.hoverIntent}
       >
         <Field {...props} />
       </FieldMeta>
@@ -78,8 +74,6 @@ export function wrapFieldWithError<ExtraFieldProps = {}, InputProps = {}>(
         error={props.meta.error}
         index={props.index}
         tinaForm={props.tinaForm}
-        focusIntent={props.field.focusIntent}
-        hoverIntent={props.field.hoverIntent}
       >
         <Field {...props} />
       </FieldMeta>
@@ -97,8 +91,6 @@ interface FieldMetaProps extends React.HTMLAttributes<HTMLElement> {
   index?: number;
   tinaForm: Form;
   field?: Field;
-  focusIntent?: boolean;
-  hoverIntent?: boolean;
 }
 
 export const FieldMeta = ({
@@ -111,48 +103,20 @@ export const FieldMeta = ({
   index,
   tinaForm,
   field,
-  focusIntent,
-  hoverIntent,
   ...props
 }: FieldMetaProps) => {
-  const cms = useCMS();
   const { dispatch: setHoveredField } =
     useEvent<FieldHoverEvent>('field:hover');
   const { dispatch: setFocusedField } =
     useEvent<FieldFocusEvent>('field:focus');
-
-  const isActive = !!focusIntent;
-  const isHovering = !!hoverIntent;
-
-  const handleClick = () => {
-    // Check if this field is already active - if so, don't toggle it off
-    const existingForm = cms.state.forms.find(
-      (form: any) => form.tinaForm.id === tinaForm.id
-    );
-    const isAlreadyActive = existingForm?.activeFieldName === name;
-
-    if (isAlreadyActive) {
-      return;
-    }
-    // Dispatch the field:focus event for iframe communication
-    setFocusedField({ id: tinaForm.id, fieldName: name });
-    // Also set the active field in Redux state for sidebar highlighting
-    cms.dispatch({
-      type: 'forms:set-active-field-name',
-      value: { formId: tinaForm.id, fieldName: name },
-    });
-  };
-
   return (
     <FieldWrapper
       margin={margin}
       field={field}
       onMouseOver={() => setHoveredField({ id: tinaForm.id, fieldName: name })}
       onMouseOut={() => setHoveredField({ id: null, fieldName: null })}
-      onClick={handleClick}
+      onClick={() => setFocusedField({ id: tinaForm.id, fieldName: name })}
       style={{ zIndex: index ? 1000 - index : undefined }}
-      data-tina-field-active={isActive ? 'true' : undefined}
-      data-tina-field-hovering={isHovering ? 'true' : undefined}
       {...props}
     >
       {(label !== false || description) && (
@@ -176,47 +140,15 @@ export const FieldWrapper = ({
   margin,
   children,
   field,
-  'data-tina-field-active': dataActive,
-  'data-tina-field-hovering': dataHovering,
   ...props
 }: {
   margin: boolean;
   children: React.ReactNode;
   field?: Field;
-  'data-tina-field-active'?: string;
-  'data-tina-field-hovering'?: string;
 } & Partial<React.ComponentPropsWithoutRef<'div'>>) => {
-  const isActive = dataActive === 'true';
-  const isHovering = dataHovering === 'true';
-
-  const getFieldStateClasses = () => {
-    const elements = ['input', 'textarea', 'select', '.ProseMirror'];
-
-    const buildClasses = (color: string) => {
-      return elements
-        .map(
-          (el) =>
-            `[&_${el}]:!border-${color} [&_${el}]:!ring-2 [&_${el}]:!ring-${color}/20`
-        )
-        .join(' ');
-    };
-
-    if (isActive) {
-      return buildClasses('tina-orange-dark');
-    }
-
-    if (isHovering) {
-      return buildClasses('blue-500');
-    }
-
-    return '';
-  };
-
   return (
     <div
-      className={`relative w-full px-2 ${margin ? 'mb-5 last:mb-0' : ''} ${field?.width === 'half' ? '@sm:w-1/2' : ''} ${getFieldStateClasses()}`}
-      data-tina-field-active={dataActive}
-      data-tina-field-hovering={dataHovering}
+      className={`relative w-full px-2 ${margin ? 'mb-5 last:mb-0' : ''} ${field?.width === 'half' ? '@sm:w-1/2' : ''}`}
       {...props}
     >
       {children}
diff --git a/packages/tinacms/src/toolkit/form-builder/fields-builder.tsx b/packages/tinacms/src/toolkit/form-builder/fields-builder.tsx
index aeea4da72f..9208d194ff 100644
--- a/packages/tinacms/src/toolkit/form-builder/fields-builder.tsx
+++ b/packages/tinacms/src/toolkit/form-builder/fields-builder.tsx
@@ -7,7 +7,6 @@ import { FieldPlugin } from './field-plugin';
 export interface FieldsBuilderProps {
   form: Form;
   activeFieldName?: string;
-  hoveringFieldName?: string;
   fields: Field[];
   padding?: boolean;
 }
@@ -16,7 +15,6 @@ export function FieldsBuilder({
   form,
   fields,
   activeFieldName,
-  hoveringFieldName,
   padding = false,
 }: FieldsBuilderProps) {
   const cms = useCMS();
@@ -38,7 +36,6 @@ export function FieldsBuilder({
             key={field.name}
             field={field}
             activeFieldName={activeFieldName}
-            hoveringFieldName={hoveringFieldName}
             form={form}
             fieldPlugins={fieldPlugins}
             index={index}
@@ -55,7 +52,6 @@ interface InnerFieldProps {
   fieldPlugins: FieldPlugin[];
   index: number;
   activeFieldName?: string;
-  hoveringFieldName?: string;
 }
 
 const InnerField = ({
@@ -64,7 +60,6 @@ const InnerField = ({
   fieldPlugins,
   index,
   activeFieldName,
-  hoveringFieldName,
 }: InnerFieldProps) => {
   /**
    * We double-render form builders for some reason which reults in useMemo not working here
@@ -96,11 +91,6 @@ const InnerField = ({
   }
 
   let isActiveField = field.name === activeFieldName;
-  const isHoveringField = field.name === hoveringFieldName;
-
-  const focusIntent = isActiveField;
-  const hoverIntent = isHoveringField;
-
   // TODO: this handles focusing on the tag element when one
   // of it's items is the activeField (categories.2) but not
   // for when the items are displayed with the ListFieldPlugin
@@ -150,11 +140,7 @@ const InnerField = ({
               {...fieldProps}
               form={form.finalForm}
               tinaForm={form}
-              field={{
-                ...field,
-                focusIntent: focusIntent,
-                hoverIntent: hoverIntent,
-              }}
+              field={{ ...field, experimental_focusIntent: isActiveField }}
             />
           );
         }
@@ -163,14 +149,10 @@ const InnerField = ({
           return (
             <plugin.Component
               {...fieldProps}
-              focusIntent={focusIntent}
+              experimental_focusIntent={isActiveField}
               form={form.finalForm}
               tinaForm={form}
-              field={{
-                ...field,
-                focusIntent: focusIntent,
-                hoverIntent: hoverIntent,
-              }}
+              field={{ ...field, experimental_focusIntent: isActiveField }}
               index={index}
             />
           );
diff --git a/packages/tinacms/src/toolkit/form-builder/form-builder.tsx b/packages/tinacms/src/toolkit/form-builder/form-builder.tsx
index 981336d327..b22f18d9c6 100644
--- a/packages/tinacms/src/toolkit/form-builder/form-builder.tsx
+++ b/packages/tinacms/src/toolkit/form-builder/form-builder.tsx
@@ -21,11 +21,7 @@ import { ResetForm } from './reset-form';
 import { CreateBranchModal } from './create-branch-modal';
 
 export interface FormBuilderProps {
-  form: {
-    tinaForm: Form;
-    activeFieldName?: string;
-    hoveringFieldName?: string;
-  };
+  form: { tinaForm: Form; activeFieldName?: string };
   hideFooter?: boolean;
   label?: string;
   onPristineChange?: (_pristine: boolean) => unknown;
@@ -212,7 +208,6 @@ export const FormBuilder: FC<FormBuilderProps> = ({
                     <FieldsBuilder
                       form={tinaForm}
                       activeFieldName={form.activeFieldName}
-                      hoveringFieldName={form.hoveringFieldName}
                       fields={fieldGroup.fields}
                     />
                   ) : (
diff --git a/packages/tinacms/src/toolkit/forms/field.ts b/packages/tinacms/src/toolkit/forms/field.ts
index 03b4a91d30..14c57c35d8 100644
--- a/packages/tinacms/src/toolkit/forms/field.ts
+++ b/packages/tinacms/src/toolkit/forms/field.ts
@@ -26,10 +26,9 @@ export interface Field<F extends Field = AnyField> {
    * a guarantee that the given field will receive focus since that functionality
    * needs to be built on a per-component basis.
    *
-   * This is also a one-way street. The "active field" for a given form isn't
+   * This is also a one-way stree. The "active field" for a given form isn't
    * necessarily updated when a user clicks on a new field. So you can have a
    * field which is marked as the active field, and have focus on another field
    */
-  focusIntent?: boolean;
-  hoverIntent?: boolean;
+  experimental_focusIntent?: boolean;
 }
diff --git a/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-switcher.tsx b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-switcher.tsx
index c9e250be91..5163c42b1e 100644
--- a/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-switcher.tsx
+++ b/packages/tinacms/src/toolkit/plugin-branch-switcher/branch-switcher.tsx
@@ -236,12 +236,22 @@ export const getFilteredBranchList = (
   filter: 'content' | 'all' = 'all'
 ) => {
   const filteredBranchList = branchList
-    .filter(
-      (branch) =>
-        !search ||
-        branch.name.includes(search) ||
-        branch.name === currentBranchName
-    )
+    .filter((branch) => {
+      if (!search) return true;
+      if (branch.name === currentBranchName) return true;
+
+      const searchLower = search.toLowerCase();
+      const nameMatch = branch.name.toLowerCase().includes(searchLower);
+
+      // Also check if search matches PR reference
+      let prMatch = false;
+      if (branch.githubPullRequestUrl) {
+        const prId = extractPullRequestId(branch.githubPullRequestUrl);
+        prMatch = prId.toLowerCase().includes(searchLower);
+      }
+
+      return nameMatch || prMatch;
+    })
     .filter((branch) => {
       // always show protected branches (e.g. main)
       if (branch.protected) return true;
@@ -380,7 +390,7 @@ const BranchSelector = ({
           </label>
           <div className='block relative group h-fit mb-auto'>
             <BaseTextField
-              placeholder='Search'
+              placeholder='Branch name or PR #'
               value={search}
               onChange={(e) => setSearch(e.target.value)}
             />
diff --git a/packages/tinacms/src/toolkit/tina-state.tsx b/packages/tinacms/src/toolkit/tina-state.tsx
index 239f96e050..7368688d79 100644
--- a/packages/tinacms/src/toolkit/tina-state.tsx
+++ b/packages/tinacms/src/toolkit/tina-state.tsx
@@ -2,26 +2,6 @@ import { AnyField } from './forms';
 import { Form } from './react-tinacms';
 import { TinaCMS } from './tina-cms';
 
-export const ACTION_TYPES = {
-  FORMS_ADD: 'forms:add',
-  FORMS_REMOVE: 'forms:remove',
-  FORMS_CLEAR: 'forms:clear',
-  FORMS_SET_ACTIVE_FORM_ID: 'forms:set-active-form-id',
-  FORMS_SET_ACTIVE_FIELD_NAME: 'forms:set-active-field-name',
-  FORMS_SET_HOVERED_FIELD_NAME: 'forms:set-hovered-field-name',
-  FORM_LISTS_ADD: 'form-lists:add',
-  FORM_LISTS_REMOVE: 'form-lists:remove',
-  FORM_LISTS_CLEAR: 'form-lists:clear',
-  SET_EDIT_MODE: 'set-edit-mode',
-  INCREMENT_OPERATION_INDEX: 'increment-operation-index',
-  SET_QUICK_EDITING_SUPPORTED: 'set-quick-editing-supported',
-  SET_QUICK_EDITING_ENABLED: 'set-quick-editing-enabled',
-  TOGGLE_QUICK_EDITING_ENABLED: 'toggle-quick-editing-enabled',
-  TOGGLE_EDIT_STATE: 'toggle-edit-state',
-  SIDEBAR_SET_DISPLAY_STATE: 'sidebar:set-display-state',
-  SIDEBAR_SET_LOADING_STATE: 'sidebar:set-loading-state',
-} as const;
-
 type FormListItem =
   | {
       type: 'document';
@@ -49,66 +29,62 @@ type Breadcrumb = {
 
 export type TinaAction =
   | {
-      type: typeof ACTION_TYPES.FORMS_ADD;
+      type: 'forms:add';
       value: Form;
     }
   | {
-      type: typeof ACTION_TYPES.FORMS_REMOVE;
+      type: 'forms:remove';
       value: string;
     }
   | {
-      type: typeof ACTION_TYPES.FORMS_CLEAR;
+      type: 'forms:clear';
     }
   | {
-      type: typeof ACTION_TYPES.FORM_LISTS_ADD;
+      type: 'form-lists:add';
       value: FormList;
     }
   | {
-      type: typeof ACTION_TYPES.FORM_LISTS_REMOVE;
+      type: 'form-lists:remove';
       value: string;
     }
   | {
-      type: typeof ACTION_TYPES.FORMS_SET_ACTIVE_FORM_ID;
+      type: 'forms:set-active-form-id';
       value: string;
     }
   | {
-      type: typeof ACTION_TYPES.FORMS_SET_ACTIVE_FIELD_NAME;
+      type: 'forms:set-active-field-name';
       value: { formId: string; fieldName: string };
     }
   | {
-      type: typeof ACTION_TYPES.FORMS_SET_HOVERED_FIELD_NAME;
-      value: { formId: string; fieldName: string | null };
-    }
-  | {
-      type: typeof ACTION_TYPES.FORM_LISTS_CLEAR;
+      type: 'form-lists:clear';
     }
   | {
-      type: typeof ACTION_TYPES.SET_EDIT_MODE;
+      type: 'set-edit-mode';
       value: 'visual' | 'basic';
     }
   | {
-      type: typeof ACTION_TYPES.INCREMENT_OPERATION_INDEX;
+      type: 'increment-operation-index';
     }
   | {
-      type: typeof ACTION_TYPES.SET_QUICK_EDITING_SUPPORTED;
+      type: 'set-quick-editing-supported';
       value: boolean;
     }
   | {
-      type: typeof ACTION_TYPES.SET_QUICK_EDITING_ENABLED;
+      type: 'set-quick-editing-enabled';
       value?: boolean;
     }
   | {
-      type: typeof ACTION_TYPES.TOGGLE_QUICK_EDITING_ENABLED;
+      type: 'toggle-quick-editing-enabled';
     }
   | {
-      type: typeof ACTION_TYPES.TOGGLE_EDIT_STATE;
+      type: 'toggle-edit-state';
     }
   | {
-      type: typeof ACTION_TYPES.SIDEBAR_SET_DISPLAY_STATE;
+      type: 'sidebar:set-display-state';
       value: TinaState['sidebarDisplayState'] | 'openOrFull';
     }
   | {
-      type: typeof ACTION_TYPES.SIDEBAR_SET_LOADING_STATE;
+      type: 'sidebar:set-loading-state';
       value: boolean;
     };
 
@@ -124,11 +100,7 @@ export interface TinaState {
    * all at once, putting state this high up at least allows us to not have to touch the Form class too much.
    * Longer term, replaceing Form with something stateful seems like the right approach
    */
-  forms: {
-    activeFieldName?: string | null;
-    tinaForm: Form;
-    hoveringFieldName?: string | null;
-  }[];
+  forms: { activeFieldName?: string | null; tinaForm: Form }[];
   formLists: FormList[];
   editingMode: 'visual' | 'basic';
   isLoadingContent: boolean;
@@ -152,24 +124,24 @@ export const initialState = (cms: TinaCMS): TinaState => {
 // Our reducer function that uses a switch statement to handle our actions
 export function tinaReducer(state: TinaState, action: TinaAction): TinaState {
   switch (action.type) {
-    case ACTION_TYPES.SET_QUICK_EDITING_SUPPORTED:
+    case 'set-quick-editing-supported':
       return {
         ...state,
         quickEditSupported: action.value,
       };
-    case ACTION_TYPES.SET_EDIT_MODE:
+    case 'set-edit-mode':
       return { ...state, editingMode: action.value };
-    case ACTION_TYPES.FORMS_ADD:
+    case 'forms:add':
       if (state.forms.find((f) => f.tinaForm.id === action.value.id)) {
         return state;
       }
       return { ...state, forms: [...state.forms, { tinaForm: action.value }] };
-    case ACTION_TYPES.FORMS_REMOVE:
+    case 'forms:remove':
       return {
         ...state,
         forms: state.forms.filter((form) => form.tinaForm.id !== action.value),
       };
-    case ACTION_TYPES.FORM_LISTS_CLEAR: {
+    case 'form-lists:clear': {
       return {
         ...state,
         quickEditSupported: false,
@@ -179,7 +151,7 @@ export function tinaReducer(state: TinaState, action: TinaAction): TinaState {
         forms: [],
       };
     }
-    case ACTION_TYPES.FORM_LISTS_ADD: {
+    case 'form-lists:add': {
       let formListItemExists = false;
       const nextFormLists = state.formLists.map((formList) => {
         if (formList.id === action.value.id) {
@@ -223,7 +195,7 @@ export function tinaReducer(state: TinaState, action: TinaAction): TinaState {
         isLoadingContent: false,
       };
     }
-    case ACTION_TYPES.FORM_LISTS_REMOVE: {
+    case 'form-lists:remove': {
       const nextFormLists = state.formLists.filter(
         ({ id }) => id !== action.value
       );
@@ -250,7 +222,7 @@ export function tinaReducer(state: TinaState, action: TinaAction): TinaState {
         formLists: nextFormLists,
       };
     }
-    case ACTION_TYPES.FORMS_SET_ACTIVE_FORM_ID:
+    case 'forms:set-active-form-id':
       if (action.value !== state.activeFormId) {
         const newActiveForm = state.forms.find(
           (form) => form.tinaForm.id === action.value
@@ -268,15 +240,14 @@ export function tinaReducer(state: TinaState, action: TinaAction): TinaState {
         };
       }
       return state;
-
-    case ACTION_TYPES.FORMS_SET_ACTIVE_FIELD_NAME:
+    case 'forms:set-active-field-name':
       if (state.activeFormId === action.value.formId) {
         const existingForm = state.forms.find(
           (form) => form.tinaForm.id === action.value.formId
         );
 
         if (existingForm?.activeFieldName === action.value.fieldName) {
-          // Clicking on the same field - don't change state
+          // If the active field name is already set, do nothing
           return state;
         }
       }
@@ -286,7 +257,6 @@ export function tinaReducer(state: TinaState, action: TinaAction): TinaState {
           return {
             tinaForm: form.tinaForm,
             activeFieldName: action.value.fieldName,
-            hoveringFieldName: null,
           };
         }
         return form;
@@ -304,59 +274,7 @@ export function tinaReducer(state: TinaState, action: TinaAction): TinaState {
         forms,
         activeFormId: action.value.formId,
       };
-
-    case ACTION_TYPES.FORMS_SET_HOVERED_FIELD_NAME:
-      const hoveredForms = state.forms.map((form) => {
-        if (form.tinaForm.id === action.value.formId) {
-          const activeFieldName = form.activeFieldName;
-          const hoveredFieldName = action.value.fieldName;
-
-          // If there's an active field and we're hovering on something
-          if (activeFieldName && hoveredFieldName) {
-            // Don't allow hover if hovering the same field as active
-            if (activeFieldName === hoveredFieldName) {
-              return {
-                ...form,
-                hoveringFieldName: null,
-              };
-            }
-
-            // Check if hoveredFieldName is a child of activeFieldName
-            const isChildOfActive = hoveredFieldName.startsWith(
-              activeFieldName + '.'
-            );
-
-            // Check if hoveredFieldName is a sibling of activeFieldName
-            const activePathParts = activeFieldName.split('.');
-            const hoveredPathParts = hoveredFieldName.split('.');
-            const isSibling =
-              activePathParts.length === hoveredPathParts.length &&
-              activePathParts.slice(0, -1).join('.') ===
-                hoveredPathParts.slice(0, -1).join('.');
-
-            if (!isChildOfActive && !isSibling) {
-              // Not a child or sibling field - don't update hover
-              return {
-                ...form,
-                hoveringFieldName: null,
-              };
-            }
-          }
-
-          return {
-            ...form,
-            hoveringFieldName: hoveredFieldName,
-          };
-        }
-        return form;
-      });
-
-      return {
-        ...state,
-        forms: hoveredForms,
-      };
-
-    case ACTION_TYPES.TOGGLE_EDIT_STATE: {
+    case 'toggle-edit-state': {
       return state.sidebarDisplayState === 'closed'
         ? { ...state, sidebarDisplayState: 'open' }
         : {
@@ -364,7 +282,7 @@ export function tinaReducer(state: TinaState, action: TinaAction): TinaState {
             sidebarDisplayState: 'closed',
           };
     }
-    case ACTION_TYPES.SIDEBAR_SET_DISPLAY_STATE: {
+    case 'sidebar:set-display-state': {
       // In some cases, you may only care that the sidebar is open, regardless
       // whether it's "open" or "full"
       if (action.value === 'openOrFull') {
@@ -384,7 +302,7 @@ export function tinaReducer(state: TinaState, action: TinaAction): TinaState {
       }
       return { ...state, sidebarDisplayState: action.value };
     }
-    case ACTION_TYPES.SIDEBAR_SET_LOADING_STATE: {
+    case 'sidebar:set-loading-state': {
       return { ...state, isLoadingContent: action.value };
     }
     default: