diff --git a/hledger-ui/hledger-ui.cabal b/hledger-ui/hledger-ui.cabal
index 7fe017d88..a153393cf 100644
--- a/hledger-ui/hledger-ui.cabal
+++ b/hledger-ui/hledger-ui.cabal
@@ -1,4 +1,4 @@
--- This file has been generated from package.yaml by hpack version 0.5.4.
+-- This file has been generated from package.yaml by hpack version 0.14.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -7,16 +7,15 @@ version:        0.28
 stability:      beta
 category:       Finance, Console
 synopsis:       Curses-style user interface for the hledger accounting tool
-description:
-    This is hledger's curses-style interface.
-    It is simpler and more convenient for browsing data than the command-line interface,
-    but lighter and faster than hledger-web.
-    hledger is a cross-platform program for tracking money, time, or
-    any other commodity, using double-entry accounting and a simple,
-    editable file format. It is inspired by and largely compatible
-    with ledger(1).  hledger provides command-line, curses and web
-    interfaces, and aims to be a reliable, practical tool for daily
-    use.
+description:    This is hledger's curses-style interface.
+                It is simpler and more convenient for browsing data than the command-line interface,
+                but lighter and faster than hledger-web.
+                hledger is a cross-platform program for tracking money, time, or
+                any other commodity, using double-entry accounting and a simple,
+                editable file format. It is inspired by and largely compatible
+                with ledger(1).  hledger provides command-line, curses and web
+                interfaces, and aims to be a reliable, practical tool for daily
+                use.
 license:        GPL
 license-file:   LICENSE
 author:         Simon Michael <simon@joyful.com>
@@ -33,32 +32,29 @@ extra-source-files:
 
 data-files:
     doc/hledger-ui.1
-    doc/hledger-ui.1.txt
     doc/hledger-ui.1.info
+    doc/hledger-ui.1.txt
 
 source-repository head
   type: git
   location: https://github.com/simonmichael/hledger
 
-flag threaded
-  default: True
-  description:
-    Build with support for multithreaded execution
-
 flag old-locale
   default: False
-  description:
-    A compatibility flag, set automatically by cabal.
-    If false then depend on time >= 1.5,
-    if true then depend on time < 1.5 together with old-locale.
+  description: A compatibility flag, set automatically by cabal. If false then depend on time >= 1.5, if true then depend on time < 1.5 together with old-locale.
+
+  manual: False
+
+flag threaded
+  default: True
+  description: Build with support for multithreaded execution
+  manual: False
 
 executable hledger-ui
   main-is: hledger-ui.hs
   hs-source-dirs:
       .
   ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
-  if flag(threaded)
-    ghc-options: -threaded
   cpp-options: -DVERSION="0.28"
   build-depends:
       hledger >= 0.28 && < 0.29
@@ -81,22 +77,28 @@ executable hledger-ui
     , transformers
     , vector
     , vty >= 5.2 && < 5.6
-  if impl(ghc >= 7.4)
-    build-depends: pretty-show >= 1.6.4
+  if flag(threaded)
+    ghc-options: -threaded
   if flag(old-locale)
-    build-depends: time < 1.5, old-locale
+    build-depends:
+        time < 1.5
+      , old-locale
   else
-    build-depends: time >= 1.5
+    build-depends:
+        time >= 1.5
+  if impl(ghc >= 7.4)
+    build-depends:
+        pretty-show >= 1.6.4
   other-modules:
       Hledger.UI
+      Hledger.UI.AccountsScreen
+      Hledger.UI.ErrorScreen
       Hledger.UI.Main
-      Hledger.UI.UIOptions
+      Hledger.UI.RegisterScreen
       Hledger.UI.Theme
+      Hledger.UI.TransactionScreen
+      Hledger.UI.UIOptions
       Hledger.UI.UIState
       Hledger.UI.UITypes
       Hledger.UI.UIUtils
-      Hledger.UI.AccountsScreen
-      Hledger.UI.ErrorScreen
-      Hledger.UI.RegisterScreen
-      Hledger.UI.TransactionScreen
   default-language: Haskell2010
