diff --git a/.emacs.d/plugins/xclip.el b/.emacs.d/plugins/xclip.el
deleted file mode 100644
index 5b5e28e5..00000000
--- a/.emacs.d/plugins/xclip.el
+++ /dev/null
@@ -1,112 +0,0 @@
-;;; xclip.el --- Emacs Interface to XClip
-
-;; Copyright (C) 2007  Leo Shidai Liu
-
-;; Author: Leo Shidai Liu <shidai.liu@gmail.com>
-;; Keywords: convenience, tools
-;; Created: 2007-12-30
-
-;; $Id: xclip.el,v 0.9 2008/02/10 11:12:56 leo Exp $
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-
-;; This file 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 General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-
-;; This code provides an Emacs interface to the tool with the same
-;; name on http://people.debian.org/~kims/xclip/.
-
-;;; Code:
-(defvar xclip-program (executable-find "xclip")
-  "Name of XClip program tool.")
-
-(defvar xclip-select-enable-clipboard t
-  "Non-nil means cutting and pasting uses the clipboard.
-This is in addition to, but in preference to, the primary selection.")
-
-(defvar xclip-last-selected-text-clipboard nil
-  "The value of the CLIPBOARD X selection from xclip.")
-
-(defvar xclip-last-selected-text-primary nil
-  "The value of the PRIMARY X selection from xclip.")
-
-(defun xclip-set-selection (type data)
-  "TYPE is a symbol: primary, secondary and clipboard.
-
-See `x-set-selection'."
-  (when (and xclip-program (getenv "DISPLAY"))
-    (let* ((process-connection-type nil)
-           (proc (start-process "xclip" nil "xclip"
-                                "-selection" (symbol-name type))))
-      (process-send-string proc data)
-      (process-send-eof proc))))
-
-(defun xclip-select-text (text &optional push)
-  "See `x-select-text'."
-  (xclip-set-selection 'primary text)
-  (setq xclip-last-selected-text-primary text)
-  (when xclip-select-enable-clipboard
-    (xclip-set-selection 'clipboard text)
-    (setq xclip-last-selected-text-clipboard text)))
-
-(defun xclip-selection-value ()
-  "See `x-cut-buffer-or-selection-value'."
-  (when (and xclip-program (getenv "DISPLAY"))
-    (let (clip-text primary-text)
-      (when xclip-select-enable-clipboard
-        (setq clip-text (shell-command-to-string "xclip -o -selection clipboard"))
-        (setq clip-text
-              (cond ;; check clipboard selection
-               ((or (not clip-text) (string= clip-text ""))
-                (setq xclip-last-selected-text-primary nil))
-               ((eq      clip-text xclip-last-selected-text-clipboard) nil)
-               ((string= clip-text xclip-last-selected-text-clipboard)
-                ;; Record the newer string,
-                ;; so subsequent calls can use the `eq' test.
-                (setq xclip-last-selected-text-clipboard clip-text)
-                nil)
-               (t (setq xclip-last-selected-text-clipboard clip-text)))))
-      (setq primary-text (shell-command-to-string "xclip -o"))
-      (setq primary-text
-            (cond ;; check primary selection
-             ((or (not primary-text) (string= primary-text ""))
-              (setq xclip-last-selected-text-primary nil))
-             ((eq      primary-text xclip-last-selected-text-primary) nil)
-             ((string= primary-text xclip-last-selected-text-primary)
-              ;; Record the newer string,
-              ;; so subsequent calls can use the `eq' test.
-              (setq xclip-last-selected-text-primary primary-text)
-              nil)
-             (t (setq xclip-last-selected-text-primary primary-text))))
-      (or clip-text primary-text))))
-
-;;;###autoload
-(defun turn-on-xclip ()
-  (interactive)
-  (setq interprogram-cut-function 'xclip-select-text)
-  (setq interprogram-paste-function 'xclip-selection-value))
-
-;;;###autoload
-(defun turn-off-xclip ()
-  (interactive)
-  (setq interprogram-cut-function nil)
-  (setq interprogram-paste-function nil))
-
-
-(add-hook 'terminal-init-xterm-hook 'turn-on-xclip)
-
-
-(provide 'xclip)
-;;; xclip.el ends here
diff --git a/.pkg-arch-aur-peteramd b/.pkg-arch-aur-peteramd
index 5a7c171d..77043869 100644
--- a/.pkg-arch-aur-peteramd
+++ b/.pkg-arch-aur-peteramd
@@ -1,27 +1,26 @@
 awesome-git
+cblas
 dropbox
 dropbox-cli
 eduke32
 eduke32-dukeplus
+emacs-glsl-mode
 emacs-mediawiki-bzr
+emacs-xclip
 emacs-yasnippet
-epsxe
-epsxe-plugin-gpu-mesagl
-epsxe-plugin-gpu-xgl2
-epsxe-plugin-spu-alsa
 fortune-mod-tbbt
 gens-gs
 google-talkplugin
+libimago2-svn
 movgrab
-mutt-android-patch
+mutt-sidebar
 package-query
 pacman-color
-pandoc
 rxvt-unicode-patched
-slowmovideo-git
 supermeatboy
+textadept-latest-stable
 trash-cli
 wikiex
-wine-mono
+wine-1.2
 worldofgoo
 yaourt
diff --git a/.pkg-arch-explicit-peteramd b/.pkg-arch-explicit-peteramd
index 3c216bdf..3324a775 100644
--- a/.pkg-arch-explicit-peteramd
+++ b/.pkg-arch-explicit-peteramd
@@ -7,7 +7,6 @@ apvlv
 aspell-en
 aspell-fr
 astyle
-ati-dri
 atool
 at-spi2-atk
 at-spi2-core
@@ -17,8 +16,12 @@ automake
 awesome-git
 bash
 bison
+blas
 bzip2
 calc
+catalyst-dkms
+catalyst-utils
+cblas
 ccrypt
 cdrtools
 chrpath
@@ -36,6 +39,7 @@ dhcpcd
 diffutils
 django
 djvulibre
+dosbox
 dosfstools
 driconf
 dropbox
@@ -44,14 +48,12 @@ dwb
 e2fsprogs
 eduke32
 eduke32-dukeplus
+emacs-glsl-mode
 emacs-lua-mode
 emacs-mediawiki-bzr
 emacs-nox
+emacs-xclip
 emacs-yasnippet
-epsxe
-epsxe-plugin-gpu-mesagl
-epsxe-plugin-gpu-xgl2
-epsxe-plugin-spu-alsa
 fakeroot
 feh
 file
@@ -71,13 +73,14 @@ gettext
 ghostscript
 gimp
 git
+glfw
 glibc
-gnumeric
 gnuplot
 google-talkplugin
 gparted
 grep
 gsfonts
+gst-libav
 gstreamer0.10-bad-plugins
 gstreamer0.10-base-plugins
 gstreamer0.10-good-plugins
@@ -100,16 +103,16 @@ iotop
 iproute2
 iptables
 iputils
-ipython2
 jfsutils
 kmod
+lapack
 latex2rtf
 less
 lesspipe
 lib32-alsa-lib
 lib32-alsa-oss
 lib32-alsa-plugins
-lib32-ati-dri
+lib32-catalyst-utils
 lib32-libao
 lib32-libpulse
 lib32-libsamplerate
@@ -121,6 +124,7 @@ lib32-sdl
 libcdio-paranoia
 libev
 libftdi
+libimago2-svn
 libirman
 libmediainfo
 libspectre
@@ -133,7 +137,6 @@ libx86
 libxdg-basedir
 libzen
 licenses
-lighttpd
 linux
 linux-firmware
 linux-lts
@@ -158,7 +161,7 @@ mp3info
 mpg123
 mplayer2
 mtools
-mutt-android-patch
+mutt-sidebar
 namcap
 nano
 nawk
@@ -168,9 +171,9 @@ nethogs
 net-tools
 ngrep
 ntfs-3g
-ntfsprogs
 numlockx
 odt2txt
+opengl-man-pages
 openssh
 oss
 p7zip
@@ -178,7 +181,6 @@ pacman
 pacman-color
 pacman-mirrorlist
 pam
-pandoc
 pari
 patch
 pciutils
@@ -195,9 +197,7 @@ procps-ng
 psmisc
 pwgen
 python2-dbus
-python2-flup
 python2-gobject
-python2-south
 ranger
 reiserfsprogs
 rtorrent
@@ -207,8 +207,8 @@ sdlmame
 sed
 shadow
 slock
-slowmovideo-git
 splint
+steam
 strace
 subdl
 sudo
@@ -216,24 +216,20 @@ supermeatboy
 sxiv
 sysfsutils
 syslinux
-syslog-ng
 sysstat
 systemd
 systemd-sysvcompat
 sysvbanner
 tar
-task
 tcc
 tcsh
 texi2html
 texinfo
-tig
+textadept-latest-stable
 trash-cli
 tree
 ttf-dejavu
-ttf-droid
 ttf-freefont
-ttf-inconsolata
 ttf-liberation
 udiskie
 unrar
@@ -251,8 +247,7 @@ w3m
 wget
 which
 wikiex
-wine_gecko
-wine-mono
+wine-1.2
 winetricks
 wipe
 wmname
@@ -262,7 +257,6 @@ wv
 xchm
 xclip
 xdg-utils
-xf86-video-ati
 xf86-video-vesa
 xfsprogs
 xmlrpc-c
diff --git a/.pkg-arch-official-peteramd b/.pkg-arch-official-peteramd
index 5114a85d..79636c28 100644
--- a/.pkg-arch-official-peteramd
+++ b/.pkg-arch-official-peteramd
@@ -15,7 +15,6 @@ aspell
 aspell-en
 aspell-fr
 astyle
-ati-dri
 atk
 atkmm
 atool
@@ -30,12 +29,15 @@ bash
 bc
 binutils-multilib
 bison
+blas
 bzip2
 cabextract
 ca-certificates
 cairo
 cairomm
 calc
+catalyst-dkms
+catalyst-utils
 ccrypt
 cdparanoia
 cdrtools
@@ -43,7 +45,6 @@ chmlib
 chrpath
 clisp
 cloog
-cmake
 cmus
 colord
 compositeproto
@@ -72,6 +73,7 @@ django
 djvulibre
 dkms
 dnssec-anchors
+dosbox
 dosfstools
 driconf
 dwb
@@ -81,7 +83,6 @@ emacs-lua-mode
 emacs-nox
 enca
 enchant
-eventlog
 expat
 faac
 faad2
@@ -129,19 +130,17 @@ girara-common
 girara-gtk2
 git
 glew
-glib
+glfw
 glib2
 glibc
 glibmm
 glib-networking
 glu
 gmp
-gnumeric
 gnupg
 gnuplot
 gnutls
 gobject-introspection
-goffice
 gparted
 gpgme
 gpm
@@ -152,6 +151,9 @@ gsettings-desktop-schemas
 gsfonts
 gsl
 gsm
+gst-libav
+gst-plugins-base-libs
+gstreamer
 gstreamer0.10
 gstreamer0.10-bad
 gstreamer0.10-bad-plugins
@@ -161,10 +163,8 @@ gstreamer0.10-good
 gstreamer0.10-good-plugins
 gstreamer0.10-ugly
 gstreamer0.10-ugly-plugins
-gtk
 gtk2
 gtk3
-gtkglext
 gtkmm
 gtkspell
 gtk-update-icon-cache
@@ -186,19 +186,16 @@ hwids
 iana-etc
 icu
 ifplugd
-ilmbase
 imagemagick
 imlib2
 indent
 inetutils
 inkscape
 inputproto
-intel-tbb
 iotop
 iproute2
 iptables
 iputils
-ipython2
 isl
 jack
 jasper
@@ -208,11 +205,11 @@ json-c
 kbd
 kbproto
 keyutils
-khrplatform-devel
 kmod
 krb5
 ladspa
 lame
+lapack
 latex2rtf
 lcms
 lcms2
@@ -223,11 +220,11 @@ lib32-acl
 lib32-alsa-lib
 lib32-alsa-oss
 lib32-alsa-plugins
-lib32-ati-dri
 lib32-atk
 lib32-attr
 lib32-bzip2
 lib32-cairo
+lib32-catalyst-utils
 lib32-dbus-core
 lib32-e2fsprogs
 lib32-expat
@@ -237,25 +234,27 @@ lib32-freetype2
 lib32-gcc-libs
 lib32-gdk-pixbuf2
 lib32-gettext
-lib32-glib
+lib32-giflib
 lib32-glib2
 lib32-glibc
 lib32-glu
-lib32-gtk
+lib32-gmp
+lib32-gnutls
 lib32-gtk2
 lib32-harfbuzz
 lib32-icu
 lib32-json-c
 lib32-keyutils
 lib32-krb5
+lib32-lcms
 lib32-libao
 lib32-libasyncns
 lib32-libcap
 lib32-libcups
 lib32-libdrm
 lib32-libffi
-lib32-libgl
-lib32-libglapi
+lib32-libgcrypt
+lib32-libgpg-error
 lib32-libice
 lib32-libjpeg-turbo
 lib32-libldap
@@ -267,6 +266,7 @@ lib32-libpulse
 lib32-libsamplerate
 lib32-libsm
 lib32-libsndfile
+lib32-libtasn1
 lib32-libtiff
 lib32-libtxc_dxtn
 lib32-libvorbis
@@ -283,6 +283,7 @@ lib32-libxft
 lib32-libxi
 lib32-libxinerama
 lib32-libxml2
+lib32-libxmu
 lib32-libxrandr
 lib32-libxrender
 lib32-libxt
@@ -291,14 +292,19 @@ lib32-libxxf86vm
 lib32-mesa
 lib32-mpg123
 lib32-ncurses
+lib32-nettle
 lib32-openal
 lib32-openssl
+lib32-p11-kit
 lib32-pango
 lib32-pcre
 lib32-pixman
 lib32-readline
 lib32-sdl
+lib32-systemd
 lib32-util-linux
+lib32-v4l-utils
+lib32-xz
 lib32-zlib
 libao
 libarchive
@@ -314,7 +320,6 @@ libcdaudio
 libcddb
 libcdio
 libcdio-paranoia
-libcl
 libcroco
 libcups
 libdaemon
@@ -327,18 +332,14 @@ libdvdcss
 libdvdnav
 libdvdread
 libedit
-libegl
 libev
 libevent
 libexif
 libffi
 libfontenc
 libftdi
-libgbm
 libgcrypt
-libgl
 libglade
-libglapi
 libgme
 libgnome-keyring
 libgpg-error
@@ -426,6 +427,7 @@ libxfont
 libxft
 libxi
 libxinerama
+libxkbcommon
 libxkbfile
 libxml2
 libxmu
@@ -437,12 +439,10 @@ libxss
 libxt
 libxtst
 libxv
-libxvmc
 libxxf86dga
 libxxf86vm
 libzen
 licenses
-lighttpd
 linux
 linux-api-headers
 linux-firmware
@@ -485,7 +485,6 @@ mtools
 musicbrainz
 namcap
 nano
-nasm
 nawk
 ncdu
 ncurses
@@ -500,14 +499,11 @@ ngrep
 nspr
 nss
 ntfs-3g
-ntfsprogs
 numlockx
-nvidia-cg-toolkit
 odt2txt
 openal
 opencore-amr
-opencv
-openexr
+opengl-man-pages
 openjpeg
 openssh
 openssl
@@ -522,7 +518,6 @@ pam
 pambase
 pango
 pangomm
-pangox-compat
 pari
 parted
 patch
@@ -546,6 +541,7 @@ poppler-glib
 popt
 ppl
 ppp
+prelink
 procps-ng
 psmisc
 pth
@@ -560,18 +556,15 @@ python2-beaker
 python2-cairo
 python2-dbus
 python2-distribute
-python2-flup
 python2-gobject
 python2-gobject2
 python2-mako
 python2-markupsafe
 python2-notify
-python2-south
 python-dbus-common
 python-pyelftools
 pyxml
 qpdf
-qt
 randrproto
 ranger
 raptor
@@ -590,6 +583,8 @@ scrot
 sdl
 sdlmame
 sdl_mixer
+sdl_net
+sdl_sound
 sdl_ttf
 sed
 sg3_utils
@@ -603,13 +598,13 @@ speex
 splint
 sqlite
 startup-notification
+steam
 strace
 subdl
 sudo
 sxiv
 sysfsutils
 syslinux
-syslog-ng
 sysstat
 systemd
 systemd-sysvcompat
@@ -617,17 +612,13 @@ sysvbanner
 sysvinit-tools
 taglib
 tar
-task
 tcc
 tcsh
 texi2html
 texinfo
-tig
 tree
 ttf-dejavu
-ttf-droid
 ttf-freefont
-ttf-inconsolata
 ttf-liberation
 tzdata
 udiskie
@@ -647,12 +638,11 @@ videoproto
 vorbis-tools
 w3m
 wavpack
+wayland
 webkitgtk2
 wget
 which
 wildmidi
-wine
-wine_gecko
 winetricks
 wipe
 wmname
@@ -671,11 +661,9 @@ xdg-utils
 xextproto
 xf86dgaproto
 xf86-input-evdev
-xf86-video-ati
 xf86-video-vesa
 xf86vidmodeproto
 xfsprogs
-xine-lib
 xineramaproto
 xinetd
 xkeyboard-config
@@ -713,6 +701,7 @@ zathura
 zathura-djvu
 zathura-pdf-poppler
 zathura-ps
+zenity
 zip
 zlib
 zsh