diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal
index a0cee4f54..0102b88b6 100644
--- a/hledger-lib/hledger-lib.cabal
+++ b/hledger-lib/hledger-lib.cabal
@@ -46,7 +46,7 @@ source-repository head
   location: https://github.com/simonmichael/hledger
 
 flag debug
-  description: Build with GHC 9.10+'s stack traces enabled
+  description: Build with GHC 9.10+ stack traces enabled
   manual: True
   default: False
 
@@ -57,6 +57,7 @@ library
       Hledger.Data.Account
       Hledger.Data.AccountName
       Hledger.Data.Amount
+      Hledger.Data.BalanceData
       Hledger.Data.Balancing
       Hledger.Data.Currency
       Hledger.Data.Dates
@@ -68,10 +69,11 @@ library
       Hledger.Data.Json
       Hledger.Data.Ledger
       Hledger.Data.Period
+      Hledger.Data.PeriodData
       Hledger.Data.PeriodicTransaction
-      Hledger.Data.StringFormat
       Hledger.Data.Posting
       Hledger.Data.RawOptions
+      Hledger.Data.StringFormat
       Hledger.Data.Timeclock
       Hledger.Data.Transaction
       Hledger.Data.TransactionModifier
@@ -84,26 +86,17 @@ library
       Hledger.Read.InputOptions
       Hledger.Read.JournalReader
       Hledger.Read.RulesReader
-      Hledger.Read.TimedotReader
       Hledger.Read.TimeclockReader
-      Hledger.Write.Beancount
-      Hledger.Write.Csv
-      Hledger.Write.Ods
-      Hledger.Write.Html
-      Hledger.Write.Html.Attribute
-      Hledger.Write.Html.Blaze
-      Hledger.Write.Html.Lucid
-      Hledger.Write.Html.HtmlCommon
-      Hledger.Write.Spreadsheet
+      Hledger.Read.TimedotReader
       Hledger.Reports
-      Hledger.Reports.ReportOptions
-      Hledger.Reports.ReportTypes
       Hledger.Reports.AccountTransactionsReport
       Hledger.Reports.BalanceReport
       Hledger.Reports.BudgetReport
       Hledger.Reports.EntriesReport
       Hledger.Reports.MultiBalanceReport
       Hledger.Reports.PostingsReport
+      Hledger.Reports.ReportOptions
+      Hledger.Reports.ReportTypes
       Hledger.Utils
       Hledger.Utils.Debug
       Hledger.Utils.IO
@@ -112,17 +105,25 @@ library
       Hledger.Utils.String
       Hledger.Utils.Test
       Hledger.Utils.Text
+      Hledger.Write.Beancount
+      Hledger.Write.Csv
+      Hledger.Write.Html
+      Hledger.Write.Html.Attribute
+      Hledger.Write.Html.Blaze
+      Hledger.Write.Html.HtmlCommon
+      Hledger.Write.Html.Lucid
+      Hledger.Write.Ods
+      Hledger.Write.Spreadsheet
       Text.Tabular.AsciiWide
       Text.WideString
   other-modules:
-      Hledger.Data.BalanceData
-      Hledger.Data.PeriodData
       Paths_hledger_lib
   autogen-modules:
       Paths_hledger_lib
   hs-source-dirs:
       ./
   ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind
+  cpp-options: -DVERSION="1.50.99"
   build-depends:
       Decimal >=0.5.1
     , Glob >=0.9
@@ -172,7 +173,7 @@ library
     , uglymemo
     , unordered-containers >=0.2
     , utf8-string >=0.3.5
-  default-language: Haskell2010
+  default-language: GHC2021
   if (flag(debug))
     cpp-options: -DDEBUG
 
@@ -182,6 +183,7 @@ test-suite doctest
   hs-source-dirs:
       test
   ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind
+  cpp-options: -DVERSION="1.50.99"
   build-depends:
       Decimal >=0.5.1
     , Glob >=0.7
@@ -232,11 +234,9 @@ test-suite doctest
     , uglymemo
     , unordered-containers >=0.2
     , utf8-string >=0.3.5
-  default-language: Haskell2010
+  default-language: GHC2021
   if (flag(debug))
     cpp-options: -DDEBUG
-  if impl(ghc >= 9.0) && impl(ghc < 9.2)
-    buildable: False
 
 test-suite unittest
   type: exitcode-stdio-1.0
