Upgraded for current and KDE 4.10