diff --git a/packages/tos-desktop-wm/PKGBUILD b/packages/tos-desktop-wm/PKGBUILD
index f05429e..3609232 100644
--- a/packages/tos-desktop-wm/PKGBUILD
+++ b/packages/tos-desktop-wm/PKGBUILD
@@ -4,7 +4,7 @@ arch=('any')
 url='https://git.tipragot.fr/tipragot/tos'
 license=('MIT')
 
-pkgver='0.1.7'
+pkgver='0.1.8'
 pkgrel='1'
 depends=('tos-desktop-core' 'tos-desktop-terminal' 'tos-desktop-browser' 'lightdm' 'qtile' 'rofi')
 source=('lightdm.conf' 'config.py')
diff --git a/packages/tos-desktop-wm/config.py b/packages/tos-desktop-wm/config.py
index 7f7c6e1..80e3000 100644
--- a/packages/tos-desktop-wm/config.py
+++ b/packages/tos-desktop-wm/config.py
@@ -20,42 +20,45 @@ ALT = "mod1"
 
 keys = [
     # Actions
-    Key([MOD, SHIFT], "r", lazy.reload_config(), desc="Reload the config"),
+    Key([MOD], "g", lazy.reload_config(), desc="Reload the config"),
+    Key([MOD], "b", lazy.window.kill(), desc="Kill focused window"),
+    Key([MOD], "v", lazy.window.toggle_floading(), desc="Toggle floating window"),
+
+    # Switch to group
+    Key([MOD], "q", lazy.group["zic"].toscreen(), desc="Switch to group zic"),
+    Key([MOD], "w", lazy.group["dev"].toscreen(), desc="Switch to group dev"),
+    Key([MOD], "f", lazy.group["web"].toscreen(), desc="Switch to group web"),
+
+    # Move window to group
+    Key([MOD], "z", lazy.window.togroup("zic", switch_group=True), desc="Move window to group zic"),
+    Key([MOD], "x", lazy.window.togroup("dev", switch_group=True), desc="Move window to group dev"),
+    Key([MOD], "c", lazy.window.togroup("web", switch_group=True), desc="Move window to group web"),
 
     # Switch between windows
     Key([MOD], "n", lazy.layout.left(), desc="Move focus left"),
-    Key([MOD], "o", lazy.layout.right(), desc="Move focus right"),
     Key([MOD], "e", lazy.layout.down(), desc="Move focus down"),
     Key([MOD], "i", lazy.layout.up(), desc="Move focus up"),
+    Key([MOD], "o", lazy.layout.right(), desc="Move focus right"),
 
     # Move windows
-    Key([CTRL, MOD], "n", lazy.layout.shuffle_left(), desc="Move window left"),
-    Key([CTRL, MOD], "o", lazy.layout.shuffle_right(), desc="Move window right"),
-    Key([CTRL, MOD], "e", lazy.layout.shuffle_down(), desc="Move window down"),
-    Key([CTRL, MOD], "i", lazy.layout.shuffle_up(), desc="Move window up"),
+    Key([MOD], "l", lazy.layout.shuffle_left(), desc="Move window left"),
+    Key([MOD], "u", lazy.layout.shuffle_down(), desc="Move window down"),
+    Key([MOD], "y", lazy.layout.shuffle_up(), desc="Move window up"),
+    Key([MOD], "BackSpace", lazy.layout.shuffle_right(), desc="Move window right"),
 
     # Grow windows
-    Key([MOD, ALT], "n", lazy.layout.grow_left(), desc="Grow window left"),
-    Key([MOD, ALT], "o", lazy.layout.grow_right(), desc="Grow window right"),
-    Key([MOD, ALT], "e", lazy.layout.grow_down(), desc="Grow window down"),
-    Key([MOD, ALT], "i", lazy.layout.grow_up(), desc="Grow window up"),
-    Key([MOD, ALT], "m", lazy.layout.normalize(), desc="Reset all window sizes"),
+    Key([MOD], "k", lazy.layout.normalize(), desc="Reset all window sizes"),
+    Key([MOD], "h", lazy.layout.grow_left(), desc="Grow window left"),
+    Key([MOD], "comma", lazy.layout.grow_down(), desc="Grow window down"),
+    Key([MOD], "semicolon", lazy.layout.grow_up(), desc="Grow window up"),
+    Key([MOD], "apostrophe", lazy.layout.grow_right(), desc="Grow window right"),
 
     # Applications
-    Key([MOD], "q", lazy.window.kill(), desc="Kill focused window"),
     Key([MOD], "a", lazy.spawn("rofi -show drun"), desc="Launch rofi"),
+    Key([MOD], "s", lazy.spawn("qutebrowser"), desc="Launch browser"),
     Key([MOD], "t", lazy.spawn("alacritty"), desc="Launch terminal"),
 ]
 
-# Group keys
-for i, name in enumerate(group_names):
-    keys.extend(
-        [
-            Key([MOD], str(i+1), lazy.group[name].toscreen(), desc=f"Switch to group {name}"),
-            Key([MOD, SHIFT], str(i+1), lazy.window.togroup(name, switch_group=True), desc=f"Switch to & move focused window to group {name}"),
-        ]
-    )
-
 # ============= #
 # === MOUSE === #
 # ============= #
@@ -73,7 +76,6 @@ mouse = [
 
 layouts = [
     layout.Columns(border_focus_stack=["#d75f5f", "#8f3d3d"], border_width=4),
-    layout.Max(),
 ]
 
 # =============== #
diff --git a/repository/tos-desktop-wm-0.1.7-1-any.pkg.tar.zst b/repository/tos-desktop-wm-0.1.7-1-any.pkg.tar.zst
deleted file mode 100644
index 6c80e50..0000000
Binary files a/repository/tos-desktop-wm-0.1.7-1-any.pkg.tar.zst and /dev/null differ
diff --git a/repository/tos-desktop-wm-0.1.8-1-any.pkg.tar.zst b/repository/tos-desktop-wm-0.1.8-1-any.pkg.tar.zst
new file mode 100644
index 0000000..05bd2ab
Binary files /dev/null and b/repository/tos-desktop-wm-0.1.8-1-any.pkg.tar.zst differ
diff --git a/repository/tos.db b/repository/tos.db
index 979e38d..b7781ee 100644
Binary files a/repository/tos.db and b/repository/tos.db differ
diff --git a/repository/tos.files b/repository/tos.files
index 75a572f..a036d35 100644
Binary files a/repository/tos.files and b/repository/tos.files differ