diff --git a/programs/BorderDemo.hs b/programs/BorderDemo.hs
index 983f1d0..c2ba5b2 100644
--- a/programs/BorderDemo.hs
+++ b/programs/BorderDemo.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 module Main where
 
@@ -5,7 +6,10 @@ module Main where
 import Control.Applicative ((<$>))
 #endif
 
+#if !(MIN_VERSION_base(4,11,0))
 import Data.Monoid ((<>))
+#endif
+
 import qualified Data.Text as T
 import qualified Graphics.Vty as V
 
diff --git a/programs/CacheDemo.hs b/programs/CacheDemo.hs
index 2581716..19f7ffc 100644
--- a/programs/CacheDemo.hs
+++ b/programs/CacheDemo.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 module Main where
 
@@ -6,7 +7,9 @@ import Control.Applicative
 #endif
 
 import Control.Monad (void)
+#if !(MIN_VERSION_base(4,11,0))
 import Data.Monoid ((<>))
+#endif
 import qualified Graphics.Vty as V
 
 import qualified Brick.Types as T
diff --git a/programs/FormDemo.hs b/programs/FormDemo.hs
index 3a1209b..5f5bac4 100644
--- a/programs/FormDemo.hs
+++ b/programs/FormDemo.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE OverloadedStrings #-}
 module Main where
@@ -5,7 +6,9 @@ module Main where
 import qualified Data.Text as T
 import Lens.Micro ((^.))
 import Lens.Micro.TH
+#if !(MIN_VERSION_base(4,11,0))
 import Data.Monoid ((<>))
+#endif
 
 import qualified Graphics.Vty as V
 import Brick
diff --git a/programs/MarkupDemo.hs b/programs/MarkupDemo.hs
index 0500579..1790e68 100644
--- a/programs/MarkupDemo.hs
+++ b/programs/MarkupDemo.hs
@@ -1,7 +1,10 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 module Main where
 
+#if !(MIN_VERSION_base(4,11,0))
 import Data.Monoid ((<>))
+#endif
 import qualified Graphics.Vty as V
 
 import Brick.Main (App(..), defaultMain, resizeOrQuit, neverShowCursor)
diff --git a/programs/MouseDemo.hs b/programs/MouseDemo.hs
index e06476d..cfeb144 100644
--- a/programs/MouseDemo.hs
+++ b/programs/MouseDemo.hs
@@ -1,12 +1,17 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TemplateHaskell #-}
 module Main where
 
+#if !MIN_VERSION_base(4,8,0)
 import Control.Applicative ((<$>))
+#endif
 import Lens.Micro ((^.), (&), (.~), (%~))
 import Lens.Micro.TH (makeLenses)
 import Control.Monad (void)
+#if !(MIN_VERSION_base(4,11,0))
 import Data.Monoid ((<>))
+#endif
 import qualified Graphics.Vty as V
 
 import qualified Brick.Types as T
@@ -125,23 +130,24 @@ main = do
 
     initialVty <- buildVty
     void $ M.customMain initialVty buildVty Nothing app $ St [] Nothing
-           "Try clicking on various UI elements.\n\
-           \Observe that the click coordinates identify the\n\
-           \underlying widget coordinates.\n\
-           \\n\
-           \Lorem ipsum dolor sit amet,\n\
-           \consectetur adipiscing elit,\n\
-           \sed do eiusmod tempor incididunt ut labore\n\
-           \et dolore magna aliqua.\n\
-           \ \n\
-           \Ut enim ad minim veniam\n\
-           \quis nostrud exercitation ullamco laboris\n\
-           \nisi ut aliquip ex ea commodo consequat.\n\
-           \\n\
-           \Duis aute irure dolor in reprehenderit\n\
-           \in voluptate velit esse cillum dolore eu fugiat nulla pariatur.\n\
-           \\n\
-           \Excepteur sint occaecat cupidatat not proident,\n\
-           \sunt in culpa qui officia deserunt mollit\n\
-           \anim id est laborum.\n"
+           (unlines [ "Try clicking on various UI elements."
+                    , "Observe that the click coordinates identify the"
+                    , "underlying widget coordinates."
+                    , ""
+                    , "Lorem ipsum dolor sit amet,"
+                    , "consectetur adipiscing elit,"
+                    , "sed do eiusmod tempor incididunt ut labore"
+                    , "et dolore magna aliqua."
+                    , ""
+                    , "Ut enim ad minim veniam"
+                    , "quis nostrud exercitation ullamco laboris"
+                    , "isi ut aliquip ex ea commodo consequat."
+                    , ""
+                    , "Duis aute irure dolor in reprehenderit"
+                    , "in voluptate velit esse cillum dolore eu fugiat nulla pariatur."
+                    , ""
+                    , "Excepteur sint occaecat cupidatat not proident,"
+                    , "sunt in culpa qui officia deserunt mollit"
+                    , "anim id est laborum."
+                    ])
            (E.editor TextBox Nothing "")
