Lots of fixes, uses .desktop file from upstream