diff --git a/internal/storage/servers.json b/internal/storage/servers.json
index 20d043c5..3c720e7a 100644
--- a/internal/storage/servers.json
+++ b/internal/storage/servers.json
@@ -26932,7 +26932,7 @@
   },
   "mullvad": {
     "version": 3,
-    "timestamp": 1629420682,
+    "timestamp": 1631979444,
     "servers": [
       {
         "vpn": "openvpn",
@@ -28127,20 +28127,6 @@
         "owned": false,
         "wgpubkey": "ptnLZbreIzTZrSyPD0XhOAAmN194hcPSG5TI5TTiL08="
       },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "172.83.40.38"
-        ],
-        "ipsv6": [
-          "2607:f7a0:d:1::2f"
-        ],
-        "country": "Canada",
-        "city": "Vancouver",
-        "hostname": "ca-van-002",
-        "isp": "100TB",
-        "owned": false
-      },
       {
         "vpn": "openvpn",
         "ips": [
@@ -28169,21 +28155,6 @@
         "isp": "Esecuredata",
         "owned": false
       },
-      {
-        "vpn": "wireguard",
-        "ips": [
-          "107.181.189.206"
-        ],
-        "ipsv6": [
-          "2607:f7a0:d:4::a02f"
-        ],
-        "country": "Canada",
-        "city": "Vancouver",
-        "hostname": "ca2-wireguard",
-        "isp": "100TB",
-        "owned": false,
-        "wgpubkey": "quPBSdtRAfoUVkbRWvjXF5d5cYwhURobppSVd5Uz3xA="
-      },
       {
         "vpn": "wireguard",
         "ips": [
@@ -28660,7 +28631,7 @@
         "hostname": "fi1-wireguard",
         "isp": "Creanova",
         "owned": true,
-        "wgpubkey": "lA7gRTmiY9IcSQGXjOEaJjvgtO76BwYJsaaNQqemMWU="
+        "wgpubkey": "XEIr5P160oonQ9mgjz6Jj9UMZZ7Jsp/tNBU+tY7c1Bs="
       },
       {
         "vpn": "wireguard",
@@ -28675,7 +28646,7 @@
         "hostname": "fi2-wireguard",
         "isp": "Creanova",
         "owned": true,
-        "wgpubkey": "HjKLtlLs1RRTS8OhxBO7HaDizaWcVVieefKn2gPPTRQ="
+        "wgpubkey": "V7rUOUbzEFouyPY2hPDzHK7EcuBlPmOexwlPe3Hl/Hs="
       },
       {
         "vpn": "wireguard",
@@ -28690,7 +28661,7 @@
         "hostname": "fi3-wireguard",
         "isp": "Creanova",
         "owned": true,
-        "wgpubkey": "Jv9FNGbb9T4ZYCXTjn/ib3ozCRvZ1ccYILuiJ1+1IgQ="
+        "wgpubkey": "hSMVwIcWJYuVF/ChRdumE5z0vhOoJN77JJEIIJYHkmE="
       },
       {
         "vpn": "openvpn",
@@ -28748,20 +28719,6 @@
         "isp": "31173",
         "owned": true
       },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "89.44.9.19"
-        ],
-        "ipsv6": [
-          "2001:ac8:25:d0::1f"
-        ],
-        "country": "France",
-        "city": "Paris",
-        "hostname": "fr-par-201",
-        "isp": "M247",
-        "owned": false
-      },
       {
         "vpn": "openvpn",
         "ips": [
@@ -29069,20 +29026,6 @@
         "isp": "31173",
         "owned": true
       },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "185.213.155.137"
-        ],
-        "ipsv6": [
-          "2a03:1b20:6:f011::7f"
-        ],
-        "country": "Germany",
-        "city": "Frankfurt",
-        "hostname": "de-fra-007",
-        "isp": "31173",
-        "owned": true
-      },
       {
         "vpn": "openvpn",
         "ips": [
@@ -29318,6 +29261,21 @@
         "owned": false,
         "wgpubkey": "Rc+VTdcBPg7i7dy7MAp6TOhwJP3g1/TilK+IaE7Aojc="
       },
+      {
+        "vpn": "wireguard",
+        "ips": [
+          "194.36.25.48"
+        ],
+        "ipsv6": [
+          "2a07:fe00:1::a26f"
+        ],
+        "country": "Germany",
+        "city": "Frankfurt",
+        "hostname": "de26-wireguard",
+        "isp": "xtom",
+        "owned": false,
+        "wgpubkey": "UXKb8MiyaWHI1k9ayZH0i206Pc+/gKUhAwCORDqonkE="
+      },
       {
         "vpn": "wireguard",
         "ips": [
@@ -29563,7 +29521,7 @@
         "hostname": "hu3-wireguard",
         "isp": "M247",
         "owned": false,
-        "wgpubkey": "lSsOZ4jUbcbi7pHDqXi7U/8O55sCMKfMwF1GF+1+qgM="
+        "wgpubkey": "gHcjEh2XuoCPiExm8ScXdz6pzduZPp6zRyam6NE6VRQ="
       },
       {
         "vpn": "wireguard",
@@ -30135,21 +30093,6 @@
         "owned": false,
         "wgpubkey": "08lMToz0IbJfqNdybOrLJ+bGeyl28DuTaM80paWCrVg="
       },
-      {
-        "vpn": "wireguard",
-        "ips": [
-          "185.225.28.146"
-        ],
-        "ipsv6": [
-          "2a0d:4500::a01f"
-        ],
-        "country": "Macedonia",
-        "city": "Skopje",
-        "hostname": "mk1-wireguard",
-        "isp": "Interspace",
-        "owned": false,
-        "wgpubkey": "jJ6XV88Ba0olZqriq44Gga8uMH35FBlMEg/6AzZ02BI="
-      },
       {
         "vpn": "openvpn",
         "ips": [
@@ -30266,140 +30209,14 @@
       {
         "vpn": "openvpn",
         "ips": [
-          "185.65.134.139"
+          "185.65.134.137"
         ],
         "ipsv6": [
-          "2a03:1b20:3:f011::9f"
+          "2a03:1b20:3:f011::7f"
         ],
         "country": "Netherlands",
         "city": "Amsterdam",
-        "hostname": "nl-ams-009",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "185.65.134.140"
-        ],
-        "ipsv6": [
-          "2a03:1b20:3:f011::10f"
-        ],
-        "country": "Netherlands",
-        "city": "Amsterdam",
-        "hostname": "nl-ams-010",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "185.65.134.141"
-        ],
-        "ipsv6": [
-          "2a03:1b20:3:f011::11f"
-        ],
-        "country": "Netherlands",
-        "city": "Amsterdam",
-        "hostname": "nl-ams-011",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "185.65.134.142"
-        ],
-        "ipsv6": [
-          "2a03:1b20:3:f011::12f"
-        ],
-        "country": "Netherlands",
-        "city": "Amsterdam",
-        "hostname": "nl-ams-012",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "185.65.134.143"
-        ],
-        "ipsv6": [
-          "2a03:1b20:3:f011::13f"
-        ],
-        "country": "Netherlands",
-        "city": "Amsterdam",
-        "hostname": "nl-ams-013",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "185.65.134.144"
-        ],
-        "ipsv6": [
-          "2a03:1b20:3:f011::14f"
-        ],
-        "country": "Netherlands",
-        "city": "Amsterdam",
-        "hostname": "nl-ams-014",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "185.65.134.145"
-        ],
-        "ipsv6": [
-          "2a03:1b20:3:f011::15f"
-        ],
-        "country": "Netherlands",
-        "city": "Amsterdam",
-        "hostname": "nl-ams-015",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "185.65.134.146"
-        ],
-        "ipsv6": [
-          "2a03:1b20:3:f011::16f"
-        ],
-        "country": "Netherlands",
-        "city": "Amsterdam",
-        "hostname": "nl-ams-016",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "185.65.134.147"
-        ],
-        "ipsv6": [
-          "2a03:1b20:3:f011::17f"
-        ],
-        "country": "Netherlands",
-        "city": "Amsterdam",
-        "hostname": "nl-ams-017",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "185.65.134.148"
-        ],
-        "ipsv6": [
-          "2a03:1b20:3:f011::18f"
-        ],
-        "country": "Netherlands",
-        "city": "Amsterdam",
-        "hostname": "nl-ams-018",
+        "hostname": "nl-ams-007",
         "isp": "31173",
         "owned": true
       },
