diff --git a/.compton.conf b/.compton.conf
new file mode 100644
index 0000000..8d6f2ba
--- /dev/null
+++ b/.compton.conf
@@ -0,0 +1,80 @@
+backend = "glx";
+vsync = "opengl-swc";
+
+shadow = true;
+no-dock-shadow = true;
+no-dnd-shadow = true;
+clear-shadow = true;
+
+shadow-radius = 10;
+shadow-offset-x = -5;
+shadow-offset-y = 0;
+shadow-opacity = 0.8;
+shadow-red = 0.11;
+shadow-green = 0.12;
+shadow-blue = 0.13;
+shadow-exclude = [
+  "name = 'Notification'",
+  "_GTK_FRAME_EXTENTS@:c",
+  "class_g = 'i3-frame'",
+  "_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'",
+  "_NET_WM_STATE@:32a *= '_NET_WM_STATE_STICKY'",
+  "!I3_FLOATING_WINDOW@:c"
+];
+shadow-ignore-shaped = true;
+
+alpha-step = 0.06;
+blur-background = false;
+blur-background-fixed = true;
+blur-kern = "7x7box";
+blur-background-exclude = [
+  "class_g = 'i3-frame'",
+  "window_type = 'dock'",
+  "window_type = 'desktop'",
+  "_GTK_FRAME_EXTENTS@:c"
+];
+
+# Duplicating the _NET_WM_STATE entries because compton cannot deal with atom arrays :-/
+opacity-rule = [
+  "97:class_g = 'Termite' && !_NET_WM_STATE@:32a",
+
+  "0:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_HIDDEN'",
+  "0:_NET_WM_STATE@[1]:32a = '_NET_WM_STATE_HIDDEN'",
+  "0:_NET_WM_STATE@[2]:32a = '_NET_WM_STATE_HIDDEN'",
+  "0:_NET_WM_STATE@[3]:32a = '_NET_WM_STATE_HIDDEN'",
+  "0:_NET_WM_STATE@[4]:32a = '_NET_WM_STATE_HIDDEN'",
+
+  "90:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_STICKY'",
+  "90:_NET_WM_STATE@[1]:32a = '_NET_WM_STATE_STICKY'",
+  "90:_NET_WM_STATE@[2]:32a = '_NET_WM_STATE_STICKY'",
+  "90:_NET_WM_STATE@[3]:32a = '_NET_WM_STATE_STICKY'",
+  "90:_NET_WM_STATE@[4]:32a = '_NET_WM_STATE_STICKY'"
+];
+
+fading = false;
+fade-delta = 7;
+fade-in-step = 0.05;
+fade-out-step = 0.05;
+fade-exclude = [];
+
+mark-wmwin-focused = true;
+mark-ovredir-focused = true;
+use-ewmh-active-win = true;
+detect-rounded-corners = true;
+detect-client-opacity = true;
+refresh-rate = 0;
+dbe = false;
+paint-on-overlay = true;
+glx-no-stencil = true;
+glx-copy-from-front = false;
+glx-swap-method = "undefined";
+sw-opti = true;
+unredir-if-possible = false;
+focus-exclude = [];
+detect-transient = true;
+detect-client-leader = true;
+invert-color-include = [];
+
+wintypes: {
+    tooltip = { fade = true; shadow = false; opacity = 1.00; focus = true;  };
+};
diff --git a/.gitignore b/.gitignore
index c28fb39..ece0410 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,3 +137,4 @@ tags
 # End of https://www.gitignore.io/api/vim,python
 
 i3/config
+.sqlite
diff --git a/Makefile b/Makefile
index bb4e40c..921c8e8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,9 @@ zsh:
 	rm ~/.zimrc
 	ln -s ~/.dotfiles/zsh/.zimrc ~/.zimrc
 
+compton:
+	ln -s ~/.dotfiles/.compton.conf ~/.compton.conf
+
 i3: dep
 	ln -s ~/.dotfiles/i3 ~/.config/i3
 	cd i3/conf/ && ./build.sh
@@ -43,9 +46,9 @@ clean:
 
 dep:
 	git clone https://aur.archlinux.org/powerline-fonts-git.git /tmp/powerline-font
-	cd /tmp/powerline-font && makepkg -Acs && sudo pacman -U *.pkg.*
+	cd /tmp/powerline-font && makepkg -Acsi
 	git clone https://aur.archlinux.org/bumblebee-status-git.git /tmp/bumblebee
-	cd /tmp/bumblebee && makepkg -Acs && sudo pacman -U *.pkg.*
+	cd /tmp/bumblebee && makepkg -Acsi
 	sudo pacman -S awesome-terminal-fonts perl-anyevent-i3 perl-json-xs w3m
 
-all: clean tmux vim git zsh i3 mutt xresources
+all: clean tmux vim git zsh i3 mutt xresources compton
diff --git a/i3/scripts/dmenu/database.sqlite b/i3/scripts/dmenu/database.sqlite
deleted file mode 100644
index 83b1c3e..0000000
Binary files a/i3/scripts/dmenu/database.sqlite and /dev/null differ
diff --git a/mutt/.mailcap b/mutt/.mailcap
index 8603537..b5b5c19 100644
--- a/mutt/.mailcap
+++ b/mutt/.mailcap
@@ -1 +1 @@
-text/html; w3m -I %{charset} -T text/html; copiousoutput;
+text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput
diff --git a/mutt/.muttrc b/mutt/.muttrc
index 36c63be..c6c5d0b 100644
--- a/mutt/.muttrc
+++ b/mutt/.muttrc
@@ -9,7 +9,7 @@ set header_cache = ~/.cache/mutt
 unset imap_passive
 set imap_keepalive = 300
 set mail_check = 20
-
+set editor = vim
 
 set record = +Sent