diff --git a/dataengines/potd/CMakeLists.txt b/dataengines/potd/CMakeLists.txt
index bea0d09bf..9948bbb68 100644
--- a/dataengines/potd/CMakeLists.txt
+++ b/dataengines/potd/CMakeLists.txt
@@ -1,109 +1,95 @@
 set(potd_engine_SRCS
 	cachedprovider.cpp
 	potd.cpp
 )
 
 add_library(plasma_engine_potd MODULE ${potd_engine_SRCS} )
 target_link_libraries(plasma_engine_potd plasmapotdprovidercore
     KF5::Plasma
     KF5::KIOCore
 )
 
 kcoreaddons_desktop_to_json(plasma_engine_potd plasma-dataengine-potd.desktop SERVICE_TYPES plasma-dataengine.desktop)
 
 install(TARGETS plasma_engine_potd DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine )
 install(FILES plasma-dataengine-potd.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
 
 
 ########### plugin core library ############
 
 set(potd_provider_core_SRCS
 	potdprovider.cpp
 	${CMAKE_CURRENT_BINARY_DIR}/plasma_potd_export.h
 )
 
 add_library( plasmapotdprovidercore SHARED ${potd_provider_core_SRCS} )
 target_link_libraries( plasmapotdprovidercore Qt5::Gui KF5::CoreAddons )
 set_target_properties( plasmapotdprovidercore PROPERTIES VERSION 1.0.0 SOVERSION 1 )
 generate_export_header(plasmapotdprovidercore BASE_NAME PLASMA_POTD EXPORT_FILE_NAME plasma_potd_export.h)
 
 install( TARGETS plasmapotdprovidercore ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 ########### plugins ###############
 
 set( potd_flickr_provider_SRCS
 	flickrprovider.cpp
 )
 
 add_library( plasma_potd_flickrprovider MODULE ${potd_flickr_provider_SRCS} )
 target_link_libraries( plasma_potd_flickrprovider plasmapotdprovidercore KF5::KIOCore KF5::CoreAddons)
 
-kcoreaddons_desktop_to_json(plasma_potd_flickrprovider flickrprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
-
 install( TARGETS plasma_potd_flickrprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
 
 set( potd_apod_provider_SRCS
 	apodprovider.cpp
 )
 
 add_library( plasma_potd_apodprovider MODULE ${potd_apod_provider_SRCS} )
 target_link_libraries( plasma_potd_apodprovider plasmapotdprovidercore KF5::KIOCore)
 
-kcoreaddons_desktop_to_json(plasma_potd_apodprovider apodprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
-
 install( TARGETS plasma_potd_apodprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
 
 set( potd_natgeo_provider_SRCS
 	natgeoprovider.cpp
 )
 
 add_library( plasma_potd_natgeoprovider MODULE ${potd_natgeo_provider_SRCS} )
 target_link_libraries( plasma_potd_natgeoprovider plasmapotdprovidercore KF5::KIOCore)
 
-kcoreaddons_desktop_to_json(plasma_potd_natgeoprovider natgeoprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
-
 install( TARGETS plasma_potd_natgeoprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
 
 set( potd_epod_provider_SRCS
 	epodprovider.cpp
 )
 
 add_library( plasma_potd_epodprovider MODULE ${potd_epod_provider_SRCS} )
 target_link_libraries( plasma_potd_epodprovider plasmapotdprovidercore KF5::KIOCore)
 
-kcoreaddons_desktop_to_json(plasma_potd_epodprovider epodprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
-
 install( TARGETS plasma_potd_epodprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
 
 set( potd_noaa_provider_SRCS
 	noaaprovider.cpp
 )
 
 add_library( plasma_potd_noaaprovider MODULE ${potd_noaa_provider_SRCS} )
 target_link_libraries( plasma_potd_noaaprovider plasmapotdprovidercore KF5::KIOCore)
 
-kcoreaddons_desktop_to_json(plasma_potd_noaaprovider noaaprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
-
 install( TARGETS plasma_potd_noaaprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
 
 set( potd_wcpotd_provider_SRCS
 	wcpotdprovider.cpp
 )
 
 add_library( plasma_potd_wcpotdprovider MODULE ${potd_wcpotd_provider_SRCS} )
 target_link_libraries( plasma_potd_wcpotdprovider plasmapotdprovidercore KF5::KIOCore )
 
-kcoreaddons_desktop_to_json(plasma_potd_wcpotdprovider wcpotdprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
-
 install( TARGETS plasma_potd_wcpotdprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
 
 set( potd_bing_provider_SRCS
 	bingprovider.cpp
 )
 
 add_library( plasma_potd_bingprovider MODULE ${potd_bing_provider_SRCS} )
 target_link_libraries( plasma_potd_bingprovider plasmapotdprovidercore KF5::KIOCore )
 
-kcoreaddons_desktop_to_json(plasma_potd_bingprovider bingprovider.desktop SERVICE_TYPES ${CMAKE_CURRENT_SOURCE_DIR}/plasma_potdprovider.desktop)
-
 install( TARGETS plasma_potd_bingprovider DESTINATION ${KDE_INSTALL_PLUGINDIR}/potd )
diff --git a/dataengines/potd/apodprovider.desktop b/dataengines/potd/apodprovider.desktop
deleted file mode 100644
index 906c0139c..000000000
--- a/dataengines/potd/apodprovider.desktop
+++ /dev/null
@@ -1,108 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=PlasmaPoTD/Plugin
-X-KDE-Library=plasma_potd_apodprovider
-X-KDE-PlasmaPoTDProvider-Identifier=apod
-Icon=
-
-Name=Astronomy Picture of the Day
-Name[ar]=الصورة الفضائية اليومية
-Name[bs]=Astronomska slika dana
-Name[ca]=Imatge astronòmica del dia
-Name[ca@valencia]=Imatge astronòmica del dia
-Name[cs]=Obrázek dne z Astronomie
-Name[da]=Dagens astronomibillede
-Name[de]=Bild des Tages der Astronomie
-Name[el]=Αστρονομική φωτογραφία της ημέρας
-Name[en_GB]=Astronomy Picture of the Day
-Name[es]=Imagen astronómica del día
-Name[et]=Astronoomia päevapilt
-Name[eu]=Eguneko irudi astronomikoa
-Name[fi]=Päivän tähtitiedekuva
-Name[fr]=Image du jour d'astronomie
-Name[ga]=Grianghraf Réalteolaíochta an Lae
-Name[gl]=Imaxe do día de astronomía
-Name[he]=תמונה אסטרונומית של היום
-Name[hr]=Slika dana na Astronomy
-Name[hu]=A nap csillagászati képe
-Name[it]=Astronomy Picture of the Day
-Name[ja]=今日の天体写真
-Name[kk]=Астрономиялық "Тәулік суреті" (Apod)
-Name[km]=រូប​ភាព​ប្រ​ចាំ​ថ្ងៃ Astronomy 
-Name[ko]=오늘의 천문학 사진
-Name[lt]=Dienos nuotrauka astronomijos tema
-Name[lv]=Astronomijas dienas attēls
-Name[mr]=खगोलशास्त्र दिवसाचे चित्र
-Name[nb]=Dagens astronomibilde
-Name[nds]=Astronoomsch Bild för Vundaag
-Name[nl]=Astronomische afbeelding van de dag
-Name[nn]=Dagens astronomibilete
-Name[pa]=ਅੱਜ ਦੀ ਖਗੋਲੀ ਤਸਵੀਰ
-Name[pl]=Astronomiczny obraz dnia
-Name[pt]=Imagem do Dia na Astronomia
-Name[pt_BR]=Imagem astronômica do dia
-Name[ro]=Imaginea zilei din astronomie
-Name[ru]=Астрономический снимок дня
-Name[sk]=Obrázok dňa z Astronómie
-Name[sl]=Astronomska slika dneva
-Name[sr]=астрономска слика дана
-Name[sr@ijekavian]=астрономска слика дана
-Name[sr@ijekavianlatin]=astronomska slika dana
-Name[sr@latin]=astronomska slika dana
-Name[sv]=Dagens astronomiska bild
-Name[th]=ภาพดาราศาสตร์ประจำวัน
-Name[tr]=Günün Astronomik Fotoğrafı
-Name[uk]=Зображення дня Astronomy
-Name[x-test]=xxAstronomy Picture of the Dayxx
-Name[zh_CN]=每日一图(天文)
-Name[zh_TW]=本日天文圖片
-Comment=Apod Provider
-Comment[ar]=المزود Apod
-Comment[bs]=Dobavljač Apod-a
-Comment[ca]=Proveïdor Apod
-Comment[ca@valencia]=Proveïdor Apod
-Comment[cs]=Poskytovatel Apodu
-Comment[da]=Apod-udbyder.
-Comment[de]=Apod-Anbieter
-Comment[el]=Πάροχος Apod 
-Comment[en_GB]=Apod Provider
-Comment[es]=Proveedor de Apod
-Comment[et]=Apodi pakkuja
-Comment[eu]=Apod hornitzailea
-Comment[fi]=Apod-tarjoaja
-Comment[fr]=Fournisseur « APOD »
-Comment[ga]=Soláthraí Apod
-Comment[gl]=Fornecedor de Apod
-Comment[he]=Apod Provider
-Comment[hr]=Pružatelj Apoda
-Comment[hu]=Apod-szolgáltató
-Comment[is]=Apod þjónusta
-Comment[it]=Fornitore Apod
-Comment[ja]=Apod のプロバイダ
-Comment[kk]=Apod таратушысы
-Comment[km]=ក្រុមហ៊ុន​ផ្ដល់ Apod
-Comment[ko]=천문학 사진 공급자
-Comment[lt]=Apod tiekėjas
-Comment[lv]=Apod piegādātājs
-Comment[mr]=एपोड पुरविठाकर्ता
-Comment[nb]=Apod-leverandør
-Comment[nds]=ABifV-Anbeder
-Comment[nl]=Apod-provider
-Comment[nn]=Apod-tilbydar
-Comment[pl]=Usługodawca Apod
-Comment[pt]=Fornecedor do Apod
-Comment[pt_BR]=Fornecedor Apod
-Comment[ro]=Furnizor Apod
-Comment[ru]=Источник данных Apod
-Comment[sk]=Poskytovateľ Apod
-Comment[sl]=Ponudnik Apod
-Comment[sr]=Добављач АПОД‑а
-Comment[sr@ijekavian]=Добављач АПОД‑а
-Comment[sr@ijekavianlatin]=Dobavljač APOD‑a
-Comment[sr@latin]=Dobavljač APOD‑a
-Comment[sv]=Tillhandahåll från Apod
-Comment[tr]=Apod Sağlayıcı
-Comment[uk]=Постачальник даних Apod
-Comment[x-test]=xxApod Providerxx
-Comment[zh_CN]=Apod 提供方
-Comment[zh_TW]=Apod 提供者
diff --git a/dataengines/potd/apodprovider.json b/dataengines/potd/apodprovider.json
new file mode 100644
index 000000000..2d1a63e8b
--- /dev/null
+++ b/dataengines/potd/apodprovider.json
@@ -0,0 +1,110 @@
+{
+    "KPlugin": {
+        "Description": "Apod Provider",
+        "Description[ar]": "المزود Apod",
+        "Description[bs]": "Dobavljač Apod-a",
+        "Description[ca@valencia]": "Proveïdor Apod",
+        "Description[ca]": "Proveïdor Apod",
+        "Description[cs]": "Poskytovatel Apodu",
+        "Description[da]": "Apod-udbyder.",
+        "Description[de]": "Apod-Anbieter",
+        "Description[el]": "Πάροχος Apod",
+        "Description[en_GB]": "Apod Provider",
+        "Description[es]": "Proveedor de Apod",
+        "Description[et]": "Apodi pakkuja",
+        "Description[eu]": "Apod hornitzailea",
+        "Description[fi]": "Apod-tarjoaja",
+        "Description[fr]": "Fournisseur « APOD »",
+        "Description[ga]": "Soláthraí Apod",
+        "Description[gl]": "Fornecedor de Apod",
+        "Description[he]": "Apod Provider",
+        "Description[hr]": "Pružatelj Apoda",
+        "Description[hu]": "Apod-szolgáltató",
+        "Description[is]": "Apod þjónusta",
+        "Description[it]": "Fornitore Apod",
+        "Description[ja]": "Apod のプロバイダ",
+        "Description[kk]": "Apod таратушысы",
+        "Description[km]": "ក្រុមហ៊ុន​ផ្ដល់ Apod",
+        "Description[ko]": "천문학 사진 공급자",
+        "Description[lt]": "Apod tiekėjas",
+        "Description[lv]": "Apod piegādātājs",
+        "Description[mr]": "एपोड पुरविठाकर्ता",
+        "Description[nb]": "Apod-leverandør",
+        "Description[nds]": "ABifV-Anbeder",
+        "Description[nl]": "Apod-provider",
+        "Description[nn]": "Apod-tilbydar",
+        "Description[pl]": "Usługodawca Apod",
+        "Description[pt]": "Fornecedor do Apod",
+        "Description[pt_BR]": "Fornecedor Apod",
+        "Description[ro]": "Furnizor Apod",
+        "Description[ru]": "Источник данных Apod",
+        "Description[sk]": "Poskytovateľ Apod",
+        "Description[sl]": "Ponudnik Apod",
+        "Description[sr@ijekavian]": "Добављач АПОД‑а",
+        "Description[sr@ijekavianlatin]": "Dobavljač APOD‑a",
+        "Description[sr@latin]": "Dobavljač APOD‑a",
+        "Description[sr]": "Добављач АПОД‑а",
+        "Description[sv]": "Tillhandahåll från Apod",
+        "Description[tr]": "Apod Sağlayıcı",
+        "Description[uk]": "Постачальник даних Apod",
+        "Description[x-test]": "xxApod Providerxx",
+        "Description[zh_CN]": "Apod 提供方",
+        "Description[zh_TW]": "Apod 提供者",
+        "Icon": "",
+        "Name": "Astronomy Picture of the Day",
+        "Name[ar]": "الصورة الفضائية اليومية",
+        "Name[bs]": "Astronomska slika dana",
+        "Name[ca@valencia]": "Imatge astronòmica del dia",
+        "Name[ca]": "Imatge astronòmica del dia",
+        "Name[cs]": "Obrázek dne z Astronomie",
+        "Name[da]": "Dagens astronomibillede",
+        "Name[de]": "Bild des Tages der Astronomie",
+        "Name[el]": "Αστρονομική φωτογραφία της ημέρας",
+        "Name[en_GB]": "Astronomy Picture of the Day",
+        "Name[es]": "Imagen astronómica del día",
+        "Name[et]": "Astronoomia päevapilt",
+        "Name[eu]": "Eguneko irudi astronomikoa",
+        "Name[fi]": "Päivän tähtitiedekuva",
+        "Name[fr]": "Image du jour d'astronomie",
+        "Name[ga]": "Grianghraf Réalteolaíochta an Lae",
+        "Name[gl]": "Imaxe do día de astronomía",
+        "Name[he]": "תמונה אסטרונומית של היום",
+        "Name[hr]": "Slika dana na Astronomy",
+        "Name[hu]": "A nap csillagászati képe",
+        "Name[it]": "Astronomy Picture of the Day",
+        "Name[ja]": "今日の天体写真",
+        "Name[kk]": "Астрономиялық \"Тәулік суреті\" (Apod)",
+        "Name[km]": "រូប​ភាព​ប្រ​ចាំ​ថ្ងៃ Astronomy",
+        "Name[ko]": "오늘의 천문학 사진",
+        "Name[lt]": "Dienos nuotrauka astronomijos tema",
+        "Name[lv]": "Astronomijas dienas attēls",
+        "Name[mr]": "खगोलशास्त्र दिवसाचे चित्र",
+        "Name[nb]": "Dagens astronomibilde",
+        "Name[nds]": "Astronoomsch Bild för Vundaag",
+        "Name[nl]": "Astronomische afbeelding van de dag",
+        "Name[nn]": "Dagens astronomibilete",
+        "Name[pa]": "ਅੱਜ ਦੀ ਖਗੋਲੀ ਤਸਵੀਰ",
+        "Name[pl]": "Astronomiczny obraz dnia",
+        "Name[pt]": "Imagem do Dia na Astronomia",
+        "Name[pt_BR]": "Imagem astronômica do dia",
+        "Name[ro]": "Imaginea zilei din astronomie",
+        "Name[ru]": "Астрономический снимок дня",
+        "Name[sk]": "Obrázok dňa z Astronómie",
+        "Name[sl]": "Astronomska slika dneva",
+        "Name[sr@ijekavian]": "астрономска слика дана",
+        "Name[sr@ijekavianlatin]": "astronomska slika dana",
+        "Name[sr@latin]": "astronomska slika dana",
+        "Name[sr]": "астрономска слика дана",
+        "Name[sv]": "Dagens astronomiska bild",
+        "Name[th]": "ภาพดาราศาสตร์ประจำวัน",
+        "Name[tr]": "Günün Astronomik Fotoğrafı",
+        "Name[uk]": "Зображення дня Astronomy",
+        "Name[x-test]": "xxAstronomy Picture of the Dayxx",
+        "Name[zh_CN]": "每日一图(天文)",
+        "Name[zh_TW]": "本日天文圖片",
+        "ServiceTypes": [
+            "PlasmaPoTD/Plugin"
+        ]
+    },
+    "X-KDE-PlasmaPoTDProvider-Identifier": "apod"
+}
diff --git a/dataengines/potd/bingprovider.desktop b/dataengines/potd/bingprovider.desktop
deleted file mode 100644
index cb3a5ab16..000000000
--- a/dataengines/potd/bingprovider.desktop
+++ /dev/null
@@ -1,77 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=PlasmaPoTD/Plugin
-X-KDE-Library=plasma_potd_bingprovider
-X-KDE-PlasmaPoTDProvider-Identifier=bing
-Icon=
-
-Name=Bing's Picture of the Day
-Name[ca]=Imatge del dia del Bing
-Name[ca@valencia]=Imatge del dia del Bing
-Name[cs]=Obrázek dne na Bing
-Name[da]=Dagens billede fra Bing
-Name[de]=Bings Bild des Tages
-Name[el]=Φωτογραφία της ημέρας από το BIng
-Name[en_GB]=Bing's Picture of the Day
-Name[es]=Imagen del día de Bing
-Name[eu]=Bing: eguneko argazkia
-Name[fi]=Bingin päivän kuva
-Name[fr]=Image du jour Bing
-Name[gl]=Imaxe do día de Bing
-Name[he]=תמונת היום של Bing
-Name[hu]=A nap képe a Bingen
-Name[it]=Immagine del giorno di Bing
-Name[ko]=Bing 오늘의 그림
-Name[nl]=Afbeelding van de dag van Bing
-Name[nn]=Dagens bilete frå Bing
-Name[pl]=Obraz dnia Binga
-Name[pt]=Imagem do Dia do Bing
-Name[pt_BR]=Imagem do dia do Bing
-Name[ru]=Изображение дня Bing
-Name[sk]=Obrázok dňa Bing
-Name[sl]=Slika dneva iz Binga
-Name[sr]=Бингова слика дана
-Name[sr@ijekavian]=Бингова слика дана
-Name[sr@ijekavianlatin]=Bingova slika dana
-Name[sr@latin]=Bingova slika dana
-Name[sv]=Dagens bild på Bing
-Name[tr]=Bing Günün Resmi
-Name[uk]=Картинка дня Bing
-Name[x-test]=xxBing's Picture of the Dayxx
-Name[zh_CN]=必应每日图片
-Name[zh_TW]=Bing 本日圖片
-Comment=Bing Provider
-Comment[ca]=Proveïdor Bing
-Comment[ca@valencia]=Proveïdor Bing
-Comment[cs]=Poskytovatel Bing
-Comment[da]=Bing-udbyder
-Comment[de]=Bing-Anbieter
-Comment[el]=Πάροχος Bing
-Comment[en_GB]=Bing Provider
-Comment[es]=Proveedor de Bing
-Comment[eu]=Bing hornitzailea
-Comment[fi]=Bing-tarjoaja
-Comment[fr]=Fournisseur Bing
-Comment[gl]=Fornecedor de Bing
-Comment[he]=Bing Provider
-Comment[hu]=Bing szolgáltató
-Comment[it]=Fornitore Bing
-Comment[ko]=Bing 공급자
-Comment[nl]=Bing-provider
-Comment[nn]=Bing-tilbydar
-Comment[pl]=Dostawca Bing
-Comment[pt]=Fornecedor do Bing
-Comment[pt_BR]=Fornecedor Bing
-Comment[ru]=Источник данных Bing
-Comment[sk]=Poskytovateľ Bing
-Comment[sl]=Ponudnik Bing
-Comment[sr]=Добављач са Бинга
-Comment[sr@ijekavian]=Добављач са Бинга
-Comment[sr@ijekavianlatin]=Dobavljač sa Binga
-Comment[sr@latin]=Dobavljač sa Binga
-Comment[sv]=Tillhandahåll från Bing
-Comment[tr]=Bing Sağlayıcı
-Comment[uk]=Постачальник даних Bing
-Comment[x-test]=xxBing Providerxx
-Comment[zh_CN]=必应提供方
-Comment[zh_TW]=Bing 提供者
diff --git a/dataengines/potd/bingprovider.json b/dataengines/potd/bingprovider.json
new file mode 100644
index 000000000..25250e7d9
--- /dev/null
+++ b/dataengines/potd/bingprovider.json
@@ -0,0 +1,79 @@
+{
+    "KPlugin": {
+        "Description": "Bing Provider",
+        "Description[ca@valencia]": "Proveïdor Bing",
+        "Description[ca]": "Proveïdor Bing",
+        "Description[cs]": "Poskytovatel Bing",
+        "Description[da]": "Bing-udbyder",
+        "Description[de]": "Bing-Anbieter",
+        "Description[el]": "Πάροχος Bing",
+        "Description[en_GB]": "Bing Provider",
+        "Description[es]": "Proveedor de Bing",
+        "Description[eu]": "Bing hornitzailea",
+        "Description[fi]": "Bing-tarjoaja",
+        "Description[fr]": "Fournisseur Bing",
+        "Description[gl]": "Fornecedor de Bing",
+        "Description[he]": "Bing Provider",
+        "Description[hu]": "Bing szolgáltató",
+        "Description[it]": "Fornitore Bing",
+        "Description[ko]": "Bing 공급자",
+        "Description[nl]": "Bing-provider",
+        "Description[nn]": "Bing-tilbydar",
+        "Description[pl]": "Dostawca Bing",
+        "Description[pt]": "Fornecedor do Bing",
+        "Description[pt_BR]": "Fornecedor Bing",
+        "Description[ru]": "Источник данных Bing",
+        "Description[sk]": "Poskytovateľ Bing",
+        "Description[sl]": "Ponudnik Bing",
+        "Description[sr@ijekavian]": "Добављач са Бинга",
+        "Description[sr@ijekavianlatin]": "Dobavljač sa Binga",
+        "Description[sr@latin]": "Dobavljač sa Binga",
+        "Description[sr]": "Добављач са Бинга",
+        "Description[sv]": "Tillhandahåll från Bing",
+        "Description[tr]": "Bing Sağlayıcı",
+        "Description[uk]": "Постачальник даних Bing",
+        "Description[x-test]": "xxBing Providerxx",
+        "Description[zh_CN]": "必应提供方",
+        "Description[zh_TW]": "Bing 提供者",
+        "Icon": "",
+        "Name": "Bing's Picture of the Day",
+        "Name[ca@valencia]": "Imatge del dia del Bing",
+        "Name[ca]": "Imatge del dia del Bing",
+        "Name[cs]": "Obrázek dne na Bing",
+        "Name[da]": "Dagens billede fra Bing",
+        "Name[de]": "Bings Bild des Tages",
+        "Name[el]": "Φωτογραφία της ημέρας από το BIng",
+        "Name[en_GB]": "Bing's Picture of the Day",
+        "Name[es]": "Imagen del día de Bing",
+        "Name[eu]": "Bing: eguneko argazkia",
+        "Name[fi]": "Bingin päivän kuva",
+        "Name[fr]": "Image du jour Bing",
+        "Name[gl]": "Imaxe do día de Bing",
+        "Name[he]": "תמונת היום של Bing",
+        "Name[hu]": "A nap képe a Bingen",
+        "Name[it]": "Immagine del giorno di Bing",
+        "Name[ko]": "Bing 오늘의 그림",
+        "Name[nl]": "Afbeelding van de dag van Bing",
+        "Name[nn]": "Dagens bilete frå Bing",
+        "Name[pl]": "Obraz dnia Binga",
+        "Name[pt]": "Imagem do Dia do Bing",
+        "Name[pt_BR]": "Imagem do dia do Bing",
+        "Name[ru]": "Изображение дня Bing",
+        "Name[sk]": "Obrázok dňa Bing",
+        "Name[sl]": "Slika dneva iz Binga",
+        "Name[sr@ijekavian]": "Бингова слика дана",
+        "Name[sr@ijekavianlatin]": "Bingova slika dana",
+        "Name[sr@latin]": "Bingova slika dana",
+        "Name[sr]": "Бингова слика дана",
+        "Name[sv]": "Dagens bild på Bing",
+        "Name[tr]": "Bing Günün Resmi",
+        "Name[uk]": "Картинка дня Bing",
+        "Name[x-test]": "xxBing's Picture of the Dayxx",
+        "Name[zh_CN]": "必应每日图片",
+        "Name[zh_TW]": "Bing 本日圖片",
+        "ServiceTypes": [
+            "PlasmaPoTD/Plugin"
+        ]
+    },
+    "X-KDE-PlasmaPoTDProvider-Identifier": "bing"
+}
diff --git a/dataengines/potd/epodprovider.desktop b/dataengines/potd/epodprovider.desktop
deleted file mode 100644
index 815b2805f..000000000
--- a/dataengines/potd/epodprovider.desktop
+++ /dev/null
@@ -1,108 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=PlasmaPoTD/Plugin
-X-KDE-Library=plasma_potd_epodprovider
-X-KDE-PlasmaPoTDProvider-Identifier=epod
-Icon=
-
-Name=Earth Science Picture of the Day
-Name[ar]=صورة علم الأرض اليومية
-Name[bs]=Geonaučna slika dana
-Name[ca]=Imatge de ciències terràqüies del dia
-Name[ca@valencia]=Imatge de ciències terràqüies del dia
-Name[cs]=Obrázek dne z Earth Science
-Name[da]=Dagens geovidenskabsbillede
-Name[de]=Bild des Tages der Geowissenschaften
-Name[el]=Earth Science φωτογραφία της ημέρας
-Name[en_GB]=Earth Science Picture of the Day
-Name[es]=Imagen de ciencias de la Tierra del día
-Name[et]=Maateaduse päevapilt
-Name[eu]=Lurreko zientziaren eguneko irudia
-Name[fi]=Päivän geotiedekuva
-Name[fr]=Image du jour des sciences de la terre
-Name[ga]=Grianghraf Domhaneolaíochta an Lae
-Name[gl]=Imaxe do día sobre as ciencias da terra
-Name[he]=תמונת היום של Earth Science 
-Name[hr]=Slika dana na Earth Science
-Name[hu]=A nap képe az Earth Science-en
-Name[it]=Earth Science Picture of the Day
-Name[ja]=今日の地学写真
-Name[kk]=Жер ғылым "Тәулік суреті" (Epod)
-Name[km]=រូប​ភាព​ប្រចាំ​ថ្ងៃ Earth Science 
-Name[ko]=오늘의 지구과학 사진
-Name[lt]=Mokslinis dienos paveikslėlis
-Name[lv]=Zemes zinātņu dienas attēls
-Name[mr]=पृथ्वी शास्त्र दिवसाचे चित्र
-Name[nb]=Dagens geovitenskapelige bilde
-Name[nds]=Eerdwetenschappen-Bild för Vundaag
-Name[nl]=Geologische afbeelding van de dag
-Name[nn]=Dagens geovitskap-bilete
-Name[pa]=ਅੱਜ ਦੀ ਧਰਤੀ ਵਿਗਿਆਨ ਤਸਵੀਰ
-Name[pl]=Naukowy obraz dnia
-Name[pt]=Imagem do Dia nas Ciências Terrestres
-Name[pt_BR]=Imagem do dia da Ciência na Terra
-Name[ro]=Imaginea zilei din științele naturii
-Name[ru]=Природоведение: Изображение Дня
-Name[sk]=Obrázok dňa z Vedy o zemi
-Name[sl]=Slika dneva z Earth Science
-Name[sr]=геонаучна слика дана
-Name[sr@ijekavian]=геонаучна слика дана
-Name[sr@ijekavianlatin]=geonaučna slika dana
-Name[sr@latin]=geonaučna slika dana
-Name[sv]=Dagens geovetenskapliga bild
-Name[th]=ภาพวิทยาศาสตร์ของโลกประจำวัน
-Name[tr]=Günün Dünya Bilimi Fotoğrafı
-Name[uk]=Зображення дня Earth Science
-Name[x-test]=xxEarth Science Picture of the Dayxx
-Name[zh_CN]=每日一图(地球科学)
-Name[zh_TW]=本日地球科學圖片
-Comment=Epod Provider
-Comment[ar]=المزود Epod
-Comment[bs]=Dobavljač Epod-a
-Comment[ca]=Proveïdor Epod
-Comment[ca@valencia]=Proveïdor Epod
-Comment[cs]=Poskytovatel Epodu
-Comment[da]=Epod-udbyder.
-Comment[de]=Epod-Anbieter
-Comment[el]=Πάροχος Epod
-Comment[en_GB]=Epod Provider
-Comment[es]=Proveedor de Epod
-Comment[et]=Epodi pakkuja
-Comment[eu]=Epod hornitzailea
-Comment[fi]=Epod-tarjoaja
-Comment[fr]=Fournisseur « EPOD »
-Comment[ga]=Soláthraí Epod
-Comment[gl]=Fornecedor de Epod
-Comment[he]=Epod Provider
-Comment[hr]=Pružatelj Epoda
-Comment[hu]=Apod-szolgáltató
-Comment[is]=Epod þjónusta
-Comment[it]=Fornitore Epod
-Comment[ja]=Epod のプロバイダ
-Comment[kk]=Epod таратушысы
-Comment[km]=ក្រុមហ៊ុន​ផ្ដល់ Epod
-Comment[ko]=지구과학 사진 공급자
-Comment[lt]=Epod tiekėjas
-Comment[lv]=Epod piegādātājs
-Comment[mr]=इपोड पुरविठाकर्ता
-Comment[nb]=Epod-leverandør
-Comment[nds]=EBifV-Anbeder
-Comment[nl]=Epod-provider
-Comment[nn]=Epod-tilbydar
-Comment[pl]=Usługodawca Epod
-Comment[pt]=Fornecedor do Epod
-Comment[pt_BR]=Fornecedor Epod
-Comment[ro]=Furnizor Epod
-Comment[ru]=Источник данных Epod
-Comment[sk]=Poskytovateľ Epod
-Comment[sl]=Ponudnik Epod
-Comment[sr]=Добављач ЕПОД‑а
-Comment[sr@ijekavian]=Добављач ЕПОД‑а
-Comment[sr@ijekavianlatin]=Dobavljač EPOD‑a
-Comment[sr@latin]=Dobavljač EPOD‑a
-Comment[sv]=Tillhandahåll från Epod
-Comment[tr]=Epod Sağlayıcı
-Comment[uk]=Постачальник даних Epod
-Comment[x-test]=xxEpod Providerxx
-Comment[zh_CN]=Epod 提供方
-Comment[zh_TW]=Epod 提供者
diff --git a/dataengines/potd/epodprovider.json b/dataengines/potd/epodprovider.json
new file mode 100644
index 000000000..ed3e3669e
--- /dev/null
+++ b/dataengines/potd/epodprovider.json
@@ -0,0 +1,110 @@
+{
+    "KPlugin": {
+        "Description": "Epod Provider",
+        "Description[ar]": "المزود Epod",
+        "Description[bs]": "Dobavljač Epod-a",
+        "Description[ca@valencia]": "Proveïdor Epod",
+        "Description[ca]": "Proveïdor Epod",
+        "Description[cs]": "Poskytovatel Epodu",
+        "Description[da]": "Epod-udbyder.",
+        "Description[de]": "Epod-Anbieter",
+        "Description[el]": "Πάροχος Epod",
+        "Description[en_GB]": "Epod Provider",
+        "Description[es]": "Proveedor de Epod",
+        "Description[et]": "Epodi pakkuja",
+        "Description[eu]": "Epod hornitzailea",
+        "Description[fi]": "Epod-tarjoaja",
+        "Description[fr]": "Fournisseur « EPOD »",
+        "Description[ga]": "Soláthraí Epod",
+        "Description[gl]": "Fornecedor de Epod",
+        "Description[he]": "Epod Provider",
+        "Description[hr]": "Pružatelj Epoda",
+        "Description[hu]": "Apod-szolgáltató",
+        "Description[is]": "Epod þjónusta",
+        "Description[it]": "Fornitore Epod",
+        "Description[ja]": "Epod のプロバイダ",
+        "Description[kk]": "Epod таратушысы",
+        "Description[km]": "ក្រុមហ៊ុន​ផ្ដល់ Epod",
+        "Description[ko]": "지구과학 사진 공급자",
+        "Description[lt]": "Epod tiekėjas",
+        "Description[lv]": "Epod piegādātājs",
+        "Description[mr]": "इपोड पुरविठाकर्ता",
+        "Description[nb]": "Epod-leverandør",
+        "Description[nds]": "EBifV-Anbeder",
+        "Description[nl]": "Epod-provider",
+        "Description[nn]": "Epod-tilbydar",
+        "Description[pl]": "Usługodawca Epod",
+        "Description[pt]": "Fornecedor do Epod",
+        "Description[pt_BR]": "Fornecedor Epod",
+        "Description[ro]": "Furnizor Epod",
+        "Description[ru]": "Источник данных Epod",
+        "Description[sk]": "Poskytovateľ Epod",
+        "Description[sl]": "Ponudnik Epod",
+        "Description[sr@ijekavian]": "Добављач ЕПОД‑а",
+        "Description[sr@ijekavianlatin]": "Dobavljač EPOD‑a",
+        "Description[sr@latin]": "Dobavljač EPOD‑a",
+        "Description[sr]": "Добављач ЕПОД‑а",
+        "Description[sv]": "Tillhandahåll från Epod",
+        "Description[tr]": "Epod Sağlayıcı",
+        "Description[uk]": "Постачальник даних Epod",
+        "Description[x-test]": "xxEpod Providerxx",
+        "Description[zh_CN]": "Epod 提供方",
+        "Description[zh_TW]": "Epod 提供者",
+        "Icon": "",
+        "Name": "Earth Science Picture of the Day",
+        "Name[ar]": "صورة علم الأرض اليومية",
+        "Name[bs]": "Geonaučna slika dana",
+        "Name[ca@valencia]": "Imatge de ciències terràqüies del dia",
+        "Name[ca]": "Imatge de ciències terràqüies del dia",
+        "Name[cs]": "Obrázek dne z Earth Science",
+        "Name[da]": "Dagens geovidenskabsbillede",
+        "Name[de]": "Bild des Tages der Geowissenschaften",
+        "Name[el]": "Earth Science φωτογραφία της ημέρας",
+        "Name[en_GB]": "Earth Science Picture of the Day",
+        "Name[es]": "Imagen de ciencias de la Tierra del día",
+        "Name[et]": "Maateaduse päevapilt",
+        "Name[eu]": "Lurreko zientziaren eguneko irudia",
+        "Name[fi]": "Päivän geotiedekuva",
+        "Name[fr]": "Image du jour des sciences de la terre",
+        "Name[ga]": "Grianghraf Domhaneolaíochta an Lae",
+        "Name[gl]": "Imaxe do día sobre as ciencias da terra",
+        "Name[he]": "תמונת היום של Earth Science",
+        "Name[hr]": "Slika dana na Earth Science",
+        "Name[hu]": "A nap képe az Earth Science-en",
+        "Name[it]": "Earth Science Picture of the Day",
+        "Name[ja]": "今日の地学写真",
+        "Name[kk]": "Жер ғылым \"Тәулік суреті\" (Epod)",
+        "Name[km]": "រូប​ភាព​ប្រចាំ​ថ្ងៃ Earth Science",
+        "Name[ko]": "오늘의 지구과학 사진",
+        "Name[lt]": "Mokslinis dienos paveikslėlis",
+        "Name[lv]": "Zemes zinātņu dienas attēls",
+        "Name[mr]": "पृथ्वी शास्त्र दिवसाचे चित्र",
+        "Name[nb]": "Dagens geovitenskapelige bilde",
+        "Name[nds]": "Eerdwetenschappen-Bild för Vundaag",
+        "Name[nl]": "Geologische afbeelding van de dag",
+        "Name[nn]": "Dagens geovitskap-bilete",
+        "Name[pa]": "ਅੱਜ ਦੀ ਧਰਤੀ ਵਿਗਿਆਨ ਤਸਵੀਰ",
+        "Name[pl]": "Naukowy obraz dnia",
+        "Name[pt]": "Imagem do Dia nas Ciências Terrestres",
+        "Name[pt_BR]": "Imagem do dia da Ciência na Terra",
+        "Name[ro]": "Imaginea zilei din științele naturii",
+        "Name[ru]": "Природоведение: Изображение Дня",
+        "Name[sk]": "Obrázok dňa z Vedy o zemi",
+        "Name[sl]": "Slika dneva z Earth Science",
+        "Name[sr@ijekavian]": "геонаучна слика дана",
+        "Name[sr@ijekavianlatin]": "geonaučna slika dana",
+        "Name[sr@latin]": "geonaučna slika dana",
+        "Name[sr]": "геонаучна слика дана",
+        "Name[sv]": "Dagens geovetenskapliga bild",
+        "Name[th]": "ภาพวิทยาศาสตร์ของโลกประจำวัน",
+        "Name[tr]": "Günün Dünya Bilimi Fotoğrafı",
+        "Name[uk]": "Зображення дня Earth Science",
+        "Name[x-test]": "xxEarth Science Picture of the Dayxx",
+        "Name[zh_CN]": "每日一图(地球科学)",
+        "Name[zh_TW]": "本日地球科學圖片",
+        "ServiceTypes": [
+            "PlasmaPoTD/Plugin"
+        ]
+    },
+    "X-KDE-PlasmaPoTDProvider-Identifier": "epod"
+}
diff --git a/dataengines/potd/flickrprovider.desktop b/dataengines/potd/flickrprovider.desktop
deleted file mode 100644
index 7c33d4767..000000000
--- a/dataengines/potd/flickrprovider.desktop
+++ /dev/null
@@ -1,109 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=PlasmaPoTD/Plugin
-X-KDE-Library=plasma_potd_flickrprovider
-X-KDE-PlasmaPoTDProvider-Identifier=flickr
-Icon=
-
-Name=Flickr Picture of the Day
-Name[ar]=صورة فليكر اليومية
-Name[bs]=Flickr slika dana
-Name[ca]=Imatge Flickr del dia
-Name[ca@valencia]=Imatge Flickr del dia
-Name[cs]=Obrázek dne z Flickru
-Name[da]=Dagens Flickr-billede
-Name[de]=Bild des Tages von Flickr
-Name[el]=Flickr φωτογραφία της ημέρας
-Name[en_GB]=Flickr Picture of the Day
-Name[es]=Imagen de Flickr del día
-Name[et]=Flickri päevapilt
-Name[eu]=Flickr eguneko irudia
-Name[fi]=Päivän Flickr-kuva
-Name[fr]=Image du jour « Flickr »
-Name[ga]=Grianghraf an Lae ó Flickr
-Name[gl]=Imaxe do día de Flickr
-Name[he]=תמונת היום של Flickr
-Name[hr]=Slika dana na Flickru
-Name[hu]=A nap képe a Flickr-ön
-Name[it]=Immagine del giorno di Flickr
-Name[ja]=Flickr 今日の写真
-Name[kk]=Flickr "Тәулік суреті" (Apod)
-Name[km]=រូប​ភាព​ប្រចាំថ្ងៃ Flickr 
-Name[ko]=오늘의 Flickr 그림
-Name[lt]=Flickr dienos paveikslėlis
-Name[lv]=Flickr dienas attēls
-Name[mr]=फ्लिकर दिवसाचे चित्र
-Name[nb]=Dagens Flickr-bilde
-Name[nds]=Flickr-Bild för Vundaag
-Name[nl]=Flickr-afbeelding van de dag
-Name[nn]=Dagens bilete frå Flickr
-Name[pa]=ਫਲਿੱਕਰ ਅੱਜ ਦੀ ਤਸਵੀਰ
-Name[pl]=Obraz dnia Flickr
-Name[pt]=Imagem do Dia no Flickr
-Name[pt_BR]=Imagem do dia do Flickr
-Name[ro]=Imaginea zilei de pe Flickr
-Name[ru]=Изображение дня Flickr
-Name[sk]=Obrázok dňa z Flickr
-Name[sl]=Flickr-jeva slika dneva
-Name[sr]=слика дана са Фликра
-Name[sr@ijekavian]=слика дана са Фликра
-Name[sr@ijekavianlatin]=slika dana sa Flickra
-Name[sr@latin]=slika dana sa Flickra
-Name[sv]=Dagens bild från Flickr
-Name[th]=ภาพประจำวันจาก Flickr
-Name[tr]=Günün Flickr Resmi
-Name[uk]=Зображення дня Flickr
-Name[x-test]=xxFlickr Picture of the Dayxx
-Name[zh_CN]=每日一图(Flickr)
-Name[zh_TW]=本日 Flickr 圖片
-Comment=Flickr Provider
-Comment[ar]=الموزد Flickr
-Comment[bs]=Dobavljac Flickr-a
-Comment[ca]=Proveïdor Flickr
-Comment[ca@valencia]=Proveïdor Flickr
-Comment[cs]=Poskytovatel Flickru
-Comment[da]=Flickr-udbyder.
-Comment[de]=Flickr-Anbieter
-Comment[el]=Πάροχος Flickr
-Comment[en_GB]=Flickr Provider
-Comment[es]=Proveedor de Flickr
-Comment[et]=Flickri pakkuja
-Comment[eu]=Flickr hornitzailea
-Comment[fi]=Flickr-tarjoaja
-Comment[fr]=Fournisseur « Flickr »
-Comment[ga]=Soláthraí Flickr
-Comment[gl]=Fornecedor de Flickr
-Comment[hr]=Pružatelj Flickra
-Comment[hu]=Flickr-szolgáltató
-Comment[is]=Flickr þjónusta
-Comment[it]=Fornitore Flickr
-Comment[ja]=Flickr のプロバイダ
-Comment[kk]=Flickr таратушысы
-Comment[km]=ក្រុមហ៊ុន​ផ្ដល់ Flickr
-Comment[ko]=Flickr 공급자
-Comment[lt]=Flickr tiekėjas
-Comment[lv]=Flickr piegādātājs
-Comment[mr]=फ्लिकर पुरवठाकर्ता
-Comment[nb]=Flickr-leverandør
-Comment[nds]=Flickr-Anbeder
-Comment[nl]=Flickr-provider
-Comment[nn]=Flickr-tilbydar
-Comment[pa]=ਫਲਿੱਕਰ ਦੇਣ ਵਾਲੇ
-Comment[pl]=Usługodawca Flickr
-Comment[pt]=Fornecedor do Flickr
-Comment[pt_BR]=Fornecedor Flickr
-Comment[ro]=Furnizor Flickr
-Comment[ru]=Источник данных Flickr
-Comment[sk]=Poskytovateľ Flickr
-Comment[sl]=Ponudnik Flickr
-Comment[sr]=Добављач Фликра
-Comment[sr@ijekavian]=Добављач Фликра
-Comment[sr@ijekavianlatin]=Dobavljač Flickra
-Comment[sr@latin]=Dobavljač Flickra
-Comment[sv]=Tillhandahåll från Flickr
-Comment[tr]=Flickr Sağlayıcı
-Comment[uk]=Постачальник даних Flickr
-Comment[wa]=Ahesseu d' Flickr
-Comment[x-test]=xxFlickr Providerxx
-Comment[zh_CN]=Flickr 提供方
-Comment[zh_TW]=Flickr 提供者
diff --git a/dataengines/potd/flickrprovider.json b/dataengines/potd/flickrprovider.json
new file mode 100644
index 000000000..e4fd2d614
--- /dev/null
+++ b/dataengines/potd/flickrprovider.json
@@ -0,0 +1,111 @@
+{
+    "KPlugin": {
+        "Description": "Flickr Provider",
+        "Description[ar]": "الموزد Flickr",
+        "Description[bs]": "Dobavljac Flickr-a",
+        "Description[ca@valencia]": "Proveïdor Flickr",
+        "Description[ca]": "Proveïdor Flickr",
+        "Description[cs]": "Poskytovatel Flickru",
+        "Description[da]": "Flickr-udbyder.",
+        "Description[de]": "Flickr-Anbieter",
+        "Description[el]": "Πάροχος Flickr",
+        "Description[en_GB]": "Flickr Provider",
+        "Description[es]": "Proveedor de Flickr",
+        "Description[et]": "Flickri pakkuja",
+        "Description[eu]": "Flickr hornitzailea",
+        "Description[fi]": "Flickr-tarjoaja",
+        "Description[fr]": "Fournisseur « Flickr »",
+        "Description[ga]": "Soláthraí Flickr",
+        "Description[gl]": "Fornecedor de Flickr",
+        "Description[hr]": "Pružatelj Flickra",
+        "Description[hu]": "Flickr-szolgáltató",
+        "Description[is]": "Flickr þjónusta",
+        "Description[it]": "Fornitore Flickr",
+        "Description[ja]": "Flickr のプロバイダ",
+        "Description[kk]": "Flickr таратушысы",
+        "Description[km]": "ក្រុមហ៊ុន​ផ្ដល់ Flickr",
+        "Description[ko]": "Flickr 공급자",
+        "Description[lt]": "Flickr tiekėjas",
+        "Description[lv]": "Flickr piegādātājs",
+        "Description[mr]": "फ्लिकर पुरवठाकर्ता",
+        "Description[nb]": "Flickr-leverandør",
+        "Description[nds]": "Flickr-Anbeder",
+        "Description[nl]": "Flickr-provider",
+        "Description[nn]": "Flickr-tilbydar",
+        "Description[pa]": "ਫਲਿੱਕਰ ਦੇਣ ਵਾਲੇ",
+        "Description[pl]": "Usługodawca Flickr",
+        "Description[pt]": "Fornecedor do Flickr",
+        "Description[pt_BR]": "Fornecedor Flickr",
+        "Description[ro]": "Furnizor Flickr",
+        "Description[ru]": "Источник данных Flickr",
+        "Description[sk]": "Poskytovateľ Flickr",
+        "Description[sl]": "Ponudnik Flickr",
+        "Description[sr@ijekavian]": "Добављач Фликра",
+        "Description[sr@ijekavianlatin]": "Dobavljač Flickra",
+        "Description[sr@latin]": "Dobavljač Flickra",
+        "Description[sr]": "Добављач Фликра",
+        "Description[sv]": "Tillhandahåll från Flickr",
+        "Description[tr]": "Flickr Sağlayıcı",
+        "Description[uk]": "Постачальник даних Flickr",
+        "Description[wa]": "Ahesseu d' Flickr",
+        "Description[x-test]": "xxFlickr Providerxx",
+        "Description[zh_CN]": "Flickr 提供方",
+        "Description[zh_TW]": "Flickr 提供者",
+        "Icon": "",
+        "Name": "Flickr Picture of the Day",
+        "Name[ar]": "صورة فليكر اليومية",
+        "Name[bs]": "Flickr slika dana",
+        "Name[ca@valencia]": "Imatge Flickr del dia",
+        "Name[ca]": "Imatge Flickr del dia",
+        "Name[cs]": "Obrázek dne z Flickru",
+        "Name[da]": "Dagens Flickr-billede",
+        "Name[de]": "Bild des Tages von Flickr",
+        "Name[el]": "Flickr φωτογραφία της ημέρας",
+        "Name[en_GB]": "Flickr Picture of the Day",
+        "Name[es]": "Imagen de Flickr del día",
+        "Name[et]": "Flickri päevapilt",
+        "Name[eu]": "Flickr eguneko irudia",
+        "Name[fi]": "Päivän Flickr-kuva",
+        "Name[fr]": "Image du jour « Flickr »",
+        "Name[ga]": "Grianghraf an Lae ó Flickr",
+        "Name[gl]": "Imaxe do día de Flickr",
+        "Name[he]": "תמונת היום של Flickr",
+        "Name[hr]": "Slika dana na Flickru",
+        "Name[hu]": "A nap képe a Flickr-ön",
+        "Name[it]": "Immagine del giorno di Flickr",
+        "Name[ja]": "Flickr 今日の写真",
+        "Name[kk]": "Flickr \"Тәулік суреті\" (Apod)",
+        "Name[km]": "រូប​ភាព​ប្រចាំថ្ងៃ Flickr",
+        "Name[ko]": "오늘의 Flickr 그림",
+        "Name[lt]": "Flickr dienos paveikslėlis",
+        "Name[lv]": "Flickr dienas attēls",
+        "Name[mr]": "फ्लिकर दिवसाचे चित्र",
+        "Name[nb]": "Dagens Flickr-bilde",
+        "Name[nds]": "Flickr-Bild för Vundaag",
+        "Name[nl]": "Flickr-afbeelding van de dag",
+        "Name[nn]": "Dagens bilete frå Flickr",
+        "Name[pa]": "ਫਲਿੱਕਰ ਅੱਜ ਦੀ ਤਸਵੀਰ",
+        "Name[pl]": "Obraz dnia Flickr",
+        "Name[pt]": "Imagem do Dia no Flickr",
+        "Name[pt_BR]": "Imagem do dia do Flickr",
+        "Name[ro]": "Imaginea zilei de pe Flickr",
+        "Name[ru]": "Изображение дня Flickr",
+        "Name[sk]": "Obrázok dňa z Flickr",
+        "Name[sl]": "Flickr-jeva slika dneva",
+        "Name[sr@ijekavian]": "слика дана са Фликра",
+        "Name[sr@ijekavianlatin]": "slika dana sa Flickra",
+        "Name[sr@latin]": "slika dana sa Flickra",
+        "Name[sr]": "слика дана са Фликра",
+        "Name[sv]": "Dagens bild från Flickr",
+        "Name[th]": "ภาพประจำวันจาก Flickr",
+        "Name[tr]": "Günün Flickr Resmi",
+        "Name[uk]": "Зображення дня Flickr",
+        "Name[x-test]": "xxFlickr Picture of the Dayxx",
+        "Name[zh_CN]": "每日一图(Flickr)",
+        "Name[zh_TW]": "本日 Flickr 圖片",
+        "ServiceTypes": [
+            "PlasmaPoTD/Plugin"
+        ]
+    },
+    "X-KDE-PlasmaPoTDProvider-Identifier": "flickr"
+}
diff --git a/dataengines/potd/natgeoprovider.desktop b/dataengines/potd/natgeoprovider.desktop
deleted file mode 100644
index c15fd1992..000000000
--- a/dataengines/potd/natgeoprovider.desktop
+++ /dev/null
@@ -1,50 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=PlasmaPoTD/Plugin
-X-KDE-Library=plasma_potd_natgeoprovider
-X-KDE-PlasmaPoTDProvider-Identifier=natgeo
-Icon=
-
-Name=National Geographic
-Name[ar]=ناشونال جيوجرافيك
-Name[bs]=National Geographic
-Name[ca]=National Geographic
-Name[ca@valencia]=National Geographic
-Name[cs]=National Geographic
-Name[da]=National Geographic
-Name[de]=National Geographic
-Name[el]=National Geographic
-Name[en_GB]=National Geographic
-Name[es]=National Geographic
-Name[et]=National Geographic
-Name[eu]=National Geographic
-Name[fi]=National Geographic
-Name[fr]=National Geographic
-Name[gl]=National Geographic
-Name[hu]=National Geographic
-Name[it]=National Geographic
-Name[kk]=National Geographic
-Name[ko]=내셔널 지오그래픽
-Name[lt]=Nacionalinė geografija
-Name[mr]=नेशनल जिओग्राफिक
-Name[nb]=National Geographic
-Name[nds]=National Geographic
-Name[nl]=National Geographic
-Name[nn]=National Geographic
-Name[pl]=National Geographic
-Name[pt]=National Geographic
-Name[pt_BR]=National Geographic
-Name[ro]=National Geographic
-Name[ru]=National Geographic
-Name[sk]=National Geographic
-Name[sl]=National Geographic
-Name[sr]=Нешонал џиографик
-Name[sr@ijekavian]=Нешонал џиографик
-Name[sr@ijekavianlatin]=National Geographic
-Name[sr@latin]=National Geographic
-Name[sv]=National Geographic
-Name[tr]=National Geographic
-Name[uk]=National Geographic
-Name[x-test]=xxNational Geographicxx
-Name[zh_CN]=国家地理
-Name[zh_TW]=國家地理頻道
diff --git a/dataengines/potd/natgeoprovider.json b/dataengines/potd/natgeoprovider.json
new file mode 100644
index 000000000..f59fe43be
--- /dev/null
+++ b/dataengines/potd/natgeoprovider.json
@@ -0,0 +1,52 @@
+{
+    "KPlugin": {
+        "Icon": "",
+        "Name": "National Geographic",
+        "Name[ar]": "ناشونال جيوجرافيك",
+        "Name[bs]": "National Geographic",
+        "Name[ca@valencia]": "National Geographic",
+        "Name[ca]": "National Geographic",
+        "Name[cs]": "National Geographic",
+        "Name[da]": "National Geographic",
+        "Name[de]": "National Geographic",
+        "Name[el]": "National Geographic",
+        "Name[en_GB]": "National Geographic",
+        "Name[es]": "National Geographic",
+        "Name[et]": "National Geographic",
+        "Name[eu]": "National Geographic",
+        "Name[fi]": "National Geographic",
+        "Name[fr]": "National Geographic",
+        "Name[gl]": "National Geographic",
+        "Name[hu]": "National Geographic",
+        "Name[it]": "National Geographic",
+        "Name[kk]": "National Geographic",
+        "Name[ko]": "내셔널 지오그래픽",
+        "Name[lt]": "Nacionalinė geografija",
+        "Name[mr]": "नेशनल जिओग्राफिक",
+        "Name[nb]": "National Geographic",
+        "Name[nds]": "National Geographic",
+        "Name[nl]": "National Geographic",
+        "Name[nn]": "National Geographic",
+        "Name[pl]": "National Geographic",
+        "Name[pt]": "National Geographic",
+        "Name[pt_BR]": "National Geographic",
+        "Name[ro]": "National Geographic",
+        "Name[ru]": "National Geographic",
+        "Name[sk]": "National Geographic",
+        "Name[sl]": "National Geographic",
+        "Name[sr@ijekavian]": "Нешонал џиографик",
+        "Name[sr@ijekavianlatin]": "National Geographic",
+        "Name[sr@latin]": "National Geographic",
+        "Name[sr]": "Нешонал џиографик",
+        "Name[sv]": "National Geographic",
+        "Name[tr]": "National Geographic",
+        "Name[uk]": "National Geographic",
+        "Name[x-test]": "xxNational Geographicxx",
+        "Name[zh_CN]": "国家地理",
+        "Name[zh_TW]": "國家地理頻道",
+        "ServiceTypes": [
+            "PlasmaPoTD/Plugin"
+        ]
+    },
+    "X-KDE-PlasmaPoTDProvider-Identifier": "natgeo"
+}
diff --git a/dataengines/potd/noaaprovider.desktop b/dataengines/potd/noaaprovider.desktop
deleted file mode 100644
index 6b19326b9..000000000
--- a/dataengines/potd/noaaprovider.desktop
+++ /dev/null
@@ -1,74 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=PlasmaPoTD/Plugin
-X-KDE-Library=plasma_potd_noaaprovider
-X-KDE-PlasmaPoTDProvider-Identifier=noaa
-Icon=
-
-Name=NOAA Environmental Visualization Laboratory Picture of the Day
-Name[ca]=Imatge del dia del NOAA Environmental Visualization Laboratory
-Name[ca@valencia]=Imatge del dia del NOAA Environmental Visualization Laboratory
-Name[da]=Dagens billede fra NOAA Environmental Visualization Laboratory
-Name[de]=Bild des Tages des Labors für Umweltvisualisierung der Nationalen Ozean- und Atmosphärenbehörde (NOAA)
-Name[el]=NOAA Environmental Visualization Laboratory Φωτογραφία της ημέρας
-Name[en_GB]=NOAA Environmental Visualisation Laboratory Picture of the Day
-Name[es]=Imagen del día del Laboratorio de Visualización Ambiental del NOAA
-Name[eu]=NOAA Ingurugiro Bistaratze Laborategiaren eguneko irudia
-Name[fi]=NOAA Environmental Visualization Laboratoryn päivän kuva
-Name[fr]=Image du jour du laboratoire de visualisation environnementale NOAA
-Name[gl]=Imaxe do día do Laboratorio de Visualización Ambiental NOAA
-Name[hu]=A nap képe a NOAA Environmental Visualization Laboratory-tól
-Name[it]=Immagine del giorno del laboratorio di visualizzazione ambientale NOAA
-Name[ko]=NOAA 환경 시각화 연구소 오늘의 그림
-Name[nl]=NOAA afbeelding-van-de-dag van het Laboratorium voor visualisatie van het milieu
-Name[nn]=Dagens bilete frå NOAA Environmental Visualization Laboratory
-Name[pl]=NOAA Environmental Visualization Laboratory Picture of the Day
-Name[pt]=Imagem do Dia do Laboratório de Visualização Ambiental do NOAA
-Name[pt_BR]=NOAA Environmental Visualization Laboratory Picture of the Day
-Name[ru]=Изображение дня NOAA
-Name[sk]=Obrázok dňa NOAA, environmentálneho vizualizačného laboratória
-Name[sl]=Slika dneva s strani NOAA Environmental Visualization Laboratory
-Name[sr]=Слика дана из НОАА‑ове лабораторије за визуелизацију природне средине
-Name[sr@ijekavian]=Слика дана из НОАА‑ове лабораторије за визуелизацију природне средине
-Name[sr@ijekavianlatin]=Slika dana iz NOAA‑ove laboratorije za vizuelizaciju prirodne sredine
-Name[sr@latin]=Slika dana iz NOAA‑ove laboratorije za vizuelizaciju prirodne sredine
-Name[sv]=Dagens bild från NOAA:s miljövisualiseringslaboratorium
-Name[tr]=NOAA Doğa Görselleme Laboratuvarı Günün Resmi
-Name[uk]=Зображення дня від Лабораторії візуалізації середовища NOAA
-Name[x-test]=xxNOAA Environmental Visualization Laboratory Picture of the Dayxx
-Name[zh_CN]=NOAA 环境可视化实验室每日一图
-Name[zh_TW]=美國國家海洋暨大氣總署環境視覺化實驗室每日圖片
-Comment=NOAA Provider
-Comment[ca]=Proveïdor NOAA
-Comment[ca@valencia]=Proveïdor NOAA
-Comment[cs]=Přidat NOAA
-Comment[da]=NOAA-udbyder
-Comment[de]=NOAA-Anbieter
-Comment[el]=Πάροχος NOAA 
-Comment[en_GB]=NOAA Provider
-Comment[es]=Proveedor del NOAA
-Comment[eu]=NOAA hornitzailea
-Comment[fi]=NOAA-tarjoaja
-Comment[fr]=Fournisseur « NOAA »
-Comment[gl]=Fornecedor de NOAA
-Comment[hu]=NOAA szolgáltató
-Comment[it]=Fornitore NOAA
-Comment[ko]=NOAA 공급자
-Comment[nl]=NOAA-provider
-Comment[nn]=NOAA-tilbydar
-Comment[pl]=Usługodawca NOAA
-Comment[pt]=Fornecedor do NOAA
-Comment[pt_BR]=Fornecedor NOAA
-Comment[ru]=Национальное управление океанических и атмосферных исследований США
-Comment[sk]=Poskytovateľ NOAA
-Comment[sl]=Ponudnik NOAA
-Comment[sr]=Добављач НОАА‑а
-Comment[sr@ijekavian]=Добављач НОАА‑а
-Comment[sr@ijekavianlatin]=Dobavljač NOAA‑a
-Comment[sr@latin]=Dobavljač NOAA‑a
-Comment[sv]=Tillhandahåll från NOAA
-Comment[tr]=NOAA Sağlayıcı
-Comment[uk]=Постачальник даних NOAA
-Comment[x-test]=xxNOAA Providerxx
-Comment[zh_CN]=NOAA 提供方
-Comment[zh_TW]=NOAA 提供者
diff --git a/dataengines/potd/noaaprovider.json b/dataengines/potd/noaaprovider.json
new file mode 100644
index 000000000..1b3dbca10
--- /dev/null
+++ b/dataengines/potd/noaaprovider.json
@@ -0,0 +1,76 @@
+{
+    "KPlugin": {
+        "Description": "NOAA Provider",
+        "Description[ca@valencia]": "Proveïdor NOAA",
+        "Description[ca]": "Proveïdor NOAA",
+        "Description[cs]": "Přidat NOAA",
+        "Description[da]": "NOAA-udbyder",
+        "Description[de]": "NOAA-Anbieter",
+        "Description[el]": "Πάροχος NOAA",
+        "Description[en_GB]": "NOAA Provider",
+        "Description[es]": "Proveedor del NOAA",
+        "Description[eu]": "NOAA hornitzailea",
+        "Description[fi]": "NOAA-tarjoaja",
+        "Description[fr]": "Fournisseur « NOAA »",
+        "Description[gl]": "Fornecedor de NOAA",
+        "Description[hu]": "NOAA szolgáltató",
+        "Description[it]": "Fornitore NOAA",
+        "Description[ko]": "NOAA 공급자",
+        "Description[nl]": "NOAA-provider",
+        "Description[nn]": "NOAA-tilbydar",
+        "Description[pl]": "Usługodawca NOAA",
+        "Description[pt]": "Fornecedor do NOAA",
+        "Description[pt_BR]": "Fornecedor NOAA",
+        "Description[ru]": "Национальное управление океанических и атмосферных исследований США",
+        "Description[sk]": "Poskytovateľ NOAA",
+        "Description[sl]": "Ponudnik NOAA",
+        "Description[sr@ijekavian]": "Добављач НОАА‑а",
+        "Description[sr@ijekavianlatin]": "Dobavljač NOAA‑a",
+        "Description[sr@latin]": "Dobavljač NOAA‑a",
+        "Description[sr]": "Добављач НОАА‑а",
+        "Description[sv]": "Tillhandahåll från NOAA",
+        "Description[tr]": "NOAA Sağlayıcı",
+        "Description[uk]": "Постачальник даних NOAA",
+        "Description[x-test]": "xxNOAA Providerxx",
+        "Description[zh_CN]": "NOAA 提供方",
+        "Description[zh_TW]": "NOAA 提供者",
+        "Icon": "",
+        "Name": "NOAA Environmental Visualization Laboratory Picture of the Day",
+        "Name[ca@valencia]": "Imatge del dia del NOAA Environmental Visualization Laboratory",
+        "Name[ca]": "Imatge del dia del NOAA Environmental Visualization Laboratory",
+        "Name[da]": "Dagens billede fra NOAA Environmental Visualization Laboratory",
+        "Name[de]": "Bild des Tages des Labors für Umweltvisualisierung der Nationalen Ozean- und Atmosphärenbehörde (NOAA)",
+        "Name[el]": "NOAA Environmental Visualization Laboratory Φωτογραφία της ημέρας",
+        "Name[en_GB]": "NOAA Environmental Visualisation Laboratory Picture of the Day",
+        "Name[es]": "Imagen del día del Laboratorio de Visualización Ambiental del NOAA",
+        "Name[eu]": "NOAA Ingurugiro Bistaratze Laborategiaren eguneko irudia",
+        "Name[fi]": "NOAA Environmental Visualization Laboratoryn päivän kuva",
+        "Name[fr]": "Image du jour du laboratoire de visualisation environnementale NOAA",
+        "Name[gl]": "Imaxe do día do Laboratorio de Visualización Ambiental NOAA",
+        "Name[hu]": "A nap képe a NOAA Environmental Visualization Laboratory-tól",
+        "Name[it]": "Immagine del giorno del laboratorio di visualizzazione ambientale NOAA",
+        "Name[ko]": "NOAA 환경 시각화 연구소 오늘의 그림",
+        "Name[nl]": "NOAA afbeelding-van-de-dag van het Laboratorium voor visualisatie van het milieu",
+        "Name[nn]": "Dagens bilete frå NOAA Environmental Visualization Laboratory",
+        "Name[pl]": "NOAA Environmental Visualization Laboratory Picture of the Day",
+        "Name[pt]": "Imagem do Dia do Laboratório de Visualização Ambiental do NOAA",
+        "Name[pt_BR]": "NOAA Environmental Visualization Laboratory Picture of the Day",
+        "Name[ru]": "Изображение дня NOAA",
+        "Name[sk]": "Obrázok dňa NOAA, environmentálneho vizualizačného laboratória",
+        "Name[sl]": "Slika dneva s strani NOAA Environmental Visualization Laboratory",
+        "Name[sr@ijekavian]": "Слика дана из НОАА‑ове лабораторије за визуелизацију природне средине",
+        "Name[sr@ijekavianlatin]": "Slika dana iz NOAA‑ove laboratorije za vizuelizaciju prirodne sredine",
+        "Name[sr@latin]": "Slika dana iz NOAA‑ove laboratorije za vizuelizaciju prirodne sredine",
+        "Name[sr]": "Слика дана из НОАА‑ове лабораторије за визуелизацију природне средине",
+        "Name[sv]": "Dagens bild från NOAA:s miljövisualiseringslaboratorium",
+        "Name[tr]": "NOAA Doğa Görselleme Laboratuvarı Günün Resmi",
+        "Name[uk]": "Зображення дня від Лабораторії візуалізації середовища NOAA",
+        "Name[x-test]": "xxNOAA Environmental Visualization Laboratory Picture of the Dayxx",
+        "Name[zh_CN]": "NOAA 环境可视化实验室每日一图",
+        "Name[zh_TW]": "美國國家海洋暨大氣總署環境視覺化實驗室每日圖片",
+        "ServiceTypes": [
+            "PlasmaPoTD/Plugin"
+        ]
+    },
+    "X-KDE-PlasmaPoTDProvider-Identifier": "noaa"
+}
diff --git a/dataengines/potd/wcpotdprovider.desktop b/dataengines/potd/wcpotdprovider.desktop
deleted file mode 100644
index ce59c3a23..000000000
--- a/dataengines/potd/wcpotdprovider.desktop
+++ /dev/null
@@ -1,107 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=PlasmaPoTD/Plugin
-X-KDE-Library=plasma_potd_wcpotdprovider
-X-KDE-PlasmaPoTDProvider-Identifier=wcpotd
-Icon=
-
-Name=Wikimedia Picture of the Day
-Name[ar]=صورة ويكيميديا اليومية
-Name[bs]=Wikimedijina slika dana
-Name[ca]=Imatge Wikimedia del dia
-Name[ca@valencia]=Imatge Wikimedia del dia
-Name[cs]=Obrázek dne z Wikimedie
-Name[da]=Dagens Wikimedia-billede
-Name[de]=Bild des Tages von Wikimedia
-Name[el]=Wikimedia φωτογραφία της ημέρας
-Name[en_GB]=Wikimedia Picture of the Day
-Name[es]=Imagen de Wikimedia del día
-Name[et]=Wikimedia päevapilt
-Name[eu]=Wikimediaren eguneko irudia
-Name[fi]=Päivän Wikimedia-kuva
-Name[fr]=Image du jour de Wikimedia
-Name[ga]=Grianghraf Wikimedia an Lae
-Name[gl]=Imaxe do día de Wikipedia
-Name[hr]=Slika dana na Wikimediji
-Name[hu]=A nap képe a Wikimedián
-Name[it]=Immagine del giorno di Wikimedia
-Name[ja]=Wikimedia 今日の写真
-Name[kk]=Уикипедия "Тәулік суреті" (Wcpotd)
-Name[km]=រូប​ភាព​​ប្រចាំ​ថ្ងៃ Wikimedia 
-Name[ko]=오늘의 위키미디어 그림
-Name[lt]=Vikipedijos dienos paveikslėlis
-Name[lv]=Wikimedia dienas attēls
-Name[mr]=विकिमेडिया दिवसाचे चित्र
-Name[nb]=Dagens Wikimedia-bilde
-Name[nds]=Wikimedia-Bild för Vundaag
-Name[nl]=Wikimedia afbeelding van de dag
-Name[nn]=Dagens bilete frå Wikimedia
-Name[pa]=ਵਿਕਿਮੀਡਿਆ ਅੱਜ ਦੀ ਤਸਵੀਰ
-Name[pl]=Obraz dnia Wikimedia
-Name[pt]=Imagem do Dia no Wikimedia
-Name[pt_BR]=Imagem do dia da Wikimedia
-Name[ro]=Imaginea zilei de pe Wikimedia
-Name[ru]=Изображение дня Wikimedia
-Name[sk]=Obrázok dňa z Wikimedie
-Name[sl]=Wikimedijina slika dneva
-Name[sr]=Викимедијина слика дана
-Name[sr@ijekavian]=Викимедијина слика дана
-Name[sr@ijekavianlatin]=Wikimedijina slika dana
-Name[sr@latin]=Wikimedijina slika dana
-Name[sv]=Dagens bild från Wikimedia
-Name[tr]=Günün Wikimedia Resmi
-Name[uk]=Зображення дня Wikimedia
-Name[x-test]=xxWikimedia Picture of the Dayxx
-Name[zh_CN]=每日一图(维基百科)
-Name[zh_TW]=本日維基百科圖片
-Comment=Wcpotd Provider
-Comment[ar]=المزود Wcpotd
-Comment[bs]=Wcpotd dobavljač
-Comment[ca]=Proveïdor Wcpotd
-Comment[ca@valencia]=Proveïdor Wcpotd
-Comment[cs]=Poskytovatel Wcpotd
-Comment[da]=Wcpotd-udbyder.
-Comment[de]=Wcpotd-Anbieter
-Comment[el]=Πάροχος Wcpotd
-Comment[en_GB]=Wcpotd Provider
-Comment[es]=Proveedor de Wcpotd
-Comment[et]=Wcpotdi pakkuja
-Comment[eu]=Wcpotd hornitzailea
-Comment[fi]=Wcpotd-tarjoaja
-Comment[fr]=Fournisseur « WCPOTD »
-Comment[ga]=Soláthraí Wcpotd
-Comment[gl]=Fornecedor de Wcpotd
-Comment[hr]=Pružatelj Wcpotda
-Comment[hu]=Wcpotd-szolgáltató
-Comment[is]=Wcpotd þjónusta
-Comment[it]=Fornitore Wcpotd
-Comment[ja]=Wcpotd プロバイダ
-Comment[kk]=Wcpotd таратушысы
-Comment[km]=ក្រុមហ៊ុន​ផ្ដល់ Wcpotd
-Comment[ko]=오늘의 위키미디어 그림 공급자
-Comment[lt]=Wcpotd tiekėjas
-Comment[lv]=Wcpotd piegādātājs
-Comment[mr]=Wcpotd पुरवठाकर्ता
-Comment[nb]=Wcpotd-leverandør
-Comment[nds]=Wc-BifV-Anbeder
-Comment[nl]=Wcpotd-provider
-Comment[nn]=Wcpotd-tilbydar
-Comment[pa]=Wcpotd ਦੇਣ ਵਾਲੇ
-Comment[pl]=Usługodawca Wcpotd
-Comment[pt]=Fornecedor do Wcpotd
-Comment[pt_BR]=Fornecedor Wcpotd
-Comment[ro]=Furnizor Wcpotd
-Comment[ru]=Источник данных Wcpotd
-Comment[sk]=Poskytovateľ Wcpotd
-Comment[sl]=Ponudnik Wcpotd
-Comment[sr]=Добављач ВпПОД
-Comment[sr@ijekavian]=Добављач ВпПОД
-Comment[sr@ijekavianlatin]=Dobavljač WpPOD
-Comment[sr@latin]=Dobavljač WpPOD
-Comment[sv]=Tillhandahåll från Wcpotd
-Comment[tr]=Wcpotd Sağlayıcı
-Comment[uk]=Постачальник даних Wcpotd
-Comment[wa]=Ahesseu Wcpotd
-Comment[x-test]=xxWcpotd Providerxx
-Comment[zh_CN]=Wcpotd 提供方
-Comment[zh_TW]=Wcpotd 提供者
diff --git a/dataengines/potd/wcpotdprovider.json b/dataengines/potd/wcpotdprovider.json
new file mode 100644
index 000000000..f6a53c76e
--- /dev/null
+++ b/dataengines/potd/wcpotdprovider.json
@@ -0,0 +1,109 @@
+{
+    "KPlugin": {
+        "Description": "Wcpotd Provider",
+        "Description[ar]": "المزود Wcpotd",
+        "Description[bs]": "Wcpotd dobavljač",
+        "Description[ca@valencia]": "Proveïdor Wcpotd",
+        "Description[ca]": "Proveïdor Wcpotd",
+        "Description[cs]": "Poskytovatel Wcpotd",
+        "Description[da]": "Wcpotd-udbyder.",
+        "Description[de]": "Wcpotd-Anbieter",
+        "Description[el]": "Πάροχος Wcpotd",
+        "Description[en_GB]": "Wcpotd Provider",
+        "Description[es]": "Proveedor de Wcpotd",
+        "Description[et]": "Wcpotdi pakkuja",
+        "Description[eu]": "Wcpotd hornitzailea",
+        "Description[fi]": "Wcpotd-tarjoaja",
+        "Description[fr]": "Fournisseur « WCPOTD »",
+        "Description[ga]": "Soláthraí Wcpotd",
+        "Description[gl]": "Fornecedor de Wcpotd",
+        "Description[hr]": "Pružatelj Wcpotda",
+        "Description[hu]": "Wcpotd-szolgáltató",
+        "Description[is]": "Wcpotd þjónusta",
+        "Description[it]": "Fornitore Wcpotd",
+        "Description[ja]": "Wcpotd プロバイダ",
+        "Description[kk]": "Wcpotd таратушысы",
+        "Description[km]": "ក្រុមហ៊ុន​ផ្ដល់ Wcpotd",
+        "Description[ko]": "오늘의 위키미디어 그림 공급자",
+        "Description[lt]": "Wcpotd tiekėjas",
+        "Description[lv]": "Wcpotd piegādātājs",
+        "Description[mr]": "Wcpotd पुरवठाकर्ता",
+        "Description[nb]": "Wcpotd-leverandør",
+        "Description[nds]": "Wc-BifV-Anbeder",
+        "Description[nl]": "Wcpotd-provider",
+        "Description[nn]": "Wcpotd-tilbydar",
+        "Description[pa]": "Wcpotd ਦੇਣ ਵਾਲੇ",
+        "Description[pl]": "Usługodawca Wcpotd",
+        "Description[pt]": "Fornecedor do Wcpotd",
+        "Description[pt_BR]": "Fornecedor Wcpotd",
+        "Description[ro]": "Furnizor Wcpotd",
+        "Description[ru]": "Источник данных Wcpotd",
+        "Description[sk]": "Poskytovateľ Wcpotd",
+        "Description[sl]": "Ponudnik Wcpotd",
+        "Description[sr@ijekavian]": "Добављач ВпПОД",
+        "Description[sr@ijekavianlatin]": "Dobavljač WpPOD",
+        "Description[sr@latin]": "Dobavljač WpPOD",
+        "Description[sr]": "Добављач ВпПОД",
+        "Description[sv]": "Tillhandahåll från Wcpotd",
+        "Description[tr]": "Wcpotd Sağlayıcı",
+        "Description[uk]": "Постачальник даних Wcpotd",
+        "Description[wa]": "Ahesseu Wcpotd",
+        "Description[x-test]": "xxWcpotd Providerxx",
+        "Description[zh_CN]": "Wcpotd 提供方",
+        "Description[zh_TW]": "Wcpotd 提供者",
+        "Icon": "",
+        "Name": "Wikimedia Picture of the Day",
+        "Name[ar]": "صورة ويكيميديا اليومية",
+        "Name[bs]": "Wikimedijina slika dana",
+        "Name[ca@valencia]": "Imatge Wikimedia del dia",
+        "Name[ca]": "Imatge Wikimedia del dia",
+        "Name[cs]": "Obrázek dne z Wikimedie",
+        "Name[da]": "Dagens Wikimedia-billede",
+        "Name[de]": "Bild des Tages von Wikimedia",
+        "Name[el]": "Wikimedia φωτογραφία της ημέρας",
+        "Name[en_GB]": "Wikimedia Picture of the Day",
+        "Name[es]": "Imagen de Wikimedia del día",
+        "Name[et]": "Wikimedia päevapilt",
+        "Name[eu]": "Wikimediaren eguneko irudia",
+        "Name[fi]": "Päivän Wikimedia-kuva",
+        "Name[fr]": "Image du jour de Wikimedia",
+        "Name[ga]": "Grianghraf Wikimedia an Lae",
+        "Name[gl]": "Imaxe do día de Wikipedia",
+        "Name[hr]": "Slika dana na Wikimediji",
+        "Name[hu]": "A nap képe a Wikimedián",
+        "Name[it]": "Immagine del giorno di Wikimedia",
+        "Name[ja]": "Wikimedia 今日の写真",
+        "Name[kk]": "Уикипедия \"Тәулік суреті\" (Wcpotd)",
+        "Name[km]": "រូប​ភាព​​ប្រចាំ​ថ្ងៃ Wikimedia",
+        "Name[ko]": "오늘의 위키미디어 그림",
+        "Name[lt]": "Vikipedijos dienos paveikslėlis",
+        "Name[lv]": "Wikimedia dienas attēls",
+        "Name[mr]": "विकिमेडिया दिवसाचे चित्र",
+        "Name[nb]": "Dagens Wikimedia-bilde",
+        "Name[nds]": "Wikimedia-Bild för Vundaag",
+        "Name[nl]": "Wikimedia afbeelding van de dag",
+        "Name[nn]": "Dagens bilete frå Wikimedia",
+        "Name[pa]": "ਵਿਕਿਮੀਡਿਆ ਅੱਜ ਦੀ ਤਸਵੀਰ",
+        "Name[pl]": "Obraz dnia Wikimedia",
+        "Name[pt]": "Imagem do Dia no Wikimedia",
+        "Name[pt_BR]": "Imagem do dia da Wikimedia",
+        "Name[ro]": "Imaginea zilei de pe Wikimedia",
+        "Name[ru]": "Изображение дня Wikimedia",
+        "Name[sk]": "Obrázok dňa z Wikimedie",
+        "Name[sl]": "Wikimedijina slika dneva",
+        "Name[sr@ijekavian]": "Викимедијина слика дана",
+        "Name[sr@ijekavianlatin]": "Wikimedijina slika dana",
+        "Name[sr@latin]": "Wikimedijina slika dana",
+        "Name[sr]": "Викимедијина слика дана",
+        "Name[sv]": "Dagens bild från Wikimedia",
+        "Name[tr]": "Günün Wikimedia Resmi",
+        "Name[uk]": "Зображення дня Wikimedia",
+        "Name[x-test]": "xxWikimedia Picture of the Dayxx",
+        "Name[zh_CN]": "每日一图(维基百科)",
+        "Name[zh_TW]": "本日維基百科圖片",
+        "ServiceTypes": [
+            "PlasmaPoTD/Plugin"
+        ]
+    },
+    "X-KDE-PlasmaPoTDProvider-Identifier": "wcpotd"
+}