diff --git a/MANIFEST.in b/MANIFEST.in
index 22416433..6580affe 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -61,3 +61,8 @@ graft data/cardset-oxymoron
 graft data/cardset-standard
 graft data/cardset-tuxedo
 graft data/cardset-vienna-2k
+##
+## exclude dirs
+##
+global-exclude .xvpics/* .thumbnails/*
+global-exclude .svn/* .svn/*/*
diff --git a/po/games.pot b/po/games.pot
index f3afc809..fdc5b81f 100644
--- a/po/games.pot
+++ b/po/games.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PySol 0.0.1\n"
-"POT-Creation-Date: Mon Nov  6 09:46:50 2006\n"
+"POT-Creation-Date: Tue Nov  7 05:42:15 2006\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -534,6 +534,9 @@ msgstr ""
 msgid "Chinese Solitaire"
 msgstr ""
 
+msgid "Chinese Spider"
+msgstr ""
+
 msgid "Chip"
 msgstr ""
 
diff --git a/po/pysol.pot b/po/pysol.pot
index 6d8c93bd..d08e9958 100644
--- a/po/pysol.pot
+++ b/po/pysol.pot
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "#-#-#-#-#  pysol-1.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Mon Nov  6 09:47:42 2006\n"
+"POT-Creation-Date: Tue Nov  7 05:43:10 2006\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 "#-#-#-#-#  pysol-2.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-11-06 09:47+0300\n"
+"POT-Creation-Date: 2006-11-07 05:43+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,7 +69,7 @@ msgid "&Next number"
 msgstr ""
 
 #: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155
-#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865
+#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1864
 #: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122
 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143
 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155
@@ -87,8 +87,8 @@ msgid "&OK"
 msgstr ""
 
 #: pysollib/actions.py:314 pysollib/app.py:893 pysollib/app.py:1167
-#: pysollib/game.py:929 pysollib/game.py:1315 pysollib/game.py:1330
-#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/colorsdialog.py:122
+#: pysollib/game.py:929 pysollib/game.py:1314 pysollib/game.py:1329
+#: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/colorsdialog.py:122
 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143
 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1122
 #: pysollib/tk/menubar.py:1124 pysollib/tk/playeroptionsdialog.py:85
@@ -111,108 +111,108 @@ msgstr ""
 msgid "Quit "
 msgstr ""
 
-#: pysollib/actions.py:449
+#: pysollib/actions.py:450
 msgid "Clear bookmarks"
 msgstr ""
 
-#: pysollib/actions.py:450
+#: pysollib/actions.py:451
 msgid "Clear all bookmarks ?"
 msgstr ""
 
-#: pysollib/actions.py:460
+#: pysollib/actions.py:461
 msgid "Restart game"
 msgstr ""
 
-#: pysollib/actions.py:461
+#: pysollib/actions.py:462
 msgid "Restart this game ?"
 msgstr ""
 
-#: pysollib/actions.py:502
+#: pysollib/actions.py:503
 msgid ""
 "Comments for %s:\n"
 "\n"
 msgstr ""
 
-#: pysollib/actions.py:504
+#: pysollib/actions.py:505
 msgid "Comments for "
 msgstr ""
 
-#: pysollib/actions.py:522 pysollib/actions.py:550
+#: pysollib/actions.py:523 pysollib/actions.py:551
 msgid "Error while writing to file"
 msgstr ""
 
-#: pysollib/actions.py:525 pysollib/actions.py:553
+#: pysollib/actions.py:526 pysollib/actions.py:554
 msgid " Info"
 msgstr ""
 
-#: pysollib/actions.py:526
+#: pysollib/actions.py:527
 msgid ""
 "Comments were appended to\n"
 "\n"
 msgstr ""
 
-#: pysollib/actions.py:537
+#: pysollib/actions.py:538
 msgid "Demo statistics"
 msgstr ""
 
