correct color component

src/AppTheme.tsx

@@ -0,0 +1,48 @@
+import * as React from "react";
+import { ThemeProvider, createTheme } from "@mui/material/styles";
+import { getDesignTokens } from "./shared-theme/themePrimitives";
+import { inputsCustomizations } from "./shared-theme/customizations/inputs";
+import { dataDisplayCustomizations } from "./shared-theme/customizations/dataDisplay";
+import { feedbackCustomizations } from "./shared-theme/customizations/feedback";
+import { navigationCustomizations } from "./shared-theme/customizations/navigation";
+import { surfacesCustomizations } from "./shared-theme/customizations/surfaces";
+
+export const ColorModeContext = React.createContext({
+  toggleColorMode: () => {},
+  mode: "light" as "light" | "dark",
+});
+
+export default function AppTheme({ children }: { children: React.ReactNode }) {
+  const [mode, setMode] = React.useState<"light" | "dark">("light");
+
+  const colorMode = React.useMemo(
+    () => ({
+      toggleColorMode: () => {
+        setMode((prevMode) => (prevMode === "light" ? "dark" : "light"));
+      },
+      mode,
+    }),
+    [mode]
+  );
+
+  const theme = React.useMemo(
+    () =>
+      createTheme({
+        ...getDesignTokens(mode),
+        components: {
+          ...inputsCustomizations,
+          ...dataDisplayCustomizations,
+          ...feedbackCustomizations,
+          ...navigationCustomizations,
+          ...surfacesCustomizations,
+        },
+      }),
+    [mode]
+  );
+
+  return (
+    <ColorModeContext.Provider value={colorMode}>
+      <ThemeProvider theme={theme}>{children}</ThemeProvider>
+    </ColorModeContext.Provider>
+  );
+}

src/Dashboard.tsx

@@ -10,14 +10,8 @@ import {
   Button
 } from "@mui/material";
 
-import DashboardView from "./components/Dashboard";
+import ConfigurableDashboard from "./components/Dashboard";
-
+import { DashboardState } from "./components/Dashboard";
-import {
-  DashboardState,
-  DashboardStateSetters,
-  DashboardFlow,
-} from "./components/Dashboard";
-
 import { configuration } from "./dashboard-config";
 import {
   useReport,
@@ -25,13 +19,7 @@ import {
 } from "./features/report";
 
 export default function Dashboard() {
-  const [state, setState] = React.useState<DashboardState>({
+  const [flow, setFlow] = React.useState<"outflows" | "inflows">("outflows");
-    flow: "outflows",
-    periodType: "rolling",
-    selectedPeriodId: null,
-    selectedGroupKey: null,
-    comparison: false,
-  });
 
   const [appliedPayees, setAppliedPayees] = React.useState<string[]>([]);
   const [appliedTags, setAppliedTags] = React.useState<string[]>([]);
@@ -44,7 +32,7 @@ export default function Dashboard() {
 
   const report = useReport({
     periods: ["daily", "weekly", "monthly", "all"],
-    flow: state.flow,
+    flow: flow,
     payee: appliedPayees.length > 0 ? appliedPayees : undefined,
     tags: appliedTags.length > 0 ? appliedTags : undefined,
   });
@@ -81,124 +69,14 @@ export default function Dashboard() {
     }
   }, [report.data?.data]);
 
-  const toggleFlow =
-    React.useCallback(() => {
-      setState((prev) => ({
-        ...prev,
-
-        flow:
-          prev.flow ===
-          "outflows"
-            ? "inflows"
-            : "outflows",
-
-        selectedGroupKey:
-          null,
-
-        selectedPeriodId:
-          null,
-      }));
-    }, []);
-
-  const setFlow =
-    React.useCallback(
-      (
-        flow: DashboardFlow
-      ) => {
-        setState((prev) => ({
-          ...prev,
-
-          flow,
-
-          selectedGroupKey:
-            null,
-
-          selectedPeriodId:
-            null,
-        }));
-      },
-      []
-    );
-
-  const togglePeriodType =
-    React.useCallback(() => {
-      setState((prev) => ({
-        ...prev,
-
-        periodType:
-          prev.periodType ===
-          "rolling"
-            ? "calendar"
-            : "rolling",
-      }));
-    }, []);
-
-  const toggleComparison =
-    React.useCallback(() => {
-      setState((prev) => ({
-        ...prev,
-
-        comparison:
-          !prev.comparison,
-      }));
-    }, []);
-
-  const setSelectedPeriodId =
-    React.useCallback(
-      (
-        selectedPeriodId: DashboardState["selectedPeriodId"]
-      ) => {
-        setState((prev) => ({
-          ...prev,
-
-          selectedPeriodId,
-        }));
-      },
-      []
-    );
-
-  const setSelectedGroupKey =
-    React.useCallback(
-      (
-        selectedGroupKey: DashboardState["selectedGroupKey"]
-      ) => {
-        setState((prev) => ({
-          ...prev,
-
-          selectedGroupKey,
-        }));
-      },
-      []
-    );
-
-  const stateSetters: DashboardStateSetters =
-    React.useMemo(
-      () => ({
-        toggleFlow,
-
-        setFlow,
-
-        togglePeriodType,
-
-        toggleComparison,
-
-        setSelectedPeriodId,
-
-        setSelectedGroupKey,
-      }),
-      [
-        toggleFlow,
-        setFlow,
-        togglePeriodType,
-        toggleComparison,
-        setSelectedPeriodId,
-        setSelectedGroupKey,
-      ]
-    );
-
   const isLoading = report.isLoading;
   const error = report.error;
 
+  /** Callback for the ConfigurableDashboard's flow toggle */
+  const handleFlowChange = React.useCallback((newState: DashboardState) => {
+    setFlow(newState.flow);
+  }, []);
+
   if (isLoading && !report.data) {
     return (
       <Box sx={{ display: "flex", justifyContent: "center", alignItems: "center", height: "60vh" }}>
@@ -265,8 +143,8 @@ export default function Dashboard() {
               sx={{ '& .MuiOutlinedInput-root': { height: 'auto', minHeight: '2.5rem', py: 0.5 } }}
             />
           </Box>
-          <Button
+          <Button 
-            variant="contained"
+            variant="contained" 
             size="large"
             onClick={() => {
               setAppliedPayees(payeeInput);
@@ -279,12 +157,11 @@ export default function Dashboard() {
           </Button>
         </Paper>
       </Container>
-      <DashboardView
+      <ConfigurableDashboard
         config={configuration}
         data={data}
-        state={state}
-        stateSetters={stateSetters}
         isFetching={report.isFetching}
+        onFlowChange={handleFlowChange}
       />
     </Box>
   );

src/Header.tsx

@@ -20,7 +20,7 @@ import DarkModeIcon from "@mui/icons-material/DarkMode";
 import LightModeIcon from "@mui/icons-material/LightMode";
 import { useNavigate } from "react-router-dom";
 import { useAuth } from "../react-auth";
-import { ColorModeContext } from "./shared-theme/AppTheme";
+import { ColorModeContext } from "./AppTheme";
 
 interface HeaderProps {
   routerMapping: {

src/Home.tsx

@@ -1,12 +1,10 @@
 import * as React from "react";
 import { Box, Typography, Button, Container, Stack } from "@mui/material";
-import { useTheme, alpha } from "@mui/material/styles";
 import { useNavigate } from "react-router-dom";
 import ArrowForwardIcon from "@mui/icons-material/ArrowForward";
 
 export default function Home() {
   const navigate = useNavigate();
-  const theme = useTheme();
 
   return (
     <Box
@@ -48,13 +46,14 @@ export default function Home() {
           sx={{
             p: { xs: 4, md: 8 },
             backdropFilter: "blur(20px)",
-            backgroundColor: (t) => alpha(t.palette.common.white, t.palette.mode === "dark" ? 0.04 : 0.6),
+            backgroundColor: (theme) => 
+               theme.palette.mode === "dark" ? "rgba(255, 255, 255, 0.03)" : "rgba(255, 255, 255, 0.6)",
             border: "1px solid",
             borderColor: "divider",
             borderRadius: 4,
-            boxShadow: (t) =>
+            boxShadow: (theme) =>
-              t.palette.mode === "dark"
+              theme.palette.mode === "dark"
-                ? "0 8px 32px 0 rgba(0, 0, 0, 0.5)"
+                ? "0 8px 32px 0 rgba(0, 0, 0, 0.37)"
                 : "0 8px 32px 0 rgba(31, 38, 135, 0.07)",
           }}
         >
@@ -95,7 +94,7 @@ export default function Home() {
                 transition: "transform 0.2s ease-in-out, box-shadow 0.2s",
                 "&:hover": {
                   transform: "translateY(-3px)",
-                  boxShadow: (t) => `0 8px 20px ${alpha(t.palette.primary.main, 0.4)}`,
+                  boxShadow: "0 8px 20px rgba(236,72,153,0.4)",
                 },
               }}
             >

src/components/Dashboard/Dashboard.models.ts

@@ -16,46 +16,40 @@ export interface DashboardState {
   comparison: boolean;
 }
 
-export interface DashboardStateSetters {
-  setSelectedPeriodId: (id: DashboardSelectedPeriodId) => void;
-  setSelectedGroupKey: (groupKey: GroupKey | null) => void;
-  toggleFlow: () => void;
-  togglePeriodType: () => void;
-  toggleComparison: () => void;
-}
-
 export interface DashboardSection {
   id: string;
-  title: string;
+  title?: string;
-  component: React.ComponentType<any>;
   summary?: string;
+  component: React.ComponentType<any>;
   settings?: Record<string, any>;
+  isList?: boolean;
+  style?: {
+    size?: number;
+    [key: string]: any;
+  };
+}
+
+export interface ColorDefinition {
+  primary: string;
+  background?: string;
+  text?: string;
+}
+
+export interface ThemeAwarePalette {
+  light: ColorDefinition;
+  dark: ColorDefinition;
 }
 
 export interface DashboardConfig {
   sections: DashboardSection[];
+  style?: {
+    palette?: Record<DashboardFlow, ThemeAwarePalette>;
+  };
 }
 
-export interface DashboardViewProps {
+export interface DashboardProps {
   config: DashboardConfig;
   data: ReportData;
-  state: DashboardState;
+  isFetching?: boolean;
-  stateSetters: DashboardStateSetters;
+  onFlowChange?: (state: DashboardState) => void;
-  isFetching: boolean;
-}
-
-export interface ColorScheme {
-  primary: string;
-  surface: string;
-  text: string;
-}
-
-export interface ComponentProps extends DashboardSection {
-  reportData: ReportData;
-
-  state: DashboardState;
-  stateSetters: DashboardStateSetters;
-  isFetching: boolean;
-
-  colorScheme: ColorScheme;
 }

src/components/Dashboard/Dashboard.tsx

@@ -0,0 +1,64 @@
+import * as React from "react";
+import DashboardView from "./Dashboard.view";
+import { DashboardProps, DashboardState } from "./Dashboard.models";
+
+export default function Dashboard(props: DashboardProps) {
+  const [state, setState] = React.useState<DashboardState>({
+    flow: "outflows",
+    periodType: "rolling",
+    selectedPeriodId: null,
+    selectedGroupKey: null,
+    comparison: false,
+  });
+
+  const toggleFlow = (
+    event: React.MouseEvent<HTMLElement>,
+    newFlow: "outflows" | "inflows" | null
+  ) => {
+    if (newFlow === null) return;
+
+    setState(prev => {
+      if (prev.flow === newFlow) return prev;
+
+      const next = { ...prev, flow: newFlow };
+      props.onFlowChange?.(next);
+
+      return next;
+    });
+  };
+
+  const togglePeriodType = () => {
+    setState(prev => ({
+      ...prev,
+      periodType: prev.periodType === "rolling" ? "calendar" : "rolling",
+    }));
+  };
+
+  const toggleComparison = () => {
+    setState(prev => ({
+      ...prev,
+      comparison: !prev.comparison,
+    }));
+  };
+
+  const setSelectedPeriodId = (selectedPeriodId: typeof state.selectedPeriodId) => {
+    setState(prev => ({ ...prev, selectedPeriodId }));
+  };
+
+  const setSelectedGroupKey = (groupKey: typeof state.selectedGroupKey) => {
+    setState(prev => ({ ...prev, selectedGroupKey: groupKey }));
+  };
+
+  return (
+    <DashboardView
+      {...props}
+      state={state}
+      setState={setState}
+      toggleFlow={toggleFlow}
+      togglePeriodType={togglePeriodType}
+      toggleComparison={toggleComparison}
+      setSelectedPeriodId={setSelectedPeriodId}
+      setSelectedGroupKey={setSelectedGroupKey}
+    />
+  );
+}

src/components/Dashboard/Dashboard.view.tsx

@@ -3,64 +3,90 @@ import {
   Box,
   Container,
   Grid,
+  Typography,
   ToggleButton,
   ToggleButtonGroup,
   Button
 } from "@mui/material";
 import { useTheme, alpha } from "@mui/material/styles";
-import { DashboardViewProps } from "./Dashboard.models";
+import { GroupKey } from "../../features/report";
+import { DashboardProps, DashboardState } from "./Dashboard.models";
+
+interface ViewProps extends DashboardProps {
+  state: DashboardState;
+  setState: React.Dispatch<React.SetStateAction<DashboardState>>;
+  toggleFlow: (event: React.MouseEvent<HTMLElement>, newFlow: "outflows" | "inflows" | null) => void;
+  togglePeriodType: () => void;
+  setSelectedPeriodId: (id: string | null) => void;
+  setSelectedGroupKey: (groupKey: GroupKey | null) => void;
+  toggleComparison: () => void;
+}
 
 export default function DashboardView({
   config,
   data,
   state,
-  stateSetters,
+  setState,
-  isFetching,
+  toggleFlow,
-}: DashboardViewProps) {
+  togglePeriodType,
+  toggleComparison,
+  setSelectedPeriodId,
+  setSelectedGroupKey,
+}: ViewProps) {
   const theme = useTheme();
+  const themeMode = theme.palette.mode;
+  const { flow, periodType, comparison, selectedPeriodId, selectedGroupKey } = state;
 
-  const {
+  // Resolve colors with fallbacks
-    flow,
+  const colors = React.useMemo(() => {
-    selectedGroupKey,
+    const palette = config.style?.palette?.[flow];
-  } = state;
+    const modeColors = palette ? palette[themeMode] : null;
 
-  const colorScheme = flow === "outflows" ? theme.palette.flows.outflows : theme.palette.flows.inflows;
+    if (modeColors) {
+      return {
+        primary: modeColors.primary,
+        light: modeColors.background || alpha(modeColors.primary, 0.1),
+        text: modeColors.text || (themeMode === 'light' ? theme.palette.text.primary : '#fff')
+      };
+    }
+
+    // Fallback to standard theme colors
+    const themeColor = flow === 'outflows' ? theme.palette.error : theme.palette.success;
+    return {
+      primary: themeColor.main,
+      light: alpha(themeColor.main, themeMode === 'light' ? 0.08 : 0.15),
+      text: themeColor.main
+    };
+  }, [config.style?.palette, flow, themeMode, theme.palette]);
 
   return (
     <Container
       sx={{
         mt: 4,
         mb: 4,
-        background: `linear-gradient(180deg, ${alpha(colorScheme.primary, theme.palette.mode === "dark" ? 0.06 : 0.04)} 0%, transparent 100%)`,
+        background: `linear-gradient(180deg, ${colors.light} 0%, transparent 100%)`,
         borderRadius: 4,
         p: 2,
-        transition: "background 0.3s ease",
+        transition: 'background 0.3s ease'
       }}
     >
-      <Box
+      <Box sx={{ display: "flex", flexDirection: "column", alignItems: "center", mb: 3 }}>
-        sx={{
-          display: "flex",
-          flexDirection: "column",
-          alignItems: "center",
-          mb: 3,
-        }}
-      >
         <ToggleButtonGroup
           value={flow}
           exclusive
-          onChange={stateSetters.toggleFlow}
+          onChange={toggleFlow}
           sx={{
             borderRadius: 3,
             overflow: "hidden",
             "& .MuiToggleButton-root": {
               px: 3,
               textTransform: "none",
-              color: "text.secondary",
+              color: "text.secondary"
             },
             "&.Mui-selected": {
-              bgcolor: colorScheme.primary,
+              bgcolor: colors.primary,
               color: "white",
-              borderColor: colorScheme.primary,
+              borderColor: colors.primary
             },
           }}
         >
@@ -69,10 +95,10 @@ export default function DashboardView({
         </ToggleButtonGroup>
 
         {selectedGroupKey && Object.keys(selectedGroupKey).length > 0 && (
-          <Button
+          <Button 
-            size="small"
+            size="small" 
             sx={{ mt: 1, textTransform: "none" }}
-            onClick={() => stateSetters.setSelectedGroupKey(null)}
+            onClick={() => setSelectedGroupKey(null)}
           >
             Clear Drill-down
           </Button>
@@ -82,19 +108,31 @@ export default function DashboardView({
       <Grid container spacing={4}>
         {config.sections.map((section) => {
           const Component = section.component;
-
+          
           return (
-            <Grid key={section.id} size={12}>
+            <Grid key={section.id} size={section.style?.size || 12 as any}>
               <Component
-                {...section}
+                {...section.settings}
-
+                header={section.title}
+                summary={section.summary}
                 reportData={data}
+                title={section.title}
+                accentColor={colors.primary}
+                colorScheme={colors}
 
-                state={state}
+                // State management
-                stateSetters={stateSetters}
+                flow={flow}
-                isFetching={isFetching}
 
-                colorScheme={colorScheme}
+                periodType={periodType}
+                comparison={comparison}
+                selectedPeriodId={selectedPeriodId}
+                selectedGroupKey={selectedGroupKey}
+
+                togglePeriodType={togglePeriodType}
+                toggleComparison={toggleComparison}
+                setSelectedPeriodId={setSelectedPeriodId}
+                setSelectedGroupKey={setSelectedGroupKey}
+                isFetching={arguments[0].isFetching}
               />
             </Grid>
           );

src/components/Dashboard/index.ts

@@ -1,2 +1,2 @@
-export { default } from "./Dashboard.view";
+export { default } from "./Dashboard";
 export * from "./Dashboard.models";

src/components/HistoryChart/HistoryChart.models.ts

@@ -1,3 +1,10 @@
+import {
+  DashboardFlow,
+  DashboardPeriodType,
+  DashboardSelectedPeriodId
+} from "../Dashboard";
+import { ReportData } from "../../features/report";
+
 export interface _ChartDataPoint {
   id: string;
   label: string;
@@ -8,3 +15,28 @@ export interface _ChartDataPoint {
 export interface ChartDataPoint extends _ChartDataPoint {
   compare?: _ChartDataPoint;
 }
+
+export interface HistoryChartProps {
+  header: string;
+  summary?: string;
+  tabs: string[];
+
+  reportData: ReportData;
+
+  colorScheme: {
+    primary: string;
+    light: string;
+    text: string;
+  };
+
+  flow: DashboardFlow;
+  periodType: DashboardPeriodType;
+  selectedPeriodId: DashboardSelectedPeriodId;
+  comparison: boolean;
+
+  togglePeriodType: () => void;
+  setSelectedPeriodId: (id: string | null) => void;
+  toggleComparison: () => void;
+
+  isFetching?: boolean;
+}

src/components/HistoryChart/HistoryChart.props.ts

@@ -1,21 +0,0 @@
-import * as React from "react";
-import { ComponentProps } from "../Dashboard";
-import { ChartDataPoint } from "./HistoryChart.models";
-
-export interface HistoryChartProps extends ComponentProps {
-  settings: {
-    tabs: string[];
-  };
-}
-
-export interface HistoryChartViewProps extends HistoryChartProps {
-  activeTab: string;
-  setActiveTab: (v: string) => void;
-  currentData: ChartDataPoint[];
-  visibleData: ChartDataPoint[];
-  maxAmount: number;
-  visibleCount: number;
-  startIndex: number;
-  setStartIndex: React.Dispatch<React.SetStateAction<number>>;
-  activeDataKey: string;
-}

src/components/HistoryChart/HistoryChart.tsx

@@ -1,23 +1,18 @@
 import * as React from "react";
+import { HistoryChartProps } from "./HistoryChart.models";
 import HistoryChartView from "./HistoryChart.view";
 import { buildChartData, tabToKey } from "./HistoryChart.adapter";
-import { HistoryChartProps } from "./HistoryChart.props";
-
 
 export default function HistoryChart(props: HistoryChartProps) {
   const {
-    settings,
+    tabs,
     reportData,
-    state,
+    flow,
-    stateSetters,
+    comparison,
-
+    selectedPeriodId,
-    isFetching,
+    setSelectedPeriodId
   } = props;
 
-  const { flow, comparison, selectedPeriodId } = state;
-  const { setSelectedPeriodId } = stateSetters;
-  const { tabs } = settings;
-
   const [activeTab, setActiveTab] = React.useState<string>(tabs[0] || "");
   const [startIndex, setStartIndex] = React.useState(0);
 

src/components/HistoryChart/HistoryChart.view.tsx

@@ -11,34 +11,49 @@ import IconButton from "@mui/material/IconButton";
 import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 import {
-  HistoryChartViewProps,
+  ChartDataPoint,
-} from "./HistoryChart.props";
+  HistoryChartProps,
+} from "./HistoryChart.models";
 import { formatDisplay } from "./HistoryChart.utils";
 
-export default function HistoryChartView({
+interface ViewProps extends HistoryChartProps {
-  title,
+  activeTab: string;
-  summary,
+  setActiveTab: (v: string) => void;
-  settings,
+  currentData: ChartDataPoint[];
+  visibleData: ChartDataPoint[];
+  maxAmount: number;
+  visibleCount: number;
+  startIndex: number;
+  setStartIndex: React.Dispatch<React.SetStateAction<number>>;
+  activeDataKey: string;
+}
 
-  state,
+export default function HistoryChartView(props: ViewProps) {
-  stateSetters,
+  const {
-  isFetching,
+    header,
+    summary,
+    tabs,
+    colorScheme,
 
-  colorScheme,
+    flow,
+    periodType,
+    selectedPeriodId,
+    comparison,
 
-  activeTab,
+    togglePeriodType,
-  setActiveTab,
+    setSelectedPeriodId,
-  currentData,
+    toggleComparison,
-  visibleData,
-  maxAmount,
-  visibleCount,
-  startIndex,
-  setStartIndex,
-  activeDataKey,
-}: HistoryChartViewProps) {
 
-  const { flow, periodType, selectedPeriodId, comparison } = state;
+    activeTab,
-  const { togglePeriodType, setSelectedPeriodId, toggleComparison } = stateSetters;
+    setActiveTab,
+    currentData,
+    visibleData,
+    maxAmount,
+    visibleCount,
+    startIndex,
+    setStartIndex,
+    activeDataKey,
+  } = props;
 
   const theme = useTheme();
   const isDark = theme.palette.mode === "dark";
@@ -76,14 +91,14 @@ export default function HistoryChartView({
         boxShadow: "none",
         border: "1px solid",
         borderColor: "divider",
-        bgcolor: isDark ? "background.paper" : colorScheme.surface,
+        bgcolor: isDark ? "background.paper" : colorScheme.light,
-        opacity: isFetching ? 0.6 : 1,
+        opacity: props.isFetching ? 0.6 : 1,
         transition: "opacity 0.3s ease",
-        pointerEvents: isFetching ? "none" : "auto",
+        pointerEvents: props.isFetching ? "none" : "auto",
       }}
     >
       <Typography variant="h6" fontWeight={700} gutterBottom>
-        {title}
+        {header}
       </Typography>
 
       {summary && (
@@ -93,7 +108,7 @@ export default function HistoryChartView({
       )}
 
       <ToggleButtonGroup value={activeTab} exclusive onChange={handleTabChange} fullWidth sx={{ mb: 4 }}>
-        {settings.tabs.map((tab) => (
+        {tabs.map((tab) => (
           <ToggleButton key={tab} value={tab}>
             {tab}
           </ToggleButton>

src/components/LatestItems/LatestItems.adapter.ts

@@ -1,19 +1,67 @@
-import { ReportData, GroupKey } from "../../features/report";
+import { ReportData, Transaction, GroupKey } from "../../features/report";
 import {
+  mergeBucketPeriods,
+  periodIdToKey,
   formatCurrency,
-  extractFilteredTransactions,
+  filterBuckets,
 } from "../report.helpers";
 import { LatestItem } from "./LatestItems.models";
 
+// ─── Transaction extraction ─────────────────────────────────
+
+function extractTransactions(
+  reportData: ReportData,
+  selectedPeriodId: string | null,
+  selectedGroupKey: GroupKey | null,
+): Transaction[] {
+  // 1. Get raw transactions
+  let rawTxns: Transaction[] = [];
+
+  if (selectedPeriodId) {
+    const key = periodIdToKey(selectedPeriodId);
+    const periods = mergeBucketPeriods(reportData.buckets, key);
+    const selected = periods.find((p) => p.id === selectedPeriodId);
+    rawTxns = selected?.metric.transactions || [];
+  } else {
+    const periods = mergeBucketPeriods(reportData.buckets, "all");
+    if (periods.length > 0) {
+      rawTxns = periods[0].metric.transactions || [];
+    }
+  }
+
+  // 2. Filter by group key
+  if (selectedGroupKey) {
+    rawTxns = rawTxns.filter(txn => {
+      let match = true;
+      if (selectedGroupKey.tags && selectedGroupKey.tags.length > 0) {
+        if (!txn.tags) match = false;
+        else {
+          const txnTags = txn.tags.map(t => typeof t === "string" ? t : t.name);
+          if (!selectedGroupKey.tags.every(selectedTag => txnTags.includes(selectedTag))) match = false;
+        }
+      }
+      if (match && selectedGroupKey.payee && selectedGroupKey.payee.length > 0) {
+        if (!txn.payee || !txn.payee.name) match = false;
+        else {
+          if (!selectedGroupKey.payee.includes(txn.payee.name)) match = false;
+        }
+      }
+      return match;
+    });
+  }
+
+  return rawTxns;
+}
+
 // ─── Main adapter ────────────────────────────────────────────
 
 export function buildLatestItems(
   reportData: ReportData,
-  selectedPeriodId: string | null | undefined,
+  selectedPeriodId: string | null,
-  selectedGroupKey: GroupKey | null | undefined,
+  selectedGroupKey: GroupKey | null,
   flow: "outflows" | "inflows"
 ): LatestItem[] {
-  const txns = extractFilteredTransactions(reportData, selectedPeriodId, selectedGroupKey);
+  const txns = extractTransactions(reportData, selectedPeriodId, selectedGroupKey);
 
   return txns
     .sort(

src/components/LatestItems/LatestItems.models.ts

@@ -5,3 +5,12 @@ export interface LatestItem {
   amount: string;
   timeAgo: string;
 }
+
+export interface LatestItemsViewProps {
+  items: LatestItem[];
+  header: string;
+  accentColor: string;
+  canExpand: boolean;
+  onExpand: () => void;
+  isFetching?: boolean;
+}

src/components/LatestItems/LatestItems.props.ts

@@ -1,10 +0,0 @@
-import { ComponentProps } from "../Dashboard";
-import { LatestItem } from "./LatestItems.models";
-
-export interface LatestItemsProps extends ComponentProps {}
-
-export interface LatestItemsViewProps extends LatestItemsProps {
-  items: LatestItem[];
-  canExpand: boolean;
-  onExpand: () => void;
-}

src/components/LatestItems/LatestItems.tsx

@@ -1,24 +1,29 @@
 import * as React from "react";
+import { ReportData, GroupKey } from "../../features/report";
 import { buildLatestItems } from "./LatestItems.adapter";
 import LatestItemsView from "./LatestItems.view";
-import { LatestItemsProps } from "./LatestItems.props";
 
-export default function LatestItems(props: LatestItemsProps) {
+type Props = {
-  const {
+  reportData: ReportData;
-    reportData,
+  flow: "outflows" | "inflows";
-    state,
+  header: string;
-    stateSetters,
+  selectedPeriodId: string | null;
-    isFetching,
+  selectedGroupKey?: GroupKey | null;
-  } = props;
+  accentColor: string;
+  isFetching?: boolean;
+};
 
-  const { flow, selectedPeriodId, selectedGroupKey } = state;
+export default function LatestItems({
+  reportData,
+  flow,
+  header,
+  selectedPeriodId,
+  selectedGroupKey = null,
+  accentColor,
+  isFetching,
+}: Props) {
   const [visibleCount, setVisibleCount] = React.useState(5);
 
-  // Reset count when flow changes to start clean
-  React.useEffect(() => {
-    setVisibleCount(5);
-  }, [flow]);
-
   const allItems = React.useMemo(() => {
     return buildLatestItems(reportData, selectedPeriodId, selectedGroupKey, flow);
   }, [reportData, selectedPeriodId, selectedGroupKey, flow]);
@@ -31,9 +36,11 @@ export default function LatestItems(props: LatestItemsProps) {
 
   return (
     <LatestItemsView
-      {...props}
       items={visibleItems}
+      header={header}
+      accentColor={accentColor}
       canExpand={canExpand}
+      isFetching={isFetching}
       onExpand={() => setVisibleCount((prev) => prev + 5)}
     />
   );

src/components/LatestItems/LatestItems.view.tsx

@@ -9,25 +9,22 @@ import {
   Box,
   IconButton,
 } from "@mui/material";
-import { alpha } from "@mui/material/styles";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
-import { LatestItemsViewProps } from "./LatestItems.props";
+import { LatestItemsViewProps } from "./LatestItems.models";
 
 export default function LatestItemsView({
   items,
-  title,
+  header,
+  accentColor,
   canExpand,
   onExpand,
   isFetching,
-  colorScheme,
 }: LatestItemsViewProps) {
-  const accentColor = colorScheme?.primary || "";
-
   return (
     <Box sx={{ width: "100%", bgcolor: "background.paper", borderRadius: 4, p: 2, opacity: isFetching ? 0.6 : 1, transition: "opacity 0.3s ease", pointerEvents: isFetching ? "none" : "auto" }}>
       <Box sx={{ mb: 2, px: 2 }}>
         <Typography variant="h6" fontWeight="bold">
-          {title}
+          {header}
         </Typography>
       </Box>
 
@@ -47,7 +44,7 @@ export default function LatestItemsView({
               <Avatar
                 variant="rounded"
                 sx={{
-                  bgcolor: alpha(accentColor, 0.13),
+                  bgcolor: `${accentColor}22`,
                   width: 48,
                   height: 48,
                   borderRadius: 3,

src/components/ProgressCard/ProgressCard.models.ts

@@ -0,0 +1,11 @@
+export interface ProgressCardProps {
+  header: string;
+  summary?: string;
+  progressAmount: number;
+  totalAmount: number;
+  colorTheme?: "primary" | "secondary" | "error" | "info" | "success" | "warning";
+  compact?: boolean;
+  selected?: boolean;
+  onClick?: () => void;
+  isFetching?: boolean;
+}

src/components/ProgressCard/ProgressCard.props.ts

@@ -1,14 +0,0 @@
-import { ComponentProps } from "../Dashboard";
-
-export interface ProgressCardProps extends ComponentProps {
-  settings: {
-    compact: boolean;
-  };
-}
-
-export interface ProgressCardViewProps extends ProgressCardProps {
-  progressAmount: number;
-  totalAmount: number;
-  selected: boolean;
-  onClick: () => void;
-}

src/components/ProgressCard/ProgressCard.tsx

@@ -0,0 +1,25 @@
+import * as React from "react";
+import ProgressCardView from "./ProgressCard.view";
+import { ProgressCardProps } from "./ProgressCard.models";
+import { getPercentage, formatCurrency } from "../report.helpers";
+
+export default function ProgressCard(props: ProgressCardProps) {
+  const { progressAmount, totalAmount, compact = false } = props;
+
+  const percentage = getPercentage(progressAmount, totalAmount);
+  
+  const formattedProgress = formatCurrency(progressAmount);
+  const formattedTotal = formatCurrency(totalAmount);
+
+  return (
+    <ProgressCardView
+      {...props}
+      percentage={percentage}
+      formattedProgress={formattedProgress}
+      formattedTotal={formattedTotal}
+      compact={compact}
+      selected={props.selected}
+      onClick={props.onClick}
+    />
+  );
+}

src/components/ProgressCard/ProgressCard.view.tsx

@@ -8,79 +8,93 @@ import {
   linearProgressClasses
 } from "@mui/material";
 import { useTheme, alpha } from "@mui/material/styles";
-import { getPercentage, formatCurrency } from "../report.helpers";
+import { ProgressCardProps } from "./ProgressCard.models";
-import { ProgressCardViewProps } from "./ProgressCard.props";
+
+interface ViewProps extends ProgressCardProps {
+  percentage: number;
+  formattedProgress: string;
+  formattedTotal: string;
+  selected?: boolean;
+  onClick?: () => void;
+}
 
 export default function ProgressCardView({
-  title,
+  header,
-  settings,
+  colorTheme = "info",
-
+  percentage,
-  isFetching,
+  formattedProgress,
-
+  formattedTotal,
-  colorScheme,
+  compact = false,
-
-  progressAmount,
-  totalAmount,
   selected,
   onClick,
-}: ProgressCardViewProps) {
+}: ViewProps) {
   const theme = useTheme();
-
+  const isDark = theme.palette.mode === "dark";
-  const percentage = getPercentage(progressAmount, totalAmount);
-  const formattedProgress = formatCurrency(progressAmount);
-  const formattedTotal = formatCurrency(totalAmount);
 
   return (
     <Paper
-      elevation={settings.compact ? 2 : 4}
+      elevation={compact ? 2 : 4}
       onClick={onClick}
       sx={{
         width: "100%",
-        p: settings.compact ? { xs: 2.5, md: 3 } : { xs: 3, md: 4 },
+        p: compact ? { xs: 2.5, md: 3 } : { xs: 3, md: 4 },
-        borderRadius: settings.compact ? 3 : 4,
+        borderRadius: compact ? 3 : 4,
+        cursor: onClick ? "pointer" : "default",
         transform: selected ? "scale(1.02)" : "scale(1)",
         transition: "transform 0.2s ease, box-shadow 0.2s ease",
-        bgcolor: colorScheme.surface,
+        background: (theme) => {
-        color: colorScheme.text,
+          const baseColor = theme.palette[colorTheme]?.main || theme.palette.primary.main;
+          const lightColor = theme.palette[colorTheme]?.light || theme.palette.primary.light;
+          return isDark
+            ? `linear-gradient(135deg, ${alpha(baseColor, 0.9)} 0%, ${alpha(baseColor, 0.3)} 100%)`
+            : `linear-gradient(135deg, ${baseColor} 0%, ${lightColor} 100%)`;
+        },
+        color: "#fff",
         display: "flex",
         flexDirection: "column",
-        alignItems: settings.compact ? "flex-start" : "center",
+        alignItems: compact ? "flex-start" : "center",
         justifyContent: "center",
         position: "relative",
         overflow: "hidden",
-        border: selected
+        border: selected 
-          ? `2px solid ${colorScheme.primary}`
+          ? `2px solid #fff`
-          : "1px solid",
+          : isDark ? "1px solid rgba(255,255,255,0.1)" : "none",
-        borderColor: selected ? colorScheme.primary : "divider",
+        boxShadow: (theme) => {
-        boxShadow: "none",
+          const baseShadow = `0 ${compact ? 6 : 12}px ${compact ? 12 : 24}px -10px ${
-        opacity: isFetching ? 0.6 : 1,
+            isDark
-        pointerEvents: isFetching ? "none" : "auto",
+              ? "rgba(0,0,0,0.5)"
+              : theme.palette[colorTheme]?.main || theme.palette.primary.main
+          }`;
+          return selected 
+            ? `${baseShadow}, 0 0 0 2px ${theme.palette.background.paper}, 0 0 0 4px ${theme.palette[colorTheme]?.main || theme.palette.primary.main}` 
+            : baseShadow;
+        },
+        opacity: arguments[0].isFetching ? 0.6 : 1,
+        pointerEvents: arguments[0].isFetching ? "none" : "auto",
       }}
     >
-      <Typography
+      <Typography 
-        variant={settings.compact ? "body2" : "subtitle1"}
+        variant={compact ? "body2" : "subtitle1"} 
-        fontWeight={700}
+        fontWeight={700} 
-        sx={{
+        sx={{ 
-          opacity: 0.95,
+          opacity: 0.95, 
-          mb: settings.compact ? 1.5 : 2,
+          mb: compact ? 1.5 : 2, 
-          width: "100%",
+          width: '100%', 
-          overflow: "hidden",
+          overflow: 'hidden', 
-          textOverflow: "ellipsis",
+          textOverflow: 'ellipsis', 
-          whiteSpace: "nowrap",
+          whiteSpace: 'nowrap',
           letterSpacing: 0.5,
+          textShadow: isDark ? '0 1px 2px rgba(0,0,0,0.3)' : 'none'
         }}
       >
-        {title}
+        {header}
       </Typography>
 
-      <Box sx={{ mb: settings.compact ? 2 : 3, width: "100%" }}>
+      <Box sx={{ mb: compact ? 2 : 3, width: '100%' }}>
         <Typography
-          variant={settings.compact ? "h5" : "h3"}
+          variant={compact ? "h5" : "h3"}
           fontWeight={900}
-          sx={{
+          sx={{ mb: 0.5, lineHeight: 1.2, textShadow: isDark ? '0 2px 4px rgba(0,0,0,0.3)' : 'none' }}
-            mb: 0.5,
-            lineHeight: 1.2,
-          }}
         >
           {formattedProgress}
         </Typography>
@@ -88,38 +102,38 @@ export default function ProgressCardView({
         <Divider
           sx={{
             my: 1,
-            borderColor: "divider",
+            borderColor: "rgba(255,255,255,0.25)",
             width: "100%",
           }}
         />
 
         <Typography
-          variant={settings.compact ? "caption" : "body2"}
+          variant={compact ? "caption" : "body2"}
           sx={{
             opacity: 0.85,
             fontWeight: 500,
             display: "block",
-            color: alpha(colorScheme.text, 0.85),
+            color: "rgba(255,255,255,0.9)"
           }}
         >
           of {formattedTotal}
         </Typography>
       </Box>
 
-      <Box sx={{ width: "100%", mt: "auto" }}>
+      <Box sx={{ width: "100%", mt: 'auto' }}>
         <LinearProgress
           variant="determinate"
           value={percentage}
           sx={{
-            height: settings.compact ? 6 : 10,
+            height: compact ? 6 : 10,
             borderRadius: 5,
             [`&.${linearProgressClasses.colorPrimary}`]: {
-              backgroundColor: alpha(theme.palette.divider, 0.5),
+              backgroundColor: "rgba(0, 0, 0, 0.25)",
             },
             [`& .${linearProgressClasses.bar}`]: {
               borderRadius: 5,
-              backgroundColor: colorScheme.primary,
+              backgroundColor: "#fff",
-              boxShadow: `0 0 8px ${alpha(colorScheme.primary, 0.4)}`,
+              boxShadow: '0 0 8px rgba(255,255,255,0.4)'
             },
           }}
         />

src/components/ProgressCard/TopPayees.adapter.ts

@@ -1,8 +1,5 @@
+import { mergeBucketPeriods, periodIdToKey } from "../report.helpers";
 import { GroupKey, ReportData } from "../../features/report";
-import {
-  extractFilteredTransactions,
-  aggregateTransactions,
-} from "../report.helpers";
 
 export interface PayeeItem {
   name: string;
@@ -15,17 +12,54 @@ export function extractTopPayees(
   selectedPeriodId?: string | null,
   selectedGroupKey?: GroupKey | null
 ): { items: PayeeItem[]; total: number } {
-  const txns = extractFilteredTransactions(reportData, selectedPeriodId, selectedGroupKey);
+  const payeeMap = new Map<string, number>();
 
-  const { items, total } = aggregateTransactions(txns, (txn) => {
+  let targetPeriods = [];
-    if (txn.payee && txn.payee.name) {
+
-      return [txn.payee.name];
+  if (selectedPeriodId) {
+    const key = periodIdToKey(selectedPeriodId);
+    const periods = mergeBucketPeriods(reportData.buckets, key);
+    const selected = periods.find((p) => p.id === selectedPeriodId);
+    if (selected) {
+      targetPeriods.push(selected);
     }
-    return [];
+  } else {
-  });
+    // If no specific period is selected, aggregate over the "all" period bucket
+    targetPeriods = mergeBucketPeriods(reportData.buckets, "all");
+  }
+
+  for (const p of targetPeriods) {
+    let txns = p.metric.transactions || [];
+    
+    if (selectedGroupKey?.tags && selectedGroupKey.tags.length > 0) {
+      txns = txns.filter(txn => {
+        if (!txn.tags) return false;
+        const txnTags = txn.tags.map(t => typeof t === "string" ? t : t.name);
+        return selectedGroupKey.tags!.every(selectedTag => txnTags.includes(selectedTag));
+      });
+    }
+
+    for (const txn of txns) {
+      if (txn.payee && txn.payee.name) {
+        const current = payeeMap.get(txn.payee.name) || 0;
+        payeeMap.set(txn.payee.name, current + txn.amount);
+      }
+    }
+  }
+
+  let items: PayeeItem[] = [];
+  let total = 0;
+
+  for (const [name, amount] of payeeMap.entries()) {
+    items.push({ name, amount });
+    total += amount;
+  }
+
+  // Sort descending by amount
+  items.sort((a, b) => b.amount - a.amount);
 
   return {
-    items,
+    items: items.slice(0, 4), // Top 4
     total,
   };
 }

src/components/ProgressCard/TopPayees.tsx

@@ -1,22 +1,30 @@
 import * as React from "react";
 import { Box, Paper, Typography } from "@mui/material";
-import ProgressCardView from "./ProgressCard.view";
+import { ReportData, GroupKey } from "../../features/report";
+import ProgressCard from "./ProgressCard";
 import { extractTopPayees } from "./TopPayees.adapter";
-import { ProgressCardProps } from "./ProgressCard.props";
 
-export default function TopPayees(props: ProgressCardProps) {
+type Props = {
-  const {
+  reportData: ReportData;
-    title,
+  flow: "outflows" | "inflows";
-
+  header: string;
-    reportData,
+  selectedPeriodId?: string | null;
-    state,
+  selectedGroupKey?: GroupKey | null;
-    stateSetters,
+  setSelectedGroupKey?: (key: GroupKey | null) => void;
-
+  compact?: boolean;
-    isFetching,
+  isFetching?: boolean;
-  } = props
+};
-  const { flow, selectedPeriodId, selectedGroupKey } = state;
-  const { setSelectedGroupKey } = stateSetters;
 
+export default function TopPayees({
+  reportData,
+  flow,
+  header,
+  selectedPeriodId,
+  selectedGroupKey,
+  setSelectedGroupKey,
+  compact = true,
+  isFetching,
+}: Props) {
   const { items, total } = React.useMemo(() => {
     return extractTopPayees(reportData, flow, selectedPeriodId, selectedGroupKey);
   }, [reportData, flow, selectedPeriodId, selectedGroupKey]);
@@ -37,7 +45,7 @@ export default function TopPayees(props: ProgressCardProps) {
       }}
     >
       <Typography variant="h6" fontWeight={700} gutterBottom>
-        {title}
+        {header}
       </Typography>
 
       <Box
@@ -52,15 +60,17 @@ export default function TopPayees(props: ProgressCardProps) {
         }}
       >
         {items.map((item) => {
-          const isSelected = !!selectedGroupKey?.payee?.includes(item.name);
+          const isSelected = selectedGroupKey?.payee?.includes(item.name);
           return (
-            <ProgressCardView
+            <ProgressCard
-              {...props}
               key={item.name}
-              title={item.name}
+              header={item.name}
               progressAmount={item.amount}
               totalAmount={total}
+              compact={compact}
+              colorTheme={flow === "outflows" ? "error" : "success"}
               selected={isSelected}
+              isFetching={isFetching}
               onClick={() => {
                 if (setSelectedGroupKey) {
                   let newKey = selectedGroupKey ? { ...selectedGroupKey } : {};

src/components/ProgressCard/TopTags.adapter.ts

@@ -1,9 +1,11 @@
-import { ReportData, GroupKey } from "../../features/report";
+import { ReportData } from "../../features/report";
 import {
-  extractFilteredTransactions,
+  mergeBucketPeriods,
-  aggregateTransactions,
+  periodIdToKey,
 } from "../report.helpers";
 
+import { GroupKey } from "../../features/report";
+
 export interface TagItem {
   tag: string;
   amount: number;
@@ -15,17 +17,55 @@ export function extractTopTags(
   selectedPeriodId?: string | null,
   selectedGroupKey?: GroupKey | null
 ): { items: TagItem[]; total: number } {
-  const txns = extractFilteredTransactions(reportData, selectedPeriodId, selectedGroupKey);
+  const tagMap = new Map<string, number>();
 
-  const { items, total } = aggregateTransactions(txns, (txn) => {
+  let periodKey: ReturnType<typeof periodIdToKey> = "all";
-    if (txn.tags && txn.tags.length > 0) {
+  if (selectedPeriodId) {
-      return txn.tags.map((t) => (typeof t === "string" ? t : t.name));
+    periodKey = periodIdToKey(selectedPeriodId);
+  }
+
+  const periods = mergeBucketPeriods(reportData.buckets, periodKey);
+
+  let period = periods[0];
+  if (selectedPeriodId) {
+    period = periods.find(p => p.id === selectedPeriodId) || period;
+  } else if (periods.length > 0) {
+    period = periods.reduce((latest, p) =>
+      new Date(p.start).getTime() > new Date(latest.start).getTime()
+        ? p
+        : latest
+    );
+  }
+
+  if (period && period.metric && period.metric.transactions) {
+    let txns = period.metric.transactions;
+    if (selectedGroupKey?.payee && selectedGroupKey.payee.length > 0) {
+      txns = txns.filter(txn => 
+        txn.payee?.name && selectedGroupKey.payee!.includes(txn.payee.name)
+      );
     }
-    return ["Untagged"];
-  });
 
-  return {
+    for (const txn of txns) {
-    items: items.map((item) => ({ tag: item.name, amount: item.amount })),
+      if (txn.tags && txn.tags.length > 0) {
-    total,
+        for (const tagObj of txn.tags) {
-  };
+          const tagName = typeof tagObj === "string" ? tagObj : tagObj.name;
+          tagMap.set(tagName, (tagMap.get(tagName) || 0) + txn.amount);
+        }
+      } else {
+        tagMap.set("Untagged", (tagMap.get("Untagged") || 0) + txn.amount);
+      }
+    }
+  }
+
+  const arr = Array.from(tagMap.entries()).map(([tag, amount]) => ({
+    tag,
+    amount,
+  }));
+
+  arr.sort((a, b) => b.amount - a.amount);
+
+  const top = arr.slice(0, 4);
+  const total = top.reduce((sum, t) => sum + t.amount, 0);
+
+  return { items: top, total };
 }

src/components/ProgressCard/TopTags.tsx

@@ -1,22 +1,30 @@
 import * as React from "react";
 import { Box, Paper, Typography } from "@mui/material";
-import ProgressCardView from "./ProgressCard.view";
+import { ReportData, GroupKey } from "../../features/report";
+import ProgressCard from "./ProgressCard";
 import { extractTopTags } from "./TopTags.adapter";
-import { ProgressCardProps } from "./ProgressCard.props";
 
-export default function TopTags(props: ProgressCardProps) {
+type Props = {
-  const {
+  reportData: ReportData;
-    title,
+  flow: "outflows" | "inflows";
-
+  header: string;
-    reportData,
+  selectedPeriodId?: string | null;
-    state,
+  selectedGroupKey?: GroupKey | null;
-    stateSetters,
+  setSelectedGroupKey?: (key: GroupKey | null) => void;
-
+  compact?: boolean;
-    isFetching,
+  isFetching?: boolean;
-  } = props
+};
-  const { flow, selectedPeriodId, selectedGroupKey } = state;
-  const { setSelectedGroupKey } = stateSetters;
 
+export default function TopTags({
+  reportData,
+  flow,
+  header,
+  selectedPeriodId,
+  selectedGroupKey,
+  setSelectedGroupKey,
+  compact = true,
+  isFetching,
+}: Props) {
   const { items, total } = React.useMemo(() => {
     return extractTopTags(reportData, flow, selectedPeriodId, selectedGroupKey);
   }, [reportData, flow, selectedPeriodId, selectedGroupKey]);
@@ -37,7 +45,7 @@ export default function TopTags(props: ProgressCardProps) {
       }}
     >
       <Typography variant="h6" fontWeight={700} gutterBottom>
-        {title}
+        {header}
       </Typography>
 
       <Box
@@ -52,15 +60,17 @@ export default function TopTags(props: ProgressCardProps) {
         }}
       >
         {items.map((item) => {
-          const isSelected = !!selectedGroupKey?.tags?.includes(item.tag);
+          const isSelected = selectedGroupKey?.tags?.includes(item.tag);
           return (
-            <ProgressCardView
+            <ProgressCard
-              {...props}
               key={item.tag}
-              title={item.tag}
+              header={item.tag}
               progressAmount={item.amount}
               totalAmount={total}
+              compact={compact}
+              colorTheme={flow === "outflows" ? "error" : "success"}
               selected={isSelected}
+              isFetching={isFetching}
               onClick={() => {
                 if (setSelectedGroupKey) {
                   let newKey = selectedGroupKey ? { ...selectedGroupKey } : {};

src/components/ProgressCard/index.ts

@@ -1,2 +1,2 @@
-export { default } from "./ProgressCard.view";
+export { default } from "./ProgressCard";
-export * from "./ProgressCard.props";
+export * from "./ProgressCard.models";

src/components/report.helpers.ts

@@ -3,8 +3,6 @@ import {
   ReportBucket,
   GroupKey,
   PeriodType,
-  ReportData,
-  Transaction,
 } from "../features/report";
 
 // ─── Types ────────────────────────────────────────────────────
@@ -142,89 +140,3 @@ export function filterBuckets(
   if (!selectedGroupKey) return buckets;
   return buckets.filter((b) => matchesGroupKey(b, selectedGroupKey));
 }
-
-export function extractFilteredTransactions(
-  reportData: ReportData,
-  selectedPeriodId: string | null | undefined,
-  selectedGroupKey: GroupKey | null | undefined
-): Transaction[] {
-  let txns: Transaction[] = [];
-
-  if (selectedPeriodId) {
-    const key = periodIdToKey(selectedPeriodId);
-    const periods = mergeBucketPeriods(reportData.buckets, key);
-    const selected = periods.find((p) => p.id === selectedPeriodId);
-    txns = selected?.metric.transactions || [];
-  } else {
-    const periods = mergeBucketPeriods(reportData.buckets, "all");
-    if (periods.length > 0) {
-      const period = periods.reduce((latest, p) =>
-        new Date(p.start).getTime() > new Date(latest.start).getTime()
-          ? p
-          : latest
-      , periods[0]);
-      txns = period?.metric.transactions || [];
-    }
-  }
-
-  if (selectedGroupKey) {
-    txns = txns.filter((txn) => {
-      let match = true;
-      if (selectedGroupKey.tags && selectedGroupKey.tags.length > 0) {
-        if (!txn.tags) {
-          match = false;
-        } else {
-          const txnTags = txn.tags.map((t: any) =>
-            typeof t === "string" ? t : t.name
-          );
-          if (
-            !selectedGroupKey.tags.every((selectedTag) =>
-              txnTags.includes(selectedTag)
-            )
-          ) {
-            match = false;
-          }
-        }
-      }
-      if (match && selectedGroupKey.payee && selectedGroupKey.payee.length > 0) {
-        if (!txn.payee || !txn.payee.name) {
-          match = false;
-        } else {
-          if (!selectedGroupKey.payee.includes(txn.payee.name)) {
-            match = false;
-          }
-        }
-      }
-      return match;
-    });
-  }
-
-  return txns;
-}
-
-export function aggregateTransactions(
-  transactions: Transaction[],
-  keyExtractor: (txn: Transaction) => string[],
-  limit = 4
-): { items: { name: string; amount: number }[]; total: number } {
-  const map = new Map<string, number>();
-
-  for (const txn of transactions) {
-    const keys = keyExtractor(txn);
-    for (const key of keys) {
-      map.set(key, (map.get(key) || 0) + txn.amount);
-    }
-  }
-
-  const items = Array.from(map.entries()).map(([name, amount]) => ({
-    name,
-    amount,
-  }));
-
-  items.sort((a, b) => b.amount - a.amount);
-
-  const top = items.slice(0, limit);
-  const total = top.reduce((sum, item) => sum + item.amount, 0);
-
-  return { items: top, total };
-}

src/dashboard-config.ts

@@ -14,6 +14,9 @@ export const configuration: DashboardConfig = {
       settings: {
         tabs: ["Weekly", "Monthly"],
       },
+      style: {
+        size: 12,
+      },
     },
     {
       id: "top-categories",
@@ -22,6 +25,9 @@ export const configuration: DashboardConfig = {
       settings: {
         compact: true,
       },
+      style: {
+        size: 12,
+      },
     },
     {
       id: "top-payees",
@@ -30,11 +36,45 @@ export const configuration: DashboardConfig = {
       settings: {
         compact: true,
       },
+      style: {
+        size: 12,
+      },
     },
     {
       id: "items",
       title: 'Recent Transactions',
       component: LatestItems,
+      style: {
+        size: 12,
+      },
     },
   ],
+  style: {
+    palette: {
+      outflows: {
+        light: {
+          primary: "#d32f2f",
+          background: "#fdecea",
+          text: "#b71c1c"
+        },
+        dark: {
+          primary: "#f44336",
+          background: "rgba(244, 67, 54, 0.15)",
+          text: "#ffcdd2"
+        }
+      },
+      inflows: {
+        light: {
+          primary: "#2e7d32",
+          background: "#e8f5e9",
+          text: "#1b5e20"
+        },
+        dark: {
+          primary: "#4caf50",
+          background: "rgba(76, 175, 80, 0.15)",
+          text: "#c8e6c9"
+        }
+      }
+    }
+  }
 };

src/main.jsx

@@ -19,7 +19,7 @@ import process from 'process';
 import { AuthProvider } from "../react-auth";
 import Header from './Header';
 import Footer from './Footer';
-import AppTheme from './shared-theme/AppTheme';
+import AppTheme from './AppTheme';
 
 window.Buffer = Buffer;
 window.process = process;

src/shared-theme/AppTheme.tsx

@@ -1,103 +1,53 @@
-import * as React from "react";
+import * as React from 'react';
-import {
+import { ThemeProvider, createTheme } from '@mui/material/styles';
-  ThemeProvider,
+import type { ThemeOptions } from '@mui/material/styles';
-  createTheme,
+import { inputsCustomizations } from './customizations/inputs';
-  CssBaseline,
+import { dataDisplayCustomizations } from './customizations/dataDisplay';
-  Box,
+import { feedbackCustomizations } from './customizations/feedback';
-} from "@mui/material";
+import { navigationCustomizations } from './customizations/navigation';
+import { surfacesCustomizations } from './customizations/surfaces';
+import { colorSchemes, typography, shadows, shape } from './themePrimitives';
 
-import { getDesignTokens } from "./themePrimitives";
+interface AppThemeProps {
-import { getSemanticColors } from "./themeConfig";
-
-import { inputsCustomizations } from "./customizations/inputs";
-import { dataDisplayCustomizations } from "./customizations/dataDisplay";
-import { feedbackCustomizations } from "./customizations/feedback";
-import { navigationCustomizations } from "./customizations/navigation";
-import { surfacesCustomizations } from "./customizations/surfaces";
-
-export type ColorMode = "light" | "dark";
-
-type ColorModeContextValue = {
-  mode: ColorMode;
-  setMode: (mode: ColorMode) => void;
-  toggleColorMode: () => void;
-};
-
-export const ColorModeContext =
-  React.createContext<ColorModeContextValue>({
-    mode: "light",
-    setMode: () => {},
-    toggleColorMode: () => {},
-  });
-
-type AppThemeProps = {
   children: React.ReactNode;
-  defaultMode?: ColorMode;
+  /**
-};
+   * This is for the docs site. You can ignore it or remove it.
-
+   */
-export default function AppTheme({
+  disableCustomTheme?: boolean;
-  children,
+  themeComponents?: ThemeOptions['components'];
-  defaultMode = "light",
+}
-}: AppThemeProps) {
-  const [mode, setMode] =
-    React.useState<ColorMode>(defaultMode);
-
-  const toggleColorMode = React.useCallback(() => {
-    setMode((prev) =>
-      prev === "light" ? "dark" : "light"
-    );
-  }, []);
-
-  const contextValue = React.useMemo(
-    () => ({
-      mode,
-      setMode,
-      toggleColorMode,
-    }),
-    [mode, toggleColorMode]
-  );
-
-  const semantic = React.useMemo(
-    () => getSemanticColors(mode),
-    [mode]
-  );
-
-  const theme = React.useMemo(
-    () =>
-      createTheme({
-        ...getDesignTokens(mode),
-        semantic,
-
-        components: {
-          ...inputsCustomizations,
-          ...dataDisplayCustomizations,
-          ...feedbackCustomizations,
-          ...navigationCustomizations,
-          ...surfacesCustomizations,
-        },
-      }),
-    [mode, semantic]
-  );
 
+export default function AppTheme(props: AppThemeProps) {
+  const { children, disableCustomTheme, themeComponents } = props;
+  const theme = React.useMemo(() => {
+    return disableCustomTheme
+      ? {}
+      : createTheme({
+          // For more details about CSS variables configuration, see https://mui.com/material-ui/customization/css-theme-variables/configuration/
+          cssVariables: {
+            colorSchemeSelector: 'data-mui-color-scheme',
+            cssVarPrefix: 'template',
+          },
+          colorSchemes, // Recently added in v6 for building light & dark mode app, see https://mui.com/material-ui/customization/palette/#color-schemes
+          typography,
+          shadows,
+          shape,
+          components: {
+            ...inputsCustomizations,
+            ...dataDisplayCustomizations,
+            ...feedbackCustomizations,
+            ...navigationCustomizations,
+            ...surfacesCustomizations,
+            ...themeComponents,
+          },
+        });
+  }, [disableCustomTheme, themeComponents]);
+  if (disableCustomTheme) {
+    return <React.Fragment>{children}</React.Fragment>;
+  }
   return (
-    <ColorModeContext.Provider value={contextValue}>
+    <ThemeProvider theme={theme} disableTransitionOnChange>
-      <ThemeProvider theme={theme}>
+      {children}
-        <CssBaseline />
+    </ThemeProvider>
-        <Box
-          sx={{
-            "--bg-page": semantic.surface.page,
-            "--bg-card": semantic.surface.card,
-            "--bg-elevated": semantic.surface.elevated,
-            "--border-default": semantic.border.default,
-            "--border-subtle": semantic.border.subtle,
-            "--text-primary": semantic.text.primary,
-            "--text-secondary": semantic.text.secondary,
-            "--text-muted": semantic.text.muted,
-          }}
-        >
-          {children}
-        </Box>
-      </ThemeProvider>
-    </ColorModeContext.Provider>
   );
 }

src/shared-theme/ColorModeIconDropdown.tsx

@@ -0,0 +1,89 @@
+import * as React from 'react';
+import DarkModeIcon from '@mui/icons-material/DarkModeRounded';
+import LightModeIcon from '@mui/icons-material/LightModeRounded';
+import Box from '@mui/material/Box';
+import IconButton, { IconButtonOwnProps } from '@mui/material/IconButton';
+import Menu from '@mui/material/Menu';
+import MenuItem from '@mui/material/MenuItem';
+import { useColorScheme } from '@mui/material/styles';
+
+export default function ColorModeIconDropdown(props: IconButtonOwnProps) {
+  const { mode, systemMode, setMode } = useColorScheme();
+  const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
+  const open = Boolean(anchorEl);
+  const handleClick = (event: React.MouseEvent<HTMLElement>) => {
+    setAnchorEl(event.currentTarget);
+  };
+  const handleClose = () => {
+    setAnchorEl(null);
+  };
+  const handleMode = (targetMode: 'system' | 'light' | 'dark') => () => {
+    setMode(targetMode);
+    handleClose();
+  };
+  if (!mode) {
+    return (
+      <Box
+        data-screenshot="toggle-mode"
+        sx={(theme) => ({
+          verticalAlign: 'bottom',
+          display: 'inline-flex',
+          width: '2.25rem',
+          height: '2.25rem',
+          borderRadius: (theme.vars || theme).shape.borderRadius,
+          border: '1px solid',
+          borderColor: (theme.vars || theme).palette.divider,
+        })}
+      />
+    );
+  }
+  const resolvedMode = (systemMode || mode) as 'light' | 'dark';
+  const icon = {
+    light: <LightModeIcon />,
+    dark: <DarkModeIcon />,
+  }[resolvedMode];
+  return (
+    <React.Fragment>
+      <IconButton
+        data-screenshot="toggle-mode"
+        onClick={handleClick}
+        disableRipple
+        size="small"
+        aria-controls={open ? 'color-scheme-menu' : undefined}
+        aria-haspopup="true"
+        aria-expanded={open ? 'true' : undefined}
+        {...props}
+      >
+        {icon}
+      </IconButton>
+      <Menu
+        anchorEl={anchorEl}
+        id="account-menu"
+        open={open}
+        onClose={handleClose}
+        onClick={handleClose}
+        slotProps={{
+          paper: {
+            variant: 'outlined',
+            elevation: 0,
+            sx: {
+              my: '4px',
+            },
+          },
+        }}
+        transformOrigin={{ horizontal: 'right', vertical: 'top' }}
+        anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
+      >
+        <MenuItem selected={mode === 'system'} onClick={handleMode('system')}>
+          System
+        </MenuItem>
+        <MenuItem selected={mode === 'light'} onClick={handleMode('light')}>
+          Light
+        </MenuItem>
+        <MenuItem selected={mode === 'dark'} onClick={handleMode('dark')}>
+          Dark
+        </MenuItem>
+      </Menu>
+    </React.Fragment>
+  );
+}

src/shared-theme/ColorModeSelect.tsx

@@ -0,0 +1,28 @@
+import * as React from 'react';
+import { useColorScheme } from '@mui/material/styles';
+import MenuItem from '@mui/material/MenuItem';
+import Select, { SelectProps } from '@mui/material/Select';
+
+export default function ColorModeSelect(props: SelectProps) {
+  const { mode, setMode } = useColorScheme();
+  if (!mode) {
+    return null;
+  }
+  return (
+    <Select
+      value={mode}
+      onChange={(event) =>
+        setMode(event.target.value as 'system' | 'light' | 'dark')
+      }
+      SelectDisplayProps={{
+        // @ts-ignore
+        'data-screenshot': 'toggle-mode',
+      }}
+      {...props}
+    >
+      <MenuItem value="system">System</MenuItem>
+      <MenuItem value="light">Light</MenuItem>
+      <MenuItem value="dark">Dark</MenuItem>
+    </Select>
+  );
+}

src/shared-theme/customizations/feedback.tsx

@@ -14,8 +14,8 @@ export const feedbackCustomizations: Components<Theme> = {
           color: orange[500],
         },
         ...theme.applyStyles('dark', {
-          backgroundColor: alpha(orange[900], 0.35),
+          backgroundColor: `${alpha(orange[900], 0.5)}`,
-          border: `1px solid ${alpha(orange[800], 0.3)}`,
+          border: `1px solid ${alpha(orange[800], 0.5)}`,
         }),
       }),
     },

src/shared-theme/customizations/inputs.tsx

@@ -125,15 +125,15 @@ export const inputsCustomizations: Components<Theme> = {
                 backgroundColor: gray[200],
               },
               ...theme.applyStyles('dark', {
-                backgroundColor: 'hsla(0, 0%, 100%, 0.06)',
+                backgroundColor: gray[800],
-                borderColor: (theme.vars || theme).palette.divider,
+                borderColor: gray[700],
 
                 '&:hover': {
-                  backgroundColor: 'hsla(0, 0%, 100%, 0.1)',
+                  backgroundColor: gray[900],
-                  borderColor: 'hsla(0, 0%, 100%, 0.15)',
+                  borderColor: gray[600],
                 },
                 '&:active': {
-                  backgroundColor: 'hsla(0, 0%, 100%, 0.1)',
+                  backgroundColor: gray[900],
                 },
               }),
             },
@@ -183,12 +183,12 @@ export const inputsCustomizations: Components<Theme> = {
                 backgroundColor: gray[200],
               },
               ...theme.applyStyles('dark', {
-                color: 'hsl(0, 0%, 92%)',
+                color: gray[50],
                 '&:hover': {
-                  backgroundColor: 'hsla(0, 0%, 100%, 0.08)',
+                  backgroundColor: gray[700],
                 },
                 '&:active': {
-                  backgroundColor: 'hsla(0, 0%, 100%, 0.12)',
+                  backgroundColor: alpha(gray[700], 0.7),
                 },
               }),
             },
@@ -241,14 +241,14 @@ export const inputsCustomizations: Components<Theme> = {
           backgroundColor: gray[200],
         },
         ...theme.applyStyles('dark', {
-          backgroundColor: 'hsla(0, 0%, 100%, 0.06)',
+          backgroundColor: gray[800],
-          borderColor: (theme.vars || theme).palette.divider,
+          borderColor: gray[700],
           '&:hover': {
-            backgroundColor: 'hsla(0, 0%, 100%, 0.1)',
+            backgroundColor: gray[900],
-            borderColor: 'hsla(0, 0%, 100%, 0.15)',
+            borderColor: gray[600],
           },
           '&:active': {
-            backgroundColor: 'hsla(0, 0%, 100%, 0.1)',
+            backgroundColor: gray[900],
           },
         }),
         variants: [
@@ -288,7 +288,7 @@ export const inputsCustomizations: Components<Theme> = {
           [`& .${toggleButtonGroupClasses.selected}`]: {
             color: '#fff',
           },
-          boxShadow: `0 2px 8px ${alpha(brand[700], 0.3)}`,
+          boxShadow: `0 4px 16px ${alpha(brand[700], 0.5)}`,
         }),
       }),
     },
@@ -302,7 +302,7 @@ export const inputsCustomizations: Components<Theme> = {
         fontWeight: 500,
         ...theme.applyStyles('dark', {
           color: gray[400],
-          boxShadow: '0 2px 8px rgba(0, 0, 0, 0.25)',
+          boxShadow: '0 4px 16px rgba(0, 0, 0, 0.5)',
           [`&.${toggleButtonClasses.selected}`]: {
             color: brand[300],
           },

src/shared-theme/customizations/navigation.tsx

@@ -49,8 +49,9 @@ export const navigationCustomizations: Components<Theme> = {
           },
         },
         ...theme.applyStyles('dark', {
-          background: (theme.vars || theme).palette.background.paper,
+          background: gray[900],
-          boxShadow: '0 4px 16px rgba(0, 0, 0, 0.4), 0 8px 24px rgba(0, 0, 0, 0.3)',
+          boxShadow:
+            'hsla(220, 30%, 5%, 0.7) 0px 4px 16px 0px, hsla(220, 25%, 10%, 0.8) 0px 8px 16px -5px',
         }),
       }),
     },
@@ -83,17 +84,17 @@ export const navigationCustomizations: Components<Theme> = {
 
         ...theme.applyStyles('dark', {
           borderRadius: (theme.vars || theme).shape.borderRadius,
-          borderColor: (theme.vars || theme).palette.divider,
+          borderColor: gray[700],
           backgroundColor: (theme.vars || theme).palette.background.paper,
-          boxShadow: 'inset 0 1px 0 hsla(0, 0%, 100%, 0.05)',
+          boxShadow: `inset 0 1px 0 1px ${alpha(gray[700], 0.15)}, inset 0 -1px 0 1px hsla(220, 0%, 0%, 0.7)`,
           '&:hover': {
-            borderColor: 'hsla(0, 0%, 100%, 0.15)',
+            borderColor: alpha(gray[700], 0.7),
             backgroundColor: (theme.vars || theme).palette.background.paper,
             boxShadow: 'none',
           },
           [`&.${selectClasses.focused}`]: {
             outlineOffset: 0,
-            borderColor: 'hsl(210, 55%, 55%)',
+            borderColor: gray[900],
           },
           '&:before, &:after': {
             display: 'none',
@@ -107,7 +108,7 @@ export const navigationCustomizations: Components<Theme> = {
           display: 'flex',
           alignItems: 'center',
           '&:focus-visible': {
-            backgroundColor: (theme.vars || theme).palette.background.default,
+            backgroundColor: gray[900],
           },
         }),
       }),
@@ -150,7 +151,6 @@ export const navigationCustomizations: Components<Theme> = {
     styleOverrides: {
       paper: ({ theme }) => ({
         backgroundColor: (theme.vars || theme).palette.background.default,
-        borderRight: `1px solid ${(theme.vars || theme).palette.divider}`,
       }),
     },
   },
@@ -204,8 +204,8 @@ export const navigationCustomizations: Components<Theme> = {
         ...theme.applyStyles('dark', {
           ':hover': {
             color: (theme.vars || theme).palette.text.primary,
-            backgroundColor: alpha((theme.vars || theme).palette.common.white, 0.08),
+            backgroundColor: gray[800],
-            borderColor: (theme.vars || theme).palette.divider,
+            borderColor: gray[700],
           },
           [`&.${tabClasses.selected}`]: {
             color: '#fff',

src/shared-theme/customizations/surfaces.ts

@@ -40,7 +40,7 @@ export const surfacesCustomizations: Components<Theme> = {
         '&:hover': { backgroundColor: gray[50] },
         '&:focus-visible': { backgroundColor: 'transparent' },
         ...theme.applyStyles('dark', {
-          '&:hover': { backgroundColor: alpha(theme.palette.common.white, 0.06) },
+          '&:hover': { backgroundColor: gray[800] },
         }),
       }),
     },
@@ -67,7 +67,7 @@ export const surfacesCustomizations: Components<Theme> = {
           border: `1px solid ${(theme.vars || theme).palette.divider}`,
           boxShadow: 'none',
           ...theme.applyStyles('dark', {
-            backgroundColor: (theme.vars || theme).palette.background.paper,
+            backgroundColor: gray[800],
           }),
           variants: [
             {
@@ -79,7 +79,7 @@ export const surfacesCustomizations: Components<Theme> = {
                 boxShadow: 'none',
                 background: 'hsl(0, 0%, 100%)',
                 ...theme.applyStyles('dark', {
-                  background: alpha((theme.vars || theme).palette.background.paper, 0.6),
+                  background: alpha(gray[900], 0.4),
                 }),
               },
             },

src/shared-theme/themeConfig.ts

@@ -1,72 +0,0 @@
-import { gray } from "./themePrimitives";
-import { alpha } from "@mui/material/styles";
-
-declare module "@mui/material/styles" {
-  interface Theme {
-    semantic: SemanticColors;
-  }
-  interface ThemeOptions {
-    semantic?: SemanticColors;
-  }
-}
-
-export type SemanticColorMode = "light" | "dark";
-
-export interface SemanticColors {
-  surface: {
-    page: string;
-    card: string;
-    elevated: string;
-  };
-  border: {
-    default: string;
-    subtle: string;
-  };
-  text: {
-    primary: string;
-    secondary: string;
-    muted: string;
-  };
-}
-
-const darkBg = 'hsl(0, 0%, 9%)';
-const darkPaper = 'hsl(0, 0%, 14%)';
-const darkElevated = 'hsl(0, 0%, 19%)';
-
-export function getSemanticColors(mode: SemanticColorMode): SemanticColors {
-  if (mode === "dark") {
-    return {
-      surface: {
-        page: darkBg,
-        card: darkPaper,
-        elevated: darkElevated,
-      },
-      border: {
-        default: 'hsla(0, 0%, 100%, 0.08)',
-        subtle: 'hsla(0, 0%, 100%, 0.04)',
-      },
-      text: {
-        primary: 'hsl(0, 0%, 92%)',
-        secondary: 'hsl(0, 0%, 60%)',
-        muted: 'hsl(0, 0%, 45%)',
-      },
-    };
-  }
-
-  return {
-    surface: {
-      page: "hsl(0, 0%, 99%)",
-      card: "hsl(220, 35%, 97%)",
-      elevated: gray[100],
-    },
-    border: {
-      default: alpha(gray[300], 0.4),
-      subtle: alpha(gray[200], 0.3),
-    },
-    text: {
-      primary: gray[800],
-      secondary: gray[600],
-      muted: gray[500],
-    },
-  };
-}

src/shared-theme/themePrimitives.ts

@@ -23,10 +23,6 @@ declare module '@mui/material/styles' {
 
   interface Palette {
     baseShadow: string;
-    flows: {
-      outflows: { primary: string; surface: string; text: string };
-      inflows: { primary: string; surface: string; text: string };
-    };
   }
 }
 
@@ -56,9 +52,7 @@ export const gray = {
   500: 'hsl(220, 20%, 42%)',
   600: 'hsl(220, 20%, 35%)',
   700: 'hsl(220, 20%, 25%)',
-  750: 'hsl(220, 20%, 18%)',
   800: 'hsl(220, 30%, 6%)',
-  850: 'hsl(220, 22%, 11%)',
   900: 'hsl(220, 35%, 3%)',
 };
 
@@ -101,14 +95,10 @@ export const red = {
   900: 'hsl(0, 93%, 6%)',
 };
 
-const darkBg = 'hsl(0, 0%, 9%)';
-const darkPaper = 'hsl(0, 0%, 14%)';
-const darkElevated = 'hsl(0, 0%, 19%)';
-
 export const getDesignTokens = (mode: PaletteMode) => {
   customShadows[1] =
     mode === 'dark'
-      ? '0 4px 16px rgba(0, 0, 0, 0.4), 0 8px 24px rgba(0, 0, 0, 0.3)'
+      ? 'hsla(220, 30%, 5%, 0.7) 0px 4px 16px 0px, hsla(220, 25%, 10%, 0.8) 0px 8px 16px -5px'
       : 'hsla(220, 30%, 5%, 0.07) 0px 4px 16px 0px, hsla(220, 25%, 10%, 0.07) 0px 8px 16px -5px';
 
   return {
@@ -121,9 +111,9 @@ export const getDesignTokens = (mode: PaletteMode) => {
         contrastText: brand[50],
         ...(mode === 'dark' && {
           contrastText: brand[50],
-          light: 'hsl(210, 50%, 65%)',
+          light: brand[300],
-          main: 'hsl(210, 55%, 55%)',
+          main: brand[400],
-          dark: 'hsl(210, 50%, 35%)',
+          dark: brand[700],
         }),
       },
       info: {
@@ -132,10 +122,10 @@ export const getDesignTokens = (mode: PaletteMode) => {
         dark: brand[600],
         contrastText: gray[50],
         ...(mode === 'dark' && {
-          contrastText: 'hsl(210, 30%, 80%)',
+          contrastText: brand[300],
-          light: 'hsl(210, 40%, 50%)',
+          light: brand[500],
-          main: 'hsl(210, 35%, 40%)',
+          main: brand[700],
-          dark: 'hsl(210, 30%, 25%)',
+          dark: brand[900],
         }),
       },
       warning: {
@@ -143,9 +133,9 @@ export const getDesignTokens = (mode: PaletteMode) => {
         main: orange[400],
         dark: orange[800],
         ...(mode === 'dark' && {
-          light: 'hsl(45, 60%, 55%)',
+          light: orange[400],
-          main: 'hsl(45, 55%, 45%)',
+          main: orange[500],
-          dark: 'hsl(45, 50%, 30%)',
+          dark: orange[700],
         }),
       },
       error: {
@@ -153,9 +143,9 @@ export const getDesignTokens = (mode: PaletteMode) => {
         main: red[400],
         dark: red[800],
         ...(mode === 'dark' && {
-          light: 'hsl(0, 55%, 60%)',
+          light: red[400],
-          main: 'hsl(0, 55%, 50%)',
+          main: red[500],
-          dark: 'hsl(0, 50%, 35%)',
+          dark: red[700],
         }),
       },
       success: {
@@ -163,46 +153,34 @@ export const getDesignTokens = (mode: PaletteMode) => {
         main: green[400],
         dark: green[800],
         ...(mode === 'dark' && {
-          light: 'hsl(120, 40%, 55%)',
+          light: green[400],
-          main: 'hsl(120, 40%, 45%)',
+          main: green[500],
-          dark: 'hsl(120, 35%, 30%)',
+          dark: green[700],
         }),
       },
       grey: {
         ...gray,
       },
-      divider: mode === 'dark' ? 'hsla(0, 0%, 100%, 0.08)' : alpha(gray[300], 0.4),
+      divider: mode === 'dark' ? alpha(gray[700], 0.6) : alpha(gray[300], 0.4),
       background: {
         default: 'hsl(0, 0%, 99%)',
         paper: 'hsl(220, 35%, 97%)',
-        ...(mode === 'dark' && { default: darkBg, paper: darkPaper }),
+        ...(mode === 'dark' && { default: gray[900], paper: 'hsl(220, 30%, 7%)' }),
       },
       text: {
         primary: gray[800],
         secondary: gray[600],
         warning: orange[400],
-        ...(mode === 'dark' && { primary: 'hsl(0, 0%, 92%)', secondary: 'hsl(0, 0%, 60%)' }),
+        ...(mode === 'dark' && { primary: 'hsl(0, 0%, 100%)', secondary: gray[400] }),
       },
       action: {
         hover: alpha(gray[200], 0.2),
         selected: `${alpha(gray[200], 0.3)}`,
         ...(mode === 'dark' && {
-          hover: 'hsla(0, 0%, 100%, 0.06)',
+          hover: alpha(gray[600], 0.2),
-          selected: 'hsla(0, 0%, 100%, 0.1)',
+          selected: alpha(gray[600], 0.3),
         }),
       },
-      flows: {
-        outflows: {
-          primary: mode === 'dark' ? 'hsl(0, 55%, 60%)' : '#d32f2f',
-          surface: mode === 'dark' ? 'hsla(0, 35%, 25%, 0.6)' : '#fdecea',
-          text: mode === 'dark' ? 'hsl(0, 60%, 80%)' : '#b71c1c',
-        },
-        inflows: {
-          primary: mode === 'dark' ? 'hsl(120, 40%, 55%)' : '#2e7d32',
-          surface: mode === 'dark' ? 'hsla(120, 25%, 22%, 0.6)' : '#e8f5e9',
-          text: mode === 'dark' ? 'hsl(120, 40%, 78%)' : '#1b5e20',
-        },
-      },
     },
     typography: {
       fontFamily: 'Inter, sans-serif',
@@ -307,18 +285,6 @@ export const colorSchemes = {
         hover: alpha(gray[200], 0.2),
         selected: `${alpha(gray[200], 0.3)}`,
       },
-      flows: {
-        outflows: {
-          primary: '#d32f2f',
-          surface: '#fdecea',
-          text: '#b71c1c',
-        },
-        inflows: {
-          primary: '#2e7d32',
-          surface: '#e8f5e9',
-          text: '#1b5e20',
-        },
-      },
       baseShadow:
         'hsla(220, 30%, 5%, 0.07) 0px 4px 16px 0px, hsla(220, 25%, 10%, 0.07) 0px 8px 16px -5px',
     },
@@ -327,60 +293,49 @@ export const colorSchemes = {
     palette: {
       primary: {
         contrastText: brand[50],
-        light: 'hsl(210, 50%, 65%)',
+        light: brand[300],
-        main: 'hsl(210, 55%, 55%)',
+        main: brand[400],
-        dark: 'hsl(210, 50%, 35%)',
+        dark: brand[700],
       },
       info: {
-        contrastText: 'hsl(210, 30%, 80%)',
+        contrastText: brand[300],
-        light: 'hsl(210, 40%, 50%)',
+        light: brand[500],
-        main: 'hsl(210, 35%, 40%)',
+        main: brand[700],
-        dark: 'hsl(210, 30%, 25%)',
+        dark: brand[900],
       },
       warning: {
-        light: 'hsl(45, 60%, 55%)',
+        light: orange[400],
-        main: 'hsl(45, 55%, 45%)',
+        main: orange[500],
-        dark: 'hsl(45, 50%, 30%)',
+        dark: orange[700],
       },
       error: {
-        light: 'hsl(0, 55%, 60%)',
+        light: red[400],
-        main: 'hsl(0, 55%, 50%)',
+        main: red[500],
-        dark: 'hsl(0, 50%, 35%)',
+        dark: red[700],
       },
       success: {
-        light: 'hsl(120, 40%, 55%)',
+        light: green[400],
-        main: 'hsl(120, 40%, 45%)',
+        main: green[500],
-        dark: 'hsl(120, 35%, 30%)',
+        dark: green[700],
       },
       grey: {
         ...gray,
       },
-      divider: 'hsla(0, 0%, 100%, 0.08)',
+      divider: alpha(gray[700], 0.6),
       background: {
-        default: darkBg,
+        default: gray[900],
-        paper: darkPaper,
+        paper: 'hsl(220, 30%, 7%)',
       },
       text: {
-        primary: 'hsl(0, 0%, 92%)',
+        primary: 'hsl(0, 0%, 100%)',
-        secondary: 'hsl(0, 0%, 60%)',
+        secondary: gray[400],
       },
       action: {
-        hover: 'hsla(0, 0%, 100%, 0.06)',
+        hover: alpha(gray[600], 0.2),
-        selected: 'hsla(0, 0%, 100%, 0.1)',
+        selected: alpha(gray[600], 0.3),
       },
-      flows: {
+      baseShadow:
-        outflows: {
+        'hsla(220, 30%, 5%, 0.7) 0px 4px 16px 0px, hsla(220, 25%, 10%, 0.8) 0px 8px 16px -5px',
-          primary: 'hsl(0, 55%, 60%)',
-          surface: 'hsla(0, 35%, 25%, 0.6)',
-          text: 'hsl(0, 60%, 80%)',
-        },
-        inflows: {
-          primary: 'hsl(120, 40%, 55%)',
-          surface: 'hsla(120, 25%, 22%, 0.6)',
-          text: 'hsl(120, 40%, 78%)',
-        },
-      },
-      baseShadow: '0 4px 16px rgba(0, 0, 0, 0.4), 0 8px 24px rgba(0, 0, 0, 0.3)',
     },
   },
 };