diff --git a/modules/applications/weechat.nix b/modules/applications/weechat.nix
index 0ffa2dc..d42112e 100644
--- a/modules/applications/weechat.nix
+++ b/modules/applications/weechat.nix
@@ -96,7 +96,7 @@ in {
       disconnect_sign = "❌"
       encrypted_room_sign = "🔐"
       encryption_warning_sign = "⚠️ "
-      human_buffer_names = off
+      human_buffer_names = on
       max_typing_notice_item_length = 50
       new_channel_position = none
       pygments_style = "native"
diff --git a/modules/workspace/gtk.nix b/modules/workspace/gtk.nix
index 068b528..b369468 100644
--- a/modules/workspace/gtk.nix
+++ b/modules/workspace/gtk.nix
@@ -65,5 +65,4 @@ in {
     };
   };
   environment.sessionVariables.GTK_THEME = "Generated";
-  environment.sessionVariables.GDK_BACKEND = "x11";
 }
diff --git a/modules/workspace/sway/default.nix b/modules/workspace/sway/default.nix
index 68088ee..ebad3f9 100755
--- a/modules/workspace/sway/default.nix
+++ b/modules/workspace/sway/default.nix
@@ -53,6 +53,7 @@ in {
         smartBorders = "on";
       };
       focus.followMouse = false;
+      focus.forceWrapping = true;
       modifier = "Mod4";
       window = {
         border = 1;
@@ -190,18 +191,24 @@ in {
       };
       workspaceLayout = "tabbed";
       workspaceAutoBackAndForth = true;
+      input = {
+        "2:14:ETPS/2_Elantech_Touchpad" = {
+          tap = "enabled";
+          natural_scroll = "enabled";
+          dwt = "enabled";
+        };
+        "2:14:ETPS/2_Elantech_TrackPoint" = {
+          pointer_accel = "-0.7";
+        };
+      };
+      output = {
+        "*".bg = "${thm.bg} solid_color";
+      };
     };
     wrapperFeatures = {
       gtk = true;
     };
     extraConfig = ''
-      output * bg ${thm.bg} solid_color
-      input 2:14:ETPS/2_Elantech_Touchpad {
-        tap enabled
-        natural_scroll enabled
-        dwt enabled
-      }
-      input 2:14:ETPS/2_Elantech_TrackPoint pointer_accel -0.7
       default_border pixel 1
       mouse_warping container
       hide_edge_borders --i3 smart