-#: pysollib/actions.py:540
+#: pysollib/actions.py:541
 msgid "Your statistics"
 msgstr ""
 
-#: pysollib/actions.py:554
+#: pysollib/actions.py:555
 msgid ""
 " were appended to\n"
 "\n"
 msgstr ""
 
-#: pysollib/actions.py:568
+#: pysollib/actions.py:569
 msgid " Demo"
 msgstr ""
 
-#: pysollib/actions.py:568
+#: pysollib/actions.py:569
 msgid " Demo "
 msgstr ""
 
-#: pysollib/actions.py:571 pysollib/actions.py:589
+#: pysollib/actions.py:572 pysollib/actions.py:590
 msgid " for "
 msgstr ""
 
-#: pysollib/actions.py:577 pysollib/stats.py:206
+#: pysollib/actions.py:578 pysollib/stats.py:206
 msgid "Statistics for "
 msgstr ""
 
-#: pysollib/actions.py:580 pysollib/tk/selectgame.py:350
+#: pysollib/actions.py:581 pysollib/tk/selectgame.py:350
 #: pysollib/tk/toolbar.py:208
 msgid "Statistics"
 msgstr ""
 
-#: pysollib/actions.py:583 data/glade-translations:31
+#: pysollib/actions.py:584 data/glade-translations:31
 msgid "Full log"
 msgstr ""
 
-#: pysollib/actions.py:586 data/glade-translations:32
+#: pysollib/actions.py:587 data/glade-translations:32
 msgid "Session log"
 msgstr ""
 
-#: pysollib/actions.py:592
+#: pysollib/actions.py:593
 msgid "Game Info"
 msgstr ""
 
-#: pysollib/actions.py:608
+#: pysollib/actions.py:609
 msgid "Reset all statistics"
 msgstr ""
 
-#: pysollib/actions.py:609
+#: pysollib/actions.py:610
 msgid ""
 "Reset ALL statistics and logs for player\n"
 "%s ?"
 msgstr ""
 
-#: pysollib/actions.py:615
+#: pysollib/actions.py:616
 msgid "Reset game statistics"
 msgstr ""
 
-#: pysollib/actions.py:616
+#: pysollib/actions.py:617
 msgid ""
 "Reset statistics and logs for player\n"
 "%s\n"
@@ -220,23 +220,23 @@ msgid ""
 "%s ?"
 msgstr ""
 
-#: pysollib/actions.py:671
+#: pysollib/actions.py:672
 msgid "Play demo"
 msgstr ""
 
-#: pysollib/actions.py:682
+#: pysollib/actions.py:683
 msgid "Set player options"
 msgstr ""
 
-#: pysollib/actions.py:696 data/glade-translations:40
+#: pysollib/actions.py:697 data/glade-translations:40
 msgid "Set colors"
 msgstr ""
 
-#: pysollib/actions.py:716
+#: pysollib/actions.py:717
 msgid "Set fonts"
 msgstr ""
 
-#: pysollib/actions.py:725 data/glade-translations:33
+#: pysollib/actions.py:726 data/glade-translations:33
 msgid "Set timeouts"
 msgstr ""
 
@@ -244,8 +244,8 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: pysollib/app.py:894 pysollib/game.py:1315 pysollib/game.py:1330
-#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/menubar.py:363
+#: pysollib/app.py:894 pysollib/game.py:1314 pysollib/game.py:1329
+#: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/menubar.py:363
 msgid "&New game"
 msgstr ""
 
@@ -286,45 +286,45 @@ msgstr ""
 msgid "Discard current game ?"
 msgstr ""
 
-#: pysollib/game.py:1269
+#: pysollib/game.py:1268
 msgid ""
 "\n"
 "You have reached\n"
 "#%d in the %s of playing time"
 msgstr ""
 
-#: pysollib/game.py:1272
+#: pysollib/game.py:1271
 msgid ""
 "\n"
 "and #%d in the %s of moves"
 msgstr ""
 
