From: Eevee <git@veekun.com>
Date: Mon, 23 Mar 2009 01:14:44 +0000 (-0400)
Subject: Merge branch 'master' of eevee@tekkanin.veekun.com:dev/pokedex
X-Git-Tag: veekun-promotions/2010050901~278
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/9aa66a43ed6fa408cfcde1146119d44792b1ff8e?hp=b66584ab42c52050b9b06bbdfcc32de15a26f00a

Merge branch 'master' of eevee@tekkanin.veekun.com:dev/pokedex
---

diff --git a/.gitignore b/.gitignore
index a400776..7f68c58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 ~*
 *.swp
 
-*.egg-into
+*.egg-info
diff --git a/pokedex/__init__.py b/pokedex/__init__.py
index 138c58b..2932504 100644
--- a/pokedex/__init__.py
+++ b/pokedex/__init__.py
@@ -27,6 +27,12 @@ def csvimport(engine_uri, dir='.'):
 
     metadata.create_all()
 
+    # Oh, mysql-chan.
+    # TODO try to insert data in preorder so we don't need this hack and won't
+    #      break similarly on other engines
+    if 'mysql' in engine_uri:
+        session.execute('SET FOREIGN_KEY_CHECKS = 0')
+
     # This is a secret attribute on a secret singleton of a secret class that
     # appears to hopefully contain all registered classes as keys.
     # There is no other way to accomplish this, as far as I can tell.
@@ -37,19 +43,30 @@ def csvimport(engine_uri, dir='.'):
         print table_name
 
         reader = csv.reader(open("%s/%s.csv" % (dir, table_name), 'rb'), lineterminator='\n')
-        columns = [unicode(column) for column in reader.next()]
+        column_names = [unicode(column) for column in reader.next()]
 
         for csvs in reader:
             row = table()
 
-            for column, value in zip(columns, csvs):
-                value = value.decode('utf-8')
-                setattr(row, column, value)
+            for column_name, value in zip(column_names, csvs):
+                if table.__table__.c[column_name].nullable and value == '':
+                    # Empty string in a nullable column really means NULL
+                    value = None
+                else:
+                    # Otherwise, unflatten from bytes
+                    value = value.decode('utf-8')
+
+                setattr(row, column_name, value)
 
             session.add(row)
 
         session.commit()
 
+    # Shouldn't matter since this is usually the end of the program and thus
+    # the connection too, but let's change this back just in case
+    if 'mysql' in engine_uri:
+        session.execute('SET FOREIGN_KEY_CHECKS = 1')
+
 
 def csvexport(engine_uri, dir='.'):
     import csv
diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index c35f0e2..030e3c1 100644
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -494,8 +494,8 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,evolut
 493,Arceus,,,4,254,,,,32,3200,Alpha,gray,8,,-1,3,255,0,,0,0,0
 494,Pokemon494,,,,0,,,,0,0,,,0,,-1,3,255,0,,0,0,0
 495,Pokemon495,,,,0,,,,0,0,,,0,,-1,3,255,0,,0,0,0
