diff --git a/data/images/cards/finder/french/01c.gif b/data/images/cards/finder/french/01c.gif
new file mode 100644
index 00000000..dd762f4e
Binary files /dev/null and b/data/images/cards/finder/french/01c.gif differ
diff --git a/data/images/cards/finder/french/01c.png b/data/images/cards/finder/french/01c.png
new file mode 100644
index 00000000..0ecb3df1
Binary files /dev/null and b/data/images/cards/finder/french/01c.png differ
diff --git a/data/images/cards/finder/french/01d.gif b/data/images/cards/finder/french/01d.gif
new file mode 100644
index 00000000..62b4eac5
Binary files /dev/null and b/data/images/cards/finder/french/01d.gif differ
diff --git a/data/images/cards/finder/french/01d.png b/data/images/cards/finder/french/01d.png
new file mode 100644
index 00000000..d65c67b4
Binary files /dev/null and b/data/images/cards/finder/french/01d.png differ
diff --git a/data/images/cards/finder/french/01h.gif b/data/images/cards/finder/french/01h.gif
new file mode 100644
index 00000000..edbfc1ac
Binary files /dev/null and b/data/images/cards/finder/french/01h.gif differ
diff --git a/data/images/cards/finder/french/01h.png b/data/images/cards/finder/french/01h.png
new file mode 100644
index 00000000..d1e638dc
Binary files /dev/null and b/data/images/cards/finder/french/01h.png differ
diff --git a/data/images/cards/finder/french/01s.gif b/data/images/cards/finder/french/01s.gif
new file mode 100644
index 00000000..1b9d6d53
Binary files /dev/null and b/data/images/cards/finder/french/01s.gif differ
diff --git a/data/images/cards/finder/french/01s.png b/data/images/cards/finder/french/01s.png
new file mode 100644
index 00000000..afd65bf7
Binary files /dev/null and b/data/images/cards/finder/french/01s.png differ
diff --git a/data/images/cards/finder/french/02c.gif b/data/images/cards/finder/french/02c.gif
new file mode 100644
index 00000000..7b4088fa
Binary files /dev/null and b/data/images/cards/finder/french/02c.gif differ
diff --git a/data/images/cards/finder/french/02c.png b/data/images/cards/finder/french/02c.png
new file mode 100644
index 00000000..16824a96
Binary files /dev/null and b/data/images/cards/finder/french/02c.png differ
diff --git a/data/images/cards/finder/french/02d.gif b/data/images/cards/finder/french/02d.gif
new file mode 100644
index 00000000..28021f0e
Binary files /dev/null and b/data/images/cards/finder/french/02d.gif differ
diff --git a/data/images/cards/finder/french/02d.png b/data/images/cards/finder/french/02d.png
new file mode 100644
index 00000000..b2f9c7fd
Binary files /dev/null and b/data/images/cards/finder/french/02d.png differ
diff --git a/data/images/cards/finder/french/02h.gif b/data/images/cards/finder/french/02h.gif
new file mode 100644
index 00000000..5b73170b
Binary files /dev/null and b/data/images/cards/finder/french/02h.gif differ
diff --git a/data/images/cards/finder/french/02h.png b/data/images/cards/finder/french/02h.png
new file mode 100644
index 00000000..bc47c06d
Binary files /dev/null and b/data/images/cards/finder/french/02h.png differ
diff --git a/data/images/cards/finder/french/02s.gif b/data/images/cards/finder/french/02s.gif
new file mode 100644
index 00000000..780fe8b8
Binary files /dev/null and b/data/images/cards/finder/french/02s.gif differ
diff --git a/data/images/cards/finder/french/02s.png b/data/images/cards/finder/french/02s.png
new file mode 100644
index 00000000..4e98678a
Binary files /dev/null and b/data/images/cards/finder/french/02s.png differ
diff --git a/data/images/cards/finder/french/03c.gif b/data/images/cards/finder/french/03c.gif
new file mode 100644
index 00000000..9fd528ec
Binary files /dev/null and b/data/images/cards/finder/french/03c.gif differ
diff --git a/data/images/cards/finder/french/03c.png b/data/images/cards/finder/french/03c.png
new file mode 100644
index 00000000..e7299ca4
Binary files /dev/null and b/data/images/cards/finder/french/03c.png differ
diff --git a/data/images/cards/finder/french/03d.gif b/data/images/cards/finder/french/03d.gif
new file mode 100644
index 00000000..89700b08
Binary files /dev/null and b/data/images/cards/finder/french/03d.gif differ
diff --git a/data/images/cards/finder/french/03d.png b/data/images/cards/finder/french/03d.png
new file mode 100644
index 00000000..9e07cd79
Binary files /dev/null and b/data/images/cards/finder/french/03d.png differ
diff --git a/data/images/cards/finder/french/03h.gif b/data/images/cards/finder/french/03h.gif
new file mode 100644
index 00000000..4920f36b
Binary files /dev/null and b/data/images/cards/finder/french/03h.gif differ
diff --git a/data/images/cards/finder/french/03h.png b/data/images/cards/finder/french/03h.png
new file mode 100644
index 00000000..e8fa436c
Binary files /dev/null and b/data/images/cards/finder/french/03h.png differ
diff --git a/data/images/cards/finder/french/03s.gif b/data/images/cards/finder/french/03s.gif
new file mode 100644
index 00000000..aacdc7cd
Binary files /dev/null and b/data/images/cards/finder/french/03s.gif differ
diff --git a/data/images/cards/finder/french/03s.png b/data/images/cards/finder/french/03s.png
new file mode 100644
index 00000000..0828746e
Binary files /dev/null and b/data/images/cards/finder/french/03s.png differ
diff --git a/data/images/cards/finder/french/04c.gif b/data/images/cards/finder/french/04c.gif
new file mode 100644
index 00000000..e10c90d7
Binary files /dev/null and b/data/images/cards/finder/french/04c.gif differ
diff --git a/data/images/cards/finder/french/04c.png b/data/images/cards/finder/french/04c.png
new file mode 100644
index 00000000..e725db1e
Binary files /dev/null and b/data/images/cards/finder/french/04c.png differ
diff --git a/data/images/cards/finder/french/04d.gif b/data/images/cards/finder/french/04d.gif
new file mode 100644
index 00000000..d5329838
Binary files /dev/null and b/data/images/cards/finder/french/04d.gif differ
diff --git a/data/images/cards/finder/french/04d.png b/data/images/cards/finder/french/04d.png
new file mode 100644
index 00000000..a2c9973e
Binary files /dev/null and b/data/images/cards/finder/french/04d.png differ
diff --git a/data/images/cards/finder/french/04h.gif b/data/images/cards/finder/french/04h.gif
new file mode 100644
index 00000000..e82aa1bf
Binary files /dev/null and b/data/images/cards/finder/french/04h.gif differ
diff --git a/data/images/cards/finder/french/04h.png b/data/images/cards/finder/french/04h.png
new file mode 100644
index 00000000..6362cb8f
Binary files /dev/null and b/data/images/cards/finder/french/04h.png differ
diff --git a/data/images/cards/finder/french/04s.gif b/data/images/cards/finder/french/04s.gif
new file mode 100644
index 00000000..98626312
Binary files /dev/null and b/data/images/cards/finder/french/04s.gif differ
diff --git a/data/images/cards/finder/french/04s.png b/data/images/cards/finder/french/04s.png
new file mode 100644
index 00000000..b5ed33dd
Binary files /dev/null and b/data/images/cards/finder/french/04s.png differ
diff --git a/data/images/cards/finder/french/05c.gif b/data/images/cards/finder/french/05c.gif
new file mode 100644
index 00000000..d64f570d
Binary files /dev/null and b/data/images/cards/finder/french/05c.gif differ
diff --git a/data/images/cards/finder/french/05c.png b/data/images/cards/finder/french/05c.png
new file mode 100644
index 00000000..56d8c7ed
Binary files /dev/null and b/data/images/cards/finder/french/05c.png differ
diff --git a/data/images/cards/finder/french/05d.gif b/data/images/cards/finder/french/05d.gif
new file mode 100644
index 00000000..f077c89e
Binary files /dev/null and b/data/images/cards/finder/french/05d.gif differ
diff --git a/data/images/cards/finder/french/05d.png b/data/images/cards/finder/french/05d.png
new file mode 100644
index 00000000..858caccb
Binary files /dev/null and b/data/images/cards/finder/french/05d.png differ
diff --git a/data/images/cards/finder/french/05h.gif b/data/images/cards/finder/french/05h.gif
new file mode 100644
index 00000000..adbea6a3
Binary files /dev/null and b/data/images/cards/finder/french/05h.gif differ
diff --git a/data/images/cards/finder/french/05h.png b/data/images/cards/finder/french/05h.png
new file mode 100644
index 00000000..7efbbad8
Binary files /dev/null and b/data/images/cards/finder/french/05h.png differ
diff --git a/data/images/cards/finder/french/05s.gif b/data/images/cards/finder/french/05s.gif
new file mode 100644
index 00000000..e99ed8eb
Binary files /dev/null and b/data/images/cards/finder/french/05s.gif differ
diff --git a/data/images/cards/finder/french/05s.png b/data/images/cards/finder/french/05s.png
new file mode 100644
index 00000000..68c48f98
Binary files /dev/null and b/data/images/cards/finder/french/05s.png differ
diff --git a/data/images/cards/finder/french/06c.gif b/data/images/cards/finder/french/06c.gif
new file mode 100644
index 00000000..212c8967
Binary files /dev/null and b/data/images/cards/finder/french/06c.gif differ
diff --git a/data/images/cards/finder/french/06c.png b/data/images/cards/finder/french/06c.png
new file mode 100644
index 00000000..173c7495
Binary files /dev/null and b/data/images/cards/finder/french/06c.png differ
diff --git a/data/images/cards/finder/french/06d.gif b/data/images/cards/finder/french/06d.gif
new file mode 100644
index 00000000..03d5c42d
Binary files /dev/null and b/data/images/cards/finder/french/06d.gif differ
diff --git a/data/images/cards/finder/french/06d.png b/data/images/cards/finder/french/06d.png
new file mode 100644
index 00000000..489f022f
Binary files /dev/null and b/data/images/cards/finder/french/06d.png differ
diff --git a/data/images/cards/finder/french/06h.gif b/data/images/cards/finder/french/06h.gif
new file mode 100644
index 00000000..46832e59
Binary files /dev/null and b/data/images/cards/finder/french/06h.gif differ
diff --git a/data/images/cards/finder/french/06h.png b/data/images/cards/finder/french/06h.png
new file mode 100644
index 00000000..5e075b2e
Binary files /dev/null and b/data/images/cards/finder/french/06h.png differ
diff --git a/data/images/cards/finder/french/06s.gif b/data/images/cards/finder/french/06s.gif
new file mode 100644
index 00000000..626ff93f
Binary files /dev/null and b/data/images/cards/finder/french/06s.gif differ
diff --git a/data/images/cards/finder/french/06s.png b/data/images/cards/finder/french/06s.png
new file mode 100644
index 00000000..1b5e6d87
Binary files /dev/null and b/data/images/cards/finder/french/06s.png differ
diff --git a/data/images/cards/finder/french/07c.gif b/data/images/cards/finder/french/07c.gif
new file mode 100644
index 00000000..ecd1c76d
Binary files /dev/null and b/data/images/cards/finder/french/07c.gif differ
diff --git a/data/images/cards/finder/french/07c.png b/data/images/cards/finder/french/07c.png
new file mode 100644
index 00000000..e2bfbfda
Binary files /dev/null and b/data/images/cards/finder/french/07c.png differ
diff --git a/data/images/cards/finder/french/07d.gif b/data/images/cards/finder/french/07d.gif
new file mode 100644
index 00000000..c205c90e
Binary files /dev/null and b/data/images/cards/finder/french/07d.gif differ
diff --git a/data/images/cards/finder/french/07d.png b/data/images/cards/finder/french/07d.png
new file mode 100644
index 00000000..d538ba9f
Binary files /dev/null and b/data/images/cards/finder/french/07d.png differ
diff --git a/data/images/cards/finder/french/07h.gif b/data/images/cards/finder/french/07h.gif
new file mode 100644
index 00000000..64e47db8
Binary files /dev/null and b/data/images/cards/finder/french/07h.gif differ
diff --git a/data/images/cards/finder/french/07h.png b/data/images/cards/finder/french/07h.png
new file mode 100644
index 00000000..86d2ab48
Binary files /dev/null and b/data/images/cards/finder/french/07h.png differ
diff --git a/data/images/cards/finder/french/07s.gif b/data/images/cards/finder/french/07s.gif
new file mode 100644
index 00000000..8995cbe6
Binary files /dev/null and b/data/images/cards/finder/french/07s.gif differ
diff --git a/data/images/cards/finder/french/07s.png b/data/images/cards/finder/french/07s.png
new file mode 100644
index 00000000..c49f441c
Binary files /dev/null and b/data/images/cards/finder/french/07s.png differ
diff --git a/data/images/cards/finder/french/08c.gif b/data/images/cards/finder/french/08c.gif
new file mode 100644
index 00000000..8eb31326
Binary files /dev/null and b/data/images/cards/finder/french/08c.gif differ
diff --git a/data/images/cards/finder/french/08c.png b/data/images/cards/finder/french/08c.png
new file mode 100644
index 00000000..cc4a212e
Binary files /dev/null and b/data/images/cards/finder/french/08c.png differ
diff --git a/data/images/cards/finder/french/08d.gif b/data/images/cards/finder/french/08d.gif
new file mode 100644
index 00000000..8a46d2d7
Binary files /dev/null and b/data/images/cards/finder/french/08d.gif differ
diff --git a/data/images/cards/finder/french/08d.png b/data/images/cards/finder/french/08d.png
new file mode 100644
index 00000000..b4ec7b91
Binary files /dev/null and b/data/images/cards/finder/french/08d.png differ
diff --git a/data/images/cards/finder/french/08h.gif b/data/images/cards/finder/french/08h.gif
new file mode 100644
index 00000000..1b2e90b7
Binary files /dev/null and b/data/images/cards/finder/french/08h.gif differ
diff --git a/data/images/cards/finder/french/08h.png b/data/images/cards/finder/french/08h.png
new file mode 100644
index 00000000..f4586de9
Binary files /dev/null and b/data/images/cards/finder/french/08h.png differ
diff --git a/data/images/cards/finder/french/08s.gif b/data/images/cards/finder/french/08s.gif
new file mode 100644
index 00000000..24cee08b
Binary files /dev/null and b/data/images/cards/finder/french/08s.gif differ
diff --git a/data/images/cards/finder/french/08s.png b/data/images/cards/finder/french/08s.png
new file mode 100644
index 00000000..d3e8c8dc
Binary files /dev/null and b/data/images/cards/finder/french/08s.png differ
diff --git a/data/images/cards/finder/french/09c.gif b/data/images/cards/finder/french/09c.gif
new file mode 100644
index 00000000..f90c6a36
Binary files /dev/null and b/data/images/cards/finder/french/09c.gif differ
diff --git a/data/images/cards/finder/french/09c.png b/data/images/cards/finder/french/09c.png
new file mode 100644
index 00000000..55acc388
Binary files /dev/null and b/data/images/cards/finder/french/09c.png differ
diff --git a/data/images/cards/finder/french/09d.gif b/data/images/cards/finder/french/09d.gif
new file mode 100644
index 00000000..61b0d7e4
Binary files /dev/null and b/data/images/cards/finder/french/09d.gif differ
diff --git a/data/images/cards/finder/french/09d.png b/data/images/cards/finder/french/09d.png
new file mode 100644
index 00000000..3c091b54
Binary files /dev/null and b/data/images/cards/finder/french/09d.png differ
diff --git a/data/images/cards/finder/french/09h.gif b/data/images/cards/finder/french/09h.gif
new file mode 100644
index 00000000..bcb2694c
Binary files /dev/null and b/data/images/cards/finder/french/09h.gif differ
diff --git a/data/images/cards/finder/french/09h.png b/data/images/cards/finder/french/09h.png
new file mode 100644
index 00000000..46ab8158
Binary files /dev/null and b/data/images/cards/finder/french/09h.png differ
diff --git a/data/images/cards/finder/french/09s.gif b/data/images/cards/finder/french/09s.gif
new file mode 100644
index 00000000..b7e92052
Binary files /dev/null and b/data/images/cards/finder/french/09s.gif differ
diff --git a/data/images/cards/finder/french/09s.png b/data/images/cards/finder/french/09s.png
new file mode 100644
index 00000000..76c58cfe
Binary files /dev/null and b/data/images/cards/finder/french/09s.png differ
diff --git a/data/images/cards/finder/french/10c.gif b/data/images/cards/finder/french/10c.gif
new file mode 100644
index 00000000..02015c74
Binary files /dev/null and b/data/images/cards/finder/french/10c.gif differ
diff --git a/data/images/cards/finder/french/10c.png b/data/images/cards/finder/french/10c.png
new file mode 100644
index 00000000..67a273c9
Binary files /dev/null and b/data/images/cards/finder/french/10c.png differ
diff --git a/data/images/cards/finder/french/10d.gif b/data/images/cards/finder/french/10d.gif
new file mode 100644
index 00000000..f4db9d68
Binary files /dev/null and b/data/images/cards/finder/french/10d.gif differ
diff --git a/data/images/cards/finder/french/10d.png b/data/images/cards/finder/french/10d.png
new file mode 100644
index 00000000..456a662b
Binary files /dev/null and b/data/images/cards/finder/french/10d.png differ
diff --git a/data/images/cards/finder/french/10h.gif b/data/images/cards/finder/french/10h.gif
new file mode 100644
index 00000000..02099f8a
Binary files /dev/null and b/data/images/cards/finder/french/10h.gif differ
diff --git a/data/images/cards/finder/french/10h.png b/data/images/cards/finder/french/10h.png
new file mode 100644
index 00000000..8112ae2f
Binary files /dev/null and b/data/images/cards/finder/french/10h.png differ
diff --git a/data/images/cards/finder/french/10s.gif b/data/images/cards/finder/french/10s.gif
new file mode 100644
index 00000000..3b7c869f
Binary files /dev/null and b/data/images/cards/finder/french/10s.gif differ
diff --git a/data/images/cards/finder/french/10s.png b/data/images/cards/finder/french/10s.png
new file mode 100644
index 00000000..366a9606
Binary files /dev/null and b/data/images/cards/finder/french/10s.png differ
diff --git a/data/images/cards/finder/french/11c.gif b/data/images/cards/finder/french/11c.gif
new file mode 100644
index 00000000..f300907a
Binary files /dev/null and b/data/images/cards/finder/french/11c.gif differ
diff --git a/data/images/cards/finder/french/11c.png b/data/images/cards/finder/french/11c.png
new file mode 100644
index 00000000..1ca7742d
Binary files /dev/null and b/data/images/cards/finder/french/11c.png differ
diff --git a/data/images/cards/finder/french/11d.gif b/data/images/cards/finder/french/11d.gif
new file mode 100644
index 00000000..28bbd2db
Binary files /dev/null and b/data/images/cards/finder/french/11d.gif differ
diff --git a/data/images/cards/finder/french/11d.png b/data/images/cards/finder/french/11d.png
new file mode 100644
index 00000000..34721727
Binary files /dev/null and b/data/images/cards/finder/french/11d.png differ
diff --git a/data/images/cards/finder/french/11h.gif b/data/images/cards/finder/french/11h.gif
new file mode 100644
index 00000000..919a31e8
Binary files /dev/null and b/data/images/cards/finder/french/11h.gif differ
diff --git a/data/images/cards/finder/french/11h.png b/data/images/cards/finder/french/11h.png
new file mode 100644
index 00000000..6bda3f1c
Binary files /dev/null and b/data/images/cards/finder/french/11h.png differ
diff --git a/data/images/cards/finder/french/11s.gif b/data/images/cards/finder/french/11s.gif
new file mode 100644
index 00000000..40d3a205
Binary files /dev/null and b/data/images/cards/finder/french/11s.gif differ
diff --git a/data/images/cards/finder/french/11s.png b/data/images/cards/finder/french/11s.png
new file mode 100644
index 00000000..a608cf3d
Binary files /dev/null and b/data/images/cards/finder/french/11s.png differ
diff --git a/data/images/cards/finder/french/12c.gif b/data/images/cards/finder/french/12c.gif
new file mode 100644
index 00000000..7e27980c
Binary files /dev/null and b/data/images/cards/finder/french/12c.gif differ
diff --git a/data/images/cards/finder/french/12c.png b/data/images/cards/finder/french/12c.png
new file mode 100644
index 00000000..9b7936bc
Binary files /dev/null and b/data/images/cards/finder/french/12c.png differ
diff --git a/data/images/cards/finder/french/12d.gif b/data/images/cards/finder/french/12d.gif
new file mode 100644
index 00000000..b3c8b6cc
Binary files /dev/null and b/data/images/cards/finder/french/12d.gif differ
diff --git a/data/images/cards/finder/french/12d.png b/data/images/cards/finder/french/12d.png
new file mode 100644
index 00000000..7c9a99b5
Binary files /dev/null and b/data/images/cards/finder/french/12d.png differ
diff --git a/data/images/cards/finder/french/12h.gif b/data/images/cards/finder/french/12h.gif
new file mode 100644
index 00000000..5f467b2e
Binary files /dev/null and b/data/images/cards/finder/french/12h.gif differ
diff --git a/data/images/cards/finder/french/12h.png b/data/images/cards/finder/french/12h.png
new file mode 100644
index 00000000..d4184717
Binary files /dev/null and b/data/images/cards/finder/french/12h.png differ
diff --git a/data/images/cards/finder/french/12s.gif b/data/images/cards/finder/french/12s.gif
new file mode 100644
index 00000000..2ff4026d
Binary files /dev/null and b/data/images/cards/finder/french/12s.gif differ
diff --git a/data/images/cards/finder/french/12s.png b/data/images/cards/finder/french/12s.png
new file mode 100644
index 00000000..d4e047a3
Binary files /dev/null and b/data/images/cards/finder/french/12s.png differ
diff --git a/data/images/cards/finder/french/13c.gif b/data/images/cards/finder/french/13c.gif
new file mode 100644
index 00000000..85178f23
Binary files /dev/null and b/data/images/cards/finder/french/13c.gif differ
diff --git a/data/images/cards/finder/french/13c.png b/data/images/cards/finder/french/13c.png
new file mode 100644
index 00000000..566b8de1
Binary files /dev/null and b/data/images/cards/finder/french/13c.png differ
diff --git a/data/images/cards/finder/french/13d.gif b/data/images/cards/finder/french/13d.gif
new file mode 100644
index 00000000..d932186b
Binary files /dev/null and b/data/images/cards/finder/french/13d.gif differ
diff --git a/data/images/cards/finder/french/13d.png b/data/images/cards/finder/french/13d.png
new file mode 100644
index 00000000..afca5200
Binary files /dev/null and b/data/images/cards/finder/french/13d.png differ
diff --git a/data/images/cards/finder/french/13h.gif b/data/images/cards/finder/french/13h.gif
new file mode 100644
index 00000000..beab17ca
Binary files /dev/null and b/data/images/cards/finder/french/13h.gif differ
diff --git a/data/images/cards/finder/french/13h.png b/data/images/cards/finder/french/13h.png
new file mode 100644
index 00000000..690d2df9
Binary files /dev/null and b/data/images/cards/finder/french/13h.png differ
diff --git a/data/images/cards/finder/french/13s.gif b/data/images/cards/finder/french/13s.gif
new file mode 100644
index 00000000..7eb7ca43
Binary files /dev/null and b/data/images/cards/finder/french/13s.gif differ
diff --git a/data/images/cards/finder/french/13s.png b/data/images/cards/finder/french/13s.png
new file mode 100644
index 00000000..b66b8ab6
Binary files /dev/null and b/data/images/cards/finder/french/13s.png differ
diff --git a/data/images/cards/finder/hanafuda/01a.gif b/data/images/cards/finder/hanafuda/01a.gif
new file mode 100644
index 00000000..5f7b2245
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01a.gif differ
diff --git a/data/images/cards/finder/hanafuda/01a.png b/data/images/cards/finder/hanafuda/01a.png
new file mode 100644
index 00000000..d1efb428
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01a.png differ
diff --git a/data/images/cards/finder/hanafuda/01b.gif b/data/images/cards/finder/hanafuda/01b.gif
new file mode 100644
index 00000000..6a4d4d8b
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01b.gif differ
diff --git a/data/images/cards/finder/hanafuda/01b.png b/data/images/cards/finder/hanafuda/01b.png
new file mode 100644
index 00000000..743f35d5
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01b.png differ
diff --git a/data/images/cards/finder/hanafuda/01c.gif b/data/images/cards/finder/hanafuda/01c.gif
new file mode 100644
index 00000000..2489abe1
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01c.gif differ
diff --git a/data/images/cards/finder/hanafuda/01c.png b/data/images/cards/finder/hanafuda/01c.png
new file mode 100644
index 00000000..316a69b3
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01c.png differ
diff --git a/data/images/cards/finder/hanafuda/01d.gif b/data/images/cards/finder/hanafuda/01d.gif
new file mode 100644
index 00000000..4ecc59db
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01d.gif differ
diff --git a/data/images/cards/finder/hanafuda/01d.png b/data/images/cards/finder/hanafuda/01d.png
new file mode 100644
index 00000000..b5bafa62
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01d.png differ
diff --git a/data/images/cards/finder/hanafuda/01e.gif b/data/images/cards/finder/hanafuda/01e.gif
new file mode 100644
index 00000000..f0f59610
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01e.gif differ
diff --git a/data/images/cards/finder/hanafuda/01e.png b/data/images/cards/finder/hanafuda/01e.png
new file mode 100644
index 00000000..3b583fb5
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01e.png differ
diff --git a/data/images/cards/finder/hanafuda/01f.gif b/data/images/cards/finder/hanafuda/01f.gif
new file mode 100644
index 00000000..c91ebf4d
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01f.gif differ
diff --git a/data/images/cards/finder/hanafuda/01f.png b/data/images/cards/finder/hanafuda/01f.png
new file mode 100644
index 00000000..c130bd80
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01f.png differ
diff --git a/data/images/cards/finder/hanafuda/01g.gif b/data/images/cards/finder/hanafuda/01g.gif
new file mode 100644
index 00000000..c4424f6f
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01g.gif differ
diff --git a/data/images/cards/finder/hanafuda/01g.png b/data/images/cards/finder/hanafuda/01g.png
new file mode 100644
index 00000000..9d8cd947
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01g.png differ
diff --git a/data/images/cards/finder/hanafuda/01h.gif b/data/images/cards/finder/hanafuda/01h.gif
new file mode 100644
index 00000000..459812a1
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01h.gif differ
diff --git a/data/images/cards/finder/hanafuda/01h.png b/data/images/cards/finder/hanafuda/01h.png
new file mode 100644
index 00000000..858bb0c3
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01h.png differ
diff --git a/data/images/cards/finder/hanafuda/01i.gif b/data/images/cards/finder/hanafuda/01i.gif
new file mode 100644
index 00000000..373e43cb
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01i.gif differ
diff --git a/data/images/cards/finder/hanafuda/01i.png b/data/images/cards/finder/hanafuda/01i.png
new file mode 100644
index 00000000..df66cbea
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01i.png differ
diff --git a/data/images/cards/finder/hanafuda/01j.gif b/data/images/cards/finder/hanafuda/01j.gif
new file mode 100644
index 00000000..4c93f177
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01j.gif differ
diff --git a/data/images/cards/finder/hanafuda/01j.png b/data/images/cards/finder/hanafuda/01j.png
new file mode 100644
index 00000000..361c988b
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01j.png differ
diff --git a/data/images/cards/finder/hanafuda/01k.gif b/data/images/cards/finder/hanafuda/01k.gif
new file mode 100644
index 00000000..2bf552a3
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01k.gif differ
diff --git a/data/images/cards/finder/hanafuda/01k.png b/data/images/cards/finder/hanafuda/01k.png
new file mode 100644
index 00000000..45407827
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01k.png differ
diff --git a/data/images/cards/finder/hanafuda/01l.gif b/data/images/cards/finder/hanafuda/01l.gif
new file mode 100644
index 00000000..7ca05dcf
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01l.gif differ
diff --git a/data/images/cards/finder/hanafuda/01l.png b/data/images/cards/finder/hanafuda/01l.png
new file mode 100644
index 00000000..5d84a988
Binary files /dev/null and b/data/images/cards/finder/hanafuda/01l.png differ
diff --git a/data/images/cards/finder/hanafuda/02a.gif b/data/images/cards/finder/hanafuda/02a.gif
new file mode 100644
index 00000000..6660ab0c
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02a.gif differ
diff --git a/data/images/cards/finder/hanafuda/02a.png b/data/images/cards/finder/hanafuda/02a.png
new file mode 100644
index 00000000..97e87bfc
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02a.png differ
diff --git a/data/images/cards/finder/hanafuda/02b.gif b/data/images/cards/finder/hanafuda/02b.gif
new file mode 100644
index 00000000..3db44e19
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02b.gif differ
diff --git a/data/images/cards/finder/hanafuda/02b.png b/data/images/cards/finder/hanafuda/02b.png
new file mode 100644
index 00000000..956bffbf
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02b.png differ
diff --git a/data/images/cards/finder/hanafuda/02c.gif b/data/images/cards/finder/hanafuda/02c.gif
new file mode 100644
index 00000000..b8d7084a
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02c.gif differ
diff --git a/data/images/cards/finder/hanafuda/02c.png b/data/images/cards/finder/hanafuda/02c.png
new file mode 100644
index 00000000..32d9b86e
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02c.png differ
diff --git a/data/images/cards/finder/hanafuda/02d.gif b/data/images/cards/finder/hanafuda/02d.gif
new file mode 100644
index 00000000..5fefb596
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02d.gif differ
diff --git a/data/images/cards/finder/hanafuda/02d.png b/data/images/cards/finder/hanafuda/02d.png
new file mode 100644
index 00000000..4a6c2f3e
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02d.png differ
diff --git a/data/images/cards/finder/hanafuda/02e.gif b/data/images/cards/finder/hanafuda/02e.gif
new file mode 100644
index 00000000..d3964423
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02e.gif differ
diff --git a/data/images/cards/finder/hanafuda/02e.png b/data/images/cards/finder/hanafuda/02e.png
new file mode 100644
index 00000000..08fc515b
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02e.png differ
diff --git a/data/images/cards/finder/hanafuda/02f.gif b/data/images/cards/finder/hanafuda/02f.gif
new file mode 100644
index 00000000..e5859e56
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02f.gif differ
diff --git a/data/images/cards/finder/hanafuda/02f.png b/data/images/cards/finder/hanafuda/02f.png
new file mode 100644
index 00000000..b2bee1ac
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02f.png differ
diff --git a/data/images/cards/finder/hanafuda/02g.gif b/data/images/cards/finder/hanafuda/02g.gif
new file mode 100644
index 00000000..42b5a8ac
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02g.gif differ
diff --git a/data/images/cards/finder/hanafuda/02g.png b/data/images/cards/finder/hanafuda/02g.png
new file mode 100644
index 00000000..9ba76572
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02g.png differ
diff --git a/data/images/cards/finder/hanafuda/02h.gif b/data/images/cards/finder/hanafuda/02h.gif
new file mode 100644
index 00000000..3cb308ff
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02h.gif differ
diff --git a/data/images/cards/finder/hanafuda/02h.png b/data/images/cards/finder/hanafuda/02h.png
new file mode 100644
index 00000000..617f9a82
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02h.png differ
diff --git a/data/images/cards/finder/hanafuda/02i.gif b/data/images/cards/finder/hanafuda/02i.gif
new file mode 100644
index 00000000..e592c148
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02i.gif differ
diff --git a/data/images/cards/finder/hanafuda/02i.png b/data/images/cards/finder/hanafuda/02i.png
new file mode 100644
index 00000000..679d16ab
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02i.png differ
diff --git a/data/images/cards/finder/hanafuda/02j.gif b/data/images/cards/finder/hanafuda/02j.gif
new file mode 100644
index 00000000..2a50885c
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02j.gif differ
diff --git a/data/images/cards/finder/hanafuda/02j.png b/data/images/cards/finder/hanafuda/02j.png
new file mode 100644
index 00000000..b17a699f
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02j.png differ
diff --git a/data/images/cards/finder/hanafuda/02k.gif b/data/images/cards/finder/hanafuda/02k.gif
new file mode 100644
index 00000000..8cf5d972
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02k.gif differ
diff --git a/data/images/cards/finder/hanafuda/02k.png b/data/images/cards/finder/hanafuda/02k.png
new file mode 100644
index 00000000..ffa640b7
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02k.png differ
diff --git a/data/images/cards/finder/hanafuda/02l.gif b/data/images/cards/finder/hanafuda/02l.gif
new file mode 100644
index 00000000..ded519f1
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02l.gif differ
diff --git a/data/images/cards/finder/hanafuda/02l.png b/data/images/cards/finder/hanafuda/02l.png
new file mode 100644
index 00000000..b5495654
Binary files /dev/null and b/data/images/cards/finder/hanafuda/02l.png differ
diff --git a/data/images/cards/finder/hanafuda/03a.gif b/data/images/cards/finder/hanafuda/03a.gif
new file mode 100644
index 00000000..94ec9bff
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03a.gif differ
diff --git a/data/images/cards/finder/hanafuda/03a.png b/data/images/cards/finder/hanafuda/03a.png
new file mode 100644
index 00000000..0f034b09
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03a.png differ
diff --git a/data/images/cards/finder/hanafuda/03b.gif b/data/images/cards/finder/hanafuda/03b.gif
new file mode 100644
index 00000000..ffc38f1d
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03b.gif differ
diff --git a/data/images/cards/finder/hanafuda/03b.png b/data/images/cards/finder/hanafuda/03b.png
new file mode 100644
index 00000000..383a155e
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03b.png differ
diff --git a/data/images/cards/finder/hanafuda/03c.gif b/data/images/cards/finder/hanafuda/03c.gif
new file mode 100644
index 00000000..9c8ad3ff
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03c.gif differ
diff --git a/data/images/cards/finder/hanafuda/03c.png b/data/images/cards/finder/hanafuda/03c.png
new file mode 100644
index 00000000..d6684ce5
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03c.png differ
diff --git a/data/images/cards/finder/hanafuda/03d.gif b/data/images/cards/finder/hanafuda/03d.gif
new file mode 100644
index 00000000..1ae7fd4f
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03d.gif differ
diff --git a/data/images/cards/finder/hanafuda/03d.png b/data/images/cards/finder/hanafuda/03d.png
new file mode 100644
index 00000000..633bf241
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03d.png differ
diff --git a/data/images/cards/finder/hanafuda/03e.gif b/data/images/cards/finder/hanafuda/03e.gif
new file mode 100644
index 00000000..ac310b1e
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03e.gif differ
diff --git a/data/images/cards/finder/hanafuda/03e.png b/data/images/cards/finder/hanafuda/03e.png
new file mode 100644
index 00000000..7764abef
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03e.png differ
diff --git a/data/images/cards/finder/hanafuda/03f.gif b/data/images/cards/finder/hanafuda/03f.gif
new file mode 100644
index 00000000..bc577085
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03f.gif differ
diff --git a/data/images/cards/finder/hanafuda/03f.png b/data/images/cards/finder/hanafuda/03f.png
new file mode 100644
index 00000000..f0429c86
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03f.png differ
diff --git a/data/images/cards/finder/hanafuda/03g.gif b/data/images/cards/finder/hanafuda/03g.gif
new file mode 100644
index 00000000..6ec9f094
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03g.gif differ
diff --git a/data/images/cards/finder/hanafuda/03g.png b/data/images/cards/finder/hanafuda/03g.png
new file mode 100644
index 00000000..7920fc72
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03g.png differ
diff --git a/data/images/cards/finder/hanafuda/03h.gif b/data/images/cards/finder/hanafuda/03h.gif
new file mode 100644
index 00000000..ef9e6816
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03h.gif differ
diff --git a/data/images/cards/finder/hanafuda/03h.png b/data/images/cards/finder/hanafuda/03h.png
new file mode 100644
index 00000000..bdb3fb46
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03h.png differ
diff --git a/data/images/cards/finder/hanafuda/03i.gif b/data/images/cards/finder/hanafuda/03i.gif
new file mode 100644
index 00000000..9aa1d8e9
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03i.gif differ
diff --git a/data/images/cards/finder/hanafuda/03i.png b/data/images/cards/finder/hanafuda/03i.png
new file mode 100644
index 00000000..56f9f3cb
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03i.png differ
diff --git a/data/images/cards/finder/hanafuda/03j.gif b/data/images/cards/finder/hanafuda/03j.gif
new file mode 100644
index 00000000..01f635fc
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03j.gif differ
diff --git a/data/images/cards/finder/hanafuda/03j.png b/data/images/cards/finder/hanafuda/03j.png
new file mode 100644
index 00000000..a7413241
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03j.png differ
diff --git a/data/images/cards/finder/hanafuda/03k.gif b/data/images/cards/finder/hanafuda/03k.gif
new file mode 100644
index 00000000..8d767788
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03k.gif differ
diff --git a/data/images/cards/finder/hanafuda/03k.png b/data/images/cards/finder/hanafuda/03k.png
new file mode 100644
index 00000000..a13d70d0
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03k.png differ
diff --git a/data/images/cards/finder/hanafuda/03l.gif b/data/images/cards/finder/hanafuda/03l.gif
new file mode 100644
index 00000000..f5225c39
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03l.gif differ
diff --git a/data/images/cards/finder/hanafuda/03l.png b/data/images/cards/finder/hanafuda/03l.png
new file mode 100644
index 00000000..94955e1e
Binary files /dev/null and b/data/images/cards/finder/hanafuda/03l.png differ
diff --git a/data/images/cards/finder/hanafuda/04a.gif b/data/images/cards/finder/hanafuda/04a.gif
new file mode 100644
index 00000000..0e468eb2
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04a.gif differ
diff --git a/data/images/cards/finder/hanafuda/04a.png b/data/images/cards/finder/hanafuda/04a.png
new file mode 100644
index 00000000..62299767
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04a.png differ
diff --git a/data/images/cards/finder/hanafuda/04b.gif b/data/images/cards/finder/hanafuda/04b.gif
new file mode 100644
index 00000000..efe0c547
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04b.gif differ
diff --git a/data/images/cards/finder/hanafuda/04b.png b/data/images/cards/finder/hanafuda/04b.png
new file mode 100644
index 00000000..6f2c56ac
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04b.png differ
diff --git a/data/images/cards/finder/hanafuda/04c.gif b/data/images/cards/finder/hanafuda/04c.gif
new file mode 100644
index 00000000..78574830
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04c.gif differ
diff --git a/data/images/cards/finder/hanafuda/04c.png b/data/images/cards/finder/hanafuda/04c.png
new file mode 100644
index 00000000..d840cc94
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04c.png differ
diff --git a/data/images/cards/finder/hanafuda/04d.gif b/data/images/cards/finder/hanafuda/04d.gif
new file mode 100644
index 00000000..7b0e90c2
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04d.gif differ
diff --git a/data/images/cards/finder/hanafuda/04d.png b/data/images/cards/finder/hanafuda/04d.png
new file mode 100644
index 00000000..57f818d4
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04d.png differ
diff --git a/data/images/cards/finder/hanafuda/04e.gif b/data/images/cards/finder/hanafuda/04e.gif
new file mode 100644
index 00000000..dee002d8
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04e.gif differ
diff --git a/data/images/cards/finder/hanafuda/04e.png b/data/images/cards/finder/hanafuda/04e.png
new file mode 100644
index 00000000..6618ad75
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04e.png differ
diff --git a/data/images/cards/finder/hanafuda/04f.gif b/data/images/cards/finder/hanafuda/04f.gif
new file mode 100644
index 00000000..27862c32
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04f.gif differ
diff --git a/data/images/cards/finder/hanafuda/04f.png b/data/images/cards/finder/hanafuda/04f.png
new file mode 100644
index 00000000..4d84503f
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04f.png differ
diff --git a/data/images/cards/finder/hanafuda/04g.gif b/data/images/cards/finder/hanafuda/04g.gif
new file mode 100644
index 00000000..43189fed
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04g.gif differ
diff --git a/data/images/cards/finder/hanafuda/04g.png b/data/images/cards/finder/hanafuda/04g.png
new file mode 100644
index 00000000..5327c256
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04g.png differ
diff --git a/data/images/cards/finder/hanafuda/04h.gif b/data/images/cards/finder/hanafuda/04h.gif
new file mode 100644
index 00000000..85345182
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04h.gif differ
diff --git a/data/images/cards/finder/hanafuda/04h.png b/data/images/cards/finder/hanafuda/04h.png
new file mode 100644
index 00000000..7fd66211
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04h.png differ
diff --git a/data/images/cards/finder/hanafuda/04i.gif b/data/images/cards/finder/hanafuda/04i.gif
new file mode 100644
index 00000000..0eb8a505
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04i.gif differ
diff --git a/data/images/cards/finder/hanafuda/04i.png b/data/images/cards/finder/hanafuda/04i.png
new file mode 100644
index 00000000..a4c4ba6c
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04i.png differ
diff --git a/data/images/cards/finder/hanafuda/04j.gif b/data/images/cards/finder/hanafuda/04j.gif
new file mode 100644
index 00000000..5b71a4f8
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04j.gif differ
diff --git a/data/images/cards/finder/hanafuda/04j.png b/data/images/cards/finder/hanafuda/04j.png
new file mode 100644
index 00000000..2b823627
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04j.png differ
diff --git a/data/images/cards/finder/hanafuda/04k.gif b/data/images/cards/finder/hanafuda/04k.gif
new file mode 100644
index 00000000..d02186d7
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04k.gif differ
diff --git a/data/images/cards/finder/hanafuda/04k.png b/data/images/cards/finder/hanafuda/04k.png
new file mode 100644
index 00000000..9b29b057
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04k.png differ
diff --git a/data/images/cards/finder/hanafuda/04l.gif b/data/images/cards/finder/hanafuda/04l.gif
new file mode 100644
index 00000000..149bd8ed
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04l.gif differ
diff --git a/data/images/cards/finder/hanafuda/04l.png b/data/images/cards/finder/hanafuda/04l.png
new file mode 100644
index 00000000..05342ed8
Binary files /dev/null and b/data/images/cards/finder/hanafuda/04l.png differ
diff --git a/pysollib/game/__init__.py b/pysollib/game/__init__.py
index f2139b8a..1fb97703 100644
--- a/pysollib/game/__init__.py
+++ b/pysollib/game/__init__.py
@@ -3415,7 +3415,8 @@ class Game(object):
 
     # for find_card_dialog
     def canFindCard(self):