-#: pysollib/game.py:1274
+#: pysollib/game.py:1273
 msgid ""
 "\n"
 "You have reached\n"
 "#%d in the %s of moves"
 msgstr ""
 
-#: pysollib/game.py:1277
+#: pysollib/game.py:1276
 msgid ""
 "\n"
 "and #%d in the %s of total moves"
 msgstr ""
 
-#: pysollib/game.py:1279
+#: pysollib/game.py:1278
 msgid ""
 "\n"
 "You have reached\n"
 "#%d in the %s of total moves"
 msgstr ""
 
-#: pysollib/game.py:1306 pysollib/game.py:1322
+#: pysollib/game.py:1305 pysollib/game.py:1321
 #: pysollib/tk/soundoptionsdialog.py:100
 msgid "Game won"
 msgstr ""
 
-#: pysollib/game.py:1307
+#: pysollib/game.py:1306
 msgid ""
 "\n"
 "Congratulations, this\n"
@@ -335,7 +335,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: pysollib/game.py:1323
+#: pysollib/game.py:1322
 msgid ""
 "\n"
 "Congratulations, you did it !\n"
@@ -345,100 +345,100 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: pysollib/game.py:1335 pysollib/game.py:1341
+#: pysollib/game.py:1334 pysollib/game.py:1340
 #: pysollib/tk/soundoptionsdialog.py:98
 msgid "Game finished"
 msgstr ""
 
-#: pysollib/game.py:1336 pysollib/game.py:1866
+#: pysollib/game.py:1335 pysollib/game.py:1865
 msgid ""
 "\n"
 "Game finished\n"
 msgstr ""
 
-#: pysollib/game.py:1342
+#: pysollib/game.py:1341
 msgid ""
 "\n"
 "Game finished, but not without my help...\n"
 msgstr ""
 
-#: pysollib/game.py:1343
+#: pysollib/game.py:1342
 msgid "&Restart"
 msgstr ""
 
-#: pysollib/game.py:1757
+#: pysollib/game.py:1756
 msgid "Score %6d"
 msgstr ""
 
-#: pysollib/game.py:1856
+#: pysollib/game.py:1855
 msgid "&Cool"
 msgstr ""
 
-#: pysollib/game.py:1856
+#: pysollib/game.py:1855
 msgid "&Great"
 msgstr ""
 
-#: pysollib/game.py:1856
+#: pysollib/game.py:1855
 msgid "&Wow"
 msgstr ""
 
-#: pysollib/game.py:1856
+#: pysollib/game.py:1855
 msgid "&Yeah"
 msgstr ""
 
-#: pysollib/game.py:1857 pysollib/game.py:1869 pysollib/game.py:1882
+#: pysollib/game.py:1856 pysollib/game.py:1868 pysollib/game.py:1881
 msgid " Autopilot"
 msgstr ""
 
-#: pysollib/game.py:1858
+#: pysollib/game.py:1857
 msgid ""
 "\n"
 "Game solved in %d moves.\n"
 msgstr ""
 
-#: pysollib/game.py:1881
+#: pysollib/game.py:1880
 msgid "&Hmm"
 msgstr ""
 
-#: pysollib/game.py:1881
+#: pysollib/game.py:1880
 msgid "&Oh well"
 msgstr ""
 
-#: pysollib/game.py:1881
+#: pysollib/game.py:1880
 msgid "&That's life"
 msgstr ""
 
-#: pysollib/game.py:1883
+#: pysollib/game.py:1882
 msgid ""
 "\n"
 "This won't come out...\n"
 msgstr ""
 
-#: pysollib/game.py:2295
+#: pysollib/game.py:2294
 msgid "Set bookmark"
 msgstr ""
 
-#: pysollib/game.py:2296
+#: pysollib/game.py:2295
 msgid "Replace existing bookmark %d ?"
 msgstr ""
 
-#: pysollib/game.py:2318
+#: pysollib/game.py:2317
 msgid "Goto bookmark"
 msgstr ""
 
