add grdesktop and clean up naming and add tags