diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template
index 0009339430..76b21298d0 100644
--- a/srcpkgs/acpica-utils/template
+++ b/srcpkgs/acpica-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'acpica-utils'
 pkgname=acpica-utils
-version=20130418
+version=20130626	
 wrksrc=acpica-unix-${version}
 revision=1
 hostmakedepends="flex"
@@ -9,7 +9,7 @@ homepage="https://www.acpica.org/"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="http://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=11e49847c627af6c44c75af035efe7087d99859060297f2e499edbdd5dce9a58
+checksum=18afb45e7c4d1698dd18b70ae8ec13ef2b818f53454d34ee95444025c70d0ed6
 long_desc="
  This package contains only the user-space tools needed for ACPI table
  development, not the kernel implementation of ACPI. The following commands
diff --git a/srcpkgs/awoken-icons-dark b/srcpkgs/awoken-icons-dark
new file mode 120000
index 0000000000..a8bfaf4c02
--- /dev/null
+++ b/srcpkgs/awoken-icons-dark
@@ -0,0 +1 @@
+awoken-icons/
\ No newline at end of file
diff --git a/srcpkgs/awoken-icons-white b/srcpkgs/awoken-icons-white
new file mode 120000
index 0000000000..a8bfaf4c02
--- /dev/null
+++ b/srcpkgs/awoken-icons-white
@@ -0,0 +1 @@
+awoken-icons/
\ No newline at end of file
diff --git a/srcpkgs/awoken-icons/template b/srcpkgs/awoken-icons/template
new file mode 100644
index 0000000000..6963eadf87
--- /dev/null
+++ b/srcpkgs/awoken-icons/template
@@ -0,0 +1,55 @@
+# Template file for 'awoken-icons'
+pkgname=awoken-icons
+version=2.5
+revision=1
+distfiles="https://dl.dropbox.com/u/8029324/AwOken-2.5.zip"
+checksum="f88b041991012b2129061e56a47f23bcb1b647f38cb493bd23a6774095b85ce3"
+makedepends="unzip"
+wrksrc="AwOken-2.5"
+maintainer="Steven R <strob AT styez DOT com>"
+homepage="http://alecive.deviantart.com/art/AwOken-163570862"
+license="CCPL:by-sa"
+short_desc="Simple and quite complete icon set, Token-style."
+
+do_install() {
+  vmkdir "usr/bin"
+  vmkdir "usr/share/icons"
+  for _theme in AwOken{,Dark,White}.tar.gz; do
+    tar --no-same-owner -xzf "$_theme" -C "${DESTDIR}/usr/share/icons/"
+  done
+  find "${DESTDIR}" -type d -exec chmod 755 '{}' \;
+  find "${DESTDIR}" -type f -exec chmod 644 '{}' \;
+  find "${DESTDIR}" -name awoken-icon-theme-customization\* -exec chmod 755 '{}' \;
+  ln -sf /usr/share/icons/AwOken/awoken-icon-theme-customization "${DESTDIR}/usr/bin/"
+  ln -sf /usr/share/icons/AwOkenDark/awoken-icon-theme-customization-dark "${DESTDIR}/usr/bin/"
+  ln -sf /usr/share/icons/AwOkenWhite/awoken-icon-theme-customization-white "${DESTDIR}/usr/bin/"
+}
+
+awoken-icons-dark_package() {
+  depends="awoken-icons>=${version}"
+  short_desc+=" - Dark icons"
+  noarch="yes"
+  pkg_install() {
+    vmove usr/share/icons/AwOkenDark
+    vmove usr/bin/awoken-icon-theme-customization-dark
+  }
+}
+
+awoken-icons-white_package() {
+  depends="awoken-icons>=${version}"
+  short_desc+=" - White icons"
+  noarch="yes"
+  pkg_install() {
+    vmove usr/share/icons/AwOkenWhite
+    vmove usr/bin/awoken-icon-theme-customization-white
+  }
+}
+
+awoken-icons_package() {
+  noarch="yes"
+  depends="zenity xdg-utils ImageMagick"
+  pkg_install() {
+    vmove usr/share/icons/AwOken
+    vmove usr/bin/awoken-icon-theme-customization
+  } 
+}
\ No newline at end of file
diff --git a/srcpkgs/compton-git/template b/srcpkgs/compton-git/template
new file mode 100644
index 0000000000..007a894329
--- /dev/null
+++ b/srcpkgs/compton-git/template
@@ -0,0 +1,27 @@
+# Template file for 'compton-git'
+pkgname=compton-git
+version=$(date +%Y%m%d)
+revision=1
+build_style=gnu-makefile
+hostmakedepends="git"
+makedepends="libGL pkg-config dbus-devel libXcomposite-devel libXdamage-devel libXrandr-devel pcre-devel libconfig-devel libdrm-devel MesaLib-devel asciidoc"
+nofetch=yes
+noextract=yes
+only_for_archs="i686 x86_64"
+maintainer="Steven R <strob AT styez DOT com>"
+homepage="https://github.com/chjj/compton"
+license="MIT"
+short_desc="Compton is a compositor for X, and a fork of xcompmgr-dana."
+
+do_fetch() {
+	local url="git://github.com/chjj/compton.git"
+	msg_normal "Fetching source from $url ...\n"
+	git clone ${url} ${pkgname}-${version}
+}
+
+compton-git_package() {
+	depends="libGL dbus libXcomposite libXdamage libXrandr pcre libconfig MesaLib"
+	pkg_install() {
+		vmove all
+	}
+}
diff --git a/srcpkgs/dbus-sharp-glib/template b/srcpkgs/dbus-sharp-glib/template
new file mode 100644
index 0000000000..d3bfcca2c8
--- /dev/null
+++ b/srcpkgs/dbus-sharp-glib/template
@@ -0,0 +1,25 @@
+# Template file for 'dbus-sharp-glib' 
+pkgname=dbus-sharp-glib 
+version=0.5
+revision=1 
+distfiles="https://github.com/mono/dbus-sharp-glib/archive/v${version}.tar.gz"
+checksum="208742e92ce4b6b4b0856e8cb70a2dad37aaae5f5708ff390b52c7938dabaea0"
+build_style=gnu-configure 
+hostmakedepends="pkg-config automake"
+makedepends="mono dbus-sharp<=0.7_1"
+maintainer="Steven R <strob AT styez DOT com>" 
+homepage="http://github.com/mono/dbus-sharp-glib/"
+license="Custom"
+short_desc="C# Glib implementation of D-Bus" 
+
+pre_configure() {
+	./autogen.sh
+}
+
+dbus-sharp-glib_package() {
+	noarch="yes"
+	depends="dbus-sharp"
+	pkg_install() {
+		vmove all
+	}
+}
diff --git a/srcpkgs/dbus-sharp/template b/srcpkgs/dbus-sharp/template
new file mode 100644
index 0000000000..4d82974fcd
--- /dev/null
+++ b/srcpkgs/dbus-sharp/template
@@ -0,0 +1,25 @@
+# Template file for 'dbus-sharp'
+pkgname=dbus-sharp
+version=0.7
+revision=1
+distfiles="https://github.com/mono/dbus-sharp/archive/v${version}.tar.gz"
+checksum="535360a164b62bd629f7ca7396a0dcfb143e05287ac2cc95ab4387bd81dd6d58"
+build_style=gnu-configure
+hostmakedepends="pkg-config automake"
+makedepends="mono"
+maintainer="Steven R <strob AT styez DOT com>"
+homepage="http://github.com/mono/dbus-sharp/"
+license="Custom"
+short_desc="C# implementation of D-Bus"
+
+pre_configure() {
+	./autogen.sh
+}
+
+dbus-sharp_package() {
+	noarch="yes"
+	depends="mono"
+	pkg_install() {
+		vmove all
+	}
+}
diff --git a/srcpkgs/fish-shell/INSTALL b/srcpkgs/fish-shell/INSTALL
new file mode 100644
index 0000000000..9ed2b5a7fd
--- /dev/null
+++ b/srcpkgs/fish-shell/INSTALL
@@ -0,0 +1,11 @@
+case "$ACTION" in
+  post)
+    if [ "$UPDATE" = "no" ]; then
+      echo "--> To run fish, type 'fish' in your terminal."
+      echo "--> To set your colors, run 'fish_config'"
+      echo "--> To scan your man pages for completions, run 'fish_update_completions'"
+      echo "--> To autocomplete command suggestions press Ctrl + F or right arrow key."
+      echo "--> To use fish as your login shell, run 'chsh -s /usr/bin/fish"
+    fi
+    ;;
+esac
\ No newline at end of file
diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
new file mode 100644
index 0000000000..ea218b8f9a
--- /dev/null
+++ b/srcpkgs/fish-shell/template
@@ -0,0 +1,27 @@
+# Template file for 'fish-shell'
+pkgname=fish-shell
+version=2.0.0
+revision=1
+distfiles="http://fishshell.com/files/${version}/fish-${version}.tar.gz"
+checksum="7e4c4a0b3c518769a3d31b235e743de7a8d52f851ad19d2df9d53534e6238303"
+build_style=gnu-configure 
+hostmakedepends="autoconf make"
+makedepends="doxygen ncurses-devel"
+wrksrc="fish"
+maintainer="Steven R <strob AT styez DOT com>"
+homepage="http://fishshell.com/"
+license="GPL"
+short_desc="User friendly shell intended mostly for interactive use"
+
+pre_configure() {
+	autoconf
+	autoheader
+}
+
+fish-shell_package() {
+	noarch="yes"
+	register_shell="/usr/bin/fish"
+	pkg_install() {
+    vmove all
+  }
+}
\ No newline at end of file
diff --git a/srcpkgs/gtk-engine-murrine/template b/srcpkgs/gtk-engine-murrine/template
new file mode 100644
index 0000000000..e23d210999
--- /dev/null
+++ b/srcpkgs/gtk-engine-murrine/template
@@ -0,0 +1,22 @@
+# Template file for 'gtk-engine-murrine'
+pkgname=gtk-engine-murrine
+version=0.98.2
+revision=1
+distfiles="http://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/murrine-${version}.tar.xz"
+checksum="e9c68ae001b9130d0f9d1b311e8121a94e5c134b82553ba03971088e57d12c89"
+build_style=gnu-configure 
+hostmakedepends="intltool make pkg-config"
+makedepends="gtk+-devel"
+wrksrc="murrine-0.98.2"
+maintainer="Steven R <strob AT styez DOT com>"
+homepage="http://cimitan.com/murrine/project/murrine"
+license="LGPL3"
+short_desc="GTK2 engine to make your desktop look like a murrina"
+
+gtk-engine-murrine_package() {
+	noarch="yes"
+	depends="gtk+"
+	pkg_install() {
+		vmove all
+	}
+}
diff --git a/srcpkgs/gtk-sharp/template b/srcpkgs/gtk-sharp/template
new file mode 100644
index 0000000000..ad5987af8c
--- /dev/null
+++ b/srcpkgs/gtk-sharp/template
@@ -0,0 +1,25 @@
+# Template file for 'gtk-sharp'
+pkgname=gtk-sharp
+version=2.12.21
+revision=1
+distfiles="https://github.com/mono/gtk-sharp/archive/${version}.tar.gz"
+checksum="bc356962294d538614fef08281b752fa85a0892607ff6d817583f712b8d8e1fa"
+build_style=gnu-configure
+hostmakedepends="pkg-config autoconf automake"
+makedepends="mono gtk+-devel libtool which"
+maintainer="Steven R <strob AT styez DOT com>"
+homepage="http://www.mono-project.com/GtkSharp"
+license="LGPL"
+short_desc="Gtk# is a Graphical User Interface Toolkit for mono and .Net"
+
+pre_configure() {
+	./bootstrap-2.12
+}
+
+gtk-sharp_package() {
+	noarch="yes"
+	depends="mono gtk+"
+	pkg_install() {
+		vmove all
+	}
+}
diff --git a/srcpkgs/mtr/template b/srcpkgs/mtr/template
new file mode 100644
index 0000000000..cd83f33f7c
--- /dev/null
+++ b/srcpkgs/mtr/template
@@ -0,0 +1,25 @@
+# Template file for 'mtr'
+pkgname=mtr
+version=0.85
+revision=1
+distfiles="https://github.com/traviscross/mtr/archive/v${version}.tar.gz"
+checksum="4c3c02cc8290798a067d514c9b243fdc90a75e58ca1a35da8e93a163f11c1884"
+build_style=gnu-configure 
+hostmakedepends="automake autoconf pkg-config"
+makedepends="ncurses-devel gtk+-devel glib-devel"
+only_for_archs="i686 x86_64"
+maintainer="Steven R <strob AT styez DOT com>"
+homepage="http://www.bitwizard.nl/mtr/"
+license="GPL"
+short_desc="Combines the functionality of traceroute and ping into one tool (CLI version)"
+
+pre_configure() {
+	./bootstrap.sh
+}
+
+mtr_package() {
+	depends="ncurses gtk+ glib"
+	pkg_install() {
+		vmove all
+	}
+}
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
new file mode 100644
index 0000000000..398914bed0
--- /dev/null
+++ b/srcpkgs/sublime-text3/template
@@ -0,0 +1,31 @@
+# Template file for 'sublime-text3'
+pkgname=sublime-text3
+version=3048
+revision=1
+distfiles="http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${version}_x64.tar.bz2"
+checksum="387d5dadc330039d212ea82220068766dd1e4b14d1234b97e22a75f69650ce11"
+wrksrc="sublime_text_3"
+only_for_archs="x86_64"
+maintainer="Steven R <strob AT styez DOT com>"
+homepage="http://www.sublimetext.com/3dev"
+license="Custom"
+short_desc="Sublime Text is a sophisticated text editor for code, markup and prose"
+
+do_install() {
+	vmkdir "opt/sublime_text"
+	vmkdir "usr/sbin"
+	cp --preserve=mode -r ./* "${DESTDIR}/opt/sublime_text"
+	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
+	for size in 128 16 256 32 48; do
+		vinstall "Icon/${size}x${size}/sublime-text.png" 644 "usr/share/icons/hicolor/${size}x${size}/apps/"
+	done
+	ln -s /opt/sublime_text/sublime_text ${DESTDIR}/usr/sbin/subl3
+}
+
+sublime-text3_package() {
+	nonfree="yes"
+	depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+	pkg_install() {
+		vmove all
+	}
+}
diff --git a/srcpkgs/vicious/template b/srcpkgs/vicious/template
new file mode 100644
index 0000000000..5bf0557156
--- /dev/null
+++ b/srcpkgs/vicious/template
@@ -0,0 +1,32 @@
+# Template file for 'vicious'
+pkgname=vicious
+version=2.1.1
+revision=1
+distfiles="http://git.sysphere.org/vicious/snapshot/vicious-${version}.tar.xz"
+checksum="59764f9a3ae491f6b14d6135ff53346c004d988bd9caa6fb1ec3b7999fbf3078"
+makedepends="lua-devel>=5.1<5.2"
+maintainer="Steven R <strob AT styez DOT com>"
+homepage="http://git.sysphere.org/vicious/about/"
+license="GPL-2"
+short_desc="Modular widget library for window managers"
+
+do_install() {
+	vinstall LICENSE 644 "usr/share/licenses/${pkgname}/"
+	vinstall CHANGES 644 "usr/share/doc/${pkgname}/"
+	vmkdir "usr/share/lua/5.1/${pkgname}"
+	vmkdir "usr/share/lua/5.1/${pkgname}/widgets"
+	vmkdir "usr/share/lua/5.1/${pkgname}/contrib"
+	vinstall TODO 644 "usr/share/doc/${pkgname}"
+	vinstall README 644 "usr/share/doc/${pkgname}"
+	install -m644 *.lua "${DESTDIR}/usr/share/lua/5.1/${pkgname}"
+	install -m644 widgets/*.lua "${DESTDIR}/usr/share/lua/5.1/${pkgname}/widgets"
+	install -m644 contrib/*.lua "${DESTDIR}/usr/share/lua/5.1/${pkgname}/contrib"
+}
+
+vicious_package() {
+	noarch="yes"
+	depends="lua"
+	pkg_install() {
+		vmove all
+	}
+}