diff --git a/apps/antalmanac/src/components/Calendar/CalendarRoot.tsx b/apps/antalmanac/src/components/Calendar/CalendarRoot.tsx
index 8883102ba..1d6365807 100644
--- a/apps/antalmanac/src/components/Calendar/CalendarRoot.tsx
+++ b/apps/antalmanac/src/components/Calendar/CalendarRoot.tsx
@@ -53,8 +53,8 @@ const AntAlmanacEvent = ({ event }: { event: CalendarEvent }) => {
                     {event.showLocationInfo
                         ? event.locations.map((location) => `${location.building} ${location.room}`).join(', ')
                         : event.locations.length > 1
-                          ? `${event.locations.length} Locations`
-                          : `${event.locations[0].building} ${event.locations[0].room}`}
+                        ? `${event.locations.length} Locations`
+                        : `${event.locations[0].building} ${event.locations[0].room}`}
                 </Box>
                 <Box>{event.sectionCode}</Box>
             </Box>
@@ -85,8 +85,8 @@ export default function ScheduleCalendar(props: ScheduleCalendarProps) {
         return showFinalsSchedule
             ? finalsEventsInCalendar
             : hoveredCourseEvents
-              ? [...eventsInCalendar, ...hoveredCourseEvents]
-              : eventsInCalendar;
+            ? [...eventsInCalendar, ...hoveredCourseEvents]
+            : eventsInCalendar;
     };
 
     const handleClosePopover = () => {
diff --git a/apps/antalmanac/src/components/Calendar/CourseCalendarEvent.tsx b/apps/antalmanac/src/components/Calendar/CourseCalendarEvent.tsx
index 67c066283..6cb7d5cc4 100644
--- a/apps/antalmanac/src/components/Calendar/CourseCalendarEvent.tsx
+++ b/apps/antalmanac/src/components/Calendar/CourseCalendarEvent.tsx
@@ -10,12 +10,12 @@ import CustomEventDialog from './Toolbar/CustomEventDialog/CustomEventDialog';
 import { deleteCourse, deleteCustomEvent } from '$actions/AppStoreActions';
 import ColorPicker from '$components/ColorPicker';
 import analyticsEnum, { logAnalytics } from '$lib/analytics';
-import { clickToCopy, isDarkMode } from '$lib/helpers';
+import { clickToCopy } from '$lib/helpers';
 import AppStore from '$stores/AppStore';
 import locationIds from '$lib/location_ids';
 import { useTabStore } from '$stores/TabStore';
 import { formatTimes } from '$stores/calendarizeHelpers';
-import { useTimeFormatStore } from '$stores/SettingsStore';
+import { useTimeFormatStore, useThemeStore } from '$stores/SettingsStore';
 import buildingCatalogue from '$lib/buildingCatalogue';
 
 const styles: Styles<Theme, object> = {
@@ -74,7 +74,6 @@ const styles: Styles<Theme, object> = {
 
     clickableLocation: {
         cursor: 'pointer',
-        color: isDarkMode() ? '#1cbeff' : 'blue',
         background: 'none !important',
         border: 'none',
         padding: '0 !important',
@@ -177,6 +176,7 @@ const CourseCalendarEvent = (props: CourseCalendarEventProps) => {
 
     const { setActiveTab } = useTabStore();
     const { isMilitaryTime } = useTimeFormatStore();
+    const isDark = useThemeStore((store) => store.isDark);
 
     const focusMap = useCallback(() => {
         setActiveTab(2);
@@ -262,6 +262,7 @@ const CourseCalendarEvent = (props: CourseCalendarEventProps) => {
                                             className={classes.clickableLocation}
                                             to={`/map?location=${locationIds[location.building] ?? 0}`}
                                             onClick={focusMap}
+                                            color={isDark ? '#1cbeff' : 'blue'}
                                         >
                                             {location.building} {location.room}
                                         </Link>
diff --git a/apps/antalmanac/src/components/Calendar/Toolbar/CustomEventDialog/CustomEventDialog.tsx b/apps/antalmanac/src/components/Calendar/Toolbar/CustomEventDialog/CustomEventDialog.tsx
index 37a159a63..4fd5978dd 100644
--- a/apps/antalmanac/src/components/Calendar/Toolbar/CustomEventDialog/CustomEventDialog.tsx
+++ b/apps/antalmanac/src/components/Calendar/Toolbar/CustomEventDialog/CustomEventDialog.tsx
@@ -19,7 +19,7 @@ import DaySelector from './DaySelector';
 import ScheduleSelector from './ScheduleSelector';
 import { addCustomEvent, editCustomEvent } from '$actions/AppStoreActions';
 import analyticsEnum, { logAnalytics } from '$lib/analytics';
-import { isDarkMode } from '$lib/helpers';
+import { useThemeStore } from '$stores/SettingsStore';
 import AppStore from '$stores/AppStore';
 import { BuildingSelect, ExtendedBuilding } from '$components/inputs/building-select';
 
@@ -139,6 +139,7 @@ function CustomEventDialogs(props: CustomEventDialogProps) {
         };
     }, []);
 
+    const isDark = useThemeStore.getState().isDark;
     return (
         <>
             {props.customEvent ? (
@@ -218,15 +219,15 @@ function CustomEventDialogs(props: CustomEventDialogProps) {
                 </DialogContent>
 
                 <DialogActions>
-                    <Button onClick={handleClose} color={isDarkMode() ? 'secondary' : 'primary'}>
+                    <Button onClick={handleClose} color={isDark ? 'secondary' : 'primary'}>
                         Cancel
                     </Button>
                     <Button onClick={handleSubmit} variant="contained" color="primary" disabled={disabled}>
                         {disabled
                             ? 'Schedule and day must be checked'
                             : props.customEvent
-                              ? 'Save Changes'
-                              : 'Add Event'}
+                            ? 'Save Changes'
+                            : 'Add Event'}
                     </Button>
                 </DialogActions>
             </Dialog>
diff --git a/apps/antalmanac/src/components/Calendar/Toolbar/EditSchedule/DeleteScheduleDialog.tsx b/apps/antalmanac/src/components/Calendar/Toolbar/EditSchedule/DeleteScheduleDialog.tsx
index 7f919943c..1c6e33047 100644
--- a/apps/antalmanac/src/components/Calendar/Toolbar/EditSchedule/DeleteScheduleDialog.tsx
+++ b/apps/antalmanac/src/components/Calendar/Toolbar/EditSchedule/DeleteScheduleDialog.tsx
@@ -14,7 +14,7 @@ import { useState } from 'react';
 import { Clear } from '@material-ui/icons';
 
 import { deleteSchedule } from '$actions/AppStoreActions';
-import { isDarkMode } from '$lib/helpers';
+import { useThemeStore } from '$stores/SettingsStore';
 import AppStore from '$stores/AppStore';
 
 interface DeleteScheduleDialogProps {
@@ -23,6 +23,8 @@ interface DeleteScheduleDialogProps {
 }
 
 const DeleteScheduleDialog = (props: DeleteScheduleDialogProps) => {
+    const isDark = useThemeStore((store) => store.isDark);
+
     const { scheduleIndex } = props;
 
     const [isOpen, setIsOpen] = useState(false);
@@ -58,7 +60,7 @@ const DeleteScheduleDialog = (props: DeleteScheduleDialogProps) => {
                     </DialogContentText>
                 </DialogContent>
                 <DialogActions>
-                    <Button onClick={handleClose} color={isDarkMode() ? 'secondary' : 'primary'}>
+                    <Button onClick={handleClose} color={isDark ? 'secondary' : 'primary'}>
                         Cancel
                     </Button>
                     <Button onClick={handleDelete} variant="contained" color="primary">
diff --git a/apps/antalmanac/src/components/Calendar/Toolbar/EditSchedule/ScheduleNameDialog.tsx b/apps/antalmanac/src/components/Calendar/Toolbar/EditSchedule/ScheduleNameDialog.tsx
index 33e4bc69c..e87ec0228 100644
--- a/apps/antalmanac/src/components/Calendar/Toolbar/EditSchedule/ScheduleNameDialog.tsx
+++ b/apps/antalmanac/src/components/Calendar/Toolbar/EditSchedule/ScheduleNameDialog.tsx
@@ -15,7 +15,7 @@ import { ClassNameMap } from '@material-ui/core/styles/withStyles';
 import { Add, Edit } from '@material-ui/icons';
 
 import { addSchedule, renameSchedule } from '$actions/AppStoreActions';
-import { isDarkMode } from '$lib/helpers';
+import { useThemeStore } from '$stores/SettingsStore';
 
 const styles = () => ({
     addButton: {
@@ -35,6 +35,8 @@ interface ScheduleNameDialogProps {
 }
 
 const ScheduleNameDialog = forwardRef((props: ScheduleNameDialogProps, ref) => {
+    const isDark = useThemeStore((store) => store.isDark);
+
     const { classes, onOpen, onClose, scheduleNames, scheduleRenameIndex } = props;
 
     const [isOpen, setIsOpen] = useState(false);
@@ -143,7 +145,7 @@ const ScheduleNameDialog = forwardRef((props: ScheduleNameDialogProps, ref) => {
                 </DialogContent>
 
                 <DialogActions>
-                    <Button onClick={handleCancel} color={isDarkMode() ? 'secondary' : 'primary'}>
+                    <Button onClick={handleCancel} color={isDark ? 'secondary' : 'primary'}>
                         Cancel
                     </Button>
                     <Button
diff --git a/apps/antalmanac/src/components/Header/LoadSaveFunctionality.tsx b/apps/antalmanac/src/components/Header/LoadSaveFunctionality.tsx
index a6d127ec4..798bca749 100644
--- a/apps/antalmanac/src/components/Header/LoadSaveFunctionality.tsx
+++ b/apps/antalmanac/src/components/Header/LoadSaveFunctionality.tsx
@@ -14,7 +14,7 @@ import { ChangeEvent, PureComponent, useEffect, useState } from 'react';
 
 import { LoadingButton } from '@mui/lab';
 import { loadSchedule, saveSchedule } from '$actions/AppStoreActions';
-import { isDarkMode } from '$lib/helpers';
+import { useThemeStore } from '$stores/SettingsStore';
 import AppStore from '$stores/AppStore';
 
 interface LoadSaveButtonBaseProps {
@@ -22,6 +22,7 @@ interface LoadSaveButtonBaseProps {
     actionName: 'Save' | 'Load';
     disabled: boolean;
     loading: boolean;
+    colorType: 'primary' | 'secondary';
     id?: string;
 }
 
@@ -129,10 +130,10 @@ class LoadSaveButtonBase extends PureComponent<LoadSaveButtonBaseProps, LoadSave
                         />
                     </DialogContent>
                     <DialogActions>
-                        <Button onClick={() => this.handleClose(true)} color={isDarkMode() ? 'secondary' : 'primary'}>
+                        <Button onClick={() => this.handleClose(true)} color={this.props.colorType}>
                             {'Cancel'}
                         </Button>
-                        <Button onClick={() => this.handleClose(false)} color={isDarkMode() ? 'secondary' : 'primary'}>
+                        <Button onClick={() => this.handleClose(false)} color={this.props.colorType}>
                             {this.props.actionName}
                         </Button>
                     </DialogActions>
@@ -143,6 +144,8 @@ class LoadSaveButtonBase extends PureComponent<LoadSaveButtonBaseProps, LoadSave
 }
 
 const LoadSaveScheduleFunctionality = () => {
+    const isDark = useThemeStore((store) => store.isDark);
+
     const [loading, setLoading] = useState(false);
     const [skeletonMode, setSkeletonMode] = useState(AppStore.getSkeletonMode());
 
@@ -181,8 +184,9 @@ const LoadSaveScheduleFunctionality = () => {
                 id="save-button"
                 actionName={'Save'}
                 action={saveSchedule}
-                disabled={loading || skeletonMode}
+                disabled={loading}
                 loading={false}
+                colorType={isDark ? 'primary' : 'secondary'}
             />
             <LoadSaveButtonBase
                 id="load-button"
@@ -190,6 +194,7 @@ const LoadSaveScheduleFunctionality = () => {
                 action={loadScheduleAndSetLoading}
                 disabled={skeletonMode}
                 loading={loading}
+                colorType={isDark ? 'primary' : 'secondary'}
             />
         </div>
     );
diff --git a/apps/antalmanac/src/components/Header/SettingsMenu.tsx b/apps/antalmanac/src/components/Header/SettingsMenu.tsx
index d35dfae06..2090bbac9 100644
--- a/apps/antalmanac/src/components/Header/SettingsMenu.tsx
+++ b/apps/antalmanac/src/components/Header/SettingsMenu.tsx
@@ -18,14 +18,15 @@ const darkSelectedStyle: CSSProperties = {
     color: '#99CCF3',
 };
 
-function getSelectedStyle(buttonValue: string, themeSetting: string, appTheme: string) {
-    return themeSetting === buttonValue ? (appTheme == 'dark' ? darkSelectedStyle : lightSelectedStyle) : {};
+function getSelectedStyle(buttonValue: string, themeSetting: string, appTheme: string, isDark: boolean) {
+    return themeSetting === buttonValue ? (isDark ? darkSelectedStyle : lightSelectedStyle) : {};
 }
 
 function ThemeMenu() {
-    const [themeSetting, appTheme, setTheme] = useThemeStore((store) => [
+    const [themeSetting, appTheme, isDark, setTheme] = useThemeStore((store) => [
         store.themeSetting,
         store.appTheme,
+        store.isDark,
         store.setAppTheme,
     ]);
 
@@ -46,7 +47,7 @@ function ThemeMenu() {
                         padding: '1rem 2rem',
                         borderRadius: '12px 0px 0px 12px',
                         width: '100%',
-                        ...getSelectedStyle('light', themeSetting, appTheme),
+                        ...getSelectedStyle('light', themeSetting, appTheme, isDark),
                     }}
                     value="light"
                     onClick={handleThemeChange}
@@ -58,7 +59,7 @@ function ThemeMenu() {
                     style={{
                         padding: '1rem 2rem',
                         width: '100%',
-                        ...getSelectedStyle('system', themeSetting, appTheme),
+                        ...getSelectedStyle('system', themeSetting, appTheme, isDark),
                     }}
                     value="system"
                     onClick={handleThemeChange}
@@ -71,7 +72,7 @@ function ThemeMenu() {
                         padding: '1rem 2rem',
                         borderRadius: '0px 12px 12px 0px',
                         width: '100%',
-                        ...getSelectedStyle('dark', themeSetting, appTheme),
+                        ...getSelectedStyle('dark', themeSetting, appTheme, isDark),
                     }}
                     value="dark"
                     onClick={handleThemeChange}
@@ -85,6 +86,7 @@ function ThemeMenu() {
 
 function TimeMenu() {
     const [isMilitaryTime, setTimeFormat] = useTimeFormatStore((store) => [store.isMilitaryTime, store.setTimeFormat]);
+    const isDark = useThemeStore((store) => store.isDark);
     const theme = useThemeStore((store) => store.appTheme);
 
     const handleTimeFormatChange = (event: React.MouseEvent<HTMLButtonElement>) => {
@@ -110,7 +112,7 @@ function TimeMenu() {
                         borderRadius: '12px 0px 0px 12px',
                         width: '100%',
                         fontSize: '12px',
-                        ...getSelectedStyle('false', isMilitaryTime.toString(), theme),
+                        ...getSelectedStyle('false', isMilitaryTime.toString(), theme, isDark),
                     }}
                     value="false"
                     onClick={handleTimeFormatChange}
@@ -124,7 +126,7 @@ function TimeMenu() {
                         borderRadius: '0px 12px 12px 0px',
                         width: '100%',
                         fontSize: '12px',
-                        ...getSelectedStyle('true', isMilitaryTime.toString(), theme),
+                        ...getSelectedStyle('true', isMilitaryTime.toString(), theme, isDark),
                     }}
                     value="true"
                     onClick={handleTimeFormatChange}
diff --git a/apps/antalmanac/src/components/Map/Map.tsx b/apps/antalmanac/src/components/Map/Map.tsx
index 43fb40963..f54462b0e 100644
--- a/apps/antalmanac/src/components/Map/Map.tsx
+++ b/apps/antalmanac/src/components/Map/Map.tsx
@@ -291,16 +291,13 @@ export default function CourseMap() {
      */
     const startDestPairs = useMemo(() => {
         const allEvents = [...markersToDisplay, ...customEventMarkersToDisplay];
-        return allEvents.reduce(
-            (acc, cur, index) => {
-                acc.push([cur]);
-                if (index > 0) {
-                    acc[index - 1].push(cur);
-                }
-                return acc;
-            },
-            [] as (typeof allEvents)[]
-        );
+        return allEvents.reduce((acc, cur, index) => {
+            acc.push([cur]);
+            if (index > 0) {
+                acc[index - 1].push(cur);
+            }
+            return acc;
+        }, [] as (typeof allEvents)[]);
     }, [markersToDisplay, customEventMarkersToDisplay]);
 
     return (
diff --git a/apps/antalmanac/src/components/RightPane/AddedCourses/AddedCoursePane.tsx b/apps/antalmanac/src/components/RightPane/AddedCourses/AddedCoursePane.tsx
index d443600af..e56f8f65c 100644
--- a/apps/antalmanac/src/components/RightPane/AddedCourses/AddedCoursePane.tsx
+++ b/apps/antalmanac/src/components/RightPane/AddedCourses/AddedCoursePane.tsx
@@ -303,14 +303,11 @@ function SkeletonSchedule() {
     }, []);
 
     const sectionsByTerm: [string, string[]][] = useMemo(() => {
-        const result = skeletonSchedule.courses.reduce(
-            (accumulated, course) => {
-                accumulated[course.term] ??= [];
-                accumulated[course.term].push(course.sectionCode);
-                return accumulated;
-            },
-            {} as Record<string, string[]>
-        );
+        const result = skeletonSchedule.courses.reduce((accumulated, course) => {
+            accumulated[course.term] ??= [];
+            accumulated[course.term].push(course.sectionCode);
+            return accumulated;
+        }, {} as Record<string, string[]>);
 
         return Object.entries(result);
     }, [skeletonSchedule.courses]);
diff --git a/apps/antalmanac/src/components/RightPane/CoursePane/CourseRenderPane.tsx b/apps/antalmanac/src/components/RightPane/CoursePane/CourseRenderPane.tsx
index 1150561a7..2fb68eec9 100644
--- a/apps/antalmanac/src/components/RightPane/CoursePane/CourseRenderPane.tsx
+++ b/apps/antalmanac/src/components/RightPane/CoursePane/CourseRenderPane.tsx
@@ -14,20 +14,17 @@ import loadingGif from './SearchForm/Gifs/loading.gif';
 import darkNoNothing from './static/dark-no_results.png';
 import noNothing from './static/no_results.png';
 import AppStore from '$stores/AppStore';
-import { isDarkMode } from '$lib/helpers';
+import { useThemeStore } from '$stores/SettingsStore';
 import Grades from '$lib/grades';
 import analyticsEnum from '$lib/analytics';
 import { openSnackbar } from '$actions/AppStoreActions';
 import WebSOC from '$lib/websoc';
 
 function getColors() {
-    const courseColors = AppStore.schedule.getCurrentCourses().reduce(
-        (accumulator, { section }) => {
-            accumulator[section.sectionCode] = section.color;
-            return accumulator;
-        },
-        {} as { [key: string]: string }
-    );
+    const courseColors = AppStore.schedule.getCurrentCourses().reduce((accumulator, { section }) => {
+        accumulator[section.sectionCode] = section.color;
+        return accumulator;
+    }, {} as { [key: string]: string });
 
     return courseColors;
 }
@@ -55,6 +52,8 @@ const flattenSOCObject = (SOCObject: WebsocAPIResponse): (WebsocSchool | WebsocD
 const RecruitmentBanner = () => {
     const [bannerVisibility, setBannerVisibility] = useState(true);
 
+    const isDark = useThemeStore((store) => store.isDark);
+
     // Display recruitment banner if more than 11 weeks (in ms) has passed since last dismissal
     const recruitmentDismissalTime = window.localStorage.getItem('recruitmentDismissalTime');
     const dismissedRecently =
@@ -70,8 +69,8 @@ const RecruitmentBanner = () => {
                     icon={false}
                     severity="info"
                     style={{
-                        color: isDarkMode() ? '#ece6e6' : '#2e2e2e',
-                        backgroundColor: isDarkMode() ? '#2e2e2e' : '#ece6e6',
+                        color: isDark ? '#ece6e6' : '#2e2e2e',
+                        backgroundColor: isDark ? '#2e2e2e' : '#ece6e6',
                     }}
                     action={
                         <IconButton
@@ -147,18 +146,20 @@ const SectionTableWrapped = (
 };
 
 const LoadingMessage = () => {
+    const isDark = useThemeStore((store) => store.isDark);
     return (
         <Box sx={{ height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
-            <img src={isDarkMode() ? darkModeLoadingGif : loadingGif} alt="Loading courses" />
+            <img src={isDark ? darkModeLoadingGif : loadingGif} alt="Loading courses" />
         </Box>
     );
 };
 
 const ErrorMessage = () => {
+    const isDark = useThemeStore((store) => store.isDark);
     return (
         <Box sx={{ height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
             <img
-                src={isDarkMode() ? darkNoNothing : noNothing}
+                src={isDark ? darkNoNothing : noNothing}
                 alt="No Results Found"
                 style={{ objectFit: 'contain', width: '80%', height: '80%' }}
             />
diff --git a/apps/antalmanac/src/components/RightPane/RightPaneRoot.tsx b/apps/antalmanac/src/components/RightPane/RightPaneRoot.tsx
index 0c8910ba5..0bde00518 100644
--- a/apps/antalmanac/src/components/RightPane/RightPaneRoot.tsx
+++ b/apps/antalmanac/src/components/RightPane/RightPaneRoot.tsx
@@ -8,7 +8,7 @@ import CoursePane from './CoursePane/CoursePaneRoot';
 import darkModeLoadingGif from './CoursePane/SearchForm/Gifs/dark-loading.gif';
 import loadingGif from './CoursePane/SearchForm/Gifs/loading.gif';
 import { useTabStore } from '$stores/TabStore';
-import { isDarkMode } from '$lib/helpers';
+import { useThemeStore } from '$stores/SettingsStore';
 
 const UCIMap = React.lazy(() => import('../Map'));
 
@@ -56,6 +56,8 @@ const tabs: Array<TabInfo> = [
 export default function Desktop({ style }: DesktopTabsProps) {
     const { activeTab, setActiveTab } = useTabStore();
 
+    const isDark = useThemeStore((store) => store.isDark);
+
     return (
         <Box style={{ ...style, margin: '0 4px' }}>
             <Paper elevation={0} variant="outlined" square style={{ borderRadius: '4px 4px 0 0' }}>
@@ -91,7 +93,7 @@ export default function Desktop({ style }: DesktopTabsProps) {
                     <Suspense
                         fallback={
                             <div style={styles.fallback}>
-                                <img src={isDarkMode() ? darkModeLoadingGif : loadingGif} alt="Loading map" />
+                                <img src={isDark ? darkModeLoadingGif : loadingGif} alt="Loading map" />
                             </div>
                         }
                     >
diff --git a/apps/antalmanac/src/components/RightPane/SectionTable/EnrollmentHistoryPopup.tsx b/apps/antalmanac/src/components/RightPane/SectionTable/EnrollmentHistoryPopup.tsx
index 4a475aac7..3394532ad 100644
--- a/apps/antalmanac/src/components/RightPane/SectionTable/EnrollmentHistoryPopup.tsx
+++ b/apps/antalmanac/src/components/RightPane/SectionTable/EnrollmentHistoryPopup.tsx
@@ -3,7 +3,7 @@ import { LineChart, Line, CartesianGrid, ResponsiveContainer, XAxis, YAxis, Tool
 import { Box, Link, Typography, Skeleton, useMediaQuery } from '@mui/material';
 import { MOBILE_BREAKPOINT } from '../../../globals';
 import { DepartmentEnrollmentHistory, EnrollmentHistory } from '$lib/enrollmentHistory';
-import { isDarkMode } from '$lib/helpers';
+import { useThemeStore } from '$stores/SettingsStore';
 
 export interface EnrollmentHistoryPopupProps {
     department: string;
@@ -28,9 +28,9 @@ export function EnrollmentHistoryPopup({ department, courseNumber }: EnrollmentH
             enrollmentHistory.quarter
         } | ${enrollmentHistory.instructors.join(', ')}`;
     }, [courseNumber, department, enrollmentHistory]);
-
+    const isDarkMode = useThemeStore((state) => state.isDark);
     const encodedDept = useMemo(() => encodeURIComponent(department), [department]);
-    const axisColor = isDarkMode() ? '#fff' : '#111';
+    const axisColor = isDarkMode ? '#fff' : '#111';
     const tooltipDateColor = '#111';
 
     useEffect(() => {
diff --git a/apps/antalmanac/src/components/RightPane/SectionTable/GradesPopup.tsx b/apps/antalmanac/src/components/RightPane/SectionTable/GradesPopup.tsx
index 01045f8d0..e2467e015 100644
--- a/apps/antalmanac/src/components/RightPane/SectionTable/GradesPopup.tsx
+++ b/apps/antalmanac/src/components/RightPane/SectionTable/GradesPopup.tsx
@@ -1,7 +1,7 @@
 import { useState, useEffect, useMemo } from 'react';
 import { Bar, BarChart, CartesianGrid, ResponsiveContainer, XAxis, YAxis } from 'recharts';
 import { Box, Link, Typography, Skeleton } from '@mui/material';
-import { isDarkMode } from '$lib/helpers';
+import { useThemeStore } from '$stores/SettingsStore';
 import GradesHelper, { type Grades } from '$lib/grades';
 
 export interface GradeData {
@@ -51,6 +51,8 @@ export interface GradesPopupProps {
 }
 
 function GradesPopup(props: GradesPopupProps) {
+    const appTheme = useThemeStore((store) => store.appTheme);
+
     const { deptCode, courseNumber, instructor = '', isMobileScreen } = props;
 
     const [loading, setLoading] = useState(true);
@@ -106,7 +108,7 @@ function GradesPopup(props: GradesPopupProps) {
     }
 
     const encodedDept = encodeURIComponent(deptCode);
-    const axisColor = isDarkMode() ? '#fff' : '#111';
+    const axisColor = isDark ? '#fff' : '#111';
 
     return (
         <Box sx={{ padding: '4px' }}>
diff --git a/apps/antalmanac/src/components/RightPane/SectionTable/PrereqTree.tsx b/apps/antalmanac/src/components/RightPane/SectionTable/PrereqTree.tsx
index 1bc339d09..90e3ee0d4 100644
--- a/apps/antalmanac/src/components/RightPane/SectionTable/PrereqTree.tsx
+++ b/apps/antalmanac/src/components/RightPane/SectionTable/PrereqTree.tsx
@@ -4,7 +4,7 @@ import { FC, useState } from 'react';
 import { Button, Modal, Popover } from '@material-ui/core';
 
 import { CourseInfo } from './CourseInfoBar';
-import { isDarkMode } from '$lib/helpers';
+import { useThemeStore } from '$stores/SettingsStore';
 
 import './PrereqTree.css';
 
@@ -23,13 +23,14 @@ interface NodeProps {
 }
 
 const Node: FC<NodeProps> = (props) => {
+    const appTheme = useThemeStore((store) => store.appTheme);
     return (
         <div style={{ padding: '1px 0' }} className={`${props.node}`} key={props.index}>
             <div
                 className={'course'}
                 style={{
-                    backgroundColor: isDarkMode() ? '#303030' : '#e0e0e0',
-                    color: isDarkMode() ? '#bfbfbf' : 'black',
+                    backgroundColor: isDark ? '#303030' : '#e0e0e0',
+                    color: isDark ? '#bfbfbf' : 'black',
                 }}
             >
                 {props.label}
diff --git a/apps/antalmanac/src/components/RightPane/SectionTable/SectionTableBody.tsx b/apps/antalmanac/src/components/RightPane/SectionTable/SectionTableBody.tsx
index 79cc5f140..d1d1b1dce 100644
--- a/apps/antalmanac/src/components/RightPane/SectionTable/SectionTableBody.tsx
+++ b/apps/antalmanac/src/components/RightPane/SectionTable/SectionTableBody.tsx
@@ -25,7 +25,7 @@ import { ColorAndDelete, ScheduleAddCell } from './SectionTableButtons';
 import restrictionsMapping from './static/restrictionsMapping.json';
 import GradesPopup from './GradesPopup';
 import analyticsEnum, { logAnalytics } from '$lib/analytics';
-import { clickToCopy, isDarkMode } from '$lib/helpers';
+import { clickToCopy } from '$lib/helpers';
 import { CourseDetails } from '$lib/course_data.types';
 import Grades from '$lib/grades';
 import AppStore from '$stores/AppStore';
@@ -33,7 +33,7 @@ import { useTabStore } from '$stores/TabStore';
 import locationIds from '$lib/location_ids';
 import { normalizeTime, parseDaysString, formatTimes } from '$stores/calendarizeHelpers';
 import useColumnStore, { type SectionTableColumn } from '$stores/ColumnStore';
-import { usePreviewStore, useTimeFormatStore } from '$stores/SettingsStore';
+import { usePreviewStore, useTimeFormatStore, useThemeStore } from '$stores/SettingsStore';
 import { useHoveredStore } from '$stores/HoveredStore';
 
 const styles: Styles<Theme, object> = (theme) => ({
@@ -41,7 +41,6 @@ const styles: Styles<Theme, object> = (theme) => ({
         display: 'inline-flex',
         cursor: 'pointer',
         '&:hover': {
-            color: isDarkMode() ? 'gold' : 'blueviolet',
             cursor: 'pointer',
         },
         alignSelf: 'center',
@@ -51,23 +50,12 @@ const styles: Styles<Theme, object> = (theme) => ({
             backgroundColor: theme.palette.action.hover,
         },
     },
-    tr: {
-        '&.addedCourse': {
-            background: isDarkMode() ? '#b0b04f' : '#fcfc97',
-        },
-        '&.scheduleConflict': {
-            background: isDarkMode() ? '#121212' : '#a0a0a0',
-            opacity: isDarkMode() ? 0.6 : 1,
-        },
-    },
     cell: {},
     link: {
         textDecoration: 'underline',
-        color: isDarkMode() ? 'dodgerblue' : 'blue',
         cursor: 'pointer',
     },
     mapLink: {
-        color: isDarkMode() ? 'dodgerblue' : 'blue',
         cursor: 'pointer',
         background: 'none !important',
         border: 'none',
@@ -101,7 +89,6 @@ const styles: Styles<Theme, object> = (theme) => ({
     Tap: { color: '#8d2df0' },
     Tut: { color: '#ffc705' },
     popoverText: {
-        color: isDarkMode() ? 'dodgerblue' : 'blue',
         cursor: 'pointer',
     },
     codeCell: {
@@ -122,8 +109,20 @@ interface CourseCodeCellProps {
 }
 
 const CourseCodeCell = withStyles(styles)((props: CourseCodeCellProps) => {
+    const isDark = useThemeStore((store) => store.isDark);
+
     const { classes, sectionCode } = props;
 
+    const [isHovered, setIsHovered] = useState(false);
+
+    const handleMouseEnter = () => {
+        setIsHovered(true);
+    };
+
+    const handleMouseLeave = () => {
+        setIsHovered(false);
+    };
+
     return (
         <NoPaddingTableCell className={`${classes.cell} ${classes.codeCell}`}>
             <Tooltip title="Click to copy course code" placement="bottom" enterDelay={150}>
@@ -137,6 +136,11 @@ const CourseCodeCell = withStyles(styles)((props: CourseCodeCellProps) => {
                     }}
                     className={classes.sectionCode}
                     label={sectionCode}
+                    onMouseEnter={handleMouseEnter}
+                    onMouseLeave={handleMouseLeave}
+                    style={{
+                        color: isHovered ? (isDark ? 'gold' : 'blueviolet') : '',
+                    }}
                     size="small"
                 />
             </Tooltip>
@@ -233,6 +237,8 @@ interface GPACellProps {
 }
 
 function GPACell(props: GPACellProps) {
+    const isDark = useThemeStore((store) => store.isDark);
+
     const { deptCode, courseNumber, instructors } = props;
 
     const [gpa, setGpa] = useState('');
@@ -264,7 +270,7 @@ function GPACell(props: GPACellProps) {
         <NoPaddingTableCell>
             <Button
                 style={{
-                    color: isDarkMode() ? 'dodgerblue' : 'blue',
+                    color: isDark ? 'dodgerblue' : 'blue',
                     padding: 0,
                     minWidth: 0,
                     fontWeight: 400,
@@ -301,6 +307,8 @@ interface LocationsCellProps {
 }
 
 const LocationsCell = withStyles(styles)((props: LocationsCellProps) => {
+    const isDark = useThemeStore((store) => store.isDark);
+
     const { classes, meetings } = props;
 
     const { setActiveTab } = useTabStore();
@@ -318,7 +326,12 @@ const LocationsCell = withStyles(styles)((props: LocationsCellProps) => {
                         const buildingId = locationIds[buildingName];
                         return (
                             <Fragment key={meeting.timeIsTBA + bldg}>
-                                <Link className={classes.mapLink} to={`/map?location=${buildingId}`} onClick={focusMap}>
+                                <Link
+                                    className={classes.mapLink}
+                                    to={`/map?location=${buildingId}`}
+                                    onClick={focusMap}
+                                    color={isDark ? 'dodgerblue' : 'blue'}
+                                >
                                     {bldg}
                                 </Link>
                                 <br />
@@ -485,6 +498,8 @@ const tableBodyCells: Record<SectionTableColumn, React.ComponentType<any>> = {
 };
 
 const SectionTableBody = withStyles(styles)((props: SectionTableBodyProps) => {
+    const isDark = useThemeStore((store) => store.isDark);
+
     const { classes, section, courseDetails, term, allowHighlight, scheduleNames } = props;
 
     const activeColumns = useColumnStore((store) => store.activeColumns);
@@ -607,8 +622,6 @@ const SectionTableBody = withStyles(styles)((props: SectionTableBodyProps) => {
                 // allowHighlight is ALWAYS false when in Added Course Pane and ALWAYS true when in CourseRenderPane
                 addedCourse ? { addedCourse: addedCourse && allowHighlight } : { scheduleConflict: scheduleConflict }
             )}
-            onMouseEnter={handleHover}
-            onMouseLeave={handleHover}
         >
             {!addedCourse ? (
                 <ScheduleAddCell
diff --git a/apps/antalmanac/src/components/buttons/Screenshot.tsx b/apps/antalmanac/src/components/buttons/Screenshot.tsx
index e73bcd1ce..be08ccbfe 100644
--- a/apps/antalmanac/src/components/buttons/Screenshot.tsx
+++ b/apps/antalmanac/src/components/buttons/Screenshot.tsx
@@ -6,17 +6,18 @@ import html2canvas from 'html2canvas';
 import { PureComponent } from 'react';
 
 import analyticsEnum, { logAnalytics } from '$lib/analytics';
-import { isDarkMode } from '$lib/helpers';
+import { useThemeStore } from '$stores/SettingsStore';
 
 class ScreenshotButton extends PureComponent {
     handleClick = () => {
+        const isDark = useThemeStore((store) => store.isDark);
         logAnalytics({
             category: analyticsEnum.calendar.title,
             action: analyticsEnum.calendar.actions.SCREENSHOT,
         });
         void html2canvas(document.getElementById('screenshot') as HTMLElement, {
             scale: 2.5,
-            backgroundColor: isDarkMode() ? '#303030' : '#fafafa',
+            backgroundColor: isDark ? '#303030' : '#fafafa',
         }).then((canvas) => {
             const imgRaw = canvas.toDataURL('image/png');
             saveAs(imgRaw, 'Schedule.png');
diff --git a/apps/antalmanac/src/components/dialogs/AddSchedule.tsx b/apps/antalmanac/src/components/dialogs/AddSchedule.tsx
index 318da32fe..21f475047 100644
--- a/apps/antalmanac/src/components/dialogs/AddSchedule.tsx
+++ b/apps/antalmanac/src/components/dialogs/AddSchedule.tsx
@@ -10,7 +10,7 @@ import {
     Box,
 } from '@mui/material';
 import { addSchedule } from '$actions/AppStoreActions';
-import { isDarkMode } from '$lib/helpers';
+import { useThemeStore } from '$stores/SettingsStore';
 import AppStore from '$stores/AppStore';
 
 type ScheduleNameDialogProps = DialogProps;
@@ -19,6 +19,8 @@ type ScheduleNameDialogProps = DialogProps;
  * Dialog with a text field to add a schedule.
  */
 function AddScheduleDialog(props: ScheduleNameDialogProps) {
+    const isDark = useThemeStore((store) => store.isDark);
+
     /**
      * {@link props.onClose} also needs to be forwarded to the {@link Dialog} component.
      * A custom {@link onKeyDown} handler is provided to handle the Enter and Escape keys.
@@ -88,7 +90,7 @@ function AddScheduleDialog(props: ScheduleNameDialogProps) {
             </DialogContent>
 
             <DialogActions>
-                <Button onClick={handleCancel} color={isDarkMode() ? 'secondary' : 'primary'}>
+                <Button onClick={handleCancel} color={isDark ? 'secondary' : 'primary'}>
                     Cancel
                 </Button>
                 <Button onClick={submitName} variant="contained" color="primary" disabled={name.trim() === ''}>
diff --git a/apps/antalmanac/src/components/dialogs/DeleteSchedule.tsx b/apps/antalmanac/src/components/dialogs/DeleteSchedule.tsx
index 1dc62fd1d..0c0919f9e 100644
--- a/apps/antalmanac/src/components/dialogs/DeleteSchedule.tsx
+++ b/apps/antalmanac/src/components/dialogs/DeleteSchedule.tsx
@@ -9,7 +9,7 @@ import {
     type DialogProps,
 } from '@mui/material';
 import { deleteSchedule } from '$actions/AppStoreActions';
-import { isDarkMode } from '$lib/helpers';
+import { useThemeStore } from '$stores/SettingsStore';
 import AppStore from '$stores/AppStore';
 
 interface ScheduleNameDialogProps extends DialogProps {
@@ -23,6 +23,8 @@ interface ScheduleNameDialogProps extends DialogProps {
  * Dialog with a prompt to delete the specified schedule.
  */
 function DeleteScheduleDialog(props: ScheduleNameDialogProps) {
+    const isDark = useThemeStore((store) => store.isDark);
+
     /**
      * {@link props.onClose} also needs to be forwarded to the {@link Dialog} component.
      */
@@ -55,7 +57,7 @@ function DeleteScheduleDialog(props: ScheduleNameDialogProps) {
             </DialogContent>
 
             <DialogActions>
-                <Button onClick={handleCancel} color={isDarkMode() ? 'secondary' : 'primary'}>
+                <Button onClick={handleCancel} color={isDark ? 'secondary' : 'primary'}>
                     Cancel
                 </Button>
                 <Button onClick={handleDelete} variant="contained" color="primary">
diff --git a/apps/antalmanac/src/components/dialogs/RenameSchedule.tsx b/apps/antalmanac/src/components/dialogs/RenameSchedule.tsx
index 8ee66fc06..16bc7315f 100644
--- a/apps/antalmanac/src/components/dialogs/RenameSchedule.tsx
+++ b/apps/antalmanac/src/components/dialogs/RenameSchedule.tsx
@@ -10,7 +10,6 @@ import {
     type DialogProps,
 } from '@mui/material';
 import { renameSchedule } from '$actions/AppStoreActions';
-import { isDarkMode } from '$lib/helpers';
 import AppStore from '$stores/AppStore';
 
 interface ScheduleNameDialogProps extends DialogProps {
diff --git a/apps/antalmanac/src/lib/buildingCatalogue.ts b/apps/antalmanac/src/lib/buildingCatalogue.ts
index fc8a8411e..312378e2d 100644
--- a/apps/antalmanac/src/lib/buildingCatalogue.ts
+++ b/apps/antalmanac/src/lib/buildingCatalogue.ts
@@ -168,30 +168,12 @@ export default {
         lng: -117.849297,
         imageURLs: ['463/vista-field.jpg'],
     },
-    83057: {
-        name: 'Biological Sciences III (BS3)',
-        lat: 33.645363,
-        lng: -117.846222,
-        imageURLs: ['463/biological-sciences-iii.jpg'],
-    },
     83058: {
         name: 'Bison Modular (BIMO)',
         lat: 33.643814,
         lng: -117.84639,
         imageURLs: ['463/bison-modular.jpg'],
     },
-    83059: {
-        name: 'Bonney Research Laboratory (BRL)',
-        lat: 33.646461,
-        lng: -117.846169,
-        imageURLs: ['463/bonney-research-laboratory.jpg'],
-    },
-    83060: {
-        name: 'Center for the Neurobiology of Learning & Memory Annex (CNLM)',
-        lat: 33.646629,
-        lng: -117.846428,
-        imageURLs: ['463/center-for-the-neurobiology-of-learning-and-memory-annex.jpg'],
-    },
     83061: {
         name: 'Greenhouse',
         lat: 33.64732,
@@ -204,24 +186,12 @@ export default {
         lng: -117.844887,
         imageURLs: ['463/mcgaugh-hall.jpg'],
     },
-    83063: {
-        name: 'Qureshey Research Laboratory (QRL)',
-        lat: 33.646648,
-        lng: -117.845764,
-        imageURLs: ['463/qureshey-research-laboratory.jpg'],
-    },
     83064: {
         name: 'Howard Schneiderman Lecture Hall (HSLH)',
         lat: 33.645618,
         lng: -117.844666,
         imageURLs: ['463/howard-schneiderman-lecture-hall.jpg'],
     },
-    83065: {
-        name: 'Steinhaus Hall (SH)',
-        lat: 33.646347,
-        lng: -117.844887,
-        imageURLs: ['463/steinhaus-hall.jpg'],
-    },
     83068: {
         name: 'Arroyo Vista',
         lat: 33.646317,
@@ -366,24 +336,18 @@ export default {
         lng: -117.841713,
         imageURLs: ['463/information-and-computer-science-ii.jpg'],
     },
-    83099: {
-        name: 'Interim Classroom Facility (ICF)',
-        lat: 33.644463,
-        lng: -117.840012,
-        imageURLs: ['463/interim-classroom-facility.jpg'],
-    },
+    // 83099: {
+    //     name: 'Interim Classroom Facility (ICF)',
+    //     lat: 33.644463,
+    //     lng: -117.840012,
+    //     imageURLs: ['463/interim-classroom-facility.jpg'],
+    // },
     83101: {
         name: 'Engineering & Computing Trailer (ECT)',
         lat: 33.644051,
         lng: -117.840149,
         imageURLs: ['463/engineering-and-comuting-trailer.jpg'],
     },
-    83102: {
-        name: 'Engineering Gateway (EG)',
-        lat: 33.643215,
-        lng: -117.840157,
-        imageURLs: ['463/engineering-gateway.jpg'],
-    },
     83103: {
         name: 'Engineering Hall (EH)',
         lat: 33.643799,
@@ -618,12 +582,6 @@ export default {
         lng: -117.835938,
         imageURLs: ['463/law.jpg'],
     },
-    83167: {
-        name: 'Multipurpose Academic & Administrative Building (MPAA)',
-        lat: 33.647156,
-        lng: -117.837013,
-        imageURLs: ['463/multipurpose-academic-and-admin-building.jpg'],
-    },
     83168: {
         name: 'Science Library (SLIB)',
         lat: 33.645908,
@@ -648,12 +606,12 @@ export default {
         lng: -117.844681,
         imageURLs: ['463/croul-hall.jpg'],
     },
-    83372: {
-        name: 'Multipurpose Science & Technology Building (MSTB)',
-        lat: 33.64209,
-        lng: -117.844467,
-        imageURLs: ['463/multipurpose-science-and-technology.jpg'],
-    },
+    // 83372: {
+    //     name: 'Multipurpose Science & Technology Building (MSTB)',
+    //     lat: 33.64209,
+    //     lng: -117.844467,
+    //     imageURLs: ['463/multipurpose-science-and-technology.jpg'],
+    // },
     83373: {
         name: 'Natural Sciences I (NS1)',
         lat: 33.644348,
@@ -726,12 +684,6 @@ export default {
         lng: -117.835938,
         imageURLs: ['463/continuing-education-6.jpg'],
     },
-    83544: {
-        name: 'Social Ecology I (SE)',
-        lat: 33.646194,
-        lng: -117.838844,
-        imageURLs: ['463/social-ecology-i.jpg'],
-    },
     83545: {
         name: 'Social Ecology II (SE2)',
         lat: 33.64666,
@@ -756,12 +708,6 @@ export default {
         lng: -117.847198,
         imageURLs: ['463/kuci-radio-station.jpg'],
     },
-    83559: {
-        name: 'Student Center (SC)',
-        lat: 33.649323,
-        lng: -117.842255,
-        imageURLs: ['463/student-center_1.jpg'],
-    },
     83560: {
         name: 'Student Health Center (SHC)',
         lat: 33.64555,
@@ -774,12 +720,6 @@ export default {
         lng: -117.842316,
         imageURLs: ['463/student-services-i.jpg'],
     },
-    83565: {
-        name: 'Social & Behavioral Sciences Gateway (SBSG)',
-        lat: 33.647488,
-        lng: -117.839165,
-        imageURLs: ['463/social-and-behavioral-sciences-gateway.jpg'],
-    },
     83566: {
         name: 'Social Science Hall (SSH)',
         lat: 33.646236,
@@ -810,12 +750,6 @@ export default {
         lng: -117.839096,
         imageURLs: ['463/social-science-plaza-b.jpg'],
     },
-    83571: {
-        name: 'Social Science Tower (SST)',
-        lat: 33.646591,
-        lng: -117.840294,
-        imageURLs: ['463/social-science-tower.jpg'],
-    },
     83572: {
         name: 'Social Science Trailer (SSTR)',
         lat: 33.647007,
@@ -888,12 +822,6 @@ export default {
         lng: -117.838409,
         imageURLs: ['463/university-tower-2.jpg'],
     },
-    99610: {
-        name: 'Interim Classroom Facility (ICF)',
-        lat: 33.644463,
-        lng: -117.840012,
-        imageURLs: ['463/interim-classroom-facility.jpg'],
-    },
     101047: {
         name: 'University Hills Community Center',
         lat: 33.636307,
@@ -924,18 +852,6 @@ export default {
         lng: -117.838112,
         imageURLs: ['463/business-ii.jpg'],
     },
-    114585: {
-        name: '100 Theory',
-        lat: 33.644245,
-        lng: -117.855675,
-        imageURLs: [],
-    },
-    114586: {
-        name: 'Anteater Instruction & Research Building (AIRB)',
-        lat: 33.643009,
-        lng: -117.838013,
-        imageURLs: ['463/anteater-instruction-and-research-building.jpg'],
-    },
     114588: {
         name: 'Beckman Center of the National Academies of Sciences & Engineering',
         lat: 33.649414,
@@ -996,54 +912,24 @@ export default {
         lng: -117.840157,
         imageURLs: ['463/engineering-gateway.jpg'],
     },
-    114601: {
-        name: 'Engineering Laboratory Facility (ELF)',
-        lat: 33.643822,
-        lng: -117.839622,
-        imageURLs: ['463/engineering-laboratory-facility.jpg'],
-    },
     114602: {
         name: 'Little Theatre',
         lat: 33.647213,
         lng: -117.844063,
         imageURLs: ['463/little-theatre.jpg'],
     },
-    114603: {
-        name: 'Humanities Interim Classroom Facility (HICF) | Studio Art Trailer',
-        lat: 33.646919,
-        lng: -117.84687,
-        imageURLs: ['463/humanities-interim-classroom-facility.jpg'],
-    },
     114604: {
         name: 'Multipurpose Academic & Administrative Building (MPAA)',
         lat: 33.647156,
         lng: -117.837013,
         imageURLs: ['463/multipurpose-academic-and-admin-building.jpg'],
     },
-    114605: {
-        name: 'Beckman Laser Institute (BLI)',
-        lat: 33.644192,
-        lng: -117.849915,
-        imageURLs: ['463/beckman-laser-institute.jpg'],
-    },
-    114606: {
-        name: 'Gillespie Neuroscience Research Facility (GNRF)',
-        lat: 33.644009,
-        lng: -117.851265,
-        imageURLs: ['463/gillespie-neuroscience-research-facility.jpg'],
-    },
     114607: {
         name: 'Sue & Bill Gross Hall: A CIRM Institute',
         lat: 33.643555,
         lng: -117.851501,
         imageURLs: ['463/gross-hall.jpg'],
     },
-    114608: {
-        name: 'Hewitt Research Hall (HRH)',
-        lat: 33.643505,
-        lng: -117.851921,
-        imageURLs: ['463/hewitt-hall.jpg'],
-    },
     114609: {
         name: 'Plumwood House (PH)',
         lat: 33.644718,
@@ -1080,36 +966,18 @@ export default {
         lng: -117.845291,
         imageURLs: ['463/physical-sciences-high-bay.jpg'],
     },
-    114615: {
-        name: 'Rowland Hall (RH)',
-        lat: 33.644531,
-        lng: -117.844162,
-        imageURLs: ['463/rowland-hall.jpg'],
-    },
     114616: {
         name: 'Anteater Instruction & Research Building (AIRB)',
         lat: 33.643009,
         lng: -117.838013,
         imageURLs: ['463/anteater-instruction-and-research-building.jpg'],
     },
-    114618: {
-        name: 'Sprague Hall (SPH)',
-        lat: 33.644062,
-        lng: -117.852066,
-        imageURLs: ['463/sprague-hall.jpg'],
-    },
     114621: {
         name: 'Facilities Management Building',
         lat: 33.664715,
         lng: -117.854805,
         imageURLs: [],
     },
-    114622: {
-        name: 'Humanities Gateway (HG)',
-        lat: 33.648266,
-        lng: -117.844406,
-        imageURLs: ['463/humanities-gateway.jpg'],
-    },
     114623: {
         name: 'Social Ecology I (SE)',
         lat: 33.646194,
@@ -1710,12 +1578,6 @@ export default {
         lng: -117.837051,
         imageURLs: ['463/banning-house.jpg'],
     },
-    407362: {
-        name: 'Gateway Study Center (GC)',
-        lat: 33.647388,
-        lng: -117.841873,
-        imageURLs: ['463/gateway-study-center.jpg'],
-    },
     444368: {
         name: 'Plaza Verde',
         lat: 33.648224,
@@ -1812,24 +1674,6 @@ export default {
         lng: -117.844414,
         imageURLs: [],
     },
-    454486: {
-        name: 'Medical Surge I (MS1)',
-        lat: 33.646484,
-        lng: -117.850174,
-        imageURLs: ['463/medical-surge-i.jpg'],
-    },
-    454487: {
-        name: 'Donald Bren Hall (DBH)',
-        lat: 33.643288,
-        lng: -117.841965,
-        imageURLs: ['463/donald-bren-hall.jpg'],
-    },
-    454488: {
-        name: 'Engineering Hall (EH)',
-        lat: 33.643799,
-        lng: -117.841202,
-        imageURLs: ['463/engineering-hall.jpg'],
-    },
     454489: {
         name: 'Air Pollution Health Effects Laboratory (APHEL)',
         lat: 33.664837,
diff --git a/apps/antalmanac/src/lib/helpers.ts b/apps/antalmanac/src/lib/helpers.ts
index f4004dd51..3d2709588 100644
--- a/apps/antalmanac/src/lib/helpers.ts
+++ b/apps/antalmanac/src/lib/helpers.ts
@@ -2,7 +2,6 @@ import React from 'react';
 
 import { PETERPORTAL_GRAPHQL_ENDPOINT } from './api/endpoints';
 import { openSnackbar } from '$actions/AppStoreActions';
-import { useThemeStore } from '$stores/SettingsStore';
 
 export async function queryGraphQL<PromiseReturnType>(queryString: string): Promise<PromiseReturnType | null> {
     const query = JSON.stringify({
@@ -41,15 +40,4 @@ export async function clickToCopy(event: React.MouseEvent<HTMLElement, MouseEven
     openSnackbar('success', 'WebsocSection code copied to clipboard');
 }
 
-export function isDarkMode() {
-    switch (useThemeStore.getState().appTheme) {
-        case 'light':
-            return false;
-        case 'dark':
-            return true;
-        default:
-            return window.matchMedia('(prefers-color-scheme: dark)').matches;
-    }
-}
-
 export const FAKE_LOCATIONS = ['VRTL REMOTE', 'ON LINE', 'TBA'];
diff --git a/apps/antalmanac/src/stores/SettingsStore.ts b/apps/antalmanac/src/stores/SettingsStore.ts
index eab601688..3e691a182 100644
--- a/apps/antalmanac/src/stores/SettingsStore.ts
+++ b/apps/antalmanac/src/stores/SettingsStore.ts
@@ -1,49 +1,48 @@
 import { create } from 'zustand';
 import analyticsEnum, { logAnalytics } from '$lib/analytics';
 
+export type ThemeSetting = 'light' | 'dark' | 'system';
+
 export interface ThemeStore {
     /**
      * The 'raw' theme, based on the user's selected setting
      */
-    themeSetting: 'light' | 'dark' | 'system';
+    themeSetting: ThemeSetting;
     /**
      * The 'derived' theme, based on user settings and device preferences
      */
     appTheme: 'light' | 'dark';
-    setAppTheme: (themeSetting: 'light' | 'dark' | 'system') => void;
+    isDark: boolean;
+
+    setAppTheme: (themeSetting: ThemeSetting) => void;
 }
 
-export const useThemeStore = create<ThemeStore>((set) => {
-    const themeSetting = typeof Storage !== 'undefined' ? window.localStorage.getItem('theme') ?? 'system' : 'system';
+function themeShouldBeDark(themeSetting: ThemeSetting) {
+    if (themeSetting == 'system') return window.matchMedia('(prefers-color-scheme: dark)').matches;
+    return themeSetting == 'dark';
+}
 
-    const appTheme =
-        themeSetting !== 'system'
-            ? themeSetting
-            : window.matchMedia('(prefers-color-scheme: dark)').matches
-              ? 'dark'
-              : 'light';
+export const useThemeStore = create<ThemeStore>((set) => {
+    const storedThemeSetting: ThemeSetting = (window.localStorage?.getItem('theme') ?? 'system') as ThemeSetting;
+    const isDark = themeShouldBeDark(storedThemeSetting);
 
     return {
-        themeSetting: themeSetting as 'light' | 'dark' | 'system',
-        appTheme: appTheme as 'light' | 'dark',
+        themeSetting: storedThemeSetting,
+        appTheme: isDark ? 'dark' : 'light',
+        isDark: isDark,
+
         setAppTheme: (themeSetting) => {
-            if (typeof Storage !== 'undefined') {
-                window.localStorage.setItem('theme', themeSetting);
-            }
+            window.localStorage?.setItem('theme', themeSetting);
 
-            const appTheme =
-                themeSetting !== 'system'
-                    ? themeSetting
-                    : window.matchMedia('(prefers-color-scheme: dark)').matches
-                      ? 'dark'
-                      : 'light';
+            const isDark = themeShouldBeDark(themeSetting);
+            const appTheme = isDark ? 'dark' : 'light';
 
-            set({ appTheme: appTheme, themeSetting: themeSetting });
+            set({ appTheme, themeSetting, isDark });
 
             logAnalytics({
                 category: analyticsEnum.nav.title,
                 action: analyticsEnum.nav.actions.CHANGE_THEME,
-                label: appTheme,
+                label: themeSetting,
             });
         },
     };