Adding new categories: Desktop Environments, Internet and Security. Slightly renaming other titles and general clean up as well.