diff --git a/packages/api/package.json b/packages/api/package.json
index a9d8dc818b642ca174e068ae3168b60e39a3260c..f5292426c39611e6afd64416ef63764788bc9390 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/api",
-  "version": "5.1.2",
+  "version": "6.0.0",
   "license": "MIT",
   "description": "An API for Actual",
   "main": "dist/index.js",
diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json
index 97a37c2749a740c753465ed27e4cb73d21a2a68e..cecb2e49ab2943622d4f94943a3925e6d23d8d02 100644
--- a/packages/desktop-client/package.json
+++ b/packages/desktop-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/web",
-  "version": "23.4.2",
+  "version": "23.5.0",
   "license": "MIT",
   "files": [
     "build"
diff --git a/packages/loot-core/webpack/webpack.browser.config.js b/packages/loot-core/webpack/webpack.browser.config.js
index e8bc0bdae250f1b997a5be45c38dae27999d77ed..161771ba3e81c9ac32155898143cd88e16528183 100644
--- a/packages/loot-core/webpack/webpack.browser.config.js
+++ b/packages/loot-core/webpack/webpack.browser.config.js
@@ -41,7 +41,7 @@ module.exports = {
       },
       {
         test: /\.pegjs$/,
-        use: { loader: path.resolve('../peg-loader.js') },
+        use: { loader: path.resolve(__dirname, '../peg-loader.js') },
       },
     ],
   },
