diff --git a/.dockerfunc b/.dockerfunc
index b5b0657..673101d 100644
--- a/.dockerfunc
+++ b/.dockerfunc
@@ -212,3 +212,23 @@ torbrowser() {
     # exit current shell
     exit 0
 }
+
+vlc() {
+    del_stopped vlc
+
+    local args=$@
+
+    docker run -it \
+           -v "$args":/home/vlc \
+           -v /etc/localtime:/etc/localtime:ro \
+           -v /tmp/.X11-unix:/tmp/.X11-unix \
+           -v /run/user/1000/pulse:/run/user/1000/pulse \
+           -v /var/lib/dbus:/var/lib/dbus \
+           -v ~/.pulse:/root/.pulse \
+           -e DISPLAY=unix$DISPLAY \
+           -e GDK_SCALE \
+           -e GDK_DPI_SCALE \
+           --device /dev/snd \
+           --name vlc \
+           fschl/vlc
+}
diff --git a/.i3/status.conf b/.i3/status.conf
index 26c1eae..858a84a 100644
--- a/.i3/status.conf
+++ b/.i3/status.conf
@@ -12,6 +12,8 @@ general {
 }
 
 order += "disk /"
+order += "disk /var"
+order += "disk /home"
 order += "run_watch Docker"
 order += "run_watch DHCP"
 order += "path_exists VPN"
@@ -20,7 +22,7 @@ order += "wireless wlan0"
 order += "ethernet eth0"
 order += "volume master"
 order += "battery 0"
-order += "cpu_temperature 0"
+#order += "cpu_temperature 0"
 order += "load"
 order += "tztime local"
 
@@ -38,9 +40,9 @@ ethernet eth0 {
 battery 0 {
 	format = "%status %percentage %remaining"
 	format_down = "No battery"
-#	status_chr = "⚇ CHR"
-#	status_bat = "⚡ BAT"
-#	status_full = "☻ FULL"
+	status_chr = "⚇ CHR"
+	status_bat = "⚡ BAT"
+	status_full = "☻ FULL"
 	path = "/sys/class/power_supply/BAT%d/uevent"
 	low_threshold = 10
 }
@@ -71,7 +73,15 @@ cpu_temperature 0 {
 }
 
 disk "/" {
-	format = "%avail"
+	format = "/ %avail"
+}
+
+disk "/var" {
+	format = "var %avail"
+}
+
+disk "/home" {
+	format = "home %avail"
 }
 
 volume master {
diff --git a/install.sh b/install.sh
index 0f4705f..7a7dcd0 100644
--- a/install.sh
+++ b/install.sh
@@ -8,17 +8,20 @@ USERNAME=fschl
 
 apt_sources() {
     cat <<-EOF > /etc/apt/sources.list
-deb http://ftp.de.debian.org/debian/ jessie main contrib non-free
-deb-src http://ftp.de.debian.org/debian/ jessie main contrib non-free
+deb http://ftp.de.debian.org/debian/ stable main contrib non-free
+deb-src http://ftp.de.debian.org/debian/ stable main contrib non-free
 
-deb http://security.debian.org/ jessie/updates main contrib non-free
-deb-src http://security.debian.org/ jessie/updates main contrib non-free
+deb http://security.debian.org/ stable/updates main contrib non-free
+deb-src http://security.debian.org/ stable/updates main contrib non-free
 
-# jessie-updates, previously known as 'volatile'
-deb http://ftp.de.debian.org/debian/ jessie-updates main contrib non-free
-deb-src http://ftp.de.debian.org/debian/ jessie-updates main contrib non-free
+# stable-updates, previously known as 'volatile'
+deb http://ftp.de.debian.org/debian/ stable-updates main contrib non-free
+deb-src http://ftp.de.debian.org/debian/ stable-updates main contrib non-free
+
+deb http://ftp.fr.debian.org/debian/ stable-proposed-updates main
+deb http://ftp.fr.debian.org/debian/ testing main
 EOF
-    
+
 }
 
 base_applications() {
@@ -41,10 +44,12 @@ base_applications() {
             gnupg-agent \
             gnupg-curl \
             grep \
+            htop \
             locales \
             make \
             mount \
             net-tools \
+            pulseaudio \
             rxvt-unicode-256color \
             ssh \
             sudo \
@@ -71,8 +76,18 @@ install_i3() {
             i3status \
             scrot \
             slim \
-            --install-no-recommends
-    
+            xorg \
+            --no-install-recommends
+}
+
+install_docker() {
+    adduser -aG docker "$USERNAME"
+
+    curl -sSL https://get.docker.com/ | sh
+
+    curl -SL https://github.com/docker/compose/releases/download/1.5.2/docker-compose-Linux-x86_64 \
+         -o /usr/bin/docker-compose
+    chmod +x /usr/bin/docker-compose
 }
 
 get_dotfiles() {
@@ -88,7 +103,7 @@ get_dotfiles() {
         cd "/home/$USERNAME"
         git clone https://github.com/fschl/dockerfiles.git "/home/$USERNAME/dockerfiles"
 
-        git clone https://github.com/fschl/.emacs.d.git "/home/$USERNAME/.emacs.d"        
+        git clone https://github.com/fschl/.emacs.d.git "/home/$USERNAME/.emacs.d"
     )
 }
 
@@ -97,6 +112,8 @@ main() {
 
     base_applications
 
+    install_docker
+
     install_i3
 }