-#: pysollib/game.py:2319
+#: pysollib/game.py:2318
 msgid "Goto bookmark %d ?"
 msgstr ""
 
-#: pysollib/game.py:2350
+#: pysollib/game.py:2349
 msgid "Open game"
 msgstr ""
 
-#: pysollib/game.py:2361 pysollib/game.py:2370 pysollib/game.py:2375
+#: pysollib/game.py:2360 pysollib/game.py:2369 pysollib/game.py:2374
 msgid "Load game error"
 msgstr ""
 
-#: pysollib/game.py:2362
+#: pysollib/game.py:2361
 msgid ""
 "Error while loading game.\n"
 "\n"
@@ -446,22 +446,22 @@ msgid ""
 "but this could also be a bug you might want to report."
 msgstr ""
 
-#: pysollib/game.py:2371
+#: pysollib/game.py:2370
 msgid "Error while loading game"
 msgstr ""
 
-#: pysollib/game.py:2376
+#: pysollib/game.py:2375
 msgid ""
 "Internal error while loading game.\n"
 "\n"
 "Please report this bug."
 msgstr ""
 
-#: pysollib/game.py:2401
+#: pysollib/game.py:2400
 msgid "Save game error"
 msgstr ""
 
-#: pysollib/game.py:2402
+#: pysollib/game.py:2401
 msgid "Error while saving game"
 msgstr ""
 
diff --git a/po/ru_games.po b/po/ru_games.po
index a7fa332a..1faaf812 100644
--- a/po/ru_games.po
+++ b/po/ru_games.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PySol 0.0.1\n"
-"POT-Creation-Date: Mon Nov  6 09:46:50 2006\n"
-"PO-Revision-Date: 2006-10-31 19:57+0300\n"
+"POT-Creation-Date: Tue Nov  7 05:42:15 2006\n"
+"PO-Revision-Date: 2006-11-07 05:51+0300\n"
 "Last-Translator: Скоморох <skomoroh@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -538,6 +538,9 @@ msgstr "Китайский Клондайк"
 msgid "Chinese Solitaire"
 msgstr "Китайский пасьянс"
 
+msgid "Chinese Spider"
+msgstr "Китайский Паук"
+
 msgid "Chip"
 msgstr "Щепка"
 
@@ -2790,9 +2793,8 @@ msgstr "Четырёхугольник"
 msgid "Quadruple Alliance"
 msgstr "Четырёхсторонний альянс"
 
-#, fuzzy
 msgid "Quads"
-msgstr "Четвёрка"
+msgstr "Четвёрки"
 
 msgid "Quartets"
 msgstr "Квартеты"
@@ -3778,7 +3780,7 @@ msgid "Zeus"
 msgstr "Зевс"
 
 msgid "Zigzag Course"
-msgstr ""
+msgstr "Зигзагообразный курс"
 
 msgid "Zodiac"
 msgstr "Зодиак"
diff --git a/po/ru_pysol.po b/po/ru_pysol.po
index f96eae84..73ad59b0 100644
--- a/po/ru_pysol.po
+++ b/po/ru_pysol.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PySol 0.0.1\n"
-"POT-Creation-Date: Mon Nov  6 09:47:42 2006\n"
+"POT-Creation-Date: Tue Nov  7 05:43:10 2006\n"
 "PO-Revision-Date: 2006-11-06 09:53+0300\n"
 "Last-Translator: Скоморох <skomoroh@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -54,7 +54,7 @@ msgid "&Next number"
 msgstr "&Следующий номер"
 
 #: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155
-#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865
+#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1864
 #: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122
 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143
 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155
@@ -72,8 +72,8 @@ msgid "&OK"
 msgstr "&ОК"
 
 #: pysollib/actions.py:314 pysollib/app.py:893 pysollib/app.py:1167
