diff --git a/gnome-breeze/git/PKGBUILD b/gnome-breeze/git/PKGBUILD
index 0973f560..5762a884 100644
--- a/gnome-breeze/git/PKGBUILD
+++ b/gnome-breeze/git/PKGBUILD
@@ -11,9 +11,8 @@ license=('LGPL')
 optdepends=("gtk2: GTK+2 theme" "gtk3: GTK+3 theme")
 makedepends=('git')
 conflicts=('gtk-theme-breezy-gtk3' 'gtk-theme-breezy-gtk2' ' gtk-theme-breezy')
-#source=(${pkgname}::"git+https://github.com/dirruk1/gnome-breeze.git")
-# use GTK 3.20 version by magnific0
-source=(${pkgname}::"git+https://github.com/magnific0/gnome-breeze.git#branch=gtk320")
+# GTK 3.20 version from magnific0 has been merged
+source=(${pkgname}::"git+https://github.com/dirruk1/gnome-breeze.git")
 md5sums=('SKIP')
 
 pkgver() {
@@ -23,5 +22,27 @@ pkgver() {
 
 package() {
   cd "${srcdir}/${pkgname}"
-  find Breeze* -type f -exec install -Dm644 '{}' "$pkgdir/usr/share/themes/{}" \;
+
+  # under Arch I suppose we always want the latest GTK 3 version -> determine latest version
+  declare -A _latest
+  for theme in Breeze*; do
+    pushd "$theme" > /dev/null
+    for ver in *; do
+      if [[ -d $ver ]] && [ "${ver:0:6}" == 'gtk-3.' ] && [ $(vercmp "${_latest["$theme"]}" "${ver:6}") -le 0 ]; then
+        _latest["$theme"]="${ver:6}"
+      fi
+    done
+    popd > /dev/null
+  done
+
+  # install GTK 2 version and latest GTK 3 version
+  for theme in Breeze*; do
+    echo "Installing latest GTK 3 version for $theme which is is 3.${_latest["$theme"]}"
+    find "$theme/gtk-"{2.0,"3.${_latest["$theme"]}"} -type f -exec install -Dm644 '{}' "$pkgdir/usr/share/themes/{}" \;
+  done
+
+  # ensure the GTK 3 themes are still found
+  for theme in Breeze*; do
+    mv "$pkgdir/usr/share/themes/${theme}/gtk-3."{"${_latest["$theme"]}",0}
+  done
 }