diff --git a/systemsettings/menu/laptop.desktop b/systemsettings/menu/laptop.desktop
new file mode 100644
index 0000000..98d7435
--- /dev/null
+++ b/systemsettings/menu/laptop.desktop
@@ -0,0 +1,135 @@
+[Desktop Entry]
+X-TDE-Library=laptop
+X-TDE-FactoryName=laptop
+X-TDE-Init=laptop
+Exec=kcmshell laptop
+Icon=laptop_battery
+Type=Application
+DocPath=kcontrol/laptop/index.html
+Categories=Qt;TDE;X-TDE-settings-hardware;
+Comment=Laptop Battery
+Comment[af]=Draagbare rekenaar Batery
+Comment[ar]=بطّاريّة الحاسوب المحمول
+Comment[bg]=Мониторинг на батериите на лаптоп
+Comment[br]=Pod-tredan an hezoug
+Comment[bs]=Upozorenje istrošene baterije
+Comment[ca]=Bateria de portàtil
+Comment[cs]=Baterie notebooku
+Comment[cy]=Batri Gliniadur
+Comment[da]=Batteri for bærbar
+Comment[de]=Notebook-Akku
+Comment[el]=Μπαταρία φορητού
+Comment[eo]=Avertilo por maplenigo de la baterio
+Comment[es]=Batería del portátil
+Comment[et]=Sülearvuti aku
+Comment[eu]=Magalekoen Bateria
+Comment[fa]=باتری رایانۀ کیفی
+Comment[fi]=Kannettavan akku
+Comment[fr]=Batterie d'ordinateur portable
+Comment[ga]=Cadhnra Ríomhaire Glúine
+Comment[he]=סוללת מחשב נייד
+Comment[hi]=लैपटॉप बैटरी
+Comment[hr]=Baterija laptopa
+Comment[hu]=Energiakezelési beállítások noteszgép esetén
+Comment[is]=Rafhlaða ferðavélar
+Comment[it]=Batteria computer portatile
+Comment[ja]=ラップトップバッテリ
+Comment[ka]=ლეპტოპის კვების ელემენტი
+Comment[kk]=Ноутбуктің аккумуляторы
+Comment[km]=ថ្ម​កុំព្យូទ័រ​យួរដៃ
+Comment[lt]=Nešiojamo kompiuterio akumuliatorius
+Comment[mk]=Предупредува кога батеријата е слаба
+Comment[ms]=Bateri Komputer Riba
+Comment[mt]=Batterija tal-laptop
+Comment[nb]=Batteri til bærbar maskin
+Comment[nds]=Klappreekner-Batterie
+Comment[ne]=ल्यापटप ब्याट्री
+Comment[nl]=Laptopbatterij
+Comment[nn]=Batteri til bærbar
+Comment[pa]=ਲੈਪਟਾਪ ਬੈਟਰੀ
+Comment[pl]=Ostrzeżenie o słabych bateriach
+Comment[pt]=Bateria do portátil
+Comment[pt_BR]=Bateria do Laptop
+Comment[ro]=Baterie de laptop
+Comment[ru]=Батарея ноутбука
+Comment[sk]=Batérie laptopu
+Comment[sl]=Baterija prenosnika
+Comment[sr]=Батерија лаптопа
+Comment[sr@Latn]=Baterija laptopa
+Comment[sv]=Batteri för bärbar dator
+Comment[ta]=  மடிக் கணினி மின்கலம்
+Comment[tg]=Батареяи Компютери Дастӣ
+Comment[th]=แบตเตอรีของเครื่องแลปทอบ
+Comment[tr]=Dizüstü Pili
+Comment[uk]=Батареї лептопа
+Comment[uz]=Laptopning batareyasi
+Comment[uz@cyrillic]=Лаптопнинг батареяси
+Comment[wa]=Batreye do poirtåve
+Comment[xh]=Ibhetri ye Laptop
+Comment[zh_CN]=便携电脑电池
+Comment[zh_TW]=筆記型電腦的電池
+Comment[zu]=Ibhetri Yekhomputha eyisicaba ephathwayo
+Name=Laptop Battery
+Name[af]=Draagbare rekenaar Batery
+Name[ar]=بطّاريّة الحاسوب المحمول
+Name[bg]=Батерии на лаптоп
+Name[br]=Pod-tredan an hezoug
+Name[bs]=Laptop baterija
+Name[ca]=Bateria de portàtil
+Name[cs]=Baterie notebooku
+Name[cy]=Batri Gliniadur
+Name[da]=Batteri for bærbar
+Name[de]=Notebook-Akku
+Name[el]=Μπαταρία φορητού
+Name[eo]=Portkomputila baterio
+Name[es]=Batería del portátil
+Name[et]=Sülearvuti aku
+Name[eu]=Magalekoen Bateria
+Name[fa]=باتری رایانۀ کیفی
+Name[fi]=Kannettavan akku
+Name[fr]=Batterie d'ordinateur portable
+Name[ga]=Cadhnra Ríomhaire Glúine
+Name[he]=סוללת מחשב נייד
+Name[hi]=लैपटॉप बैटरी
+Name[hr]=Laptop baterija
+Name[hu]=Noteszgép-telepek
+Name[is]=Ferðavélarafhlaða
+Name[it]=Batteria computer portatile
+Name[ja]=ラップトップバッテリ
+Name[ka]=ლეპტოპის კვების ელემენტი
+Name[kk]=Ноутбуктің аккумуляторы
+Name[km]=ថ្ម​កុំព្យូទ័រ​យួរដៃ
+Name[lt]=Laptop baterija
+Name[mk]=Батерија на лаптопот
+Name[ms]=Bateri Komputer Riba
+Name[mt]=Batterija tal-laptop
+Name[nb]=Batteri til bærbar maskin
+Name[nds]=Klappreekner-Batterie
+Name[ne]=ल्यापटप ब्याट्री
+Name[nl]=Laptopbatterij
+Name[nn]=Batteri til bærbar
+Name[pa]=ਲੈਪਟਾਪ ਬੈਟਰੀ
+Name[pl]=Bateria laptopa
+Name[pt]=Bateria do Portátil
+Name[pt_BR]=Bateria do Laptop
+Name[ro]=Baterie laptop
+Name[ru]=Батарея ноутбука
+Name[sk]=Batérie laptopu
+Name[sl]=Baterija prenosnika
+Name[sr]=Батерија лаптопа
+Name[sr@Latn]=Baterija laptopa
+Name[sv]=Batteri för bärbar dator
+Name[ta]= மடிக் கணினி மின்கலம்
+Name[tg]=Батареяи Компютери Дастӣ
+Name[th]=แบตเตอรีแลปทอบ
+Name[tr]=Dizüstü Pili
+Name[uk]=Батареї лептопа
+Name[uz]=Laptopning batareyasi
+Name[uz@cyrillic]=Лаптопнинг батареяси
+Name[wa]=Batreye do poirtåve
+Name[xh]=Ibhetri ye Laptop
+Name[zh_CN]=便携电脑电池
+Name[zh_TW]=筆記型電腦的電池
+Name[zu]=Ibhetri Yekhomputha eyisicaba ephathwayo
+Init=klaptop_check
+
diff --git a/systemsettings/menu/laptoppowermanagement.desktop b/systemsettings/menu/laptoppowermanagement.desktop
deleted file mode 100644
index 1be9319..0000000
--- a/systemsettings/menu/laptoppowermanagement.desktop
+++ /dev/null
@@ -1,43 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-X-TDE-Library=laptop
-X-TDE-FactoryName=laptop
-X-TDE-Init=laptop
-Exec=kcmshell laptop
-Icon=laptop_battery
-Type=Application
-DocPath=kcontrol/laptop/index.html
-
-## Keep this out of kcontrol
-#Categories=Qt;TDE;X-TDE-settings-power;
-
-Comment=Laptop Power Management
-Comment[ar]=تدبير الطاقة للحاسوب النقال
-Comment[bg]=Захранване за лаптоп
-Comment[da]=Strømhåndtering for bærbar computer
-Comment[de]=Laptop-Energieverwaltung
-Comment[el]=Διαχείριση ενέργειας φορητού υπολογιστή
-Comment[es]=Administración de energía del portátil
-Comment[et]=Sülearvuti voolutarbe haldus
-Comment[gl]=Xestión de Enerxia de Portáteis
-Comment[ja]=ラップトップの電源管理
-Comment[nl]=Laptop energiebeheer
-Comment[pt]=Gestão de Energia de Portáteis
-Comment[pt_BR]=Gerenciamento de Energia do Laptop
-Comment[sv]=Strömhantering för bärbar dator
-Name=Power Management
-Name[ar]=إدخار الطاقة
-Name[bg]=Захранване
-Name[br]=Merañ ar gremm
-Name[da]=Energisparefunktion
-Name[de]=Energierverwaltung
-Name[el]=Διαχείριση ενέργειας
-Name[es]=Administración de energía
-Name[et]=Voolutarbe haldus
-Name[gl]=Xestión da Enerxia
-Name[ja]=電源管理
-Name[nl]=Energiebeheer
-Name[pt]=Gestão de Energia
-Name[pt_BR]=Gerenciamento de Energia
-Name[sv]=Energisparfunktion
-Init=klaptop_check