-        return self.gameinfo.category == GI.GC_FRENCH
+        return (self.gameinfo.category == GI.GC_FRENCH or
+                self.gameinfo.category == GI.GC_HANAFUDA)
 
     #
     # subclass hooks
diff --git a/pysollib/resource.py b/pysollib/resource.py
index e5517d28..0e7d8fb3 100644
--- a/pysollib/resource.py
+++ b/pysollib/resource.py
@@ -217,6 +217,42 @@ class CSI:
         9: "trumps-only",
     }
 
+    TYPE_SUITS = {
+        1: "cshd",
+        2: "abcdefghijkl",
+        3: "cshd",
+        4: "abc",
+        5: "cshd",
+        6: "abcdefgh",
+        7: "abcdefghi",
+        8: "abcdefghij",
+        9: "",
+    }
+
+    TYPE_RANKS = {
+        1: list(range(13)),
+        2: list(range(4)),
+        3: list(range(14)),
+        4: list(range(10)),
+        5: list(range(16)),
+        6: list(range(12)),
+        7: list(range(12)),
+        8: list(range(12)),
+        9: list(range(0)),
+    }
+
+    TYPE_TRUMPS = {
+        1: (),
+        2: (),
+        3: list(range(22)),
+        4: list(range(12)),
+        5: list(range(4)),
+        6: (),
+        7: (),
+        8: (),
+        9: (),
+    }
+
     # cardset styles
     STYLE = {
         1:  _("Adult"),                #
@@ -408,44 +444,28 @@ class CardsetManager(ResourceManager):
         if s not in CSI.TYPE:
             return 0
         cs.si.type = s
+        cs.suits = CSI.TYPE_SUITS[s]
+        cs.ranks = CSI.TYPE_RANKS[s]
+        cs.trumps = CSI.TYPE_TRUMPS[s]
         if s == CSI.TYPE_FRENCH:
-            cs.ranks = list(range(13))
-            cs.suits = "cshd"
+            pass
         elif s == CSI.TYPE_HANAFUDA:
             cs.nbottoms = 15
-            cs.ranks = list(range(4))
-            cs.suits = "abcdefghijkl"
         elif s == CSI.TYPE_TAROCK:
             cs.nbottoms = 8
-            cs.ranks = list(range(14))
-            cs.suits = "cshd"
-            cs.trumps = list(range(22))
         elif s == CSI.TYPE_MAHJONGG:
-            cs.ranks = list(range(10))
-            cs.suits = "abc"
-            cs.trumps = list(range(12))
-            #
             cs.nbottoms = 0
             cs.nletters = 0
             cs.nshadows = 0
         elif s == CSI.TYPE_HEXADECK:
             cs.nbottoms = 8
-            cs.ranks = list(range(16))
-            cs.suits = "cshd"
-            cs.trumps = list(range(4))
         elif s == CSI.TYPE_MUGHAL_GANJIFA:
             cs.nbottoms = 11
-            cs.ranks = list(range(12))
-            cs.suits = "abcdefgh"
         elif s == CSI.TYPE_NAVAGRAHA_GANJIFA:
             # ???return 0                            ## FIXME
             cs.nbottoms = 12
-            cs.ranks = list(range(12))
-            cs.suits = "abcdefghi"
         elif s == CSI.TYPE_DASHAVATARA_GANJIFA:
             cs.nbottoms = 13
-            cs.ranks = list(range(12))
-            cs.suits = "abcdefghij"
         elif s == CSI.TYPE_TRUMP_ONLY:
             # ???return 0                            ## FIXME
             # cs.nbottoms = 7
@@ -455,8 +475,6 @@ class CardsetManager(ResourceManager):
             cs.nbottoms = 1
             cs.nletters = 0
             cs.nshadows = 0
-            cs.ranks = ()
-            cs.suits = ""
             cs.trumps = list(range(cs.ncards))
 
         else:
diff --git a/pysollib/ui/tktile/findcarddialog.py b/pysollib/ui/tktile/findcarddialog.py
index 7c9baed1..14e6d3f3 100644
--- a/pysollib/ui/tktile/findcarddialog.py
+++ b/pysollib/ui/tktile/findcarddialog.py
@@ -24,6 +24,7 @@
 import os
 
 from pysollib.mygettext import _
+from pysollib.resource import CSI
 from pysollib.settings import TITLE
 from pysollib.ui.tktile.tkcanvas import MfxCanvas, MfxCanvasGroup
 from pysollib.ui.tktile.tkcanvas import MfxCanvasImage, MfxCanvasRectangle
@@ -38,21 +39,26 @@ SMALL_EMBLEMS_SIZE = (31, 21)
 
 
 class FindCardDialog(tkinter.Toplevel):
-    CARD_IMAGES = {}  # key: (rank, suit)
+    CARD_IMAGES = {}  # key: (type, rank, suit)
 
-    def __init__(self, parent, game, dir, size='large'):
+    def __init__(self, parent, game, dir):
         tkinter.Toplevel.__init__(self)
         title = TITLE + ' - ' + _('Find card')
         self.title(title)
         self.wm_resizable(False, False)
+        self.cardsettype = game.gameinfo.category
+        cs_type = CSI.TYPE_ID[self.cardsettype]
         #
         # self.images_dir = dir
-        if size == 'large':
-            self.images_dir = os.path.join(dir, 'large')
-            self.label_width, self.label_height = LARGE_EMBLEMS_SIZE
-        else:
-            self.images_dir = os.path.join(dir, 'small')
-            self.label_width, self.label_height = SMALL_EMBLEMS_SIZE
+        self.images_dir = os.path.join(dir, 'finder', cs_type)
+        self.label_width, self.label_height = LARGE_EMBLEMS_SIZE
+        # if size == 'large':
+        #     self.images_dir = os.path.join(dir, 'large', cs_type)
+        #     self.label_width, self.label_height = LARGE_EMBLEMS_SIZE
+        # else:
+        #     self.images_dir = os.path.join(dir, 'small')
+        #     self.label_width, self.label_height = SMALL_EMBLEMS_SIZE
+
         self.canvas = MfxCanvas(self, bg='white')
         # self.canvas = MfxCanvas(self, bg='black')
         self.canvas.pack(expand=True, fill='both')
@@ -77,13 +83,13 @@ class FindCardDialog(tkinter.Toplevel):
         canvas = self.canvas
         group = MfxCanvasGroup(canvas)
         #
-        im = FindCardDialog.CARD_IMAGES.get((rank, suit))
+        im = FindCardDialog.CARD_IMAGES.get((self.cardsettype, rank, suit))
         if im is None:
             r = '%02d' % (rank+1)
-            s = 'cshd'[suit]
+            s = CSI.TYPE_SUITS[self.cardsettype][suit]
             fn = os.path.join(dir, r+s+'.gif')
             im = makeImage(file=fn)
-            FindCardDialog.CARD_IMAGES[(rank, suit)] = im
+            FindCardDialog.CARD_IMAGES[(self.cardsettype, rank, suit)] = im
         cim = MfxCanvasImage(canvas, x0, y0, image=im, anchor='nw')
         cim.addtag(group)
         cim.lower()