-496,Deoxys,attack,386,,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
-497,Deoxys,defense,386,,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
-498,Deoxys,speed,386,,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
-499,Wormadam,ground,413,,213,,,,5,65,Bagworm,gray,2,,8,45,159,70,,0,0,0
-500,Wormadam,steel,413,,213,,,,5,65,Bagworm,gray,2,,8,45,159,70,,0,0,0
+496,Deoxys,attack,386,,,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
+497,Deoxys,defense,386,,,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
+498,Deoxys,speed,386,,,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
+499,Wormadam,ground,413,,,,,,5,65,Bagworm,gray,2,,8,45,159,70,,0,0,0
+500,Wormadam,steel,413,,,,,,5,65,Bagworm,gray,2,,8,45,159,70,,0,0,0
diff --git a/pokedex/data/media/icons/0.png b/pokedex/data/media/icons/0.png
new file mode 100644
index 0000000..4fb8fc3
Binary files /dev/null and b/pokedex/data/media/icons/0.png differ
diff --git a/pokedex/data/media/icons/1.png b/pokedex/data/media/icons/1.png
new file mode 100644
index 0000000..676f6cb
Binary files /dev/null and b/pokedex/data/media/icons/1.png differ
diff --git a/pokedex/data/media/icons/10.png b/pokedex/data/media/icons/10.png
new file mode 100644
index 0000000..e63a423
Binary files /dev/null and b/pokedex/data/media/icons/10.png differ
diff --git a/pokedex/data/media/icons/100.png b/pokedex/data/media/icons/100.png
new file mode 100644
index 0000000..33cf890
Binary files /dev/null and b/pokedex/data/media/icons/100.png differ
diff --git a/pokedex/data/media/icons/101.png b/pokedex/data/media/icons/101.png
new file mode 100644
index 0000000..b1f691e
Binary files /dev/null and b/pokedex/data/media/icons/101.png differ
diff --git a/pokedex/data/media/icons/102.png b/pokedex/data/media/icons/102.png
new file mode 100644
index 0000000..8f8fb33
Binary files /dev/null and b/pokedex/data/media/icons/102.png differ
diff --git a/pokedex/data/media/icons/103.png b/pokedex/data/media/icons/103.png
new file mode 100644
index 0000000..d6f5e5e
Binary files /dev/null and b/pokedex/data/media/icons/103.png differ
diff --git a/pokedex/data/media/icons/104.png b/pokedex/data/media/icons/104.png
new file mode 100644
index 0000000..e1a2722
Binary files /dev/null and b/pokedex/data/media/icons/104.png differ
diff --git a/pokedex/data/media/icons/105.png b/pokedex/data/media/icons/105.png
new file mode 100644
index 0000000..97d1c3e
Binary files /dev/null and b/pokedex/data/media/icons/105.png differ
diff --git a/pokedex/data/media/icons/106.png b/pokedex/data/media/icons/106.png
new file mode 100644
index 0000000..22a3f1d
Binary files /dev/null and b/pokedex/data/media/icons/106.png differ
diff --git a/pokedex/data/media/icons/107.png b/pokedex/data/media/icons/107.png
new file mode 100644
index 0000000..2def8cd
Binary files /dev/null and b/pokedex/data/media/icons/107.png differ
diff --git a/pokedex/data/media/icons/108.png b/pokedex/data/media/icons/108.png
new file mode 100644
index 0000000..ffc8750
Binary files /dev/null and b/pokedex/data/media/icons/108.png differ
diff --git a/pokedex/data/media/icons/109.png b/pokedex/data/media/icons/109.png
new file mode 100644
index 0000000..b8d1989
Binary files /dev/null and b/pokedex/data/media/icons/109.png differ
diff --git a/pokedex/data/media/icons/11.png b/pokedex/data/media/icons/11.png
new file mode 100644
index 0000000..e756492
Binary files /dev/null and b/pokedex/data/media/icons/11.png differ
diff --git a/pokedex/data/media/icons/110.png b/pokedex/data/media/icons/110.png
new file mode 100644
index 0000000..8490f25
Binary files /dev/null and b/pokedex/data/media/icons/110.png differ
diff --git a/pokedex/data/media/icons/111.png b/pokedex/data/media/icons/111.png
new file mode 100644
index 0000000..fdc2510
Binary files /dev/null and b/pokedex/data/media/icons/111.png differ
diff --git a/pokedex/data/media/icons/112.png b/pokedex/data/media/icons/112.png
new file mode 100644
index 0000000..bb673c4
Binary files /dev/null and b/pokedex/data/media/icons/112.png differ
diff --git a/pokedex/data/media/icons/113.png b/pokedex/data/media/icons/113.png
new file mode 100644
index 0000000..cbdff35
Binary files /dev/null and b/pokedex/data/media/icons/113.png differ
diff --git a/pokedex/data/media/icons/114.png b/pokedex/data/media/icons/114.png
new file mode 100644
index 0000000..c424288
Binary files /dev/null and b/pokedex/data/media/icons/114.png differ
diff --git a/pokedex/data/media/icons/115.png b/pokedex/data/media/icons/115.png
new file mode 100644
index 0000000..860bdc8
Binary files /dev/null and b/pokedex/data/media/icons/115.png differ
diff --git a/pokedex/data/media/icons/116.png b/pokedex/data/media/icons/116.png
new file mode 100644
index 0000000..ec49395
Binary files /dev/null and b/pokedex/data/media/icons/116.png differ
diff --git a/pokedex/data/media/icons/117.png b/pokedex/data/media/icons/117.png
new file mode 100644
index 0000000..9df3725
Binary files /dev/null and b/pokedex/data/media/icons/117.png differ
diff --git a/pokedex/data/media/icons/118.png b/pokedex/data/media/icons/118.png
new file mode 100644
index 0000000..f403e7c
Binary files /dev/null and b/pokedex/data/media/icons/118.png differ
diff --git a/pokedex/data/media/icons/119.png b/pokedex/data/media/icons/119.png
new file mode 100644
index 0000000..93917b3
Binary files /dev/null and b/pokedex/data/media/icons/119.png differ
diff --git a/pokedex/data/media/icons/12.png b/pokedex/data/media/icons/12.png
new file mode 100644
index 0000000..1e259f8
Binary files /dev/null and b/pokedex/data/media/icons/12.png differ
diff --git a/pokedex/data/media/icons/120.png b/pokedex/data/media/icons/120.png
new file mode 100644
index 0000000..46bbda1
Binary files /dev/null and b/pokedex/data/media/icons/120.png differ
diff --git a/pokedex/data/media/icons/121.png b/pokedex/data/media/icons/121.png
new file mode 100644
index 0000000..2e825d6
Binary files /dev/null and b/pokedex/data/media/icons/121.png differ
diff --git a/pokedex/data/media/icons/122.png b/pokedex/data/media/icons/122.png
new file mode 100644
index 0000000..beb2a7e
Binary files /dev/null and b/pokedex/data/media/icons/122.png differ
diff --git a/pokedex/data/media/icons/123.png b/pokedex/data/media/icons/123.png
new file mode 100644
index 0000000..f56ba85
Binary files /dev/null and b/pokedex/data/media/icons/123.png differ
diff --git a/pokedex/data/media/icons/124.png b/pokedex/data/media/icons/124.png
new file mode 100644
index 0000000..b504b15
Binary files /dev/null and b/pokedex/data/media/icons/124.png differ
diff --git a/pokedex/data/media/icons/125.png b/pokedex/data/media/icons/125.png
new file mode 100644
index 0000000..c2461b1
Binary files /dev/null and b/pokedex/data/media/icons/125.png differ
diff --git a/pokedex/data/media/icons/126.png b/pokedex/data/media/icons/126.png
new file mode 100644
index 0000000..4a31fec
Binary files /dev/null and b/pokedex/data/media/icons/126.png differ
diff --git a/pokedex/data/media/icons/127.png b/pokedex/data/media/icons/127.png
new file mode 100644
index 0000000..eebde79
Binary files /dev/null and b/pokedex/data/media/icons/127.png differ
diff --git a/pokedex/data/media/icons/128.png b/pokedex/data/media/icons/128.png
new file mode 100644
index 0000000..4419456
Binary files /dev/null and b/pokedex/data/media/icons/128.png differ
diff --git a/pokedex/data/media/icons/129.png b/pokedex/data/media/icons/129.png
new file mode 100644
index 0000000..08f26a2
Binary files /dev/null and b/pokedex/data/media/icons/129.png differ
diff --git a/pokedex/data/media/icons/13.png b/pokedex/data/media/icons/13.png
new file mode 100644
index 0000000..e82ae32
Binary files /dev/null and b/pokedex/data/media/icons/13.png differ
diff --git a/pokedex/data/media/icons/130.png b/pokedex/data/media/icons/130.png
new file mode 100644
index 0000000..d1b41ea
Binary files /dev/null and b/pokedex/data/media/icons/130.png differ
diff --git a/pokedex/data/media/icons/131.png b/pokedex/data/media/icons/131.png
new file mode 100644
index 0000000..213b1f8
Binary files /dev/null and b/pokedex/data/media/icons/131.png differ
diff --git a/pokedex/data/media/icons/132.png b/pokedex/data/media/icons/132.png
new file mode 100644
index 0000000..01c8f41
Binary files /dev/null and b/pokedex/data/media/icons/132.png differ
diff --git a/pokedex/data/media/icons/133.png b/pokedex/data/media/icons/133.png
new file mode 100644
index 0000000..024e47d
Binary files /dev/null and b/pokedex/data/media/icons/133.png differ
diff --git a/pokedex/data/media/icons/134.png b/pokedex/data/media/icons/134.png
new file mode 100644
index 0000000..2d38ba0
Binary files /dev/null and b/pokedex/data/media/icons/134.png differ
diff --git a/pokedex/data/media/icons/135.png b/pokedex/data/media/icons/135.png
new file mode 100644
index 0000000..70235c3
Binary files /dev/null and b/pokedex/data/media/icons/135.png differ
diff --git a/pokedex/data/media/icons/136.png b/pokedex/data/media/icons/136.png
new file mode 100644
index 0000000..1edf086
Binary files /dev/null and b/pokedex/data/media/icons/136.png differ
diff --git a/pokedex/data/media/icons/137.png b/pokedex/data/media/icons/137.png
new file mode 100644
index 0000000..2e15261
Binary files /dev/null and b/pokedex/data/media/icons/137.png differ
diff --git a/pokedex/data/media/icons/138.png b/pokedex/data/media/icons/138.png
new file mode 100644
index 0000000..361757e
Binary files /dev/null and b/pokedex/data/media/icons/138.png differ
diff --git a/pokedex/data/media/icons/139.png b/pokedex/data/media/icons/139.png
new file mode 100644
index 0000000..ddce8b0
Binary files /dev/null and b/pokedex/data/media/icons/139.png differ
diff --git a/pokedex/data/media/icons/14.png b/pokedex/data/media/icons/14.png
new file mode 100644
index 0000000..04ec7d0
Binary files /dev/null and b/pokedex/data/media/icons/14.png differ
diff --git a/pokedex/data/media/icons/140.png b/pokedex/data/media/icons/140.png
new file mode 100644
index 0000000..c2e25ab
Binary files /dev/null and b/pokedex/data/media/icons/140.png differ
diff --git a/pokedex/data/media/icons/141.png b/pokedex/data/media/icons/141.png
new file mode 100644
index 0000000..a440736
Binary files /dev/null and b/pokedex/data/media/icons/141.png differ
diff --git a/pokedex/data/media/icons/142.png b/pokedex/data/media/icons/142.png
new file mode 100644
index 0000000..6fa2f4d
Binary files /dev/null and b/pokedex/data/media/icons/142.png differ
diff --git a/pokedex/data/media/icons/143.png b/pokedex/data/media/icons/143.png
new file mode 100644
index 0000000..cf49bad
Binary files /dev/null and b/pokedex/data/media/icons/143.png differ
diff --git a/pokedex/data/media/icons/144.png b/pokedex/data/media/icons/144.png
new file mode 100644
index 0000000..890b3fb
Binary files /dev/null and b/pokedex/data/media/icons/144.png differ
diff --git a/pokedex/data/media/icons/145.png b/pokedex/data/media/icons/145.png
new file mode 100644
index 0000000..86ef68a
Binary files /dev/null and b/pokedex/data/media/icons/145.png differ
diff --git a/pokedex/data/media/icons/146.png b/pokedex/data/media/icons/146.png
new file mode 100644
index 0000000..c9a8920
Binary files /dev/null and b/pokedex/data/media/icons/146.png differ
diff --git a/pokedex/data/media/icons/147.png b/pokedex/data/media/icons/147.png
new file mode 100644
index 0000000..95c028f
Binary files /dev/null and b/pokedex/data/media/icons/147.png differ
diff --git a/pokedex/data/media/icons/148.png b/pokedex/data/media/icons/148.png
new file mode 100644
index 0000000..0750aa9
Binary files /dev/null and b/pokedex/data/media/icons/148.png differ
diff --git a/pokedex/data/media/icons/149.png b/pokedex/data/media/icons/149.png
new file mode 100644
index 0000000..7e194b8
Binary files /dev/null and b/pokedex/data/media/icons/149.png differ
diff --git a/pokedex/data/media/icons/15.png b/pokedex/data/media/icons/15.png
new file mode 100644
index 0000000..a74bb92
Binary files /dev/null and b/pokedex/data/media/icons/15.png differ
diff --git a/pokedex/data/media/icons/150.png b/pokedex/data/media/icons/150.png
new file mode 100644
index 0000000..3f488fd
Binary files /dev/null and b/pokedex/data/media/icons/150.png differ
diff --git a/pokedex/data/media/icons/151.png b/pokedex/data/media/icons/151.png
new file mode 100644
index 0000000..a9d31af
Binary files /dev/null and b/pokedex/data/media/icons/151.png differ
diff --git a/pokedex/data/media/icons/152.png b/pokedex/data/media/icons/152.png
new file mode 100644
index 0000000..e8bc7ea
Binary files /dev/null and b/pokedex/data/media/icons/152.png differ
diff --git a/pokedex/data/media/icons/153.png b/pokedex/data/media/icons/153.png
new file mode 100644
index 0000000..d1dd6c3
Binary files /dev/null and b/pokedex/data/media/icons/153.png differ
diff --git a/pokedex/data/media/icons/154.png b/pokedex/data/media/icons/154.png
new file mode 100644
index 0000000..bb2e8f1
Binary files /dev/null and b/pokedex/data/media/icons/154.png differ
diff --git a/pokedex/data/media/icons/155.png b/pokedex/data/media/icons/155.png
new file mode 100644
index 0000000..624c398
Binary files /dev/null and b/pokedex/data/media/icons/155.png differ
diff --git a/pokedex/data/media/icons/156.png b/pokedex/data/media/icons/156.png
new file mode 100644
index 0000000..2453807
Binary files /dev/null and b/pokedex/data/media/icons/156.png differ
diff --git a/pokedex/data/media/icons/157.png b/pokedex/data/media/icons/157.png
new file mode 100644
index 0000000..a35013f
Binary files /dev/null and b/pokedex/data/media/icons/157.png differ
diff --git a/pokedex/data/media/icons/158.png b/pokedex/data/media/icons/158.png
new file mode 100644
index 0000000..c83fe3f
Binary files /dev/null and b/pokedex/data/media/icons/158.png differ
diff --git a/pokedex/data/media/icons/159.png b/pokedex/data/media/icons/159.png
new file mode 100644
index 0000000..0d9ab73
Binary files /dev/null and b/pokedex/data/media/icons/159.png differ
diff --git a/pokedex/data/media/icons/16.png b/pokedex/data/media/icons/16.png
new file mode 100644
index 0000000..6c1e7a5
Binary files /dev/null and b/pokedex/data/media/icons/16.png differ
diff --git a/pokedex/data/media/icons/160.png b/pokedex/data/media/icons/160.png
new file mode 100644
index 0000000..426ed1e
Binary files /dev/null and b/pokedex/data/media/icons/160.png differ
diff --git a/pokedex/data/media/icons/161.png b/pokedex/data/media/icons/161.png
new file mode 100644
index 0000000..a3ece54
Binary files /dev/null and b/pokedex/data/media/icons/161.png differ
diff --git a/pokedex/data/media/icons/162.png b/pokedex/data/media/icons/162.png
new file mode 100644
index 0000000..38c51eb
Binary files /dev/null and b/pokedex/data/media/icons/162.png differ
diff --git a/pokedex/data/media/icons/163.png b/pokedex/data/media/icons/163.png
new file mode 100644
index 0000000..7ae4341
Binary files /dev/null and b/pokedex/data/media/icons/163.png differ
diff --git a/pokedex/data/media/icons/164.png b/pokedex/data/media/icons/164.png
new file mode 100644
index 0000000..390d417
Binary files /dev/null and b/pokedex/data/media/icons/164.png differ
diff --git a/pokedex/data/media/icons/165.png b/pokedex/data/media/icons/165.png
new file mode 100644
index 0000000..be73dc5
Binary files /dev/null and b/pokedex/data/media/icons/165.png differ
diff --git a/pokedex/data/media/icons/166.png b/pokedex/data/media/icons/166.png
new file mode 100644
index 0000000..f418523
Binary files /dev/null and b/pokedex/data/media/icons/166.png differ
diff --git a/pokedex/data/media/icons/167.png b/pokedex/data/media/icons/167.png
new file mode 100644
index 0000000..16e673b
Binary files /dev/null and b/pokedex/data/media/icons/167.png differ
diff --git a/pokedex/data/media/icons/168.png b/pokedex/data/media/icons/168.png
new file mode 100644
index 0000000..bdce7bd
Binary files /dev/null and b/pokedex/data/media/icons/168.png differ
diff --git a/pokedex/data/media/icons/169.png b/pokedex/data/media/icons/169.png
new file mode 100644
index 0000000..8b914bd
Binary files /dev/null and b/pokedex/data/media/icons/169.png differ
diff --git a/pokedex/data/media/icons/17.png b/pokedex/data/media/icons/17.png
new file mode 100644
index 0000000..fd19b89
Binary files /dev/null and b/pokedex/data/media/icons/17.png differ
diff --git a/pokedex/data/media/icons/170.png b/pokedex/data/media/icons/170.png
new file mode 100644
index 0000000..c4b40e0
Binary files /dev/null and b/pokedex/data/media/icons/170.png differ
diff --git a/pokedex/data/media/icons/171.png b/pokedex/data/media/icons/171.png
new file mode 100644
index 0000000..b1d2846
Binary files /dev/null and b/pokedex/data/media/icons/171.png differ
diff --git a/pokedex/data/media/icons/172.png b/pokedex/data/media/icons/172.png
new file mode 100644
index 0000000..afc803b
Binary files /dev/null and b/pokedex/data/media/icons/172.png differ
diff --git a/pokedex/data/media/icons/173.png b/pokedex/data/media/icons/173.png
new file mode 100644
index 0000000..417dd19
Binary files /dev/null and b/pokedex/data/media/icons/173.png differ
diff --git a/pokedex/data/media/icons/174.png b/pokedex/data/media/icons/174.png
new file mode 100644
index 0000000..7b54f82
Binary files /dev/null and b/pokedex/data/media/icons/174.png differ
diff --git a/pokedex/data/media/icons/175.png b/pokedex/data/media/icons/175.png
new file mode 100644
index 0000000..16063a2
Binary files /dev/null and b/pokedex/data/media/icons/175.png differ
diff --git a/pokedex/data/media/icons/176.png b/pokedex/data/media/icons/176.png
new file mode 100644
index 0000000..f527dc7
Binary files /dev/null and b/pokedex/data/media/icons/176.png differ
diff --git a/pokedex/data/media/icons/177.png b/pokedex/data/media/icons/177.png
new file mode 100644
index 0000000..aa46b25
Binary files /dev/null and b/pokedex/data/media/icons/177.png differ
diff --git a/pokedex/data/media/icons/178.png b/pokedex/data/media/icons/178.png
new file mode 100644
index 0000000..4853dac
Binary files /dev/null and b/pokedex/data/media/icons/178.png differ
diff --git a/pokedex/data/media/icons/179.png b/pokedex/data/media/icons/179.png
new file mode 100644
index 0000000..67f1c61
Binary files /dev/null and b/pokedex/data/media/icons/179.png differ
diff --git a/pokedex/data/media/icons/18.png b/pokedex/data/media/icons/18.png
new file mode 100644
index 0000000..2fd5507
Binary files /dev/null and b/pokedex/data/media/icons/18.png differ
diff --git a/pokedex/data/media/icons/180.png b/pokedex/data/media/icons/180.png
new file mode 100644
index 0000000..e736ee0
Binary files /dev/null and b/pokedex/data/media/icons/180.png differ
diff --git a/pokedex/data/media/icons/181.png b/pokedex/data/media/icons/181.png
new file mode 100644
index 0000000..661e285
Binary files /dev/null and b/pokedex/data/media/icons/181.png differ
diff --git a/pokedex/data/media/icons/182.png b/pokedex/data/media/icons/182.png
new file mode 100644
index 0000000..0c6ce3d
Binary files /dev/null and b/pokedex/data/media/icons/182.png differ
diff --git a/pokedex/data/media/icons/183.png b/pokedex/data/media/icons/183.png
new file mode 100644
index 0000000..309c501
Binary files /dev/null and b/pokedex/data/media/icons/183.png differ
diff --git a/pokedex/data/media/icons/184.png b/pokedex/data/media/icons/184.png
new file mode 100644
index 0000000..0d82dd6
Binary files /dev/null and b/pokedex/data/media/icons/184.png differ
diff --git a/pokedex/data/media/icons/185.png b/pokedex/data/media/icons/185.png
new file mode 100644
index 0000000..8924960
Binary files /dev/null and b/pokedex/data/media/icons/185.png differ
diff --git a/pokedex/data/media/icons/186.png b/pokedex/data/media/icons/186.png
new file mode 100644
index 0000000..05a23a7
Binary files /dev/null and b/pokedex/data/media/icons/186.png differ
diff --git a/pokedex/data/media/icons/187.png b/pokedex/data/media/icons/187.png
new file mode 100644
index 0000000..135f56a
Binary files /dev/null and b/pokedex/data/media/icons/187.png differ
diff --git a/pokedex/data/media/icons/188.png b/pokedex/data/media/icons/188.png
new file mode 100644
index 0000000..260c7fc
Binary files /dev/null and b/pokedex/data/media/icons/188.png differ
diff --git a/pokedex/data/media/icons/189.png b/pokedex/data/media/icons/189.png
new file mode 100644
index 0000000..49b97e7
Binary files /dev/null and b/pokedex/data/media/icons/189.png differ
diff --git a/pokedex/data/media/icons/19.png b/pokedex/data/media/icons/19.png
new file mode 100644
index 0000000..ddd0c8f
Binary files /dev/null and b/pokedex/data/media/icons/19.png differ
diff --git a/pokedex/data/media/icons/190.png b/pokedex/data/media/icons/190.png
new file mode 100644
index 0000000..cc9b1f7
Binary files /dev/null and b/pokedex/data/media/icons/190.png differ
diff --git a/pokedex/data/media/icons/191.png b/pokedex/data/media/icons/191.png
new file mode 100644
index 0000000..ee7aa92
Binary files /dev/null and b/pokedex/data/media/icons/191.png differ
diff --git a/pokedex/data/media/icons/192.png b/pokedex/data/media/icons/192.png
new file mode 100644
index 0000000..2f7165f
Binary files /dev/null and b/pokedex/data/media/icons/192.png differ
diff --git a/pokedex/data/media/icons/193.png b/pokedex/data/media/icons/193.png
new file mode 100644
index 0000000..d88c027
Binary files /dev/null and b/pokedex/data/media/icons/193.png differ
diff --git a/pokedex/data/media/icons/194.png b/pokedex/data/media/icons/194.png
new file mode 100644
index 0000000..39ad57e
Binary files /dev/null and b/pokedex/data/media/icons/194.png differ
diff --git a/pokedex/data/media/icons/195.png b/pokedex/data/media/icons/195.png
new file mode 100644
index 0000000..1429378
Binary files /dev/null and b/pokedex/data/media/icons/195.png differ
diff --git a/pokedex/data/media/icons/196.png b/pokedex/data/media/icons/196.png
new file mode 100644
index 0000000..25baa5d
Binary files /dev/null and b/pokedex/data/media/icons/196.png differ
diff --git a/pokedex/data/media/icons/197.png b/pokedex/data/media/icons/197.png
new file mode 100644
index 0000000..07d66fa
Binary files /dev/null and b/pokedex/data/media/icons/197.png differ
diff --git a/pokedex/data/media/icons/198.png b/pokedex/data/media/icons/198.png
new file mode 100644
index 0000000..a4f6a06
Binary files /dev/null and b/pokedex/data/media/icons/198.png differ
diff --git a/pokedex/data/media/icons/199.png b/pokedex/data/media/icons/199.png
new file mode 100644
index 0000000..b768ec7
Binary files /dev/null and b/pokedex/data/media/icons/199.png differ
diff --git a/pokedex/data/media/icons/2.png b/pokedex/data/media/icons/2.png
new file mode 100644
index 0000000..8e9c955
Binary files /dev/null and b/pokedex/data/media/icons/2.png differ
diff --git a/pokedex/data/media/icons/20.png b/pokedex/data/media/icons/20.png
new file mode 100644
index 0000000..c093efb
Binary files /dev/null and b/pokedex/data/media/icons/20.png differ
diff --git a/pokedex/data/media/icons/200.png b/pokedex/data/media/icons/200.png
new file mode 100644
index 0000000..1df7e89
Binary files /dev/null and b/pokedex/data/media/icons/200.png differ
diff --git a/pokedex/data/media/icons/201-a.png b/pokedex/data/media/icons/201-a.png
new file mode 100644
index 0000000..8ba453e
Binary files /dev/null and b/pokedex/data/media/icons/201-a.png differ
diff --git a/pokedex/data/media/icons/201-b.png b/pokedex/data/media/icons/201-b.png
new file mode 100644
index 0000000..2490845
Binary files /dev/null and b/pokedex/data/media/icons/201-b.png differ
diff --git a/pokedex/data/media/icons/201-c.png b/pokedex/data/media/icons/201-c.png
new file mode 100644
index 0000000..c7dd823
Binary files /dev/null and b/pokedex/data/media/icons/201-c.png differ
diff --git a/pokedex/data/media/icons/201-d.png b/pokedex/data/media/icons/201-d.png
new file mode 100644
index 0000000..15a4d8b
Binary files /dev/null and b/pokedex/data/media/icons/201-d.png differ
diff --git a/pokedex/data/media/icons/201-e.png b/pokedex/data/media/icons/201-e.png
new file mode 100644
index 0000000..8cb78b3
Binary files /dev/null and b/pokedex/data/media/icons/201-e.png differ
diff --git a/pokedex/data/media/icons/201-ep.png b/pokedex/data/media/icons/201-ep.png
new file mode 100644
index 0000000..13004ac
Binary files /dev/null and b/pokedex/data/media/icons/201-ep.png differ
diff --git a/pokedex/data/media/icons/201-f.png b/pokedex/data/media/icons/201-f.png
new file mode 100644
index 0000000..0f1f277
Binary files /dev/null and b/pokedex/data/media/icons/201-f.png differ
diff --git a/pokedex/data/media/icons/201-g.png b/pokedex/data/media/icons/201-g.png
new file mode 100644
index 0000000..f33df11
Binary files /dev/null and b/pokedex/data/media/icons/201-g.png differ
diff --git a/pokedex/data/media/icons/201-h.png b/pokedex/data/media/icons/201-h.png
new file mode 100644
index 0000000..633c24d
Binary files /dev/null and b/pokedex/data/media/icons/201-h.png differ
diff --git a/pokedex/data/media/icons/201-i.png b/pokedex/data/media/icons/201-i.png
new file mode 100644
index 0000000..df96ad1
Binary files /dev/null and b/pokedex/data/media/icons/201-i.png differ
diff --git a/pokedex/data/media/icons/201-j.png b/pokedex/data/media/icons/201-j.png
new file mode 100644
index 0000000..e5fc6dd
Binary files /dev/null and b/pokedex/data/media/icons/201-j.png differ
diff --git a/pokedex/data/media/icons/201-k.png b/pokedex/data/media/icons/201-k.png
new file mode 100644
index 0000000..7fda1a2
Binary files /dev/null and b/pokedex/data/media/icons/201-k.png differ
diff --git a/pokedex/data/media/icons/201-l.png b/pokedex/data/media/icons/201-l.png
new file mode 100644
index 0000000..06f5b6c
Binary files /dev/null and b/pokedex/data/media/icons/201-l.png differ
diff --git a/pokedex/data/media/icons/201-m.png b/pokedex/data/media/icons/201-m.png
new file mode 100644
index 0000000..9a9d4d1
Binary files /dev/null and b/pokedex/data/media/icons/201-m.png differ
diff --git a/pokedex/data/media/icons/201-n.png b/pokedex/data/media/icons/201-n.png
new file mode 100644
index 0000000..c27716f
Binary files /dev/null and b/pokedex/data/media/icons/201-n.png differ
diff --git a/pokedex/data/media/icons/201-o.png b/pokedex/data/media/icons/201-o.png
new file mode 100644
index 0000000..0660556
Binary files /dev/null and b/pokedex/data/media/icons/201-o.png differ
diff --git a/pokedex/data/media/icons/201-p.png b/pokedex/data/media/icons/201-p.png
new file mode 100644
index 0000000..e37fd86
Binary files /dev/null and b/pokedex/data/media/icons/201-p.png differ
diff --git a/pokedex/data/media/icons/201-q.png b/pokedex/data/media/icons/201-q.png
new file mode 100644
index 0000000..a68512e
Binary files /dev/null and b/pokedex/data/media/icons/201-q.png differ
diff --git a/pokedex/data/media/icons/201-qm.png b/pokedex/data/media/icons/201-qm.png
new file mode 100644
index 0000000..6f04649
Binary files /dev/null and b/pokedex/data/media/icons/201-qm.png differ
diff --git a/pokedex/data/media/icons/201-r.png b/pokedex/data/media/icons/201-r.png
new file mode 100644
index 0000000..a162495
Binary files /dev/null and b/pokedex/data/media/icons/201-r.png differ
diff --git a/pokedex/data/media/icons/201-s.png b/pokedex/data/media/icons/201-s.png
new file mode 100644
index 0000000..004046a
Binary files /dev/null and b/pokedex/data/media/icons/201-s.png differ
diff --git a/pokedex/data/media/icons/201-t.png b/pokedex/data/media/icons/201-t.png
new file mode 100644
index 0000000..a199dc0
Binary files /dev/null and b/pokedex/data/media/icons/201-t.png differ
diff --git a/pokedex/data/media/icons/201-u.png b/pokedex/data/media/icons/201-u.png
new file mode 100644
index 0000000..1895cc5
Binary files /dev/null and b/pokedex/data/media/icons/201-u.png differ
diff --git a/pokedex/data/media/icons/201-v.png b/pokedex/data/media/icons/201-v.png
new file mode 100644
index 0000000..4a74643
Binary files /dev/null and b/pokedex/data/media/icons/201-v.png differ
diff --git a/pokedex/data/media/icons/201-w.png b/pokedex/data/media/icons/201-w.png
new file mode 100644
index 0000000..b843f23
Binary files /dev/null and b/pokedex/data/media/icons/201-w.png differ
diff --git a/pokedex/data/media/icons/201-x.png b/pokedex/data/media/icons/201-x.png
new file mode 100644
index 0000000..0304a63
Binary files /dev/null and b/pokedex/data/media/icons/201-x.png differ
diff --git a/pokedex/data/media/icons/201-y.png b/pokedex/data/media/icons/201-y.png
new file mode 100644
index 0000000..9e4a8fd
Binary files /dev/null and b/pokedex/data/media/icons/201-y.png differ
diff --git a/pokedex/data/media/icons/201-z.png b/pokedex/data/media/icons/201-z.png
new file mode 100644
index 0000000..7a1a1b4
Binary files /dev/null and b/pokedex/data/media/icons/201-z.png differ
diff --git a/pokedex/data/media/icons/201.png b/pokedex/data/media/icons/201.png
new file mode 100644
index 0000000..8ba453e
Binary files /dev/null and b/pokedex/data/media/icons/201.png differ
diff --git a/pokedex/data/media/icons/202.png b/pokedex/data/media/icons/202.png
new file mode 100644
index 0000000..d2d42ac
Binary files /dev/null and b/pokedex/data/media/icons/202.png differ
diff --git a/pokedex/data/media/icons/203.png b/pokedex/data/media/icons/203.png
new file mode 100644
index 0000000..373f247
Binary files /dev/null and b/pokedex/data/media/icons/203.png differ
diff --git a/pokedex/data/media/icons/204.png b/pokedex/data/media/icons/204.png
new file mode 100644
index 0000000..a73ed5e
Binary files /dev/null and b/pokedex/data/media/icons/204.png differ
diff --git a/pokedex/data/media/icons/205.png b/pokedex/data/media/icons/205.png
new file mode 100644
index 0000000..2742273
Binary files /dev/null and b/pokedex/data/media/icons/205.png differ
diff --git a/pokedex/data/media/icons/206.png b/pokedex/data/media/icons/206.png
new file mode 100644
index 0000000..444965c
Binary files /dev/null and b/pokedex/data/media/icons/206.png differ
diff --git a/pokedex/data/media/icons/207.png b/pokedex/data/media/icons/207.png
new file mode 100644
index 0000000..9004d91
Binary files /dev/null and b/pokedex/data/media/icons/207.png differ
diff --git a/pokedex/data/media/icons/208.png b/pokedex/data/media/icons/208.png
new file mode 100644
index 0000000..e2ca3b6
Binary files /dev/null and b/pokedex/data/media/icons/208.png differ
diff --git a/pokedex/data/media/icons/209.png b/pokedex/data/media/icons/209.png
new file mode 100644
index 0000000..1ce80f3
Binary files /dev/null and b/pokedex/data/media/icons/209.png differ
diff --git a/pokedex/data/media/icons/21.png b/pokedex/data/media/icons/21.png
new file mode 100644
index 0000000..c68539c
Binary files /dev/null and b/pokedex/data/media/icons/21.png differ
diff --git a/pokedex/data/media/icons/210.png b/pokedex/data/media/icons/210.png
new file mode 100644
index 0000000..78762e3
Binary files /dev/null and b/pokedex/data/media/icons/210.png differ
diff --git a/pokedex/data/media/icons/211.png b/pokedex/data/media/icons/211.png
new file mode 100644
index 0000000..3222235
Binary files /dev/null and b/pokedex/data/media/icons/211.png differ
diff --git a/pokedex/data/media/icons/212.png b/pokedex/data/media/icons/212.png
new file mode 100644
index 0000000..ed33830
Binary files /dev/null and b/pokedex/data/media/icons/212.png differ
diff --git a/pokedex/data/media/icons/213.png b/pokedex/data/media/icons/213.png
new file mode 100644
index 0000000..040836e
Binary files /dev/null and b/pokedex/data/media/icons/213.png differ
diff --git a/pokedex/data/media/icons/214.png b/pokedex/data/media/icons/214.png
new file mode 100644
index 0000000..751043d
Binary files /dev/null and b/pokedex/data/media/icons/214.png differ
diff --git a/pokedex/data/media/icons/215.png b/pokedex/data/media/icons/215.png
new file mode 100644
index 0000000..5135cc4
Binary files /dev/null and b/pokedex/data/media/icons/215.png differ
diff --git a/pokedex/data/media/icons/216.png b/pokedex/data/media/icons/216.png
new file mode 100644
index 0000000..ba82b14
Binary files /dev/null and b/pokedex/data/media/icons/216.png differ
diff --git a/pokedex/data/media/icons/217.png b/pokedex/data/media/icons/217.png
new file mode 100644
index 0000000..4ae8f82
Binary files /dev/null and b/pokedex/data/media/icons/217.png differ
diff --git a/pokedex/data/media/icons/218.png b/pokedex/data/media/icons/218.png
new file mode 100644
index 0000000..f654730
Binary files /dev/null and b/pokedex/data/media/icons/218.png differ
diff --git a/pokedex/data/media/icons/219.png b/pokedex/data/media/icons/219.png
new file mode 100644
index 0000000..c9b53f3
Binary files /dev/null and b/pokedex/data/media/icons/219.png differ
diff --git a/pokedex/data/media/icons/22.png b/pokedex/data/media/icons/22.png
new file mode 100644
index 0000000..d1c63b2
Binary files /dev/null and b/pokedex/data/media/icons/22.png differ
diff --git a/pokedex/data/media/icons/220.png b/pokedex/data/media/icons/220.png
new file mode 100644
index 0000000..8abbb5a
Binary files /dev/null and b/pokedex/data/media/icons/220.png differ
diff --git a/pokedex/data/media/icons/221.png b/pokedex/data/media/icons/221.png
new file mode 100644
index 0000000..87d6746
Binary files /dev/null and b/pokedex/data/media/icons/221.png differ
diff --git a/pokedex/data/media/icons/222.png b/pokedex/data/media/icons/222.png
new file mode 100644
index 0000000..e249c68
Binary files /dev/null and b/pokedex/data/media/icons/222.png differ
diff --git a/pokedex/data/media/icons/223.png b/pokedex/data/media/icons/223.png
new file mode 100644
index 0000000..74fc3ab
Binary files /dev/null and b/pokedex/data/media/icons/223.png differ
diff --git a/pokedex/data/media/icons/224.png b/pokedex/data/media/icons/224.png
new file mode 100644
index 0000000..22f85d7
Binary files /dev/null and b/pokedex/data/media/icons/224.png differ
diff --git a/pokedex/data/media/icons/225.png b/pokedex/data/media/icons/225.png
new file mode 100644
index 0000000..ec87b62
Binary files /dev/null and b/pokedex/data/media/icons/225.png differ
diff --git a/pokedex/data/media/icons/226.png b/pokedex/data/media/icons/226.png
new file mode 100644
index 0000000..c426c43
Binary files /dev/null and b/pokedex/data/media/icons/226.png differ
diff --git a/pokedex/data/media/icons/227.png b/pokedex/data/media/icons/227.png
new file mode 100644
index 0000000..9e6beca
Binary files /dev/null and b/pokedex/data/media/icons/227.png differ
diff --git a/pokedex/data/media/icons/228.png b/pokedex/data/media/icons/228.png
new file mode 100644
index 0000000..769ef3a
Binary files /dev/null and b/pokedex/data/media/icons/228.png differ
diff --git a/pokedex/data/media/icons/229.png b/pokedex/data/media/icons/229.png
new file mode 100644
index 0000000..a3d75d0
Binary files /dev/null and b/pokedex/data/media/icons/229.png differ
diff --git a/pokedex/data/media/icons/23.png b/pokedex/data/media/icons/23.png
new file mode 100644
index 0000000..e545794
Binary files /dev/null and b/pokedex/data/media/icons/23.png differ
diff --git a/pokedex/data/media/icons/230.png b/pokedex/data/media/icons/230.png
new file mode 100644
index 0000000..a0858cf
Binary files /dev/null and b/pokedex/data/media/icons/230.png differ
diff --git a/pokedex/data/media/icons/231.png b/pokedex/data/media/icons/231.png
new file mode 100644
index 0000000..f10aa0d
Binary files /dev/null and b/pokedex/data/media/icons/231.png differ
diff --git a/pokedex/data/media/icons/232.png b/pokedex/data/media/icons/232.png
new file mode 100644
index 0000000..abd13e7
Binary files /dev/null and b/pokedex/data/media/icons/232.png differ
diff --git a/pokedex/data/media/icons/233.png b/pokedex/data/media/icons/233.png
new file mode 100644
index 0000000..9359bcf
Binary files /dev/null and b/pokedex/data/media/icons/233.png differ
diff --git a/pokedex/data/media/icons/234.png b/pokedex/data/media/icons/234.png
new file mode 100644
index 0000000..c1fa1bf
Binary files /dev/null and b/pokedex/data/media/icons/234.png differ
diff --git a/pokedex/data/media/icons/235.png b/pokedex/data/media/icons/235.png
new file mode 100644
index 0000000..2da6273
Binary files /dev/null and b/pokedex/data/media/icons/235.png differ
diff --git a/pokedex/data/media/icons/236.png b/pokedex/data/media/icons/236.png
new file mode 100644
index 0000000..271c0c5
Binary files /dev/null and b/pokedex/data/media/icons/236.png differ
diff --git a/pokedex/data/media/icons/237.png b/pokedex/data/media/icons/237.png
new file mode 100644
index 0000000..0a2bab5
Binary files /dev/null and b/pokedex/data/media/icons/237.png differ
diff --git a/pokedex/data/media/icons/238.png b/pokedex/data/media/icons/238.png
new file mode 100644
index 0000000..6a65154
Binary files /dev/null and b/pokedex/data/media/icons/238.png differ
diff --git a/pokedex/data/media/icons/239.png b/pokedex/data/media/icons/239.png
new file mode 100644
index 0000000..e43f38f
Binary files /dev/null and b/pokedex/data/media/icons/239.png differ
diff --git a/pokedex/data/media/icons/24.png b/pokedex/data/media/icons/24.png
new file mode 100644
index 0000000..c00100b
Binary files /dev/null and b/pokedex/data/media/icons/24.png differ
diff --git a/pokedex/data/media/icons/240.png b/pokedex/data/media/icons/240.png
new file mode 100644
index 0000000..98e80cb
Binary files /dev/null and b/pokedex/data/media/icons/240.png differ
diff --git a/pokedex/data/media/icons/241.png b/pokedex/data/media/icons/241.png
new file mode 100644
index 0000000..07953f4
Binary files /dev/null and b/pokedex/data/media/icons/241.png differ
diff --git a/pokedex/data/media/icons/242.png b/pokedex/data/media/icons/242.png
new file mode 100644
index 0000000..3bb05ad
Binary files /dev/null and b/pokedex/data/media/icons/242.png differ
diff --git a/pokedex/data/media/icons/243.png b/pokedex/data/media/icons/243.png
new file mode 100644
index 0000000..29a00d2
Binary files /dev/null and b/pokedex/data/media/icons/243.png differ
diff --git a/pokedex/data/media/icons/244.png b/pokedex/data/media/icons/244.png
new file mode 100644
index 0000000..d618070
Binary files /dev/null and b/pokedex/data/media/icons/244.png differ
diff --git a/pokedex/data/media/icons/245.png b/pokedex/data/media/icons/245.png
new file mode 100644
index 0000000..510c37e
Binary files /dev/null and b/pokedex/data/media/icons/245.png differ
diff --git a/pokedex/data/media/icons/246.png b/pokedex/data/media/icons/246.png
new file mode 100644
index 0000000..84d994c
Binary files /dev/null and b/pokedex/data/media/icons/246.png differ
diff --git a/pokedex/data/media/icons/247.png b/pokedex/data/media/icons/247.png
new file mode 100644
index 0000000..5f36fa7
Binary files /dev/null and b/pokedex/data/media/icons/247.png differ
diff --git a/pokedex/data/media/icons/248.png b/pokedex/data/media/icons/248.png
new file mode 100644
index 0000000..e9d1040
Binary files /dev/null and b/pokedex/data/media/icons/248.png differ
diff --git a/pokedex/data/media/icons/249.png b/pokedex/data/media/icons/249.png
new file mode 100644
index 0000000..7319875
Binary files /dev/null and b/pokedex/data/media/icons/249.png differ
diff --git a/pokedex/data/media/icons/25.png b/pokedex/data/media/icons/25.png
new file mode 100644
index 0000000..4fa3320
Binary files /dev/null and b/pokedex/data/media/icons/25.png differ
diff --git a/pokedex/data/media/icons/250.png b/pokedex/data/media/icons/250.png
new file mode 100644
index 0000000..3e1634a
Binary files /dev/null and b/pokedex/data/media/icons/250.png differ
diff --git a/pokedex/data/media/icons/251.png b/pokedex/data/media/icons/251.png
new file mode 100644
index 0000000..89c2f82
Binary files /dev/null and b/pokedex/data/media/icons/251.png differ
diff --git a/pokedex/data/media/icons/252.png b/pokedex/data/media/icons/252.png
new file mode 100644
index 0000000..517458d
Binary files /dev/null and b/pokedex/data/media/icons/252.png differ
diff --git a/pokedex/data/media/icons/253.png b/pokedex/data/media/icons/253.png
new file mode 100644
index 0000000..41f729d
Binary files /dev/null and b/pokedex/data/media/icons/253.png differ
diff --git a/pokedex/data/media/icons/254.png b/pokedex/data/media/icons/254.png
new file mode 100644
index 0000000..0202ab9
Binary files /dev/null and b/pokedex/data/media/icons/254.png differ
diff --git a/pokedex/data/media/icons/255.png b/pokedex/data/media/icons/255.png
new file mode 100644
index 0000000..ae4c1cb
Binary files /dev/null and b/pokedex/data/media/icons/255.png differ
diff --git a/pokedex/data/media/icons/256.png b/pokedex/data/media/icons/256.png
new file mode 100644
index 0000000..5f4777e
Binary files /dev/null and b/pokedex/data/media/icons/256.png differ
diff --git a/pokedex/data/media/icons/257.png b/pokedex/data/media/icons/257.png
new file mode 100644
index 0000000..189f95e
Binary files /dev/null and b/pokedex/data/media/icons/257.png differ
diff --git a/pokedex/data/media/icons/258.png b/pokedex/data/media/icons/258.png
new file mode 100644
index 0000000..d2d3ad9
Binary files /dev/null and b/pokedex/data/media/icons/258.png differ
diff --git a/pokedex/data/media/icons/259.png b/pokedex/data/media/icons/259.png
new file mode 100644
index 0000000..f9528f8
Binary files /dev/null and b/pokedex/data/media/icons/259.png differ
diff --git a/pokedex/data/media/icons/26.png b/pokedex/data/media/icons/26.png
new file mode 100644
index 0000000..9ee0f78
Binary files /dev/null and b/pokedex/data/media/icons/26.png differ
diff --git a/pokedex/data/media/icons/260.png b/pokedex/data/media/icons/260.png
new file mode 100644
index 0000000..d61521d
Binary files /dev/null and b/pokedex/data/media/icons/260.png differ
diff --git a/pokedex/data/media/icons/261.png b/pokedex/data/media/icons/261.png
new file mode 100644
index 0000000..7d644c7
Binary files /dev/null and b/pokedex/data/media/icons/261.png differ
diff --git a/pokedex/data/media/icons/262.png b/pokedex/data/media/icons/262.png
new file mode 100644
index 0000000..a2156d4
Binary files /dev/null and b/pokedex/data/media/icons/262.png differ
diff --git a/pokedex/data/media/icons/263.png b/pokedex/data/media/icons/263.png
new file mode 100644
index 0000000..031c369
Binary files /dev/null and b/pokedex/data/media/icons/263.png differ
diff --git a/pokedex/data/media/icons/264.png b/pokedex/data/media/icons/264.png
new file mode 100644
index 0000000..602c46f
Binary files /dev/null and b/pokedex/data/media/icons/264.png differ
diff --git a/pokedex/data/media/icons/265.png b/pokedex/data/media/icons/265.png
new file mode 100644
index 0000000..b7ae116
Binary files /dev/null and b/pokedex/data/media/icons/265.png differ
diff --git a/pokedex/data/media/icons/266.png b/pokedex/data/media/icons/266.png
new file mode 100644
index 0000000..7920e62
Binary files /dev/null and b/pokedex/data/media/icons/266.png differ
diff --git a/pokedex/data/media/icons/267.png b/pokedex/data/media/icons/267.png
new file mode 100644
index 0000000..4583e77
Binary files /dev/null and b/pokedex/data/media/icons/267.png differ
diff --git a/pokedex/data/media/icons/268.png b/pokedex/data/media/icons/268.png
new file mode 100644
index 0000000..aff5549
Binary files /dev/null and b/pokedex/data/media/icons/268.png differ
diff --git a/pokedex/data/media/icons/269.png b/pokedex/data/media/icons/269.png
new file mode 100644
index 0000000..01cb31f
Binary files /dev/null and b/pokedex/data/media/icons/269.png differ
diff --git a/pokedex/data/media/icons/27.png b/pokedex/data/media/icons/27.png
new file mode 100644
index 0000000..c87f462
Binary files /dev/null and b/pokedex/data/media/icons/27.png differ
diff --git a/pokedex/data/media/icons/270.png b/pokedex/data/media/icons/270.png
new file mode 100644
index 0000000..a567c8a
Binary files /dev/null and b/pokedex/data/media/icons/270.png differ
diff --git a/pokedex/data/media/icons/271.png b/pokedex/data/media/icons/271.png
new file mode 100644
index 0000000..72626de
Binary files /dev/null and b/pokedex/data/media/icons/271.png differ
diff --git a/pokedex/data/media/icons/272.png b/pokedex/data/media/icons/272.png
new file mode 100644
index 0000000..57baa7d
Binary files /dev/null and b/pokedex/data/media/icons/272.png differ
diff --git a/pokedex/data/media/icons/273.png b/pokedex/data/media/icons/273.png
new file mode 100644
index 0000000..ae82425
Binary files /dev/null and b/pokedex/data/media/icons/273.png differ
diff --git a/pokedex/data/media/icons/274.png b/pokedex/data/media/icons/274.png
new file mode 100644
index 0000000..bdbe8d7
Binary files /dev/null and b/pokedex/data/media/icons/274.png differ
diff --git a/pokedex/data/media/icons/275.png b/pokedex/data/media/icons/275.png
new file mode 100644
index 0000000..299787a
Binary files /dev/null and b/pokedex/data/media/icons/275.png differ
diff --git a/pokedex/data/media/icons/276.png b/pokedex/data/media/icons/276.png
new file mode 100644
index 0000000..46bb923
Binary files /dev/null and b/pokedex/data/media/icons/276.png differ
diff --git a/pokedex/data/media/icons/277.png b/pokedex/data/media/icons/277.png
new file mode 100644
index 0000000..f3ccf2b
Binary files /dev/null and b/pokedex/data/media/icons/277.png differ
diff --git a/pokedex/data/media/icons/278.png b/pokedex/data/media/icons/278.png
new file mode 100644
index 0000000..dcbd8bc
Binary files /dev/null and b/pokedex/data/media/icons/278.png differ
diff --git a/pokedex/data/media/icons/279.png b/pokedex/data/media/icons/279.png
new file mode 100644
index 0000000..4a46b3a
Binary files /dev/null and b/pokedex/data/media/icons/279.png differ
diff --git a/pokedex/data/media/icons/28.png b/pokedex/data/media/icons/28.png
new file mode 100644
index 0000000..5866c8d
Binary files /dev/null and b/pokedex/data/media/icons/28.png differ
diff --git a/pokedex/data/media/icons/280.png b/pokedex/data/media/icons/280.png
new file mode 100644
index 0000000..fbe4bcd
Binary files /dev/null and b/pokedex/data/media/icons/280.png differ
diff --git a/pokedex/data/media/icons/281.png b/pokedex/data/media/icons/281.png
new file mode 100644
index 0000000..5464342
Binary files /dev/null and b/pokedex/data/media/icons/281.png differ
diff --git a/pokedex/data/media/icons/282.png b/pokedex/data/media/icons/282.png
new file mode 100644
index 0000000..b5a7a0c
Binary files /dev/null and b/pokedex/data/media/icons/282.png differ
diff --git a/pokedex/data/media/icons/283.png b/pokedex/data/media/icons/283.png
new file mode 100644
index 0000000..0b4c3b1
Binary files /dev/null and b/pokedex/data/media/icons/283.png differ
diff --git a/pokedex/data/media/icons/284.png b/pokedex/data/media/icons/284.png
new file mode 100644
index 0000000..8eefaa7
Binary files /dev/null and b/pokedex/data/media/icons/284.png differ
diff --git a/pokedex/data/media/icons/285.png b/pokedex/data/media/icons/285.png
new file mode 100644
index 0000000..60f54b9
Binary files /dev/null and b/pokedex/data/media/icons/285.png differ
diff --git a/pokedex/data/media/icons/286.png b/pokedex/data/media/icons/286.png
new file mode 100644
index 0000000..32c2ef6
Binary files /dev/null and b/pokedex/data/media/icons/286.png differ
diff --git a/pokedex/data/media/icons/287.png b/pokedex/data/media/icons/287.png
new file mode 100644
index 0000000..ae36c22
Binary files /dev/null and b/pokedex/data/media/icons/287.png differ
diff --git a/pokedex/data/media/icons/288.png b/pokedex/data/media/icons/288.png
new file mode 100644
index 0000000..29e5f75
Binary files /dev/null and b/pokedex/data/media/icons/288.png differ
diff --git a/pokedex/data/media/icons/289.png b/pokedex/data/media/icons/289.png
new file mode 100644
index 0000000..3f94465
Binary files /dev/null and b/pokedex/data/media/icons/289.png differ
diff --git a/pokedex/data/media/icons/29.png b/pokedex/data/media/icons/29.png
new file mode 100644
index 0000000..5f20e36
Binary files /dev/null and b/pokedex/data/media/icons/29.png differ
diff --git a/pokedex/data/media/icons/290.png b/pokedex/data/media/icons/290.png
new file mode 100644
index 0000000..1ea6c60
Binary files /dev/null and b/pokedex/data/media/icons/290.png differ
diff --git a/pokedex/data/media/icons/291.png b/pokedex/data/media/icons/291.png
new file mode 100644
index 0000000..51a63ea
Binary files /dev/null and b/pokedex/data/media/icons/291.png differ
diff --git a/pokedex/data/media/icons/292.png b/pokedex/data/media/icons/292.png
new file mode 100644
index 0000000..596464a
Binary files /dev/null and b/pokedex/data/media/icons/292.png differ
diff --git a/pokedex/data/media/icons/293.png b/pokedex/data/media/icons/293.png
new file mode 100644
index 0000000..1320472
Binary files /dev/null and b/pokedex/data/media/icons/293.png differ
diff --git a/pokedex/data/media/icons/294.png b/pokedex/data/media/icons/294.png
new file mode 100644
index 0000000..9c394f3
Binary files /dev/null and b/pokedex/data/media/icons/294.png differ
diff --git a/pokedex/data/media/icons/295.png b/pokedex/data/media/icons/295.png
new file mode 100644
index 0000000..c2edf78
Binary files /dev/null and b/pokedex/data/media/icons/295.png differ
diff --git a/pokedex/data/media/icons/296.png b/pokedex/data/media/icons/296.png
new file mode 100644
index 0000000..aeca981
Binary files /dev/null and b/pokedex/data/media/icons/296.png differ
diff --git a/pokedex/data/media/icons/297.png b/pokedex/data/media/icons/297.png
new file mode 100644
index 0000000..d2f11d6
Binary files /dev/null and b/pokedex/data/media/icons/297.png differ
diff --git a/pokedex/data/media/icons/298.png b/pokedex/data/media/icons/298.png
new file mode 100644
index 0000000..6653c74
Binary files /dev/null and b/pokedex/data/media/icons/298.png differ
diff --git a/pokedex/data/media/icons/299.png b/pokedex/data/media/icons/299.png
new file mode 100644
index 0000000..009cc1a
Binary files /dev/null and b/pokedex/data/media/icons/299.png differ
diff --git a/pokedex/data/media/icons/3.png b/pokedex/data/media/icons/3.png
new file mode 100644
index 0000000..504f0d9
Binary files /dev/null and b/pokedex/data/media/icons/3.png differ
diff --git a/pokedex/data/media/icons/30.png b/pokedex/data/media/icons/30.png
new file mode 100644
index 0000000..e00b499
Binary files /dev/null and b/pokedex/data/media/icons/30.png differ
diff --git a/pokedex/data/media/icons/300.png b/pokedex/data/media/icons/300.png
new file mode 100644
index 0000000..8be0415
Binary files /dev/null and b/pokedex/data/media/icons/300.png differ
diff --git a/pokedex/data/media/icons/301.png b/pokedex/data/media/icons/301.png
new file mode 100644
index 0000000..8ce6ee1
Binary files /dev/null and b/pokedex/data/media/icons/301.png differ
diff --git a/pokedex/data/media/icons/302.png b/pokedex/data/media/icons/302.png
new file mode 100644
index 0000000..4d4e240
Binary files /dev/null and b/pokedex/data/media/icons/302.png differ
diff --git a/pokedex/data/media/icons/303.png b/pokedex/data/media/icons/303.png
new file mode 100644
index 0000000..15fe019
Binary files /dev/null and b/pokedex/data/media/icons/303.png differ
diff --git a/pokedex/data/media/icons/304.png b/pokedex/data/media/icons/304.png
new file mode 100644
index 0000000..42023b3
Binary files /dev/null and b/pokedex/data/media/icons/304.png differ
diff --git a/pokedex/data/media/icons/305.png b/pokedex/data/media/icons/305.png
new file mode 100644
index 0000000..ffbfb1a
Binary files /dev/null and b/pokedex/data/media/icons/305.png differ
diff --git a/pokedex/data/media/icons/306.png b/pokedex/data/media/icons/306.png
new file mode 100644
index 0000000..9b66182
Binary files /dev/null and b/pokedex/data/media/icons/306.png differ
diff --git a/pokedex/data/media/icons/307.png b/pokedex/data/media/icons/307.png
new file mode 100644
index 0000000..8b5d0e4
Binary files /dev/null and b/pokedex/data/media/icons/307.png differ
diff --git a/pokedex/data/media/icons/308.png b/pokedex/data/media/icons/308.png
new file mode 100644
index 0000000..56004c2
Binary files /dev/null and b/pokedex/data/media/icons/308.png differ
diff --git a/pokedex/data/media/icons/309.png b/pokedex/data/media/icons/309.png
new file mode 100644
index 0000000..c1436d5
Binary files /dev/null and b/pokedex/data/media/icons/309.png differ
diff --git a/pokedex/data/media/icons/31.png b/pokedex/data/media/icons/31.png
new file mode 100644
index 0000000..22301ec
Binary files /dev/null and b/pokedex/data/media/icons/31.png differ
diff --git a/pokedex/data/media/icons/310.png b/pokedex/data/media/icons/310.png
new file mode 100644
index 0000000..1ec7697
Binary files /dev/null and b/pokedex/data/media/icons/310.png differ
diff --git a/pokedex/data/media/icons/311.png b/pokedex/data/media/icons/311.png
new file mode 100644
index 0000000..f06cf7e
Binary files /dev/null and b/pokedex/data/media/icons/311.png differ
diff --git a/pokedex/data/media/icons/312.png b/pokedex/data/media/icons/312.png
new file mode 100644
index 0000000..484f6a1
Binary files /dev/null and b/pokedex/data/media/icons/312.png differ
diff --git a/pokedex/data/media/icons/313.png b/pokedex/data/media/icons/313.png
new file mode 100644
index 0000000..537cf14
Binary files /dev/null and b/pokedex/data/media/icons/313.png differ
diff --git a/pokedex/data/media/icons/314.png b/pokedex/data/media/icons/314.png
new file mode 100644
index 0000000..2c6a3f9
Binary files /dev/null and b/pokedex/data/media/icons/314.png differ
diff --git a/pokedex/data/media/icons/315.png b/pokedex/data/media/icons/315.png
new file mode 100644
index 0000000..8d13ea6
Binary files /dev/null and b/pokedex/data/media/icons/315.png differ
diff --git a/pokedex/data/media/icons/316.png b/pokedex/data/media/icons/316.png
new file mode 100644
index 0000000..a578c53
Binary files /dev/null and b/pokedex/data/media/icons/316.png differ
diff --git a/pokedex/data/media/icons/317.png b/pokedex/data/media/icons/317.png
new file mode 100644
index 0000000..9b4da74
Binary files /dev/null and b/pokedex/data/media/icons/317.png differ
diff --git a/pokedex/data/media/icons/318.png b/pokedex/data/media/icons/318.png
new file mode 100644
index 0000000..c7e1039
Binary files /dev/null and b/pokedex/data/media/icons/318.png differ
diff --git a/pokedex/data/media/icons/319.png b/pokedex/data/media/icons/319.png
new file mode 100644
index 0000000..e80ee7d
Binary files /dev/null and b/pokedex/data/media/icons/319.png differ
diff --git a/pokedex/data/media/icons/32.png b/pokedex/data/media/icons/32.png
new file mode 100644
index 0000000..8eaacd0
Binary files /dev/null and b/pokedex/data/media/icons/32.png differ
diff --git a/pokedex/data/media/icons/320.png b/pokedex/data/media/icons/320.png
new file mode 100644
index 0000000..78c7b6e
Binary files /dev/null and b/pokedex/data/media/icons/320.png differ
diff --git a/pokedex/data/media/icons/321.png b/pokedex/data/media/icons/321.png
new file mode 100644
index 0000000..ddaf322
Binary files /dev/null and b/pokedex/data/media/icons/321.png differ
diff --git a/pokedex/data/media/icons/322.png b/pokedex/data/media/icons/322.png
new file mode 100644
index 0000000..8166dc4
Binary files /dev/null and b/pokedex/data/media/icons/322.png differ
diff --git a/pokedex/data/media/icons/323.png b/pokedex/data/media/icons/323.png
new file mode 100644
index 0000000..aec385a
Binary files /dev/null and b/pokedex/data/media/icons/323.png differ
diff --git a/pokedex/data/media/icons/324.png b/pokedex/data/media/icons/324.png
new file mode 100644
index 0000000..f35bbb1
Binary files /dev/null and b/pokedex/data/media/icons/324.png differ
diff --git a/pokedex/data/media/icons/325.png b/pokedex/data/media/icons/325.png
new file mode 100644
index 0000000..6725b32
Binary files /dev/null and b/pokedex/data/media/icons/325.png differ
diff --git a/pokedex/data/media/icons/326.png b/pokedex/data/media/icons/326.png
new file mode 100644
index 0000000..e1c3550
Binary files /dev/null and b/pokedex/data/media/icons/326.png differ
diff --git a/pokedex/data/media/icons/327.png b/pokedex/data/media/icons/327.png
new file mode 100644
index 0000000..d7b8852
Binary files /dev/null and b/pokedex/data/media/icons/327.png differ
diff --git a/pokedex/data/media/icons/328.png b/pokedex/data/media/icons/328.png
new file mode 100644
index 0000000..2b81dc5
Binary files /dev/null and b/pokedex/data/media/icons/328.png differ
diff --git a/pokedex/data/media/icons/329.png b/pokedex/data/media/icons/329.png
new file mode 100644
index 0000000..44aa8f8
Binary files /dev/null and b/pokedex/data/media/icons/329.png differ
diff --git a/pokedex/data/media/icons/33.png b/pokedex/data/media/icons/33.png
new file mode 100644
index 0000000..e8bdb26
Binary files /dev/null and b/pokedex/data/media/icons/33.png differ
diff --git a/pokedex/data/media/icons/330.png b/pokedex/data/media/icons/330.png
new file mode 100644
index 0000000..5ce25b4
Binary files /dev/null and b/pokedex/data/media/icons/330.png differ
diff --git a/pokedex/data/media/icons/331.png b/pokedex/data/media/icons/331.png
new file mode 100644
index 0000000..5c32c12
Binary files /dev/null and b/pokedex/data/media/icons/331.png differ
diff --git a/pokedex/data/media/icons/332.png b/pokedex/data/media/icons/332.png
new file mode 100644
index 0000000..bb751c4
Binary files /dev/null and b/pokedex/data/media/icons/332.png differ
diff --git a/pokedex/data/media/icons/333.png b/pokedex/data/media/icons/333.png
new file mode 100644
index 0000000..e8fd09e
Binary files /dev/null and b/pokedex/data/media/icons/333.png differ
diff --git a/pokedex/data/media/icons/334.png b/pokedex/data/media/icons/334.png
new file mode 100644
index 0000000..25b12b4
Binary files /dev/null and b/pokedex/data/media/icons/334.png differ
diff --git a/pokedex/data/media/icons/335.png b/pokedex/data/media/icons/335.png
new file mode 100644
index 0000000..a4be361
Binary files /dev/null and b/pokedex/data/media/icons/335.png differ
diff --git a/pokedex/data/media/icons/336.png b/pokedex/data/media/icons/336.png
new file mode 100644
index 0000000..eae6a43
Binary files /dev/null and b/pokedex/data/media/icons/336.png differ
diff --git a/pokedex/data/media/icons/337.png b/pokedex/data/media/icons/337.png
new file mode 100644
index 0000000..d3279b9
Binary files /dev/null and b/pokedex/data/media/icons/337.png differ
diff --git a/pokedex/data/media/icons/338.png b/pokedex/data/media/icons/338.png
new file mode 100644
index 0000000..eefee88
Binary files /dev/null and b/pokedex/data/media/icons/338.png differ
diff --git a/pokedex/data/media/icons/339.png b/pokedex/data/media/icons/339.png
new file mode 100644
index 0000000..ef4fec0
Binary files /dev/null and b/pokedex/data/media/icons/339.png differ
diff --git a/pokedex/data/media/icons/34.png b/pokedex/data/media/icons/34.png
new file mode 100644
index 0000000..2fd530c
Binary files /dev/null and b/pokedex/data/media/icons/34.png differ
diff --git a/pokedex/data/media/icons/340.png b/pokedex/data/media/icons/340.png
new file mode 100644
index 0000000..a6162be
Binary files /dev/null and b/pokedex/data/media/icons/340.png differ
diff --git a/pokedex/data/media/icons/341.png b/pokedex/data/media/icons/341.png
new file mode 100644
index 0000000..5d0c5a5
Binary files /dev/null and b/pokedex/data/media/icons/341.png differ
diff --git a/pokedex/data/media/icons/342.png b/pokedex/data/media/icons/342.png
new file mode 100644
index 0000000..7770599
Binary files /dev/null and b/pokedex/data/media/icons/342.png differ
diff --git a/pokedex/data/media/icons/343.png b/pokedex/data/media/icons/343.png
new file mode 100644
index 0000000..8692213
Binary files /dev/null and b/pokedex/data/media/icons/343.png differ
diff --git a/pokedex/data/media/icons/344.png b/pokedex/data/media/icons/344.png
new file mode 100644
index 0000000..16417c3
Binary files /dev/null and b/pokedex/data/media/icons/344.png differ
diff --git a/pokedex/data/media/icons/345.png b/pokedex/data/media/icons/345.png
new file mode 100644
index 0000000..6070508
Binary files /dev/null and b/pokedex/data/media/icons/345.png differ
diff --git a/pokedex/data/media/icons/346.png b/pokedex/data/media/icons/346.png
new file mode 100644
index 0000000..b7d0952
Binary files /dev/null and b/pokedex/data/media/icons/346.png differ
diff --git a/pokedex/data/media/icons/347.png b/pokedex/data/media/icons/347.png
new file mode 100644
index 0000000..d6e2bda
Binary files /dev/null and b/pokedex/data/media/icons/347.png differ
diff --git a/pokedex/data/media/icons/348.png b/pokedex/data/media/icons/348.png
new file mode 100644
index 0000000..d06f7d1
Binary files /dev/null and b/pokedex/data/media/icons/348.png differ
diff --git a/pokedex/data/media/icons/349.png b/pokedex/data/media/icons/349.png
new file mode 100644
index 0000000..6a8f812
Binary files /dev/null and b/pokedex/data/media/icons/349.png differ
diff --git a/pokedex/data/media/icons/35.png b/pokedex/data/media/icons/35.png
new file mode 100644
index 0000000..b2acf39
Binary files /dev/null and b/pokedex/data/media/icons/35.png differ
diff --git a/pokedex/data/media/icons/350.png b/pokedex/data/media/icons/350.png
new file mode 100644
index 0000000..5c70b72
Binary files /dev/null and b/pokedex/data/media/icons/350.png differ
diff --git a/pokedex/data/media/icons/351.png b/pokedex/data/media/icons/351.png
new file mode 100644
index 0000000..3fd535a
Binary files /dev/null and b/pokedex/data/media/icons/351.png differ
diff --git a/pokedex/data/media/icons/352.png b/pokedex/data/media/icons/352.png
new file mode 100644
index 0000000..aaeba79
Binary files /dev/null and b/pokedex/data/media/icons/352.png differ
diff --git a/pokedex/data/media/icons/353.png b/pokedex/data/media/icons/353.png
new file mode 100644
index 0000000..b1f2e5e
Binary files /dev/null and b/pokedex/data/media/icons/353.png differ
diff --git a/pokedex/data/media/icons/354.png b/pokedex/data/media/icons/354.png
new file mode 100644
index 0000000..7f221c4
Binary files /dev/null and b/pokedex/data/media/icons/354.png differ
diff --git a/pokedex/data/media/icons/355.png b/pokedex/data/media/icons/355.png
new file mode 100644
index 0000000..09cffb8
Binary files /dev/null and b/pokedex/data/media/icons/355.png differ
diff --git a/pokedex/data/media/icons/356.png b/pokedex/data/media/icons/356.png
new file mode 100644
index 0000000..ef330d4
Binary files /dev/null and b/pokedex/data/media/icons/356.png differ
diff --git a/pokedex/data/media/icons/357.png b/pokedex/data/media/icons/357.png
new file mode 100644
index 0000000..ed94907
Binary files /dev/null and b/pokedex/data/media/icons/357.png differ
diff --git a/pokedex/data/media/icons/358.png b/pokedex/data/media/icons/358.png
new file mode 100644
index 0000000..a7cf717
Binary files /dev/null and b/pokedex/data/media/icons/358.png differ
diff --git a/pokedex/data/media/icons/359.png b/pokedex/data/media/icons/359.png
new file mode 100644
index 0000000..db38273
Binary files /dev/null and b/pokedex/data/media/icons/359.png differ
diff --git a/pokedex/data/media/icons/36.png b/pokedex/data/media/icons/36.png
new file mode 100644
index 0000000..363acc8
Binary files /dev/null and b/pokedex/data/media/icons/36.png differ
diff --git a/pokedex/data/media/icons/360.png b/pokedex/data/media/icons/360.png
new file mode 100644
index 0000000..476872c
Binary files /dev/null and b/pokedex/data/media/icons/360.png differ
diff --git a/pokedex/data/media/icons/361.png b/pokedex/data/media/icons/361.png
new file mode 100644
index 0000000..5d2c3a2
Binary files /dev/null and b/pokedex/data/media/icons/361.png differ
diff --git a/pokedex/data/media/icons/362.png b/pokedex/data/media/icons/362.png
new file mode 100644
index 0000000..2fdc5ae
Binary files /dev/null and b/pokedex/data/media/icons/362.png differ
diff --git a/pokedex/data/media/icons/363.png b/pokedex/data/media/icons/363.png
new file mode 100644
index 0000000..acbca4c
Binary files /dev/null and b/pokedex/data/media/icons/363.png differ
diff --git a/pokedex/data/media/icons/364.png b/pokedex/data/media/icons/364.png
new file mode 100644
index 0000000..1fd86c9
Binary files /dev/null and b/pokedex/data/media/icons/364.png differ
diff --git a/pokedex/data/media/icons/365.png b/pokedex/data/media/icons/365.png
new file mode 100644
index 0000000..3ad7cd5
Binary files /dev/null and b/pokedex/data/media/icons/365.png differ
diff --git a/pokedex/data/media/icons/366.png b/pokedex/data/media/icons/366.png
new file mode 100644
index 0000000..a2f0e0d
Binary files /dev/null and b/pokedex/data/media/icons/366.png differ
diff --git a/pokedex/data/media/icons/367.png b/pokedex/data/media/icons/367.png
new file mode 100644
index 0000000..ed849ba
Binary files /dev/null and b/pokedex/data/media/icons/367.png differ
diff --git a/pokedex/data/media/icons/368.png b/pokedex/data/media/icons/368.png
new file mode 100644
index 0000000..c848160
Binary files /dev/null and b/pokedex/data/media/icons/368.png differ
diff --git a/pokedex/data/media/icons/369.png b/pokedex/data/media/icons/369.png
new file mode 100644
index 0000000..b4e2a34
Binary files /dev/null and b/pokedex/data/media/icons/369.png differ
diff --git a/pokedex/data/media/icons/37.png b/pokedex/data/media/icons/37.png
new file mode 100644
index 0000000..7c9da3d
Binary files /dev/null and b/pokedex/data/media/icons/37.png differ
diff --git a/pokedex/data/media/icons/370.png b/pokedex/data/media/icons/370.png
new file mode 100644
index 0000000..fc90004
Binary files /dev/null and b/pokedex/data/media/icons/370.png differ
diff --git a/pokedex/data/media/icons/371.png b/pokedex/data/media/icons/371.png
new file mode 100644
index 0000000..224d4f4
Binary files /dev/null and b/pokedex/data/media/icons/371.png differ
diff --git a/pokedex/data/media/icons/372.png b/pokedex/data/media/icons/372.png
new file mode 100644
index 0000000..41de782
Binary files /dev/null and b/pokedex/data/media/icons/372.png differ
diff --git a/pokedex/data/media/icons/373.png b/pokedex/data/media/icons/373.png
new file mode 100644
index 0000000..2e1801c
Binary files /dev/null and b/pokedex/data/media/icons/373.png differ
diff --git a/pokedex/data/media/icons/374.png b/pokedex/data/media/icons/374.png
new file mode 100644
index 0000000..b9e3c58
Binary files /dev/null and b/pokedex/data/media/icons/374.png differ
diff --git a/pokedex/data/media/icons/375.png b/pokedex/data/media/icons/375.png
new file mode 100644
index 0000000..14bcabc
Binary files /dev/null and b/pokedex/data/media/icons/375.png differ
diff --git a/pokedex/data/media/icons/376.png b/pokedex/data/media/icons/376.png
new file mode 100644
index 0000000..ad20382
Binary files /dev/null and b/pokedex/data/media/icons/376.png differ
diff --git a/pokedex/data/media/icons/377.png b/pokedex/data/media/icons/377.png
new file mode 100644
index 0000000..b74f6dd
Binary files /dev/null and b/pokedex/data/media/icons/377.png differ
diff --git a/pokedex/data/media/icons/378.png b/pokedex/data/media/icons/378.png
new file mode 100644
index 0000000..a772133
Binary files /dev/null and b/pokedex/data/media/icons/378.png differ
diff --git a/pokedex/data/media/icons/379.png b/pokedex/data/media/icons/379.png
new file mode 100644
index 0000000..86cc938
Binary files /dev/null and b/pokedex/data/media/icons/379.png differ
diff --git a/pokedex/data/media/icons/38.png b/pokedex/data/media/icons/38.png
new file mode 100644
index 0000000..e72b320
Binary files /dev/null and b/pokedex/data/media/icons/38.png differ
diff --git a/pokedex/data/media/icons/380.png b/pokedex/data/media/icons/380.png
new file mode 100644
index 0000000..2486a5a
Binary files /dev/null and b/pokedex/data/media/icons/380.png differ
diff --git a/pokedex/data/media/icons/381.png b/pokedex/data/media/icons/381.png
new file mode 100644
index 0000000..42f3115
Binary files /dev/null and b/pokedex/data/media/icons/381.png differ
diff --git a/pokedex/data/media/icons/382.png b/pokedex/data/media/icons/382.png
new file mode 100644
index 0000000..c9760de
Binary files /dev/null and b/pokedex/data/media/icons/382.png differ
diff --git a/pokedex/data/media/icons/383.png b/pokedex/data/media/icons/383.png
new file mode 100644
index 0000000..b8b8f94
Binary files /dev/null and b/pokedex/data/media/icons/383.png differ
diff --git a/pokedex/data/media/icons/384.png b/pokedex/data/media/icons/384.png
new file mode 100644
index 0000000..ec2065f
Binary files /dev/null and b/pokedex/data/media/icons/384.png differ
diff --git a/pokedex/data/media/icons/385.png b/pokedex/data/media/icons/385.png
new file mode 100644
index 0000000..5a40d61
Binary files /dev/null and b/pokedex/data/media/icons/385.png differ
diff --git a/pokedex/data/media/icons/386-attack.png b/pokedex/data/media/icons/386-attack.png
new file mode 100644
index 0000000..ad3fcb7
Binary files /dev/null and b/pokedex/data/media/icons/386-attack.png differ
diff --git a/pokedex/data/media/icons/386-defense.png b/pokedex/data/media/icons/386-defense.png
new file mode 100644
index 0000000..9d41ae9
Binary files /dev/null and b/pokedex/data/media/icons/386-defense.png differ
diff --git a/pokedex/data/media/icons/386-normal.png b/pokedex/data/media/icons/386-normal.png
new file mode 100644
index 0000000..f443696
Binary files /dev/null and b/pokedex/data/media/icons/386-normal.png differ
diff --git a/pokedex/data/media/icons/386-speed.png b/pokedex/data/media/icons/386-speed.png
new file mode 100644
index 0000000..a2859fe
Binary files /dev/null and b/pokedex/data/media/icons/386-speed.png differ
diff --git a/pokedex/data/media/icons/386.png b/pokedex/data/media/icons/386.png
new file mode 100644
index 0000000..f443696
Binary files /dev/null and b/pokedex/data/media/icons/386.png differ
diff --git a/pokedex/data/media/icons/387.png b/pokedex/data/media/icons/387.png
new file mode 100644
index 0000000..7947995
Binary files /dev/null and b/pokedex/data/media/icons/387.png differ
diff --git a/pokedex/data/media/icons/388.png b/pokedex/data/media/icons/388.png
new file mode 100644
index 0000000..a7155e0
Binary files /dev/null and b/pokedex/data/media/icons/388.png differ
diff --git a/pokedex/data/media/icons/389.png b/pokedex/data/media/icons/389.png
new file mode 100644
index 0000000..2a2b57d
Binary files /dev/null and b/pokedex/data/media/icons/389.png differ
diff --git a/pokedex/data/media/icons/39.png b/pokedex/data/media/icons/39.png
new file mode 100644
index 0000000..d7a75da
Binary files /dev/null and b/pokedex/data/media/icons/39.png differ
diff --git a/pokedex/data/media/icons/390.png b/pokedex/data/media/icons/390.png
new file mode 100644
index 0000000..b42b28f
Binary files /dev/null and b/pokedex/data/media/icons/390.png differ
diff --git a/pokedex/data/media/icons/391.png b/pokedex/data/media/icons/391.png
new file mode 100644
index 0000000..7bf4aaf
Binary files /dev/null and b/pokedex/data/media/icons/391.png differ
diff --git a/pokedex/data/media/icons/392.png b/pokedex/data/media/icons/392.png
new file mode 100644
index 0000000..f03549e
Binary files /dev/null and b/pokedex/data/media/icons/392.png differ
diff --git a/pokedex/data/media/icons/393.png b/pokedex/data/media/icons/393.png
new file mode 100644
index 0000000..6213954
Binary files /dev/null and b/pokedex/data/media/icons/393.png differ
diff --git a/pokedex/data/media/icons/394.png b/pokedex/data/media/icons/394.png
new file mode 100644
index 0000000..2718d91
Binary files /dev/null and b/pokedex/data/media/icons/394.png differ
diff --git a/pokedex/data/media/icons/395.png b/pokedex/data/media/icons/395.png
new file mode 100644
index 0000000..512be76
Binary files /dev/null and b/pokedex/data/media/icons/395.png differ
diff --git a/pokedex/data/media/icons/396.png b/pokedex/data/media/icons/396.png
new file mode 100644
index 0000000..9b43ea5
Binary files /dev/null and b/pokedex/data/media/icons/396.png differ
diff --git a/pokedex/data/media/icons/397.png b/pokedex/data/media/icons/397.png
new file mode 100644
index 0000000..05a2a3b
Binary files /dev/null and b/pokedex/data/media/icons/397.png differ
diff --git a/pokedex/data/media/icons/398.png b/pokedex/data/media/icons/398.png
new file mode 100644
index 0000000..52ee8b0
Binary files /dev/null and b/pokedex/data/media/icons/398.png differ
diff --git a/pokedex/data/media/icons/399.png b/pokedex/data/media/icons/399.png
new file mode 100644
index 0000000..79bf29b
Binary files /dev/null and b/pokedex/data/media/icons/399.png differ
diff --git a/pokedex/data/media/icons/4.png b/pokedex/data/media/icons/4.png
new file mode 100644
index 0000000..8b638af
Binary files /dev/null and b/pokedex/data/media/icons/4.png differ
diff --git a/pokedex/data/media/icons/40.png b/pokedex/data/media/icons/40.png
new file mode 100644
index 0000000..4893788
Binary files /dev/null and b/pokedex/data/media/icons/40.png differ
diff --git a/pokedex/data/media/icons/400.png b/pokedex/data/media/icons/400.png
new file mode 100644
index 0000000..3044b4a
Binary files /dev/null and b/pokedex/data/media/icons/400.png differ
diff --git a/pokedex/data/media/icons/401.png b/pokedex/data/media/icons/401.png
new file mode 100644
index 0000000..ac18bca
Binary files /dev/null and b/pokedex/data/media/icons/401.png differ
diff --git a/pokedex/data/media/icons/402.png b/pokedex/data/media/icons/402.png
new file mode 100644
index 0000000..5d3a512
Binary files /dev/null and b/pokedex/data/media/icons/402.png differ
diff --git a/pokedex/data/media/icons/403.png b/pokedex/data/media/icons/403.png
new file mode 100644
index 0000000..6118beb
Binary files /dev/null and b/pokedex/data/media/icons/403.png differ
diff --git a/pokedex/data/media/icons/404.png b/pokedex/data/media/icons/404.png
new file mode 100644
index 0000000..20911a1
Binary files /dev/null and b/pokedex/data/media/icons/404.png differ
diff --git a/pokedex/data/media/icons/405.png b/pokedex/data/media/icons/405.png
new file mode 100644
index 0000000..7b53e7a
Binary files /dev/null and b/pokedex/data/media/icons/405.png differ
diff --git a/pokedex/data/media/icons/406.png b/pokedex/data/media/icons/406.png
new file mode 100644
index 0000000..b639896
Binary files /dev/null and b/pokedex/data/media/icons/406.png differ
diff --git a/pokedex/data/media/icons/407.png b/pokedex/data/media/icons/407.png
new file mode 100644
index 0000000..08a1656
Binary files /dev/null and b/pokedex/data/media/icons/407.png differ
diff --git a/pokedex/data/media/icons/408.png b/pokedex/data/media/icons/408.png
new file mode 100644
index 0000000..2ce7af1
Binary files /dev/null and b/pokedex/data/media/icons/408.png differ
diff --git a/pokedex/data/media/icons/409.png b/pokedex/data/media/icons/409.png
new file mode 100644
index 0000000..02afcf9
Binary files /dev/null and b/pokedex/data/media/icons/409.png differ
diff --git a/pokedex/data/media/icons/41.png b/pokedex/data/media/icons/41.png
new file mode 100644
index 0000000..4544b9c
Binary files /dev/null and b/pokedex/data/media/icons/41.png differ
diff --git a/pokedex/data/media/icons/410.png b/pokedex/data/media/icons/410.png
new file mode 100644
index 0000000..55477ae
Binary files /dev/null and b/pokedex/data/media/icons/410.png differ
diff --git a/pokedex/data/media/icons/411.png b/pokedex/data/media/icons/411.png
new file mode 100644
index 0000000..5d10c27
Binary files /dev/null and b/pokedex/data/media/icons/411.png differ
diff --git a/pokedex/data/media/icons/412-ground.png b/pokedex/data/media/icons/412-ground.png
new file mode 100644
index 0000000..b5df788
Binary files /dev/null and b/pokedex/data/media/icons/412-ground.png differ
diff --git a/pokedex/data/media/icons/412-steel.png b/pokedex/data/media/icons/412-steel.png
new file mode 100644
index 0000000..d2363c3
Binary files /dev/null and b/pokedex/data/media/icons/412-steel.png differ
diff --git a/pokedex/data/media/icons/412.png b/pokedex/data/media/icons/412.png
new file mode 100644
index 0000000..f8172be
Binary files /dev/null and b/pokedex/data/media/icons/412.png differ
diff --git a/pokedex/data/media/icons/413-grass.png b/pokedex/data/media/icons/413-grass.png
new file mode 100644
index 0000000..48b350b
Binary files /dev/null and b/pokedex/data/media/icons/413-grass.png differ
diff --git a/pokedex/data/media/icons/413-ground.png b/pokedex/data/media/icons/413-ground.png
new file mode 100644
index 0000000..536e5d4
Binary files /dev/null and b/pokedex/data/media/icons/413-ground.png differ
diff --git a/pokedex/data/media/icons/413-steel.png b/pokedex/data/media/icons/413-steel.png
new file mode 100644
index 0000000..784ec94
Binary files /dev/null and b/pokedex/data/media/icons/413-steel.png differ
diff --git a/pokedex/data/media/icons/413.png b/pokedex/data/media/icons/413.png
new file mode 100644
index 0000000..48b350b
Binary files /dev/null and b/pokedex/data/media/icons/413.png differ
diff --git a/pokedex/data/media/icons/414.png b/pokedex/data/media/icons/414.png
new file mode 100644
index 0000000..8be3985
Binary files /dev/null and b/pokedex/data/media/icons/414.png differ
diff --git a/pokedex/data/media/icons/415.png b/pokedex/data/media/icons/415.png
new file mode 100644
index 0000000..a7708a6
Binary files /dev/null and b/pokedex/data/media/icons/415.png differ
diff --git a/pokedex/data/media/icons/416.png b/pokedex/data/media/icons/416.png
new file mode 100644
index 0000000..fe56ea6
Binary files /dev/null and b/pokedex/data/media/icons/416.png differ
diff --git a/pokedex/data/media/icons/417.png b/pokedex/data/media/icons/417.png
new file mode 100644
index 0000000..f83e9d9
Binary files /dev/null and b/pokedex/data/media/icons/417.png differ
diff --git a/pokedex/data/media/icons/418.png b/pokedex/data/media/icons/418.png
new file mode 100644
index 0000000..284707f
Binary files /dev/null and b/pokedex/data/media/icons/418.png differ
diff --git a/pokedex/data/media/icons/419.png b/pokedex/data/media/icons/419.png
new file mode 100644
index 0000000..b994236
Binary files /dev/null and b/pokedex/data/media/icons/419.png differ
diff --git a/pokedex/data/media/icons/42.png b/pokedex/data/media/icons/42.png
new file mode 100644
index 0000000..50d9b72
Binary files /dev/null and b/pokedex/data/media/icons/42.png differ
diff --git a/pokedex/data/media/icons/420.png b/pokedex/data/media/icons/420.png
new file mode 100644
index 0000000..28f0268
Binary files /dev/null and b/pokedex/data/media/icons/420.png differ
diff --git a/pokedex/data/media/icons/421.png b/pokedex/data/media/icons/421.png
new file mode 100644
index 0000000..1d66e78
Binary files /dev/null and b/pokedex/data/media/icons/421.png differ
diff --git a/pokedex/data/media/icons/422-east.png b/pokedex/data/media/icons/422-east.png
new file mode 100644
index 0000000..b753b75
Binary files /dev/null and b/pokedex/data/media/icons/422-east.png differ
diff --git a/pokedex/data/media/icons/422-west.png b/pokedex/data/media/icons/422-west.png
new file mode 100644
index 0000000..d62114a
Binary files /dev/null and b/pokedex/data/media/icons/422-west.png differ
diff --git a/pokedex/data/media/icons/422.png b/pokedex/data/media/icons/422.png
new file mode 100644
index 0000000..d62114a
Binary files /dev/null and b/pokedex/data/media/icons/422.png differ
diff --git a/pokedex/data/media/icons/423-east.png b/pokedex/data/media/icons/423-east.png
new file mode 100644
index 0000000..6ea76f9
Binary files /dev/null and b/pokedex/data/media/icons/423-east.png differ
diff --git a/pokedex/data/media/icons/423-west.png b/pokedex/data/media/icons/423-west.png
new file mode 100644
index 0000000..71365c9
Binary files /dev/null and b/pokedex/data/media/icons/423-west.png differ
diff --git a/pokedex/data/media/icons/423.png b/pokedex/data/media/icons/423.png
new file mode 100644
index 0000000..71365c9
Binary files /dev/null and b/pokedex/data/media/icons/423.png differ
diff --git a/pokedex/data/media/icons/424.png b/pokedex/data/media/icons/424.png
new file mode 100644
index 0000000..fada0b8
Binary files /dev/null and b/pokedex/data/media/icons/424.png differ
diff --git a/pokedex/data/media/icons/425.png b/pokedex/data/media/icons/425.png
new file mode 100644
index 0000000..3447cfe
Binary files /dev/null and b/pokedex/data/media/icons/425.png differ
diff --git a/pokedex/data/media/icons/426.png b/pokedex/data/media/icons/426.png
new file mode 100644
index 0000000..60e3ffe
Binary files /dev/null and b/pokedex/data/media/icons/426.png differ
diff --git a/pokedex/data/media/icons/427.png b/pokedex/data/media/icons/427.png
new file mode 100644
index 0000000..b67b249
Binary files /dev/null and b/pokedex/data/media/icons/427.png differ
diff --git a/pokedex/data/media/icons/428.png b/pokedex/data/media/icons/428.png
new file mode 100644
index 0000000..bb7bb09
Binary files /dev/null and b/pokedex/data/media/icons/428.png differ
diff --git a/pokedex/data/media/icons/429.png b/pokedex/data/media/icons/429.png
new file mode 100644
index 0000000..26832ec
Binary files /dev/null and b/pokedex/data/media/icons/429.png differ
diff --git a/pokedex/data/media/icons/43.png b/pokedex/data/media/icons/43.png
new file mode 100644
index 0000000..7b7f7f7
Binary files /dev/null and b/pokedex/data/media/icons/43.png differ
diff --git a/pokedex/data/media/icons/430.png b/pokedex/data/media/icons/430.png
new file mode 100644
index 0000000..e1f0a5b
Binary files /dev/null and b/pokedex/data/media/icons/430.png differ
diff --git a/pokedex/data/media/icons/431.png b/pokedex/data/media/icons/431.png
new file mode 100644
index 0000000..52228c5
Binary files /dev/null and b/pokedex/data/media/icons/431.png differ
diff --git a/pokedex/data/media/icons/432.png b/pokedex/data/media/icons/432.png
new file mode 100644
index 0000000..f039867
Binary files /dev/null and b/pokedex/data/media/icons/432.png differ
diff --git a/pokedex/data/media/icons/433.png b/pokedex/data/media/icons/433.png
new file mode 100644
index 0000000..c1ec01a
Binary files /dev/null and b/pokedex/data/media/icons/433.png differ
diff --git a/pokedex/data/media/icons/434.png b/pokedex/data/media/icons/434.png
new file mode 100644
index 0000000..e0b6431
Binary files /dev/null and b/pokedex/data/media/icons/434.png differ
diff --git a/pokedex/data/media/icons/435.png b/pokedex/data/media/icons/435.png
new file mode 100644
index 0000000..042b268
Binary files /dev/null and b/pokedex/data/media/icons/435.png differ
diff --git a/pokedex/data/media/icons/436.png b/pokedex/data/media/icons/436.png
new file mode 100644
index 0000000..f4d014e
Binary files /dev/null and b/pokedex/data/media/icons/436.png differ
diff --git a/pokedex/data/media/icons/437.png b/pokedex/data/media/icons/437.png
new file mode 100644
index 0000000..82ead38
Binary files /dev/null and b/pokedex/data/media/icons/437.png differ
diff --git a/pokedex/data/media/icons/438.png b/pokedex/data/media/icons/438.png
new file mode 100644
index 0000000..1d36f6e
Binary files /dev/null and b/pokedex/data/media/icons/438.png differ
diff --git a/pokedex/data/media/icons/439.png b/pokedex/data/media/icons/439.png
new file mode 100644
index 0000000..4afbba8
Binary files /dev/null and b/pokedex/data/media/icons/439.png differ
diff --git a/pokedex/data/media/icons/44.png b/pokedex/data/media/icons/44.png
new file mode 100644
index 0000000..501abb3
Binary files /dev/null and b/pokedex/data/media/icons/44.png differ
diff --git a/pokedex/data/media/icons/440.png b/pokedex/data/media/icons/440.png
new file mode 100644
index 0000000..5b563cd
Binary files /dev/null and b/pokedex/data/media/icons/440.png differ
diff --git a/pokedex/data/media/icons/441.png b/pokedex/data/media/icons/441.png
new file mode 100644
index 0000000..cb2475e
Binary files /dev/null and b/pokedex/data/media/icons/441.png differ
diff --git a/pokedex/data/media/icons/442.png b/pokedex/data/media/icons/442.png
new file mode 100644
index 0000000..e884058
Binary files /dev/null and b/pokedex/data/media/icons/442.png differ
diff --git a/pokedex/data/media/icons/443.png b/pokedex/data/media/icons/443.png
new file mode 100644
index 0000000..efb0ff2
Binary files /dev/null and b/pokedex/data/media/icons/443.png differ
diff --git a/pokedex/data/media/icons/444.png b/pokedex/data/media/icons/444.png
new file mode 100644
index 0000000..1aa7a64
Binary files /dev/null and b/pokedex/data/media/icons/444.png differ
diff --git a/pokedex/data/media/icons/445.png b/pokedex/data/media/icons/445.png
new file mode 100644
index 0000000..9aae55f
Binary files /dev/null and b/pokedex/data/media/icons/445.png differ
diff --git a/pokedex/data/media/icons/446.png b/pokedex/data/media/icons/446.png
new file mode 100644
index 0000000..3edd18b
Binary files /dev/null and b/pokedex/data/media/icons/446.png differ
diff --git a/pokedex/data/media/icons/447.png b/pokedex/data/media/icons/447.png
new file mode 100644
index 0000000..3e04759
Binary files /dev/null and b/pokedex/data/media/icons/447.png differ
diff --git a/pokedex/data/media/icons/448.png b/pokedex/data/media/icons/448.png
new file mode 100644
index 0000000..081aea4
Binary files /dev/null and b/pokedex/data/media/icons/448.png differ
diff --git a/pokedex/data/media/icons/449.png b/pokedex/data/media/icons/449.png
new file mode 100644
index 0000000..423066a
Binary files /dev/null and b/pokedex/data/media/icons/449.png differ
diff --git a/pokedex/data/media/icons/45.png b/pokedex/data/media/icons/45.png
new file mode 100644
index 0000000..b65fc6e
Binary files /dev/null and b/pokedex/data/media/icons/45.png differ
diff --git a/pokedex/data/media/icons/450.png b/pokedex/data/media/icons/450.png
new file mode 100644
index 0000000..ae1554c
Binary files /dev/null and b/pokedex/data/media/icons/450.png differ
diff --git a/pokedex/data/media/icons/451.png b/pokedex/data/media/icons/451.png
new file mode 100644
index 0000000..e3646fb
Binary files /dev/null and b/pokedex/data/media/icons/451.png differ
diff --git a/pokedex/data/media/icons/452.png b/pokedex/data/media/icons/452.png
new file mode 100644
index 0000000..8c97f28
Binary files /dev/null and b/pokedex/data/media/icons/452.png differ
diff --git a/pokedex/data/media/icons/453.png b/pokedex/data/media/icons/453.png
new file mode 100644
index 0000000..7a64648
Binary files /dev/null and b/pokedex/data/media/icons/453.png differ
diff --git a/pokedex/data/media/icons/454.png b/pokedex/data/media/icons/454.png
new file mode 100644
index 0000000..a11f4a1
Binary files /dev/null and b/pokedex/data/media/icons/454.png differ
diff --git a/pokedex/data/media/icons/455.png b/pokedex/data/media/icons/455.png
new file mode 100644
index 0000000..7fdac7f
Binary files /dev/null and b/pokedex/data/media/icons/455.png differ
diff --git a/pokedex/data/media/icons/456.png b/pokedex/data/media/icons/456.png
new file mode 100644
index 0000000..cf19b09
Binary files /dev/null and b/pokedex/data/media/icons/456.png differ
diff --git a/pokedex/data/media/icons/457.png b/pokedex/data/media/icons/457.png
new file mode 100644
index 0000000..ce59842
Binary files /dev/null and b/pokedex/data/media/icons/457.png differ
diff --git a/pokedex/data/media/icons/458.png b/pokedex/data/media/icons/458.png
new file mode 100644
index 0000000..22f74f8
Binary files /dev/null and b/pokedex/data/media/icons/458.png differ
diff --git a/pokedex/data/media/icons/459.png b/pokedex/data/media/icons/459.png
new file mode 100644
index 0000000..502f31e
Binary files /dev/null and b/pokedex/data/media/icons/459.png differ
diff --git a/pokedex/data/media/icons/46.png b/pokedex/data/media/icons/46.png
new file mode 100644
index 0000000..6dac501
Binary files /dev/null and b/pokedex/data/media/icons/46.png differ
diff --git a/pokedex/data/media/icons/460.png b/pokedex/data/media/icons/460.png
new file mode 100644
index 0000000..9b4346c
Binary files /dev/null and b/pokedex/data/media/icons/460.png differ
diff --git a/pokedex/data/media/icons/461.png b/pokedex/data/media/icons/461.png
new file mode 100644
index 0000000..807ac8c
Binary files /dev/null and b/pokedex/data/media/icons/461.png differ
diff --git a/pokedex/data/media/icons/462.png b/pokedex/data/media/icons/462.png
new file mode 100644
index 0000000..955d3df
Binary files /dev/null and b/pokedex/data/media/icons/462.png differ
diff --git a/pokedex/data/media/icons/463.png b/pokedex/data/media/icons/463.png
new file mode 100644
index 0000000..f6b3329
Binary files /dev/null and b/pokedex/data/media/icons/463.png differ
diff --git a/pokedex/data/media/icons/464.png b/pokedex/data/media/icons/464.png
new file mode 100644
index 0000000..9d92b51
Binary files /dev/null and b/pokedex/data/media/icons/464.png differ
diff --git a/pokedex/data/media/icons/465.png b/pokedex/data/media/icons/465.png
new file mode 100644
index 0000000..161fb2a
Binary files /dev/null and b/pokedex/data/media/icons/465.png differ
diff --git a/pokedex/data/media/icons/466.png b/pokedex/data/media/icons/466.png
new file mode 100644
index 0000000..aa11657
Binary files /dev/null and b/pokedex/data/media/icons/466.png differ
diff --git a/pokedex/data/media/icons/467.png b/pokedex/data/media/icons/467.png
new file mode 100644
index 0000000..854dace
Binary files /dev/null and b/pokedex/data/media/icons/467.png differ
diff --git a/pokedex/data/media/icons/468.png b/pokedex/data/media/icons/468.png
new file mode 100644
index 0000000..f3ea261
Binary files /dev/null and b/pokedex/data/media/icons/468.png differ
diff --git a/pokedex/data/media/icons/469.png b/pokedex/data/media/icons/469.png
new file mode 100644
index 0000000..eb63714
Binary files /dev/null and b/pokedex/data/media/icons/469.png differ
diff --git a/pokedex/data/media/icons/47.png b/pokedex/data/media/icons/47.png
new file mode 100644
index 0000000..51d9325
Binary files /dev/null and b/pokedex/data/media/icons/47.png differ
diff --git a/pokedex/data/media/icons/470.png b/pokedex/data/media/icons/470.png
new file mode 100644
index 0000000..22d9d2e
Binary files /dev/null and b/pokedex/data/media/icons/470.png differ
diff --git a/pokedex/data/media/icons/471.png b/pokedex/data/media/icons/471.png
new file mode 100644
index 0000000..d6a7f71
Binary files /dev/null and b/pokedex/data/media/icons/471.png differ
diff --git a/pokedex/data/media/icons/472.png b/pokedex/data/media/icons/472.png
new file mode 100644
index 0000000..add9946
Binary files /dev/null and b/pokedex/data/media/icons/472.png differ
diff --git a/pokedex/data/media/icons/473.png b/pokedex/data/media/icons/473.png
new file mode 100644
index 0000000..4759c97
Binary files /dev/null and b/pokedex/data/media/icons/473.png differ
diff --git a/pokedex/data/media/icons/474.png b/pokedex/data/media/icons/474.png
new file mode 100644
index 0000000..7dd3c45
Binary files /dev/null and b/pokedex/data/media/icons/474.png differ
diff --git a/pokedex/data/media/icons/475.png b/pokedex/data/media/icons/475.png
new file mode 100644
index 0000000..3f2277f
Binary files /dev/null and b/pokedex/data/media/icons/475.png differ
diff --git a/pokedex/data/media/icons/476.png b/pokedex/data/media/icons/476.png
new file mode 100644
index 0000000..a115193
Binary files /dev/null and b/pokedex/data/media/icons/476.png differ
diff --git a/pokedex/data/media/icons/477.png b/pokedex/data/media/icons/477.png
new file mode 100644
index 0000000..fab6f07
Binary files /dev/null and b/pokedex/data/media/icons/477.png differ
diff --git a/pokedex/data/media/icons/478.png b/pokedex/data/media/icons/478.png
new file mode 100644
index 0000000..dadc2c6
Binary files /dev/null and b/pokedex/data/media/icons/478.png differ
diff --git a/pokedex/data/media/icons/479.png b/pokedex/data/media/icons/479.png
new file mode 100644
index 0000000..e2919c6
Binary files /dev/null and b/pokedex/data/media/icons/479.png differ
diff --git a/pokedex/data/media/icons/48.png b/pokedex/data/media/icons/48.png
new file mode 100644
index 0000000..48d4465
Binary files /dev/null and b/pokedex/data/media/icons/48.png differ
diff --git a/pokedex/data/media/icons/480.png b/pokedex/data/media/icons/480.png
new file mode 100644
index 0000000..8c39d48
Binary files /dev/null and b/pokedex/data/media/icons/480.png differ
diff --git a/pokedex/data/media/icons/481.png b/pokedex/data/media/icons/481.png
new file mode 100644
index 0000000..657699c
Binary files /dev/null and b/pokedex/data/media/icons/481.png differ
diff --git a/pokedex/data/media/icons/482.png b/pokedex/data/media/icons/482.png
new file mode 100644
index 0000000..55a374a
Binary files /dev/null and b/pokedex/data/media/icons/482.png differ
diff --git a/pokedex/data/media/icons/483.png b/pokedex/data/media/icons/483.png
new file mode 100644
index 0000000..5a8f12f
Binary files /dev/null and b/pokedex/data/media/icons/483.png differ
diff --git a/pokedex/data/media/icons/484.png b/pokedex/data/media/icons/484.png
new file mode 100644
index 0000000..90883eb
Binary files /dev/null and b/pokedex/data/media/icons/484.png differ
diff --git a/pokedex/data/media/icons/485.png b/pokedex/data/media/icons/485.png
new file mode 100644
index 0000000..f4f26d5
Binary files /dev/null and b/pokedex/data/media/icons/485.png differ
diff --git a/pokedex/data/media/icons/486.png b/pokedex/data/media/icons/486.png
new file mode 100644
index 0000000..8e71730
Binary files /dev/null and b/pokedex/data/media/icons/486.png differ
diff --git a/pokedex/data/media/icons/487.png b/pokedex/data/media/icons/487.png
new file mode 100644
index 0000000..22fcba3
Binary files /dev/null and b/pokedex/data/media/icons/487.png differ
diff --git a/pokedex/data/media/icons/488.png b/pokedex/data/media/icons/488.png
new file mode 100644
index 0000000..dbbe60b
Binary files /dev/null and b/pokedex/data/media/icons/488.png differ
diff --git a/pokedex/data/media/icons/489.png b/pokedex/data/media/icons/489.png
new file mode 100644
index 0000000..3cf2de5
Binary files /dev/null and b/pokedex/data/media/icons/489.png differ
diff --git a/pokedex/data/media/icons/49.png b/pokedex/data/media/icons/49.png
new file mode 100644
index 0000000..b4e129e
Binary files /dev/null and b/pokedex/data/media/icons/49.png differ
diff --git a/pokedex/data/media/icons/490.png b/pokedex/data/media/icons/490.png
new file mode 100644
index 0000000..5da6e3c
Binary files /dev/null and b/pokedex/data/media/icons/490.png differ
diff --git a/pokedex/data/media/icons/491.png b/pokedex/data/media/icons/491.png
new file mode 100644
index 0000000..4f86a63
Binary files /dev/null and b/pokedex/data/media/icons/491.png differ
diff --git a/pokedex/data/media/icons/492.png b/pokedex/data/media/icons/492.png
new file mode 100644
index 0000000..5a03dea
Binary files /dev/null and b/pokedex/data/media/icons/492.png differ
diff --git a/pokedex/data/media/icons/493.png b/pokedex/data/media/icons/493.png
new file mode 100644
index 0000000..770e631
Binary files /dev/null and b/pokedex/data/media/icons/493.png differ
diff --git a/pokedex/data/media/icons/5.png b/pokedex/data/media/icons/5.png
new file mode 100644
index 0000000..0bbe8cb
Binary files /dev/null and b/pokedex/data/media/icons/5.png differ
diff --git a/pokedex/data/media/icons/50.png b/pokedex/data/media/icons/50.png
new file mode 100644
index 0000000..91373f9
Binary files /dev/null and b/pokedex/data/media/icons/50.png differ
diff --git a/pokedex/data/media/icons/51.png b/pokedex/data/media/icons/51.png
new file mode 100644
index 0000000..9557e1a
Binary files /dev/null and b/pokedex/data/media/icons/51.png differ
diff --git a/pokedex/data/media/icons/52.png b/pokedex/data/media/icons/52.png
new file mode 100644
index 0000000..17e3c69
Binary files /dev/null and b/pokedex/data/media/icons/52.png differ
diff --git a/pokedex/data/media/icons/53.png b/pokedex/data/media/icons/53.png
new file mode 100644
index 0000000..85e9d33
Binary files /dev/null and b/pokedex/data/media/icons/53.png differ
diff --git a/pokedex/data/media/icons/54.png b/pokedex/data/media/icons/54.png
new file mode 100644
index 0000000..8bfaa3c
Binary files /dev/null and b/pokedex/data/media/icons/54.png differ
diff --git a/pokedex/data/media/icons/55.png b/pokedex/data/media/icons/55.png
new file mode 100644
index 0000000..41ddc3a
Binary files /dev/null and b/pokedex/data/media/icons/55.png differ
diff --git a/pokedex/data/media/icons/56.png b/pokedex/data/media/icons/56.png
new file mode 100644
index 0000000..e375244
Binary files /dev/null and b/pokedex/data/media/icons/56.png differ
diff --git a/pokedex/data/media/icons/57.png b/pokedex/data/media/icons/57.png
new file mode 100644
index 0000000..bc2aaf0
Binary files /dev/null and b/pokedex/data/media/icons/57.png differ
diff --git a/pokedex/data/media/icons/58.png b/pokedex/data/media/icons/58.png
new file mode 100644
index 0000000..a1360fb
Binary files /dev/null and b/pokedex/data/media/icons/58.png differ
diff --git a/pokedex/data/media/icons/59.png b/pokedex/data/media/icons/59.png
new file mode 100644
index 0000000..8a0071a
Binary files /dev/null and b/pokedex/data/media/icons/59.png differ
diff --git a/pokedex/data/media/icons/6.png b/pokedex/data/media/icons/6.png
new file mode 100644
index 0000000..9c7714f
Binary files /dev/null and b/pokedex/data/media/icons/6.png differ
diff --git a/pokedex/data/media/icons/60.png b/pokedex/data/media/icons/60.png
new file mode 100644
index 0000000..0ebc24e
Binary files /dev/null and b/pokedex/data/media/icons/60.png differ
diff --git a/pokedex/data/media/icons/61.png b/pokedex/data/media/icons/61.png
new file mode 100644
index 0000000..fe17b36
Binary files /dev/null and b/pokedex/data/media/icons/61.png differ
diff --git a/pokedex/data/media/icons/62.png b/pokedex/data/media/icons/62.png
new file mode 100644
index 0000000..2fe67f0
Binary files /dev/null and b/pokedex/data/media/icons/62.png differ
diff --git a/pokedex/data/media/icons/63.png b/pokedex/data/media/icons/63.png
new file mode 100644
index 0000000..a0da1dd
Binary files /dev/null and b/pokedex/data/media/icons/63.png differ
diff --git a/pokedex/data/media/icons/64.png b/pokedex/data/media/icons/64.png
new file mode 100644
index 0000000..a33103c
Binary files /dev/null and b/pokedex/data/media/icons/64.png differ
diff --git a/pokedex/data/media/icons/65.png b/pokedex/data/media/icons/65.png
new file mode 100644
index 0000000..4d9045f
Binary files /dev/null and b/pokedex/data/media/icons/65.png differ
diff --git a/pokedex/data/media/icons/66.png b/pokedex/data/media/icons/66.png
new file mode 100644
index 0000000..43bd8c2
Binary files /dev/null and b/pokedex/data/media/icons/66.png differ
diff --git a/pokedex/data/media/icons/67.png b/pokedex/data/media/icons/67.png
new file mode 100644
index 0000000..dc29aec
Binary files /dev/null and b/pokedex/data/media/icons/67.png differ
diff --git a/pokedex/data/media/icons/68.png b/pokedex/data/media/icons/68.png
new file mode 100644
index 0000000..ea777de
Binary files /dev/null and b/pokedex/data/media/icons/68.png differ
diff --git a/pokedex/data/media/icons/69.png b/pokedex/data/media/icons/69.png
new file mode 100644
index 0000000..d92ce71
Binary files /dev/null and b/pokedex/data/media/icons/69.png differ
diff --git a/pokedex/data/media/icons/7.png b/pokedex/data/media/icons/7.png
new file mode 100644
index 0000000..ed59032
Binary files /dev/null and b/pokedex/data/media/icons/7.png differ
diff --git a/pokedex/data/media/icons/70.png b/pokedex/data/media/icons/70.png
new file mode 100644
index 0000000..583a8ee
Binary files /dev/null and b/pokedex/data/media/icons/70.png differ
diff --git a/pokedex/data/media/icons/71.png b/pokedex/data/media/icons/71.png
new file mode 100644
index 0000000..2445a50
Binary files /dev/null and b/pokedex/data/media/icons/71.png differ
diff --git a/pokedex/data/media/icons/72.png b/pokedex/data/media/icons/72.png
new file mode 100644
index 0000000..3a327d1
Binary files /dev/null and b/pokedex/data/media/icons/72.png differ
diff --git a/pokedex/data/media/icons/73.png b/pokedex/data/media/icons/73.png
new file mode 100644
index 0000000..d31414c
Binary files /dev/null and b/pokedex/data/media/icons/73.png differ
diff --git a/pokedex/data/media/icons/74.png b/pokedex/data/media/icons/74.png
new file mode 100644
index 0000000..1d474da
Binary files /dev/null and b/pokedex/data/media/icons/74.png differ
diff --git a/pokedex/data/media/icons/75.png b/pokedex/data/media/icons/75.png
new file mode 100644
index 0000000..d6fc468
Binary files /dev/null and b/pokedex/data/media/icons/75.png differ
diff --git a/pokedex/data/media/icons/76.png b/pokedex/data/media/icons/76.png
new file mode 100644
index 0000000..9aefda0
Binary files /dev/null and b/pokedex/data/media/icons/76.png differ
diff --git a/pokedex/data/media/icons/77.png b/pokedex/data/media/icons/77.png
new file mode 100644
index 0000000..1d06c38
Binary files /dev/null and b/pokedex/data/media/icons/77.png differ
diff --git a/pokedex/data/media/icons/78.png b/pokedex/data/media/icons/78.png
new file mode 100644
index 0000000..665d492
Binary files /dev/null and b/pokedex/data/media/icons/78.png differ
diff --git a/pokedex/data/media/icons/79.png b/pokedex/data/media/icons/79.png
new file mode 100644
index 0000000..b42c0b8
Binary files /dev/null and b/pokedex/data/media/icons/79.png differ
diff --git a/pokedex/data/media/icons/8.png b/pokedex/data/media/icons/8.png
new file mode 100644
index 0000000..37e4e42
Binary files /dev/null and b/pokedex/data/media/icons/8.png differ
diff --git a/pokedex/data/media/icons/80.png b/pokedex/data/media/icons/80.png
new file mode 100644
index 0000000..1dc1e06
Binary files /dev/null and b/pokedex/data/media/icons/80.png differ
diff --git a/pokedex/data/media/icons/81.png b/pokedex/data/media/icons/81.png
new file mode 100644
index 0000000..95e1b01
Binary files /dev/null and b/pokedex/data/media/icons/81.png differ
diff --git a/pokedex/data/media/icons/82.png b/pokedex/data/media/icons/82.png
new file mode 100644
index 0000000..3569cdc
Binary files /dev/null and b/pokedex/data/media/icons/82.png differ
diff --git a/pokedex/data/media/icons/83.png b/pokedex/data/media/icons/83.png
new file mode 100644
index 0000000..c2a92a3
Binary files /dev/null and b/pokedex/data/media/icons/83.png differ
diff --git a/pokedex/data/media/icons/84.png b/pokedex/data/media/icons/84.png
new file mode 100644
index 0000000..96bb5a1
Binary files /dev/null and b/pokedex/data/media/icons/84.png differ
diff --git a/pokedex/data/media/icons/85.png b/pokedex/data/media/icons/85.png
new file mode 100644
index 0000000..e74181f
Binary files /dev/null and b/pokedex/data/media/icons/85.png differ
diff --git a/pokedex/data/media/icons/86.png b/pokedex/data/media/icons/86.png
new file mode 100644
index 0000000..5d0ac75
Binary files /dev/null and b/pokedex/data/media/icons/86.png differ
diff --git a/pokedex/data/media/icons/87.png b/pokedex/data/media/icons/87.png
new file mode 100644
index 0000000..7027464
Binary files /dev/null and b/pokedex/data/media/icons/87.png differ
diff --git a/pokedex/data/media/icons/88.png b/pokedex/data/media/icons/88.png
new file mode 100644
index 0000000..7a9cacb
Binary files /dev/null and b/pokedex/data/media/icons/88.png differ
diff --git a/pokedex/data/media/icons/89.png b/pokedex/data/media/icons/89.png
new file mode 100644
index 0000000..6aabfd2
Binary files /dev/null and b/pokedex/data/media/icons/89.png differ
diff --git a/pokedex/data/media/icons/9.png b/pokedex/data/media/icons/9.png
new file mode 100644
index 0000000..ca63dc9
Binary files /dev/null and b/pokedex/data/media/icons/9.png differ
diff --git a/pokedex/data/media/icons/90.png b/pokedex/data/media/icons/90.png
new file mode 100644
index 0000000..2c69e85
Binary files /dev/null and b/pokedex/data/media/icons/90.png differ
diff --git a/pokedex/data/media/icons/91.png b/pokedex/data/media/icons/91.png
new file mode 100644
index 0000000..f5b2c1c
Binary files /dev/null and b/pokedex/data/media/icons/91.png differ
diff --git a/pokedex/data/media/icons/92.png b/pokedex/data/media/icons/92.png
new file mode 100644
index 0000000..e36882d
Binary files /dev/null and b/pokedex/data/media/icons/92.png differ
diff --git a/pokedex/data/media/icons/93.png b/pokedex/data/media/icons/93.png
new file mode 100644
index 0000000..b517ac5
Binary files /dev/null and b/pokedex/data/media/icons/93.png differ
diff --git a/pokedex/data/media/icons/94.png b/pokedex/data/media/icons/94.png
new file mode 100644
index 0000000..6877d2c
Binary files /dev/null and b/pokedex/data/media/icons/94.png differ
diff --git a/pokedex/data/media/icons/95.png b/pokedex/data/media/icons/95.png
new file mode 100644
index 0000000..cb958f6
Binary files /dev/null and b/pokedex/data/media/icons/95.png differ
diff --git a/pokedex/data/media/icons/96.png b/pokedex/data/media/icons/96.png
new file mode 100644
index 0000000..c7bb94c
Binary files /dev/null and b/pokedex/data/media/icons/96.png differ
diff --git a/pokedex/data/media/icons/97.png b/pokedex/data/media/icons/97.png
new file mode 100644
index 0000000..4980b04
Binary files /dev/null and b/pokedex/data/media/icons/97.png differ
diff --git a/pokedex/data/media/icons/98.png b/pokedex/data/media/icons/98.png
new file mode 100644
index 0000000..3e456ab
Binary files /dev/null and b/pokedex/data/media/icons/98.png differ
diff --git a/pokedex/data/media/icons/99.png b/pokedex/data/media/icons/99.png
new file mode 100644
index 0000000..b72e840
Binary files /dev/null and b/pokedex/data/media/icons/99.png differ
diff --git a/pokedex/data/media/icons/egg-manaphy.png b/pokedex/data/media/icons/egg-manaphy.png
new file mode 100644
index 0000000..d7699b6
Binary files /dev/null and b/pokedex/data/media/icons/egg-manaphy.png differ
diff --git a/pokedex/data/media/icons/egg.png b/pokedex/data/media/icons/egg.png
new file mode 100644
index 0000000..73bce17
Binary files /dev/null and b/pokedex/data/media/icons/egg.png differ
diff --git a/pokedex/db/__init__.py b/pokedex/db/__init__.py
index 0641391..c9b739d 100644
--- a/pokedex/db/__init__.py
+++ b/pokedex/db/__init__.py
@@ -15,9 +15,11 @@ def connect(uri):
         if 'charset' not in uri:
             uri += '?charset=utf8'
 
