diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template
index 07816eeea20..463acc3e32c 100644
--- a/srcpkgs/catalyst/template
+++ b/srcpkgs/catalyst/template
@@ -1,8 +1,8 @@
 # Template file for 'catalyst'
 pkgname=catalyst
 version=13.4
-revision=1
-short_desc="AMD catalyst driver for Linux -- libraries and utilities"
+revision=2
+short_desc="AMD catalyst driver for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary AMD license"
 homepage="http://www.amd.com"
@@ -99,10 +99,10 @@ do_install() {
 }
 
 catalyst-dkms_package() {
-	nonfree=yes
-	short_desc="AMD catalyst driver for Linux -- DKMS kernel module"
+	short_desc+=" - DKMS kernel module"
 	triggers="dkms"
 	dkms_modules="fglrx ${version}_${revision}"
+	nonfree=yes
 	pkg_install() {
 		local _fglrx=fglrx-${version}_${revision}
 
@@ -125,10 +125,10 @@ catalyst-dkms_package() {
 }
 
 catalyst-opencl_package() {
-	nonfree=yes
-	short_desc="AMD catalyst driver for Linux -- OpenCL implementation"
+	short_desc+=" - OpenCL implementation"
 	provides="libOpenCL-${version}"
 	replaces="libOpenCL>=0"
+	nonfree=yes
 	noverifyrdeps=yes
 	pkg_install() {
 		cd ${wrksrc}/fglrx/arch/${_ARCHDIR}
@@ -147,9 +147,10 @@ catalyst-opencl_package() {
 }
 
 catalyst_package() {
-	nonfree=yes
-	depends="${pkgname}-dkms-${version}_${revision}"
+	short_desc+=" - Libraries and Utilities"
+	depends="xserver-abi-video<14 ${pkgname}-dkms-${version}_${revision}"
 	conflicts="nvidia>=0"
+	nonfree=yes
 	pkg_install() {
 		vmove all
 	}
diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template
index 77e5d547a75..982e87c0c86 100644
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@@ -1,7 +1,7 @@
 # Template file for 'colord'
 pkgname=colord
-version=1.0.0
-revision=2
+version=1.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile
  --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-vala
@@ -15,13 +15,13 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/software/colord"
 license="GPL-2"
 distfiles="$homepage/releases/$pkgname-$version.tar.xz"
-checksum=c7a875d5a50905117a76c73df4c4386384dfdd20bbc8a77dff0fedec847a4aa5
+checksum=053f028aba6071068064ca7fe949bb3f74fb5ad16af2d7ec5bba10dea00cb785
 
 libcolord_package() {
 	short_desc+=" - runtime library"
 	replaces="colord<0.1.23_3"
 	pkg_install() {
-		vmove "usr/lib/*.so*"
+		vmove "usr/lib/*.so.*"
 	}
 }
 
@@ -31,6 +31,7 @@ colord-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		vmove usr/share/gir-1.0
 		vmove usr/share/vala
 	}
diff --git a/srcpkgs/iotop/template b/srcpkgs/iotop/template
index 5834d899c09..3f4906ef387 100644
--- a/srcpkgs/iotop/template
+++ b/srcpkgs/iotop/template
@@ -1,6 +1,6 @@
 # Template file for 'iotop'
 pkgname=iotop
-version=0.5
+version=0.6
 revision=1
 build_style=python-module
 makedepends="python>=2.7"
@@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://guichaz.free.fr/iotop"
 distfiles="http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2"
-checksum=761b7b34b88a6b4715927f5319cf0b775e15aa70f43c69dcb805b0e49da1a2e9
+checksum=3adea2a24eda49bbbaeb4e6ed2042355b441dbd7161e883067a02bfc8dcef75b
 
 iotop_package() {
 	depends="${makedepends}"
diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
new file mode 100644
index 00000000000..ffbc43b7451
--- /dev/null
+++ b/srcpkgs/kmix/template
@@ -0,0 +1,25 @@
+# Template file for 'kmix'
+pkgname=kmix
+version=4.10.4
+revision=1
+short_desc="KDE's mixer application"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL, LGPL, FDL"
+homepage="http://www.kde.org"
+distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
+checksum=47fa26839adb83e30a5eb96fa734d8793a1f004e1694d92dba23c8809f7fc7cc
+
+build_style=cmake
+configure_args="-DKDE4_BUILD_TESTS=OFF"
+
+hostmakedepends="cmake automoc4 pkg-config"
+makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel
+ soprano-devel kdelibs-devel>=${version} kde-baseapps-devel>=${version}
+ alsa-lib-devel pulseaudio-devel libcanberra-devel"
+
+kmix_package() {
+	depends="pulseaudio"
+	pkg_install() {
+		vmove all
+	}
+}
diff --git a/srcpkgs/libXi/template b/srcpkgs/libXi/template
index f81830cada4..33e000fd99b 100644
--- a/srcpkgs/libXi/template
+++ b/srcpkgs/libXi/template
@@ -1,7 +1,7 @@
 # Template build file for 'libXi'.
 pkgname=libXi
-version=1.7.1
-revision=2
+version=1.7.1.901
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xmlto"
 makedepends="inputproto>=2.3 libXfixes-devel libXext-devel"
@@ -10,16 +10,17 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
 homepage="${XORG_SITE}"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5
+checksum=5248b643fc0b76fff978eefc0acdeee278407983cf7b6e371242e1b53ba32f7c
 
 libXi-devel_package() {
 	depends="inputproto libX11-devel libXext-devel libXfixes-devel libXi>=${version}"
-	short_desc="X Input extension library -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/share
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }
 
diff --git a/srcpkgs/libva-intel-driver/template b/srcpkgs/libva-intel-driver/template
index 1839c9f20fc..dfe9b89786c 100644
--- a/srcpkgs/libva-intel-driver/template
+++ b/srcpkgs/libva-intel-driver/template
@@ -1,16 +1,16 @@
 # Template file for 'libva-intel-driver'
 pkgname=libva-intel-driver
-version=1.0.20
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libX11-devel libva-devel>=1:1.0.16 libdrm-devel"
+makedepends="libX11-devel libva-devel>=1:1.2.0 libdrm-devel"
 short_desc="Video Acceleration (VA) API - Intel Graphics backend"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://freedesktop.org/wiki/Software/vaapi"
 license="MIT"
 distfiles="http://www.freedesktop.org/software/vaapi/releases/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=12fefb661372c053ff26530fae8342f9df63dbe8ab2c548d8d430d994042d4c9
+checksum=a6fceaa118fe5d1a6e7382ed30e6684b4059b3fedd79eb53121a80e8016c748c
 long_desc="
  The main motivation for VA-API (Video Acceleration API) is to enable hardware
  accelerated video decode/encode at various entry-points (VLD, IDCT, Motion
@@ -25,7 +25,7 @@ post_install() {
 }
 
 libva-intel-driver_package() {
-	depends="libva>=1:1.0.16"
+	depends="libva>=1:1.2.0"
 	pkg_install() {
 		vmove all
 	}
diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index fa381d293c8..514cb2808bd 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -1,6 +1,6 @@
 # Template file for 'libva'
 pkgname=libva
-_distver=1.1.1
+_distver=1.2.1
 version=1:${_distver}
 revision=1
 wrksrc="${pkgname}-${_distver}"
@@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://freedesktop.org/wiki/Software/vaapi"
 license="MIT"
 distfiles="http://www.freedesktop.org/software/vaapi/releases/libva/libva-${_distver}.tar.bz2"
-checksum=c0af7bf3e96e19fbd0513fbf461a010638907136b5ee0d68094fa0cc7e66cd4d
+checksum=70080f8b260ca4316f7e100f2ce15ad3e2356a2b9eff951278085ff8d48ea83b
 long_desc="
  The main motivation for VA-API (Video Acceleration API) is to enable hardware
  accelerated video decode/encode at various entry-points (VLD, IDCT, Motion
@@ -26,10 +26,11 @@ post_install() {
 
 libva-devel_package() {
 	depends="libva-${version}_${revision}"
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }
 
diff --git a/srcpkgs/linux3.8/template b/srcpkgs/linux3.8/template
index 03f3dab8e8f..1e08bd12d53 100644
--- a/srcpkgs/linux3.8/template
+++ b/srcpkgs/linux3.8/template
@@ -27,7 +27,11 @@ do_configure() {
 		arch=x86_64
 	fi
 
-	if [ -f ${FILESDIR}/${arch}-dotconfig ]; then
+	if [ -f ${FILESDIR}/${arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${arch}-dotconfig-custom .config
+		make ${makejobs} oldconfig
+	elif [ -f ${FILESDIR}/${arch}-dotconfig ]; then
 		msg_normal "Detected a .config file for your arch, using it.\n"
 		cp -f ${FILESDIR}/${arch}-dotconfig .config
 		make ${makejobs} oldconfig
diff --git a/srcpkgs/linux3.9/template b/srcpkgs/linux3.9/template
index 3e47e46a8f4..1174a081d21 100644
--- a/srcpkgs/linux3.9/template
+++ b/srcpkgs/linux3.9/template
@@ -27,7 +27,11 @@ do_configure() {
 		arch=x86_64
 	fi
 
-	if [ -f ${FILESDIR}/${arch}-dotconfig ]; then
+	if [ -f ${FILESDIR}/${arch}-dotconfig-custom ]; then
+		msg_normal "Detected a custom .config file for your arch, using it.\n"
+		cp -f ${FILESDIR}/${arch}-dotconfig-custom .config
+		make ${makejobs} oldconfig
+	elif [ -f ${FILESDIR}/${arch}-dotconfig ]; then
 		msg_normal "Detected a .config file for your arch, using it.\n"
 		cp -f ${FILESDIR}/${arch}-dotconfig .config
 		make ${makejobs} oldconfig
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index ff27a8acca7..6920fe89914 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -1,8 +1,8 @@
 # Template file for 'nvidia'
 pkgname=nvidia
 version=319.32
-revision=1
-short_desc="NVIDIA drivers for linux - libraries and utilities"
+revision=3
+short_desc="NVIDIA drivers for linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -130,11 +130,11 @@ do_install() {
 }
 
 nvidia-dkms_package() {
-	nonfree=yes
+	short_desc+=" - DKMS kernel module"
 	triggers="dkms"
 	dkms_modules="nvidia ${version}"
 	depends="dkms"
-	short_desc="NVIDIA drivers for linux - DKMS kernel module"
+	nonfree=yes
 	pkg_install() {
 		vmove usr/src
 		vmove usr/lib/modules-load.d
@@ -143,10 +143,10 @@ nvidia-dkms_package() {
 }
 
 nvidia-opencl_package() {
-	nonfree=yes
-	short_desc="NVIDIA drivers for linux - OpenCL implementation"
+	short_desc+=" - OpenCL implementation"
 	provides="libOpenCL-${version}"
 	replaces="libOpenCL>=0"
+	nonfree=yes
 	pkg_install() {
 		vmove "usr/lib/libOpenCL*"
 		vmove "usr/lib/libnvidia-compiler*"
@@ -156,9 +156,10 @@ nvidia-opencl_package() {
 }
 
 nvidia_package() {
-	nonfree=yes
-	depends="nvidia-dkms-${version}_${revision} pkg-config"
+	short_desc+=" - Libraries and Utilities"
+	depends="xserver-abi-video<15 nvidia-dkms-${version}_${revision} pkg-config"
 	conflicts="catalyst>=0"
+	nonfree=yes
 	pkg_install() {
 		vmove all
 	}
diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template
index 8d336e52381..6505eb47fec 100644
--- a/srcpkgs/nvidia304/template
+++ b/srcpkgs/nvidia304/template
@@ -1,8 +1,8 @@
 # Template file for 'nvidia304'
 pkgname=nvidia304
 version=304.84
-revision=2
-short_desc="NVIDIA drivers for linux (304.xx series) -- libraries and utilities"
+revision=4
+short_desc="NVIDIA drivers for linux (304.xx series)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary NVIDIA license"
 homepage="http://www.nvidia.com"
@@ -136,13 +136,13 @@ do_install() {
 }
 
 nvidia304-dkms_package() {
-	short_desc="NVIDIA drivers for linux (304.xx series) -- DKMS kernel module"
-	nonfree=yes
+	short_desc+=" - DKMS kernel module"
 	depends="dkms"
 	triggers="dkms"
 	dkms_modules="nvidia ${version}"
 	provides="nvidia-dkms-${version}"
 	replaces="nvidia-dkms>=0"
+	nonfree=yes
 	pkg_install() {
 		vmove usr/src
 		vmove usr/lib/modules-load.d
@@ -151,10 +151,10 @@ nvidia304-dkms_package() {
 }
 
 nvidia304-opencl_package() {
-	short_desc="NVIDIA drivers for linux (304.xx series) -- OpenCL implementation"
-	nonfree=yes
+	short_desc+=" - OpenCL implementation"
 	provides="nvidia-opencl-${version} libOpenCL-${version}"
 	replaces="nvidia-openctl>=0 libOpenCL>=0"
+	nonfree=yes
 	pkg_install() {
 		vmove "usr/lib/libOpenCL*"
 		vmove "usr/lib/libnvidia-compiler*"
@@ -164,12 +164,13 @@ nvidia304-opencl_package() {
 }
 
 nvidia304_package() {
-	nonfree=yes
+	short_desc+=" - Libraries and Utilities"
+	depends="xserver-abi-video<15 ${pkgname}-dkms-${version}_${revision} pkg-config"
 	provides="nvidia-${version}"
 	replaces="nvidia>=0"
-	depends="${pkgname}-dkms-${version}_${revision} pkg-config"
 	conflicts="catalyst>=0"
+	nonfree=yes
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }
diff --git a/srcpkgs/polkit-kde/template b/srcpkgs/polkit-kde/template
new file mode 100644
index 00000000000..ab43c8f1db1
--- /dev/null
+++ b/srcpkgs/polkit-kde/template
@@ -0,0 +1,21 @@
+# Template file for 'polkit-kde'
+pkgname=polkit-kde
+version=0.99.0
+revision=1
+build_style=cmake
+wrksrc="${pkgname}-agent-1-${version}"
+short_desc="Daemon providing a polkit authentication UI for KDE"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="https://projects.kde.org/projects/extragear/base/polkit-kde-agent-1"
+license="GPL-2"
+distfiles="http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-agent-1-${version}.tar.bz2"
+checksum=e371ff2698431decc825bb146d638de432f5fffd09046e225270c30dbac1b467
+
+hostmakedepends="cmake automoc4"
+makedepends="qt-devel phonon-devel polkit-qt-devel kdelibs-devel"
+
+polkit-kde_package() {
+	pkg_install() {
+		vmove all
+	}
+}
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 188e36ef720..64906988f4f 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,6 +1,6 @@
 # Template file for 'transmission'
 pkgname=transmission
-version=2.77
+version=2.80
 revision=1
 build_style=gnu-configure
 configure_args="--enable-nls --enable-cli --enable-daemon --enable-utp"
@@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.transmissionbt.com/"
 license="MIT, GPL-2"
 distfiles="http://download.transmissionbt.com/files/$pkgname-$version.tar.xz"
-checksum=55b1653fc18a10153ba9439f284bd7b2276a6859416dcae217d9e8c689841fde
+checksum=0ea0bc62e3917ce4cb848582888ecdcd0c0dbe8ffb9482d7330c823e1ff15df3
 
 post_build() {
 	# Build the qt frontend.
@@ -28,7 +28,7 @@ post_install() {
 
 transmission-gtk_package() {
 	depends="${sourcepkg}>=${version} hicolor-icon-theme desktop-file-utils"
-	short_desc="${short_desc} -- GTK+ frontend"
+	short_desc+=" - GTK+ frontend"
 	pkg_install() {
 		vmove usr/bin/transmission-gtk
 		vmove usr/share/man/man1/transmission-gtk.1
@@ -40,7 +40,7 @@ transmission-gtk_package() {
 
 transmission-qt_package() {
 	depends="${sourcepkg}>=${version}"
-	short_desc="${short_desc} -- QT Frontend"
+	short_desc+=" - QT Frontend"
 	pkg_install() {
 		vmove usr/bin/transmission-qt
 		vmove usr/share/man/man1/transmission-qt.1
@@ -51,6 +51,6 @@ transmission-qt_package() {
 
 transmission_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }