diff --git a/metadata/categories.conf b/metadata/categories.conf
index 46c3269..198f281 100644
--- a/metadata/categories.conf
+++ b/metadata/categories.conf
@@ -1,10 +1,14 @@
+app-misc
 budgie-desktop
 dev-python
+dev-util
 elementary-base
 elementary-indicator
 elementary-lib
 elementary-plugs
 gnome-desktop
+media-video
 net-im
 net-p2p
+sys-apps
 x11-apps
diff --git a/packages/app-misc/over-env/over-env-scm.exheres-0 b/packages/app-misc/over-env/over-env-scm.exheres-0
new file mode 100644
index 0000000..f54677b
--- /dev/null
+++ b/packages/app-misc/over-env/over-env-scm.exheres-0
@@ -0,0 +1,34 @@
+# Copyright 2018 Martin Sekera <sekerama@gmail.com>
+# Distributed under the terms of the GNU General Public License v2
+
+SUMMARY="A personal collection of scripts, aliases, zsh envs, and a nice prompt."
+HOMEPAGE="https://git.aggregate.cz/overwatch/over-env"
+LICENCES="GPL-3"
+SLOT="0"
+PLATFORMS="~amd64 ~armv7 ~x86"
+MYOPTIONS=""
+SCM_REPOSITORY="https://git.aggregate.cz/overwatch/over-env.git"
+if ! ever is_scm; then
+	SCM_BRANCH="${PV}"
+fi
+
+DEPENDENCIES="
+	run:
+		dev-python/psutil[python_abis:*(-)?]
+		dev-python/over[python_abis:*(-)?]
+"
+
+require scm-git
+
+src_install() {
+	dobin bin/*
+	
+	exeinto /usr/share/over-env
+	doexe lib/*
+	
+	insinto /etc
+	doins -r etc/*
+	
+	insinto /usr/share/i18n/locales
+	doins locale/*
+}
diff --git a/packages/dev-python/over/over-scm.exheres-0 b/packages/dev-python/over/over-scm.exheres-0
index e0eabd9..f5fa432 100644
--- a/packages/dev-python/over/over-scm.exheres-0
+++ b/packages/dev-python/over/over-scm.exheres-0
@@ -1,8 +1,6 @@
 # Copyright 2018 Martin Sekera <sekerama@gmail.com>
 # Distributed under the terms of the GNU General Public License v2
 
-
-
 SUMMARY="Useful Python libraries and convenience functions."
 DESCRIPTION="Stuff mostly derived from the Overwatch UAV project - terminal IO, text, configuration etc."
 HOMEPAGE="https://git.aggregate.cz/overwatch/over"
@@ -11,7 +9,7 @@ SLOT="0"
 PLATFORMS="~amd64 ~armv7 ~x86"
 MYOPTIONS=""
 
-SCM_REPOSITORY="https://git.aggregate.cz/overwatch/${PN}.git"
+SCM_REPOSITORY="https://git.aggregate.cz/overwatch/over.git"
 if ! ever is_scm; then
 	SCM_BRANCH="${PV}"
 fi
@@ -21,5 +19,7 @@ DEPENDENCIES="
 		dev-python/tzlocal
 "
 
+RESTRICT="test" # none provided by upstream
+
+require setup-py [ import=distutils blacklist="2" ]
 require scm-git
-require setup-py [ import=distutils ]
diff --git a/packages/dev-util/over-hex/over-hex-scm.exheres-0 b/packages/dev-util/over-hex/over-hex-scm.exheres-0
new file mode 100644
index 0000000..ccad7e0
--- /dev/null
+++ b/packages/dev-util/over-hex/over-hex-scm.exheres-0
@@ -0,0 +1,31 @@
+# Copyright 2018 Martin Sekera <sekerama@gmail.com>
+# Distributed under the terms of the GNU General Public License v2
+
+SUMMARY="A somewhat less painful alternative to hexdump(1)."
+HOMEPAGE="https://git.aggregate.cz/overwatch/${PN}"
+LICENCES="GPL-3"
+SLOT="0"
+PLATFORMS="~amd64 ~armv7 ~x86"
+MYOPTIONS=""
+SCM_REPOSITORY="https://git.aggregate.cz/overwatch/${PN}.git"
+if ! ever is_scm; then
+	SCM_BRANCH="${PV}"
+fi
+
+DEPENDENCIES="
+	run:
+		dev-python/over
+"
+
+require scm-git
+
+src_install() {
+	exeinto /usr/share/${PN}
+	doexe ${PN}.py
+	
+	insinto /usr/share/${PN}
+	doins version.py
+	
+	dodir /usr/$(exhost --target)/bin
+	dosym /usr/share/${PN}/${PN}.py /usr/$(exhost --target)/bin/${PN}
+}
diff --git a/packages/media-video/over-video/over-video-scm.exheres-0 b/packages/media-video/over-video/over-video-scm.exheres-0
new file mode 100644
index 0000000..163c364
--- /dev/null
+++ b/packages/media-video/over-video/over-video-scm.exheres-0
@@ -0,0 +1,41 @@
+# Copyright 2018 Martin Sekera <sekerama@gmail.com>
+# Distributed under the terms of the GNU General Public License v2
+
+SUMMARY="Audio-video format converter."
+DESCRIPTION="A video converter meant to coerce all video formats into one format with properly normalized audio. It can also be used to extract audio from video files, resizing, or very basic cutting."
+HOMEPAGE="https://git.aggregate.cz/overwatch/${PN}"
+LICENCES="GPL-3"
+SLOT="0"
+PLATFORMS="~amd64 ~armv7 ~x86"
+MYOPTIONS="
+	( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
+"
+SCM_REPOSITORY="https://git.aggregate.cz/overwatch/${PN}.git"
+if ! ever is_scm; then
+	SCM_BRANCH="${PV}"
+fi
+
+DEPENDENCIES="
+	run:
+		dev-python/over
+		(
+			providers:ffmpeg? ( media/ffmpeg )
+			providers:libav? ( media/libav )
+		)
+
+"
+
+require scm-git
+
+src_install() {
+	exeinto /usr/share/${PN}
+	doexe ${PN}.py
+	
+	insinto /usr/share/${PN}
+	doins aux.py version.py
+	
+	dodoc doc/*
+	
+	dodir /usr/$(exhost --target)/bin
+	dosym /usr/share/${PN}/${PN}.py /usr/$(exhost --target)/bin/${PN}
+}
diff --git a/packages/sys-apps/over-rename/over-rename-scm.exheres-0 b/packages/sys-apps/over-rename/over-rename-scm.exheres-0
new file mode 100644
index 0000000..fd1e7d8
--- /dev/null
+++ b/packages/sys-apps/over-rename/over-rename-scm.exheres-0
@@ -0,0 +1,31 @@
+# Copyright 2018 Martin Sekera <sekerama@gmail.com>
+# Distributed under the terms of the GNU General Public License v2
+
+SUMMARY="Displays the contents of the current directory in a text editor allowing quick in-place renaming."
+HOMEPAGE="https://git.aggregate.cz/overwatch/${PN}"
+LICENCES="GPL-3"
+SLOT="0"
+PLATFORMS="~amd64 ~armv7 ~x86"
+MYOPTIONS=""
+SCM_REPOSITORY="https://git.aggregate.cz/overwatch/${PN}.git"
+if ! ever is_scm; then
+	SCM_BRANCH="${PV}"
+fi
+
+DEPENDENCIES="
+	run:
+		dev-python/over
+"
+
+require scm-git
+
+src_install() {
+	exeinto /usr/share/${PN}
+	doexe ${PN}.py
+	
+	insinto /usr/share/${PN}
+	doins template.py version.py
+	
+	dodir /usr/$(exhost --target)/bin
+	dosym /usr/share/${PN}/${PN}.py /usr/$(exhost --target)/bin/${PN}
+}