diff --git a/.etckeeper b/.etckeeper
index 077db592..efc4928b 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -62,6 +62,7 @@ maybe chmod 0644 'X11/Xresources/x11-common'
 maybe chmod 0755 'X11/Xsession'
 maybe chmod 0755 'X11/Xsession.d'
 maybe chmod 0644 'X11/Xsession.d/20dbus_xdg-runtime'
+maybe chmod 0644 'X11/Xsession.d/20vdpau-va-gl'
 maybe chmod 0644 'X11/Xsession.d/20x11-common_process-args'
 maybe chmod 0644 'X11/Xsession.d/30x11-common_xresources'
 maybe chmod 0644 'X11/Xsession.d/35x11-common_xhost-local'
@@ -165,6 +166,11 @@ maybe chmod 0664 'chromium-browser/default'
 maybe chmod 0775 'chromium-browser/policies'
 maybe chmod 0775 'chromium-browser/policies/managed'
 maybe chmod 0775 'chromium-browser/policies/recommended'
+maybe chmod 0755 'chromium.d'
+maybe chmod 0644 'chromium.d/README'
+maybe chmod 0644 'chromium.d/apikeys'
+maybe chmod 0644 'chromium.d/default-flags'
+maybe chmod 0644 'chromium.d/extensions'
 maybe chmod 0755 'cifs-utils'
 maybe chmod 0755 'console-setup'
 maybe chmod 0644 'console-setup/cached_Lat15-Fixed16.psf.gz'
@@ -1145,6 +1151,10 @@ maybe chmod 0644 'profile.d/bash_completion.sh'
 maybe chmod 0644 'profile.d/sshpwd.sh'
 maybe chmod 0644 'profile.d/wifi-country.sh'
 maybe chmod 0644 'protocols'
+maybe chmod 0755 'pulse'
+maybe chmod 0644 'pulse/client.conf'
+maybe chmod 0755 'pulse/client.conf.d'
+maybe chmod 0644 'pulse/client.conf.d/00-disable-autospawn.conf'
 maybe chmod 0755 'python'
 maybe chmod 0644 'python/debian_config'
 maybe chmod 0755 'python2.7'
@@ -1299,6 +1309,7 @@ maybe chmod 0755 'update-motd.d'
 maybe chmod 0755 'update-motd.d/10-uname'
 maybe chmod 0644 'usb_modeswitch.conf'
 maybe chmod 0755 'usb_modeswitch.d'
+maybe chmod 0644 'vdpau_wrapper.cfg'
 maybe chmod 0755 'vim'
 maybe chmod 0644 'vim/vimrc'
 maybe chmod 0644 'vim/vimrc.tiny'
