Cleaned+refactored and added support for \ in *.desktop and cat name