diff --git a/.aliases b/.aliases
index a838a6c..48805a9 100644
--- a/.aliases
+++ b/.aliases
@@ -4,4 +4,5 @@
 # Update apt packages, npm modules and composer
 alias update="sudo apt-get update; sudo apt-get dist-upgrade -y; sudo npm update -g; composer self-update"
 
+# Shortcut for clear because I often type the DOS command instead
 alias cls="clear"
diff --git a/.config/i3/config b/.config/i3/config
index 1339c9e..ab1979b 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -173,6 +173,13 @@ bar {
         font pango: Roboto-Regular, FontAwesome 10
         status_command i3blocks -c $HOME/.config/i3/i3blocks.conf
         position top
+	colors {
+		background #000000
+		separator #000000
+		focused_workspace #000000 #000000 #FF5722
+		inactive_workspace #000000 #424242 #FFFFFF
+		urgent_workspace #000000 #424242 #FFFFFF
+	}
 }
 
 # Custom key bindings
@@ -224,7 +231,5 @@ assign [class="KeePass2"] $workspace8
 assign [class="vlc"] $workspace9
 assign [class="Audacious"] $workspace10
 
-# i3-gaps specific
-
 # Disable window titlebars
 for_window [class="^.*"] border pixel 0
diff --git a/.config/i3/i3bar/music.sh b/.config/i3/i3bar/music.sh
index 34ae632..9ab95ae 100755
--- a/.config/i3/i3bar/music.sh
+++ b/.config/i3/i3bar/music.sh
@@ -1,3 +1,9 @@
 #!/bin/bash
 
-echo " $(audtool current-song)"
+OUTPUT="$(audtool current-song)"
+
+if [ -z "$OUTPUT" ]; then
+	OUTPUT="Not playing"
+fi
+
+echo " $OUTPUT"
diff --git a/.config/i3/i3blocks.conf b/.config/i3/i3blocks.conf
index 0c74efa..4809b7f 100644
--- a/.config/i3/i3blocks.conf
+++ b/.config/i3/i3blocks.conf
@@ -6,21 +6,25 @@ full_text=
 align=center
 separator=false
 separator_block_width=10
+color=#FF5722
 
 [Music]
 markup=pango
 command=~/.config/i3/i3bar/music.sh
-interval=repeat
+interval=1
+color=#FFFFFF
 
 [seperator]
 
 [Volume]
 full_text=
 command=~/.config/i3/i3bar/volume.sh
-interval=repeat
+interval=1
+color=#FFFFFF
 
 [seperator]
 
 [Datetime]
 command=~/.config/i3/i3bar/datetime.sh
 interval=1
+color=#FFFFFF
diff --git a/.xinitrc b/.xinitrc
index ba0c6ef..89fd2ae 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1 +1,7 @@
+# Disable screen saver
+xset s off
+xset -dpms
+xset s noblank
+
+# Start i3
 exec i3