diff --git a/upcoming-release-notes/858.md b/upcoming-release-notes/858.md
deleted file mode 100644
index 38a4f140f844a38415ea082259866d65c52abb8c..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/858.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [shall0pass]
----
-
-Goals: Added support for percentage driven targets
\ No newline at end of file
diff --git a/upcoming-release-notes/879.md b/upcoming-release-notes/879.md
deleted file mode 100644
index 1fd38d297bad379a0d8f1d6017d591e5b057ff7e..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/879.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [shall0pass]
----
-
-Goal templates: Changed how compounding 'by' matches are filled.  Now uses an average across templates.
diff --git a/upcoming-release-notes/896.md b/upcoming-release-notes/896.md
deleted file mode 100644
index af1da3d8a6bb7d85f4ab1298f0b4d67aa8ed0a6a..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/896.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [albertogasparin]
----
-
-Convert few more folders in `loot-core` to Typescript
diff --git a/upcoming-release-notes/910.md b/upcoming-release-notes/910.md
deleted file mode 100644
index 170f39fb14a45088337ae34a6a22c45d174e4cbc..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/910.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [biohzrddd]
----
-
-Add setting to change first day of the week
\ No newline at end of file
diff --git a/upcoming-release-notes/919.md b/upcoming-release-notes/919.md
deleted file mode 100644
index 6131c9b9dd16809291d939beeb699cf60caee2c5..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/919.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [henrikmaa]
----
-
-Show pending transactions from Nordigen in transactions table
diff --git a/upcoming-release-notes/921.md b/upcoming-release-notes/921.md
deleted file mode 100644
index 7e1d900ebf0d4a5660c5eb7a664637b5d63502f8..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/921.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Features
-authors: [sinistersnare]
----
-
-Add experimental OFX importer written in pure javascript.
diff --git a/upcoming-release-notes/931.md b/upcoming-release-notes/931.md
deleted file mode 100644
index 44782eb466f93407e12a4f529e8f862fe6725bab..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/931.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MatissJanis]
----
-
-Cleaning up state management in autocomplete
diff --git a/upcoming-release-notes/932.md b/upcoming-release-notes/932.md
deleted file mode 100644
index 4032e0c0833d1ff1618a983d11a7c327b9b457ea..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/932.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MatissJanis]
----
-
-Improving e2e test stability
diff --git a/upcoming-release-notes/933.md b/upcoming-release-notes/933.md
deleted file mode 100644
index d162e46cf1f3628f51002edd9700958eb475ca43..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/933.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [MatissJanis]
----
-
-Autocomplete: set min-width for the tooltip
diff --git a/upcoming-release-notes/934.md b/upcoming-release-notes/934.md
deleted file mode 100644
index bdde27a0d5077a31ce03d1940b06561d4ae16a2d..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/934.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [Sinistersnare]
----
-
-Move from deprecated peg.js to Peggy for Goal template parser.
diff --git a/upcoming-release-notes/939.md b/upcoming-release-notes/939.md
deleted file mode 100644
index b51f32bc814a1652167bb086f88e53b44f29a797..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/939.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [j-f1]
----
-
-Fix j/k shortcuts to move between transactions on account pages
diff --git a/upcoming-release-notes/945.md b/upcoming-release-notes/945.md
deleted file mode 100644
index 0a584c2c471a605f5b9a21bad410aa3a780445ab..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/945.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MatissJanis]
----
-
-Autocomplete: upgrade `Downshift` dependency
diff --git a/upcoming-release-notes/946.md b/upcoming-release-notes/946.md
deleted file mode 100644
index 482fa12b9d4359ef9951ac63de2cdddb764fdd78..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/946.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [j-f1]
----
-
-Don’t reset checked transactions when creating a schedule
diff --git a/upcoming-release-notes/947.md b/upcoming-release-notes/947.md
deleted file mode 100644
index 3dc8c54100af08bbbd2066dbb579399c65b434ab..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/947.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Autocomplete: fix multi-autocomplete filtering UX
diff --git a/upcoming-release-notes/949.md b/upcoming-release-notes/949.md
deleted file mode 100644
index 8bdd11979624b894509584c8a6d0f2ece82b56c1..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/949.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Autocomplete: support touch events
diff --git a/upcoming-release-notes/950.md b/upcoming-release-notes/950.md
deleted file mode 100644
index c4f8e3f4e87a1f4ac328d070d6391cb00c8ce531..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/950.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Nordigen: add fallback link to re-init bank-sync in case the popover was blocked
diff --git a/upcoming-release-notes/951.md b/upcoming-release-notes/951.md
deleted file mode 100644
index 88fd040e28a1d0d715440e273af197a5ccdf041c..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/951.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [aaroneiche]
----
-
-Forces CSV importer to ignore extra lines ensuring valid import field keys.
diff --git a/upcoming-release-notes/953.md b/upcoming-release-notes/953.md
deleted file mode 100644
index f0e1669da55933d05f3b76163846572f569f6220..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/953.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [MatissJanis]
----
-
-Re-arrange schedule operation options to start with "is approximately" (the default selection)
diff --git a/upcoming-release-notes/954.md b/upcoming-release-notes/954.md
deleted file mode 100644
index 609aca5459bcdd6473860647375890889cfc2888..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/954.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MatissJanis]
----
-
-Automatically close feature request issues so the open issue list can focus on bugs
diff --git a/upcoming-release-notes/955.md b/upcoming-release-notes/955.md
deleted file mode 100644
index 0d1b5690d1dcc6beb5da9a0b51bc38852967dfb5..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/955.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Schedules: make transfer transactions appear in both affecting accounts
diff --git a/upcoming-release-notes/957.md b/upcoming-release-notes/957.md
deleted file mode 100644
index 8c18f3ef89d7420c124fb0cba8149861a7676928..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/957.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [albertogasparin]
----
-
-Finish converting `loot-core` to Typescript
diff --git a/upcoming-release-notes/960.md b/upcoming-release-notes/960.md
deleted file mode 100644
index f559ca012c011332a9a6d088ec424a3d39388ede..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/960.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Mobile: use the correct top-bar background color in settings page
diff --git a/upcoming-release-notes/961.md b/upcoming-release-notes/961.md
deleted file mode 100644
index 622a90faa0de7e20894427bf4c5d4f0127b2c2a4..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/961.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [shall0pass, youngcw]
----
-
-Goals: Add priority support
\ No newline at end of file
diff --git a/upcoming-release-notes/962.md b/upcoming-release-notes/962.md
deleted file mode 100644
index f881fbca789a3eb2f9197c39dc7a039a2303f2b8..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/962.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MatissJanis]
----
-
-TypeScript: migrated an assortment of common components to TS
diff --git a/upcoming-release-notes/966.md b/upcoming-release-notes/966.md
deleted file mode 100644
index 54c7f665c781966247892afee270c3eb9185f0fb..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/966.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Transaction table: show action checkbox on row hover
diff --git a/upcoming-release-notes/967.md b/upcoming-release-notes/967.md
deleted file mode 100644
index c18af5f2aed072bd44bf5fec59a4d9f8cebab555..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/967.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Re-introduce single line text blocks (useful for mobile)
diff --git a/upcoming-release-notes/968.md b/upcoming-release-notes/968.md
deleted file mode 100644
index 96187e7e5c8f93aef5648aa954dd5c9fffcefdba..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/968.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [MatissJanis]
----
-
-Nordigen: ability to configure credentials via the UI
diff --git a/upcoming-release-notes/969.md b/upcoming-release-notes/969.md
deleted file mode 100644
index 2e6960296ccd80228984958cb25e259b1b8103e9..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/969.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Nordigen: improved error handling when bank-list API fails
diff --git a/upcoming-release-notes/972.md b/upcoming-release-notes/972.md
deleted file mode 100644
index c79de0303f12cf3511607090b7eccb44d6f3d0f4..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/972.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Position notification banners always at bottom of the page
diff --git a/upcoming-release-notes/974.md b/upcoming-release-notes/974.md
deleted file mode 100644
index 69a733445cd116ac510671a20bda8a6aaa683b7c..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/974.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [trevdor]
----
-
-eslint: Switch to TypeScript-aware `no-unused-vars` rule.
diff --git a/upcoming-release-notes/976.md b/upcoming-release-notes/976.md
deleted file mode 100644
index 15dae3a08dcbe9180c4627940dd95a9d75c07e4b..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/976.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MatissJanis]
----
-
-Remove unused `prop-types` dependency
diff --git a/upcoming-release-notes/977.md b/upcoming-release-notes/977.md
deleted file mode 100644
index cd75531e1a7a86f61d3127a3741a8d67a1dab9ee..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/977.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MatissJanis]
----
-
-Make `yarn start:browser` the default `start` command instead of `start:desktop` which currently doesn't realiably work
diff --git a/upcoming-release-notes/978.md b/upcoming-release-notes/978.md
deleted file mode 100644
index 7f578c3bee143bf16f10be27c66ed9e17c23b2c4..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/978.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MatissJanis]
----
-
-Contributors: add back Rich, add also Alberto
diff --git a/upcoming-release-notes/980.md b/upcoming-release-notes/980.md
deleted file mode 100644
index 74946fe93ca042014d0b8cbd06ef49045963170e..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/980.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MatissJanis]
----
-
-Run feature-request management github action when the "feature" label is added
diff --git a/upcoming-release-notes/982.md b/upcoming-release-notes/982.md
deleted file mode 100644
index 6dc8356a36683c2575b7e6be921ee0525b530c9c..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/982.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [MatissJanis]
----
-
-Run feature-request management github action only once and for the "feature" label only (not for other labels)
diff --git a/upcoming-release-notes/985.md b/upcoming-release-notes/985.md
deleted file mode 100644
index 890b46234dddf245c7725bee0340ce3921165732..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/985.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Maintenance
-authors: [j-f1]
----
-
-Remove unused payee rules feature
diff --git a/upcoming-release-notes/987.md b/upcoming-release-notes/987.md
deleted file mode 100644
index d262331d44a93d1d2c1a1f6fc2af4139e806272e..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/987.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Enhancements
-authors: [j-f1]
----
-
-Add support for credit card OFX files
diff --git a/upcoming-release-notes/992.md b/upcoming-release-notes/992.md
deleted file mode 100644
index 9275329ec2f433c6a6e92618d75d21101dd685cb..0000000000000000000000000000000000000000
--- a/upcoming-release-notes/992.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-category: Bugfix
-authors: [MatissJanis]
----
-
-Allow creating transactions by clicking "enter" in the notes/payee/category field