Replace X.L.Groups with X.L.SubLayouts.

diff --git a/lib/KeyBindings.hs b/lib/KeyBindings.hs
index 8b31b5f..7ce7ea8 100644
--- a/lib/KeyBindings.hs
+++ b/lib/KeyBindings.hs
@@ -25,9 +25,10 @@ import XMonad.Layout.MultiToggle
 import XMonad.Layout.MultiToggle.Instances
 import XMonad.Layout.Maximize
 import XMonad.Layout.Minimize
-import XMonad.Layout.Groups.Examples
+-- import XMonad.Layout.Groups.Examples
+import XMonad.Layout.SubLayouts
 -- import qualified XMonad.Layout.TabbedModifier as Tab
--- import qualified XMonad.Layout.WindowNavigation as Nav
+import qualified XMonad.Layout.WindowNavigation as Nav

 import XMonad.Prompt
 import XMonad.Prompt.Window
@@ -119,8 +120,8 @@ addKeys = [("M-s n",         spawn "screenslide start"),

           -- Move focus to the next window
           ("M1-<Tab>",        windows W.focusDown),
-          ("M-j",             bindOn [("im", focusUp),   ("", windows W.focusDown)]),
-          ("M-k",             bindOn [("im", focusDown), ("", windows W.focusUp)]),
+          ("M-j",             windows W.focusDown),
+          ("M-k",             windows W.focusUp),

 --        ("M-<Left>",        sendMessage $ Nav.Go Nav.L  ),
 --        ("M-<Right>",       sendMessage $ Nav.Go Nav.R  ),
@@ -139,12 +140,12 @@ addKeys = [("M-s n",         spawn "screenslide start"),
           ("M-S-k",           windows W.swapUp    ),

           -- Tab/Untab
-          ("M-M1-j",          moveToGroupDown True),
-          ("M-M1-l",          moveToGroupUp True),
-          -- ("M-M1-k",          sendMessage $ Tab.pull Nav.U),
-          -- ("M-M1-h",          sendMessage $ Tab.pull Nav.D),
+          ("M-M1-j",          sendMessage $ pushWindow Nav.D),
+          ("M-M1-l",          sendMessage $ pushWindow Nav.R),
+          ("M-M1-k",          sendMessage $ pushWindow Nav.U),
+          ("M-M1-h",          sendMessage $ pushWindow Nav.L),

-          ("M-M1-u",          splitGroup),
+          ("M-M1-u",          withFocused (sendMessage . UnMergeAll)),

           -- Shrink/expand the master area
           ("M-e",             sendMessage Shrink),
diff --git a/lib/Layouts.hs b/lib/Layouts.hs
index 6ab9ebd..c302141 100644
--- a/lib/Layouts.hs
+++ b/lib/Layouts.hs
@@ -36,7 +36,8 @@ import XMonad.Layout.Tabbed
 import XMonad.Layout.TrackFloating
 import XMonad.Layout.Maximize
 import XMonad.Layout.Minimize
-import XMonad.Layout.Groups
+import XMonad.Layout.SubLayouts
+import XMonad.Layout.Simplest

 import qualified XMonad.Layout.WindowNavigation as Nav

@@ -50,7 +51,7 @@ tWithIM = withIM (1%6) ((Role "buddy_list") `Or` (Role "MainWindow") `Or` (Role

 isGfxPanel = (Role "gimp-toolbox") `Or` (Role "Brush selector") `Or` (Role "toolbox_window") `Or` (Role "Layers")

-imlayout = group (tabbed shrinkText deco) (Grid 2)
+imlayout = addTabs shrinkText deco $ subLayout [] Simplest (Grid 2)

 grid = named "grid" $ Grid (2)
 vgrid = Grid (1/2)
@@ -98,7 +99,7 @@ draggable layout = windowSwitcherDecorationWithButtons shrinkText decoB (draggin

 myLayout = trackFloating $
            smartBorders $
-           -- Nav.configurableNavigation (Nav.navigateBrightness 0.0) $
+           Nav.configurableNavigation (Nav.navigateBrightness 0.0) $
            avoidStruts $
            -- Tab.modify shrinkText deco $
            onWorkspace "inet" (minimax full ||| minimax autogrid ||| onebig) $