-#: pysollib/game.py:929 pysollib/game.py:1315 pysollib/game.py:1330
-#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/colorsdialog.py:122
+#: pysollib/game.py:929 pysollib/game.py:1314 pysollib/game.py:1329
+#: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/colorsdialog.py:122
 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143
 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1122
 #: pysollib/tk/menubar.py:1124 pysollib/tk/playeroptionsdialog.py:85
@@ -96,23 +96,23 @@ msgstr "Выбрать следующую игру"
 msgid "Quit "
 msgstr "Выйти из "
 
-#: pysollib/actions.py:449
+#: pysollib/actions.py:450
 msgid "Clear bookmarks"
 msgstr "Удалить закладки"
 
-#: pysollib/actions.py:450
+#: pysollib/actions.py:451
 msgid "Clear all bookmarks ?"
 msgstr "Удалить все закладки?"
 
-#: pysollib/actions.py:460
+#: pysollib/actions.py:461
 msgid "Restart game"
 msgstr "Начать игру с начала"
 
-#: pysollib/actions.py:461
+#: pysollib/actions.py:462
 msgid "Restart this game ?"
 msgstr "Начать игру с начала?"
 
-#: pysollib/actions.py:502
+#: pysollib/actions.py:503
 msgid ""
 "Comments for %s:\n"
 "\n"
@@ -120,19 +120,19 @@ msgstr ""
 "Комментарий для %s:\n"
 "\n"
 
-#: pysollib/actions.py:504
+#: pysollib/actions.py:505
 msgid "Comments for "
 msgstr "Комментарий для "
 
-#: pysollib/actions.py:522 pysollib/actions.py:550
+#: pysollib/actions.py:523 pysollib/actions.py:551
 msgid "Error while writing to file"
 msgstr "Ошибка при записи в файл"
 
-#: pysollib/actions.py:525 pysollib/actions.py:553
+#: pysollib/actions.py:526 pysollib/actions.py:554
 msgid " Info"
 msgstr " Информация"
 
-#: pysollib/actions.py:526
+#: pysollib/actions.py:527
 msgid ""
 "Comments were appended to\n"
 "\n"
@@ -140,15 +140,15 @@ msgstr ""
 "Комментарий добавлен в файл\n"
 "\n"
 
-#: pysollib/actions.py:537
+#: pysollib/actions.py:538
 msgid "Demo statistics"
 msgstr "Статистика демо"
 
-#: pysollib/actions.py:540
+#: pysollib/actions.py:541
 msgid "Your statistics"
 msgstr "Ваша статистика"
 
-#: pysollib/actions.py:554
+#: pysollib/actions.py:555
 msgid ""
 " were appended to\n"
 "\n"
@@ -156,44 +156,44 @@ msgstr ""
 " добавлена в файл\n"
 "\n"
 
-#: pysollib/actions.py:568
+#: pysollib/actions.py:569
 msgid " Demo"
 msgstr " Демо"
 
-#: pysollib/actions.py:568
+#: pysollib/actions.py:569
 msgid " Demo "
 msgstr " Демо "
 
-#: pysollib/actions.py:571 pysollib/actions.py:589
+#: pysollib/actions.py:572 pysollib/actions.py:590
 msgid " for "
 msgstr " для "
 
-#: pysollib/actions.py:577 pysollib/stats.py:206
+#: pysollib/actions.py:578 pysollib/stats.py:206
 msgid "Statistics for "
 msgstr "Статистика игры "
 
-#: pysollib/actions.py:580 pysollib/tk/selectgame.py:350
+#: pysollib/actions.py:581 pysollib/tk/selectgame.py:350
 #: pysollib/tk/toolbar.py:208
 msgid "Statistics"
 msgstr "Статистика"
 
-#: pysollib/actions.py:583 data/glade-translations:31
+#: pysollib/actions.py:584 data/glade-translations:31
 msgid "Full log"
 msgstr "Полный лог"
 
-#: pysollib/actions.py:586 data/glade-translations:32
+#: pysollib/actions.py:587 data/glade-translations:32
 msgid "Session log"
 msgstr "Лог сессии"
 
