diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass
index c606a78..2fe914a 100644
--- a/classes/cmake_kf5.bbclass
+++ b/classes/cmake_kf5.bbclass
@@ -5,6 +5,8 @@ EXTRA_OECMAKE += " \
     
 # This function is rather offensive right now, but it seems to work
 do_install_prepend() {
-    sed -i 's/\"\/usr\//\"\$\{OE_KF5_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr)
-    sed -i 's/\;\/usr\//\;\$\{OE_KF5_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr)
+    if [ "0" -ne $(find . -name \*.cmake | grep _usr | wc -l) ]; then
+        sed -i 's/\"\/usr\//\"\$\{OE_KF5_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr)
+        sed -i 's/\;\/usr\//\;\$\{OE_KF5_PATH_HOST_ROOT\}\/usr\//g' $(find . -name "*.cmake" | grep _usr)
+    fi
 }
diff --git a/recipes-kf5/tier1-deps/ecm.inc b/recipes-kf5/tier1-deps/ecm.inc
index 1106bea..fa55171 100644
--- a/recipes-kf5/tier1-deps/ecm.inc
+++ b/recipes-kf5/tier1-deps/ecm.inc
@@ -1,13 +1,12 @@
 DESCRIPTION = "Extra CMake Modules"
 HOMEPAGE = "https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1 \
-    "
+LIC_FILES_CHKSUM = "file://COPYING-CMAKE-SCRIPTS;md5=54c7042be62e169199200bc6477f04d1"
 PR = "r0"
 
 DEPENDS = "cmake-native qttools"
 