diff --git a/X11/Xsession.d/20vdpau-va-gl b/X11/Xsession.d/20vdpau-va-gl
new file mode 100644
index 00000000..8e43d4eb
--- /dev/null
+++ b/X11/Xsession.d/20vdpau-va-gl
@@ -0,0 +1,6 @@
+# To enable the use of libvdpau-va-gl as the default VDPAU driver,
+# uncommont the following lines. See
+# `/usr/share/doc/libvdpau-va-gl1/README.Debian` for more details.
+
+# [ ! -f /usr/lib/$(arch)-$(uname -s | tr '[A-Z]' '[a-z]')-gnu/vdpau/libvdpau_va_gl.so.1 ] || \
+#   export VDPAU_DRIVER=va_gl
diff --git a/chromium.d/README b/chromium.d/README
new file mode 100644
index 00000000..2f953121
--- /dev/null
+++ b/chromium.d/README
@@ -0,0 +1 @@
+Any files placed in this directory will be sourced prior to executing chromium.
diff --git a/chromium.d/apikeys b/chromium.d/apikeys
new file mode 100644
index 00000000..8964ef50
--- /dev/null
+++ b/chromium.d/apikeys
@@ -0,0 +1,5 @@
+# API keys assigned to Debian by Google for access to their services like sync and gmail.
+
+export GOOGLE_API_KEY="AIzaSyCkfPOPZXDKNn8hhgu3JrA62wIgC93d44k"
+export GOOGLE_DEFAULT_CLIENT_ID="811574891467.apps.googleusercontent.com"
+export GOOGLE_DEFAULT_CLIENT_SECRET="kdloedMFGdGla2P1zacGjAQh"
diff --git a/chromium.d/default-flags b/chromium.d/default-flags
new file mode 100644
index 00000000..1b912048
--- /dev/null
+++ b/chromium.d/default-flags
@@ -0,0 +1,16 @@
+# A set of command line flags that we want to set by default.
+
+# Do not hide any extensions in the about:extensions dialog
+export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --show-component-extension-options"
+
+# Don't use the GPU blacklist (bug #802933)
+export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --ignore-gpu-blacklist"
+
+# Don't display any warnings about not being the default browser
+export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --no-default-browser-check"
+
+# Disable pinging
+export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --disable-pings"
+
+# Disable the builtin media router (bug #833477)
+export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --media-router=0"
diff --git a/chromium.d/extensions b/chromium.d/extensions
new file mode 100644
index 00000000..24bd902a
--- /dev/null
+++ b/chromium.d/extensions
@@ -0,0 +1,2 @@
+# remote extensions on by default
+export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --enable-remote-extensions"
diff --git a/mailcap b/mailcap
index 255188fb..6418d8d7 100644
--- a/mailcap
+++ b/mailcap
@@ -40,6 +40,12 @@ text/xml; chromium-browser --temp-profile %s; test=test -n "$DISPLAY"
 application/xhtml_xml; chromium-browser --temp-profile %s; test=test -n "$DISPLAY"
 x-scheme-handler/http; chromium-browser --temp-profile %s; test=test -n "$DISPLAY"
 x-scheme-handler/https; chromium-browser --temp-profile %s; test=test -n "$DISPLAY"
+text/html; /usr/bin/chromium %s; test=test -n "$DISPLAY"
+text/xml; /usr/bin/chromium %s; test=test -n "$DISPLAY"
+application/xhtml_xml; /usr/bin/chromium %s; test=test -n "$DISPLAY"
+application/x-mimearchive; /usr/bin/chromium %s; test=test -n "$DISPLAY"
+x-scheme-handler/http; /usr/bin/chromium %s; test=test -n "$DISPLAY"
+x-scheme-handler/https; /usr/bin/chromium %s; test=test -n "$DISPLAY"
 text/english; vim %s; needsterminal
 text/plain; vim %s; needsterminal
 text/x-makefile; vim %s; needsterminal
diff --git a/pulse/client.conf b/pulse/client.conf
new file mode 100644
index 00000000..7a428f7e
--- /dev/null
+++ b/pulse/client.conf
@@ -0,0 +1,35 @@
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PulseAudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+
+## Configuration file for PulseAudio clients. See pulse-client.conf(5) for
+## more information. Default values are commented out.  Use either ; or # for
+## commenting.
+
+; default-sink =
+; default-source =
+; default-server =
+; default-dbus-server =
+
+; autospawn = yes
+; daemon-binary = /usr/bin/pulseaudio
+; extra-arguments = --log-target=syslog
+
+; cookie-file =
+
+; enable-shm = yes
+; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
+
+; auto-connect-localhost = no
+; auto-connect-display = no
diff --git a/pulse/client.conf.d/00-disable-autospawn.conf b/pulse/client.conf.d/00-disable-autospawn.conf
new file mode 100644
index 00000000..7dfaf589
--- /dev/null
+++ b/pulse/client.conf.d/00-disable-autospawn.conf
@@ -0,0 +1,3 @@
+# On linux systems, disable autospawn by default
+# If you are not using systemd, comment out this line
+autospawn=no
diff --git a/vdpau_wrapper.cfg b/vdpau_wrapper.cfg
new file mode 100644
index 00000000..21d5b8c0
--- /dev/null
+++ b/vdpau_wrapper.cfg
@@ -0,0 +1,2 @@
+enable_flash_uv_swap=1
+disable_flash_pq_bg_color=1