-#: pysollib/actions.py:592
+#: pysollib/actions.py:593
 msgid "Game Info"
 msgstr "Информация об игре"
 
-#: pysollib/actions.py:608
+#: pysollib/actions.py:609
 msgid "Reset all statistics"
 msgstr "Очистить всю статистику"
 
-#: pysollib/actions.py:609
+#: pysollib/actions.py:610
 msgid ""
 "Reset ALL statistics and logs for player\n"
 "%s ?"
@@ -201,11 +201,11 @@ msgstr ""
 "Очистить всю статистику и лог для игрока\n"
 "%s?"
 
-#: pysollib/actions.py:615
+#: pysollib/actions.py:616
 msgid "Reset game statistics"
 msgstr "Очистить статистику игры"
 
-#: pysollib/actions.py:616
+#: pysollib/actions.py:617
 msgid ""
 "Reset statistics and logs for player\n"
 "%s\n"
@@ -217,23 +217,23 @@ msgstr ""
 "и игры\n"
 "%s?"
 
-#: pysollib/actions.py:671
+#: pysollib/actions.py:672
 msgid "Play demo"
 msgstr "Показать демо"
 
-#: pysollib/actions.py:682
+#: pysollib/actions.py:683
 msgid "Set player options"
 msgstr "Установить настройки игрока"
 
-#: pysollib/actions.py:696 data/glade-translations:40
+#: pysollib/actions.py:697 data/glade-translations:40
 msgid "Set colors"
 msgstr "Настроить цвета"
 
-#: pysollib/actions.py:716
+#: pysollib/actions.py:717
 msgid "Set fonts"
 msgstr "Настроить шрифт"
 
-#: pysollib/actions.py:725 data/glade-translations:33
+#: pysollib/actions.py:726 data/glade-translations:33
 msgid "Set timeouts"
 msgstr "Настроить таймауты"
 
@@ -241,8 +241,8 @@ msgstr "Настроить таймауты"
 msgid "Unknown"
 msgstr "Неизвестный"
 
-#: pysollib/app.py:894 pysollib/game.py:1315 pysollib/game.py:1330
-#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/menubar.py:363
+#: pysollib/app.py:894 pysollib/game.py:1314 pysollib/game.py:1329
+#: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/menubar.py:363
 msgid "&New game"
 msgstr "&Новая игра"
 
@@ -288,7 +288,7 @@ msgstr "Игрок\n"
 msgid "Discard current game ?"
 msgstr "Завершить текущую игру?"
 
-#: pysollib/game.py:1269
+#: pysollib/game.py:1268
 msgid ""
 "\n"
 "You have reached\n"
@@ -298,7 +298,7 @@ msgstr ""
 "Вы достигли\n"
 "#%d в %s игрового времени"
 
-#: pysollib/game.py:1272
+#: pysollib/game.py:1271
 msgid ""
 "\n"
 "and #%d in the %s of moves"
@@ -306,7 +306,7 @@ msgstr ""
 "\n"
 "и #%d в %s количества ходов"
 
-#: pysollib/game.py:1274
+#: pysollib/game.py:1273
 msgid ""
 "\n"
 "You have reached\n"
@@ -316,7 +316,7 @@ msgstr ""
 "Вы достигли\n"
 "#%d в %s количества ходов"
 
-#: pysollib/game.py:1277
+#: pysollib/game.py:1276
 msgid ""
 "\n"
 "and #%d in the %s of total moves"
@@ -324,7 +324,7 @@ msgstr ""
 "\n"
 "и #%d в %s общего количества ходов"
 
-#: pysollib/game.py:1279
+#: pysollib/game.py:1278
 msgid ""
 "\n"
 "You have reached\n"
@@ -334,12 +334,12 @@ msgstr ""
 "Вы достигли\n"
 "#%d в %s общего количества ходов"
 
