diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index d90e956..4f34d48 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -173,35 +173,7 @@ mode "resize" {
 
 }
 
-set $mode_media "Media"
-mode $mode_media {
-        # Pressing left will move 5s back
-        bindsym h exec playerctl position 5-
-        bindsym Shift+h exec playerctl position 15-
-        # Pressing down will move to the next file
-        bindsym j exec playerctl next
-        # Pressing up will move to the previous file
-        bindsym k exec playerctl previous
-        # Pressing right will move 5s forward
-        bindsym l exec playerctl position 5+
-        bindsym Shift+l exec playerctl position 30+
-
-        # Pressing p will play/pause current track
-        bindsym p exec playerctl play-pause
-
-        # Pressing p will play/pause current track
-        bindsym s exec playerctl stop
-
-        #TODO add option to open file, loop, shuffle, show/select players
-
-        # back to normal
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-        bindsym $modemod+m mode "default"
-}
-
 bindsym $modemod+r mode "resize"
-bindsym $modemod+m mode $mode_media
 
 # reload the configuration file
 bindsym $mod+F12 reload
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
index da8d7f9..9a943e7 100644
--- a/sxhkd/.config/sxhkd/sxhkdrc
+++ b/sxhkd/.config/sxhkd/sxhkdrc
@@ -1,28 +1,8 @@
 # universal x key bindings
 
-# Open terminal emulator (TODO find way to not hard-code alacritty, perhaps ENV vars)
-super + Return
-  exec alacritty
-
-# open quick start menu
-super + space
-  exec rofi -show drun -theme themes/dmenu
-
-# open more extensive run menu
-super + r
-  exec rofi -modi combi,ssh,calc -show combi -combi-modi "window,clipboard:greenclip print,run" -theme themes/dropdown
-
-# open gopass frontend menu
-super + p
-  exec rofi-gopass -theme themes/dropdown
-
-# open surfraw rofi frontend
-super + q
-  exec rofi-surfraw
-
 # System functionality
 
-# Enable lock screen (TODO does not stop music, etc yet
+# Enable lock screen (TODO does not stop music, etc yet)
 super + x
   lockscreen
 
@@ -35,15 +15,48 @@ super + F8
   styler set $(styler list themes | rofi -dmenu -theme /themes/dropdown -matching fuzzy)
 
 # enable function (/media) key functionality
-# TODO: set up next song, previous song, pause, etc
-# see: https://www.reddit.com/r/i3wm/comments/3a6nh3/help_how_to_use_function_keys_in_i3_config/
-XF86MonBrightnessUp
-  exec `xbacklight -inc 10`
-XF86MonBrightnessDown
-  exec `xbacklight -dec 10`
+XF86MonBrightness{Up,Down}
+  xbacklight {-inc,-dec} 10
 XF86AudioMute
-  exec `pulsemixer --toggle-mute`
-XF86AudioRaiseVolume
-  exec `pulsemixer --change-volume +5`
-XF86AudioLowerVolume
-  exec `pulsemixer --change-volume -5`
+  pulsemixer --toggle-mute
+XF86Audio{RaiseVolume,LowerVolume}
+  pulsemixer --change-volume {-5,+5}
+
+# Open terminal emulator (TODO find way to not hard-code alacritty, perhaps ENV vars)
+super + Return
+  alacritty
+
+# open quick start menu
+super + space
+  rofi -show drun -theme themes/dmenu
+
+# open more extensive run menu
+super + r
+  rofi -modi combi,ssh,calc -show combi -combi-modi "window,clipboard:greenclip print,run" -theme themes/dropdown
+
+# open gopass frontend menu
+super + p
+  rofi-gopass -theme themes/dropdown
+
+# open surfraw rofi frontend
+super + q
+  rofi-surfraw
+
+## modes
+
+# media control mode
+# seek +/- 5 seconds
+super + alt + m : {h,l}
+  playerctl position {5-,5+}
+# seek +/- 15 seconds
+super + alt + m : shift + {h,l}
+  playerctl position {15-,15+}
+# decrease/increase volume
+super + alt + m : {j,k}
+  pulsemixer --change-volume {-5,+5}
+# decrease/increase volume
+super + alt + m : shift + {j,k}
+  playerctl {next,previous}
+# pause/stop player
+super + alt + m : {_,shift} + p
+  playerctl {play-pause,stop}