-        # Tables should be InnoDB, in the event that we're creating them
+        # Tables should be InnoDB, in the event that we're creating them, and
+        # use UTF-8 goddammit!
         for table in metadata.tables.values():
             table.kwargs['mysql_engine'] = 'InnoDB'
+            table.kwargs['mysql_charset'] = 'utf8'
 
     ### Connect
     engine = create_engine(uri)
diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 4c38755..e40f4ed 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -1,6 +1,6 @@
 from sqlalchemy import Column, ForeignKey, MetaData, Table
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import relation
+from sqlalchemy.orm import backref, relation
 from sqlalchemy.types import *
 from sqlalchemy.databases.mysql import *
 
@@ -93,7 +93,7 @@ class Pokemon(TableBase):
     forme_name = Column(Unicode(16))
     forme_base_pokemon_id = Column(Integer, ForeignKey('pokemon.id'))
     generation_id = Column(Integer, ForeignKey('generations.id'))
-    evolution_chain_id = Column(Integer, ForeignKey('evolution_chains.id'), nullable=False)
+    evolution_chain_id = Column(Integer, ForeignKey('evolution_chains.id'))
     evolution_parent_pokemon_id = Column(Integer, ForeignKey('pokemon.id'))
     evolution_method_id = Column(Integer, ForeignKey('evolution_methods.id'))
     evolution_parameter = Column(Unicode(32))
