diff --git a/src/components/Global/components/library-selector.tsx b/src/components/Global/components/library-selector.tsx
index 77b107f6..7285b11a 100644
--- a/src/components/Global/components/library-selector.tsx
+++ b/src/components/Global/components/library-selector.tsx
@@ -102,7 +102,7 @@ export default function LibrarySelector({
 					>
 						<Text
 							fontWeight={isSelected ? 'bold' : '600'}
-							color={isSelected ? '$background' : 'unset'}
+							color={isSelected ? '$background' : '$neutral'}
 						>
 							{library.Name ?? 'Unnamed Library'}
 						</Text>
diff --git a/src/components/Global/helpers/flashlist-sticky-header.tsx b/src/components/Global/helpers/flashlist-sticky-header.tsx
index f18e03b4..cd97a794 100644
--- a/src/components/Global/helpers/flashlist-sticky-header.tsx
+++ b/src/components/Global/helpers/flashlist-sticky-header.tsx
@@ -17,7 +17,7 @@ export default function FlashListStickyHeader({ text }: { text: string }): React
 					y: 0,
 				}}
 				locations={[0.1, 0.9]}
-				colors={[theme.primary.val, 'transparent']}
+				colors={[theme.primary.val, theme.background.val]}
 				style={{
 					position: 'absolute',
 					top: 0,
diff --git a/src/components/theme.ts b/src/components/theme.ts
index ed4d140d..271b3be2 100644
--- a/src/components/theme.ts
+++ b/src/components/theme.ts
@@ -1,5 +1,5 @@
 import { DarkTheme, DefaultTheme } from '@react-navigation/native'
-import { getTokens } from 'tamagui'
+import { getToken, getTokens } from 'tamagui'
 
 interface Fonts {
 	regular: FontStyle
@@ -60,6 +60,9 @@ export const JellifyLightTheme = {
 	colors: {
 		...DefaultTheme.colors,
 		primary: getTokens().color.$primaryLight.val,
+		border: getTokens().color.$neutral.val,
+		background: getTokens().color.$white.val,
+		card: getTokens().color.$white.val,
 	},
 	fonts: JellifyFonts,
 }
diff --git a/tamagui.config.ts b/tamagui.config.ts
index 765904f7..a5b438ba 100644
--- a/tamagui.config.ts
+++ b/tamagui.config.ts
@@ -7,7 +7,8 @@ const tokens = createTokens({
 	color: {
 		danger: '#ff9966',
 		purpleDark: '#0C0622',
-		success: 'rgba(82, 216, 186, 1)',
+		tealLight: 'rgba(16, 175, 141, 1)',
+		tealDark: 'rgba(87, 233, 201, 1)',
 		purple: '#100538',
 		purpleGray: '#66617B',
 
@@ -63,7 +64,7 @@ const jellifyConfig = createTamagui({
 			background25: tokens.color.darkBackground25,
 			borderColor: tokens.color.neutral,
 			color: tokens.color.white,
-			success: tokens.color.success,
+			success: tokens.color.tealDark,
 			secondary: tokens.color.secondary,
 			primary: tokens.color.primaryDark,
 			danger: tokens.color.danger,
@@ -79,7 +80,7 @@ const jellifyConfig = createTamagui({
 			background25: tokens.color.black25,
 			borderColor: tokens.color.neutral,
 			color: tokens.color.white,
-			success: tokens.color.success,
+			success: tokens.color.tealDark,
 			secondary: tokens.color.secondary,
 			primary: tokens.color.primaryDark,
 			danger: tokens.color.danger,
@@ -94,7 +95,7 @@ const jellifyConfig = createTamagui({
 			background25: tokens.color.amethyst25,
 			background50: tokens.color.amethyst50,
 			background75: tokens.color.amethyst75,
-			success: tokens.color.success,
+			success: tokens.color.tealDark,
 			secondary: tokens.color.secondary,
 			primary: tokens.color.primaryDark,
 			danger: tokens.color.danger,
@@ -109,7 +110,7 @@ const jellifyConfig = createTamagui({
 			background25: tokens.color.lightBackground25,
 			borderColor: tokens.color.neutral,
 			color: tokens.color.purpleDark,
-			success: tokens.color.success,
+			success: tokens.color.tealLight,
 			secondary: tokens.color.secondary,
 			primary: tokens.color.primaryLight,
 			danger: tokens.color.danger,
@@ -124,7 +125,7 @@ const jellifyConfig = createTamagui({
 			background25: tokens.color.amethyst25,
 			background50: tokens.color.amethyst50,
 			background75: tokens.color.amethyst75,
-			success: tokens.color.success,
+			success: tokens.color.tealLight,
 			secondary: tokens.color.secondary,
 			primary: tokens.color.primaryLight,
 			danger: tokens.color.danger,