diff --git a/angleproject/mingw-w64/PKGBUILD b/angleproject/mingw-w64/PKGBUILD
index 54837ab5..383a63b9 100644
--- a/angleproject/mingw-w64/PKGBUILD
+++ b/angleproject/mingw-w64/PKGBUILD
@@ -17,9 +17,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 source=('angleproject::git+https://chromium.googlesource.com/angle/angle#commit=7a533f7'
         'additional-mingw-header::git+https://github.com/Martchus/additional-mingw-header.git#commit=7a8f394'
         'angleproject-include-import-library-and-use-def-file.patch')
-md5sums=('SKIP'
-         'SKIP'
-         '966e40c3ffc2070ce413a7fda9b6aedc')
+sha256sums=('SKIP'
+            'SKIP'
+            '985a17541f2a4df6243cf817fd607f74619f995ff42f307ff95d6500f7f8fb64')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 #pkgver() {
diff --git a/c++utilities/git/PKGBUILD b/c++utilities/git/PKGBUILD
index c61509c2..b7076502 100644
--- a/c++utilities/git/PKGBUILD
+++ b/c++utilities/git/PKGBUILD
@@ -12,7 +12,7 @@ makedepends=('cmake' 'git')
 provides=('c++utilities')
 conflicts=('c++utilities')
 url="https://github.com/Martchus/${_reponame}"
-source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -21,12 +21,12 @@ pkgver() {
 }
 
 build() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
   make
 }
 
 package() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   make install
 }
diff --git a/passwordfile/git/PKGBUILD b/passwordfile/git/PKGBUILD
index 3661a0c4..862e918e 100644
--- a/passwordfile/git/PKGBUILD
+++ b/passwordfile/git/PKGBUILD
@@ -13,7 +13,7 @@ provides=('passwordfile')
 conflicts=('passwordfile')
 install=
 url="https://github.com/Martchus/${_reponame}"
-source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -22,12 +22,12 @@ pkgver() {
 }
 
 build() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
   make
 }
 
 package() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   make install
 }
diff --git a/passwordmanager/git/PKGBUILD b/passwordmanager/git/PKGBUILD
index 364be30f..de95ebe1 100644
--- a/passwordmanager/git/PKGBUILD
+++ b/passwordmanager/git/PKGBUILD
@@ -13,7 +13,7 @@ provides=('passwordmanager')
 conflicts=('passwordmanager')
 install=${_name}.install
 url="https://github.com/Martchus/${_reponame}"
-source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -22,12 +22,12 @@ pkgver() {
 }
 
 build() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
   make
 }
 
 package() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   make install
 }
diff --git a/qtutilities/git/PKGBUILD b/qtutilities/git/PKGBUILD
index a26f52f8..5a7e02e5 100644
--- a/qtutilities/git/PKGBUILD
+++ b/qtutilities/git/PKGBUILD
@@ -12,7 +12,7 @@ makedepends=('cmake' 'git')
 provides=('qtutilities')
 conflicts=('qtutilities')
 url="https://github.com/Martchus/${_reponame}"
-source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -21,13 +21,13 @@ pkgver() {
 }
 
 build() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
   make
 }
 
 package() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   make install
 }
 
diff --git a/repoindex/default/PKGBUILD b/repoindex/default/PKGBUILD
index 4b545257..f4f47637 100644
--- a/repoindex/default/PKGBUILD
+++ b/repoindex/default/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=(repoindex{,-header,-web,-gui})
 pkgver=0.2.1
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Provides a web interface to browse Arch Linux package repositories."
+pkgdesc="Repository browser for Arch Linux"
 license=('GPL')
 depends=('qt5-websockets' 'qt5-webengine' 'karchive' 'c++utilities' 'qtutilities')
 makedepends=('cmake' 'yuicompressor')
@@ -21,7 +21,7 @@ build() {
 }
 
 package_repoindex() {
-  pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides server binary)."
+  pkgdesc="Repository browser for Arch Linux (provides server binary)."
   depends=('qt5-base' 'qt5-websockets' 'karchive' 'c++utilities')
   optdepends=('repoindex-header: header files')
   optdepends=('repoindex-web: file for web UI')
@@ -41,8 +41,7 @@ package_repoindex() {
 }
 
 package_repoindex-header() {
-  arch=('any')
-  pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides header files)."
+  pkgdesc="Repository browser for Arch Linux (provides header files)"
   depends=('repoindex')
   backup=()
 
