Finish cleaning up theme stuff

components/theme/ui/ThemedBadge.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { StyleSheet, ViewProps } from 'react-native';
-import { ThemedView, ThemedText } from '@/components/theme';
+import ThemedText from '@/components/theme/default/ThemedText';
+import ThemedView from '@/components/theme/default/ThemedView';
 import { Colors } from '@/constants/Colors';
 import { useColorScheme } from '@/hooks/useColorScheme';
 
@@ -22,7 +23,7 @@ const ThemedBadge: React.FC<ThemedBadgeProps> = ({
   const scheme = useColorScheme() ?? 'dark';
   const badgeColor = color || Colors[scheme].tint;
   const badgeTextColor = textColor || Colors[scheme].background;
-  
+
   return (
     <ThemedView
       style={[
@@ -37,12 +38,7 @@ const ThemedBadge: React.FC<ThemedBadgeProps> = ({
       ]}
       {...restProps}
     >
-      <ThemedText 
-        style={[
-          styles.text, 
-          { color: badgeTextColor, fontSize: size * 0.5 }
-        ]}
-      >
+      <ThemedText style={[styles.text, { color: badgeTextColor, fontSize: size * 0.5 }]}>
         {value}
       </ThemedText>
     </ThemedView>