Moving shortcuts to plugins. Cleaning up.