@@ -244,6 +244,7 @@ test-suite unittest
   hs-source-dirs:
       test
   ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind
+  cpp-options: -DVERSION="1.50.99"
   build-depends:
       Decimal >=0.5.1
     , Glob >=0.9
@@ -295,6 +296,6 @@ test-suite unittest
     , unordered-containers >=0.2
     , utf8-string >=0.3.5
   buildable: True
-  default-language: Haskell2010
+  default-language: GHC2021
   if (flag(debug))
     cpp-options: -DDEBUG
diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal
index c848a1360..ff8240ec9 100644
--- a/hledger-ui/hledger-ui.cabal
+++ b/hledger-ui/hledger-ui.cabal
@@ -39,7 +39,7 @@ source-repository head
   location: https://github.com/simonmichael/hledger
 
 flag debug
-  description: Build with GHC 9.10+'s stack traces enabled
+  description: Build with GHC 9.10+ stack traces enabled
   manual: True
   default: False
 
@@ -51,30 +51,30 @@ flag threaded
 library
   exposed-modules:
       Hledger.UI
-      Hledger.UI.Main
-      Hledger.UI.Theme
-      Hledger.UI.UIOptions
-  other-modules:
       Hledger.UI.AccountsScreen
       Hledger.UI.BalancesheetScreen
       Hledger.UI.CashScreen
       Hledger.UI.Editor
       Hledger.UI.ErrorScreen
       Hledger.UI.IncomestatementScreen
+      Hledger.UI.Main
       Hledger.UI.MenuScreen
       Hledger.UI.RegisterScreen
+      Hledger.UI.Theme
       Hledger.UI.TransactionScreen
+      Hledger.UI.UIOptions
       Hledger.UI.UIScreens
       Hledger.UI.UIState
       Hledger.UI.UITypes
       Hledger.UI.UIUtils
+  other-modules:
       Paths_hledger_ui
   autogen-modules:
       Paths_hledger_ui
   hs-source-dirs:
       ./
   ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind
-  cpp-options: -DVERSION="1.50.99" -DVERSION="1.50.99"
+  cpp-options: -DVERSION="1.50.99"
   build-depends:
       ansi-terminal >=0.9
     , async
@@ -106,7 +106,7 @@ library
     , vector
     , vty >=6.1 && <6.5
     , vty-crossplatform >=0.4.0.0 && <0.5.0.0
-  default-language: Haskell2010
+  default-language: GHC2021
   if (flag(debug))
     cpp-options: -DDEBUG
   if os(windows)
@@ -124,12 +124,12 @@ executable hledger-ui
       Paths_hledger_ui
   hs-source-dirs:
       app
-  ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind -with-rtsopts=-T
+  ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind
   cpp-options: -DVERSION="1.50.99"
   build-depends:
       base >=4.18 && <4.22
     , hledger-ui
-  default-language: Haskell2010
+  default-language: GHC2021
   if (flag(debug))
     cpp-options: -DDEBUG
   if flag(threaded)
diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
index b684568cb..fc30edf94 100644
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@@ -114,7 +114,7 @@ source-repository head
   location: https://github.com/simonmichael/hledger
 
 flag debug
-  description: Build with GHC 9.10+'s stack traces enabled
+  description: Build with GHC 9.10+ stack traces enabled
   manual: True
   default: False
 
@@ -136,29 +136,29 @@ flag threaded
 library
   exposed-modules:
       Hledger.Web
-      Hledger.Web.Main
-      Hledger.Web.WebOptions
-      Hledger.Web.Application
-      Hledger.Web.Import
-      Hledger.Web.Test
-  other-modules:
       Hledger.Web.App
+      Hledger.Web.Application
       Hledger.Web.Handler.AddR
       Hledger.Web.Handler.EditR
       Hledger.Web.Handler.JournalR
       Hledger.Web.Handler.MiscR
       Hledger.Web.Handler.RegisterR
       Hledger.Web.Handler.UploadR
+      Hledger.Web.Import
+      Hledger.Web.Main
       Hledger.Web.Settings
       Hledger.Web.Settings.StaticFiles
+      Hledger.Web.Test
+      Hledger.Web.WebOptions
       Hledger.Web.Widget.AddForm
       Hledger.Web.Widget.Common
