diff --git a/Hledger/Web/Application.hs b/Hledger/Web/Application.hs
--- a/Hledger/Web/Application.hs
+++ b/Hledger/Web/Application.hs
@@ -12,6 +12,7 @@
 import Data.Dynamic (Dynamic, toDyn)
 import Network.Wai (Application)
 import Network.Wai.Middleware.Debug (debugHandle)
+import Yesod.Core hiding (AppConfig,loadConfig,appPort)
 import Yesod.Logger (makeLogger, flushLogger, Logger, logLazyText, logString)
 import Yesod.Static
 
@@ -33,10 +34,10 @@
 withApp conf logger opts f = do
 #ifdef PRODUCTION
     putStrLn $ "Production mode, using embedded web files"
-    let s = $(embed Hledger.Web.Settings.staticDir)
+    let s = $(embed staticDir)
 #else
-    putStrLn $ "Not in production mode, using web files from " ++ Hledger.Web.Settings.staticDir ++ "/"
-    s <- staticDevel Hledger.Web.Settings.staticDir
+    putStrLn $ "Not in production mode, using web files from " ++ staticDir ++ "/"
+    s <- staticDevel staticDir
 #endif
     let a = App {settings=conf
                 ,getLogger=logger
@@ -52,7 +53,7 @@
   where
     go :: ((Int, Application) -> IO ()) -> IO ()
     go f = do
-        conf <- Hledger.Web.Settings.loadConfig Hledger.Web.Settings.Development
+        conf <- loadConfig Development
         let port = appPort conf
         logger <- makeLogger
         logString logger $ "Devel application launched with default options, listening on port " ++ show port
diff --git a/Hledger/Web/Foundation.hs b/Hledger/Web/Foundation.hs
--- a/Hledger/Web/Foundation.hs
+++ b/Hledger/Web/Foundation.hs
@@ -6,8 +6,6 @@
     , resourcesApp
     , Handler
     , Widget
-    , module Yesod.Core
-    -- , module Settings
     , StaticRoute (..)
     , lift
     , liftIO
diff --git a/Hledger/Web/Handlers.hs b/Hledger/Web/Handlers.hs
--- a/Hledger/Web/Handlers.hs
+++ b/Hledger/Web/Handlers.hs
@@ -23,6 +23,7 @@
 import Text.Blaze (preEscapedString, toHtml)
 import Text.Hamlet hiding (hamletFile)
 import Text.Printf
+import Yesod.Core
 import Yesod.Json
 
 import Hledger hiding (today)
diff --git a/Hledger/Web/Options.hs b/Hledger/Web/Options.hs
--- a/Hledger/Web/Options.hs
+++ b/Hledger/Web/Options.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE TemplateHaskell #-}
 {-|
 
 -}
@@ -5,17 +6,15 @@
 module Hledger.Web.Options
 where
 import Data.Maybe
+import Distribution.PackageDescription.TH (packageVariable, package, pkgName, pkgVersion)
 import System.Console.CmdArgs
 import System.Console.CmdArgs.Explicit
 
 import Hledger.Cli hiding (progname,progversion)
-import qualified Hledger.Cli (progname)
-
 import Hledger.Web.Settings
 
-progname = Hledger.Cli.progname ++ "-web"
--- progversion = progversionstr progname
-progversion = progname ++ "-" ++ "0.16.3"
+progname    = $(packageVariable (pkgName . package))
+progversion = progname ++ " " ++ $(packageVariable (pkgVersion . package)) :: String
 
 defbaseurlexample = (reverse $ drop 4 $ reverse $ defbaseurl defport) ++ "PORT"
 
diff --git a/hledger-web.cabal b/hledger-web.cabal
--- a/hledger-web.cabal
+++ b/hledger-web.cabal
@@ -1,5 +1,5 @@
 name:           hledger-web
-version: 0.16.3
+version: 0.16.4
 category:       Finance
 synopsis:       A web interface for the hledger accounting tool.
 description:    
@@ -76,6 +76,7 @@
                  ,HUnit
                  ,base >= 4 && < 5
                  ,bytestring
+                 ,cabal-file-th
                  ,cmdargs >= 0.8   && < 0.9
                  ,directory
                  ,filepath