diff --git a/packages/archlinux/python-powerline-git/.gitignore b/packages/archlinux/python-powerline-git/.gitignore
deleted file mode 100644
index cc7d5336..00000000
--- a/packages/archlinux/python-powerline-git/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*
-!.gitignore
-!PKGBUILD
-!*.install
-!*.patch
diff --git a/packages/archlinux/python-powerline-git/PKGBUILD b/packages/archlinux/python-powerline-git/PKGBUILD
deleted file mode 100644
index f818b77b..00000000
--- a/packages/archlinux/python-powerline-git/PKGBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# Maintainer: Kim Silkebækken <kim.silkebaekken+aur@gmail.com>
-
-_gitname=powerline
-_gitbranch=develop
-pkgname="python-${_gitname}-git" # Workaround for missing split package support in AUR
-true && pkgname=("python-${_gitname}-git" "${_gitname}-fontpatcher-git")
-pkgbase=powerline
-pkgver=822.225ac48
-pkgrel=1
-url='https://github.com/Lokaltog/powerline'
-license=('MIT')
-arch=('any')
-makedepends=('git' 'python-setuptools')
-provides=('powerline')
-conflicts=('python2-powerline-git'
-           'powerline-git')
-install="${_gitname}.install"
-source=("${_gitname}::git://github.com/Lokaltog/${_gitname}.git#branch=${_gitbranch}"
-        "fontpatcher.py.patch"
-        "${install}")
-sha256sums=('SKIP'
-            '85576097662ab4203968b5fba1d59ec2653a390cdd4db9cee8ffa7bd4c5a7253'
-            '7b1257cdacce60e19280f7d918e5f3aa6f13b519dff16ecc6f732c881ef63ca1')
-
-pkgver() {
-	cd "${_gitname}"
-	echo "$(git rev-list --count ${_gitbranch}).$(git rev-parse --short ${_gitbranch})"
-}
-
-prepare() {
-	cd "${srcdir}/${_gitname}"
-	patch -p1 < ../fontpatcher.py.patch
-}
-
-package_powerline-fontpatcher-git() {
-	pkgdesc='OTF/TTF font patcher for Powerline symbols'
-	depends=('python2' 'fontforge')
-
-	cd "${_gitname}"
-
-	# Font patcher
-	install -Dm755 "font/fontpatcher.py" "${pkgdir}/usr/bin/powerline-fontpatcher"
-	install -Dm644 "font/fontpatcher-symbols.sfd" "${pkgdir}/usr/share/$_gitname/fontpatcher-symbols.sfd"
-}
-
-package_python-powerline-git() {
-	pkgdesc='The ultimate statusline/prompt utility.'
-	depends=('python>=3.2')
-	optdepends=('python-psutil: improved system information'
-	            'python-pygit2: improved git support'
-	            'zsh: better shell prompt'
-	            'gvim: vim compiled with Python support')
-
-	cd "${_gitname}"
-	python setup.py install --root="${pkgdir}" --optimize=1
-
-	# Fonts
-	install -dm755 "${pkgdir}/etc/fonts/conf.d"
-	install -Dm644 "font/PowerlineSymbols.otf" "${pkgdir}/usr/share/fonts/OTF/PowerlineSymbols.otf"
-	install -Dm644 "font/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.avail/10-powerline-symbols.conf"
-	ln -s "../conf.avail/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.d/10-powerline-symbols.conf"
-
-	# Vim Plugin
-	install -Dm644 "powerline/bindings/vim/plugin/powerline.vim" "${pkgdir}/usr/share/vim/vimfiles/plugin/powerline.vim"
-
-	# Zsh Plugin
-	install -Dm644 "powerline/bindings/zsh/powerline.zsh" "${pkgdir}/usr/share/zsh/site-contrib/powerline.zsh"
-
-	# Tmux Configuration
-	install -Dm644 "powerline/bindings/tmux/powerline.conf" "${pkgdir}/usr/share/tmux/powerline.conf"
-
-	# License
-	install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/packages/archlinux/python-powerline-git/fontpatcher.py.patch b/packages/archlinux/python-powerline-git/fontpatcher.py.patch
deleted file mode 100644
index fb394ce2..00000000
--- a/packages/archlinux/python-powerline-git/fontpatcher.py.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/font/fontpatcher.py b/font/fontpatcher.py
-index e2bbf2a..aa172f6 100755
---- a/font/fontpatcher.py
-+++ b/font/fontpatcher.py
-@@ -21,7 +21,7 @@ except ImportError:
- parser = argparse.ArgumentParser(description='Font patcher for Powerline. Requires FontForge with Python bindings. Stores the patched font as a new, renamed font file by default.')
- parser.add_argument('target_fonts', help='font files to patch', metavar='font', nargs='+', type=argparse.FileType('rb'))
- parser.add_argument('--no-rename', help='don\'t add " for Powerline" to the font name', default=True, action='store_false', dest='rename_font')
--parser.add_argument('--source-font', help='source symbol font', metavar='font', dest='source_font', default='{0}/fontpatcher-symbols.sfd'.format(sys.path[0]), type=argparse.FileType('rb'))
-+parser.add_argument('--source-font', help='source symbol font', metavar='font', dest='source_font', default='/usr/share/powerline/fontpatcher-symbols.sfd', type=argparse.FileType('rb'))
- args = parser.parse_args()
- 
- 
diff --git a/packages/archlinux/python-powerline-git/powerline.install b/packages/archlinux/python-powerline-git/powerline.install
deleted file mode 100644
index d6644b17..00000000
--- a/packages/archlinux/python-powerline-git/powerline.install
+++ /dev/null
@@ -1,48 +0,0 @@
-post_install() {
-	echo "Updating font cache..."
-	fc-cache -f
-
-	echo "
-IMPORTANT
-=========
-
-Powerline requires custom glyphs to work properly. A font with these glyphs has 
-been installed along with a fontconfig file which enables the glyphs for many 
-common coding fonts.
-
-If Powerline doesn't work out of the box on your system, please submit an issue 
-on GitHub: https://github.com/Lokaltog/powerline/issues
-
-Consult the documentation for detailed installation instructions and 
-troubleshooting information: https://powerline.readthedocs.org/en/latest/
-
-You may need to update your PYTHONPATH environment variable by adding the 
-following line to your /etc/profile, .zshrc, etc.:
-
-    export PYTHONPATH=/usr/lib/python3.3/site-packages
-
-Vim installation
-----------------
-
-The plugin has been installed and is enabled by default.
-
-Zsh installation
-----------------
-
-Add the following line to your ~/.zshrc:
-
-    . /usr/share/zsh/site-contrib/powerline.zsh
-
-Tmux installation
------------------
-
-Add the following line to your ~/.tmux.conf:
-
-    source '/usr/share/tmux/powerline.conf'
-"
-}
-
-post_remove() {
-	echo "Updating font cache..."
-	fc-cache -f
-}
diff --git a/packages/archlinux/python2-powerline-git/.gitignore b/packages/archlinux/python2-powerline-git/.gitignore
deleted file mode 100644
index cc7d5336..00000000
--- a/packages/archlinux/python2-powerline-git/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*
-!.gitignore
-!PKGBUILD
-!*.install
-!*.patch
diff --git a/packages/archlinux/python2-powerline-git/PKGBUILD b/packages/archlinux/python2-powerline-git/PKGBUILD
deleted file mode 100644
index cc262dd5..00000000
--- a/packages/archlinux/python2-powerline-git/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Maintainer: Kim Silkebækken <kim.silkebaekken+aur@gmail.com>
-
-_gitname=powerline
-_gitbranch=develop
-pkgname="python2-${_gitname}-git" # Workaround for missing split package support in AUR
-true && pkgname=("python2-${_gitname}-git" "${_gitname}-fontpatcher-git")
-pkgbase=powerline
-pkgver=822.225ac48
-pkgrel=1
-url='https://github.com/Lokaltog/powerline'
-license=('MIT')
-arch=('any')
-makedepends=('git' 'python2-setuptools')
-provides=('powerline')
-conflicts=('python-powerline-git')
-replaces=('powerline-git')
-install="${_gitname}.install"
-source=("${_gitname}::git://github.com/Lokaltog/${_gitname}.git#branch=${_gitbranch}"
-        "fontpatcher.py.patch"
-        "${install}")
-sha256sums=('SKIP'
-            '85576097662ab4203968b5fba1d59ec2653a390cdd4db9cee8ffa7bd4c5a7253'
-            'e8ab7fb51ac7244bfad973a999c9333ba4334fa391aa890489cf8c8f1211c94f')
-
-pkgver() {
-	cd "${_gitname}"
-	echo "$(git rev-list --count ${_gitbranch}).$(git rev-parse --short ${_gitbranch})"
-}
-
-prepare() {
-	cd "${srcdir}/${_gitname}"
-	patch -p1 < ../fontpatcher.py.patch
-}
-
-package_powerline-fontpatcher-git() {
-	pkgdesc='OTF/TTF font patcher for Powerline symbols'
-	depends=('python2' 'fontforge')
-
-	cd "${_gitname}"
-
-	# Font patcher
-	install -Dm755 "font/fontpatcher.py" "${pkgdir}/usr/bin/powerline-fontpatcher"
-	install -Dm644 "font/fontpatcher-symbols.sfd" "${pkgdir}/usr/share/${_gitname}/fontpatcher-symbols.sfd"
-}
-
-package_python2-powerline-git() {
-	pkgdesc='The ultimate statusline/prompt utility.'
-	depends=('python2>=2.6')
-	optdepends=('python2-psutil: improved system information'
-	            'python2-pygit2: improved git support'
-	            'mercurial: improved mercurial support'
-	            'zsh: better shell prompt'
-	            'gvim: vim compiled with Python support')
-
-	cd "${_gitname}"
-	python2 setup.py install --root="${pkgdir}" --optimize=1
-
-	# Fonts
-	install -dm755 "${pkgdir}/etc/fonts/conf.d"
-	install -Dm644 "font/PowerlineSymbols.otf" "${pkgdir}/usr/share/fonts/OTF/PowerlineSymbols.otf"
-	install -Dm644 "font/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.avail/10-powerline-symbols.conf"
-	ln -s "../conf.avail/10-powerline-symbols.conf" "${pkgdir}/etc/fonts/conf.d/10-powerline-symbols.conf"
-
-	# Vim Plugin
-	install -Dm644 "powerline/bindings/vim/plugin/powerline.vim" "${pkgdir}/usr/share/vim/vimfiles/plugin/powerline.vim"
-
-	# Zsh Plugin
-	install -Dm644 "powerline/bindings/zsh/powerline.zsh" "${pkgdir}/usr/share/zsh/site-contrib/powerline.zsh"
-
-	# Tmux Configuration
-	install -Dm644 "powerline/bindings/tmux/powerline.conf" "${pkgdir}/usr/share/tmux/powerline.conf"
-
-	# License
-	install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/packages/archlinux/python2-powerline-git/fontpatcher.py.patch b/packages/archlinux/python2-powerline-git/fontpatcher.py.patch
deleted file mode 100644
index fb394ce2..00000000
--- a/packages/archlinux/python2-powerline-git/fontpatcher.py.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/font/fontpatcher.py b/font/fontpatcher.py
-index e2bbf2a..aa172f6 100755
---- a/font/fontpatcher.py
-+++ b/font/fontpatcher.py
-@@ -21,7 +21,7 @@ except ImportError:
- parser = argparse.ArgumentParser(description='Font patcher for Powerline. Requires FontForge with Python bindings. Stores the patched font as a new, renamed font file by default.')
- parser.add_argument('target_fonts', help='font files to patch', metavar='font', nargs='+', type=argparse.FileType('rb'))
- parser.add_argument('--no-rename', help='don\'t add " for Powerline" to the font name', default=True, action='store_false', dest='rename_font')
--parser.add_argument('--source-font', help='source symbol font', metavar='font', dest='source_font', default='{0}/fontpatcher-symbols.sfd'.format(sys.path[0]), type=argparse.FileType('rb'))
-+parser.add_argument('--source-font', help='source symbol font', metavar='font', dest='source_font', default='/usr/share/powerline/fontpatcher-symbols.sfd', type=argparse.FileType('rb'))
- args = parser.parse_args()
- 
- 
diff --git a/packages/archlinux/python2-powerline-git/powerline.install b/packages/archlinux/python2-powerline-git/powerline.install
deleted file mode 100644
index d7938d2b..00000000
--- a/packages/archlinux/python2-powerline-git/powerline.install
+++ /dev/null
@@ -1,43 +0,0 @@
-post_install() {
-	echo "Updating font cache..."
-	fc-cache -f
-
-	echo "
-IMPORTANT
-=========
-
-Powerline requires custom glyphs to work properly. A font with these glyphs has 
-been installed along with a fontconfig file which enables the glyphs for many 
-common coding fonts.
-
-If Powerline doesn't work out of the box on your system, please submit an issue 
-on GitHub: https://github.com/Lokaltog/powerline/issues
-
-Consult the documentation for detailed installation instructions and 
-troubleshooting information: https://powerline.readthedocs.org/en/latest/
-
-Vim installation
-----------------
-
-The plugin has been installed and is enabled by default.
-
-Zsh installation
-----------------
-
-Add the following line to your ~/.zshrc:
-
-    . /usr/share/zsh/site-contrib/powerline.zsh
-
-Tmux installation
------------------
-
-Add the following line to your ~/.tmux.conf:
-
-    source '/usr/share/tmux/powerline.conf'
-"
-}
-
-post_remove() {
-	echo "Updating font cache..."
-	fc-cache -f
-}