diff --git a/FeroxRev b/FeroxRev
index 4998de75d..4d1a3a615 160000
--- a/FeroxRev
+++ b/FeroxRev
@@ -1 +1 @@
-Subproject commit 4998de75ddf048be7869031956933e8b6f7c60c8
+Subproject commit 4d1a3a6159bfcd9c83e76c6df089fd220b1f7965
diff --git a/KillSwitch.txt b/KillSwitch.txt
index 9c6aad49f..f10dfb159 100644
--- a/KillSwitch.txt
+++ b/KillSwitch.txt
@@ -1,12 +1,12 @@
-BotStatus=ENABLED;
+BotStatus=DISABLED;
 //============================================//
-              POKEMON GO 0.91.1
+              POKEMON GO 0.95.3
 //============================================//
 
-    Necrobot is now compatible with 0.91.1 API.
+    Necrobot is compatible with 0.91.2 API.
 
 //============================================//
-              Updated: 02/08/2017
+              Updated: 03/22/2017
 
 
 For support/questions:
diff --git a/PoGo.NecroBot.CLI/Config/Translations/TEMPLATE-translation.en.json b/PoGo.NecroBot.CLI/Config/Translations/TEMPLATE-translation.en.json
index 31c9f0fd8..7b34a566c 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/TEMPLATE-translation.en.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/TEMPLATE-translation.en.json
@@ -202,11 +202,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Putting egg in incubator: {0} km left"
+      "Value": "{0}) Putting egg in incubator: {1} km left"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Incubator status update: {0} Km left of {1} Km egg."
+      "Value": "{0}) Incubator status update: {1} Km left of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.ca.json b/PoGo.NecroBot.CLI/Config/Translations/translation.ca.json
index 12d716114..d947fd39c 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.ca.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.ca.json
@@ -126,11 +126,11 @@
     },
     {
       "Key": "eventPokemonCaptureSuccess",
-      "Value": "({0}) | ({1}) {2} | Lvl: {3} | CP: {4}/{5} | IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left) | XP: {11} | SD: {12} | {13} | lat: {14} long: {15} | Move1: {16} Move2: {17} | Rarity: {18} | Capture Reason: {19} | Shiny: {20} | Form: {21} | Costume: {22} | Sex: {23}"
+      "Value": "({0}) | ({1}) {2} | XP: {11} | SD: {12} | Lvl: {3} | CP: {4}/{5} | IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left) | {13} | lat: {14} long: {15} | Move1: {16} Move2: {17} | Rarity: {18} | Capture Reason: {19} | Shiny: {20} | Form: {21} | Costume: {22} | Sex: {23}"
     },
     {
       "Key": "eventPokemonCaptureFailed",
-      "Value": "({0}) | ({1}) {2} | Lvl: {3} | CP: {4}/{5} | IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left) | XP: {11} | lat: {12} long: {13} | Move1: {14} Move2: {15} | Rarity :{16}"
+      "Value": "({0}) | ({1}) {2} | XP: {11} |          | Lvl: {3} | CP: {4}/{5} | IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left) | lat: {12} long: {13} | Move1: {14} Move2: {15} | Rarity :{16}"
     },
     {
       "Key": "eventNoPokeballs",
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Afegint ou a la incubadora: {0:0.00}km restants"
+      "Value": "{0}) Afegint ou a la incubadora: {1:0.00}km restants"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Actualitzant l'estat de la incubadora: {0:0.00}km restants"
+      "Value": "{0}) Actualitzant l'estat de la incubadora: {1:0.00}km restants of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.cs.json b/PoGo.NecroBot.CLI/Config/Translations/translation.cs.json
index 6e88d3390..ff567414a 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.cs.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.cs.json
@@ -182,11 +182,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Vložení vajíčka do inkubátoru: {0:0.00}km zbývá"
+      "Value": "{0}) Vložení vajíčka do inkubátoru: {1:0.00}km zbývá"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Stav inkubátoru aktualizován: {0:0.00}km zbývá"
+      "Value": "{0}) Stav inkubátoru aktualizován: {1:0.00}km zbývá of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
@@ -912,7 +912,7 @@
     },
     {
       "Key": "farfetchd",
-      "Value": "farfetchd"
+      "Value": "Farfetchd"
     },
     {
       "Key": "doduo",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.da.json b/PoGo.NecroBot.CLI/Config/Translations/translation.da.json
index f1b293b03..e6d52dbdb 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.da.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.da.json
@@ -238,11 +238,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Putter æg i inkubator: {0:0.00}km tilbage"
+      "Value": "{0}) Putter æg i inkubator: {1:0.00}km tilbage"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Ægge inkubator Status: {0:0.00}km tilbage"
+      "Value": "{0}) Ægge inkubator Status: {1:0.00}km tilbage of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.de.json b/PoGo.NecroBot.CLI/Config/Translations/translation.de.json
index 734639be2..212eed7da 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.de.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.de.json
@@ -182,11 +182,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Lege Ei in die Ei-Brutmaschine: {0:0.00}km verbleibend"
+      "Value": "{0}) Lege Ei in die Ei-Brutmaschine: {1:0.00}km verbleibend"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Ei-Brutmaschine Status Update: {0:0.00}km verbleibend"
+      "Value": "{0}) Ei-Brutmaschine Status Update: {1:0.00}km verbleibend of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.el.json b/PoGo.NecroBot.CLI/Config/Translations/translation.el.json
index e08baca1a..681562db3 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.el.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.el.json
@@ -178,15 +178,15 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Ένα αυγό μπαίνει στο εκκολαπτήριο: {0:0.00}km απομένουν"
+      "Value": "{0}) Ένα αυγό μπαίνει στο εκκολαπτήριο: {1:0.00}km απομένουν"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Ενημέρωση κατάστασης αυγού: {0:0.00}km απομένουν"
+      "Value": "{0}) Ενημέρωση κατάστασης αυγού: {1:0.00}km απομένουν of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
-      "Value": "Το εκκολαπτήριο εκκόλαψε ενα αυγό: {0}"
+      "Value": "{0}) Το εκκολαπτήριο εκκόλαψε ενα αυγό: {0}"
     },
     {
       "Key": "logEntryError",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.es.json b/PoGo.NecroBot.CLI/Config/Translations/translation.es.json
index 1fac169be..bcc4869cb 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.es.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.es.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Añadiendo huevo a la incubadora: {0:0.00}km restantes"
+      "Value": "{0}) Añadiendo huevo a la incubadora: {1:0.00}km restantes"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Actualizando el estado de la incubadora: {0:0.00}km restantes"
+      "Value": "{0}) Actualizando el estado de la incubadora: {1:0.00}km restantes of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.et.json b/PoGo.NecroBot.CLI/Config/Translations/translation.et.json
index 6b415d53a..ea7fa4c3b 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.et.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.et.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Panen muna inkubaatorisse: {0:0.00} km veel jäänud"
+      "Value": "{0}) Panen muna inkubaatorisse: {1:0.00} km veel jäänud"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Inkubaatori seis: {0:0.00} km veel jäänud"
+      "Value": "{0}) Inkubaatori seis: {1:0.00} km veel jäänud of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.fr.json b/PoGo.NecroBot.CLI/Config/Translations/translation.fr.json
index 8ada1268e..45772c72b 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.fr.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.fr.json
@@ -202,11 +202,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Incubation d'un oeuf: {0:0.00}km restant"
+      "Value": "{0}) Incubation d'un oeuf: {1:0.00}km restant"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Statut de l'incubateur: {0:0.00}km restant d'un oeuf de {1:0.00}km."
+      "Value": "{0}) Statut de l'incubateur: {1:0.00}km restant d'un oeuf de {2:0.00}km."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.hu.json b/PoGo.NecroBot.CLI/Config/Translations/translation.hu.json
index 7503bdbe9..156a38a8f 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.hu.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.hu.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Tojas behelyezese az inkubatorba: {0:0.00}km maradt"
+      "Value": "{0}) Tojas behelyezese az inkubatorba: {1:0.00}km maradt"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Aktualis inkubator allapot: {0:0.00}km maradt"
+      "Value": "{0}) Aktualis inkubator allapot: {1:0.00}km maradt of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.id.json b/PoGo.NecroBot.CLI/Config/Translations/translation.id.json
index 9a95dca06..a4dcf2418 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.id.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.id.json
@@ -218,11 +218,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Meletakkan telur ({0:0.00} km) ke dalam inkubator"
+      "Value": "{0}) Meletakkan telur ({1:0.00} km) ke dalam inkubator"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Status terbaru inkubator: {0:0.00} km lagi menetas!"
+      "Value": "{0}) Status terbaru inkubator: {1:0.00} km lagi menetas of {2} Km egg!"
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.it.json b/PoGo.NecroBot.CLI/Config/Translations/translation.it.json
index 5a399f881..785cdf66a 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.it.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.it.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Inserimento Uovo nell'Incubatrice: {0:0.00}km rimanenti"
+      "Value": "{0}) Inserimento Uovo nell'Incubatrice: {1:0.00}km rimanenti"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Aggiornamento stato Incubatrice: {0:0.00}km rimanenti"
+      "Value": "{0}) Aggiornamento stato Incubatrice: {1:0.00}km rimanenti of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.ja-JP.json b/PoGo.NecroBot.CLI/Config/Translations/translation.ja-JP.json
index d58146c1b..42c986a31 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.ja-JP.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.ja-JP.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "タマゴを孵化装置にセットしています: 残り：{0:0.00}km"
+      "Value": "{0}) タマゴを孵化装置にセットしています: 残り：{1:0.00}km"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "孵化装置の状態: 残り：{0:0.00}km"
+      "Value": "{0}) 孵化装置の状態: 残り：{1:0.00}km of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.lt.json b/PoGo.NecroBot.CLI/Config/Translations/translation.lt.json
index 3133403db..28fc2dacc 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.lt.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.lt.json
@@ -186,11 +186,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Dedamas kiaušinis į inkubatorių: {0:0.00}km liko"
+      "Value": "{0}) Dedamas kiaušinis į inkubatorių: {1:0.00}km liko"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Inkubatoriaus atnaujinimas: {0:0.00}km liko"
+      "Value": "{0}) Inkubatoriaus atnaujinimas: {1:0.00}km liko of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.nl-NL.json b/PoGo.NecroBot.CLI/Config/Translations/translation.nl-NL.json
index 5a1139bac..496b98561 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.nl-NL.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.nl-NL.json
@@ -175,11 +175,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Ei in broedmachine stoppen: {0:0.00} km resterend"
+      "Value": "{0}) Ei in broedmachine stoppen: {1:0.00} km resterend"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Broedmachine status update: {0:0.00} km resterend"
+      "Value": "{0}) Broedmachine status update: {1:0.00} km resterend of {2} Km egg."
     },
     {
       "Key": "PokedexCatchedTelegram",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.nn-NO.json b/PoGo.NecroBot.CLI/Config/Translations/translation.nn-NO.json
index 18db25858..ccba3a157 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.nn-NO.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.nn-NO.json
@@ -170,11 +170,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Putter egg i incubator: {0:0.00}km igjen"
+      "Value": "{0}) Putter egg i incubator: {1:0.00}km igjen"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Incubator oppdatering: {0:0.00}km igjen"
+      "Value": "{0}) Incubator oppdatering: {1:0.00}km igjen of {2} Km egg."
     },
     {
       "Key": "PokedexCatchedTelegram",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.pl.json b/PoGo.NecroBot.CLI/Config/Translations/translation.pl.json
index 5d569c3df..ddf82beed 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.pl.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.pl.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Umieszczono Jajko w inkubatorze. Pozostało {0:0.00}km"
+      "Value": "{0}) Umieszczono Jajko w inkubatorze. Pozostało {1:0.00}km"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Pozostało: {0:0.00}km do wyklucia"
+      "Value": "{0}) Pozostało: {1:0.00}km do wyklucia of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
@@ -1080,7 +1080,7 @@
     },
     {
       "Key": "farfetchd",
-      "Value": "Farfetch'd"
+      "Value": "Farfetchd"
     },
     {
       "Key": "doduo",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.pt-br.json b/PoGo.NecroBot.CLI/Config/Translations/translation.pt-br.json
index bbdaa6a9d..45f28d27a 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.pt-br.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.pt-br.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Colocando ovo na incubadora: restando {0:0.00}km"
+      "Value": "{0}) Colocando ovo na incubadora: restando {1:0.00}km"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Status da incubadora atualizado: restando {0:0.00}km"
+      "Value": "{0}) Status da incubadora atualizado: restando {1:0.00}km of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.pt-pt.json b/PoGo.NecroBot.CLI/Config/Translations/translation.pt-pt.json
index 592f33e35..8540b221c 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.pt-pt.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.pt-pt.json
@@ -178,11 +178,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "A colocar ovo na incubadora: restam {0:0.00}km"
+      "Value": "{0}) A colocar ovo na incubadora: restam {1:0.00}km"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Status da incubadora atualizado: restam {0:0.00}km"
+      "Value": "{0}) Status da incubadora atualizado: restam {1:0.00}km of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.ro.json b/PoGo.NecroBot.CLI/Config/Translations/translation.ro.json
index 538a7fa98..f888a2400 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.ro.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.ro.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Se pune oul în incubator: {0:0.00} km rămași"
+      "Value": "{0}) Se pune oul în incubator: {1:0.00} km rămași"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Actualizare pentru statusului incubatorului: {0:0.00} km rămași"
+      "Value": "{0}) Actualizare pentru statusului incubatorului: {1:0.00} km rămași of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.ru-RU.json b/PoGo.NecroBot.CLI/Config/Translations/translation.ru-RU.json
index 53db94b62..c9c92714e 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.ru-RU.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.ru-RU.json
@@ -207,14 +207,14 @@
       "Key": "welcomeWarning",
       "Value": "Убедитесь, что Широта и Долгота верны! Закройте программу, если это не так! Широта: {0} Долгота: {1}"
     },
-    {
-      "Key": "incubatorPuttingEgg",
-      "Value": "Кладем яйцо в инкубатор: {0:0.00}км осталось"
-    },
-    {
-      "Key": "incubatorStatusUpdate",
-      "Value": "Статус инкубатора: {0:0.00}км осталось"
-    },
+      {
+        "Key": "incubatorPuttingEgg",
+        "Value": "{0}) Кладем яйцо в инкубатор: {1:0.00}км осталось"
+      },
+      {
+        "Key": "incubatorStatusUpdate",
+        "Value": "{0}) Статус инкубатора: {1:0.00}км осталось of {2} Km egg."
+      },
     {
       "Key": "incubatorEggHatched",
       "Value": "Из Яйца получили: {0} | Lvl: {1} CP: ({2}/{3}) IV: {4}%"
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.sv.json b/PoGo.NecroBot.CLI/Config/Translations/translation.sv.json
index f4849c22a..ca3fc8a72 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.sv.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.sv.json
@@ -178,11 +178,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Placerar ägg i inkubator: {0:0.00}km kvar"
+      "Value": "{0}) Placerar ägg i inkubator: {1:0.00}km kvar"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Inkubator status: {0:0.00}km kvar"
+      "Value": "{0}) Inkubator status: {1:0.00}km kvar of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.th.json b/PoGo.NecroBot.CLI/Config/Translations/translation.th.json
index beabde8a3..c138c5176 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.th.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.th.json
@@ -214,7 +214,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "สถานะแคปซูนฟักไข่อีก : {0:0.00} กิโลเมตร"
+      "Value": "สถานะแคปซูนฟักไข่อีก : {0:0.00} กิโลเมตร of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.tr.json b/PoGo.NecroBot.CLI/Config/Translations/translation.tr.json
index 59113b2c2..a523d38f9 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.tr.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.tr.json
@@ -214,7 +214,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Kuluçka makinesi(Incubator) durum güncellemesi: {0:0.00}km kaldı"
+      "Value": "Kuluçka makinesi(Incubator) durum güncellemesi: {0:0.00}km kaldı of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
@@ -1076,7 +1076,7 @@
     },
     {
       "Key": "farfetchd",
-      "Value": "Farfetch'd"
+      "Value": "Farfetchd"
     },
     {
       "Key": "doduo",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.uk-UA.json b/PoGo.NecroBot.CLI/Config/Translations/translation.uk-UA.json
index b59d16a97..8008756c9 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.uk-UA.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.uk-UA.json
@@ -182,7 +182,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Статус інкубатора: {0: 0.00} км залишилося"
+      "Value": "Статус інкубатора: {0: 0.00} км залишилося of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.vi.json b/PoGo.NecroBot.CLI/Config/Translations/translation.vi.json
index cb709cde4..0affd5c41 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.vi.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.vi.json
@@ -214,7 +214,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Tình trạng lồng ấp: còn lại {0:0.00}km"
+      "Value": "Tình trạng lồng ấp: còn lại {0:0.00}km of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.zh-CN.json b/PoGo.NecroBot.CLI/Config/Translations/translation.zh-CN.json
index ad39a0a57..f2247bef6 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.zh-CN.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.zh-CN.json
@@ -214,7 +214,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "孵化器状态更新:剩余{0:0.00}千米\t\t"
+      "Value": "孵化器状态更新:剩余{0:0.00}千米 of {2} Km egg.\t\t"
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.zh-CN_pp.json b/PoGo.NecroBot.CLI/Config/Translations/translation.zh-CN_pp.json
index f0b54011f..140ba2f37 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.zh-CN_pp.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.zh-CN_pp.json
@@ -214,7 +214,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "孵化器状态更新:剩余{0:0.00}千米\t\t"
+      "Value": "孵化器状态更新:剩余{0:0.00}千米 of {2} Km egg.\t\t"
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.zh-HK.json b/PoGo.NecroBot.CLI/Config/Translations/translation.zh-HK.json
index f9fa5e04a..e6285033c 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.zh-HK.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.zh-HK.json
@@ -214,7 +214,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "更新孵化器狀態：剩餘{0:0.00}公里"
+      "Value": "更新孵化器狀態：剩餘{0:0.00}公里 of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/Config/Translations/translation.zh-TW.json b/PoGo.NecroBot.CLI/Config/Translations/translation.zh-TW.json
index a18deb3a4..094f2d3ac 100644
--- a/PoGo.NecroBot.CLI/Config/Translations/translation.zh-TW.json
+++ b/PoGo.NecroBot.CLI/Config/Translations/translation.zh-TW.json
@@ -218,7 +218,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "更新孵化器狀態：剩餘{0:0.00}公里\t\t"
+      "Value": "更新孵化器狀態：剩餘{0:0.00}公里 of {2} Km egg.\t\t"
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj
index 5f20fad52..37e71d811 100644
--- a/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj
+++ b/PoGo.NecroBot.CLI/PoGo.NecroBot.CLI.csproj
@@ -112,16 +112,14 @@
     <None Include="Resources\PayPalDonateNow1.png" />
     <None Include="Resources\PayPalDonateNow.png" />
     <None Include="Resources\necro_logo.jpg" />
-    <Reference Include="AeroWizard, Version=2.1.10.0, Culture=neutral, PublicKeyToken=915e74f5d64b8f37, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\AeroWizard.2.1.10\lib\net452\AeroWizard.dll</HintPath>
+    <Reference Include="AeroWizard, Version=2.1.11.0, Culture=neutral, PublicKeyToken=915e74f5d64b8f37, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\AeroWizard.2.1.11\lib\net452\AeroWizard.dll</HintPath>
     </Reference>
-    <Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="CommandLine, Version=2.2.1.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\CommandLineParser.2.2.1\lib\net45\CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="Costura, Version=1.6.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="Costura, Version=2.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Costura.Fody.2.0.0\lib\net452\Costura.dll</HintPath>
     </Reference>
     <Reference Include="Google.Protobuf, Version=3.5.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Google.Protobuf.3.5.1\lib\net45\Google.Protobuf.dll</HintPath>
@@ -156,14 +154,14 @@
     <Reference Include="Microsoft.Extensions.Primitives, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Primitives.1.1.1\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="POGOProtos.Core, Version=2.21.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\POGOProtos.Core.2.21.1\lib\net45\POGOProtos.Core.dll</HintPath>
+    <Reference Include="POGOProtos.Core, Version=2.24.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\POGOProtos.Core.2.24.0\lib\net45\POGOProtos.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
+    <Reference Include="Remotion.Linq, Version=2.2.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll</HintPath>
     </Reference>
     <Reference Include="SuperSocket.Common, Version=1.6.6.1, Culture=neutral, PublicKeyToken=6c80000676988ebb, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\SuperSocket.1.6.6.1\lib\net45\SuperSocket.Common.dll</HintPath>
@@ -208,6 +206,10 @@
     </Reference>
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Numerics" />
+    <Reference Include="System.Reflection.TypeExtensions">
+      <HintPath>$(SolutionDir)\packages\System.Reflection.TypeExtensions.4.4.0\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Runtime.Caching" />
     <Reference Include="Microsoft.CSharp">
       <Private>True</Private>
@@ -228,13 +230,15 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="WebDriver">
-      <HintPath>$(SolutionDir)\packages\Selenium.WebDriver.3.8.0\lib\net45\WebDriver.dll</HintPath>
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="WebDriver.Support">
-      <HintPath>$(SolutionDir)\packages\Selenium.Support.3.8.0\lib\net45\WebDriver.Support.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="WebDriver, Version=3.11.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Selenium.WebDriver.3.11.1\lib\net45\WebDriver.dll</HintPath>
+    </Reference>
+    <Reference Include="WebDriver.Support, Version=3.11.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Selenium.Support.3.11.1\lib\net45\WebDriver.Support.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -431,9 +435,9 @@ rmdir /s /q x64</PostBuildEvent>
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)\packages\Fody.2.3.15\build\net452\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.2.3.15\build\net452\Fody.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Fody.3.0.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.3.0.3\build\Fody.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets'))" />
   </Target>
   <UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
     <ParameterGroup>
@@ -471,9 +475,9 @@ foreach (var item in filesToCleanup)
   <Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
     <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
   </Target>
-  <Import Project="$(SolutionDir)\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('$(SolutionDir)\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
-  <Import Project="$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets')" />
-  <Import Project="$(SolutionDir)\packages\Fody.2.3.15\build\net452\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.2.3.15\build\net452\Fody.targets')" />
+  <Import Project="$(SolutionDir)\packages\Fody.3.0.3\build\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.3.0.3\build\Fody.targets')" />
+  <Import Project="$(SolutionDir)\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets" Condition="Exists('$(SolutionDir)\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets')" />
+  <Import Project="$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/PoGo.NecroBot.CLI/Program.cs b/PoGo.NecroBot.CLI/Program.cs
index cc7b6479d..0538bde3c 100644
--- a/PoGo.NecroBot.CLI/Program.cs
+++ b/PoGo.NecroBot.CLI/Program.cs
@@ -37,24 +37,26 @@ class Options
         [Option('i', "init", Required = false, HelpText = "Init account")]
         public bool Init { get; set; }
 
-        [Option('t', "template", DefaultValue = "", Required = false, HelpText = "Prints all messages to standard output.")]
+        [Option('t', "template", Default = "", Required = false, HelpText = "Prints all messages to standard output.")]
         public string Template { get; set; }
 
-        [Option('p', "password", DefaultValue = "", Required = false, HelpText = "Password")]
+        [Option('p', "password", Default = "", Required = false, HelpText = "Password")]
         public string Password { get; set; }
 
-        [Option('g', "google", DefaultValue = false, Required = false, HelpText = "is google account")]
+        [Option('g', "google", Default = false, Required = false, HelpText = "is google account")]
         public bool IsGoogle { get; set; }
 
-        [Option('s', "start", DefaultValue = 1, HelpText = "Start account", Required = false)]
+        [Option('s', "start", Default = 1, HelpText = "Start account", Required = false)]
         public int Start { get; set; }
 
-        [Option('e', "end", DefaultValue = 10, HelpText = "End account", Required = false)]
+        [Option('e', "end", Default = 10, HelpText = "End account", Required = false)]
         public int End { get; set; }
 
+        /*
+         * outed or deprecated
         [ParserState]
         public IParserState LastParserState { get; set; }
-
+        
         [HelpOption]
         public string GetUsage()
         {
@@ -66,6 +68,7 @@ public string GetUsage()
             Environment.Exit(0);
             return null;
         }
+        */
     }
 
     public class Program
@@ -216,14 +219,14 @@ public static void RunBotWithParameters(Action<ISession, StatisticsAggregator> o
             }
 
             var options = new Options();
-            if (CommandLine.Parser.Default.ParseArguments(args, options))
-            {
+            //if (CommandLine.Parser.Default.ParseArguments(args, options))
+            //{
                 // Values are available here
                 if (options.Init)
                 {
                     settings.GenerateAccount(options.IsGoogle, options.Template, options.Start, options.End, options.Password);
                 }
-            }
+            //}
             var lastPosFile = Path.Combine(profileConfigPath, "LastPos.ini");
             if (File.Exists(lastPosFile) && settings.LocationConfig.StartFromLastPosition)
             {
@@ -440,7 +443,7 @@ public static void RunBotWithParameters(Action<ISession, StatisticsAggregator> o
             stats.DirtyEvent +=
                 () =>
                 {
-                    GetPlayerResponse x = _session.Client.Player.GetPlayer().Result;
+                    GetPlayerResponse x =  _session.Client.Player.GetPlayer().Result;
                     string warn = x.Warn ? "*(Flagged)*-" : null;
 
                     Console.Title = $"[NecroBot2 v{strVersion}] Team: {x.PlayerData.Team} - {warn}" +
diff --git a/PoGo.NecroBot.CLI/packages.config b/PoGo.NecroBot.CLI/packages.config
index bebbf16d6..34305ed66 100644
--- a/PoGo.NecroBot.CLI/packages.config
+++ b/PoGo.NecroBot.CLI/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AeroWizard" version="2.1.10" targetFramework="net462" />
-  <package id="CommandLineParser" version="1.9.71" targetFramework="net462" />
-  <package id="Costura.Fody" version="1.6.2" targetFramework="net462" developmentDependency="true" />
-  <package id="Fody" version="2.3.15" targetFramework="net462" developmentDependency="true" />
+  <package id="AeroWizard" version="2.1.11" targetFramework="net462" />
+  <package id="CommandLineParser" version="2.2.1" targetFramework="net462" />
+  <package id="Costura.Fody" version="2.0.0" targetFramework="net462" developmentDependency="true" />
+  <package id="Fody" version="3.0.3" targetFramework="net462" developmentDependency="true" />
   <package id="Google.Protobuf" version="3.5.1" targetFramework="net462" />
   <package id="log4net" version="2.0.8" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore" version="1.1.2" targetFramework="net462" />
@@ -18,12 +18,12 @@
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net462" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net462" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net462" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
-  <package id="POGOProtos.Core" version="2.21.1" targetFramework="net462" />
-  <package id="Remotion.Linq" version="2.1.2" targetFramework="net462" />
-  <package id="Selenium.Support" version="3.8.0" targetFramework="net462" />
-  <package id="Selenium.WebDriver" version="3.8.0" targetFramework="net462" />
-  <package id="Selenium.WebDriver.ChromeDriver" version="2.34.0" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
+  <package id="POGOProtos.Core" version="2.24.0" targetFramework="net462" />
+  <package id="Remotion.Linq" version="2.2.0" targetFramework="net462" />
+  <package id="Selenium.Support" version="3.11.1" targetFramework="net462" />
+  <package id="Selenium.WebDriver" version="3.11.1" targetFramework="net462" />
+  <package id="Selenium.WebDriver.ChromeDriver" version="2.37.0" targetFramework="net462" />
   <package id="SuperSocket" version="1.6.6.1" targetFramework="net462" />
   <package id="SuperSocket.Engine" version="1.6.6.1" targetFramework="net462" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net462" />
@@ -54,6 +54,7 @@
   <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
   <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net462" />
   <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection.TypeExtensions" version="4.4.0" targetFramework="net462" />
   <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net462" />
   <package id="System.Runtime" version="4.3.0" targetFramework="net462" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net462" />
@@ -72,7 +73,7 @@
   <package id="System.Threading" version="4.3.0" targetFramework="net462" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net462" />
   <package id="System.Threading.Timer" version="4.3.0" targetFramework="net462" />
-  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net462" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net462" />
   <package id="TinyIoC" version="1.3" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/PoGo.NecroBot.Logic/Common/Translations.cs b/PoGo.NecroBot.Logic/Common/Translations.cs
index 0c29dd033..6fd92ba3b 100644
--- a/PoGo.NecroBot.Logic/Common/Translations.cs
+++ b/PoGo.NecroBot.Logic/Common/Translations.cs
@@ -368,7 +368,7 @@ public class Translation : ITranslation
                 new KeyValuePair<TranslationString, string>(TranslationString.EventPokemonEvolvedSuccess,
                     "{0} to {1} | CP: {2} | IV: {3}% | XP: {4} | Candies: {5} | Lvl: {6}"),
                 new KeyValuePair<TranslationString, string>(TranslationString.EventPokemonEvolvedFailed,
-                    "Failed {0}. Result was {1}, stopping evolving {2}"),
+                    "Failed {0} | Result was {1}, stopping evolving {2}"),
                 new KeyValuePair<TranslationString, string>(TranslationString.EventPokemonTransferred,
                     "{0} | CP: {1}/{3} | IV: {2}%/{4}% | Candies: {5} | Lvl: {6} | Slashed: {7}"),
                 new KeyValuePair<TranslationString, string>(TranslationString.EventPokemonUpgraded,
@@ -377,9 +377,9 @@ public class Translation : ITranslation
                 new KeyValuePair<TranslationString, string>(TranslationString.EventItemRecycled, "{0}x {1}"), //"{0,3:0}x {1}"),
                 //Logging Cleanup (mostly uneccessary information, may want a verbose pokemon capture logger setting)
                 new KeyValuePair<TranslationString, string>(TranslationString.EventPokemonCaptureSuccess,
-                    "({0}) | ({1}) {2} | Lvl: {3} | CP: {4}/{5} | IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left) | XP: {11} | SD: {12} | {13} | lat: {14} long: {15} | Move1: {16} Move2: {17} | Rarity: {18} | Capture Reason: {19} | Shiny: {20} | Form: {21} | Costume: {22} | Sex: {23}"),
+                    "({0}) | ({1}) {2} | XP: {11} | SD: {12} | Lvl: {3} | CP: {4}/{5} | IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left) | {13} | lat: {14} long: {15} | Move1: {16} Move2: {17} | Rarity: {18} | Capture Reason: {19} | Shiny: {20} | Form: {21} | Costume: {22} | Sex: {23}"),
                 new KeyValuePair<TranslationString, string>(TranslationString.EventPokemonCaptureFailed,
-                    "({0}) | ({1}) {2} | Lvl: {3} | CP: {4}/{5} | IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left) | XP: {11} | lat: {12} long: {13} | Move1: {14} Move2: {15} | Rarity: {16}"),
+                    "({0}) | ({1}) {2} | XP: {11} |          | Lvl: {3} | CP: {4}/{5} | IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left) | lat: {12} long: {13} | Move1: {14} Move2: {15} | Rarity :{16}"),
 
                 new KeyValuePair<TranslationString, string>(TranslationString.EventNoPokeballs,
                     "No Pokeballs - We missed a {0} with CP {1}"),
@@ -416,9 +416,9 @@ public class Translation : ITranslation
                 new KeyValuePair<TranslationString, string>(TranslationString.WelcomeWarning,
                     "Make sure Lat & Lng are right. Exit Program if not! Lat: {0} Lng: {1}"),
                 new KeyValuePair<TranslationString, string>(TranslationString.IncubatorPuttingEgg,
-                    "Putting egg in incubator: {0} km left"),
+                    "{0}) Putting egg in incubator: {1} km left"),
                 new KeyValuePair<TranslationString, string>(TranslationString.IncubatorStatusUpdate,
-                    "Incubator status update: {0} Km left of {1} Km egg."),
+                    "{0}) Incubator status update: {1} Km left of {2} Km egg."),
                 new KeyValuePair<TranslationString, string>(TranslationString.IncubatorEggHatched,
                     "{0} Km egg has hatched: {1} | Lvl: {2} | CP: {3}/{4} | IV: {5}% | XP: {6} | SD: {7} | Candies: {8}"),
                 new KeyValuePair<TranslationString, string>(TranslationString.LogEntryError, "ERROR"),
diff --git a/PoGo.NecroBot.Logic/Event/EggIncubatorStatusEvent.cs b/PoGo.NecroBot.Logic/Event/EggIncubatorStatusEvent.cs
index 52e6cc5ce..a5ad2ad0f 100644
--- a/PoGo.NecroBot.Logic/Event/EggIncubatorStatusEvent.cs
+++ b/PoGo.NecroBot.Logic/Event/EggIncubatorStatusEvent.cs
@@ -2,6 +2,7 @@
 {
     public class EggIncubatorStatusEvent : IEvent
     {
+        public int Eggs;
         public string IncubatorId;
         public double KmRemaining;
         public double KmToWalk;
diff --git a/PoGo.NecroBot.Logic/Inventory.cs b/PoGo.NecroBot.Logic/Inventory.cs
index d99ff7566..e6334181d 100644
--- a/PoGo.NecroBot.Logic/Inventory.cs
+++ b/PoGo.NecroBot.Logic/Inventory.cs
@@ -777,15 +777,19 @@ public int GetCandyToEvolve(PokemonSettings settings, EvolveFilter appliedFilter
 
         public async Task<bool> CanEvolvePokemon(PokemonData pokemon, EvolveFilter appliedFilter = null, bool checkEvolveFilterRequirements = false)
         {
+            // Can't evolve pokemon null.
+            if (pokemon == null || pokemon.PokemonId == PokemonId.Missingno || pokemon.IsBad)
+                return false;
+
             // Can't evolve pokemon in gyms.
             if (!string.IsNullOrEmpty(pokemon.DeployedFortId))
                 return false;
 
             IEnumerable<PokemonSettings> pokemonSettings = await GetPokemonSettings().ConfigureAwait(false);
-            var settings = pokemonSettings.SingleOrDefault(x => x.PokemonId == pokemon.PokemonId);
+            var settings = pokemonSettings.FirstOrDefault(x => x.PokemonId == pokemon.PokemonId);
 
             // Can't evolve pokemon that are not evolvable.
-            if (settings.EvolutionIds.Count == 0 && settings.EvolutionBranch.Count == 0)
+            if (settings == null || settings.EvolutionIds.Count == 0 && settings.EvolutionBranch.Count == 0)
                 return false;
 
             int familyCandy = await GetCandyCount(pokemon.PokemonId).ConfigureAwait(false);
diff --git a/PoGo.NecroBot.Logic/Model/Account.cs b/PoGo.NecroBot.Logic/Model/Account.cs
index 12252be6d..64a80724b 100644
--- a/PoGo.NecroBot.Logic/Model/Account.cs
+++ b/PoGo.NecroBot.Logic/Model/Account.cs
@@ -17,6 +17,8 @@ public partial class Account
         public double AccountLatitude { get; set; }
         public double AccountLongitude { get; set; }
         public bool AccountActive { get; set; }
+        public double RunStart { get; set; }
+        public double RunEnd { get; set; }
         [Required]
         public string Password { get; set; }
         public double? RuntimeTotal { get; set; }
@@ -54,6 +56,8 @@ public Account(AuthConfig item)
             AccountLatitude = item.AccountLatitude;
             AccountLongitude = item.AccountLongitude;
             AccountActive = item.AccountActive;
+            RunStart = item.RunStart;
+            RunEnd = item.RunEnd;
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
diff --git a/PoGo.NecroBot.Logic/Model/Settings/AuthConfig.cs b/PoGo.NecroBot.Logic/Model/Settings/AuthConfig.cs
index 80803b287..71463ffb7 100644
--- a/PoGo.NecroBot.Logic/Model/Settings/AuthConfig.cs
+++ b/PoGo.NecroBot.Logic/Model/Settings/AuthConfig.cs
@@ -64,6 +64,14 @@ public AuthConfig() : base() { }
         [JsonProperty(Required = Required.Default, DefaultValueHandling = DefaultValueHandling.Populate, Order = 11)]
         public string POSIX { get; set; }
 
+        [DefaultValue(0)]
+        [JsonProperty(Required = Required.Default, DefaultValueHandling = DefaultValueHandling.Populate, Order = 12)]
+        public double RunStart { get; set; }
+
+        [DefaultValue(86399)]
+        [JsonProperty(Required = Required.Default, DefaultValueHandling = DefaultValueHandling.Populate, Order = 13)]
+        public double RunEnd { get; set; }
+
         // Total runtime since client started
         [JsonIgnore]
         public double RuntimeTotal { get; set; }
diff --git a/PoGo.NecroBot.Logic/Model/Settings/ClientSettings.cs b/PoGo.NecroBot.Logic/Model/Settings/ClientSettings.cs
index c149823e5..723ec323d 100644
--- a/PoGo.NecroBot.Logic/Model/Settings/ClientSettings.cs
+++ b/PoGo.NecroBot.Logic/Model/Settings/ClientSettings.cs
@@ -134,6 +134,18 @@ string ISettings.POSIX
             set { _settings.Auth.CurrentAuthConfig.POSIX = value; }
         }
 
+        double ISettings.RunStart
+        {
+            get { return _settings.Auth.CurrentAuthConfig.RunStart; }
+            set { _settings.Auth.CurrentAuthConfig.RunStart = value; }
+        }
+
+        double ISettings.RunEnd
+        {
+            get { return _settings.Auth.CurrentAuthConfig.RunEnd; }
+            set { _settings.Auth.CurrentAuthConfig.RunEnd = value; }
+        }
+
         #endregion Auth Config Values
 
         #region Device Config Values
diff --git a/PoGo.NecroBot.Logic/MultiAccountManager.cs b/PoGo.NecroBot.Logic/MultiAccountManager.cs
index 74dfc076d..f4c17ae82 100644
--- a/PoGo.NecroBot.Logic/MultiAccountManager.cs
+++ b/PoGo.NecroBot.Logic/MultiAccountManager.cs
@@ -55,7 +55,6 @@ public LocalView<Account> Accounts
                     {
                         item.IsRunning = 0;
                         item.LastRuntimeUpdatedAt = null;
-                        item.RuntimeTotal = 0;
                     }
                     _context.SaveChanges();
                 }
@@ -92,11 +91,12 @@ public void SwitchAccounts(Account newAccount)
             if (runningAccount != null)
             {
                 runningAccount.IsRunning = 0;
-                var now = DateTime.Now;
 
                 if (runningAccount.LastRuntimeUpdatedAt.HasValue)
-                    runningAccount.RuntimeTotal += (now - TimeUtil.GetDateTimeFromMilliseconds(runningAccount.LastRuntimeUpdatedAt.Value)).TotalMinutes;
-                runningAccount.LastRuntimeUpdatedAt = now.ToUnixTime();
+                {
+                    runningAccount.RuntimeTotal = (int)runningAccount.RuntimeTotal; //+= (now - TimeUtil.GetDateTimeFromMilliseconds(runningAccount.LastRuntimeUpdatedAt.Value)).TotalMinutes;
+                    runningAccount.LastRuntimeUpdatedAt = DateTime.Now.ToUnixTime();
+                }
                 UpdateLocalAccount(runningAccount);
             }
 
@@ -113,6 +113,8 @@ public void SwitchAccounts(Account newAccount)
             _globalSettings.Auth.CurrentAuthConfig.AccountLatitude = newAccount.AccountLatitude;
             _globalSettings.Auth.CurrentAuthConfig.AccountLongitude = newAccount.AccountLongitude;
             _globalSettings.Auth.CurrentAuthConfig.AccountActive = newAccount.AccountActive;
+            _globalSettings.Auth.CurrentAuthConfig.RunStart = newAccount.RunStart;
+            _globalSettings.Auth.CurrentAuthConfig.RunEnd = newAccount.RunEnd;
 
             string body = "";
             foreach (var item in Accounts)
@@ -139,9 +141,9 @@ private void LoadDataFromDB()
                 foreach (var item in _context.Account.OrderBy(p => p.Id))
                 {
                     item.IsRunning = 0;
-                    item.RuntimeTotal = 0;
                     UpdateLocalAccount(item);
                 }
+                _context.SaveChanges();
             }
         }
 
@@ -191,7 +193,7 @@ private void SyncDatabase(List<AuthConfig> authConfigs)
                         _context.Account.Add(newAcc);
                         _context.SaveChanges();
                     }
-                    catch(Exception)
+                    catch (Exception)
                     {
                         Logic.Logging.Logger.Write($"Error while saving data into {ACCOUNT_DB_NAME}, please delete {ACCOUNT_DB_NAME} and restart bot to have it fully work in order");
                     }
@@ -205,6 +207,8 @@ private void SyncDatabase(List<AuthConfig> authConfigs)
                     existing.AccountLatitude = authConfig.AccountLatitude;
                     existing.AccountLongitude = authConfig.AccountLongitude;
                     existing.AccountActive = authConfig.AccountActive;
+                    existing.RunStart = authConfig.RunStart;
+                    existing.RunEnd = authConfig.RunEnd;
                     _context.SaveChanges();
                 }
             }
@@ -233,9 +237,9 @@ internal Account GetMinRuntime(bool ignoreBlockCheck = false)
                 return null;
 
             if (ignoreBlockCheck)
-                return _context.Account.OrderByDescending(x => x.Level).ThenByDescending(x => x.CurrentXp).Where(a => a.AccountActive == true).LastOrDefault();
+                return _context.Account.OrderByDescending(x => x.RuntimeTotal).ThenByDescending(x => x.Level).ThenByDescending(x => x.CurrentXp).Where(a => a.AccountActive == true && a.LastLogin != "Failure" && DateTime.Now.TimeOfDay.TotalSeconds >= a.RunStart && DateTime.Now.TimeOfDay.TotalSeconds <= a.RunEnd).Last();
             else
-                return _context.Account.OrderByDescending(x => x.Level).ThenByDescending(x => x.CurrentXp).ThenBy(x => x.RuntimeTotal).Where(x => x != null && x.ReleaseBlockTime.HasValue && x.ReleaseBlockTime < DateTime.Now.ToUnixTime()).LastOrDefault();
+                return _context.Account.OrderByDescending(x => x.Level).ThenByDescending(x => x.CurrentXp).ThenBy(x => x.RuntimeTotal).Where(x => x != null && x.ReleaseBlockTime.HasValue && x.ReleaseBlockTime < DateTime.Now.ToUnixTime()).Last();
         }
 
         public bool AllowMultipleBot()
@@ -293,7 +297,7 @@ public Account GetSwitchableAccount(Account bot = null, bool pauseIfNoSwitchable
 
             if (_context.Account.Count() > 0)
             {
-                var runnableAccount = _context.Account.OrderByDescending(p => p.Level).ThenByDescending(p => p.CurrentXp).Where(a => a.AccountActive == true).LastOrDefault(); //_context.Account.OrderByDescending(x => x.RuntimeTotal).ThenByDescending(p => p.Level).ThenByDescending(p => p.CurrentXp).LastOrDefault(p => p != currentAccount && p.AccountActive == true);
+                var runnableAccount = _context.Account.OrderByDescending(p => p.RuntimeTotal).ThenByDescending(p => p.Level).ThenByDescending(p => p.CurrentXp).Where(a => a != currentAccount && a.AccountActive == true && a.LastLogin != "Failure" && DateTime.Now.TimeOfDay.TotalSeconds >= a.RunStart && DateTime.Now.TimeOfDay.TotalSeconds <= a.RunEnd).LastOrDefault();
 
                 if (runnableAccount != null)
                     return runnableAccount;
@@ -386,24 +390,32 @@ public void DumpAccountList()
 
             int acnt = 0;
 
-            foreach (var item in Accounts.OrderByDescending(p => p.Level).ThenByDescending(p => p.CurrentXp))
+            foreach (var item in Accounts.OrderByDescending(p => p.AccountActive).ThenByDescending(p => p.Level).ThenByDescending(p => p.CurrentXp))
             {
                 user = string.IsNullOrEmpty(item.Nickname) ? item.Username : item.Nickname;
                 acnt = acnt + 1;
+                if (item.RuntimeTotal == null) { item.RuntimeTotal = 0.0; }
+                int M = (int)item.RuntimeTotal;
+                int H = 0;
+                if (M >= 60) { H = (int)(M / 60); M = M - H * 60; }
+                string RT = "  :  ";
+                if (item.RuntimeTotal > 0) { RT = $"{H.ToString("00")}:{ M.ToString("00")}"; } 
+                if (item.LastLogin == "Failure") { item.AccountActive = false; }
+                //if (((DateTime.Now.TimeOfDay.TotalMilliseconds - item.LastLoginTimestamp.Value) / 86400) >= 14) { item.AccountActive = false; }
 
                 if (item.Level > 0)
                 {
-                    if (item.AccountActive)
-                        Logger.Write($"{acnt,2}) {user.PadRight(maxL)} | Lvl: {item.Level,2:#0} | XP: {item.CurrentXp,8:0} ({(int)((double)item.CurrentXp.Value / (double)item.NextLevelXp.Value * 100),2:#0}%) | SD: {item.Stardust,8:0} | Runtime: {item.RuntimeTotal:00:00}", LogLevel.BotStats);
+                    if (item.AccountActive && DateTime.Now.TimeOfDay.TotalSeconds >= item.RunStart && DateTime.Now.TimeOfDay.TotalSeconds <= item.RunEnd)
+                        Logger.Write($"{acnt,2}) {user.PadRight(maxL)} | Lvl: {item.Level,2:#0} | XP: {item.CurrentXp,8:0} ({(int)((double)item.CurrentXp.Value / item.NextLevelXp.Value * 100),2:#0}%) | SD: {item.Stardust,8:0} | Runtime: {RT} | Last Login: {TimeUtil.GetDateTimeFromMilliseconds(item.LastLoginTimestamp.Value).ToLocalTime().ToString("MMM dd-HH:mm")}", LogLevel.BotStats);
                     else
-                        Logger.Write($"{acnt,2}) {user.PadRight(maxL)} | Lvl: {item.Level,2:#0} | XP: {item.CurrentXp,8:0} ({(int)((double)item.CurrentXp.Value / (double)item.NextLevelXp.Value * 100),2:#0}%) | SD: {item.Stardust,8:0} | Runtime: {item.RuntimeTotal:00:00}", LogLevel.BotStats, ConsoleColor.Red);
+                        Logger.Write($"{acnt,2})-{user.PadRight(maxL)} | Lvl: {item.Level,2:#0} | XP: {item.CurrentXp,8:0} ({(int)((double)item.CurrentXp.Value / item.NextLevelXp.Value * 100),2:#0}%) | SD: {item.Stardust,8:0} | Runtime: {RT} | Last Login: {TimeUtil.GetDateTimeFromMilliseconds(item.LastLoginTimestamp.Value).ToLocalTime().ToString("MMM dd-HH:mm")}", LogLevel.BotStats, ConsoleColor.Red);
                 }
                 else
                 {
-                    if (item.AccountActive)
-                        Logger.Write($"{acnt,2}) {user.PadRight(maxL)} | Lvl: ?? | XP:        0 ( 0%) | SD:        0 | Runtime: {item.RuntimeTotal:00:00}", LogLevel.BotStats, ConsoleColor.Yellow);
+                    if (item.AccountActive && DateTime.Now.TimeOfDay.TotalSeconds >= item.RunStart && DateTime.Now.TimeOfDay.TotalSeconds <= item.RunEnd)
+                        Logger.Write($"{acnt,2}) {user.PadRight(maxL)} | Lvl: ?? | XP:        0 ( 0%) | SD:        0 | Runtime:   :   | Last Login: N/A", LogLevel.BotStats, ConsoleColor.Yellow);
                     else
-                        Logger.Write($"{acnt,2}) {user.PadRight(maxL)} | Lvl: ?? | XP:        0 ( 0%) | SD:        0 | Runtime: {item.RuntimeTotal:00:00}", LogLevel.BotStats, ConsoleColor.Red);
+                        Logger.Write($"{acnt,2})-{user.PadRight(maxL)} | Lvl: ?? | XP:        0 ( 0%) | SD:        0 | Runtime:   :   | Last Login: N/A", LogLevel.BotStats, ConsoleColor.Red);
                 }
             }
         }
@@ -438,9 +450,10 @@ internal void DirtyEventHandle(Statistics stat)
             account.PrevLevelXp = stat.StatsExport.PreviousXp - stat.StatsExport.LevelXp;
             var now = DateTime.Now;
             if (account.LastRuntimeUpdatedAt.HasValue)
+            {
                 account.RuntimeTotal += (now - TimeUtil.GetDateTimeFromMilliseconds(account.LastRuntimeUpdatedAt.Value)).TotalMinutes;
-            account.LastRuntimeUpdatedAt = now.ToUnixTime();
-
+                account.LastRuntimeUpdatedAt = now.ToUnixTime();
+            }
             UpdateLocalAccount(account);
         }
     }
diff --git a/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj b/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj
index 06ee6faa2..51bfbc3e0 100644
--- a/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj
+++ b/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj
@@ -64,20 +64,20 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AeroWizard, Version=2.1.10.0, Culture=neutral, PublicKeyToken=915e74f5d64b8f37, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\AeroWizard.2.1.10\lib\net452\AeroWizard.dll</HintPath>
+    <Reference Include="AeroWizard, Version=2.1.11.0, Culture=neutral, PublicKeyToken=915e74f5d64b8f37, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\AeroWizard.2.1.11\lib\net452\AeroWizard.dll</HintPath>
     </Reference>
     <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Portable.BouncyCastle.1.8.1.3\lib\net40\BouncyCastle.Crypto.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Portable.BouncyCastle.1.8.1.4\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="CloudFlareUtilities, Version=0.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\CloudFlareUtilities.0.4.0-alpha\lib\portable45-net45+win8+wpa81\CloudFlareUtilities.dll</HintPath>
+    <Reference Include="CloudFlareUtilities, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\CloudFlareUtilities.1.2.0\lib\netstandard1.1\CloudFlareUtilities.dll</HintPath>
     </Reference>
-    <Reference Include="EngineIoClientDotNet, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\EngineIoClientDotNet.1.0.4\lib\net45\EngineIoClientDotNet.dll</HintPath>
+    <Reference Include="EngineIoClientDotNet, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\EngineIoClientDotNet.1.0.5\lib\net45\EngineIoClientDotNet.dll</HintPath>
     </Reference>
-    <Reference Include="EPPlus, Version=4.1.1.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)packages\EPPlus.4.1.1\lib\net40\EPPlus.dll</HintPath>
+    <Reference Include="EPPlus, Version=4.5.1.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\EPPlus.4.5.1\lib\net40\EPPlus.dll</HintPath>
     </Reference>
     <Reference Include="Geocoding, Version=3.6.0.0, Culture=neutral, PublicKeyToken=7c714700b88674c7, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Geocoding.net.3.6.1\lib\net40\Geocoding.dll</HintPath>
@@ -85,45 +85,45 @@
     <Reference Include="GeoCoordinate.NetStandard1, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\GeoCoordinate.NetStandard1.1.0.1\lib\netstandard1.1\GeoCoordinate.NetStandard1.dll</HintPath>
     </Reference>
-    <Reference Include="Google.Api.CommonProtos, Version=1.1.0.0, Culture=neutral, PublicKeyToken=3ec5ea7f18953e47, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Google.Api.CommonProtos.1.1.0\lib\net45\Google.Api.CommonProtos.dll</HintPath>
+    <Reference Include="Google.Api.CommonProtos, Version=1.2.0.0, Culture=neutral, PublicKeyToken=3ec5ea7f18953e47, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Google.Api.CommonProtos.1.2.0\lib\net45\Google.Api.CommonProtos.dll</HintPath>
     </Reference>
-    <Reference Include="Google.Api.Gax, Version=2.2.1.0, Culture=neutral, PublicKeyToken=3ec5ea7f18953e47, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Google.Api.Gax.2.2.1\lib\net45\Google.Api.Gax.dll</HintPath>
+    <Reference Include="Google.Api.Gax, Version=2.3.0.0, Culture=neutral, PublicKeyToken=3ec5ea7f18953e47, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Google.Api.Gax.2.3.0\lib\net45\Google.Api.Gax.dll</HintPath>
     </Reference>
-    <Reference Include="Google.Apis, Version=1.32.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Google.Apis.1.32.0\lib\net45\Google.Apis.dll</HintPath>
+    <Reference Include="Google.Apis, Version=1.32.2.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Google.Apis.1.32.2\lib\net45\Google.Apis.dll</HintPath>
     </Reference>
     <Reference Include="Google.Apis.Analytics.v3, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(SolutionDir)\packages\Google.Apis.Analytics.v3.1.0.2\lib\net45\Google.Apis.Analytics.v3.dll</HintPath>
     </Reference>
-    <Reference Include="Google.Apis.Auth, Version=1.32.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Google.Apis.Auth.1.32.0\lib\net45\Google.Apis.Auth.dll</HintPath>
+    <Reference Include="Google.Apis.Auth, Version=1.32.2.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Google.Apis.Auth.1.32.2\lib\net45\Google.Apis.Auth.dll</HintPath>
     </Reference>
-    <Reference Include="Google.Apis.Auth.PlatformServices, Version=1.32.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Google.Apis.Auth.1.32.0\lib\net45\Google.Apis.Auth.PlatformServices.dll</HintPath>
+    <Reference Include="Google.Apis.Auth.PlatformServices, Version=1.32.2.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Google.Apis.Auth.1.32.2\lib\net45\Google.Apis.Auth.PlatformServices.dll</HintPath>
     </Reference>
-    <Reference Include="Google.Apis.Core, Version=1.32.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Google.Apis.Core.1.32.0\lib\net45\Google.Apis.Core.dll</HintPath>
+    <Reference Include="Google.Apis.Core, Version=1.32.2.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Google.Apis.Core.1.32.2\lib\net45\Google.Apis.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Google.Apis.PlatformServices, Version=1.32.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Google.Apis.1.32.0\lib\net45\Google.Apis.PlatformServices.dll</HintPath>
+    <Reference Include="Google.Apis.PlatformServices, Version=1.32.2.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Google.Apis.1.32.2\lib\net45\Google.Apis.PlatformServices.dll</HintPath>
     </Reference>
     <Reference Include="Google.Protobuf, Version=3.5.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Google.Protobuf.3.5.1\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
-    <Reference Include="GPSOAuthSharp.NetStandard1, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\GPSOAuthSharp.NetStandard1.1.0.1\lib\netstandard1.1\GPSOAuthSharp.NetStandard1.dll</HintPath>
+    <Reference Include="GPSOAuthSharp.Core, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\GPSOAuthSharp.Core.1.0.3\lib\netstandard1.1\GPSOAuthSharp.Core.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="Markdig, Version=0.14.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Markdig.0.14.8\lib\net40\Markdig.dll</HintPath>
+    <Reference Include="Markdig, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Markdig.0.15.0\lib\net40\Markdig.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNet.SignalR.Client, Version=2.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.AspNet.SignalR.Client.2.2.2\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
+    <Reference Include="Microsoft.AspNet.SignalR.Client, Version=2.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Microsoft.AspNet.SignalR.Client.2.2.3\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Data.Sqlite, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Microsoft.Data.Sqlite.1.1.0\lib\net451\Microsoft.Data.Sqlite.dll</HintPath>
@@ -161,27 +161,28 @@
     <Reference Include="Microsoft.Extensions.Primitives, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Primitives.1.1.1\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json.Schema, Version=3.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.Schema.3.0.4\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.Schema.3.0.10\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>
     </Reference>
-    <Reference Include="POGOProtos.Core, Version=2.21.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\POGOProtos.Core.2.21.1\lib\net45\POGOProtos.Core.dll</HintPath>
+    <Reference Include="POGOProtos.Core, Version=2.24.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\POGOProtos.Core.2.24.0\lib\net45\POGOProtos.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
+    <Reference Include="PresentationCore" />
+    <Reference Include="Remotion.Linq, Version=2.2.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll</HintPath>
     </Reference>
     <Reference Include="S2Geometry, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\S2Geometry.1.0.3\lib\portable-net45+wp8+win8\S2Geometry.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SocketIoClientDotNet, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\SocketIoClientDotNet.1.0.4\lib\net45\SocketIoClientDotNet.dll</HintPath>
+    <Reference Include="SocketIoClientDotNet, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SocketIoClientDotNet.1.0.5\lib\net45\SocketIoClientDotNet.dll</HintPath>
     </Reference>
-    <Reference Include="SuperSocket.ClientEngine, Version=0.9.0.0, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\SuperSocket.ClientEngine.Core.0.9.0\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
+    <Reference Include="SuperSocket.ClientEngine, Version=0.10.0.0, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\SuperSocket.ClientEngine.Core.0.10.0\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
     </Reference>
     <Reference Include="SuperSocket.Common, Version=1.6.6.1, Culture=neutral, PublicKeyToken=6c80000676988ebb, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\SuperSocket.1.6.6.1\lib\net45\SuperSocket.Common.dll</HintPath>
@@ -224,9 +225,8 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime.Caching" />
@@ -234,6 +234,7 @@
       <HintPath>$(SolutionDir)\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
     <Reference Include="System.Security.Cryptography.Algorithms">
       <HintPath>$(SolutionDir)\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
       <Private>True</Private>
@@ -249,20 +250,24 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Telegram.Bot, Version=13.4.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Telegram.Bot.13.4.0\lib\net45\Telegram.Bot.dll</HintPath>
     </Reference>
-    <Reference Include="WebDriver, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Selenium.WebDriver.3.8.0\lib\net45\WebDriver.dll</HintPath>
+    <Reference Include="WebDriver, Version=3.11.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Selenium.WebDriver.3.11.1\lib\net45\WebDriver.dll</HintPath>
     </Reference>
-    <Reference Include="WebDriver.Support, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Selenium.Support.3.8.0\lib\net45\WebDriver.Support.dll</HintPath>
+    <Reference Include="WebDriver.Support, Version=3.11.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Selenium.Support.3.11.1\lib\net45\WebDriver.Support.dll</HintPath>
     </Reference>
     <Reference Include="websocket-sharp, Version=1.0.2.59611, Culture=neutral, PublicKeyToken=5660b08a1845a91e, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\WebSocketSharp.1.0.3-rc11\lib\websocket-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="WebSocket4Net, Version=0.15.1.10, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\WebSocket4Net.0.15.1\lib\net45\WebSocket4Net.dll</HintPath>
+    <Reference Include="WebSocket4Net, Version=0.15.2.11, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\WebSocket4Net.0.15.2\lib\net45\WebSocket4Net.dll</HintPath>
     </Reference>
     <Reference Include="Zlib.Portable, Version=1.11.0.0, Culture=neutral, PublicKeyToken=431cba815f6a8b5b, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Zlib.Portable.Signed.1.11.0\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll</HintPath>
@@ -707,9 +712,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\packages\SQLite.3.13.0\build\net45\SQLite.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\SQLite.3.13.0\build\net45\SQLite.props'))" />
-    <Error Condition="!Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets'))" />
   </Target>
-  <Import Project="$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets')" />
+  <Import Project="$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/PoGo.NecroBot.Logic/Service/ConsoleEventListener.cs b/PoGo.NecroBot.Logic/Service/ConsoleEventListener.cs
index 09284d183..e0d9e4e96 100644
--- a/PoGo.NecroBot.Logic/Service/ConsoleEventListener.cs
+++ b/PoGo.NecroBot.Logic/Service/ConsoleEventListener.cs
@@ -181,9 +181,11 @@ private static void HandleEvent(EggIncubatorStatusEvent eggIncubatorStatusEvent,
         {
             Logger.Write(eggIncubatorStatusEvent.WasAddedNow
                     ? session.Translation.GetTranslation(TranslationString.IncubatorPuttingEgg,
+                        eggIncubatorStatusEvent.Eggs,
                         eggIncubatorStatusEvent.KmToWalk.ToString("0.00").PadLeft(5))
                     : session.Translation.GetTranslation(TranslationString.IncubatorStatusUpdate,
-                        eggIncubatorStatusEvent.KmRemaining.ToString("0.00").PadLeft(5),
+                        eggIncubatorStatusEvent.Eggs,
+                        eggIncubatorStatusEvent.KmRemaining.ToString("0.00").PadLeft(6),
                         eggIncubatorStatusEvent.KmToWalk.ToString("0.00").PadLeft(5)),
                 LogLevel.Egg);
         }
@@ -222,8 +224,8 @@ private static void HandleEvent(FortUsedEvent fortUsedEvent, ISession session)
             }
 
             string eventMessage = session.Translation.GetTranslation(TranslationString.EventFortUsed, fortUsedEvent.Name,
-                    fortUsedEvent.Exp, fortUsedEvent.Gems,
-                     fortUsedEvent.Items, fortUsedEvent.Badges, fortUsedEvent.BonusLoot, fortUsedEvent.RaidTickets, fortUsedEvent.TeamBonusLoot, PokemonDataEgg, session.Inventory.GetEggs().Result.Count(), fortUsedEvent.Latitude, fortUsedEvent.Longitude, fortUsedEvent.Altitude);
+                    fortUsedEvent.Exp.ToString("0").PadLeft(4), fortUsedEvent.Gems.PadLeft(3),
+                     fortUsedEvent.Items, fortUsedEvent.Badges.PadLeft(3), fortUsedEvent.BonusLoot, fortUsedEvent.RaidTickets, fortUsedEvent.TeamBonusLoot, PokemonDataEgg, session.Inventory.GetEggs().Result.Count(), fortUsedEvent.Latitude, fortUsedEvent.Longitude, fortUsedEvent.Altitude);
 
             if (fortUsedEvent.Fort.Type == FortType.Checkpoint)
                 Logger.Write(eventMessage, LogLevel.Pokestop);
@@ -261,6 +263,9 @@ private static void HandleEvent(FortFailedEvent fortFailedEvent, ISession sessio
                 Logger.Write(
                     session.Translation.GetTranslation(TranslationString.SoftBanBypassed),
                     LogLevel.SoftBan, ConsoleColor.Green);
+
+                if (session.LogicSettings.NotificationConfig.EnablePushBulletNotification)
+                    PushNotificationClient.SendNotification(session, "Soft Ban", "Successfully bypassed!", true).ConfigureAwait(false);
             }
             else
             {
diff --git a/PoGo.NecroBot.Logic/State/LoginState.cs b/PoGo.NecroBot.Logic/State/LoginState.cs
index cb9e41c8c..4d7c4ba93 100644
--- a/PoGo.NecroBot.Logic/State/LoginState.cs
+++ b/PoGo.NecroBot.Logic/State/LoginState.cs
@@ -15,6 +15,7 @@
 using POGOProtos.Enums;
 using TinyIoC;
 using PokemonGo.RocketAPI.Util;
+using PokemonGo.RocketAPI.Extensions;
 
 #endregion
 
@@ -210,7 +211,11 @@ public async Task<IState> Execute(ISession session, CancellationToken cancellati
                 if (currentAccount != null)
                 {
                     currentAccount.LastLogin = successfullyLoggedIn ? "Success" : "Failure";
-                    currentAccount.LastLoginTimestamp = TimeUtil.GetCurrentTimestampInMilliseconds();
+                    if (currentAccount.LastLogin == "Success")
+                    {
+                        currentAccount.LastLoginTimestamp = TimeUtil.GetCurrentTimestampInMilliseconds();
+                        currentAccount.LastRuntimeUpdatedAt = DateTime.Now.ToUnixTime();
+                    }
                     accountManager.UpdateLocalAccount(currentAccount);
                 }
             }
@@ -231,6 +236,14 @@ public async Task<IState> Execute(ISession session, CancellationToken cancellati
                     if (successfullyLoggedIn)
                     {
                         var currentAccount = accountManager?.GetCurrentAccount();
+
+                        var pokName = string.IsNullOrEmpty(currentAccount.Nickname) ? currentAccount.Username : currentAccount.Nickname;
+                        var EXP = currentAccount.CurrentXp; var SD = currentAccount.Stardust; var LV = currentAccount.Level;
+                        if (EXP < 1) { EXP = 0; }
+                        if (SD < 1) { SD = 0; }
+                        if (LV < 1) { LV = 0; }
+                        Logic.Logging.Logger.Write($"(STATS UPDATE) {pokName} Stats updated | Lvl: {LV} | XP: {EXP} | SD: {SD}", LogLevel.Info);
+
                         if (currentAccount != null)
                         {
                             if (session.Profile.Banned)
diff --git a/PoGo.NecroBot.Logic/State/Session.cs b/PoGo.NecroBot.Logic/State/Session.cs
index ea81e6bff..678ff0127 100644
--- a/PoGo.NecroBot.Logic/State/Session.cs
+++ b/PoGo.NecroBot.Logic/State/Session.cs
@@ -110,7 +110,9 @@ public Session(GlobalSettings globalSettings, ISettings settings, ILogicSettings
                     AutoExitBotIfAccountFlagged = settings.AutoExitBotIfAccountFlagged,
                     AccountLatitude = settings.AccountLatitude,
                     AccountLongitude = settings.AccountLongitude,
-                    AccountActive = settings.AccountActive
+                    AccountActive = settings.AccountActive,
+                    RunStart = settings.RunStart,
+                    RunEnd= settings.RunEnd,
                 });
             }
             if (File.Exists("runtime.log"))
@@ -161,19 +163,56 @@ public void Reset(ISettings settings, ILogicSettings logicSettings)
         {
             KnownLatitudeBeforeSnipe = 0;
             KnownLongitudeBeforeSnipe = 0;
-            if(GlobalSettings.Auth.DeviceConfig.UseRandomDeviceId)
+            if (GlobalSettings.Auth.DeviceConfig.UseRandomDeviceId)
             {
                 settings.DeviceId = DeviceConfig.GetDeviceId(settings.Username);
                 Logger.Debug($"Username : {Settings.Username} , Device ID :{Settings.DeviceId}");
             }
             Client = new Client(settings);
             // ferox wants us to set this manually
-            Inventory = new Inventory(this, Client, logicSettings, async () =>
+
+            var inv = new Inventory(this, Client , logicSettings, null);
+            try
             {
-                var candy = (await Inventory.GetPokemonFamilies().ConfigureAwait(false)).ToList();
-                var pokemonSettings = (await Inventory.GetPokemonSettings().ConfigureAwait(false)).ToList();
-                EventDispatcher.Send(new InventoryRefreshedEvent(null, pokemonSettings, candy));
-            });
+                inv = new Inventory(this, Client, logicSettings, async () =>
+                {
+                    var candy = (await Inventory.GetPokemonFamilies().ConfigureAwait(false)).ToList();
+                    try
+                    {
+                        candy = (await Inventory.GetPokemonFamilies().ConfigureAwait(false)).ToList();
+                    }
+                    catch
+                    {
+#if DEBUG
+                        var OldNot = TinyIoCContainer.Current.Resolve<ISession>().LogicSettings.NotificationConfig.EnablePushBulletNotification;
+                        TinyIoCContainer.Current.Resolve<ISession>().LogicSettings.NotificationConfig.EnablePushBulletNotification = true;
+                        await PushNotificationClient.SendNotification(TinyIoCContainer.Current.Resolve<ISession>(), $"Candy ERROR.", $"Check your code.", true).ConfigureAwait(false);
+                        TinyIoCContainer.Current.Resolve<ISession>().LogicSettings.NotificationConfig.EnablePushBulletNotification = OldNot;
+#endif
+                    }
+                    var pokemonSettings = (await Inventory.GetPokemonSettings().ConfigureAwait(false)).ToList();
+                    EventDispatcher.Send(new InventoryRefreshedEvent(null, pokemonSettings, candy));
+                });
+            }
+            catch
+            {
+#if DEBUG
+                var OldNot = TinyIoCContainer.Current.Resolve<ISession>().LogicSettings.NotificationConfig.EnablePushBulletNotification;
+                TinyIoCContainer.Current.Resolve<ISession>().LogicSettings.NotificationConfig.EnablePushBulletNotification = true;
+                PushNotificationClient.SendNotification(TinyIoCContainer.Current.Resolve<ISession>(), $"Candy ERROR.", $"Check your code.", true).ConfigureAwait(false);
+                TinyIoCContainer.Current.Resolve<ISession>().LogicSettings.NotificationConfig.EnablePushBulletNotification = OldNot;
+#endif
+                // Null
+            }
+            Inventory = inv;
+
+            //Inventory = new Inventory(this, Client, logicSettings, async () =>
+            //{
+            //    var candy = (await Inventory.GetPokemonFamilies().ConfigureAwait(false)).ToList();
+            //    var pokemonSettings = (await Inventory.GetPokemonSettings().ConfigureAwait(false)).ToList();
+            //    EventDispatcher.Send(new InventoryRefreshedEvent(null, pokemonSettings, candy));
+            //});
+
             Navigation = new Navigation(Client, logicSettings);
             Navigation.WalkStrategy.UpdatePositionEvent +=
                 (session, lat, lng,s) => EventDispatcher.Send(new UpdatePositionEvent {Latitude = lat, Longitude = lng, Speed = s});
@@ -212,10 +251,12 @@ public bool ReInitSessionWithNextBot(Account bot = null, double lat = 0, double
             Logger.Write($"Account changed to {Account}", LogLevel.BotStats);
 
             if (session.LogicSettings.NotificationConfig.EnablePushBulletNotification)
-                PushNotificationClient.SendNotification(session, $"Account changed to", $"{Account}\n" +
+                PushNotificationClient.SendNotification(session, $"Account change:", 
+                                                                 $"Acc: {Account}\n" +
                                                                  $"Lvl: {Lvl}\n" +
                                                                  $"XP : {XP:#,##0} ({(double)XP / ((double)NLevelXP) * 100:#0.00}%)\n" +
-                                                                 $"SD : {SD:#,##0}", true).ConfigureAwait(false);
+                                                                 $"SD : {SD:#,##0}\n" +
+                                                                 $"RT : {nextBot.RuntimeTotal:00:00}", true).ConfigureAwait(false);
 
 #if DEBUG
             Thread.Sleep(1000); //Pauses execution for 1 sec. Personal use for TheWizard. I need a 1 sec gap between this and next logger line.
diff --git a/PoGo.NecroBot.Logic/State/StateMachine.cs b/PoGo.NecroBot.Logic/State/StateMachine.cs
index a19aee39d..eb3908daa 100644
--- a/PoGo.NecroBot.Logic/State/StateMachine.cs
+++ b/PoGo.NecroBot.Logic/State/StateMachine.cs
@@ -162,6 +162,9 @@ public async Task Start(IState initialState, ISession session, string subPath, b
                 catch(ActiveSwitchAccountManualException ex)
                 {
                     session.EventDispatcher.Send(new WarnEvent { Message = "Switch bot account requested by: User" });
+                    if (session.LogicSettings.NotificationConfig.EnablePushBulletNotification)
+                        await PushNotificationClient.SendNotification(session, $"Switch bot account", $"Activated by: User", true).ConfigureAwait(false);
+
                     ReInitializeSession(session, globalSettings, ex.RequestedAccount);
                     state = new LoginState();
                 }
@@ -181,8 +184,8 @@ public async Task Start(IState initialState, ISession session, string subPath, b
                 catch (ActiveSwitchByRuleException se)
                 {
                     session.EventDispatcher.Send(new WarnEvent { Message = $"Switch bot account activated by: {se.MatchedRule.ToString()} - {se.ReachedValue}" });
-                    //if (session.LogicSettings.NotificationConfig.EnablePushBulletNotification)
-                    //    await PushNotificationClient.SendNotification(session, $"Switch bot account", $"Activated by: {se.MatchedRule.ToString()} - {se.ReachedValue}", true).ConfigureAwait(false);
+                    if (session.LogicSettings.NotificationConfig.EnablePushBulletNotification)
+                        await PushNotificationClient.SendNotification(session, $"Switch bot account", $"Activated by: {se.MatchedRule.ToString()} - {se.ReachedValue}", true).ConfigureAwait(false);
 
                     if (se.MatchedRule == SwitchRules.EmptyMap)
                     {
@@ -209,9 +212,9 @@ public async Task Start(IState initialState, ISession session, string subPath, b
                             // jjskuld - Ignore CS4014 warning for now.
 
                             if (session.LogicSettings.NotificationConfig.EnablePushBulletNotification)
-                                await PushNotificationClient.SendNotification(session, $"{se.MatchedRule} - {session.Settings.Username}", $"This bot has reach limit, it will be blocked for {session.LogicSettings.MultipleBotConfig.OnLimitPauseTimes} mins for safety.", true).ConfigureAwait(false);
+                                await PushNotificationClient.SendNotification(session, $"{se.MatchedRule} - {session.Settings.Username}", $"Bot has reached it's limit, it will be blocked for {session.LogicSettings.MultipleBotConfig.OnLimitPauseTimes} mins for safety.", true).ConfigureAwait(false);
 
-                            session.EventDispatcher.Send(new WarnEvent() { Message = $"You reach limited. bot will sleep for {session.LogicSettings.MultipleBotConfig.OnLimitPauseTimes} min" });
+                            session.EventDispatcher.Send(new WarnEvent() { Message = $"Bot has reached it's limit, it will be blocked for {session.LogicSettings.MultipleBotConfig.OnLimitPauseTimes} min" });
 
                             TinyIoCContainer.Current.Resolve<MultiAccountManager>().BlockCurrentBot(session.LogicSettings.MultipleBotConfig.OnLimitPauseTimes);
 
diff --git a/PoGo.NecroBot.Logic/Tasks/CatchPokemonTask.cs b/PoGo.NecroBot.Logic/Tasks/CatchPokemonTask.cs
index a0c16610b..817c379c8 100644
--- a/PoGo.NecroBot.Logic/Tasks/CatchPokemonTask.cs
+++ b/PoGo.NecroBot.Logic/Tasks/CatchPokemonTask.cs
@@ -408,7 +408,13 @@ encounter is EncounterResponse || encounter is IncenseEncounterResponse
                             await session.Inventory.UpdateInventoryItem(ballToByPass[i]).ConfigureAwait(false);
 
                             await Task.Delay(100).ConfigureAwait(false);
-                            Logger.Write($"CatchFlee By pass : {ballToByPass[i].ToString()} , Attempt {i}, result {caughtPokemonResponse.Status}");
+                            Logger.Write($"CatchFlee By pass: {ballToByPass[i].ToString()} , Attempt {i}, result {caughtPokemonResponse.Status}");
+
+                            if (session.LogicSettings.NotificationConfig.EnablePushBulletNotification && i == 0)
+                                await PushNotificationClient.SendNotification(session, "Catch Flee Soft Ban", "Attempting to bypass Catch Flee Soft Ban.", true).ConfigureAwait(false);
+
+                            if (session.LogicSettings.NotificationConfig.EnablePushBulletNotification && caughtPokemonResponse.Status == CatchPokemonResponse.Types.CatchStatus.CatchSuccess)
+                                await PushNotificationClient.SendNotification(session, "Catch Flee Soft Ban", "Catch Flee Soft Ban bypassed.", true).ConfigureAwait(false);
 
                             if (caughtPokemonResponse.Status != CatchPokemonResponse.Types.CatchStatus.CatchMissed)
                             {
@@ -563,7 +569,10 @@ encounter is EncounterResponse || encounter is IncenseEncounterResponse
                     if (CatchFleeContinuouslyCount >= 3 && session.LogicSettings.ByPassCatchFlee)
                     {
                         session.SaveBallForByPassCatchFlee = true;
-                        Logger.Write("Seem that bot has been catch flee softban, Bot will start save 100 balls to by pass it.");
+                        Logger.Write("Seems your bot has been CatchFlee Softban, Bot will start save 100 balls to by pass it.");
+
+                        if (session.LogicSettings.NotificationConfig.EnablePushBulletNotification)
+                            await PushNotificationClient.SendNotification(session, "CatchFlee Soft Ban", "Seems your bot has been catch flee softban, Bot will start save 100 balls to by pass it.", true).ConfigureAwait(false);
                     }
                     if (manager.AllowMultipleBot() && !session.LogicSettings.ByPassCatchFlee)
                     {
diff --git a/PoGo.NecroBot.Logic/Tasks/DisplayPokemonStatsTask.cs b/PoGo.NecroBot.Logic/Tasks/DisplayPokemonStatsTask.cs
index 40f360055..cefceed96 100644
--- a/PoGo.NecroBot.Logic/Tasks/DisplayPokemonStatsTask.cs
+++ b/PoGo.NecroBot.Logic/Tasks/DisplayPokemonStatsTask.cs
@@ -78,6 +78,7 @@ public static async Task Execute(ISession session)
             var allPokemonInBag = session.LogicSettings.PrioritizeIvOverCp
                 ? await session.Inventory.GetHighestsPerfect(1000).ConfigureAwait(false)
                 : await session.Inventory.GetHighestsCp(1000).ConfigureAwait(false);
+
             if (session.LogicSettings.DumpPokemonStats)
             {
                 _MultiAccountManager = new MultiAccountManager();
diff --git a/PoGo.NecroBot.Logic/Tasks/GetPokeDexCount.cs b/PoGo.NecroBot.Logic/Tasks/GetPokeDexCount.cs
index 935f74e71..f0b1ea4c0 100644
--- a/PoGo.NecroBot.Logic/Tasks/GetPokeDexCount.cs
+++ b/PoGo.NecroBot.Logic/Tasks/GetPokeDexCount.cs
@@ -27,7 +27,7 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
             var _totalData = PokeDex.Count();
 
             Logger.Write(session.Translation
-                .GetTranslation(TranslationString.AmountPkmSeenCaught, _totalData, 252, _totalCaptures, 252)
+                .GetTranslation(TranslationString.AmountPkmSeenCaught, _totalData, 386, _totalCaptures, 386)
             );
         }
     }
diff --git a/PoGo.NecroBot.Logic/Tasks/UpgradeSinglePokemonTask.cs b/PoGo.NecroBot.Logic/Tasks/UpgradeSinglePokemonTask.cs
index 4db508a60..67a206223 100644
--- a/PoGo.NecroBot.Logic/Tasks/UpgradeSinglePokemonTask.cs
+++ b/PoGo.NecroBot.Logic/Tasks/UpgradeSinglePokemonTask.cs
@@ -11,6 +11,7 @@
 using POGOProtos.Data;
 using POGOProtos.Networking.Responses;
 using PokemonGo.RocketAPI.Helpers;
+using PoGo.NecroBot.Logic.Logging;
 
 #endregion
 
@@ -35,10 +36,6 @@ public static async Task<bool> UpgradeSinglePokemon(ISession session, PokemonDat
 
                 //stardust from what I've gathered is supposed to be - not + for AdditionalCpMultiplier
                 var stardust = -PokemonCpUtils.GetStardustCostsForPowerup(upgradeResult.UpgradedPokemon.CpMultiplier);
-                var stardust2 = -PokemonCpUtils.GetStardustCostsForPowerup(upgradeResult.UpgradedPokemon.CpMultiplier - upgradeResult.UpgradedPokemon.AdditionalCpMultiplier);
-                var totalStarDust = session.Inventory.UpdateStarDust(stardust);
-                Logging.Logger.Write($"SD1: {stardust,5:0} | SD2: {stardust2,5:0} | TotalSD: {totalStarDust,5:0}", Logging.LogLevel.Error);
-
                 session.EventDispatcher.Send(new UpgradePokemonEvent()
                 {
                     Candy = await session.Inventory.GetCandyCount(pokemon.PokemonId).ConfigureAwait(false),
diff --git a/PoGo.NecroBot.Logic/Tasks/UseIncubatorsTask.cs b/PoGo.NecroBot.Logic/Tasks/UseIncubatorsTask.cs
index 3fa34944b..948e5f483 100644
--- a/PoGo.NecroBot.Logic/Tasks/UseIncubatorsTask.cs
+++ b/PoGo.NecroBot.Logic/Tasks/UseIncubatorsTask.cs
@@ -27,6 +27,8 @@ public class UseIncubatorsTask
         public static long Stardust { get; set; }
         public static object eggIncubatorStatusEvent { get; private set; }
 
+        public static float kmWalked; // = playerStats.KmWalked;
+
         public static async Task Execute(ISession session, CancellationToken cancellationToken,
             ulong eggId, string incubatorId)
         {
@@ -45,12 +47,29 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
             var response = await session.Client.Inventory.UseItemEggIncubator(incubators.Id, unusedEggs.Id).ConfigureAwait(false);
             var newRememberedIncubators = new List<IncubatorUsage>();
 
+            var playerStats = (await session.Inventory.GetPlayerStats().ConfigureAwait(false)).FirstOrDefault();
+
+#if DEBUG
+            if (session.LogicSettings.NotificationConfig.PushBulletApiKey != null)
+            {
+                var OldNot = session.LogicSettings.NotificationConfig.EnablePushBulletNotification;
+                session.LogicSettings.NotificationConfig.EnablePushBulletNotification = true;
+                await PushNotificationClient.SendNotification(session, $"Session paused.", $"Check your code.", true).ConfigureAwait(false);
+                session.LogicSettings.NotificationConfig.EnablePushBulletNotification = OldNot;
+            }
+#endif
+            kmWalked = playerStats.KmWalked;
+
+            var eggs = 0;
+
             if (response.Result == UseItemEggIncubatorResponse.Types.Result.Success)
             {
+                eggs += 1;
                 newRememberedIncubators.Add(new IncubatorUsage { IncubatorId = incubators.Id, PokemonId = unusedEggs.Id });
 
                 session.EventDispatcher.Send(new EggIncubatorStatusEvent
                 {
+                    Eggs = eggs,
                     IncubatorId = incubators.Id,
                     WasAddedNow = true,
                     PokemonId = unusedEggs.Id,
@@ -78,8 +97,6 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                 if (playerStats == null)
                     return;
 
-                var kmWalked = playerStats.KmWalked;
-
                 var incubators = (await session.Inventory.GetEggIncubators().ConfigureAwait(false))
                     .Where(x => x.UsesRemaining > 0 || x.ItemId == ItemId.ItemIncubatorBasicUnlimited)
                     .OrderByDescending(x => x.ItemId == ItemId.ItemIncubatorBasicUnlimited)
@@ -103,12 +120,12 @@ public static async Task Execute(ISession session, CancellationToken cancellatio
                     if (hatched == null) continue;
 
                     //Still Needs some work - TheWizard1328
-                    var stats = session.RuntimeStatistics;           // Total Km walked
-                    var KMs = eggIncubatorStatusEvent.KmToWalk; //playerStats.KmWalked - hatched.EggKmWalkedStart; // Total Km Walked(hatched.EggKmWalkedStart=0)
-                    var stardust1 = session.Inventory.GetStarDust(); // Total trainer Stardust
-                    var stardust2 = stats.TotalStardust;             // Total trainer Stardust
-                    var ExpAwarded1 = playerStats.Experience;        // Total Player Exp - TheWizard1328
-                    var ExpAwarded2 = stats.TotalExperience;         // Session Exp - TheWizard1328
+
+                    var KMs = playerStats.KmWalked - kmWalked;                          // playerStats.KmWalked - hatched.EggKmWalkedStart; // Total Km Walked(hatched.EggKmWalkedStart=0)
+                    var stardust1 = session.Inventory.GetStarDust();                    // Total trainer Stardust
+                    var stardust2 = session.RuntimeStatistics.TotalStardust;            // Total trainer Stardust
+                    var ExpAwarded1 = playerStats.Experience;                           // Total Player Exp - TheWizard1328
+                    var ExpAwarded2 = session.RuntimeStatistics.TotalExperience;        // Session Exp - TheWizard1328
                     var TotCandy = session.Inventory.GetCandyCount(hatched.PokemonId);
                     //Temp logger line personal testing info - TheWizard1328
 #if DEBUG
@@ -137,11 +154,14 @@ await PushNotificationClient.SendNotification(session, $"Egg has hatched.", $"Po
                 }
 
                 var newRememberedIncubators = new List<IncubatorUsage>();
+                var eggs = 0;
 
                 foreach (var incubator in incubators)
                 {
                     cancellationToken.ThrowIfCancellationRequested();
                     TinyIoC.TinyIoCContainer.Current.Resolve<MultiAccountManager>().ThrowIfSwitchAccountRequested();
+                    eggs += 1;
+
                     if (incubator.PokemonId == 0)
                     {
                         // Unlimited incubators prefer short eggs, limited incubators prefer long eggs
@@ -165,6 +185,7 @@ await PushNotificationClient.SendNotification(session, $"Egg has hatched.", $"Po
 
                         session.EventDispatcher.Send(new EggIncubatorStatusEvent
                         {
+                            Eggs = eggs,
                             IncubatorId = incubator.Id,
                             WasAddedNow = true,
                             PokemonId = egg.Id,
@@ -182,6 +203,7 @@ await PushNotificationClient.SendNotification(session, $"Egg has hatched.", $"Po
 
                         session.EventDispatcher.Send(new EggIncubatorStatusEvent
                         {
+                            Eggs = eggs,
                             IncubatorId = incubator.Id,
                             PokemonId = incubator.PokemonId,
                             KmToWalk = incubator.TargetKmWalked - incubator.StartKmWalked,
diff --git a/PoGo.NecroBot.Logic/Tasks/UseNearbyPokestopsTask.cs b/PoGo.NecroBot.Logic/Tasks/UseNearbyPokestopsTask.cs
index 0592544fd..11aa9cd0e 100644
--- a/PoGo.NecroBot.Logic/Tasks/UseNearbyPokestopsTask.cs
+++ b/PoGo.NecroBot.Logic/Tasks/UseNearbyPokestopsTask.cs
@@ -202,15 +202,14 @@ public static async Task<FortData> GetNextPokeStop(ISession session)
             var forts = session.Forts.Where(p => p.CooldownCompleteTimestampMs < DateTime.UtcNow.ToUnixTime())
                 .Where(x => x.Id != string.Empty).ToList();
 
-            forts = forts.OrderBy(
-                        p =>
-                            session.Navigation.WalkStrategy.CalculateDistance(
+            forts = forts.OrderBy(p => p.Visited).ThenBy(
+                                p => session.Navigation.WalkStrategy.CalculateDistance(
                                 session.Client.CurrentLatitude,
                                 session.Client.CurrentLongitude,
                                 p.Latitude,
                                 p.Longitude,
-                                session)
-                                ).ToList();
+                                session)).ToList();
+
 
             if (session.LogicSettings.UseGpxPathing)
             {
@@ -257,7 +256,23 @@ public static async Task<FortData> GetNextPokeStop(ISession session)
                     return gyms.FirstOrDefault();
             }
 
-            return forts.FirstOrDefault();
+            //Need observation 
+            /*
+            Random RndFort = new Random((int)DateTime.Now.Ticks);
+            int R = 10; if (forts.Count < R) { R = forts.Count; }
+
+            {
+                int RndF = RndFort.Next(1, R);
+
+                Logger.Debug($"Total Pokestops: {forts.Count} | Rnd Stop Chosen: {RndF}");
+
+                return forts[RndF - 1];
+            } 
+            else
+            {
+            */
+                return forts.FirstOrDefault();
+            //}
         }
 
         public static async Task SpinPokestopNearBy(ISession session, CancellationToken cancellationToken, FortData destinationFort = null)
@@ -494,7 +509,7 @@ public static async Task FarmPokestop(ISession session, FortData pokeStop, FortD
                         if (session.SaveBallForByPassCatchFlee)
                         {
                             var totalBalls = (await session.Inventory.GetItems().ConfigureAwait(false)).Where(x => x.ItemId == ItemId.ItemPokeBall || x.ItemId == ItemId.ItemGreatBall || x.ItemId == ItemId.ItemUltraBall).Sum(x => x.Count);
-                            Logger.Write($"Ball requires for by pass catch flee {totalBalls}/{CatchPokemonTask.BALL_REQUIRED_TO_BYPASS_CATCHFLEE}");
+                            Logger.Write($"Balls required to by-pass catch flee {totalBalls}/{CatchPokemonTask.BALL_REQUIRED_TO_BYPASS_CATCHFLEE}");
                         }
                         else
                             MSniperServiceTask.UnblockSnipe(false);
diff --git a/PoGo.NecroBot.Logic/Utils/Statistics.cs b/PoGo.NecroBot.Logic/Utils/Statistics.cs
index 60ae0931d..5cfbc0fe2 100644
--- a/PoGo.NecroBot.Logic/Utils/Statistics.cs
+++ b/PoGo.NecroBot.Logic/Utils/Statistics.cs
@@ -45,8 +45,6 @@ public class Statistics
 
         public StatsExport StatsExport => _exportStats;
 
-
-
         public void Dirty(Inventory inventory, ISession session)
         {
             _exportStats = GetCurrentInfo(session, inventory).Result;
@@ -110,8 +108,6 @@ public void OnStatisticChanged(ISession session)
                 var totalMin = (DateTime.Now - _initSessionDateTime).TotalMinutes;
                 if (newRandomSwitchTime > 0 && newRandomSwitchTime <= totalMin)
                 {
-
-
                     // Setup random time to false, so that next account generates new random runtime
                     isRandomTimeSet = false;
 
@@ -123,11 +119,6 @@ public void OnStatisticChanged(ISession session)
                         ReachedValue = Math.Round(totalMin, 1)
                     };
                 }
-
-
-
-
-
             }
         }
 
diff --git a/PoGo.NecroBot.Logic/packages.config b/PoGo.NecroBot.Logic/packages.config
index dc85b32a2..d97c02e02 100644
--- a/PoGo.NecroBot.Logic/packages.config
+++ b/PoGo.NecroBot.Logic/packages.config
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AeroWizard" version="2.1.10" targetFramework="net462" />
-  <package id="CloudFlareUtilities" version="0.4.0-alpha" targetFramework="net462" />
-  <package id="EngineIoClientDotNet" version="1.0.4" targetFramework="net462" />
-  <package id="EPPlus" version="4.1.1" targetFramework="net462" />
+  <package id="AeroWizard" version="2.1.11" targetFramework="net462" />
+  <package id="CloudFlareUtilities" version="1.2.0" targetFramework="net462" />
+  <package id="EngineIoClientDotNet" version="1.0.5" targetFramework="net462" />
+  <package id="EPPlus" version="4.5.1" targetFramework="net462" />
   <package id="Geocoding.net" version="3.6.1" targetFramework="net462" />
   <package id="GeoCoordinate.NetStandard1" version="1.0.1" targetFramework="net462" />
-  <package id="Google.Api.CommonProtos" version="1.1.0" targetFramework="net462" />
-  <package id="Google.Api.Gax" version="2.2.1" targetFramework="net462" />
-  <package id="Google.Apis" version="1.32.0" targetFramework="net462" />
-  <package id="Google.Apis.Auth" version="1.32.0" targetFramework="net462" />
-  <package id="Google.Apis.Core" version="1.32.0" targetFramework="net462" />
+  <package id="Google.Api.CommonProtos" version="1.2.0" targetFramework="net462" />
+  <package id="Google.Api.Gax" version="2.3.0" targetFramework="net462" />
+  <package id="Google.Apis" version="1.32.2" targetFramework="net462" />
+  <package id="Google.Apis.Auth" version="1.32.2" targetFramework="net462" />
+  <package id="Google.Apis.Core" version="1.32.2" targetFramework="net462" />
   <package id="Google.Protobuf" version="3.5.1" targetFramework="net462" />
-  <package id="GPSOAuthSharp.NetStandard1" version="1.0.1" targetFramework="net462" />
+  <package id="GPSOAuthSharp.Core" version="1.0.3" targetFramework="net462" />
   <package id="log4net" version="2.0.8" targetFramework="net462" />
-  <package id="Markdig" version="0.14.8" targetFramework="net462" />
-  <package id="Microsoft.AspNet.SignalR.Client" version="2.2.2" targetFramework="net462" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net462" />
+  <package id="Markdig" version="0.15.0" targetFramework="net462" />
+  <package id="Microsoft.AspNet.SignalR.Client" version="2.2.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.4" targetFramework="net462" />
   <package id="Microsoft.Data.Sqlite" version="1.1.0" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore" version="1.1.2" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore.Relational" version="1.1.2" targetFramework="net462" />
@@ -32,19 +32,19 @@
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net462" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net462" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net462" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
-  <package id="Newtonsoft.Json.Schema" version="3.0.4" targetFramework="net462" />
-  <package id="POGOProtos.Core" version="2.21.1" targetFramework="net462" />
-  <package id="Portable.BouncyCastle" version="1.8.1.3" targetFramework="net462" />
-  <package id="Remotion.Linq" version="2.1.2" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
+  <package id="Newtonsoft.Json.Schema" version="3.0.10" targetFramework="net462" />
+  <package id="POGOProtos.Core" version="2.24.0" targetFramework="net462" />
+  <package id="Portable.BouncyCastle" version="1.8.1.4" targetFramework="net462" />
+  <package id="Remotion.Linq" version="2.2.0" targetFramework="net462" />
   <package id="S2Geometry" version="1.0.3" targetFramework="net462" />
-  <package id="Selenium.Support" version="3.8.0" targetFramework="net462" />
-  <package id="Selenium.WebDriver" version="3.8.0" targetFramework="net462" />
-  <package id="Selenium.WebDriver.ChromeDriver" version="2.34.0" targetFramework="net462" />
-  <package id="SocketIoClientDotNet" version="1.0.4" targetFramework="net462" />
+  <package id="Selenium.Support" version="3.11.1" targetFramework="net462" />
+  <package id="Selenium.WebDriver" version="3.11.1" targetFramework="net462" />
+  <package id="Selenium.WebDriver.ChromeDriver" version="2.37.0" targetFramework="net462" />
+  <package id="SocketIoClientDotNet" version="1.0.5" targetFramework="net462" />
   <package id="SQLite" version="3.13.0" targetFramework="net462" />
   <package id="SuperSocket" version="1.6.6.1" targetFramework="net462" />
-  <package id="SuperSocket.ClientEngine.Core" version="0.9.0" targetFramework="net462" />
+  <package id="SuperSocket.ClientEngine.Core" version="0.10.0" targetFramework="net462" />
   <package id="SuperSocket.Engine" version="1.6.6.1" targetFramework="net462" />
   <package id="SuperSocket.WebSocket" version="1.6.6.1" targetFramework="net462" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net462" />
@@ -96,11 +96,11 @@
   <package id="System.Threading" version="4.3.0" targetFramework="net462" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net462" />
   <package id="System.Threading.Timer" version="4.3.0" targetFramework="net462" />
-  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net462" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net462" />
   <package id="Telegram.Bot" version="13.4.0" targetFramework="net462" />
   <package id="TinyIoC" version="1.3" targetFramework="net462" developmentDependency="true" />
-  <package id="WebSocket4Net" version="0.15.1" targetFramework="net462" />
+  <package id="WebSocket4Net" version="0.15.2" targetFramework="net462" />
   <package id="WebSocketSharp" version="1.0.3-rc11" targetFramework="net462" />
   <package id="Zlib.Portable.Signed" version="1.11.0" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/PoGo.NecroBot.Window/PoGo.Necrobot.Window.csproj b/PoGo.NecroBot.Window/PoGo.Necrobot.Window.csproj
index 3eff98e6c..7b46e68b2 100644
--- a/PoGo.NecroBot.Window/PoGo.Necrobot.Window.csproj
+++ b/PoGo.NecroBot.Window/PoGo.Necrobot.Window.csproj
@@ -85,9 +85,11 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Costura, Version=1.6.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\ControlzEx.3.0.2.4\lib\net462\ControlzEx.dll</HintPath>
+    </Reference>
+    <Reference Include="Costura, Version=2.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Costura.Fody.2.0.0\lib\net452\Costura.dll</HintPath>
     </Reference>
     <Reference Include="DotNetBrowser">
       <HintPath>$(SolutionDir)\packages\DotNetBrowser.1.14\lib\DotNetBrowser.dll</HintPath>
@@ -118,8 +120,8 @@
     <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
+    <Reference Include="MahApps.Metro, Version=1.6.1.4, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\MahApps.Metro.1.6.1\lib\net45\MahApps.Metro.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore, Version=1.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Microsoft.EntityFrameworkCore.1.1.2\lib\net451\Microsoft.EntityFrameworkCore.dll</HintPath>
@@ -148,27 +150,51 @@
     <Reference Include="Microsoft.Extensions.Primitives, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Primitives.1.1.1\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Microsoft.VisualStudio.CoreUtility.15.6.27740\lib\net46\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>$(SolutionDir)\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Microsoft.VisualStudio.Shell.Framework.15.6.27413\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.15.0.25414\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.15.0.25415\lib\net45\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.Threading">
+      <HintPath>$(SolutionDir)\packages\Microsoft.VisualStudio.Threading.15.6.46\lib\net46\Microsoft.VisualStudio.Threading.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Microsoft.VisualStudio.Utilities.15.6.27413\lib\net46\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="POGOProtos.Core, Version=2.21.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\POGOProtos.Core.2.21.1\lib\net45\POGOProtos.Core.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.Validation">
+      <HintPath>$(SolutionDir)\packages\Microsoft.VisualStudio.Validation.15.3.32\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="POGOProtos.Core, Version=2.24.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\POGOProtos.Core.2.24.0\lib\net45\POGOProtos.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Remotion.Linq, Version=2.2.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll</HintPath>
     </Reference>
     <Reference Include="S2Geometry, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\S2Geometry.1.0.3\lib\portable-net45+wp8+win8\S2Geometry.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="StreamJsonRpc">
+      <HintPath>$(SolutionDir)\packages\StreamJsonRpc.1.3.23\lib\net45\StreamJsonRpc.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="SuperSocket.Common, Version=1.6.6.1, Culture=neutral, PublicKeyToken=6c80000676988ebb, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\SuperSocket.1.6.6.1\lib\net45\SuperSocket.Common.dll</HintPath>
     </Reference>
@@ -202,6 +228,7 @@
       <HintPath>$(SolutionDir)\packages\System.Interactive.Async.3.1.1\lib\net46\System.Interactive.Async.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe">
       <HintPath>$(SolutionDir)\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
@@ -221,7 +248,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\ControlzEx.3.0.2.4\lib\net462\System.Windows.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
@@ -232,6 +259,10 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -239,23 +270,23 @@
       <HintPath>$(SolutionDir)\packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.2.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Extended.Wpf.Toolkit.3.3.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.2.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Extended.Wpf.Toolkit.3.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.2.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Extended.Wpf.Toolkit.3.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.2.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Extended.Wpf.Toolkit.3.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.DataGrid, Version=3.2.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
+    <Reference Include="Xceed.Wpf.DataGrid, Version=3.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Extended.Wpf.Toolkit.3.3.0\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=3.2.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=3.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Extended.Wpf.Toolkit.3.3.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -857,15 +888,18 @@
     <EmbeddedResource Include="costura64\sqlite3.dll" />
     <Content Include="Effects\GrayscaleEffect.dll" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Analyzer Include="$(SolutionDir)\packages\Microsoft.VisualStudio.Threading.Analyzers.15.6.46\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)\packages\Fody.2.3.15\build\net452\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.2.3.15\build\net452\Fody.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Fody.3.0.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.3.0.3\build\Fody.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.VisualStudio.Threading.Analyzers.15.6.46\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.VisualStudio.Threading.Analyzers.15.6.46\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
   </Target>
   <UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
     <ParameterGroup>
@@ -912,9 +946,10 @@ rmdir /s /q x86
 del /s /q x64
 rmdir /s /q x64</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('$(SolutionDir)\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
-  <Import Project="$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets')" />
-  <Import Project="$(SolutionDir)\packages\Fody.2.3.15\build\net452\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.2.3.15\build\net452\Fody.targets')" />
+  <Import Project="$(SolutionDir)\packages\Fody.3.0.3\build\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.3.0.3\build\Fody.targets')" />
+  <Import Project="$(SolutionDir)\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets" Condition="Exists('$(SolutionDir)\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets')" />
+  <Import Project="$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets')" />
+  <Import Project="$(SolutionDir)\packages\Microsoft.VisualStudio.Threading.Analyzers.15.6.46\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.VisualStudio.Threading.Analyzers.15.6.46\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/PoGo.NecroBot.Window/packages.config b/PoGo.NecroBot.Window/packages.config
index 83c0aa5c3..643f806ba 100644
--- a/PoGo.NecroBot.Window/packages.config
+++ b/PoGo.NecroBot.Window/packages.config
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody" version="1.6.2" targetFramework="net462" developmentDependency="true" />
+  <package id="ControlzEx" version="3.0.2.4" targetFramework="net462" />
+  <package id="Costura.Fody" version="2.0.0" targetFramework="net462" developmentDependency="true" />
   <package id="DotNetBrowser" version="1.14" targetFramework="net462" />
-  <package id="Extended.Wpf.Toolkit" version="3.2.0" targetFramework="net462" />
-  <package id="Fody" version="2.3.15" targetFramework="net462" developmentDependency="true" />
+  <package id="Extended.Wpf.Toolkit" version="3.3.0" targetFramework="net462" />
+  <package id="Fody" version="3.0.3" targetFramework="net462" developmentDependency="true" />
   <package id="Geocoding.net" version="3.6.1" targetFramework="net462" />
   <package id="GMap.NET.Presentation" version="1.7.5" targetFramework="net462" />
   <package id="Google.Protobuf" version="3.5.1" targetFramework="net462" />
   <package id="log4net" version="2.0.8" targetFramework="net462" />
-  <package id="MahApps.Metro" version="1.5.0" targetFramework="net462" />
+  <package id="MahApps.Metro" version="1.6.1" targetFramework="net462" />
   <package id="MahApps.Metro.Resources" version="0.6.1.0" targetFramework="net462" />
   <package id="Microsoft.EntityFrameworkCore" version="1.1.2" targetFramework="net462" />
   <package id="Microsoft.Extensions.Caching.Abstractions" version="1.1.2" targetFramework="net462" />
@@ -20,18 +21,22 @@
   <package id="Microsoft.Extensions.Options" version="1.1.2" targetFramework="net462" />
   <package id="Microsoft.Extensions.Primitives" version="1.1.1" targetFramework="net462" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net462" />
-  <package id="Microsoft.VisualStudio.CoreUtility" version="15.4.27004" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.6.27740" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net462" />
-  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.4.27004" targetFramework="net462" />
-  <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="15.0.25414" targetFramework="net462" />
-  <package id="Microsoft.VisualStudio.Utilities" version="15.4.27004" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.6.27413" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="15.0.25415" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Threading" version="15.6.46" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Threading.Analyzers" version="15.6.46" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.6.27413" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Validation" version="15.3.32" targetFramework="net462" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net462" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net462" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
-  <package id="POGOProtos.Core" version="2.21.1" targetFramework="net462" />
-  <package id="Remotion.Linq" version="2.1.2" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
+  <package id="POGOProtos.Core" version="2.24.0" targetFramework="net462" />
+  <package id="Remotion.Linq" version="2.2.0" targetFramework="net462" />
   <package id="S2Geometry" version="1.0.3" targetFramework="net462" />
-  <package id="Selenium.WebDriver.ChromeDriver" version="2.34.0" targetFramework="net462" />
+  <package id="Selenium.WebDriver.ChromeDriver" version="2.37.0" targetFramework="net462" />
+  <package id="StreamJsonRpc" version="1.3.23" targetFramework="net462" />
   <package id="SuperSocket" version="1.6.6.1" targetFramework="net462" />
   <package id="SuperSocket.Engine" version="1.6.6.1" targetFramework="net462" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net462" />
@@ -79,7 +84,7 @@
   <package id="System.Threading" version="4.3.0" targetFramework="net462" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net462" />
   <package id="System.Threading.Timer" version="4.3.0" targetFramework="net462" />
-  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net462" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net462" />
   <package id="WPFToolkit" version="3.5.50211.1" targetFramework="net462" />
 </packages>
\ No newline at end of file
diff --git a/PokemonGO-Assets b/PokemonGO-Assets
index 896b0483c..8c8bae82b 160000
--- a/PokemonGO-Assets
+++ b/PokemonGO-Assets
@@ -1 +1 @@
-Subproject commit 896b0483c7210d1034a92165749963b5d6c5bee5
+Subproject commit 8c8bae82b3ae8fe807304a377cef926418a6e636
diff --git a/README.md b/README.md
index 9daa8505d..19983bebd 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![Github All Releases](https://img.shields.io/github/downloads/Necrobot-Private/NecroBot/total.svg)](https://github.com/Necrobot-Private/NecroBot/releases)
 [![ license](https://img.shields.io/badge/license-AGPL-blue.svg)](https://raw.githubusercontent.com/Necrobot-Private/NecroBot/master/LICENSE.md)
 
-<h1>Necrobot2 is now compatible with 0.91.1 API.</h1>
+<h1>Necrobot2 is now compatible with 0.95.3 API.</h1>
 
 <p>
 Necrobot2 itself is free but now you will need to purchase an API key from Bossland in order to run the bot.
diff --git a/RocketBot2/Config/Translations/TEMPLATE-translation.en.json b/RocketBot2/Config/Translations/TEMPLATE-translation.en.json
index 31c9f0fd8..7b34a566c 100644
--- a/RocketBot2/Config/Translations/TEMPLATE-translation.en.json
+++ b/RocketBot2/Config/Translations/TEMPLATE-translation.en.json
@@ -202,11 +202,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Putting egg in incubator: {0} km left"
+      "Value": "{0}) Putting egg in incubator: {1} km left"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Incubator status update: {0} Km left of {1} Km egg."
+      "Value": "{0}) Incubator status update: {1} Km left of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.ca.json b/RocketBot2/Config/Translations/translation.ca.json
index 12d716114..d947fd39c 100644
--- a/RocketBot2/Config/Translations/translation.ca.json
+++ b/RocketBot2/Config/Translations/translation.ca.json
@@ -126,11 +126,11 @@
     },
     {
       "Key": "eventPokemonCaptureSuccess",
-      "Value": "({0}) | ({1}) {2} | Lvl: {3} | CP: {4}/{5} | IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left) | XP: {11} | SD: {12} | {13} | lat: {14} long: {15} | Move1: {16} Move2: {17} | Rarity: {18} | Capture Reason: {19} | Shiny: {20} | Form: {21} | Costume: {22} | Sex: {23}"
+      "Value": "({0}) | ({1}) {2} | XP: {11} | SD: {12} | Lvl: {3} | CP: {4}/{5} | IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left) | {13} | lat: {14} long: {15} | Move1: {16} Move2: {17} | Rarity: {18} | Capture Reason: {19} | Shiny: {20} | Form: {21} | Costume: {22} | Sex: {23}"
     },
     {
       "Key": "eventPokemonCaptureFailed",
-      "Value": "({0}) | ({1}) {2} | Lvl: {3} | CP: {4}/{5} | IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left) | XP: {11} | lat: {12} long: {13} | Move1: {14} Move2: {15} | Rarity :{16}"
+      "Value": "({0}) | ({1}) {2} | XP: {11} |          | Lvl: {3} | CP: {4}/{5} | IV: {6}% | Chance: {7}% | {8}m dist | with a {9} ({10} left) | lat: {12} long: {13} | Move1: {14} Move2: {15} | Rarity :{16}"
     },
     {
       "Key": "eventNoPokeballs",
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Afegint ou a la incubadora: {0:0.00}km restants"
+      "Value": "{0}) Afegint ou a la incubadora: {1:0.00}km restants"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Actualitzant l'estat de la incubadora: {0:0.00}km restants"
+      "Value": "{0}) Actualitzant l'estat de la incubadora: {1:0.00}km restants of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.cs.json b/RocketBot2/Config/Translations/translation.cs.json
index 6e88d3390..ff567414a 100644
--- a/RocketBot2/Config/Translations/translation.cs.json
+++ b/RocketBot2/Config/Translations/translation.cs.json
@@ -182,11 +182,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Vložení vajíčka do inkubátoru: {0:0.00}km zbývá"
+      "Value": "{0}) Vložení vajíčka do inkubátoru: {1:0.00}km zbývá"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Stav inkubátoru aktualizován: {0:0.00}km zbývá"
+      "Value": "{0}) Stav inkubátoru aktualizován: {1:0.00}km zbývá of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
@@ -912,7 +912,7 @@
     },
     {
       "Key": "farfetchd",
-      "Value": "farfetchd"
+      "Value": "Farfetchd"
     },
     {
       "Key": "doduo",
diff --git a/RocketBot2/Config/Translations/translation.da.json b/RocketBot2/Config/Translations/translation.da.json
index f1b293b03..e6d52dbdb 100644
--- a/RocketBot2/Config/Translations/translation.da.json
+++ b/RocketBot2/Config/Translations/translation.da.json
@@ -238,11 +238,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Putter æg i inkubator: {0:0.00}km tilbage"
+      "Value": "{0}) Putter æg i inkubator: {1:0.00}km tilbage"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Ægge inkubator Status: {0:0.00}km tilbage"
+      "Value": "{0}) Ægge inkubator Status: {1:0.00}km tilbage of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.de.json b/RocketBot2/Config/Translations/translation.de.json
index 734639be2..212eed7da 100644
--- a/RocketBot2/Config/Translations/translation.de.json
+++ b/RocketBot2/Config/Translations/translation.de.json
@@ -182,11 +182,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Lege Ei in die Ei-Brutmaschine: {0:0.00}km verbleibend"
+      "Value": "{0}) Lege Ei in die Ei-Brutmaschine: {1:0.00}km verbleibend"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Ei-Brutmaschine Status Update: {0:0.00}km verbleibend"
+      "Value": "{0}) Ei-Brutmaschine Status Update: {1:0.00}km verbleibend of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.el.json b/RocketBot2/Config/Translations/translation.el.json
index e08baca1a..681562db3 100644
--- a/RocketBot2/Config/Translations/translation.el.json
+++ b/RocketBot2/Config/Translations/translation.el.json
@@ -178,15 +178,15 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Ένα αυγό μπαίνει στο εκκολαπτήριο: {0:0.00}km απομένουν"
+      "Value": "{0}) Ένα αυγό μπαίνει στο εκκολαπτήριο: {1:0.00}km απομένουν"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Ενημέρωση κατάστασης αυγού: {0:0.00}km απομένουν"
+      "Value": "{0}) Ενημέρωση κατάστασης αυγού: {1:0.00}km απομένουν of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
-      "Value": "Το εκκολαπτήριο εκκόλαψε ενα αυγό: {0}"
+      "Value": "{0}) Το εκκολαπτήριο εκκόλαψε ενα αυγό: {0}"
     },
     {
       "Key": "logEntryError",
diff --git a/RocketBot2/Config/Translations/translation.es.json b/RocketBot2/Config/Translations/translation.es.json
index 1fac169be..bcc4869cb 100644
--- a/RocketBot2/Config/Translations/translation.es.json
+++ b/RocketBot2/Config/Translations/translation.es.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Añadiendo huevo a la incubadora: {0:0.00}km restantes"
+      "Value": "{0}) Añadiendo huevo a la incubadora: {1:0.00}km restantes"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Actualizando el estado de la incubadora: {0:0.00}km restantes"
+      "Value": "{0}) Actualizando el estado de la incubadora: {1:0.00}km restantes of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.et.json b/RocketBot2/Config/Translations/translation.et.json
index 6b415d53a..ea7fa4c3b 100644
--- a/RocketBot2/Config/Translations/translation.et.json
+++ b/RocketBot2/Config/Translations/translation.et.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Panen muna inkubaatorisse: {0:0.00} km veel jäänud"
+      "Value": "{0}) Panen muna inkubaatorisse: {1:0.00} km veel jäänud"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Inkubaatori seis: {0:0.00} km veel jäänud"
+      "Value": "{0}) Inkubaatori seis: {1:0.00} km veel jäänud of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.fr.json b/RocketBot2/Config/Translations/translation.fr.json
index 8ada1268e..45772c72b 100644
--- a/RocketBot2/Config/Translations/translation.fr.json
+++ b/RocketBot2/Config/Translations/translation.fr.json
@@ -202,11 +202,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Incubation d'un oeuf: {0:0.00}km restant"
+      "Value": "{0}) Incubation d'un oeuf: {1:0.00}km restant"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Statut de l'incubateur: {0:0.00}km restant d'un oeuf de {1:0.00}km."
+      "Value": "{0}) Statut de l'incubateur: {1:0.00}km restant d'un oeuf de {2:0.00}km."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.hu.json b/RocketBot2/Config/Translations/translation.hu.json
index 7503bdbe9..156a38a8f 100644
--- a/RocketBot2/Config/Translations/translation.hu.json
+++ b/RocketBot2/Config/Translations/translation.hu.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Tojas behelyezese az inkubatorba: {0:0.00}km maradt"
+      "Value": "{0}) Tojas behelyezese az inkubatorba: {1:0.00}km maradt"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Aktualis inkubator allapot: {0:0.00}km maradt"
+      "Value": "{0}) Aktualis inkubator allapot: {1:0.00}km maradt of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.id.json b/RocketBot2/Config/Translations/translation.id.json
index 9a95dca06..a4dcf2418 100644
--- a/RocketBot2/Config/Translations/translation.id.json
+++ b/RocketBot2/Config/Translations/translation.id.json
@@ -218,11 +218,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Meletakkan telur ({0:0.00} km) ke dalam inkubator"
+      "Value": "{0}) Meletakkan telur ({1:0.00} km) ke dalam inkubator"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Status terbaru inkubator: {0:0.00} km lagi menetas!"
+      "Value": "{0}) Status terbaru inkubator: {1:0.00} km lagi menetas of {2} Km egg!"
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.it.json b/RocketBot2/Config/Translations/translation.it.json
index 5a399f881..785cdf66a 100644
--- a/RocketBot2/Config/Translations/translation.it.json
+++ b/RocketBot2/Config/Translations/translation.it.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Inserimento Uovo nell'Incubatrice: {0:0.00}km rimanenti"
+      "Value": "{0}) Inserimento Uovo nell'Incubatrice: {1:0.00}km rimanenti"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Aggiornamento stato Incubatrice: {0:0.00}km rimanenti"
+      "Value": "{0}) Aggiornamento stato Incubatrice: {1:0.00}km rimanenti of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.ja-JP.json b/RocketBot2/Config/Translations/translation.ja-JP.json
index d58146c1b..42c986a31 100644
--- a/RocketBot2/Config/Translations/translation.ja-JP.json
+++ b/RocketBot2/Config/Translations/translation.ja-JP.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "タマゴを孵化装置にセットしています: 残り：{0:0.00}km"
+      "Value": "{0}) タマゴを孵化装置にセットしています: 残り：{1:0.00}km"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "孵化装置の状態: 残り：{0:0.00}km"
+      "Value": "{0}) 孵化装置の状態: 残り：{1:0.00}km of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.lt.json b/RocketBot2/Config/Translations/translation.lt.json
index 3133403db..28fc2dacc 100644
--- a/RocketBot2/Config/Translations/translation.lt.json
+++ b/RocketBot2/Config/Translations/translation.lt.json
@@ -186,11 +186,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Dedamas kiaušinis į inkubatorių: {0:0.00}km liko"
+      "Value": "{0}) Dedamas kiaušinis į inkubatorių: {1:0.00}km liko"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Inkubatoriaus atnaujinimas: {0:0.00}km liko"
+      "Value": "{0}) Inkubatoriaus atnaujinimas: {1:0.00}km liko of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.nl-NL.json b/RocketBot2/Config/Translations/translation.nl-NL.json
index 5a1139bac..496b98561 100644
--- a/RocketBot2/Config/Translations/translation.nl-NL.json
+++ b/RocketBot2/Config/Translations/translation.nl-NL.json
@@ -175,11 +175,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Ei in broedmachine stoppen: {0:0.00} km resterend"
+      "Value": "{0}) Ei in broedmachine stoppen: {1:0.00} km resterend"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Broedmachine status update: {0:0.00} km resterend"
+      "Value": "{0}) Broedmachine status update: {1:0.00} km resterend of {2} Km egg."
     },
     {
       "Key": "PokedexCatchedTelegram",
diff --git a/RocketBot2/Config/Translations/translation.nn-NO.json b/RocketBot2/Config/Translations/translation.nn-NO.json
index 18db25858..ccba3a157 100644
--- a/RocketBot2/Config/Translations/translation.nn-NO.json
+++ b/RocketBot2/Config/Translations/translation.nn-NO.json
@@ -170,11 +170,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Putter egg i incubator: {0:0.00}km igjen"
+      "Value": "{0}) Putter egg i incubator: {1:0.00}km igjen"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Incubator oppdatering: {0:0.00}km igjen"
+      "Value": "{0}) Incubator oppdatering: {1:0.00}km igjen of {2} Km egg."
     },
     {
       "Key": "PokedexCatchedTelegram",
diff --git a/RocketBot2/Config/Translations/translation.pl.json b/RocketBot2/Config/Translations/translation.pl.json
index 5d569c3df..ddf82beed 100644
--- a/RocketBot2/Config/Translations/translation.pl.json
+++ b/RocketBot2/Config/Translations/translation.pl.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Umieszczono Jajko w inkubatorze. Pozostało {0:0.00}km"
+      "Value": "{0}) Umieszczono Jajko w inkubatorze. Pozostało {1:0.00}km"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Pozostało: {0:0.00}km do wyklucia"
+      "Value": "{0}) Pozostało: {1:0.00}km do wyklucia of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
@@ -1080,7 +1080,7 @@
     },
     {
       "Key": "farfetchd",
-      "Value": "Farfetch'd"
+      "Value": "Farfetchd"
     },
     {
       "Key": "doduo",
diff --git a/RocketBot2/Config/Translations/translation.pt-br.json b/RocketBot2/Config/Translations/translation.pt-br.json
index bbdaa6a9d..45f28d27a 100644
--- a/RocketBot2/Config/Translations/translation.pt-br.json
+++ b/RocketBot2/Config/Translations/translation.pt-br.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Colocando ovo na incubadora: restando {0:0.00}km"
+      "Value": "{0}) Colocando ovo na incubadora: restando {1:0.00}km"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Status da incubadora atualizado: restando {0:0.00}km"
+      "Value": "{0}) Status da incubadora atualizado: restando {1:0.00}km of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.pt-pt.json b/RocketBot2/Config/Translations/translation.pt-pt.json
index 592f33e35..8540b221c 100644
--- a/RocketBot2/Config/Translations/translation.pt-pt.json
+++ b/RocketBot2/Config/Translations/translation.pt-pt.json
@@ -178,11 +178,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "A colocar ovo na incubadora: restam {0:0.00}km"
+      "Value": "{0}) A colocar ovo na incubadora: restam {1:0.00}km"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Status da incubadora atualizado: restam {0:0.00}km"
+      "Value": "{0}) Status da incubadora atualizado: restam {1:0.00}km of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.ro.json b/RocketBot2/Config/Translations/translation.ro.json
index 538a7fa98..f888a2400 100644
--- a/RocketBot2/Config/Translations/translation.ro.json
+++ b/RocketBot2/Config/Translations/translation.ro.json
@@ -210,11 +210,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Se pune oul în incubator: {0:0.00} km rămași"
+      "Value": "{0}) Se pune oul în incubator: {1:0.00} km rămași"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Actualizare pentru statusului incubatorului: {0:0.00} km rămași"
+      "Value": "{0}) Actualizare pentru statusului incubatorului: {1:0.00} km rămași of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.ru-RU.json b/RocketBot2/Config/Translations/translation.ru-RU.json
index 53db94b62..c9c92714e 100644
--- a/RocketBot2/Config/Translations/translation.ru-RU.json
+++ b/RocketBot2/Config/Translations/translation.ru-RU.json
@@ -207,14 +207,14 @@
       "Key": "welcomeWarning",
       "Value": "Убедитесь, что Широта и Долгота верны! Закройте программу, если это не так! Широта: {0} Долгота: {1}"
     },
-    {
-      "Key": "incubatorPuttingEgg",
-      "Value": "Кладем яйцо в инкубатор: {0:0.00}км осталось"
-    },
-    {
-      "Key": "incubatorStatusUpdate",
-      "Value": "Статус инкубатора: {0:0.00}км осталось"
-    },
+      {
+        "Key": "incubatorPuttingEgg",
+        "Value": "{0}) Кладем яйцо в инкубатор: {1:0.00}км осталось"
+      },
+      {
+        "Key": "incubatorStatusUpdate",
+        "Value": "{0}) Статус инкубатора: {1:0.00}км осталось of {2} Km egg."
+      },
     {
       "Key": "incubatorEggHatched",
       "Value": "Из Яйца получили: {0} | Lvl: {1} CP: ({2}/{3}) IV: {4}%"
diff --git a/RocketBot2/Config/Translations/translation.sv.json b/RocketBot2/Config/Translations/translation.sv.json
index f4849c22a..ca3fc8a72 100644
--- a/RocketBot2/Config/Translations/translation.sv.json
+++ b/RocketBot2/Config/Translations/translation.sv.json
@@ -178,11 +178,11 @@
     },
     {
       "Key": "incubatorPuttingEgg",
-      "Value": "Placerar ägg i inkubator: {0:0.00}km kvar"
+      "Value": "{0}) Placerar ägg i inkubator: {1:0.00}km kvar"
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Inkubator status: {0:0.00}km kvar"
+      "Value": "{0}) Inkubator status: {1:0.00}km kvar of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.th.json b/RocketBot2/Config/Translations/translation.th.json
index beabde8a3..c138c5176 100644
--- a/RocketBot2/Config/Translations/translation.th.json
+++ b/RocketBot2/Config/Translations/translation.th.json
@@ -214,7 +214,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "สถานะแคปซูนฟักไข่อีก : {0:0.00} กิโลเมตร"
+      "Value": "สถานะแคปซูนฟักไข่อีก : {0:0.00} กิโลเมตร of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.tr.json b/RocketBot2/Config/Translations/translation.tr.json
index 59113b2c2..a523d38f9 100644
--- a/RocketBot2/Config/Translations/translation.tr.json
+++ b/RocketBot2/Config/Translations/translation.tr.json
@@ -214,7 +214,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Kuluçka makinesi(Incubator) durum güncellemesi: {0:0.00}km kaldı"
+      "Value": "Kuluçka makinesi(Incubator) durum güncellemesi: {0:0.00}km kaldı of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
@@ -1076,7 +1076,7 @@
     },
     {
       "Key": "farfetchd",
-      "Value": "Farfetch'd"
+      "Value": "Farfetchd"
     },
     {
       "Key": "doduo",
diff --git a/RocketBot2/Config/Translations/translation.uk-UA.json b/RocketBot2/Config/Translations/translation.uk-UA.json
index b59d16a97..8008756c9 100644
--- a/RocketBot2/Config/Translations/translation.uk-UA.json
+++ b/RocketBot2/Config/Translations/translation.uk-UA.json
@@ -182,7 +182,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Статус інкубатора: {0: 0.00} км залишилося"
+      "Value": "Статус інкубатора: {0: 0.00} км залишилося of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.vi.json b/RocketBot2/Config/Translations/translation.vi.json
index cb709cde4..0affd5c41 100644
--- a/RocketBot2/Config/Translations/translation.vi.json
+++ b/RocketBot2/Config/Translations/translation.vi.json
@@ -214,7 +214,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "Tình trạng lồng ấp: còn lại {0:0.00}km"
+      "Value": "Tình trạng lồng ấp: còn lại {0:0.00}km of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.zh-CN.json b/RocketBot2/Config/Translations/translation.zh-CN.json
index ad39a0a57..f2247bef6 100644
--- a/RocketBot2/Config/Translations/translation.zh-CN.json
+++ b/RocketBot2/Config/Translations/translation.zh-CN.json
@@ -214,7 +214,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "孵化器状态更新:剩余{0:0.00}千米\t\t"
+      "Value": "孵化器状态更新:剩余{0:0.00}千米 of {2} Km egg.\t\t"
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.zh-CN_pp.json b/RocketBot2/Config/Translations/translation.zh-CN_pp.json
index f0b54011f..140ba2f37 100644
--- a/RocketBot2/Config/Translations/translation.zh-CN_pp.json
+++ b/RocketBot2/Config/Translations/translation.zh-CN_pp.json
@@ -214,7 +214,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "孵化器状态更新:剩余{0:0.00}千米\t\t"
+      "Value": "孵化器状态更新:剩余{0:0.00}千米 of {2} Km egg.\t\t"
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.zh-HK.json b/RocketBot2/Config/Translations/translation.zh-HK.json
index f9fa5e04a..e6285033c 100644
--- a/RocketBot2/Config/Translations/translation.zh-HK.json
+++ b/RocketBot2/Config/Translations/translation.zh-HK.json
@@ -214,7 +214,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "更新孵化器狀態：剩餘{0:0.00}公里"
+      "Value": "更新孵化器狀態：剩餘{0:0.00}公里 of {2} Km egg."
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Config/Translations/translation.zh-TW.json b/RocketBot2/Config/Translations/translation.zh-TW.json
index a18deb3a4..094f2d3ac 100644
--- a/RocketBot2/Config/Translations/translation.zh-TW.json
+++ b/RocketBot2/Config/Translations/translation.zh-TW.json
@@ -218,7 +218,7 @@
     },
     {
       "Key": "incubatorStatusUpdate",
-      "Value": "更新孵化器狀態：剩餘{0:0.00}公里\t\t"
+      "Value": "更新孵化器狀態：剩餘{0:0.00}公里 of {2} Km egg.\t\t"
     },
     {
       "Key": "incubatorEggHatched",
diff --git a/RocketBot2/Forms/MainForm.cs b/RocketBot2/Forms/MainForm.cs
index 170ca4b12..b62f1523a 100644
--- a/RocketBot2/Forms/MainForm.cs
+++ b/RocketBot2/Forms/MainForm.cs
@@ -1,4 +1,4 @@
-#region using directives
+#region using directives
 
 using BrightIdeasSoftware;
 using GeoCoordinatePortable;
@@ -26,6 +26,7 @@
 using PokemonGo.RocketAPI;
 using PokemonGo.RocketAPI.Extensions;
 using PokemonGo.RocketAPI.Helpers;
+using PokemonGo.RocketAPI.Util;
 using RocketBot2.CommandLineUtility;
 using RocketBot2.Helpers;
 using RocketBot2.Models;
@@ -49,7 +50,6 @@
 
 #endregion
 
-
 namespace RocketBot2.Forms
 {
     public partial class MainForm : System.Windows.Forms.Form
@@ -63,6 +63,8 @@ public partial class MainForm : System.Windows.Forms.Form
         private static bool _excelConfigAllow = false;
         private static bool _ignoreKillSwitch;
         private bool _botStarted = false;
+        private bool _GoogleWalk;
+        public int hwScale;
 
         private static readonly Uri StrKillSwitchUri =
             new Uri("https://raw.githubusercontent.com/TheUnnamedOrganisation/RocketBot/master/KillSwitch.txt");
@@ -89,7 +91,7 @@ public partial class MainForm : System.Windows.Forms.Form
         internal readonly GMapOverlay _pokestopsOverlay = new GMapOverlay("pokestops");
         internal readonly GMapOverlay _searchAreaOverlay = new GMapOverlay("areas");
 
-        private const int DefaultZoomLevel = 15;
+        private const int DefaultZoomLevel = 16;
 
         public static int[] BotRed;
         public static int[] BotGreen;
@@ -117,9 +119,15 @@ private void MainForm_Load(object sender, EventArgs e)
                 Spliter1Width += olvPokemonList.GetColumn(i).Width;
             }
             if (Spliter1Width > this.Width / 2)
+            {
                 this.splitContainer1.SplitterDistance = this.splitContainer1.Width / 100 * 47;
+                hwScale = 2;
+            }
             else
-                this.splitContainer1.SplitterDistance = this.Width - Spliter1Width - 53;
+            {
+                this.splitContainer1.SplitterDistance = this.Width - Spliter1Width - 80;
+                hwScale = 1;
+            }
 
             this.splitContainer2.SplitterDistance = this.splitContainer2.Height / 100 * 47;// Always keeps the logger window @ 47%/53% of the window height
 
@@ -154,7 +162,7 @@ private void MainForm_Load(object sender, EventArgs e)
 
             InitializePokemonForm();
 
-            if (_currentLatLng.IsEmpty) 
+            if (_currentLatLng.IsEmpty)
             {
                 _currentLatLng.Lat = settings.Auth.CurrentAuthConfig.AccountLatitude;
                 _currentLatLng.Lng = settings.Auth.CurrentAuthConfig.AccountLongitude;
@@ -220,7 +228,7 @@ private void LoadPokeStopsRefresh_MouseEnter(object sender, EventArgs e)
             };
 
             // Set up the ToolTip text for the Button and Checkbox.
-            LoadPokeStopsRefreshTips.SetToolTip(this.LoadPokeStopsRefresh, $"Changes the refresh interval\nof Pokestops on the map.\n(Range: 10 - 60 sec)\n(Default: 30 sec)");
+            LoadPokeStopsRefreshTips.SetToolTip(this.LoadPokeStopsRefresh, $"Changes the refresh interval\nof Pokestops on the map.\n(Range: 10 - 60 sec)\n(Default: 30 sec)\n(Current: {LoadPokeStopsRefresh.Value} sec)");
         }
 
         private void LoadPokeStopsRefresh_MouseUp(object sender, EventArgs e)
@@ -341,15 +349,15 @@ private void InitializeMap()
             }
 
             //Bottom most layer
-            GMapControl1.Overlays.Add(_searchAreaOverlay);
-            GMapControl1.Overlays.Add(_pokemonsOverlay);
-            GMapControl1.Overlays.Add(_pokestopsOverlay);
-            GMapControl1.Overlays.Add(_playerRoutePointsOverlay);
-            GMapControl1.Overlays.Add(_playerRouteOverlay);
-            GMapControl1.Overlays.Add(_playerOverlay);
+            GMapControl1.Overlays.Add(_searchAreaOverlay);          
+            GMapControl1.Overlays.Add(_pokemonsOverlay);            //Pokemons
+            GMapControl1.Overlays.Add(_playerRouteOverlay);         //Trainer walked path
+            GMapControl1.Overlays.Add(_playerRoutePointsOverlay);   //Google walk path
+            GMapControl1.Overlays.Add(_pokestopsOverlay);           //Pokestops & Gyms
+            GMapControl1.Overlays.Add(_playerOverlay);              //Trainer icon
             //Top most layer
 
-            _playerMarker = new GMapMarkerTrainer(new PointLatLng(lat, lng), ResourceHelper.GetImage("PlayerLocation", null, null, 32, 32));
+            _playerMarker = new GMapMarkerTrainer(new PointLatLng(lat, lng), ResourceHelper.GetImage("PlayerLocation", null, null, 24, 24));
             _playerOverlay.Markers.Add(_playerMarker);
             _playerMarker.Position = new PointLatLng(lat, lng);
             _searchAreaOverlay.Polygons.Clear();
@@ -415,7 +423,7 @@ private async Task InitializePokestopsAndRoute()
 
                     var route = new GMapRoute(_routePoints, "Walking Path")
                     {
-                        Stroke = new Pen(Color.FromArgb(102, 178, 255), 2)
+                        Stroke = new Pen(Color.FromArgb(0, 255, 0), 2)
                     };
                     _playerRouteOverlay.Routes.Add(route);
                 }
@@ -429,8 +437,8 @@ private async Task InitializePokestopsAndRoute()
                     bool isRaid = false;
                     bool asBoss = false;
                     bool isSpawn = false;
-                    int hg = 32;
-                    int wg = 32;
+                    int hg = 24; // 32 / hwScale;
+                    int wg = 24; // 32 / hwScale;
                     Image fort = ResourceHelper.GetImage($"Pokestop", null, null, hg, wg);
                     string finalText = null;
                     DateTime expires = new DateTime(0);
@@ -444,14 +452,20 @@ private async Task InitializePokestopsAndRoute()
                                 if (pokeStop.LureInfo != null)
                                 {
                                     if (pokeStop.CooldownCompleteTimestampMs < DateTime.UtcNow.ToUnixTime())
-                                        fort = ResourceHelper.GetImage($"Pokestop_Lured", null, null, hg, wg);
+                                        if (!pokeStop.Visited)
+                                            fort = ResourceHelper.GetImage($"Pokestop_Lured", null, null, hg, wg);
+                                        else
+                                            fort = ResourceHelper.GetImage($"Pokestop_Lured_Visited", null, null, hg, wg);
                                     else
                                         fort = ResourceHelper.GetImage($"Pokestop_looted_VisitedLure", null, null, hg, wg);
                                 }
                                 else
                                 {
                                     if (pokeStop.CooldownCompleteTimestampMs < DateTime.UtcNow.ToUnixTime())
-                                        fort = ResourceHelper.GetImage($"Pokestop", null, null, hg, wg);
+                                        if (!pokeStop.Visited)
+                                            fort = ResourceHelper.GetImage($"Pokestop", null, null, hg, wg);
+                                        else
+                                            fort = ResourceHelper.GetImage($"Pokestop_Visited", null, null, hg, wg);
                                     else
                                         fort = ResourceHelper.GetImage($"Pokestop_looted", null, null, hg, wg);
                                 }
@@ -497,8 +511,8 @@ private async Task InitializePokestopsAndRoute()
                                         if (!(expires.Ticks == 0 || time.TotalSeconds < 0))
                                         {
                                             asBoss = true;
-                                            hg = 48;
-                                            wg = 48;
+                                            hg = 48 / hwScale;
+                                            wg = 48 / hwScale;
                                             ImgGymBoss = ResourceHelper.GetImage(null, pokeStop.RaidInfo.RaidPokemon, null, 38, 38);
                                             boss = $"Boss: {_session.Translation.GetPokemonTranslation(pokeStop.RaidInfo.RaidPokemon.PokemonId)} CP: {pokeStop.RaidInfo.RaidPokemon.Cp}";
                                             finalText = $"Local RAID ends in: {time.Hours:00}h:{time.Minutes:00}m\nat: {(DateTime.Now + time).Hour:00}:{(DateTime.Now + time).Minute:00} Local time\n\r{boss}";
@@ -586,7 +600,7 @@ private async Task InitializePokestopsAndRoute()
                         Points = _session.Navigation.WalkStrategy.Points;
                         _playerLocations.Clear();
                         _playerRoutePointsOverlay.Routes.Clear();
-                        _playerOverlay.Routes.Clear();
+                        //_playerOverlay.Routes.Clear();
                         List<PointLatLng> routePointLatLngs = new List<PointLatLng>();
                         foreach (var item in Points)
                         {
@@ -594,13 +608,22 @@ private async Task InitializePokestopsAndRoute()
                         }
                         GMapRoute routes = new GMapRoute(routePointLatLngs, routePointLatLngs.ToString())
                         {
-                            Stroke = new Pen(Color.FromArgb(255, 51, 51), 2) { DashStyle = DashStyle.Dash }
+                            Stroke = new Pen(Color.FromArgb(0, 0, 204), 2) { DashStyle = DashStyle.Dot }
                         };
                         _playerRoutePointsOverlay.Routes.Add(routes);
+                        _GoogleWalk = true;
+                    }
+                    else
+                    //if (_GoogleWalk == true && _playerRoutePointsOverlay.Routes.Count() == 0)
+                    {
+                        //_playerRoutePointsOverlay.Routes.Clear();
+                        _GoogleWalk = false;
                     }
                 }
                 catch
                 {
+                    _playerRoutePointsOverlay.Routes.Clear();
+                    _GoogleWalk = false;
                     //return;
                 }
 
@@ -651,8 +674,8 @@ private void Navigation_UpdatePositionEvent()
 
                 if (!_currentLatLng.IsEmpty)
                     _playerMarker = _currentLatLng != latlng
-                        ? new GMapMarkerTrainer(latlng, ResourceHelper.GetImage("PlayerLocation2", null, null, 32, 32))
-                        : new GMapMarkerTrainer(latlng, ResourceHelper.GetImage("PlayerLocation", null, null, 32, 32));
+                        ? new GMapMarkerTrainer(latlng, ResourceHelper.GetImage("PlayerLocation2", null, null, 24, 24))
+                        : new GMapMarkerTrainer(latlng, ResourceHelper.GetImage("PlayerLocation", null, null, 24, 24));
 
                 _playerOverlay.Markers.Add(_playerMarker);
 
@@ -682,10 +705,16 @@ private void Navigation_UpdatePositionEvent()
                 {
                     var step = new GMapRoute(_playerLocations, "step")
                     {
-                        Stroke = new Pen(Color.FromArgb(0, 204, 0), 1) { DashStyle = DashStyle.Solid }
-                        //Stroke = new Pen(Color.FromArgb(BotRed[BotID], BotGreen[BotID], BotBlue[BotID]), 1) { DashStyle = DashStyle.Solid }
+                        //Stroke = new Pen(Color.FromArgb(BotRed[BotID], BotGreen[BotID], BotBlue[BotID]), 2) { DashStyle = DashStyle.Solid }
+                        Stroke = new Pen(Color.FromArgb(255, 0, 0), 2) { DashStyle = DashStyle.Solid }
                     };
                     _playerOverlay.Routes.Add(step);
+
+                    if (_GoogleWalk == true && _playerRoutePointsOverlay.Routes.Count() == 0)
+                    {
+                        _playerRoutePointsOverlay.Routes.Clear();
+                        _GoogleWalk = false;
+                    }
                 }
             }, null);
         }
@@ -951,17 +980,18 @@ private void TogglePrecalRoute_CheckStateChanged(object sender, EventArgs e)
             {
                 _playerRouteOverlay.Routes.Clear();
                 _playerOverlay.Routes.Clear();
+                _playerRoutePointsOverlay.Routes.Clear();
 
                 if (_routePoints != null)
                 {
                     var route = new GMapRoute(_routePoints, "Walking Path")
                     {
-                        Stroke = new Pen(Color.FromArgb(102, 178, 255), 2)
+                        Stroke = new Pen(Color.FromArgb(0, 255, 0), 2)
                     };
 
                     var step = new GMapRoute(_playerLocations, "step")
                     {
-                        Stroke = new Pen(Color.FromArgb(0, 204, 0), 1) { DashStyle = DashStyle.Dash }
+                        Stroke = new Pen(Color.FromArgb(0, 0, 204), 2) { DashStyle = DashStyle.Dot }
                     };
 
                     if (togglePrecalRoute.CheckState == CheckState.Checked)
@@ -1305,6 +1335,10 @@ public async void NicknamePokemon(IEnumerable<PokemonData> pokemons, string nick
 
         internal int OldCount = 0;
         internal int OldItemsCount = 0;
+
+        public object GetCurrentTimestampInSeconds { get; private set; }
+        public long LastRuntimeUpdatedAt { get; private set; }
+
         private async Task ReloadPokemonList()
         {
             SetState(false);
@@ -1358,7 +1392,7 @@ private async Task ReloadPokemonList()
                     OldCount = NewCount;
                 }
 
-                Instance.lblPokemonList.Text = _session.Translation.GetTranslation(TranslationString.AmountPkmSeenCaught, _totalData, 252, _totalCaptures, 252) +
+                Instance.lblPokemonList.Text = _session.Translation.GetTranslation(TranslationString.AmountPkmSeenCaught, _totalData, 721, _totalCaptures, 721) +
                     $" | Storage: {_session.Client.Player.PlayerData.MaxPokemonStorage} (Pokémons: {pokemons.Count()}, Eggs: {_session.Inventory.GetEggs().Result.Count()}) [Depolyments: {NewCount}]";
 
                 var items =
@@ -1635,8 +1669,9 @@ private void InitializeBot(Action<ISession, StatisticsAggregator> onBotStarted)
 
             bool AutoStart = false;
             var options = new Options();
-            if (CommandLine.Parser.Default.ParseArguments(args, options))
-            {
+
+            //if (CommandLine.Parser.Default.ParseArguments(args, options))
+            //{
                 // Values are available here
                 if (options.Init)
                 {
@@ -1644,7 +1679,7 @@ private void InitializeBot(Action<ISession, StatisticsAggregator> onBotStarted)
                 }
                 if (options.AutoStart)
                     AutoStart = true;
-            }
+            //}
 
             var lastPosFile = Path.Combine(profileConfigPath, "LastPos.ini");
             if (File.Exists(lastPosFile) && settings.LocationConfig.StartFromLastPosition)
@@ -1830,7 +1865,7 @@ private void InitializeBot(Action<ISession, StatisticsAggregator> onBotStarted)
                     GetPlayerResponse x = _session.Client.Player.GetPlayer().Result;
                     string warn = x.Warn ? "*(Flagged)*-" : null;
 
-                    SetStatusText($"[RocketBot2 v{strVersion}] Team: {x.PlayerData.Team} -  {warn}" +
+                    SetStatusText($"[RocketBot2 v{strVersion}] Team: {x.PlayerData.Team} - {warn}" +
                                 stats.GetTemplatedStats(
                                     _session.Translation.GetTranslation(TranslationString.StatsTemplateString),
                                     _session.Translation.GetTranslation(TranslationString.StatsXpTemplateString)));
@@ -1895,6 +1930,19 @@ private void InitializeBot(Action<ISession, StatisticsAggregator> onBotStarted)
             {
                 foreach (var _bot in accountManager.AccountsReadOnly.OrderByDescending(p => p.Level).ThenByDescending(p => p.CurrentXp))
                 {
+                    string TStamp = string.IsNullOrEmpty(_bot.LastLoginTimestamp.ToString()) ? null : _bot.LastLoginTimestamp.ToString();
+                    if (TStamp != null)
+                    {
+                        if ((TimeUtil.GetDateTimeFromMilliseconds(_bot.LastLoginTimestamp.Value).ToLocalTime().Date - DateTime.Now.Date).Days >= 14)
+                            _bot.AccountActive = false;
+                    }
+
+                    if (_bot.RuntimeTotal > 0)
+                    {
+                        if (TimeUtil.GetDateTimeFromMilliseconds(_bot.LastLoginTimestamp.Value).ToLocalTime().Date != DateTime.Now.Date)
+                            _bot.RuntimeTotal = 0;
+                    }
+
                     var _item = new ToolStripMenuItem()
                     {
                         Text = _bot.Username
@@ -2138,12 +2186,26 @@ private static bool CheckKillSwitch()
 
         private static void UnhandledExceptionEventHandler(object obj, UnhandledExceptionEventArgs args)
         {
+            if (_session.LogicSettings.NotificationConfig.PushBulletApiKey != null)
+            {
+                var OldNot = _session.LogicSettings.NotificationConfig.EnablePushBulletNotification;
+                _session.LogicSettings.NotificationConfig.EnablePushBulletNotification = true;
+                PushNotificationClient.SendNotification(_session, "Exception caught.", $"Writing LogBuffer.\nBot has stopped running", true).ConfigureAwait(false);
+                _session.LogicSettings.NotificationConfig.EnablePushBulletNotification = OldNot;
+            }
             Logger.Write("Exception caught, writing LogBuffer.", force: true);
             //throw new Exception();
         }
 
         public static bool PromptForKillSwitchOverride(string strReason)
         {
+            if (_session.LogicSettings.NotificationConfig.PushBulletApiKey != null)
+            {
+                var OldNot = _session.LogicSettings.NotificationConfig.EnablePushBulletNotification;
+                _session.LogicSettings.NotificationConfig.EnablePushBulletNotification = true;
+                PushNotificationClient.SendNotification(_session, "Killswitch.", $"Override Killswitch requested?", true).ConfigureAwait(false);
+                _session.LogicSettings.NotificationConfig.EnablePushBulletNotification = OldNot;
+            }
             Logger.Write("Do you want to override killswitch to bot at your own risk? Y/N", LogLevel.Warning);
 
             /*while (true)
diff --git a/RocketBot2/Forms/MainForm.designer.cs b/RocketBot2/Forms/MainForm.designer.cs
index bc84f8cc1..956fb0bea 100644
--- a/RocketBot2/Forms/MainForm.designer.cs
+++ b/RocketBot2/Forms/MainForm.designer.cs
@@ -207,8 +207,8 @@ private void InitializeComponent()
             // 
             // GMapControl1
             // 
-            this.GMapControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+            this.GMapControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.GMapControl1.Bearing = 0F;
             this.GMapControl1.CanDragMap = true;
@@ -254,8 +254,8 @@ private void InitializeComponent()
             this.olvPokemonList.AllColumns.Add(this.pkmnTransferButton);
             this.olvPokemonList.AllColumns.Add(this.pkmnPowerUpButton);
             this.olvPokemonList.AllColumns.Add(this.pkmnEvolveButton);
-            this.olvPokemonList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+            this.olvPokemonList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.olvPokemonList.CellEditUseWholeCell = false;
             this.olvPokemonList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
@@ -664,7 +664,7 @@ private void InitializeComponent()
             // 
             // lblInventory
             // 
-            this.lblInventory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            this.lblInventory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lblInventory.Location = new System.Drawing.Point(2, 742);
             this.lblInventory.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
@@ -676,7 +676,7 @@ private void InitializeComponent()
             // 
             // flpItems
             // 
-            this.flpItems.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            this.flpItems.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.flpItems.AutoScroll = true;
             this.flpItems.BackColor = System.Drawing.SystemColors.Window;
@@ -690,7 +690,7 @@ private void InitializeComponent()
             // 
             // lblPokemonList
             // 
-            this.lblPokemonList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            this.lblPokemonList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lblPokemonList.Location = new System.Drawing.Point(3, 605);
             this.lblPokemonList.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
diff --git a/RocketBot2/Forms/SettingForm.Designer.cs b/RocketBot2/Forms/SettingForm.Designer.cs
index a77ef4a45..c4468aef4 100644
--- a/RocketBot2/Forms/SettingForm.Designer.cs
+++ b/RocketBot2/Forms/SettingForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace RocketBot2.Forms
+namespace RocketBot2.Forms
 {
     partial class SettingsForm
     {
@@ -207,7 +207,6 @@ private void InitializeComponent()
             this.tbEvolveApplyLuckyEggOnEvolutionCountValue = new System.Windows.Forms.TextBox();
             this.cbEvolveApplyLuckyEggOnEvolutionCount = new System.Windows.Forms.CheckBox();
             this.cbEvolvePreserveMinCandiesFromFilter = new System.Windows.Forms.CheckBox();
-            this.cbEvolveAll = new System.Windows.Forms.CheckBox();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.cbEvolvePokemonsThatMatchFilter = new System.Windows.Forms.CheckBox();
             this.label33 = new System.Windows.Forms.Label();
@@ -225,6 +224,7 @@ private void InitializeComponent()
             this.cbTriggerEvolveOnStorageUsagePercentage = new System.Windows.Forms.CheckBox();
             this.gbEvolve = new System.Windows.Forms.GroupBox();
             this.clbEvolve = new System.Windows.Forms.CheckedListBox();
+            this.cbEvolveAll = new System.Windows.Forms.CheckBox();
             this.tabSnipePokemonFilter = new System.Windows.Forms.TabPage();
             this.gbSnipe = new System.Windows.Forms.GroupBox();
             this.clbSnipePokemonFilter = new System.Windows.Forms.CheckedListBox();
@@ -388,10 +388,10 @@ private void InitializeComponent()
             // 
             this.cancelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.cancelBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.cancelBtn.Location = new System.Drawing.Point(825, 520);
-            this.cancelBtn.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.cancelBtn.Location = new System.Drawing.Point(990, 624);
+            this.cancelBtn.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.cancelBtn.Name = "cancelBtn";
-            this.cancelBtn.Size = new System.Drawing.Size(125, 62);
+            this.cancelBtn.Size = new System.Drawing.Size(150, 74);
             this.cancelBtn.TabIndex = 31;
             this.cancelBtn.Text = "Cancel";
             this.cancelBtn.UseVisualStyleBackColor = true;
@@ -412,7 +412,7 @@ private void InitializeComponent()
             this.tabControl.Margin = new System.Windows.Forms.Padding(2);
             this.tabControl.Name = "tabControl";
             this.tabControl.SelectedIndex = 0;
-            this.tabControl.Size = new System.Drawing.Size(962, 518);
+            this.tabControl.Size = new System.Drawing.Size(1154, 622);
             this.tabControl.TabIndex = 30;
             // 
             // tabAuth
@@ -438,28 +438,28 @@ private void InitializeComponent()
             this.tabAuth.Controls.Add(this.latLabel);
             this.tabAuth.Controls.Add(this.UserLabel);
             this.tabAuth.Controls.Add(this.PasswordLabel);
-            this.tabAuth.Location = new System.Drawing.Point(4, 29);
-            this.tabAuth.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.tabAuth.Location = new System.Drawing.Point(4, 34);
+            this.tabAuth.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.tabAuth.Name = "tabAuth";
-            this.tabAuth.Padding = new System.Windows.Forms.Padding(2, 5, 2, 5);
-            this.tabAuth.Size = new System.Drawing.Size(954, 485);
+            this.tabAuth.Padding = new System.Windows.Forms.Padding(2, 6, 2, 6);
+            this.tabAuth.Size = new System.Drawing.Size(1146, 584);
             this.tabAuth.TabIndex = 0;
             this.tabAuth.Text = "Auth";
             // 
             // cbTimeZone
             // 
             this.cbTimeZone.FormattingEnabled = true;
-            this.cbTimeZone.Location = new System.Drawing.Point(125, 265);
+            this.cbTimeZone.Location = new System.Drawing.Point(150, 318);
             this.cbTimeZone.Name = "cbTimeZone";
-            this.cbTimeZone.Size = new System.Drawing.Size(203, 28);
+            this.cbTimeZone.Size = new System.Drawing.Size(243, 33);
             this.cbTimeZone.TabIndex = 36;
             // 
             // label34
             // 
             this.label34.AutoSize = true;
-            this.label34.Location = new System.Drawing.Point(8, 269);
+            this.label34.Location = new System.Drawing.Point(10, 323);
             this.label34.Name = "label34";
-            this.label34.Size = new System.Drawing.Size(79, 20);
+            this.label34.Size = new System.Drawing.Size(94, 25);
             this.label34.TabIndex = 35;
             this.label34.Text = "TimeZone:";
             // 
@@ -472,11 +472,11 @@ private void InitializeComponent()
             this.tabControl1.Controls.Add(this.tabDevice);
             this.tabControl1.Controls.Add(this.tabAPIConfig);
             this.tabControl1.Controls.Add(this.tabAccounts);
-            this.tabControl1.Location = new System.Drawing.Point(338, 0);
+            this.tabControl1.Location = new System.Drawing.Point(406, 0);
             this.tabControl1.Margin = new System.Windows.Forms.Padding(2);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(612, 478);
+            this.tabControl1.Size = new System.Drawing.Size(734, 574);
             this.tabControl1.TabIndex = 34;
             // 
             // tabPosition
@@ -487,11 +487,11 @@ private void InitializeComponent()
             this.tabPosition.Controls.Add(this.FindAdressBtn);
             this.tabPosition.Controls.Add(this.ResetLocationBtn);
             this.tabPosition.Controls.Add(this.gMapCtrl);
-            this.tabPosition.Location = new System.Drawing.Point(4, 29);
+            this.tabPosition.Location = new System.Drawing.Point(4, 34);
             this.tabPosition.Margin = new System.Windows.Forms.Padding(2);
             this.tabPosition.Name = "tabPosition";
             this.tabPosition.Padding = new System.Windows.Forms.Padding(2);
-            this.tabPosition.Size = new System.Drawing.Size(604, 445);
+            this.tabPosition.Size = new System.Drawing.Size(726, 536);
             this.tabPosition.TabIndex = 0;
             this.tabPosition.Text = "Position";
             // 
@@ -500,10 +500,10 @@ private void InitializeComponent()
             this.AdressBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.AdressBox.ForeColor = System.Drawing.Color.Gray;
-            this.AdressBox.Location = new System.Drawing.Point(9, 401);
-            this.AdressBox.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.AdressBox.Location = new System.Drawing.Point(11, 475);
+            this.AdressBox.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.AdressBox.Name = "AdressBox";
-            this.AdressBox.Size = new System.Drawing.Size(332, 27);
+            this.AdressBox.Size = new System.Drawing.Size(398, 31);
             this.AdressBox.TabIndex = 25;
             this.AdressBox.Text = "Enter an address or a coordinate";
             this.AdressBox.Enter += new System.EventHandler(this.AdressBox_Enter);
@@ -514,13 +514,13 @@ private void InitializeComponent()
             // 
             this.trackBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.trackBar.BackColor = System.Drawing.SystemColors.Info;
-            this.trackBar.Location = new System.Drawing.Point(555, -10);
-            this.trackBar.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.trackBar.Location = new System.Drawing.Point(666, -12);
+            this.trackBar.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.trackBar.Maximum = 18;
             this.trackBar.Minimum = 2;
             this.trackBar.Name = "trackBar";
             this.trackBar.Orientation = System.Windows.Forms.Orientation.Vertical;
-            this.trackBar.Size = new System.Drawing.Size(56, 188);
+            this.trackBar.Size = new System.Drawing.Size(69, 226);
             this.trackBar.TabIndex = 25;
             this.trackBar.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
             this.trackBar.Value = 2;
@@ -529,10 +529,10 @@ private void InitializeComponent()
             // FindAdressBtn
             // 
             this.FindAdressBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.FindAdressBtn.Location = new System.Drawing.Point(346, 398);
-            this.FindAdressBtn.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.FindAdressBtn.Location = new System.Drawing.Point(415, 472);
+            this.FindAdressBtn.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.FindAdressBtn.Name = "FindAdressBtn";
-            this.FindAdressBtn.Size = new System.Drawing.Size(125, 38);
+            this.FindAdressBtn.Size = new System.Drawing.Size(150, 46);
             this.FindAdressBtn.TabIndex = 25;
             this.FindAdressBtn.Text = "Find Location";
             this.FindAdressBtn.UseVisualStyleBackColor = true;
@@ -541,10 +541,10 @@ private void InitializeComponent()
             // ResetLocationBtn
             // 
             this.ResetLocationBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.ResetLocationBtn.Location = new System.Drawing.Point(478, 398);
-            this.ResetLocationBtn.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.ResetLocationBtn.Location = new System.Drawing.Point(574, 472);
+            this.ResetLocationBtn.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.ResetLocationBtn.Name = "ResetLocationBtn";
-            this.ResetLocationBtn.Size = new System.Drawing.Size(125, 38);
+            this.ResetLocationBtn.Size = new System.Drawing.Size(150, 46);
             this.ResetLocationBtn.TabIndex = 26;
             this.ResetLocationBtn.Text = "Reset Location";
             this.ResetLocationBtn.UseVisualStyleBackColor = true;
@@ -561,7 +561,7 @@ private void InitializeComponent()
             this.gMapCtrl.HelperLineOption = GMap.NET.WindowsForms.HelperLineOptions.DontShow;
             this.gMapCtrl.LevelsKeepInMemmory = 5;
             this.gMapCtrl.Location = new System.Drawing.Point(2, 2);
-            this.gMapCtrl.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.gMapCtrl.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.gMapCtrl.MarkersEnabled = true;
             this.gMapCtrl.MaxZoom = 18;
             this.gMapCtrl.MinZoom = 2;
@@ -575,7 +575,7 @@ private void InitializeComponent()
             this.gMapCtrl.ScaleMode = GMap.NET.WindowsForms.ScaleModes.Integer;
             this.gMapCtrl.SelectedAreaFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(65)))), ((int)(((byte)(105)))), ((int)(((byte)(225)))));
             this.gMapCtrl.ShowTileGridLines = false;
-            this.gMapCtrl.Size = new System.Drawing.Size(600, 441);
+            this.gMapCtrl.Size = new System.Drawing.Size(722, 532);
             this.gMapCtrl.TabIndex = 22;
             this.gMapCtrl.Zoom = 0D;
             this.gMapCtrl.OnMapZoomChanged += new GMap.NET.MapZoomChanged(this.GMapCtrl_OnMapZoomChanged);
@@ -614,11 +614,11 @@ private void InitializeComponent()
             this.tabDevice.Controls.Add(this.label16);
             this.tabDevice.Controls.Add(this.AndroidBootloaderTb);
             this.tabDevice.Controls.Add(this.label17);
-            this.tabDevice.Location = new System.Drawing.Point(4, 29);
+            this.tabDevice.Location = new System.Drawing.Point(4, 34);
             this.tabDevice.Margin = new System.Windows.Forms.Padding(2);
             this.tabDevice.Name = "tabDevice";
             this.tabDevice.Padding = new System.Windows.Forms.Padding(2);
-            this.tabDevice.Size = new System.Drawing.Size(604, 445);
+            this.tabDevice.Size = new System.Drawing.Size(726, 536);
             this.tabDevice.TabIndex = 1;
             this.tabDevice.Text = "Device";
             // 
@@ -626,10 +626,10 @@ private void InitializeComponent()
             // 
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.label18.Location = new System.Drawing.Point(8, 16);
+            this.label18.Location = new System.Drawing.Point(10, 19);
             this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(577, 20);
+            this.label18.Size = new System.Drawing.Size(696, 25);
             this.label18.TabIndex = 71;
             this.label18.Text = "PokemonGo.RocketAPI (FeroxRev Credits) emulates only iOS android is not supported" +
     ".";
@@ -640,11 +640,11 @@ private void InitializeComponent()
             this.groupBox20.Controls.Add(this.label13);
             this.groupBox20.Controls.Add(this.label14);
             this.groupBox20.Controls.Add(this.FirmwareFingerprintTb);
-            this.groupBox20.Location = new System.Drawing.Point(302, 232);
+            this.groupBox20.Location = new System.Drawing.Point(362, 278);
             this.groupBox20.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox20.Name = "groupBox20";
             this.groupBox20.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox20.Size = new System.Drawing.Size(282, 95);
+            this.groupBox20.Size = new System.Drawing.Size(338, 114);
             this.groupBox20.TabIndex = 70;
             this.groupBox20.TabStop = false;
             this.groupBox20.Text = "Firmware";
@@ -654,10 +654,10 @@ private void InitializeComponent()
             this.FirmwareTypeTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.FirmwareTypeTb.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.FirmwareTypeTb.Location = new System.Drawing.Point(52, 25);
-            this.FirmwareTypeTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.FirmwareTypeTb.Location = new System.Drawing.Point(62, 30);
+            this.FirmwareTypeTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.FirmwareTypeTb.Name = "FirmwareTypeTb";
-            this.FirmwareTypeTb.Size = new System.Drawing.Size(214, 27);
+            this.FirmwareTypeTb.Size = new System.Drawing.Size(256, 31);
             this.FirmwareTypeTb.TabIndex = 58;
             // 
             // label13
@@ -665,10 +665,10 @@ private void InitializeComponent()
             this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.label13.Location = new System.Drawing.Point(8, 30);
+            this.label13.Location = new System.Drawing.Point(10, 36);
             this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(40, 20);
+            this.label13.Size = new System.Drawing.Size(49, 25);
             this.label13.TabIndex = 51;
             this.label13.Text = "Type";
             // 
@@ -677,10 +677,10 @@ private void InitializeComponent()
             this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.label14.Location = new System.Drawing.Point(8, 62);
+            this.label14.Location = new System.Drawing.Point(10, 74);
             this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(81, 20);
+            this.label14.Size = new System.Drawing.Size(98, 25);
             this.label14.TabIndex = 49;
             this.label14.Text = "Fingerprint";
             // 
@@ -689,20 +689,20 @@ private void InitializeComponent()
             this.FirmwareFingerprintTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.FirmwareFingerprintTb.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.FirmwareFingerprintTb.Location = new System.Drawing.Point(92, 58);
-            this.FirmwareFingerprintTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.FirmwareFingerprintTb.Location = new System.Drawing.Point(110, 70);
+            this.FirmwareFingerprintTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.FirmwareFingerprintTb.Name = "FirmwareFingerprintTb";
-            this.FirmwareFingerprintTb.Size = new System.Drawing.Size(176, 27);
+            this.FirmwareFingerprintTb.Size = new System.Drawing.Size(210, 31);
             this.FirmwareFingerprintTb.TabIndex = 62;
             // 
             // label22
             // 
             this.label22.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label22.AutoSize = true;
-            this.label22.Location = new System.Drawing.Point(310, 352);
+            this.label22.Location = new System.Drawing.Point(372, 422);
             this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(283, 80);
+            this.label22.Size = new System.Drawing.Size(344, 100);
             this.label22.TabIndex = 69;
             this.label22.Text = "This setting change what the server\r\nthink you are using to play Pokémon GO. \r\nIt" +
     "s a good idea to change your device to \r\nwhat phone you are using to prevent ban" +
@@ -712,10 +712,10 @@ private void InitializeComponent()
             // 
             this.RandomDeviceBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.RandomDeviceBtn.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.RandomDeviceBtn.Location = new System.Drawing.Point(186, 352);
-            this.RandomDeviceBtn.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.RandomDeviceBtn.Location = new System.Drawing.Point(223, 422);
+            this.RandomDeviceBtn.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.RandomDeviceBtn.Name = "RandomDeviceBtn";
-            this.RandomDeviceBtn.Size = new System.Drawing.Size(108, 75);
+            this.RandomDeviceBtn.Size = new System.Drawing.Size(130, 90);
             this.RandomDeviceBtn.TabIndex = 64;
             this.RandomDeviceBtn.Text = "I am feeling RICH (Randomize)";
             this.RandomDeviceBtn.UseVisualStyleBackColor = true;
@@ -727,10 +727,10 @@ private void InitializeComponent()
             this.label20.AutoSize = true;
             this.label20.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold);
             this.label20.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.label20.Location = new System.Drawing.Point(8, 325);
+            this.label20.Location = new System.Drawing.Point(10, 390);
             this.label20.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(85, 20);
+            this.label20.Size = new System.Drawing.Size(104, 25);
             this.label20.TabIndex = 67;
             this.label20.Text = "Important:";
             // 
@@ -738,10 +738,10 @@ private void InitializeComponent()
             // 
             this.label21.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label21.AutoSize = true;
-            this.label21.Location = new System.Drawing.Point(8, 352);
+            this.label21.Location = new System.Drawing.Point(10, 422);
             this.label21.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(165, 80);
+            this.label21.Size = new System.Drawing.Size(202, 100);
             this.label21.TabIndex = 66;
             this.label21.Text = "For your account safety.\r\nPlease do not change\r\nyour device infomation\r\ntoo often" +
     ".\r\n";
@@ -749,19 +749,19 @@ private void InitializeComponent()
             // deviceIdlb
             // 
             this.deviceIdlb.AutoSize = true;
-            this.deviceIdlb.Location = new System.Drawing.Point(8, 52);
+            this.deviceIdlb.Location = new System.Drawing.Point(10, 62);
             this.deviceIdlb.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.deviceIdlb.Name = "deviceIdlb";
-            this.deviceIdlb.Size = new System.Drawing.Size(73, 20);
+            this.deviceIdlb.Size = new System.Drawing.Size(87, 25);
             this.deviceIdlb.TabIndex = 45;
             this.deviceIdlb.Text = "Device ID";
             // 
             // RandomIDBtn
             // 
-            this.RandomIDBtn.Location = new System.Drawing.Point(82, 48);
-            this.RandomIDBtn.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.RandomIDBtn.Location = new System.Drawing.Point(98, 58);
+            this.RandomIDBtn.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.RandomIDBtn.Name = "RandomIDBtn";
-            this.RandomIDBtn.Size = new System.Drawing.Size(100, 28);
+            this.RandomIDBtn.Size = new System.Drawing.Size(120, 34);
             this.RandomIDBtn.TabIndex = 65;
             this.RandomIDBtn.Text = "Get New ID";
             this.RandomIDBtn.UseVisualStyleBackColor = true;
@@ -771,20 +771,20 @@ private void InitializeComponent()
             // 
             this.DeviceIdTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.DeviceIdTb.Location = new System.Drawing.Point(188, 48);
-            this.DeviceIdTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.DeviceIdTb.Location = new System.Drawing.Point(226, 58);
+            this.DeviceIdTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.DeviceIdTb.Name = "DeviceIdTb";
-            this.DeviceIdTb.Size = new System.Drawing.Size(106, 27);
+            this.DeviceIdTb.Size = new System.Drawing.Size(126, 31);
             this.DeviceIdTb.TabIndex = 38;
             // 
             // BoardName
             // 
             this.BoardName.AutoSize = true;
             this.BoardName.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.BoardName.Location = new System.Drawing.Point(8, 82);
+            this.BoardName.Location = new System.Drawing.Point(10, 98);
             this.BoardName.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.BoardName.Name = "BoardName";
-            this.BoardName.Size = new System.Drawing.Size(151, 20);
+            this.BoardName.Size = new System.Drawing.Size(181, 25);
             this.BoardName.TabIndex = 39;
             this.BoardName.Text = "Android Board Name";
             // 
@@ -792,29 +792,29 @@ private void InitializeComponent()
             // 
             this.AndroidBoardNameTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.AndroidBoardNameTb.Location = new System.Drawing.Point(188, 78);
-            this.AndroidBoardNameTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.AndroidBoardNameTb.Location = new System.Drawing.Point(226, 94);
+            this.AndroidBoardNameTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.AndroidBoardNameTb.Name = "AndroidBoardNameTb";
-            this.AndroidBoardNameTb.Size = new System.Drawing.Size(106, 27);
+            this.AndroidBoardNameTb.Size = new System.Drawing.Size(126, 31);
             this.AndroidBoardNameTb.TabIndex = 61;
             // 
             // FirmwareBrandTb
             // 
             this.FirmwareBrandTb.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.FirmwareBrandTb.Location = new System.Drawing.Point(275, 448);
-            this.FirmwareBrandTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.FirmwareBrandTb.Location = new System.Drawing.Point(330, 538);
+            this.FirmwareBrandTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.FirmwareBrandTb.Name = "FirmwareBrandTb";
-            this.FirmwareBrandTb.Size = new System.Drawing.Size(299, 27);
+            this.FirmwareBrandTb.Size = new System.Drawing.Size(358, 31);
             this.FirmwareBrandTb.TabIndex = 52;
             // 
             // label9
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.label9.Location = new System.Drawing.Point(8, 270);
+            this.label9.Location = new System.Drawing.Point(10, 324);
             this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(170, 20);
+            this.label9.Size = new System.Drawing.Size(203, 25);
             this.label9.TabIndex = 47;
             this.label9.Text = "Hardware Manu facturer";
             // 
@@ -822,10 +822,10 @@ private void InitializeComponent()
             // 
             this.label11.AutoSize = true;
             this.label11.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.label11.Location = new System.Drawing.Point(8, 450);
+            this.label11.Location = new System.Drawing.Point(10, 540);
             this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(113, 20);
+            this.label11.Size = new System.Drawing.Size(135, 25);
             this.label11.TabIndex = 48;
             this.label11.Text = "Firmware Brand";
             // 
@@ -834,10 +834,10 @@ private void InitializeComponent()
             this.HardwareManufacturerTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.HardwareManufacturerTb.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.HardwareManufacturerTb.Location = new System.Drawing.Point(188, 265);
-            this.HardwareManufacturerTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.HardwareManufacturerTb.Location = new System.Drawing.Point(226, 318);
+            this.HardwareManufacturerTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.HardwareManufacturerTb.Name = "HardwareManufacturerTb";
-            this.HardwareManufacturerTb.Size = new System.Drawing.Size(106, 27);
+            this.HardwareManufacturerTb.Size = new System.Drawing.Size(126, 31);
             this.HardwareManufacturerTb.TabIndex = 60;
             // 
             // HardwareModelTb
@@ -845,20 +845,20 @@ private void InitializeComponent()
             this.HardwareModelTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.HardwareModelTb.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.HardwareModelTb.Location = new System.Drawing.Point(188, 298);
-            this.HardwareModelTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.HardwareModelTb.Location = new System.Drawing.Point(226, 358);
+            this.HardwareModelTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.HardwareModelTb.Name = "HardwareModelTb";
-            this.HardwareModelTb.Size = new System.Drawing.Size(106, 27);
+            this.HardwareModelTb.Size = new System.Drawing.Size(126, 31);
             this.HardwareModelTb.TabIndex = 56;
             // 
             // label10
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.label10.Location = new System.Drawing.Point(8, 302);
+            this.label10.Location = new System.Drawing.Point(10, 362);
             this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(121, 20);
+            this.label10.Size = new System.Drawing.Size(144, 25);
             this.label10.TabIndex = 46;
             this.label10.Text = "Hardware Model";
             // 
@@ -867,20 +867,20 @@ private void InitializeComponent()
             this.DeviceModelBootTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.DeviceModelBootTb.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.DeviceModelBootTb.Location = new System.Drawing.Point(188, 232);
-            this.DeviceModelBootTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.DeviceModelBootTb.Location = new System.Drawing.Point(226, 278);
+            this.DeviceModelBootTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.DeviceModelBootTb.Name = "DeviceModelBootTb";
-            this.DeviceModelBootTb.Size = new System.Drawing.Size(106, 27);
+            this.DeviceModelBootTb.Size = new System.Drawing.Size(126, 31);
             this.DeviceModelBootTb.TabIndex = 63;
             // 
             // label8
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.label8.Location = new System.Drawing.Point(8, 238);
+            this.label8.Location = new System.Drawing.Point(10, 286);
             this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(137, 20);
+            this.label8.Size = new System.Drawing.Size(163, 25);
             this.label8.TabIndex = 44;
             this.label8.Text = "Device Model Boot";
             // 
@@ -888,10 +888,10 @@ private void InitializeComponent()
             // 
             this.label12.AutoSize = true;
             this.label12.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.label12.Location = new System.Drawing.Point(8, 492);
+            this.label12.Location = new System.Drawing.Point(10, 590);
             this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(103, 20);
+            this.label12.Size = new System.Drawing.Size(124, 25);
             this.label12.TabIndex = 50;
             this.label12.Text = "Firmware Tags";
             // 
@@ -900,29 +900,29 @@ private void InitializeComponent()
             this.DeviceModelIdentifierTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.DeviceModelIdentifierTb.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.DeviceModelIdentifierTb.Location = new System.Drawing.Point(188, 202);
-            this.DeviceModelIdentifierTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.DeviceModelIdentifierTb.Location = new System.Drawing.Point(226, 242);
+            this.DeviceModelIdentifierTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.DeviceModelIdentifierTb.Name = "DeviceModelIdentifierTb";
-            this.DeviceModelIdentifierTb.Size = new System.Drawing.Size(106, 27);
+            this.DeviceModelIdentifierTb.Size = new System.Drawing.Size(126, 31);
             this.DeviceModelIdentifierTb.TabIndex = 53;
             // 
             // FirmwareTagsTb
             // 
             this.FirmwareTagsTb.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.FirmwareTagsTb.Location = new System.Drawing.Point(275, 490);
-            this.FirmwareTagsTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.FirmwareTagsTb.Location = new System.Drawing.Point(330, 588);
+            this.FirmwareTagsTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.FirmwareTagsTb.Name = "FirmwareTagsTb";
-            this.FirmwareTagsTb.Size = new System.Drawing.Size(299, 27);
+            this.FirmwareTagsTb.Size = new System.Drawing.Size(358, 31);
             this.FirmwareTagsTb.TabIndex = 54;
             // 
             // label7
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.label7.Location = new System.Drawing.Point(8, 208);
+            this.label7.Location = new System.Drawing.Point(10, 250);
             this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(165, 20);
+            this.label7.Size = new System.Drawing.Size(195, 25);
             this.label7.TabIndex = 43;
             this.label7.Text = "Device Model Identifier";
             // 
@@ -931,20 +931,20 @@ private void InitializeComponent()
             this.DeviceModelTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.DeviceModelTb.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.DeviceModelTb.Location = new System.Drawing.Point(188, 172);
-            this.DeviceModelTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.DeviceModelTb.Location = new System.Drawing.Point(226, 206);
+            this.DeviceModelTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.DeviceModelTb.Name = "DeviceModelTb";
-            this.DeviceModelTb.Size = new System.Drawing.Size(106, 27);
+            this.DeviceModelTb.Size = new System.Drawing.Size(126, 31);
             this.DeviceModelTb.TabIndex = 55;
             // 
             // label15
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.label15.Location = new System.Drawing.Point(8, 178);
+            this.label15.Location = new System.Drawing.Point(10, 214);
             this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(101, 20);
+            this.label15.Size = new System.Drawing.Size(120, 25);
             this.label15.TabIndex = 42;
             this.label15.Text = "Device Model";
             // 
@@ -953,20 +953,20 @@ private void InitializeComponent()
             this.DeviceBrandTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.DeviceBrandTb.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.DeviceBrandTb.Location = new System.Drawing.Point(188, 140);
-            this.DeviceBrandTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.DeviceBrandTb.Location = new System.Drawing.Point(226, 168);
+            this.DeviceBrandTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.DeviceBrandTb.Name = "DeviceBrandTb";
-            this.DeviceBrandTb.Size = new System.Drawing.Size(106, 27);
+            this.DeviceBrandTb.Size = new System.Drawing.Size(126, 31);
             this.DeviceBrandTb.TabIndex = 57;
             // 
             // label16
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.label16.Location = new System.Drawing.Point(8, 145);
+            this.label16.Location = new System.Drawing.Point(10, 174);
             this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(97, 20);
+            this.label16.Size = new System.Drawing.Size(115, 25);
             this.label16.TabIndex = 41;
             this.label16.Text = "Device Brand";
             // 
@@ -974,20 +974,20 @@ private void InitializeComponent()
             // 
             this.AndroidBootloaderTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.AndroidBootloaderTb.Location = new System.Drawing.Point(188, 108);
-            this.AndroidBootloaderTb.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.AndroidBootloaderTb.Location = new System.Drawing.Point(226, 130);
+            this.AndroidBootloaderTb.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.AndroidBootloaderTb.Name = "AndroidBootloaderTb";
-            this.AndroidBootloaderTb.Size = new System.Drawing.Size(106, 27);
+            this.AndroidBootloaderTb.Size = new System.Drawing.Size(126, 31);
             this.AndroidBootloaderTb.TabIndex = 59;
             // 
             // label17
             // 
             this.label17.AutoSize = true;
             this.label17.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.label17.Location = new System.Drawing.Point(8, 112);
+            this.label17.Location = new System.Drawing.Point(10, 134);
             this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(146, 20);
+            this.label17.Size = new System.Drawing.Size(175, 25);
             this.label17.TabIndex = 40;
             this.label17.Text = "Android Boot loader";
             // 
@@ -1004,11 +1004,11 @@ private void InitializeComponent()
             this.tabAPIConfig.Controls.Add(this.tbAuthAPIKey);
             this.tabAPIConfig.Controls.Add(this.label67);
             this.tabAPIConfig.Controls.Add(this.cbUsePogoDevAPI);
-            this.tabAPIConfig.Location = new System.Drawing.Point(4, 29);
+            this.tabAPIConfig.Location = new System.Drawing.Point(4, 34);
             this.tabAPIConfig.Margin = new System.Windows.Forms.Padding(2);
             this.tabAPIConfig.Name = "tabAPIConfig";
             this.tabAPIConfig.Padding = new System.Windows.Forms.Padding(2);
-            this.tabAPIConfig.Size = new System.Drawing.Size(604, 445);
+            this.tabAPIConfig.Size = new System.Drawing.Size(726, 536);
             this.tabAPIConfig.TabIndex = 2;
             this.tabAPIConfig.Text = "APIConfig";
             // 
@@ -1016,10 +1016,10 @@ private void InitializeComponent()
             // 
             this.tbHashURL.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbHashURL.Location = new System.Drawing.Point(109, 111);
+            this.tbHashURL.Location = new System.Drawing.Point(131, 143);
             this.tbHashURL.Margin = new System.Windows.Forms.Padding(2);
             this.tbHashURL.Name = "tbHashURL";
-            this.tbHashURL.Size = new System.Drawing.Size(186, 27);
+            this.tbHashURL.Size = new System.Drawing.Size(222, 31);
             this.tbHashURL.TabIndex = 44;
             // 
             // label74
@@ -1027,10 +1027,10 @@ private void InitializeComponent()
             this.label74.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.label74.AutoSize = true;
-            this.label74.Location = new System.Drawing.Point(4, 114);
+            this.label74.Location = new System.Drawing.Point(5, 147);
             this.label74.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label74.Name = "label74";
-            this.label74.Size = new System.Drawing.Size(75, 20);
+            this.label74.Size = new System.Drawing.Size(92, 25);
             this.label74.TabIndex = 43;
             this.label74.Text = "Hash URL:";
             // 
@@ -1038,10 +1038,10 @@ private void InitializeComponent()
             // 
             this.tbPushBulletAPIKey.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbPushBulletAPIKey.Location = new System.Drawing.Point(109, 173);
+            this.tbPushBulletAPIKey.Location = new System.Drawing.Point(131, 218);
             this.tbPushBulletAPIKey.Margin = new System.Windows.Forms.Padding(2);
             this.tbPushBulletAPIKey.Name = "tbPushBulletAPIKey";
-            this.tbPushBulletAPIKey.Size = new System.Drawing.Size(186, 27);
+            this.tbPushBulletAPIKey.Size = new System.Drawing.Size(222, 31);
             this.tbPushBulletAPIKey.TabIndex = 42;
             // 
             // label68
@@ -1049,20 +1049,20 @@ private void InitializeComponent()
             this.label68.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.label68.AutoSize = true;
-            this.label68.Location = new System.Drawing.Point(4, 176);
+            this.label68.Location = new System.Drawing.Point(5, 221);
             this.label68.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label68.Name = "label68";
-            this.label68.Size = new System.Drawing.Size(83, 20);
+            this.label68.Size = new System.Drawing.Size(101, 25);
             this.label68.TabIndex = 41;
             this.label68.Text = "PB API Key:";
             // 
             // cbEnablePushBulletNotification
             // 
             this.cbEnablePushBulletNotification.AutoSize = true;
-            this.cbEnablePushBulletNotification.Location = new System.Drawing.Point(8, 145);
+            this.cbEnablePushBulletNotification.Location = new System.Drawing.Point(10, 174);
             this.cbEnablePushBulletNotification.Margin = new System.Windows.Forms.Padding(2);
             this.cbEnablePushBulletNotification.Name = "cbEnablePushBulletNotification";
-            this.cbEnablePushBulletNotification.Size = new System.Drawing.Size(231, 24);
+            this.cbEnablePushBulletNotification.Size = new System.Drawing.Size(273, 29);
             this.cbEnablePushBulletNotification.TabIndex = 40;
             this.cbEnablePushBulletNotification.Text = "Enable PushBullet Notification";
             this.cbEnablePushBulletNotification.UseVisualStyleBackColor = true;
@@ -1071,10 +1071,10 @@ private void InitializeComponent()
             // cbDiplayHashServerLog
             // 
             this.cbDiplayHashServerLog.AutoSize = true;
-            this.cbDiplayHashServerLog.Location = new System.Drawing.Point(8, 81);
+            this.cbDiplayHashServerLog.Location = new System.Drawing.Point(10, 97);
             this.cbDiplayHashServerLog.Margin = new System.Windows.Forms.Padding(2);
             this.cbDiplayHashServerLog.Name = "cbDiplayHashServerLog";
-            this.cbDiplayHashServerLog.Size = new System.Drawing.Size(185, 24);
+            this.cbDiplayHashServerLog.Size = new System.Drawing.Size(222, 29);
             this.cbDiplayHashServerLog.TabIndex = 39;
             this.cbDiplayHashServerLog.Text = "Diplay Hash Server Log";
             this.cbDiplayHashServerLog.UseVisualStyleBackColor = true;
@@ -1082,10 +1082,10 @@ private void InitializeComponent()
             // cbUseCustomAPI
             // 
             this.cbUseCustomAPI.AutoSize = true;
-            this.cbUseCustomAPI.Location = new System.Drawing.Point(8, 50);
+            this.cbUseCustomAPI.Location = new System.Drawing.Point(10, 60);
             this.cbUseCustomAPI.Margin = new System.Windows.Forms.Padding(2);
             this.cbUseCustomAPI.Name = "cbUseCustomAPI";
-            this.cbUseCustomAPI.Size = new System.Drawing.Size(135, 24);
+            this.cbUseCustomAPI.Size = new System.Drawing.Size(166, 29);
             this.cbUseCustomAPI.TabIndex = 38;
             this.cbUseCustomAPI.Text = "Use Custom API";
             this.cbUseCustomAPI.UseVisualStyleBackColor = true;
@@ -1095,10 +1095,10 @@ private void InitializeComponent()
             // 
             this.tbAuthAPIKey.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbAuthAPIKey.Location = new System.Drawing.Point(109, 206);
+            this.tbAuthAPIKey.Location = new System.Drawing.Point(131, 257);
             this.tbAuthAPIKey.Margin = new System.Windows.Forms.Padding(2);
             this.tbAuthAPIKey.Name = "tbAuthAPIKey";
-            this.tbAuthAPIKey.Size = new System.Drawing.Size(186, 27);
+            this.tbAuthAPIKey.Size = new System.Drawing.Size(222, 31);
             this.tbAuthAPIKey.TabIndex = 37;
             // 
             // label67
@@ -1106,20 +1106,20 @@ private void InitializeComponent()
             this.label67.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.label67.AutoSize = true;
-            this.label67.Location = new System.Drawing.Point(4, 209);
+            this.label67.Location = new System.Drawing.Point(5, 261);
             this.label67.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label67.Name = "label67";
-            this.label67.Size = new System.Drawing.Size(97, 20);
+            this.label67.Size = new System.Drawing.Size(119, 25);
             this.label67.TabIndex = 36;
             this.label67.Text = "Auth API Key:";
             // 
             // cbUsePogoDevAPI
             // 
             this.cbUsePogoDevAPI.AutoSize = true;
-            this.cbUsePogoDevAPI.Location = new System.Drawing.Point(8, 18);
+            this.cbUsePogoDevAPI.Location = new System.Drawing.Point(10, 22);
             this.cbUsePogoDevAPI.Margin = new System.Windows.Forms.Padding(2);
             this.cbUsePogoDevAPI.Name = "cbUsePogoDevAPI";
-            this.cbUsePogoDevAPI.Size = new System.Drawing.Size(145, 24);
+            this.cbUsePogoDevAPI.Size = new System.Drawing.Size(177, 29);
             this.cbUsePogoDevAPI.TabIndex = 34;
             this.cbUsePogoDevAPI.Text = "Use PogoDev API";
             this.cbUsePogoDevAPI.UseVisualStyleBackColor = true;
@@ -1129,11 +1129,11 @@ private void InitializeComponent()
             // 
             this.tabAccounts.BackColor = System.Drawing.SystemColors.Control;
             this.tabAccounts.Controls.Add(this.lvAccounts);
-            this.tabAccounts.Location = new System.Drawing.Point(4, 29);
+            this.tabAccounts.Location = new System.Drawing.Point(4, 34);
             this.tabAccounts.Margin = new System.Windows.Forms.Padding(2);
             this.tabAccounts.Name = "tabAccounts";
             this.tabAccounts.Padding = new System.Windows.Forms.Padding(2);
-            this.tabAccounts.Size = new System.Drawing.Size(604, 445);
+            this.tabAccounts.Size = new System.Drawing.Size(726, 536);
             this.tabAccounts.TabIndex = 3;
             this.tabAccounts.Text = "Accounts";
             // 
@@ -1150,7 +1150,7 @@ private void InitializeComponent()
             this.lvAccounts.Location = new System.Drawing.Point(2, 2);
             this.lvAccounts.Margin = new System.Windows.Forms.Padding(2);
             this.lvAccounts.Name = "lvAccounts";
-            this.lvAccounts.Size = new System.Drawing.Size(600, 441);
+            this.lvAccounts.Size = new System.Drawing.Size(722, 532);
             this.lvAccounts.TabIndex = 3;
             this.lvAccounts.UseCompatibleStateImageBehavior = false;
             this.lvAccounts.View = System.Windows.Forms.View.Details;
@@ -1175,37 +1175,37 @@ private void InitializeComponent()
             // 
             // GoogleApiBox
             // 
-            this.GoogleApiBox.Location = new System.Drawing.Point(125, 140);
-            this.GoogleApiBox.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.GoogleApiBox.Location = new System.Drawing.Point(150, 168);
+            this.GoogleApiBox.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.GoogleApiBox.Name = "GoogleApiBox";
-            this.GoogleApiBox.Size = new System.Drawing.Size(204, 27);
+            this.GoogleApiBox.Size = new System.Drawing.Size(244, 31);
             this.GoogleApiBox.TabIndex = 33;
             // 
             // GoogleApiLabel
             // 
             this.GoogleApiLabel.AutoSize = true;
-            this.GoogleApiLabel.Location = new System.Drawing.Point(8, 142);
+            this.GoogleApiLabel.Location = new System.Drawing.Point(10, 170);
             this.GoogleApiLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.GoogleApiLabel.Name = "GoogleApiLabel";
-            this.GoogleApiLabel.Size = new System.Drawing.Size(115, 20);
+            this.GoogleApiLabel.Size = new System.Drawing.Size(139, 25);
             this.GoogleApiLabel.TabIndex = 32;
             this.GoogleApiLabel.Text = "Google API Key:";
             // 
             // tbWalkingSpeed
             // 
-            this.tbWalkingSpeed.Location = new System.Drawing.Point(172, 232);
-            this.tbWalkingSpeed.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbWalkingSpeed.Location = new System.Drawing.Point(206, 278);
+            this.tbWalkingSpeed.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbWalkingSpeed.Name = "tbWalkingSpeed";
-            this.tbWalkingSpeed.Size = new System.Drawing.Size(156, 27);
+            this.tbWalkingSpeed.Size = new System.Drawing.Size(186, 31);
             this.tbWalkingSpeed.TabIndex = 30;
             // 
             // TravelSpeedText
             // 
             this.TravelSpeedText.AutoSize = true;
-            this.TravelSpeedText.Location = new System.Drawing.Point(8, 238);
+            this.TravelSpeedText.Location = new System.Drawing.Point(10, 286);
             this.TravelSpeedText.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.TravelSpeedText.Name = "TravelSpeedText";
-            this.TravelSpeedText.Size = new System.Drawing.Size(164, 20);
+            this.TravelSpeedText.Size = new System.Drawing.Size(195, 25);
             this.TravelSpeedText.TabIndex = 31;
             this.TravelSpeedText.Text = "Walking Speed (KM/H):";
             // 
@@ -1213,19 +1213,19 @@ private void InitializeComponent()
             // 
             this.cbLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cbLanguage.FormattingEnabled = true;
-            this.cbLanguage.Location = new System.Drawing.Point(125, 12);
-            this.cbLanguage.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.cbLanguage.Location = new System.Drawing.Point(150, 14);
+            this.cbLanguage.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.cbLanguage.Name = "cbLanguage";
-            this.cbLanguage.Size = new System.Drawing.Size(204, 28);
+            this.cbLanguage.Size = new System.Drawing.Size(244, 33);
             this.cbLanguage.TabIndex = 29;
             // 
             // label26
             // 
             this.label26.AutoSize = true;
-            this.label26.Location = new System.Drawing.Point(8, 18);
+            this.label26.Location = new System.Drawing.Point(10, 22);
             this.label26.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label26.Name = "label26";
-            this.label26.Size = new System.Drawing.Size(77, 20);
+            this.label26.Size = new System.Drawing.Size(93, 25);
             this.label26.TabIndex = 28;
             this.label26.Text = "Language:";
             // 
@@ -1241,11 +1241,11 @@ private void InitializeComponent()
             this.proxyGb.Controls.Add(this.label19);
             this.proxyGb.Controls.Add(this.useProxyCb);
             this.proxyGb.Controls.Add(this.label23);
-            this.proxyGb.Location = new System.Drawing.Point(5, 302);
+            this.proxyGb.Location = new System.Drawing.Point(6, 362);
             this.proxyGb.Margin = new System.Windows.Forms.Padding(2);
             this.proxyGb.Name = "proxyGb";
             this.proxyGb.Padding = new System.Windows.Forms.Padding(2);
-            this.proxyGb.Size = new System.Drawing.Size(332, 168);
+            this.proxyGb.Size = new System.Drawing.Size(398, 202);
             this.proxyGb.TabIndex = 27;
             this.proxyGb.TabStop = false;
             this.proxyGb.Text = "Proxy Setting";
@@ -1254,50 +1254,50 @@ private void InitializeComponent()
             // 
             this.proxyPortTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.proxyPortTb.Location = new System.Drawing.Point(120, 78);
-            this.proxyPortTb.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.proxyPortTb.Location = new System.Drawing.Point(144, 94);
+            this.proxyPortTb.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.proxyPortTb.Name = "proxyPortTb";
-            this.proxyPortTb.Size = new System.Drawing.Size(202, 27);
+            this.proxyPortTb.Size = new System.Drawing.Size(242, 31);
             this.proxyPortTb.TabIndex = 36;
             // 
             // proxyUserTb
             // 
             this.proxyUserTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.proxyUserTb.Location = new System.Drawing.Point(120, 107);
-            this.proxyUserTb.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.proxyUserTb.Location = new System.Drawing.Point(144, 128);
+            this.proxyUserTb.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.proxyUserTb.Name = "proxyUserTb";
-            this.proxyUserTb.Size = new System.Drawing.Size(202, 27);
+            this.proxyUserTb.Size = new System.Drawing.Size(242, 31);
             this.proxyUserTb.TabIndex = 34;
             // 
             // proxyPwTb
             // 
             this.proxyPwTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.proxyPwTb.Location = new System.Drawing.Point(120, 137);
-            this.proxyPwTb.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.proxyPwTb.Location = new System.Drawing.Point(144, 164);
+            this.proxyPwTb.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.proxyPwTb.Name = "proxyPwTb";
             this.proxyPwTb.PasswordChar = '*';
-            this.proxyPwTb.Size = new System.Drawing.Size(202, 27);
+            this.proxyPwTb.Size = new System.Drawing.Size(242, 31);
             this.proxyPwTb.TabIndex = 35;
             // 
             // label24
             // 
             this.label24.AutoSize = true;
-            this.label24.Location = new System.Drawing.Point(4, 110);
+            this.label24.Location = new System.Drawing.Point(5, 132);
             this.label24.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(78, 20);
+            this.label24.Size = new System.Drawing.Size(95, 25);
             this.label24.TabIndex = 32;
             this.label24.Text = "Username:";
             // 
             // label25
             // 
             this.label25.AutoSize = true;
-            this.label25.Location = new System.Drawing.Point(3, 140);
+            this.label25.Location = new System.Drawing.Point(4, 168);
             this.label25.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(73, 20);
+            this.label25.Size = new System.Drawing.Size(91, 25);
             this.label25.TabIndex = 33;
             this.label25.Text = "Password:";
             // 
@@ -1305,19 +1305,19 @@ private void InitializeComponent()
             // 
             this.proxyHostTb.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.proxyHostTb.Location = new System.Drawing.Point(120, 48);
-            this.proxyHostTb.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.proxyHostTb.Location = new System.Drawing.Point(144, 58);
+            this.proxyHostTb.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.proxyHostTb.Name = "proxyHostTb";
-            this.proxyHostTb.Size = new System.Drawing.Size(202, 27);
+            this.proxyHostTb.Size = new System.Drawing.Size(242, 31);
             this.proxyHostTb.TabIndex = 30;
             // 
             // useProxyAuthCb
             // 
             this.useProxyAuthCb.AutoSize = true;
-            this.useProxyAuthCb.Location = new System.Drawing.Point(120, 25);
+            this.useProxyAuthCb.Location = new System.Drawing.Point(144, 30);
             this.useProxyAuthCb.Margin = new System.Windows.Forms.Padding(2);
             this.useProxyAuthCb.Name = "useProxyAuthCb";
-            this.useProxyAuthCb.Size = new System.Drawing.Size(196, 24);
+            this.useProxyAuthCb.Size = new System.Drawing.Size(236, 29);
             this.useProxyAuthCb.TabIndex = 29;
             this.useProxyAuthCb.Text = "Use Proxy Authentication";
             this.useProxyAuthCb.UseVisualStyleBackColor = true;
@@ -1326,20 +1326,20 @@ private void InitializeComponent()
             // label19
             // 
             this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(5, 55);
+            this.label19.Location = new System.Drawing.Point(6, 66);
             this.label19.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(43, 20);
+            this.label19.Size = new System.Drawing.Size(54, 25);
             this.label19.TabIndex = 28;
             this.label19.Text = "Host:";
             // 
             // useProxyCb
             // 
             this.useProxyCb.AutoSize = true;
-            this.useProxyCb.Location = new System.Drawing.Point(8, 25);
+            this.useProxyCb.Location = new System.Drawing.Point(10, 30);
             this.useProxyCb.Margin = new System.Windows.Forms.Padding(2);
             this.useProxyCb.Name = "useProxyCb";
-            this.useProxyCb.Size = new System.Drawing.Size(95, 24);
+            this.useProxyCb.Size = new System.Drawing.Size(116, 29);
             this.useProxyCb.TabIndex = 30;
             this.useProxyCb.Text = "Use Proxy\r\n";
             this.useProxyCb.UseVisualStyleBackColor = true;
@@ -1348,65 +1348,65 @@ private void InitializeComponent()
             // label23
             // 
             this.label23.AutoSize = true;
-            this.label23.Location = new System.Drawing.Point(5, 81);
+            this.label23.Location = new System.Drawing.Point(6, 97);
             this.label23.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label23.Name = "label23";
-            this.label23.Size = new System.Drawing.Size(38, 20);
+            this.label23.Size = new System.Drawing.Size(48, 25);
             this.label23.TabIndex = 29;
             this.label23.Text = "Port:";
             // 
             // UserLoginBox
             // 
-            this.UserLoginBox.Location = new System.Drawing.Point(125, 78);
-            this.UserLoginBox.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.UserLoginBox.Location = new System.Drawing.Point(150, 94);
+            this.UserLoginBox.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.UserLoginBox.Name = "UserLoginBox";
-            this.UserLoginBox.Size = new System.Drawing.Size(204, 27);
+            this.UserLoginBox.Size = new System.Drawing.Size(244, 31);
             this.UserLoginBox.TabIndex = 11;
             // 
             // UserPasswordBox
             // 
-            this.UserPasswordBox.Location = new System.Drawing.Point(125, 108);
-            this.UserPasswordBox.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.UserPasswordBox.Location = new System.Drawing.Point(150, 130);
+            this.UserPasswordBox.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.UserPasswordBox.Name = "UserPasswordBox";
             this.UserPasswordBox.PasswordChar = '*';
-            this.UserPasswordBox.Size = new System.Drawing.Size(204, 27);
+            this.UserPasswordBox.Size = new System.Drawing.Size(244, 31);
             this.UserPasswordBox.TabIndex = 12;
             // 
             // tbLatitude
             // 
-            this.tbLatitude.Location = new System.Drawing.Point(125, 172);
-            this.tbLatitude.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbLatitude.Location = new System.Drawing.Point(150, 206);
+            this.tbLatitude.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbLatitude.Name = "tbLatitude";
-            this.tbLatitude.Size = new System.Drawing.Size(204, 27);
+            this.tbLatitude.Size = new System.Drawing.Size(244, 31);
             this.tbLatitude.TabIndex = 13;
             this.tbLatitude.Leave += new System.EventHandler(this.LatitudeText_Leave);
             // 
             // tbLongitude
             // 
-            this.tbLongitude.Location = new System.Drawing.Point(125, 202);
-            this.tbLongitude.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbLongitude.Location = new System.Drawing.Point(150, 242);
+            this.tbLongitude.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbLongitude.Name = "tbLongitude";
-            this.tbLongitude.Size = new System.Drawing.Size(204, 27);
+            this.tbLongitude.Size = new System.Drawing.Size(244, 31);
             this.tbLongitude.TabIndex = 14;
             this.tbLongitude.Leave += new System.EventHandler(this.LongitudeText_Leave);
             // 
             // authTypeLabel
             // 
             this.authTypeLabel.AutoSize = true;
-            this.authTypeLabel.Location = new System.Drawing.Point(8, 48);
+            this.authTypeLabel.Location = new System.Drawing.Point(10, 58);
             this.authTypeLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.authTypeLabel.Name = "authTypeLabel";
-            this.authTypeLabel.Size = new System.Drawing.Size(84, 20);
+            this.authTypeLabel.Size = new System.Drawing.Size(102, 25);
             this.authTypeLabel.TabIndex = 0;
             this.authTypeLabel.Text = "Login Type:";
             // 
             // longiLabel
             // 
             this.longiLabel.AutoSize = true;
-            this.longiLabel.Location = new System.Drawing.Point(8, 205);
+            this.longiLabel.Location = new System.Drawing.Point(10, 246);
             this.longiLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.longiLabel.Name = "longiLabel";
-            this.longiLabel.Size = new System.Drawing.Size(79, 20);
+            this.longiLabel.Size = new System.Drawing.Size(96, 25);
             this.longiLabel.TabIndex = 5;
             this.longiLabel.Text = "Longitude:";
             // 
@@ -1417,39 +1417,39 @@ private void InitializeComponent()
             this.authTypeCb.Items.AddRange(new object[] {
             "Google",
             "PTC"});
-            this.authTypeCb.Location = new System.Drawing.Point(125, 45);
-            this.authTypeCb.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.authTypeCb.Location = new System.Drawing.Point(150, 54);
+            this.authTypeCb.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.authTypeCb.Name = "authTypeCb";
-            this.authTypeCb.Size = new System.Drawing.Size(204, 28);
+            this.authTypeCb.Size = new System.Drawing.Size(244, 33);
             this.authTypeCb.TabIndex = 1;
             // 
             // latLabel
             // 
             this.latLabel.AutoSize = true;
-            this.latLabel.Location = new System.Drawing.Point(8, 172);
+            this.latLabel.Location = new System.Drawing.Point(10, 206);
             this.latLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.latLabel.Name = "latLabel";
-            this.latLabel.Size = new System.Drawing.Size(66, 20);
+            this.latLabel.Size = new System.Drawing.Size(79, 25);
             this.latLabel.TabIndex = 4;
             this.latLabel.Text = "Latitude:";
             // 
             // UserLabel
             // 
             this.UserLabel.AutoSize = true;
-            this.UserLabel.Location = new System.Drawing.Point(8, 80);
+            this.UserLabel.Location = new System.Drawing.Point(10, 96);
             this.UserLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.UserLabel.Name = "UserLabel";
-            this.UserLabel.Size = new System.Drawing.Size(78, 20);
+            this.UserLabel.Size = new System.Drawing.Size(95, 25);
             this.UserLabel.TabIndex = 2;
             this.UserLabel.Text = "Username:";
             // 
             // PasswordLabel
             // 
             this.PasswordLabel.AutoSize = true;
-            this.PasswordLabel.Location = new System.Drawing.Point(8, 112);
+            this.PasswordLabel.Location = new System.Drawing.Point(10, 134);
             this.PasswordLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.PasswordLabel.Name = "PasswordLabel";
-            this.PasswordLabel.Size = new System.Drawing.Size(73, 20);
+            this.PasswordLabel.Size = new System.Drawing.Size(91, 25);
             this.PasswordLabel.TabIndex = 3;
             this.PasswordLabel.Text = "Password:";
             // 
@@ -1457,10 +1457,10 @@ private void InitializeComponent()
             // 
             this.tabPokemon.BackColor = System.Drawing.SystemColors.Control;
             this.tabPokemon.Controls.Add(this.tcPokemonDetail);
-            this.tabPokemon.Location = new System.Drawing.Point(4, 29);
+            this.tabPokemon.Location = new System.Drawing.Point(4, 34);
             this.tabPokemon.Margin = new System.Windows.Forms.Padding(2);
             this.tabPokemon.Name = "tabPokemon";
-            this.tabPokemon.Size = new System.Drawing.Size(954, 485);
+            this.tabPokemon.Size = new System.Drawing.Size(1146, 584);
             this.tabPokemon.TabIndex = 3;
             this.tabPokemon.Text = "Pokemon";
             // 
@@ -1476,7 +1476,7 @@ private void InitializeComponent()
             this.tcPokemonDetail.Margin = new System.Windows.Forms.Padding(2);
             this.tcPokemonDetail.Name = "tcPokemonDetail";
             this.tcPokemonDetail.SelectedIndex = 0;
-            this.tcPokemonDetail.Size = new System.Drawing.Size(954, 485);
+            this.tcPokemonDetail.Size = new System.Drawing.Size(1146, 584);
             this.tcPokemonDetail.TabIndex = 5;
             // 
             // tabCatch
@@ -1489,11 +1489,11 @@ private void InitializeComponent()
             this.tabCatch.Controls.Add(this.cbUseEggIncubators);
             this.tabCatch.Controls.Add(this.cbCatchPoke);
             this.tabCatch.Controls.Add(this.gbCatchPokemon);
-            this.tabCatch.Location = new System.Drawing.Point(4, 29);
+            this.tabCatch.Location = new System.Drawing.Point(4, 34);
             this.tabCatch.Margin = new System.Windows.Forms.Padding(2);
             this.tabCatch.Name = "tabCatch";
             this.tabCatch.Padding = new System.Windows.Forms.Padding(2);
-            this.tabCatch.Size = new System.Drawing.Size(946, 452);
+            this.tabCatch.Size = new System.Drawing.Size(1138, 546);
             this.tabCatch.TabIndex = 0;
             this.tabCatch.Text = "Catch";
             // 
@@ -1501,10 +1501,10 @@ private void InitializeComponent()
             // 
             this.cbUseLimitedEggIncubators.AutoSize = true;
             this.cbUseLimitedEggIncubators.Enabled = false;
-            this.cbUseLimitedEggIncubators.Location = new System.Drawing.Point(158, 8);
+            this.cbUseLimitedEggIncubators.Location = new System.Drawing.Point(190, 6);
             this.cbUseLimitedEggIncubators.Margin = new System.Windows.Forms.Padding(2);
             this.cbUseLimitedEggIncubators.Name = "cbUseLimitedEggIncubators";
-            this.cbUseLimitedEggIncubators.Size = new System.Drawing.Size(153, 24);
+            this.cbUseLimitedEggIncubators.Size = new System.Drawing.Size(186, 29);
             this.cbUseLimitedEggIncubators.TabIndex = 20;
             this.cbUseLimitedEggIncubators.Text = "Use Ltd Incubators";
             this.cbUseLimitedEggIncubators.UseVisualStyleBackColor = true;
@@ -1518,11 +1518,11 @@ private void InitializeComponent()
             this.groupBox10.Controls.Add(this.tbUseBerriesMinIv);
             this.groupBox10.Controls.Add(this.label56);
             this.groupBox10.Controls.Add(this.tbUseBerriesBelowCatchProbability);
-            this.groupBox10.Location = new System.Drawing.Point(12, 244);
+            this.groupBox10.Location = new System.Drawing.Point(14, 289);
             this.groupBox10.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox10.Name = "groupBox10";
             this.groupBox10.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox10.Size = new System.Drawing.Size(300, 150);
+            this.groupBox10.Size = new System.Drawing.Size(360, 180);
             this.groupBox10.TabIndex = 7;
             this.groupBox10.TabStop = false;
             this.groupBox10.Text = "Use Berries:";
@@ -1535,67 +1535,67 @@ private void InitializeComponent()
             this.cbUseBerriesOperator.Items.AddRange(new object[] {
             "AND",
             "OR"});
-            this.cbUseBerriesOperator.Location = new System.Drawing.Point(212, 50);
+            this.cbUseBerriesOperator.Location = new System.Drawing.Point(254, 60);
             this.cbUseBerriesOperator.Margin = new System.Windows.Forms.Padding(2);
             this.cbUseBerriesOperator.Name = "cbUseBerriesOperator";
-            this.cbUseBerriesOperator.Size = new System.Drawing.Size(74, 28);
+            this.cbUseBerriesOperator.Size = new System.Drawing.Size(88, 33);
             this.cbUseBerriesOperator.TabIndex = 17;
             // 
             // label52
             // 
             this.label52.AutoSize = true;
-            this.label52.Location = new System.Drawing.Point(8, 21);
+            this.label52.Location = new System.Drawing.Point(10, 25);
             this.label52.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label52.Name = "label52";
-            this.label52.Size = new System.Drawing.Size(58, 20);
+            this.label52.Size = new System.Drawing.Size(72, 25);
             this.label52.TabIndex = 4;
             this.label52.Text = "Min CP:";
             // 
             // tbUseBerriesMinCp
             // 
             this.tbUseBerriesMinCp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbUseBerriesMinCp.Location = new System.Drawing.Point(212, 18);
+            this.tbUseBerriesMinCp.Location = new System.Drawing.Point(254, 22);
             this.tbUseBerriesMinCp.Margin = new System.Windows.Forms.Padding(2);
             this.tbUseBerriesMinCp.Name = "tbUseBerriesMinCp";
-            this.tbUseBerriesMinCp.Size = new System.Drawing.Size(74, 27);
+            this.tbUseBerriesMinCp.Size = new System.Drawing.Size(88, 31);
             this.tbUseBerriesMinCp.TabIndex = 5;
             // 
             // label54
             // 
             this.label54.AutoSize = true;
-            this.label54.Location = new System.Drawing.Point(8, 84);
+            this.label54.Location = new System.Drawing.Point(10, 101);
             this.label54.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label54.Name = "label54";
-            this.label54.Size = new System.Drawing.Size(54, 20);
+            this.label54.Size = new System.Drawing.Size(67, 25);
             this.label54.TabIndex = 4;
             this.label54.Text = "Min IV:";
             // 
             // tbUseBerriesMinIv
             // 
             this.tbUseBerriesMinIv.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbUseBerriesMinIv.Location = new System.Drawing.Point(212, 82);
+            this.tbUseBerriesMinIv.Location = new System.Drawing.Point(254, 98);
             this.tbUseBerriesMinIv.Margin = new System.Windows.Forms.Padding(2);
             this.tbUseBerriesMinIv.Name = "tbUseBerriesMinIv";
-            this.tbUseBerriesMinIv.Size = new System.Drawing.Size(74, 27);
+            this.tbUseBerriesMinIv.Size = new System.Drawing.Size(88, 31);
             this.tbUseBerriesMinIv.TabIndex = 5;
             // 
             // label56
             // 
             this.label56.AutoSize = true;
-            this.label56.Location = new System.Drawing.Point(8, 114);
+            this.label56.Location = new System.Drawing.Point(10, 137);
             this.label56.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label56.Name = "label56";
-            this.label56.Size = new System.Drawing.Size(129, 20);
+            this.label56.Size = new System.Drawing.Size(155, 25);
             this.label56.TabIndex = 4;
             this.label56.Text = "Below Catch Prob:";
             // 
             // tbUseBerriesBelowCatchProbability
             // 
             this.tbUseBerriesBelowCatchProbability.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbUseBerriesBelowCatchProbability.Location = new System.Drawing.Point(212, 112);
+            this.tbUseBerriesBelowCatchProbability.Location = new System.Drawing.Point(254, 134);
             this.tbUseBerriesBelowCatchProbability.Margin = new System.Windows.Forms.Padding(2);
             this.tbUseBerriesBelowCatchProbability.Name = "tbUseBerriesBelowCatchProbability";
-            this.tbUseBerriesBelowCatchProbability.Size = new System.Drawing.Size(74, 27);
+            this.tbUseBerriesBelowCatchProbability.Size = new System.Drawing.Size(88, 31);
             this.tbUseBerriesBelowCatchProbability.TabIndex = 5;
             // 
             // groupBox9
@@ -1603,11 +1603,11 @@ private void InitializeComponent()
             this.groupBox9.Controls.Add(this.groupBox25);
             this.groupBox9.Controls.Add(this.groupBox23);
             this.groupBox9.Controls.Add(this.groupBox24);
-            this.groupBox9.Location = new System.Drawing.Point(320, 8);
+            this.groupBox9.Location = new System.Drawing.Point(384, 6);
             this.groupBox9.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox9.Name = "groupBox9";
             this.groupBox9.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox9.Size = new System.Drawing.Size(275, 350);
+            this.groupBox9.Size = new System.Drawing.Size(330, 420);
             this.groupBox9.TabIndex = 6;
             this.groupBox9.TabStop = false;
             this.groupBox9.Text = "PokeBall\'s";
@@ -1620,11 +1620,11 @@ private void InitializeComponent()
             this.groupBox25.Controls.Add(this.tbUseMasterBallAboveCp);
             this.groupBox25.Controls.Add(this.label4);
             this.groupBox25.Controls.Add(this.label42);
-            this.groupBox25.Location = new System.Drawing.Point(8, 258);
+            this.groupBox25.Location = new System.Drawing.Point(10, 310);
             this.groupBox25.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox25.Name = "groupBox25";
             this.groupBox25.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox25.Size = new System.Drawing.Size(262, 88);
+            this.groupBox25.Size = new System.Drawing.Size(314, 106);
             this.groupBox25.TabIndex = 25;
             this.groupBox25.TabStop = false;
             this.groupBox25.Text = "Use Master Balls:";
@@ -1632,38 +1632,38 @@ private void InitializeComponent()
             // tbUseMasterBallBelowCatchProbability
             // 
             this.tbUseMasterBallBelowCatchProbability.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbUseMasterBallBelowCatchProbability.Location = new System.Drawing.Point(175, 50);
+            this.tbUseMasterBallBelowCatchProbability.Location = new System.Drawing.Point(210, 60);
             this.tbUseMasterBallBelowCatchProbability.Margin = new System.Windows.Forms.Padding(2);
             this.tbUseMasterBallBelowCatchProbability.Name = "tbUseMasterBallBelowCatchProbability";
-            this.tbUseMasterBallBelowCatchProbability.Size = new System.Drawing.Size(74, 27);
+            this.tbUseMasterBallBelowCatchProbability.Size = new System.Drawing.Size(88, 31);
             this.tbUseMasterBallBelowCatchProbability.TabIndex = 5;
             // 
             // tbUseMasterBallAboveCp
             // 
             this.tbUseMasterBallAboveCp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbUseMasterBallAboveCp.Location = new System.Drawing.Point(175, 18);
+            this.tbUseMasterBallAboveCp.Location = new System.Drawing.Point(210, 22);
             this.tbUseMasterBallAboveCp.Margin = new System.Windows.Forms.Padding(2);
             this.tbUseMasterBallAboveCp.Name = "tbUseMasterBallAboveCp";
-            this.tbUseMasterBallAboveCp.Size = new System.Drawing.Size(74, 27);
+            this.tbUseMasterBallAboveCp.Size = new System.Drawing.Size(88, 31);
             this.tbUseMasterBallAboveCp.TabIndex = 5;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(8, 21);
+            this.label4.Location = new System.Drawing.Point(10, 25);
             this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(76, 20);
+            this.label4.Size = new System.Drawing.Size(94, 25);
             this.label4.TabIndex = 4;
             this.label4.Text = "Above CP:";
             // 
             // label42
             // 
             this.label42.AutoSize = true;
-            this.label42.Location = new System.Drawing.Point(8, 52);
+            this.label42.Location = new System.Drawing.Point(10, 62);
             this.label42.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label42.Name = "label42";
-            this.label42.Size = new System.Drawing.Size(129, 20);
+            this.label42.Size = new System.Drawing.Size(155, 25);
             this.label42.TabIndex = 4;
             this.label42.Text = "Below Catch Prob:";
             // 
@@ -1677,11 +1677,11 @@ private void InitializeComponent()
             this.groupBox23.Controls.Add(this.label6);
             this.groupBox23.Controls.Add(this.label40);
             this.groupBox23.Controls.Add(this.tbUseGreatBallBelowCatchProbability);
-            this.groupBox23.Location = new System.Drawing.Point(8, 18);
+            this.groupBox23.Location = new System.Drawing.Point(10, 22);
             this.groupBox23.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox23.Name = "groupBox23";
             this.groupBox23.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox23.Size = new System.Drawing.Size(262, 118);
+            this.groupBox23.Size = new System.Drawing.Size(314, 142);
             this.groupBox23.TabIndex = 23;
             this.groupBox23.TabStop = false;
             this.groupBox23.Text = "Use Great Balls:";
@@ -1689,58 +1689,58 @@ private void InitializeComponent()
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(8, 21);
+            this.label2.Location = new System.Drawing.Point(10, 25);
             this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(76, 20);
+            this.label2.Size = new System.Drawing.Size(94, 25);
             this.label2.TabIndex = 4;
             this.label2.Text = "Above CP:\r\n";
             // 
             // tbUseGreatBallAboveIv
             // 
             this.tbUseGreatBallAboveIv.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbUseGreatBallAboveIv.Location = new System.Drawing.Point(175, 50);
+            this.tbUseGreatBallAboveIv.Location = new System.Drawing.Point(210, 60);
             this.tbUseGreatBallAboveIv.Margin = new System.Windows.Forms.Padding(2);
             this.tbUseGreatBallAboveIv.Name = "tbUseGreatBallAboveIv";
-            this.tbUseGreatBallAboveIv.Size = new System.Drawing.Size(74, 27);
+            this.tbUseGreatBallAboveIv.Size = new System.Drawing.Size(88, 31);
             this.tbUseGreatBallAboveIv.TabIndex = 5;
             // 
             // tbUseGreatBallAboveCp
             // 
             this.tbUseGreatBallAboveCp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbUseGreatBallAboveCp.Location = new System.Drawing.Point(175, 18);
+            this.tbUseGreatBallAboveCp.Location = new System.Drawing.Point(210, 22);
             this.tbUseGreatBallAboveCp.Margin = new System.Windows.Forms.Padding(2);
             this.tbUseGreatBallAboveCp.Name = "tbUseGreatBallAboveCp";
-            this.tbUseGreatBallAboveCp.Size = new System.Drawing.Size(74, 27);
+            this.tbUseGreatBallAboveCp.Size = new System.Drawing.Size(88, 31);
             this.tbUseGreatBallAboveCp.TabIndex = 5;
             // 
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(8, 52);
+            this.label6.Location = new System.Drawing.Point(10, 62);
             this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(72, 20);
+            this.label6.Size = new System.Drawing.Size(89, 25);
             this.label6.TabIndex = 4;
             this.label6.Text = "Above IV:\r\n";
             // 
             // label40
             // 
             this.label40.AutoSize = true;
-            this.label40.Location = new System.Drawing.Point(8, 84);
+            this.label40.Location = new System.Drawing.Point(10, 101);
             this.label40.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label40.Name = "label40";
-            this.label40.Size = new System.Drawing.Size(129, 20);
+            this.label40.Size = new System.Drawing.Size(155, 25);
             this.label40.TabIndex = 4;
             this.label40.Text = "Below Catch Prob:\r\n";
             // 
             // tbUseGreatBallBelowCatchProbability
             // 
             this.tbUseGreatBallBelowCatchProbability.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbUseGreatBallBelowCatchProbability.Location = new System.Drawing.Point(175, 82);
+            this.tbUseGreatBallBelowCatchProbability.Location = new System.Drawing.Point(210, 98);
             this.tbUseGreatBallBelowCatchProbability.Margin = new System.Windows.Forms.Padding(2);
             this.tbUseGreatBallBelowCatchProbability.Name = "tbUseGreatBallBelowCatchProbability";
-            this.tbUseGreatBallBelowCatchProbability.Size = new System.Drawing.Size(74, 27);
+            this.tbUseGreatBallBelowCatchProbability.Size = new System.Drawing.Size(88, 31);
             this.tbUseGreatBallBelowCatchProbability.TabIndex = 5;
             // 
             // groupBox24
@@ -1753,11 +1753,11 @@ private void InitializeComponent()
             this.groupBox24.Controls.Add(this.label36);
             this.groupBox24.Controls.Add(this.label41);
             this.groupBox24.Controls.Add(this.tbUseUltraBallAboveIv);
-            this.groupBox24.Location = new System.Drawing.Point(8, 138);
+            this.groupBox24.Location = new System.Drawing.Point(10, 166);
             this.groupBox24.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox24.Name = "groupBox24";
             this.groupBox24.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox24.Size = new System.Drawing.Size(262, 118);
+            this.groupBox24.Size = new System.Drawing.Size(314, 142);
             this.groupBox24.TabIndex = 24;
             this.groupBox24.TabStop = false;
             this.groupBox24.Text = "Use Ultra Balls:";
@@ -1765,58 +1765,58 @@ private void InitializeComponent()
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(8, 21);
+            this.label3.Location = new System.Drawing.Point(10, 25);
             this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(76, 20);
+            this.label3.Size = new System.Drawing.Size(94, 25);
             this.label3.TabIndex = 4;
             this.label3.Text = "Above CP:\r\n";
             // 
             // tbUseUltraBallAboveCp
             // 
             this.tbUseUltraBallAboveCp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbUseUltraBallAboveCp.Location = new System.Drawing.Point(175, 18);
+            this.tbUseUltraBallAboveCp.Location = new System.Drawing.Point(210, 22);
             this.tbUseUltraBallAboveCp.Margin = new System.Windows.Forms.Padding(2);
             this.tbUseUltraBallAboveCp.Name = "tbUseUltraBallAboveCp";
-            this.tbUseUltraBallAboveCp.Size = new System.Drawing.Size(74, 27);
+            this.tbUseUltraBallAboveCp.Size = new System.Drawing.Size(88, 31);
             this.tbUseUltraBallAboveCp.TabIndex = 5;
             // 
             // tbUseUltraBallBelowCatchProbability
             // 
             this.tbUseUltraBallBelowCatchProbability.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbUseUltraBallBelowCatchProbability.Location = new System.Drawing.Point(175, 82);
+            this.tbUseUltraBallBelowCatchProbability.Location = new System.Drawing.Point(210, 98);
             this.tbUseUltraBallBelowCatchProbability.Margin = new System.Windows.Forms.Padding(2);
             this.tbUseUltraBallBelowCatchProbability.Name = "tbUseUltraBallBelowCatchProbability";
-            this.tbUseUltraBallBelowCatchProbability.Size = new System.Drawing.Size(74, 27);
+            this.tbUseUltraBallBelowCatchProbability.Size = new System.Drawing.Size(88, 31);
             this.tbUseUltraBallBelowCatchProbability.TabIndex = 5;
             // 
             // label36
             // 
             this.label36.AutoSize = true;
-            this.label36.Location = new System.Drawing.Point(8, 52);
+            this.label36.Location = new System.Drawing.Point(10, 62);
             this.label36.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label36.Name = "label36";
-            this.label36.Size = new System.Drawing.Size(72, 20);
+            this.label36.Size = new System.Drawing.Size(89, 25);
             this.label36.TabIndex = 4;
             this.label36.Text = "Above IV:\r\n";
             // 
             // label41
             // 
             this.label41.AutoSize = true;
-            this.label41.Location = new System.Drawing.Point(8, 84);
+            this.label41.Location = new System.Drawing.Point(10, 101);
             this.label41.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label41.Name = "label41";
-            this.label41.Size = new System.Drawing.Size(129, 20);
+            this.label41.Size = new System.Drawing.Size(155, 25);
             this.label41.TabIndex = 4;
             this.label41.Text = "Below Catch Prob:";
             // 
             // tbUseUltraBallAboveIv
             // 
             this.tbUseUltraBallAboveIv.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbUseUltraBallAboveIv.Location = new System.Drawing.Point(175, 50);
+            this.tbUseUltraBallAboveIv.Location = new System.Drawing.Point(210, 60);
             this.tbUseUltraBallAboveIv.Margin = new System.Windows.Forms.Padding(2);
             this.tbUseUltraBallAboveIv.Name = "tbUseUltraBallAboveIv";
-            this.tbUseUltraBallAboveIv.Size = new System.Drawing.Size(74, 27);
+            this.tbUseUltraBallAboveIv.Size = new System.Drawing.Size(88, 31);
             this.tbUseUltraBallAboveIv.TabIndex = 5;
             // 
             // gbCatchIgnore
@@ -1825,11 +1825,11 @@ private void InitializeComponent()
             | System.Windows.Forms.AnchorStyles.Left)));
             this.gbCatchIgnore.Controls.Add(this.clbCatchIgnore);
             this.gbCatchIgnore.Controls.Add(this.cbIgnoreAll);
-            this.gbCatchIgnore.Location = new System.Drawing.Point(602, 8);
-            this.gbCatchIgnore.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.gbCatchIgnore.Location = new System.Drawing.Point(722, 6);
+            this.gbCatchIgnore.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.gbCatchIgnore.Name = "gbCatchIgnore";
-            this.gbCatchIgnore.Padding = new System.Windows.Forms.Padding(2, 5, 2, 5);
-            this.gbCatchIgnore.Size = new System.Drawing.Size(338, 448);
+            this.gbCatchIgnore.Padding = new System.Windows.Forms.Padding(2, 6, 2, 6);
+            this.gbCatchIgnore.Size = new System.Drawing.Size(406, 541);
             this.gbCatchIgnore.TabIndex = 3;
             this.gbCatchIgnore.TabStop = false;
             this.gbCatchIgnore.Text = "Ignore";
@@ -1840,19 +1840,19 @@ private void InitializeComponent()
             this.clbCatchIgnore.Dock = System.Windows.Forms.DockStyle.Fill;
             this.clbCatchIgnore.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.clbCatchIgnore.FormattingEnabled = true;
-            this.clbCatchIgnore.Location = new System.Drawing.Point(2, 25);
-            this.clbCatchIgnore.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.clbCatchIgnore.Location = new System.Drawing.Point(2, 30);
+            this.clbCatchIgnore.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.clbCatchIgnore.Name = "clbCatchIgnore";
-            this.clbCatchIgnore.Size = new System.Drawing.Size(334, 418);
+            this.clbCatchIgnore.Size = new System.Drawing.Size(402, 505);
             this.clbCatchIgnore.TabIndex = 0;
             // 
             // cbIgnoreAll
             // 
             this.cbIgnoreAll.AutoSize = true;
-            this.cbIgnoreAll.Location = new System.Drawing.Point(162, 0);
-            this.cbIgnoreAll.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.cbIgnoreAll.Location = new System.Drawing.Point(230, 0);
+            this.cbIgnoreAll.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.cbIgnoreAll.Name = "cbIgnoreAll";
-            this.cbIgnoreAll.Size = new System.Drawing.Size(93, 24);
+            this.cbIgnoreAll.Size = new System.Drawing.Size(109, 29);
             this.cbIgnoreAll.TabIndex = 1;
             this.cbIgnoreAll.Text = "Select All";
             this.cbIgnoreAll.UseVisualStyleBackColor = true;
@@ -1861,10 +1861,10 @@ private void InitializeComponent()
             // cbUseEggIncubators
             // 
             this.cbUseEggIncubators.AutoSize = true;
-            this.cbUseEggIncubators.Location = new System.Drawing.Point(18, 8);
+            this.cbUseEggIncubators.Location = new System.Drawing.Point(22, 6);
             this.cbUseEggIncubators.Margin = new System.Windows.Forms.Padding(2);
             this.cbUseEggIncubators.Name = "cbUseEggIncubators";
-            this.cbUseEggIncubators.Size = new System.Drawing.Size(128, 24);
+            this.cbUseEggIncubators.Size = new System.Drawing.Size(156, 29);
             this.cbUseEggIncubators.TabIndex = 1;
             this.cbUseEggIncubators.Text = "Use Incubators";
             this.cbUseEggIncubators.UseVisualStyleBackColor = true;
@@ -1873,10 +1873,10 @@ private void InitializeComponent()
             // cbCatchPoke
             // 
             this.cbCatchPoke.AutoSize = true;
-            this.cbCatchPoke.Location = new System.Drawing.Point(18, 34);
+            this.cbCatchPoke.Location = new System.Drawing.Point(22, 37);
             this.cbCatchPoke.Margin = new System.Windows.Forms.Padding(2);
             this.cbCatchPoke.Name = "cbCatchPoke";
-            this.cbCatchPoke.Size = new System.Drawing.Size(133, 24);
+            this.cbCatchPoke.Size = new System.Drawing.Size(162, 29);
             this.cbCatchPoke.TabIndex = 1;
             this.cbCatchPoke.Text = "Catch Pokemon";
             this.cbCatchPoke.UseVisualStyleBackColor = true;
@@ -1893,31 +1893,31 @@ private void InitializeComponent()
             this.gbCatchPokemon.Controls.Add(this.tbMaxPokeballsPerPokemon);
             this.gbCatchPokemon.Controls.Add(this.tbFavoriteMinIvPercentage);
             this.gbCatchPokemon.Enabled = false;
-            this.gbCatchPokemon.Location = new System.Drawing.Point(12, 51);
+            this.gbCatchPokemon.Location = new System.Drawing.Point(14, 57);
             this.gbCatchPokemon.Margin = new System.Windows.Forms.Padding(2);
             this.gbCatchPokemon.Name = "gbCatchPokemon";
             this.gbCatchPokemon.Padding = new System.Windows.Forms.Padding(2);
-            this.gbCatchPokemon.Size = new System.Drawing.Size(300, 182);
+            this.gbCatchPokemon.Size = new System.Drawing.Size(360, 218);
             this.gbCatchPokemon.TabIndex = 22;
             this.gbCatchPokemon.TabStop = false;
             // 
             // label27
             // 
             this.label27.AutoSize = true;
-            this.label27.Location = new System.Drawing.Point(8, 22);
+            this.label27.Location = new System.Drawing.Point(10, 26);
             this.label27.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label27.Name = "label27";
-            this.label27.Size = new System.Drawing.Size(157, 20);
+            this.label27.Size = new System.Drawing.Size(192, 25);
             this.label27.TabIndex = 1;
             this.label27.Text = "Berry to use/Pokemon:\r\n";
             // 
             // cbAutoFavoriteShinyOnCatch
             // 
             this.cbAutoFavoriteShinyOnCatch.AutoSize = true;
-            this.cbAutoFavoriteShinyOnCatch.Location = new System.Drawing.Point(8, 148);
+            this.cbAutoFavoriteShinyOnCatch.Location = new System.Drawing.Point(10, 178);
             this.cbAutoFavoriteShinyOnCatch.Margin = new System.Windows.Forms.Padding(2);
             this.cbAutoFavoriteShinyOnCatch.Name = "cbAutoFavoriteShinyOnCatch";
-            this.cbAutoFavoriteShinyOnCatch.Size = new System.Drawing.Size(206, 24);
+            this.cbAutoFavoriteShinyOnCatch.Size = new System.Drawing.Size(250, 29);
             this.cbAutoFavoriteShinyOnCatch.TabIndex = 21;
             this.cbAutoFavoriteShinyOnCatch.Text = "AutoFavoriteShinyOnCatch";
             this.cbAutoFavoriteShinyOnCatch.UseVisualStyleBackColor = true;
@@ -1925,39 +1925,39 @@ private void InitializeComponent()
             // tBMaxBerriesToUsePerPokemon
             // 
             this.tBMaxBerriesToUsePerPokemon.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tBMaxBerriesToUsePerPokemon.Location = new System.Drawing.Point(212, 20);
+            this.tBMaxBerriesToUsePerPokemon.Location = new System.Drawing.Point(254, 24);
             this.tBMaxBerriesToUsePerPokemon.Margin = new System.Windows.Forms.Padding(2);
             this.tBMaxBerriesToUsePerPokemon.Name = "tBMaxBerriesToUsePerPokemon";
-            this.tBMaxBerriesToUsePerPokemon.Size = new System.Drawing.Size(74, 27);
+            this.tBMaxBerriesToUsePerPokemon.Size = new System.Drawing.Size(88, 31);
             this.tBMaxBerriesToUsePerPokemon.TabIndex = 2;
             // 
             // label47
             // 
             this.label47.AutoSize = true;
-            this.label47.Location = new System.Drawing.Point(8, 116);
+            this.label47.Location = new System.Drawing.Point(10, 139);
             this.label47.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label47.Name = "label47";
-            this.label47.Size = new System.Drawing.Size(124, 20);
+            this.label47.Size = new System.Drawing.Size(151, 25);
             this.label47.TabIndex = 4;
             this.label47.Text = "Favorite Min-IV%:";
             // 
             // label43
             // 
             this.label43.AutoSize = true;
-            this.label43.Location = new System.Drawing.Point(8, 54);
+            this.label43.Location = new System.Drawing.Point(10, 65);
             this.label43.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label43.Name = "label43";
-            this.label43.Size = new System.Drawing.Size(177, 20);
+            this.label43.Size = new System.Drawing.Size(215, 25);
             this.label43.TabIndex = 7;
             this.label43.Text = "Max Poke balls/Pokemon:\r\n";
             // 
             // cbAutoFavoritePokemon
             // 
             this.cbAutoFavoritePokemon.AutoSize = true;
-            this.cbAutoFavoritePokemon.Location = new System.Drawing.Point(8, 85);
+            this.cbAutoFavoritePokemon.Location = new System.Drawing.Point(10, 102);
             this.cbAutoFavoritePokemon.Margin = new System.Windows.Forms.Padding(2);
             this.cbAutoFavoritePokemon.Name = "cbAutoFavoritePokemon";
-            this.cbAutoFavoritePokemon.Size = new System.Drawing.Size(186, 24);
+            this.cbAutoFavoritePokemon.Size = new System.Drawing.Size(226, 29);
             this.cbAutoFavoritePokemon.TabIndex = 19;
             this.cbAutoFavoritePokemon.Text = "Auto-Favorite Pokemon";
             this.cbAutoFavoritePokemon.UseVisualStyleBackColor = true;
@@ -1965,19 +1965,19 @@ private void InitializeComponent()
             // tbMaxPokeballsPerPokemon
             // 
             this.tbMaxPokeballsPerPokemon.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbMaxPokeballsPerPokemon.Location = new System.Drawing.Point(212, 52);
+            this.tbMaxPokeballsPerPokemon.Location = new System.Drawing.Point(254, 62);
             this.tbMaxPokeballsPerPokemon.Margin = new System.Windows.Forms.Padding(2);
             this.tbMaxPokeballsPerPokemon.Name = "tbMaxPokeballsPerPokemon";
-            this.tbMaxPokeballsPerPokemon.Size = new System.Drawing.Size(74, 27);
+            this.tbMaxPokeballsPerPokemon.Size = new System.Drawing.Size(88, 31);
             this.tbMaxPokeballsPerPokemon.TabIndex = 8;
             // 
             // tbFavoriteMinIvPercentage
             // 
             this.tbFavoriteMinIvPercentage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbFavoriteMinIvPercentage.Location = new System.Drawing.Point(212, 112);
+            this.tbFavoriteMinIvPercentage.Location = new System.Drawing.Point(254, 134);
             this.tbFavoriteMinIvPercentage.Margin = new System.Windows.Forms.Padding(2);
             this.tbFavoriteMinIvPercentage.Name = "tbFavoriteMinIvPercentage";
-            this.tbFavoriteMinIvPercentage.Size = new System.Drawing.Size(74, 27);
+            this.tbFavoriteMinIvPercentage.Size = new System.Drawing.Size(88, 31);
             this.tbFavoriteMinIvPercentage.TabIndex = 5;
             // 
             // tabTransfer
@@ -1986,11 +1986,11 @@ private void InitializeComponent()
             this.tabTransfer.Controls.Add(this.groupBox7);
             this.tabTransfer.Controls.Add(this.gbExcludeTrans);
             this.tabTransfer.Controls.Add(this.groupBox8);
-            this.tabTransfer.Location = new System.Drawing.Point(4, 29);
+            this.tabTransfer.Location = new System.Drawing.Point(4, 34);
             this.tabTransfer.Margin = new System.Windows.Forms.Padding(2);
             this.tabTransfer.Name = "tabTransfer";
             this.tabTransfer.Padding = new System.Windows.Forms.Padding(2);
-            this.tabTransfer.Size = new System.Drawing.Size(946, 452);
+            this.tabTransfer.Size = new System.Drawing.Size(1138, 546);
             this.tabTransfer.TabIndex = 1;
             this.tabTransfer.Text = "Transfer";
             // 
@@ -2007,11 +2007,11 @@ private void InitializeComponent()
             this.groupBox7.Controls.Add(this.tbKeepMinCp);
             this.groupBox7.Controls.Add(this.label38);
             this.groupBox7.Controls.Add(this.label39);
-            this.groupBox7.Location = new System.Drawing.Point(12, 8);
+            this.groupBox7.Location = new System.Drawing.Point(14, 6);
             this.groupBox7.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox7.Name = "groupBox7";
             this.groupBox7.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox7.Size = new System.Drawing.Size(312, 268);
+            this.groupBox7.Size = new System.Drawing.Size(374, 322);
             this.groupBox7.TabIndex = 18;
             this.groupBox7.TabStop = false;
             this.groupBox7.Text = "Condiction";
@@ -2019,10 +2019,10 @@ private void InitializeComponent()
             // cbTransferDuplicatePokemonOnCapture
             // 
             this.cbTransferDuplicatePokemonOnCapture.AutoSize = true;
-            this.cbTransferDuplicatePokemonOnCapture.Location = new System.Drawing.Point(12, 240);
+            this.cbTransferDuplicatePokemonOnCapture.Location = new System.Drawing.Point(14, 288);
             this.cbTransferDuplicatePokemonOnCapture.Margin = new System.Windows.Forms.Padding(2);
             this.cbTransferDuplicatePokemonOnCapture.Name = "cbTransferDuplicatePokemonOnCapture";
-            this.cbTransferDuplicatePokemonOnCapture.Size = new System.Drawing.Size(295, 24);
+            this.cbTransferDuplicatePokemonOnCapture.Size = new System.Drawing.Size(354, 29);
             this.cbTransferDuplicatePokemonOnCapture.TabIndex = 24;
             this.cbTransferDuplicatePokemonOnCapture.Text = "Transfer Duplicate Pokemon On Capture";
             this.cbTransferDuplicatePokemonOnCapture.UseVisualStyleBackColor = true;
@@ -2030,10 +2030,10 @@ private void InitializeComponent()
             // cbTransferDuplicatePokemon
             // 
             this.cbTransferDuplicatePokemon.AutoSize = true;
-            this.cbTransferDuplicatePokemon.Location = new System.Drawing.Point(12, 210);
+            this.cbTransferDuplicatePokemon.Location = new System.Drawing.Point(14, 252);
             this.cbTransferDuplicatePokemon.Margin = new System.Windows.Forms.Padding(2);
             this.cbTransferDuplicatePokemon.Name = "cbTransferDuplicatePokemon";
-            this.cbTransferDuplicatePokemon.Size = new System.Drawing.Size(216, 24);
+            this.cbTransferDuplicatePokemon.Size = new System.Drawing.Size(258, 29);
             this.cbTransferDuplicatePokemon.TabIndex = 24;
             this.cbTransferDuplicatePokemon.Text = "Transfer Duplicate Pokemon";
             this.cbTransferDuplicatePokemon.UseVisualStyleBackColor = true;
@@ -2041,10 +2041,10 @@ private void InitializeComponent()
             // cbTransferWeakPokemon
             // 
             this.cbTransferWeakPokemon.AutoSize = true;
-            this.cbTransferWeakPokemon.Location = new System.Drawing.Point(12, 180);
+            this.cbTransferWeakPokemon.Location = new System.Drawing.Point(14, 216);
             this.cbTransferWeakPokemon.Margin = new System.Windows.Forms.Padding(2);
             this.cbTransferWeakPokemon.Name = "cbTransferWeakPokemon";
-            this.cbTransferWeakPokemon.Size = new System.Drawing.Size(188, 24);
+            this.cbTransferWeakPokemon.Size = new System.Drawing.Size(227, 29);
             this.cbTransferWeakPokemon.TabIndex = 24;
             this.cbTransferWeakPokemon.Text = "Transfer Weak Pokemon";
             this.cbTransferWeakPokemon.UseVisualStyleBackColor = true;
@@ -2052,29 +2052,29 @@ private void InitializeComponent()
             // tbKeepMinDuplicatePokemon
             // 
             this.tbKeepMinDuplicatePokemon.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbKeepMinDuplicatePokemon.Location = new System.Drawing.Point(225, 145);
+            this.tbKeepMinDuplicatePokemon.Location = new System.Drawing.Point(270, 174);
             this.tbKeepMinDuplicatePokemon.Margin = new System.Windows.Forms.Padding(2);
             this.tbKeepMinDuplicatePokemon.Name = "tbKeepMinDuplicatePokemon";
-            this.tbKeepMinDuplicatePokemon.Size = new System.Drawing.Size(74, 27);
+            this.tbKeepMinDuplicatePokemon.Size = new System.Drawing.Size(88, 31);
             this.tbKeepMinDuplicatePokemon.TabIndex = 23;
             // 
             // label35
             // 
             this.label35.AutoSize = true;
-            this.label35.Location = new System.Drawing.Point(12, 148);
+            this.label35.Location = new System.Drawing.Point(14, 178);
             this.label35.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label35.Name = "label35";
-            this.label35.Size = new System.Drawing.Size(179, 20);
+            this.label35.Size = new System.Drawing.Size(214, 25);
             this.label35.TabIndex = 22;
             this.label35.Text = "Keep Duplicate Pokemon:\r\n";
             // 
             // cbPrioritizeIvOverCp
             // 
             this.cbPrioritizeIvOverCp.AutoSize = true;
-            this.cbPrioritizeIvOverCp.Location = new System.Drawing.Point(12, 25);
+            this.cbPrioritizeIvOverCp.Location = new System.Drawing.Point(14, 30);
             this.cbPrioritizeIvOverCp.Margin = new System.Windows.Forms.Padding(2);
             this.cbPrioritizeIvOverCp.Name = "cbPrioritizeIvOverCp";
-            this.cbPrioritizeIvOverCp.Size = new System.Drawing.Size(163, 24);
+            this.cbPrioritizeIvOverCp.Size = new System.Drawing.Size(196, 29);
             this.cbPrioritizeIvOverCp.TabIndex = 21;
             this.cbPrioritizeIvOverCp.Text = "Prioritize IV Over CP";
             this.cbPrioritizeIvOverCp.UseVisualStyleBackColor = true;
@@ -2082,10 +2082,10 @@ private void InitializeComponent()
             // tbKeepMinIV
             // 
             this.tbKeepMinIV.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbKeepMinIV.Location = new System.Drawing.Point(225, 112);
+            this.tbKeepMinIV.Location = new System.Drawing.Point(270, 134);
             this.tbKeepMinIV.Margin = new System.Windows.Forms.Padding(2);
             this.tbKeepMinIV.Name = "tbKeepMinIV";
-            this.tbKeepMinIV.Size = new System.Drawing.Size(74, 27);
+            this.tbKeepMinIV.Size = new System.Drawing.Size(88, 31);
             this.tbKeepMinIV.TabIndex = 12;
             // 
             // cbKeepMinOperator
@@ -2096,38 +2096,38 @@ private void InitializeComponent()
             this.cbKeepMinOperator.Items.AddRange(new object[] {
             "AND",
             "OR"});
-            this.cbKeepMinOperator.Location = new System.Drawing.Point(225, 82);
+            this.cbKeepMinOperator.Location = new System.Drawing.Point(270, 98);
             this.cbKeepMinOperator.Margin = new System.Windows.Forms.Padding(2);
             this.cbKeepMinOperator.Name = "cbKeepMinOperator";
-            this.cbKeepMinOperator.Size = new System.Drawing.Size(74, 28);
+            this.cbKeepMinOperator.Size = new System.Drawing.Size(88, 33);
             this.cbKeepMinOperator.TabIndex = 11;
             // 
             // tbKeepMinCp
             // 
             this.tbKeepMinCp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbKeepMinCp.Location = new System.Drawing.Point(225, 52);
+            this.tbKeepMinCp.Location = new System.Drawing.Point(270, 62);
             this.tbKeepMinCp.Margin = new System.Windows.Forms.Padding(2);
             this.tbKeepMinCp.Name = "tbKeepMinCp";
-            this.tbKeepMinCp.Size = new System.Drawing.Size(74, 27);
+            this.tbKeepMinCp.Size = new System.Drawing.Size(88, 31);
             this.tbKeepMinCp.TabIndex = 11;
             // 
             // label38
             // 
             this.label38.AutoSize = true;
-            this.label38.Location = new System.Drawing.Point(12, 112);
+            this.label38.Location = new System.Drawing.Point(14, 134);
             this.label38.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label38.Name = "label38";
-            this.label38.Size = new System.Drawing.Size(106, 20);
+            this.label38.Size = new System.Drawing.Size(128, 25);
             this.label38.TabIndex = 10;
             this.label38.Text = "Keep Min-IV%:";
             // 
             // label39
             // 
             this.label39.AutoSize = true;
-            this.label39.Location = new System.Drawing.Point(12, 54);
+            this.label39.Location = new System.Drawing.Point(14, 65);
             this.label39.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label39.Name = "label39";
-            this.label39.Size = new System.Drawing.Size(98, 20);
+            this.label39.Size = new System.Drawing.Size(118, 25);
             this.label39.TabIndex = 8;
             this.label39.Text = "Keep Min-CP:";
             // 
@@ -2137,11 +2137,11 @@ private void InitializeComponent()
             | System.Windows.Forms.AnchorStyles.Left)));
             this.gbExcludeTrans.Controls.Add(this.clbTransfer);
             this.gbExcludeTrans.Controls.Add(this.cbNotTransferAll);
-            this.gbExcludeTrans.Location = new System.Drawing.Point(602, 8);
-            this.gbExcludeTrans.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.gbExcludeTrans.Location = new System.Drawing.Point(722, 6);
+            this.gbExcludeTrans.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.gbExcludeTrans.Name = "gbExcludeTrans";
-            this.gbExcludeTrans.Padding = new System.Windows.Forms.Padding(2, 5, 2, 5);
-            this.gbExcludeTrans.Size = new System.Drawing.Size(338, 534);
+            this.gbExcludeTrans.Padding = new System.Windows.Forms.Padding(2, 6, 2, 6);
+            this.gbExcludeTrans.Size = new System.Drawing.Size(406, 546);
             this.gbExcludeTrans.TabIndex = 20;
             this.gbExcludeTrans.TabStop = false;
             this.gbExcludeTrans.Text = "Exclude";
@@ -2152,19 +2152,19 @@ private void InitializeComponent()
             this.clbTransfer.Dock = System.Windows.Forms.DockStyle.Fill;
             this.clbTransfer.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.clbTransfer.FormattingEnabled = true;
-            this.clbTransfer.Location = new System.Drawing.Point(2, 25);
-            this.clbTransfer.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.clbTransfer.Location = new System.Drawing.Point(2, 30);
+            this.clbTransfer.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.clbTransfer.Name = "clbTransfer";
-            this.clbTransfer.Size = new System.Drawing.Size(334, 504);
+            this.clbTransfer.Size = new System.Drawing.Size(402, 510);
             this.clbTransfer.TabIndex = 0;
             // 
             // cbNotTransferAll
             // 
             this.cbNotTransferAll.AutoSize = true;
-            this.cbNotTransferAll.Location = new System.Drawing.Point(162, 0);
-            this.cbNotTransferAll.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.cbNotTransferAll.Location = new System.Drawing.Point(230, 0);
+            this.cbNotTransferAll.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.cbNotTransferAll.Name = "cbNotTransferAll";
-            this.cbNotTransferAll.Size = new System.Drawing.Size(93, 24);
+            this.cbNotTransferAll.Size = new System.Drawing.Size(109, 29);
             this.cbNotTransferAll.TabIndex = 1;
             this.cbNotTransferAll.Text = "Select All";
             this.cbNotTransferAll.UseVisualStyleBackColor = true;
@@ -2176,11 +2176,11 @@ private void InitializeComponent()
             this.groupBox8.Controls.Add(this.tbKeepMinLvl);
             this.groupBox8.Controls.Add(this.cbUseKeepMinLvl);
             this.groupBox8.Controls.Add(this.label37);
-            this.groupBox8.Location = new System.Drawing.Point(12, 280);
+            this.groupBox8.Location = new System.Drawing.Point(14, 332);
             this.groupBox8.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox8.Name = "groupBox8";
             this.groupBox8.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox8.Size = new System.Drawing.Size(312, 115);
+            this.groupBox8.Size = new System.Drawing.Size(374, 138);
             this.groupBox8.TabIndex = 19;
             this.groupBox8.TabStop = false;
             this.groupBox8.Text = "Additional Condiction";
@@ -2188,10 +2188,10 @@ private void InitializeComponent()
             // cbKeepPokemonsToBeEvolved
             // 
             this.cbKeepPokemonsToBeEvolved.AutoSize = true;
-            this.cbKeepPokemonsToBeEvolved.Location = new System.Drawing.Point(12, 84);
+            this.cbKeepPokemonsToBeEvolved.Location = new System.Drawing.Point(14, 101);
             this.cbKeepPokemonsToBeEvolved.Margin = new System.Windows.Forms.Padding(2);
             this.cbKeepPokemonsToBeEvolved.Name = "cbKeepPokemonsToBeEvolved";
-            this.cbKeepPokemonsToBeEvolved.Size = new System.Drawing.Size(240, 24);
+            this.cbKeepPokemonsToBeEvolved.Size = new System.Drawing.Size(287, 29);
             this.cbKeepPokemonsToBeEvolved.TabIndex = 21;
             this.cbKeepPokemonsToBeEvolved.Text = "Keep If Pokemon To Be Evolved";
             this.cbKeepPokemonsToBeEvolved.UseVisualStyleBackColor = true;
@@ -2199,19 +2199,19 @@ private void InitializeComponent()
             // tbKeepMinLvl
             // 
             this.tbKeepMinLvl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbKeepMinLvl.Location = new System.Drawing.Point(225, 50);
+            this.tbKeepMinLvl.Location = new System.Drawing.Point(270, 60);
             this.tbKeepMinLvl.Margin = new System.Windows.Forms.Padding(2);
             this.tbKeepMinLvl.Name = "tbKeepMinLvl";
-            this.tbKeepMinLvl.Size = new System.Drawing.Size(74, 27);
+            this.tbKeepMinLvl.Size = new System.Drawing.Size(88, 31);
             this.tbKeepMinLvl.TabIndex = 17;
             // 
             // cbUseKeepMinLvl
             // 
             this.cbUseKeepMinLvl.AutoSize = true;
-            this.cbUseKeepMinLvl.Location = new System.Drawing.Point(12, 25);
+            this.cbUseKeepMinLvl.Location = new System.Drawing.Point(14, 30);
             this.cbUseKeepMinLvl.Margin = new System.Windows.Forms.Padding(2);
             this.cbUseKeepMinLvl.Name = "cbUseKeepMinLvl";
-            this.cbUseKeepMinLvl.Size = new System.Drawing.Size(236, 24);
+            this.cbUseKeepMinLvl.Size = new System.Drawing.Size(281, 29);
             this.cbUseKeepMinLvl.TabIndex = 20;
             this.cbUseKeepMinLvl.Text = "Use Keep Min Level Condiction\r\n";
             this.cbUseKeepMinLvl.UseVisualStyleBackColor = true;
@@ -2219,10 +2219,10 @@ private void InitializeComponent()
             // label37
             // 
             this.label37.AutoSize = true;
-            this.label37.Location = new System.Drawing.Point(12, 52);
+            this.label37.Location = new System.Drawing.Point(14, 62);
             this.label37.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label37.Name = "label37";
-            this.label37.Size = new System.Drawing.Size(115, 20);
+            this.label37.Size = new System.Drawing.Size(136, 25);
             this.label37.TabIndex = 16;
             this.label37.Text = "Keep Min-Level:";
             // 
@@ -2235,20 +2235,20 @@ private void InitializeComponent()
             this.tabPowerUp.Controls.Add(this.label29);
             this.tabPowerUp.Controls.Add(this.gbPUP);
             this.tabPowerUp.Controls.Add(this.cbAutoPowerUp);
-            this.tabPowerUp.Location = new System.Drawing.Point(4, 29);
+            this.tabPowerUp.Location = new System.Drawing.Point(4, 34);
             this.tabPowerUp.Margin = new System.Windows.Forms.Padding(2);
             this.tabPowerUp.Name = "tabPowerUp";
-            this.tabPowerUp.Size = new System.Drawing.Size(946, 452);
+            this.tabPowerUp.Size = new System.Drawing.Size(1138, 546);
             this.tabPowerUp.TabIndex = 4;
             this.tabPowerUp.Text = "PowerUp";
             // 
             // cbPowerUpFav
             // 
             this.cbPowerUpFav.AutoSize = true;
-            this.cbPowerUpFav.Location = new System.Drawing.Point(18, 34);
+            this.cbPowerUpFav.Location = new System.Drawing.Point(22, 37);
             this.cbPowerUpFav.Margin = new System.Windows.Forms.Padding(2);
             this.cbPowerUpFav.Name = "cbPowerUpFav";
-            this.cbPowerUpFav.Size = new System.Drawing.Size(186, 24);
+            this.cbPowerUpFav.Size = new System.Drawing.Size(226, 29);
             this.cbPowerUpFav.TabIndex = 11;
             this.cbPowerUpFav.Text = "Only PowerUp Favorites\r\n";
             this.cbPowerUpFav.UseVisualStyleBackColor = true;
@@ -2262,11 +2262,11 @@ private void InitializeComponent()
             this.groupBox6.Controls.Add(this.label30);
             this.groupBox6.Controls.Add(this.cbPowerUpMinStarDust);
             this.groupBox6.Controls.Add(this.label28);
-            this.groupBox6.Location = new System.Drawing.Point(12, 98);
+            this.groupBox6.Location = new System.Drawing.Point(14, 114);
             this.groupBox6.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox6.Size = new System.Drawing.Size(292, 162);
+            this.groupBox6.Size = new System.Drawing.Size(350, 194);
             this.groupBox6.TabIndex = 10;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "Condiction";
@@ -2274,10 +2274,10 @@ private void InitializeComponent()
             // tbPowerUpMinIV
             // 
             this.tbPowerUpMinIV.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbPowerUpMinIV.Location = new System.Drawing.Point(208, 118);
+            this.tbPowerUpMinIV.Location = new System.Drawing.Point(250, 142);
             this.tbPowerUpMinIV.Margin = new System.Windows.Forms.Padding(2);
             this.tbPowerUpMinIV.Name = "tbPowerUpMinIV";
-            this.tbPowerUpMinIV.Size = new System.Drawing.Size(74, 27);
+            this.tbPowerUpMinIV.Size = new System.Drawing.Size(88, 31);
             this.tbPowerUpMinIV.TabIndex = 12;
             // 
             // cbPowerUpCondiction
@@ -2288,38 +2288,38 @@ private void InitializeComponent()
             this.cbPowerUpCondiction.Items.AddRange(new object[] {
             "AND",
             "OR"});
-            this.cbPowerUpCondiction.Location = new System.Drawing.Point(208, 58);
+            this.cbPowerUpCondiction.Location = new System.Drawing.Point(250, 70);
             this.cbPowerUpCondiction.Margin = new System.Windows.Forms.Padding(2);
             this.cbPowerUpCondiction.Name = "cbPowerUpCondiction";
-            this.cbPowerUpCondiction.Size = new System.Drawing.Size(74, 28);
+            this.cbPowerUpCondiction.Size = new System.Drawing.Size(88, 33);
             this.cbPowerUpCondiction.TabIndex = 11;
             // 
             // tbPowerUpMinCP
             // 
             this.tbPowerUpMinCP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbPowerUpMinCP.Location = new System.Drawing.Point(208, 88);
+            this.tbPowerUpMinCP.Location = new System.Drawing.Point(250, 106);
             this.tbPowerUpMinCP.Margin = new System.Windows.Forms.Padding(2);
             this.tbPowerUpMinCP.Name = "tbPowerUpMinCP";
-            this.tbPowerUpMinCP.Size = new System.Drawing.Size(74, 27);
+            this.tbPowerUpMinCP.Size = new System.Drawing.Size(88, 31);
             this.tbPowerUpMinCP.TabIndex = 11;
             // 
             // label31
             // 
             this.label31.AutoSize = true;
-            this.label31.Location = new System.Drawing.Point(8, 121);
+            this.label31.Location = new System.Drawing.Point(10, 145);
             this.label31.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label31.Name = "label31";
-            this.label31.Size = new System.Drawing.Size(68, 20);
+            this.label31.Size = new System.Drawing.Size(84, 25);
             this.label31.TabIndex = 10;
             this.label31.Text = "Min-IV%:";
             // 
             // label30
             // 
             this.label30.AutoSize = true;
-            this.label30.Location = new System.Drawing.Point(8, 91);
+            this.label30.Location = new System.Drawing.Point(10, 109);
             this.label30.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label30.Name = "label30";
-            this.label30.Size = new System.Drawing.Size(60, 20);
+            this.label30.Size = new System.Drawing.Size(74, 25);
             this.label30.TabIndex = 8;
             this.label30.Text = "Min-CP:";
             // 
@@ -2349,20 +2349,20 @@ private void InitializeComponent()
             "9000",
             "10000",
             "20000"});
-            this.cbPowerUpMinStarDust.Location = new System.Drawing.Point(208, 25);
+            this.cbPowerUpMinStarDust.Location = new System.Drawing.Point(250, 30);
             this.cbPowerUpMinStarDust.Margin = new System.Windows.Forms.Padding(2);
             this.cbPowerUpMinStarDust.Name = "cbPowerUpMinStarDust";
-            this.cbPowerUpMinStarDust.Size = new System.Drawing.Size(74, 28);
+            this.cbPowerUpMinStarDust.Size = new System.Drawing.Size(88, 33);
             this.cbPowerUpMinStarDust.TabIndex = 7;
             this.cbPowerUpMinStarDust.Text = "5000";
             // 
             // label28
             // 
             this.label28.AutoSize = true;
-            this.label28.Location = new System.Drawing.Point(8, 28);
+            this.label28.Location = new System.Drawing.Point(10, 34);
             this.label28.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label28.Name = "label28";
-            this.label28.Size = new System.Drawing.Size(187, 20);
+            this.label28.Size = new System.Drawing.Size(227, 25);
             this.label28.TabIndex = 6;
             this.label28.Text = "Min-StarDust For PowerUp:\r\n";
             // 
@@ -2373,20 +2373,20 @@ private void InitializeComponent()
             this.cbPowerUpType.Items.AddRange(new object[] {
             "IV",
             "CP"});
-            this.cbPowerUpType.Location = new System.Drawing.Point(218, 62);
+            this.cbPowerUpType.Location = new System.Drawing.Point(262, 70);
             this.cbPowerUpType.Margin = new System.Windows.Forms.Padding(2);
             this.cbPowerUpType.Name = "cbPowerUpType";
-            this.cbPowerUpType.Size = new System.Drawing.Size(74, 28);
+            this.cbPowerUpType.Size = new System.Drawing.Size(88, 33);
             this.cbPowerUpType.TabIndex = 9;
             this.cbPowerUpType.SelectionChangeCommitted += new System.EventHandler(this.CbPowerUpType_SelectionChangeCommitted);
             // 
             // label29
             // 
             this.label29.AutoSize = true;
-            this.label29.Location = new System.Drawing.Point(18, 66);
+            this.label29.Location = new System.Drawing.Point(22, 75);
             this.label29.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label29.Name = "label29";
-            this.label29.Size = new System.Drawing.Size(106, 20);
+            this.label29.Size = new System.Drawing.Size(129, 25);
             this.label29.TabIndex = 8;
             this.label29.Text = "PowerUp Type:";
             // 
@@ -2396,11 +2396,11 @@ private void InitializeComponent()
             | System.Windows.Forms.AnchorStyles.Left)));
             this.gbPUP.Controls.Add(this.clbPowerUp);
             this.gbPUP.Controls.Add(this.cbPowerUpAll);
-            this.gbPUP.Location = new System.Drawing.Point(602, 8);
-            this.gbPUP.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.gbPUP.Location = new System.Drawing.Point(722, 6);
+            this.gbPUP.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.gbPUP.Name = "gbPUP";
-            this.gbPUP.Padding = new System.Windows.Forms.Padding(2, 5, 2, 5);
-            this.gbPUP.Size = new System.Drawing.Size(338, 534);
+            this.gbPUP.Padding = new System.Windows.Forms.Padding(2, 6, 2, 6);
+            this.gbPUP.Size = new System.Drawing.Size(406, 546);
             this.gbPUP.TabIndex = 5;
             this.gbPUP.TabStop = false;
             this.gbPUP.Text = "Power Up";
@@ -2411,19 +2411,19 @@ private void InitializeComponent()
             this.clbPowerUp.Dock = System.Windows.Forms.DockStyle.Fill;
             this.clbPowerUp.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.clbPowerUp.FormattingEnabled = true;
-            this.clbPowerUp.Location = new System.Drawing.Point(2, 25);
-            this.clbPowerUp.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.clbPowerUp.Location = new System.Drawing.Point(2, 30);
+            this.clbPowerUp.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.clbPowerUp.Name = "clbPowerUp";
-            this.clbPowerUp.Size = new System.Drawing.Size(334, 504);
+            this.clbPowerUp.Size = new System.Drawing.Size(402, 510);
             this.clbPowerUp.TabIndex = 0;
             // 
             // cbPowerUpAll
             // 
             this.cbPowerUpAll.AutoSize = true;
-            this.cbPowerUpAll.Location = new System.Drawing.Point(162, 0);
-            this.cbPowerUpAll.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.cbPowerUpAll.Location = new System.Drawing.Point(230, 0);
+            this.cbPowerUpAll.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.cbPowerUpAll.Name = "cbPowerUpAll";
-            this.cbPowerUpAll.Size = new System.Drawing.Size(93, 24);
+            this.cbPowerUpAll.Size = new System.Drawing.Size(109, 29);
             this.cbPowerUpAll.TabIndex = 1;
             this.cbPowerUpAll.Text = "Select All";
             this.cbPowerUpAll.UseVisualStyleBackColor = true;
@@ -2432,10 +2432,10 @@ private void InitializeComponent()
             // cbAutoPowerUp
             // 
             this.cbAutoPowerUp.AutoSize = true;
-            this.cbAutoPowerUp.Location = new System.Drawing.Point(18, 8);
+            this.cbAutoPowerUp.Location = new System.Drawing.Point(22, 6);
             this.cbAutoPowerUp.Margin = new System.Windows.Forms.Padding(2);
             this.cbAutoPowerUp.Name = "cbAutoPowerUp";
-            this.cbAutoPowerUp.Size = new System.Drawing.Size(130, 24);
+            this.cbAutoPowerUp.Size = new System.Drawing.Size(158, 29);
             this.cbAutoPowerUp.TabIndex = 4;
             this.cbAutoPowerUp.Text = "Auto Power Up";
             this.cbAutoPowerUp.UseVisualStyleBackColor = true;
@@ -2444,14 +2444,13 @@ private void InitializeComponent()
             // 
             this.tabEvo.BackColor = System.Drawing.SystemColors.Control;
             this.tabEvo.Controls.Add(this.groupBox2);
-            this.tabEvo.Controls.Add(this.cbEvolveAll);
             this.tabEvo.Controls.Add(this.groupBox1);
             this.tabEvo.Controls.Add(this.groupBox5);
             this.tabEvo.Controls.Add(this.gbEvolve);
-            this.tabEvo.Location = new System.Drawing.Point(4, 29);
+            this.tabEvo.Location = new System.Drawing.Point(4, 34);
             this.tabEvo.Margin = new System.Windows.Forms.Padding(2);
             this.tabEvo.Name = "tabEvo";
-            this.tabEvo.Size = new System.Drawing.Size(946, 452);
+            this.tabEvo.Size = new System.Drawing.Size(1138, 546);
             this.tabEvo.TabIndex = 3;
             this.tabEvo.Text = "Evolve";
             // 
@@ -2461,11 +2460,11 @@ private void InitializeComponent()
             this.groupBox2.Controls.Add(this.tbEvolveApplyLuckyEggOnEvolutionCountValue);
             this.groupBox2.Controls.Add(this.cbEvolveApplyLuckyEggOnEvolutionCount);
             this.groupBox2.Controls.Add(this.cbEvolvePreserveMinCandiesFromFilter);
-            this.groupBox2.Location = new System.Drawing.Point(12, 338);
+            this.groupBox2.Location = new System.Drawing.Point(14, 402);
             this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox2.Size = new System.Drawing.Size(375, 100);
+            this.groupBox2.Size = new System.Drawing.Size(450, 120);
             this.groupBox2.TabIndex = 28;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "When Evolving";
@@ -2473,27 +2472,27 @@ private void InitializeComponent()
             // textBox12
             // 
             this.textBox12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.textBox12.Location = new System.Drawing.Point(228, 310);
+            this.textBox12.Location = new System.Drawing.Point(274, 372);
             this.textBox12.Margin = new System.Windows.Forms.Padding(2);
             this.textBox12.Name = "textBox12";
-            this.textBox12.Size = new System.Drawing.Size(126, 27);
+            this.textBox12.Size = new System.Drawing.Size(150, 31);
             this.textBox12.TabIndex = 23;
             // 
             // tbEvolveApplyLuckyEggOnEvolutionCountValue
             // 
-            this.tbEvolveApplyLuckyEggOnEvolutionCountValue.Location = new System.Drawing.Point(284, 54);
+            this.tbEvolveApplyLuckyEggOnEvolutionCountValue.Location = new System.Drawing.Point(341, 65);
             this.tbEvolveApplyLuckyEggOnEvolutionCountValue.Margin = new System.Windows.Forms.Padding(2);
             this.tbEvolveApplyLuckyEggOnEvolutionCountValue.Name = "tbEvolveApplyLuckyEggOnEvolutionCountValue";
-            this.tbEvolveApplyLuckyEggOnEvolutionCountValue.Size = new System.Drawing.Size(74, 27);
+            this.tbEvolveApplyLuckyEggOnEvolutionCountValue.Size = new System.Drawing.Size(88, 31);
             this.tbEvolveApplyLuckyEggOnEvolutionCountValue.TabIndex = 80;
             // 
             // cbEvolveApplyLuckyEggOnEvolutionCount
             // 
             this.cbEvolveApplyLuckyEggOnEvolutionCount.AutoSize = true;
-            this.cbEvolveApplyLuckyEggOnEvolutionCount.Location = new System.Drawing.Point(12, 46);
+            this.cbEvolveApplyLuckyEggOnEvolutionCount.Location = new System.Drawing.Point(14, 55);
             this.cbEvolveApplyLuckyEggOnEvolutionCount.Margin = new System.Windows.Forms.Padding(2);
             this.cbEvolveApplyLuckyEggOnEvolutionCount.Name = "cbEvolveApplyLuckyEggOnEvolutionCount";
-            this.cbEvolveApplyLuckyEggOnEvolutionCount.Size = new System.Drawing.Size(240, 44);
+            this.cbEvolveApplyLuckyEggOnEvolutionCount.Size = new System.Drawing.Size(289, 54);
             this.cbEvolveApplyLuckyEggOnEvolutionCount.TabIndex = 70;
             this.cbEvolveApplyLuckyEggOnEvolutionCount.Text = "Apply Lucky Egg If There Are At\r\nLeast This Many Evolutions:";
             this.cbEvolveApplyLuckyEggOnEvolutionCount.UseVisualStyleBackColor = true;
@@ -2501,37 +2500,25 @@ private void InitializeComponent()
             // cbEvolvePreserveMinCandiesFromFilter
             // 
             this.cbEvolvePreserveMinCandiesFromFilter.AutoSize = true;
-            this.cbEvolvePreserveMinCandiesFromFilter.Location = new System.Drawing.Point(12, 25);
+            this.cbEvolvePreserveMinCandiesFromFilter.Location = new System.Drawing.Point(14, 30);
             this.cbEvolvePreserveMinCandiesFromFilter.Margin = new System.Windows.Forms.Padding(2);
             this.cbEvolvePreserveMinCandiesFromFilter.Name = "cbEvolvePreserveMinCandiesFromFilter";
-            this.cbEvolvePreserveMinCandiesFromFilter.Size = new System.Drawing.Size(351, 24);
+            this.cbEvolvePreserveMinCandiesFromFilter.Size = new System.Drawing.Size(419, 29);
             this.cbEvolvePreserveMinCandiesFromFilter.TabIndex = 65;
             this.cbEvolvePreserveMinCandiesFromFilter.Text = "Preserve Candies Defined As Min In Filter Details";
             this.cbEvolvePreserveMinCandiesFromFilter.UseVisualStyleBackColor = true;
             // 
-            // cbEvolveAll
-            // 
-            this.cbEvolveAll.AutoSize = true;
-            this.cbEvolveAll.Location = new System.Drawing.Point(829, 8);
-            this.cbEvolveAll.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
-            this.cbEvolveAll.Name = "cbEvolveAll";
-            this.cbEvolveAll.Size = new System.Drawing.Size(93, 24);
-            this.cbEvolveAll.TabIndex = 100;
-            this.cbEvolveAll.Text = "Select All";
-            this.cbEvolveAll.UseVisualStyleBackColor = true;
-            this.cbEvolveAll.CheckedChanged += new System.EventHandler(this.CbSelectAllEvolve_CheckedChanged);
-            // 
             // groupBox1
             // 
             this.groupBox1.Controls.Add(this.cbEvolvePokemonsThatMatchFilter);
             this.groupBox1.Controls.Add(this.label33);
             this.groupBox1.Controls.Add(this.cbEvolveAnyPokemonAboveIv);
             this.groupBox1.Controls.Add(this.tbEvolveAnyPokemonAboveIvValue);
-            this.groupBox1.Location = new System.Drawing.Point(12, 8);
+            this.groupBox1.Location = new System.Drawing.Point(14, 6);
             this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox1.Size = new System.Drawing.Size(375, 146);
+            this.groupBox1.Size = new System.Drawing.Size(450, 175);
             this.groupBox1.TabIndex = 28;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "Evolve Pokemons Filter";
@@ -2539,10 +2526,10 @@ private void InitializeComponent()
             // cbEvolvePokemonsThatMatchFilter
             // 
             this.cbEvolvePokemonsThatMatchFilter.AutoSize = true;
-            this.cbEvolvePokemonsThatMatchFilter.Location = new System.Drawing.Point(12, 56);
+            this.cbEvolvePokemonsThatMatchFilter.Location = new System.Drawing.Point(14, 67);
             this.cbEvolvePokemonsThatMatchFilter.Margin = new System.Windows.Forms.Padding(2);
             this.cbEvolvePokemonsThatMatchFilter.Name = "cbEvolvePokemonsThatMatchFilter";
-            this.cbEvolvePokemonsThatMatchFilter.Size = new System.Drawing.Size(228, 24);
+            this.cbEvolvePokemonsThatMatchFilter.Size = new System.Drawing.Size(275, 29);
             this.cbEvolvePokemonsThatMatchFilter.TabIndex = 15;
             this.cbEvolvePokemonsThatMatchFilter.Text = "Evolve Pokemons By Filter List";
             this.cbEvolvePokemonsThatMatchFilter.UseVisualStyleBackColor = true;
@@ -2552,10 +2539,10 @@ private void InitializeComponent()
             this.label33.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label33.AutoSize = true;
             this.label33.Enabled = false;
-            this.label33.Location = new System.Drawing.Point(9, 91);
+            this.label33.Location = new System.Drawing.Point(11, 109);
             this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label33.Name = "label33";
-            this.label33.Size = new System.Drawing.Size(340, 40);
+            this.label33.Size = new System.Drawing.Size(402, 50);
             this.label33.TabIndex = 20;
             this.label33.Text = "Note: filter details for each Pokemon are available\r\nin your config.json, section" +
     " PokemonEvolveFilter";
@@ -2563,20 +2550,20 @@ private void InitializeComponent()
             // cbEvolveAnyPokemonAboveIv
             // 
             this.cbEvolveAnyPokemonAboveIv.AutoSize = true;
-            this.cbEvolveAnyPokemonAboveIv.Location = new System.Drawing.Point(12, 28);
+            this.cbEvolveAnyPokemonAboveIv.Location = new System.Drawing.Point(14, 34);
             this.cbEvolveAnyPokemonAboveIv.Margin = new System.Windows.Forms.Padding(2);
             this.cbEvolveAnyPokemonAboveIv.Name = "cbEvolveAnyPokemonAboveIv";
-            this.cbEvolveAnyPokemonAboveIv.Size = new System.Drawing.Size(247, 24);
+            this.cbEvolveAnyPokemonAboveIv.Size = new System.Drawing.Size(302, 29);
             this.cbEvolveAnyPokemonAboveIv.TabIndex = 5;
             this.cbEvolveAnyPokemonAboveIv.Text = "Evolve Any Pokemon Above IV%:";
             this.cbEvolveAnyPokemonAboveIv.UseVisualStyleBackColor = true;
             // 
             // tbEvolveAnyPokemonAboveIvValue
             // 
-            this.tbEvolveAnyPokemonAboveIvValue.Location = new System.Drawing.Point(284, 25);
+            this.tbEvolveAnyPokemonAboveIvValue.Location = new System.Drawing.Point(341, 30);
             this.tbEvolveAnyPokemonAboveIvValue.Margin = new System.Windows.Forms.Padding(2);
             this.tbEvolveAnyPokemonAboveIvValue.Name = "tbEvolveAnyPokemonAboveIvValue";
-            this.tbEvolveAnyPokemonAboveIvValue.Size = new System.Drawing.Size(74, 27);
+            this.tbEvolveAnyPokemonAboveIvValue.Size = new System.Drawing.Size(88, 31);
             this.tbEvolveAnyPokemonAboveIvValue.TabIndex = 10;
             // 
             // groupBox5
@@ -2590,11 +2577,11 @@ private void InitializeComponent()
             this.groupBox5.Controls.Add(this.cbTriggerEvolveAsSoonAsFilterIsMatched);
             this.groupBox5.Controls.Add(this.cbTriggerEvolveOnEvolutionCount);
             this.groupBox5.Controls.Add(this.cbTriggerEvolveOnStorageUsagePercentage);
-            this.groupBox5.Location = new System.Drawing.Point(12, 159);
+            this.groupBox5.Location = new System.Drawing.Point(14, 187);
             this.groupBox5.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox5.Name = "groupBox5";
             this.groupBox5.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox5.Size = new System.Drawing.Size(375, 174);
+            this.groupBox5.Size = new System.Drawing.Size(450, 209);
             this.groupBox5.TabIndex = 21;
             this.groupBox5.TabStop = false;
             this.groupBox5.Text = "Evolve Pokemons Trigger";
@@ -2602,65 +2589,65 @@ private void InitializeComponent()
             // cbTriggerEvolveIfLuckyEggIsActive
             // 
             this.cbTriggerEvolveIfLuckyEggIsActive.AutoSize = true;
-            this.cbTriggerEvolveIfLuckyEggIsActive.Location = new System.Drawing.Point(12, 144);
+            this.cbTriggerEvolveIfLuckyEggIsActive.Location = new System.Drawing.Point(14, 173);
             this.cbTriggerEvolveIfLuckyEggIsActive.Margin = new System.Windows.Forms.Padding(2);
             this.cbTriggerEvolveIfLuckyEggIsActive.Name = "cbTriggerEvolveIfLuckyEggIsActive";
-            this.cbTriggerEvolveIfLuckyEggIsActive.Size = new System.Drawing.Size(169, 24);
+            this.cbTriggerEvolveIfLuckyEggIsActive.Size = new System.Drawing.Size(205, 29);
             this.cbTriggerEvolveIfLuckyEggIsActive.TabIndex = 60;
             this.cbTriggerEvolveIfLuckyEggIsActive.Text = "If Lucky Egg Is Active";
             this.cbTriggerEvolveIfLuckyEggIsActive.UseVisualStyleBackColor = true;
             // 
             // tbTriggerEvolveOnStorageUsageAbsoluteValue
             // 
-            this.tbTriggerEvolveOnStorageUsageAbsoluteValue.Location = new System.Drawing.Point(284, 112);
+            this.tbTriggerEvolveOnStorageUsageAbsoluteValue.Location = new System.Drawing.Point(341, 134);
             this.tbTriggerEvolveOnStorageUsageAbsoluteValue.Margin = new System.Windows.Forms.Padding(2);
             this.tbTriggerEvolveOnStorageUsageAbsoluteValue.Name = "tbTriggerEvolveOnStorageUsageAbsoluteValue";
-            this.tbTriggerEvolveOnStorageUsageAbsoluteValue.Size = new System.Drawing.Size(74, 27);
+            this.tbTriggerEvolveOnStorageUsageAbsoluteValue.Size = new System.Drawing.Size(88, 31);
             this.tbTriggerEvolveOnStorageUsageAbsoluteValue.TabIndex = 55;
             // 
             // cbTriggerEvolveOnStorageUsageAbsolute
             // 
             this.cbTriggerEvolveOnStorageUsageAbsolute.AutoSize = true;
-            this.cbTriggerEvolveOnStorageUsageAbsolute.Location = new System.Drawing.Point(12, 115);
+            this.cbTriggerEvolveOnStorageUsageAbsolute.Location = new System.Drawing.Point(14, 138);
             this.cbTriggerEvolveOnStorageUsageAbsolute.Margin = new System.Windows.Forms.Padding(2);
             this.cbTriggerEvolveOnStorageUsageAbsolute.Name = "cbTriggerEvolveOnStorageUsageAbsolute";
-            this.cbTriggerEvolveOnStorageUsageAbsolute.Size = new System.Drawing.Size(269, 24);
+            this.cbTriggerEvolveOnStorageUsageAbsolute.Size = new System.Drawing.Size(327, 29);
             this.cbTriggerEvolveOnStorageUsageAbsolute.TabIndex = 50;
             this.cbTriggerEvolveOnStorageUsageAbsolute.Text = "If Storage Has This Many Pokemons:";
             this.cbTriggerEvolveOnStorageUsageAbsolute.UseVisualStyleBackColor = true;
             // 
             // tbTriggerEvolveOnStorageUsagePercentageValue
             // 
-            this.tbTriggerEvolveOnStorageUsagePercentageValue.Location = new System.Drawing.Point(284, 84);
+            this.tbTriggerEvolveOnStorageUsagePercentageValue.Location = new System.Drawing.Point(341, 101);
             this.tbTriggerEvolveOnStorageUsagePercentageValue.Margin = new System.Windows.Forms.Padding(2);
             this.tbTriggerEvolveOnStorageUsagePercentageValue.Name = "tbTriggerEvolveOnStorageUsagePercentageValue";
-            this.tbTriggerEvolveOnStorageUsagePercentageValue.Size = new System.Drawing.Size(74, 27);
+            this.tbTriggerEvolveOnStorageUsagePercentageValue.Size = new System.Drawing.Size(88, 31);
             this.tbTriggerEvolveOnStorageUsagePercentageValue.TabIndex = 45;
             // 
             // tbTriggerEvolveOnEvolutionCountValue
             // 
-            this.tbTriggerEvolveOnEvolutionCountValue.Location = new System.Drawing.Point(284, 55);
+            this.tbTriggerEvolveOnEvolutionCountValue.Location = new System.Drawing.Point(341, 66);
             this.tbTriggerEvolveOnEvolutionCountValue.Margin = new System.Windows.Forms.Padding(2);
             this.tbTriggerEvolveOnEvolutionCountValue.Name = "tbTriggerEvolveOnEvolutionCountValue";
-            this.tbTriggerEvolveOnEvolutionCountValue.Size = new System.Drawing.Size(74, 27);
+            this.tbTriggerEvolveOnEvolutionCountValue.Size = new System.Drawing.Size(88, 31);
             this.tbTriggerEvolveOnEvolutionCountValue.TabIndex = 35;
             // 
             // textBox2
             // 
             this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.textBox2.Location = new System.Drawing.Point(228, 310);
+            this.textBox2.Location = new System.Drawing.Point(274, 372);
             this.textBox2.Margin = new System.Windows.Forms.Padding(2);
             this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(126, 27);
+            this.textBox2.Size = new System.Drawing.Size(150, 31);
             this.textBox2.TabIndex = 23;
             // 
             // cbTriggerEvolveAsSoonAsFilterIsMatched
             // 
             this.cbTriggerEvolveAsSoonAsFilterIsMatched.AutoSize = true;
-            this.cbTriggerEvolveAsSoonAsFilterIsMatched.Location = new System.Drawing.Point(12, 28);
+            this.cbTriggerEvolveAsSoonAsFilterIsMatched.Location = new System.Drawing.Point(14, 34);
             this.cbTriggerEvolveAsSoonAsFilterIsMatched.Margin = new System.Windows.Forms.Padding(2);
             this.cbTriggerEvolveAsSoonAsFilterIsMatched.Name = "cbTriggerEvolveAsSoonAsFilterIsMatched";
-            this.cbTriggerEvolveAsSoonAsFilterIsMatched.Size = new System.Drawing.Size(218, 24);
+            this.cbTriggerEvolveAsSoonAsFilterIsMatched.Size = new System.Drawing.Size(265, 29);
             this.cbTriggerEvolveAsSoonAsFilterIsMatched.TabIndex = 25;
             this.cbTriggerEvolveAsSoonAsFilterIsMatched.Text = "As Soon As Filter Is Matched";
             this.cbTriggerEvolveAsSoonAsFilterIsMatched.UseVisualStyleBackColor = true;
@@ -2668,10 +2655,10 @@ private void InitializeComponent()
             // cbTriggerEvolveOnEvolutionCount
             // 
             this.cbTriggerEvolveOnEvolutionCount.AutoSize = true;
-            this.cbTriggerEvolveOnEvolutionCount.Location = new System.Drawing.Point(12, 58);
+            this.cbTriggerEvolveOnEvolutionCount.Location = new System.Drawing.Point(14, 70);
             this.cbTriggerEvolveOnEvolutionCount.Margin = new System.Windows.Forms.Padding(2);
             this.cbTriggerEvolveOnEvolutionCount.Name = "cbTriggerEvolveOnEvolutionCount";
-            this.cbTriggerEvolveOnEvolutionCount.Size = new System.Drawing.Size(253, 24);
+            this.cbTriggerEvolveOnEvolutionCount.Size = new System.Drawing.Size(305, 29);
             this.cbTriggerEvolveOnEvolutionCount.TabIndex = 30;
             this.cbTriggerEvolveOnEvolutionCount.Text = "If There Are This Many Evolutions:";
             this.cbTriggerEvolveOnEvolutionCount.UseVisualStyleBackColor = true;
@@ -2679,10 +2666,10 @@ private void InitializeComponent()
             // cbTriggerEvolveOnStorageUsagePercentage
             // 
             this.cbTriggerEvolveOnStorageUsagePercentage.AutoSize = true;
-            this.cbTriggerEvolveOnStorageUsagePercentage.Location = new System.Drawing.Point(12, 86);
+            this.cbTriggerEvolveOnStorageUsagePercentage.Location = new System.Drawing.Point(14, 103);
             this.cbTriggerEvolveOnStorageUsagePercentage.Margin = new System.Windows.Forms.Padding(2);
             this.cbTriggerEvolveOnStorageUsagePercentage.Name = "cbTriggerEvolveOnStorageUsagePercentage";
-            this.cbTriggerEvolveOnStorageUsagePercentage.Size = new System.Drawing.Size(186, 24);
+            this.cbTriggerEvolveOnStorageUsagePercentage.Size = new System.Drawing.Size(225, 29);
             this.cbTriggerEvolveOnStorageUsagePercentage.TabIndex = 40;
             this.cbTriggerEvolveOnStorageUsagePercentage.Text = "If Storage Is Used To %:";
             this.cbTriggerEvolveOnStorageUsagePercentage.UseVisualStyleBackColor = true;
@@ -2692,14 +2679,15 @@ private void InitializeComponent()
             this.gbEvolve.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.gbEvolve.Controls.Add(this.clbEvolve);
-            this.gbEvolve.Location = new System.Drawing.Point(602, 8);
-            this.gbEvolve.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.gbEvolve.Controls.Add(this.cbEvolveAll);
+            this.gbEvolve.Location = new System.Drawing.Point(722, 6);
+            this.gbEvolve.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.gbEvolve.Name = "gbEvolve";
-            this.gbEvolve.Padding = new System.Windows.Forms.Padding(2, 5, 2, 5);
-            this.gbEvolve.Size = new System.Drawing.Size(338, 534);
+            this.gbEvolve.Padding = new System.Windows.Forms.Padding(2, 6, 2, 6);
+            this.gbEvolve.Size = new System.Drawing.Size(406, 546);
             this.gbEvolve.TabIndex = 90;
             this.gbEvolve.TabStop = false;
-            this.gbEvolve.Text = "Evolve Filter List (00/000)";
+            this.gbEvolve.Text = "Evolve Filter List (000/000)";
             // 
             // clbEvolve
             // 
@@ -2707,21 +2695,33 @@ private void InitializeComponent()
             this.clbEvolve.Dock = System.Windows.Forms.DockStyle.Fill;
             this.clbEvolve.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.clbEvolve.FormattingEnabled = true;
-            this.clbEvolve.Location = new System.Drawing.Point(2, 25);
-            this.clbEvolve.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.clbEvolve.Location = new System.Drawing.Point(2, 30);
+            this.clbEvolve.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.clbEvolve.Name = "clbEvolve";
-            this.clbEvolve.Size = new System.Drawing.Size(334, 504);
+            this.clbEvolve.Size = new System.Drawing.Size(402, 510);
             this.clbEvolve.TabIndex = 0;
             // 
+            // cbEvolveAll
+            // 
+            this.cbEvolveAll.AutoSize = true;
+            this.cbEvolveAll.Location = new System.Drawing.Point(230, 0);
+            this.cbEvolveAll.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
+            this.cbEvolveAll.Name = "cbEvolveAll";
+            this.cbEvolveAll.Size = new System.Drawing.Size(109, 29);
+            this.cbEvolveAll.TabIndex = 100;
+            this.cbEvolveAll.Text = "Select All";
+            this.cbEvolveAll.UseVisualStyleBackColor = true;
+            this.cbEvolveAll.CheckedChanged += new System.EventHandler(this.CbSelectAllEvolve_CheckedChanged);
+            // 
             // tabSnipePokemonFilter
             // 
             this.tabSnipePokemonFilter.BackColor = System.Drawing.SystemColors.Control;
             this.tabSnipePokemonFilter.Controls.Add(this.gbSnipe);
-            this.tabSnipePokemonFilter.Location = new System.Drawing.Point(4, 29);
+            this.tabSnipePokemonFilter.Location = new System.Drawing.Point(4, 34);
             this.tabSnipePokemonFilter.Margin = new System.Windows.Forms.Padding(2);
             this.tabSnipePokemonFilter.Name = "tabSnipePokemonFilter";
             this.tabSnipePokemonFilter.Padding = new System.Windows.Forms.Padding(2);
-            this.tabSnipePokemonFilter.Size = new System.Drawing.Size(946, 452);
+            this.tabSnipePokemonFilter.Size = new System.Drawing.Size(1138, 546);
             this.tabSnipePokemonFilter.TabIndex = 5;
             this.tabSnipePokemonFilter.Text = "SnipePokemonFilter";
             // 
@@ -2731,11 +2731,11 @@ private void InitializeComponent()
             | System.Windows.Forms.AnchorStyles.Left)));
             this.gbSnipe.Controls.Add(this.clbSnipePokemonFilter);
             this.gbSnipe.Controls.Add(this.cbSnipePokemonFilterAll);
-            this.gbSnipe.Location = new System.Drawing.Point(602, 8);
-            this.gbSnipe.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.gbSnipe.Location = new System.Drawing.Point(722, 6);
+            this.gbSnipe.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.gbSnipe.Name = "gbSnipe";
-            this.gbSnipe.Padding = new System.Windows.Forms.Padding(2, 5, 2, 5);
-            this.gbSnipe.Size = new System.Drawing.Size(338, 534);
+            this.gbSnipe.Padding = new System.Windows.Forms.Padding(2, 6, 2, 6);
+            this.gbSnipe.Size = new System.Drawing.Size(406, 546);
             this.gbSnipe.TabIndex = 17;
             this.gbSnipe.TabStop = false;
             this.gbSnipe.Text = "Snipe";
@@ -2746,19 +2746,19 @@ private void InitializeComponent()
             this.clbSnipePokemonFilter.Dock = System.Windows.Forms.DockStyle.Fill;
             this.clbSnipePokemonFilter.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.clbSnipePokemonFilter.FormattingEnabled = true;
-            this.clbSnipePokemonFilter.Location = new System.Drawing.Point(2, 25);
-            this.clbSnipePokemonFilter.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.clbSnipePokemonFilter.Location = new System.Drawing.Point(2, 30);
+            this.clbSnipePokemonFilter.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.clbSnipePokemonFilter.Name = "clbSnipePokemonFilter";
-            this.clbSnipePokemonFilter.Size = new System.Drawing.Size(334, 504);
+            this.clbSnipePokemonFilter.Size = new System.Drawing.Size(402, 510);
             this.clbSnipePokemonFilter.TabIndex = 0;
             // 
             // cbSnipePokemonFilterAll
             // 
             this.cbSnipePokemonFilterAll.AutoSize = true;
-            this.cbSnipePokemonFilterAll.Location = new System.Drawing.Point(162, 0);
+            this.cbSnipePokemonFilterAll.Location = new System.Drawing.Point(230, 0);
             this.cbSnipePokemonFilterAll.Margin = new System.Windows.Forms.Padding(2);
             this.cbSnipePokemonFilterAll.Name = "cbSnipePokemonFilterAll";
-            this.cbSnipePokemonFilterAll.Size = new System.Drawing.Size(93, 24);
+            this.cbSnipePokemonFilterAll.Size = new System.Drawing.Size(109, 29);
             this.cbSnipePokemonFilterAll.TabIndex = 0;
             this.cbSnipePokemonFilterAll.Text = "Select All";
             this.cbSnipePokemonFilterAll.UseVisualStyleBackColor = true;
@@ -2771,21 +2771,21 @@ private void InitializeComponent()
             this.tabItems.Controls.Add(this.cbUseLuckyEggConstantly);
             this.tabItems.Controls.Add(this.groupBox14);
             this.tabItems.Controls.Add(this.groupBox13);
-            this.tabItems.Location = new System.Drawing.Point(4, 29);
-            this.tabItems.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.tabItems.Location = new System.Drawing.Point(4, 34);
+            this.tabItems.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.tabItems.Name = "tabItems";
-            this.tabItems.Padding = new System.Windows.Forms.Padding(2, 5, 2, 5);
-            this.tabItems.Size = new System.Drawing.Size(954, 485);
+            this.tabItems.Padding = new System.Windows.Forms.Padding(2, 6, 2, 6);
+            this.tabItems.Size = new System.Drawing.Size(1146, 584);
             this.tabItems.TabIndex = 2;
             this.tabItems.Text = "Items";
             // 
             // cbUseIncenseConstantly
             // 
             this.cbUseIncenseConstantly.AutoSize = true;
-            this.cbUseIncenseConstantly.Location = new System.Drawing.Point(22, 42);
+            this.cbUseIncenseConstantly.Location = new System.Drawing.Point(26, 50);
             this.cbUseIncenseConstantly.Margin = new System.Windows.Forms.Padding(2);
             this.cbUseIncenseConstantly.Name = "cbUseIncenseConstantly";
-            this.cbUseIncenseConstantly.Size = new System.Drawing.Size(181, 24);
+            this.cbUseIncenseConstantly.Size = new System.Drawing.Size(220, 29);
             this.cbUseIncenseConstantly.TabIndex = 2;
             this.cbUseIncenseConstantly.Text = "Use Incense Constantly";
             this.cbUseIncenseConstantly.UseVisualStyleBackColor = true;
@@ -2793,10 +2793,10 @@ private void InitializeComponent()
             // cbUseLuckyEggConstantly
             // 
             this.cbUseLuckyEggConstantly.AutoSize = true;
-            this.cbUseLuckyEggConstantly.Location = new System.Drawing.Point(22, 12);
+            this.cbUseLuckyEggConstantly.Location = new System.Drawing.Point(26, 14);
             this.cbUseLuckyEggConstantly.Margin = new System.Windows.Forms.Padding(2);
             this.cbUseLuckyEggConstantly.Name = "cbUseLuckyEggConstantly";
-            this.cbUseLuckyEggConstantly.Size = new System.Drawing.Size(198, 24);
+            this.cbUseLuckyEggConstantly.Size = new System.Drawing.Size(241, 29);
             this.cbUseLuckyEggConstantly.TabIndex = 2;
             this.cbUseLuckyEggConstantly.Text = "Use Lucky Egg Constantly";
             this.cbUseLuckyEggConstantly.UseVisualStyleBackColor = true;
@@ -2806,11 +2806,11 @@ private void InitializeComponent()
             this.groupBox14.Controls.Add(this.cbVerboseRecycling);
             this.groupBox14.Controls.Add(this.label1);
             this.groupBox14.Controls.Add(this.tbRecycleInventoryAtUsagePercentage);
-            this.groupBox14.Location = new System.Drawing.Point(10, 235);
+            this.groupBox14.Location = new System.Drawing.Point(12, 282);
             this.groupBox14.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox14.Name = "groupBox14";
             this.groupBox14.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox14.Size = new System.Drawing.Size(312, 100);
+            this.groupBox14.Size = new System.Drawing.Size(374, 120);
             this.groupBox14.TabIndex = 18;
             this.groupBox14.TabStop = false;
             this.groupBox14.Text = "Recycle";
@@ -2818,10 +2818,10 @@ private void InitializeComponent()
             // cbVerboseRecycling
             // 
             this.cbVerboseRecycling.AutoSize = true;
-            this.cbVerboseRecycling.Location = new System.Drawing.Point(12, 25);
+            this.cbVerboseRecycling.Location = new System.Drawing.Point(14, 30);
             this.cbVerboseRecycling.Margin = new System.Windows.Forms.Padding(2);
             this.cbVerboseRecycling.Name = "cbVerboseRecycling";
-            this.cbVerboseRecycling.Size = new System.Drawing.Size(151, 24);
+            this.cbVerboseRecycling.Size = new System.Drawing.Size(180, 29);
             this.cbVerboseRecycling.TabIndex = 16;
             this.cbVerboseRecycling.Text = "Verbose Recycling";
             this.cbVerboseRecycling.UseVisualStyleBackColor = true;
@@ -2829,20 +2829,20 @@ private void InitializeComponent()
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(8, 60);
+            this.label1.Location = new System.Drawing.Point(10, 72);
             this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(207, 20);
+            this.label1.Size = new System.Drawing.Size(250, 25);
             this.label1.TabIndex = 14;
             this.label1.Text = "Recycle Inventory At Usage %:\r\n";
             // 
             // tbRecycleInventoryAtUsagePercentage
             // 
             this.tbRecycleInventoryAtUsagePercentage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbRecycleInventoryAtUsagePercentage.Location = new System.Drawing.Point(232, 52);
-            this.tbRecycleInventoryAtUsagePercentage.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbRecycleInventoryAtUsagePercentage.Location = new System.Drawing.Point(278, 62);
+            this.tbRecycleInventoryAtUsagePercentage.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbRecycleInventoryAtUsagePercentage.Name = "tbRecycleInventoryAtUsagePercentage";
-            this.tbRecycleInventoryAtUsagePercentage.Size = new System.Drawing.Size(74, 27);
+            this.tbRecycleInventoryAtUsagePercentage.Size = new System.Drawing.Size(88, 31);
             this.tbRecycleInventoryAtUsagePercentage.TabIndex = 15;
             // 
             // groupBox13
@@ -2855,11 +2855,11 @@ private void InitializeComponent()
             this.groupBox13.Controls.Add(this.tbTotalAmountOfRevivesToKeep);
             this.groupBox13.Controls.Add(this.label46);
             this.groupBox13.Controls.Add(this.tbTotalAmountOfBerriesToKeep);
-            this.groupBox13.Location = new System.Drawing.Point(10, 72);
+            this.groupBox13.Location = new System.Drawing.Point(12, 86);
             this.groupBox13.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox13.Name = "groupBox13";
             this.groupBox13.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox13.Size = new System.Drawing.Size(312, 162);
+            this.groupBox13.Size = new System.Drawing.Size(374, 194);
             this.groupBox13.TabIndex = 17;
             this.groupBox13.TabStop = false;
             this.groupBox13.Text = "Amount to Keep";
@@ -2867,77 +2867,77 @@ private void InitializeComponent()
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(12, 30);
+            this.label5.Location = new System.Drawing.Point(14, 36);
             this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(169, 20);
+            this.label5.Size = new System.Drawing.Size(199, 25);
             this.label5.TabIndex = 14;
             this.label5.Text = "Total Pokeballs To Keep:";
             // 
             // tbTotalAmountOfPokeballsToKeep
             // 
             this.tbTotalAmountOfPokeballsToKeep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbTotalAmountOfPokeballsToKeep.Location = new System.Drawing.Point(232, 28);
-            this.tbTotalAmountOfPokeballsToKeep.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbTotalAmountOfPokeballsToKeep.Location = new System.Drawing.Point(278, 34);
+            this.tbTotalAmountOfPokeballsToKeep.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbTotalAmountOfPokeballsToKeep.Name = "tbTotalAmountOfPokeballsToKeep";
-            this.tbTotalAmountOfPokeballsToKeep.Size = new System.Drawing.Size(74, 27);
+            this.tbTotalAmountOfPokeballsToKeep.Size = new System.Drawing.Size(88, 31);
             this.tbTotalAmountOfPokeballsToKeep.TabIndex = 15;
             // 
             // label44
             // 
             this.label44.AutoSize = true;
-            this.label44.Location = new System.Drawing.Point(12, 62);
+            this.label44.Location = new System.Drawing.Point(14, 74);
             this.label44.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label44.Name = "label44";
-            this.label44.Size = new System.Drawing.Size(155, 20);
+            this.label44.Size = new System.Drawing.Size(184, 25);
             this.label44.TabIndex = 14;
             this.label44.Text = "Total Potions To Keep:\r\n";
             // 
             // tbTotalAmountOfPotionsToKeep
             // 
             this.tbTotalAmountOfPotionsToKeep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbTotalAmountOfPotionsToKeep.Location = new System.Drawing.Point(232, 59);
-            this.tbTotalAmountOfPotionsToKeep.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbTotalAmountOfPotionsToKeep.Location = new System.Drawing.Point(278, 71);
+            this.tbTotalAmountOfPotionsToKeep.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbTotalAmountOfPotionsToKeep.Name = "tbTotalAmountOfPotionsToKeep";
-            this.tbTotalAmountOfPotionsToKeep.Size = new System.Drawing.Size(74, 27);
+            this.tbTotalAmountOfPotionsToKeep.Size = new System.Drawing.Size(88, 31);
             this.tbTotalAmountOfPotionsToKeep.TabIndex = 15;
             // 
             // label45
             // 
             this.label45.AutoSize = true;
-            this.label45.Location = new System.Drawing.Point(12, 92);
+            this.label45.Location = new System.Drawing.Point(14, 110);
             this.label45.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label45.Name = "label45";
-            this.label45.Size = new System.Drawing.Size(156, 20);
+            this.label45.Size = new System.Drawing.Size(183, 25);
             this.label45.TabIndex = 14;
             this.label45.Text = "Total Revives To Keep:";
             // 
             // tbTotalAmountOfRevivesToKeep
             // 
             this.tbTotalAmountOfRevivesToKeep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbTotalAmountOfRevivesToKeep.Location = new System.Drawing.Point(232, 89);
-            this.tbTotalAmountOfRevivesToKeep.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbTotalAmountOfRevivesToKeep.Location = new System.Drawing.Point(278, 107);
+            this.tbTotalAmountOfRevivesToKeep.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbTotalAmountOfRevivesToKeep.Name = "tbTotalAmountOfRevivesToKeep";
-            this.tbTotalAmountOfRevivesToKeep.Size = new System.Drawing.Size(74, 27);
+            this.tbTotalAmountOfRevivesToKeep.Size = new System.Drawing.Size(88, 31);
             this.tbTotalAmountOfRevivesToKeep.TabIndex = 15;
             // 
             // label46
             // 
             this.label46.AutoSize = true;
-            this.label46.Location = new System.Drawing.Point(12, 122);
+            this.label46.Location = new System.Drawing.Point(14, 146);
             this.label46.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label46.Name = "label46";
-            this.label46.Size = new System.Drawing.Size(152, 20);
+            this.label46.Size = new System.Drawing.Size(177, 25);
             this.label46.TabIndex = 14;
             this.label46.Text = "Total Berries To Keep:\r\n";
             // 
             // tbTotalAmountOfBerriesToKeep
             // 
             this.tbTotalAmountOfBerriesToKeep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbTotalAmountOfBerriesToKeep.Location = new System.Drawing.Point(232, 120);
-            this.tbTotalAmountOfBerriesToKeep.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbTotalAmountOfBerriesToKeep.Location = new System.Drawing.Point(278, 144);
+            this.tbTotalAmountOfBerriesToKeep.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbTotalAmountOfBerriesToKeep.Name = "tbTotalAmountOfBerriesToKeep";
-            this.tbTotalAmountOfBerriesToKeep.Size = new System.Drawing.Size(74, 27);
+            this.tbTotalAmountOfBerriesToKeep.Size = new System.Drawing.Size(88, 31);
             this.tbTotalAmountOfBerriesToKeep.TabIndex = 15;
             // 
             // tabAdvSetting
@@ -2949,10 +2949,10 @@ private void InitializeComponent()
             this.tabAdvSetting.Controls.Add(this.groupBox16);
             this.tabAdvSetting.Controls.Add(this.groupBox15);
             this.tabAdvSetting.Controls.Add(this.groupBox18);
-            this.tabAdvSetting.Location = new System.Drawing.Point(4, 29);
+            this.tabAdvSetting.Location = new System.Drawing.Point(4, 34);
             this.tabAdvSetting.Margin = new System.Windows.Forms.Padding(2);
             this.tabAdvSetting.Name = "tabAdvSetting";
-            this.tabAdvSetting.Size = new System.Drawing.Size(954, 485);
+            this.tabAdvSetting.Size = new System.Drawing.Size(1146, 584);
             this.tabAdvSetting.TabIndex = 4;
             this.tabAdvSetting.Text = "Advanced Settings";
             // 
@@ -2982,11 +2982,11 @@ private void InitializeComponent()
             this.groupBox22.Controls.Add(this.tbOnLimitPauseTimes);
             this.groupBox22.Controls.Add(this.cbSwitchOnPokestopLimit);
             this.groupBox22.Controls.Add(this.cbSwitchOnCatchLimit);
-            this.groupBox22.Location = new System.Drawing.Point(662, 10);
+            this.groupBox22.Location = new System.Drawing.Point(794, 12);
             this.groupBox22.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox22.Name = "groupBox22";
             this.groupBox22.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox22.Size = new System.Drawing.Size(282, 468);
+            this.groupBox22.Size = new System.Drawing.Size(338, 562);
             this.groupBox22.TabIndex = 22;
             this.groupBox22.TabStop = false;
             this.groupBox22.Text = "Multi Bot Config";
@@ -2994,29 +2994,29 @@ private void InitializeComponent()
             // tbCatchFleeCount
             // 
             this.tbCatchFleeCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbCatchFleeCount.Location = new System.Drawing.Point(195, 425);
+            this.tbCatchFleeCount.Location = new System.Drawing.Point(234, 510);
             this.tbCatchFleeCount.Margin = new System.Windows.Forms.Padding(2);
             this.tbCatchFleeCount.Name = "tbCatchFleeCount";
-            this.tbCatchFleeCount.Size = new System.Drawing.Size(74, 27);
+            this.tbCatchFleeCount.Size = new System.Drawing.Size(88, 31);
             this.tbCatchFleeCount.TabIndex = 36;
             // 
             // label78
             // 
             this.label78.AutoSize = true;
-            this.label78.Location = new System.Drawing.Point(10, 428);
+            this.label78.Location = new System.Drawing.Point(12, 514);
             this.label78.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label78.Name = "label78";
-            this.label78.Size = new System.Drawing.Size(123, 20);
+            this.label78.Size = new System.Drawing.Size(149, 25);
             this.label78.TabIndex = 35;
             this.label78.Text = "Catch Flee Count:";
             // 
             // cbSelectAccountOnStartUp
             // 
             this.cbSelectAccountOnStartUp.AutoSize = true;
-            this.cbSelectAccountOnStartUp.Location = new System.Drawing.Point(12, 398);
+            this.cbSelectAccountOnStartUp.Location = new System.Drawing.Point(14, 478);
             this.cbSelectAccountOnStartUp.Margin = new System.Windows.Forms.Padding(2);
             this.cbSelectAccountOnStartUp.Name = "cbSelectAccountOnStartUp";
-            this.cbSelectAccountOnStartUp.Size = new System.Drawing.Size(210, 24);
+            this.cbSelectAccountOnStartUp.Size = new System.Drawing.Size(252, 29);
             this.cbSelectAccountOnStartUp.TabIndex = 34;
             this.cbSelectAccountOnStartUp.Text = "Select Account On Start Up";
             this.cbSelectAccountOnStartUp.UseVisualStyleBackColor = true;
@@ -3024,10 +3024,10 @@ private void InitializeComponent()
             // cbDisplayList
             // 
             this.cbDisplayList.AutoSize = true;
-            this.cbDisplayList.Location = new System.Drawing.Point(12, 365);
+            this.cbDisplayList.Location = new System.Drawing.Point(14, 438);
             this.cbDisplayList.Margin = new System.Windows.Forms.Padding(2);
             this.cbDisplayList.Name = "cbDisplayList";
-            this.cbDisplayList.Size = new System.Drawing.Size(106, 24);
+            this.cbDisplayList.Size = new System.Drawing.Size(127, 29);
             this.cbDisplayList.TabIndex = 33;
             this.cbDisplayList.Text = "Display List";
             this.cbDisplayList.UseVisualStyleBackColor = true;
@@ -3035,29 +3035,29 @@ private void InitializeComponent()
             // tbPokestopSoftbanCount
             // 
             this.tbPokestopSoftbanCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbPokestopSoftbanCount.Location = new System.Drawing.Point(195, 332);
+            this.tbPokestopSoftbanCount.Location = new System.Drawing.Point(234, 398);
             this.tbPokestopSoftbanCount.Margin = new System.Windows.Forms.Padding(2);
             this.tbPokestopSoftbanCount.Name = "tbPokestopSoftbanCount";
-            this.tbPokestopSoftbanCount.Size = new System.Drawing.Size(74, 27);
+            this.tbPokestopSoftbanCount.Size = new System.Drawing.Size(88, 31);
             this.tbPokestopSoftbanCount.TabIndex = 32;
             // 
             // label77
             // 
             this.label77.AutoSize = true;
-            this.label77.Location = new System.Drawing.Point(10, 334);
+            this.label77.Location = new System.Drawing.Point(12, 401);
             this.label77.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label77.Name = "label77";
-            this.label77.Size = new System.Drawing.Size(171, 20);
+            this.label77.Size = new System.Drawing.Size(211, 25);
             this.label77.TabIndex = 31;
             this.label77.Text = "Pokestop Softban Count:";
             // 
             // cbStartFromDefaultLocation
             // 
             this.cbStartFromDefaultLocation.AutoSize = true;
-            this.cbStartFromDefaultLocation.Location = new System.Drawing.Point(12, 302);
+            this.cbStartFromDefaultLocation.Location = new System.Drawing.Point(14, 362);
             this.cbStartFromDefaultLocation.Margin = new System.Windows.Forms.Padding(2);
             this.cbStartFromDefaultLocation.Name = "cbStartFromDefaultLocation";
-            this.cbStartFromDefaultLocation.Size = new System.Drawing.Size(214, 24);
+            this.cbStartFromDefaultLocation.Size = new System.Drawing.Size(255, 29);
             this.cbStartFromDefaultLocation.TabIndex = 30;
             this.cbStartFromDefaultLocation.Text = "Start From Default Location";
             this.cbStartFromDefaultLocation.UseVisualStyleBackColor = true;
@@ -3065,87 +3065,87 @@ private void InitializeComponent()
             // label73
             // 
             this.label73.AutoSize = true;
-            this.label73.Location = new System.Drawing.Point(10, 178);
+            this.label73.Location = new System.Drawing.Point(12, 214);
             this.label73.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label73.Name = "label73";
-            this.label73.Size = new System.Drawing.Size(84, 20);
+            this.label73.Size = new System.Drawing.Size(102, 25);
             this.label73.TabIndex = 22;
             this.label73.Text = "EXP Switch:";
             // 
             // tbEXPSwitch
             // 
             this.tbEXPSwitch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbEXPSwitch.Location = new System.Drawing.Point(195, 175);
+            this.tbEXPSwitch.Location = new System.Drawing.Point(234, 210);
             this.tbEXPSwitch.Margin = new System.Windows.Forms.Padding(2);
             this.tbEXPSwitch.Name = "tbEXPSwitch";
-            this.tbEXPSwitch.Size = new System.Drawing.Size(74, 27);
+            this.tbEXPSwitch.Size = new System.Drawing.Size(88, 31);
             this.tbEXPSwitch.TabIndex = 26;
             // 
             // tbPokestopSwitch
             // 
             this.tbPokestopSwitch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.tbPokestopSwitch.Enabled = false;
-            this.tbPokestopSwitch.Location = new System.Drawing.Point(195, 208);
+            this.tbPokestopSwitch.Location = new System.Drawing.Point(234, 250);
             this.tbPokestopSwitch.Margin = new System.Windows.Forms.Padding(2);
             this.tbPokestopSwitch.Name = "tbPokestopSwitch";
-            this.tbPokestopSwitch.Size = new System.Drawing.Size(74, 27);
+            this.tbPokestopSwitch.Size = new System.Drawing.Size(88, 31);
             this.tbPokestopSwitch.TabIndex = 27;
             // 
             // tbPokemonPerHourSwitch
             // 
             this.tbPokemonPerHourSwitch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbPokemonPerHourSwitch.Location = new System.Drawing.Point(195, 268);
+            this.tbPokemonPerHourSwitch.Location = new System.Drawing.Point(234, 322);
             this.tbPokemonPerHourSwitch.Margin = new System.Windows.Forms.Padding(2);
             this.tbPokemonPerHourSwitch.Name = "tbPokemonPerHourSwitch";
-            this.tbPokemonPerHourSwitch.Size = new System.Drawing.Size(74, 27);
+            this.tbPokemonPerHourSwitch.Size = new System.Drawing.Size(88, 31);
             this.tbPokemonPerHourSwitch.TabIndex = 28;
             // 
             // tbPokemonSwitch
             // 
             this.tbPokemonSwitch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.tbPokemonSwitch.Enabled = false;
-            this.tbPokemonSwitch.Location = new System.Drawing.Point(195, 238);
+            this.tbPokemonSwitch.Location = new System.Drawing.Point(234, 286);
             this.tbPokemonSwitch.Margin = new System.Windows.Forms.Padding(2);
             this.tbPokemonSwitch.Name = "tbPokemonSwitch";
-            this.tbPokemonSwitch.Size = new System.Drawing.Size(74, 27);
+            this.tbPokemonSwitch.Size = new System.Drawing.Size(88, 31);
             this.tbPokemonSwitch.TabIndex = 29;
             // 
             // label76
             // 
             this.label76.AutoSize = true;
-            this.label76.Location = new System.Drawing.Point(10, 271);
+            this.label76.Location = new System.Drawing.Point(12, 325);
             this.label76.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label76.Name = "label76";
-            this.label76.Size = new System.Drawing.Size(181, 20);
+            this.label76.Size = new System.Drawing.Size(221, 25);
             this.label76.TabIndex = 25;
             this.label76.Text = "Pokemon Per Hour Switch:";
             // 
             // label72
             // 
             this.label72.AutoSize = true;
-            this.label72.Location = new System.Drawing.Point(10, 146);
+            this.label72.Location = new System.Drawing.Point(12, 175);
             this.label72.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label72.Name = "label72";
-            this.label72.Size = new System.Drawing.Size(121, 20);
+            this.label72.Size = new System.Drawing.Size(146, 25);
             this.label72.TabIndex = 20;
             this.label72.Text = "Min IV To Switch:";
             // 
             // tbMinIVToSwitch
             // 
             this.tbMinIVToSwitch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbMinIVToSwitch.Location = new System.Drawing.Point(195, 142);
+            this.tbMinIVToSwitch.Location = new System.Drawing.Point(234, 170);
             this.tbMinIVToSwitch.Margin = new System.Windows.Forms.Padding(2);
             this.tbMinIVToSwitch.Name = "tbMinIVToSwitch";
-            this.tbMinIVToSwitch.Size = new System.Drawing.Size(74, 27);
+            this.tbMinIVToSwitch.Size = new System.Drawing.Size(88, 31);
             this.tbMinIVToSwitch.TabIndex = 21;
             // 
             // cbOnRarePokemon
             // 
             this.cbOnRarePokemon.AutoSize = true;
-            this.cbOnRarePokemon.Location = new System.Drawing.Point(12, 115);
+            this.cbOnRarePokemon.Location = new System.Drawing.Point(14, 138);
             this.cbOnRarePokemon.Margin = new System.Windows.Forms.Padding(2);
             this.cbOnRarePokemon.Name = "cbOnRarePokemon";
-            this.cbOnRarePokemon.Size = new System.Drawing.Size(196, 24);
+            this.cbOnRarePokemon.Size = new System.Drawing.Size(238, 29);
             this.cbOnRarePokemon.TabIndex = 19;
             this.cbOnRarePokemon.Text = "Switch On Rare Pokemon";
             this.cbOnRarePokemon.UseVisualStyleBackColor = true;
@@ -3153,92 +3153,94 @@ private void InitializeComponent()
             // label69
             // 
             this.label69.AutoSize = true;
-            this.label69.Location = new System.Drawing.Point(8, 21);
+            this.label69.Location = new System.Drawing.Point(10, 25);
             this.label69.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label69.Name = "label69";
-            this.label69.Size = new System.Drawing.Size(114, 20);
+            this.label69.Size = new System.Drawing.Size(138, 25);
             this.label69.TabIndex = 6;
             this.label69.Text = "Runtime Switch:";
             // 
             // tbRuntimeSwitch
             // 
             this.tbRuntimeSwitch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbRuntimeSwitch.Location = new System.Drawing.Point(192, 18);
+            this.tbRuntimeSwitch.Location = new System.Drawing.Point(230, 22);
             this.tbRuntimeSwitch.Margin = new System.Windows.Forms.Padding(2);
             this.tbRuntimeSwitch.Name = "tbRuntimeSwitch";
-            this.tbRuntimeSwitch.Size = new System.Drawing.Size(74, 27);
+            this.tbRuntimeSwitch.Size = new System.Drawing.Size(88, 31);
             this.tbRuntimeSwitch.TabIndex = 9;
             // 
             // label70
             // 
             this.label70.AutoSize = true;
-            this.label70.Location = new System.Drawing.Point(8, 52);
+            this.label70.Location = new System.Drawing.Point(10, 62);
             this.label70.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label70.Name = "label70";
-            this.label70.Size = new System.Drawing.Size(156, 20);
+            this.label70.Size = new System.Drawing.Size(190, 25);
             this.label70.TabIndex = 7;
             this.label70.Text = "Runtime Random Min:";
             // 
             // tbRuntimeSwitchRandomTime
             // 
             this.tbRuntimeSwitchRandomTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbRuntimeSwitchRandomTime.Location = new System.Drawing.Point(192, 50);
+            this.tbRuntimeSwitchRandomTime.Location = new System.Drawing.Point(230, 60);
             this.tbRuntimeSwitchRandomTime.Margin = new System.Windows.Forms.Padding(2);
             this.tbRuntimeSwitchRandomTime.Name = "tbRuntimeSwitchRandomTime";
-            this.tbRuntimeSwitchRandomTime.Size = new System.Drawing.Size(74, 27);
+            this.tbRuntimeSwitchRandomTime.Size = new System.Drawing.Size(88, 31);
             this.tbRuntimeSwitchRandomTime.TabIndex = 10;
             // 
             // label71
             // 
             this.label71.AutoSize = true;
-            this.label71.Location = new System.Drawing.Point(8, 84);
+            this.label71.Location = new System.Drawing.Point(10, 101);
             this.label71.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label71.Name = "label71";
-            this.label71.Size = new System.Drawing.Size(152, 20);
+            this.label71.Size = new System.Drawing.Size(184, 25);
             this.label71.TabIndex = 8;
             this.label71.Text = "On Limit Pause Times:";
             // 
             // tbOnLimitPauseTimes
             // 
             this.tbOnLimitPauseTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbOnLimitPauseTimes.Location = new System.Drawing.Point(192, 82);
+            this.tbOnLimitPauseTimes.Location = new System.Drawing.Point(230, 98);
             this.tbOnLimitPauseTimes.Margin = new System.Windows.Forms.Padding(2);
             this.tbOnLimitPauseTimes.Name = "tbOnLimitPauseTimes";
-            this.tbOnLimitPauseTimes.Size = new System.Drawing.Size(74, 27);
+            this.tbOnLimitPauseTimes.Size = new System.Drawing.Size(88, 31);
             this.tbOnLimitPauseTimes.TabIndex = 11;
             // 
             // cbSwitchOnPokestopLimit
             // 
             this.cbSwitchOnPokestopLimit.AutoSize = true;
-            this.cbSwitchOnPokestopLimit.Location = new System.Drawing.Point(12, 208);
+            this.cbSwitchOnPokestopLimit.Location = new System.Drawing.Point(14, 250);
             this.cbSwitchOnPokestopLimit.Margin = new System.Windows.Forms.Padding(2);
             this.cbSwitchOnPokestopLimit.Name = "cbSwitchOnPokestopLimit";
-            this.cbSwitchOnPokestopLimit.Size = new System.Drawing.Size(172, 24);
+            this.cbSwitchOnPokestopLimit.Size = new System.Drawing.Size(207, 29);
             this.cbSwitchOnPokestopLimit.TabIndex = 38;
             this.cbSwitchOnPokestopLimit.Text = "Switch On Stop Limit:";
             this.cbSwitchOnPokestopLimit.UseVisualStyleBackColor = true;
+            this.cbSwitchOnPokestopLimit.CheckedChanged += new System.EventHandler(this.cbSwitchOnPokestopLimit_CheckedChanged_1);
             // 
             // cbSwitchOnCatchLimit
             // 
             this.cbSwitchOnCatchLimit.AutoSize = true;
-            this.cbSwitchOnCatchLimit.Location = new System.Drawing.Point(12, 238);
+            this.cbSwitchOnCatchLimit.Location = new System.Drawing.Point(14, 286);
             this.cbSwitchOnCatchLimit.Margin = new System.Windows.Forms.Padding(2);
             this.cbSwitchOnCatchLimit.Name = "cbSwitchOnCatchLimit";
-            this.cbSwitchOnCatchLimit.Size = new System.Drawing.Size(178, 24);
+            this.cbSwitchOnCatchLimit.Size = new System.Drawing.Size(214, 29);
             this.cbSwitchOnCatchLimit.TabIndex = 37;
             this.cbSwitchOnCatchLimit.Text = "Switch On Catch Limit:";
             this.cbSwitchOnCatchLimit.UseVisualStyleBackColor = true;
+            this.cbSwitchOnCatchLimit.CheckedChanged += new System.EventHandler(this.cbSwitchOnCatchLimit_CheckedChanged_1);
             // 
             // groupBox19
             // 
             this.groupBox19.Controls.Add(this.label32);
             this.groupBox19.Controls.Add(this.tbAutoWalkKM);
             this.groupBox19.Controls.Add(this.cbAutoWalkAI);
-            this.groupBox19.Location = new System.Drawing.Point(10, 360);
+            this.groupBox19.Location = new System.Drawing.Point(12, 432);
             this.groupBox19.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox19.Name = "groupBox19";
             this.groupBox19.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox19.Size = new System.Drawing.Size(312, 92);
+            this.groupBox19.Size = new System.Drawing.Size(374, 110);
             this.groupBox19.TabIndex = 21;
             this.groupBox19.TabStop = false;
             this.groupBox19.Text = "Auto Walk AI";
@@ -3246,29 +3248,29 @@ private void InitializeComponent()
             // label32
             // 
             this.label32.AutoSize = true;
-            this.label32.Location = new System.Drawing.Point(12, 52);
+            this.label32.Location = new System.Drawing.Point(14, 62);
             this.label32.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label32.Name = "label32";
-            this.label32.Size = new System.Drawing.Size(119, 20);
+            this.label32.Size = new System.Drawing.Size(141, 25);
             this.label32.TabIndex = 20;
             this.label32.Text = "AI Distance(Km):";
             // 
             // tbAutoWalkKM
             // 
             this.tbAutoWalkKM.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbAutoWalkKM.Location = new System.Drawing.Point(225, 50);
+            this.tbAutoWalkKM.Location = new System.Drawing.Point(270, 60);
             this.tbAutoWalkKM.Margin = new System.Windows.Forms.Padding(2);
             this.tbAutoWalkKM.Name = "tbAutoWalkKM";
-            this.tbAutoWalkKM.Size = new System.Drawing.Size(74, 27);
+            this.tbAutoWalkKM.Size = new System.Drawing.Size(88, 31);
             this.tbAutoWalkKM.TabIndex = 21;
             // 
             // cbAutoWalkAI
             // 
             this.cbAutoWalkAI.AutoSize = true;
-            this.cbAutoWalkAI.Location = new System.Drawing.Point(12, 22);
+            this.cbAutoWalkAI.Location = new System.Drawing.Point(14, 26);
             this.cbAutoWalkAI.Margin = new System.Windows.Forms.Padding(2);
             this.cbAutoWalkAI.Name = "cbAutoWalkAI";
-            this.cbAutoWalkAI.Size = new System.Drawing.Size(158, 24);
+            this.cbAutoWalkAI.Size = new System.Drawing.Size(189, 29);
             this.cbAutoWalkAI.TabIndex = 19;
             this.cbAutoWalkAI.Text = "Enable AutoWalkAI";
             this.cbAutoWalkAI.UseVisualStyleBackColor = true;
@@ -3278,11 +3280,11 @@ private void InitializeComponent()
             this.groupBox17.Controls.Add(this.cbRandomizeRecycle);
             this.groupBox17.Controls.Add(this.label51);
             this.groupBox17.Controls.Add(this.tbRandomRecycleValue);
-            this.groupBox17.Location = new System.Drawing.Point(332, 318);
+            this.groupBox17.Location = new System.Drawing.Point(398, 382);
             this.groupBox17.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox17.Name = "groupBox17";
             this.groupBox17.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox17.Size = new System.Drawing.Size(318, 92);
+            this.groupBox17.Size = new System.Drawing.Size(382, 110);
             this.groupBox17.TabIndex = 19;
             this.groupBox17.TabStop = false;
             this.groupBox17.Text = "Recycle Behavior";
@@ -3290,10 +3292,10 @@ private void InitializeComponent()
             // cbRandomizeRecycle
             // 
             this.cbRandomizeRecycle.AutoSize = true;
-            this.cbRandomizeRecycle.Location = new System.Drawing.Point(12, 22);
+            this.cbRandomizeRecycle.Location = new System.Drawing.Point(14, 26);
             this.cbRandomizeRecycle.Margin = new System.Windows.Forms.Padding(2);
             this.cbRandomizeRecycle.Name = "cbRandomizeRecycle";
-            this.cbRandomizeRecycle.Size = new System.Drawing.Size(160, 24);
+            this.cbRandomizeRecycle.Size = new System.Drawing.Size(189, 29);
             this.cbRandomizeRecycle.TabIndex = 17;
             this.cbRandomizeRecycle.Text = "Randomize Recycle";
             this.cbRandomizeRecycle.UseVisualStyleBackColor = true;
@@ -3301,20 +3303,20 @@ private void InitializeComponent()
             // label51
             // 
             this.label51.AutoSize = true;
-            this.label51.Location = new System.Drawing.Point(8, 52);
+            this.label51.Location = new System.Drawing.Point(10, 62);
             this.label51.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label51.Name = "label51";
-            this.label51.Size = new System.Drawing.Size(162, 20);
+            this.label51.Size = new System.Drawing.Size(193, 25);
             this.label51.TabIndex = 14;
             this.label51.Text = "Random Recycle Value:";
             // 
             // tbRandomRecycleValue
             // 
             this.tbRandomRecycleValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbRandomRecycleValue.Location = new System.Drawing.Point(232, 50);
-            this.tbRandomRecycleValue.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbRandomRecycleValue.Location = new System.Drawing.Point(278, 60);
+            this.tbRandomRecycleValue.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbRandomRecycleValue.Name = "tbRandomRecycleValue";
-            this.tbRandomRecycleValue.Size = new System.Drawing.Size(74, 27);
+            this.tbRandomRecycleValue.Size = new System.Drawing.Size(88, 31);
             this.tbRandomRecycleValue.TabIndex = 15;
             // 
             // groupBox16
@@ -3329,11 +3331,11 @@ private void InitializeComponent()
             this.groupBox16.Controls.Add(this.tbMaxSpawnLocationOffset);
             this.groupBox16.Controls.Add(this.label59);
             this.groupBox16.Controls.Add(this.tbMaxTravelDistanceInMeters);
-            this.groupBox16.Location = new System.Drawing.Point(10, 10);
+            this.groupBox16.Location = new System.Drawing.Point(12, 12);
             this.groupBox16.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox16.Name = "groupBox16";
             this.groupBox16.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox16.Size = new System.Drawing.Size(312, 238);
+            this.groupBox16.Size = new System.Drawing.Size(374, 286);
             this.groupBox16.TabIndex = 19;
             this.groupBox16.TabStop = false;
             this.groupBox16.Text = "Walking Behavior";
@@ -3341,20 +3343,20 @@ private void InitializeComponent()
             // tbWalkingSpeedVariantInKilometerPerHour
             // 
             this.tbWalkingSpeedVariantInKilometerPerHour.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbWalkingSpeedVariantInKilometerPerHour.Location = new System.Drawing.Point(225, 82);
-            this.tbWalkingSpeedVariantInKilometerPerHour.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbWalkingSpeedVariantInKilometerPerHour.Location = new System.Drawing.Point(270, 98);
+            this.tbWalkingSpeedVariantInKilometerPerHour.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbWalkingSpeedVariantInKilometerPerHour.Name = "tbWalkingSpeedVariantInKilometerPerHour";
-            this.tbWalkingSpeedVariantInKilometerPerHour.Size = new System.Drawing.Size(74, 27);
+            this.tbWalkingSpeedVariantInKilometerPerHour.Size = new System.Drawing.Size(88, 31);
             this.tbWalkingSpeedVariantInKilometerPerHour.TabIndex = 15;
             // 
             // cbStartFromLastPosition
             // 
             this.cbStartFromLastPosition.AutoSize = true;
             this.cbStartFromLastPosition.BackColor = System.Drawing.Color.Transparent;
-            this.cbStartFromLastPosition.Location = new System.Drawing.Point(12, 208);
+            this.cbStartFromLastPosition.Location = new System.Drawing.Point(14, 250);
             this.cbStartFromLastPosition.Margin = new System.Windows.Forms.Padding(2);
             this.cbStartFromLastPosition.Name = "cbStartFromLastPosition";
-            this.cbStartFromLastPosition.Size = new System.Drawing.Size(174, 24);
+            this.cbStartFromLastPosition.Size = new System.Drawing.Size(210, 29);
             this.cbStartFromLastPosition.TabIndex = 31;
             this.cbStartFromLastPosition.Text = "StartFromLastPosition";
             this.cbStartFromLastPosition.UseVisualStyleBackColor = false;
@@ -3362,10 +3364,10 @@ private void InitializeComponent()
             // cbShowWalkingSpeed
             // 
             this.cbShowWalkingSpeed.AutoSize = true;
-            this.cbShowWalkingSpeed.Location = new System.Drawing.Point(12, 115);
+            this.cbShowWalkingSpeed.Location = new System.Drawing.Point(14, 138);
             this.cbShowWalkingSpeed.Margin = new System.Windows.Forms.Padding(2);
             this.cbShowWalkingSpeed.Name = "cbShowWalkingSpeed";
-            this.cbShowWalkingSpeed.Size = new System.Drawing.Size(170, 24);
+            this.cbShowWalkingSpeed.Size = new System.Drawing.Size(205, 29);
             this.cbShowWalkingSpeed.TabIndex = 18;
             this.cbShowWalkingSpeed.Text = "Show Walking Speed";
             this.cbShowWalkingSpeed.UseVisualStyleBackColor = true;
@@ -3373,10 +3375,10 @@ private void InitializeComponent()
             // cbUseWalkingSpeedVariant
             // 
             this.cbUseWalkingSpeedVariant.AutoSize = true;
-            this.cbUseWalkingSpeedVariant.Location = new System.Drawing.Point(12, 52);
+            this.cbUseWalkingSpeedVariant.Location = new System.Drawing.Point(14, 62);
             this.cbUseWalkingSpeedVariant.Margin = new System.Windows.Forms.Padding(2);
             this.cbUseWalkingSpeedVariant.Name = "cbUseWalkingSpeedVariant";
-            this.cbUseWalkingSpeedVariant.Size = new System.Drawing.Size(208, 24);
+            this.cbUseWalkingSpeedVariant.Size = new System.Drawing.Size(249, 29);
             this.cbUseWalkingSpeedVariant.TabIndex = 17;
             this.cbUseWalkingSpeedVariant.Text = "Use Walking Speed Variant";
             this.cbUseWalkingSpeedVariant.UseVisualStyleBackColor = true;
@@ -3384,10 +3386,10 @@ private void InitializeComponent()
             // cbDisableHumanWalking
             // 
             this.cbDisableHumanWalking.AutoSize = true;
-            this.cbDisableHumanWalking.Location = new System.Drawing.Point(12, 22);
+            this.cbDisableHumanWalking.Location = new System.Drawing.Point(14, 26);
             this.cbDisableHumanWalking.Margin = new System.Windows.Forms.Padding(2);
             this.cbDisableHumanWalking.Name = "cbDisableHumanWalking";
-            this.cbDisableHumanWalking.Size = new System.Drawing.Size(190, 24);
+            this.cbDisableHumanWalking.Size = new System.Drawing.Size(227, 29);
             this.cbDisableHumanWalking.TabIndex = 16;
             this.cbDisableHumanWalking.Text = "Disable Human Walking";
             this.cbDisableHumanWalking.UseVisualStyleBackColor = true;
@@ -3395,49 +3397,49 @@ private void InitializeComponent()
             // label57
             // 
             this.label57.AutoSize = true;
-            this.label57.Location = new System.Drawing.Point(12, 84);
+            this.label57.Location = new System.Drawing.Point(14, 101);
             this.label57.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label57.Name = "label57";
-            this.label57.Size = new System.Drawing.Size(214, 20);
+            this.label57.Size = new System.Drawing.Size(254, 25);
             this.label57.TabIndex = 14;
             this.label57.Text = "Walking Speed Variant (KM/H):";
             // 
             // label58
             // 
             this.label58.AutoSize = true;
-            this.label58.Location = new System.Drawing.Point(12, 146);
+            this.label58.Location = new System.Drawing.Point(14, 175);
             this.label58.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label58.Name = "label58";
-            this.label58.Size = new System.Drawing.Size(193, 20);
+            this.label58.Size = new System.Drawing.Size(233, 25);
             this.label58.TabIndex = 14;
             this.label58.Text = "Max Spawn Location Offset:";
             // 
             // tbMaxSpawnLocationOffset
             // 
             this.tbMaxSpawnLocationOffset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbMaxSpawnLocationOffset.Location = new System.Drawing.Point(225, 142);
-            this.tbMaxSpawnLocationOffset.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbMaxSpawnLocationOffset.Location = new System.Drawing.Point(270, 170);
+            this.tbMaxSpawnLocationOffset.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbMaxSpawnLocationOffset.Name = "tbMaxSpawnLocationOffset";
-            this.tbMaxSpawnLocationOffset.Size = new System.Drawing.Size(74, 27);
+            this.tbMaxSpawnLocationOffset.Size = new System.Drawing.Size(88, 31);
             this.tbMaxSpawnLocationOffset.TabIndex = 15;
             // 
             // label59
             // 
             this.label59.AutoSize = true;
-            this.label59.Location = new System.Drawing.Point(12, 178);
+            this.label59.Location = new System.Drawing.Point(14, 214);
             this.label59.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label59.Name = "label59";
-            this.label59.Size = new System.Drawing.Size(203, 20);
+            this.label59.Size = new System.Drawing.Size(239, 25);
             this.label59.TabIndex = 14;
             this.label59.Text = "Max Travel Distance (Meters):";
             // 
             // tbMaxTravelDistanceInMeters
             // 
             this.tbMaxTravelDistanceInMeters.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbMaxTravelDistanceInMeters.Location = new System.Drawing.Point(225, 175);
-            this.tbMaxTravelDistanceInMeters.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbMaxTravelDistanceInMeters.Location = new System.Drawing.Point(270, 210);
+            this.tbMaxTravelDistanceInMeters.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbMaxTravelDistanceInMeters.Name = "tbMaxTravelDistanceInMeters";
-            this.tbMaxTravelDistanceInMeters.Size = new System.Drawing.Size(74, 27);
+            this.tbMaxTravelDistanceInMeters.Size = new System.Drawing.Size(88, 31);
             this.tbMaxTravelDistanceInMeters.TabIndex = 15;
             // 
             // groupBox15
@@ -3447,11 +3449,11 @@ private void InitializeComponent()
             this.groupBox15.Controls.Add(this.tbDelayBetweenPlayerActions);
             this.groupBox15.Controls.Add(this.label50);
             this.groupBox15.Controls.Add(this.tbDelayBetweenPokemonCatch);
-            this.groupBox15.Location = new System.Drawing.Point(10, 248);
+            this.groupBox15.Location = new System.Drawing.Point(12, 298);
             this.groupBox15.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox15.Name = "groupBox15";
             this.groupBox15.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox15.Size = new System.Drawing.Size(312, 112);
+            this.groupBox15.Size = new System.Drawing.Size(374, 134);
             this.groupBox15.TabIndex = 18;
             this.groupBox15.TabStop = false;
             this.groupBox15.Text = "Action Behavior";
@@ -3459,10 +3461,10 @@ private void InitializeComponent()
             // cbUseHumanlikeDelays
             // 
             this.cbUseHumanlikeDelays.AutoSize = true;
-            this.cbUseHumanlikeDelays.Location = new System.Drawing.Point(12, 82);
+            this.cbUseHumanlikeDelays.Location = new System.Drawing.Point(14, 98);
             this.cbUseHumanlikeDelays.Margin = new System.Windows.Forms.Padding(2);
             this.cbUseHumanlikeDelays.Name = "cbUseHumanlikeDelays";
-            this.cbUseHumanlikeDelays.Size = new System.Drawing.Size(170, 24);
+            this.cbUseHumanlikeDelays.Size = new System.Drawing.Size(203, 29);
             this.cbUseHumanlikeDelays.TabIndex = 16;
             this.cbUseHumanlikeDelays.Text = "UseHumanlikeDelays";
             this.cbUseHumanlikeDelays.UseVisualStyleBackColor = true;
@@ -3470,39 +3472,39 @@ private void InitializeComponent()
             // label49
             // 
             this.label49.AutoSize = true;
-            this.label49.Location = new System.Drawing.Point(12, 21);
+            this.label49.Location = new System.Drawing.Point(14, 25);
             this.label49.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label49.Name = "label49";
-            this.label49.Size = new System.Drawing.Size(197, 20);
+            this.label49.Size = new System.Drawing.Size(234, 25);
             this.label49.TabIndex = 14;
             this.label49.Text = "Delay Between Actions (ms):";
             // 
             // tbDelayBetweenPlayerActions
             // 
             this.tbDelayBetweenPlayerActions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbDelayBetweenPlayerActions.Location = new System.Drawing.Point(225, 18);
-            this.tbDelayBetweenPlayerActions.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbDelayBetweenPlayerActions.Location = new System.Drawing.Point(270, 22);
+            this.tbDelayBetweenPlayerActions.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbDelayBetweenPlayerActions.Name = "tbDelayBetweenPlayerActions";
-            this.tbDelayBetweenPlayerActions.Size = new System.Drawing.Size(74, 27);
+            this.tbDelayBetweenPlayerActions.Size = new System.Drawing.Size(88, 31);
             this.tbDelayBetweenPlayerActions.TabIndex = 15;
             // 
             // label50
             // 
             this.label50.AutoSize = true;
-            this.label50.Location = new System.Drawing.Point(12, 52);
+            this.label50.Location = new System.Drawing.Point(14, 62);
             this.label50.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label50.Name = "label50";
-            this.label50.Size = new System.Drawing.Size(206, 20);
+            this.label50.Size = new System.Drawing.Size(244, 25);
             this.label50.TabIndex = 14;
             this.label50.Text = "Delay Between Catching (ms):";
             // 
             // tbDelayBetweenPokemonCatch
             // 
             this.tbDelayBetweenPokemonCatch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbDelayBetweenPokemonCatch.Location = new System.Drawing.Point(225, 50);
-            this.tbDelayBetweenPokemonCatch.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.tbDelayBetweenPokemonCatch.Location = new System.Drawing.Point(270, 60);
+            this.tbDelayBetweenPokemonCatch.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.tbDelayBetweenPokemonCatch.Name = "tbDelayBetweenPokemonCatch";
-            this.tbDelayBetweenPokemonCatch.Size = new System.Drawing.Size(74, 27);
+            this.tbDelayBetweenPokemonCatch.Size = new System.Drawing.Size(88, 31);
             this.tbDelayBetweenPokemonCatch.TabIndex = 15;
             // 
             // groupBox18
@@ -3524,11 +3526,11 @@ private void InitializeComponent()
             this.groupBox18.Controls.Add(this.tbCurveThrowChance);
             this.groupBox18.Controls.Add(this.tbExcellentThrowChance);
             this.groupBox18.Controls.Add(this.label65);
-            this.groupBox18.Location = new System.Drawing.Point(332, 10);
+            this.groupBox18.Location = new System.Drawing.Point(398, 12);
             this.groupBox18.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox18.Name = "groupBox18";
             this.groupBox18.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox18.Size = new System.Drawing.Size(318, 308);
+            this.groupBox18.Size = new System.Drawing.Size(382, 370);
             this.groupBox18.TabIndex = 20;
             this.groupBox18.TabStop = false;
             this.groupBox18.Text = "Catching Behavior";
@@ -3536,10 +3538,10 @@ private void InitializeComponent()
             // cbEnableHumanizedThrows
             // 
             this.cbEnableHumanizedThrows.AutoSize = true;
-            this.cbEnableHumanizedThrows.Location = new System.Drawing.Point(12, 22);
+            this.cbEnableHumanizedThrows.Location = new System.Drawing.Point(14, 26);
             this.cbEnableHumanizedThrows.Margin = new System.Windows.Forms.Padding(2);
             this.cbEnableHumanizedThrows.Name = "cbEnableHumanizedThrows";
-            this.cbEnableHumanizedThrows.Size = new System.Drawing.Size(207, 24);
+            this.cbEnableHumanizedThrows.Size = new System.Drawing.Size(247, 29);
             this.cbEnableHumanizedThrows.TabIndex = 18;
             this.cbEnableHumanizedThrows.Text = "Enable Humanized Throws";
             this.cbEnableHumanizedThrows.UseVisualStyleBackColor = true;
@@ -3547,163 +3549,163 @@ private void InitializeComponent()
             // tbForceExcellentThrowOverCp
             // 
             this.tbForceExcellentThrowOverCp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbForceExcellentThrowOverCp.Location = new System.Drawing.Point(232, 268);
+            this.tbForceExcellentThrowOverCp.Location = new System.Drawing.Point(278, 322);
             this.tbForceExcellentThrowOverCp.Margin = new System.Windows.Forms.Padding(2);
             this.tbForceExcellentThrowOverCp.Name = "tbForceExcellentThrowOverCp";
-            this.tbForceExcellentThrowOverCp.Size = new System.Drawing.Size(74, 27);
+            this.tbForceExcellentThrowOverCp.Size = new System.Drawing.Size(88, 31);
             this.tbForceExcellentThrowOverCp.TabIndex = 5;
             // 
             // tbForceGreatThrowOverCp
             // 
             this.tbForceGreatThrowOverCp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbForceGreatThrowOverCp.Location = new System.Drawing.Point(232, 238);
+            this.tbForceGreatThrowOverCp.Location = new System.Drawing.Point(278, 286);
             this.tbForceGreatThrowOverCp.Margin = new System.Windows.Forms.Padding(2);
             this.tbForceGreatThrowOverCp.Name = "tbForceGreatThrowOverCp";
-            this.tbForceGreatThrowOverCp.Size = new System.Drawing.Size(74, 27);
+            this.tbForceGreatThrowOverCp.Size = new System.Drawing.Size(88, 31);
             this.tbForceGreatThrowOverCp.TabIndex = 5;
             // 
             // label66
             // 
             this.label66.AutoSize = true;
-            this.label66.Location = new System.Drawing.Point(8, 271);
+            this.label66.Location = new System.Drawing.Point(10, 325);
             this.label66.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label66.Name = "label66";
-            this.label66.Size = new System.Drawing.Size(212, 20);
+            this.label66.Size = new System.Drawing.Size(254, 25);
             this.label66.TabIndex = 4;
             this.label66.Text = "Force Excellent Throw Over CP:";
             // 
             // label55
             // 
             this.label55.AutoSize = true;
-            this.label55.Location = new System.Drawing.Point(8, 239);
+            this.label55.Location = new System.Drawing.Point(10, 287);
             this.label55.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label55.Name = "label55";
-            this.label55.Size = new System.Drawing.Size(189, 20);
+            this.label55.Size = new System.Drawing.Size(229, 25);
             this.label55.TabIndex = 4;
             this.label55.Text = "Force Great Throw Over CP:";
             // 
             // label60
             // 
             this.label60.AutoSize = true;
-            this.label60.Location = new System.Drawing.Point(8, 52);
+            this.label60.Location = new System.Drawing.Point(10, 62);
             this.label60.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label60.Name = "label60";
-            this.label60.Size = new System.Drawing.Size(155, 20);
+            this.label60.Size = new System.Drawing.Size(186, 25);
             this.label60.TabIndex = 4;
             this.label60.Text = "Nice Throw Chance %:";
             // 
             // tbForceExcellentThrowOverIv
             // 
             this.tbForceExcellentThrowOverIv.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbForceExcellentThrowOverIv.Location = new System.Drawing.Point(232, 208);
+            this.tbForceExcellentThrowOverIv.Location = new System.Drawing.Point(278, 250);
             this.tbForceExcellentThrowOverIv.Margin = new System.Windows.Forms.Padding(2);
             this.tbForceExcellentThrowOverIv.Name = "tbForceExcellentThrowOverIv";
-            this.tbForceExcellentThrowOverIv.Size = new System.Drawing.Size(74, 27);
+            this.tbForceExcellentThrowOverIv.Size = new System.Drawing.Size(88, 31);
             this.tbForceExcellentThrowOverIv.TabIndex = 5;
             // 
             // tbNiceThrowChance
             // 
             this.tbNiceThrowChance.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbNiceThrowChance.Location = new System.Drawing.Point(232, 50);
+            this.tbNiceThrowChance.Location = new System.Drawing.Point(278, 60);
             this.tbNiceThrowChance.Margin = new System.Windows.Forms.Padding(2);
             this.tbNiceThrowChance.Name = "tbNiceThrowChance";
-            this.tbNiceThrowChance.Size = new System.Drawing.Size(74, 27);
+            this.tbNiceThrowChance.Size = new System.Drawing.Size(88, 31);
             this.tbNiceThrowChance.TabIndex = 5;
             // 
             // label61
             // 
             this.label61.AutoSize = true;
-            this.label61.Location = new System.Drawing.Point(8, 209);
+            this.label61.Location = new System.Drawing.Point(10, 251);
             this.label61.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label61.Name = "label61";
-            this.label61.Size = new System.Drawing.Size(224, 20);
+            this.label61.Size = new System.Drawing.Size(269, 25);
             this.label61.TabIndex = 4;
             this.label61.Text = "Force Excellent Throw Over IV %:";
             // 
             // label62
             // 
             this.label62.AutoSize = true;
-            this.label62.Location = new System.Drawing.Point(8, 84);
+            this.label62.Location = new System.Drawing.Point(10, 101);
             this.label62.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label62.Name = "label62";
-            this.label62.Size = new System.Drawing.Size(161, 20);
+            this.label62.Size = new System.Drawing.Size(194, 25);
             this.label62.TabIndex = 4;
             this.label62.Text = "Great Throw Chance %:";
             // 
             // tbForceGreatThrowOverIv
             // 
             this.tbForceGreatThrowOverIv.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbForceGreatThrowOverIv.Location = new System.Drawing.Point(232, 175);
+            this.tbForceGreatThrowOverIv.Location = new System.Drawing.Point(278, 210);
             this.tbForceGreatThrowOverIv.Margin = new System.Windows.Forms.Padding(2);
             this.tbForceGreatThrowOverIv.Name = "tbForceGreatThrowOverIv";
-            this.tbForceGreatThrowOverIv.Size = new System.Drawing.Size(74, 27);
+            this.tbForceGreatThrowOverIv.Size = new System.Drawing.Size(88, 31);
             this.tbForceGreatThrowOverIv.TabIndex = 5;
             // 
             // tbGreatThrowChance
             // 
             this.tbGreatThrowChance.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbGreatThrowChance.Location = new System.Drawing.Point(232, 82);
+            this.tbGreatThrowChance.Location = new System.Drawing.Point(278, 98);
             this.tbGreatThrowChance.Margin = new System.Windows.Forms.Padding(2);
             this.tbGreatThrowChance.Name = "tbGreatThrowChance";
-            this.tbGreatThrowChance.Size = new System.Drawing.Size(74, 27);
+            this.tbGreatThrowChance.Size = new System.Drawing.Size(88, 31);
             this.tbGreatThrowChance.TabIndex = 5;
             // 
             // label63
             // 
             this.label63.AutoSize = true;
-            this.label63.Location = new System.Drawing.Point(8, 178);
+            this.label63.Location = new System.Drawing.Point(10, 214);
             this.label63.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label63.Name = "label63";
-            this.label63.Size = new System.Drawing.Size(201, 20);
+            this.label63.Size = new System.Drawing.Size(244, 25);
             this.label63.TabIndex = 4;
             this.label63.Text = "Force Great Throw Over IV %:\r\n";
             // 
             // label64
             // 
             this.label64.AutoSize = true;
-            this.label64.Location = new System.Drawing.Point(8, 114);
+            this.label64.Location = new System.Drawing.Point(10, 137);
             this.label64.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label64.Name = "label64";
-            this.label64.Size = new System.Drawing.Size(184, 20);
+            this.label64.Size = new System.Drawing.Size(219, 25);
             this.label64.TabIndex = 4;
             this.label64.Text = "Excellent Throw Chance %:\r\n";
             // 
             // tbCurveThrowChance
             // 
             this.tbCurveThrowChance.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbCurveThrowChance.Location = new System.Drawing.Point(232, 142);
+            this.tbCurveThrowChance.Location = new System.Drawing.Point(278, 170);
             this.tbCurveThrowChance.Margin = new System.Windows.Forms.Padding(2);
             this.tbCurveThrowChance.Name = "tbCurveThrowChance";
-            this.tbCurveThrowChance.Size = new System.Drawing.Size(74, 27);
+            this.tbCurveThrowChance.Size = new System.Drawing.Size(88, 31);
             this.tbCurveThrowChance.TabIndex = 5;
             // 
             // tbExcellentThrowChance
             // 
             this.tbExcellentThrowChance.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbExcellentThrowChance.Location = new System.Drawing.Point(232, 112);
+            this.tbExcellentThrowChance.Location = new System.Drawing.Point(278, 134);
             this.tbExcellentThrowChance.Margin = new System.Windows.Forms.Padding(2);
             this.tbExcellentThrowChance.Name = "tbExcellentThrowChance";
-            this.tbExcellentThrowChance.Size = new System.Drawing.Size(74, 27);
+            this.tbExcellentThrowChance.Size = new System.Drawing.Size(88, 31);
             this.tbExcellentThrowChance.TabIndex = 5;
             // 
             // label65
             // 
             this.label65.AutoSize = true;
-            this.label65.Location = new System.Drawing.Point(8, 146);
+            this.label65.Location = new System.Drawing.Point(10, 175);
             this.label65.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label65.Name = "label65";
-            this.label65.Size = new System.Drawing.Size(162, 20);
+            this.label65.Size = new System.Drawing.Size(197, 25);
             this.label65.TabIndex = 4;
             this.label65.Text = "Curve Throw Chance %:\r\n";
             // 
             // tabAuthJson
             // 
             this.tabAuthJson.Controls.Add(this.splitContainer2);
-            this.tabAuthJson.Location = new System.Drawing.Point(4, 29);
+            this.tabAuthJson.Location = new System.Drawing.Point(4, 34);
             this.tabAuthJson.Margin = new System.Windows.Forms.Padding(2);
             this.tabAuthJson.Name = "tabAuthJson";
             this.tabAuthJson.Padding = new System.Windows.Forms.Padding(2);
-            this.tabAuthJson.Size = new System.Drawing.Size(954, 485);
+            this.tabAuthJson.Size = new System.Drawing.Size(1146, 584);
             this.tabAuthJson.TabIndex = 6;
             this.tabAuthJson.Text = "Auth & Config";
             this.tabAuthJson.UseVisualStyleBackColor = true;
@@ -3723,9 +3725,9 @@ private void InitializeComponent()
             // 
             this.splitContainer2.Panel2.BackColor = System.Drawing.SystemColors.Control;
             this.splitContainer2.Panel2.Controls.Add(this.splitContainer5);
-            this.splitContainer2.Size = new System.Drawing.Size(950, 481);
-            this.splitContainer2.SplitterDistance = 468;
-            this.splitContainer2.SplitterWidth = 5;
+            this.splitContainer2.Size = new System.Drawing.Size(1142, 580);
+            this.splitContainer2.SplitterDistance = 562;
+            this.splitContainer2.SplitterWidth = 6;
             this.splitContainer2.TabIndex = 3;
             // 
             // splitContainer4
@@ -3742,9 +3744,9 @@ private void InitializeComponent()
             // splitContainer4.Panel2
             // 
             this.splitContainer4.Panel2.BackColor = System.Drawing.SystemColors.Control;
-            this.splitContainer4.Size = new System.Drawing.Size(468, 481);
-            this.splitContainer4.SplitterDistance = 255;
-            this.splitContainer4.SplitterWidth = 5;
+            this.splitContainer4.Size = new System.Drawing.Size(562, 580);
+            this.splitContainer4.SplitterDistance = 306;
+            this.splitContainer4.SplitterWidth = 6;
             this.splitContainer4.TabIndex = 3;
             // 
             // Auth
@@ -3753,9 +3755,9 @@ private void InitializeComponent()
             this.Auth.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Auth.LabelEdit = true;
             this.Auth.Location = new System.Drawing.Point(0, 0);
-            this.Auth.Margin = new System.Windows.Forms.Padding(5);
+            this.Auth.Margin = new System.Windows.Forms.Padding(6);
             this.Auth.Name = "Auth";
-            this.Auth.Size = new System.Drawing.Size(255, 481);
+            this.Auth.Size = new System.Drawing.Size(306, 580);
             this.Auth.TabIndex = 2;
             // 
             // splitContainer5
@@ -3768,9 +3770,9 @@ private void InitializeComponent()
             // splitContainer5.Panel1
             // 
             this.splitContainer5.Panel1.Controls.Add(this.Config);
-            this.splitContainer5.Size = new System.Drawing.Size(477, 481);
-            this.splitContainer5.SplitterDistance = 261;
-            this.splitContainer5.SplitterWidth = 5;
+            this.splitContainer5.Size = new System.Drawing.Size(574, 580);
+            this.splitContainer5.SplitterDistance = 314;
+            this.splitContainer5.SplitterWidth = 6;
             this.splitContainer5.TabIndex = 3;
             // 
             // Config
@@ -3779,18 +3781,18 @@ private void InitializeComponent()
             this.Config.Dock = System.Windows.Forms.DockStyle.Fill;
             this.Config.LabelEdit = true;
             this.Config.Location = new System.Drawing.Point(0, 0);
-            this.Config.Margin = new System.Windows.Forms.Padding(5);
+            this.Config.Margin = new System.Windows.Forms.Padding(6);
             this.Config.Name = "Config";
-            this.Config.Size = new System.Drawing.Size(261, 481);
+            this.Config.Size = new System.Drawing.Size(314, 580);
             this.Config.TabIndex = 2;
             // 
             // saveBtn
             // 
             this.saveBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.saveBtn.Location = new System.Drawing.Point(692, 520);
-            this.saveBtn.Margin = new System.Windows.Forms.Padding(2, 8, 2, 8);
+            this.saveBtn.Location = new System.Drawing.Point(830, 624);
+            this.saveBtn.Margin = new System.Windows.Forms.Padding(2, 10, 2, 10);
             this.saveBtn.Name = "saveBtn";
-            this.saveBtn.Size = new System.Drawing.Size(125, 62);
+            this.saveBtn.Size = new System.Drawing.Size(150, 74);
             this.saveBtn.TabIndex = 29;
             this.saveBtn.Text = "Save";
             this.saveBtn.UseVisualStyleBackColor = true;
@@ -3800,10 +3802,10 @@ private void InitializeComponent()
             // 
             this.cbAutoSniper.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.cbAutoSniper.AutoSize = true;
-            this.cbAutoSniper.Location = new System.Drawing.Point(18, 522);
+            this.cbAutoSniper.Location = new System.Drawing.Point(22, 626);
             this.cbAutoSniper.Margin = new System.Windows.Forms.Padding(2);
             this.cbAutoSniper.Name = "cbAutoSniper";
-            this.cbAutoSniper.Size = new System.Drawing.Size(167, 24);
+            this.cbAutoSniper.Size = new System.Drawing.Size(200, 29);
             this.cbAutoSniper.TabIndex = 33;
             this.cbAutoSniper.Text = "Activate Auto Sniper";
             this.cbAutoSniper.UseVisualStyleBackColor = true;
@@ -3812,10 +3814,10 @@ private void InitializeComponent()
             // 
             this.cbEnableGyms.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.cbEnableGyms.AutoSize = true;
-            this.cbEnableGyms.Location = new System.Drawing.Point(18, 555);
+            this.cbEnableGyms.Location = new System.Drawing.Point(22, 666);
             this.cbEnableGyms.Margin = new System.Windows.Forms.Padding(2);
             this.cbEnableGyms.Name = "cbEnableGyms";
-            this.cbEnableGyms.Size = new System.Drawing.Size(116, 24);
+            this.cbEnableGyms.Size = new System.Drawing.Size(140, 29);
             this.cbEnableGyms.TabIndex = 34;
             this.cbEnableGyms.Text = "Enable Gmys";
             this.cbEnableGyms.UseVisualStyleBackColor = true;
@@ -3824,30 +3826,30 @@ private void InitializeComponent()
             // 
             this.label48.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label48.AutoSize = true;
-            this.label48.Location = new System.Drawing.Point(190, 522);
+            this.label48.Location = new System.Drawing.Point(228, 626);
             this.label48.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label48.Name = "label48";
-            this.label48.Size = new System.Drawing.Size(176, 20);
+            this.label48.Size = new System.Drawing.Size(207, 25);
             this.label48.TabIndex = 35;
             this.label48.Text = "DataServiceIdentification";
             // 
             // tbDataServiceIdentification
             // 
             this.tbDataServiceIdentification.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.tbDataServiceIdentification.Location = new System.Drawing.Point(368, 519);
+            this.tbDataServiceIdentification.Location = new System.Drawing.Point(442, 623);
             this.tbDataServiceIdentification.Margin = new System.Windows.Forms.Padding(2);
             this.tbDataServiceIdentification.Name = "tbDataServiceIdentification";
-            this.tbDataServiceIdentification.Size = new System.Drawing.Size(222, 27);
+            this.tbDataServiceIdentification.Size = new System.Drawing.Size(266, 31);
             this.tbDataServiceIdentification.TabIndex = 36;
             // 
             // cbEnableSyncData
             // 
             this.cbEnableSyncData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.cbEnableSyncData.AutoSize = true;
-            this.cbEnableSyncData.Location = new System.Drawing.Point(368, 558);
+            this.cbEnableSyncData.Location = new System.Drawing.Point(442, 670);
             this.cbEnableSyncData.Margin = new System.Windows.Forms.Padding(2);
             this.cbEnableSyncData.Name = "cbEnableSyncData";
-            this.cbEnableSyncData.Size = new System.Drawing.Size(138, 24);
+            this.cbEnableSyncData.Size = new System.Drawing.Size(163, 29);
             this.cbEnableSyncData.TabIndex = 37;
             this.cbEnableSyncData.Text = "EnableSyncData";
             this.cbEnableSyncData.UseVisualStyleBackColor = true;
@@ -3861,21 +3863,21 @@ private void InitializeComponent()
             "Yellow",
             "Blue",
             "Red"});
-            this.cBoxTeamColor.Location = new System.Drawing.Point(135, 554);
+            this.cBoxTeamColor.Location = new System.Drawing.Point(162, 665);
             this.cBoxTeamColor.Margin = new System.Windows.Forms.Padding(2);
             this.cBoxTeamColor.Name = "cBoxTeamColor";
-            this.cBoxTeamColor.Size = new System.Drawing.Size(99, 28);
+            this.cBoxTeamColor.Size = new System.Drawing.Size(118, 33);
             this.cBoxTeamColor.TabIndex = 38;
             this.cBoxTeamColor.Text = "Neutral";
             // 
             // SettingsForm
             // 
             this.AcceptButton = this.saveBtn;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(144F, 144F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.CancelButton = this.cancelBtn;
-            this.ClientSize = new System.Drawing.Size(968, 588);
+            this.ClientSize = new System.Drawing.Size(1162, 706);
             this.Controls.Add(this.cBoxTeamColor);
             this.Controls.Add(this.cbEnableSyncData);
             this.Controls.Add(this.tbDataServiceIdentification);
@@ -3888,7 +3890,7 @@ private void InitializeComponent()
             this.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(2, 5, 2, 5);
+            this.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "SettingsForm";
@@ -3943,7 +3945,6 @@ private void InitializeComponent()
             this.gbPUP.ResumeLayout(false);
             this.gbPUP.PerformLayout();
             this.tabEvo.ResumeLayout(false);
-            this.tabEvo.PerformLayout();
             this.groupBox2.ResumeLayout(false);
             this.groupBox2.PerformLayout();
             this.groupBox1.ResumeLayout(false);
@@ -3951,6 +3952,7 @@ private void InitializeComponent()
             this.groupBox5.ResumeLayout(false);
             this.groupBox5.PerformLayout();
             this.gbEvolve.ResumeLayout(false);
+            this.gbEvolve.PerformLayout();
             this.tabSnipePokemonFilter.ResumeLayout(false);
             this.gbSnipe.ResumeLayout(false);
             this.gbSnipe.PerformLayout();
@@ -4289,4 +4291,4 @@ private void InitializeComponent()
         private System.Windows.Forms.Label label34;
         private System.Windows.Forms.Label label18;
     }
-}
\ No newline at end of file
+}
diff --git a/RocketBot2/Forms/SettingForm.cs b/RocketBot2/Forms/SettingForm.cs
index f4668c096..2ec362dbe 100644
--- a/RocketBot2/Forms/SettingForm.cs
+++ b/RocketBot2/Forms/SettingForm.cs
@@ -36,12 +36,14 @@ internal partial class SettingsForm : System.Windows.Forms.Form
         public static MultiAccountManager accountManager;
         private readonly ISession _session;
 
+
         public SettingsForm(ref GlobalSettings settings, ISession session, string[] _args)
         {
             InitializeComponent();
             _settings = settings;
             _session = session;
 
+
             args = _args;
             var Pokemons = Enum.GetValues(typeof(PokemonId)).Cast<PokemonId>().Where(id => id != PokemonId.Missingno);
 
@@ -74,7 +76,7 @@ public SettingsForm(ref GlobalSettings settings, ISession session, string[] _arg
                     lvAccounts.Items.Add($"{acc.AuthType}");
                     lvAccounts.Items[i].SubItems.Add($"{acc.Username}");
                     lvAccounts.Items[i].SubItems.Add($"{acc.Nickname}");
-                    lvAccounts.Items[i].Checked = acc.AccountActive;
+                    lvAccounts.Items[i].Checked = acc.AccountActive; // _settings.Auth.Bots[(int)acc.Id - 1].AccountActive;
                     i += 1;
                 }
                 //lvAccounts.Items[0].Remove();
@@ -298,7 +300,7 @@ private void SettingsForm_Load(object sender, EventArgs e)
             cbEvolvePreserveMinCandiesFromFilter.Checked = _settings.PokemonConfig.EvolveConfig.PreserveMinCandiesFromFilter;
             cbEvolveApplyLuckyEggOnEvolutionCount.Checked = _settings.PokemonConfig.EvolveConfig.ApplyLuckyEggOnEvolutionCount;
             tbEvolveApplyLuckyEggOnEvolutionCountValue.Text = _settings.PokemonConfig.EvolveConfig.ApplyLuckyEggOnEvolutionCountValue.ToString();
-            
+
             foreach (var poke in _settings.PokemonEvolveFilter)
             {
                 clbEvolve.SetItemChecked(clbEvolve.FindStringExact(poke.Key.ToString()), true);
@@ -517,7 +519,7 @@ private void ToggleProxyCtrls()
         }
 
         private void PopulateDevice()
-        { 
+        {
             var device = DeviceInfoHelper.GetRandomIosDevice();
             DeviceIdTb.Text = device.DeviceId;
             AndroidBoardNameTb.Text = device.AndroidBoardName;
@@ -625,8 +627,14 @@ private void SaveBtn_Click(object sender, EventArgs e)
                         if (acc.Username == lvAccounts.Items[i].SubItems[1].Text)
                         {
                             if (acc.AccountActive != lvAccounts.Items[i].Checked) Changed = true;
+
+
                             acc.AccountActive = lvAccounts.Items[i].Checked;
                             _settings.Auth.Bots[i].AccountActive = lvAccounts.Items[i].Checked;
+
+
+
+
                         }
                     }
                     _context.SaveChanges();
@@ -991,5 +999,15 @@ private void cbSwitchOnPokestopLimit_CheckedChanged(object sender, EventArgs e)
             tbPokestopSwitch.Enabled = cbSwitchOnPokestopLimit.Checked;
         }
         #endregion
+
+        private void cbSwitchOnPokestopLimit_CheckedChanged_1(object sender, EventArgs e)
+        {
+            tbPokestopSwitch.Enabled = cbSwitchOnPokestopLimit.Checked;
+        }
+
+        private void cbSwitchOnCatchLimit_CheckedChanged_1(object sender, EventArgs e)
+        {
+            tbPokemonSwitch.Enabled = cbSwitchOnCatchLimit.Checked;
+        }
     }
 }
diff --git a/RocketBot2/Helpers/Options.cs b/RocketBot2/Helpers/Options.cs
index 82250875d..8297b5da0 100644
--- a/RocketBot2/Helpers/Options.cs
+++ b/RocketBot2/Helpers/Options.cs
@@ -7,28 +7,29 @@ namespace RocketBot2.Helpers
 
     class Options
     {
-        [Option('a', "autostart", DefaultValue = false, Required = false, HelpText = "Auto start bot")]
+        [Option('a', "autostart", Default = false, Required = false, HelpText = "Auto start bot")]
         public bool AutoStart { get; set; }
 
         [Option('i', "init", Required = false, HelpText = "Init account")]
         public bool Init { get; set; }
 
-        [Option('t', "template", DefaultValue = null, Required = false, HelpText = "Prints all messages to standard output.")]
+        [Option('t', "template", Default = null, Required = false, HelpText = "Prints all messages to standard output.")]
         public string Template { get; set; }
 
-        [Option('p', "password", DefaultValue = null, Required = false, HelpText = "pasword")]
+        [Option('p', "password", Default = null, Required = false, HelpText = "pasword")]
         public string Password { get; set; }
 
-        [Option('g', "google", DefaultValue = false, Required = false, HelpText = "is google account")]
+        [Option('g', "google", Default = false, Required = false, HelpText = "is google account")]
         public bool IsGoogle { get; set; }
 
-        [Option('s', "start", DefaultValue = 1, HelpText = "Start account", Required = false)]
+        [Option('s', "start", Default = 1, HelpText = "Start account", Required = false)]
         public int Start { get; set; }
 
-        [Option('e', "end", DefaultValue = 10, HelpText = "End account", Required = false)]
+        [Option('e', "end", Default = 10, HelpText = "End account", Required = false)]
         public int End { get; set; }
 
-        [ParserState]
+        /* Outed or depracated
+         * [ParserState]
         public IParserState LastParserState { get; set; }
 
         [HelpOption]
@@ -41,5 +42,6 @@ public string GetUsage()
             Environment.Exit(0);
             return null;
         }
+        */
     }
 }
diff --git a/RocketBot2/Helpers/PokemomObject.cs b/RocketBot2/Helpers/PokemomObject.cs
index 9d1622393..4d5d69dac 100644
--- a/RocketBot2/Helpers/PokemomObject.cs
+++ b/RocketBot2/Helpers/PokemomObject.cs
@@ -327,7 +327,8 @@ public static void Initilize(ISession session, List<PokemonSettings> templates)
                 {
                     if (t != null)
                     {
-                        CandyToEvolveDict.Add(t.PokemonId, t.EvolutionBranch.Select(x => x.CandyCost).FirstOrDefault());
+                        //CandyToEvolveDict.Add(t.PokemonId, t.EvolutionBranch.Select(x => x.CandyCost).FirstOrDefault());
+                        CandyToEvolveDict.Add(t.PokemonId, session.Inventory.GetCandyToEvolve(templates.FirstOrDefault(p => p.PokemonId == t.PokemonId)));
                     }
                 }
             }
diff --git a/RocketBot2/Properties/AssemblyInfo.cs b/RocketBot2/Properties/AssemblyInfo.cs
index 5e60455ad..7e4e894a1 100644
--- a/RocketBot2/Properties/AssemblyInfo.cs
+++ b/RocketBot2/Properties/AssemblyInfo.cs
@@ -37,8 +37,8 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("2.21.1.1")]
+// [assembly: AssemblyVersion("2.22.0.1")]
 
-[assembly: AssemblyVersion("2.21.1.1")]
+[assembly: AssemblyVersion("2.22.0.1")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("v2.21.1.1")]
+[assembly: AssemblyInformationalVersion("v2.22.0.1")]
diff --git a/RocketBot2/Resources/PokemonDB.Designer.cs b/RocketBot2/Resources/PokemonDB.Designer.cs
index 043d266d9..8285cb502 100644
--- a/RocketBot2/Resources/PokemonDB.Designer.cs
+++ b/RocketBot2/Resources/PokemonDB.Designer.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,12 +13,12 @@ namespace RocketBot2.Resources {
     
     
     /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées.
     /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
+    // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder
+    // à l'aide d'un outil, tel que ResGen ou Visual Studio.
+    // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen
+    // avec l'option /str ou régénérez votre projet VS.
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@ internal PokemonDB() {
         }
         
         /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   Retourne l'instance ResourceManager mise en cache utilisée par cette classe.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ internal PokemonDB() {
         }
         
         /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   Remplace la propriété CurrentUICulture du thread actuel pour toutes
+        ///   les recherches de ressources à l'aide de cette classe de ressource fortement typée.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ internal PokemonDB() {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _0 {
             get {
@@ -71,7 +71,7 @@ internal static System.Drawing.Bitmap _0 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _1 {
             get {
@@ -81,7 +81,7 @@ internal static System.Drawing.Bitmap _1 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _10 {
             get {
@@ -91,7 +91,7 @@ internal static System.Drawing.Bitmap _10 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _100 {
             get {
@@ -101,7 +101,7 @@ internal static System.Drawing.Bitmap _100 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _101 {
             get {
@@ -111,7 +111,7 @@ internal static System.Drawing.Bitmap _101 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _102 {
             get {
@@ -121,7 +121,7 @@ internal static System.Drawing.Bitmap _102 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _103 {
             get {
@@ -131,7 +131,7 @@ internal static System.Drawing.Bitmap _103 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _104 {
             get {
@@ -141,7 +141,7 @@ internal static System.Drawing.Bitmap _104 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _105 {
             get {
@@ -151,7 +151,7 @@ internal static System.Drawing.Bitmap _105 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _106 {
             get {
@@ -161,7 +161,7 @@ internal static System.Drawing.Bitmap _106 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _107 {
             get {
@@ -171,7 +171,7 @@ internal static System.Drawing.Bitmap _107 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _108 {
             get {
@@ -181,7 +181,7 @@ internal static System.Drawing.Bitmap _108 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _109 {
             get {
@@ -191,7 +191,7 @@ internal static System.Drawing.Bitmap _109 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _11 {
             get {
@@ -201,7 +201,7 @@ internal static System.Drawing.Bitmap _11 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _110 {
             get {
@@ -211,7 +211,7 @@ internal static System.Drawing.Bitmap _110 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _111 {
             get {
@@ -221,7 +221,7 @@ internal static System.Drawing.Bitmap _111 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _112 {
             get {
@@ -231,7 +231,7 @@ internal static System.Drawing.Bitmap _112 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _113 {
             get {
@@ -241,7 +241,7 @@ internal static System.Drawing.Bitmap _113 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _114 {
             get {
@@ -251,7 +251,7 @@ internal static System.Drawing.Bitmap _114 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _115 {
             get {
@@ -261,7 +261,7 @@ internal static System.Drawing.Bitmap _115 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _116 {
             get {
@@ -271,7 +271,7 @@ internal static System.Drawing.Bitmap _116 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _117 {
             get {
@@ -281,7 +281,7 @@ internal static System.Drawing.Bitmap _117 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _118 {
             get {
@@ -291,7 +291,7 @@ internal static System.Drawing.Bitmap _118 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _119 {
             get {
@@ -301,7 +301,7 @@ internal static System.Drawing.Bitmap _119 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _12 {
             get {
@@ -311,7 +311,7 @@ internal static System.Drawing.Bitmap _12 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _120 {
             get {
@@ -321,7 +321,7 @@ internal static System.Drawing.Bitmap _120 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _121 {
             get {
@@ -331,7 +331,7 @@ internal static System.Drawing.Bitmap _121 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _122 {
             get {
@@ -341,7 +341,7 @@ internal static System.Drawing.Bitmap _122 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _123 {
             get {
@@ -351,7 +351,7 @@ internal static System.Drawing.Bitmap _123 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _124 {
             get {
@@ -361,7 +361,7 @@ internal static System.Drawing.Bitmap _124 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _125 {
             get {
@@ -371,7 +371,7 @@ internal static System.Drawing.Bitmap _125 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _126 {
             get {
@@ -381,7 +381,7 @@ internal static System.Drawing.Bitmap _126 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _127 {
             get {
@@ -391,7 +391,7 @@ internal static System.Drawing.Bitmap _127 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _128 {
             get {
@@ -401,7 +401,7 @@ internal static System.Drawing.Bitmap _128 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _129 {
             get {
@@ -411,7 +411,7 @@ internal static System.Drawing.Bitmap _129 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _129_shiny {
             get {
@@ -421,7 +421,7 @@ internal static System.Drawing.Bitmap _129_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _13 {
             get {
@@ -431,7 +431,7 @@ internal static System.Drawing.Bitmap _13 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _130 {
             get {
@@ -441,7 +441,7 @@ internal static System.Drawing.Bitmap _130 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _130_shiny {
             get {
@@ -451,7 +451,7 @@ internal static System.Drawing.Bitmap _130_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _131 {
             get {
@@ -461,7 +461,7 @@ internal static System.Drawing.Bitmap _131 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _132 {
             get {
@@ -471,7 +471,7 @@ internal static System.Drawing.Bitmap _132 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _133 {
             get {
@@ -481,7 +481,7 @@ internal static System.Drawing.Bitmap _133 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _134 {
             get {
@@ -491,7 +491,7 @@ internal static System.Drawing.Bitmap _134 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _135 {
             get {
@@ -501,7 +501,7 @@ internal static System.Drawing.Bitmap _135 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _136 {
             get {
@@ -511,7 +511,7 @@ internal static System.Drawing.Bitmap _136 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _137 {
             get {
@@ -521,7 +521,7 @@ internal static System.Drawing.Bitmap _137 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _138 {
             get {
@@ -531,7 +531,7 @@ internal static System.Drawing.Bitmap _138 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _139 {
             get {
@@ -541,7 +541,7 @@ internal static System.Drawing.Bitmap _139 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _14 {
             get {
@@ -551,7 +551,7 @@ internal static System.Drawing.Bitmap _14 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _140 {
             get {
@@ -561,7 +561,7 @@ internal static System.Drawing.Bitmap _140 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _141 {
             get {
@@ -571,7 +571,7 @@ internal static System.Drawing.Bitmap _141 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _142 {
             get {
@@ -581,7 +581,7 @@ internal static System.Drawing.Bitmap _142 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _143 {
             get {
@@ -591,7 +591,7 @@ internal static System.Drawing.Bitmap _143 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _144 {
             get {
@@ -601,7 +601,7 @@ internal static System.Drawing.Bitmap _144 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _144_shiny {
             get {
@@ -611,7 +611,7 @@ internal static System.Drawing.Bitmap _144_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _145 {
             get {
@@ -621,7 +621,7 @@ internal static System.Drawing.Bitmap _145 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _145_shiny {
             get {
@@ -631,7 +631,7 @@ internal static System.Drawing.Bitmap _145_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _146 {
             get {
@@ -641,7 +641,7 @@ internal static System.Drawing.Bitmap _146 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _146_shiny {
             get {
@@ -651,7 +651,7 @@ internal static System.Drawing.Bitmap _146_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _147 {
             get {
@@ -661,7 +661,7 @@ internal static System.Drawing.Bitmap _147 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _148 {
             get {
@@ -671,7 +671,7 @@ internal static System.Drawing.Bitmap _148 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _149 {
             get {
@@ -681,7 +681,7 @@ internal static System.Drawing.Bitmap _149 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _15 {
             get {
@@ -691,7 +691,7 @@ internal static System.Drawing.Bitmap _15 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _150 {
             get {
@@ -701,7 +701,7 @@ internal static System.Drawing.Bitmap _150 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _150_shiny {
             get {
@@ -711,7 +711,7 @@ internal static System.Drawing.Bitmap _150_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _151 {
             get {
@@ -721,7 +721,7 @@ internal static System.Drawing.Bitmap _151 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _152 {
             get {
@@ -731,7 +731,7 @@ internal static System.Drawing.Bitmap _152 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _153 {
             get {
@@ -741,7 +741,7 @@ internal static System.Drawing.Bitmap _153 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _154 {
             get {
@@ -751,7 +751,7 @@ internal static System.Drawing.Bitmap _154 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _155 {
             get {
@@ -761,7 +761,7 @@ internal static System.Drawing.Bitmap _155 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _156 {
             get {
@@ -771,7 +771,7 @@ internal static System.Drawing.Bitmap _156 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _157 {
             get {
@@ -781,7 +781,7 @@ internal static System.Drawing.Bitmap _157 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _158 {
             get {
@@ -791,7 +791,7 @@ internal static System.Drawing.Bitmap _158 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _159 {
             get {
@@ -801,7 +801,7 @@ internal static System.Drawing.Bitmap _159 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _16 {
             get {
@@ -811,7 +811,7 @@ internal static System.Drawing.Bitmap _16 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _160 {
             get {
@@ -821,7 +821,7 @@ internal static System.Drawing.Bitmap _160 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _161 {
             get {
@@ -831,7 +831,7 @@ internal static System.Drawing.Bitmap _161 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _162 {
             get {
@@ -841,7 +841,7 @@ internal static System.Drawing.Bitmap _162 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _163 {
             get {
@@ -851,7 +851,7 @@ internal static System.Drawing.Bitmap _163 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _164 {
             get {
@@ -861,7 +861,7 @@ internal static System.Drawing.Bitmap _164 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _165 {
             get {
@@ -871,7 +871,7 @@ internal static System.Drawing.Bitmap _165 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _166 {
             get {
@@ -881,7 +881,7 @@ internal static System.Drawing.Bitmap _166 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _167 {
             get {
@@ -891,7 +891,7 @@ internal static System.Drawing.Bitmap _167 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _168 {
             get {
@@ -901,7 +901,7 @@ internal static System.Drawing.Bitmap _168 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _169 {
             get {
@@ -911,7 +911,7 @@ internal static System.Drawing.Bitmap _169 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _17 {
             get {
@@ -921,7 +921,7 @@ internal static System.Drawing.Bitmap _17 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _170 {
             get {
@@ -931,7 +931,7 @@ internal static System.Drawing.Bitmap _170 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _171 {
             get {
@@ -941,7 +941,7 @@ internal static System.Drawing.Bitmap _171 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _172 {
             get {
@@ -951,7 +951,7 @@ internal static System.Drawing.Bitmap _172 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _172_Holiday2016 {
             get {
@@ -961,7 +961,7 @@ internal static System.Drawing.Bitmap _172_Holiday2016 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _172_Holiday2016_shiny {
             get {
@@ -971,7 +971,7 @@ internal static System.Drawing.Bitmap _172_Holiday2016_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _172_OneYearAnniversary {
             get {
@@ -981,7 +981,7 @@ internal static System.Drawing.Bitmap _172_OneYearAnniversary {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _172_OneYearAnniversary_shiny {
             get {
@@ -991,7 +991,7 @@ internal static System.Drawing.Bitmap _172_OneYearAnniversary_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _172_shiny {
             get {
@@ -1001,7 +1001,7 @@ internal static System.Drawing.Bitmap _172_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _173 {
             get {
@@ -1011,7 +1011,7 @@ internal static System.Drawing.Bitmap _173 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _174 {
             get {
@@ -1021,7 +1021,7 @@ internal static System.Drawing.Bitmap _174 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _175 {
             get {
@@ -1031,7 +1031,7 @@ internal static System.Drawing.Bitmap _175 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _176 {
             get {
@@ -1041,7 +1041,7 @@ internal static System.Drawing.Bitmap _176 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _177 {
             get {
@@ -1051,7 +1051,7 @@ internal static System.Drawing.Bitmap _177 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _178 {
             get {
@@ -1061,7 +1061,7 @@ internal static System.Drawing.Bitmap _178 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _179 {
             get {
@@ -1071,7 +1071,7 @@ internal static System.Drawing.Bitmap _179 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _18 {
             get {
@@ -1081,7 +1081,7 @@ internal static System.Drawing.Bitmap _18 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _180 {
             get {
@@ -1091,7 +1091,7 @@ internal static System.Drawing.Bitmap _180 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _181 {
             get {
@@ -1101,7 +1101,7 @@ internal static System.Drawing.Bitmap _181 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _182 {
             get {
@@ -1111,7 +1111,7 @@ internal static System.Drawing.Bitmap _182 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _183 {
             get {
@@ -1121,7 +1121,7 @@ internal static System.Drawing.Bitmap _183 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _184 {
             get {
@@ -1131,7 +1131,7 @@ internal static System.Drawing.Bitmap _184 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _185 {
             get {
@@ -1141,7 +1141,7 @@ internal static System.Drawing.Bitmap _185 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _186 {
             get {
@@ -1151,7 +1151,7 @@ internal static System.Drawing.Bitmap _186 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _187 {
             get {
@@ -1161,7 +1161,7 @@ internal static System.Drawing.Bitmap _187 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _188 {
             get {
@@ -1171,7 +1171,7 @@ internal static System.Drawing.Bitmap _188 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _189 {
             get {
@@ -1181,7 +1181,7 @@ internal static System.Drawing.Bitmap _189 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _19 {
             get {
@@ -1191,7 +1191,7 @@ internal static System.Drawing.Bitmap _19 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _190 {
             get {
@@ -1201,7 +1201,7 @@ internal static System.Drawing.Bitmap _190 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _191 {
             get {
@@ -1211,7 +1211,7 @@ internal static System.Drawing.Bitmap _191 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _192 {
             get {
@@ -1221,7 +1221,7 @@ internal static System.Drawing.Bitmap _192 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _193 {
             get {
@@ -1231,7 +1231,7 @@ internal static System.Drawing.Bitmap _193 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _194 {
             get {
@@ -1241,7 +1241,7 @@ internal static System.Drawing.Bitmap _194 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _195 {
             get {
@@ -1251,7 +1251,7 @@ internal static System.Drawing.Bitmap _195 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _196 {
             get {
@@ -1261,7 +1261,7 @@ internal static System.Drawing.Bitmap _196 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _197 {
             get {
@@ -1271,7 +1271,7 @@ internal static System.Drawing.Bitmap _197 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _198 {
             get {
@@ -1281,7 +1281,7 @@ internal static System.Drawing.Bitmap _198 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _199 {
             get {
@@ -1291,7 +1291,7 @@ internal static System.Drawing.Bitmap _199 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _2 {
             get {
@@ -1301,7 +1301,7 @@ internal static System.Drawing.Bitmap _2 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _20 {
             get {
@@ -1311,7 +1311,7 @@ internal static System.Drawing.Bitmap _20 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _200 {
             get {
@@ -1321,7 +1321,7 @@ internal static System.Drawing.Bitmap _200 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201 {
             get {
@@ -1331,7 +1331,7 @@ internal static System.Drawing.Bitmap _201 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_A {
             get {
@@ -1341,7 +1341,7 @@ internal static System.Drawing.Bitmap _201_A {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_B {
             get {
@@ -1351,7 +1351,7 @@ internal static System.Drawing.Bitmap _201_B {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_C {
             get {
@@ -1361,7 +1361,7 @@ internal static System.Drawing.Bitmap _201_C {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_D {
             get {
@@ -1371,7 +1371,7 @@ internal static System.Drawing.Bitmap _201_D {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_E {
             get {
@@ -1381,7 +1381,7 @@ internal static System.Drawing.Bitmap _201_E {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_ExclamationPoint {
             get {
@@ -1391,7 +1391,7 @@ internal static System.Drawing.Bitmap _201_ExclamationPoint {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_F {
             get {
@@ -1401,7 +1401,7 @@ internal static System.Drawing.Bitmap _201_F {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_G {
             get {
@@ -1411,7 +1411,7 @@ internal static System.Drawing.Bitmap _201_G {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_H {
             get {
@@ -1421,7 +1421,7 @@ internal static System.Drawing.Bitmap _201_H {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_I {
             get {
@@ -1431,7 +1431,7 @@ internal static System.Drawing.Bitmap _201_I {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_J {
             get {
@@ -1441,7 +1441,7 @@ internal static System.Drawing.Bitmap _201_J {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_K {
             get {
@@ -1451,7 +1451,7 @@ internal static System.Drawing.Bitmap _201_K {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_L {
             get {
@@ -1461,7 +1461,7 @@ internal static System.Drawing.Bitmap _201_L {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_M {
             get {
@@ -1471,7 +1471,7 @@ internal static System.Drawing.Bitmap _201_M {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_N {
             get {
@@ -1481,7 +1481,7 @@ internal static System.Drawing.Bitmap _201_N {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_O {
             get {
@@ -1491,7 +1491,7 @@ internal static System.Drawing.Bitmap _201_O {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_P {
             get {
@@ -1501,7 +1501,7 @@ internal static System.Drawing.Bitmap _201_P {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_Q {
             get {
@@ -1511,7 +1511,7 @@ internal static System.Drawing.Bitmap _201_Q {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_QuestionMark {
             get {
@@ -1521,7 +1521,7 @@ internal static System.Drawing.Bitmap _201_QuestionMark {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_R {
             get {
@@ -1531,7 +1531,7 @@ internal static System.Drawing.Bitmap _201_R {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_S {
             get {
@@ -1541,7 +1541,7 @@ internal static System.Drawing.Bitmap _201_S {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_T {
             get {
@@ -1551,7 +1551,7 @@ internal static System.Drawing.Bitmap _201_T {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_U {
             get {
@@ -1561,7 +1561,7 @@ internal static System.Drawing.Bitmap _201_U {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_V {
             get {
@@ -1571,7 +1571,7 @@ internal static System.Drawing.Bitmap _201_V {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_W {
             get {
@@ -1581,7 +1581,7 @@ internal static System.Drawing.Bitmap _201_W {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_X {
             get {
@@ -1591,7 +1591,7 @@ internal static System.Drawing.Bitmap _201_X {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_Y {
             get {
@@ -1601,7 +1601,7 @@ internal static System.Drawing.Bitmap _201_Y {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _201_Z {
             get {
@@ -1611,7 +1611,7 @@ internal static System.Drawing.Bitmap _201_Z {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _202 {
             get {
@@ -1621,7 +1621,7 @@ internal static System.Drawing.Bitmap _202 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _203 {
             get {
@@ -1631,7 +1631,7 @@ internal static System.Drawing.Bitmap _203 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _204 {
             get {
@@ -1641,7 +1641,7 @@ internal static System.Drawing.Bitmap _204 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _205 {
             get {
@@ -1651,7 +1651,7 @@ internal static System.Drawing.Bitmap _205 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _206 {
             get {
@@ -1661,7 +1661,7 @@ internal static System.Drawing.Bitmap _206 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _207 {
             get {
@@ -1671,7 +1671,7 @@ internal static System.Drawing.Bitmap _207 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _208 {
             get {
@@ -1681,7 +1681,7 @@ internal static System.Drawing.Bitmap _208 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _209 {
             get {
@@ -1691,7 +1691,7 @@ internal static System.Drawing.Bitmap _209 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _21 {
             get {
@@ -1701,7 +1701,7 @@ internal static System.Drawing.Bitmap _21 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _210 {
             get {
@@ -1711,7 +1711,7 @@ internal static System.Drawing.Bitmap _210 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _211 {
             get {
@@ -1721,7 +1721,7 @@ internal static System.Drawing.Bitmap _211 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _212 {
             get {
@@ -1731,7 +1731,7 @@ internal static System.Drawing.Bitmap _212 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _213 {
             get {
@@ -1741,7 +1741,7 @@ internal static System.Drawing.Bitmap _213 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _214 {
             get {
@@ -1751,7 +1751,7 @@ internal static System.Drawing.Bitmap _214 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _215 {
             get {
@@ -1761,7 +1761,7 @@ internal static System.Drawing.Bitmap _215 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _216 {
             get {
@@ -1771,7 +1771,7 @@ internal static System.Drawing.Bitmap _216 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _217 {
             get {
@@ -1781,7 +1781,7 @@ internal static System.Drawing.Bitmap _217 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _218 {
             get {
@@ -1791,7 +1791,7 @@ internal static System.Drawing.Bitmap _218 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _219 {
             get {
@@ -1801,7 +1801,7 @@ internal static System.Drawing.Bitmap _219 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _22 {
             get {
@@ -1811,7 +1811,7 @@ internal static System.Drawing.Bitmap _22 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _220 {
             get {
@@ -1821,7 +1821,7 @@ internal static System.Drawing.Bitmap _220 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _221 {
             get {
@@ -1831,7 +1831,7 @@ internal static System.Drawing.Bitmap _221 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _222 {
             get {
@@ -1841,7 +1841,7 @@ internal static System.Drawing.Bitmap _222 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _223 {
             get {
@@ -1851,7 +1851,7 @@ internal static System.Drawing.Bitmap _223 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _224 {
             get {
@@ -1861,7 +1861,7 @@ internal static System.Drawing.Bitmap _224 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _225 {
             get {
@@ -1871,7 +1871,7 @@ internal static System.Drawing.Bitmap _225 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _226 {
             get {
@@ -1881,7 +1881,7 @@ internal static System.Drawing.Bitmap _226 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _227 {
             get {
@@ -1891,7 +1891,7 @@ internal static System.Drawing.Bitmap _227 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _228 {
             get {
@@ -1901,7 +1901,7 @@ internal static System.Drawing.Bitmap _228 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _229 {
             get {
@@ -1911,7 +1911,7 @@ internal static System.Drawing.Bitmap _229 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _23 {
             get {
@@ -1921,7 +1921,7 @@ internal static System.Drawing.Bitmap _23 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _230 {
             get {
@@ -1931,7 +1931,7 @@ internal static System.Drawing.Bitmap _230 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _231 {
             get {
@@ -1941,7 +1941,7 @@ internal static System.Drawing.Bitmap _231 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _232 {
             get {
@@ -1951,7 +1951,7 @@ internal static System.Drawing.Bitmap _232 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _233 {
             get {
@@ -1961,7 +1961,7 @@ internal static System.Drawing.Bitmap _233 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _234 {
             get {
@@ -1971,7 +1971,7 @@ internal static System.Drawing.Bitmap _234 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _235 {
             get {
@@ -1981,7 +1981,7 @@ internal static System.Drawing.Bitmap _235 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _236 {
             get {
@@ -1991,7 +1991,7 @@ internal static System.Drawing.Bitmap _236 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _237 {
             get {
@@ -2001,7 +2001,7 @@ internal static System.Drawing.Bitmap _237 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _238 {
             get {
@@ -2011,7 +2011,7 @@ internal static System.Drawing.Bitmap _238 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _239 {
             get {
@@ -2021,7 +2021,7 @@ internal static System.Drawing.Bitmap _239 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _24 {
             get {
@@ -2031,7 +2031,7 @@ internal static System.Drawing.Bitmap _24 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _240 {
             get {
@@ -2041,7 +2041,7 @@ internal static System.Drawing.Bitmap _240 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _241 {
             get {
@@ -2051,7 +2051,7 @@ internal static System.Drawing.Bitmap _241 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _242 {
             get {
@@ -2061,7 +2061,7 @@ internal static System.Drawing.Bitmap _242 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _243 {
             get {
@@ -2071,7 +2071,7 @@ internal static System.Drawing.Bitmap _243 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _244 {
             get {
@@ -2081,7 +2081,7 @@ internal static System.Drawing.Bitmap _244 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _245 {
             get {
@@ -2091,7 +2091,7 @@ internal static System.Drawing.Bitmap _245 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _246 {
             get {
@@ -2101,7 +2101,7 @@ internal static System.Drawing.Bitmap _246 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _247 {
             get {
@@ -2111,7 +2111,7 @@ internal static System.Drawing.Bitmap _247 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _248 {
             get {
@@ -2121,7 +2121,7 @@ internal static System.Drawing.Bitmap _248 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _249 {
             get {
@@ -2131,7 +2131,7 @@ internal static System.Drawing.Bitmap _249 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _249_shiny {
             get {
@@ -2141,7 +2141,7 @@ internal static System.Drawing.Bitmap _249_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _25 {
             get {
@@ -2151,7 +2151,7 @@ internal static System.Drawing.Bitmap _25 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _25_Anniversary {
             get {
@@ -2161,7 +2161,7 @@ internal static System.Drawing.Bitmap _25_Anniversary {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _25_Anniversary_shiny {
             get {
@@ -2171,7 +2171,7 @@ internal static System.Drawing.Bitmap _25_Anniversary_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _25_Holiday2016 {
             get {
@@ -2181,7 +2181,7 @@ internal static System.Drawing.Bitmap _25_Holiday2016 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _25_Holiday2016_shiny {
             get {
@@ -2191,7 +2191,7 @@ internal static System.Drawing.Bitmap _25_Holiday2016_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _25_OneYearAnniversar_shiny {
             get {
@@ -2201,7 +2201,7 @@ internal static System.Drawing.Bitmap _25_OneYearAnniversar_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _25_OneYearAnniversary {
             get {
@@ -2211,7 +2211,7 @@ internal static System.Drawing.Bitmap _25_OneYearAnniversary {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _25_shiny {
             get {
@@ -2221,7 +2221,7 @@ internal static System.Drawing.Bitmap _25_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _250 {
             get {
@@ -2231,7 +2231,7 @@ internal static System.Drawing.Bitmap _250 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _251 {
             get {
@@ -2241,7 +2241,227 @@ internal static System.Drawing.Bitmap _251 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _252 {
+            get {
+                object obj = ResourceManager.GetObject("_252", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _252_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_252_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _253 {
+            get {
+                object obj = ResourceManager.GetObject("_253", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _253_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_253_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _254 {
+            get {
+                object obj = ResourceManager.GetObject("_254", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _254_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_254_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _255 {
+            get {
+                object obj = ResourceManager.GetObject("_255", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _255_1 {
+            get {
+                object obj = ResourceManager.GetObject("_255_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _255_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_255_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _255_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_255_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _256 {
+            get {
+                object obj = ResourceManager.GetObject("_256", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _256_1 {
+            get {
+                object obj = ResourceManager.GetObject("_256_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _256_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_256_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _256_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_256_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _257 {
+            get {
+                object obj = ResourceManager.GetObject("_257", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _257_1 {
+            get {
+                object obj = ResourceManager.GetObject("_257_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _257_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_257_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _257_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_257_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _258 {
+            get {
+                object obj = ResourceManager.GetObject("_258", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _258_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_258_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _259 {
+            get {
+                object obj = ResourceManager.GetObject("_259", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _259_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_259_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _26 {
             get {
@@ -2251,7 +2471,7 @@ internal static System.Drawing.Bitmap _26 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _26_Anniversary {
             get {
@@ -2261,7 +2481,7 @@ internal static System.Drawing.Bitmap _26_Anniversary {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _26_Anniversary_shiny {
             get {
@@ -2271,7 +2491,7 @@ internal static System.Drawing.Bitmap _26_Anniversary_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _26_Holiday2016 {
             get {
@@ -2281,7 +2501,7 @@ internal static System.Drawing.Bitmap _26_Holiday2016 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _26_Holiday2016_shiny {
             get {
@@ -2291,7 +2511,7 @@ internal static System.Drawing.Bitmap _26_Holiday2016_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _26_OneYearAnniversary {
             get {
@@ -2301,7 +2521,7 @@ internal static System.Drawing.Bitmap _26_OneYearAnniversary {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _26_OneYearAnniversary_shiny {
             get {
@@ -2311,7 +2531,7 @@ internal static System.Drawing.Bitmap _26_OneYearAnniversary_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _26_shiny {
             get {
@@ -2321,137 +2541,2737 @@ internal static System.Drawing.Bitmap _26_shiny {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _27 {
+        internal static System.Drawing.Bitmap _260 {
             get {
-                object obj = ResourceManager.GetObject("_27", resourceCulture);
+                object obj = ResourceManager.GetObject("_260", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _28 {
+        internal static System.Drawing.Bitmap _260_shiny {
             get {
-                object obj = ResourceManager.GetObject("_28", resourceCulture);
+                object obj = ResourceManager.GetObject("_260_shiny", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _29 {
+        internal static System.Drawing.Bitmap _261 {
             get {
-                object obj = ResourceManager.GetObject("_29", resourceCulture);
+                object obj = ResourceManager.GetObject("_261", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _3 {
+        internal static System.Drawing.Bitmap _261_shiny {
             get {
-                object obj = ResourceManager.GetObject("_3", resourceCulture);
+                object obj = ResourceManager.GetObject("_261_shiny", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _30 {
+        internal static System.Drawing.Bitmap _262 {
             get {
-                object obj = ResourceManager.GetObject("_30", resourceCulture);
+                object obj = ResourceManager.GetObject("_262", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _31 {
+        internal static System.Drawing.Bitmap _262_shiny {
             get {
-                object obj = ResourceManager.GetObject("_31", resourceCulture);
+                object obj = ResourceManager.GetObject("_262_shiny", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _32 {
+        internal static System.Drawing.Bitmap _263 {
             get {
-                object obj = ResourceManager.GetObject("_32", resourceCulture);
+                object obj = ResourceManager.GetObject("_263", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _33 {
+        internal static System.Drawing.Bitmap _263_shiny {
             get {
-                object obj = ResourceManager.GetObject("_33", resourceCulture);
+                object obj = ResourceManager.GetObject("_263_shiny", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _34 {
+        internal static System.Drawing.Bitmap _264 {
             get {
-                object obj = ResourceManager.GetObject("_34", resourceCulture);
+                object obj = ResourceManager.GetObject("_264", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _35 {
+        internal static System.Drawing.Bitmap _264_shiny {
             get {
-                object obj = ResourceManager.GetObject("_35", resourceCulture);
+                object obj = ResourceManager.GetObject("_264_shiny", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _36 {
+        internal static System.Drawing.Bitmap _265 {
             get {
-                object obj = ResourceManager.GetObject("_36", resourceCulture);
+                object obj = ResourceManager.GetObject("_265", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _37 {
+        internal static System.Drawing.Bitmap _265_shiny {
             get {
-                object obj = ResourceManager.GetObject("_37", resourceCulture);
+                object obj = ResourceManager.GetObject("_265_shiny", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
-        internal static System.Drawing.Bitmap _38 {
+        internal static System.Drawing.Bitmap _266 {
             get {
-                object obj = ResourceManager.GetObject("_38", resourceCulture);
+                object obj = ResourceManager.GetObject("_266", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _266_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_266_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _267 {
+            get {
+                object obj = ResourceManager.GetObject("_267", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _267_1 {
+            get {
+                object obj = ResourceManager.GetObject("_267_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _267_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_267_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _267_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_267_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _268 {
+            get {
+                object obj = ResourceManager.GetObject("_268", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _268_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_268_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _269 {
+            get {
+                object obj = ResourceManager.GetObject("_269", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _269_1 {
+            get {
+                object obj = ResourceManager.GetObject("_269_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _269_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_269_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _269_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_269_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _27 {
+            get {
+                object obj = ResourceManager.GetObject("_27", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _270 {
+            get {
+                object obj = ResourceManager.GetObject("_270", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _270_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_270_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _271 {
+            get {
+                object obj = ResourceManager.GetObject("_271", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _271_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_271_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _272 {
+            get {
+                object obj = ResourceManager.GetObject("_272", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _272_1 {
+            get {
+                object obj = ResourceManager.GetObject("_272_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _272_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_272_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _272_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_272_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _273 {
+            get {
+                object obj = ResourceManager.GetObject("_273", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _273_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_273_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _274 {
+            get {
+                object obj = ResourceManager.GetObject("_274", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _274_1 {
+            get {
+                object obj = ResourceManager.GetObject("_274_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _274_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_274_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _274_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_274_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _275 {
+            get {
+                object obj = ResourceManager.GetObject("_275", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _275_1 {
+            get {
+                object obj = ResourceManager.GetObject("_275_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _275_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_275_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _275_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_275_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _276 {
+            get {
+                object obj = ResourceManager.GetObject("_276", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _276_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_276_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _277 {
+            get {
+                object obj = ResourceManager.GetObject("_277", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _277_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_277_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _278 {
+            get {
+                object obj = ResourceManager.GetObject("_278", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _278_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_278_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _279 {
+            get {
+                object obj = ResourceManager.GetObject("_279", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _279_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_279_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _28 {
+            get {
+                object obj = ResourceManager.GetObject("_28", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _280 {
+            get {
+                object obj = ResourceManager.GetObject("_280", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _280_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_280_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _281 {
+            get {
+                object obj = ResourceManager.GetObject("_281", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _281_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_281_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _282 {
+            get {
+                object obj = ResourceManager.GetObject("_282", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _282_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_282_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _283 {
+            get {
+                object obj = ResourceManager.GetObject("_283", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _283_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_283_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _284 {
+            get {
+                object obj = ResourceManager.GetObject("_284", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _284_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_284_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _285 {
+            get {
+                object obj = ResourceManager.GetObject("_285", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _285_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_285_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _286 {
+            get {
+                object obj = ResourceManager.GetObject("_286", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _286_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_286_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _287 {
+            get {
+                object obj = ResourceManager.GetObject("_287", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _287_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_287_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _288 {
+            get {
+                object obj = ResourceManager.GetObject("_288", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _288_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_288_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _289 {
+            get {
+                object obj = ResourceManager.GetObject("_289", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _289_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_289_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _29 {
+            get {
+                object obj = ResourceManager.GetObject("_29", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _293 {
+            get {
+                object obj = ResourceManager.GetObject("_293", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _293_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_293_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _294 {
+            get {
+                object obj = ResourceManager.GetObject("_294", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _294_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_294_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _295 {
+            get {
+                object obj = ResourceManager.GetObject("_295", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _295_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_295_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _296 {
+            get {
+                object obj = ResourceManager.GetObject("_296", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _296_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_296_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _297 {
+            get {
+                object obj = ResourceManager.GetObject("_297", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _297_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_297_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _298 {
+            get {
+                object obj = ResourceManager.GetObject("_298", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _298_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_298_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _299 {
+            get {
+                object obj = ResourceManager.GetObject("_299", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _299_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_299_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _3 {
+            get {
+                object obj = ResourceManager.GetObject("_3", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _30 {
+            get {
+                object obj = ResourceManager.GetObject("_30", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _300 {
+            get {
+                object obj = ResourceManager.GetObject("_300", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _300_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_300_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _301 {
+            get {
+                object obj = ResourceManager.GetObject("_301", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _301_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_301_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _302 {
+            get {
+                object obj = ResourceManager.GetObject("_302", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _302_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_302_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _303 {
+            get {
+                object obj = ResourceManager.GetObject("_303", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _303_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_303_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _304 {
+            get {
+                object obj = ResourceManager.GetObject("_304", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _304_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_304_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _305 {
+            get {
+                object obj = ResourceManager.GetObject("_305", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _305_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_305_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _306 {
+            get {
+                object obj = ResourceManager.GetObject("_306", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _306_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_306_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _307 {
+            get {
+                object obj = ResourceManager.GetObject("_307", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _307_1 {
+            get {
+                object obj = ResourceManager.GetObject("_307_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _307_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_307_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _307_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_307_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _308 {
+            get {
+                object obj = ResourceManager.GetObject("_308", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _308_1 {
+            get {
+                object obj = ResourceManager.GetObject("_308_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _308_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_308_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _308_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_308_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _309 {
+            get {
+                object obj = ResourceManager.GetObject("_309", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _309_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_309_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _31 {
+            get {
+                object obj = ResourceManager.GetObject("_31", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _310 {
+            get {
+                object obj = ResourceManager.GetObject("_310", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _310_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_310_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _311 {
+            get {
+                object obj = ResourceManager.GetObject("_311", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _311_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_311_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _312 {
+            get {
+                object obj = ResourceManager.GetObject("_312", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _312_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_312_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _313 {
+            get {
+                object obj = ResourceManager.GetObject("_313", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _313_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_313_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _314 {
+            get {
+                object obj = ResourceManager.GetObject("_314", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _314_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_314_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _315 {
+            get {
+                object obj = ResourceManager.GetObject("_315", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _315_1 {
+            get {
+                object obj = ResourceManager.GetObject("_315_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _315_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_315_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _315_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_315_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _316 {
+            get {
+                object obj = ResourceManager.GetObject("_316", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _316_1 {
+            get {
+                object obj = ResourceManager.GetObject("_316_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _316_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_316_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _316_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_316_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _317 {
+            get {
+                object obj = ResourceManager.GetObject("_317", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _317_1 {
+            get {
+                object obj = ResourceManager.GetObject("_317_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _317_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_317_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _317_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_317_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _318 {
+            get {
+                object obj = ResourceManager.GetObject("_318", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _318_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_318_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _319 {
+            get {
+                object obj = ResourceManager.GetObject("_319", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _319_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_319_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _32 {
+            get {
+                object obj = ResourceManager.GetObject("_32", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _320 {
+            get {
+                object obj = ResourceManager.GetObject("_320", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _320_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_320_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _321 {
+            get {
+                object obj = ResourceManager.GetObject("_321", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _321_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_321_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _322 {
+            get {
+                object obj = ResourceManager.GetObject("_322", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _322_1 {
+            get {
+                object obj = ResourceManager.GetObject("_322_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _322_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_322_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _322_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_322_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _323 {
+            get {
+                object obj = ResourceManager.GetObject("_323", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _323_1 {
+            get {
+                object obj = ResourceManager.GetObject("_323_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _323_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_323_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _323_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_323_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _324 {
+            get {
+                object obj = ResourceManager.GetObject("_324", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _324_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_324_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _325 {
+            get {
+                object obj = ResourceManager.GetObject("_325", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _325_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_325_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _326 {
+            get {
+                object obj = ResourceManager.GetObject("_326", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _326_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_326_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _328 {
+            get {
+                object obj = ResourceManager.GetObject("_328", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _328_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_328_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _329 {
+            get {
+                object obj = ResourceManager.GetObject("_329", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _329_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_329_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _33 {
+            get {
+                object obj = ResourceManager.GetObject("_33", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _330 {
+            get {
+                object obj = ResourceManager.GetObject("_330", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _330_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_330_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _331 {
+            get {
+                object obj = ResourceManager.GetObject("_331", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _331_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_331_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _332 {
+            get {
+                object obj = ResourceManager.GetObject("_332", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _332_1 {
+            get {
+                object obj = ResourceManager.GetObject("_332_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _332_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_332_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _332_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_332_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _333 {
+            get {
+                object obj = ResourceManager.GetObject("_333", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _333_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_333_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _334 {
+            get {
+                object obj = ResourceManager.GetObject("_334", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _334_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_334_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _335 {
+            get {
+                object obj = ResourceManager.GetObject("_335", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _335_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_335_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _336 {
+            get {
+                object obj = ResourceManager.GetObject("_336", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _336_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_336_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _337 {
+            get {
+                object obj = ResourceManager.GetObject("_337", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _337_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_337_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _338 {
+            get {
+                object obj = ResourceManager.GetObject("_338", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _338_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_338_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _339 {
+            get {
+                object obj = ResourceManager.GetObject("_339", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _339_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_339_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _34 {
+            get {
+                object obj = ResourceManager.GetObject("_34", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _340 {
+            get {
+                object obj = ResourceManager.GetObject("_340", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _340_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_340_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _341 {
+            get {
+                object obj = ResourceManager.GetObject("_341", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _341_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_341_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _342 {
+            get {
+                object obj = ResourceManager.GetObject("_342", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _342_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_342_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _343 {
+            get {
+                object obj = ResourceManager.GetObject("_343", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _343_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_343_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _344 {
+            get {
+                object obj = ResourceManager.GetObject("_344", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _344_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_344_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _345 {
+            get {
+                object obj = ResourceManager.GetObject("_345", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _345_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_345_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _346 {
+            get {
+                object obj = ResourceManager.GetObject("_346", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _346_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_346_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _347 {
+            get {
+                object obj = ResourceManager.GetObject("_347", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _347_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_347_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _348 {
+            get {
+                object obj = ResourceManager.GetObject("_348", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _348_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_348_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _349 {
+            get {
+                object obj = ResourceManager.GetObject("_349", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _349_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_349_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _35 {
+            get {
+                object obj = ResourceManager.GetObject("_35", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _350 {
+            get {
+                object obj = ResourceManager.GetObject("_350", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _350_1 {
+            get {
+                object obj = ResourceManager.GetObject("_350_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _350_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_350_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _350_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_350_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _351_11 {
+            get {
+                object obj = ResourceManager.GetObject("_351_11", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _351_11_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_351_11_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _351_12 {
+            get {
+                object obj = ResourceManager.GetObject("_351_12", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _351_12_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_351_12_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _351_13 {
+            get {
+                object obj = ResourceManager.GetObject("_351_13", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _351_13_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_351_13_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _351_14 {
+            get {
+                object obj = ResourceManager.GetObject("_351_14", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _351_14_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_351_14_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _353 {
+            get {
+                object obj = ResourceManager.GetObject("_353", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _353_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_353_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _354 {
+            get {
+                object obj = ResourceManager.GetObject("_354", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _354_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_354_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _355 {
+            get {
+                object obj = ResourceManager.GetObject("_355", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _355_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_355_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _356 {
+            get {
+                object obj = ResourceManager.GetObject("_356", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _356_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_356_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _357 {
+            get {
+                object obj = ResourceManager.GetObject("_357", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _357_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_357_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _358 {
+            get {
+                object obj = ResourceManager.GetObject("_358", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _358_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_358_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _359 {
+            get {
+                object obj = ResourceManager.GetObject("_359", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _359_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_359_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _36 {
+            get {
+                object obj = ResourceManager.GetObject("_36", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _360 {
+            get {
+                object obj = ResourceManager.GetObject("_360", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _360_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_360_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _361 {
+            get {
+                object obj = ResourceManager.GetObject("_361", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _361_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_361_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _362 {
+            get {
+                object obj = ResourceManager.GetObject("_362", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _362_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_362_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _363 {
+            get {
+                object obj = ResourceManager.GetObject("_363", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _363_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_363_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _364 {
+            get {
+                object obj = ResourceManager.GetObject("_364", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _364_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_364_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _365 {
+            get {
+                object obj = ResourceManager.GetObject("_365", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _365_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_365_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _369 {
+            get {
+                object obj = ResourceManager.GetObject("_369", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _369_1 {
+            get {
+                object obj = ResourceManager.GetObject("_369_1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _369_1_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_369_1_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _369_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_369_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _37 {
+            get {
+                object obj = ResourceManager.GetObject("_37", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _370 {
+            get {
+                object obj = ResourceManager.GetObject("_370", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _370_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_370_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _371 {
+            get {
+                object obj = ResourceManager.GetObject("_371", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _371_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_371_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _372 {
+            get {
+                object obj = ResourceManager.GetObject("_372", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _372_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_372_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _373 {
+            get {
+                object obj = ResourceManager.GetObject("_373", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _373_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_373_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _374 {
+            get {
+                object obj = ResourceManager.GetObject("_374", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _374_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_374_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _375 {
+            get {
+                object obj = ResourceManager.GetObject("_375", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _375_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_375_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _376 {
+            get {
+                object obj = ResourceManager.GetObject("_376", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _376_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_376_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _38 {
+            get {
+                object obj = ResourceManager.GetObject("_38", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _382 {
+            get {
+                object obj = ResourceManager.GetObject("_382", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _382_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_382_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _383 {
+            get {
+                object obj = ResourceManager.GetObject("_383", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _383_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_383_shiny", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _384 {
+            get {
+                object obj = ResourceManager.GetObject("_384", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap _384_shiny {
+            get {
+                object obj = ResourceManager.GetObject("_384_shiny", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _39 {
             get {
@@ -2461,7 +5281,7 @@ internal static System.Drawing.Bitmap _39 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _4 {
             get {
@@ -2471,7 +5291,7 @@ internal static System.Drawing.Bitmap _4 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _40 {
             get {
@@ -2481,7 +5301,7 @@ internal static System.Drawing.Bitmap _40 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _41 {
             get {
@@ -2491,7 +5311,7 @@ internal static System.Drawing.Bitmap _41 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _42 {
             get {
@@ -2501,7 +5321,7 @@ internal static System.Drawing.Bitmap _42 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _43 {
             get {
@@ -2511,7 +5331,7 @@ internal static System.Drawing.Bitmap _43 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _44 {
             get {
@@ -2521,7 +5341,7 @@ internal static System.Drawing.Bitmap _44 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _45 {
             get {
@@ -2531,7 +5351,7 @@ internal static System.Drawing.Bitmap _45 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _46 {
             get {
@@ -2541,7 +5361,7 @@ internal static System.Drawing.Bitmap _46 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _47 {
             get {
@@ -2551,7 +5371,7 @@ internal static System.Drawing.Bitmap _47 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _48 {
             get {
@@ -2561,7 +5381,7 @@ internal static System.Drawing.Bitmap _48 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _49 {
             get {
@@ -2571,7 +5391,7 @@ internal static System.Drawing.Bitmap _49 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _5 {
             get {
@@ -2581,7 +5401,7 @@ internal static System.Drawing.Bitmap _5 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _50 {
             get {
@@ -2591,7 +5411,7 @@ internal static System.Drawing.Bitmap _50 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _51 {
             get {
@@ -2601,7 +5421,7 @@ internal static System.Drawing.Bitmap _51 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _52 {
             get {
@@ -2611,7 +5431,7 @@ internal static System.Drawing.Bitmap _52 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _53 {
             get {
@@ -2621,7 +5441,7 @@ internal static System.Drawing.Bitmap _53 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _54 {
             get {
@@ -2631,7 +5451,7 @@ internal static System.Drawing.Bitmap _54 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _55 {
             get {
@@ -2641,7 +5461,7 @@ internal static System.Drawing.Bitmap _55 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _56 {
             get {
@@ -2651,7 +5471,7 @@ internal static System.Drawing.Bitmap _56 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _57 {
             get {
@@ -2661,7 +5481,7 @@ internal static System.Drawing.Bitmap _57 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _58 {
             get {
@@ -2671,7 +5491,7 @@ internal static System.Drawing.Bitmap _58 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _59 {
             get {
@@ -2681,7 +5501,7 @@ internal static System.Drawing.Bitmap _59 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _6 {
             get {
@@ -2691,7 +5511,7 @@ internal static System.Drawing.Bitmap _6 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _60 {
             get {
@@ -2701,7 +5521,7 @@ internal static System.Drawing.Bitmap _60 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _61 {
             get {
@@ -2711,7 +5531,7 @@ internal static System.Drawing.Bitmap _61 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _62 {
             get {
@@ -2721,7 +5541,7 @@ internal static System.Drawing.Bitmap _62 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _63 {
             get {
@@ -2731,7 +5551,7 @@ internal static System.Drawing.Bitmap _63 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _64 {
             get {
@@ -2741,7 +5561,7 @@ internal static System.Drawing.Bitmap _64 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _65 {
             get {
@@ -2751,7 +5571,7 @@ internal static System.Drawing.Bitmap _65 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _66 {
             get {
@@ -2761,7 +5581,7 @@ internal static System.Drawing.Bitmap _66 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _67 {
             get {
@@ -2771,7 +5591,7 @@ internal static System.Drawing.Bitmap _67 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _68 {
             get {
@@ -2781,7 +5601,7 @@ internal static System.Drawing.Bitmap _68 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _69 {
             get {
@@ -2791,7 +5611,7 @@ internal static System.Drawing.Bitmap _69 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _7 {
             get {
@@ -2801,7 +5621,7 @@ internal static System.Drawing.Bitmap _7 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _70 {
             get {
@@ -2811,7 +5631,7 @@ internal static System.Drawing.Bitmap _70 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _71 {
             get {
@@ -2821,7 +5641,7 @@ internal static System.Drawing.Bitmap _71 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _72 {
             get {
@@ -2831,7 +5651,7 @@ internal static System.Drawing.Bitmap _72 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _73 {
             get {
@@ -2841,7 +5661,7 @@ internal static System.Drawing.Bitmap _73 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _74 {
             get {
@@ -2851,7 +5671,7 @@ internal static System.Drawing.Bitmap _74 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _75 {
             get {
@@ -2861,7 +5681,7 @@ internal static System.Drawing.Bitmap _75 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _76 {
             get {
@@ -2871,7 +5691,7 @@ internal static System.Drawing.Bitmap _76 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _77 {
             get {
@@ -2881,7 +5701,7 @@ internal static System.Drawing.Bitmap _77 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _78 {
             get {
@@ -2891,7 +5711,7 @@ internal static System.Drawing.Bitmap _78 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _79 {
             get {
@@ -2901,7 +5721,7 @@ internal static System.Drawing.Bitmap _79 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _8 {
             get {
@@ -2911,7 +5731,7 @@ internal static System.Drawing.Bitmap _8 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _80 {
             get {
@@ -2921,7 +5741,7 @@ internal static System.Drawing.Bitmap _80 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _81 {
             get {
@@ -2931,7 +5751,7 @@ internal static System.Drawing.Bitmap _81 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _82 {
             get {
@@ -2941,7 +5761,7 @@ internal static System.Drawing.Bitmap _82 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _83 {
             get {
@@ -2951,7 +5771,7 @@ internal static System.Drawing.Bitmap _83 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _84 {
             get {
@@ -2961,7 +5781,7 @@ internal static System.Drawing.Bitmap _84 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _85 {
             get {
@@ -2971,7 +5791,7 @@ internal static System.Drawing.Bitmap _85 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _86 {
             get {
@@ -2981,7 +5801,7 @@ internal static System.Drawing.Bitmap _86 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _87 {
             get {
@@ -2991,7 +5811,7 @@ internal static System.Drawing.Bitmap _87 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _88 {
             get {
@@ -3001,7 +5821,7 @@ internal static System.Drawing.Bitmap _88 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _89 {
             get {
@@ -3011,7 +5831,7 @@ internal static System.Drawing.Bitmap _89 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _9 {
             get {
@@ -3021,7 +5841,7 @@ internal static System.Drawing.Bitmap _9 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _90 {
             get {
@@ -3031,7 +5851,7 @@ internal static System.Drawing.Bitmap _90 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _91 {
             get {
@@ -3041,7 +5861,7 @@ internal static System.Drawing.Bitmap _91 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _92 {
             get {
@@ -3051,7 +5871,7 @@ internal static System.Drawing.Bitmap _92 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _93 {
             get {
@@ -3061,7 +5881,7 @@ internal static System.Drawing.Bitmap _93 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _94 {
             get {
@@ -3071,7 +5891,7 @@ internal static System.Drawing.Bitmap _94 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _95 {
             get {
@@ -3081,7 +5901,7 @@ internal static System.Drawing.Bitmap _95 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _96 {
             get {
@@ -3091,7 +5911,7 @@ internal static System.Drawing.Bitmap _96 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _97 {
             get {
@@ -3101,7 +5921,7 @@ internal static System.Drawing.Bitmap _97 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _98 {
             get {
@@ -3111,7 +5931,7 @@ internal static System.Drawing.Bitmap _98 {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _99 {
             get {
diff --git a/RocketBot2/Resources/PokemonDB.resx b/RocketBot2/Resources/PokemonDB.resx
index 67020aae0..556568007 100644
--- a/RocketBot2/Resources/PokemonDB.resx
+++ b/RocketBot2/Resources/PokemonDB.resx
@@ -1036,4 +1036,850 @@
   <data name="_150_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>pokemongo-assets\pokemon\150-shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="_252" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\252.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_252_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\252_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_253" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\253.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_253_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\253_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_254" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\254.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_254_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\254_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_255" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\255.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_255_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\255_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_255_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\255_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_255_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\255_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_256" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_256_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\256_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_256_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\256_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_256_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\256_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_257" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\257.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_257_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\257_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_257_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\257_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_257_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\257_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_258" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\258.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_258_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\258_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_259" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\259.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_259_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\259_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_260" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\260.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_260_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\260_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_261" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\261.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_261_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\261_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_262" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\262.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_262_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\262_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_263" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\263.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_263_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\263_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_264" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\264.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_264_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\264_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_265" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\265.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_265_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\265_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_266" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\266.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_266_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\266_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_267" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\267.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_267_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\267_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_267_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\267_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_267_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\267_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_268" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\268.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_268_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\268_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_269" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\269.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_269_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\269_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_269_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\269_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_269_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\269_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_270" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\270.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_270_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\270_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_271" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\271.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_271_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\271_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_272" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\272.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_272_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\272_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_272_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\272_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_272_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\272_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_273" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\273.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_273_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\273_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_274" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\274.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_274_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\274_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_274_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\274_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_274_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\274_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_275" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\275.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_275_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\275_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_275_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\275_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_275_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\275_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_276" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\276.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_276_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\276_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_277" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\277.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_277_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\277_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_278" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\278.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_278_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\278_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_279" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\279.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_279_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\279_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_280" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\280.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_280_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\280_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_281" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\281.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_281_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\281_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_282" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\282.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_282_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\282_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_283" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\283.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_283_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\283_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_284" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\284.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_284_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\284_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_285" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\285.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_285_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\285_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_286" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\286.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_286_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\286_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_287" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\287.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_287_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\287_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_288" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\288.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_288_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\288_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_289" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\289.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_289_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\289_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_293" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\293.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_293_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\293_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_294" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\294.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_294_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\294_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_295" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\295.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_295_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\295_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_296" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\296.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_296_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\296_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_297" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_297_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\297_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_298" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\298.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_298_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\298_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_299" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\299.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_299_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\299_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_300" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\300.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_300_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\300_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_301" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\301.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_301_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\301_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_302" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\302.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_302_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\302_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_303" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\303.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_303_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\303_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_304" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\304.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_304_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\304_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_305" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\305.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_305_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\305_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_306" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\306.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_306_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\306_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_307" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\307.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_307_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\307_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_307_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\307_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_307_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\307_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_308" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\308.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_308_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\308_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_308_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\308_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_308_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\308_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_309" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\309.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_309_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\309_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_310" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\310.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_310_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\310_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_311" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\311.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_311_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\311_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_312" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\312.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_312_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\312_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_313" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\313.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_313_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\313_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_314" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\314.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_314_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\314_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_315" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\315.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_315_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\315_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_315_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\315_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_315_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\315_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_316" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\316.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_316_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\316_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_316_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\316_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_316_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\316_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_317" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\317.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_317_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\317_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_317_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\317_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_317_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\317_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_318" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\318.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_318_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\318_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_319" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\319.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_319_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\319_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_320" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\320.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_320_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\320_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_321_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\321_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_322" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_322_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\322_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_322_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\322_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_322_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\322_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_323" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_323_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\323_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_323_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\323_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_323_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\323_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_324" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\324.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_324_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\324_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_325" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\325.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_325_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\325_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_326" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\326.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_326_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\326_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_328" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\328.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_328_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\328_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_329" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\329.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_329_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\329_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_330" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\330.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_330_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\330_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_331" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\331.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_331_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\331_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_332" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\332.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_332_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\332_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_332_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\332_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_332_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\332_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_333" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\333.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_333_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\333_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_334" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\334.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_334_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\334_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_335" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\335.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_335_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\335_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_336" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\336.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_336_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\336_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_337" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\337.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_337_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\337_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_338" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\338.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_338_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\338_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_339" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\339.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_339_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\339_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_340" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\340.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_340_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\340_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_341" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\341.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_341_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\341_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_342" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\342.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_342_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\342_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_343" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\343.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_343_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\343_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_344" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\344.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_344_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\344_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_345" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\345.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_345_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\345_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_346" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\346.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_346_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\346_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_347" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\347.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_347_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\347_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_348" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\348.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_348_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\348_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_349" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\349.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_349_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\349_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_350" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\350.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_350_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\350_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_350_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\350_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_350_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\350_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_351_11" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\351_11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_351_11_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\351_11_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_351_12" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\351_12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_351_12_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\351_12_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_351_13" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\351_13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_351_13_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\351_13_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_351_14" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\351_14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_351_14_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\351_14_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_353" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\353.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_353_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\353_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_354" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\354.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_354_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\354_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_355" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\355.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_355_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\355_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_356" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\356.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_356_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\356_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_357" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\357.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_357_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\357_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_358" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\358.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_358_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\358_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_359" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\359.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_359_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\359_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_360" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\360.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_360_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\360_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_361" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\361.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_361_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\361_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_362" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\362.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_362_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\362_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_363" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\363.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_363_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\363_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_364" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\364.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_364_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\364_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_365" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\365.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_365_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\365_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_369" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\369.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_369_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\369_1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_369_1_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\369_1_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_369_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\369_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_370" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\370.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_370_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\370_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_371" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\371.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_371_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\371_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_372" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\372.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_372_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\372_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_373" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\373.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_373_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\373_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_374" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\374.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_374_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\374_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_375" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\375.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_375_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\375_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_376" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\376.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_376_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\376_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_382" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\382.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_382_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\382_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_383" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\383.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_383_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\383_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_384" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\384.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="_384_shiny" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>pokemongo-assets\pokemon\384_shiny.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/RocketBot2/Resources/PokemonGO-Assets b/RocketBot2/Resources/PokemonGO-Assets
index 896b0483c..8c8bae82b 160000
--- a/RocketBot2/Resources/PokemonGO-Assets
+++ b/RocketBot2/Resources/PokemonGO-Assets
@@ -1 +1 @@
-Subproject commit 896b0483c7210d1034a92165749963b5d6c5bee5
+Subproject commit 8c8bae82b3ae8fe807304a377cef926418a6e636
diff --git a/RocketBot2/RocketBot2.csproj b/RocketBot2/RocketBot2.csproj
index e44cb983d..470d3b842 100644
--- a/RocketBot2/RocketBot2.csproj
+++ b/RocketBot2/RocketBot2.csproj
@@ -115,12 +115,14 @@
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AeroWizard, Version=2.1.10.0, Culture=neutral, PublicKeyToken=915e74f5d64b8f37, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\AeroWizard.2.1.10\lib\net452\AeroWizard.dll</HintPath>
+    <Reference Include="AeroWizard, Version=2.1.11.0, Culture=neutral, PublicKeyToken=915e74f5d64b8f37, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\AeroWizard.2.1.11\lib\net452\AeroWizard.dll</HintPath>
     </Reference>
-    <Reference Include="Costura, Version=1.6.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="CommandLine, Version=2.2.1.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\CommandLineParser.2.2.1\lib\net45\CommandLine.dll</HintPath>
+    </Reference>
+    <Reference Include="Costura, Version=2.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Costura.Fody.2.0.0\lib\net452\Costura.dll</HintPath>
     </Reference>
     <Reference Include="GeoCoordinate.NetStandard1, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\GeoCoordinate.NetStandard1.1.0.1\lib\netstandard1.1\GeoCoordinate.NetStandard1.dll</HintPath>
@@ -160,14 +162,15 @@
     <Reference Include="Microsoft.Extensions.Primitives, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Primitives.1.1.1\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="POGOProtos.Core, Version=2.21.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\POGOProtos.Core.2.21.1\lib\net45\POGOProtos.Core.dll</HintPath>
+    <Reference Include="POGOProtos.Core, Version=2.24.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\POGOProtos.Core.2.24.0\lib\net45\POGOProtos.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Remotion.Linq.2.1.2\lib\net45\Remotion.Linq.dll</HintPath>
+    <Reference Include="Remotion.Linq">
+      <HintPath>$(SolutionDir)\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -183,6 +186,9 @@
     </Reference>
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Management" />
+    <Reference Include="System.Reflection.TypeExtensions, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\System.Reflection.TypeExtensions.4.4.0\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
@@ -195,10 +201,6 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="GMap.NET.Core, Version=1.7.5.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL">
       <HintPath>$(SolutionDir)\packages\GMap.NET.WindowsForms.1.7.5\lib\net40\GMap.NET.Core.dll</HintPath>
       <Private>True</Private>
@@ -235,11 +237,16 @@
       <HintPath>$(SolutionDir)\packages\SuperSocket.1.6.6.1\lib\net45\SuperSocket.SocketBase.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="WebDriver, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Selenium.WebDriver.3.8.0\lib\net45\WebDriver.dll</HintPath>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="WebDriver, Version=3.11.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Selenium.WebDriver.3.11.1\lib\net45\WebDriver.dll</HintPath>
     </Reference>
-    <Reference Include="WebDriver.Support, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\Selenium.Support.3.8.0\lib\net45\WebDriver.Support.dll</HintPath>
+    <Reference Include="WebDriver.Support, Version=3.11.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\Selenium.Support.3.11.1\lib\net45\WebDriver.Support.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -366,7 +373,293 @@
   <ItemGroup>
     <Content Include="Images\Miscs\PayPalDonateNow.png" />
     <Content Include="Resources\PokemonGO-Assets\items\903.png" />
+    <Content Include="Resources\PokemonGO-Assets\NecroEase\markers\GymVisited.png" />
+    <Content Include="Resources\PokemonGO-Assets\NecroEase\markers\lured1.png" />
+    <Content Include="Resources\PokemonGO-Assets\NecroEase\markers\normal1.png" />
+    <Content Include="Resources\PokemonGO-Assets\NecroEase\markers\spawn.png" />
     <Content Include="Resources\PokemonGO-Assets\pokemon\150-shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\252.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\252_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\253.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\253_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\254.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\254_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\255.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\255_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\255_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\255_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\256.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\256_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\256_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\256_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\257.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\257_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\257_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\257_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\258.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\258_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\259.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\259_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\260.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\260_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\261.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\261_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\262.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\262_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\263.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\263_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\264.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\264_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\265.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\265_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\266.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\266_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\267.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\267_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\267_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\267_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\268.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\268_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\269.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\269_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\269_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\269_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\270.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\270_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\271.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\271_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\272.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\272_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\272_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\272_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\273.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\273_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\274.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\274_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\274_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\274_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\275.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\275_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\275_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\275_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\276.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\276_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\277.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\277_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\278.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\278_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\279.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\279_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\280.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\280_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\281.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\281_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\282.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\282_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\283.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\283_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\284.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\284_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\285.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\285_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\286.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\286_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\287.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\287_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\288.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\288_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\289.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\289_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\293.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\293_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\294.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\294_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\295.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\295_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\296.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\296_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\297.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\297_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\298.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\298_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\299.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\299_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\300.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\300_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\301.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\301_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\302.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\302_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\303.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\303_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\304.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\304_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\305.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\305_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\306.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\306_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\307.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\307_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\307_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\307_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\308.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\308_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\308_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\308_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\309.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\309_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\310.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\310_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\311.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\311_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\312.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\312_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\313.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\313_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\314.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\314_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\315.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\315_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\315_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\315_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\316.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\316_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\316_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\316_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\317.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\317_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\317_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\317_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\318.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\318_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\319.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\319_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\320.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\320_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\321.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\321_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\322.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\322_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\322_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\322_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\323.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\323_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\323_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\323_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\324.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\324_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\325.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\325_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\326.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\326_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\328.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\328_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\329.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\329_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\330.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\330_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\331.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\331_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\332.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\332_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\332_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\332_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\333.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\333_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\334.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\334_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\335.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\335_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\336.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\336_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\337.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\337_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\338.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\338_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\339.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\339_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\340.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\340_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\341.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\341_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\342.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\342_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\343.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\343_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\344.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\344_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\345.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\345_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\346.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\346_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\347.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\347_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\348.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\348_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\349.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\349_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\350.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\350_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\350_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\350_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\351_11.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\351_11_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\351_12.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\351_12_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\351_13.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\351_13_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\351_14.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\351_14_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\353.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\353_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\354.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\354_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\355.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\355_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\356.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\356_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\357.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\357_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\358.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\358_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\359.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\359_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\360.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\360_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\361.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\361_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\362.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\362_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\363.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\363_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\364.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\364_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\365.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\365_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\369.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\369_1.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\369_1_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\369_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\370.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\370_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\371.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\371_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\372.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\372_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\373.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\373_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\374.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\374_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\375.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\375_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\376.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\376_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\382.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\382_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\383.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\383_shiny.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\384.png" />
+    <Content Include="Resources\PokemonGO-Assets\pokemon\384_shiny.png" />
     <Content Include="Resources\PokemonGO-Assets\pokemon\slashed.png" />
     <EmbeddedResource Include="costura32\sqlite3.dll" />
     <EmbeddedResource Include="costura64\sqlite3.dll" />
@@ -1163,13 +1456,13 @@ foreach (var item in filesToCleanup)
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)\packages\Fody.2.3.15\build\net452\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.2.3.15\build\net452\Fody.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Fody.3.0.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.3.0.3\build\Fody.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets'))" />
   </Target>
-  <Import Project="$(SolutionDir)\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('$(SolutionDir)\packages\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
-  <Import Project="$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.34.0\build\Selenium.WebDriver.ChromeDriver.targets')" />
-  <Import Project="$(SolutionDir)\packages\Fody.2.3.15\build\net452\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.2.3.15\build\net452\Fody.targets')" />
+  <Import Project="$(SolutionDir)\packages\Fody.3.0.3\build\Fody.targets" Condition="Exists('$(SolutionDir)\packages\Fody.3.0.3\build\Fody.targets')" />
+  <Import Project="$(SolutionDir)\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets" Condition="Exists('$(SolutionDir)\packages\Costura.Fody.2.0.0\build\Costura.Fody.targets')" />
+  <Import Project="$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('$(SolutionDir)\packages\Selenium.WebDriver.ChromeDriver.2.37.0\build\Selenium.WebDriver.ChromeDriver.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/RocketBot2/packages.config b/RocketBot2/packages.config
index 6595f3694..9e8dbac1d 100644
--- a/RocketBot2/packages.config
+++ b/RocketBot2/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AeroWizard" version="2.1.10" targetFramework="net462" />
-  <package id="CommandLineParser" version="1.9.71" targetFramework="net462" />
-  <package id="Costura.Fody" version="1.6.2" targetFramework="net462" developmentDependency="true" />
-  <package id="Fody" version="2.3.15" targetFramework="net462" developmentDependency="true" />
+  <package id="AeroWizard" version="2.1.11" targetFramework="net462" />
+  <package id="CommandLineParser" version="2.2.1" targetFramework="net462" />
+  <package id="Costura.Fody" version="2.0.0" targetFramework="net462" developmentDependency="true" />
+  <package id="Fody" version="3.0.3" targetFramework="net462" developmentDependency="true" />
   <package id="GeoCoordinate.NetStandard1" version="1.0.1" targetFramework="net462" />
   <package id="GMap.NET.WindowsForms" version="1.7.5" targetFramework="net462" />
   <package id="Google.Protobuf" version="3.5.1" targetFramework="net462" />
@@ -20,14 +20,14 @@
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net462" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net462" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net462" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
   <package id="ObjectListView.Official" version="2.9.1" targetFramework="net462" />
-  <package id="POGOProtos.Core" version="2.21.1" targetFramework="net462" />
-  <package id="Remotion.Linq" version="2.1.2" targetFramework="net462" />
+  <package id="POGOProtos.Core" version="2.24.0" targetFramework="net462" />
+  <package id="Remotion.Linq" version="2.2.0" targetFramework="net462" />
   <package id="S2Geometry" version="1.0.3" targetFramework="net462" />
-  <package id="Selenium.Support" version="3.8.0" targetFramework="net462" />
-  <package id="Selenium.WebDriver" version="3.8.0" targetFramework="net462" />
-  <package id="Selenium.WebDriver.ChromeDriver" version="2.34.0" targetFramework="net462" />
+  <package id="Selenium.Support" version="3.11.1" targetFramework="net462" />
+  <package id="Selenium.WebDriver" version="3.11.1" targetFramework="net462" />
+  <package id="Selenium.WebDriver.ChromeDriver" version="2.37.0" targetFramework="net462" />
   <package id="SuperSocket" version="1.6.6.1" targetFramework="net462" />
   <package id="SuperSocket.Engine" version="1.6.6.1" targetFramework="net462" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net462" />
@@ -58,6 +58,7 @@
   <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
   <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net462" />
   <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection.TypeExtensions" version="4.4.0" targetFramework="net462" />
   <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net462" />
   <package id="System.Runtime" version="4.3.0" targetFramework="net462" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.4.0" targetFramework="net462" />
@@ -76,7 +77,7 @@
   <package id="System.Threading" version="4.3.0" targetFramework="net462" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net462" />
   <package id="System.Threading.Timer" version="4.3.0" targetFramework="net462" />
-  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net462" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net462" />
   <package id="TinyIoC" version="1.3" targetFramework="net462" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/packages/Google.Api.CommonProtos.1.1.0/lib/net45/Google.Api.CommonProtos.dll b/packages/Google.Api.CommonProtos.1.1.0/lib/net45/Google.Api.CommonProtos.dll
deleted file mode 100644
index e29d0b049..000000000
Binary files a/packages/Google.Api.CommonProtos.1.1.0/lib/net45/Google.Api.CommonProtos.dll and /dev/null differ
diff --git a/packages/Google.Api.CommonProtos.1.1.0/lib/netstandard1.3/Google.Api.CommonProtos.dll b/packages/Google.Api.CommonProtos.1.1.0/lib/netstandard1.3/Google.Api.CommonProtos.dll
deleted file mode 100644
index 9ce7fb873..000000000
Binary files a/packages/Google.Api.CommonProtos.1.1.0/lib/netstandard1.3/Google.Api.CommonProtos.dll and /dev/null differ
diff --git a/packages/Google.Api.CommonProtos.1.2.0/lib/net45/Google.Api.CommonProtos.dll b/packages/Google.Api.CommonProtos.1.2.0/lib/net45/Google.Api.CommonProtos.dll
new file mode 100644
index 000000000..775924ab1
Binary files /dev/null and b/packages/Google.Api.CommonProtos.1.2.0/lib/net45/Google.Api.CommonProtos.dll differ
diff --git a/packages/Google.Api.CommonProtos.1.1.0/lib/net45/Google.Api.CommonProtos.xml b/packages/Google.Api.CommonProtos.1.2.0/lib/net45/Google.Api.CommonProtos.xml
similarity index 94%
rename from packages/Google.Api.CommonProtos.1.1.0/lib/net45/Google.Api.CommonProtos.xml
rename to packages/Google.Api.CommonProtos.1.2.0/lib/net45/Google.Api.CommonProtos.xml
index c3d07cc92..41b122087 100644
--- a/packages/Google.Api.CommonProtos.1.1.0/lib/net45/Google.Api.CommonProtos.xml
+++ b/packages/Google.Api.CommonProtos.1.2.0/lib/net45/Google.Api.CommonProtos.xml
@@ -171,6 +171,15 @@
                             bookstore_web.apps.googleusercontent.com
              </summary>
         </member>
+        <member name="F:Google.Api.AuthProvider.AuthorizationUrlFieldNumber">
+            <summary>Field number for the "authorization_url" field.</summary>
+        </member>
+        <member name="P:Google.Api.AuthProvider.AuthorizationUrl">
+            <summary>
+            Redirect URL if JWT token is required but no present or is expired.
+            Implement authorizationUrl of securityDefinitions in OpenAPI spec.
+            </summary>
+        </member>
         <member name="T:Google.Api.OAuthRequirements">
              <summary>
              OAuth scopes are a way to define data and permissions on data. For example,
@@ -340,94 +349,62 @@
              <summary>
              Billing related configuration of the service.
             
-             The following example shows how to configure metrics for billing:
-            
+             The following example shows how to configure monitored resources and metrics
+             for billing:
+                 monitored_resources:
+                 - type: library.googleapis.com/branch
+                   labels:
+                   - key: /city
+                     description: The city where the library branch is located in.
+                   - key: /name
+                     description: The name of the branch.
                  metrics:
-                 - name: library.googleapis.com/read_calls
+                 - name: library.googleapis.com/book/borrowed_count
                    metric_kind: DELTA
                    value_type: INT64
-                 - name: library.googleapis.com/write_calls
-                   metric_kind: DELTA
-                   value_type: INT64
-                 billing:
-                   metrics:
-                   - library.googleapis.com/read_calls
-                   - library.googleapis.com/write_calls
-            
-             The next example shows how to enable billing status check and customize the
-             check behavior. It makes sure billing status check is included in the `Check`
-             method of [Service Control API](https://cloud.google.com/service-control/).
-             In the example, "google.storage.Get" method can be served when the billing
-             status is either `current` or `delinquent`, while "google.storage.Write"
-             method can only be served when the billing status is `current`:
-            
                  billing:
-                   rules:
-                   - selector: google.storage.Get
-                     allowed_statuses:
-                     - current
-                     - delinquent
-                   - selector: google.storage.Write
-                     allowed_statuses: current
-            
-             Mostly services should only allow `current` status when serving requests.
-             In addition, services can choose to allow both `current` and `delinquent`
-             statuses when serving read-only requests to resources. If there's no
-             matching selector for operation, no billing status check will be performed.
+                   consumer_destinations:
+                   - monitored_resource: library.googleapis.com/branch
+                     metrics:
+                     - library.googleapis.com/book/borrowed_count
              </summary>
         </member>
-        <member name="F:Google.Api.Billing.MetricsFieldNumber">
-            <summary>Field number for the "metrics" field.</summary>
+        <member name="F:Google.Api.Billing.ConsumerDestinationsFieldNumber">
+            <summary>Field number for the "consumer_destinations" field.</summary>
         </member>
-        <member name="P:Google.Api.Billing.Metrics">
+        <member name="P:Google.Api.Billing.ConsumerDestinations">
             <summary>
-            Names of the metrics to report to billing. Each name must
-            be defined in [Service.metrics][google.api.Service.metrics] section.
+            Billing configurations for sending metrics to the consumer project.
+            There can be multiple consumer destinations per service, each one must have
+            a different monitored resource type. A metric can be used in at most
+            one consumer destination.
             </summary>
         </member>
-        <member name="F:Google.Api.Billing.RulesFieldNumber">
-            <summary>Field number for the "rules" field.</summary>
+        <member name="T:Google.Api.Billing.Types">
+            <summary>Container for nested types declared in the Billing message type.</summary>
         </member>
-        <member name="P:Google.Api.Billing.Rules">
+        <member name="T:Google.Api.Billing.Types.BillingDestination">
             <summary>
-            A list of billing status rules for configuring billing status check.
+            Configuration of a specific billing destination (Currently only support
+            bill against consumer project).
             </summary>
         </member>
-        <member name="T:Google.Api.BillingStatusRule">
-             <summary>
-             Defines the billing status requirements for operations.
-            
-             When used with
-             [Service Control API](https://cloud.google.com/service-control/), the
-             following statuses are supported:
-            
-             - **current**: the associated billing account is up to date and capable of
-                            paying for resource usages.
-             - **delinquent**: the associated billing account has a correctable problem,
-                               such as late payment.
-            
-             Mostly services should only allow `current` status when serving requests.
-             In addition, services can choose to allow both `current` and `delinquent`
-             statuses when serving read-only requests to resources. If the list of
-             allowed_statuses is empty, it means no billing requirement.
-             </summary>
-        </member>
-        <member name="F:Google.Api.BillingStatusRule.SelectorFieldNumber">
-            <summary>Field number for the "selector" field.</summary>
+        <member name="F:Google.Api.Billing.Types.BillingDestination.MonitoredResourceFieldNumber">
+            <summary>Field number for the "monitored_resource" field.</summary>
         </member>
-        <member name="P:Google.Api.BillingStatusRule.Selector">
+        <member name="P:Google.Api.Billing.Types.BillingDestination.MonitoredResource">
             <summary>
-            Selects the operation names to which this rule applies.
-            Refer to [selector][google.api.DocumentationRule.selector] for syntax details.
+            The monitored resource type. The type must be defined in
+            [Service.monitored_resources][google.api.Service.monitored_resources] section.
             </summary>
         </member>
-        <member name="F:Google.Api.BillingStatusRule.AllowedStatusesFieldNumber">
-            <summary>Field number for the "allowed_statuses" field.</summary>
+        <member name="F:Google.Api.Billing.Types.BillingDestination.MetricsFieldNumber">
+            <summary>Field number for the "metrics" field.</summary>
         </member>
-        <member name="P:Google.Api.BillingStatusRule.AllowedStatuses">
+        <member name="P:Google.Api.Billing.Types.BillingDestination.Metrics">
             <summary>
-            Allowed billing statuses. The billing status check passes if the actual
-            billing status matches any of the provided values here.
+            Names of the metrics to report to this billing destination.
+            Each name must be defined in [Service.metrics][google.api.Service.metrics] section.
             </summary>
         </member>
         <member name="T:Google.Api.ConfigChangeReflection">
@@ -1325,7 +1302,7 @@
         </member>
         <member name="T:Google.Api.Http">
             <summary>
-            Defines the HTTP configuration for a service. It contains a list of
+            Defines the HTTP configuration for an API service. It contains a list of
             [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method
             to one or more HTTP REST API methods.
             </summary>
@@ -1340,14 +1317,27 @@
              **NOTE:** All service configuration rules follow "last one wins" order.
              </summary>
         </member>
+        <member name="F:Google.Api.Http.FullyDecodeReservedExpansionFieldNumber">
+            <summary>Field number for the "fully_decode_reserved_expansion" field.</summary>
+        </member>
+        <member name="P:Google.Api.Http.FullyDecodeReservedExpansion">
+             <summary>
+             When set to true, URL path parmeters will be fully URI-decoded except in
+             cases of single segment matches in reserved expansion, where "%2F" will be
+             left encoded.
+            
+             The default behavior is to not decode RFC 6570 reserved characters in multi
+             segment matches.
+             </summary>
+        </member>
         <member name="T:Google.Api.HttpRule">
              <summary>
              `HttpRule` defines the mapping of an RPC method to one or more HTTP
-             REST APIs.  The mapping determines what portions of the request
-             message are populated from the path, query parameters, or body of
-             the HTTP request.  The mapping is typically specified as an
-             `google.api.http` annotation, see "google/api/annotations.proto"
-             for details.
+             REST API methods. The mapping specifies how different portions of the RPC
+             request message are mapped to URL path, URL query parameters, and
+             HTTP request body. The mapping is typically specified as an
+             `google.api.http` annotation on the RPC method,
+             see "google/api/annotations.proto" for details.
             
              The mapping consists of a field specifying the path template and
              method kind.  The path template can refer to fields in the request
@@ -1393,6 +1383,11 @@
              pattern automatically become (optional) HTTP query
              parameters. Assume the following definition of the request message:
             
+                 service Messaging {
+                   rpc GetMessage(GetMessageRequest) returns (Message) {
+                     option (google.api.http).get = "/v1/messages/{message_id}";
+                   }
+                 }
                  message GetMessageRequest {
                    message SubMessage {
                      string subfield = 1;
@@ -1500,7 +1495,7 @@
              to the request message are as follows:
             
              1. The `body` field specifies either `*` or a field path, or is
-                omitted. If omitted, it assumes there is no HTTP body.
+                omitted. If omitted, it indicates there is no HTTP request body.
              2. Leaf fields (recursive expansion of nested messages in the
                 request) can be classified into three types:
                  (a) Matched in the URL template.
@@ -1519,28 +1514,34 @@
                  FieldPath = IDENT { "." IDENT } ;
                  Verb     = ":" LITERAL ;
             
-             The syntax `*` matches a single path segment. It follows the semantics of
-             [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String
-             Expansion.
+             The syntax `*` matches a single path segment. The syntax `**` matches zero
+             or more path segments, which must be the last part of the path except the
+             `Verb`. The syntax `LITERAL` matches literal text in the path.
             
-             The syntax `**` matches zero or more path segments. It follows the semantics
-             of [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.3 Reserved
-             Expansion. NOTE: it must be the last segment in the path except the Verb.
-            
-             The syntax `LITERAL` matches literal text in the URL path.
-            
-             The syntax `Variable` matches the entire path as specified by its template;
-             this nested template must not contain further variables. If a variable
+             The syntax `Variable` matches part of the URL path as specified by its
+             template. A variable template must not contain other variables. If a variable
              matches a single path segment, its template may be omitted, e.g. `{var}`
              is equivalent to `{var=*}`.
             
+             If a variable contains exactly one path segment, such as `"{var}"` or
+             `"{var=*}"`, when such a variable is expanded into a URL path, all characters
+             except `[-_.~0-9a-zA-Z]` are percent-encoded. Such variables show up in the
+             Discovery Document as `{var}`.
+            
+             If a variable contains one or more path segments, such as `"{var=foo/*}"`
+             or `"{var=**}"`, when such a variable is expanded into a URL path, all
+             characters except `[-_.~/0-9a-zA-Z]` are percent-encoded. Such variables
+             show up in the Discovery Document as `{+var}`.
+            
+             NOTE: While the single segment variable matches the semantics of
+             [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2
+             Simple String Expansion, the multi segment variable **does not** match
+             RFC 6570 Reserved Expansion. The reason is that the Reserved Expansion
+             does not expand special characters like `?` and `#`, which would lead
+             to invalid URLs.
+            
              NOTE: the field paths in variables and in the `body` must not refer to
              repeated fields or map fields.
-            
-             Use CustomHttpPattern to specify any HTTP method that is not included in the
-             `pattern` field, such as HEAD, or "*" to leave the HTTP method unspecified for
-             a given URL path rule. The wild-card rule is useful for services that provide
-             content to Web (HTML) clients.
              </summary>
         </member>
         <member name="F:Google.Api.HttpRule.SelectorFieldNumber">
@@ -1598,7 +1599,10 @@
         </member>
         <member name="P:Google.Api.HttpRule.Custom">
             <summary>
-            Custom pattern is used for defining custom verbs.
+            The custom pattern is used for specifying an HTTP method that is not
+            included in the `pattern` field, such as HEAD, or "*" to leave the
+            HTTP method unspecified for this rule. The wild-card rule is useful
+            for services that provide content to Web (HTML) clients.
             </summary>
         </member>
         <member name="F:Google.Api.HttpRule.BodyFieldNumber">
@@ -2730,10 +2734,10 @@
         </member>
         <member name="P:Google.Api.Service.ConfigVersion">
             <summary>
-            The version of the service configuration. The config version may
-            influence interpretation of the configuration, for example, to
-            determine defaults. This is documented together with applicable
-            options. The current default for the config version itself is `3`.
+            The semantic version of the service configuration. The config version
+            affects the interpretation of the service configuration. For example,
+            certain features are enabled by default for certain config versions.
+            The latest config version is `3`.
             </summary>
         </member>
         <member name="F:Google.Api.Service.NameFieldNumber">
@@ -2760,7 +2764,7 @@
         </member>
         <member name="P:Google.Api.Service.Title">
             <summary>
-            The product title associated with this service.
+            The product title for this service.
             </summary>
         </member>
         <member name="F:Google.Api.Service.ProducerProjectIdFieldNumber">
@@ -2768,9 +2772,7 @@
         </member>
         <member name="P:Google.Api.Service.ProducerProjectId">
             <summary>
-            The id of the Google developer project that owns the service.
-            Members of this project can manage the service configuration,
-            manage consumption of the service, etc.
+            The Google project that owns this service.
             </summary>
         </member>
         <member name="F:Google.Api.Service.ApisFieldNumber">
@@ -2913,6 +2915,14 @@
             by the [Service.monitoring][google.api.Service.monitoring] and [Service.logging][google.api.Service.logging] configurations.
             </summary>
         </member>
+        <member name="F:Google.Api.Service.BillingFieldNumber">
+            <summary>Field number for the "billing" field.</summary>
+        </member>
+        <member name="P:Google.Api.Service.Billing">
+            <summary>
+            Billing configuration.
+            </summary>
+        </member>
         <member name="F:Google.Api.Service.LoggingFieldNumber">
             <summary>Field number for the "logging" field.</summary>
         </member>
@@ -3178,6 +3188,15 @@
             True, if the method allows unregistered calls; false otherwise.
             </summary>
         </member>
+        <member name="F:Google.Api.UsageRule.SkipServiceControlFieldNumber">
+            <summary>Field number for the "skip_service_control" field.</summary>
+        </member>
+        <member name="P:Google.Api.UsageRule.SkipServiceControl">
+            <summary>
+            True, if the method should skip service control. If so, no control plane
+            feature (like quota and billing) will be enabled.
+            </summary>
+        </member>
         <member name="T:Google.Rpc.CodeReflection">
             <summary>Holder for reflection information generated from google/rpc/code.proto</summary>
         </member>
@@ -3243,9 +3262,12 @@
         <member name="F:Google.Rpc.Code.NotFound">
              <summary>
              Some requested entity (e.g., file or directory) was not found.
-             For privacy reasons, this code *may* be returned when the client
-             does not have the access rights to the entity, though such usage is
-             discouraged.
+            
+             Note to server developers: if a request is denied for an entire class
+             of users, such as gradual feature rollout or undocumented whitelist,
+             `NOT_FOUND` may be used. If a request is denied for some users within
+             a class of users, such as user-based access control, `PERMISSION_DENIED`
+             must be used.
             
              HTTP Mapping: 404 Not Found
              </summary>
@@ -3265,7 +3287,9 @@
              caused by exhausting some resource (use `RESOURCE_EXHAUSTED`
              instead for those errors). `PERMISSION_DENIED` must not be
              used if the caller can not be identified (use `UNAUTHENTICATED`
-             instead for those errors).
+             instead for those errors). This error code does not imply the
+             request is valid or the requested entity exists or satisfies
+             other pre-conditions.
             
              HTTP Mapping: 403 Forbidden
              </summary>
@@ -3297,7 +3321,8 @@
              between `FAILED_PRECONDITION`, `ABORTED`, and `UNAVAILABLE`:
               (a) Use `UNAVAILABLE` if the client can retry just the failing call.
               (b) Use `ABORTED` if the client should retry at a higher level
-                  (e.g., restarting a read-modify-write sequence).
+                  (e.g., when a client-specified test-and-set fails, indicating the
+                  client should restart a read-modify-write sequence).
               (c) Use `FAILED_PRECONDITION` if the client should not retry until
                   the system state has been explicitly fixed.  E.g., if an "rmdir"
                   fails because the directory is non-empty, `FAILED_PRECONDITION`
@@ -3483,6 +3508,62 @@
              exceeded".
              </summary>
         </member>
+        <member name="T:Google.Rpc.PreconditionFailure">
+             <summary>
+             Describes what preconditions have failed.
+            
+             For example, if an RPC failed because it required the Terms of Service to be
+             acknowledged, it could list the terms of service violation in the
+             PreconditionFailure message.
+             </summary>
+        </member>
+        <member name="F:Google.Rpc.PreconditionFailure.ViolationsFieldNumber">
+            <summary>Field number for the "violations" field.</summary>
+        </member>
+        <member name="P:Google.Rpc.PreconditionFailure.Violations">
+            <summary>
+            Describes all precondition violations.
+            </summary>
+        </member>
+        <member name="T:Google.Rpc.PreconditionFailure.Types">
+            <summary>Container for nested types declared in the PreconditionFailure message type.</summary>
+        </member>
+        <member name="T:Google.Rpc.PreconditionFailure.Types.Violation">
+            <summary>
+            A message type used to describe a single precondition failure.
+            </summary>
+        </member>
+        <member name="F:Google.Rpc.PreconditionFailure.Types.Violation.TypeFieldNumber">
+            <summary>Field number for the "type" field.</summary>
+        </member>
+        <member name="P:Google.Rpc.PreconditionFailure.Types.Violation.Type">
+            <summary>
+            The type of PreconditionFailure. We recommend using a service-specific
+            enum type to define the supported precondition violation types. For
+            example, "TOS" for "Terms of Service violation".
+            </summary>
+        </member>
+        <member name="F:Google.Rpc.PreconditionFailure.Types.Violation.SubjectFieldNumber">
+            <summary>Field number for the "subject" field.</summary>
+        </member>
+        <member name="P:Google.Rpc.PreconditionFailure.Types.Violation.Subject">
+            <summary>
+            The subject, relative to the type, that failed.
+            For example, "google.com/cloud" relative to the "TOS" type would
+            indicate which terms of service is being referenced.
+            </summary>
+        </member>
+        <member name="F:Google.Rpc.PreconditionFailure.Types.Violation.DescriptionFieldNumber">
+            <summary>Field number for the "description" field.</summary>
+        </member>
+        <member name="P:Google.Rpc.PreconditionFailure.Types.Violation.Description">
+             <summary>
+             A description of how the precondition failed. Developers can use this
+             description to understand how to fix the failure.
+            
+             For example: "Terms of service not accepted".
+             </summary>
+        </member>
         <member name="T:Google.Rpc.BadRequest">
             <summary>
             Describes violations in a client request. This error type focuses on the
@@ -3682,7 +3763,7 @@
              error message is needed, put the localized message in the error details or
              localize it in the client. The optional error details may contain arbitrary
              information about the error. There is a predefined set of error detail types
-             in the package `google.rpc` which can be used for common error conditions.
+             in the package `google.rpc` that can be used for common error conditions.
             
              # Language mapping
             
@@ -3705,7 +3786,7 @@
                  errors.
             
              - Workflow errors. A typical workflow has multiple steps. Each step may
-                 have a `Status` message for error reporting purpose.
+                 have a `Status` message for error reporting.
             
              - Batch operations. If a client uses batch request and batch response, the
                  `Status` message should be used directly inside batch response, one for
@@ -3742,8 +3823,8 @@
         </member>
         <member name="P:Google.Rpc.Status.Details">
             <summary>
-            A list of messages that carry the error details.  There will be a
-            common set of message types for APIs to use.
+            A list of messages that carry the error details.  There is a common set of
+            message types for APIs to use.
             </summary>
         </member>
         <member name="T:Google.Type.ColorReflection">
diff --git a/packages/Google.Api.CommonProtos.1.2.0/lib/netstandard1.3/Google.Api.CommonProtos.dll b/packages/Google.Api.CommonProtos.1.2.0/lib/netstandard1.3/Google.Api.CommonProtos.dll
new file mode 100644
index 000000000..bb6cb10fd
Binary files /dev/null and b/packages/Google.Api.CommonProtos.1.2.0/lib/netstandard1.3/Google.Api.CommonProtos.dll differ
diff --git a/packages/Google.Api.CommonProtos.1.1.0/lib/netstandard1.3/Google.Api.CommonProtos.xml b/packages/Google.Api.CommonProtos.1.2.0/lib/netstandard1.3/Google.Api.CommonProtos.xml
similarity index 94%
rename from packages/Google.Api.CommonProtos.1.1.0/lib/netstandard1.3/Google.Api.CommonProtos.xml
rename to packages/Google.Api.CommonProtos.1.2.0/lib/netstandard1.3/Google.Api.CommonProtos.xml
index c3d07cc92..41b122087 100644
--- a/packages/Google.Api.CommonProtos.1.1.0/lib/netstandard1.3/Google.Api.CommonProtos.xml
+++ b/packages/Google.Api.CommonProtos.1.2.0/lib/netstandard1.3/Google.Api.CommonProtos.xml
@@ -171,6 +171,15 @@
                             bookstore_web.apps.googleusercontent.com
              </summary>
         </member>
+        <member name="F:Google.Api.AuthProvider.AuthorizationUrlFieldNumber">
+            <summary>Field number for the "authorization_url" field.</summary>
+        </member>
+        <member name="P:Google.Api.AuthProvider.AuthorizationUrl">
+            <summary>
+            Redirect URL if JWT token is required but no present or is expired.
+            Implement authorizationUrl of securityDefinitions in OpenAPI spec.
+            </summary>
+        </member>
         <member name="T:Google.Api.OAuthRequirements">
              <summary>
              OAuth scopes are a way to define data and permissions on data. For example,
@@ -340,94 +349,62 @@
              <summary>
              Billing related configuration of the service.
             
-             The following example shows how to configure metrics for billing:
-            
+             The following example shows how to configure monitored resources and metrics
+             for billing:
+                 monitored_resources:
+                 - type: library.googleapis.com/branch
+                   labels:
+                   - key: /city
+                     description: The city where the library branch is located in.
+                   - key: /name
+                     description: The name of the branch.
                  metrics:
-                 - name: library.googleapis.com/read_calls
+                 - name: library.googleapis.com/book/borrowed_count
                    metric_kind: DELTA
                    value_type: INT64
-                 - name: library.googleapis.com/write_calls
-                   metric_kind: DELTA
-                   value_type: INT64
-                 billing:
-                   metrics:
-                   - library.googleapis.com/read_calls
-                   - library.googleapis.com/write_calls
-            
-             The next example shows how to enable billing status check and customize the
-             check behavior. It makes sure billing status check is included in the `Check`
-             method of [Service Control API](https://cloud.google.com/service-control/).
-             In the example, "google.storage.Get" method can be served when the billing
-             status is either `current` or `delinquent`, while "google.storage.Write"
-             method can only be served when the billing status is `current`:
-            
                  billing:
-                   rules:
-                   - selector: google.storage.Get
-                     allowed_statuses:
-                     - current
-                     - delinquent
-                   - selector: google.storage.Write
-                     allowed_statuses: current
-            
-             Mostly services should only allow `current` status when serving requests.
-             In addition, services can choose to allow both `current` and `delinquent`
-             statuses when serving read-only requests to resources. If there's no
-             matching selector for operation, no billing status check will be performed.
+                   consumer_destinations:
+                   - monitored_resource: library.googleapis.com/branch
+                     metrics:
+                     - library.googleapis.com/book/borrowed_count
              </summary>
         </member>
-        <member name="F:Google.Api.Billing.MetricsFieldNumber">
-            <summary>Field number for the "metrics" field.</summary>
+        <member name="F:Google.Api.Billing.ConsumerDestinationsFieldNumber">
+            <summary>Field number for the "consumer_destinations" field.</summary>
         </member>
-        <member name="P:Google.Api.Billing.Metrics">
+        <member name="P:Google.Api.Billing.ConsumerDestinations">
             <summary>
-            Names of the metrics to report to billing. Each name must
-            be defined in [Service.metrics][google.api.Service.metrics] section.
+            Billing configurations for sending metrics to the consumer project.
+            There can be multiple consumer destinations per service, each one must have
+            a different monitored resource type. A metric can be used in at most
+            one consumer destination.
             </summary>
         </member>
-        <member name="F:Google.Api.Billing.RulesFieldNumber">
-            <summary>Field number for the "rules" field.</summary>
+        <member name="T:Google.Api.Billing.Types">
+            <summary>Container for nested types declared in the Billing message type.</summary>
         </member>
-        <member name="P:Google.Api.Billing.Rules">
+        <member name="T:Google.Api.Billing.Types.BillingDestination">
             <summary>
-            A list of billing status rules for configuring billing status check.
+            Configuration of a specific billing destination (Currently only support
+            bill against consumer project).
             </summary>
         </member>
-        <member name="T:Google.Api.BillingStatusRule">
-             <summary>
-             Defines the billing status requirements for operations.
-            
-             When used with
-             [Service Control API](https://cloud.google.com/service-control/), the
-             following statuses are supported:
-            
-             - **current**: the associated billing account is up to date and capable of
-                            paying for resource usages.
-             - **delinquent**: the associated billing account has a correctable problem,
-                               such as late payment.
-            
-             Mostly services should only allow `current` status when serving requests.
-             In addition, services can choose to allow both `current` and `delinquent`
-             statuses when serving read-only requests to resources. If the list of
-             allowed_statuses is empty, it means no billing requirement.
-             </summary>
-        </member>
-        <member name="F:Google.Api.BillingStatusRule.SelectorFieldNumber">
-            <summary>Field number for the "selector" field.</summary>
+        <member name="F:Google.Api.Billing.Types.BillingDestination.MonitoredResourceFieldNumber">
+            <summary>Field number for the "monitored_resource" field.</summary>
         </member>
-        <member name="P:Google.Api.BillingStatusRule.Selector">
+        <member name="P:Google.Api.Billing.Types.BillingDestination.MonitoredResource">
             <summary>
-            Selects the operation names to which this rule applies.
-            Refer to [selector][google.api.DocumentationRule.selector] for syntax details.
+            The monitored resource type. The type must be defined in
+            [Service.monitored_resources][google.api.Service.monitored_resources] section.
             </summary>
         </member>
-        <member name="F:Google.Api.BillingStatusRule.AllowedStatusesFieldNumber">
-            <summary>Field number for the "allowed_statuses" field.</summary>
+        <member name="F:Google.Api.Billing.Types.BillingDestination.MetricsFieldNumber">
+            <summary>Field number for the "metrics" field.</summary>
         </member>
-        <member name="P:Google.Api.BillingStatusRule.AllowedStatuses">
+        <member name="P:Google.Api.Billing.Types.BillingDestination.Metrics">
             <summary>
-            Allowed billing statuses. The billing status check passes if the actual
-            billing status matches any of the provided values here.
+            Names of the metrics to report to this billing destination.
+            Each name must be defined in [Service.metrics][google.api.Service.metrics] section.
             </summary>
         </member>
         <member name="T:Google.Api.ConfigChangeReflection">
@@ -1325,7 +1302,7 @@
         </member>
         <member name="T:Google.Api.Http">
             <summary>
-            Defines the HTTP configuration for a service. It contains a list of
+            Defines the HTTP configuration for an API service. It contains a list of
             [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method
             to one or more HTTP REST API methods.
             </summary>
@@ -1340,14 +1317,27 @@
              **NOTE:** All service configuration rules follow "last one wins" order.
              </summary>
         </member>
+        <member name="F:Google.Api.Http.FullyDecodeReservedExpansionFieldNumber">
+            <summary>Field number for the "fully_decode_reserved_expansion" field.</summary>
+        </member>
+        <member name="P:Google.Api.Http.FullyDecodeReservedExpansion">
+             <summary>
+             When set to true, URL path parmeters will be fully URI-decoded except in
+             cases of single segment matches in reserved expansion, where "%2F" will be
+             left encoded.
+            
+             The default behavior is to not decode RFC 6570 reserved characters in multi
+             segment matches.
+             </summary>
+        </member>
         <member name="T:Google.Api.HttpRule">
              <summary>
              `HttpRule` defines the mapping of an RPC method to one or more HTTP
-             REST APIs.  The mapping determines what portions of the request
-             message are populated from the path, query parameters, or body of
-             the HTTP request.  The mapping is typically specified as an
-             `google.api.http` annotation, see "google/api/annotations.proto"
-             for details.
+             REST API methods. The mapping specifies how different portions of the RPC
+             request message are mapped to URL path, URL query parameters, and
+             HTTP request body. The mapping is typically specified as an
+             `google.api.http` annotation on the RPC method,
+             see "google/api/annotations.proto" for details.
             
              The mapping consists of a field specifying the path template and
              method kind.  The path template can refer to fields in the request
@@ -1393,6 +1383,11 @@
              pattern automatically become (optional) HTTP query
              parameters. Assume the following definition of the request message:
             
+                 service Messaging {
+                   rpc GetMessage(GetMessageRequest) returns (Message) {
+                     option (google.api.http).get = "/v1/messages/{message_id}";
+                   }
+                 }
                  message GetMessageRequest {
                    message SubMessage {
                      string subfield = 1;
@@ -1500,7 +1495,7 @@
              to the request message are as follows:
             
              1. The `body` field specifies either `*` or a field path, or is
-                omitted. If omitted, it assumes there is no HTTP body.
+                omitted. If omitted, it indicates there is no HTTP request body.
              2. Leaf fields (recursive expansion of nested messages in the
                 request) can be classified into three types:
                  (a) Matched in the URL template.
@@ -1519,28 +1514,34 @@
                  FieldPath = IDENT { "." IDENT } ;
                  Verb     = ":" LITERAL ;
             
-             The syntax `*` matches a single path segment. It follows the semantics of
-             [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String
-             Expansion.
+             The syntax `*` matches a single path segment. The syntax `**` matches zero
+             or more path segments, which must be the last part of the path except the
+             `Verb`. The syntax `LITERAL` matches literal text in the path.
             
-             The syntax `**` matches zero or more path segments. It follows the semantics
-             of [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.3 Reserved
-             Expansion. NOTE: it must be the last segment in the path except the Verb.
-            
-             The syntax `LITERAL` matches literal text in the URL path.
-            
-             The syntax `Variable` matches the entire path as specified by its template;
-             this nested template must not contain further variables. If a variable
+             The syntax `Variable` matches part of the URL path as specified by its
+             template. A variable template must not contain other variables. If a variable
              matches a single path segment, its template may be omitted, e.g. `{var}`
              is equivalent to `{var=*}`.
             
+             If a variable contains exactly one path segment, such as `"{var}"` or
+             `"{var=*}"`, when such a variable is expanded into a URL path, all characters
+             except `[-_.~0-9a-zA-Z]` are percent-encoded. Such variables show up in the
+             Discovery Document as `{var}`.
+            
+             If a variable contains one or more path segments, such as `"{var=foo/*}"`
+             or `"{var=**}"`, when such a variable is expanded into a URL path, all
+             characters except `[-_.~/0-9a-zA-Z]` are percent-encoded. Such variables
+             show up in the Discovery Document as `{+var}`.
+            
+             NOTE: While the single segment variable matches the semantics of
+             [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2
+             Simple String Expansion, the multi segment variable **does not** match
+             RFC 6570 Reserved Expansion. The reason is that the Reserved Expansion
+             does not expand special characters like `?` and `#`, which would lead
+             to invalid URLs.
+            
              NOTE: the field paths in variables and in the `body` must not refer to
              repeated fields or map fields.
-            
-             Use CustomHttpPattern to specify any HTTP method that is not included in the
-             `pattern` field, such as HEAD, or "*" to leave the HTTP method unspecified for
-             a given URL path rule. The wild-card rule is useful for services that provide
-             content to Web (HTML) clients.
              </summary>
         </member>
         <member name="F:Google.Api.HttpRule.SelectorFieldNumber">
@@ -1598,7 +1599,10 @@
         </member>
         <member name="P:Google.Api.HttpRule.Custom">
             <summary>
-            Custom pattern is used for defining custom verbs.
+            The custom pattern is used for specifying an HTTP method that is not
+            included in the `pattern` field, such as HEAD, or "*" to leave the
+            HTTP method unspecified for this rule. The wild-card rule is useful
+            for services that provide content to Web (HTML) clients.
             </summary>
         </member>
         <member name="F:Google.Api.HttpRule.BodyFieldNumber">
@@ -2730,10 +2734,10 @@
         </member>
         <member name="P:Google.Api.Service.ConfigVersion">
             <summary>
-            The version of the service configuration. The config version may
-            influence interpretation of the configuration, for example, to
-            determine defaults. This is documented together with applicable
-            options. The current default for the config version itself is `3`.
+            The semantic version of the service configuration. The config version
+            affects the interpretation of the service configuration. For example,
+            certain features are enabled by default for certain config versions.
+            The latest config version is `3`.
             </summary>
         </member>
         <member name="F:Google.Api.Service.NameFieldNumber">
@@ -2760,7 +2764,7 @@
         </member>
         <member name="P:Google.Api.Service.Title">
             <summary>
-            The product title associated with this service.
+            The product title for this service.
             </summary>
         </member>
         <member name="F:Google.Api.Service.ProducerProjectIdFieldNumber">
@@ -2768,9 +2772,7 @@
         </member>
         <member name="P:Google.Api.Service.ProducerProjectId">
             <summary>
-            The id of the Google developer project that owns the service.
-            Members of this project can manage the service configuration,
-            manage consumption of the service, etc.
+            The Google project that owns this service.
             </summary>
         </member>
         <member name="F:Google.Api.Service.ApisFieldNumber">
@@ -2913,6 +2915,14 @@
             by the [Service.monitoring][google.api.Service.monitoring] and [Service.logging][google.api.Service.logging] configurations.
             </summary>
         </member>
+        <member name="F:Google.Api.Service.BillingFieldNumber">
+            <summary>Field number for the "billing" field.</summary>
+        </member>
+        <member name="P:Google.Api.Service.Billing">
+            <summary>
+            Billing configuration.
+            </summary>
+        </member>
         <member name="F:Google.Api.Service.LoggingFieldNumber">
             <summary>Field number for the "logging" field.</summary>
         </member>
@@ -3178,6 +3188,15 @@
             True, if the method allows unregistered calls; false otherwise.
             </summary>
         </member>
+        <member name="F:Google.Api.UsageRule.SkipServiceControlFieldNumber">
+            <summary>Field number for the "skip_service_control" field.</summary>
+        </member>
+        <member name="P:Google.Api.UsageRule.SkipServiceControl">
+            <summary>
+            True, if the method should skip service control. If so, no control plane
+            feature (like quota and billing) will be enabled.
+            </summary>
+        </member>
         <member name="T:Google.Rpc.CodeReflection">
             <summary>Holder for reflection information generated from google/rpc/code.proto</summary>
         </member>
@@ -3243,9 +3262,12 @@
         <member name="F:Google.Rpc.Code.NotFound">
              <summary>
              Some requested entity (e.g., file or directory) was not found.
-             For privacy reasons, this code *may* be returned when the client
-             does not have the access rights to the entity, though such usage is
-             discouraged.
+            
+             Note to server developers: if a request is denied for an entire class
+             of users, such as gradual feature rollout or undocumented whitelist,
+             `NOT_FOUND` may be used. If a request is denied for some users within
+             a class of users, such as user-based access control, `PERMISSION_DENIED`
+             must be used.
             
              HTTP Mapping: 404 Not Found
              </summary>
@@ -3265,7 +3287,9 @@
              caused by exhausting some resource (use `RESOURCE_EXHAUSTED`
              instead for those errors). `PERMISSION_DENIED` must not be
              used if the caller can not be identified (use `UNAUTHENTICATED`
-             instead for those errors).
+             instead for those errors). This error code does not imply the
+             request is valid or the requested entity exists or satisfies
+             other pre-conditions.
             
              HTTP Mapping: 403 Forbidden
              </summary>
@@ -3297,7 +3321,8 @@
              between `FAILED_PRECONDITION`, `ABORTED`, and `UNAVAILABLE`:
               (a) Use `UNAVAILABLE` if the client can retry just the failing call.
               (b) Use `ABORTED` if the client should retry at a higher level
-                  (e.g., restarting a read-modify-write sequence).
+                  (e.g., when a client-specified test-and-set fails, indicating the
+                  client should restart a read-modify-write sequence).
               (c) Use `FAILED_PRECONDITION` if the client should not retry until
                   the system state has been explicitly fixed.  E.g., if an "rmdir"
                   fails because the directory is non-empty, `FAILED_PRECONDITION`
@@ -3483,6 +3508,62 @@
              exceeded".
              </summary>
         </member>
+        <member name="T:Google.Rpc.PreconditionFailure">
+             <summary>
+             Describes what preconditions have failed.
+            
+             For example, if an RPC failed because it required the Terms of Service to be
+             acknowledged, it could list the terms of service violation in the
+             PreconditionFailure message.
+             </summary>
+        </member>
+        <member name="F:Google.Rpc.PreconditionFailure.ViolationsFieldNumber">
+            <summary>Field number for the "violations" field.</summary>
+        </member>
+        <member name="P:Google.Rpc.PreconditionFailure.Violations">
+            <summary>
+            Describes all precondition violations.
+            </summary>
+        </member>
+        <member name="T:Google.Rpc.PreconditionFailure.Types">
+            <summary>Container for nested types declared in the PreconditionFailure message type.</summary>
+        </member>
+        <member name="T:Google.Rpc.PreconditionFailure.Types.Violation">
+            <summary>
+            A message type used to describe a single precondition failure.
+            </summary>
+        </member>
+        <member name="F:Google.Rpc.PreconditionFailure.Types.Violation.TypeFieldNumber">
+            <summary>Field number for the "type" field.</summary>
+        </member>
+        <member name="P:Google.Rpc.PreconditionFailure.Types.Violation.Type">
+            <summary>
+            The type of PreconditionFailure. We recommend using a service-specific
+            enum type to define the supported precondition violation types. For
+            example, "TOS" for "Terms of Service violation".
+            </summary>
+        </member>
+        <member name="F:Google.Rpc.PreconditionFailure.Types.Violation.SubjectFieldNumber">
+            <summary>Field number for the "subject" field.</summary>
+        </member>
+        <member name="P:Google.Rpc.PreconditionFailure.Types.Violation.Subject">
+            <summary>
+            The subject, relative to the type, that failed.
+            For example, "google.com/cloud" relative to the "TOS" type would
+            indicate which terms of service is being referenced.
+            </summary>
+        </member>
+        <member name="F:Google.Rpc.PreconditionFailure.Types.Violation.DescriptionFieldNumber">
+            <summary>Field number for the "description" field.</summary>
+        </member>
+        <member name="P:Google.Rpc.PreconditionFailure.Types.Violation.Description">
+             <summary>
+             A description of how the precondition failed. Developers can use this
+             description to understand how to fix the failure.
+            
+             For example: "Terms of service not accepted".
+             </summary>
+        </member>
         <member name="T:Google.Rpc.BadRequest">
             <summary>
             Describes violations in a client request. This error type focuses on the
@@ -3682,7 +3763,7 @@
              error message is needed, put the localized message in the error details or
              localize it in the client. The optional error details may contain arbitrary
              information about the error. There is a predefined set of error detail types
-             in the package `google.rpc` which can be used for common error conditions.
+             in the package `google.rpc` that can be used for common error conditions.
             
              # Language mapping
             
@@ -3705,7 +3786,7 @@
                  errors.
             
              - Workflow errors. A typical workflow has multiple steps. Each step may
-                 have a `Status` message for error reporting purpose.
+                 have a `Status` message for error reporting.
             
              - Batch operations. If a client uses batch request and batch response, the
                  `Status` message should be used directly inside batch response, one for
@@ -3742,8 +3823,8 @@
         </member>
         <member name="P:Google.Rpc.Status.Details">
             <summary>
-            A list of messages that carry the error details.  There will be a
-            common set of message types for APIs to use.
+            A list of messages that carry the error details.  There is a common set of
+            message types for APIs to use.
             </summary>
         </member>
         <member name="T:Google.Type.ColorReflection">
diff --git a/packages/Google.Api.Gax.2.2.1/lib/net45/Google.Api.Gax.dll b/packages/Google.Api.Gax.2.2.1/lib/net45/Google.Api.Gax.dll
deleted file mode 100644
index ba8650dd7..000000000
Binary files a/packages/Google.Api.Gax.2.2.1/lib/net45/Google.Api.Gax.dll and /dev/null differ
diff --git a/packages/Google.Api.Gax.2.2.1/lib/netstandard1.3/Google.Api.Gax.dll b/packages/Google.Api.Gax.2.2.1/lib/netstandard1.3/Google.Api.Gax.dll
deleted file mode 100644
index 7a36e2512..000000000
Binary files a/packages/Google.Api.Gax.2.2.1/lib/netstandard1.3/Google.Api.Gax.dll and /dev/null differ
diff --git a/packages/Google.Api.Gax.2.3.0/lib/net45/Google.Api.Gax.dll b/packages/Google.Api.Gax.2.3.0/lib/net45/Google.Api.Gax.dll
new file mode 100644
index 000000000..c1ea2a0e2
Binary files /dev/null and b/packages/Google.Api.Gax.2.3.0/lib/net45/Google.Api.Gax.dll differ
diff --git a/packages/Google.Api.Gax.2.2.1/lib/net45/Google.Api.Gax.xml b/packages/Google.Api.Gax.2.3.0/lib/net45/Google.Api.Gax.xml
similarity index 81%
rename from packages/Google.Api.Gax.2.2.1/lib/net45/Google.Api.Gax.xml
rename to packages/Google.Api.Gax.2.3.0/lib/net45/Google.Api.Gax.xml
index 7af8b6c9c..9dfa68341 100644
--- a/packages/Google.Api.Gax.2.2.1/lib/net45/Google.Api.Gax.xml
+++ b/packages/Google.Api.Gax.2.3.0/lib/net45/Google.Api.Gax.xml
@@ -423,6 +423,334 @@
             <param name="cancellationToken">The cancellation token that will be watched during the sleep operation.</param>
             <exception cref="T:System.OperationCanceledException">The cancellation token was cancelled during the sleep.</exception>
         </member>
+        <member name="T:Google.Api.Gax.Json.InvalidJsonException">
+            <summary>
+            Thrown when an attempt is made to parse invalid JSON, e.g. using
+            a non-string property key, or including a redundant comma.
+            </summary>
+        </member>
+        <member name="T:Google.Api.Gax.Json.JsonBuilder">
+            <summary>
+            Utility class for generating JSON. This class doesn't perform much in the way of validity
+            checks - that's left as the responsibility of the caller. However, it allows values and properties
+            to be written in a simple, chainable way, without the caller needing to worry about adding commas.
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonBuilder.CommonRepresentations">
+            <summary>
+            The JSON representation of the first 160 characters of Unicode.
+            Empty strings are replaced by the static constructor.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.#ctor(System.Text.StringBuilder)">
+            <summary>
+            Constructs a new instance using the specified <see cref="T:System.Text.StringBuilder"/>.
+            </summary>
+            <param name="builder">The <see cref="T:System.Text.StringBuilder"/> to append to. Must not be null.</param>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.#ctor">
+            <summary>
+            Constructs a new instance with a new <see cref="T:System.Text.StringBuilder"/>.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.StartObject">
+            <summary>
+            Writes the start of an object to the builder.
+            </summary>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.StartArray">
+            <summary>
+            Writes the start of an array to the builder.
+            </summary>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.EndArray">
+            <summary>
+            Writes the end of an array to the builder.
+            </summary>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.EndObject">
+            <summary>
+            Writes the end of an object to the builder.
+            </summary>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.Value(System.String)">
+            <summary>
+            Writes a string value to the builder, escaping it if necessary.
+            </summary>
+            <param name="value">The value to write. May be null.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.Value(System.Boolean)">
+            <summary>
+            Writes a Boolean value to the builder.
+            </summary>
+            <param name="value">The value to write.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.Value(System.Double)">
+            <summary>
+            Writes a numeric value to the builder.
+            </summary>
+            <param name="value">The value to write.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.Property(System.String,System.String)">
+            <summary>
+            Writes a name/value property pair to the builder for a string value.
+            </summary>
+            <param name="name">The name of the property. Must not be null.</param>
+            <param name="value">The value of the property. May be null.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.Property(System.String,System.Boolean)">
+            <summary>
+            Writes a name/value property pair to the builder for a Boolean value.
+            </summary>
+            <param name="name">The name of the property. Must not be null.</param>
+            <param name="value">The value of the property.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.Property(System.String,System.Double)">
+            <summary>
+            Writes a name/value property pair to the builder for a numeric value.
+            </summary>
+            <param name="name">The name of the property. Must not be null.</param>
+            <param name="value">The value of the property.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.PropertyName(System.String)">
+            <summary>
+            Writes a property name to the builder, so that an array or object value may then be written.
+            </summary>
+            <param name="name">The name of the property. Must not be null.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.ToString">
+            <summary>
+            Returns the string representation of the underlying <see cref="T:System.Text.StringBuilder"/>.
+            If this builder was created with an existing StringBuilder instance, any data written earlier
+            will be included in the result.
+            </summary>
+            <returns>The string representation of the builder.</returns>
+        </member>
+        <member name="T:Google.Api.Gax.Json.JsonParser">
+            <summary>
+            Crude JSON parser. This is only capable of parsing documents that are fully compliant with RFC 7159.
+            Each JSON value is represented as:
+            
+            - JSON string: System.String
+            - JSON number: System.Double
+            - JSON array: System.Collections.Generic.List`1{System.Object}
+            - JSON object: System.Collections.Generic.Dictionary`1{System.String, System.Object}
+            - JSON Boolean: System.Boolean
+            - JSON null: null reference
+            </summary>
+        </member>
+        <member name="T:Google.Api.Gax.Json.JsonTokenizer">
+            <summary>
+            Simple but strict JSON tokenizer, rigidly following RFC 7159.
+            </summary>
+            <remarks>
+            <para>
+            This tokenizer is stateful, and only returns "useful" tokens - names, values etc.
+            It does not create tokens for the separator between names and values, or for the comma
+            between values. It validates the token stream as it goes - so callers can assume that the
+            tokens it produces are appropriate. For example, it would never produce "start object, end array."
+            </para>
+            <para>Not thread-safe.</para>
+            </remarks>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.FromTextReader(System.IO.TextReader)">
+            <summary>
+             Creates a tokenizer that reads from the given text reader.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.PushContainer(Google.Api.Gax.Json.JsonTokenizer.ContainerType)">
+            <summary>
+            Pushes a new container type onto the stack and validates that we don't violate the maximum depth.
+            </summary>
+            <param name="type"></param>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.Peek">
+            <summary>
+            Peeks at the next token in the stream, without changing the visible state.
+            </summary>
+            <returns>The next token in the stream.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.SkipValue">
+            <summary>
+            Skips the value we're about to read. This must only be called immediately after reading a property name.
+            If the value is an object or an array, the complete object/array is skipped.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.Next">
+            <summary>
+            Returns the next JSON token in the stream.
+            </summary>
+            <exception cref="T:System.InvalidOperationException">This method is called after an EndDocument token has been returned</exception>
+            <exception cref="T:Google.Api.Gax.Json.InvalidJsonException">The input text does not comply with RFC 7159</exception>
+            <returns>The next token in the stream.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.ReadString">
+            <summary>
+            Reads a string token. It is assumed that the opening " has already been read.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.ReadEscapedCharacter">
+            <summary>
+            Reads an escaped character. It is assumed that the leading backslash has already been read.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.ReadUnicodeEscape">
+            <summary>
+            Reads an escaped Unicode 4-nybble hex sequence. It is assumed that the leading \u has already been read.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.ConsumeLiteral(System.String)">
+            <summary>
+            Consumes a text-only literal, throwing an exception if the read text doesn't match it.
+            It is assumed that the first letter of the literal has already been read.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.ValidateAndModifyStateForValue(System.String)">
+            <summary>
+            Validates that we're in a valid state to read a value (using the given error prefix if necessary)
+            and changes the state to the appropriate one, e.g. ObjectAfterColon to ObjectAfterProperty.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.PopContainer">
+            <summary>
+            Pops the top-most container, and sets the state to the appropriate one for the end of a value
+            in the parent container.
+            </summary>
+        </member>
+        <member name="T:Google.Api.Gax.Json.JsonTokenizer.State">
+            <summary>
+            Possible states of the tokenizer.
+            </summary>
+            <remarks>
+            <para>This is a flags enum purely so we can simply and efficiently represent a set of valid states
+            for checking.</para>
+            <para>
+            Each is documented with an example,
+            where ^ represents the current position within the text stream. The examples all use string values,
+            but could be any value, including nested objects/arrays.
+            The complete state of the tokenizer also includes a stack to indicate the contexts (arrays/objects).
+            Any additional notional state of "AfterValue" indicates that a value has been completed, at which 
+            point there's an immediate transition to ExpectedEndOfDocument,  ObjectAfterProperty or ArrayAfterValue.
+            </para>
+            <para>
+            These states were derived manually by reading RFC 7159 carefully.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.StartOfDocument">
+            <summary>
+            ^ { "foo": "bar" }
+            Before the value in a document. Next states: ObjectStart, ArrayStart, "AfterValue"
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ExpectedEndOfDocument">
+            <summary>
+            { "foo": "bar" } ^
+            After the value in a document. Next states: ReaderExhausted
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ReaderExhausted">
+            <summary>
+            { "foo": "bar" } ^ (and already read to the end of the reader)
+            Terminal state.
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ObjectStart">
+            <summary>
+            { ^ "foo": "bar" }
+            Before the *first* property in an object.
+            Next states:
+            "AfterValue" (empty object)
+            ObjectBeforeColon (read a name)
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ObjectBeforeColon">
+            <summary>
+            { "foo" ^ : "bar", "x": "y" }
+            Next state: ObjectAfterColon
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ObjectAfterColon">
+            <summary>
+            { "foo" : ^ "bar", "x": "y" }
+            Before any property other than the first in an object.
+            (Equivalently: after any property in an object) 
+            Next states:
+            "AfterValue" (value is simple)
+            ObjectStart (value is object)
+            ArrayStart (value is array)
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ObjectAfterProperty">
+            <summary>
+            { "foo" : "bar" ^ , "x" : "y" }
+            At the end of a property, so expecting either a comma or end-of-object
+            Next states: ObjectAfterComma or "AfterValue"
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ObjectAfterComma">
+            <summary>
+            { "foo":"bar", ^ "x":"y" }
+            Read the comma after the previous property, so expecting another property.
+            This is like ObjectStart, but closing brace isn't valid here
+            Next state: ObjectBeforeColon.
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ArrayStart">
+            <summary>
+            [ ^ "foo", "bar" ]
+            Before the *first* value in an array.
+            Next states:
+            "AfterValue" (read a value)
+            "AfterValue" (end of array; will pop stack)
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ArrayAfterValue">
+            <summary>
+            [ "foo" ^ , "bar" ]
+            After any value in an array, so expecting either a comma or end-of-array
+            Next states: ArrayAfterComma or "AfterValue"
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ArrayAfterComma">
+            <summary>
+            [ "foo", ^ "bar" ]
+            After a comma in an array, so there *must* be another value (simple or complex).
+            Next states: "AfterValue" (simple value), StartObject, StartArray
+            </summary>
+        </member>
+        <member name="T:Google.Api.Gax.Json.JsonTokenizer.PushBackReader">
+            <summary>
+            Wrapper around a text reader allowing small amounts of buffering and location handling.
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.PushBackReader.nextChar">
+            <summary>
+            The buffered next character, if we have one.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.PushBackReader.Read">
+            <summary>
+            Returns the next character in the stream, or null if we have reached the end.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.PushBackReader.CreateException(System.String)">
+            <summary>
+            Creates a new exception appropriate for the current state of the reader.
+            </summary>
+        </member>
         <member name="T:Google.Api.Gax.Page`1">
             <summary>
             A page of resources which will only have fewer results than requested if
@@ -943,7 +1271,7 @@
         </member>
         <member name="M:Google.Api.Gax.Platform.Instance">
             <summary>
-            Get execution platform information. This may block for up to one second.
+            Get execution platform information. This may block briefly while network operations are in progress.
             </summary>
             <returns>Execution platform information.</returns>
         </member>
diff --git a/packages/Google.Api.Gax.2.3.0/lib/netstandard1.3/Google.Api.Gax.dll b/packages/Google.Api.Gax.2.3.0/lib/netstandard1.3/Google.Api.Gax.dll
new file mode 100644
index 000000000..c230b04fa
Binary files /dev/null and b/packages/Google.Api.Gax.2.3.0/lib/netstandard1.3/Google.Api.Gax.dll differ
diff --git a/packages/Google.Api.Gax.2.2.1/lib/netstandard1.3/Google.Api.Gax.xml b/packages/Google.Api.Gax.2.3.0/lib/netstandard1.3/Google.Api.Gax.xml
similarity index 81%
rename from packages/Google.Api.Gax.2.2.1/lib/netstandard1.3/Google.Api.Gax.xml
rename to packages/Google.Api.Gax.2.3.0/lib/netstandard1.3/Google.Api.Gax.xml
index 7af8b6c9c..9dfa68341 100644
--- a/packages/Google.Api.Gax.2.2.1/lib/netstandard1.3/Google.Api.Gax.xml
+++ b/packages/Google.Api.Gax.2.3.0/lib/netstandard1.3/Google.Api.Gax.xml
@@ -423,6 +423,334 @@
             <param name="cancellationToken">The cancellation token that will be watched during the sleep operation.</param>
             <exception cref="T:System.OperationCanceledException">The cancellation token was cancelled during the sleep.</exception>
         </member>
+        <member name="T:Google.Api.Gax.Json.InvalidJsonException">
+            <summary>
+            Thrown when an attempt is made to parse invalid JSON, e.g. using
+            a non-string property key, or including a redundant comma.
+            </summary>
+        </member>
+        <member name="T:Google.Api.Gax.Json.JsonBuilder">
+            <summary>
+            Utility class for generating JSON. This class doesn't perform much in the way of validity
+            checks - that's left as the responsibility of the caller. However, it allows values and properties
+            to be written in a simple, chainable way, without the caller needing to worry about adding commas.
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonBuilder.CommonRepresentations">
+            <summary>
+            The JSON representation of the first 160 characters of Unicode.
+            Empty strings are replaced by the static constructor.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.#ctor(System.Text.StringBuilder)">
+            <summary>
+            Constructs a new instance using the specified <see cref="T:System.Text.StringBuilder"/>.
+            </summary>
+            <param name="builder">The <see cref="T:System.Text.StringBuilder"/> to append to. Must not be null.</param>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.#ctor">
+            <summary>
+            Constructs a new instance with a new <see cref="T:System.Text.StringBuilder"/>.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.StartObject">
+            <summary>
+            Writes the start of an object to the builder.
+            </summary>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.StartArray">
+            <summary>
+            Writes the start of an array to the builder.
+            </summary>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.EndArray">
+            <summary>
+            Writes the end of an array to the builder.
+            </summary>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.EndObject">
+            <summary>
+            Writes the end of an object to the builder.
+            </summary>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.Value(System.String)">
+            <summary>
+            Writes a string value to the builder, escaping it if necessary.
+            </summary>
+            <param name="value">The value to write. May be null.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.Value(System.Boolean)">
+            <summary>
+            Writes a Boolean value to the builder.
+            </summary>
+            <param name="value">The value to write.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.Value(System.Double)">
+            <summary>
+            Writes a numeric value to the builder.
+            </summary>
+            <param name="value">The value to write.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.Property(System.String,System.String)">
+            <summary>
+            Writes a name/value property pair to the builder for a string value.
+            </summary>
+            <param name="name">The name of the property. Must not be null.</param>
+            <param name="value">The value of the property. May be null.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.Property(System.String,System.Boolean)">
+            <summary>
+            Writes a name/value property pair to the builder for a Boolean value.
+            </summary>
+            <param name="name">The name of the property. Must not be null.</param>
+            <param name="value">The value of the property.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.Property(System.String,System.Double)">
+            <summary>
+            Writes a name/value property pair to the builder for a numeric value.
+            </summary>
+            <param name="name">The name of the property. Must not be null.</param>
+            <param name="value">The value of the property.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.PropertyName(System.String)">
+            <summary>
+            Writes a property name to the builder, so that an array or object value may then be written.
+            </summary>
+            <param name="name">The name of the property. Must not be null.</param>
+            <returns>A reference to the same <see cref="T:Google.Api.Gax.Json.JsonBuilder"/> the method was called on, for chaining.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonBuilder.ToString">
+            <summary>
+            Returns the string representation of the underlying <see cref="T:System.Text.StringBuilder"/>.
+            If this builder was created with an existing StringBuilder instance, any data written earlier
+            will be included in the result.
+            </summary>
+            <returns>The string representation of the builder.</returns>
+        </member>
+        <member name="T:Google.Api.Gax.Json.JsonParser">
+            <summary>
+            Crude JSON parser. This is only capable of parsing documents that are fully compliant with RFC 7159.
+            Each JSON value is represented as:
+            
+            - JSON string: System.String
+            - JSON number: System.Double
+            - JSON array: System.Collections.Generic.List`1{System.Object}
+            - JSON object: System.Collections.Generic.Dictionary`1{System.String, System.Object}
+            - JSON Boolean: System.Boolean
+            - JSON null: null reference
+            </summary>
+        </member>
+        <member name="T:Google.Api.Gax.Json.JsonTokenizer">
+            <summary>
+            Simple but strict JSON tokenizer, rigidly following RFC 7159.
+            </summary>
+            <remarks>
+            <para>
+            This tokenizer is stateful, and only returns "useful" tokens - names, values etc.
+            It does not create tokens for the separator between names and values, or for the comma
+            between values. It validates the token stream as it goes - so callers can assume that the
+            tokens it produces are appropriate. For example, it would never produce "start object, end array."
+            </para>
+            <para>Not thread-safe.</para>
+            </remarks>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.FromTextReader(System.IO.TextReader)">
+            <summary>
+             Creates a tokenizer that reads from the given text reader.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.PushContainer(Google.Api.Gax.Json.JsonTokenizer.ContainerType)">
+            <summary>
+            Pushes a new container type onto the stack and validates that we don't violate the maximum depth.
+            </summary>
+            <param name="type"></param>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.Peek">
+            <summary>
+            Peeks at the next token in the stream, without changing the visible state.
+            </summary>
+            <returns>The next token in the stream.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.SkipValue">
+            <summary>
+            Skips the value we're about to read. This must only be called immediately after reading a property name.
+            If the value is an object or an array, the complete object/array is skipped.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.Next">
+            <summary>
+            Returns the next JSON token in the stream.
+            </summary>
+            <exception cref="T:System.InvalidOperationException">This method is called after an EndDocument token has been returned</exception>
+            <exception cref="T:Google.Api.Gax.Json.InvalidJsonException">The input text does not comply with RFC 7159</exception>
+            <returns>The next token in the stream.</returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.ReadString">
+            <summary>
+            Reads a string token. It is assumed that the opening " has already been read.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.ReadEscapedCharacter">
+            <summary>
+            Reads an escaped character. It is assumed that the leading backslash has already been read.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.ReadUnicodeEscape">
+            <summary>
+            Reads an escaped Unicode 4-nybble hex sequence. It is assumed that the leading \u has already been read.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.ConsumeLiteral(System.String)">
+            <summary>
+            Consumes a text-only literal, throwing an exception if the read text doesn't match it.
+            It is assumed that the first letter of the literal has already been read.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.ValidateAndModifyStateForValue(System.String)">
+            <summary>
+            Validates that we're in a valid state to read a value (using the given error prefix if necessary)
+            and changes the state to the appropriate one, e.g. ObjectAfterColon to ObjectAfterProperty.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.PopContainer">
+            <summary>
+            Pops the top-most container, and sets the state to the appropriate one for the end of a value
+            in the parent container.
+            </summary>
+        </member>
+        <member name="T:Google.Api.Gax.Json.JsonTokenizer.State">
+            <summary>
+            Possible states of the tokenizer.
+            </summary>
+            <remarks>
+            <para>This is a flags enum purely so we can simply and efficiently represent a set of valid states
+            for checking.</para>
+            <para>
+            Each is documented with an example,
+            where ^ represents the current position within the text stream. The examples all use string values,
+            but could be any value, including nested objects/arrays.
+            The complete state of the tokenizer also includes a stack to indicate the contexts (arrays/objects).
+            Any additional notional state of "AfterValue" indicates that a value has been completed, at which 
+            point there's an immediate transition to ExpectedEndOfDocument,  ObjectAfterProperty or ArrayAfterValue.
+            </para>
+            <para>
+            These states were derived manually by reading RFC 7159 carefully.
+            </para>
+            </remarks>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.StartOfDocument">
+            <summary>
+            ^ { "foo": "bar" }
+            Before the value in a document. Next states: ObjectStart, ArrayStart, "AfterValue"
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ExpectedEndOfDocument">
+            <summary>
+            { "foo": "bar" } ^
+            After the value in a document. Next states: ReaderExhausted
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ReaderExhausted">
+            <summary>
+            { "foo": "bar" } ^ (and already read to the end of the reader)
+            Terminal state.
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ObjectStart">
+            <summary>
+            { ^ "foo": "bar" }
+            Before the *first* property in an object.
+            Next states:
+            "AfterValue" (empty object)
+            ObjectBeforeColon (read a name)
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ObjectBeforeColon">
+            <summary>
+            { "foo" ^ : "bar", "x": "y" }
+            Next state: ObjectAfterColon
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ObjectAfterColon">
+            <summary>
+            { "foo" : ^ "bar", "x": "y" }
+            Before any property other than the first in an object.
+            (Equivalently: after any property in an object) 
+            Next states:
+            "AfterValue" (value is simple)
+            ObjectStart (value is object)
+            ArrayStart (value is array)
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ObjectAfterProperty">
+            <summary>
+            { "foo" : "bar" ^ , "x" : "y" }
+            At the end of a property, so expecting either a comma or end-of-object
+            Next states: ObjectAfterComma or "AfterValue"
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ObjectAfterComma">
+            <summary>
+            { "foo":"bar", ^ "x":"y" }
+            Read the comma after the previous property, so expecting another property.
+            This is like ObjectStart, but closing brace isn't valid here
+            Next state: ObjectBeforeColon.
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ArrayStart">
+            <summary>
+            [ ^ "foo", "bar" ]
+            Before the *first* value in an array.
+            Next states:
+            "AfterValue" (read a value)
+            "AfterValue" (end of array; will pop stack)
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ArrayAfterValue">
+            <summary>
+            [ "foo" ^ , "bar" ]
+            After any value in an array, so expecting either a comma or end-of-array
+            Next states: ArrayAfterComma or "AfterValue"
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.State.ArrayAfterComma">
+            <summary>
+            [ "foo", ^ "bar" ]
+            After a comma in an array, so there *must* be another value (simple or complex).
+            Next states: "AfterValue" (simple value), StartObject, StartArray
+            </summary>
+        </member>
+        <member name="T:Google.Api.Gax.Json.JsonTokenizer.PushBackReader">
+            <summary>
+            Wrapper around a text reader allowing small amounts of buffering and location handling.
+            </summary>
+        </member>
+        <member name="F:Google.Api.Gax.Json.JsonTokenizer.PushBackReader.nextChar">
+            <summary>
+            The buffered next character, if we have one.
+            </summary>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.PushBackReader.Read">
+            <summary>
+            Returns the next character in the stream, or null if we have reached the end.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Google.Api.Gax.Json.JsonTokenizer.PushBackReader.CreateException(System.String)">
+            <summary>
+            Creates a new exception appropriate for the current state of the reader.
+            </summary>
+        </member>
         <member name="T:Google.Api.Gax.Page`1">
             <summary>
             A page of resources which will only have fewer results than requested if
@@ -943,7 +1271,7 @@
         </member>
         <member name="M:Google.Api.Gax.Platform.Instance">
             <summary>
-            Get execution platform information. This may block for up to one second.
+            Get execution platform information. This may block briefly while network operations are in progress.
             </summary>
             <returns>Execution platform information.</returns>
         </member>
diff --git a/packages/Google.Apis.1.32.0/lib/net45/Google.Apis.PlatformServices.dll b/packages/Google.Apis.1.32.2/lib/net45/Google.Apis.PlatformServices.dll
similarity index 52%
rename from packages/Google.Apis.1.32.0/lib/net45/Google.Apis.PlatformServices.dll
rename to packages/Google.Apis.1.32.2/lib/net45/Google.Apis.PlatformServices.dll
index ef397e6be..e5635f281 100644
Binary files a/packages/Google.Apis.1.32.0/lib/net45/Google.Apis.PlatformServices.dll and b/packages/Google.Apis.1.32.2/lib/net45/Google.Apis.PlatformServices.dll differ
diff --git a/packages/Google.Apis.1.32.0/lib/net45/Google.Apis.dll b/packages/Google.Apis.1.32.2/lib/net45/Google.Apis.dll
similarity index 98%
rename from packages/Google.Apis.1.32.0/lib/net45/Google.Apis.dll
rename to packages/Google.Apis.1.32.2/lib/net45/Google.Apis.dll
index 170a9abd3..bbdadb9a2 100644
Binary files a/packages/Google.Apis.1.32.0/lib/net45/Google.Apis.dll and b/packages/Google.Apis.1.32.2/lib/net45/Google.Apis.dll differ
diff --git a/packages/Google.Apis.1.32.0/lib/net45/Google.Apis.xml b/packages/Google.Apis.1.32.2/lib/net45/Google.Apis.xml
similarity index 100%
rename from packages/Google.Apis.1.32.0/lib/net45/Google.Apis.xml
rename to packages/Google.Apis.1.32.2/lib/net45/Google.Apis.xml
diff --git a/packages/Google.Apis.1.32.0/lib/netstandard1.3/Google.Apis.dll b/packages/Google.Apis.1.32.2/lib/netstandard1.3/Google.Apis.dll
similarity index 98%
rename from packages/Google.Apis.1.32.0/lib/netstandard1.3/Google.Apis.dll
rename to packages/Google.Apis.1.32.2/lib/netstandard1.3/Google.Apis.dll
index af2adf3c8..95e1dbda6 100644
Binary files a/packages/Google.Apis.1.32.0/lib/netstandard1.3/Google.Apis.dll and b/packages/Google.Apis.1.32.2/lib/netstandard1.3/Google.Apis.dll differ
diff --git a/packages/Google.Apis.1.32.0/lib/netstandard1.3/Google.Apis.xml b/packages/Google.Apis.1.32.2/lib/netstandard1.3/Google.Apis.xml
similarity index 100%
rename from packages/Google.Apis.1.32.0/lib/netstandard1.3/Google.Apis.xml
rename to packages/Google.Apis.1.32.2/lib/netstandard1.3/Google.Apis.xml
diff --git a/packages/Google.Apis.Auth.1.32.0/lib/net45/Google.Apis.Auth.dll b/packages/Google.Apis.Auth.1.32.0/lib/net45/Google.Apis.Auth.dll
deleted file mode 100644
index 67e920da7..000000000
Binary files a/packages/Google.Apis.Auth.1.32.0/lib/net45/Google.Apis.Auth.dll and /dev/null differ
diff --git a/packages/Google.Apis.Auth.1.32.0/lib/netstandard1.3/Google.Apis.Auth.dll b/packages/Google.Apis.Auth.1.32.0/lib/netstandard1.3/Google.Apis.Auth.dll
deleted file mode 100644
index 21455396d..000000000
Binary files a/packages/Google.Apis.Auth.1.32.0/lib/netstandard1.3/Google.Apis.Auth.dll and /dev/null differ
diff --git a/packages/Google.Apis.Auth.1.32.0/lib/net45/Google.Apis.Auth.PlatformServices.dll b/packages/Google.Apis.Auth.1.32.2/lib/net45/Google.Apis.Auth.PlatformServices.dll
similarity index 82%
rename from packages/Google.Apis.Auth.1.32.0/lib/net45/Google.Apis.Auth.PlatformServices.dll
rename to packages/Google.Apis.Auth.1.32.2/lib/net45/Google.Apis.Auth.PlatformServices.dll
index 651ba8400..18f3acbf1 100644
Binary files a/packages/Google.Apis.Auth.1.32.0/lib/net45/Google.Apis.Auth.PlatformServices.dll and b/packages/Google.Apis.Auth.1.32.2/lib/net45/Google.Apis.Auth.PlatformServices.dll differ
diff --git a/packages/Google.Apis.Auth.1.32.2/lib/net45/Google.Apis.Auth.dll b/packages/Google.Apis.Auth.1.32.2/lib/net45/Google.Apis.Auth.dll
new file mode 100644
index 000000000..afbc9d2f7
Binary files /dev/null and b/packages/Google.Apis.Auth.1.32.2/lib/net45/Google.Apis.Auth.dll differ
diff --git a/packages/Google.Apis.Auth.1.32.0/lib/net45/Google.Apis.Auth.xml b/packages/Google.Apis.Auth.1.32.2/lib/net45/Google.Apis.Auth.xml
similarity index 99%
rename from packages/Google.Apis.Auth.1.32.0/lib/net45/Google.Apis.Auth.xml
rename to packages/Google.Apis.Auth.1.32.2/lib/net45/Google.Apis.Auth.xml
index 0c7ad8979..0cf1ae015 100644
--- a/packages/Google.Apis.Auth.1.32.0/lib/net45/Google.Apis.Auth.xml
+++ b/packages/Google.Apis.Auth.1.32.2/lib/net45/Google.Apis.Auth.xml
@@ -390,8 +390,9 @@
         </member>
         <member name="F:Google.Apis.Auth.OAuth2.ComputeCredential.MetadataServerPingTimeoutInMilliseconds">
             <summary>
-            Experimentally, 200ms was found to be 99.9999% reliable. 
-            This is a conservative timeout to minimize hanging on some troublesome network. 
+            Originally 1000ms was used without a retry. This proved inadequate; even 2000ms without
+            a retry occasionally failed. We have observed that after a timeout, the next attempt
+            succeeds very quickly (sub-50ms) which suggests that this should be fine.
             </summary>
         </member>
         <member name="F:Google.Apis.Auth.OAuth2.ComputeCredential.MetadataFlavor">
diff --git a/packages/Google.Apis.Auth.1.32.0/lib/netstandard1.3/Google.Apis.Auth.PlatformServices.dll b/packages/Google.Apis.Auth.1.32.2/lib/netstandard1.3/Google.Apis.Auth.PlatformServices.dll
similarity index 82%
rename from packages/Google.Apis.Auth.1.32.0/lib/netstandard1.3/Google.Apis.Auth.PlatformServices.dll
rename to packages/Google.Apis.Auth.1.32.2/lib/netstandard1.3/Google.Apis.Auth.PlatformServices.dll
index 60af2dd0c..5c348d046 100644
Binary files a/packages/Google.Apis.Auth.1.32.0/lib/netstandard1.3/Google.Apis.Auth.PlatformServices.dll and b/packages/Google.Apis.Auth.1.32.2/lib/netstandard1.3/Google.Apis.Auth.PlatformServices.dll differ
diff --git a/packages/Google.Apis.Auth.1.32.2/lib/netstandard1.3/Google.Apis.Auth.dll b/packages/Google.Apis.Auth.1.32.2/lib/netstandard1.3/Google.Apis.Auth.dll
new file mode 100644
index 000000000..a03b01081
Binary files /dev/null and b/packages/Google.Apis.Auth.1.32.2/lib/netstandard1.3/Google.Apis.Auth.dll differ
diff --git a/packages/Google.Apis.Auth.1.32.0/lib/netstandard1.3/Google.Apis.Auth.xml b/packages/Google.Apis.Auth.1.32.2/lib/netstandard1.3/Google.Apis.Auth.xml
similarity index 99%
rename from packages/Google.Apis.Auth.1.32.0/lib/netstandard1.3/Google.Apis.Auth.xml
rename to packages/Google.Apis.Auth.1.32.2/lib/netstandard1.3/Google.Apis.Auth.xml
index 0c7ad8979..0cf1ae015 100644
--- a/packages/Google.Apis.Auth.1.32.0/lib/netstandard1.3/Google.Apis.Auth.xml
+++ b/packages/Google.Apis.Auth.1.32.2/lib/netstandard1.3/Google.Apis.Auth.xml
@@ -390,8 +390,9 @@
         </member>
         <member name="F:Google.Apis.Auth.OAuth2.ComputeCredential.MetadataServerPingTimeoutInMilliseconds">
             <summary>
-            Experimentally, 200ms was found to be 99.9999% reliable. 
-            This is a conservative timeout to minimize hanging on some troublesome network. 
+            Originally 1000ms was used without a retry. This proved inadequate; even 2000ms without
+            a retry occasionally failed. We have observed that after a timeout, the next attempt
+            succeeds very quickly (sub-50ms) which suggests that this should be fine.
             </summary>
         </member>
         <member name="F:Google.Apis.Auth.OAuth2.ComputeCredential.MetadataFlavor">
diff --git a/packages/Google.Apis.Core.1.32.0/lib/net45/Google.Apis.Core.dll b/packages/Google.Apis.Core.1.32.2/lib/net45/Google.Apis.Core.dll
similarity index 98%
rename from packages/Google.Apis.Core.1.32.0/lib/net45/Google.Apis.Core.dll
rename to packages/Google.Apis.Core.1.32.2/lib/net45/Google.Apis.Core.dll
index ea8b17a1a..b2cba2ed8 100644
Binary files a/packages/Google.Apis.Core.1.32.0/lib/net45/Google.Apis.Core.dll and b/packages/Google.Apis.Core.1.32.2/lib/net45/Google.Apis.Core.dll differ
diff --git a/packages/Google.Apis.Core.1.32.0/lib/net45/Google.Apis.Core.xml b/packages/Google.Apis.Core.1.32.2/lib/net45/Google.Apis.Core.xml
similarity index 100%
rename from packages/Google.Apis.Core.1.32.0/lib/net45/Google.Apis.Core.xml
rename to packages/Google.Apis.Core.1.32.2/lib/net45/Google.Apis.Core.xml
diff --git a/packages/Google.Apis.Core.1.32.0/lib/netstandard1.3/Google.Apis.Core.dll b/packages/Google.Apis.Core.1.32.2/lib/netstandard1.3/Google.Apis.Core.dll
similarity index 97%
rename from packages/Google.Apis.Core.1.32.0/lib/netstandard1.3/Google.Apis.Core.dll
rename to packages/Google.Apis.Core.1.32.2/lib/netstandard1.3/Google.Apis.Core.dll
index 0253238c1..7fdcc64bd 100644
Binary files a/packages/Google.Apis.Core.1.32.0/lib/netstandard1.3/Google.Apis.Core.dll and b/packages/Google.Apis.Core.1.32.2/lib/netstandard1.3/Google.Apis.Core.dll differ
diff --git a/packages/Google.Apis.Core.1.32.0/lib/netstandard1.3/Google.Apis.Core.xml b/packages/Google.Apis.Core.1.32.2/lib/netstandard1.3/Google.Apis.Core.xml
similarity index 100%
rename from packages/Google.Apis.Core.1.32.0/lib/netstandard1.3/Google.Apis.Core.xml
rename to packages/Google.Apis.Core.1.32.2/lib/netstandard1.3/Google.Apis.Core.xml