diff --git a/internal/storage/servers.json b/internal/storage/servers.json
index 8fe15e59..926adc09 100644
--- a/internal/storage/servers.json
+++ b/internal/storage/servers.json
@@ -103916,7 +103916,7 @@
   },
   "windscribe": {
     "version": 1,
-    "timestamp": 1629420754,
+    "timestamp": 1637272747,
     "servers": [
       {
         "vpn": "openvpn",
@@ -104023,6 +104023,27 @@
           "103.62.50.209"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "Australia",
+        "city": "Brisbane",
+        "hostname": "au-014.whiskergalaxy.com",
+        "x509": "bne-357.windscribe.com",
+        "ips": [
+          "43.245.160.34",
+          "43.245.160.35"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "Australia",
+        "city": "Brisbane",
+        "hostname": "au-014.whiskergalaxy.com",
+        "wgpubkey": "iY4MhQqQTP4uT7U4w9DfUEVxi5I3HJvjZcIL2dwmtTw=",
+        "ips": [
+          "43.245.160.36"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "Australia",
@@ -104426,21 +104447,21 @@
         "vpn": "openvpn",
         "region": "Canada East",
         "city": "Halifax",
-        "hostname": "ca-029.whiskergalaxy.com",
-        "x509": "yhz-340.windscribe.com",
+        "hostname": "ca-021.whiskergalaxy.com",
+        "x509": "yhz-386.windscribe.com",
         "ips": [
-          "199.204.208.157",
-          "199.204.208.158"
+          "23.191.80.2",
+          "23.191.80.3"
         ]
       },
       {
         "vpn": "wireguard",
         "region": "Canada East",
         "city": "Halifax",
-        "hostname": "ca-029.whiskergalaxy.com",
-        "wgpubkey": "moi+8owLNQ+XRE2cXoHme9uzrvTy5WJSxZduevNpRmU=",
+        "hostname": "ca-021.whiskergalaxy.com",
+        "wgpubkey": "w262TI0UyIg9pFunMiekVURYUuT/z4qXRor2Z7VcOn4=",
         "ips": [
-          "199.204.208.159"
+          "23.191.80.4"
         ]
       },
       {
@@ -104947,6 +104968,27 @@
           "157.97.132.44"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "Cyprus",
+        "city": "Nicosia",
+        "hostname": "cy-002.whiskergalaxy.com",
+        "x509": "lca-320.windscribe.com",
+        "ips": [
+          "157.97.132.195",
+          "157.97.132.198"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "Cyprus",
+        "city": "Nicosia",
+        "hostname": "cy-002.whiskergalaxy.com",
+        "wgpubkey": "90fjr1sq0Hgv2l+DgMaaGQ009SDw7VxmzJwaYmclaFs=",
+        "ips": [
+          "157.97.132.236"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "Czech Republic",
@@ -105031,6 +105073,27 @@
           "185.206.224.36"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "Ecuador",
+        "city": "Quito",
+        "hostname": "ec-001.whiskergalaxy.com",
+        "x509": "uio-385.windscribe.com",
+        "ips": [
+          "200.107.206.130",
+          "200.107.206.131"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "Ecuador",
+        "city": "Quito",
+        "hostname": "ec-001.whiskergalaxy.com",
+        "wgpubkey": "nwpvJ7AtDjk77dpyL7qKkvwsWQL82Fqy3JEk/KR/iGw=",
+        "ips": [
+          "200.107.206.132"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "Estonia",
@@ -105178,6 +105241,27 @@
           "194.34.133.83"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "Finland",
+        "city": "Helsinki",
+        "hostname": "fi-005.whiskergalaxy.com",
+        "x509": "hel-98.windscribe.com",
+        "ips": [
+          "196.244.192.50",
+          "196.244.192.51"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "Finland",
+        "city": "Helsinki",
+        "hostname": "fi-005.whiskergalaxy.com",
+        "wgpubkey": "2LiGGjfWP64d7uVNpgV8n/lIg2iM62iz8ZXRHFd1Qw0=",
+        "ips": [
+          "196.244.192.52"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "France",
@@ -106081,6 +106165,27 @@
           "143.244.40.227"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "Japan",
+        "city": "Tokyo",
+        "hostname": "jp-008.whiskergalaxy.com",
+        "x509": "hnd-287.windscribe.com",
+        "ips": [
+          "146.70.31.114",
+          "146.70.31.115"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "Japan",
+        "city": "Tokyo",
+        "hostname": "jp-008.whiskergalaxy.com",
+        "wgpubkey": "X6LjCVZ41wLoSbWWZpFET+Ejw0VsGuvJ5utU/l3rKl4=",
+        "ips": [
+          "146.70.31.116"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "Latvia",
@@ -106144,6 +106249,27 @@
           "85.254.72.239"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "Latvia",
+        "city": "Riga",
+        "hostname": "lv-009.whiskergalaxy.com",
+        "x509": "rix-254.windscribe.com",
+        "ips": [
+          "159.148.186.189",
+          "159.148.186.68"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "Latvia",
+        "city": "Riga",
+        "hostname": "lv-009.whiskergalaxy.com",
+        "wgpubkey": "hcn+JR0QAhhUVVRND5Djq35caGmBEGlcp4MX/xlm6HE=",
+        "ips": [
+          "159.148.186.69"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "Lithuania",
@@ -106354,6 +106480,27 @@
           "178.175.144.124"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "Moldova",
+        "city": "Chisinau",
+        "hostname": "md-003.whiskergalaxy.com",
+        "x509": "kiv-210.windscribe.com",
+        "ips": [
+          "178.175.134.186",
+          "178.175.134.187"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "Moldova",
+        "city": "Chisinau",
+        "hostname": "md-003.whiskergalaxy.com",
+        "wgpubkey": "HHDA7gntK+JWWxilBUsDI1FMgeGZtVFKKhbWVIbwMC0=",
+        "ips": [
+          "178.175.134.188"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "Netherlands",
@@ -107194,6 +107341,27 @@
           "103.107.198.228"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "Singapore",
+        "city": "Singapore",
+        "hostname": "sg-009.whiskergalaxy.com",
+        "x509": "sin-170.windscribe.com",
+        "ips": [
+          "146.70.29.178",
+          "146.70.29.179"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "Singapore",
+        "city": "Singapore",
+        "hostname": "sg-009.whiskergalaxy.com",
+        "wgpubkey": "ePfazP+V1DkyyzK2VpSKS1JFiChU2TpO6jyYOmjnRAw=",
+        "ips": [
+          "146.70.29.180"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "Slovakia",
@@ -107320,6 +107488,27 @@
           "129.232.131.172"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "South Africa",
+        "city": "Johannesburg",
+        "hostname": "za-006.whiskergalaxy.com",
+        "x509": "jnb-164.windscribe.com",
+        "ips": [
+          "197.242.159.23",
+          "197.242.159.199"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "South Africa",
+        "city": "Johannesburg",
+        "hostname": "za-006.whiskergalaxy.com",
+        "wgpubkey": "Nh5LEJT44xbuvTQnv3OZ0bXi09BFXV4SBB1XVMI12Ec=",
+        "ips": [
+          "197.242.159.229"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "South Korea",
@@ -107698,6 +107887,27 @@
           "37.120.213.164"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "Switzerland",
+        "city": "Zurich",
+        "hostname": "ch-009.whiskergalaxy.com",
+        "x509": "zrh-264.windscribe.com",
+        "ips": [
+          "141.255.162.18",
+          "81.17.29.2"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "Switzerland",
+        "city": "Zurich",
+        "hostname": "ch-009.whiskergalaxy.com",
+        "wgpubkey": "3+ehrqWHaqA4lC10BRkscYasaewB2eamMSRda+HSkxQ=",
+        "ips": [
+          "81.17.29.3"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "Taiwan",
@@ -107782,27 +107992,6 @@
           "185.189.161.51"
         ]
       },
-      {
-        "vpn": "openvpn",
-        "region": "Thailand",
-        "city": "Bangkok",
-        "hostname": "th-003.whiskergalaxy.com",
-        "x509": "bkk-245.windscribe.com",
-        "ips": [
-          "27.254.130.220",
-          "27.254.130.216"
-        ]
-      },
-      {
-        "vpn": "wireguard",
-        "region": "Thailand",
-        "city": "Bangkok",
-        "hostname": "th-003.whiskergalaxy.com",
-        "wgpubkey": "R0DcCsuFG3sgugDVRnt6vy28z+AP9r1ygYIw0pJApGs=",
-        "ips": [
-          "27.254.130.222"
-        ]
-      },
       {
         "vpn": "openvpn",
         "region": "Thailand",
@@ -107849,42 +108038,21 @@
         "vpn": "openvpn",
         "region": "Turkey",
         "city": "Bursa",
-        "hostname": "tr-001.whiskergalaxy.com",
+        "hostname": "tr-016.whiskergalaxy.com",
         "x509": "yei-236.windscribe.com",
         "ips": [
-          "45.123.118.155",
-          "45.123.118.156"
+          "185.195.79.18",
+          "185.195.79.19"
         ]
       },
       {
         "vpn": "wireguard",
         "region": "Turkey",
         "city": "Bursa",
-        "hostname": "tr-001.whiskergalaxy.com",
+        "hostname": "tr-016.whiskergalaxy.com",
         "wgpubkey": "ST6xQmd7dcCl8HuR7jBRpAEyc2IOgpVE605uPTIycQg=",
         "ips": [
-          "45.123.118.157"
-        ]
-      },
-      {
-        "vpn": "openvpn",
-        "region": "Turkey",
-        "city": "Istanbul",
-        "hostname": "tr-004.whiskergalaxy.com",
-        "x509": "ist-250.windscribe.com",
-        "ips": [
-          "45.123.119.10",
-          "45.123.119.11"
-        ]
-      },
-      {
-        "vpn": "wireguard",
-        "region": "Turkey",
-        "city": "Istanbul",
-        "hostname": "tr-004.whiskergalaxy.com",
-        "wgpubkey": "jJUwb5Ekpn3w4fqZiCjO6GDRQ882AeiLjvDx5tYOfTw=",
-        "ips": [
-          "45.123.119.12"
+          "185.195.79.20"
         ]
       },
       {
@@ -107971,6 +108139,27 @@
           "178.211.33.244"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "Turkey",
+        "city": "Istanbul",
+        "hostname": "tr-018.whiskergalaxy.com",
+        "x509": "ist-250.windscribe.com",
+        "ips": [
+          "185.195.79.34",
+          "185.195.79.35"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "Turkey",
+        "city": "Istanbul",
+        "hostname": "tr-018.whiskergalaxy.com",
+        "wgpubkey": "jJUwb5Ekpn3w4fqZiCjO6GDRQ882AeiLjvDx5tYOfTw=",
+        "ips": [
+          "185.195.79.36"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "US Central",
@@ -108622,6 +108811,27 @@
           "155.94.249.68"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "US Central",
+        "city": "Dallas",
+        "hostname": "us-central-095.whiskergalaxy.com",
+        "x509": "dfw-192.windscribe.com",
+        "ips": [
+          "206.217.134.114",
+          "206.217.134.115"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "US Central",
+        "city": "Dallas",
+        "hostname": "us-central-095.whiskergalaxy.com",
+        "wgpubkey": "47tLjymDPpTIBerb+wn02/XNFABF4YDAGwOnijSoZmQ=",
+        "ips": [
+          "206.217.134.116"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "US Central",
@@ -109063,6 +109273,27 @@
           "208.77.22.101"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "US East",
+        "city": "Chicago",
+        "hostname": "us-east-101.whiskergalaxy.com",
+        "x509": "ord-130.windscribe.com",
+        "ips": [
+          "107.150.28.130",
+          "107.150.28.131"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "US East",
+        "city": "Chicago",
+        "hostname": "us-east-101.whiskergalaxy.com",
+        "wgpubkey": "qt+nrPNqLaB7dNOKD3JWvkG4JbgZgKfHZv7t0818LTg=",
+        "ips": [
+          "107.150.28.132"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "US East",
@@ -109189,27 +109420,6 @@
           "45.87.214.36"
         ]
       },
-      {
-        "vpn": "openvpn",
-        "region": "US East",
-        "city": "Miami",
-        "hostname": "us-east-028.whiskergalaxy.com",
-        "x509": "mia-206.windscribe.com",
-        "ips": [
-          "104.223.127.194",
-          "104.223.127.195"
-        ]
-      },
-      {
-        "vpn": "wireguard",
-        "region": "US East",
-        "city": "Miami",
-        "hostname": "us-east-028.whiskergalaxy.com",
-        "wgpubkey": "7LiZu9B4qzVwl3jKRVs7ivx/BHi/jnSS/GWSuxEClgk=",
-        "ips": [
-          "104.223.127.196"
-        ]
-      },
       {
         "vpn": "openvpn",
         "region": "US East",
@@ -109651,48 +109861,6 @@
           "23.172.112.228"
         ]
       },
-      {
-        "vpn": "openvpn",
-        "region": "US East",
-        "city": "Tampa",
-        "hostname": "us-east-080.whiskergalaxy.com",
-        "x509": "tpa-349.windscribe.com",
-        "ips": [
-          "209.216.79.82",
-          "209.216.79.83"
-        ]
-      },
-      {
-        "vpn": "wireguard",
-        "region": "US East",
-        "city": "Tampa",
-        "hostname": "us-east-080.whiskergalaxy.com",
-        "wgpubkey": "jqf7HHmkBdzk1kkGLD20O/EzLHSFV2Bc7z4MeHcP7iA=",
-        "ips": [
-          "209.216.79.84"
-        ]
-      },
-      {
-        "vpn": "openvpn",
-        "region": "US East",
-        "city": "Tampa",
-        "hostname": "us-east-081.whiskergalaxy.com",
-        "x509": "tpa-349.windscribe.com",
-        "ips": [
-          "209.216.79.66",
-          "209.216.79.67"
-        ]
-      },
-      {
-        "vpn": "wireguard",
-        "region": "US East",
-        "city": "Tampa",
-        "hostname": "us-east-081.whiskergalaxy.com",
-        "wgpubkey": "jqf7HHmkBdzk1kkGLD20O/EzLHSFV2Bc7z4MeHcP7iA=",
-        "ips": [
-          "209.216.79.68"
-        ]
-      },
       {
         "vpn": "openvpn",
         "region": "US East",
@@ -110449,27 +110617,6 @@
           "198.12.116.196"
         ]
       },
-      {
-        "vpn": "openvpn",
-        "region": "US West",
-        "city": "Seattle",
-        "hostname": "us-west-071.whiskergalaxy.com",
-        "x509": "sea-290.windscribe.com",
-        "ips": [
-          "104.129.56.2",
-          "104.129.56.3"
-        ]
-      },
-      {
-        "vpn": "wireguard",
-        "region": "US West",
-        "city": "Seattle",
-        "hostname": "us-west-071.whiskergalaxy.com",
-        "wgpubkey": "89DUtbYYyXcAktaB2cnCVA/YiZQEddYHuOz2K0vBAn4=",
-        "ips": [
-          "104.129.56.4"
-        ]
-      },
       {
         "vpn": "openvpn",
         "region": "Ukraine",
@@ -110974,6 +111121,27 @@
           "45.9.248.4"
         ]
       },
+      {
+        "vpn": "openvpn",
+        "region": "WINDFLIX UK",
+        "city": "London",
+        "hostname": "wf-uk-006.whiskergalaxy.com",
+        "x509": "lhr-185.windscribe.com",
+        "ips": [
+          "81.92.200.84",
+          "81.92.200.85"
+        ]
+      },
+      {
+        "vpn": "wireguard",
+        "region": "WINDFLIX UK",
+        "city": "London",
+        "hostname": "wf-uk-006.whiskergalaxy.com",
+        "wgpubkey": "XKu6eYKMo3aqVxjOEo4vNY11qZYUsMG+WXWnQlCoKR0=",
+        "ips": [
+          "81.92.200.86"
+        ]
+      },
       {
         "vpn": "openvpn",
         "region": "WINDFLIX UK",