diff --git a/audio b/audio
index c62ed83..3d92fb7 100755
--- a/audio
+++ b/audio
@@ -1,5 +1,22 @@
 #!/bin/bash
-sl=$(amixer get Master | tail -n 1)
-status=$(echo "${sl}" | grep -wo "on")
-volume=$(echo "${sl}" | awk -F ' ' '{print $5}' | tr -d '[]%')
-echo ${volume}
+amixer get Master | gawk '
+    match($0, /\[([0-9]+)\%\]/, matches) {
+        audio=matches[1]
+    }
+    END {
+        printf("%d%", audio)
+        print("\n")
+        if (audio < 75) {
+            print("#04B431\n")
+        } else if (audio < 80) {
+            print("#A8FF00\n")
+        } else if (audio < 85) {
+            print("#FFF600\n")
+        } else if (audio < 90) {
+            print("#FFAE00\n")
+        } else if (audio < 95) {
+            print("#FF0000\n")
+        } else {
+            exit 33
+        }
+    }'
diff --git a/config b/config
index aa12a35..47e4fa0 100644
--- a/config
+++ b/config
@@ -5,11 +5,21 @@ separator=false
 command=$HOME/.config/i3blocks/$BLOCK_NAME
 interval=5
 
+#[cpu]
+[audio]
+interval=1
+label=audio
 [ram]
+label=ram
 [storage]
+label=storage
 [ip]
+label=ip
 interval=once
 [battery]
+label=battery
+separator_block_width=5
 [battery]
 instance=1
 [datetime]
+interval=1
diff --git a/cpu b/cpu
new file mode 100755
index 0000000..8c3c1f5
--- /dev/null
+++ b/cpu
@@ -0,0 +1,55 @@
+#!/usr/bin/perl
+#
+# Copyright 2014 Pierre Mavro <deimos@deimos.fr>
+# Copyright 2014 Vivien Didelot <vivien@didelot.org>
+# Copyright 2014 Andreas Guldstrand <andreas.guldstrand@gmail.com>
+#
+# Licensed under the terms of the GNU GPL v3, or any later version.
+
+use strict;
+use warnings;
+use utf8;
+use Getopt::Long;
+
+# default values
+my $t_warn = 50;
+my $t_crit = 80;
+my $cpu_usage = -1;
+
+sub help {
+    print "Usage: cpu_usage [-w <warning>] [-c <critical>]\n";
+    print "-w <percent>: warning threshold to become yellow\n";
+    print "-c <percent>: critical threshold to become red\n";
+    exit 0;
+}
+
+GetOptions("help|h" => \&help,
+           "w=i"    => \$t_warn,
+           "c=i"    => \$t_crit);
+
+# Get CPU usage
+$ENV{LC_ALL}="en_US"; # if mpstat is not run under en_US locale, things may break, so make sure it is
+open (MPSTAT, 'mpstat 1 1 |') or die;
+while (<MPSTAT>) {
+    if (/^.*\s+(\d+\.\d+)\s+$/) {
+        $cpu_usage = 100 - $1; # 100% - %idle
+        last;
+    }
+}
+close(MPSTAT);
+
+$cpu_usage eq -1 and die 'Can\'t find CPU information';
+
+# Print short_text, full_text
+printf "%.2f%%\n", $cpu_usage;
+printf "%.2f%%\n", $cpu_usage;
+
+# Print color, if needed
+if ($cpu_usage >= $t_crit) {
+    print "#FF0000\n";
+    exit 33;
+} elsif ($cpu_usage >= $t_warn) {
+    print "#FFFC00\n";
+}
+
+exit 0;