diff --git a/srcpkgs/envypn-font/template b/srcpkgs/envypn-font/template
new file mode 100644
index 00000000000..348497a3d17
--- /dev/null
+++ b/srcpkgs/envypn-font/template
@@ -0,0 +1,29 @@
+# Template file for 'envypn-font'
+pkgname=envypn-font
+version=1.5.1
+revision=1
+short_desc="Readable terminal font inspired by Envy Code R"
+maintainer="Ypnose <linuxienATlegtuxDOTorg>"
+homepage="http://tetedulinuxien.fr/"
+license="GPL+FE"
+disfiles="http://linuxien.legtux.org/projects/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=bfc4bcaa932da92253ba4159b6a440c1dbd92184d199f1439d177c970b96d60b
+makedepends="font-util mkfontdir"
+
+do_install() {
+	vmkdir usr/share/fonts/envypn
+	install -m644 *.pcf  ${DESTDIR}/usr/share/fonts/envypn
+
+	vinstall fonts.alias 644 usr/share/fonts/envypn
+	vinstall LICENSE 644 usr/share/licenses/envypn
+	vinstall README 644 usr/share/doc/envypn
+}
+
+envypn-font_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/envypn"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/tabbed/files/config.h b/srcpkgs/tabbed/files/config.h
new file mode 100644
index 00000000000..ca4b8d6b474
--- /dev/null
+++ b/srcpkgs/tabbed/files/config.h
@@ -0,0 +1,49 @@
+/* See LICENSE file for copyright and license details. */
+
+/* appearance */
+static const char font[]        = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
+static const char normbgcolor[] = "#222222";
+static const char normfgcolor[] = "#cccccc";
+static const char selbgcolor[]  = "#555555";
+static const char selfgcolor[]  = "#ffffff";
+static const char before[]      = "<";
+static const char after[]       = ">";
+static const int  tabwidth      = 200;
+static const Bool foreground    = True;
+
+/*
+ * Where to place a new tab when it is opened. When npisrelative is True,
+ * then the current position is changed + newposition. If npisrelative
+ * is False, then newposition is an absolute position.
+ */
+static int  newposition   = 0;
+static Bool npisrelative  = False;
+
+#define MODKEY ControlMask
+static Key keys[] = { \
+	/* modifier                     key        function        argument */
+	{ MODKEY|ShiftMask,             XK_Return, focusonce,      { 0 } },
+	{ MODKEY|ShiftMask,             XK_Return, spawn,          { 0 } },
+
+	{ MODKEY|ShiftMask,             XK_l,      rotate,         { .i = +1 } },
+	{ MODKEY|ShiftMask,             XK_h,      rotate,         { .i = -1 } },
+	{ MODKEY|ShiftMask,             XK_j,      movetab,        { .i = -1 } },
+	{ MODKEY|ShiftMask,             XK_k,      movetab,        { .i = +1 } },
+	{ MODKEY,                       XK_Tab,    rotate,         { .i = 0 } },
+
+	{ MODKEY,                       XK_1,      move,           { .i = 0 } },
+	{ MODKEY,                       XK_2,      move,           { .i = 1 } },
+	{ MODKEY,                       XK_3,      move,           { .i = 2 } },
+	{ MODKEY,                       XK_4,      move,           { .i = 3 } },
+	{ MODKEY,                       XK_5,      move,           { .i = 4 } },
+	{ MODKEY,                       XK_6,      move,           { .i = 5 } },
+	{ MODKEY,                       XK_7,      move,           { .i = 6 } },
+	{ MODKEY,                       XK_8,      move,           { .i = 7 } },
+	{ MODKEY,                       XK_9,      move,           { .i = 8 } },
+	{ MODKEY,                       XK_0,      move,           { .i = 9 } },
+
+	{ MODKEY,                       XK_q,      killclient,     { 0 } },
+
+	{ 0,                            XK_F11,    fullscreen,     { 0 } },
+};
+
diff --git a/srcpkgs/tabbed/template b/srcpkgs/tabbed/template
new file mode 100644
index 00000000000..a31f66c22d1
--- /dev/null
+++ b/srcpkgs/tabbed/template
@@ -0,0 +1,32 @@
+# Template file for 'tabbed'
+pkgname=tabbed
+version=0.5
+revision=1
+homepage="http://tools.suckless.org/tabbed/"
+distfiles="http://dl.suckless.org/tools/$pkgname-$version.tar.gz"
+makedepends="libX11-devel"
+short_desc="Tab interface for application supporting Xembed"
+maintainer="Ypnose <linuxienATlegtuxDOTorg>"
+license="MIT"
+checksum=21226506761909fadebdd5fae0ff5149b9a378836fa515c45efbcbe504321fb9
+long_desc="
+ tabbed is a simple tabbed X window container, for application supporting Xembed"
+
+do_build() {
+	cp ${FILESDIR}/config.h config.h
+	sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
+	sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk
+	sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk
+	make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
+}
+
+do_install() {
+	make PREFIX=/usr DESTDIR=$DESTDIR install
+	vinstall LICENSE 644 usr/share/licenses/$pkgname
+}
+
+tabbed_package() {
+	pkg_install() {
+		vmove usr
+	}
+}