diff --git a/CHANGELOG.md b/CHANGELOG.md
index e493e315e..351376809 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,11 @@
 
 ## [master] (https://github.com/WagicProject/wagic/tree/master)
 
+### 08/10/21
+- *Committed:* Fixed a bug on deck choosing menu when an AI deck has no avatar image (it will be used "baka.jpg"), added new default avatar images for AI decks (up to 200), fixed "_PROLIFERATE_" macro and fixed all primitives with "proliferate" ability, improved the "proliferation" keyword for target chooser in order to avoid targeting permanents or players without counters and/or with some protections (e.g. hexproof, shroud and similar). ([Vitty85](https://github.com/Vitty85))
+
 ### 07/10/21
-- *Committed:* Removed the previous limit of 99 avatars images, if "avatarXX.jpg" image is not present, for deckXX.txt of AI it will be used "baka.jpg" image instead. ([Vitty85](https://github.com/Vitty85))
+- *Committed:* Removed the previous limit of 99 avatars images, if "avatarXX.jpg" image is not present, for deckXX.txt of AI it will be used "baka.jpg" image instead. https://github.com/WagicProject/wagic/commit/aafaadb76ffacda5b7b9430df4435e143d1bcba4 ([Vitty85](https://github.com/Vitty85))
 
 ### 06/10/21
 - *Committed:* Fixed primitive "Armament Master" (issue #1075 opened by @remigiusz-suwalski). https://github.com/WagicProject/wagic/commit/99b501105d1d83588d07ed3026ead0b182b00978 ([Vitty85](https://github.com/Vitty85))
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar101.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar101.jpg
new file mode 100644
index 000000000..6a910977d
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar101.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar102.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar102.jpg
new file mode 100644
index 000000000..068ffd07e
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar102.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar103.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar103.jpg
new file mode 100644
index 000000000..a3d6d5b53
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar103.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar104.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar104.jpg
new file mode 100644
index 000000000..eafaca382
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar104.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar105.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar105.jpg
new file mode 100644
index 000000000..0cc45230f
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar105.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar106.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar106.jpg
new file mode 100644
index 000000000..8e9c5e746
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar106.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar107.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar107.jpg
new file mode 100644
index 000000000..128542f1e
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar107.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar108.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar108.jpg
new file mode 100644
index 000000000..6ba81c7be
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar108.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar109.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar109.jpg
new file mode 100644
index 000000000..d25b795a9
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar109.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar110.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar110.jpg
new file mode 100644
index 000000000..f1e83f652
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar110.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar111.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar111.jpg
new file mode 100644
index 000000000..8843c3a99
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar111.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar112.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar112.jpg
new file mode 100644
index 000000000..d09cc56ac
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar112.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar113.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar113.jpg
new file mode 100644
index 000000000..068ffd07e
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar113.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar114.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar114.jpg
new file mode 100644
index 000000000..a2a2fcffc
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar114.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar115.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar115.jpg
new file mode 100644
index 000000000..a28275fe8
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar115.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar116.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar116.jpg
new file mode 100644
index 000000000..9ba6a10d7
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar116.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar117.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar117.jpg
new file mode 100644
index 000000000..8e9c5e746
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar117.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar118.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar118.jpg
new file mode 100644
index 000000000..0c4f3ca7a
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar118.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar119.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar119.jpg
new file mode 100644
index 000000000..0e7da8ecb
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar119.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar120.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar120.jpg
new file mode 100644
index 000000000..1c747b54f
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar120.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar121.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar121.jpg
new file mode 100644
index 000000000..3f1ffabb6
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar121.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar122.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar122.jpg
new file mode 100644
index 000000000..2447124d1
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar122.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar123.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar123.jpg
new file mode 100644
index 000000000..b1f5ea1ab
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar123.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar124.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar124.jpg
new file mode 100644
index 000000000..7ebed6f9d
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar124.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar125.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar125.jpg
new file mode 100644
index 000000000..ec8abb7ea
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar125.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar126.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar126.jpg
new file mode 100644
index 000000000..45bb6b3a3
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar126.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar127.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar127.jpg
new file mode 100644
index 000000000..aa0d6d3c2
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar127.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar128.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar128.jpg
new file mode 100644
index 000000000..3f1ffabb6
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar128.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar129.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar129.jpg
new file mode 100644
index 000000000..fe3fadeca
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar129.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar130.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar130.jpg
new file mode 100644
index 000000000..8843c3a99
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar130.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar131.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar131.jpg
new file mode 100644
index 000000000..aa0d6d3c2
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar131.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar132.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar132.jpg
new file mode 100644
index 000000000..ab2d5a2ba
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar132.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar133.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar133.jpg
new file mode 100644
index 000000000..d09cc56ac
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar133.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar134.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar134.jpg
new file mode 100644
index 000000000..a28275fe8
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar134.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar135.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar135.jpg
new file mode 100644
index 000000000..ab2d5a2ba
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar135.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar136.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar136.jpg
new file mode 100644
index 000000000..a2a2fcffc
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar136.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar137.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar137.jpg
new file mode 100644
index 000000000..fe3fadeca
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar137.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar138.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar138.jpg
new file mode 100644
index 000000000..395f9e591
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar138.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar139.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar139.jpg
new file mode 100644
index 000000000..8797d1c38
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar139.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar140.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar140.jpg
new file mode 100644
index 000000000..1c747b54f
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar140.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar141.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar141.jpg
new file mode 100644
index 000000000..0c4f3ca7a
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar141.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar142.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar142.jpg
new file mode 100644
index 000000000..a3d6be374
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar142.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar143.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar143.jpg
new file mode 100644
index 000000000..ec8abb7ea
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar143.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar144.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar144.jpg
new file mode 100644
index 000000000..ec8abb7ea
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar144.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar145.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar145.jpg
new file mode 100644
index 000000000..b1f5ea1ab
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar145.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar146.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar146.jpg
new file mode 100644
index 000000000..3d9aa8521
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar146.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar147.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar147.jpg
new file mode 100644
index 000000000..8216ce982
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar147.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar148.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar148.jpg
new file mode 100644
index 000000000..133cbbb54
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar148.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar149.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar149.jpg
new file mode 100644
index 000000000..8c6a72dcf
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar149.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar150.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar150.jpg
new file mode 100644
index 000000000..a2a2fcffc
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar150.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar151.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar151.jpg
new file mode 100644
index 000000000..3f1ffabb6
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar151.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar152.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar152.jpg
new file mode 100644
index 000000000..068ffd07e
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar152.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar153.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar153.jpg
new file mode 100644
index 000000000..6ba81c7be
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar153.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar154.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar154.jpg
new file mode 100644
index 000000000..d09cc56ac
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar154.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar155.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar155.jpg
new file mode 100644
index 000000000..a28275fe8
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar155.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar156.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar156.jpg
new file mode 100644
index 000000000..0cc45230f
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar156.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar157.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar157.jpg
new file mode 100644
index 000000000..395f9e591
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar157.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar158.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar158.jpg
new file mode 100644
index 000000000..0e7da8ecb
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar158.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar159.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar159.jpg
new file mode 100644
index 000000000..a3d6be374
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar159.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar160.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar160.jpg
new file mode 100644
index 000000000..d25b795a9
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar160.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar161.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar161.jpg
new file mode 100644
index 000000000..9ba6a10d7
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar161.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar162.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar162.jpg
new file mode 100644
index 000000000..b1f5ea1ab
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar162.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar163.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar163.jpg
new file mode 100644
index 000000000..8c6a72dcf
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar163.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar164.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar164.jpg
new file mode 100644
index 000000000..eafaca382
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar164.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar165.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar165.jpg
new file mode 100644
index 000000000..6a910977d
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar165.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar166.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar166.jpg
new file mode 100644
index 000000000..8c6a72dcf
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar166.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar167.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar167.jpg
new file mode 100644
index 000000000..d25b795a9
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar167.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar168.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar168.jpg
new file mode 100644
index 000000000..eafaca382
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar168.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar169.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar169.jpg
new file mode 100644
index 000000000..128542f1e
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar169.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar170.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar170.jpg
new file mode 100644
index 000000000..3d9aa8521
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar170.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar171.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar171.jpg
new file mode 100644
index 000000000..aa0d6d3c2
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar171.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar172.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar172.jpg
new file mode 100644
index 000000000..a3d6d5b53
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar172.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar173.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar173.jpg
new file mode 100644
index 000000000..45bb6b3a3
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar173.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar174.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar174.jpg
new file mode 100644
index 000000000..0e7da8ecb
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar174.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar175.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar175.jpg
new file mode 100644
index 000000000..9ba6a10d7
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar175.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar176.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar176.jpg
new file mode 100644
index 000000000..133cbbb54
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar176.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar177.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar177.jpg
new file mode 100644
index 000000000..2447124d1
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar177.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar178.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar178.jpg
new file mode 100644
index 000000000..fe3fadeca
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar178.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar179.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar179.jpg
new file mode 100644
index 000000000..6ba81c7be
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar179.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar180.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar180.jpg
new file mode 100644
index 000000000..2447124d1
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar180.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar181.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar181.jpg
new file mode 100644
index 000000000..8797d1c38
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar181.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar182.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar182.jpg
new file mode 100644
index 000000000..ad86e1e01
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar182.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar183.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar183.jpg
new file mode 100644
index 000000000..d920cca97
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar183.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar184.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar184.jpg
new file mode 100644
index 000000000..ab2d5a2ba
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar184.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar185.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar185.jpg
new file mode 100644
index 000000000..ad86e1e01
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar185.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar186.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar186.jpg
new file mode 100644
index 000000000..a3d6be374
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar186.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar187.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar187.jpg
new file mode 100644
index 000000000..f1e83f652
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar187.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar188.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar188.jpg
new file mode 100644
index 000000000..45bb6b3a3
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar188.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar189.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar189.jpg
new file mode 100644
index 000000000..8843c3a99
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar189.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar190.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar190.jpg
new file mode 100644
index 000000000..a3d6d5b53
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar190.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar191.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar191.jpg
new file mode 100644
index 000000000..6a910977d
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar191.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar192.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar192.jpg
new file mode 100644
index 000000000..8e9c5e746
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar192.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar193.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar193.jpg
new file mode 100644
index 000000000..8216ce982
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar193.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar194.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar194.jpg
new file mode 100644
index 000000000..8216ce982
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar194.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar195.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar195.jpg
new file mode 100644
index 000000000..133cbbb54
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar195.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar196.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar196.jpg
new file mode 100644
index 000000000..395f9e591
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar196.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar197.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar197.jpg
new file mode 100644
index 000000000..3d9aa8521
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar197.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar198.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar198.jpg
new file mode 100644
index 000000000..ad86e1e01
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar198.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar199.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar199.jpg
new file mode 100644
index 000000000..f1e83f652
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar199.jpg differ
diff --git a/projects/mtg/bin/Res/ai/baka/avatars/avatar200.jpg b/projects/mtg/bin/Res/ai/baka/avatars/avatar200.jpg
new file mode 100644
index 000000000..7ebed6f9d
Binary files /dev/null and b/projects/mtg/bin/Res/ai/baka/avatars/avatar200.jpg differ
diff --git a/projects/mtg/bin/Res/sets/primitives/_macros.txt b/projects/mtg/bin/Res/sets/primitives/_macros.txt
index d585f2d5d..68ce117ad 100644
--- a/projects/mtg/bin/Res/sets/primitives/_macros.txt
+++ b/projects/mtg/bin/Res/sets/primitives/_macros.txt
@@ -94,7 +94,7 @@ $AUTO_DEFINE _CLASH_ Put here a code if compare the casting cost based on Errati
 #AUTO_DEFINE _CONSPIRE_ @movedTo(this|myStak):may {T(creature|myBattlefield)}{T(creature|myBattlefield)} castcard(copied noevent) target(*|myStack)
 
 # Proliferate
-#AUTO_DEFINE _PROLIFERATE_ name(Proliferate) notatarget(<anyamount>player^permanent) proliferate
+#AUTO_DEFINE _PROLIFERATE_ name(Proliferate) notatarget(proliferation) proliferate
 
 # Scavenge
 #AUTO_DEFINE _SCAVENGE_($cost) name(Scavenge) autograveyard={$cost}{E}:counter(1/1,$c) target(creature) asSorcery
diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 8fb5e8c27..a26d3e692 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -2020,7 +2020,7 @@ toughness=2
 [card]
 name=Animation Module
 auto=@counteradded(1/1) from(*|mybattlefield):name(pay 1 for 1/1 Servo) pay[[{1}]] name(pay 1 for 1/1 Servo) token(Servo,Artifact Creature Servo,1/1)
-auto={3}{T}:name(Add a counter) name(Add a counter) target(player,permanent) duplicatecounters(single)
+auto={3}{T}:name(Add a counter) name(Add a counter) target(proliferation) duplicatecounters(single)
 text=Whenever one or more +1/+1 counters are placed on a permanent you control, you may pay {1}. If you do, create a 1/1 colorless Servo artifact creature token. -- {3}, {T}: Choose a counter on target permanent or player. Give that permanent or player another counter of that kind.
 mana={1}
 type=Artifact
@@ -50339,7 +50339,7 @@ type=Enchantment
 [/card]
 [card]
 name=Planewide Celebration
-auto=thisforeach(variable{4}) ability$!name(Choose one) choice name(Create citizen) token(Citizen,Creature Citizen,2/2,white,blue,black,red,green) _ choice name(Return permanent) target(*[-instant;-sorcery]|mygraveyard) moveto(ownerhand) _ choice name(Proliferate) notatarget(<anyamount>player,permanent) proliferate _choice name(Gain life) life:4 controller!$ controller
+auto=thisforeach(variable{4}) ability$!name(Choose one) choice name(Create citizen) token(Citizen,Creature Citizen,2/2,white,blue,black,red,green) _ choice name(Return permanent) target(*[-instant;-sorcery]|mygraveyard) moveto(ownerhand) _ choice name(Proliferate) notatarget(proliferation) proliferate _choice name(Gain life) life:4 controller!$ controller
 text=Choose four. You may choose the same mode more than once. -- Create a 2/2 Citizen creature token that's all colors. -- Return target permanent card from your graveyard to your hand. -- Proliferate. -- You gain 4 life.
 mana={5}{G}{G}
 type=Sorcery
@@ -56086,7 +56086,7 @@ type=Sorcery
 name=Roalesk, Apex Hybrid
 abilities=flying,trample
 auto=counter(1/1,2) target(other creature|myBattlefield)
-auto=_DIES_name(Proliferate) notatarget(<anyamount>player,permanent) proliferate && proliferate
+auto=_DIES_name(Proliferate 2 times) notatarget(proliferation) proliferate && proliferate
 text=Flying, trample -- When Roalesk, Apex Hybrid enters the battlefield, put two +1/+1 counters on another target creature you control. -- When Roalesk dies, proliferate, then proliferate again. (Choose any number of permanents and/or players, then give each another counter of each kind already there. Then do it again.)
 mana={2}{G}{G}{U}
 type=Legendary Creature
@@ -76691,7 +76691,7 @@ auto=ability$!name(Choose one) choice name(Don't put anything) donothing _ choic
 auto=ability$!name(Choose one) choice name(Don't put anything) donothing _ choice name(Put from hand) target(*[zombie;planeswalker]|myhand) moveTo(myBattlefield) _ choice name(Put from graveyard) target(*[zombie;planeswalker]|myGraveyard) moveTo(myBattlefield)!$ opponent
 auto=@counteradded(0/0,1,Lore) from(this) restriction{compare(hascntlore)~equalto~2}:may name(Sacrifice creatures and planeswalkers) target(<anyamount>*[creature;planeswalker]|myBattlefield) transforms((,newability[sacrifice],newability[ability$!name(Sacrifice creature or planeswalker) name(Sacrifice creature or planeswalker) notatarget(*[creature;planeswalker]|myBattlefield) sacrifice!$ opponent])) oneshot
 auto=@counteradded(0/0,1,Lore) from(this) restriction{compare(hascntlore)~equalto~3}:may name(Exile a bolas) target(*[Bolas]|battlefield) moveTo(exile)
-auto=@counteradded(0/0,1,Lore) from(this) restriction{compare(hascntlore)~equalto~3}:name(Proliferate 3 times) notatarget(<anyamount>player,permanent) proliferate && proliferate && proliferate
+auto=@counteradded(0/0,1,Lore) from(this) restriction{compare(hascntlore)~equalto~3}:name(Proliferate 3 times) notatarget(proliferation) proliferate && proliferate && proliferate
 auto=@counteradded(0/0,1,Lore) from(this) restriction{compare(hascntlore)~equalto~3}:name(Sacrifice) sacrifice
 text=(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.) -- I - Each player may put a planeswalker or Zombie card from War of the Spark from their hand or graveyard onto the battlefield. -- II - Sacrifice any number of creatures and/or planeswalkers. Each opponent sacrifices that many creatures and/or planeswalkers. -- III - Exile up to one target Bolas. Proliferate three times.
 mana={3}{B}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 533cead41..25565a533 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -22179,7 +22179,7 @@ type=Artifact
 [card]
 name=Contagion Engine
 auto=target(player) ability$!name(target player) counter(-1/-1,1) all(creature|mybattlefield)!$ targetedplayer
-auto={4}{T}:name(Proliferate) notatarget(<anyamount>player,permanent) proliferate && proliferate
+auto={4}{T}:name(Proliferate 2 times) notatarget(proliferation) proliferate && proliferate
 text=When Contagion Engine enters the battlefield, put a -1/-1 counter on each creature target player controls. -- {4},{T}: Proliferate, then proliferate again. (You choose any number of permanents and/or players with counters on them, then give each another counter of a kind already there. Then do it again.)
 mana={6}
 type=Artifact
diff --git a/projects/mtg/src/AIPlayerBaka.cpp b/projects/mtg/src/AIPlayerBaka.cpp
index ebf1d89ee..08ddae0f6 100644
--- a/projects/mtg/src/AIPlayerBaka.cpp
+++ b/projects/mtg/src/AIPlayerBaka.cpp
@@ -4292,7 +4292,7 @@ AIPlayerBaka::AIPlayerBaka(GameObserver *observer, string file, string fileSmall
     {
         avatarFile = "avatar";
         char buffer[3];
-        sprintf(buffer, "%i", int(observer->getRandomGenerator()->random()%100));
+        sprintf(buffer, "%i", int(observer->getRandomGenerator()->random()%200));
         avatarFile.append(buffer);
         avatarFile.append(".jpg");
         if(!loadAvatar(avatarFile, "bakaAvatar"))
diff --git a/projects/mtg/src/DeckMenuItem.cpp b/projects/mtg/src/DeckMenuItem.cpp
index 191e841fa..7047fc9f8 100644
--- a/projects/mtg/src/DeckMenuItem.cpp
+++ b/projects/mtg/src/DeckMenuItem.cpp
@@ -49,7 +49,11 @@ DeckMenuItem::DeckMenuItem(DeckMenu* _parent, int id, int fontId, string text, f
     }
     
     if (mMetaData && mMetaData->getAvatarFilename().size() > 0)
+    {
         mImageFilename = mMetaData->getAvatarFilename();
+        if(!(WResourceManager::Instance()->RetrieveTexture(mImageFilename))) 
+            mImageFilename = "baka.jpg"; // if the AI deck has no specific avatar we will display the default "baka.jpg" image.
+    } 
     else 
     {
         // this is a non-deck menu item (ie "Random", "Cancel", etc
diff --git a/projects/mtg/src/TargetChooser.cpp b/projects/mtg/src/TargetChooser.cpp
index 1ccf00837..fc610c902 100644
--- a/projects/mtg/src/TargetChooser.cpp
+++ b/projects/mtg/src/TargetChooser.cpp
@@ -2180,13 +2180,41 @@ bool ProliferateChooser::canTarget(Targetable * target,bool withoutProtections)
 {
     if (MTGCardInstance * card = dynamic_cast<MTGCardInstance*>(target))
     {
+        if (source && card->isInPlay(observer) && !withoutProtections)
+        { 
+            if (card->has(Constants::SHROUD)) return source->bypassTC;
+            if (card->protectedAgainst(source)) return source->bypassTC;
+            if (card->CantBeTargetby(source)) return source->bypassTC;
+            if ((source->controller() != card->controller()) && card->has(Constants::OPPONENTSHROUD)) return source->bypassTC;
+            if (card->has(Constants::PROTECTIONFROMCOLOREDSPELLS)){
+                if((source->spellTargetType.size()) && (source->hasColor(1)||source->hasColor(2)||source->hasColor(3)||source->hasColor(4)||source->hasColor(5)))
+                    return source->bypassTC;
+            }
+        }
         if(card->counters && card->counters->counters.empty())
             return false;
         return true;
     }
     else if (Player * p = dynamic_cast<Player*>(target))
     {
-        if(!p->poisonCount)
+        if (source)
+        {
+            if ((source->controller() != source->controller()->opponent())
+                && (source->controller()->opponent()->game->inPlay->hasAbility(Constants::CONTROLLERSHROUD))
+                && source->controller() != target)
+                    return source->bypassTC;
+            if ((source->controller()->opponent()->game->inPlay->hasAbility(Constants::PLAYERSHROUD))
+                && source->controller()->opponent() == target)
+                    return source->bypassTC;
+            if ((source->controller()->game->inPlay->hasAbility(Constants::PLAYERSHROUD))
+                && source->controller() == target)
+                    return source->bypassTC;
+            if(source->controller()->isAI() && p == source->controller() && p->poisonCount)
+                return false; // prevent AI to target itself when it has some poison counters.
+            if(source->controller()->isAI() && p != source->controller() && !p->poisonCount)
+                return false; // prevent AI to target opponent when there are no poison counters.
+        }
+        if(!p->poisonCount && !p->energyCount && !p->experienceCount)
             return false;
         return true;
     }