-GIT_REPO = "git://anongit.kde.org/extra-cmake-modules;protocol=git"
+SRC_URI = "git://anongit.kde.org/extra-cmake-modules;protocol=git"
 S = "${WORKDIR}/git"
 
 do_compile() {
diff --git a/recipes-kf5/tier1-deps/ecm_1.0.0.bb b/recipes-kf5/tier1-deps/ecm_1.0.0.bb
deleted file mode 100644
index 32a1b5a..0000000
--- a/recipes-kf5/tier1-deps/ecm_1.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "9e999cecc0a0427b593ce18c9619934ad09e1e92"
-PV = "1.0.0"
diff --git a/recipes-kf5/tier1-deps/ecm_5.19.0.bb b/recipes-kf5/tier1-deps/ecm_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1-deps/ecm_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/attica.inc b/recipes-kf5/tier1/attica.inc
index 2a617ca..71c00e2 100644
--- a/recipes-kf5/tier1/attica.inc
+++ b/recipes-kf5/tier1/attica.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/attica"
+SRC_URI = "git://anongit.kde.org/attica"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/attica_5.0.0.bb b/recipes-kf5/tier1/attica_5.0.0.bb
deleted file mode 100644
index 2e45d63..0000000
--- a/recipes-kf5/tier1/attica_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "aebbe875f20b0c5c4be073917366cf10e00a948b"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/attica_5.19.0.bb b/recipes-kf5/tier1/attica_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/attica_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/karchive.inc b/recipes-kf5/tier1/karchive.inc
index 1145b87..a0d2962 100644
--- a/recipes-kf5/tier1/karchive.inc
+++ b/recipes-kf5/tier1/karchive.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "ecm zlib bzip2 xz qtbase"
 
-GIT_REPO = "git://anongit.kde.org/karchive;protocol=git"
+SRC_URI = "git://anongit.kde.org/karchive;protocol=git"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/karchive_5.0.0.bb b/recipes-kf5/tier1/karchive_5.0.0.bb
deleted file mode 100644
index 4447d37..0000000
--- a/recipes-kf5/tier1/karchive_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "05065c64b0d60842b9b8004ecf29132978e99a42"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/karchive_5.19.0.bb b/recipes-kf5/tier1/karchive_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/karchive_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kcodecs.inc b/recipes-kf5/tier1/kcodecs.inc
index 78a951f..ea00337 100644
--- a/recipes-kf5/tier1/kcodecs.inc
+++ b/recipes-kf5/tier1/kcodecs.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/kcodecs"
+SRC_URI = "git://anongit.kde.org/kcodecs"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kcodecs_5.0.0.bb b/recipes-kf5/tier1/kcodecs_5.0.0.bb
deleted file mode 100644
index 30f7048..0000000
--- a/recipes-kf5/tier1/kcodecs_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "4685f319963730680bc4aa423368d518fe3646a0"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kcodecs_5.19.0.bb b/recipes-kf5/tier1/kcodecs_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kcodecs_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kcoreaddons.inc b/recipes-kf5/tier1/kcoreaddons.inc
index dc676d9..76bb9e3 100644
--- a/recipes-kf5/tier1/kcoreaddons.inc
+++ b/recipes-kf5/tier1/kcoreaddons.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/kcoreaddons"
+SRC_URI = "git://anongit.kde.org/kcoreaddons"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kcoreaddons_5.0.0.bb b/recipes-kf5/tier1/kcoreaddons_5.0.0.bb
deleted file mode 100644
index 02dab0b..0000000
--- a/recipes-kf5/tier1/kcoreaddons_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "3bf93e981bd0f25dc06fb7e373f8b2b3b7e19a5f"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kcoreaddons_5.19.0.bb b/recipes-kf5/tier1/kcoreaddons_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kcoreaddons_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kdbusaddons.inc b/recipes-kf5/tier1/kdbusaddons.inc
index 49c54e4..c018910 100644
--- a/recipes-kf5/tier1/kdbusaddons.inc
+++ b/recipes-kf5/tier1/kdbusaddons.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/kdbusaddons"
+SRC_URI = "git://anongit.kde.org/kdbusaddons"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kdbusaddons_5.0.0.bb b/recipes-kf5/tier1/kdbusaddons_5.0.0.bb
deleted file mode 100644
index fedf138..0000000
--- a/recipes-kf5/tier1/kdbusaddons_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "25a4c2d62f749cd96a3885a1e0f67b0facc840c6"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kdbusaddons_5.19.0.bb b/recipes-kf5/tier1/kdbusaddons_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kdbusaddons_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kdnssd.inc b/recipes-kf5/tier1/kdnssd.inc
index 57d2602..3378ff5 100644
--- a/recipes-kf5/tier1/kdnssd.inc
+++ b/recipes-kf5/tier1/kdnssd.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/kdnssd"
+SRC_URI = "git://anongit.kde.org/kdnssd"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kdnssd_5.0.0.bb b/recipes-kf5/tier1/kdnssd_5.0.0.bb
deleted file mode 100644
index af9f340..0000000
--- a/recipes-kf5/tier1/kdnssd_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "e7740b2723c2789ece5b816e74139205cc6976ef"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kdnssd_5.19.0.bb b/recipes-kf5/tier1/kdnssd_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kdnssd_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kglobalaccel.inc b/recipes-kf5/tier1/kglobalaccel.inc
index 0c9ae84..7fe44fd 100644
--- a/recipes-kf5/tier1/kglobalaccel.inc
+++ b/recipes-kf5/tier1/kglobalaccel.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase qtx11extras"
 
-GIT_REPO = "git://anongit.kde.org/kglobalaccel"
+SRC_URI = "git://anongit.kde.org/kglobalaccel"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kglobalaccel_5.0.0.bb b/recipes-kf5/tier1/kglobalaccel_5.0.0.bb
deleted file mode 100644
index e2ba751..0000000
--- a/recipes-kf5/tier1/kglobalaccel_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "46dc641175994185934b3231816d6a7cd48a2a71"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kglobalaccel_5.19.0.bb b/recipes-kf5/tier1/kglobalaccel_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kglobalaccel_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kguiaddons.inc b/recipes-kf5/tier1/kguiaddons.inc
index 903482b..7289740 100644
--- a/recipes-kf5/tier1/kguiaddons.inc
+++ b/recipes-kf5/tier1/kguiaddons.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/kguiaddons"
+SRC_URI = "git://anongit.kde.org/kguiaddons"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kguiaddons_5.0.0.bb b/recipes-kf5/tier1/kguiaddons_5.0.0.bb
deleted file mode 100644
index 3f64db2..0000000
--- a/recipes-kf5/tier1/kguiaddons_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "629628028eb637a727ab54689c2dec50a68eaaca"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kguiaddons_5.19.0.bb b/recipes-kf5/tier1/kguiaddons_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kguiaddons_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/ki18n.inc b/recipes-kf5/tier1/ki18n.inc
index c1d3c13..c051191 100644
--- a/recipes-kf5/tier1/ki18n.inc
+++ b/recipes-kf5/tier1/ki18n.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase qtscript"
 
-GIT_REPO = "git://anongit.kde.org/ki18n"
+SRC_URI = "git://anongit.kde.org/ki18n"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/ki18n_5.0.0.bb b/recipes-kf5/tier1/ki18n_5.0.0.bb
deleted file mode 100644
index 3d66f64..0000000
--- a/recipes-kf5/tier1/ki18n_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "71bb29c73625e14e81da804a3c1fd0ff29c315e0"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/ki18n_5.19.0.bb b/recipes-kf5/tier1/ki18n_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/ki18n_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kidletime.inc b/recipes-kf5/tier1/kidletime.inc
index f04e76e..587c0c1 100644
--- a/recipes-kf5/tier1/kidletime.inc
+++ b/recipes-kf5/tier1/kidletime.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/kidletime"
+SRC_URI = "git://anongit.kde.org/kidletime"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kidletime_5.0.0.bb b/recipes-kf5/tier1/kidletime_5.0.0.bb
deleted file mode 100644
index 4d0be78..0000000
--- a/recipes-kf5/tier1/kidletime_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "1c99d012dbf370a09d5e2664b2d3c9a341682927"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kidletime_5.19.0.bb b/recipes-kf5/tier1/kidletime_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kidletime_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kimageformats.inc b/recipes-kf5/tier1/kimageformats.inc
index fcf97d1..95587e1 100644
--- a/recipes-kf5/tier1/kimageformats.inc
+++ b/recipes-kf5/tier1/kimageformats.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/kimageformats"
+SRC_URI = "git://anongit.kde.org/kimageformats"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kimageformats_5.0.0.bb b/recipes-kf5/tier1/kimageformats_5.0.0.bb
deleted file mode 100644
index b371666..0000000
--- a/recipes-kf5/tier1/kimageformats_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "5b42b3b7870e493b04a3c9dc09de0795db5eb443"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kimageformats_5.19.0.bb b/recipes-kf5/tier1/kimageformats_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kimageformats_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kitemmodels.inc b/recipes-kf5/tier1/kitemmodels.inc
index 53b655f..f4b81c9 100644
--- a/recipes-kf5/tier1/kitemmodels.inc
+++ b/recipes-kf5/tier1/kitemmodels.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/kitemmodels"
+SRC_URI = "git://anongit.kde.org/kitemmodels"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kitemmodels_5.0.0.bb b/recipes-kf5/tier1/kitemmodels_5.0.0.bb
deleted file mode 100644
index 4867633..0000000
--- a/recipes-kf5/tier1/kitemmodels_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "a90e289399faa4a174f29b71f6fea42ce575095c"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kitemmodels_5.19.0.bb b/recipes-kf5/tier1/kitemmodels_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kitemmodels_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kitemviews.inc b/recipes-kf5/tier1/kitemviews.inc
index d00e19a..c5fa040 100644
--- a/recipes-kf5/tier1/kitemviews.inc
+++ b/recipes-kf5/tier1/kitemviews.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/kitemviews"
+SRC_URI = "git://anongit.kde.org/kitemviews"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kitemviews_5.0.0.bb b/recipes-kf5/tier1/kitemviews_5.0.0.bb
deleted file mode 100644
index 0957322..0000000
--- a/recipes-kf5/tier1/kitemviews_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "73efe3cc9fceffa7dbfd75f975d2dce673f109e9"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kitemviews_5.19.0.bb b/recipes-kf5/tier1/kitemviews_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kitemviews_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kplotting.inc b/recipes-kf5/tier1/kplotting.inc
index f8d018d..809bb33 100644
--- a/recipes-kf5/tier1/kplotting.inc
+++ b/recipes-kf5/tier1/kplotting.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/kplotting"
+SRC_URI = "git://anongit.kde.org/kplotting"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kplotting_5.0.0.bb b/recipes-kf5/tier1/kplotting_5.0.0.bb
deleted file mode 100644
index c659a1e..0000000
--- a/recipes-kf5/tier1/kplotting_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "1ef35022e0c8a1ad87783d7338af7b90672694c6"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kplotting_5.19.0.bb b/recipes-kf5/tier1/kplotting_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kplotting_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kwidgetsaddons.inc b/recipes-kf5/tier1/kwidgetsaddons.inc
index 0e4c1f9..5bc0a56 100644
--- a/recipes-kf5/tier1/kwidgetsaddons.inc
+++ b/recipes-kf5/tier1/kwidgetsaddons.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/kwidgetsaddons"
+SRC_URI = "git://anongit.kde.org/kwidgetsaddons"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kwidgetsaddons_5.0.0.bb b/recipes-kf5/tier1/kwidgetsaddons_5.0.0.bb
deleted file mode 100644
index 0fc7f59..0000000
--- a/recipes-kf5/tier1/kwidgetsaddons_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "1c06448e7997f70e2174c2fdc8b6bdfbef44d56d"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kwidgetsaddons_5.19.0.bb b/recipes-kf5/tier1/kwidgetsaddons_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kwidgetsaddons_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/kwindowsystem.inc b/recipes-kf5/tier1/kwindowsystem.inc
index 5ddff12..217f8db 100644
--- a/recipes-kf5/tier1/kwindowsystem.inc
+++ b/recipes-kf5/tier1/kwindowsystem.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/kwindowsystem"
+SRC_URI = "git://anongit.kde.org/kwindowsystem"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/kwindowsystem_5.0.0.bb b/recipes-kf5/tier1/kwindowsystem_5.0.0.bb
deleted file mode 100644
index 09a2d05..0000000
--- a/recipes-kf5/tier1/kwindowsystem_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "5dcdca311dcbad5f88cb0ae8c0c329c4b379b773"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/kwindowsystem_5.19.0.bb b/recipes-kf5/tier1/kwindowsystem_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/kwindowsystem_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/solid.inc b/recipes-kf5/tier1/solid.inc
index 8d8640a..abb131f 100644
--- a/recipes-kf5/tier1/solid.inc
+++ b/recipes-kf5/tier1/solid.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/solid"
+SRC_URI = "git://anongit.kde.org/solid"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/solid_5.0.0.bb b/recipes-kf5/tier1/solid_5.0.0.bb
deleted file mode 100644
index 0b11003..0000000
--- a/recipes-kf5/tier1/solid_5.0.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-# 5 commits past 5.0.0, due to licensing
-SRCREV = "d89d25980ac1b4c5ee51058ea746984aec23c1e1" 
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/solid_5.19.0.bb b/recipes-kf5/tier1/solid_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/solid_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+
diff --git a/recipes-kf5/tier1/threadweaver.inc b/recipes-kf5/tier1/threadweaver.inc
index 3eec83a..7fb43be 100644
--- a/recipes-kf5/tier1/threadweaver.inc
+++ b/recipes-kf5/tier1/threadweaver.inc
@@ -7,7 +7,7 @@ PR = "r0"
 
 DEPENDS = "qtbase"
 
-GIT_REPO = "git://anongit.kde.org/threadweaver"
+SRC_URI = "git://anongit.kde.org/threadweaver"
 S = "${WORKDIR}/git"
 
 inherit cmake_kf5
diff --git a/recipes-kf5/tier1/threadweaver_5.0.0.bb b/recipes-kf5/tier1/threadweaver_5.0.0.bb
deleted file mode 100644
index fcbe5ba..0000000
--- a/recipes-kf5/tier1/threadweaver_5.0.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-SRC_URI = "${GIT_REPO}"
-SRCREV = "cfbea9ea8e4988b1762f7b9b824c2328b3f233b7"
-PV = "5.0.0"
diff --git a/recipes-kf5/tier1/threadweaver_5.19.0.bb b/recipes-kf5/tier1/threadweaver_5.19.0.bb
new file mode 100644
index 0000000..2e9a613
--- /dev/null
+++ b/recipes-kf5/tier1/threadweaver_5.19.0.bb
@@ -0,0 +1,4 @@
+require ${PN}.inc
+
+SRCREV = "v${PV}"
+