Moved common code to desktop_environments