Moved global shortcuts into general shortcuts