diff --git a/categories/CMakeLists.txt b/categories/CMakeLists.txt
index 00786044..c710791c 100644
--- a/categories/CMakeLists.txt
+++ b/categories/CMakeLists.txt
@@ -1,45 +1,44 @@
 
 install( FILES systemsettingscategory.desktop DESTINATION  ${KDE_INSTALL_KSERVICETYPES5DIR} )
 
 install( FILES 
     settings-appearance.desktop
-    settings-appearance-workspacetheme.desktop
     settings-appearance-applicationstyle.desktop
     settings-appearance-color.desktop
     settings-appearance-font.desktop
     settings-appearance-icons.desktop
 
     settings-workspace.desktop
     settings-workspace-windowmanagement.desktop
     settings-workspace-desktopbehavior.desktop
     settings-workspace-shortcuts.desktop
     settings-workspace-session.desktop
     settings-workspace-search.desktop
 
     settings-personalization.desktop
     settings-personalization-accountdetails.desktop
     settings-personalization-accessibility.desktop
     settings-personalization-regionalsettings.desktop
     settings-personalization-notification.desktop
     settings-personalization-applications.desktop
 
     settings-network.desktop
     settings-network-networksettings.desktop
     settings-network-connectivity.desktop
 
     settings-hardware.desktop
     settings-hardware-display.desktop
     settings-hardware-input.desktop
     settings-hardware-multimedia.desktop
     settings-hardware-peripherals.desktop
     settings-hardware-powermanagement.desktop
     settings-hardware-removable-storage.desktop
 
     DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 
 if (NOT WIN32)
     install( FILES
          settings-network-bluetooth.desktop
          DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 endif ()
 
diff --git a/categories/settings-appearance-applicationstyle.desktop b/categories/settings-appearance-applicationstyle.desktop
index a6f643b1..859c941a 100644
--- a/categories/settings-appearance-applicationstyle.desktop
+++ b/categories/settings-appearance-applicationstyle.desktop
@@ -1,53 +1,53 @@
 [Desktop Entry]
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=applicationstyle
 X-KDE-System-Settings-Parent-Category=appearance
-X-KDE-Weight=80
 Icon=preferences-desktop-theme-applications
+X-KDE-Weight=30
 
 Name=Application Style
 Name[ar]=نمط التّطبيقات
 Name[bs]=Stil programa
 Name[ca]=Estil de l'aplicació
 Name[ca@valencia]=Estil de l'aplicació
 Name[cs]=Styl aplikací
 Name[da]=Programstil
 Name[de]=Anwendungs-Stil
 Name[el]=Στιλ εφαρμογών
 Name[en_GB]=Application Style
 Name[es]=Estilo de las aplicaciones
 Name[et]=Rakenduste stiil
 Name[eu]=Aplikazioen estiloa
 Name[fi]=Sovellusten tyyli
 Name[fr]=Apparence des applications
 Name[gl]=Estilo do aplicativo
 Name[he]=מראה יישומים
 Name[hu]=Alkalmazások megjelenése
 Name[id]=Gaya Aplikasi
 Name[it]=Stile delle applicazioni
 Name[ja]=アプリケーションスタイル
 Name[ko]=프로그램 모양
 Name[lt]=Programų stilius
 Name[nb]=Programstil
 Name[nds]=Programmstil
 Name[nl]=Stijl van toepassing
 Name[nn]=Program­stil
 Name[pa]=ਐਪਲੀਕੇਸ਼ਨ ਸਟਾਈਲ
 Name[pl]=Wygląd programów
 Name[pt]=Estilo das Aplicações
 Name[pt_BR]=Estilo dos aplicativos
 Name[ro]=Stil aplicații
 Name[ru]=Оформление приложений
 Name[sk]=Štýl aplikácií
 Name[sl]=Slog programov
 Name[sr]=Стил програма
 Name[sr@ijekavian]=Стил програма
 Name[sr@ijekavianlatin]=Stil programa
 Name[sr@latin]=Stil programa
 Name[sv]=Programstil
 Name[tr]=Uygulama Biçemi
 Name[uk]=Стиль вікон програм
 Name[x-test]=xxApplication Stylexx
 Name[zh_CN]=应用程序风格
 Name[zh_TW]=應用程式樣式
diff --git a/categories/settings-appearance-font.desktop b/categories/settings-appearance-font.desktop
index b06d80e9..3567dc9f 100644
--- a/categories/settings-appearance-font.desktop
+++ b/categories/settings-appearance-font.desktop
@@ -1,50 +1,50 @@
 [Desktop Entry]
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=font
 X-KDE-System-Settings-Parent-Category=appearance
-X-KDE-Weight=70
+X-KDE-Weight=40
 Icon=preferences-desktop-font
 
 Name=Fonts
 Name[ar]=الخطوط
 Name[ca]=Tipus de lletres
 Name[ca@valencia]=Tipus de lletres
 Name[cs]=Písma
 Name[da]=Skrifttyper
 Name[de]=Schriftarten
 Name[el]=Γραμματοσειρές
 Name[en_GB]=Fonts
 Name[es]=Tipos de letra
 Name[eu]=Letra-tipoak
 Name[fi]=Fontit
 Name[fr]=Polices
 Name[gl]=Tipos de letra
 Name[he]=גופנים
 Name[hu]=Betűkészletek
 Name[id]=Font
 Name[it]=Caratteri
 Name[ja]=フォント
 Name[ko]=글꼴
 Name[lt]=Šriftai
 Name[nb]=Skrifttyper
 Name[nl]=Lettertypen
 Name[nn]=Skrifter
 Name[pa]=ਫ਼ੋਂਟ
 Name[pl]=Czcionki
 Name[pt]=Tipos de Letra
 Name[pt_BR]=Fontes
 Name[ru]=Шрифты
 Name[se]=Fonttat
 Name[sk]=Písma
 Name[sl]=Pisave
 Name[sr]=Фонтови
 Name[sr@ijekavian]=Фонтови
 Name[sr@ijekavianlatin]=Fontovi
 Name[sr@latin]=Fontovi
 Name[sv]=Teckensnitt
 Name[tr]=Yazı Tipleri
 Name[uk]=Шрифти
 Name[x-test]=xxFontsxx
 Name[zh_CN]=字体
 Name[zh_TW]=字型
diff --git a/categories/settings-appearance-icons.desktop b/categories/settings-appearance-icons.desktop
index 7473cbad..cf175bd8 100644
--- a/categories/settings-appearance-icons.desktop
+++ b/categories/settings-appearance-icons.desktop
@@ -1,55 +1,55 @@
 [Desktop Entry]
 Type=Service
 X-KDE-ServiceTypes=SystemSettingsCategory
 X-KDE-System-Settings-Category=icons
 X-KDE-System-Settings-Parent-Category=appearance
-X-KDE-Weight=70
+X-KDE-Weight=50
 Icon=preferences-desktop-icons
 
 Name=Icons
 Name[ar]=الأيقونات
 Name[bs]=Ikone
 Name[ca]=Icones
 Name[ca@valencia]=Icones
 Name[cs]=Ikony
 Name[da]=Ikoner
 Name[de]=Symbole
 Name[el]=Εικονίδια
 Name[en_GB]=Icons
 Name[es]=Iconos
 Name[et]=Ikoonid
 Name[eu]=Ikonoak
 Name[fi]=Kuvakkeet
 Name[fr]=Icônes
 Name[gl]=Iconas
 Name[he]=סמלים
 Name[hu]=Ikonok
 Name[ia]=Icones
 Name[id]=Ikon
 Name[it]=Icone
 Name[ja]=アイコン
 Name[ko]=아이콘
 Name[lt]=Piktogramos
 Name[nb]=Ikoner
 Name[nds]=Lüttbiller
 Name[nl]=Pictogrammen
 Name[nn]=Ikon
 Name[pa]=ਆਈਕਾਨ
 Name[pl]=Ikony
 Name[pt]=Ícones
 Name[pt_BR]=Ícones
 Name[ro]=Pictograme
 Name[ru]=Значки
 Name[se]=Govažat
 Name[sk]=Ikony
 Name[sl]=Ikone
 Name[sr]=Иконице
 Name[sr@ijekavian]=Иконице
 Name[sr@ijekavianlatin]=Ikonice
 Name[sr@latin]=Ikonice
 Name[sv]=Ikoner
 Name[tr]=Simgeler
 Name[uk]=Піктограми
 Name[x-test]=xxIconsxx
 Name[zh_CN]=图标
 Name[zh_TW]=圖示
diff --git a/categories/settings-appearance-workspacetheme.desktop b/categories/settings-appearance-workspacetheme.desktop
deleted file mode 100644
index a0099377..00000000
--- a/categories/settings-appearance-workspacetheme.desktop
+++ /dev/null
@@ -1,53 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=SystemSettingsCategory
-X-KDE-System-Settings-Category=workspacetheme
-X-KDE-System-Settings-Parent-Category=appearance
-X-KDE-Weight=40
-Icon=preferences-desktop-plasma-theme
-
-Name=Workspace Theme
-Name[ar]=سمة مساحة العمل
-Name[bs]=Tema radne površine
-Name[ca]=Tema de l'espai de treball
-Name[ca@valencia]=Tema de l'espai de treball
-Name[cs]=Motiv pracovní plochy
-Name[da]=Arbejdsområdets tema
-Name[de]=Arbeitsbereich-Design
-Name[el]=Θέμα χώρου εργασίας
-Name[en_GB]=Workspace Theme
-Name[es]=Tema del espacio de trabajo
-Name[et]=Töötsooni teema
-Name[eu]=Laneko eremuaren gaia
-Name[fi]=Työtilan teema
-Name[fr]=Apparence de l'espace de travail
-Name[gl]=Tema do espazo de traballo
-Name[he]=מראה סביבת העבודה
-Name[hu]=Asztali téma
-Name[id]=Tema Workspace
-Name[it]=Tema dello spazio di lavoro
-Name[ja]=ワークスペーステーマ
-Name[ko]=작업 공간 모양
-Name[lt]=Darbo srities apipavidalinimas
-Name[nb]=Tema for arbeidsområde
-Name[nds]=Arbeitrebeet-Muster
-Name[nl]=Thema van werkruimte
-Name[nn]=Tema for arbeids­område
-Name[pa]=ਵਰਕਸਪੇਸ ਥੀਮ
-Name[pl]=Wygląd przestrzeni roboczej
-Name[pt]=Tema da Área de Trabalho
-Name[pt_BR]=Tema do Espaço de Trabalho
-Name[ro]=Tematica spațiului de lucru
-Name[ru]=Оформление рабочего стола
-Name[sk]=Téma pracovnej plochy
-Name[sl]=Tema delovnega prostora
-Name[sr]=Тема радног простора
-Name[sr@ijekavian]=Тема радног простора
-Name[sr@ijekavianlatin]=Tema radnog prostora
-Name[sr@latin]=Tema radnog prostora
-Name[sv]=Arbetsytans tema
-Name[tr]=Çalışma Alanı Teması
-Name[uk]=Тема робочого простору
-Name[x-test]=xxWorkspace Themexx
-Name[zh_CN]=工作空间主题
-Name[zh_TW]=工作空間主題