diff --git a/hledger-ui/future-package.yaml b/hledger-ui/package.yaml
similarity index 62%
rename from hledger-ui/future-package.yaml
rename to hledger-ui/package.yaml
index d6b2f5249..e171e268f 100644
--- a/hledger-ui/future-package.yaml
+++ b/hledger-ui/package.yaml
@@ -30,7 +30,6 @@ maintainer  : Simon Michael <simon@joyful.com>
 github      : simonmichael/hledger
 homepage    : http://hledger.org
 bug-reports : http://bugs.hledger.org
-# XXX not supported
 tested-with : GHC==7.8.4, GHC==7.10.3, GHC==8.0
 
 extra-source-files:
@@ -42,22 +41,18 @@ data-files:
   - doc/hledger-ui.1.txt
   - doc/hledger-ui.1.info
 
-# XXX not supported
-# flag:
-#   old-locale:
-#     - default: False
-#     - description:
-#         A compatibility flag, set automatically by cabal.
-#         If false then depend on time >= 1.5,
-#         if true then depend on time < 1.5 together with old-locale.
-
-ghc-options:
-  -Wall
-  -fno-warn-unused-do-bind
-  -fno-warn-name-shadowing
-  -fno-warn-missing-signatures
-  -fno-warn-type-defaults
-  -fno-warn-orphans
+flags:
+  threaded:
+    description: Build with support for multithreaded execution
+    manual: false
+    default: true
+  old-locale:
+    description: >
+        A compatibility flag, set automatically by cabal.
+        If false then depend on time >= 1.5,
+        if true then depend on time < 1.5 together with old-locale.
+    manual: false
+    default: false
 
 cpp-options: -DVERSION="0.28"
 
@@ -65,17 +60,20 @@ executables:
   hledger-ui:
     source-dirs: .
     main: hledger-ui.hs
-    # if flag(threaded)
-    #   ghc-options:   -threaded
     ghc-options:
-      -threaded
+      -Wall
+      -fno-warn-unused-do-bind
+      -fno-warn-name-shadowing
+      -fno-warn-missing-signatures
+      -fno-warn-type-defaults
+      -fno-warn-orphans
     dependencies:
       - hledger >= 0.28 && < 0.29
       - hledger-lib >= 0.28 && < 0.29
       - ansi-terminal >= 0.6.2.3 && < 0.7
       - base >= 3 && < 5
       - base-compat >= 0.8.1
-      - brick >= 0.2 && < 0.5
+      - brick >= 0.2 && < 0.7
       - cmdargs >= 0.8
       - containers
       - data-default
@@ -89,34 +87,18 @@ executables:
       - text-zipper >= 0.4 && < 0.5
       - transformers
       - vector
-      - vty >= 5.2 && < 5.5
-      # XXX not supported
-      # if impl(ghc >= 7.4)
-      #   build-depends: pretty-show >= 1.6.4
-      - pretty-show >= 1.6.4
-      # if flag(old-locale)
-      #   build-depends: time < 1.5, old-locale
-      # else
-      #   build-depends: time >= 1.5
-      - time >= 1.5
-
-# tests:
-#   test:
-#     source-dirs: test
-#     main: test.hs
-#     dependencies:
-#       - hledger-ui
-#       - test-framework
-#       - test-framework-hunit
-
-# XXX not supported
-# benchmarks:
-#   bench:
-#     source-dirs: bench
-#     main: bench.hs
-#     other-modules: SimpleBench
-#     dependencies:
-#       - hledger-ui
-#       - criterion
-#       - html
-#       - timeit
+      - vty >= 5.2 && < 5.6
+    when:
+      - condition: flag(threaded)
+        ghc-options: -threaded
+      - condition: flag(old-locale)
+        then:
+          dependencies:
+            - time < 1.5
+            - old-locale
+        else:
+          dependencies:
+            - time >= 1.5
+      - condition: impl(ghc >= 7.4)
+        dependencies:
+          - pretty-show >= 1.6.4