diff --git a/.zshrc b/.zshrc
index 2252092..a2359d1 100644
--- a/.zshrc
+++ b/.zshrc
@@ -12,3 +12,6 @@ export FZF_DEFAULT_COMMAND='fd --type f'
 source /usr/share/fzf/completion.zsh
 source /usr/share/fzf/key-bindings.zsh
 alias pdfdiff="diffpdf"
+
+# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
+export PATH="$PATH:$HOME/.rvm/bin"
diff --git a/i3/conf/client/Cyb3r/bar b/i3/conf/client/Cyb3r/bar
index 33b7fc7..f2c8ca2 100644
--- a/i3/conf/client/Cyb3r/bar
+++ b/i3/conf/client/Cyb3r/bar
@@ -1,4 +1,4 @@
-set $CLIENT_BUMBLEBEE -m spotify load spaceapi memory disk nic amixer datetime -p nic.states=^down -p amixer.left-click="pavucontrol" spaceapi.format=" %%space%%: %%state.open%Geöffnet%Geschlossen%%" -t gruvbox-powerline-light -a load spaceapi memory disk
+set $CLIENT_BUMBLEBEE -m spotify load spaceapi memory disk nic amixer datetime -p nic.states=^down -p amixer.left-click="pavucontrol" spaceapi.format=" %%space%%: %%state.open%Geöffnet%Geschlossen%%" -t onedark-powerline -a load spaceapi memory disk
 
 # {{{ STATUS BAR }}}
 bar {
diff --git a/i3/conf/client/ThinkPad/bar b/i3/conf/client/ThinkPad/bar
index 385c0d9..0339db7 100644
--- a/i3/conf/client/ThinkPad/bar
+++ b/i3/conf/client/ThinkPad/bar
@@ -1,4 +1,4 @@
-set $CLIENT_BUMBLEBEE -m spotify load spaceapi memory disk nic battery sensors amixer datetime -p sensors.path="/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp3_input" nic.states=^down amixer.left-click="pavucontrol" battery.device="BAT0,BAT1" spaceapi.format=" %%space%%: %%state.open%Geöffnet%Geschlossen%%" -t gruvbox-powerline -a load spaceapi memory disk
+set $CLIENT_BUMBLEBEE -m spotify load spaceapi memory disk nic battery sensors amixer datetime -p sensors.path="/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp3_input" nic.states=^down amixer.left-click="pavucontrol" battery.device="BAT0,BAT1" spaceapi.format=" %%space%%: %%state.open%Geöffnet%Geschlossen%%" -t onedark-powerline -a load spaceapi memory disk
 
 # {{{ STATUS BAR }}}
 bar {
diff --git a/i3/conf/common/base b/i3/conf/common/base
index 052c594..4d14ff5 100644
--- a/i3/conf/common/base
+++ b/i3/conf/common/base
@@ -136,10 +136,10 @@ floating_modifier $mod
     bindsym Ctrl+XF86AudioLowerVolume exec --no-startup-id amixer set Master 10%-
 
     bindsym XF86AudioMute        exec --no-startup-id amixer set Master toggle
-    bindsym XF86AudioPlay        exec --no-startup-id mpc toggle
-    bindsym XF86AudioNext        exec --no-startup-id mpc next
-    bindsym XF86AudioPrev        exec --no-startup-id mpc prev
-    bindsym XF86AudioStop        exec --no-startup-id mpc stop
+    bindsym XF86AudioPlay        exec --no-startup-id playerctl play-pause
+    bindsym XF86AudioNext        exec --no-startup-id playerctl next
+    bindsym XF86AudioPrev        exec --no-startup-id playerctl previous
+    bindsym XF86AudioStop        exec --no-startup-id playerctl stop
 
     # Screensaver || ThinkVantage
     bindsym XF86ScreenSaver exec xautolock -locknow