@@ -114,31 +114,31 @@ class Pokemon(TableBase):
 
 class PokemonAbility(TableBase):
     __tablename__ = 'pokemon_abilities'
-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
     ability_id = Column(Integer, ForeignKey('abilities.id'), nullable=False)
-    slot = Column(Integer, primary_key=True, nullable=False)
+    slot = Column(Integer, primary_key=True, nullable=False, autoincrement=False)
 
 class PokemonDexNumber(TableBase):
     __tablename__ = 'pokemon_dex_numbers'
-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
-    generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
+    generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, nullable=False, autoincrement=False)
     pokedex_number = Column(Integer, nullable=False)
 
 class PokemonEggGroup(TableBase):
     __tablename__ = 'pokemon_egg_groups'
-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
-    egg_group_id = Column(Integer, ForeignKey('egg_groups.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
+    egg_group_id = Column(Integer, ForeignKey('egg_groups.id'), primary_key=True, nullable=False, autoincrement=False)
 
 class PokemonFlavorText(TableBase):
     __tablename__ = 'pokemon_flavor_text'
-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
-    version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
+    version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, nullable=False, autoincrement=False)
     flavor_text = Column(Unicode(255), nullable=False)
 
 class PokemonName(TableBase):
     __tablename__ = 'pokemon_names'
-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
-    language_id = Column(Integer, ForeignKey('languages.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
+    language_id = Column(Integer, ForeignKey('languages.id'), primary_key=True, nullable=False, autoincrement=False)
     name = Column(Unicode(16), nullable=False)
 
 class PokemonShape(TableBase):
@@ -149,16 +149,16 @@ class PokemonShape(TableBase):
 
 class PokemonStat(TableBase):
     __tablename__ = 'pokemon_stats'
-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
-    stat_id = Column(Integer, ForeignKey('stats.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
+    stat_id = Column(Integer, ForeignKey('stats.id'), primary_key=True, nullable=False, autoincrement=False)
     base_stat = Column(Integer, nullable=False)
     effort = Column(Integer, nullable=False)
 
 class PokemonType(TableBase):
     __tablename__ = 'pokemon_types'
-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
     type_id = Column(Integer, ForeignKey('types.id'), nullable=False)
-    slot = Column(Integer, primary_key=True, nullable=False)
+    slot = Column(Integer, primary_key=True, nullable=False, autoincrement=False)
 
 class Stat(TableBase):
     __tablename__ = 'stats'
@@ -167,8 +167,8 @@ class Stat(TableBase):
 
 class TypeEfficacy(TableBase):
     __tablename__ = 'type_efficacy'
-    damage_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False)
-    target_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False)
+    damage_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False)
+    target_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False)
     damage_factor = Column(Integer, nullable=False)
 
 class Type(TableBase):
@@ -199,6 +199,10 @@ Pokemon.egg_groups = relation(EggGroup, secondary=PokemonEggGroup.__table__,
                                         order_by=PokemonEggGroup.egg_group_id,
                                         backref='pokemon')
 Pokemon.evolution_chain = relation(EvolutionChain, backref='pokemon')
+Pokemon.evolution_method = relation(EvolutionMethod)
+Pokemon.evolution_children = relation(Pokemon, primaryjoin=Pokemon.id==Pokemon.evolution_parent_pokemon_id,
+                                               backref=backref('evolution_parent',
+                                                               remote_side=[Pokemon.id]))
 Pokemon.flavor_text = relation(PokemonFlavorText, backref='pokemon')
 Pokemon.foreign_names = relation(PokemonName, backref='pokemon')
 Pokemon.generation = relation(Generation, backref='pokemon')
diff --git a/setup.py b/setup.py
index edd8053..d6557d3 100644
--- a/setup.py
+++ b/setup.py
@@ -4,6 +4,7 @@ setup(
     version = '0.1',
     packages = find_packages(),
     package_data = { '': 'data' },
+    install_requires=['SQLAlchemy>=0.5.1'],
 
     entry_points = {
         'console_scripts': [