diff --git a/music.json b/music.json
index 942fdba..7fbe9e6 100644
--- a/music.json
+++ b/music.json
@@ -3,7 +3,7 @@
         "27271E24211E1E26": {
             "Play": "02 - Disturbed - Immortalized.mp3"
         },
-        "27271E242121221F": "Shuffle",
+        "27271E242121221F": "VolumeUp",
         "27271E2420222321": {
             "Play": "01-13 33 RPM.flac"
         }
diff --git a/src/card.rs b/src/card.rs
index ea0ccdd..e9c9faa 100644
--- a/src/card.rs
+++ b/src/card.rs
@@ -10,6 +10,8 @@ pub enum Card {
     Next,
     Previous,
     Shuffle,
+    VolumeUp,
+    VolumeDown,
     ToggleHotspot,
 }
 
diff --git a/src/service.rs b/src/service.rs
index 52e85cb..85cbf13 100644
--- a/src/service.rs
+++ b/src/service.rs
@@ -76,6 +76,9 @@ pub fn run(rx: &Receiver<Arc<str>>, library: &Arc<Mutex<Library>>) -> Result<(),
                             toggle_hotspot(!hotspot_enabled)?;
                             hotspot_enabled = !hotspot_enabled;
                         }
+                        // TODO: Volume management. Currently the volume is set independetly from the OS which leads to a horrible quality decrease.
+                        Card::VolumeUp => sink.set_volume(sink.volume() + 1.0),
+                        Card::VolumeDown => sink.set_volume(sink.volume() - 1.0),
                     }
                 } else {
                     println!("No music file found for this card");