@@ -56,7 +55,7 @@ package_repoindex-header() {
 
 package_repoindex-web() {
   arch=('any')
-  pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides assets for web interface)."
+  pkgdesc="Repository browser for Arch Linux (provides assets for web interface)"
   depends=('repoindex')
   backup=()
 
@@ -70,7 +69,7 @@ package_repoindex-web() {
 
 package_repoindex-gui() {
   arch=('any')
-  pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides an application showing the web UI)."
+  pkgdesc="Repository browser for Arch Linux (provides an desktop app showing the web UI)"
   depends=('repoindex-web' 'qt5-webengine')
   install=${_reponame}.install
   backup=()
diff --git a/repoindex/git/PKGBUILD b/repoindex/git/PKGBUILD
index 5ec1e5e6..70a391b0 100644
--- a/repoindex/git/PKGBUILD
+++ b/repoindex/git/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Martchus <martchus@gmx.net>
 _reponame=repoindex
 pkgname=(repoindex{,-header,-web,-gui})
-pkgver=0.0.1
+pkgver=0.2.1
 pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Provides a web interface to browse Arch Linux package repositories (git version)."
+pkgdesc="Repository browser for Arch Linux (git version)."
 license=('GPL')
 depends=('qt5-base' 'qt5-websockets' 'karchive' 'pacman' 'c++utilities')
 makedepends=('cmake' 'git' 'yuicompressor')
 backup=("etc/${_reponame}.conf")
 url="https://github.com/Martchus/${_reponame}"
 options=(emptydirs)
-source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -20,20 +20,20 @@ pkgver() {
 }
 
 build() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
   make
 }
 
 package_repoindex() {
-  pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides server binary)."
+  pkgdesc="Repository browser for Arch Linux (provides server binary, git version)."
   depends=('qt5-base' 'qt5-websockets' 'karchive' 'c++utilities')
   optdepends=('repoindex-header: header files')
   optdepends=('repoindex-web: file for web UI')
   optdepends=('repoindex-gui: application showing the web UI')
 
   # install files
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   make install-binary install-service install-config
 
   # make directories for cache and data
@@ -47,12 +47,12 @@ package_repoindex() {
 
 package_repoindex-header() {
   arch=('any')
-  pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides header files)."
+  pkgdesc="Repository browser for Arch Linux (provides header files, git version)"
   depends=('repoindex')
   backup=()
 
   # must call cmake again to adjust install prefix
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
 
   # install files
@@ -61,12 +61,12 @@ package_repoindex-header() {
 
 package_repoindex-web() {
   arch=('any')
-  pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides assets for web interface)."
+  pkgdesc="Repository browser for Arch Linux (provides assets for web interface, git version)"
   depends=('repoindex')
   backup=()
 
   # must call cmake again to adjust install prefix
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
 
   # install files
@@ -74,14 +74,13 @@ package_repoindex-web() {
 }
 
 package_repoindex-gui() {
-  arch=('any')
-  pkgdesc="Provides a web interface to browse Arch Linux package repositories (provides an application showing the web UI)."
+  pkgdesc="Repository browser for Arch Linux (provides an desktop app showing the web UI, git version)"
   depends=('repoindex-web' 'qt5-webengine')
   install=${_reponame}.install
   backup=()
 
   # must call cmake again to adjust install prefix
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
 
   # install files
diff --git a/tageditor/git/PKGBUILD b/tageditor/git/PKGBUILD
index 9b6d1a15..c99f9831 100644
--- a/tageditor/git/PKGBUILD
+++ b/tageditor/git/PKGBUILD
@@ -16,7 +16,7 @@ provides=('tageditor')
 conflicts=('tageditor')
 install=${_name}.install
 url="https://github.com/Martchus/${_reponame}"
-source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -25,12 +25,12 @@ pkgver() {
 }
 
 build() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
   make
 }
 
 package() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   make install
 }
diff --git a/tagparser/git/PKGBUILD b/tagparser/git/PKGBUILD
index 5a147c50..8541068e 100644
--- a/tagparser/git/PKGBUILD
+++ b/tagparser/git/PKGBUILD
@@ -12,7 +12,7 @@ makedepends=('cmake' 'git')
 provides=('videodownloader')
 conflicts=('videodownloader')
 url="https://github.com/Martchus/${_reponame}"
-source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -21,12 +21,12 @@ pkgver() {
 }
 
 build() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
   make
 }
 
 package() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   make install
 }
diff --git a/videodownloader/git/PKGBUILD b/videodownloader/git/PKGBUILD
index 9b3a165e..6a12ebd2 100644
--- a/videodownloader/git/PKGBUILD
+++ b/videodownloader/git/PKGBUILD
@@ -13,7 +13,7 @@ provides=('videodownloader')
 conflicts=('videodownloader')
 install=${_name}.install
 url="https://github.com/Martchus/${_reponame}"
-source=("${pkgname}::git://github.com/Martchus/${_reponame}.git")
+source=("${_reponame}::git://github.com/Martchus/${_reponame}.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -22,12 +22,12 @@ pkgver() {
 }
 
 build() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr"
   make
 }
 
 package() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}"
   make install
 }