diff --git a/src/form/Form.tsx b/src/form/Form.tsx
index 664b94d6..d05e265c 100644
--- a/src/form/Form.tsx
+++ b/src/form/Form.tsx
@@ -11,7 +11,6 @@ import { filterDOMProps } from '@react-aria/utils';
 import React, { useContext, ReactElement, FormEventHandler } from 'react';
 import { css } from '@emotion/react';
 import { Provider } from '../provider';
-import theme from '../theme';
 
 let FormContext = React.createContext<LabelableProps>({});
 
@@ -100,7 +99,7 @@ const formCSS = css`
       flex-wrap: wrap;
       gap: 0.5em;
 
-      --ac-field-text-color-override: ${theme.colors.arizeLightBlue};
+      --ac-field-text-color-override: var(--ac-global-color-primary);
     }
   }
 `;
diff --git a/src/navlist/NavList.tsx b/src/navlist/NavList.tsx
index 9f07b621..6b14d83c 100644
--- a/src/navlist/NavList.tsx
+++ b/src/navlist/NavList.tsx
@@ -27,12 +27,12 @@ const navCSS = css`
     position: relative;
     overflow: visible;
     &.is-selected {
-      background-color: ${theme.colors.gray600};
+      background-color: var(--ac-global-color-grey-700);
       &::before {
         position: absolute;
         display: block;
         content: '';
-        background-color: ${theme.colors.arizeLightBlue};
+        background-color: var(--ac-global-color-primary);
         width: 4px;
         height: calc(100% - 4px);
         left: -8px;
@@ -40,7 +40,7 @@ const navCSS = css`
       }
     }
     &:hover {
-      background-color: ${theme.colors.gray500};
+      background-color: var(--ac-global-color-grey-500);
     }
   }
 `;