From 9a543acf5b3311726dd84547c5eb148d07f06151 Mon Sep 17 00:00:00 2001
From: speediegq <speedie.alt@gmail.com>
Date: Sat, 17 Sep 2022 18:31:27 +0200
Subject: [PATCH] Change older keybinds

---
 README.md     |  2 +-
 docs/bindlist |  6 ++----
 keybinds.h    | 19 ++++++++-----------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index bdc5a47..e7cacc9 100644
--- a/README.md
+++ b/README.md
@@ -195,7 +195,7 @@ Below is a list of all speedwm keybinds.
   - Music button              | Open your defined music player
   - WLAN button               | Disconnect from WLAN
 
-  -- Mouse --
+  ### Mouse
 
   These binds can be activated using your mouse
 
diff --git a/docs/bindlist b/docs/bindlist
index e82a11c..4e91ce1 100644
--- a/docs/bindlist
+++ b/docs/bindlist
@@ -77,10 +77,8 @@
   - Super+Control+q           | Mutes your audio
   - Super+Control+w           | Increases your volume
   - Super+Control+e           | Decreases your volume
-  - Super+Control+e           | Switch to layout 3 (Grid)
-  - Super+Control+r           | Switch to layout 1 (Monocle)
-  - Super+Control+t           | Switch to layout 0 (Master & stack)
-  - Super+Control+y           | Switch to layout 4 (Deck)
+  - Super+Control+r           | Switch to layout 0 (Tile)
+  - Super+Control+t           | Switch to layout 18 (Dynamic Grid)
   - Super+Control+0           | View all windows at once.
   - Super+Control+Arrow       | Moves a window to any corner of your screen (Arrow key)
   - Super+Control+Tab         | Open a dmenu prompt asking the user what layout to switch to
diff --git a/keybinds.h b/keybinds.h
index 254c450..a75b1ac 100644
--- a/keybinds.h
+++ b/keybinds.h
@@ -19,11 +19,12 @@
  */
 
 /* Tag related keybinds */
-#define TAGKEYS(CHAIN,KEY,TAG)                { MODIFIER1,                       CHAIN, KEY, view,       {.ui = 1 << TAG } },  \
-										      { MODIFIER1|ShiftMask,             CHAIN, KEY, previewtag, {.ui = TAG} }, \
-										      { MODIFIER1|ControlMask,           CHAIN, KEY, toggleview, {.ui = 1 << TAG } },  \
-										      { MODIFIER1|ShiftMask|ControlMask, CHAIN, KEY, tag,        {.ui = 1 << TAG } },
+#define TAGKEYS(CHAIN,KEY,TAG) { MODIFIER1,                   CHAIN, KEY, view,       {.ui = 1 << TAG } },  \
+							   { MODIFIER1|SHIFT,             CHAIN, KEY, previewtag, {.ui = TAG} },        \
+							   { MODIFIER1|CONTROL,           CHAIN, KEY, toggleview, {.ui = 1 << TAG } },  \
+							   { MODIFIER1|SHIFT|CONTROL,     CHAIN, KEY, tag,        {.ui = 1 << TAG } },  
 
+/* Keybinds */
 static const Key keys[] = {
 	/* modifier                     chain key     key           function              argument */
 
@@ -64,16 +65,12 @@ static const Key keys[] = {
 	/* Layout keybinds */
 	{ MODIFIER1|CONTROL|SHIFT,     -1,            XK_a,         cyclelayout,          {.i = -1 } },
 	{ MODIFIER1|CONTROL|SHIFT,     -1,            XK_d,         cyclelayout,          {.i = +1 } },
-#if LAYOUT_DECK
-    { MODIFIER1|CONTROL,           -1,            XK_y,         setlayout,            {.v = &layouts[4]} },
-#endif
-#if LAYOUT_GRID
-	{ MODIFIER1|CONTROL,           -1,            XK_e,         setlayout,            {.v = &layouts[3]} },
-#endif
 #if LAYOUT_TILE
 	{ MODIFIER1|CONTROL,           -1,            XK_r,         setlayout,            {.v = &layouts[1]} },
 #endif
-	{ MODIFIER1|CONTROL,           -1,            XK_t,         setlayout,            {.v = &layouts[0]} },
+#if LAYOUT_DGRID
+	{ MODIFIER1|CONTROL,           -1,            XK_t,         setlayout,            {.v = &layouts[18]} },
+#endif
 	{ MODIFIER1,                   -1,            XK_space,     setlayout,            {0} },
 
 	/* Sticky keybinds */