diff --git a/plugins/battery/CMakeLists.txt b/plugins/battery/CMakeLists.txt
index a77c67d45..82275c13e 100644
--- a/plugins/battery/CMakeLists.txt
+++ b/plugins/battery/CMakeLists.txt
@@ -10,7 +10,7 @@ set(kdeconnect_battery_SRCS
     ${debug_file_SRCS}
 )
 
-kdeconnect_add_plugin(kdeconnect_battery JSON kdeconnect_battery.json SOURCES ${kdeconnect_battery_SRCS})
+kdeconnect_add_plugin(kdeconnect_battery SOURCES ${kdeconnect_battery_SRCS})
 
 target_link_libraries(kdeconnect_battery
     kdeconnectcore
diff --git a/plugins/bigscreen/CMakeLists.txt b/plugins/bigscreen/CMakeLists.txt
index 713b68067..bb2c271f4 100644
--- a/plugins/bigscreen/CMakeLists.txt
+++ b/plugins/bigscreen/CMakeLists.txt
@@ -2,6 +2,6 @@ set(kdeconnect_bigscreen_SRCS
     bigscreenplugin.cpp
 )
 
-kdeconnect_add_plugin(kdeconnect_bigscreen JSON kdeconnect_bigscreen.json SOURCES ${kdeconnect_bigscreen_SRCS})
+kdeconnect_add_plugin(kdeconnect_bigscreen SOURCES ${kdeconnect_bigscreen_SRCS})
 
 target_link_libraries(kdeconnect_bigscreen kdeconnectcore Qt5::DBus KF5::I18n)
diff --git a/plugins/clipboard/CMakeLists.txt b/plugins/clipboard/CMakeLists.txt
index 4df045589..61dbf3c36 100644
--- a/plugins/clipboard/CMakeLists.txt
+++ b/plugins/clipboard/CMakeLists.txt
@@ -28,7 +28,7 @@ if(UNIX AND NOT APPLE)
 endif()
 
 
-kdeconnect_add_plugin(kdeconnect_clipboard JSON kdeconnect_clipboard.json SOURCES ${kdeconnect_clipboard_SRCS})
+kdeconnect_add_plugin(kdeconnect_clipboard SOURCES ${kdeconnect_clipboard_SRCS})
 
 target_link_libraries(kdeconnect_clipboard kdeconnectcore
                                     Qt5::Gui
diff --git a/plugins/connectivity-report/CMakeLists.txt b/plugins/connectivity-report/CMakeLists.txt
index a962d0cb2..5f7742a1d 100644
--- a/plugins/connectivity-report/CMakeLists.txt
+++ b/plugins/connectivity-report/CMakeLists.txt
@@ -10,7 +10,7 @@ set(kdeconnect_connectivity_report_SRCS
     ${debug_file_SRCS}
 )
 
-kdeconnect_add_plugin(kdeconnect_connectivity_report JSON kdeconnect_connectivity_report.json SOURCES ${kdeconnect_connectivity_report_SRCS})
+kdeconnect_add_plugin(kdeconnect_connectivity_report SOURCES ${kdeconnect_connectivity_report_SRCS})
 
 target_link_libraries(kdeconnect_connectivity_report
     kdeconnectcore
diff --git a/plugins/contacts/CMakeLists.txt b/plugins/contacts/CMakeLists.txt
index 492ebcb70..8dc7bc2af 100644
--- a/plugins/contacts/CMakeLists.txt
+++ b/plugins/contacts/CMakeLists.txt
@@ -10,7 +10,7 @@ set(kdeconnect_contacts_SRCS
     ${debug_file_SRCS}
 )
 
-kdeconnect_add_plugin(kdeconnect_contacts JSON kdeconnect_contacts.json SOURCES ${kdeconnect_contacts_SRCS})
+kdeconnect_add_plugin(kdeconnect_contacts SOURCES ${kdeconnect_contacts_SRCS})
 
 target_link_libraries(kdeconnect_contacts
     kdeconnectcore
diff --git a/plugins/findmyphone/CMakeLists.txt b/plugins/findmyphone/CMakeLists.txt
index 1a945ea8b..43903fa93 100644
--- a/plugins/findmyphone/CMakeLists.txt
+++ b/plugins/findmyphone/CMakeLists.txt
@@ -2,7 +2,7 @@ set(kdeconnect_findmyphone_SRCS
     findmyphoneplugin.cpp
 )
 
-kdeconnect_add_plugin(kdeconnect_findmyphone JSON kdeconnect_findmyphone.json SOURCES ${kdeconnect_findmyphone_SRCS})
+kdeconnect_add_plugin(kdeconnect_findmyphone SOURCES ${kdeconnect_findmyphone_SRCS})
 
 target_link_libraries(kdeconnect_findmyphone kdeconnectcore Qt5::Core Qt5::DBus)
 
diff --git a/plugins/findthisdevice/CMakeLists.txt b/plugins/findthisdevice/CMakeLists.txt
index 39e665c58..5b5e06c56 100644
--- a/plugins/findthisdevice/CMakeLists.txt
+++ b/plugins/findthisdevice/CMakeLists.txt
@@ -11,7 +11,6 @@ set(kdeconnect_findthisdevice_SRCS
 )
 
 kdeconnect_add_plugin(kdeconnect_findthisdevice
-    JSON kdeconnect_findthisdevice.json
     SOURCES ${kdeconnect_findthisdevice_SRCS})
 
 target_link_libraries(kdeconnect_findthisdevice
diff --git a/plugins/lockdevice/CMakeLists.txt b/plugins/lockdevice/CMakeLists.txt
index 34741b649..6a99f1d7b 100644
--- a/plugins/lockdevice/CMakeLists.txt
+++ b/plugins/lockdevice/CMakeLists.txt
@@ -14,7 +14,7 @@ else ()
     list(APPEND lockdevice_SRCS lockdeviceplugin.cpp)
 endif()
 
-kdeconnect_add_plugin(kdeconnect_lockdevice JSON kdeconnect_lockdevice.json SOURCES ${lockdevice_SRCS} ${debug_file_SRCS})
+kdeconnect_add_plugin(kdeconnect_lockdevice SOURCES ${lockdevice_SRCS} ${debug_file_SRCS})
 
 target_link_libraries(kdeconnect_lockdevice
     kdeconnectcore
diff --git a/plugins/mousepad/CMakeLists.txt b/plugins/mousepad/CMakeLists.txt
index a7b18d114..dad07fae5 100644
--- a/plugins/mousepad/CMakeLists.txt
+++ b/plugins/mousepad/CMakeLists.txt
@@ -1,4 +1,4 @@
-kdeconnect_add_plugin(kdeconnect_mousepad JSON kdeconnect_mousepad.json SOURCES mousepadplugin.cpp abstractremoteinput.cpp)
+kdeconnect_add_plugin(kdeconnect_mousepad SOURCES mousepadplugin.cpp abstractremoteinput.cpp)
 
 if(UNIX AND NOT APPLE)
     find_package(KF5 ${KF5_MIN_VERSION} QUIET OPTIONAL_COMPONENTS Wayland)
diff --git a/plugins/mpriscontrol/CMakeLists.txt b/plugins/mpriscontrol/CMakeLists.txt
index b523da8c8..f5ac0e44a 100644
--- a/plugins/mpriscontrol/CMakeLists.txt
+++ b/plugins/mpriscontrol/CMakeLists.txt
@@ -27,7 +27,7 @@ ecm_qt_declare_logging_category(
     DEFAULT_SEVERITY Warning
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin mpris)")
 
-kdeconnect_add_plugin(kdeconnect_mpriscontrol JSON kdeconnect_mpriscontrol.json SOURCES  ${kdeconnect_mpriscontrol_SRCS} ${debug_file_SRCS})
+kdeconnect_add_plugin(kdeconnect_mpriscontrol SOURCES  ${kdeconnect_mpriscontrol_SRCS} ${debug_file_SRCS})
 
 if(WIN32)
    target_link_libraries(kdeconnect_mpriscontrol kdeconnectcore windowsapp)
diff --git a/plugins/mprisremote/CMakeLists.txt b/plugins/mprisremote/CMakeLists.txt
index 42b75670c..8d1e1a37f 100644
--- a/plugins/mprisremote/CMakeLists.txt
+++ b/plugins/mprisremote/CMakeLists.txt
@@ -5,7 +5,7 @@ ecm_qt_declare_logging_category(
     DEFAULT_SEVERITY Warning
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin mprisremote)")
 
-kdeconnect_add_plugin(kdeconnect_mprisremote JSON kdeconnect_mprisremote.json SOURCES mprisremoteplugin.cpp mprisremoteplayer.cpp mprisremoteplayermediaplayer2.cpp mprisremoteplayermediaplayer2player.cpp ${debug_file_SRCS})
+kdeconnect_add_plugin(kdeconnect_mprisremote SOURCES mprisremoteplugin.cpp mprisremoteplayer.cpp mprisremoteplayermediaplayer2.cpp mprisremoteplayermediaplayer2player.cpp ${debug_file_SRCS})
 
 target_link_libraries(kdeconnect_mprisremote
     kdeconnectcore
diff --git a/plugins/notifications/CMakeLists.txt b/plugins/notifications/CMakeLists.txt
index f5999ba4c..445bb55a5 100644
--- a/plugins/notifications/CMakeLists.txt
+++ b/plugins/notifications/CMakeLists.txt
@@ -14,7 +14,7 @@ set(kdeconnect_notifications_SRCS
 
 ki18n_wrap_ui(kdeconnect_notifications_SRCS sendreplydialog.ui)
 
-kdeconnect_add_plugin(kdeconnect_notifications JSON kdeconnect_notifications.json SOURCES ${kdeconnect_notifications_SRCS})
+kdeconnect_add_plugin(kdeconnect_notifications SOURCES ${kdeconnect_notifications_SRCS})
 
 target_link_libraries(kdeconnect_notifications
     kdeconnectcore
diff --git a/plugins/pausemusic/CMakeLists.txt b/plugins/pausemusic/CMakeLists.txt
index 9c483e700..b317c49e2 100644
--- a/plugins/pausemusic/CMakeLists.txt
+++ b/plugins/pausemusic/CMakeLists.txt
@@ -17,7 +17,7 @@ ecm_qt_declare_logging_category(
 
 qt5_add_dbus_interface(kdeconnect_pausemusic_SRCS org.mpris.MediaPlayer2.Player.xml mprisplayer)
 
-kdeconnect_add_plugin(kdeconnect_pausemusic JSON kdeconnect_pausemusic.json SOURCES ${kdeconnect_pausemusic_SRCS} ${debug_file_SRCS})
+kdeconnect_add_plugin(kdeconnect_pausemusic SOURCES ${kdeconnect_pausemusic_SRCS} ${debug_file_SRCS})
 
 target_link_libraries(kdeconnect_pausemusic
     kdeconnectcore
diff --git a/plugins/photo/CMakeLists.txt b/plugins/photo/CMakeLists.txt
index 21c7910d2..bc761b6d6 100644
--- a/plugins/photo/CMakeLists.txt
+++ b/plugins/photo/CMakeLists.txt
@@ -10,7 +10,7 @@ set(kdeconnect_photo_SRCS
     ${debug_file_SRCS}
 )
 
-kdeconnect_add_plugin(kdeconnect_photo JSON kdeconnect_photo.json SOURCES ${kdeconnect_photo_SRCS})
+kdeconnect_add_plugin(kdeconnect_photo SOURCES ${kdeconnect_photo_SRCS})
 
 target_link_libraries(kdeconnect_photo
     kdeconnectcore
diff --git a/plugins/ping/CMakeLists.txt b/plugins/ping/CMakeLists.txt
index 56fb60e8a..726e802e1 100644
--- a/plugins/ping/CMakeLists.txt
+++ b/plugins/ping/CMakeLists.txt
@@ -10,7 +10,7 @@ set(kdeconnect_ping_SRCS
     ${debug_file_SRCS}
 )
 
-kdeconnect_add_plugin(kdeconnect_ping JSON kdeconnect_ping.json SOURCES ${kdeconnect_ping_SRCS})
+kdeconnect_add_plugin(kdeconnect_ping SOURCES ${kdeconnect_ping_SRCS})
 
 target_link_libraries(kdeconnect_ping
     kdeconnectcore
diff --git a/plugins/presenter/CMakeLists.txt b/plugins/presenter/CMakeLists.txt
index 42c2f0bdb..9ddc9e50a 100644
--- a/plugins/presenter/CMakeLists.txt
+++ b/plugins/presenter/CMakeLists.txt
@@ -7,7 +7,7 @@ ecm_qt_declare_logging_category(
     DEFAULT_SEVERITY Warning
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin presenter)")
 
-kdeconnect_add_plugin(kdeconnect_presenter JSON kdeconnect_presenter.json SOURCES presenterplugin.cpp ${presenter_SRCS} ${debug_file_SRCS})
+kdeconnect_add_plugin(kdeconnect_presenter SOURCES presenterplugin.cpp ${presenter_SRCS} ${debug_file_SRCS})
 target_link_libraries(kdeconnect_presenter
     kdeconnectcore
     Qt5::DBus
diff --git a/plugins/remotecommands/CMakeLists.txt b/plugins/remotecommands/CMakeLists.txt
index 4645f16af..dd8450cef 100644
--- a/plugins/remotecommands/CMakeLists.txt
+++ b/plugins/remotecommands/CMakeLists.txt
@@ -5,7 +5,7 @@ ecm_qt_declare_logging_category(
     DEFAULT_SEVERITY Warning
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin remotecommands)")
 
-kdeconnect_add_plugin(kdeconnect_remotecommands JSON kdeconnect_remotecommands.json
+kdeconnect_add_plugin(kdeconnect_remotecommands
     SOURCES remotecommandsplugin.cpp ${debug_file_SRCS}
 )
 
diff --git a/plugins/remotecontrol/CMakeLists.txt b/plugins/remotecontrol/CMakeLists.txt
index 5496dc54e..33179e69a 100644
--- a/plugins/remotecontrol/CMakeLists.txt
+++ b/plugins/remotecontrol/CMakeLists.txt
@@ -5,7 +5,7 @@ ecm_qt_declare_logging_category(
     DEFAULT_SEVERITY Warning
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin remotecontrol)")
 
-kdeconnect_add_plugin(kdeconnect_remotecontrol JSON kdeconnect_remotecontrol.json SOURCES remotecontrolplugin.cpp ${debug_file_SRCS})
+kdeconnect_add_plugin(kdeconnect_remotecontrol SOURCES remotecontrolplugin.cpp ${debug_file_SRCS})
 
 target_link_libraries(kdeconnect_remotecontrol
     kdeconnectcore
diff --git a/plugins/remotekeyboard/CMakeLists.txt b/plugins/remotekeyboard/CMakeLists.txt
index 02137749e..8c023565f 100644
--- a/plugins/remotekeyboard/CMakeLists.txt
+++ b/plugins/remotekeyboard/CMakeLists.txt
@@ -5,7 +5,7 @@ ecm_qt_declare_logging_category(
     DEFAULT_SEVERITY Warning
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin remotekeyboard)")
 
-kdeconnect_add_plugin(kdeconnect_remotekeyboard JSON kdeconnect_remotekeyboard.json
+kdeconnect_add_plugin(kdeconnect_remotekeyboard
     SOURCES remotekeyboardplugin.cpp ${debug_file_SRCS})
 
 target_link_libraries(kdeconnect_remotekeyboard
diff --git a/plugins/remotesystemvolume/CMakeLists.txt b/plugins/remotesystemvolume/CMakeLists.txt
index ba12e120c..c83ac3fed 100644
--- a/plugins/remotesystemvolume/CMakeLists.txt
+++ b/plugins/remotesystemvolume/CMakeLists.txt
@@ -10,7 +10,7 @@ set(kdeconnect_remotesystemvolume_SRCS
     ${debug_file_SRCS}
 )
 
-kdeconnect_add_plugin(kdeconnect_remotesystemvolume JSON kdeconnect_remotesystemvolume.json SOURCES ${kdeconnect_remotesystemvolume_SRCS})
+kdeconnect_add_plugin(kdeconnect_remotesystemvolume SOURCES ${kdeconnect_remotesystemvolume_SRCS})
 
 target_link_libraries(kdeconnect_remotesystemvolume
     kdeconnectcore
diff --git a/plugins/runcommand/CMakeLists.txt b/plugins/runcommand/CMakeLists.txt
index ee82c06d6..29dde2b0b 100644
--- a/plugins/runcommand/CMakeLists.txt
+++ b/plugins/runcommand/CMakeLists.txt
@@ -10,7 +10,7 @@ set(kdeconnect_runcommand_SRCS
     ${debug_file_SRCS}
 )
 
-kdeconnect_add_plugin(kdeconnect_runcommand JSON kdeconnect_runcommand.json SOURCES ${kdeconnect_runcommand_SRCS})
+kdeconnect_add_plugin(kdeconnect_runcommand SOURCES ${kdeconnect_runcommand_SRCS})
 
 target_link_libraries(kdeconnect_runcommand
     kdeconnectcore
diff --git a/plugins/screensaver-inhibit/CMakeLists.txt b/plugins/screensaver-inhibit/CMakeLists.txt
index 363deb93e..c19b5fc48 100644
--- a/plugins/screensaver-inhibit/CMakeLists.txt
+++ b/plugins/screensaver-inhibit/CMakeLists.txt
@@ -20,7 +20,7 @@ ecm_qt_declare_logging_category(
     DEFAULT_SEVERITY Warning
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin screensaverinhibit)")
 
-kdeconnect_add_plugin(kdeconnect_screensaver_inhibit JSON kdeconnect_screensaver_inhibit.json SOURCES ${kdeconnect_screensaver_inhibit_SRCS} ${debug_file_SRCS})
+kdeconnect_add_plugin(kdeconnect_screensaver_inhibit SOURCES ${kdeconnect_screensaver_inhibit_SRCS} ${debug_file_SRCS})
 
 target_link_libraries(kdeconnect_screensaver_inhibit kdeconnectcore)
 if(NOT APPLE AND NOT WIN32)
diff --git a/plugins/sendnotifications/CMakeLists.txt b/plugins/sendnotifications/CMakeLists.txt
index 090c4b81f..d1c16fd5e 100644
--- a/plugins/sendnotifications/CMakeLists.txt
+++ b/plugins/sendnotifications/CMakeLists.txt
@@ -21,7 +21,7 @@ set(kdeconnect_sendnotifications_SRCS
     ${debug_file_SRCS}
 )
 
-kdeconnect_add_plugin(kdeconnect_sendnotifications JSON "${CMAKE_CURRENT_BINARY_DIR}/kdeconnect_sendnotifications.json" SOURCES ${kdeconnect_sendnotifications_SRCS})
+kdeconnect_add_plugin(kdeconnect_sendnotifications SOURCES ${kdeconnect_sendnotifications_SRCS})
 
 target_link_libraries(kdeconnect_sendnotifications
     kdeconnectcore
diff --git a/plugins/sftp/CMakeLists.txt b/plugins/sftp/CMakeLists.txt
index beb177436..192385d21 100644
--- a/plugins/sftp/CMakeLists.txt
+++ b/plugins/sftp/CMakeLists.txt
@@ -21,7 +21,7 @@ ecm_qt_declare_logging_category(
     DEFAULT_SEVERITY Warning
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin sftp)")
 
-kdeconnect_add_plugin(kdeconnect_sftp JSON kdeconnect_sftp.json SOURCES ${kdeconnect_sftp_SRCS} ${debug_file_SRCS})
+kdeconnect_add_plugin(kdeconnect_sftp SOURCES ${kdeconnect_sftp_SRCS} ${debug_file_SRCS})
 
 target_link_libraries(kdeconnect_sftp
     kdeconnectcore
diff --git a/plugins/share/CMakeLists.txt b/plugins/share/CMakeLists.txt
index a4a40ad46..6f94d2601 100644
--- a/plugins/share/CMakeLists.txt
+++ b/plugins/share/CMakeLists.txt
@@ -10,7 +10,7 @@ set(kdeconnect_share_SRCS
     ${debug_file_SRCS}
 )
 
-kdeconnect_add_plugin(kdeconnect_share JSON kdeconnect_share.json SOURCES ${kdeconnect_share_SRCS})
+kdeconnect_add_plugin(kdeconnect_share SOURCES ${kdeconnect_share_SRCS})
 
 target_link_libraries(kdeconnect_share
     kdeconnectcore
diff --git a/plugins/sms/CMakeLists.txt b/plugins/sms/CMakeLists.txt
index 09e4557a3..dc57345a7 100644
--- a/plugins/sms/CMakeLists.txt
+++ b/plugins/sms/CMakeLists.txt
@@ -18,7 +18,7 @@ set(kdeconnect_sms_SRCS
     ${debug_file_SRCS}
 )
 
-kdeconnect_add_plugin(kdeconnect_sms JSON kdeconnect_sms.json SOURCES ${kdeconnect_sms_SRCS})
+kdeconnect_add_plugin(kdeconnect_sms SOURCES ${kdeconnect_sms_SRCS})
 
 target_link_libraries(kdeconnect_sms
     kdeconnectcore
diff --git a/plugins/systemvolume/CMakeLists.txt b/plugins/systemvolume/CMakeLists.txt
index 8614447ee..2e9f3214b 100644
--- a/plugins/systemvolume/CMakeLists.txt
+++ b/plugins/systemvolume/CMakeLists.txt
@@ -18,7 +18,7 @@ ecm_qt_declare_logging_category(
     IDENTIFIER KDECONNECT_PLUGIN_SYSTEMVOLUME CATEGORY_NAME kdeconnect.plugin.systemvolume
     DEFAULT_SEVERITY Warning
     EXPORT kdeconnect-kde DESCRIPTION "kdeconnect (plugin systemvolume)")
-kdeconnect_add_plugin(kdeconnect_systemvolume JSON kdeconnect_systemvolume.json SOURCES ${kdeconnect_systemvolume_SRCS} ${debug_file_SRCS})
+kdeconnect_add_plugin(kdeconnect_systemvolume SOURCES ${kdeconnect_systemvolume_SRCS} ${debug_file_SRCS})
 
 if(WIN32)
     target_link_libraries(kdeconnect_systemvolume
diff --git a/plugins/telephony/CMakeLists.txt b/plugins/telephony/CMakeLists.txt
index 2fe06c6d2..89adec362 100644
--- a/plugins/telephony/CMakeLists.txt
+++ b/plugins/telephony/CMakeLists.txt
@@ -10,7 +10,7 @@ set(kdeconnect_telephony_SRCS
     ${debug_file_SRCS}
 )
 
-kdeconnect_add_plugin(kdeconnect_telephony JSON kdeconnect_telephony.json SOURCES ${kdeconnect_telephony_SRCS})
+kdeconnect_add_plugin(kdeconnect_telephony SOURCES ${kdeconnect_telephony_SRCS})
 
 target_link_libraries(kdeconnect_telephony
     kdeconnectcore