diff --git a/backend/union/union.go b/backend/union/union.go
index b619c2f9d..8934a2526 100644
--- a/backend/union/union.go
+++ b/backend/union/union.go
@@ -21,7 +21,7 @@ import (
 func init() {
 	fsi := &fs.RegInfo{
 		Name:        "union",
-		Description: "A stackable unification remote, which can appear to merge the contents of several remotes",
+		Description: "Union merges the contents of several remotes",
 		NewFs:       NewFs,
 		Options: []fs.Option{{
 			Name:     "remotes",
diff --git a/docs/content/alias.md b/docs/content/alias.md
index bc91d5023..83738a7a0 100644
--- a/docs/content/alias.md
+++ b/docs/content/alias.md
@@ -41,51 +41,11 @@ n/s/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Alias for an existing remote
+[snip]
+XX / Alias for an existing remote
    \ "alias"
- 2 / Amazon Drive
-   \ "amazon cloud drive"
- 3 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 4 / Backblaze B2
-   \ "b2"
- 5 / Box
-   \ "box"
- 6 / Cache a remote
-   \ "cache"
- 7 / Dropbox
-   \ "dropbox"
- 8 / Encrypt/Decrypt a remote
-   \ "crypt"
- 9 / FTP Connection
-   \ "ftp"
-10 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
-11 / Google Drive
-   \ "drive"
-12 / Hubic
-   \ "hubic"
-13 / Local Disk
-   \ "local"
-14 / Microsoft Azure Blob Storage
-   \ "azureblob"
-15 / Microsoft OneDrive
-   \ "onedrive"
-16 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-17 / Pcloud
-   \ "pcloud"
-18 / QingCloud Object Storage
-   \ "qingstor"
-19 / SSH/SFTP Connection
-   \ "sftp"
-20 / Webdav
-   \ "webdav"
-21 / Yandex Disk
-   \ "yandex"
-22 / http Connection
-   \ "http"
-Storage> 1
+[snip]
+Storage> alias
 Remote or path to alias.
 Can be "myremote:path/to/dir", "myremote:bucket", "myremote:" or "/local/path".
 remote> /mnt/storage/backup
diff --git a/docs/content/amazonclouddrive.md b/docs/content/amazonclouddrive.md
index 47cd15eec..da1f592b1 100644
--- a/docs/content/amazonclouddrive.md
+++ b/docs/content/amazonclouddrive.md
@@ -65,35 +65,11 @@ n/r/c/s/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
+[snip]
+XX / Amazon Drive
    \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Dropbox
-   \ "dropbox"
- 5 / Encrypt/Decrypt a remote
-   \ "crypt"
- 6 / FTP Connection
-   \ "ftp"
- 7 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 8 / Google Drive
-   \ "drive"
- 9 / Hubic
-   \ "hubic"
-10 / Local Disk
-   \ "local"
-11 / Microsoft OneDrive
-   \ "onedrive"
-12 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-13 / SSH/SFTP Connection
-   \ "sftp"
-14 / Yandex Disk
-   \ "yandex"
-Storage> 1
+[snip]
+Storage> amazon cloud drive
 Amazon Application Client Id - required.
 client_id> your client ID goes here
 Amazon Application Client Secret - required.
diff --git a/docs/content/azureblob.md b/docs/content/azureblob.md
index 6dfa42693..ee9df1ab9 100644
--- a/docs/content/azureblob.md
+++ b/docs/content/azureblob.md
@@ -27,40 +27,10 @@ n/s/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Box
-   \ "box"
- 5 / Dropbox
-   \ "dropbox"
- 6 / Encrypt/Decrypt a remote
-   \ "crypt"
- 7 / FTP Connection
-   \ "ftp"
- 8 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 9 / Google Drive
-   \ "drive"
-10 / Hubic
-   \ "hubic"
-11 / Local Disk
-   \ "local"
-12 / Microsoft Azure Blob Storage
+[snip]
+XX / Microsoft Azure Blob Storage
    \ "azureblob"
-13 / Microsoft OneDrive
-   \ "onedrive"
-14 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-15 / SSH/SFTP Connection
-   \ "sftp"
-16 / Yandex Disk
-   \ "yandex"
-17 / http Connection
-   \ "http"
+[snip]
 Storage> azureblob
 Storage Account Name
 account> account_name
diff --git a/docs/content/b2.md b/docs/content/b2.md
index 7275ccb2b..a37f729c3 100644
--- a/docs/content/b2.md
+++ b/docs/content/b2.md
@@ -30,33 +30,11 @@ n/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
+[snip]
+XX / Backblaze B2
    \ "b2"
- 4 / Dropbox
-   \ "dropbox"
- 5 / Encrypt/Decrypt a remote
-   \ "crypt"
- 6 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 7 / Google Drive
-   \ "drive"
- 8 / Hubic
-   \ "hubic"
- 9 / Local Disk
-   \ "local"
-10 / Microsoft OneDrive
-   \ "onedrive"
-11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-12 / SSH/SFTP Connection
-   \ "sftp"
-13 / Yandex Disk
-   \ "yandex"
-Storage> 3
+[snip]
+Storage> b2
 Account ID or Application Key ID
 account> 123456789abc
 Application Key
diff --git a/docs/content/box.md b/docs/content/box.md
index 44e3e8773..bf23edcc4 100644
--- a/docs/content/box.md
+++ b/docs/content/box.md
@@ -29,38 +29,10 @@ n/s/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Box
+[snip]
+XX / Box
    \ "box"
- 5 / Dropbox
-   \ "dropbox"
- 6 / Encrypt/Decrypt a remote
-   \ "crypt"
- 7 / FTP Connection
-   \ "ftp"
- 8 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 9 / Google Drive
-   \ "drive"
-10 / Hubic
-   \ "hubic"
-11 / Local Disk
-   \ "local"
-12 / Microsoft OneDrive
-   \ "onedrive"
-13 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-14 / SSH/SFTP Connection
-   \ "sftp"
-15 / Yandex Disk
-   \ "yandex"
-16 / http Connection
-   \ "http"
+[snip]
 Storage> box
 Box App Client Id - leave blank normally.
 client_id> 
diff --git a/docs/content/cache.md b/docs/content/cache.md
index acd7efafc..e3cfa0c8d 100644
--- a/docs/content/cache.md
+++ b/docs/content/cache.md
@@ -30,11 +30,11 @@ n/r/c/s/q> n
 name> test-cache
 Type of storage to configure.
 Choose a number from below, or type in your own value
-...
- 5 / Cache a remote
+[snip]
+XX / Cache a remote
    \ "cache"
-...
-Storage> 5
+[snip]
+Storage> cache
 Remote to cache.
 Normally should contain a ':' and a path, eg "myremote:path/to/dir",
 "myremote:bucket" or maybe "myremote:" (not recommended).
diff --git a/docs/content/crypt.md b/docs/content/crypt.md
index c83f6852c..2b55aff9f 100644
--- a/docs/content/crypt.md
+++ b/docs/content/crypt.md
@@ -34,33 +34,11 @@ n/s/q> n
 name> secret
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Dropbox
-   \ "dropbox"
- 5 / Encrypt/Decrypt a remote
+[snip]
+XX / Encrypt/Decrypt a remote
    \ "crypt"
- 6 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 7 / Google Drive
-   \ "drive"
- 8 / Hubic
-   \ "hubic"
- 9 / Local Disk
-   \ "local"
-10 / Microsoft OneDrive
-   \ "onedrive"
-11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-12 / SSH/SFTP Connection
-   \ "sftp"
-13 / Yandex Disk
-   \ "yandex"
-Storage> 5
+[snip]
+Storage> crypt
 Remote to encrypt/decrypt.
 Normally should contain a ':' and a path, eg "myremote:path/to/dir",
 "myremote:bucket" or maybe "myremote:" (not recommended).
diff --git a/docs/content/drive.md b/docs/content/drive.md
index a2d2cdb7d..bb58a7327 100644
--- a/docs/content/drive.md
+++ b/docs/content/drive.md
@@ -33,7 +33,7 @@ name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
 [snip]
-10 / Google Drive
+XX / Google Drive
    \ "drive"
 [snip]
 Storage> drive
diff --git a/docs/content/dropbox.md b/docs/content/dropbox.md
index a22a45333..da37b8328 100644
--- a/docs/content/dropbox.md
+++ b/docs/content/dropbox.md
@@ -30,33 +30,11 @@ e/n/d/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Dropbox
+[snip]
+XX / Dropbox
    \ "dropbox"
- 5 / Encrypt/Decrypt a remote
-   \ "crypt"
- 6 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 7 / Google Drive
-   \ "drive"
- 8 / Hubic
-   \ "hubic"
- 9 / Local Disk
-   \ "local"
-10 / Microsoft OneDrive
-   \ "onedrive"
-11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-12 / SSH/SFTP Connection
-   \ "sftp"
-13 / Yandex Disk
-   \ "yandex"
-Storage> 4
+[snip]
+Storage> dropbox
 Dropbox App Key - leave blank normally.
 app_key>
 Dropbox App Secret - leave blank normally.
diff --git a/docs/content/fichier.md b/docs/content/fichier.md
index 45db7601e..786f74303 100644
--- a/docs/content/fichier.md
+++ b/docs/content/fichier.md
@@ -34,9 +34,10 @@ name> remote
 Type of storage to configure.
 Enter a string value. Press Enter for the default ("").
 Choose a number from below, or type in your own value
-  1 / 1Fichier
-    \ "fichier"
-...
+[snip]
+XX / 1Fichier
+   \ "fichier"
+[snip]
 Storage> fichier
 ** See help for fichier backend at: https://rclone.org/fichier/ **
 
diff --git a/docs/content/ftp.md b/docs/content/ftp.md
index ebb4afd15..02b1cc7c1 100644
--- a/docs/content/ftp.md
+++ b/docs/content/ftp.md
@@ -33,7 +33,7 @@ Type of storage to configure.
 Enter a string value. Press Enter for the default ("").
 Choose a number from below, or type in your own value
 [snip]
-10 / FTP Connection
+XX / FTP Connection
    \ "ftp"
 [snip]
 Storage> ftp
diff --git a/docs/content/googlecloudstorage.md b/docs/content/googlecloudstorage.md
index dd8fed7b7..6ab4611c6 100644
--- a/docs/content/googlecloudstorage.md
+++ b/docs/content/googlecloudstorage.md
@@ -28,33 +28,11 @@ e/n/d/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Dropbox
-   \ "dropbox"
- 5 / Encrypt/Decrypt a remote
-   \ "crypt"
- 6 / Google Cloud Storage (this is not Google Drive)
+[snip]
+XX / Google Cloud Storage (this is not Google Drive)
    \ "google cloud storage"
- 7 / Google Drive
-   \ "drive"
- 8 / Hubic
-   \ "hubic"
- 9 / Local Disk
-   \ "local"
-10 / Microsoft OneDrive
-   \ "onedrive"
-11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-12 / SSH/SFTP Connection
-   \ "sftp"
-13 / Yandex Disk
-   \ "yandex"
-Storage> 6
+[snip]
+Storage> google cloud storage
 Google Application Client Id - leave blank normally.
 client_id>
 Google Application Client Secret - leave blank normally.
diff --git a/docs/content/googlephotos.md b/docs/content/googlephotos.md
index a906a5ec0..d66ba10da 100644
--- a/docs/content/googlephotos.md
+++ b/docs/content/googlephotos.md
@@ -38,7 +38,7 @@ Type of storage to configure.
 Enter a string value. Press Enter for the default ("").
 Choose a number from below, or type in your own value
 [snip]
-13 / Google Photos
+XX / Google Photos
    \ "google photos"
 [snip]
 Storage> google photos
diff --git a/docs/content/http.md b/docs/content/http.md
index 32c7c6e69..6ef5ab473 100644
--- a/docs/content/http.md
+++ b/docs/content/http.md
@@ -32,36 +32,10 @@ n/s/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Dropbox
-   \ "dropbox"
- 5 / Encrypt/Decrypt a remote
-   \ "crypt"
- 6 / FTP Connection
-   \ "ftp"
- 7 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 8 / Google Drive
-   \ "drive"
- 9 / Hubic
-   \ "hubic"
-10 / Local Disk
-   \ "local"
-11 / Microsoft OneDrive
-   \ "onedrive"
-12 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-13 / SSH/SFTP Connection
-   \ "sftp"
-14 / Yandex Disk
-   \ "yandex"
-15 / http Connection
+[snip]
+XX / http Connection
    \ "http"
+[snip]
 Storage> http
 URL of http host to connect to
 Choose a number from below, or type in your own value
diff --git a/docs/content/hubic.md b/docs/content/hubic.md
index d7ae9a18f..011ad12c3 100644
--- a/docs/content/hubic.md
+++ b/docs/content/hubic.md
@@ -28,33 +28,11 @@ n/s> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Dropbox
-   \ "dropbox"
- 5 / Encrypt/Decrypt a remote
-   \ "crypt"
- 6 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 7 / Google Drive
-   \ "drive"
- 8 / Hubic
+[snip]
+XX / Hubic
    \ "hubic"
- 9 / Local Disk
-   \ "local"
-10 / Microsoft OneDrive
-   \ "onedrive"
-11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-12 / SSH/SFTP Connection
-   \ "sftp"
-13 / Yandex Disk
-   \ "yandex"
-Storage> 8
+[snip]
+Storage> hubic
 Hubic Client Id - leave blank normally.
 client_id>
 Hubic Client Secret - leave blank normally.
diff --git a/docs/content/jottacloud.md b/docs/content/jottacloud.md
index 547252951..4a5df99ec 100644
--- a/docs/content/jottacloud.md
+++ b/docs/content/jottacloud.md
@@ -30,7 +30,7 @@ Type of storage to configure.
 Enter a string value. Press Enter for the default ("").
 Choose a number from below, or type in your own value
 [snip]
-14 / JottaCloud
+XX / JottaCloud
    \ "jottacloud"
 [snip]
 Storage> jottacloud
diff --git a/docs/content/koofr.md b/docs/content/koofr.md
index 3d5ea3d8f..cea5d354f 100644
--- a/docs/content/koofr.md
+++ b/docs/content/koofr.md
@@ -32,60 +32,10 @@ name> koofr
 Type of storage to configure.
 Enter a string value. Press Enter for the default ("").
 Choose a number from below, or type in your own value
- 1 / A stackable unification remote, which can appear to merge the contents of several remotes
-   \ "union"
- 2 / Alias for an existing remote
-   \ "alias"
- 3 / Amazon Drive
-   \ "amazon cloud drive"
- 4 / Amazon S3 Compliant Storage Provider (AWS, Alibaba, Ceph, Digital Ocean, Dreamhost, IBM COS, Minio, etc)
-   \ "s3"
- 5 / Backblaze B2
-   \ "b2"
- 6 / Box
-   \ "box"
- 7 / Cache a remote
-   \ "cache"
- 8 / Dropbox
-   \ "dropbox"
- 9 / Encrypt/Decrypt a remote
-   \ "crypt"
-10 / FTP Connection
-   \ "ftp"
-11 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
-12 / Google Drive
-   \ "drive"
-13 / Hubic
-   \ "hubic"
-14 / JottaCloud
-   \ "jottacloud"
-15 / Koofr
+[snip]
+XX / Koofr
    \ "koofr"
-16 / Local Disk
-   \ "local"
-17 / Mega
-   \ "mega"
-18 / Microsoft Azure Blob Storage
-   \ "azureblob"
-19 / Microsoft OneDrive
-   \ "onedrive"
-20 / OpenDrive
-   \ "opendrive"
-21 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-22 / Pcloud
-   \ "pcloud"
-23 / QingCloud Object Storage
-   \ "qingstor"
-24 / SSH/SFTP Connection
-   \ "sftp"
-25 / Webdav
-   \ "webdav"
-26 / Yandex Disk
-   \ "yandex"
-27 / http Connection
-   \ "http"
+[snip]
 Storage> koofr
 ** See help for koofr backend at: https://rclone.org/koofr/ **
 
diff --git a/docs/content/mega.md b/docs/content/mega.md
index 16702322b..796d7fbf6 100644
--- a/docs/content/mega.md
+++ b/docs/content/mega.md
@@ -35,14 +35,10 @@ n/s/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Alias for an existing remote
-   \ "alias"
 [snip]
-14 / Mega
+XX / Mega
    \ "mega"
 [snip]
-23 / http Connection
-   \ "http"
 Storage> mega
 User name
 user> you@example.com
diff --git a/docs/content/onedrive.md b/docs/content/onedrive.md
index 90fe0f4fe..242be0f42 100644
--- a/docs/content/onedrive.md
+++ b/docs/content/onedrive.md
@@ -34,11 +34,11 @@ name> remote
 Type of storage to configure.
 Enter a string value. Press Enter for the default ("").
 Choose a number from below, or type in your own value
-...
-18 / Microsoft OneDrive
+[snip]
+XX / Microsoft OneDrive
    \ "onedrive"
-...
-Storage> 18
+[snip]
+Storage> onedrive
 Microsoft App Client Id
 Leave blank normally.
 Enter a string value. Press Enter for the default ("").
diff --git a/docs/content/opendrive.md b/docs/content/opendrive.md
index 2caf42734..152e83fd6 100644
--- a/docs/content/opendrive.md
+++ b/docs/content/opendrive.md
@@ -25,35 +25,11 @@ e/n/d/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Dropbox
-   \ "dropbox"
- 5 / Encrypt/Decrypt a remote
-   \ "crypt"
- 6 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 7 / Google Drive
-   \ "drive"
- 8 / Hubic
-   \ "hubic"
- 9 / Local Disk
-   \ "local"
-10 / OpenDrive
+[snip]
+XX / OpenDrive
    \ "opendrive"
-11 / Microsoft OneDrive
-   \ "onedrive"
-12 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-13 / SSH/SFTP Connection
-   \ "sftp"
-14 / Yandex Disk
-   \ "yandex"
-Storage> 10
+[snip]
+Storage> opendrive
 Username
 username>
 Password
diff --git a/docs/content/pcloud.md b/docs/content/pcloud.md
index 2805634f9..47c206adf 100644
--- a/docs/content/pcloud.md
+++ b/docs/content/pcloud.md
@@ -29,44 +29,10 @@ n/s/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Box
-   \ "box"
- 5 / Dropbox
-   \ "dropbox"
- 6 / Encrypt/Decrypt a remote
-   \ "crypt"
- 7 / FTP Connection
-   \ "ftp"
- 8 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 9 / Google Drive
-   \ "drive"
-10 / Hubic
-   \ "hubic"
-11 / Local Disk
-   \ "local"
-12 / Microsoft Azure Blob Storage
-   \ "azureblob"
-13 / Microsoft OneDrive
-   \ "onedrive"
-14 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-15 / Pcloud
+[snip]
+XX / Pcloud
    \ "pcloud"
-16 / QingCloud Object Storage
-   \ "qingstor"
-17 / SSH/SFTP Connection
-   \ "sftp"
-18 / Yandex Disk
-   \ "yandex"
-19 / http Connection
-   \ "http"
+[snip]
 Storage> pcloud
 Pcloud App Client Id - leave blank normally.
 client_id> 
diff --git a/docs/content/premiumizeme.md b/docs/content/premiumizeme.md
index 2d66e5cc1..4afa97e9a 100644
--- a/docs/content/premiumizeme.md
+++ b/docs/content/premiumizeme.md
@@ -31,8 +31,9 @@ Type of storage to configure.
 Enter a string value. Press Enter for the default ("").
 Choose a number from below, or type in your own value
 [snip]
-30 / premiumize.me
+XX / premiumize.me
    \ "premiumizeme"
+[snip]
 Storage> premiumizeme
 ** See help for premiumizeme backend at: https://rclone.org/premiumizeme/ **
 
diff --git a/docs/content/putio.md b/docs/content/putio.md
index c14ea61c5..996ee51d6 100644
--- a/docs/content/putio.md
+++ b/docs/content/putio.md
@@ -33,7 +33,7 @@ Type of storage to configure.
 Enter a string value. Press Enter for the default ("").
 Choose a number from below, or type in your own value
 [snip]
-25 / Put.io
+XX / Put.io
    \ "putio"
 [snip]
 Storage> putio
diff --git a/docs/content/qingstor.md b/docs/content/qingstor.md
index c632172ee..af1446755 100644
--- a/docs/content/qingstor.md
+++ b/docs/content/qingstor.md
@@ -27,37 +27,11 @@ n/r/c/s/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Dropbox
-   \ "dropbox"
- 5 / Encrypt/Decrypt a remote
-   \ "crypt"
- 6 / FTP Connection
-   \ "ftp"
- 7 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 8 / Google Drive
-   \ "drive"
- 9 / Hubic
-   \ "hubic"
-10 / Local Disk
-   \ "local"
-11 / Microsoft OneDrive
-   \ "onedrive"
-12 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-13 / QingStor Object Storage
+[snip]
+XX / QingStor Object Storage
    \ "qingstor"
-14 / SSH/SFTP Connection
-   \ "sftp"
-15 / Yandex Disk
-   \ "yandex"
-Storage> 13
+[snip]
+Storage> qingstor
 Get QingStor credentials from runtime. Only applies if access_key_id and secret_access_key is blank.
 Choose a number from below, or type in your own value
  1 / Enter QingStor credentials in the next step
diff --git a/docs/content/s3.md b/docs/content/s3.md
index 9bb4d8934..21a8a2b4b 100644
--- a/docs/content/s3.md
+++ b/docs/content/s3.md
@@ -58,17 +58,10 @@ n/s/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Alias for an existing remote
-   \ "alias"
- 2 / Amazon Drive
-   \ "amazon cloud drive"
- 3 / Amazon S3 Compliant Storage Providers (AWS, Ceph, Dreamhost, IBM COS, Minio)
-   \ "s3"
- 4 / Backblaze B2
-   \ "b2"
 [snip]
-23 / http Connection
-   \ "http"
+XX / Amazon S3 Compliant Storage Providers (AWS, Ceph, Dreamhost, IBM COS, Minio)
+   \ "s3"
+[snip]
 Storage> s3
 Choose your S3 provider.
 Choose a number from below, or type in your own value
@@ -1527,9 +1520,8 @@ n/s> n
 name> wasabi
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
+[snip]
+XX / Amazon S3 (also Dreamhost, Ceph, Minio)
    \ "s3"
 [snip]
 Storage> s3
diff --git a/docs/content/sftp.md b/docs/content/sftp.md
index 8009c422e..125aeb03e 100644
--- a/docs/content/sftp.md
+++ b/docs/content/sftp.md
@@ -41,36 +41,10 @@ n/s/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Dropbox
-   \ "dropbox"
- 5 / Encrypt/Decrypt a remote
-   \ "crypt"
- 6 / FTP Connection
-   \ "ftp"
- 7 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 8 / Google Drive
-   \ "drive"
- 9 / Hubic
-   \ "hubic"
-10 / Local Disk
-   \ "local"
-11 / Microsoft OneDrive
-   \ "onedrive"
-12 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-13 / SSH/SFTP Connection
+[snip]
+XX / SSH/SFTP Connection
    \ "sftp"
-14 / Yandex Disk
-   \ "yandex"
-15 / http Connection
-   \ "http"
+[snip]
 Storage> sftp
 SSH host to connect to
 Choose a number from below, or type in your own value
diff --git a/docs/content/swift.md b/docs/content/swift.md
index 5a1858f11..3c5750a0d 100644
--- a/docs/content/swift.md
+++ b/docs/content/swift.md
@@ -34,48 +34,10 @@ n/s/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Box
-   \ "box"
- 5 / Cache a remote
-   \ "cache"
- 6 / Dropbox
-   \ "dropbox"
- 7 / Encrypt/Decrypt a remote
-   \ "crypt"
- 8 / FTP Connection
-   \ "ftp"
- 9 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
-10 / Google Drive
-   \ "drive"
-11 / Hubic
-   \ "hubic"
-12 / Local Disk
-   \ "local"
-13 / Microsoft Azure Blob Storage
-   \ "azureblob"
-14 / Microsoft OneDrive
-   \ "onedrive"
-15 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
+[snip]
+XX / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
    \ "swift"
-16 / Pcloud
-   \ "pcloud"
-17 / QingCloud Object Storage
-   \ "qingstor"
-18 / SSH/SFTP Connection
-   \ "sftp"
-19 / Webdav
-   \ "webdav"
-20 / Yandex Disk
-   \ "yandex"
-21 / http Connection
-   \ "http"
+[snip]
 Storage> swift
 Get swift credentials from environment variables in standard OpenStack form.
 Choose a number from below, or type in your own value
diff --git a/docs/content/union.md b/docs/content/union.md
index 502ff7c31..2ea039262 100644
--- a/docs/content/union.md
+++ b/docs/content/union.md
@@ -44,58 +44,10 @@ n/s/q> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Alias for an existing remote
-   \ "alias"
- 2 / Amazon Drive
-   \ "amazon cloud drive"
- 3 / Amazon S3 Compliant Storage Providers (AWS, Ceph, Dreamhost, IBM COS, Minio)
-   \ "s3"
- 4 / Backblaze B2
-   \ "b2"
- 5 / Box
-   \ "box"
- 6 / Builds a stackable unification remote, which can appear to merge the contents of several remotes
+[snip]
+XX / Union merges the contents of several remotes
    \ "union"
- 7 / Cache a remote
-   \ "cache"
- 8 / Dropbox
-   \ "dropbox"
- 9 / Encrypt/Decrypt a remote
-   \ "crypt"
-10 / FTP Connection
-   \ "ftp"
-11 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
-12 / Google Drive
-   \ "drive"
-13 / Hubic
-   \ "hubic"
-14 / JottaCloud
-   \ "jottacloud"
-15 / Local Disk
-   \ "local"
-16 / Mega
-   \ "mega"
-17 / Microsoft Azure Blob Storage
-   \ "azureblob"
-18 / Microsoft OneDrive
-   \ "onedrive"
-19 / OpenDrive
-   \ "opendrive"
-20 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-21 / Pcloud
-   \ "pcloud"
-22 / QingCloud Object Storage
-   \ "qingstor"
-23 / SSH/SFTP Connection
-   \ "sftp"
-24 / Webdav
-   \ "webdav"
-25 / Yandex Disk
-   \ "yandex"
-26 / http Connection
-   \ "http"
+[snip]
 Storage> union
 List of space separated remotes.
 Can be 'remotea:test/dir remoteb:', '"remotea:test/space dir" remoteb:', etc.
diff --git a/docs/content/webdav.md b/docs/content/webdav.md
index 514cdd74d..f71e4be61 100644
--- a/docs/content/webdav.md
+++ b/docs/content/webdav.md
@@ -31,7 +31,7 @@ name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
 [snip]
-22 / Webdav
+XX / Webdav
    \ "webdav"
 [snip]
 Storage> webdav
diff --git a/docs/content/yandex.md b/docs/content/yandex.md
index d56c172b6..78c4eb589 100644
--- a/docs/content/yandex.md
+++ b/docs/content/yandex.md
@@ -25,33 +25,11 @@ n/s> n
 name> remote
 Type of storage to configure.
 Choose a number from below, or type in your own value
- 1 / Amazon Drive
-   \ "amazon cloud drive"
- 2 / Amazon S3 (also Dreamhost, Ceph, Minio)
-   \ "s3"
- 3 / Backblaze B2
-   \ "b2"
- 4 / Dropbox
-   \ "dropbox"
- 5 / Encrypt/Decrypt a remote
-   \ "crypt"
- 6 / Google Cloud Storage (this is not Google Drive)
-   \ "google cloud storage"
- 7 / Google Drive
-   \ "drive"
- 8 / Hubic
-   \ "hubic"
- 9 / Local Disk
-   \ "local"
-10 / Microsoft OneDrive
-   \ "onedrive"
-11 / Openstack Swift (Rackspace Cloud Files, Memset Memstore, OVH)
-   \ "swift"
-12 / SSH/SFTP Connection
-   \ "sftp"
-13 / Yandex Disk
+[snip]
+XX / Yandex Disk
    \ "yandex"
-Storage> 13
+[snip]
+Storage> yandex
 Yandex Client Id - leave blank normally.
 client_id>
 Yandex Client Secret - leave blank normally.