diff --git a/desktoppackage/contents/defaults b/desktoppackage/contents/defaults
--- a/desktoppackage/contents/defaults
+++ b/desktoppackage/contents/defaults
@@ -10,6 +10,6 @@
  
 [Panel]
 Containment=org.kde.panel
-ToolBox=org.kde.paneltoolbox
+ToolBox=
 [Panel][ContainmentActions]
 RightButton;NoModifier=org.kde.contextmenu
diff --git a/toolboxes/CMakeLists.txt b/toolboxes/CMakeLists.txt
--- a/toolboxes/CMakeLists.txt
+++ b/toolboxes/CMakeLists.txt
@@ -1,4 +1,3 @@
 
 plasma_install_package(desktoptoolbox org.kde.desktoptoolbox packages package)
-plasma_install_package(paneltoolbox org.kde.paneltoolbox packages package)
 
diff --git a/toolboxes/paneltoolbox/Messages.sh b/toolboxes/paneltoolbox/Messages.sh
deleted file mode 100644
--- a/toolboxes/paneltoolbox/Messages.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/env bash
-$XGETTEXT `find . -name \*.js -o -name \*.qml -o -name \*.cpp` -o $podir/plasma_toolbox_org.kde.paneltoolbox.pot
diff --git a/toolboxes/paneltoolbox/contents/ui/main.qml b/toolboxes/paneltoolbox/contents/ui/main.qml
deleted file mode 100644
--- a/toolboxes/paneltoolbox/contents/ui/main.qml
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *   Copyright 2011 Sebastian Kügler <sebas@kde.org>
- *   Copyright 2013 Marco Martin <mart@kde.org>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU Library General Public License as
- *   published by the Free Software Foundation; either version 2 or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU Library General Public License for more details
- *
- *   You should have received a copy of the GNU Library General Public
- *   License along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-import QtQuick 2.0
-import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
-import org.kde.plasma.plasmoid 2.0
-
-Item {
-    id: main
-
-    width: isVertical ? units.iconSizes.medium : units.iconSizes.smallMedium + units.smallSpacing * 2
-    height: isVertical ? units.iconSizes.smallMedium + units.smallSpacing * 2 : units.iconSizes.medium
-    property bool isVertical: plasmoid.formFactor === 3
-    opacity: plasmoid.immutable ? 0 : (mouseArea.containsMouse || plasmoid.userConfiguring ? 1 : 0.5)
-
-    z: 999
-
-    Behavior on opacity {
-        NumberAnimation {
-            duration: units.longDuration;
-            easing.type: Easing.InOutExpo;
-        }
-    }
-
-    LayoutMirroring.enabled: (Qt.application.layoutDirection === Qt.RightToLeft)
-    anchors {
-        left: undefined
-        top: undefined
-        right: isVertical || !parent ? undefined : parent.right
-        bottom: isVertical && parent ? parent.bottom : undefined
-        verticalCenter: isVertical || !parent ? undefined : parent.verticalCenter
-        horizontalCenter: isVertical && parent ? parent.horizontalCenter : undefined
-    }
-
-    PlasmaCore.SvgItem {
-        id: toolBoxIcon
-        svg: PlasmaCore.Svg {
-            id: iconSvg
-            imagePath: "widgets/configuration-icons"
-        }
-        elementId: "configure"
-
-        anchors.centerIn: mouseArea
-        width: units.iconSizes.small
-        height: width
-    }
-
-    Connections {
-        target: plasmoid
-        onUserConfiguringChanged: {
-            plasmoid.editMode = plasmoid.userConfiguring;
-            if (plasmoid.userConfiguring) {
-                toolTipArea.hideToolTip();
-            }
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        hoverEnabled: enabled
-        enabled: !plasmoid.immutable
-        onClicked: {
-            main.Plasmoid.action("configure").trigger()
-        }
-
-        PlasmaCore.ToolTipArea {
-            id: toolTipArea
-            anchors.fill: parent
-            mainText: i18nd("plasma_toolbox_org.kde.paneltoolbox", "Configure Panel...")
-            icon: "configure"
-            enabled: mouseArea.containsMouse
-        }
-    }
-}
diff --git a/toolboxes/paneltoolbox/metadata.desktop b/toolboxes/paneltoolbox/metadata.desktop
deleted file mode 100644
--- a/toolboxes/paneltoolbox/metadata.desktop
+++ /dev/null
@@ -1,119 +0,0 @@
-[Desktop Entry]
-Name=Panel Toolbox
-Name[ar]=صندوق أدوات اللوحة
-Name[bs]=Panel kutija sa alatom
-Name[ca]=Quadre d'eines del plafó
-Name[ca@valencia]=Quadre d'eines del plafó
-Name[cs]=Nástroje panelu
-Name[da]=Panelværktøjskasse
-Name[de]=Werkzeugkasten für die Kontrollleiste
-Name[el]=Εργαλεία πίνακα
-Name[en_GB]=Panel Toolbox
-Name[es]=Caja de herramientas del panel
-Name[et]=Paneeli tööriistakast
-Name[eu]=Paneleko tresna-kutxa
-Name[fi]=Paneelin työkalupakki
-Name[fr]=Boîte à outils de tableau de bord
-Name[gl]=Caixa de ferramentas de panel
-Name[he]=ארגז־הכלים של הלוח
-Name[hu]=Panel eszköztár
-Name[ia]=Instrumentario de pannello
-Name[id]=Kotak-Alat Panel
-Name[is]=Verkfærasafn fyrir spjöld
-Name[it]=Strumento per pannelli
-Name[ja]=パネルツールボックス
-Name[kk]=Панель құралдары
-Name[ko]=패널 도구 상자
-Name[lt]=Skydelio priemonių komplektas
-Name[mr]=पटल साधने
-Name[nb]=Panel-verktøykasse
-Name[nds]=Paneel-Warktüüchkist
-Name[nl]=Paneelhulpmiddelen
-Name[nn]=Panelverktøykasse
-Name[pa]=ਪੈਨਲ ਟੂਲਬਾਕਸ
-Name[pl]=Przybornik panelu
-Name[pt]=Barra do Painel
-Name[pt_BR]=Barra de ferramentas Painel
-Name[ru]=Инструменты панели
-Name[sk]=Nástroje panelu
-Name[sl]=Orodjarna za pult
-Name[sr]=Панелска алатница
-Name[sr@ijekavian]=Панелска алатница
-Name[sr@ijekavianlatin]=Panelska alatnica
-Name[sr@latin]=Panelska alatnica
-Name[sv]=Panelverktygslåda
-Name[tr]=Panel Araç Kutusu
-Name[uk]=Набір інструментів панелі
-Name[vi]=Hộp công cụ điều khiển
-Name[x-test]=xxPanel Toolboxxx
-Name[zh_CN]=面板工具箱
-Name[zh_TW]=面板工具盒
-Comment=Manage Plasma panel
-Comment[ar]=أدر لوحة بلازما
-Comment[bs]=Upravljaj Plasma panelom
-Comment[ca]=Gestió del plafó del Plasma
-Comment[ca@valencia]=Gestió del plafó del Plasma
-Comment[cs]=Spravovat panel Plasmy
-Comment[da]=Håndtér Plasma-panel
-Comment[de]=Plasma-Kontrollleiste verwalten
-Comment[el]=Διαχείριση πίνακα Plasma
-Comment[en_GB]=Manage Plasma panel
-Comment[es]=Gestión del panel de Plasma
-Comment[et]=Plasma paneeli haldamine
-Comment[eu]=Kudeatu Plasma panela
-Comment[fi]=Plasma-paneelin hallinta
-Comment[fr]=Gérer le tableau de bord Plasma
-Comment[gl]=Xestionar o panel de Plasma
-Comment[he]=נהל את הלוח של פלזמה
-Comment[hu]=Plasma panel kezelése
-Comment[ia]=Gere pannello de Plasma
-Comment[id]=Kelola panel Plasma
-Comment[is]=Sýsla með stillingar Plasma-spjalds
-Comment[it]=Gestisce il pannello di Plasma
-Comment[ja]=Plasma パネルを管理
-Comment[kk]=Plasma панелін басқару
-Comment[ko]=Plasma 패널 관리
-Comment[lt]=Tvarkyti Plasma skydelį
-Comment[mr]=प्लाज्मा पटल व्यवस्थापन
-Comment[nb]=Håndter Plasma-panel
-Comment[nds]=Plasmapaneel plegen
-Comment[nl]=Plasmapaneel beheren
-Comment[nn]=Handsam Plasma-panel
-Comment[pa]=ਪਲਾਜ਼ਮਾ ਪੈਨਲ ਪਰਬੰਧ
-Comment[pl]=Zarządzanie panelem Plazmy
-Comment[pt]=Gerir o painel do Plasma
-Comment[pt_BR]=Gerencia o painel do Plasma
-Comment[ro]=Gestionează panoul Plasma
-Comment[ru]=Настройка панели Plasma
-Comment[sk]=Spravovať panel Plasma
-Comment[sl]=Upravljanje pulta Plasme
-Comment[sr]=Управљајте плазма панелом
-Comment[sr@ijekavian]=Управљајте плазма панелом
-Comment[sr@ijekavianlatin]=Upravljajte plasma panelom
-Comment[sr@latin]=Upravljajte plasma panelom
-Comment[sv]=Hantera Plasma-panel
-Comment[tr]=Plasma panelini yönet
-Comment[uk]=Керування панеллю Плазми
-Comment[vi]=Quản lý thanh điều khiển Plasma
-Comment[x-test]=xxManage Plasma panelxx
-Comment[zh_CN]=管理 Plasma 面板 
-Comment[zh_TW]=管理 Plasma 面板
-
-Type=Service
-Icon=plasma
-X-KDE-ParentApp=
-X-KDE-ServiceTypes=Plasma/Generic
-
-X-KDE-PluginInfo-Author=Marco Martin
-X-KDE-PluginInfo-Email=mart@kde.org
-X-KDE-PluginInfo-Name=org.kde.paneltoolbox
-X-KDE-PluginInfo-Version=1.0
-X-KDE-PluginInfo-Website=https://www.kde.org/plasma-desktop
-X-KDE-PluginInfo-Category=Toolbox
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=LGPLv2+
-X-KDE-PluginInfo-EnabledByDefault=true
-X-KDE-PluginInfo-Version=0.1
-
-X-Plasma-MainScript=ui/main.qml
-
diff --git a/toolboxes/plasma-toolbox-paneltoolbox.desktop b/toolboxes/plasma-toolbox-paneltoolbox.desktop
deleted file mode 100644
--- a/toolboxes/plasma-toolbox-paneltoolbox.desktop
+++ /dev/null
@@ -1,123 +0,0 @@
-[Desktop Entry]
-Comment=Default panel toolbox for the Plasma desktop shell
-Comment[ar]=صندوق أدوات اللوحة الافتراضيّ لصدفة سطح مكتب بلازما
-Comment[bg]=Стандартен набор инструменти на панела за настолната обвивка Plasma
-Comment[bs]=Podrazumijevana alatnica panela za plazma školjku površi
-Comment[ca]=Quadre d'eines per defecte del plafó per a l'àrea de treball de l'escriptori Plasma
-Comment[ca@valencia]=Quadre d'eines per defecte del plafó per a l'àrea de treball de l'escriptori Plasma
-Comment[cs]=Výchozí nástroje panelu pro Plasma shell pracovní plochy
-Comment[da]=Standard panelværktøjskasse til Plasma-skrivebordets skal
-Comment[de]=Standard-Werkzeugkasten für die Plasma-Kontrollleiste
-Comment[el]=Η προκαθορισμένη εργαλειοθήκη πίνακα για το κέλυφος της επιφάνειας εργασίας Plasma
-Comment[en_GB]=Default panel toolbox for the Plasma desktop shell
-Comment[es]=Caja de herramientas de panel predeterminada de la shell del escritorio Plasma
-Comment[et]=Plasma töölauakooriku vaikimisi paneeli tööriistakast
-Comment[eu]=Plasma mahaigainaren shell-erako paneleko tresna-kutxa lehenetsia
-Comment[fi]=Plasma-työpöytäkuoren oletuspaneelin työkalupakki
-Comment[fr]=Boîte à outils du tableau de bord par défaut pour le shell du bureau Plasma
-Comment[gl]=A caixa de ferramentas de panel predeterminada da shell de escritorio Plasma
-Comment[he]=ארגז־כלי לוח ברירת המחדל עבור מעטפת שולחן העבודה של Plasma
-Comment[hr]=Zadana panelna alatna kutija za Plasma ljusku radne površine
-Comment[hu]=Alapértelmezett panel eszközkészlet a Plasma asztali héjhoz
-Comment[ia]=Instrumentario de pannello pro le shell de scriptorio de Plasma
-Comment[id]=Toolbar panel baku untuk shell desktop Plasma
-Comment[is]=Sjálfgefið verkfærasafn með Plasma skjáborðsskelinni
-Comment[it]=Strumento predefinito del pannello per la shell del desktop di Plasma
-Comment[ja]=Plasma デスクトップシェルの標準パネルツールボックス
-Comment[kk]=Plasma үстел ортасының әдетті панель құралдары
-Comment[km]=ប្រអប់​ឧបករណ៍​បន្ទះ​លំនាំដើម​សម្រាប់​សែល​ផ្ទៃតុ​ប្លា​ស្មា
-Comment[ko]=Plasma 데스크톱 쉘용 기본 패널 도구 상자
-Comment[lt]=Numatytasis skydelio priemonių komplektas, skirtas Plasma darbalaukio apvalkalui
-Comment[lv]=Noklusētā paneļa rīkkaste Plasma darbvirsmas čaulai
-Comment[mr]=प्लाज्मा डेस्कटॉप शेलसाठी मूलभूत पटल साधने
-Comment[nb]=Standard panel-verktøykasse for Plasma skrivebordsskallet
-Comment[nds]=Standard-Paneelwarktüüchkist för de Plasma-Schriefdischkonsool
-Comment[nl]=Standaard paneelhulpmiddelen voor de Plasma bureaublad-shell
-Comment[nn]=Standard verktøykasse for Plasma-skrivebordsskalet
-Comment[pa]=ਪਲਾਜ਼ਮਾ ਡੈਸਕਟਾਪ ਸ਼ੈੱਲ ਲਈ ਡਿਫਾਲਟ ਪੈਨਲ ਟੂਲਬਾਕਸ
-Comment[pl]=Domyślny przybornik panelu dla powłoki pulpitu plazmy
-Comment[pt]=A barra de ferramentas do painel da área de trabalho do Plasma
-Comment[pt_BR]=Barra de ferramentas padrão do painel para o shell do Plasma Desktop
-Comment[ro]=Trusa de unelte implicită a panoului pentru învelișul de birou Plasma
-Comment[ru]=Стандартные инструменты настройки панели для оболочки рабочего стола Plasma
-Comment[sk]=Štandardné nástroje panelu pre shell plochy Plasma
-Comment[sl]=Privzeti nabor orodij za pult Namizne lupine Plasma
-Comment[sr]=Подразумевана алатница панела за плазма шкољку површи
-Comment[sr@ijekavian]=Подразумевана алатница панела за плазма шкољку површи
-Comment[sr@ijekavianlatin]=Podrazumevana alatnica panela za plasma školjku površi
-Comment[sr@latin]=Podrazumevana alatnica panela za plasma školjku površi
-Comment[sv]=Standardpanelverktyg för Plasma skrivbordsskalet
-Comment[th]=เครื่องมือของพาเนลปริยายสำหรับเชลล์พื้นที่ทำงานพลาสมา
-Comment[tr]=Plasma masaüstü kabuğu için öntanımlı panel araç kutusu
-Comment[ug]=پلازما ئۈستەلئۈستى shell ئۈچۈن كۆڭۈلدىكى تاختا قورال ساندۇقى
-Comment[uk]=Типовий набір інструментів панелі для оболонки Плазми стаціонарних комп’ютерів
-Comment[vi]=Hộp công cụ điều khiển mặc định cho Plasma
-Comment[wa]=Usteye di scriftôr prémetowe pol shell do scribanne Plasma
-Comment[x-test]=xxDefault panel toolbox for the Plasma desktop shellxx
-Comment[zh_CN]=Plasma 桌面外壳的默认面板工具箱
-Comment[zh_TW]=預設的 Plasma 桌面 shell 的面板工具盒
-Icon=plasma
-Name=Panel toolbox
-Name[ar]=صندوق أدوات اللوحة
-Name[bs]=Alatnica panela
-Name[ca]=Quadre d'eines del plafó
-Name[ca@valencia]=Quadre d'eines del plafó
-Name[cs]=Nástroje panelu
-Name[da]=Panelværktøjskasse
-Name[de]=Werkzeugkasten für die Kontrollleiste
-Name[el]=Εργαλειοθήκη πίνακα
-Name[en_GB]=Panel toolbox
-Name[es]=Caja de herramientas del panel
-Name[et]=Paneeli tööriistakast
-Name[eu]=Paneleko tresna-kutxa
-Name[fi]=Paneelin työkalupakki
-Name[fr]=Boîte à outils de tableau de bord
-Name[gl]=Caixa de ferramentas de panel
-Name[he]=ארגז־הכלים של הלוח
-Name[hr]=Alatna kutija panela
-Name[hu]=Panel eszköztár
-Name[ia]=Instrumentario de pannello
-Name[id]=Kotak-alat panel
-Name[is]=Verkfærasafn fyrir spjöld
-Name[it]=Strumento per pannelli
-Name[ja]=パネルツールボックス
-Name[ko]=패널 도구 상자
-Name[lt]=Skydelio priemonių komplektas
-Name[mr]=पटल साधने
-Name[nb]=Panel verktøykasse
-Name[nds]=Paneel-Warktüüchkist
-Name[nl]=Paneelhulpmiddelen
-Name[nn]=Panelverktøykasse
-Name[pa]=ਪੈਨਲ ਟੂਲਬਾਕਸ
-Name[pl]=Przybornik panelu
-Name[pt]=Área de ferramentas do painel
-Name[pt_BR]=Barra de ferramentas Painel
-Name[ro]=Trusa de unelte a panoului
-Name[ru]=Инструменты панели
-Name[sk]=Nástroje panelu
-Name[sl]=Orodjarna za pult
-Name[sr]=Алатница панела
-Name[sr@ijekavian]=Алатница панела
-Name[sr@ijekavianlatin]=Alatnica panela
-Name[sr@latin]=Alatnica panela
-Name[sv]=Panelverktygslåda
-Name[tr]=Panel araç kutusu
-Name[uk]=Набір інструментів панелі
-Name[vi]=Hộp công cụ điều khiển
-Name[x-test]=xxPanel toolboxxx
-Name[zh_CN]=面板工具箱
-Name[zh_TW]=面板工具盒
-Type=Service
-
-X-KDE-ServiceTypes=Plasma/ToolBox
-X-KDE-Library=plasma_toolbox_paneltoolbox
-X-KDE-PluginInfo-Author=Marco Martin
-X-KDE-PluginInfo-Category=
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-Email=mart@kde.org
-X-KDE-PluginInfo-EnabledByDefault=true
-X-KDE-PluginInfo-License=LGPLv2+
-X-KDE-PluginInfo-Name=org.kde.paneltoolbox
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=https://www.kde.org/plasma-desktop
-