diff --git a/README.md b/README.md
index bea6c6e..f702541 100644
--- a/README.md
+++ b/README.md
@@ -16,21 +16,30 @@ This repository is a template for React Native Expo applications. It integrates
 
 ### Light Theme
 
-![Home Screen Light](screenshots/home-light.png)
-![Settings Screen Light](screenshots/settings-light.png)
-![Modal Screen Light](screenshots/modal-light.png)
+![Home Screen Light](screenshots/light/home.png)
+![Settings Screen Light](screenshots/light/settings.png)
+![Modal Screen Light](screenshots/light/modal.png)
 
 ### Dark Theme
 
-![Home Screen Dark](screenshots/home-dark.png)
-![Settings Screen Dark](screenshots/settings-dark.png)
-![Modal Screen Dark](screenshots/modal-dark.png)
+![Home Screen Dark](screenshots/dark/home.png)
+![Settings Screen Dark](screenshots/dark/settings.png)
+![Modal Screen Dark](screenshots/dark/modal.png)
 
 ### Custom Themes
 
-![Home Screen Cyan Dark](screenshots/home-cyan.png)
-![Settings Screen Orange Light](screenshots/settings-orange.png)
-![Modal Screen Yellow Dark](screenshots/modal-yellow.png)
+![Default Theme](screenshots/themes/default.png)
+![Blue Theme](screenshots/themes/blue.png)
+![Brown Theme](screenshots/themes/brown.png)
+![Cyan Theme](screenshots/themes/cyan.png)
+![Green Theme](screenshots/themes/green.png)
+![Indigo Theme](screenshots/themes/indigo.png)
+![Lime Theme](screenshots/themes/lime.png)
+![Olive Theme](screenshots/themes/olive.png)
+![Orange Theme](screenshots/themes/orange.png)
+![Red Theme](screenshots/themes/red.png)
+![Teal Theme](screenshots/themes/teal.png)
+![Violet Theme](screenshots/themes/violet.png)
 
 ## Getting Started
 
