diff --git a/appliances/cisco-asav.gns3a b/appliances/cisco-asav.gns3a
index a593bed..e34cc62 100644
--- a/appliances/cisco-asav.gns3a
+++ b/appliances/cisco-asav.gns3a
@@ -37,7 +37,8 @@
             "md5sum": "ca071370278ecbd5dfdb1c5a4161571a",
             "filesize": 160038912,
             "download_url": "https://virl.mediuscorp.com/my-account/"
-        }    ],
+        }
+    ],
     "versions": [
         {
             "name": "9.5.2-204",
diff --git a/appliances/cisco-iosv.gns3a b/appliances/cisco-iosv.gns3a
index 988416c..22c6ae7 100644
--- a/appliances/cisco-iosv.gns3a
+++ b/appliances/cisco-iosv.gns3a
@@ -44,7 +44,7 @@
         }
     ],
     "versions": [
-         {
+        {
             "name": "15.6(2)T",
             "images": {
                 "hda_disk_image": "vios-adventerprisek9-m.vmdk.SPA.156-2.T"
diff --git a/appliances/fortiadc.gns3a b/appliances/fortiadc.gns3a
index d7077c3..31cf3bf 100644
--- a/appliances/fortiadc.gns3a
+++ b/appliances/fortiadc.gns3a
@@ -11,22 +11,20 @@
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "symbol": "loadbalancer.svg",
     "usage": "Default username is admin, no password is set. Silent boot, it might take a while.",
+    "symbol": "loadbalancer.svg",
     "port_name_format": "Port{port1}",
-
     "qemu": {
         "adapter_type": "virtio-net-pci",
+        "adapters": 10,
+        "ram": 2048,
         "hda_disk_interface": "virtio",
         "hdb_disk_interface": "virtio",
-        "adapters": 10,
-        "console_type": "telnet",
-        "ram": 2048,
         "arch": "x86_64",
+        "console_type": "telnet",
         "boot_priority": "c",
         "kvm": "allow"
     },
-
     "images": [
         {
             "filename": "FAD_KVM-v400-build0560-FORTINET.out.kvm-boot.qcow2",
@@ -42,9 +40,7 @@
             "filesize": 30998528,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         }
-
     ],
-
     "versions": [
         {
             "name": "4.5.0",
diff --git a/appliances/fortianalyzer.gns3a b/appliances/fortianalyzer.gns3a
index b62a3a7..45aad41 100644
--- a/appliances/fortianalyzer.gns3a
+++ b/appliances/fortianalyzer.gns3a
@@ -6,26 +6,24 @@
     "vendor_url": "http://www.fortinet.com/",
     "documentation_url": "http://docs.fortinet.com/fortianalyzer/",
     "product_name": "FortiAnalyzer",
-    "product_url": "http://www.fortinet.com/products/fortianalyzer/",
+    "product_url": "https://www.fortinet.com/products-services/products/management-reporting/fortianalyzer.html",
     "registry_version": 1,
     "status": "stable",
     "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
     "usage": "Default username is admin, no password is set.",
     "port_name_format": "Port{port1}",
-
     "qemu": {
         "adapter_type": "virtio-net-pci",
+        "adapters": 4,
+        "ram": 1024,
         "hda_disk_interface": "virtio",
         "hdb_disk_interface": "virtio",
-        "adapters": 4,
-        "console_type": "telnet",
-        "ram": 1024,
         "arch": "x86_64",
+        "console_type": "telnet",
         "boot_priority": "c",
         "kvm": "allow"
     },
-
     "images": [
         {
             "filename": "FAZ_VM64_KVM-v5-build1019-FORTINET.out.kvm.qcow2",
@@ -49,9 +47,7 @@
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
             "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
-
     ],
-
     "versions": [
         {
             "name": "5.4.0",
diff --git a/appliances/fortimail.gns3a b/appliances/fortimail.gns3a
index 1a376bf..1090eac 100644
--- a/appliances/fortimail.gns3a
+++ b/appliances/fortimail.gns3a
@@ -13,19 +13,17 @@
     "maintainer_email": "developers@gns3.net",
     "usage": "First boot takes a few minutes. Admin URL is https://x.x.x.x/admin, default username is admin, no password is set.",
     "port_name_format": "Port{port1}",
-
     "qemu": {
         "adapter_type": "virtio-net-pci",
+        "adapters": 4,
+        "ram": 1024,
         "hda_disk_interface": "virtio",
         "hdb_disk_interface": "virtio",
-        "adapters": 4,
-        "console_type": "telnet",
-        "ram": 1024,
         "arch": "x86_64",
+        "console_type": "telnet",
         "boot_priority": "c",
         "kvm": "allow"
     },
-
     "images": [
         {
             "filename": "FML_VMKV-64-v53-build0593-FORTINET.out.kvm.qcow2",
@@ -42,9 +40,7 @@
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
             "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
-
     ],
-
     "versions": [
         {
             "name": "5.3.2",
diff --git a/appliances/fortimanager.gns3a b/appliances/fortimanager.gns3a
index e2fe73f..73256fa 100644
--- a/appliances/fortimanager.gns3a
+++ b/appliances/fortimanager.gns3a
@@ -13,19 +13,17 @@
     "maintainer_email": "developers@gns3.net",
     "usage": "Default username is admin, no password is set.",
     "port_name_format": "Port{port1}",
-
     "qemu": {
         "adapter_type": "virtio-net-pci",
+        "adapters": 4,
+        "ram": 1024,
         "hda_disk_interface": "virtio",
         "hdb_disk_interface": "virtio",
-        "adapters": 4,
-        "console_type": "telnet",
-        "ram": 1024,
         "arch": "x86_64",
+        "console_type": "telnet",
         "boot_priority": "c",
         "kvm": "allow"
     },
-
     "images": [
         {
             "filename": "FMG_VM64_KVM-v5-build1019-FORTINET.out.kvm.qcow2",
@@ -49,9 +47,7 @@
             "download_url": "https://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/",
             "direct_download_url": "http://sourceforge.net/projects/gns-3/files/Empty%20Qemu%20disk/empty30G.qcow2/download"
         }
-
     ],
-
     "versions": [
         {
             "name": "5.4.0",
diff --git a/appliances/fortiweb.gns3a b/appliances/fortiweb.gns3a
index dafdf0e..55d8d24 100644
--- a/appliances/fortiweb.gns3a
+++ b/appliances/fortiweb.gns3a
@@ -13,19 +13,17 @@
     "maintainer_email": "developers@gns3.net",
     "usage": "Default username is admin, no password is set. Console keeps sending 'access uuid file failed, error number 2' messages; ignore it.",
     "port_name_format": "Port{port1}",
-
     "qemu": {
         "adapter_type": "virtio-net-pci",
+        "adapters": 4,
+        "ram": 2048,
         "hda_disk_interface": "virtio",
         "hdb_disk_interface": "virtio",
-        "adapters": 4,
-        "console_type": "vnc",
-        "ram": 2048,
         "arch": "x86_64",
+        "console_type": "vnc",
         "boot_priority": "c",
         "kvm": "allow"
     },
-
     "images": [
         {
             "filename": "FWB_KVM-v500-build0723-FORTINET.out.kvm-boot.qcow2",
@@ -41,9 +39,7 @@
             "filesize": 7602176,
             "download_url": "https://support.fortinet.com/Download/FirmwareImages.aspx"
         }
-
     ],
-
     "versions": [
         {
             "name": "5.5.2",
diff --git a/appliances/hp-vsr1001.gns3a b/appliances/hp-vsr1001.gns3a
index 33f46e2..a7bb9e2 100644
--- a/appliances/hp-vsr1001.gns3a
+++ b/appliances/hp-vsr1001.gns3a
@@ -23,13 +23,6 @@
         "kvm": "require"
     },
     "images": [
-        {
-            "filename": "VSR1000_HPE-CMW710-E0321P01-X64.iso",
-            "version": "7.10.E0321P01",
-            "md5sum": "1675fed446449e782819c383293a35f6",
-            "filesize": 286515200,
-            "download_url": "https://h10145.www1.hp.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=16838&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&OrderNumber=&PurchaseDate="
-        },
         {
             "filename": "VSR1000_HP-CMW710-R0204P01-X64.iso",
             "version": "7.10.R0204P01",
@@ -37,6 +30,13 @@
             "filesize": 236687360,
             "download_url": "https://h10145.www1.hp.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=11832&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&OrderNumber=&PurchaseDate="
         },
+        {
+            "filename": "VSR1000_HPE-CMW710-E0321P01-X64.iso",
+            "version": "7.10.E0321P01",
+            "md5sum": "1675fed446449e782819c383293a35f6",
+            "filesize": 286515200,
+            "download_url": "https://h10145.www1.hp.com/Downloads/DownloadSoftware.aspx?SoftwareReleaseUId=16838&ProductNumber=JG811AAE&lang=en&cc=us&prodSeriesId=5443163&OrderNumber=&PurchaseDate="
+        },
         {
             "filename": "empty8G.qcow2",
             "version": "1.0",
@@ -47,19 +47,19 @@
         }
     ],
     "versions": [
-        {
-            "name": "7.10.E0321P01",
-            "images": {
-                "hda_disk_image": "empty8G.qcow2",
-                "cdrom_image": "VSR1000_HPE-CMW710-E0321P01-X64.iso"
-            }
-        },
         {
             "name": "7.10.R0204P01",
             "images": {
                 "hda_disk_image": "empty8G.qcow2",
                 "cdrom_image": "VSR1000_HP-CMW710-R0204P01-X64.iso"
             }
+        },
+        {
+            "name": "7.10.E0321P01",
+            "images": {
+                "hda_disk_image": "empty8G.qcow2",
+                "cdrom_image": "VSR1000_HPE-CMW710-E0321P01-X64.iso"
+            }
         }
     ]
 }