+  other-modules:
       Paths_hledger_web
   autogen-modules:
       Paths_hledger_web
   hs-source-dirs:
       ./
-  ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns
+  ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind
   cpp-options: -DVERSION="1.50.99"
   build-depends:
       Decimal >=0.5.1
@@ -210,7 +210,7 @@ library
     , yesod-form >=1.4 && <1.8
     , yesod-static >=1.4 && <1.7
     , yesod-test
-  default-language: Haskell2010
+  default-language: GHC2021
   if flag(threaded)
     ghc-options: -threaded
   if (flag(dev)) || (flag(library-only))
@@ -228,12 +228,12 @@ executable hledger-web
       Paths_hledger_web
   hs-source-dirs:
       app
-  ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -with-rtsopts=-T
+  ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind
   cpp-options: -DVERSION="1.50.99"
   build-depends:
       base >=4.18 && <4.22
     , hledger-web
-  default-language: Haskell2010
+  default-language: GHC2021
   if flag(threaded)
     ghc-options: -threaded
   if (flag(dev)) || (flag(library-only))
@@ -245,17 +245,17 @@ executable hledger-web
   if flag(library-only)
     buildable: False
 
-test-suite test
+test-suite apptest
   type: exitcode-stdio-1.0
   main-is: test.hs
   hs-source-dirs:
       test
-  ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns
+  ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind
   cpp-options: -DVERSION="1.50.99"
   build-depends:
       base >=4.18 && <4.22
     , hledger-web
-  default-language: Haskell2010
+  default-language: GHC2021
   if flag(threaded)
     ghc-options: -threaded
   if (flag(dev)) || (flag(library-only))
diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal
index 99484069a..2e0a62b52 100644
--- a/hledger/hledger.cabal
+++ b/hledger/hledger.cabal
@@ -97,7 +97,7 @@ source-repository head
   location: https://github.com/simonmichael/hledger
 
 flag debug
-  description: Build with GHC 9.10+'s stack traces enabled
+  description: Build with GHC 9.10+ stack traces enabled
   manual: True
   default: False
 
@@ -128,8 +128,8 @@ library
       Hledger.Cli.Commands.Demo
       Hledger.Cli.Commands.Descriptions
       Hledger.Cli.Commands.Diff
-      Hledger.Cli.Commands.Help
       Hledger.Cli.Commands.Files
+      Hledger.Cli.Commands.Help
       Hledger.Cli.Commands.Import
       Hledger.Cli.Commands.Incomestatement
       Hledger.Cli.Commands.Notes
@@ -153,6 +153,8 @@ library
       Paths_hledger
   autogen-modules:
       Paths_hledger
+  hs-source-dirs:
+      ./
   ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind -optP-Wno-nonportable-include-path
   cpp-options: -DVERSION="1.50.99"
   build-depends:
@@ -198,7 +200,7 @@ library
     , utf8-string >=0.3.5
     , utility-ht >=0.0.13
     , wizards >=1.0
-  default-language: Haskell2010
+  default-language: GHC2021
   if (flag(debug))
     cpp-options: -DDEBUG
 
@@ -252,7 +254,7 @@ executable hledger
     , utf8-string >=0.3.5
     , utility-ht >=0.0.13
     , wizards >=1.0
-  default-language: Haskell2010
+  default-language: GHC2021
   if (flag(debug))
     cpp-options: -DDEBUG
   if flag(threaded)
@@ -305,7 +307,7 @@ test-suite unittest
     , utf8-string >=0.3.5
     , utility-ht >=0.0.13
     , wizards >=1.0
-  default-language: Haskell2010
+  default-language: GHC2021
   if (flag(debug))
     cpp-options: -DDEBUG
 
@@ -315,6 +317,7 @@ benchmark bench
   hs-source-dirs:
       bench
   ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind -optP-Wno-nonportable-include-path
+  cpp-options: -DVERSION="1.50.99"
   build-depends:
       Decimal >=0.5.1
     , aeson >=1 && <2.3
@@ -358,6 +361,6 @@ benchmark bench
     , utility-ht >=0.0.13
     , wizards >=1.0
   buildable: False
-  default-language: Haskell2010
+  default-language: GHC2021
   if (flag(debug))
     cpp-options: -DDEBUG