-#: pysollib/game.py:1306 pysollib/game.py:1322
+#: pysollib/game.py:1305 pysollib/game.py:1321
 #: pysollib/tk/soundoptionsdialog.py:100
 msgid "Game won"
 msgstr "Игра выиграна"
 
-#: pysollib/game.py:1307
+#: pysollib/game.py:1306
 msgid ""
 "\n"
 "Congratulations, this\n"
@@ -358,7 +358,7 @@ msgstr ""
 "Количество ходов: %s\n"
 "%s\n"
 
-#: pysollib/game.py:1323
+#: pysollib/game.py:1322
 msgid ""
 "\n"
 "Congratulations, you did it !\n"
@@ -375,12 +375,12 @@ msgstr ""
 "Количество ходов: %s\n"
 "%s\n"
 
-#: pysollib/game.py:1335 pysollib/game.py:1341
+#: pysollib/game.py:1334 pysollib/game.py:1340
 #: pysollib/tk/soundoptionsdialog.py:98
 msgid "Game finished"
 msgstr "Игра закончена"
 
-#: pysollib/game.py:1336 pysollib/game.py:1866
+#: pysollib/game.py:1335 pysollib/game.py:1865
 msgid ""
 "\n"
 "Game finished\n"
@@ -388,7 +388,7 @@ msgstr ""
 "\n"
 "Игра закончена\n"
 
-#: pysollib/game.py:1342
+#: pysollib/game.py:1341
 msgid ""
 "\n"
 "Game finished, but not without my help...\n"
@@ -396,35 +396,35 @@ msgstr ""
 "\n"
 "Игра закончена, но не без моей помощи...\n"
 
-#: pysollib/game.py:1343
+#: pysollib/game.py:1342
 msgid "&Restart"
 msgstr "&Начало"
 
-#: pysollib/game.py:1757
+#: pysollib/game.py:1756
 msgid "Score %6d"
 msgstr "Счёт %6d"
 
-#: pysollib/game.py:1856
+#: pysollib/game.py:1855
 msgid "&Cool"
 msgstr "&Отлично"
 
-#: pysollib/game.py:1856
+#: pysollib/game.py:1855
 msgid "&Great"
 msgstr "&Здорово"
 
-#: pysollib/game.py:1856
+#: pysollib/game.py:1855
 msgid "&Wow"
 msgstr "&Ура"
 
-#: pysollib/game.py:1856
+#: pysollib/game.py:1855
 msgid "&Yeah"
 msgstr "&Ага"
 
-#: pysollib/game.py:1857 pysollib/game.py:1869 pysollib/game.py:1882
+#: pysollib/game.py:1856 pysollib/game.py:1868 pysollib/game.py:1881
 msgid " Autopilot"
 msgstr " Автопилот"
 
-#: pysollib/game.py:1858
+#: pysollib/game.py:1857
 msgid ""
 "\n"
 "Game solved in %d moves.\n"
@@ -432,19 +432,19 @@ msgstr ""
 "\n"
 "Игра решена за %d ходов\n"
 
-#: pysollib/game.py:1881
+#: pysollib/game.py:1880
 msgid "&Hmm"
 msgstr "&Хмм"
 
-#: pysollib/game.py:1881
+#: pysollib/game.py:1880
 msgid "&Oh well"
 msgstr "&Ох"
 
-#: pysollib/game.py:1881
+#: pysollib/game.py:1880
 msgid "&That's life"
 msgstr "&Такова жизнь"
 
-#: pysollib/game.py:1883
+#: pysollib/game.py:1882
 msgid ""
 "\n"
 "This won't come out...\n"
@@ -452,31 +452,31 @@ msgstr ""
 "\n"
 "Не удалось...\n"
 
-#: pysollib/game.py:2295
+#: pysollib/game.py:2294
 msgid "Set bookmark"
 msgstr "Установить закладку"
 
-#: pysollib/game.py:2296
+#: pysollib/game.py:2295
 msgid "Replace existing bookmark %d ?"
 msgstr "Заменить существующую закладку %d ?"
 
