diff --git a/PKGBUILD b/PKGBUILD
index 6b7eb8718533b3365c0e1f54cb070ab28a1d1258..aa7ae91acb1c9d9b2e0a249ea230e79ba2136390 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,83 +1,46 @@
-# Maintainer: Ramon Buldó <ramon@manjaro.org>
+# Maintainer: Bernhard Landauer <bernhard@manjaro.org>
+# Maintainer: Bogdan Covaciu <bogdan@manjaro.org
 
 pkgbase=artwork-breath
-pkgname=('breath-icon-theme' 'breath-dark-icon-theme' 'plasma5-themes-breath' 'sddm-breath-theme' 'breath-wallpaper')
-pkgver=0.4.0
-pkgrel=3
-_gitcommit=b82857ca3a6e542492cdad235b37490b3e617fb2
+pkgname=('plasma5-themes-breath'
+    'breath-wallpapers'
+    'sddm-breath-theme')
+pkgver=21.2.0
+pkgrel=0
 url=https://gitlab.manjaro.org/artwork/themes/breath
 arch=('any')
 license=('LGPL')
-makedepends=('extra-cmake-modules' 'plasma-framework')
-source=("breath-$pkgver-$pkgrel.tar.gz::$url/-/archive/master/breath-$_gitcommit.tar.gz") 
-md5sums=('8f8e25a21d6cd979fc7cb610fb32653f')
+makedepends=('extra-cmake-modules' 'git' 'plasma-framework')
+source=("git+$url.git")
+md5sums=('SKIP')
 
 prepare() {
-  mv $srcdir/breath-master-$_gitcommit $srcdir/breath
   mkdir -p build
 }
 
-build() {
+package_plasma5-themes-breath() {
+  pkgdesc='Breath2 theme for KDE Plasma 5'
+  depends=('breeze')
+  conflicts=('plasma5-themes-breath2' 'breath2-icon-themes')
+  replaces=('plasma5-themes-breath2' 'breath2-icon-themes')
   cd build
-  cmake ../breath \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-  make
+  cmake ../breath -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_PLASMA_THEMES=ON
+  make && make DESTDIR="${pkgdir}" install
 }
 
-package_breath-wallpaper() {
-  pkgdesc='breath wallpaper'
-  install -Dm644 ${srcdir}/breath/wallpapers/Breath/contents/images/1920x1080.png ${pkgdir}/usr/share/backgrounds/breath.png
+package_breath-wallpapers() {
+  pkgdesc='Breath wallpapers'
+  install -Dm644 ${srcdir}/breath/wallpapers/Bamboo/contents/images/5120x2880.png ${pkgdir}/usr/share/backgrounds/bamboo.png
+  install -Dm644 ${srcdir}/breath/wallpapers/Bamboo\ at\ Night/contents/images/5120x2880.png ${pkgdir}/usr/share/backgrounds/bambooatnight.png
 }
 
-package_breath-icon-theme() {
-  pkgdesc='breath icon theme'
-  cd build
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/share/color-schemes"
-  rm -rf "${pkgdir}/usr/share/icons/breath-dark"
-  rm -rf "${pkgdir}/usr/share/kservices5"
-  rm -rf "${pkgdir}/usr/share/metainfo"
-  rm -rf "${pkgdir}/usr/share/plasma"
-  rm -rf "${pkgdir}/usr/share/sddm"
-  rm -rf "${pkgdir}/usr/share/wallpapers"
-}
-
-package_breath-dark-icon-theme() {
-  pkgdesc='breath dark icon theme'
-  cd build
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/share/color-schemes"
-  rm -rf "${pkgdir}/usr/share/icons/breath"
-  rm -rf "${pkgdir}/usr/share/kservices5"
-  rm -rf "${pkgdir}/usr/share/metainfo"
-  rm -rf "${pkgdir}/usr/share/plasma"
-  rm -rf "${pkgdir}/usr/share/sddm"
-  rm -rf "${pkgdir}/usr/share/wallpapers"
-}
-
-package_plasma5-themes-breath() {
-  pkgdesc='breath theme for KDE Plasma 5'
-  depends=('breeze')
-  optdepends=('breath-icon-theme: light icon theme'
-              'breath-dark-icon-theme: dark icon theme')
-  replaces=('breath-themes')
-  cd build
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/share/sddm"
-  rm -rf "${pkgdir}/usr/share/icons"
-}
 
 package_sddm-breath-theme() {
-  pkgdesc="breath theme for SDDM"
+  pkgdesc="Breath theme for SDDM"
   depends=('plasma-framework' 'plasma-workspace')
-  cd build
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/share/color-schemes"
-  rm -rf "${pkgdir}/usr/share/icons"
-  rm -rf "${pkgdir}/usr/share/kservices5"
-  rm -rf "${pkgdir}/usr/share/metainfo"
-  rm -rf "${pkgdir}/usr/share/plasma"
-  rm -rf "${pkgdir}/usr/share/wallpapers"
+  conflicts=('sddm-breath2-theme-dev')
+  replaces=('sddm-breath2-theme')
+  cd build && rm -rf *
+  cmake ../breath -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_SDDM_THEME=ON
+  make && make DESTDIR="${pkgdir}" install
 }