diff --git a/kanshi/.config/kanshi/config b/kanshi/.config/kanshi/config
index 96dce49..c5dadb4 100644
--- a/kanshi/.config/kanshi/config
+++ b/kanshi/.config/kanshi/config
@@ -11,7 +11,7 @@ profile multihead-DP {
 
 profile multihead-HDMI {
   output eDP-1 enable
-  output HDMI-A-2 enable mode 1920x1080
+  output HDMI-A-1 enable mode 1920x1080
   exec swaymsg workspace "1: ", move workspace to eDP-1
   exec swaymsg workspace "3: ", move workspace to eDP-1
   exec swaymsg workspace "2: ", move workspace to HDMI-A-2
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 8938d57..32ce425 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -274,11 +274,11 @@ bindsym XF86AudioMicMute exec ~/.local/share/scripts/pulseaudio-mic-mute
 bindsym XF86MonBrightnessUp exec light -A 10
 bindsym XF86MonBrightnessDown exec light -U 10
 # Media control
-bindsym XF86Tools exec mpc toggle
+bindsym XF86Messenger exec mpc toggle
 bindsym XF86AudioPlay exec mpc toggle
-bindsym XF86Search exec mpc stop
-bindsym XF86LaunchA exec mpc prev
-bindsym XF86Explorer exec mpc next
+bindsym XF86Go exec mpc stop
+bindsym Cancel exec mpc prev
+bindsym XF86Favorites exec mpc next
 
 #
 # Program keybindings
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index 46f623a..8fc54b2 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -3,7 +3,7 @@
     "height": 25,
     "modules-left": ["sway/workspaces" ],
     "modules-center": ["custom/org-pomodoro", "clock", "custom/cgm-value"],
-    "modules-right": ["mpd", "network", "pulseaudio", "battery", "battery#bat2"],
+    "modules-right": ["mpd", "network", "pulseaudio", "battery" ],
     "mpd": {
         "format": "<span foreground='#88C0D0'>{stateIcon}</span>  {title}",
         "format-disconnected": "",
@@ -41,20 +41,6 @@
         "format-full": "<span foreground='#88C0D0'>󰁹</span> 100%",
         "format-icons": ["󰁼", "󰁿", "󰂁"]
     },
-    "battery#bat2": {
-        "bat": "BAT1",
-        "states": {
-            "good": 95,
-            "warning": 30,
-            "critical": 10
-        },
-        "format": "<span foreground='#88C0D0'>{icon}</span> {capacity}%",
-        "format-charging": "<span foreground='#88C0D0'>󰂄</span> {capacity}%",
-        "format-plugged": "<span foreground='#88C0D0'>󰂄</span> {capacity}%",
-        "format-alt": "{time} {icon}",
-        "format-full": "<span foreground='#88C0D0'>󰁹</span> 100%",
-        "format-icons": ["󰁼", "󰁿", "󰂁"]
-    },
     "network": {
         "format-wifi": "<span foreground='#88C0D0'>{icon}</span>  {essid}",
         "format-ethernet": "<span foreground='#88C0D0'></span>  Connected",