diff --git a/App.tsx b/App.tsx
index b388185..7395d4a 100644
--- a/App.tsx
+++ b/App.tsx
@@ -26,19 +26,19 @@ export type DrawerParamList = {
 };
 
 export const CombinedDefaultTheme = {
-  ...PaperDefaultTheme,
   ...NavigationDefaultTheme,
+  ...PaperDefaultTheme,
   colors: {
-    ...PaperDefaultTheme.colors,
     ...NavigationDefaultTheme.colors,
+    ...PaperDefaultTheme.colors,
   },
 };
 export const CombinedDarkTheme = {
-  ...PaperDarkTheme,
   ...NavigationDarkTheme,
+  ...PaperDarkTheme,
   colors: {
-    ...PaperDarkTheme.colors,
     ...NavigationDarkTheme.colors,
+    ...PaperDarkTheme.colors,
     primary: '#B3E5fC',
     background: '#0e0e0e',
   },
diff --git a/MassiveFab.tsx b/MassiveFab.tsx
index 16f2f29..5c52524 100644
--- a/MassiveFab.tsx
+++ b/MassiveFab.tsx
@@ -11,6 +11,7 @@ export default function MassiveFab(
     <FAB
       {...props}
       icon="add"
+      color={color === '#B3E5fC' ? 'black' : undefined}
       style={{
         position: 'absolute',
         right: 10,