diff --git a/src/Vervis/Import/NoFoundation.hs b/src/Vervis/Import/NoFoundation.hs
index 708988f..5137834 100644
--- a/src/Vervis/Import/NoFoundation.hs
+++ b/src/Vervis/Import/NoFoundation.hs
@@ -15,11 +15,24 @@
 
 module Vervis.Import.NoFoundation ( module Import ) where
 
-import ClassyPrelude.Yesod   as Import
-import Vervis.Style                 as Import
-import Vervis.Model                 as Import
-import Vervis.Settings              as Import
-import Vervis.Settings.StaticFiles  as Import
-import Yesod.Auth            as Import
-import Yesod.Core.Types      as Import (loggerSet)
-import Yesod.Default.Config2 as Import
+import ClassyPrelude.Conduit       as Import
+import Data.Default                as Import (Default (..))
+import Database.Persist.Sql        as Import ( SqlBackend
+                                             , SqlPersistT
+                                             , runMigration
+                                             )
+import Network.HTTP.Client.Conduit as Import
+import Network.HTTP.Types          as Import
+import Yesod                       as Import hiding (Header, parseTime)
+import Yesod.Auth                  as Import
+import Yesod.Core.Types            as Import (loggerSet)
+import Yesod.Default.Config2       as Import
+--import Yesod.Feed                  as Import
+import Yesod.Static                as Import
+
+import qualified Yesod
+
+import Vervis.Style                as Import
+import Vervis.Model                as Import
+import Vervis.Settings             as Import
+import Vervis.Settings.StaticFiles as Import
diff --git a/src/Vervis/Model.hs b/src/Vervis/Model.hs
index c64e245..8f14f5d 100644
--- a/src/Vervis/Model.hs
+++ b/src/Vervis/Model.hs
@@ -17,7 +17,15 @@
 
 module Vervis.Model where
 
-import ClassyPrelude.Yesod
+import ClassyPrelude.Conduit
+import Yesod hiding (Header, parseTime)
+import qualified Yesod
+import Yesod.Static
+import Network.HTTP.Client.Conduit
+import Network.HTTP.Types
+import Database.Persist.Sql (SqlBackend, SqlPersistT, runMigration)
+import Data.Default (Default (..))
+
 import Database.Persist.Quasi
 import Yesod.Auth.HashDB (HashDBUser (..))
 
diff --git a/src/Vervis/Settings.hs b/src/Vervis/Settings.hs
index 4ee1a2f..fef261f 100644
--- a/src/Vervis/Settings.hs
+++ b/src/Vervis/Settings.hs
@@ -22,7 +22,15 @@
 -- declared in the Foundation.hs file.
 module Vervis.Settings where
 
-import ClassyPrelude.Yesod
+import ClassyPrelude.Conduit
+import Yesod hiding (Header, parseTime)
+import qualified Yesod
+import Yesod.Static
+import Network.HTTP.Client.Conduit
+import Network.HTTP.Types
+import Database.Persist.Sql (SqlBackend, SqlPersistT, runMigration)
+import Data.Default (Default (..))
+
 import Control.Exception           (throw)
 import Data.Aeson                  (Result (..), fromJSON, withObject, (.!=),
                                     (.:?))
diff --git a/vervis.cabal b/vervis.cabal
index 8fc209f..f057cfe 100644
--- a/vervis.cabal
+++ b/vervis.cabal
@@ -35,6 +35,7 @@ flag library-only
 
 library
   exposed-modules:     Data.Char.Local
+                       Data.Git.Local
                        Data.Graph.Inductive.Local
                        Data.List.Local
                        Vervis.Application
@@ -91,7 +92,7 @@ library
                      , case-insensitive
                      , classy-prelude                >= 0.10.2
                      , classy-prelude-conduit        >= 0.10.2
-                     , classy-prelude-yesod          >= 0.10.2
+                     --, classy-prelude-yesod          >= 0.10.2
                      , conduit                       >= 1.0        && < 2.0
                      , containers
                      , data-default
@@ -105,6 +106,7 @@ library
                      , hjsmin                        >= 0.1        && < 0.2
                      , hourglass
                      , http-conduit                  >= 2.1        && < 2.2
+                     , http-types
                      , monad-control                 >= 0.3        && < 1.1
                      , monad-logger                  >= 0.3        && < 0.4
                      , persistent                    >= 2.0        && < 2.3
@@ -115,6 +117,7 @@ library
                      , template-haskell
                      , text                          >= 0.11       && < 2.0
                      , time
+                     , transformers
                      , unordered-containers
                      , vector
                      , wai