diff --git a/app/(tabs)/_layout.tsx b/app/(tabs)/_layout.tsx
index c92b3ad..b6eb343 100644
--- a/app/(tabs)/_layout.tsx
+++ b/app/(tabs)/_layout.tsx
@@ -30,6 +30,7 @@ const TabLayout = () => (
     }}
     tabBar={({ navigation, state, descriptors, insets }) => (
       <BottomNavigation.Bar
+        shifting
         navigationState={state}
         safeAreaInsets={insets}
         onTabPress={({ route, preventDefault }) => {
diff --git a/screenshots/dark/home.png b/screenshots/dark/home.png
new file mode 100644
index 0000000..e30b5e3
Binary files /dev/null and b/screenshots/dark/home.png differ
diff --git a/screenshots/dark/modal.png b/screenshots/dark/modal.png
new file mode 100644
index 0000000..35a1391
Binary files /dev/null and b/screenshots/dark/modal.png differ
diff --git a/screenshots/dark/settings.png b/screenshots/dark/settings.png
new file mode 100644
index 0000000..2828137
Binary files /dev/null and b/screenshots/dark/settings.png differ
diff --git a/screenshots/home-cyan.png b/screenshots/home-cyan.png
deleted file mode 100644
index 4fd05d3..0000000
Binary files a/screenshots/home-cyan.png and /dev/null differ
diff --git a/screenshots/home-dark.png b/screenshots/home-dark.png
deleted file mode 100644
index 7767174..0000000
Binary files a/screenshots/home-dark.png and /dev/null differ
diff --git a/screenshots/home-light.png b/screenshots/home-light.png
deleted file mode 100644
index 54e02b1..0000000
Binary files a/screenshots/home-light.png and /dev/null differ
diff --git a/screenshots/light/home.png b/screenshots/light/home.png
new file mode 100644
index 0000000..385addc
Binary files /dev/null and b/screenshots/light/home.png differ
diff --git a/screenshots/light/modal.png b/screenshots/light/modal.png
new file mode 100644
index 0000000..06dce47
Binary files /dev/null and b/screenshots/light/modal.png differ
diff --git a/screenshots/light/settings.png b/screenshots/light/settings.png
new file mode 100644
index 0000000..ace656f
Binary files /dev/null and b/screenshots/light/settings.png differ
diff --git a/screenshots/modal-dark.png b/screenshots/modal-dark.png
deleted file mode 100644
index bd83456..0000000
Binary files a/screenshots/modal-dark.png and /dev/null differ
diff --git a/screenshots/modal-light.png b/screenshots/modal-light.png
deleted file mode 100644
index ef2ebcb..0000000
Binary files a/screenshots/modal-light.png and /dev/null differ
diff --git a/screenshots/modal-yellow.png b/screenshots/modal-yellow.png
deleted file mode 100644
index c224914..0000000
Binary files a/screenshots/modal-yellow.png and /dev/null differ
diff --git a/screenshots/settings-dark.png b/screenshots/settings-dark.png
deleted file mode 100644
index 4d7f471..0000000
Binary files a/screenshots/settings-dark.png and /dev/null differ
diff --git a/screenshots/settings-light.png b/screenshots/settings-light.png
deleted file mode 100644
index 8575174..0000000
Binary files a/screenshots/settings-light.png and /dev/null differ
diff --git a/screenshots/settings-orange.png b/screenshots/settings-orange.png
deleted file mode 100644
index 6443198..0000000
Binary files a/screenshots/settings-orange.png and /dev/null differ
diff --git a/screenshots/themes/blue.png b/screenshots/themes/blue.png
new file mode 100644
index 0000000..17048d0
Binary files /dev/null and b/screenshots/themes/blue.png differ
diff --git a/screenshots/themes/brown.png b/screenshots/themes/brown.png
new file mode 100644
index 0000000..2e62260
Binary files /dev/null and b/screenshots/themes/brown.png differ
diff --git a/screenshots/themes/cyan.png b/screenshots/themes/cyan.png
new file mode 100644
index 0000000..043192c
Binary files /dev/null and b/screenshots/themes/cyan.png differ
diff --git a/screenshots/themes/default.png b/screenshots/themes/default.png
new file mode 100644
index 0000000..1b0474e
Binary files /dev/null and b/screenshots/themes/default.png differ
diff --git a/screenshots/themes/green.png b/screenshots/themes/green.png
new file mode 100644
index 0000000..7770338
Binary files /dev/null and b/screenshots/themes/green.png differ
diff --git a/screenshots/themes/indigo.png b/screenshots/themes/indigo.png
new file mode 100644
index 0000000..5977683
Binary files /dev/null and b/screenshots/themes/indigo.png differ
diff --git a/screenshots/themes/lime.png b/screenshots/themes/lime.png
new file mode 100644
index 0000000..36880e9
Binary files /dev/null and b/screenshots/themes/lime.png differ
diff --git a/screenshots/themes/olive.png b/screenshots/themes/olive.png
new file mode 100644
index 0000000..7987523
Binary files /dev/null and b/screenshots/themes/olive.png differ
diff --git a/screenshots/themes/orange.png b/screenshots/themes/orange.png
new file mode 100644
index 0000000..2768a41
Binary files /dev/null and b/screenshots/themes/orange.png differ
diff --git a/screenshots/themes/red.png b/screenshots/themes/red.png
new file mode 100644
index 0000000..ad92376
Binary files /dev/null and b/screenshots/themes/red.png differ
diff --git a/screenshots/themes/teal.png b/screenshots/themes/teal.png
new file mode 100644
index 0000000..3175ea6
Binary files /dev/null and b/screenshots/themes/teal.png differ
diff --git a/screenshots/themes/violet.png b/screenshots/themes/violet.png
new file mode 100644
index 0000000..e4f4ce2
Binary files /dev/null and b/screenshots/themes/violet.png differ
diff --git a/styles/colors.ts b/styles/colors.ts
index 72dc37e..3a0054c 100644
--- a/styles/colors.ts
+++ b/styles/colors.ts
@@ -7,85 +7,43 @@ import { MD3DarkTheme, MD3LightTheme } from "react-native-paper";
 const Colors = {
   light: {
     default: { primary: MD3LightTheme.colors.primary },
-    yellow: {
-      primary: "rgb(135, 82, 0)",
+    orange: {
+      primary: "rgb(176, 46, 0)",
       onPrimary: "rgb(255, 255, 255)",
-      primaryContainer: "rgb(255, 221, 186)",
-      onPrimaryContainer: "rgb(43, 23, 0)",
-      secondary: "rgb(113, 90, 65)",
+      primaryContainer: "rgb(255, 219, 209)",
+      onPrimaryContainer: "rgb(59, 9, 0)",
+      secondary: "rgb(119, 87, 78)",
       onSecondary: "rgb(255, 255, 255)",
-      secondaryContainer: "rgb(253, 221, 189)",
-      onSecondaryContainer: "rgb(40, 24, 5)",
-      tertiary: "rgb(85, 99, 60)",
+      secondaryContainer: "rgb(255, 219, 209)",
+      onSecondaryContainer: "rgb(44, 21, 15)",
+      tertiary: "rgb(108, 93, 47)",
       onTertiary: "rgb(255, 255, 255)",
-      tertiaryContainer: "rgb(216, 233, 183)",
-      onTertiaryContainer: "rgb(20, 31, 2)",
+      tertiaryContainer: "rgb(246, 225, 166)",
+      onTertiaryContainer: "rgb(35, 27, 0)",
       background: "rgb(255, 251, 255)",
-      onBackground: "rgb(31, 27, 22)",
+      onBackground: "rgb(32, 26, 24)",
       surface: "rgb(255, 251, 255)",
-      onSurface: "rgb(31, 27, 22)",
-      surfaceVariant: "rgb(241, 224, 208)",
-      onSurfaceVariant: "rgb(80, 69, 58)",
-      outline: "rgb(130, 117, 104)",
-      outlineVariant: "rgb(212, 196, 181)",
-      shadow: "rgb(0, 0, 0)",
-      scrim: "rgb(0, 0, 0)",
-      inverseSurface: "rgb(53, 47, 42)",
-      inverseOnSurface: "rgb(249, 239, 231)",
-      inversePrimary: "rgb(255, 184, 101)",
-      elevation: {
-        level0: "transparent",
-        level1: "rgb(249, 243, 242)",
-        level2: "rgb(245, 238, 235)",
-        level3: "rgb(242, 232, 227)",
-        level4: "rgb(241, 231, 224)",
-        level5: "rgb(238, 227, 219)",
-      },
-      surfaceDisabled: "rgba(31, 27, 22, 0.12)",
-      onSurfaceDisabled: "rgba(31, 27, 22, 0.38)",
-      backdrop: "rgba(57, 47, 36, 0.4)",
-    },
-    orange: {
-      primary: "rgb(255, 183, 134)",
-      onPrimary: "rgb(80, 36, 0)",
-      primaryContainer: "rgb(114, 54, 0)",
-      onPrimaryContainer: "rgb(255, 220, 198)",
-      secondary: "rgb(229, 191, 168)",
-      onSecondary: "rgb(66, 43, 27)",
-      secondaryContainer: "rgb(91, 65, 48)",
-      onSecondaryContainer: "rgb(255, 220, 198)",
-      tertiary: "rgb(201, 202, 147)",
-      onTertiary: "rgb(49, 50, 10)",
-      tertiaryContainer: "rgb(72, 73, 31)",
-      onTertiaryContainer: "rgb(229, 230, 173)",
-      error: "rgb(255, 180, 171)",
-      onError: "rgb(105, 0, 5)",
-      errorContainer: "rgb(147, 0, 10)",
-      onErrorContainer: "rgb(255, 180, 171)",
-      background: "rgb(32, 26, 23)",
-      onBackground: "rgb(236, 224, 218)",
-      surface: "rgb(32, 26, 23)",
-      onSurface: "rgb(236, 224, 218)",
-      surfaceVariant: "rgb(82, 68, 60)",
-      onSurfaceVariant: "rgb(215, 195, 183)",
-      outline: "rgb(159, 141, 131)",
-      outlineVariant: "rgb(82, 68, 60)",
+      onSurface: "rgb(32, 26, 24)",
+      surfaceVariant: "rgb(245, 222, 216)",
+      onSurfaceVariant: "rgb(83, 67, 63)",
+      outline: "rgb(133, 115, 110)",
+      outlineVariant: "rgb(216, 194, 188)",
       shadow: "rgb(0, 0, 0)",
       scrim: "rgb(0, 0, 0)",
-      inverseSurface: "rgb(236, 224, 218)",
-      inverseOnSurface: "rgb(54, 47, 43)",
-      inversePrimary: "rgb(150, 73, 0)",
+      inverseSurface: "rgb(54, 47, 45)",
+      inverseOnSurface: "rgb(251, 238, 235)",
+      inversePrimary: "rgb(255, 181, 160)",
       elevation: {
         level0: "transparent",
-        level1: "rgb(43, 34, 29)",
-        level2: "rgb(50, 39, 32)",
-        level3: "rgb(57, 43, 35)",
-        level4: "rgb(59, 45, 36)",
-        level5: "rgb(63, 48, 39)",
+        level1: "rgb(251, 241, 242)",
+        level2: "rgb(249, 235, 235)",
+        level3: "rgb(246, 229, 227)",
+        level4: "rgb(246, 226, 224)",
+        level5: "rgb(244, 222, 219)",
       },
-      surfaceDisabled: "rgba(236, 224, 218, 0.12)",
-      onSurfaceDisabled: "rgba(236, 224, 218, 0.38)",
-      backdrop: "rgba(58, 46, 38, 0.4)",
+      surfaceDisabled: "rgba(32, 26, 24, 0.12)",
+      onSurfaceDisabled: "rgba(32, 26, 24, 0.38)",
+      backdrop: "rgba(59, 45, 41, 0.4)",
     },
     red: {
       primary: "rgb(185, 12, 85)",
@@ -470,85 +428,47 @@ const Colors = {
   },
   dark: {
     default: { primary: MD3DarkTheme.colors.primary },
-    yellow: {
-      primary: "rgb(255, 184, 101)",
-      onPrimary: "rgb(72, 42, 0)",
-      primaryContainer: "rgb(102, 61, 0)",
-      onPrimaryContainer: "rgb(255, 221, 186)",
-      secondary: "rgb(224, 193, 163)",
-      onSecondary: "rgb(63, 45, 23)",
-      secondaryContainer: "rgb(88, 67, 43)",
-      onSecondaryContainer: "rgb(253, 221, 189)",
-      tertiary: "rgb(189, 205, 157)",
-      onTertiary: "rgb(40, 52, 18)",
-      tertiaryContainer: "rgb(62, 75, 39)",
-      onTertiaryContainer: "rgb(216, 233, 183)",
+    orange: {
+      primary: "rgb(255, 183, 134)",
+      onPrimary: "rgb(80, 36, 0)",
+      primaryContainer: "rgb(114, 54, 0)",
+      onPrimaryContainer: "rgb(255, 220, 198)",
+      secondary: "rgb(229, 191, 168)",
+      onSecondary: "rgb(66, 43, 27)",
+      secondaryContainer: "rgb(91, 65, 48)",
+      onSecondaryContainer: "rgb(255, 220, 198)",
+      tertiary: "rgb(201, 202, 147)",
+      onTertiary: "rgb(49, 50, 10)",
+      tertiaryContainer: "rgb(72, 73, 31)",
+      onTertiaryContainer: "rgb(229, 230, 173)",
       error: "rgb(255, 180, 171)",
       onError: "rgb(105, 0, 5)",
       errorContainer: "rgb(147, 0, 10)",
       onErrorContainer: "rgb(255, 180, 171)",
-      background: "rgb(31, 27, 22)",
-      onBackground: "rgb(235, 225, 217)",
-      surface: "rgb(31, 27, 22)",
-      onSurface: "rgb(235, 225, 217)",
-      surfaceVariant: "rgb(80, 69, 58)",
-      onSurfaceVariant: "rgb(212, 196, 181)",
-      outline: "rgb(157, 142, 129)",
-      outlineVariant: "rgb(80, 69, 58)",
-      shadow: "rgb(0, 0, 0)",
-      scrim: "rgb(0, 0, 0)",
-      inverseSurface: "rgb(235, 225, 217)",
-      inverseOnSurface: "rgb(53, 47, 42)",
-      inversePrimary: "rgb(135, 82, 0)",
-      elevation: {
-        level0: "transparent",
-        level1: "rgb(42, 35, 26)",
-        level2: "rgb(49, 40, 28)",
-        level3: "rgb(56, 44, 31)",
-        level4: "rgb(58, 46, 32)",
-        level5: "rgb(62, 49, 33)",
-      },
-      surfaceDisabled: "rgba(235, 225, 217, 0.12)",
-      onSurfaceDisabled: "rgba(235, 225, 217, 0.38)",
-      backdrop: "rgba(57, 47, 36, 0.4)",
-    },
-    orange: {
-      primary: "rgb(176, 46, 0)",
-      onPrimary: "rgb(255, 255, 255)",
-      primaryContainer: "rgb(255, 219, 209)",
-      onPrimaryContainer: "rgb(59, 9, 0)",
-      secondary: "rgb(119, 87, 78)",
-      onSecondary: "rgb(255, 255, 255)",
-      secondaryContainer: "rgb(255, 219, 209)",
-      onSecondaryContainer: "rgb(44, 21, 15)",
-      tertiary: "rgb(108, 93, 47)",
-      onTertiary: "rgb(255, 255, 255)",
-      tertiaryContainer: "rgb(246, 225, 166)",
-      onTertiaryContainer: "rgb(35, 27, 0)",
-      background: "rgb(255, 251, 255)",
-      onBackground: "rgb(32, 26, 24)",
-      surface: "rgb(255, 251, 255)",
-      onSurface: "rgb(32, 26, 24)",
-      surfaceVariant: "rgb(245, 222, 216)",
-      onSurfaceVariant: "rgb(83, 67, 63)",
-      outline: "rgb(133, 115, 110)",
-      outlineVariant: "rgb(216, 194, 188)",
+      background: "rgb(32, 26, 23)",
+      onBackground: "rgb(236, 224, 218)",
+      surface: "rgb(32, 26, 23)",
+      onSurface: "rgb(236, 224, 218)",
+      surfaceVariant: "rgb(82, 68, 60)",
+      onSurfaceVariant: "rgb(215, 195, 183)",
+      outline: "rgb(159, 141, 131)",
+      outlineVariant: "rgb(82, 68, 60)",
       shadow: "rgb(0, 0, 0)",
       scrim: "rgb(0, 0, 0)",
-      inverseSurface: "rgb(54, 47, 45)",
-      inverseOnSurface: "rgb(251, 238, 235)",
-      inversePrimary: "rgb(255, 181, 160)",
+      inverseSurface: "rgb(236, 224, 218)",
+      inverseOnSurface: "rgb(54, 47, 43)",
+      inversePrimary: "rgb(150, 73, 0)",
       elevation: {
         level0: "transparent",
-        level1: "rgb(251, 241, 242)",
-        level2: "rgb(249, 235, 235)",
-        level3: "rgb(246, 229, 227)",
-        level4: "rgb(246, 226, 224)",
-        level5: "rgb(244, 222, 219)",
+        level1: "rgb(43, 34, 29)",
+        level2: "rgb(50, 39, 32)",
+        level3: "rgb(57, 43, 35)",
+        level4: "rgb(59, 45, 36)",
+        level5: "rgb(63, 48, 39)",
       },
-      surfaceDisabled: "rgba(32, 26, 24, 0.12)",
-      onSurfaceDisabled: "rgba(32, 26, 24, 0.38)",
-      backdrop: "rgba(59, 45, 41, 0.4)",
+      surfaceDisabled: "rgba(236, 224, 218, 0.12)",
+      onSurfaceDisabled: "rgba(236, 224, 218, 0.38)",
+      backdrop: "rgba(58, 46, 38, 0.4)",
     },
     red: {
       primary: "rgb(255, 177, 194)",
diff --git a/styles/themes.ts b/styles/themes.ts
index 05bb42b..4a371d5 100644
--- a/styles/themes.ts
+++ b/styles/themes.ts
@@ -43,13 +43,6 @@ const Themes = {
         ...Colors.light.default,
       },
     },
-    yellow: {
-      ...BaseLightTheme,
-      colors: {
-        ...BaseLightTheme.colors,
-        ...Colors.light.yellow,
-      },
-    },
     orange: {
       ...BaseLightTheme,
       colors: {
@@ -136,13 +129,6 @@ const Themes = {
         ...Colors.dark.default,
       },
     },
-    yellow: {
-      ...BaseDarkTheme,
-      colors: {
-        ...BaseDarkTheme.colors,
-        ...Colors.dark.yellow,
-      },
-    },
     red: {
       ...BaseDarkTheme,
       colors: {