diff --git a/CMakeLists.txt b/CMakeLists.txt
index 221cbcaa5..7787a05a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ find_package(ECM 5.85.0  NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules")
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
diff --git a/cmake/Find7z.cmake b/cmake/Find7z.cmake
deleted file mode 100644
index 28132581c..000000000
--- a/cmake/Find7z.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-# Finds 7z.
-#
-#  7z_FOUND     - True if 7z is found.
-#  7z_EXECUTABLE - Path to executable
-
-#=============================================================================
-# SPDX-FileCopyrightText: 2019 Friedrich W. H. Kossebau <kossebau@kde.org>
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#=============================================================================
-
-find_program(7z_EXECUTABLE NAMES 7z.exe 7za.exe)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(7z
-    FOUND_VAR
-        7z_FOUND
-    REQUIRED_VARS
-        7z_EXECUTABLE
-)
-mark_as_advanced(7z_EXECUTABLE)
-
-set_package_properties(7z PROPERTIES
-    URL "https://www.7-zip.org/"
-    DESCRIPTION "Data (de)compression program"
-)
diff --git a/cmake/Findgzip.cmake b/cmake/Findgzip.cmake
deleted file mode 100644
index 2cc03f6b0..000000000
--- a/cmake/Findgzip.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-# Finds gzip.
-#
-#  gzip_FOUND     - True if gzip is found.
-#  gzip_EXECUTABLE - Path to executable
-
-#=============================================================================
-# SPDX-FileCopyrightText: 2019 Friedrich W. H. Kossebau <kossebau@kde.org>
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#=============================================================================
-
-find_program(gzip_EXECUTABLE NAMES gzip)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(gzip
-    FOUND_VAR
-        gzip_FOUND
-    REQUIRED_VARS
-        gzip_EXECUTABLE
-)
-mark_as_advanced(gzip_EXECUTABLE)
-
-set_package_properties(gzip PROPERTIES
-    URL "https://www.gnu.org/software/gzip"
-    DESCRIPTION "Data compression program for the gzip format"
-)
diff --git a/src/desktoptheme/CMakeLists.txt b/src/desktoptheme/CMakeLists.txt
index 874f48f92..1dbac2316 100644
--- a/src/desktoptheme/CMakeLists.txt
+++ b/src/desktoptheme/CMakeLists.txt
@@ -65,7 +65,7 @@ function(PLASMA_INSTALL_DESKTOPTHEME_SVGS theme_name)
             if(WIN32)
                 add_custom_command(
                     OUTPUT ${_gzipped_file}
-                    COMMAND ${7z_EXECUTABLE}
+                    COMMAND 7z::7z
                     ARGS
                         a
                         -tgzip
@@ -76,7 +76,7 @@ function(PLASMA_INSTALL_DESKTOPTHEME_SVGS theme_name)
             else()
                 add_custom_command(
                     OUTPUT ${_gzipped_file}
-                    COMMAND ${gzip_EXECUTABLE}
+                    COMMAND gzip::gzip
                     ARGS
                         -9
                         -c