diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,8 +43,6 @@
     Declarative
     Activities
     ActivitiesStats
-    OPTIONAL_COMPONENTS
-    KHtml
     QUIET
 )
 
@@ -61,10 +59,6 @@
 add_subdirectory(sidebar)
 add_subdirectory(doc)
 
-if(KF5KHtml_FOUND)
-    add_subdirectory(classic)
-endif()
-
 if (${ECM_VERSION} STRGREATER "5.58.0")
     install(FILES systemsettings.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
 else()
diff --git a/classic/CMakeLists.txt b/classic/CMakeLists.txt
deleted file mode 100644
--- a/classic/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-set(classic_mode_srcs
-    ClassicMode.cpp
-    CategoryList.cpp
-)
-
-ecm_qt_declare_logging_category(classic_mode_srcs HEADER systemsettings_classic_debug.h IDENTIFIER SYSTEMSETTINGS_CLASSIC_LOG CATEGORY_NAME org.kde.systemsettings.classic)
-
-ki18n_wrap_ui( classic_mode_srcs configClassic.ui )
-add_library(classic_mode MODULE ${classic_mode_srcs})
-
-target_link_libraries(classic_mode systemsettingsview
-    KF5::ItemViews
-    KF5::ConfigCore
-    KF5::KCMUtils
-    KF5::IconThemes
-    KF5::I18n
-    KF5::KIOWidgets
-    KF5::Service
-    KF5::KHtml
-)
-
-install( TARGETS classic_mode DESTINATION ${KDE_INSTALL_PLUGINDIR} )
-install( FILES settings-classic-view.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
-install( FILES main.html systemsettings-classic.css DESTINATION ${KDE_INSTALL_DATADIR}/systemsettings/classic/ )
-
diff --git a/classic/CategoryList.h b/classic/CategoryList.h
deleted file mode 100644
--- a/classic/CategoryList.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2000,2001 Matthias Elter <elter@kde.org>
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, 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 General Public License for more details.
-
-  You should have received a copy of the GNU 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.
-*/
-
-#ifndef CATEGORYLIST_H
-#define CATEGORYLIST_H
-
-#include <QWidget>
-
-class QModelIndex;
-class QAbstractItemModel;
-
-
-class CategoryList : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit CategoryList( QWidget *parent, QAbstractItemModel *model );
-    ~CategoryList() override;
-
-    void changeModule( const QModelIndex &newItem);
-
-Q_SIGNALS:
-    void moduleSelected( const QModelIndex &itemSelected );
-
-private Q_SLOTS:
-    void slotModuleLinkClicked( const QUrl& moduleName );
-
-private:
-    void updatePixmap();
-
-private:
-    class Private;
-    Private *const d;
-};
-
-#endif
diff --git a/classic/CategoryList.cpp b/classic/CategoryList.cpp
deleted file mode 100644
--- a/classic/CategoryList.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- Copyright (c) 2000,2001 Matthias Elter <elter@kde.org>
- Copyright (c) 2009 Ben Cooksley <bcooksley@kde.org>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, 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 General Public License for more details.
-
- You should have received a copy of the GNU 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.
- */
-
-#include "CategoryList.h"
-#include "systemsettings_classic_debug.h"
-#include "MenuItem.h"
-
-#include <QFile>
-#include <QModelIndex>
-#include <QTextStream>
-#include <QIcon>
-#include <QBuffer>
-
-#include <KHTMLPart>
-
-#include <KIconLoader>
-#include <QUrl>
-#include <QHBoxLayout>
-#include <KHTMLView>
-#include <KCModuleInfo>
-#include <QStandardPaths>
-#include <QApplication>
-
-static const char kcc_infotext[]= I18N_NOOP("System Settings");
-static const char title_infotext[]= I18N_NOOP("Configure your system");
-static const char intro_infotext[]= I18N_NOOP("Welcome to \"System Settings\", "
-    "a central place to configure your computer system.");
-
-class CategoryList::Private {
-public:
-    Private() {}
-
-    KHTMLPart * categoryView = nullptr;
-    QModelIndex categoryMenu;
-    QAbstractItemModel * itemModel = nullptr;
-    QMap<QString, QModelIndex> itemMap;
-};
-
-CategoryList::CategoryList( QWidget *parent, QAbstractItemModel *model )
-    : QWidget(parent), d( new Private() )
-{
-    QHBoxLayout *mainLayout = new QHBoxLayout;
-    setLayout(mainLayout);
-    setMinimumSize( 400, 400 );
-    d->itemModel = model;
-
-    // set what's this help
-    this->setWhatsThis( i18n( intro_infotext ) );
-    d->categoryView = new KHTMLPart( this );
-    mainLayout->addWidget(d->categoryView->view());
-    d->categoryView->view()->setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
-    d->categoryView->widget()->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored );
-    connect( d->categoryView->browserExtension(),
-             SIGNAL( openUrlRequest( const QUrl&,
-                                     const KParts::OpenUrlArguments&,
-                                     const KParts::BrowserArguments& ) ),
-             this, SLOT(slotModuleLinkClicked(QUrl)) );
-}
-
-CategoryList::~CategoryList()
-{
-    delete d;
-}
-
-void CategoryList::updatePixmap()
-{
-    QString content;
-    QString moduleName;
-    d->itemMap.clear();
-
-    const QString templatePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("systemsettings/classic/main.html") );
-    QFile templateFile( templatePath );
-    templateFile.open( QIODevice::ReadOnly );
-    QTextStream templateText( &templateFile );
-    QString templateString = templateText.readAll();
-    templateString = templateString.arg( QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kf5/infopage/kde_infopage.css") ) );
-    if ( qApp->layoutDirection() == Qt::RightToLeft ) {
-        templateString = templateString.arg( QStringLiteral("@import \"%1\";") ).arg( QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kf5/infopage/kde_infopage_rtl.css") ) );
-    } else {
-        templateString = templateString.arg( QString() );
-    }
-    templateString = templateString.arg( i18n( kcc_infotext ) );
-    templateString = templateString.arg( i18n( title_infotext ) );
-    templateString = templateString.arg( i18n( intro_infotext ) );
-    if ( d->categoryMenu.isValid() ) {
-        moduleName = d->itemModel->data( d->categoryMenu, Qt::DisplayRole ).toString();
-    }
-    content += QLatin1String("<div id=\"tableTitle\">") + moduleName + QLatin1String("</div>");
-    content += QStringLiteral("<table class=\"kc_table\">\n");
-    for( int done = 0;  d->itemModel->rowCount( d->categoryMenu ) > done; ++done ) {
-        QModelIndex childIndex = d->itemModel->index( done, 0, d->categoryMenu );
-        MenuItem *childItem = d->itemModel->data( childIndex, Qt::UserRole ).value<MenuItem*>();
-        const QString url = QLatin1String("kcm:///") + childItem->item().fileName();
-        QUrl link(url);
-        const QString szLink = QLatin1String("<a href=\"") + link.url() + QLatin1String("\" >");
-        content += QLatin1String("<tr><td class=\"kc_leftcol\">") + szLink + QLatin1String("<img src=\"%1\" width=\"24\" height=\"24\"></a></td><td class=\"kc_middlecol\">");
-        const QString szName = childItem->name();
-        const QString szComment = childItem->service()->comment();
-        content += szLink + szName + QLatin1String("</a></td><td class=\"kc_rightcol\">") + szLink + szComment + QLatin1String("</a>");
-
-        //passing just the path is insufficient as some icon sets (breeze) only provide SVGs
-        //instead pass data inline
-
-        QIcon icon = QIcon::fromTheme(childItem->service()->icon());
-        QImage image(icon.pixmap(24).toImage()); //icons are hardcoded to size 24 above
-        QByteArray byteArray;
-        QBuffer buffer(&byteArray);
-        image.save(&buffer, "PNG"); // writes the image in PNG format inside the buffer
-        QString iconBase64 = QString::fromLatin1(byteArray.toBase64().data());
-
-        content = content.arg(QLatin1String("data:image/png;base64,") + iconBase64);
-
-
-        d->itemMap.insert( link.url(), childIndex );
-        content += QStringLiteral("</td></tr>\n");
-    }
-    content += QStringLiteral("</table>");
-    d->categoryView->begin( QUrl::fromLocalFile( templatePath ) );
-    d->categoryView->write( templateString.arg( content ) );
-    d->categoryView->end();
-}
-
-void CategoryList::changeModule( const QModelIndex &newItem )
-{
-    d->categoryMenu = newItem;
-    updatePixmap();
-}
-
-void CategoryList::slotModuleLinkClicked( const QUrl& moduleName )
-{
-    QModelIndex module = d->itemMap.value( moduleName.url() );
-    qCDebug(SYSTEMSETTINGS_CLASSIC_LOG) << "Link name: " << moduleName.url();
-    emit moduleSelected( module );
-}
-
-#include "moc_CategoryList.cpp"
diff --git a/classic/ClassicMode.h b/classic/ClassicMode.h
deleted file mode 100644
--- a/classic/ClassicMode.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/**************************************************************************
- * Copyright (C) 2009 Ben Cooksley <bcooksley@kde.org>                    *
- *                                                                        *
- * This program is free software; you can redistribute it and/or          *
- * modify it under the terms of the GNU General Public License            *
- * as published by the Free Software Foundation; either version 2         *
- * of the License, 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 General Public License for more details.                           *
- *                                                                        *
- * You should have received a copy of the GNU 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.                                                       *
-***************************************************************************/
-#ifndef CLASSICMODE_H
-#define CLASSICMODE_H
-
-#include "BaseMode.h"
-
-class MenuItem;
-class ModuleView;
-class QModelIndex;
-
-class ClassicMode : public BaseMode
-{
-    Q_OBJECT
-
-public:
-    ClassicMode(QObject * parent, const QVariantList& );
-    ~ClassicMode() override;
-    void initEvent() override;
-    void leaveModuleView() override;
-    QWidget * mainWidget() override;
-    KAboutData * aboutData() override;
-    ModuleView * moduleView() const override;
-
-protected:
-    QList<QAbstractItemView*> views() const override;
-    bool eventFilter(QObject* watched, QEvent* event) override;
-
-public Q_SLOTS:
-    void expandColumns();
-    void searchChanged( const QString& text ) override;
-    void selectModule( const QModelIndex& selectedModule );
-    void changeModule( const QModelIndex& activeModule );
-    void saveState() override;
-    void giveFocus() override;
-    void addConfiguration( KConfigDialog * config ) override;
-    void loadConfiguration() override;
-    void saveConfiguration() override;
-
-private Q_SLOTS:
-    void moduleLoaded();
-    void initWidget();
-    void moveUp( MenuItem * item );
-
-private:
-    class Private;
-    Private *const d;
-};
-
-#endif
diff --git a/classic/ClassicMode.cpp b/classic/ClassicMode.cpp
deleted file mode 100644
--- a/classic/ClassicMode.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-/**************************************************************************
- * Copyright (C) 2009 Ben Cooksley <bcooksley@kde.org>                    *
- * Copyright (C) 2008 Mathias Soeken <msoeken@informatik.uni-bremen.de>   *
- *                                                                        *
- * This program is free software; you can redistribute it and/or          *
- * modify it under the terms of the GNU General Public License            *
- * as published by the Free Software Foundation; either version 2         *
- * of the License, 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 General Public License for more details.                           *
- *                                                                        *
- * You should have received a copy of the GNU 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.                                                       *
-***************************************************************************/
-
-#include "ClassicMode.h"
-#include "ui_configClassic.h"
-
-#include <QLayout>
-#include <QSplitter>
-#include <QTreeView>
-#include <QModelIndex>
-#include <QStackedWidget>
-#include <QStyle>
-
-#include <KAboutData>
-#include <KConfigDialog>
-#include <KConfigGroup>
-
-#include "MenuItem.h"
-#include "MenuModel.h"
-#include "ModuleView.h"
-#include "CategoryList.h"
-#include "MenuProxyModel.h"
-
-K_PLUGIN_FACTORY(ClassicModeFactory, registerPlugin<ClassicMode>();)
-
-class ClassicMode::Private {
-public:
-    Private() {}
-    virtual ~Private() {
-        delete aboutClassic;
-    }
-
-    QSplitter * classicWidget = nullptr;
-    QTreeView * classicTree = nullptr;
-    Ui::ConfigClassic classicConfig;
-    CategoryList * classicCategory = nullptr;
-    QStackedWidget * stackedWidget = nullptr;
-    ModuleView * moduleView = nullptr;
-    QModelIndex currentItem;
-
-    MenuProxyModel * proxyModel = nullptr;
-    MenuModel * model = nullptr;
-    KAboutData * aboutClassic = nullptr;
-};
-
-ClassicMode::ClassicMode( QObject * parent, const QVariantList& )
-    : BaseMode( parent ), d( new Private() )
-{
-    d->aboutClassic = new KAboutData(QStringLiteral("TreeView"),
-                                     i18n("Tree View"),
-                                     QStringLiteral("1.0"),
-                                     i18n("Provides a classic tree-based view of control modules."),
-                                     KAboutLicense::GPL,
-                                     i18n("(c) 2009, Ben Cooksley"));
-    d->aboutClassic->addAuthor(i18n("Ben Cooksley"), i18n("Author"), QStringLiteral("bcooksley@kde.org"));
-    d->aboutClassic->addAuthor(i18n("Mathias Soeken"), i18n("Developer"), QStringLiteral("msoeken@informatik.uni-bremen.de"));
-}
-
-ClassicMode::~ClassicMode()
-{
-    if( !d->classicTree ) {
-        delete d->classicWidget;
-    }
-    delete d;
-}
-
-void ClassicMode::initEvent()
-{
-    // Create the model
-    d->model = new MenuModel( rootItem(), this );
-    
-    // Move items that are the sole child of a category up....
-    moveUp( rootItem() );
-
-    // Create the proxy model
-    d->proxyModel = new MenuProxyModel( this );
-    d->proxyModel->setSourceModel( d->model );
-    d->proxyModel->sort( 0 );
-    d->classicWidget = new QSplitter( Qt::Horizontal, nullptr );
-    d->classicWidget->setChildrenCollapsible( false );
-    d->moduleView = new ModuleView( d->classicWidget );
-    d->classicTree = nullptr;
-}
-
-QWidget * ClassicMode::mainWidget()
-{
-    if( !d->classicTree ) {
-        initWidget();
-    }
-    return d->classicWidget;
-}
-
-KAboutData * ClassicMode::aboutData()
-{
-    return d->aboutClassic;
-}
-
-ModuleView * ClassicMode::moduleView() const
-{
-    return d->moduleView;
-}
-
-QList<QAbstractItemView*> ClassicMode::views() const
-{
-    QList<QAbstractItemView*> theViews;
-    theViews << d->classicTree;
-    return theViews;
-}
-
-void ClassicMode::saveState()
-{
-    config().writeEntry( "viewLayout", d->classicWidget->sizes() );
-    config().sync();
-}
-
-void ClassicMode::expandColumns()
-{
-    d->classicTree->resizeColumnToContents(0);
-}
-
-void ClassicMode::searchChanged( const QString& text )
-{
-    d->proxyModel->setFilterRegExp(text);
-    if( d->classicTree ) {
-        d->classicCategory->changeModule( d->classicTree->currentIndex() );
-    }
-}
-
-void ClassicMode::selectModule( const QModelIndex& selectedModule )
-{
-    d->classicTree->setCurrentIndex( selectedModule );
-    if( d->proxyModel->rowCount(selectedModule) > 0 ) {
-        d->classicTree->setExpanded(selectedModule, true);
-    }
-    changeModule( selectedModule );
-}
-
-void ClassicMode::changeModule( const QModelIndex& activeModule )
-{
-    if( activeModule == d->currentItem ) {
-        return;
-    }
-    if( !d->moduleView->resolveChanges() ) {
-        return;
-    }
-    d->moduleView->closeModules();
-    d->currentItem = activeModule;
-    if( d->proxyModel->rowCount(activeModule) > 0 ) {
-        d->stackedWidget->setCurrentWidget( d->classicCategory );
-        d->classicCategory->changeModule(activeModule);
-        emit viewChanged( false );
-    } else {
-        d->moduleView->loadModule( activeModule );
-    }
-}
-
-void ClassicMode::moduleLoaded()
-{
-    d->stackedWidget->setCurrentWidget( d->moduleView );
-}
-
-void ClassicMode::initWidget()
-{
-    // Create the widget
-    d->classicTree = new QTreeView( d->classicWidget );
-    d->classicCategory = new CategoryList( d->classicWidget, d->proxyModel );
-
-    d->stackedWidget = new QStackedWidget( d->classicWidget );
-    d->stackedWidget->layout()->setContentsMargins(0, 0, 0, 0);
-    d->stackedWidget->addWidget( d->classicCategory );
-    d->stackedWidget->addWidget( d->moduleView );
-
-    d->classicWidget->addWidget( d->classicTree );
-    d->classicWidget->addWidget( d->stackedWidget );
-
-    d->classicTree->setModel( d->proxyModel );
-    d->classicTree->setHeaderHidden( true );
-    d->classicTree->setIconSize( QSize( 24, 24 ) );
-    d->classicTree->setSortingEnabled( true );
-    d->classicTree->setMouseTracking( true );
-    d->classicTree->setMinimumWidth( 200 );
-    d->classicTree->setSelectionMode( QAbstractItemView::SingleSelection );
-    d->classicTree->sortByColumn( 0, Qt::AscendingOrder );
-
-    d->classicCategory->changeModule( d->classicTree->rootIndex() );
-
-    connect( d->classicCategory, &CategoryList::moduleSelected, this, &ClassicMode::selectModule );
-    connect( d->classicTree, &QAbstractItemView::activated, this, &ClassicMode::changeModule );
-    connect( d->classicTree, &QTreeView::collapsed, this, &ClassicMode::expandColumns );
-    connect( d->classicTree, &QTreeView::expanded, this, &ClassicMode::expandColumns );
-    connect( d->moduleView, &ModuleView::moduleChanged, this, &ClassicMode::moduleLoaded );
-
-    if( !qApp->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) ) {
-        // Needed because otherwise activated() is not fired with single click, which is apparently expected for tree views
-        connect( d->classicTree, &QAbstractItemView::clicked, this, &ClassicMode::changeModule );
-    }
-
-    if( config().readEntry( "autoExpandOneLevel", false ) ) {
-        for( int processed = 0; d->proxyModel->rowCount() > processed; processed++ ) {
-            d->classicTree->setExpanded( d->proxyModel->index( processed, 0 ), true );
-        }
-    }
-
-    expandColumns();
-    QList<int> defaultSizes;
-    defaultSizes << 250 << 500;
-    d->classicWidget->setSizes( config().readEntry( "viewLayout", defaultSizes ) );
-    emit changeToolBarItems( BaseMode::Search | BaseMode::Configure | BaseMode::Quit );
-    d->classicWidget->installEventFilter(this);
-}
-
-bool ClassicMode::eventFilter(QObject* watched, QEvent* event)
-{
-    if (watched == d->classicWidget && event->type() == QEvent::Show) {
-        emit changeToolBarItems( BaseMode::Search | BaseMode::Configure | BaseMode::Quit );
-    }
-    return BaseMode::eventFilter(watched, event);
-}
-
-void ClassicMode::leaveModuleView()
-{
-    d->moduleView->closeModules();
-    d->stackedWidget->setCurrentWidget( d->classicCategory );
-}
-
-void ClassicMode::giveFocus()
-{
-    d->classicTree->setFocus();
-}
-
-void ClassicMode::addConfiguration( KConfigDialog * config )
-{
-    QWidget * configWidget = new QWidget( config );
-    d->classicConfig.setupUi( configWidget );
-    config->addPage( configWidget, i18n("Tree View"), QStringLiteral("view-list-tree") );
-}
-
-void ClassicMode::loadConfiguration()
-{
-    d->classicConfig.CbExpand->setChecked( config().readEntry( "autoExpandOneLevel", false ) );
-}
-
-void ClassicMode::saveConfiguration()
-{
-    config().writeEntry("autoExpandOneLevel", d->classicConfig.CbExpand->isChecked());
-}
-
-void ClassicMode::moveUp( MenuItem * item )
-{
-    foreach( MenuItem * child, item->children() ) {
-        if( child->children().count() == 1 ) {
-            d->model->addException( child );
-        }
-        moveUp( child );
-    }
-}
-
-#include "ClassicMode.moc"
diff --git a/classic/configClassic.ui b/classic/configClassic.ui
deleted file mode 100644
--- a/classic/configClassic.ui
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ConfigClassic</class>
- <widget class="QWidget" name="ConfigClassic">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>66</height>
-   </rect>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QCheckBox" name="CbExpand">
-     <property name="text">
-      <string>Expand the first level automatically</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>28</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/classic/main.html b/classic/main.html
deleted file mode 100644
--- a/classic/main.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <style type="text/css">
-  /*<![CDATA[*/
-    @import "%1"; /* kde_infopage.css */
-    %2 /* maybe @import "kde_infopage_rtl.css"; */
-    @import "systemsettings-classic.css";
-    /*body {font-size: px;}*/
-  /*]]>*/
-  </style>
-</head>
-
-<body>
-  <div id="header">
-    <div id="headerL"/>
-   
-    <div id="title">
-    %3 <!-- Title -->
-    </div>
-
-    <div id="tagline">
-    %4 <!-- Catchphrase -->
-    </div>
-  </div>
-
-  <!-- the bar -->
-  <div id="bar">
-    <div id="barT"><div id="barTL"/><div id="barTR"/><div id="barTC"/></div>
-    <div id="barL">
-      <div id="barR">
-        <div id="barCenter" class="bar_text">
-      %5<!-- Summary -->
-        </div>
-      </div>
-    </div>
-    <div id="barB"><div id="barBL"/><div id="barBR"/><div id="barBC"/></div>
-  </div>
-
-  <!-- the main text box -->
-  <div id="box">
-    <div id="boxT"><div id="boxTL"/><div id="boxTR"/><div id="boxTC"/></div>
-    <div id="boxL">
-      <div id="boxR">
-        <div id="boxCenter">
-        <!--Content-->
-        %6
-        </div>
-      </div>
-    </div>
-    <div id="boxB"><div id="boxBL"/><div id="boxBR"/><div id="boxBC"/></div>
-  </div>
-
-  <div id="footer"><div id="footerL"/><div id="footerR"/></div>
-</body>
-</html>
diff --git a/classic/settings-classic-view.desktop b/classic/settings-classic-view.desktop
deleted file mode 100644
--- a/classic/settings-classic-view.desktop
+++ /dev/null
@@ -1,168 +0,0 @@
-[Desktop Entry]
-Icon=view-list-tree
-Type=Service
-X-KDE-ServiceTypes=SystemSettingsView
-
-X-KDE-Library=classic_mode
-X-KDE-Keywords=System Settings
-X-KDE-Keywords[ar]=إعدادات النّظام
-X-KDE-Keywords[bg]=Системни настройки
-X-KDE-Keywords[bs]=Sistemske postavke
-X-KDE-Keywords[ca]=Arranjament del sistema
-X-KDE-Keywords[ca@valencia]=Configuració del sistema
-X-KDE-Keywords[cs]=Nastavení systému
-X-KDE-Keywords[da]=Systemindstillinger
-X-KDE-Keywords[de]=Systemeinstellungen
-X-KDE-Keywords[el]=Ρυθμίσεις συστήματος
-X-KDE-Keywords[en_GB]=System Settings
-X-KDE-Keywords[eo]=Sistema agordo
-X-KDE-Keywords[es]=Preferencias del sistema
-X-KDE-Keywords[et]=Süsteemi seadistused
-X-KDE-Keywords[eu]=Sistemako ezarpenak
-X-KDE-Keywords[fi]=järjestelmä, asetukset
-X-KDE-Keywords[fr]=Configuration du système
-X-KDE-Keywords[ga]=Socruithe an Chórais
-X-KDE-Keywords[gl]=Configuración do sistema
-X-KDE-Keywords[he]=הגדרות מערכת
-X-KDE-Keywords[hu]=Rendszerbeállítások
-X-KDE-Keywords[ia]=Preferentias de systema
-X-KDE-Keywords[id]=System Settings
-X-KDE-Keywords[is]=Kerfisstillingar
-X-KDE-Keywords[it]=Impostazioni di sistema
-X-KDE-Keywords[ja]=システム設定
-X-KDE-Keywords[kk]=System Settings,Жүйе параметрлері
-X-KDE-Keywords[km]=ការ​កំណត់​ប្រព័ន្ធ​
-X-KDE-Keywords[ko]=시스템 설정
-X-KDE-Keywords[lt]=Sistemos nuostatos
-X-KDE-Keywords[lv]=Sistēmas iestatījumi
-X-KDE-Keywords[mr]=प्रणाली संयोजना
-X-KDE-Keywords[nb]=Systeminnstillinger
-X-KDE-Keywords[nds]=Systeeminstellen
-X-KDE-Keywords[nl]=Systeeminstellingen
-X-KDE-Keywords[nn]=Systemoppsett
-X-KDE-Keywords[pa]=ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ
-X-KDE-Keywords[pl]=Ustawienia systemowe
-X-KDE-Keywords[pt]=Configuração do Sistema
-X-KDE-Keywords[pt_BR]=Configurações do sistema
-X-KDE-Keywords[ro]=Configurări de sistem
-X-KDE-Keywords[ru]=Параметры системы
-X-KDE-Keywords[sk]=Systémové nastavenia
-X-KDE-Keywords[sl]=Sistemske nastavitve
-X-KDE-Keywords[sr]=System Settings,Системске поставке
-X-KDE-Keywords[sr@ijekavian]=System Settings,Системске поставке
-X-KDE-Keywords[sr@ijekavianlatin]=System Settings,Sistemske postavke
-X-KDE-Keywords[sr@latin]=System Settings,Sistemske postavke
-X-KDE-Keywords[sv]=Systeminställningar
-X-KDE-Keywords[tg]=Танзимоти низом
-X-KDE-Keywords[tr]=Sistem Ayarları
-X-KDE-Keywords[ug]=سىستېما تەڭشەكلىرى
-X-KDE-Keywords[uk]=система,параметри,System Settings,системні параметри
-X-KDE-Keywords[vi]=Thiết lập hệ thống
-X-KDE-Keywords[x-test]=xxSystem Settingsxx
-X-KDE-Keywords[zh_CN]=System Settings,系统设置
-X-KDE-Keywords[zh_TW]=System Settings
-
-Name=Tree View
-Name[bg]=Дървовиден изглед
-Name[ca]=Vista en arbre
-Name[ca@valencia]=Vista en arbre
-Name[cs]=Stromové zobrazení
-Name[da]=Trævisning
-Name[de]=Baumansicht
-Name[el]=Προβολή δέντρου
-Name[en_GB]=Tree View
-Name[es]=Vista de árbol
-Name[eu]=Zuhaitz-ikuspegia
-Name[fi]=Puunäkymä
-Name[fr]=Vue arborescente
-Name[gl]=Vista en árbore
-Name[hu]=Fastruktúra-nézet
-Name[id]=Tampilan Hierarki
-Name[it]=Vista ad albero
-Name[ja]=ツリー表示
-Name[ko]=트리 보기
-Name[lt]=Medžio rodinys
-Name[nl]=Boomstructuurweergave
-Name[nn]=Trevising
-Name[pa]=ਲੜੀ ਝਲਕ
-Name[pl]=Widok drzewa
-Name[pt]=Vista em Árvore
-Name[pt_BR]=Exibição em árvore
-Name[ru]=Дерево
-Name[sk]=Stromové zobrazenie
-Name[sl]=Drevesni pogled
-Name[sr]=Приказ стабла
-Name[sr@ijekavian]=Приказ стабла
-Name[sr@ijekavianlatin]=Prikaz stabla
-Name[sr@latin]=Prikaz stabla
-Name[sv]=Trädvy
-Name[tg]=Намуди дарахтшакл
-Name[tr]=Ağaç Görünümü
-Name[uk]=Ієрархічний перегляд
-Name[x-test]=xxTree Viewxx
-Name[zh_CN]=树状视图
-Name[zh_TW]=樹狀檢視
-Comment=A Classic KDE 3 KControl style system settings view.
-Comment[ar]=عرض إعدادات النّظام لنمط KControl في كدي 3 التّقليديّ.
-Comment[bg]=Класически изглед (като KDE 3).
-Comment[bn]=ক্লাসিক KDE 3 কে-কন্ট্রোল-এর মত একটি সিস্টেম সেটিংস ভিউ।
-Comment[bs]=Prikaz postavki u klasičnom stilu K‑kontrole iz KDE‑a 3.
-Comment[ca]=Una vista de l'arranjament del sistema a l'estil clàssic del KControl del KDE 3.
-Comment[ca@valencia]=Una vista de la configuració del sistema a l'estil clàssic de KControl de KDE 3.
-Comment[cs]=Klasický styl pohledu Ovládacího centra KDE 3.
-Comment[csb]=Systemòwi nastôw w klasykòwim sztélu KDE 3
-Comment[da]=En klassisk visning af Systemindstillinger i stil med KDE 3 KControl.
-Comment[de]=Eine klassische KDE-3-Ansicht für die Systemeinstellungen.
-Comment[el]=Ένα κλασσικό στιλ εμφάνισης ρυθμίσεων συστήματος του KDE 3 KControl.
-Comment[en_GB]=A Classic KDE 3 KControl style system settings view.
-Comment[es]=Una vista clásica de KControl de KDE de las preferencias del sistema.
-Comment[et]=KDE3 klassikalise juhtimiskeskuse laadis süsteemi seadistuste vaade.
-Comment[eu]=KDE 3 KControl estiloko sistemako ezarpen ikuspegi klasiko bat.
-Comment[fi]=Klassinen KDE 3 KControl -tyylinen järjestelmäasetusnäkymä.
-Comment[fr]=Une vue classique dans le style de KControl de KDE 3 pour les paramètres du système.
-Comment[fy]=In klassike KDE 3 KControl styl systeem ynstellings werjefte.
-Comment[gl]=Unha vista da configuración do sistema co estilo clásico de KControl de KDE 3.
-Comment[he]=תצוגת הגדרות מערכת בסגנון KDE 3 קלאסי.
-Comment[hr]=Klasični KDE 3 KControl stil prikaza sustavskih postavki.
-Comment[hu]=KDE 3 KControl-stílusú nézet a Rendszerbeállításokhoz.
-Comment[ia]=Un vista de preferentias de systema secundo le stilo classic de KControl KDE 3
-Comment[id]=Sebuah tampilan system settings bergaya KControl KDE 3 Klasik.
-Comment[is]=Klassískur stíll KDE 3 KControl kerfisstillingasýnar.
-Comment[it]=Una classica vista delle impostazioni di sistema sullo stile del centro di controllo di KDE 3.
-Comment[ja]=KDE 3 のコントロールセンターの表示スタイル
-Comment[kk]=Классикалық KDE 3 KControl стильдегі жүйе параметрлер көрнісі
-Comment[km]=ទិដ្ឋភាព​ការ​កំណត់​ប្រព័ន្ធ​រចនាប័ទញម​របស់ KDE 3 KControl បុរាណ ។
-Comment[kn]=ಸಾಂಪ್ರದಾಯಿಕ KDE 3 KControl ಶೈಲಿಯ ವ್ಯವಸ್ಥೆಯ ಸಂಯೋಜನೆಗಳ ನೋಟ.
-Comment[ko]=KDE 3 제어판 스타일로 시스템 설정을 표시합니다.
-Comment[lt]=Klasikinis KDE 3 KControl stiliaus sistemos nuostatų rodinys.
-Comment[lv]=Klaksiskais KDE 3 KControl stila sistēmas iestatījumu skats.
-Comment[ml]=കെഡിഈ 3ലെ കെ നിയന്ത്രണരീതിയിലുള്ള വ്യവസ്ഥ ഒരുക്കുന്നതിന്റെ ക്ലാസിക് കാഴ്ച
-Comment[mr]=केडीई 3 के-कंट्रोल क्लासिक शैलीचे प्रणाली संयोजना दृश्य.
-Comment[nb]=En visning av systeminnstillinger med klassisk KDE 3 KControl-stil.
-Comment[nds]=En klass'sch Ansicht för de Systeeminstellen, as bi KDE-3 sien KControl.
-Comment[nl]=Een systeeminstelling voor een klassieke KDE3 KControl weergave.
-Comment[nn]=Ei klassisk KDE 3-aktig vising av systeminnstillingane.
-Comment[pa]=ਕਲਾਸਿਕ ਕੇਡੀਈ 3 ਕੇ-ਕੰਟਰੋਲ ਸਟਾਈਲ ਵਰਗੀ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਝਲਕ ਹੈ।
-Comment[pl]=Klasyczny widok ustawień systemowych z Centrum sterowania KDE 3.
-Comment[pt]=A vista para a configuração do sistema clássica do KControl do KDE 3.
-Comment[pt_BR]=Uma exibição das configurações do sistema no estilo do KControl do KDE 3.
-Comment[ro]=Vizualizare clasică KControl KDE 3 pentru configurări de sistem.
-Comment[ru]=Классический стиль «Параметров системы», как в KDE 3.
-Comment[si]=සාම්ප්‍රධායික KDE 3 KControl රටා පද්ධති සැකසුම් දසුන.
-Comment[sk]=Klasický štýl zobrazenia Ovládacieho centra KDE 3.
-Comment[sl]=Pogled za sistemske nastavitve v slogu nadzornega središča iz KDE 3.
-Comment[sr]=Приказ поставки у класичном стилу К‑контроле из КДЕ‑а 3.
-Comment[sr@ijekavian]=Приказ поставки у класичном стилу К‑контроле из КДЕ‑а 3.
-Comment[sr@ijekavianlatin]=Prikaz postavki u klasičnom stilu K‑kontrole iz KDE‑a 3.
-Comment[sr@latin]=Prikaz postavki u klasičnom stilu K‑kontrole iz KDE‑a 3.
-Comment[sv]=En klassisk systeminställningsvy som liknar inställningscentralen i KDE 3.
-Comment[tg]=Намуди танзимоти низом бо услуби классикии KDE 3 KControl
-Comment[th]=รูปแบบมุมมองคลาสสิกของศูนย์ควบคุม KDE 3 แบบผังต้นไม้
-Comment[tr]=Klasik KDE3 KControl biçimi sistem ayarları görünümü.
-Comment[ug]=ئەنئەنىۋى KDE 3 تىزگىن مەركىزى ئۇسلۇبىدىكى سىستېما تەڭشەك كۆرۈنۈشى.
-Comment[uk]=Класичний перегляд параметрів у стилі KControl з KDE 3.
-Comment[vi]=Xem thiết lập hệ thống theo kiểu KControl KDE 3 cổ điển.
-Comment[wa]=Ene vuwe classike des tchuzes do sistinme al façon di KControl dins KDE 3.
-Comment[x-test]=xxA Classic KDE 3 KControl style system settings view.xx
-Comment[zh_CN]=经典的 KDE 3 控制中心风格系统设置视图。
-Comment[zh_TW]=傳統 KDE3 KControl 風格的系統設定檢視。
diff --git a/classic/systemsettings-classic.css b/classic/systemsettings-classic.css
deleted file mode 100644
--- a/classic/systemsettings-classic.css
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#title {
-  right: 80px;
-  font-size: x-large;
-}
-
-#tagline {
-  right: 80px;
-  font-size: x-small;
-}
-
-#barCenter {
-  font-size: x-small;
-}
-
-#tableTitle {
-  font-weight: bold;
-  padding-bottom: 1ex;
-}
-
-.kc_table {
-  font-size: x-small;
-  width: 100%;
-}
-
-.kc_leftcol {
-  width: 32px;
-  vertical-align: center;
-}
-
-.kc_middlecol {
-}
-
-.kc_rightcol {
-  font-weight: bold;
-}
-
-.kc_use_text {
-  margin-bottom: 0;
-  font-size: xx-small;
-}
-
diff --git a/systemsettings.categories b/systemsettings.categories
--- a/systemsettings.categories
+++ b/systemsettings.categories
@@ -1,2 +1 @@
 org.kde.systemsettings.app systemsettings app IDENTIFIER [SYSTEMSETTINGS_APP_LOG]
-org.kde.systemsettings.classic systemsettings classic IDENTIFIER [SYSTEMSETTINGS_CLASSIC_LOG]