diff --git a/programs/TextWrapDemo.hs b/programs/TextWrapDemo.hs
index 5853215..f69a81d 100644
--- a/programs/TextWrapDemo.hs
+++ b/programs/TextWrapDemo.hs
@@ -1,6 +1,9 @@
+{-# LANGUAGE CPP #-}
 module Main where
 
+#if !(MIN_VERSION_base(4,11,0))
 import Data.Monoid ((<>))
+#endif
 import Brick
 import Text.Wrap (defaultWrapSettings, preserveIndentation)
 
diff --git a/programs/ViewportScrollDemo.hs b/programs/ViewportScrollDemo.hs
index 1cd992f..3d9c4e0 100644
--- a/programs/ViewportScrollDemo.hs
+++ b/programs/ViewportScrollDemo.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 module Main where
 
@@ -6,7 +7,9 @@ import Control.Applicative
 #endif
 
 import Control.Monad (void)
+#if !(MIN_VERSION_base(4,11,0))
 import Data.Monoid ((<>))
+#endif
 import qualified Graphics.Vty as V
 
 import qualified Brick.Types as T
diff --git a/src/Brick/Themes.hs b/src/Brick/Themes.hs
index adba54a..c954c74 100644
--- a/src/Brick/Themes.hs
+++ b/src/Brick/Themes.hs
@@ -89,7 +89,9 @@ import Data.Tuple (swap)
 import Data.List (intercalate)
 import Data.Bits ((.|.), (.&.))
 import Data.Maybe (fromMaybe, isNothing, catMaybes, mapMaybe)
+#if !(MIN_VERSION_base(4,11,0))
 import Data.Monoid ((<>))
+#endif
 import qualified Data.Foldable as F
 
 import Data.Ini.Config
diff --git a/src/Brick/Util.hs b/src/Brick/Util.hs
index a129c7c..76571db 100644
--- a/src/Brick/Util.hs
+++ b/src/Brick/Util.hs
@@ -9,7 +9,9 @@ module Brick.Util
 where
 
 import Lens.Micro ((&), (%~))
+#if !(MIN_VERSION_base(4,11,0))
 import Data.Monoid ((<>))
+#endif
 import Graphics.Vty
 
 import Brick.Types.Internal (Location(..), CursorLocation(..), cursorLocationL)
diff --git a/src/Brick/Widgets/Core.hs b/src/Brick/Widgets/Core.hs
index 5dea18b..b4dbabd 100644
--- a/src/Brick/Widgets/Core.hs
+++ b/src/Brick/Widgets/Core.hs
@@ -91,9 +91,11 @@ module Brick.Widgets.Core
   )
 where
 
-#if MIN_VERSION_base(4,8,0)
+#if !(MIN_VERSION_base(4,11,0))
 import Data.Monoid ((<>))
-#else
+#endif
+
+#if !MIN_VERSION_base(4,8,0)
 import Control.Applicative
 import Data.Monoid ((<>), mempty)
 #endif
diff --git a/src/Brick/Widgets/Internal.hs b/src/Brick/Widgets/Internal.hs
index e755a56..335e777 100644
--- a/src/Brick/Widgets/Internal.hs
+++ b/src/Brick/Widgets/Internal.hs
@@ -21,7 +21,7 @@ import Brick.Types
 import Brick.Types.Internal
 import Brick.AttrMap
 import Brick.Widgets.Border.Style
-import Brick.BorderMap (BorderMap, Edges(..))
+import Brick.BorderMap (BorderMap)
 import qualified Brick.BorderMap as BM
 
 renderFinal :: AttrMap