-#: pysollib/game.py:2318
+#: pysollib/game.py:2317
 msgid "Goto bookmark"
 msgstr "Перейти к закладке"
 
-#: pysollib/game.py:2319
+#: pysollib/game.py:2318
 msgid "Goto bookmark %d ?"
 msgstr "Перейти к закладке %d ?"
 
-#: pysollib/game.py:2350
+#: pysollib/game.py:2349
 msgid "Open game"
 msgstr "Открыть игру"
 
-#: pysollib/game.py:2361 pysollib/game.py:2370 pysollib/game.py:2375
+#: pysollib/game.py:2360 pysollib/game.py:2369 pysollib/game.py:2374
 msgid "Load game error"
 msgstr "Ошибка при загрузке игры"
 
-#: pysollib/game.py:2362
+#: pysollib/game.py:2361
 msgid ""
 "Error while loading game.\n"
 "\n"
@@ -488,11 +488,11 @@ msgstr ""
 "Возможно повреждён файл,\n"
 "или ошибка в программе."
 
-#: pysollib/game.py:2371
+#: pysollib/game.py:2370
 msgid "Error while loading game"
 msgstr "Ошибка при загрузке игры"
 
-#: pysollib/game.py:2376
+#: pysollib/game.py:2375
 msgid ""
 "Internal error while loading game.\n"
 "\n"
@@ -502,11 +502,11 @@ msgstr ""
 "\n"
 "Пожалуйста сообщите об этой ошибке."
 
-#: pysollib/game.py:2401
+#: pysollib/game.py:2400
 msgid "Save game error"
 msgstr "Ошибка при сохранении игры"
 
-#: pysollib/game.py:2402
+#: pysollib/game.py:2401
 msgid "Error while saving game"
 msgstr "Ошибка при сохранении игры"
 
diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py
index 86a848ea..b0baddfa 100644
--- a/pysollib/gamedb.py
+++ b/pysollib/gamedb.py
@@ -337,6 +337,7 @@ class GI:
         ('fc-0.9.1', tuple(range(421, 441))),
         ('fc-0.9.2', tuple(range(441, 466))),
         ('fc-0.9.3', tuple(range(466, 661))),
+        ('fc-0.9.4', tuple(range(661, 671))),
     )
 
     # deprecated - the correct way is to or a GI.GT_XXX flag
diff --git a/pysollib/tile/tkhtml.py b/pysollib/tile/tkhtml.py
index ab991d96..6edc07f4 100644
--- a/pysollib/tile/tkhtml.py
+++ b/pysollib/tile/tkhtml.py
@@ -268,7 +268,8 @@ class HTMLViewer:
 
         # create text widget
         text_frame = Tkinter.Frame(parent)
-        text_frame.grid(row=1, column=0, columnspan=4, sticky='nsew')
+        text_frame.grid(row=1, column=0, columnspan=4,
+                        sticky='nsew', padx=1, pady=1)
         vbar = Tkinter.Scrollbar(text_frame)
         vbar.pack(side=Tkinter.RIGHT, fill=Tkinter.Y)
         self.text = Tkinter.Text(text_frame,
diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py
index dd6ff8b0..38f3c2e2 100644
--- a/pysollib/tile/toolbar.py
+++ b/pysollib/tile/toolbar.py
@@ -78,12 +78,16 @@ class AbstractToolbarButton:
         self.visible = True
         if orient == Tkinter.HORIZONTAL:
             padx, pady = 0, 2
+            if os.name == 'nt':
+                padx, pady = 0, 0
             self.grid(row=0,
                       column=self.position,
                       padx=padx, pady=pady,
                       sticky='nsew')
         else:
             padx, pady = 2, 0
+            if os.name == 'nt':
+                padx, pady = 0, 0
             self.grid(row=self.position,
                       column=0,
                       padx=padx, pady=pady,