@@ -30582,6 +30399,21 @@
         "owned": false,
         "wgpubkey": "kDVDjSME2WSxhEqOV6fkeNetTHv6tYWD8HNqHXCnESw="
       },
+      {
+        "vpn": "wireguard",
+        "ips": [
+          "185.225.28.146"
+        ],
+        "ipsv6": [
+          "2a0d:4500::a01f"
+        ],
+        "country": "North Macedonia",
+        "city": "Skopje",
+        "hostname": "mk1-wireguard",
+        "isp": "Interspace",
+        "owned": false,
+        "wgpubkey": "jJ6XV88Ba0olZqriq44Gga8uMH35FBlMEg/6AzZ02BI="
+      },
       {
         "vpn": "openvpn",
         "ips": [
@@ -30997,7 +30829,7 @@
         "hostname": "ro4-wireguard",
         "isp": "M247",
         "owned": false,
-        "wgpubkey": "+5uSytyBBNzlJSc/Bg+B5fbhz04hGJEtgjYRY9eDFi0="
+        "wgpubkey": "NGG2LF66eJhGOKe77mfX9rzP81gAK45XRj05TVC79GU="
       },
       {
         "vpn": "wireguard",
@@ -31044,21 +30876,6 @@
         "owned": false,
         "wgpubkey": "PBkAK/T6eQHrBTAvfeSngjNnwb8FvhwQ2FKXEQp5dgM="
       },
-      {
-        "vpn": "wireguard",
-        "ips": [
-          "185.120.144.98"
-        ],
-        "ipsv6": [
-          "2a04:9dc0:0:98::a08f"
-        ],
-        "country": "Romania",
-        "city": "Bucharest",
-        "hostname": "ro8-wireguard",
-        "isp": "M247",
-        "owned": false,
-        "wgpubkey": "oqfJ+FTSFZjTGzNVU7V8SOskjc0OtOEZ9HbUyHwKuBI="
-      },
       {
         "vpn": "openvpn",
         "ips": [
@@ -31145,20 +30962,6 @@
         "isp": "M247",
         "owned": false
       },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "94.198.43.2"
-        ],
-        "ipsv6": [
-          "2a0a:b640:1:55::2f"
-        ],
-        "country": "Singapore",
-        "city": "Singapore",
-        "hostname": "sg-sin-202",
-        "isp": "M247",
-        "owned": false
-      },
       {
         "vpn": "wireguard",
         "ips": [
@@ -31518,6 +31321,20 @@
         "isp": "31173",
         "owned": true
       },
+      {
+        "vpn": "openvpn",
+        "ips": [
+          "185.213.154.142"
+        ],
+        "ipsv6": [
+          "2a03:1b20:5:f011::12f"
+        ],
+        "country": "Sweden",
+        "city": "Gothenburg",
+        "hostname": "se-got-012",
+        "isp": "31173",
+        "owned": true
+      },
       {
         "vpn": "wireguard",
         "ips": [
@@ -31634,76 +31451,6 @@
         "isp": "31173",
         "owned": true
       },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "193.138.218.133"
-        ],
-        "ipsv6": [
-          "2a03:1b20:1:f410:40::3f"
-        ],
-        "country": "Sweden",
-        "city": "Malmö",
-        "hostname": "se-mma-003",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "193.138.218.134"
-        ],
-        "ipsv6": [
-          "2a03:1b20:1:f410:40::4f"
-        ],
-        "country": "Sweden",
-        "city": "Malmö",
-        "hostname": "se-mma-004",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "193.138.218.135"
-        ],
-        "ipsv6": [
-          "2a03:1b20:1:f410:40::5f"
-        ],
-        "country": "Sweden",
-        "city": "Malmö",
-        "hostname": "se-mma-005",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "193.138.218.136"
-        ],
-        "ipsv6": [
-          "2a03:1b20:1:f410:40::6f"
-        ],
-        "country": "Sweden",
-        "city": "Malmö",
-        "hostname": "se-mma-006",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "193.138.218.137"
-        ],
-        "ipsv6": [
-          "2a03:1b20:1:f410:40::7f"
-        ],
-        "country": "Sweden",
-        "city": "Malmö",
-        "hostname": "se-mma-007",
-        "isp": "31173",
-        "owned": true
-      },
       {
         "vpn": "openvpn",
         "ips": [
@@ -31858,34 +31605,6 @@
         "isp": "31173",
         "owned": true
       },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "45.83.220.87"
-        ],
-        "ipsv6": [
-          "2a03:1b20:1:e011::7f"
-        ],
-        "country": "Sweden",
-        "city": "Malmö",
-        "hostname": "se-mma-107",
-        "isp": "31173",
-        "owned": true
-      },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "45.83.220.89"
-        ],
-        "ipsv6": [
-          "2a03:1b20:1:e011::9f"
-        ],
-        "country": "Sweden",
-        "city": "Malmö",
-        "hostname": "se-mma-109",
-        "isp": "31173",
-        "owned": true
-      },
       {
         "vpn": "openvpn",
         "ips": [
@@ -32449,20 +32168,6 @@
         "isp": "31173",
         "owned": true
       },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "179.43.128.170"
-        ],
-        "ipsv6": [
-          "2a02:29b8:dc01:597::1f"
-        ],
-        "country": "Switzerland",
-        "city": "Zurich",
-        "hostname": "ch-zrh-201",
-        "isp": "PrivateLayer",
-        "owned": false
-      },
       {
         "vpn": "openvpn",
         "ips": [
@@ -32561,7 +32266,7 @@
         "hostname": "ch11-wireguard",
         "isp": "M247",
         "owned": false,
-        "wgpubkey": "M160brlgfeqrtrRrDNvUU7E9iytIrdpmLsTPDFBmGSI="
+        "wgpubkey": "Cq72XZa39jAkxcS49RqiDX7m76BX75HsZ3DLwDushhs="
       },
       {
         "vpn": "wireguard",
@@ -32666,7 +32371,7 @@
         "hostname": "ch2-wireguard",
         "isp": "PrivateLayer",
         "owned": false,
-        "wgpubkey": "fOQ5qclvv7008dwWmz89B6Sf+Oh4IhTF+R+G+xB6HlM="
+        "wgpubkey": "bmy9vGzMqc0yS3IiMMyOONyXRwPCMiyhR/bnNQ2LsCE="
       },
       {
         "vpn": "wireguard",
@@ -33001,7 +32706,7 @@
         "hostname": "gb18-wireguard",
         "isp": "M247",
         "owned": false,
-        "wgpubkey": "ug9qzYOLA7WRR17XzmGSnYNnt4HficuJpFlXopaWOB8="
+        "wgpubkey": "4CO8lBJQ+iyP7wtsn41oxTWvAWZlOYqdM4oAabpwslw="
       },
       {
         "vpn": "wireguard",
@@ -33579,6 +33284,36 @@
         "owned": false,
         "wgpubkey": "CTObFSK15M3u1de40b2PNxN3em8h1lLtMrZxoS24gH4="
       },
+      {
+        "vpn": "wireguard",
+        "ips": [
+          "69.174.103.162"
+        ],
+        "ipsv6": [
+          "2607:fcd0:aa80:1304::b42f"
+        ],
+        "country": "USA",
+        "city": "Atlanta GA",
+        "hostname": "us242-wireguard",
+        "isp": "Quadranet",
+        "owned": false,
+        "wgpubkey": "1M3QArbXAoYqoUz9KV3Wuyb8iLLl6J/GMazUnjC8xmo="
+      },
+      {
+        "vpn": "wireguard",
+        "ips": [
+          "104.223.91.18"
+        ],
+        "ipsv6": [
+          "2607:fcd0:aa80:1305::b43f"
+        ],
+        "country": "USA",
+        "city": "Atlanta GA",
+        "hostname": "us243-wireguard",
+        "isp": "Quadranet",
+        "owned": false,
+        "wgpubkey": "5pIIPfnc2GtlcIanhmt+nkQiYC3ERc/q+EFbBHAZfQU="
+      },
       {
         "vpn": "openvpn",
         "ips": [
@@ -33722,7 +33457,7 @@
       {
         "vpn": "wireguard",
         "ips": [
-          "68.235.43.130"
+          "68.235.44.2"
         ],
         "ipsv6": [
           "2607:9000:0:67::b28f"
@@ -33737,7 +33472,7 @@
       {
         "vpn": "wireguard",
         "ips": [
-          "68.235.43.138"
+          "68.235.44.18"
         ],
         "ipsv6": [
           "2607:9000:0:68::b29f"
@@ -33752,7 +33487,7 @@
       {
         "vpn": "wireguard",
         "ips": [
-          "68.235.43.146"
+          "68.235.44.34"
         ],
         "ipsv6": [
           "2607:9000:0:69::b30f"
@@ -33767,7 +33502,7 @@
       {
         "vpn": "wireguard",
         "ips": [
-          "68.235.43.154"
+          "68.235.44.50"
         ],
         "ipsv6": [
           "2607:9000:0:70::b31f"
@@ -33782,7 +33517,7 @@
       {
         "vpn": "wireguard",
         "ips": [
-          "68.235.43.162"
+          "68.235.44.66"
         ],
         "ipsv6": [
           "2607:9000:0:71::b32f"
@@ -33824,36 +33559,6 @@
         "owned": false,
         "wgpubkey": "J7kRI51rpEiFy3HMxXS6azAhvdOqAbvLKwiDI8SyKU0="
       },
-      {
-        "vpn": "wireguard",
-        "ips": [
-          "68.235.43.98"
-        ],
-        "ipsv6": [
-          "2607:9000:0:62::a03f"
-        ],
-        "country": "USA",
-        "city": "Chicago IL",
-        "hostname": "us22-wireguard",
-        "isp": "Tzulo",
-        "owned": false,
-        "wgpubkey": "cyFIfgkdN/teublULKmhQj5+dJnhsGcLyRiWxjQscW4="
-      },
-      {
-        "vpn": "wireguard",
-        "ips": [
-          "68.235.43.106"
-        ],
-        "ipsv6": [
-          "2607:9000:0:63::a04f"
-        ],
-        "country": "USA",
-        "city": "Chicago IL",
-        "hostname": "us23-wireguard",
-        "isp": "Tzulo",
-        "owned": false,
-        "wgpubkey": "tAThJW853lY/JTNqU6zcBtYk8PxM93P2DqQFWfs1Z3M="
-      },
       {
         "vpn": "wireguard",
         "ips": [
@@ -33885,19 +33590,18 @@
         "wgpubkey": "Ou6ayqTmV9H8rf2waNbaJKsGCRy4NjcvCZjgJPvtx0Y="
       },
       {
-        "vpn": "wireguard",
+        "vpn": "openvpn",
         "ips": [
-          "68.235.43.82"
+          "174.127.113.3"
         ],
         "ipsv6": [
-          "2607:9000:0:60::a01f"
+          "2606:2e00:8007:1::1f"
         ],
         "country": "USA",
-        "city": "Chicago IL",
-        "hostname": "us4-wireguard",
-        "isp": "Tzulo",
-        "owned": false,
-        "wgpubkey": "9BIWByBn70uCB9qVj9Vf02yzar4RJQjgHyVpo+yLk2c="
+        "city": "Dallas TX",
+        "hostname": "us-dal-101",
+        "isp": "100TB",
+        "owned": false
       },
       {
         "vpn": "openvpn",
@@ -36396,7 +36100,7 @@
         "hostname": "us90-wireguard",
         "isp": "M247",
         "owned": false,
-        "wgpubkey": "UwNBR7xJgc+R383zl2Eas2HzSC3hOFY5zDsfHRGSlgg="
+        "wgpubkey": "0OcKhUBT4o0h0j5vEro0/3vK8Ezw1R9B1eXiU9CKFBo="
       },
       {
         "vpn": "wireguard",
@@ -36533,20 +36237,6 @@
         "owned": false,
         "wgpubkey": "EPLh6pVel06dND8cE4Prix9GP4hGLYNhQhn5mSN2yzM="
       },
-      {
-        "vpn": "openvpn",
-        "ips": [
-          "107.152.99.86"
-        ],
-        "ipsv6": [
-          "2607:f7a0:5:4::4f"
-        ],
-        "country": "USA",
-        "city": "Phoenix AZ",
-        "hostname": "us-phx-004",
-        "isp": "100TB",
-        "owned": false
-      },
       {
         "vpn": "openvpn",
         "ips": [