diff --git a/src/Prelude.hs b/src/Prelude.hs
index 945d807120b1e7393b27994986ebf0d81afa43b4..596792e002d37644f81e8616d1e99286e03a8a81 100644
--- a/src/Prelude.hs
+++ b/src/Prelude.hs
@@ -2,20 +2,24 @@
 
 module Prelude
   ( module BasePrelude,
-    head,
+    ByteString.ByteString,
+    Text.Text,
+    Maybe.listToMaybe,
     error,
     errorWithoutStackTrace,
-    undefined,
-    Text.Text,
-    ByteString.ByteString,
+    forever,
+    head,
+    intercalate,
     trace,
     traceId,
     traceShow,
     traceShowId,
     traceM,
     traceShowM,
-    Maybe.listToMaybe,
-    intercalate
+    undefined,
+    unless,
+    void,
+    when
   )
 where
 
@@ -26,6 +30,7 @@ import BasePrelude hiding
     undefined,
   )
 import qualified BasePrelude as P
+import Control.Monad (forever, void, when, unless)
 import qualified Data.ByteString as ByteString
 import qualified Data.Maybe as Maybe
 import qualified Data.Text.Lazy as Text
diff --git a/src/QBar/ControlSocket.hs b/src/QBar/ControlSocket.hs
index 632d48659bcf5c5c6690216cd4916996b2cc4c05..5b3c6e5ef7394dccda96e38d77d07348884ae560 100644
--- a/src/QBar/ControlSocket.hs
+++ b/src/QBar/ControlSocket.hs
@@ -14,7 +14,6 @@ import QBar.Host
 import QBar.Util
 
 import Control.Exception (SomeException, handle)
-import Control.Monad (forever, void, when)
 import Control.Concurrent (forkFinally)
 import Control.Concurrent.Async
 import Data.Aeson (FromJSON, ToJSON)
diff --git a/src/QBar/Core.hs b/src/QBar/Core.hs
index 46bd95c8ec4ca28ab0c4a217388cec09568c459f..3638ae9ec96e7454afb9456fcc14880e82eda14c 100644
--- a/src/QBar/Core.hs
+++ b/src/QBar/Core.hs
@@ -12,7 +12,6 @@ import Control.Concurrent.MVar
 import Control.Concurrent.STM.TChan (TChan, writeTChan)
 import Control.Exception (IOException)
 import Control.Lens
-import Control.Monad (forever, when)
 import Control.Monad.Reader (ReaderT, runReaderT, ask)
 import Control.Monad.State (StateT)
 import Control.Monad.Writer (WriterT)
diff --git a/src/QBar/Host.hs b/src/QBar/Host.hs
index 2ba09a09db66a4d31239eab5c5fbadfd1e481c3c..e191194a2eacd1463c156bb4e2d1add4bb930032 100644
--- a/src/QBar/Host.hs
+++ b/src/QBar/Host.hs
@@ -11,7 +11,6 @@ import Control.Concurrent.Event as Event
 import Control.Concurrent.STM.TChan (TChan, newTChanIO, tryReadTChan)
 import Control.Exception (SomeException, catch)
 import Control.Lens hiding (each, (.=))
-import Control.Monad (when)
 import Control.Monad.STM (atomically)
 import Data.IORef (IORef, newIORef, readIORef, writeIORef)
 import Data.Maybe (catMaybes, mapMaybe)
diff --git a/src/QBar/Server.hs b/src/QBar/Server.hs
index d36cbf0a55866081183edfc96b4d1865975439eb..324d2aef3cae572b7671370c715799a71aba8baa 100644
--- a/src/QBar/Server.hs
+++ b/src/QBar/Server.hs
@@ -11,7 +11,7 @@ import QBar.Pango
 import QBar.Theme
 import QBar.Util
 
-import Control.Monad (when, unless, forM_)
+import Control.Monad (forM_)
 import Control.Concurrent.Async (async, link)
 import Control.Concurrent.Event as Event
 import Control.Concurrent.MVar (MVar, newMVar, modifyMVar, modifyMVar_)
diff --git a/src/QBar/Time.hs b/src/QBar/Time.hs
index e7afdc5d9918c9bf1454aada3f5f6880e65b23bf..fa205f22f91d0e2ebb76ec51ecbd40e515417eae 100644
--- a/src/QBar/Time.hs
+++ b/src/QBar/Time.hs
@@ -1,7 +1,6 @@
 module QBar.Time (sleepUntil, nextMinute) where
 
 import Control.Concurrent (threadDelay)
-import Control.Monad (when)
 import Data.Time.Clock (UTCTime, getCurrentTime, diffUTCTime, utctDayTime)
 
 sleepUntil :: UTCTime -> IO ()