n# This is a combination of 2 commits.

[Desklets] Revamped desklet manager for consistency with applet manager