diff --git a/Accordion.hs b/Accordion.hs
index b2fbec8f..1edec42b 100644
--- a/Accordion.hs
+++ b/Accordion.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Circle.hs b/Circle.hs
index a60cdf94..6fa98600 100644
--- a/Circle.hs
+++ b/Circle.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Circle
diff --git a/Combo.hs b/Combo.hs
index f4ab4b03..99dba299 100644
--- a/Combo.hs
+++ b/Combo.hs
@@ -1,5 +1,4 @@
-{-# OPTIONS_GHC -fallow-undecidable-instances #-}
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, UndecidableInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Dishes.hs b/Dishes.hs
index e080d71d..8faff4e0 100644
--- a/Dishes.hs
+++ b/Dishes.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Dishes
diff --git a/DragPane.hs b/DragPane.hs
index fa73c0b0..0546cb0c 100644
--- a/DragPane.hs
+++ b/DragPane.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/FlexibleManipulate.hs b/FlexibleManipulate.hs
index 778859c0..c85706aa 100644
--- a/FlexibleManipulate.hs
+++ b/FlexibleManipulate.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, TypeSynonymInstances #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.FlexibleManipulate
diff --git a/Grid.hs b/Grid.hs
index 361b5668..b7fe41b2 100644
--- a/Grid.hs
+++ b/Grid.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Grid
diff --git a/LayoutHints.hs b/LayoutHints.hs
index 67816e2c..e804102f 100644
--- a/LayoutHints.hs
+++ b/LayoutHints.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/LayoutModifier.hs b/LayoutModifier.hs
index 59258f91..1bf276fe 100644
--- a/LayoutModifier.hs
+++ b/LayoutModifier.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# -fglasgow-exts #-} -- For deriving Data/Typeable
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/LayoutScreens.hs b/LayoutScreens.hs
index 06947d2c..85dad374 100644
--- a/LayoutScreens.hs
+++ b/LayoutScreens.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/MagicFocus.hs b/MagicFocus.hs
index 8da34393..41540497 100644
--- a/MagicFocus.hs
+++ b/MagicFocus.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Magnifier.hs b/Magnifier.hs
index 6bd83067..49ea131b 100644
--- a/Magnifier.hs
+++ b/Magnifier.hs
@@ -1,4 +1,5 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Magnifier
diff --git a/Maximize.hs b/Maximize.hs
index 2322c549..db9d265a 100644
--- a/Maximize.hs
+++ b/Maximize.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable
+{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Mosaic.hs b/Mosaic.hs
index 5fa33048..fe994449 100644
--- a/Mosaic.hs
+++ b/Mosaic.hs
@@ -1,4 +1,5 @@
 {-# OPTIONS -fglasgow-exts #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Mosaic
diff --git a/MosaicAlt.hs b/MosaicAlt.hs
index 14a18285..a5308e3a 100644
--- a/MosaicAlt.hs
+++ b/MosaicAlt.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# OPTIONS -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.MosaicAlt
diff --git a/NoBorders.hs b/NoBorders.hs
index 30944c37..16bd534b 100644
--- a/NoBorders.hs
+++ b/NoBorders.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/ResizableTile.hs b/ResizableTile.hs
index 650e3fa4..f4617d24 100644
--- a/ResizableTile.hs
+++ b/ResizableTile.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving, FlexibleInstances #-}
+{-# OPTIONS_GHC -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.ResizableTile
diff --git a/Roledex.hs b/Roledex.hs
index c7b407ba..87651464 100644
--- a/Roledex.hs
+++ b/Roledex.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, TypeSynonymInstances, MultiParamTypeClasses #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Spiral.hs b/Spiral.hs
index 42e78814..53b4d45e 100644
--- a/Spiral.hs
+++ b/Spiral.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/Square.hs b/Square.hs
index 48b94278..42de9741 100644
--- a/Square.hs
+++ b/Square.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Square
diff --git a/SwitchTrans.hs b/SwitchTrans.hs
index c4be6cd4..5683436a 100644
--- a/SwitchTrans.hs
+++ b/SwitchTrans.hs
@@ -1,4 +1,5 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.SwitchTrans
diff --git a/Tabbed.hs b/Tabbed.hs
index 6f1cdf67..0996e069 100644
--- a/Tabbed.hs
+++ b/Tabbed.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards, TypeSynonymInstances #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.Tabbed
diff --git a/ThreeColumns.hs b/ThreeColumns.hs
index 683af88c..14755861 100644
--- a/ThreeColumns.hs
+++ b/ThreeColumns.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/TwoPane.hs b/TwoPane.hs
index 867e6a7c..a3ea118b 100644
--- a/TwoPane.hs
+++ b/TwoPane.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/WindowNavigation.hs b/WindowNavigation.hs
index a219a54a..5410a159 100644
--- a/WindowNavigation.hs
+++ b/WindowNavigation.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving, FlexibleInstances #-}
+{-# OPTIONS -fglasgow-exts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonadContrib.WorkspaceDir
diff --git a/WorkspaceDir.hs b/WorkspaceDir.hs
index 97e5f948..3fe46d59 100644
--- a/WorkspaceDir.hs
+++ b/WorkspaceDir.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# OPTIONS_GHC -fglasgow-exts #-} -- For deriving Data/Typeable
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
 
 -----------------------------------------------------------------------------
 -- |