diff --git a/src/components/features/charactersAndCampaigns/MoveDrawer.tsx b/src/components/features/charactersAndCampaigns/MoveDrawer.tsx
index 9ec926f5..e20ef010 100644
--- a/src/components/features/charactersAndCampaigns/MoveDrawer.tsx
+++ b/src/components/features/charactersAndCampaigns/MoveDrawer.tsx
@@ -13,7 +13,6 @@ function MoveDrawerUnMemoized(props: MoveDrawerProps) {
   const { open, onClose } = props;
 
   const useNewMoves = useNewCustomContentPage();
-
   const openCallback = useCallback(() => {}, []);
   return (
     <SwipeableDrawer
diff --git a/src/components/features/charactersAndCampaigns/OracleDrawer.tsx b/src/components/features/charactersAndCampaigns/OracleDrawer.tsx
index d6b02656..e6bb2dda 100644
--- a/src/components/features/charactersAndCampaigns/OracleDrawer.tsx
+++ b/src/components/features/charactersAndCampaigns/OracleDrawer.tsx
@@ -1,6 +1,8 @@
 import { SwipeableDrawer } from "@mui/material";
-import { OracleSection } from "./OracleSection";
+import { OracleSection as OracleSectionOld } from "./OracleSection";
+import { OracleSection } from "./NewOracleSection";
 import React, { useCallback } from "react";
+import { useNewCustomContentPage } from "hooks/featureFlags/useNewCustomContentPage";
 
 export interface OracleDrawerProps {
   open?: boolean;
@@ -10,6 +12,7 @@ export interface OracleDrawerProps {
 function OracleDrawerUnMemoized(props: OracleDrawerProps) {
   const { open, onClose } = props;
 
+  const showNewOracles = useNewCustomContentPage();
   const openCallback = useCallback(() => {}, []);
   return (
     <SwipeableDrawer
@@ -20,7 +23,7 @@ function OracleDrawerUnMemoized(props: OracleDrawerProps) {
       disableDiscovery
       onClose={onClose}
     >
-      <OracleSection />
+      {showNewOracles ? <OracleSection /> : <OracleSectionOld />}
     </SwipeableDrawer>
   );
 }
diff --git a/src/stores/homebrew/homebrew.slice.ts b/src/stores/homebrew/homebrew.slice.ts
index 92c7ef15..b0526c95 100644
--- a/src/stores/homebrew/homebrew.slice.ts
+++ b/src/stores/homebrew/homebrew.slice.ts
@@ -107,6 +107,19 @@ export const createHomebrewSlice: CreateSliceType<HomebrewSlice> = (
   subscribeToHomebrewContent: (homebrewIds) => {
     getState().rules.setExpansionIds(homebrewIds);
 
+    const defaultHomebrewIds = homebrewIds.filter(
+      (homebrewId) => defaultExpansions[homebrewId]
+    );
+
+    if (defaultHomebrewIds.length > 0) {
+      getState().rules.rebuildOracles();
+      getState().rules.rebuildMoves();
+      getState().rules.rebuildStats();
+      getState().rules.rebuildConditionMeters();
+      getState().rules.rebuildSpecialTracks();
+      getState().rules.rebuildImpacts();
+    }
+
     const filteredHomebrewIds = homebrewIds.filter(
       (homebrewId) => !defaultExpansions[homebrewId]
     );