diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png
index 8b6f637184d..6abd4082738 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png
index 0cfdffe0d74..e2981f282c6 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png
index 08644ff8375..65935ac1424 100644
Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png differ
diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json
index 5bd8879c351..921766ab9e2 100644
--- a/packages/desktop-client/package.json
+++ b/packages/desktop-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/web",
-  "version": "23.10.0",
+  "version": "23.11.0",
   "license": "MIT",
   "files": [
     "build"
diff --git a/packages/desktop-client/src/components/Titlebar.tsx b/packages/desktop-client/src/components/Titlebar.tsx
index bab3123ba3f..587b3c2f2a0 100644
--- a/packages/desktop-client/src/components/Titlebar.tsx
+++ b/packages/desktop-client/src/components/Titlebar.tsx
@@ -41,15 +41,21 @@ import useSheetValue from './spreadsheet/useSheetValue';
 import { ThemeSelector } from './ThemeSelector';
 import { Tooltip } from './tooltips';
 
-export let TitlebarContext = createContext(null);
+export type TitlebarContextValue = {
+  sendEvent: (msg: string) => void;
+  subscribe: (listener) => () => void;
+};
+
+export let TitlebarContext = createContext<TitlebarContextValue>(null);
 
 type TitlebarProviderProps = {
   children?: ReactNode;
 };
+
 export function TitlebarProvider({ children }: TitlebarProviderProps) {
   let listeners = useRef([]);
 
-  function sendEvent(msg) {
+  function sendEvent(msg: string) {
     listeners.current.forEach(func => func(msg));
   }
 
diff --git a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
index 943a6a69298..4cbdb09f754 100644
--- a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
+++ b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
@@ -58,7 +58,7 @@ export default function BalanceWithCarryover({
             alignSelf: 'center',
             marginLeft: 2,
             position: 'absolute',
-            right: -4,
+            right: -8,
             top: 0,
             bottom: 0,
             justifyContent: 'center',
diff --git a/packages/desktop-client/src/components/budget/BudgetPageHeader.js b/packages/desktop-client/src/components/budget/BudgetPageHeader.tsx
similarity index 72%
rename from packages/desktop-client/src/components/budget/BudgetPageHeader.js
rename to packages/desktop-client/src/components/budget/BudgetPageHeader.tsx
index 6f711901168..c5f3576c70b 100644
--- a/packages/desktop-client/src/components/budget/BudgetPageHeader.js
+++ b/packages/desktop-client/src/components/budget/BudgetPageHeader.tsx
@@ -1,4 +1,4 @@
-import React, { memo } from 'react';
+import React, { type ComponentProps, memo } from 'react';
 
 import * as monthUtils from 'loot-core/src/shared/months';
 
@@ -7,8 +7,15 @@ import View from '../common/View';
 import { MonthPicker } from './MonthPicker';
 import { getScrollbarWidth } from './util';
 
-const BudgetPageHeader = memo(
-  ({ startMonth, onMonthSelect, numMonths, monthBounds, style }) => {
+type BudgetPageHeaderProps = {
+  startMonth: string;
+  onMonthSelect: (month: string) => void;
+  numMonths: number;
+  monthBounds: ComponentProps<typeof MonthPicker>['monthBounds'];
+};
+
+const BudgetPageHeader = memo<BudgetPageHeaderProps>(
+  ({ startMonth, onMonthSelect, numMonths, monthBounds }) => {
     function getValidMonth(month) {
       let start = monthBounds.start;
       let end = monthUtils.subMonths(monthBounds.end, numMonths - 1);
diff --git a/packages/desktop-client/src/components/budget/DynamicBudgetTable.js b/packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx
similarity index 76%
rename from packages/desktop-client/src/components/budget/DynamicBudgetTable.js
rename to packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx
index dbd83c50abe..51ab9df2761 100644
--- a/packages/desktop-client/src/components/budget/DynamicBudgetTable.js
+++ b/packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef, useEffect } from 'react';
+import React, { forwardRef, useEffect, type ComponentProps } from 'react';
 import { useSelector } from 'react-redux';
 import AutoSizer from 'react-virtualized-auto-sizer';
 
@@ -9,7 +9,7 @@ import { useBudgetMonthCount } from './BudgetMonthCountContext';
 import BudgetPageHeader from './BudgetPageHeader';
 import BudgetTable from './BudgetTable';
 
-function getNumPossibleMonths(width) {
+function getNumPossibleMonths(width: number) {
   let estimatedTableWidth = width - 200;
 
   if (estimatedTableWidth < 500) {
@@ -27,7 +27,15 @@ function getNumPossibleMonths(width) {
   return 6;
 }
 
-const DynamicBudgetTableInner = forwardRef(
+type DynamicBudgetTableInnerProps = {
+  width: number;
+  height: number;
+} & ComponentProps<typeof BudgetTable>;
+
+const DynamicBudgetTableInner = forwardRef<
+  BudgetTable,
+  DynamicBudgetTableInnerProps
+>(
   (
     {
       width,
@@ -92,17 +100,19 @@ const DynamicBudgetTableInner = forwardRef(
   },
 );
 
-export default forwardRef((props, ref) => {
-  return (
-    <AutoSizer>
-      {({ width, height }) => (
-        <DynamicBudgetTableInner
-          ref={ref}
-          width={width}
-          height={height}
-          {...props}
-        />
-      )}
-    </AutoSizer>
-  );
-});
+export default forwardRef<BudgetTable, DynamicBudgetTableInnerProps>(
+  (props, ref) => {
+    return (
+      <AutoSizer>
+        {({ width, height }) => (
+          <DynamicBudgetTableInner
+            ref={ref}
+            width={width}
+            height={height}
+            {...props}
+          />
+        )}
+      </AutoSizer>
+    );
+  },
+);
diff --git a/packages/desktop-client/src/components/budget/index.js b/packages/desktop-client/src/components/budget/index.tsx
similarity index 84%
rename from packages/desktop-client/src/components/budget/index.js
rename to packages/desktop-client/src/components/budget/index.tsx
index 65f984d2a08..dbc3f1bf594 100644
--- a/packages/desktop-client/src/components/budget/index.js
+++ b/packages/desktop-client/src/components/budget/index.tsx
@@ -7,29 +7,37 @@ import React, {
   useRef,
 } from 'react';
 import { useSelector } from 'react-redux';
-import { useLocation, useMatch } from 'react-router-dom';
+import {
+  type NavigateFunction,
+  type PathMatch,
+  useLocation,
+  useMatch,
+} from 'react-router-dom';
 
 import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
+import { type QueriesState } from 'loot-core/src/client/state-types/queries';
 import { send, listen } from 'loot-core/src/platform/client/fetch';
 import {
   addCategory,
-  updateCategory,
   moveCategory,
   moveCategoryGroup,
+  updateCategory,
   deleteCategory,
   addGroup,
   updateGroup,
   deleteGroup,
 } from 'loot-core/src/shared/categories';
 import * as monthUtils from 'loot-core/src/shared/months';
+import { type Handlers } from 'loot-core/src/types/handlers';
+import { type GlobalPrefs, type LocalPrefs } from 'loot-core/src/types/prefs';
 
-import { useActions } from '../../hooks/useActions';
+import { type BoundActions, useActions } from '../../hooks/useActions';
 import useCategories from '../../hooks/useCategories';
 import useFeatureFlag from '../../hooks/useFeatureFlag';
 import useNavigate from '../../hooks/useNavigate';
 import { styles } from '../../style';
 import View from '../common/View';
-import { TitlebarContext } from '../Titlebar';
+import { TitlebarContext, type TitlebarContextValue } from '../Titlebar';
 
 import DynamicBudgetTable from './DynamicBudgetTable';
 import { getValidMonthBounds } from './MonthsContext';
@@ -38,7 +46,56 @@ import { ReportProvider } from './report/ReportContext';
 import * as rollover from './rollover/rollover-components';
 import { RolloverContext } from './rollover/RolloverContext';
 
-function Budget(props) {
+type ReportComponents = {
+  SummaryComponent: typeof report.BudgetSummary;
+  ExpenseCategoryComponent: typeof report.ExpenseCategoryMonth;
+  ExpenseGroupComponent: typeof report.ExpenseGroupMonth;
+  IncomeCategoryComponent: typeof report.IncomeCategoryMonth;
+  IncomeGroupComponent: typeof report.IncomeGroupMonth;
+  BudgetTotalsComponent: typeof report.BudgetTotalsMonth;
+  IncomeHeaderComponent: typeof report.IncomeHeaderMonth;
+};
+
+type RolloverComponents = {
+  SummaryComponent: typeof RolloverBudgetSummary;
+  ExpenseCategoryComponent: typeof rollover.ExpenseCategoryMonth;
+  ExpenseGroupComponent: typeof rollover.ExpenseGroupMonth;
+  IncomeCategoryComponent: typeof rollover.IncomeCategoryMonth;
+  IncomeGroupComponent: typeof rollover.IncomeGroupMonth;
+  BudgetTotalsComponent: typeof rollover.BudgetTotalsMonth;
+  IncomeHeaderComponent: typeof rollover.IncomeHeaderMonth;
+};
+
+type BudgetProps = {
+  accountId?: string;
+  startMonth: LocalPrefs['budget.startMonth'];
+  collapsedPrefs: LocalPrefs['budget.collapsed'];
+  summaryCollapsed: LocalPrefs['budget.summaryCollapsed'];
+  budgetType: LocalPrefs['budgetType'];
+  maxMonths: GlobalPrefs['maxMonths'];
+  categoryGroups: QueriesState['categories']['grouped'];
+  reportComponents: ReportComponents;
+  rolloverComponents: RolloverComponents;
+  titlebar: TitlebarContextValue;
+  match: PathMatch<string>;
+  spreadsheet: ReturnType<typeof useSpreadsheet>;
+  navigate: NavigateFunction;
+  getCategories: BoundActions['getCategories'];
+  savePrefs: BoundActions['savePrefs'];
+  createCategory: BoundActions['createCategory'];
+  updateCategory: BoundActions['updateCategory'];
+  pushModal: BoundActions['pushModal'];
+  deleteCategory: BoundActions['deleteCategory'];
+  createGroup: BoundActions['createGroup'];
+  updateGroup: BoundActions['updateGroup'];
+  deleteGroup: BoundActions['deleteGroup'];
+  applyBudgetAction: BoundActions['applyBudgetAction'];
+  moveCategory: BoundActions['moveCategory'];
+  moveCategoryGroup: BoundActions['moveCategoryGroup'];
+  loadPrefs: BoundActions['loadPrefs'];
+};
+
+function Budget(props: BudgetProps) {
   const currentMonth = monthUtils.currentMonth();
   const tableRef = useRef(null);
 
@@ -130,7 +187,7 @@ function Budget(props) {
   const prewarmMonth = async (month, type = null) => {
     type = type || props.budgetType;
 
-    let method =
+    let method: keyof Handlers =
       type === 'report' ? 'report-budget-month' : 'rollover-budget-month';
 
     let values = await send(method, { month });
@@ -439,7 +496,7 @@ function Budget(props) {
   return <View style={{ flex: 1 }}>{table}</View>;
 }
 
-const RolloverBudgetSummary = memo(props => {
+const RolloverBudgetSummary = memo<{ month: string }>(props => {
   const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');
   return (
     <rollover.BudgetSummary
@@ -470,7 +527,7 @@ export default function BudgetWrapper(props) {
   let match = useMatch(location.pathname);
   let navigate = useNavigate();
 
-  let reportComponents = useMemo(
+  let reportComponents = useMemo<ReportComponents>(
     () => ({
       SummaryComponent: report.BudgetSummary,
       ExpenseCategoryComponent: report.ExpenseCategoryMonth,
@@ -483,7 +540,7 @@ export default function BudgetWrapper(props) {
     [report],
   );
 
-  let rolloverComponents = useMemo(
+  let rolloverComponents = useMemo<RolloverComponents>(
     () => ({
       SummaryComponent: RolloverBudgetSummary,
       ExpenseCategoryComponent: rollover.ExpenseCategoryMonth,
diff --git a/packages/desktop-client/src/components/budget/report/components.tsx b/packages/desktop-client/src/components/budget/report/components.tsx
index fa491dcd10e..9adab83304c 100644
--- a/packages/desktop-client/src/components/budget/report/components.tsx
+++ b/packages/desktop-client/src/components/budget/report/components.tsx
@@ -360,6 +360,7 @@ export const CategoryMonth = memo(function CategoryMonth({
       {!category.is_income && (
         <Field
           name="balance"
+          truncate={false}
           width="flex"
           style={{ paddingRight: styles.monthRightPadding, textAlign: 'right' }}
         >
diff --git a/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx
index 74e1228080f..0399184d59d 100644
--- a/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx
@@ -29,7 +29,7 @@ export default function HoldTooltip({ onSubmit, onClose }: HoldTooltipProps) {
   useEffect(() => {
     (async () => {
       const node = await spreadsheet.get(sheetName, 'to-budget');
-      setAmount(integerToCurrency(Math.max(node.value, 0)));
+      setAmount(integerToCurrency(Math.max(node.value as number, 0)));
     })();
   }, []);
 
diff --git a/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
index 06e8a099f4e..76a4d3b83e7 100644
--- a/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
@@ -51,7 +51,7 @@ export default function TransferTooltip({
     (async () => {
       if (initialAmountName) {
         const node = await spreadsheet.get(sheetName, initialAmountName);
-        setAmount(integerToCurrency(Math.max(node.value, 0)));
+        setAmount(integerToCurrency(Math.max(node.value as number, 0)));
       } else {
         setAmount(integerToCurrency(Math.max(initialAmount, 0)));
       }
diff --git a/packages/desktop-client/src/components/budget/rollover/rollover-components.tsx b/packages/desktop-client/src/components/budget/rollover/rollover-components.tsx
index b63fa03f651..8be56b0bbf8 100644
--- a/packages/desktop-client/src/components/budget/rollover/rollover-components.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/rollover-components.tsx
@@ -187,9 +187,10 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
           <View
             style={{
               flexShrink: 1,
-              marginRight: 0,
-              marginLeft: 3,
+              paddingLeft: 3,
               justifyContent: 'center',
+              borderTopWidth: 1,
+              borderColor: theme.tableBorder,
             }}
           >
             <Button
@@ -311,6 +312,7 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
       </Field>
       <Field
         name="balance"
+        truncate={false}
         width="flex"
         style={{ paddingRight: styles.monthRightPadding, textAlign: 'right' }}
       >
diff --git a/packages/desktop-client/src/components/mobile/MobileForms.js b/packages/desktop-client/src/components/mobile/MobileForms.js
index 21ebbc657a3..66f5bd780f3 100644
--- a/packages/desktop-client/src/components/mobile/MobileForms.js
+++ b/packages/desktop-client/src/components/mobile/MobileForms.js
@@ -32,8 +32,8 @@ export function FieldLabel({ title, flush, style }) {
 const valueStyle = {
   borderWidth: 1,
   borderColor: theme.formInputBorder,
-  marginLeft: -1,
-  marginRight: -1,
+  marginLeft: 8,
+  marginRight: 8,
   height: FIELD_HEIGHT,
   paddingHorizontal: styles.mobileEditingPadding,
 };
diff --git a/packages/desktop-client/src/components/table.tsx b/packages/desktop-client/src/components/table.tsx
index 95cb64a8760..5962eaba509 100644
--- a/packages/desktop-client/src/components/table.tsx
+++ b/packages/desktop-client/src/components/table.tsx
@@ -306,8 +306,9 @@ const readonlyInputStyle = {
 };
 
 type InputValueProps = ComponentProps<typeof Input> & {
-  value: string;
+  value?: string;
 };
+
 function InputValue({
   value: defaultValue,
   onUpdate,
diff --git a/packages/desktop-client/src/components/transactions/MobileTransaction.js b/packages/desktop-client/src/components/transactions/MobileTransaction.js
index 5a88eee4d28..8705224ac7a 100644
--- a/packages/desktop-client/src/components/transactions/MobileTransaction.js
+++ b/packages/desktop-client/src/components/transactions/MobileTransaction.js
@@ -570,14 +570,18 @@ class TransactionEditInner extends PureComponent {
                 />
               </View>
 
-              <View style={{ marginLeft: 35, marginRight: 35 }}>
+              <View style={{ marginLeft: 0, marginRight: 8 }}>
                 <FieldLabel title="Cleared" />
                 <BooleanField
                   checked={transaction.cleared}
                   onUpdate={checked =>
                     this.onEdit(transaction, 'cleared', checked)
                   }
-                  style={{ marginTop: 4 }}
+                  style={{
+                    margin: 'auto',
+                    width: 22,
+                    height: 22,
+                  }}
                 />
               </View>
             </View>
diff --git a/packages/desktop-electron/package.json b/packages/desktop-electron/package.json
index 7e6735e0199..44ab0e5b4ee 100644
--- a/packages/desktop-electron/package.json
+++ b/packages/desktop-electron/package.json
@@ -2,7 +2,7 @@
   "name": "desktop-electron",
   "productName": "Actual",
   "description": "A simple and powerful personal finance system",
-  "version": "23.10.0",
+  "version": "23.11.0",
   "scripts": {
     "clean": "rm -rf dist",
     "update-client": "bin/update-client",
diff --git a/packages/loot-core/src/client/SpreadsheetProvider.tsx b/packages/loot-core/src/client/SpreadsheetProvider.tsx
index 270cba1923a..bb30cda9537 100644
--- a/packages/loot-core/src/client/SpreadsheetProvider.tsx
+++ b/packages/loot-core/src/client/SpreadsheetProvider.tsx
@@ -4,7 +4,8 @@ import LRU from 'lru-cache';
 
 import { listen, send } from '../platform/client/fetch';
 
-const SpreadsheetContext = createContext(undefined);
+type SpreadsheetContextValue = ReturnType<typeof makeSpreadsheet>;
+const SpreadsheetContext = createContext<SpreadsheetContextValue>(undefined);
 
 export function useSpreadsheet() {
   return useContext(SpreadsheetContext);
diff --git a/packages/loot-core/src/client/actions/queries.ts b/packages/loot-core/src/client/actions/queries.ts
index 5631fcbdea0..c32d1ff5d65 100644
--- a/packages/loot-core/src/client/actions/queries.ts
+++ b/packages/loot-core/src/client/actions/queries.ts
@@ -216,7 +216,7 @@ export function updateGroup(group) {
   };
 }
 
-export function deleteGroup(id, transferId) {
+export function deleteGroup(id, transferId?) {
   return async function (dispatch, getState) {
     await send('category-group-delete', { id, transferId });
     await dispatch(getCategories());
diff --git a/packages/loot-core/src/server/spreadsheet/spreadsheet.ts b/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
index 53f62431d52..f098d85cd2e 100644
--- a/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
+++ b/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
@@ -5,7 +5,7 @@ import { compileQuery, runCompiledQuery, schema, schemaConfig } from '../aql';
 import Graph from './graph-data-structure';
 import { unresolveName, resolveName } from './util';
 
-type Node = {
+export type Node = {
   name: string;
   expr: string | number | boolean;
   value: string | number | boolean;
diff --git a/packages/loot-core/src/shared/schedules.ts b/packages/loot-core/src/shared/schedules.ts
index fd0dea98853..a6396b93b14 100644
--- a/packages/loot-core/src/shared/schedules.ts
+++ b/packages/loot-core/src/shared/schedules.ts
@@ -66,17 +66,21 @@ function prettyDayName(day) {
 export function getRecurringDescription(config) {
   let interval = config.interval || 1;
 
+  let weekendSolveSuffix = config.skipWeekend
+    ? ` (${config.weekendSolveMode} weekend) `
+    : '';
+
   switch (config.frequency) {
     case 'daily': {
       let desc = 'Every ';
       desc += interval !== 1 ? `${interval} days` : 'day';
-      return desc;
+      return desc + weekendSolveSuffix;
     }
     case 'weekly': {
       let desc = 'Every ';
       desc += interval !== 1 ? `${interval} weeks` : 'week';
       desc += ' on ' + monthUtils.format(config.start, 'EEEE');
-      return desc;
+      return desc + weekendSolveSuffix;
     }
     case 'monthly': {
       let desc = 'Every ';
@@ -145,13 +149,13 @@ export function getRecurringDescription(config) {
         desc += ' on the ' + monthUtils.format(config.start, 'do');
       }
 
-      return desc;
+      return desc + weekendSolveSuffix;
     }
     case 'yearly': {
       let desc = 'Every ';
       desc += interval !== 1 ? `${interval} years` : 'year';
       desc += ' on ' + monthUtils.format(config.start, 'LLL do');
-      return desc;
+      return desc + weekendSolveSuffix;
     }
     default:
       return 'Recurring error';
diff --git a/packages/loot-core/src/types/prefs.d.ts b/packages/loot-core/src/types/prefs.d.ts
index ef97ecf4383..67e870f4c36 100644
--- a/packages/loot-core/src/types/prefs.d.ts
+++ b/packages/loot-core/src/types/prefs.d.ts
@@ -26,9 +26,10 @@ export type LocalPrefs = Partial<
     'expand-splits': boolean;
     [key: `show-extra-balances-${string}`]: boolean;
     [key: `hide-cleared-${string}`]: boolean;
-    'budget.collapsed': boolean;
+    'budget.collapsed': string[];
     'budget.summaryCollapsed': boolean;
     'budget.showHiddenCategories': boolean;
+    'budget.startMonth': string;
     // TODO: pull from src/components/modals/ImportTransactions.js
     [key: `parse-date-${string}-${'csv' | 'qif'}`]: string;
     [key: `csv-mappings-${string}`]: string;
diff --git a/packages/loot-core/src/types/server-handlers.d.ts b/packages/loot-core/src/types/server-handlers.d.ts
index 252ec501fe2..65d85e18f53 100644
--- a/packages/loot-core/src/types/server-handlers.d.ts
+++ b/packages/loot-core/src/types/server-handlers.d.ts
@@ -3,6 +3,7 @@ import { ParseFileResult } from '../server/accounts/parse-file';
 import { batchUpdateTransactions } from '../server/accounts/transactions';
 import { Backup } from '../server/backups';
 import { RemoteFile } from '../server/cloud-storage';
+import { Node as SpreadsheetNode } from '../server/spreadsheet/spreadsheet';
 import { Message } from '../server/sync';
 
 import { AccountEntity, CategoryEntity, CategoryGroupEntity } from './models';
@@ -51,9 +52,19 @@ export interface ServerHandlers {
 
   'get-budget-bounds': () => Promise<{ start: string; end: string }>;
 
-  'rollover-budget-month': (arg: { month }) => Promise<unknown>;
+  'rollover-budget-month': (arg: { month }) => Promise<
+    {
+      value: string | number | boolean;
+      name: string;
+    }[]
+  >;
 
-  'report-budget-month': (arg: { month }) => Promise<unknown>;
+  'report-budget-month': (arg: { month }) => Promise<
+    {
+      value: string | number | boolean;
+      name: string;
+    }[]
+  >;
 
   'budget-set-type': (arg: { type }) => Promise<unknown>;
 
@@ -100,7 +111,10 @@ export interface ServerHandlers {
     conditions;
   }) => Promise<{ filters: unknown[] }>;
 
-  getCell: (arg: { sheetName; name }) => Promise<unknown>;
+  getCell: (arg: {
+    sheetName;
+    name;
+  }) => Promise<SpreadsheetNode | { value?: SpreadsheetNode['value'] }>;
 
   getCells: (arg: { names }) => Promise<unknown>;
 
diff --git a/upcoming-release-notes/1662.md b/upcoming-release-notes/1662.md
deleted file mode 100644
index 4800358b666..00000000000
--- a/upcoming-release-notes/1662.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: Enhancements
-authors: [joel-jeremy, dmlazaro]
----
-Editable mobile budget cells
diff --git a/upcoming-release-notes/1694.md b/upcoming-release-notes/1694.md
deleted file mode 100644
index 0892ca3bac3..00000000000
--- a/upcoming-release-notes/1694.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Desktop: reconnect to websockets if connection lost or server restarted
diff --git a/upcoming-release-notes/1720.md b/upcoming-release-notes/1720.md
deleted file mode 100644
index 0d72060aa8e..00000000000
--- a/upcoming-release-notes/1720.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [youngcw]
----
-
-Goals: speedup by only run the requested priority levels, skip others
diff --git a/upcoming-release-notes/1724.md b/upcoming-release-notes/1724.md
deleted file mode 100644
index b4308edd4a0..00000000000
--- a/upcoming-release-notes/1724.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [carkom]
----
-
-Consolidate notice colors.
\ No newline at end of file
diff --git a/upcoming-release-notes/1737.md b/upcoming-release-notes/1737.md
deleted file mode 100644
index 41fd66c85fc..00000000000
--- a/upcoming-release-notes/1737.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [joel-jeremy]
----
-
-Various mobile category and group functionalities.
\ No newline at end of file
diff --git a/upcoming-release-notes/1740.md b/upcoming-release-notes/1740.md
deleted file mode 100644
index 8a7b1d32e3e..00000000000
--- a/upcoming-release-notes/1740.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [shaankhosla]
----
-
-Update the NetWorth graph to use the Recharts library.
\ No newline at end of file
diff --git a/upcoming-release-notes/1743.md b/upcoming-release-notes/1743.md
deleted file mode 100644
index 6d54cd5d2d3..00000000000
--- a/upcoming-release-notes/1743.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [Jod929]
----
-
-refactor the following to tsx: IncomeGroup, IncomeHeader, MonthsContext, RenderMonths, SidebarGroup.
\ No newline at end of file
diff --git a/upcoming-release-notes/1745.md b/upcoming-release-notes/1745.md
deleted file mode 100644
index 356a8157cd1..00000000000
--- a/upcoming-release-notes/1745.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [joel-jeremy,MatissJanis]
----
-
-Hide mobile nav bar when scrolling
diff --git a/upcoming-release-notes/1750.md b/upcoming-release-notes/1750.md
deleted file mode 100644
index cb2f399c5e1..00000000000
--- a/upcoming-release-notes/1750.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [shall0pass]
----
-
-End of month cleanup - fixed condition that caused an error with null carryover value
diff --git a/upcoming-release-notes/1751.md b/upcoming-release-notes/1751.md
deleted file mode 100644
index 8ff15646aeb..00000000000
--- a/upcoming-release-notes/1751.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joel-jeremy]
----
-
-Prevent parent transaction being added to transfer account when splitting an existing transaction.
diff --git a/upcoming-release-notes/1753.md b/upcoming-release-notes/1753.md
deleted file mode 100644
index 0e04fb44e96..00000000000
--- a/upcoming-release-notes/1753.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [shall0pass]
----
-
-Goals - Fix schedules 'in between' calculation
diff --git a/upcoming-release-notes/1755.md b/upcoming-release-notes/1755.md
deleted file mode 100644
index 9a27e1ed88c..00000000000
--- a/upcoming-release-notes/1755.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Convert CreateAccount and CreateEncryptionKey components to TypeScript.
diff --git a/upcoming-release-notes/1756.md b/upcoming-release-notes/1756.md
deleted file mode 100644
index 8f0807b2308..00000000000
--- a/upcoming-release-notes/1756.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [carkom]
----
-
-Conslidating and making consistent error colors across all pages in the app.
diff --git a/upcoming-release-notes/1759.md b/upcoming-release-notes/1759.md
deleted file mode 100644
index d66e13d3408..00000000000
--- a/upcoming-release-notes/1759.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [joel-jeremy]
----
-
-Allow linked child transactions.
diff --git a/upcoming-release-notes/1768.md b/upcoming-release-notes/1768.md
deleted file mode 100644
index b8b0545a6a8..00000000000
--- a/upcoming-release-notes/1768.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Convert BudgetSummary modal(mobile) and CreateLocalAccounts components to TypeScript.
diff --git a/upcoming-release-notes/1770.md b/upcoming-release-notes/1770.md
deleted file mode 100644
index a73c4ca0ad8..00000000000
--- a/upcoming-release-notes/1770.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [Compositr, shaankhosla]
----
-
-Sync on Ctrl+S
\ No newline at end of file
diff --git a/upcoming-release-notes/1774.md b/upcoming-release-notes/1774.md
deleted file mode 100644
index 1ad0be8ce55..00000000000
--- a/upcoming-release-notes/1774.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [KaiBelmo]
----
-
-Fix selecting delimiters in CSV options when uploading a CSV; it will apply to parsing. Also added a new delimiter '|'.
\ No newline at end of file
diff --git a/upcoming-release-notes/1776.md b/upcoming-release-notes/1776.md
deleted file mode 100644
index d4c2cd9e547..00000000000
--- a/upcoming-release-notes/1776.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Convert DateSelect component to TypeScript and update category query type.
diff --git a/upcoming-release-notes/1781.md b/upcoming-release-notes/1781.md
deleted file mode 100644
index 536b390a50d..00000000000
--- a/upcoming-release-notes/1781.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [joel-jeremy]
----
-
-Inline mobile edits.
diff --git a/upcoming-release-notes/1783.md b/upcoming-release-notes/1783.md
deleted file mode 100644
index c466bfdc4e7..00000000000
--- a/upcoming-release-notes/1783.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joel-jeremy]
----
-
-Fix alignment of mobile budget header elements.
diff --git a/upcoming-release-notes/1784.md b/upcoming-release-notes/1784.md
deleted file mode 100644
index 530c9a07ec3..00000000000
--- a/upcoming-release-notes/1784.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Convert FixEncryptionKey, Loading, AnimatedLoading components to TypeScript and update get-payee query type.
diff --git a/upcoming-release-notes/1785.md b/upcoming-release-notes/1785.md
deleted file mode 100644
index 52406089dfb..00000000000
--- a/upcoming-release-notes/1785.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Update generated icons to typescript
diff --git a/upcoming-release-notes/1795.md b/upcoming-release-notes/1795.md
deleted file mode 100644
index 929e65f9312..00000000000
--- a/upcoming-release-notes/1795.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [youngcw]
----
-
-Dark Theme: add theming to budget table where it was missing
diff --git a/upcoming-release-notes/1797.md b/upcoming-release-notes/1797.md
deleted file mode 100644
index ca29b85030b..00000000000
--- a/upcoming-release-notes/1797.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [miqh]
----
-
-Adjust casing of theme options for consistent presentation.
diff --git a/upcoming-release-notes/1799.md b/upcoming-release-notes/1799.md
deleted file mode 100644
index a66d715b823..00000000000
--- a/upcoming-release-notes/1799.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: Enhancements
-authors: [carkom]
----
-Consolidating and making consistent page colors
diff --git a/upcoming-release-notes/1800.md b/upcoming-release-notes/1800.md
deleted file mode 100644
index ce17a7e7b5b..00000000000
--- a/upcoming-release-notes/1800.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-category: Enhancements
-authors: [carkom]
----
-Fixes dark mode issues: server status color, and upcoming pill on schedules page
diff --git a/upcoming-release-notes/1802.md b/upcoming-release-notes/1802.md
deleted file mode 100644
index f76c713bf1f..00000000000
--- a/upcoming-release-notes/1802.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [joel-jeremy]
----
-
-Mobile balance cover/transfer/rollover overspending
diff --git a/upcoming-release-notes/1808.md b/upcoming-release-notes/1808.md
deleted file mode 100644
index dd21148d476..00000000000
--- a/upcoming-release-notes/1808.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joel-jeremy]
----
-
-Fix flaky mobile back button on account transactions.
diff --git a/upcoming-release-notes/1814.md b/upcoming-release-notes/1814.md
deleted file mode 100644
index f04b5b376d9..00000000000
--- a/upcoming-release-notes/1814.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [shaankhosla]
----
-
-Added 2 new VRT tests for reports. 
diff --git a/upcoming-release-notes/1819.md b/upcoming-release-notes/1819.md
deleted file mode 100644
index 4f0c8ee8fb6..00000000000
--- a/upcoming-release-notes/1819.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [shaankhosla]
----
-
-Fix styling on cash-flow graph.
diff --git a/upcoming-release-notes/1820.md b/upcoming-release-notes/1820.md
new file mode 100644
index 00000000000..c678478a00d
--- /dev/null
+++ b/upcoming-release-notes/1820.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [KaiBelmo]
+---
+
+Fix styling of transaction page on mobile.
\ No newline at end of file
diff --git a/upcoming-release-notes/1823.md b/upcoming-release-notes/1823.md
deleted file mode 100644
index 4df7bd57b66..00000000000
--- a/upcoming-release-notes/1823.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MikesGlitch]
----
-
-Convert Sort Utils, DisplayId, PlaidExternalMsg components to Typescript
diff --git a/upcoming-release-notes/1824.md b/upcoming-release-notes/1824.md
deleted file mode 100644
index 3a85eb45d3f..00000000000
--- a/upcoming-release-notes/1824.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [Kit-p]
----
-
-Allow categorise transfer to off budget accounts on mobile
diff --git a/upcoming-release-notes/1834.md b/upcoming-release-notes/1834.md
new file mode 100644
index 00000000000..4e74b5e428b
--- /dev/null
+++ b/upcoming-release-notes/1834.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MikesGlitch]
+---
+
+Convert Titlebar, BudgetPageHeader, DynamicBudgetTable, Tooltips components to Typescript.
diff --git a/upcoming-release-notes/1840.md b/upcoming-release-notes/1840.md
new file mode 100644
index 00000000000..4d7462a2bb6
--- /dev/null
+++ b/upcoming-release-notes/1840.md
@@ -0,0 +1,5 @@
+---
+category: Bugfix
+authors: [sethgillett]
+---
+Schedule creation modal notify user of weekend skip option
diff --git a/upcoming-release-notes/1844.md b/upcoming-release-notes/1844.md
deleted file mode 100644
index 7fa37ec9d69..00000000000
--- a/upcoming-release-notes/1844.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [joel-jeremy]
----
-
-Mobile: Fix mobile budget click handlers