diff --git a/Clckwrks/Monad.hs b/Clckwrks/Monad.hs
--- a/Clckwrks/Monad.hs
+++ b/Clckwrks/Monad.hs
@@ -252,7 +252,7 @@
 ------------------------------------------------------------------------------
 
 newtype ClckT url m a = ClckT { unClckT :: RouteT url (StateT ClckState m) a }
-#ifdef MIN_VERSION_base(4,9,0)
+#if MIN_VERSION_base(4,9,0)
     deriving (Functor, Applicative, Alternative, Monad, MonadIO, MonadFail, MonadPlus, ServerMonad, HasRqData, FilterMonad r, WebMonad r, MonadState ClckState)
 #else
     deriving (Functor, Applicative, Alternative, Monad, MonadIO, MonadPlus, ServerMonad, HasRqData, FilterMonad r, WebMonad r, MonadState ClckState)
diff --git a/Clckwrks/Server.hs b/Clckwrks/Server.hs
--- a/Clckwrks/Server.hs
+++ b/Clckwrks/Server.hs
@@ -88,7 +88,6 @@
           requestInit clckState
           msum $
             [ jsHandlers cc
-            , dir "favicon.ico" $ notFound (toResponse ())
             , dir "static"      $ (liftIO $ Clckwrks.getDataFileName "static") >>= serveDirectory DisableBrowsing []
             , do nullDir
                  mRR <- query' (acidCore . acidState $ clckState) GetRootRedirect
diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -3,11 +3,6 @@
 module Main where
 
 import Distribution.Simple
-import Distribution.Simple.Program
 
-hsx2hsProgram = simpleProgram "hsx2hs"
-
 main :: IO ()
-main = defaultMainWithHooks simpleUserHooks {
-         hookedPrograms = [hsx2hsProgram]
-       }
+main = defaultMain
diff --git a/clckwrks.cabal b/clckwrks.cabal
--- a/clckwrks.cabal
+++ b/clckwrks.cabal
@@ -1,5 +1,5 @@
 Name:                clckwrks
-Version:             0.25.4
+Version:             0.25.5
 Synopsis:            A secure, reliable content management system (CMS) and blogging platform
 Description:         clckwrks (pronounced, clockworks) aims to compete
                      directly with popular PHP-based blogging and CMS
@@ -19,9 +19,9 @@
 Copyright:           2012-2015 SeeReason Partners LLC, Jeremy Shaw
 Stability:           Experimental
 Category:            Clckwrks
-Build-type:          Custom
-Cabal-version:       >=1.18
-tested-with:         GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1, GHC == 8.6.3, GHC == 8.8.1
+Build-type:          Simple
+Cabal-version:       1.18
+tested-with:         GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1, GHC == 8.6.3, GHC == 8.8.1
 Data-Files:
            static/admin.css
 
@@ -33,11 +33,8 @@
     description: Get Network.URI from the network-uri package
     default: True
 
-custom-setup
-        setup-depends: base >= 4.6 && < 5,
-                       Cabal >= 1.18
 Library
-  Build-tools:      hsx2hs
+  Build-tool-depends: hsx2hs:hsx2hs
   default-language: Haskell2010
   Exposed-modules: Clckwrks
                    Clckwrks.Acid
@@ -117,7 +114,7 @@
      hsx2hs                       >= 0.13 && < 0.15,
      ixset                        >= 1.0 && < 1.2,
      jmacro                       == 0.6.*,
-     lens                         >= 4.3  && < 4.19,
+     lens                         >= 4.3  && < 4.20,
      mtl                          >= 2.0  && < 2.3,
      old-locale                   ==  1.0.*,
      process                      >= 1.0  && < 1.7,
@@ -129,7 +126,7 @@
      safecopy                     >= 0.6,
      stm                          >= 2.2  && < 2.6,
      text                         >= 0.11 && < 1.3,
-     time                         >= 1.2  && < 1.10,
+     time                         >= 1.2  && < 1.11,
      time-locale-compat           >= 0.1  && < 0.2,
      uuid-orphans                 >= 1.2  && < 1.5,
      uuid-types                   >= 1.0  && < 1.1,