diff --git a/MANIFEST.in b/MANIFEST.in
index fcfab63b..990c264f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,7 +4,7 @@
 ## code
 ##
 include pysol.py setup.py setup_osx.py setup.cfg MANIFEST.in Makefile
-include COPYING README.md AUTHORS
+include COPYING README.md AUTHORS README.android README.kivy
 #recursive-include pysollib *.py
 include pysollib/*.py pysollib/macosx/*.py pysollib/configobj/*.py
 include pysollib/winsystems/*.py
@@ -18,6 +18,9 @@ graft data/themes
 recursive-exclude data/themes *.py
 include scripts/build.bat scripts/create_iss.py scripts/mahjongg_utils.py
 include scripts/pygettext.py scripts/all_games.py scripts/cardset_viewer.py
+include android/*.py
+include android/mk* 
+include android/debian/*
 #graft data/plugins
 ##
 ## data - docs
diff --git a/Makefile b/Makefile
index 1d2e6398..b51b1209 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ override PYSOL_DEBUG=1
 
 PYSOLLIB_FILES=pysollib/tk/*.py pysollib/tile/*.py pysollib/*.py \
 	pysollib/games/*.py pysollib/games/special/*.py \
-	pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py
+	pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py \
+  pysollib/kivy/*.py
 
 .PHONY : all install dist all_games_html rules pot mo
 
diff --git a/README.android b/README.android
new file mode 100644
index 00000000..3e066a2e
--- /dev/null
+++ b/README.android
@@ -0,0 +1,89 @@
+
+Prerequisites (needs root):
+
+  On a 'freshly installed' Ubuntu 16.04 (32bit), the following
+  additional packages had to be installed:
+  
+  - python-setuptools
+  - javasdk          (ubuntu: default jdk)
+  - cython           (ubuntu: cython)
+  - pip              (ubuntu: python-pip)
+  - pexpect          (ubuntu: python-pexpect)
+  - zlib headers     (ubuntu: zlib1g-dev)
+  - virtualenv       (python-virtualenv)
+  - zip,unzip
+
+  On a freshly installed debian stretch/xfce:
+
+  -> consult script files in directory android/debian.
+
+  On a 'simple' gentoo installation the following packages had to be
+  installed in addition:
+
+  - dev-python/pip
+  - dev-python/virtualenv
+  - dev-python/cython
+  - dev-media-libs/libsdl2
+  - dev-media-libs/sdl2-image
+  - dev-media-libs/sdl2-mixer
+  - dev-media-libs/sdl2-ttf
+  - dev-media-libs/gstreamer
+  - dev-vcs/git
+  - dev-java/ant 
+
+  and python modules:
+
+  - python3 -m pip install requests --user.
+  - python3 -m pip install clint --user.
+
+  NOTES:
+  1) This information is supplied to give you a hint, when running into
+     problems.
+  2) All builds need an working (fairly fast) internet connection and
+     6 GB of free disk space.
+
+
+Build with 'python-for-android' (as user):
+
+  go to the android directory, then
+
+  $ ./mkp4a.init [<sdkdir>] [<ndkdir>]        # prepare sdk and p4a installation
+  $ ./mkkeystore                              # if you want to build a release version.
+
+  $ ./mkp4a.debug                             # build debug apk
+  $ ./mkp4a.release  <passwd1>  [<passwd2>]   # build release apk
+  $ ./mkp4a.unsigned                          # build an unsigned release apk
+
+  The build system will download all required additional
+  packages (such as the android sdk and more). Do the first build will
+  take a while. All in all you will need up to 6 GB of free disk space.
+
+  If you have Android Studio installed, you may call mkp4a.init
+  with optional parameter <sdk-dir> and ev. in addition as
+  second parameter <ndk-dir> (if not default) to prevent them
+  from downloading a new. (Note that currently android ndk version
+  should be less 14, otherwise the build will fail).
+
+  Resulted apks will appear in directory android.
+
+Cardsets:
+
+Cardsets should be installed in ${HOME}/.PySolFC/cardsets/. On an
+android device this is equivalent to /sdcard/.PySolFC/cardsets/.
+Cardsets must use the bmp image format. Use scripts/cardsetsgiftobmp
+(on a linux system) to convert them, before copying to the device.
+
+Possible known build issues:
+
+2) for android ndk: needs a Version <=13 (because needs ant support).
+
+3) python-for-android, on downloading recipes:
+
+  ('CA CERTIFICATE VALIDATION FAILED' when downloading python.2.7 or
+   some 'recipes')
+
+  Solution:
+    Try the download address with firefox. if it works, view the
+    site certificate and download (export) it from the browser.
+    Copy the resulting *.crt to /usr/local/ca-certificates and
+    run update-ca-certificates.
diff --git a/README.kivy b/README.kivy
new file mode 100644
index 00000000..7d84bbbd
--- /dev/null
+++ b/README.kivy
@@ -0,0 +1,48 @@
+
+Introduction
+------------
+
+This is a (inofficial) Fork of the PysolFC-2.0 open source project
+(http://pysolfc.sourceforge.net)
+
+Early investigations of the code showed, that it would not be
+a too big effort to replace or add a new user interface (UI).
+
+The new UI using kivy has been designed to meet requirments
+of tablet and smartphone devices. Most of the functionality
+of the original version has been maintained
+
+The new UI is selected via a new commandline option '--kivy'.
+Original user interfaces will continue to work. To run the
+kivy version call:
+
+$ python pysol.py --kivy
+
+
+Images
+------
+
+Original images supplied by the collection are of type
+gif. In kivy that image type loads very slow. Also many
+cards cannot be loaded, because of decoding errors.
+To prevent from these problems, the kivy version was
+modified to not read any gif images.
+
+Some cardsets have been translated to png, a format
+that is processed by both the tcl and the kivy version.
+
+Some others, for which transparency information is not
+processed correctly even from png images, have been translated
+to the bmp image format (while keeping their gif variant for
+the tcl version). bmp format is only processed by the
+kivy version.
+
+Additional cardsets are available from the SourceForge
+project. To use them with kivy, they need to be converted to
+bmp format. A shell script 'cardsetsgiftobmp' has been added
+to the scripts directory (needs bash and ImageMagick).
+
+For all gif-images in directories data/images and data/tiles
+a duplicate image in png format has been added too.
+
+LB170321.
diff --git a/README.md b/README.md
index b464073f..193e8928 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,19 @@ $ python pysol.py
 After following steps similar to these (on
 [Mageia Linux](http://www.mageia.org/) ):
 
+## Alternate toolkit.
+
+- Python2 (2.7 or later)
+- Kivy (10.0 or later)
+
+- Features:
+  - Sound support integrated.
+  - Android apk build support.
+
+- Running from source without installation:
+
+$ python2 pysol.py --kivy
+
 #### Step 1 - install the dependencies
 
 On Mageia you can do:
diff --git a/android/debian/README b/android/debian/README
new file mode 100644
index 00000000..93bcdabc
--- /dev/null
+++ b/android/debian/README
@@ -0,0 +1,19 @@
+Actions to take upon a freshly installed Debian stretch/xfce (virtualbox).
+
+Do something like:
+
+user$ su
+- enter root password.
+
+root$ ./apt-install.sh
+- .... some output.
+
+root$ exit
+
+user$ ./pip-install.sh
+- .....some output.
+
+Now all required packages are installed to proceed with the
+android build.
+
+LB170709.
diff --git a/android/debian/apt-installs.sh b/android/debian/apt-installs.sh
new file mode 100755
index 00000000..4b4f7ca9
--- /dev/null
+++ b/android/debian/apt-installs.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+# als root ausführen!
+
+apt-get install -y mercurial git default-jdk
+apt-get install -y cython cython3
+apt-get install -y python3-pip
+apt-get install -y python3-yaml
+apt-get install -y virtualenv
+apt-get install -y pkg-config
+apt-get install -y automake autoconf libtool
+apt-get install -y zlib1g-dev
+apt-get install -y libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
diff --git a/android/debian/pip-installs.sh b/android/debian/pip-installs.sh
new file mode 100755
index 00000000..4e0ae212
--- /dev/null
+++ b/android/debian/pip-installs.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# als user installieren !
+
+python3 -m pip install --user pyasn1
+python3 -m pip install --user pyasn1_modules
+python3 -m pip install --user requests
+python3 -m pip install --user clint
diff --git a/android/initsdk.py b/android/initsdk.py
new file mode 100755
index 00000000..e1d36c9a
--- /dev/null
+++ b/android/initsdk.py
@@ -0,0 +1,240 @@
+#! /usr/bin/env python3
+# -*- coding: iso-8859-1 -*-
+
+import sys
+import os
+import requests
+import logging
+import hashlib
+import glob
+from zipfile import ZipFile, ZipInfo
+from clint.textui import progress
+
+cachefiles = [
+  ('https://dl.google.com/android/repository/platform-tools-latest-linux.zip',
+   '',
+   'platform-tools'),
+  ('https://dl.google.com/android/repository/tools_r25.2.5-linux.zip',
+   '577516819c8b5fae680f049d39014ff1ba4af870b687cab10595783e6f22d33e',
+   'tools'),
+  ('https://dl.google.com/android/repository/android-19_r04.zip',
+   '5efc3a3a682c1d49128daddb6716c433edf16e63349f32959b6207524ac04039',
+   'platform'),
+  ('https://dl.google.com/android/repository/build-tools_r26-linux.zip',
+   '7422682f92fb471d4aad4c053c9982a9a623377f9d5e4de7a73cd44ebf2f3c61',
+   'build-tools'),
+  ('https://dl.google.com/'
+   'android/repository/android-ndk-r12b-linux-x86_64.zip',
+   'eafae2d614e5475a3bcfd7c5f201db5b963cc1290ee3e8ae791ff0c66757781e',
+   'ndk'),
+]
+
+# https://stackoverflow.com/questions/39296101:
+
+
+class MyZipFile(ZipFile):
+
+    def extract(self, member, path=None, pwd=None):
+        if not isinstance(member, ZipInfo):
+            member = self.getinfo(member)
+
+        if path is None:
+            path = os.getcwd()
+
+        ret_val = self._extract_member(member, path, pwd)
+        attr = member.external_attr >> 16
+        os.chmod(ret_val, attr)
+        return ret_val
+
+# Reused from fdroidserver:
+
+
+def sha256_for_file(path):
+    with open(path, 'rb') as f:
+        s = hashlib.sha256()
+        while True:
+            data = f.read(4096)
+            if not data:
+                break
+            s.update(data)
+        return s.hexdigest()
+
+# Adapted from fdroidserver:
+
+
+def update_cache(cachedir, cachefiles):
+    for srcurl, shasum, typ in cachefiles:
+        filename = os.path.basename(srcurl)
+        local_filename = os.path.join(cachedir, filename)
+
+        if os.path.exists(local_filename):
+            local_length = os.path.getsize(local_filename)
+        else:
+
+            local_length = -1
+
+        if (typ == 'ndk') and (ndkloc is not None):
+            continue
+        elif (typ != 'tools') and (sdkloc is not None):
+            continue
+
+        resume_header = {}
+        download = True
+
+        try:
+            r = requests.head(srcurl, allow_redirects=True, timeout=60)
+            if r.status_code == 200:
+                content_length = int(r.headers.get('content-length'))
+            else:
+                content_length = local_length  # skip the download
+        except requests.exceptions.RequestException as e:
+            content_length = local_length  # skip the download
+            logger.warn('%s', e)
+
+        if local_length == content_length:
+            download = False
+        elif local_length > content_length:
+            logger.info('deleting corrupt file from cache: %s',
+                        local_filename)
+            os.remove(local_filename)
+            logger.info("Downloading %s to cache", filename)
+        elif local_length > -1 and local_length < content_length:
+            logger.info("Resuming download of %s", local_filename)
+            resume_header = {
+                'Range': 'bytes=%d-%d' % (local_length, content_length)}
+        else:
+            logger.info("Downloading %s to cache", filename)
+
+        if download:
+            r = requests.get(srcurl, headers=resume_header,
+                             stream=True, verify=False, allow_redirects=True)
+            content_length = int(r.headers.get('content-length'))
+            with open(local_filename, 'ab') as f:
+                for chunk in progress.bar(
+                        r.iter_content(chunk_size=65536),
+                        expected_size=(content_length / 65536) + 1):
+                    if chunk:  # filter out keep-alive new chunks
+                        f.write(chunk)
+        if not shasum == '':
+            v = sha256_for_file(local_filename)
+            if v == shasum:
+                logger.info("Shasum verified for %s", local_filename)
+            else:
+                logger.critical(
+                  "Invalid shasum of '%s' detected for %s", v, local_filename)
+                os.remove(local_filename)
+                sys.exit(1)
+
+# Build the sdk from zips.
+
+
+def build_sdk(sdkdir, cachedir, cachfiles):
+    for srcurl, shasum, typ in cachefiles:
+        filename = os.path.basename(srcurl)
+        local_filename = os.path.join(cachedir, filename)
+
+        if typ == 'tools':
+            if os.path.exists(local_filename):
+                print('Extract: %s' % local_filename)
+                zf = MyZipFile(local_filename)
+                zf.extractall(sdkdir)
+        elif typ == 'platform-tools':
+            if (sdkloc is None) and (os.path.exists(local_filename)):
+                print('Extract: %s' % local_filename)
+                zf = MyZipFile(local_filename)
+                zf.extractall(sdkdir)
+            else:
+                print('Link to: %s' % sdkloc)
+                os.symlink(sdkloc + '/platform-tools',
+                           sdkdir + '/platform-tools')
+        elif typ == 'platform':
+            if (sdkloc is None) and (os.path.exists(local_filename)):
+                print('Extract: %s' % local_filename)
+                zf = MyZipFile(local_filename)
+                zf.extractall(sdkdir + '/platforms')
+            else:
+                print('Link to: %s' % sdkloc)
+                os.symlink(sdkloc + '/platforms', sdkdir + '/platforms')
+        elif typ == 'build-tools':
+            if (sdkloc is None) and (os.path.exists(local_filename)):
+                print('Extract: %s' % local_filename)
+                zf = MyZipFile(local_filename)
+                zf.extractall(sdkdir + '/build-tools')
+            else:
+                print('Link to: %s' % sdkloc)
+                os.symlink(sdkloc + '/build-tools', sdkdir + '/build-tools')
+        elif typ == 'ndk':
+            if ndkloc is None:
+                print('Extract: %s' % local_filename)
+                zf = MyZipFile(local_filename)
+                zf.extractall(sdkdir)
+                lst = glob.glob(sdkdir + '/*-ndk-*')
+                print(lst)
+                os.rename(lst[0], sdkdir + '/ndk-bundle')
+            else:
+                print('Link to: %s' % ndkloc)
+                os.symlink(ndkloc, sdkdir + '/ndk-bundle')
+
+
+logger = logging.getLogger('prepare-fdroid-build')
+logging.basicConfig(format='%(message)s', level=logging.INFO)
+logger.setLevel(logging.INFO)
+
+# command line arguments
+
+sdkloc = None
+ndkloc = None
+if len(sys.argv) > 1:
+    sdkloc = sys.argv[1]
+    if (len(sdkloc) > 0) and (sdkloc[-1] == '/'):
+        sdkloc = sdkloc[:-1]
+    if not os.path.isdir(sdkloc):
+        sdkloc = None
+
+if len(sys.argv) > 2:
+    ndkloc = sys.argv[2]
+    if (len(ndkloc) > 0) and (ndkloc[-1] == '/'):
+        ndkloc = ndkloc[:-1]
+    if not os.path.isdir(ndkloc):
+        ndkloc = None
+
+fdroidmode = None
+if len(sys.argv) > 3:
+    fdroidmode = sys.argv[3]
+    if (len(fdroidmode) > 0):
+        fdroidmode = '1'
+
+if sdkloc == "":
+    sdkloc = None
+if ndkloc == "":
+    ndkloc = None
+
+logger.info('sdkloc = %s' % sdkloc)
+logger.info('ndkloc = %s' % ndkloc)
+
+# sdkloc and ndkloc already set by the user and fdroidmode:
+# nothing to do.
+
+if (sdkloc is not None) and (ndkloc is not None) and (fdroidmode is not None):
+    sys.exit(0)
+
+# cache dir (using the same as in fdroidserver/buildserver)
+cachedir = os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver')
+logger.info('cachedir name is: %s', cachedir)
+
+if not os.path.exists(cachedir):
+    os.makedirs(cachedir, 0o755)
+    logger.info('created cachedir %s', cachedir)
+
+# sdkdir location
+sdkdir = os.path.join(os.getenv('HOME'), '.cache', 'sdk-for-p4a')
+logger.info('sdkdir name is: %s', sdkdir)
+
+if not os.path.exists(sdkdir):
+    os.makedirs(sdkdir, 0o755)
+    logger.debug('created sdkdir %s', sdkdir)
+
+    update_cache(cachedir, cachefiles)
+    build_sdk(sdkdir, cachedir, cachefiles)
+else:
+    logger.info('sdkdir %s already exists', sdkdir)
diff --git a/android/main.py b/android/main.py
new file mode 100755
index 00000000..f98f6d64
--- /dev/null
+++ b/android/main.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python2.7
+# ---------------------------------------------------------------------------
+#
+# PySol -- a Python Solitaire game
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.
+# If not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ---------------------------------------------------------------------------
+
+# Starter for kivy/android using buildozer: Needs an explizitly
+# named main.py as startpoint.
+
+import sys
+if '--kivy' not in sys.argv:
+    sys.argv.append('--kivy')
+
+runmain = True
+if runmain:
+    from pysollib.init import init
+init()
+
+if runmain:
+    from pysollib.main import main
+sys.exit(main(sys.argv))
diff --git a/android/mkkeystore b/android/mkkeystore
new file mode 100755
index 00000000..f825daa1
--- /dev/null
+++ b/android/mkkeystore
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# memo:
+# keytool -genkey -v -keystore my-release-keystore -alias alias_name -keyalg RSA -keysize 2048 -validity 12000
+
+if [ ! -d bin ]
+then
+  echo "mkdir bin"
+  mkdir bin
+fi
+
+if [ -f ./bin/keystore ]
+then
+  echo "keystore is already defined"
+else
+  keytool -genkey -v -keystore ./bin/keystore -alias python -keyalg RSA -keysize 2048 -validity 12000
+fi
diff --git a/android/mkp4a.clean b/android/mkp4a.clean
new file mode 100755
index 00000000..75ed2916
--- /dev/null
+++ b/android/mkp4a.clean
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm -rf tmp/*
+python3 -m pythonforandroid.toolchain clean_dists
+python3 -m pythonforandroid.toolchain clean_builds
+rm -f *.apk
diff --git a/android/mkp4a.cleanall b/android/mkp4a.cleanall
new file mode 100755
index 00000000..1de262e7
--- /dev/null
+++ b/android/mkp4a.cleanall
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+rm -rf tmp/*
+rm -f *.apk
+rm -rf ~/.local/share/python-for-android/packages
+rm -rf ~/.local/share/python-for-android/build
+rm -rf ~/.local/share/python-for-android/dists
+python3 -m pip uninstall python-for-android -y
+exit 0
diff --git a/android/mkp4a.debug b/android/mkp4a.debug
new file mode 100755
index 00000000..df210374
--- /dev/null
+++ b/android/mkp4a.debug
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+version=`./version.py`
+
+python3 -m pythonforandroid.toolchain apk \
+  --sdk-dir ${HOME}/.cache/sdk-for-p4a \
+  --ndk-dir ${HOME}/.cache/sdk-for-p4a/ndk-bundle \
+  --android-api 19 \
+  --ndk-version r12b \
+  --arch armeabi-v7a \
+  --dist-name pysolfc \
+  --name pysolfc \
+  --bootstrap=sdl2 \
+  --requirements kivy,hostpython2,random2 \
+  --minsdk 14 \
+  --private tmp/src \
+  --package org.lufebe16.gh.pysolfc \
+  --version ${version} \
+  --orientation sensor \
+  --color=always \
+  --icon tmp/src/data/images/misc/pysol01.png \
+  --presplash tmp/src/data/images/misc/pysol06.png \
+  --copy-libs
diff --git a/android/mkp4a.init b/android/mkp4a.init
new file mode 100755
index 00000000..1d0bea9d
--- /dev/null
+++ b/android/mkp4a.init
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+echo '### prepare sdk'
+
+./initsdk.py $1 $2 $3
+
+echo '### install p4a'
+
+#p4aversion='0.5.3p'
+# Downloded file "https://github.com/kivy/python-for-android/archive/0.5.3.zip"
+# Note: Minor fixes had to be added to version 0.5.3 in order to
+# cooperate with fdroid.
+#python3 -m  pip install -q --user "./p4a/${p4aversion}.zip"
+
+p4aversion='0.5.3'
+python3 -m  pip install -q --user "https://github.com/kivy/python-for-android/archive/${p4aversion}.zip"
+
+echo '### prepare recipes'
+
+if [ -d ./packages ]
+then
+  echo '### copying recipes'
+  mkdir -p ${HOME}/.local/share/python-for-android
+  cp -a packages ${HOME}/.local/share/python-for-android/
+fi
+
+echo '### prepare source'
+
+mkdir -p tmp
+rm -rf tmp/src
+
+# Easiest variant. But rsync may not be installed.
+# rsync -a .. tmp/src --exclude android/tmp
+# so:
+
+mkdir -p ${HOME}/.local/tmp/src
+cp -a .. ${HOME}/.local/tmp/src
+mv ${HOME}/.local/tmp/src tmp/src
+
+rm -rf tmp/src/android
+rm -rf tmp/src/src
+cp -a main.py tmp/src/main.py
+
+echo '### end init'
diff --git a/android/mkp4a.release b/android/mkp4a.release
new file mode 100755
index 00000000..04583fd2
--- /dev/null
+++ b/android/mkp4a.release
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+pass1=""
+pass2=""
+keyalias="python"
+keystore="${PWD}/bin/keystore"
+if [ $1 ]
+then
+  pass1=$1
+  pass2=$1
+else
+  echo "usage: ./mkp4a.release <keystore-password> [<keyalias-password>] [<keyalias>] [<keystore-path>]"
+  echo "        (use ./mkkeystore to create one in default location)"
+  exit
+fi
+if [ $2 ]
+then
+  pass2=$2
+fi
+if [ $3 ]
+then
+  keyalias=$3
+fi
+if [ $4 ]
+then
+  keystore=$4
+fi
+
+export P4A_RELEASE_KEYSTORE="$keystore"
+export P4A_RELEASE_KEYSTORE_PASSWD="$pass1"
+export P4A_RELEASE_KEYALIAS_PASSWD="$pass2"
+export P4A_RELEASE_KEYALIAS="$keyalias"
+
+version=`./version.py`
+
+python3 -m pythonforandroid.toolchain apk \
+  --sdk-dir ${HOME}/.cache/sdk-for-p4a \
+  --ndk-dir ${HOME}/.cache/sdk-for-p4a/ndk-bundle \
+  --android-api 19 \
+  --ndk-version r12b \
+  --arch armeabi-v7a \
+  --dist-name pysolfc \
+  --name pysolfc \
+  --bootstrap=sdl2 \
+  --requirements kivy,hostpython2,random2 \
+  --release \
+  --sign \
+  --minsdk 14 \
+  --private tmp/src \
+  --package org.lufebe16.gh.pysolfc \
+  --version ${version} \
+  --orientation sensor \
+  --color=always \
+  --icon tmp/src/data/images/misc/pysol01.png \
+  --presplash tmp/src/data/images/misc/pysol06.png \
+  --copy-libs
+
+# keystore options (instead environment vars):
+#
+# keystore:        --keystore <file>
+# key alias        --signkey   <keyalias>
+# keystore passwd  --keystorepw  <pass1>
+# key passwd       --signkeypw   <pass2>
diff --git a/android/mkp4a.unsigned b/android/mkp4a.unsigned
new file mode 100755
index 00000000..1a7f52cb
--- /dev/null
+++ b/android/mkp4a.unsigned
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+echo '### p4a started'
+
+# sdk-dir and nkd-dir from command line (fdroid mode)
+
+sdkdir="${HOME}/.cache/sdk-for-p4a"
+ndkdir="${HOME}/.cache/sdk-for-p4a/ndk-bundle"
+if [ $1 ]
+then
+  echo "set sdk to: $1"
+  sdkdir="$1"
+fi
+if [ $2 ]
+then
+  echo "set ndk to: $2"
+  ndkdir="$2"
+fi
+
+echo '### run toolchain'
+
+version=`./version.py`
+
+python3 -m pythonforandroid.toolchain apk \
+  --sdk-dir ${sdkdir} \
+  --ndk-dir ${ndkdir} \
+  --android-api 19 \
+  --ndk-version r12b \
+  --arch armeabi-v7a \
+  --dist-name pysolfc \
+  --name pysolfc \
+  --bootstrap=sdl2 \
+  --requirements kivy,hostpython2,random2 \
+  --release \
+  --minsdk 14 \
+  --private tmp/src \
+  --package org.lufebe16.gh.pysolfc \
+  --version ${version} \
+  --orientation sensor \
+  --color=always \
+  --icon tmp/src/data/images/misc/pysol01.png \
+  --presplash tmp/src/data/images/misc/pysol06.png \
+  --copy-libs
+
+# python3 -m pythonforandroid.toolchain apk
+# ...
+# --release          #1
+# --sign             #2
+# ...
+#
+# ad 1,2:
+# ohne:    -> debug version
+# 1:       -> release unsigned
+# 1 und 2: -> release version.
+
+echo '### p4a finished'
diff --git a/android/p4a/0.5.3p.zip b/android/p4a/0.5.3p.zip
new file mode 100644
index 00000000..20cf297b
Binary files /dev/null and b/android/p4a/0.5.3p.zip differ
diff --git a/android/version.py b/android/version.py
new file mode 100755
index 00000000..483b0b9b
--- /dev/null
+++ b/android/version.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+# ---------------------------------------------------------------------------
+#
+# PySol -- a Python Solitaire game
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.
+# If not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# ---------------------------------------------------------------------------
+
+# import pychecker.checker
+
+# Starter for kivy/android using buildozer: Needs an explizitly
+# named main.py as startpoint.
+
+if True:
+    import sys
+    sys.path.insert(0, '..')
+if True:
+    from pysollib.settings import VERSION
+    print(VERSION)
diff --git a/data/images/buttons/bluecurve/cancel.png b/data/images/buttons/bluecurve/cancel.png
new file mode 100644
index 00000000..04d15080
Binary files /dev/null and b/data/images/buttons/bluecurve/cancel.png differ
diff --git a/data/images/buttons/bluecurve/new.png b/data/images/buttons/bluecurve/new.png
new file mode 100644
index 00000000..8f39110f
Binary files /dev/null and b/data/images/buttons/bluecurve/new.png differ
diff --git a/data/images/buttons/bluecurve/ok.png b/data/images/buttons/bluecurve/ok.png
new file mode 100644
index 00000000..66b35c80
Binary files /dev/null and b/data/images/buttons/bluecurve/ok.png differ
diff --git a/data/images/cards/large/01c.png b/data/images/cards/large/01c.png
new file mode 100644
index 00000000..0ecb3df1
Binary files /dev/null and b/data/images/cards/large/01c.png differ
diff --git a/data/images/cards/large/01d.png b/data/images/cards/large/01d.png
new file mode 100644
index 00000000..d65c67b4
Binary files /dev/null and b/data/images/cards/large/01d.png differ
diff --git a/data/images/cards/large/01h.png b/data/images/cards/large/01h.png
new file mode 100644
index 00000000..d1e638dc
Binary files /dev/null and b/data/images/cards/large/01h.png differ
diff --git a/data/images/cards/large/01s.png b/data/images/cards/large/01s.png
new file mode 100644
index 00000000..afd65bf7
Binary files /dev/null and b/data/images/cards/large/01s.png differ
diff --git a/data/images/cards/large/02c.png b/data/images/cards/large/02c.png
new file mode 100644
index 00000000..16824a96
Binary files /dev/null and b/data/images/cards/large/02c.png differ
diff --git a/data/images/cards/large/02d.png b/data/images/cards/large/02d.png
new file mode 100644
index 00000000..b2f9c7fd
Binary files /dev/null and b/data/images/cards/large/02d.png differ
diff --git a/data/images/cards/large/02h.png b/data/images/cards/large/02h.png
new file mode 100644
index 00000000..bc47c06d
Binary files /dev/null and b/data/images/cards/large/02h.png differ
diff --git a/data/images/cards/large/02s.png b/data/images/cards/large/02s.png
new file mode 100644
index 00000000..4e98678a
Binary files /dev/null and b/data/images/cards/large/02s.png differ
diff --git a/data/images/cards/large/03c.png b/data/images/cards/large/03c.png
new file mode 100644
index 00000000..e7299ca4
Binary files /dev/null and b/data/images/cards/large/03c.png differ
diff --git a/data/images/cards/large/03d.png b/data/images/cards/large/03d.png
new file mode 100644
index 00000000..9e07cd79
Binary files /dev/null and b/data/images/cards/large/03d.png differ
diff --git a/data/images/cards/large/03h.png b/data/images/cards/large/03h.png
new file mode 100644
index 00000000..e8fa436c
Binary files /dev/null and b/data/images/cards/large/03h.png differ
diff --git a/data/images/cards/large/03s.png b/data/images/cards/large/03s.png
new file mode 100644
index 00000000..0828746e
Binary files /dev/null and b/data/images/cards/large/03s.png differ
diff --git a/data/images/cards/large/04c.png b/data/images/cards/large/04c.png
new file mode 100644
index 00000000..e725db1e
Binary files /dev/null and b/data/images/cards/large/04c.png differ
diff --git a/data/images/cards/large/04d.png b/data/images/cards/large/04d.png
new file mode 100644
index 00000000..a2c9973e
Binary files /dev/null and b/data/images/cards/large/04d.png differ
diff --git a/data/images/cards/large/04h.png b/data/images/cards/large/04h.png
new file mode 100644
index 00000000..6362cb8f
Binary files /dev/null and b/data/images/cards/large/04h.png differ
diff --git a/data/images/cards/large/04s.png b/data/images/cards/large/04s.png
new file mode 100644
index 00000000..b5ed33dd
Binary files /dev/null and b/data/images/cards/large/04s.png differ
diff --git a/data/images/cards/large/05c.png b/data/images/cards/large/05c.png
new file mode 100644
index 00000000..56d8c7ed
Binary files /dev/null and b/data/images/cards/large/05c.png differ
diff --git a/data/images/cards/large/05d.png b/data/images/cards/large/05d.png
new file mode 100644
index 00000000..858caccb
Binary files /dev/null and b/data/images/cards/large/05d.png differ
diff --git a/data/images/cards/large/05h.png b/data/images/cards/large/05h.png
new file mode 100644
index 00000000..7efbbad8
Binary files /dev/null and b/data/images/cards/large/05h.png differ
diff --git a/data/images/cards/large/05s.png b/data/images/cards/large/05s.png
new file mode 100644
index 00000000..68c48f98
Binary files /dev/null and b/data/images/cards/large/05s.png differ
diff --git a/data/images/cards/large/06c.png b/data/images/cards/large/06c.png
new file mode 100644
index 00000000..173c7495
Binary files /dev/null and b/data/images/cards/large/06c.png differ
diff --git a/data/images/cards/large/06d.png b/data/images/cards/large/06d.png
new file mode 100644
index 00000000..489f022f
Binary files /dev/null and b/data/images/cards/large/06d.png differ
diff --git a/data/images/cards/large/06h.png b/data/images/cards/large/06h.png
new file mode 100644
index 00000000..5e075b2e
Binary files /dev/null and b/data/images/cards/large/06h.png differ
diff --git a/data/images/cards/large/06s.png b/data/images/cards/large/06s.png
new file mode 100644
index 00000000..1b5e6d87
Binary files /dev/null and b/data/images/cards/large/06s.png differ
diff --git a/data/images/cards/large/07c.png b/data/images/cards/large/07c.png
new file mode 100644
index 00000000..e2bfbfda
Binary files /dev/null and b/data/images/cards/large/07c.png differ
diff --git a/data/images/cards/large/07d.png b/data/images/cards/large/07d.png
new file mode 100644
index 00000000..d538ba9f
Binary files /dev/null and b/data/images/cards/large/07d.png differ
diff --git a/data/images/cards/large/07h.png b/data/images/cards/large/07h.png
new file mode 100644
index 00000000..86d2ab48
Binary files /dev/null and b/data/images/cards/large/07h.png differ
diff --git a/data/images/cards/large/07s.png b/data/images/cards/large/07s.png
new file mode 100644
index 00000000..c49f441c
Binary files /dev/null and b/data/images/cards/large/07s.png differ
diff --git a/data/images/cards/large/08c.png b/data/images/cards/large/08c.png
new file mode 100644
index 00000000..cc4a212e
Binary files /dev/null and b/data/images/cards/large/08c.png differ
diff --git a/data/images/cards/large/08d.png b/data/images/cards/large/08d.png
new file mode 100644
index 00000000..b4ec7b91
Binary files /dev/null and b/data/images/cards/large/08d.png differ
diff --git a/data/images/cards/large/08h.png b/data/images/cards/large/08h.png
new file mode 100644
index 00000000..f4586de9
Binary files /dev/null and b/data/images/cards/large/08h.png differ
diff --git a/data/images/cards/large/08s.png b/data/images/cards/large/08s.png
new file mode 100644
index 00000000..d3e8c8dc
Binary files /dev/null and b/data/images/cards/large/08s.png differ
diff --git a/data/images/cards/large/09c.png b/data/images/cards/large/09c.png
new file mode 100644
index 00000000..55acc388
Binary files /dev/null and b/data/images/cards/large/09c.png differ
diff --git a/data/images/cards/large/09d.png b/data/images/cards/large/09d.png
new file mode 100644
index 00000000..3c091b54
Binary files /dev/null and b/data/images/cards/large/09d.png differ
diff --git a/data/images/cards/large/09h.png b/data/images/cards/large/09h.png
new file mode 100644
index 00000000..46ab8158
Binary files /dev/null and b/data/images/cards/large/09h.png differ
diff --git a/data/images/cards/large/09s.png b/data/images/cards/large/09s.png
new file mode 100644
index 00000000..76c58cfe
Binary files /dev/null and b/data/images/cards/large/09s.png differ
diff --git a/data/images/cards/large/10c.png b/data/images/cards/large/10c.png
new file mode 100644
index 00000000..67a273c9
Binary files /dev/null and b/data/images/cards/large/10c.png differ
diff --git a/data/images/cards/large/10d.png b/data/images/cards/large/10d.png
new file mode 100644
index 00000000..456a662b
Binary files /dev/null and b/data/images/cards/large/10d.png differ
diff --git a/data/images/cards/large/10h.png b/data/images/cards/large/10h.png
new file mode 100644
index 00000000..8112ae2f
Binary files /dev/null and b/data/images/cards/large/10h.png differ
diff --git a/data/images/cards/large/10s.png b/data/images/cards/large/10s.png
new file mode 100644
index 00000000..366a9606
Binary files /dev/null and b/data/images/cards/large/10s.png differ
diff --git a/data/images/cards/large/11c.png b/data/images/cards/large/11c.png
new file mode 100644
index 00000000..1ca7742d
Binary files /dev/null and b/data/images/cards/large/11c.png differ
diff --git a/data/images/cards/large/11d.png b/data/images/cards/large/11d.png
new file mode 100644
index 00000000..34721727
Binary files /dev/null and b/data/images/cards/large/11d.png differ
diff --git a/data/images/cards/large/11h.png b/data/images/cards/large/11h.png
new file mode 100644
index 00000000..6bda3f1c
Binary files /dev/null and b/data/images/cards/large/11h.png differ
diff --git a/data/images/cards/large/11s.png b/data/images/cards/large/11s.png
new file mode 100644
index 00000000..a608cf3d
Binary files /dev/null and b/data/images/cards/large/11s.png differ
diff --git a/data/images/cards/large/12c.png b/data/images/cards/large/12c.png
new file mode 100644
index 00000000..9b7936bc
Binary files /dev/null and b/data/images/cards/large/12c.png differ
diff --git a/data/images/cards/large/12d.png b/data/images/cards/large/12d.png
new file mode 100644
index 00000000..7c9a99b5
Binary files /dev/null and b/data/images/cards/large/12d.png differ
diff --git a/data/images/cards/large/12h.png b/data/images/cards/large/12h.png
new file mode 100644
index 00000000..d4184717
Binary files /dev/null and b/data/images/cards/large/12h.png differ
diff --git a/data/images/cards/large/12s.png b/data/images/cards/large/12s.png
new file mode 100644
index 00000000..d4e047a3
Binary files /dev/null and b/data/images/cards/large/12s.png differ
diff --git a/data/images/cards/large/13c.png b/data/images/cards/large/13c.png
new file mode 100644
index 00000000..566b8de1
Binary files /dev/null and b/data/images/cards/large/13c.png differ
diff --git a/data/images/cards/large/13d.png b/data/images/cards/large/13d.png
new file mode 100644
index 00000000..afca5200
Binary files /dev/null and b/data/images/cards/large/13d.png differ
diff --git a/data/images/cards/large/13h.png b/data/images/cards/large/13h.png
new file mode 100644
index 00000000..690d2df9
Binary files /dev/null and b/data/images/cards/large/13h.png differ
diff --git a/data/images/cards/large/13s.png b/data/images/cards/large/13s.png
new file mode 100644
index 00000000..b66b8ab6
Binary files /dev/null and b/data/images/cards/large/13s.png differ
diff --git a/data/images/cards/small/01c.png b/data/images/cards/small/01c.png
new file mode 100644
index 00000000..b3df09ec
Binary files /dev/null and b/data/images/cards/small/01c.png differ
diff --git a/data/images/cards/small/01d.png b/data/images/cards/small/01d.png
new file mode 100644
index 00000000..5d8ee777
Binary files /dev/null and b/data/images/cards/small/01d.png differ
diff --git a/data/images/cards/small/01h.png b/data/images/cards/small/01h.png
new file mode 100644
index 00000000..62e24bf2
Binary files /dev/null and b/data/images/cards/small/01h.png differ
diff --git a/data/images/cards/small/01s.png b/data/images/cards/small/01s.png
new file mode 100644
index 00000000..59626b3d
Binary files /dev/null and b/data/images/cards/small/01s.png differ
diff --git a/data/images/cards/small/02c.png b/data/images/cards/small/02c.png
new file mode 100644
index 00000000..ab134fce
Binary files /dev/null and b/data/images/cards/small/02c.png differ
diff --git a/data/images/cards/small/02d.png b/data/images/cards/small/02d.png
new file mode 100644
index 00000000..9d491b3b
Binary files /dev/null and b/data/images/cards/small/02d.png differ
diff --git a/data/images/cards/small/02h.png b/data/images/cards/small/02h.png
new file mode 100644
index 00000000..8564c3e0
Binary files /dev/null and b/data/images/cards/small/02h.png differ
diff --git a/data/images/cards/small/02s.png b/data/images/cards/small/02s.png
new file mode 100644
index 00000000..696e95c0
Binary files /dev/null and b/data/images/cards/small/02s.png differ
diff --git a/data/images/cards/small/03c.png b/data/images/cards/small/03c.png
new file mode 100644
index 00000000..9c7983e1
Binary files /dev/null and b/data/images/cards/small/03c.png differ
diff --git a/data/images/cards/small/03d.png b/data/images/cards/small/03d.png
new file mode 100644
index 00000000..9e44843c
Binary files /dev/null and b/data/images/cards/small/03d.png differ
diff --git a/data/images/cards/small/03h.png b/data/images/cards/small/03h.png
new file mode 100644
index 00000000..a01647c1
Binary files /dev/null and b/data/images/cards/small/03h.png differ
diff --git a/data/images/cards/small/03s.png b/data/images/cards/small/03s.png
new file mode 100644
index 00000000..1f2fbd18
Binary files /dev/null and b/data/images/cards/small/03s.png differ
diff --git a/data/images/cards/small/04c.png b/data/images/cards/small/04c.png
new file mode 100644
index 00000000..d19e3953
Binary files /dev/null and b/data/images/cards/small/04c.png differ
diff --git a/data/images/cards/small/04d.png b/data/images/cards/small/04d.png
new file mode 100644
index 00000000..072e5353
Binary files /dev/null and b/data/images/cards/small/04d.png differ
diff --git a/data/images/cards/small/04h.png b/data/images/cards/small/04h.png
new file mode 100644
index 00000000..34cde36b
Binary files /dev/null and b/data/images/cards/small/04h.png differ
diff --git a/data/images/cards/small/04s.png b/data/images/cards/small/04s.png
new file mode 100644
index 00000000..d0d0be3f
Binary files /dev/null and b/data/images/cards/small/04s.png differ
diff --git a/data/images/cards/small/05c.png b/data/images/cards/small/05c.png
new file mode 100644
index 00000000..5a2949ca
Binary files /dev/null and b/data/images/cards/small/05c.png differ
diff --git a/data/images/cards/small/05d.png b/data/images/cards/small/05d.png
new file mode 100644
index 00000000..682129d6
Binary files /dev/null and b/data/images/cards/small/05d.png differ
diff --git a/data/images/cards/small/05h.png b/data/images/cards/small/05h.png
new file mode 100644
index 00000000..a30fdaac
Binary files /dev/null and b/data/images/cards/small/05h.png differ
diff --git a/data/images/cards/small/05s.png b/data/images/cards/small/05s.png
new file mode 100644
index 00000000..6d130e1f
Binary files /dev/null and b/data/images/cards/small/05s.png differ
diff --git a/data/images/cards/small/06c.png b/data/images/cards/small/06c.png
new file mode 100644
index 00000000..6ff3c685
Binary files /dev/null and b/data/images/cards/small/06c.png differ
diff --git a/data/images/cards/small/06d.png b/data/images/cards/small/06d.png
new file mode 100644
index 00000000..2b017461
Binary files /dev/null and b/data/images/cards/small/06d.png differ
diff --git a/data/images/cards/small/06h.png b/data/images/cards/small/06h.png
new file mode 100644
index 00000000..2a089643
Binary files /dev/null and b/data/images/cards/small/06h.png differ
diff --git a/data/images/cards/small/06s.png b/data/images/cards/small/06s.png
new file mode 100644
index 00000000..48899663
Binary files /dev/null and b/data/images/cards/small/06s.png differ
diff --git a/data/images/cards/small/07c.png b/data/images/cards/small/07c.png
new file mode 100644
index 00000000..60d788ac
Binary files /dev/null and b/data/images/cards/small/07c.png differ
diff --git a/data/images/cards/small/07d.png b/data/images/cards/small/07d.png
new file mode 100644
index 00000000..95c6b735
Binary files /dev/null and b/data/images/cards/small/07d.png differ
diff --git a/data/images/cards/small/07h.png b/data/images/cards/small/07h.png
new file mode 100644
index 00000000..0949b45e
Binary files /dev/null and b/data/images/cards/small/07h.png differ
diff --git a/data/images/cards/small/07s.png b/data/images/cards/small/07s.png
new file mode 100644
index 00000000..67c42d53
Binary files /dev/null and b/data/images/cards/small/07s.png differ
diff --git a/data/images/cards/small/08c.png b/data/images/cards/small/08c.png
new file mode 100644
index 00000000..7f9fe76e
Binary files /dev/null and b/data/images/cards/small/08c.png differ
diff --git a/data/images/cards/small/08d.png b/data/images/cards/small/08d.png
new file mode 100644
index 00000000..1628f515
Binary files /dev/null and b/data/images/cards/small/08d.png differ
diff --git a/data/images/cards/small/08h.png b/data/images/cards/small/08h.png
new file mode 100644
index 00000000..da676fbd
Binary files /dev/null and b/data/images/cards/small/08h.png differ
diff --git a/data/images/cards/small/08s.png b/data/images/cards/small/08s.png
new file mode 100644
index 00000000..05c8241c
Binary files /dev/null and b/data/images/cards/small/08s.png differ
diff --git a/data/images/cards/small/09c.png b/data/images/cards/small/09c.png
new file mode 100644
index 00000000..4b1b58f2
Binary files /dev/null and b/data/images/cards/small/09c.png differ
diff --git a/data/images/cards/small/09d.png b/data/images/cards/small/09d.png
new file mode 100644
index 00000000..3f0d0ea3
Binary files /dev/null and b/data/images/cards/small/09d.png differ
diff --git a/data/images/cards/small/09h.png b/data/images/cards/small/09h.png
new file mode 100644
index 00000000..513b6e81
Binary files /dev/null and b/data/images/cards/small/09h.png differ
diff --git a/data/images/cards/small/09s.png b/data/images/cards/small/09s.png
new file mode 100644
index 00000000..93205ece
Binary files /dev/null and b/data/images/cards/small/09s.png differ
diff --git a/data/images/cards/small/10c.png b/data/images/cards/small/10c.png
new file mode 100644
index 00000000..f6f9c7c5
Binary files /dev/null and b/data/images/cards/small/10c.png differ
diff --git a/data/images/cards/small/10d.png b/data/images/cards/small/10d.png
new file mode 100644
index 00000000..4e9a77ea
Binary files /dev/null and b/data/images/cards/small/10d.png differ
diff --git a/data/images/cards/small/10h.png b/data/images/cards/small/10h.png
new file mode 100644
index 00000000..f00f4230
Binary files /dev/null and b/data/images/cards/small/10h.png differ
diff --git a/data/images/cards/small/10s.png b/data/images/cards/small/10s.png
new file mode 100644
index 00000000..5209e50f
Binary files /dev/null and b/data/images/cards/small/10s.png differ
diff --git a/data/images/cards/small/11c.png b/data/images/cards/small/11c.png
new file mode 100644
index 00000000..7377c063
Binary files /dev/null and b/data/images/cards/small/11c.png differ
diff --git a/data/images/cards/small/11d.png b/data/images/cards/small/11d.png
new file mode 100644
index 00000000..18602b96
Binary files /dev/null and b/data/images/cards/small/11d.png differ
diff --git a/data/images/cards/small/11h.png b/data/images/cards/small/11h.png
new file mode 100644
index 00000000..2cdb2c4e
Binary files /dev/null and b/data/images/cards/small/11h.png differ
diff --git a/data/images/cards/small/11s.png b/data/images/cards/small/11s.png
new file mode 100644
index 00000000..18563e55
Binary files /dev/null and b/data/images/cards/small/11s.png differ
diff --git a/data/images/cards/small/12c.png b/data/images/cards/small/12c.png
new file mode 100644
index 00000000..289df81b
Binary files /dev/null and b/data/images/cards/small/12c.png differ
diff --git a/data/images/cards/small/12d.png b/data/images/cards/small/12d.png
new file mode 100644
index 00000000..8729a2e1
Binary files /dev/null and b/data/images/cards/small/12d.png differ
diff --git a/data/images/cards/small/12h.png b/data/images/cards/small/12h.png
new file mode 100644
index 00000000..01e52258
Binary files /dev/null and b/data/images/cards/small/12h.png differ
diff --git a/data/images/cards/small/12s.png b/data/images/cards/small/12s.png
new file mode 100644
index 00000000..74f3876f
Binary files /dev/null and b/data/images/cards/small/12s.png differ
diff --git a/data/images/cards/small/13c.png b/data/images/cards/small/13c.png
new file mode 100644
index 00000000..c80adfc5
Binary files /dev/null and b/data/images/cards/small/13c.png differ
diff --git a/data/images/cards/small/13d.png b/data/images/cards/small/13d.png
new file mode 100644
index 00000000..f56e97a9
Binary files /dev/null and b/data/images/cards/small/13d.png differ
diff --git a/data/images/cards/small/13h.png b/data/images/cards/small/13h.png
new file mode 100644
index 00000000..ab038cbf
Binary files /dev/null and b/data/images/cards/small/13h.png differ
diff --git a/data/images/cards/small/13s.png b/data/images/cards/small/13s.png
new file mode 100644
index 00000000..14a979a7
Binary files /dev/null and b/data/images/cards/small/13s.png differ
diff --git a/data/images/demo/demo01.png b/data/images/demo/demo01.png
new file mode 100644
index 00000000..ae73caba
Binary files /dev/null and b/data/images/demo/demo01.png differ
diff --git a/data/images/demo/demo02.png b/data/images/demo/demo02.png
new file mode 100644
index 00000000..a7658261
Binary files /dev/null and b/data/images/demo/demo02.png differ
diff --git a/data/images/demo/demo03.png b/data/images/demo/demo03.png
new file mode 100644
index 00000000..b7a9cbfd
Binary files /dev/null and b/data/images/demo/demo03.png differ
diff --git a/data/images/demo/demo04.png b/data/images/demo/demo04.png
new file mode 100644
index 00000000..43433eb1
Binary files /dev/null and b/data/images/demo/demo04.png differ
diff --git a/data/images/demo/demo05.png b/data/images/demo/demo05.png
new file mode 100644
index 00000000..e9482bce
Binary files /dev/null and b/data/images/demo/demo05.png differ
diff --git a/data/images/dialog/bluecurve/error.png b/data/images/dialog/bluecurve/error.png
new file mode 100644
index 00000000..4cc4aec3
Binary files /dev/null and b/data/images/dialog/bluecurve/error.png differ
diff --git a/data/images/dialog/bluecurve/info.png b/data/images/dialog/bluecurve/info.png
new file mode 100644
index 00000000..2a3f3b2d
Binary files /dev/null and b/data/images/dialog/bluecurve/info.png differ
diff --git a/data/images/dialog/bluecurve/question.png b/data/images/dialog/bluecurve/question.png
new file mode 100644
index 00000000..2cde3e80
Binary files /dev/null and b/data/images/dialog/bluecurve/question.png differ
diff --git a/data/images/dialog/bluecurve/warning.png b/data/images/dialog/bluecurve/warning.png
new file mode 100644
index 00000000..c0dfab59
Binary files /dev/null and b/data/images/dialog/bluecurve/warning.png differ
diff --git a/data/images/dialog/default/error.png b/data/images/dialog/default/error.png
new file mode 100644
index 00000000..f01440db
Binary files /dev/null and b/data/images/dialog/default/error.png differ
diff --git a/data/images/dialog/default/info.png b/data/images/dialog/default/info.png
new file mode 100644
index 00000000..efde015e
Binary files /dev/null and b/data/images/dialog/default/info.png differ
diff --git a/data/images/dialog/default/question.png b/data/images/dialog/default/question.png
new file mode 100644
index 00000000..d416f1d7
Binary files /dev/null and b/data/images/dialog/default/question.png differ
diff --git a/data/images/dialog/default/warning.png b/data/images/dialog/default/warning.png
new file mode 100644
index 00000000..4cf7c8b2
Binary files /dev/null and b/data/images/dialog/default/warning.png differ
diff --git a/data/images/htmlviewer/disk.png b/data/images/htmlviewer/disk.png
new file mode 100644
index 00000000..d77bf3cd
Binary files /dev/null and b/data/images/htmlviewer/disk.png differ
diff --git a/data/images/logos/joker07_40_774.png b/data/images/logos/joker07_40_774.png
new file mode 100644
index 00000000..15a106b7
Binary files /dev/null and b/data/images/logos/joker07_40_774.png differ
diff --git a/data/images/logos/joker07_50_774.png b/data/images/logos/joker07_50_774.png
new file mode 100644
index 00000000..c164b0af
Binary files /dev/null and b/data/images/logos/joker07_50_774.png differ
diff --git a/data/images/logos/joker08_40_774.png b/data/images/logos/joker08_40_774.png
new file mode 100644
index 00000000..098a3513
Binary files /dev/null and b/data/images/logos/joker08_40_774.png differ
diff --git a/data/images/logos/joker08_50_774.png b/data/images/logos/joker08_50_774.png
new file mode 100644
index 00000000..f820eea6
Binary files /dev/null and b/data/images/logos/joker08_50_774.png differ
diff --git a/data/images/logos/joker10_100.png b/data/images/logos/joker10_100.png
new file mode 100644
index 00000000..4e87f06e
Binary files /dev/null and b/data/images/logos/joker10_100.png differ
diff --git a/data/images/logos/joker11_100_774.png b/data/images/logos/joker11_100_774.png
new file mode 100644
index 00000000..9c2bad93
Binary files /dev/null and b/data/images/logos/joker11_100_774.png differ
diff --git a/data/images/misc/pysol03.png b/data/images/misc/pysol03.png
new file mode 100644
index 00000000..068b4f37
Binary files /dev/null and b/data/images/misc/pysol03.png differ
diff --git a/data/images/misc/pysol06.png b/data/images/misc/pysol06.png
new file mode 100644
index 00000000..cb68c903
Binary files /dev/null and b/data/images/misc/pysol06.png differ
diff --git a/data/images/noredeal.png b/data/images/noredeal.png
new file mode 100644
index 00000000..c761ea97
Binary files /dev/null and b/data/images/noredeal.png differ
diff --git a/data/images/pause/pause01.png b/data/images/pause/pause01.png
new file mode 100644
index 00000000..afbef556
Binary files /dev/null and b/data/images/pause/pause01.png differ
diff --git a/data/images/pause/pause02.png b/data/images/pause/pause02.png
new file mode 100644
index 00000000..f60d7b64
Binary files /dev/null and b/data/images/pause/pause02.png differ
diff --git a/data/images/pause/pause03.png b/data/images/pause/pause03.png
new file mode 100644
index 00000000..05eb06f6
Binary files /dev/null and b/data/images/pause/pause03.png differ
diff --git a/data/images/selectgame.png b/data/images/selectgame.png
new file mode 100644
index 00000000..88aa7499
Binary files /dev/null and b/data/images/selectgame.png differ
diff --git a/data/images/shadow.png b/data/images/shadow.png
new file mode 100644
index 00000000..cfd813d8
Binary files /dev/null and b/data/images/shadow.png differ
diff --git a/data/images/stats/barchart.png b/data/images/stats/barchart.png
new file mode 100644
index 00000000..db3210f1
Binary files /dev/null and b/data/images/stats/barchart.png differ
diff --git a/data/images/stoplight.png b/data/images/stoplight.png
new file mode 100644
index 00000000..2ee2e067
Binary files /dev/null and b/data/images/stoplight.png differ
diff --git a/data/images/toolbar/bluecurve/large/autodrop.png b/data/images/toolbar/bluecurve/large/autodrop.png
new file mode 100644
index 00000000..d0a42bf5
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/autodrop.png differ
diff --git a/data/images/toolbar/bluecurve/large/new.png b/data/images/toolbar/bluecurve/large/new.png
new file mode 100644
index 00000000..27e50c78
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/new.png differ
diff --git a/data/images/toolbar/bluecurve/large/open.png b/data/images/toolbar/bluecurve/large/open.png
new file mode 100644
index 00000000..8679c8f0
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/open.png differ
diff --git a/data/images/toolbar/bluecurve/large/pause.png b/data/images/toolbar/bluecurve/large/pause.png
new file mode 100644
index 00000000..3db24ca2
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/pause.png differ
diff --git a/data/images/toolbar/bluecurve/large/quit.png b/data/images/toolbar/bluecurve/large/quit.png
new file mode 100644
index 00000000..2fea4822
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/quit.png differ
diff --git a/data/images/toolbar/bluecurve/large/redo.png b/data/images/toolbar/bluecurve/large/redo.png
new file mode 100644
index 00000000..c171d38a
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/redo.png differ
diff --git a/data/images/toolbar/bluecurve/large/restart.png b/data/images/toolbar/bluecurve/large/restart.png
new file mode 100644
index 00000000..fbe03d61
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/restart.png differ
diff --git a/data/images/toolbar/bluecurve/large/rules.png b/data/images/toolbar/bluecurve/large/rules.png
new file mode 100644
index 00000000..f90fcde5
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/rules.png differ
diff --git a/data/images/toolbar/bluecurve/large/save.png b/data/images/toolbar/bluecurve/large/save.png
new file mode 100644
index 00000000..5201f13c
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/save.png differ
diff --git a/data/images/toolbar/bluecurve/large/shuffle.png b/data/images/toolbar/bluecurve/large/shuffle.png
new file mode 100644
index 00000000..21e970db
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/shuffle.png differ
diff --git a/data/images/toolbar/bluecurve/large/statistics.png b/data/images/toolbar/bluecurve/large/statistics.png
new file mode 100644
index 00000000..e1f407f0
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/statistics.png differ
diff --git a/data/images/toolbar/bluecurve/large/undo.png b/data/images/toolbar/bluecurve/large/undo.png
new file mode 100644
index 00000000..04913c59
Binary files /dev/null and b/data/images/toolbar/bluecurve/large/undo.png differ
diff --git a/data/images/toolbar/bluecurve/small/autodrop.png b/data/images/toolbar/bluecurve/small/autodrop.png
new file mode 100644
index 00000000..14788d43
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/autodrop.png differ
diff --git a/data/images/toolbar/bluecurve/small/new.png b/data/images/toolbar/bluecurve/small/new.png
new file mode 100644
index 00000000..f1e9d96e
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/new.png differ
diff --git a/data/images/toolbar/bluecurve/small/open.png b/data/images/toolbar/bluecurve/small/open.png
new file mode 100644
index 00000000..649df18d
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/open.png differ
diff --git a/data/images/toolbar/bluecurve/small/pause.png b/data/images/toolbar/bluecurve/small/pause.png
new file mode 100644
index 00000000..977727ac
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/pause.png differ
diff --git a/data/images/toolbar/bluecurve/small/quit.png b/data/images/toolbar/bluecurve/small/quit.png
new file mode 100644
index 00000000..2e9e488a
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/quit.png differ
diff --git a/data/images/toolbar/bluecurve/small/redo.png b/data/images/toolbar/bluecurve/small/redo.png
new file mode 100644
index 00000000..22a71dce
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/redo.png differ
diff --git a/data/images/toolbar/bluecurve/small/restart.png b/data/images/toolbar/bluecurve/small/restart.png
new file mode 100644
index 00000000..6c7f6522
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/restart.png differ
diff --git a/data/images/toolbar/bluecurve/small/rules.png b/data/images/toolbar/bluecurve/small/rules.png
new file mode 100644
index 00000000..5112b1db
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/rules.png differ
diff --git a/data/images/toolbar/bluecurve/small/save.png b/data/images/toolbar/bluecurve/small/save.png
new file mode 100644
index 00000000..f3b4b728
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/save.png differ
diff --git a/data/images/toolbar/bluecurve/small/shuffle.png b/data/images/toolbar/bluecurve/small/shuffle.png
new file mode 100644
index 00000000..8ffb61c9
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/shuffle.png differ
diff --git a/data/images/toolbar/bluecurve/small/statistics.png b/data/images/toolbar/bluecurve/small/statistics.png
new file mode 100644
index 00000000..60539c37
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/statistics.png differ
diff --git a/data/images/toolbar/bluecurve/small/undo.png b/data/images/toolbar/bluecurve/small/undo.png
new file mode 100644
index 00000000..136c12a8
Binary files /dev/null and b/data/images/toolbar/bluecurve/small/undo.png differ
diff --git a/data/images/toolbar/bluecurve/xlarge/autodrop.png b/data/images/toolbar/bluecurve/xlarge/autodrop.png
new file mode 100644
index 00000000..dfbf4cb2
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/autodrop.png differ
diff --git a/data/images/toolbar/bluecurve/xlarge/new.png b/data/images/toolbar/bluecurve/xlarge/new.png
new file mode 100644
index 00000000..d089f2f5
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/new.png differ
diff --git a/data/images/toolbar/bluecurve/xlarge/open.png b/data/images/toolbar/bluecurve/xlarge/open.png
new file mode 100644
index 00000000..1a4c4d8c
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/open.png differ
diff --git a/data/images/toolbar/bluecurve/xlarge/pause.png b/data/images/toolbar/bluecurve/xlarge/pause.png
new file mode 100644
index 00000000..86c71c97
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/pause.png differ
diff --git a/data/images/toolbar/bluecurve/xlarge/quit.png b/data/images/toolbar/bluecurve/xlarge/quit.png
new file mode 100644
index 00000000..aaafdaa2
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/quit.png differ
diff --git a/data/images/toolbar/bluecurve/xlarge/redo.png b/data/images/toolbar/bluecurve/xlarge/redo.png
new file mode 100644
index 00000000..2f56badb
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/redo.png differ
diff --git a/data/images/toolbar/bluecurve/xlarge/restart.png b/data/images/toolbar/bluecurve/xlarge/restart.png
new file mode 100644
index 00000000..f3987063
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/restart.png differ
diff --git a/data/images/toolbar/bluecurve/xlarge/rules.png b/data/images/toolbar/bluecurve/xlarge/rules.png
new file mode 100644
index 00000000..006621a6
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/rules.png differ
diff --git a/data/images/toolbar/bluecurve/xlarge/save.png b/data/images/toolbar/bluecurve/xlarge/save.png
new file mode 100644
index 00000000..7fa548f2
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/save.png differ
diff --git a/data/images/toolbar/bluecurve/xlarge/statistics.png b/data/images/toolbar/bluecurve/xlarge/statistics.png
new file mode 100644
index 00000000..74067cce
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/statistics.png differ
diff --git a/data/images/toolbar/bluecurve/xlarge/undo.png b/data/images/toolbar/bluecurve/xlarge/undo.png
new file mode 100644
index 00000000..63d7a61a
Binary files /dev/null and b/data/images/toolbar/bluecurve/xlarge/undo.png differ
diff --git a/data/images/toolbar/crystal/large/autodrop.png b/data/images/toolbar/crystal/large/autodrop.png
new file mode 100644
index 00000000..6857d3ff
Binary files /dev/null and b/data/images/toolbar/crystal/large/autodrop.png differ
diff --git a/data/images/toolbar/crystal/large/new.png b/data/images/toolbar/crystal/large/new.png
new file mode 100644
index 00000000..0a38aa1c
Binary files /dev/null and b/data/images/toolbar/crystal/large/new.png differ
diff --git a/data/images/toolbar/crystal/large/open.png b/data/images/toolbar/crystal/large/open.png
new file mode 100644
index 00000000..c1ad72fe
Binary files /dev/null and b/data/images/toolbar/crystal/large/open.png differ
diff --git a/data/images/toolbar/crystal/large/pause.png b/data/images/toolbar/crystal/large/pause.png
new file mode 100644
index 00000000..3db24ca2
Binary files /dev/null and b/data/images/toolbar/crystal/large/pause.png differ
diff --git a/data/images/toolbar/crystal/large/quit.png b/data/images/toolbar/crystal/large/quit.png
new file mode 100644
index 00000000..8cb6b93a
Binary files /dev/null and b/data/images/toolbar/crystal/large/quit.png differ
diff --git a/data/images/toolbar/crystal/large/redo.png b/data/images/toolbar/crystal/large/redo.png
new file mode 100644
index 00000000..194a8181
Binary files /dev/null and b/data/images/toolbar/crystal/large/redo.png differ
diff --git a/data/images/toolbar/crystal/large/restart.png b/data/images/toolbar/crystal/large/restart.png
new file mode 100644
index 00000000..554bd1c5
Binary files /dev/null and b/data/images/toolbar/crystal/large/restart.png differ
diff --git a/data/images/toolbar/crystal/large/rules.png b/data/images/toolbar/crystal/large/rules.png
new file mode 100644
index 00000000..ab7d16e4
Binary files /dev/null and b/data/images/toolbar/crystal/large/rules.png differ
diff --git a/data/images/toolbar/crystal/large/save.png b/data/images/toolbar/crystal/large/save.png
new file mode 100644
index 00000000..aefcdfc6
Binary files /dev/null and b/data/images/toolbar/crystal/large/save.png differ
diff --git a/data/images/toolbar/crystal/large/shuffle.png b/data/images/toolbar/crystal/large/shuffle.png
new file mode 100644
index 00000000..21df38d5
Binary files /dev/null and b/data/images/toolbar/crystal/large/shuffle.png differ
diff --git a/data/images/toolbar/crystal/large/statistics.png b/data/images/toolbar/crystal/large/statistics.png
new file mode 100644
index 00000000..f7787b9b
Binary files /dev/null and b/data/images/toolbar/crystal/large/statistics.png differ
diff --git a/data/images/toolbar/crystal/large/undo.png b/data/images/toolbar/crystal/large/undo.png
new file mode 100644
index 00000000..8abe7a7a
Binary files /dev/null and b/data/images/toolbar/crystal/large/undo.png differ
diff --git a/data/images/toolbar/crystal/small/autodrop.png b/data/images/toolbar/crystal/small/autodrop.png
new file mode 100644
index 00000000..30e062de
Binary files /dev/null and b/data/images/toolbar/crystal/small/autodrop.png differ
diff --git a/data/images/toolbar/crystal/small/new.png b/data/images/toolbar/crystal/small/new.png
new file mode 100644
index 00000000..8bad9fb9
Binary files /dev/null and b/data/images/toolbar/crystal/small/new.png differ
diff --git a/data/images/toolbar/crystal/small/open.png b/data/images/toolbar/crystal/small/open.png
new file mode 100644
index 00000000..75247d27
Binary files /dev/null and b/data/images/toolbar/crystal/small/open.png differ
diff --git a/data/images/toolbar/crystal/small/pause.png b/data/images/toolbar/crystal/small/pause.png
new file mode 100644
index 00000000..177cf76d
Binary files /dev/null and b/data/images/toolbar/crystal/small/pause.png differ
diff --git a/data/images/toolbar/crystal/small/quit.png b/data/images/toolbar/crystal/small/quit.png
new file mode 100644
index 00000000..1975dad3
Binary files /dev/null and b/data/images/toolbar/crystal/small/quit.png differ
diff --git a/data/images/toolbar/crystal/small/redo.png b/data/images/toolbar/crystal/small/redo.png
new file mode 100644
index 00000000..74817b6b
Binary files /dev/null and b/data/images/toolbar/crystal/small/redo.png differ
diff --git a/data/images/toolbar/crystal/small/restart.png b/data/images/toolbar/crystal/small/restart.png
new file mode 100644
index 00000000..95888e7a
Binary files /dev/null and b/data/images/toolbar/crystal/small/restart.png differ
diff --git a/data/images/toolbar/crystal/small/rules.png b/data/images/toolbar/crystal/small/rules.png
new file mode 100644
index 00000000..b4d0e82a
Binary files /dev/null and b/data/images/toolbar/crystal/small/rules.png differ
diff --git a/data/images/toolbar/crystal/small/save.png b/data/images/toolbar/crystal/small/save.png
new file mode 100644
index 00000000..96e8e302
Binary files /dev/null and b/data/images/toolbar/crystal/small/save.png differ
diff --git a/data/images/toolbar/crystal/small/shuffle.png b/data/images/toolbar/crystal/small/shuffle.png
new file mode 100644
index 00000000..7cc0d349
Binary files /dev/null and b/data/images/toolbar/crystal/small/shuffle.png differ
diff --git a/data/images/toolbar/crystal/small/statistics.png b/data/images/toolbar/crystal/small/statistics.png
new file mode 100644
index 00000000..aca2fd31
Binary files /dev/null and b/data/images/toolbar/crystal/small/statistics.png differ
diff --git a/data/images/toolbar/crystal/small/undo.png b/data/images/toolbar/crystal/small/undo.png
new file mode 100644
index 00000000..f5289d88
Binary files /dev/null and b/data/images/toolbar/crystal/small/undo.png differ
diff --git a/data/images/toolbar/default/large/autodrop.png b/data/images/toolbar/default/large/autodrop.png
new file mode 100644
index 00000000..9f9cfb6b
Binary files /dev/null and b/data/images/toolbar/default/large/autodrop.png differ
diff --git a/data/images/toolbar/default/large/new.png b/data/images/toolbar/default/large/new.png
new file mode 100644
index 00000000..46af2e0e
Binary files /dev/null and b/data/images/toolbar/default/large/new.png differ
diff --git a/data/images/toolbar/default/large/open.png b/data/images/toolbar/default/large/open.png
new file mode 100644
index 00000000..de0e2c6e
Binary files /dev/null and b/data/images/toolbar/default/large/open.png differ
diff --git a/data/images/toolbar/default/large/pause.png b/data/images/toolbar/default/large/pause.png
new file mode 100644
index 00000000..3db24ca2
Binary files /dev/null and b/data/images/toolbar/default/large/pause.png differ
diff --git a/data/images/toolbar/default/large/quit.png b/data/images/toolbar/default/large/quit.png
new file mode 100644
index 00000000..a1c99055
Binary files /dev/null and b/data/images/toolbar/default/large/quit.png differ
diff --git a/data/images/toolbar/default/large/redo.png b/data/images/toolbar/default/large/redo.png
new file mode 100644
index 00000000..35a14ec2
Binary files /dev/null and b/data/images/toolbar/default/large/redo.png differ
diff --git a/data/images/toolbar/default/large/restart.png b/data/images/toolbar/default/large/restart.png
new file mode 100644
index 00000000..78b5f1bc
Binary files /dev/null and b/data/images/toolbar/default/large/restart.png differ
diff --git a/data/images/toolbar/default/large/rules.png b/data/images/toolbar/default/large/rules.png
new file mode 100644
index 00000000..2c22c2d8
Binary files /dev/null and b/data/images/toolbar/default/large/rules.png differ
diff --git a/data/images/toolbar/default/large/save.png b/data/images/toolbar/default/large/save.png
new file mode 100644
index 00000000..033e369a
Binary files /dev/null and b/data/images/toolbar/default/large/save.png differ
diff --git a/data/images/toolbar/default/large/statistics.png b/data/images/toolbar/default/large/statistics.png
new file mode 100644
index 00000000..291d14cc
Binary files /dev/null and b/data/images/toolbar/default/large/statistics.png differ
diff --git a/data/images/toolbar/default/large/undo.png b/data/images/toolbar/default/large/undo.png
new file mode 100644
index 00000000..4ff4b518
Binary files /dev/null and b/data/images/toolbar/default/large/undo.png differ
diff --git a/data/images/toolbar/default/small/autodrop.png b/data/images/toolbar/default/small/autodrop.png
new file mode 100644
index 00000000..3e5cd202
Binary files /dev/null and b/data/images/toolbar/default/small/autodrop.png differ
diff --git a/data/images/toolbar/default/small/new.png b/data/images/toolbar/default/small/new.png
new file mode 100644
index 00000000..570a7cb9
Binary files /dev/null and b/data/images/toolbar/default/small/new.png differ
diff --git a/data/images/toolbar/default/small/open.png b/data/images/toolbar/default/small/open.png
new file mode 100644
index 00000000..7c46966b
Binary files /dev/null and b/data/images/toolbar/default/small/open.png differ
diff --git a/data/images/toolbar/default/small/pause.png b/data/images/toolbar/default/small/pause.png
new file mode 100644
index 00000000..177cf76d
Binary files /dev/null and b/data/images/toolbar/default/small/pause.png differ
diff --git a/data/images/toolbar/default/small/quit.png b/data/images/toolbar/default/small/quit.png
new file mode 100644
index 00000000..d875f772
Binary files /dev/null and b/data/images/toolbar/default/small/quit.png differ
diff --git a/data/images/toolbar/default/small/redo.png b/data/images/toolbar/default/small/redo.png
new file mode 100644
index 00000000..b61776e9
Binary files /dev/null and b/data/images/toolbar/default/small/redo.png differ
diff --git a/data/images/toolbar/default/small/restart.png b/data/images/toolbar/default/small/restart.png
new file mode 100644
index 00000000..9f83ec39
Binary files /dev/null and b/data/images/toolbar/default/small/restart.png differ
diff --git a/data/images/toolbar/default/small/rules.png b/data/images/toolbar/default/small/rules.png
new file mode 100644
index 00000000..13253951
Binary files /dev/null and b/data/images/toolbar/default/small/rules.png differ
diff --git a/data/images/toolbar/default/small/save.png b/data/images/toolbar/default/small/save.png
new file mode 100644
index 00000000..2b9800ca
Binary files /dev/null and b/data/images/toolbar/default/small/save.png differ
diff --git a/data/images/toolbar/default/small/statistics.png b/data/images/toolbar/default/small/statistics.png
new file mode 100644
index 00000000..ad1155f8
Binary files /dev/null and b/data/images/toolbar/default/small/statistics.png differ
diff --git a/data/images/toolbar/default/small/undo.png b/data/images/toolbar/default/small/undo.png
new file mode 100644
index 00000000..371dba96
Binary files /dev/null and b/data/images/toolbar/default/small/undo.png differ
diff --git a/data/images/toolbar/human/small/autodrop.png b/data/images/toolbar/human/small/autodrop.png
new file mode 100644
index 00000000..e432e269
Binary files /dev/null and b/data/images/toolbar/human/small/autodrop.png differ
diff --git a/data/images/toolbar/human/small/new.png b/data/images/toolbar/human/small/new.png
new file mode 100644
index 00000000..a5f9d572
Binary files /dev/null and b/data/images/toolbar/human/small/new.png differ
diff --git a/data/images/toolbar/human/small/open.png b/data/images/toolbar/human/small/open.png
new file mode 100644
index 00000000..1be90204
Binary files /dev/null and b/data/images/toolbar/human/small/open.png differ
diff --git a/data/images/toolbar/human/small/pause.png b/data/images/toolbar/human/small/pause.png
new file mode 100644
index 00000000..2887ce31
Binary files /dev/null and b/data/images/toolbar/human/small/pause.png differ
diff --git a/data/images/toolbar/human/small/quit.png b/data/images/toolbar/human/small/quit.png
new file mode 100644
index 00000000..ceecf72a
Binary files /dev/null and b/data/images/toolbar/human/small/quit.png differ
diff --git a/data/images/toolbar/human/small/redo.png b/data/images/toolbar/human/small/redo.png
new file mode 100644
index 00000000..88261589
Binary files /dev/null and b/data/images/toolbar/human/small/redo.png differ
diff --git a/data/images/toolbar/human/small/restart.png b/data/images/toolbar/human/small/restart.png
new file mode 100644
index 00000000..67549510
Binary files /dev/null and b/data/images/toolbar/human/small/restart.png differ
diff --git a/data/images/toolbar/human/small/rules.png b/data/images/toolbar/human/small/rules.png
new file mode 100644
index 00000000..0343ec78
Binary files /dev/null and b/data/images/toolbar/human/small/rules.png differ
diff --git a/data/images/toolbar/human/small/save.png b/data/images/toolbar/human/small/save.png
new file mode 100644
index 00000000..fee2609b
Binary files /dev/null and b/data/images/toolbar/human/small/save.png differ
diff --git a/data/images/toolbar/human/small/shuffle.png b/data/images/toolbar/human/small/shuffle.png
new file mode 100644
index 00000000..91219c0a
Binary files /dev/null and b/data/images/toolbar/human/small/shuffle.png differ
diff --git a/data/images/toolbar/human/small/statistics.png b/data/images/toolbar/human/small/statistics.png
new file mode 100644
index 00000000..58ed3731
Binary files /dev/null and b/data/images/toolbar/human/small/statistics.png differ
diff --git a/data/images/toolbar/human/small/undo.png b/data/images/toolbar/human/small/undo.png
new file mode 100644
index 00000000..a4332989
Binary files /dev/null and b/data/images/toolbar/human/small/undo.png differ
diff --git a/data/images/tree/emptynode.png b/data/images/tree/emptynode.png
new file mode 100644
index 00000000..284574ea
Binary files /dev/null and b/data/images/tree/emptynode.png differ
diff --git a/data/images/tree/folder.png b/data/images/tree/folder.png
new file mode 100644
index 00000000..0f4b342d
Binary files /dev/null and b/data/images/tree/folder.png differ
diff --git a/data/images/tree/minusnode.png b/data/images/tree/minusnode.png
new file mode 100644
index 00000000..5841210f
Binary files /dev/null and b/data/images/tree/minusnode.png differ
diff --git a/data/images/tree/node.png b/data/images/tree/node.png
new file mode 100644
index 00000000..c640e67c
Binary files /dev/null and b/data/images/tree/node.png differ
diff --git a/data/images/tree/openfolder.png b/data/images/tree/openfolder.png
new file mode 100644
index 00000000..7063cee9
Binary files /dev/null and b/data/images/tree/openfolder.png differ
diff --git a/data/images/tree/plusnode.png b/data/images/tree/plusnode.png
new file mode 100644
index 00000000..55e73148
Binary files /dev/null and b/data/images/tree/plusnode.png differ
diff --git a/data/images/tree/python.png b/data/images/tree/python.png
new file mode 100644
index 00000000..69cd0024
Binary files /dev/null and b/data/images/tree/python.png differ
diff --git a/data/images/tree/tk.png b/data/images/tree/tk.png
new file mode 100644
index 00000000..31e433f9
Binary files /dev/null and b/data/images/tree/tk.png differ
diff --git a/data/images/wizard.png b/data/images/wizard.png
new file mode 100644
index 00000000..9b2b5c7c
Binary files /dev/null and b/data/images/wizard.png differ
diff --git a/data/images/wizardcards.png b/data/images/wizardcards.png
new file mode 100644
index 00000000..8cc49edb
Binary files /dev/null and b/data/images/wizardcards.png differ
diff --git a/data/procexample.txt b/data/procexample.txt
new file mode 100755
index 00000000..cc225ff2
--- /dev/null
+++ b/data/procexample.txt
@@ -0,0 +1,8 @@
+#!/bin/bash
+# convert gif to png - dir recursive
+
+# scharf !!!!
+#for i in `find . -iname '*.gif'`; do bn=.$(echo $i | cut -f2 -d'.'); convert $bn.gif $bn.png; rm $bn.gif; done
+
+# test:
+#for i in `find . -iname '*.gif'`; do bn=.$(echo $i | cut -f2 -d'.'); echo $bn; done
diff --git a/data/tiles/Baize.png b/data/tiles/Baize.png
new file mode 100644
index 00000000..143d3b88
Binary files /dev/null and b/data/tiles/Baize.png differ
diff --git a/data/tiles/Chequered_Field.png b/data/tiles/Chequered_Field.png
new file mode 100644
index 00000000..37f3d6d9
Binary files /dev/null and b/data/tiles/Chequered_Field.png differ
diff --git a/data/tiles/Fade_Blue.png b/data/tiles/Fade_Blue.png
new file mode 100644
index 00000000..3f0ac64a
Binary files /dev/null and b/data/tiles/Fade_Blue.png differ
diff --git a/data/tiles/Fade_Green.png b/data/tiles/Fade_Green.png
new file mode 100644
index 00000000..d52c6b3a
Binary files /dev/null and b/data/tiles/Fade_Green.png differ
diff --git a/data/tiles/Fade_Red.png b/data/tiles/Fade_Red.png
new file mode 100644
index 00000000..e9e7e1e7
Binary files /dev/null and b/data/tiles/Fade_Red.png differ
diff --git a/data/tiles/Gammi.png b/data/tiles/Gammi.png
new file mode 100644
index 00000000..ee7a7617
Binary files /dev/null and b/data/tiles/Gammi.png differ
diff --git a/data/tiles/Nostalgy.png b/data/tiles/Nostalgy.png
new file mode 100644
index 00000000..9adf633c
Binary files /dev/null and b/data/tiles/Nostalgy.png differ
diff --git a/data/tiles/Olive_Fossils.png b/data/tiles/Olive_Fossils.png
new file mode 100644
index 00000000..5a52ecb2
Binary files /dev/null and b/data/tiles/Olive_Fossils.png differ
diff --git a/data/tiles/Orange_Ornaments.png b/data/tiles/Orange_Ornaments.png
new file mode 100644
index 00000000..07d415c0
Binary files /dev/null and b/data/tiles/Orange_Ornaments.png differ
diff --git a/data/tiles/Pale_Satin.png b/data/tiles/Pale_Satin.png
new file mode 100644
index 00000000..8bad11fb
Binary files /dev/null and b/data/tiles/Pale_Satin.png differ
diff --git a/data/tiles/Rainbow.png b/data/tiles/Rainbow.png
new file mode 100644
index 00000000..0f482e35
Binary files /dev/null and b/data/tiles/Rainbow.png differ
diff --git a/data/tiles/stretch/Castle.png b/data/tiles/stretch/Castle.png
new file mode 100644
index 00000000..58303b24
Binary files /dev/null and b/data/tiles/stretch/Castle.png differ
diff --git a/data/tiles/stretch/Sunset.png b/data/tiles/stretch/Sunset.png
new file mode 100644
index 00000000..a9ee838a
Binary files /dev/null and b/data/tiles/stretch/Sunset.png differ
diff --git a/pysol.py b/pysol.py
index 3006b6c6..42b2d2ae 100755
--- a/pysol.py
+++ b/pysol.py
@@ -21,12 +21,22 @@
 # ---------------------------------------------------------------------------##
 
 # import pychecker.checker
-
 import sys
+
+# Initialise basics and read command line and settings.
 from pysollib.init import init
-from pysollib.main import main
 init()
 
+# Setup and Load the main process modules.
+# IMPORTANT: The set of modules to load depends on the settings
+# and command line options. Therfore import of pysollib.main
+# HAS TO BE after call to init().
+# See docs/README.SOURCE.
+# Flake8 test would complain here E402, so disabled
+
+from pysollib.main import main  # noqa: E402
+
+# Execute it.
 # import profile
 # profile.run("main(sys.argv)")
 sys.exit(main(sys.argv))
diff --git a/pysollib/actions.py b/pysollib/actions.py
index f290a145..cbde8ebb 100644
--- a/pysollib/actions.py
+++ b/pysollib/actions.py
@@ -777,6 +777,12 @@ class PysolMenubar(PysolMenubarTk):
     # Help menu
     #
 
+    def mHelpHtml(self, *args):
+        print('mHelpHtml: %s' % str(args))
+        if self._cancelDrag(break_pause=False):
+            return
+        help_html(self.app, args[0], "html")
+
     def mHelp(self, *args):
         if self._cancelDrag(break_pause=False):
             return
diff --git a/pysollib/app.py b/pysollib/app.py
index b5165800..ef4a5bf2 100644
--- a/pysollib/app.py
+++ b/pysollib/app.py
@@ -58,11 +58,16 @@ from pysollib.pysoltk import SelectCardsetDialogWithPreview
 from pysollib.pysoltk import SelectDialogTreeData
 from pysollib.pysoltk import HTMLViewer
 from pysollib.pysoltk import destroy_find_card_dialog
-from pysollib.ui.tktile.solverdialog import destroy_solver_dialog
-
-from pysollib.actions import PysolMenubar
-from pysollib.actions import PysolToolbar
-from pysollib.help import help_about, destroy_help_html
+if TOOLKIT == 'tk':
+    from pysollib.ui.tktile.solverdialog import destroy_solver_dialog
+else:
+    from pysollib.pysoltk import destroy_solver_dialog
+if TOOLKIT == 'kivy':
+    import logging
+if True:  # This prevents from travis 'error' E402.
+    from pysollib.actions import PysolMenubar
+    from pysollib.actions import PysolToolbar
+    from pysollib.help import help_about, destroy_help_html
 
 # ************************************************************************
 # * Statistics
@@ -420,6 +425,20 @@ class Application:
 
     # the PySol mainloop
     def mainloop(self):
+        try:
+            approc = self.mainproc()  # setup process
+            approc.send(None)				# and go
+        except Exception:
+            pass
+
+    def gameproc(self):
+        while True:
+            logging.info('App: gameproc waiting for game to start')
+            (id, random) = yield
+            logging.info('App: game started %s,%s' % (str(id), str(random)))
+            self.runGame(id, random)
+
+    def mainproc(self):
         # copy startup options
         self.startup_opt = self.opt.copy()
         # try to load statistics
@@ -517,6 +536,11 @@ class Application:
         if self.intro.progress:
             self.intro.progress.update(step=1)
         #
+
+        if TOOLKIT == 'kivy':
+            self.gproc = self.gameproc()
+            self.gproc.send(None)
+
         try:
             # this is the mainloop
             while 1:
@@ -524,7 +548,13 @@ class Application:
                 id_, random = self.nextgame.id, self.nextgame.random
                 self.nextgame.id, self.nextgame.random = 0, None
                 try:
-                    self.runGame(id_, random)
+                    if TOOLKIT == 'kivy':
+                        self.gproc.send((id_, random))
+                        logging.info('App: sent for game to start')
+                        yield
+                        logging.info('App: game proc stopped')
+                    else:
+                        self.runGame(id_, random)
                 except Exception:
                     # try Klondike if current game fails
                     if id_ == 2:
@@ -561,6 +591,11 @@ class Application:
                         update=7+256)
                 else:
                     self.requestCompatibleCardsetType(self.nextgame.id)
+
+        except Exception:
+            traceback.print_exc()
+            pass
+
         finally:
             # hide main window
             self.wm_withdraw()
@@ -594,6 +629,11 @@ class Application:
             except Exception:
                 traceback.print_exc()
                 pass
+            if TOOLKIT == 'kivy':
+                self.top.quit()
+                while True:
+                    logging.info('App: mainloop end position')
+                    yield
 
     def runGame(self, id_, random=None):
         self.top.connectApp(self)
@@ -1425,6 +1465,7 @@ Please select a %s type %s.
             dirs = dirs + manager.getSearchDirs(self, "cardsets-*")
         # print dirs
         found, t = [], {}
+        fnames = {}  # (to check for duplicates)
         for dir in dirs:
             dir = dir.strip()
             try:
@@ -1452,10 +1493,12 @@ Please select a %s type %s.
                                 f1 = os.path.join(d, back)
                                 f2 = os.path.join(d, "shade" + cs.ext)
                                 if (cs.ext in IMAGE_EXTENSIONS and
+                                        cs.name not in fnames and
                                         os.path.isfile(f1) and
                                         os.path.isfile(f2)):
                                     found.append(cs)
                                     # print '+', cs.name
+                                    fnames[cs.name] = 1
                             else:
                                 print_err('fail _readCardsetConfig: %s %s'
                                           % (d, f1))
diff --git a/pysollib/game.py b/pysollib/game.py
index 3fdbae4a..bec7f1fc 100644
--- a/pysollib/game.py
+++ b/pysollib/game.py
@@ -52,14 +52,19 @@ from pysollib.pysoltk import after, after_idle, after_cancel
 from pysollib.pysoltk import MfxMessageDialog, MfxExceptionDialog
 from pysollib.pysoltk import MfxCanvasText, MfxCanvasLine, MfxCanvasRectangle
 from pysollib.pysoltk import Card
-from pysollib.ui.tktile.solverdialog import reset_solver_dialog
-from pysollib.move import AMoveMove, AFlipMove, AFlipAndMoveMove
-from pysollib.move import ASingleFlipMove, ATurnStackMove
-from pysollib.move import ANextRoundMove, ASaveSeedMove, AShuffleStackMove
-from pysollib.move import AUpdateStackMove, AFlipAllMove, ASaveStateMove
-from pysollib.move import ASingleCardMove
-from pysollib.hint import DefaultHint
-from pysollib.help import help_about
+if TOOLKIT == 'tk':
+    from pysollib.ui.tktile.solverdialog import reset_solver_dialog
+else:
+    from pysollib.pysoltk import reset_solver_dialog
+
+if True:  # This prevents from travis 'error' E402.
+    from pysollib.move import AMoveMove, AFlipMove, AFlipAndMoveMove
+    from pysollib.move import ASingleFlipMove, ATurnStackMove
+    from pysollib.move import ANextRoundMove, ASaveSeedMove, AShuffleStackMove
+    from pysollib.move import AUpdateStackMove, AFlipAllMove, ASaveStateMove
+    from pysollib.move import ASingleCardMove
+    from pysollib.hint import DefaultHint
+    from pysollib.help import help_about
 
 if sys.version_info > (3,):
     basestring = str
@@ -1190,6 +1195,10 @@ class Game(object):
     #
 
     def areYouSure(self, title=None, text=None, confirm=-1, default=0):
+
+        if TOOLKIT == 'kivy':
+            return True
+
         if self.preview:
             return True
         if confirm < 0:
@@ -1252,6 +1261,15 @@ class Game(object):
             shadow = self.app.opt.shadow
         shadows = ()
         # start animation
+        if TOOLKIT == 'kivy':
+            c0 = cards[0]
+            dx, dy = (x - c0.x), (y - c0.y)
+            for card in cards:
+                base = float(self.app.opt.animations)
+                duration = base*0.1
+                card.animatedMove(dx, dy, duration)
+            return
+
         if tkraise:
             for card in cards:
                 card.tkraise()
@@ -1890,6 +1908,11 @@ You have reached
             return 1
         if self.demo:
             return status
+        if TOOLKIT == 'kivy':
+            if not self.app.opt.display_win_message:
+                return 1
+            from kivy.LApp import LAnimationManager
+            self.top.waitCondition(LAnimationManager.checkRunning)
         if status == 2:
             top_msg = self.updateStats()
             time = self.getTime()
@@ -1944,6 +1967,8 @@ Congratulations, you did it !
                 text=_("\nGame finished, but not without my help...\n"),
                 strings=(_("&New game"), _("&Restart"), _("&Cancel")))
         self.updateMenus()
+        if TOOLKIT == 'kivy':
+            return 1
         if d.status == 0 and d.button == 0:
             # new game
             self.endGame()
@@ -2166,6 +2191,11 @@ Congratulations, you did it !
                                        width=4, fill=None, outline=color)
                 if tkraise:
                     r.tkraise(c2.item)
+            elif TOOLKIT == 'kivy':
+                r = MfxCanvasRectangle(self.canvas, x1, y1, x2, y2,
+                                       width=4, fill=None, outline=color)
+                if tkraise:
+                    r.tkraise(c2.item)
             elif TOOLKIT == 'gtk':
                 r = MfxCanvasRectangle(self.canvas, x1, y1, x2, y2,
                                        width=4, fill=None, outline=color,
@@ -2209,6 +2239,12 @@ Congratulations, you did it !
         x1, y1 = x+w-width//2-xmargin, y+h-width//2-ymargin
         r = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1,
                                width=width, fill=None, outline=color)
+
+        if TOOLKIT == "kivy":
+            r.canvas.canvas.ask_update()
+            r.delete_deferred(self.app.opt.timeouts['highlight_cards'])
+            return
+
         self.canvas.update_idletasks()
         self.sleep(self.app.opt.timeouts['highlight_cards'])
         r.delete()
@@ -2446,6 +2482,10 @@ Congratulations, you did it !
                               arrow="last", arrowshape=(30, 30, 10))
         self.canvas.update_idletasks()
         # wait
+        if TOOLKIT == "kivy":
+            arrow.delete_deferred(sleep)
+            return
+        # wait
         self.sleep(sleep)
         # delete the hint
         if arrow is not None:
diff --git a/pysollib/games/mahjongg/mahjongg.py b/pysollib/games/mahjongg/mahjongg.py
index 837828b7..8c7542e3 100644
--- a/pysollib/games/mahjongg/mahjongg.py
+++ b/pysollib/games/mahjongg/mahjongg.py
@@ -211,6 +211,15 @@ class Mahjongg_RowStack(OpenStack):
             if rows:
                 self.group.lower(rows[0].group)
                 return
+        elif TOOLKIT == 'kivy':
+            rows = [s for s in self.game.s.rows[:self.id] if s.cards]
+            if rows:
+                # self.group.tkraise(rows[-1].group)
+                return
+            rows = [s for s in self.game.s.rows[self.id+1:] if s.cards]
+            if rows:
+                # self.group.lower(rows[0].group)
+                return
         elif TOOLKIT == 'gtk':
             # FIXME (this is very slow)
             for s in self.game.s.rows[self.id+1:]:
@@ -270,6 +279,12 @@ class Mahjongg_RowStack(OpenStack):
                 self._stopDrag()
                 # this code actually moves the tiles
                 from_stack.playMoveMove(1, self, frames=0, sound=True)
+                if TOOLKIT == 'kivy':
+                    if drag.shade_img:
+                        # drag.shade_img.dtag(drag.shade_stack.group)
+                        drag.shade_img.delete()
+                        # game.canvas.delete(drag.shade_img)
+                        drag.shade_img = None
                 return 1
         drag.stack = self
         self.game.playSample("startdrag")
@@ -514,6 +529,9 @@ class AbstractMahjonggGame(Game):
                     if TOOLKIT == 'tk':
                         x = -l.XS-self.canvas.xmargin
                         y = l.YM+dyy
+                    elif TOOLKIT == 'kivy':
+                        x = -1000
+                        y = l.YM+dyy
                     elif TOOLKIT == 'gtk':
                         # FIXME
                         x = self.width - l.XS
@@ -782,11 +800,13 @@ class AbstractMahjonggGame(Game):
 
         new_cards = self._shuffleHook2(rows, cards)
         if new_cards is None:
-            MfxMessageDialog(self.top, title=_('Warning'),
-                             text=_('''\
+            if TOOLKIT != 'kivy':
+                MfxMessageDialog(self.top, title=_('Warning'),
+                                 text=_('''\
 Sorry, I can\'t find
 a solvable configuration.'''),
-                             bitmap='warning')
+                                 bitmap='warning')
+
             self.leaveState(old_state)
             # self.finishMove()
             # hack
@@ -859,7 +879,7 @@ a solvable configuration.'''),
             f = ungettext('%d Free\nMatching\nPair',
                           '%d Free\nMatching\nPairs',
                           f) % f
-        t = sum([len(i.cards) for i in self.s.foundations])
+        t = sum([len(ii.cards) for ii in self.s.foundations])
         r1 = ungettext('%d\nTile\nRemoved\n\n',
                        '%d\nTiles\nRemoved\n\n',
                        t) % t
diff --git a/pysollib/games/mahjongg/shisensho.py b/pysollib/games/mahjongg/shisensho.py
index 7486b90a..d6f89775 100644
--- a/pysollib/games/mahjongg/shisensho.py
+++ b/pysollib/games/mahjongg/shisensho.py
@@ -25,6 +25,8 @@
 from gettext import ungettext
 from six.moves import range
 
+from pysollib.settings import TOOLKIT
+
 # PySol imports
 from pysollib.mygettext import _
 from pysollib.gamedb import registerGame, GameInfo, GI
@@ -292,6 +294,9 @@ class Shisen_RowStack(Mahjongg_RowStack):
                                }
                               )
         game.canvas.update_idletasks()
+        if TOOLKIT == "kivy":
+            arrow.delete_deferred(sleep)
+            return
         game.sleep(sleep)
         if arrow is not None:
             arrow.delete()
@@ -365,8 +370,10 @@ class AbstractShisenGame(AbstractMahjonggGame):
 
         # create other stacks
         y = l.YM + dyy
-        s.foundations.append(Shisen_Foundation(-l.XS-self.canvas.xmargin,
-                                               y, self))
+        ivx = -l.XS-self.canvas.xmargin
+        if TOOLKIT == 'kivy':
+            ivx = -1000
+        s.foundations.append(Shisen_Foundation(ivx, y, self))
         self.texts.info = MfxCanvasText(self.canvas,
                                         self.width - l.XM - ti_width, y,
                                         anchor="nw", font=font)
diff --git a/pysollib/help.py b/pysollib/help.py
index 65b6a0d7..ce0cd519 100644
--- a/pysollib/help.py
+++ b/pysollib/help.py
@@ -82,6 +82,8 @@ def help_credits(app, timeout=0, sound=True):
         t = "pyKDE"
     elif TOOLKIT == "wx":
         t = "wxPython"
+    elif TOOLKIT == "kivy":
+        t = "kivy"
     d = MfxMessageDialog(
         app.top, title=_("Credits"), timeout=timeout,
         text=TITLE+_(''' credits go to:
diff --git a/pysollib/hint.py b/pysollib/hint.py
index eaaa3a40..c683cba9 100644
--- a/pysollib/hint.py
+++ b/pysollib/hint.py
@@ -872,8 +872,7 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
 
         def my_find_re(RE, m):
             s = m.group(1)
-            assert re.match(r'^\s*(?:' + RE + r')?(?:\s+'
-                            + RE + r')*\s*$', s)
+            assert re.match(r'^\s*(?:' + RE + r')?(?:\s+' + RE + r')*\s*$', s)
             return re.findall(r'\b' + RE + r'\b', s)
 
         for line_p in fh:
diff --git a/pysollib/htmllib2.py b/pysollib/htmllib2.py
index c38c5626..5a20b5e9 100644
--- a/pysollib/htmllib2.py
+++ b/pysollib/htmllib2.py
@@ -23,7 +23,7 @@ class HTMLParser(html_parser.HTMLParser):
 
     """
 
-    from six.moves.html_entities import entitydefs
+    # from six.moves.html_entities import entitydefs
 
     def __init__(self, formatter):
         """Creates an instance of the HTMLParser class.
diff --git a/pysollib/images.py b/pysollib/images.py
index 4fed94f6..47f257b6 100644
--- a/pysollib/images.py
+++ b/pysollib/images.py
@@ -25,6 +25,9 @@
 # imports
 import os
 
+# settings
+from pysollib.settings import TOOLKIT
+
 # PySol imports
 from pysollib.resource import CSI
 from pysollib.mfxutil import Image, ImageTk, USE_PIL
@@ -88,7 +91,13 @@ class Images:
             img = loadImage(file=f)
         except Exception:
             return None
-        w, h = img.width(), img.height()
+
+        if TOOLKIT == 'kivy':
+            w = img.texture.size[0]
+            h = img.texture.size[1]
+        else:
+            w, h = img.width(), img.height()
+
         if self.CARDW < 0:
             self.CARDW, self.CARDH = w, h
         else:
diff --git a/pysollib/init.py b/pysollib/init.py
index ab146595..098720b7 100644
--- a/pysollib/init.py
+++ b/pysollib/init.py
@@ -82,6 +82,12 @@ def init():
         pysollib.settings.TOOLKIT = 'tk'
         pysollib.settings.USE_TILE = True
         sys.argv.remove('--tile')
+    elif '--kivy' in sys.argv:
+        pysollib.settings.TOOLKIT = 'kivy'
+        pysollib.settings.USE_TILE = False
+        pysollib.settings.SELECT_GAME_MENU = False
+        sys.argv.remove('--kivy')
+
     if pysollib.settings.TOOLKIT == 'tk':
         from six.moves import tkinter
         root = tkinter.Tk(className=pysollib.settings.TITLE)
diff --git a/pysollib/kivy/LApp.py b/pysollib/kivy/LApp.py
new file mode 100644
index 00000000..904f3671
--- /dev/null
+++ b/pysollib/kivy/LApp.py
@@ -0,0 +1,1700 @@
+#!/usr/bin/python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 2017 LB
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+from __future__ import division
+
+# import os
+# print ('KIVY_HOME: '+os.environ['KIVY_HOME'])
+
+import logging
+# import time
+import math
+import traceback
+
+from kivy.graphics import Color
+from kivy.graphics import Rectangle
+from kivy.graphics import Line
+from kivy.graphics import Triangle
+
+# from kivy.uix.treeview import TreeView
+# from kivy.uix.actionbar import ActionBar
+from kivy.utils import platform
+# from kivy.event import EventDispatcher
+
+from kivy.properties import StringProperty
+
+from kivy.base import EventLoop
+# from kivy.base import EventLoopBase
+from kivy.base import stopTouchApp
+from kivy.app import App
+from kivy.animation import Animation
+from kivy.core.audio import SoundLoader
+from kivy.clock import Clock
+
+from kivy.uix.image import Image as KivyImage
+# from kivy.uix.anchorlayout import AnchorLayout
+from kivy.uix.boxlayout import BoxLayout
+from kivy.uix.widget import Widget
+from kivy.uix.button import Button
+from kivy.uix.behaviors import ButtonBehavior
+from kivy.uix.label import Label
+# from kivy.uix.relativelayout import RelativeLayout
+from kivy.uix.scrollview import ScrollView
+
+from kivy.uix.actionbar import ActionView
+from kivy.uix.actionbar import ActionPrevious
+from kivy.uix.actionbar import ActionButton
+
+from kivy.uix.treeview import TreeView
+from kivy.uix.treeview import TreeViewLabel
+
+from kivy.core.window import Window
+from kivy.cache import Cache
+
+
+# =============================================================================
+
+
+def get_platform():
+    return platform
+
+# =============================================================================
+
+
+class LAnimationMgr(object):
+    def __init__(self, **kw):
+        super(LAnimationMgr, self).__init__()
+        self.animations = []
+        self.widgets = {}
+
+    def animEnd(self, anim, widget):
+        # print('LAnimationMgr: animEnd = %s.%s' % (anim, widget))
+
+        self.widgets[widget] = self.widgets[widget][1:]
+        self.animations.remove(anim)
+        if len(self.widgets[widget]) > 0:
+            # start next animation on widget
+            nanim = self.widgets[widget][0]
+            self.animations.append(nanim)
+            print('LAnimationMgr: animEnd, append = %s' % (nanim))
+            nanim.start(widget)
+        else:
+            # no further animations for widget so stop
+            del self.widgets[widget]
+
+    def makeAnimStart(self, anim, spos, widget):
+        def animStart(dt):
+            widget.pos = spos
+            # print('LAnimationMgr: animStart = %s ... %s' % (anim, dt))
+            anim.start(widget)
+        return animStart
+
+    def checkRunning(self):
+        return len(self.animations) > 0
+
+    def create(self, spos, widget, **kw):
+        x = 0.0
+        y = 0.0
+        duration = 0.2
+        transition = 'in_out_quad'
+        if 'x' in kw:
+            x = kw['x']
+        if 'y' in kw:
+            y = kw['y']
+        if 'duration' in kw:
+            duration = kw['duration']
+        if 'transition' in kw:
+            transition = kw['transition']
+
+        anim = Animation(x=x, y=y, duration=duration, transition=transition)
+        anim.bind(on_complete=self.animEnd)
+        if 'bindE' in kw:
+            anim.bind(on_complete=kw['bindE'])
+        if 'bindS' in kw:
+            anim.bind(on_start=kw['bindS'])
+
+        offset = duration / 3.0
+        # offset = duration*1.2
+        timedelay = offset * len(self.animations)
+        # print('offset = %s'% offset)
+        print('LAnimationMgr: timedelay = %s' % timedelay)
+
+        if widget in self.widgets:
+            # append additional animation to widget
+            self.widgets[widget].append(anim)
+        else:
+            # setup first animation for widget
+            self.animations.append(anim)
+            self.widgets[widget] = [anim]
+            Clock.schedule_once(self.makeAnimStart(
+                anim, spos, widget), timedelay)
+
+
+LAnimationManager = LAnimationMgr()
+
+# =============================================================================
+
+LSoundLoader = SoundLoader
+
+# =============================================================================
+
+
+class LBoxLayout(BoxLayout):
+    def __init__(self, **kw):
+        super(LBoxLayout, self).__init__(**kw)
+
+    def winfo_screenwidth(self):
+        return self.size[0]
+
+    def winfo_screenheight(self):
+        return self.size[1]
+
+# =============================================================================
+
+
+class LImage(KivyImage):
+
+    def __init__(self, **kwargs):
+        super(LImage, self).__init__(**kwargs)
+        self.size = self.texture.size
+        self.silent = False
+        self.allow_stretch = True
+        # self.keep_ratio = 0
+        # self.size_hint = (1.0/9.0, 1.0/4.0)
+        self.size_hint = (1.0, 1.0)
+        # self.mipmap = True     # funktioniert nicht.
+
+        self.corePos = None
+        self.coreSize = None
+
+        # logging.info('LImage: __init__() %s' % kwargs)
+
+    def getHeight(self):
+        return self.size[1]
+
+    def getWidth(self):
+        return self.size[0]
+
+    def subsample(self, r):
+        ''
+        return LImage(texture=self.texture)
+        '''
+        if (self.source!=None):
+            # logging.info("LImage: subsample, %d, %s " % (r , self.source))
+            return LImage(source=self.source)
+        elif (self.texture!=None):
+            # logging.info("LImage: subsample, %d (texture) " % r)
+            return LImage(texture=self.texture)
+        '''
+        return self
+
+    def on_touch_down(self, touch):
+        if self.silent:
+            return False
+
+        # print('LImage: touch_down on %s' % str(touch.pos))
+        if self.collide_point(*touch.pos):
+            if (self.source is not None):
+                print('LImage match %s' % self.source)
+            else:
+                print('LImage match with texture')
+            return True
+        return False
+
+    def on_touch_up(self, touch):
+        if self.silent:
+            return False
+
+        # print('LImage: touch_up on %s' % str(touch.pos))
+        if self.collide_point(*touch.pos):
+            if (self.source is not None):
+                print('LImage match %s' % self.source)
+            else:
+                print('LImage match with texture')
+            return True
+        return False
+
+# =============================================================================
+
+
+def addAnchorOffset(pos, size, anchor):
+    # print ('MfxCanvas: anchor=%s' % (anchor))
+    x = pos[0]
+    y = pos[1]
+    xa = 0
+    ya = 0
+    if anchor == "n":
+        ya = -1
+    elif anchor == "w":
+        xa = -1
+    elif anchor == "s":
+        ya = 1
+    elif anchor == "e":
+        xa = 1
+    elif anchor == "ne":
+        ya = -1
+        xa = 1
+    elif anchor == "nw":
+        ya = -1
+        xa = -1
+    elif anchor == "se":
+        ya = 1
+        xa = 1
+    elif anchor == "sw":
+        ya = 1
+        xa = -1
+
+    if xa == 0:
+        x = x - size[0] / 2.0
+    elif xa == 1:
+        x = x - size[0]
+    if ya == 0:
+        y = y - size[1] / 2.0
+    elif ya == 1:
+        y = y - size[1]
+    return (x, y)
+
+# =============================================================================
+
+
+def LColorToKivy(outline):
+    if (outline[0] == '#'):
+        outline = outline[1:]
+    ou0 = float(int(outline[0:2], 16)) / 256.0
+    ou1 = float(int(outline[2:4], 16)) / 256.0
+    ou2 = float(int(outline[4:6], 16)) / 256.0
+    ou3 = 1.0
+    if len(outline) >= 8:
+        ou3 = float(int(outline[6:8], 16)) / 256.0
+    return ou0, ou1, ou2, ou3
+
+# =============================================================================
+
+
+class LText(Widget):
+    text = StringProperty('')
+
+    def __init__(self, canvas, x, y, **kwargs):
+        super(LText, self).__init__(**kwargs)
+
+        if 'text' not in kwargs:
+            kwargs['text'] = 'X'
+
+        font = 'helvetica'
+        fontsize = 18.0
+        if 'font' in kwargs:
+            font = kwargs['font'][0]
+            fontsize = kwargs['font'][1]
+            del kwargs['font']
+
+        self.anchor = 'nw'
+        if 'anchor' in kwargs:
+            self.anchor = kwargs['anchor']
+
+        self.text = kwargs['text']
+        self.coreFontSize = fontsize
+        self.coreFont = font
+
+        # print('LText: font = %s, font_size = %s' % (font, fontsize))
+        # print('LText: text = %s' % (self.text))
+
+        self.label = Label(font=font, font_size=fontsize, **kwargs)
+        self.label.texture_update()
+        self.coreSize = self.label.texture_size
+        self.corePos = (x, y)
+        self.prnt = canvas
+
+        # print('LText: corePos = %s, coreSize = %s'
+        # % (self.corePos, self.coreSize))
+
+        self.size = self.label.texture_size
+
+        self.bind(size=self.updateCanvas)
+        self.bind(pos=self.updateCanvas)
+        self.bind(text=self.updateCanvas)
+
+    def updateCanvas(self, inst, val):
+        self.label.text = self.text
+        self.label.texture_update()
+
+        self.coreSize = self.label.texture_size
+        cp = addAnchorOffset(self.corePos, self.coreSize, self.anchor)
+        cs = self.coreSize
+
+        pos, size = self.prnt.CoreToKivy(cp, cs)
+        # print('LText: pos = %s, size = %s' % (pos, size))
+
+        color = LColorToKivy(self.prnt._text_color)
+        # print('LText: color = %s' % str(color))
+        self.canvas.clear()
+        with self.canvas:
+            Color(color[0], color[1], color[2], color[3])
+            Rectangle(texture=self.label.texture, pos=pos, size=size)
+
+# =============================================================================
+
+
+class LEvent(object):
+    def __init__(self):
+        self.x = 0
+        self.y = 0
+        self.cardid = -1
+        self.char = False
+        pass
+
+# =============================================================================
+
+
+class LLine(Widget):
+    def __init__(self, canvas, args, **kw):
+        super(LLine, self).__init__(**kw)
+
+        print('kw = %s%s' % (args, kw))
+
+        lwidth = 10
+        fill = '#ee3344'
+        ashape = ()
+        arrow = 'none'
+
+        self.prnt = canvas
+        xmin = 100000
+        ymin = 100000
+        xmax = -100000
+        ymax = -100000
+        self.corePoly = []
+        if isinstance(args[0], list):
+            kww = args[1]
+            if ('width' in kww):
+                lwidth = kww['width']
+            self.lwidth = lwidth
+            if ('fill' in kww):
+                fill = kww['fill']
+            self.fill = fill
+            if ('arrowshape' in kw):
+                ashape = kw['arrowshape']
+            self.ashape = ashape
+            if ('arrow' in kw):
+                arrow = kw['arrow']
+            self.arrow = arrow
+
+            pts = args[0]
+            ipts = iter(pts)
+            for x, y in zip(ipts, ipts):
+                print('%s.%s' % (x, y))
+                self.corePoly.append(x)
+                self.corePoly.append(y)
+                if x < xmin:
+                    xmin = x
+                if x > xmax:
+                    xmax = x
+                if y < ymin:
+                    ymin = y
+                if y > ymax:
+                    ymax = y
+        else:
+            if ('width' in kw):
+                lwidth = kw['width']
+            self.lwidth = lwidth
+            if ('fill' in kw):
+                fill = kw['fill']
+            self.fill = fill
+            if ('arrowshape' in kw):
+                ashape = kw['arrowshape']
+            self.ashape = ashape
+            if ('arrow' in kw):
+                arrow = kw['arrow']
+            self.arrow = arrow
+
+            for i in range(0, 2):
+                x = args[2 * i]
+                y = args[2 * i + 1]
+                self.corePoly.append(x)
+                self.corePoly.append(y)
+                if x < xmin:
+                    xmin = x
+                if x > xmax:
+                    xmax = x
+                if y < ymin:
+                    ymin = y
+                if y > ymax:
+                    ymax = y
+
+        print('width = %s' % self.lwidth)
+        print('color = %s' % self.fill)
+        print('arrow = %s' % self.arrow)
+        print('ashape = %s' % str(self.ashape))
+
+        self.alist = []
+        if self.arrow == 'last':
+            self.alist.append(self.corePoly[-2])
+            self.alist.append(self.corePoly[-1])
+            self.alist.append(self.corePoly[-4])
+            self.alist.append(self.corePoly[-3])
+        elif self.arrow != 'none':
+            self.alist.append(self.corePoly[0])
+            self.alist.append(self.corePoly[1])
+            self.alist.append(self.corePoly[2])
+            self.alist.append(self.corePoly[3])
+
+        self.corePos = (xmin, ymin)
+        self.coreSize = (xmax - xmin, ymax - ymin)
+        self.pos = self.corePos
+        self.size = self.coreSize
+
+        self.bcolor = LColorToKivy(self.fill)
+
+        self.bind(size=self.updateCanvas)
+        self.bind(pos=self.updateCanvas)
+
+    def updateCanvas(self, instance, value):
+        # size = self.size
+        # pos = self.pos
+
+        # Linie:
+        poly = None
+        poly = []
+        dmy, sxy = self.prnt.CoreToKivy(
+            (0.0, 0.0), (self.lwidth, self.lwidth))
+        wpoly = sxy[1]
+        ipts = iter(self.corePoly)
+        for x, y in zip(ipts, ipts):
+            print('%s.%s' % (x, y))
+            xy, dmy = self.prnt.CoreToKivy((x, y))
+            poly.append(xy[0])
+            poly.append(xy[1])
+
+        def rot(x, y, a):
+            x1 = x * math.cos(a) + y * math.sin(a)
+            y1 = y * math.cos(a) - x * math.sin(a)
+            return (x1, y1)
+
+        # Pfeil:
+        PI = 3.1415926
+        atrio = None
+        atrio = []
+        if (len(self.ashape) > 2):
+            dx = (self.alist[0] - self.alist[2])
+            dy = (self.alist[1] - self.alist[3])
+            if (dx == 0.0):
+                if (dy > 0.0):
+                    ang = -PI / 2.0
+                else:
+                    ang = PI / 2.0
+            else:
+                ang = math.atan(dy / dx)
+            if (dx > 0.0):
+                ang = ang + PI
+
+            # (kante, winkel?)
+            x = self.ashape[0] * math.cos(self.ashape[1] * PI / 360.0)
+            y = 2.0 * self.ashape[0] * math.sin(self.ashape[1] * PI / 360.0)
+            # (länge, breite?)
+            # x = self.ashape[0]
+            # y = self.ashape[1]
+            o = self.ashape[2]
+            axy, dmy = self.prnt.CoreToKivy((self.alist[0], self.alist[1]))
+            dmy, asxy = self.prnt.CoreToKivy((0, 0), (x, y))
+            dmy, aoff = self.prnt.CoreToKivy((0, 0), (o, o))
+            print('asxy=%s' % str(asxy))
+
+            x1, y1 = rot(-aoff[0], 0.0, ang)
+            atrio.append(x1 + axy[0])
+            atrio.append(y1 + axy[1])
+            x1, y1 = rot(asxy[0] - aoff[0], asxy[1], ang)
+            atrio.append(x1 + axy[0])
+            atrio.append(y1 + axy[1])
+            x1, y1 = rot(asxy[0] - aoff[0], -asxy[1], ang)
+            atrio.append(x1 + axy[0])
+            atrio.append(y1 + axy[1])
+
+        self.canvas.clear()
+        with self.canvas:
+            Color(self.bcolor[0], self.bcolor[1],
+                  self.bcolor[2], self.bcolor[3])
+            Line(points=poly, width=wpoly, cap='none', joint='bevel')
+            if (len(atrio) > 2):
+                Triangle(points=atrio)
+
+# =============================================================================
+
+
+class LRectangle(Widget):
+    def __init__(self, prnt, args, **kw):
+        super(LRectangle, self).__init__(**kw)
+        self.prnt = prnt
+
+        # print('width   %s' % kw['width'])
+        # print('outline %s' % kw['outline'])
+        # print('fill    %s' % kw['fill'])
+
+        width = 10.0
+        if ('width' in kw):
+            width = float(kw['width'])
+
+        bcolor = '#ffa000a0'
+        if ('outline') in kw:
+            bcolor = kw['outline']
+        if (not bcolor or len(bcolor) < 7):
+            bcolor = '#ffa000a0'
+
+        fcolor = '#00aaff20'
+        if ('fill') in kw:
+            fcolor = kw['fill']
+        if (not fcolor or len(fcolor) < 7):
+            fcolor = '#00aaff20'
+
+        self.group = None
+        if 'group' in kw:
+            self.group = kw['group']
+
+        xmin = float(args[0])
+        ymin = float(args[1])
+        xmax = float(args[2])
+        ymax = float(args[3])
+
+        # print ('LRectangle: min = %s.%s' % (xmin, ymin))
+        # print ('LRectangle: max = %s.%s' % (xmax, ymax))
+        # print ('LRectangle: border = %s' % (width))
+
+        self.border = width
+        self.fcolor = LColorToKivy(fcolor)
+        self.bcolor = LColorToKivy(bcolor)
+
+        self.corePos = (xmin, ymin)
+        self.coreSize = (xmax - xmin, ymax - ymin)
+        self.pos = self.corePos
+        self.size = self.coreSize
+        self.topleft = (xmin + width / 2.0, ymin + width / 2.0)
+        self.bottomright = (xmax - width / 2.0, ymax - width / 2.0)
+        self.poly = None
+
+        self.bind(size=self.updateCanvas)
+        self.bind(pos=self.updateCanvas)
+
+    def updateCanvas(self, instance, value):
+        # print('LRectangle: updateCanvas')
+
+        pos, size = self.prnt.CoreToKivy(self.corePos, self.coreSize)
+        bpos, dmy = self.prnt.CoreToKivy(self.topleft)
+        tpos, dmy = self.prnt.CoreToKivy(self.bottomright)
+
+        poly = [bpos[0], bpos[1],
+                tpos[0], bpos[1],
+                tpos[0], tpos[1],
+                bpos[0], tpos[1],
+                bpos[0], bpos[1]]
+
+        dmy, brd = self.prnt.CoreToKivy(
+            (0.0, 0.0), (self.border, self.border))
+        border = brd[1]
+
+        self.canvas.clear()
+        with self.canvas:
+            Color(self.fcolor[0], self.fcolor[1],
+                  self.fcolor[2], self.fcolor[3])
+            Rectangle(pos=pos, size=size)
+            Color(self.bcolor[0], self.bcolor[1],
+                  self.bcolor[2], self.bcolor[3])
+            Line(points=poly, width=border)
+
+    def on_touch_down(self, touch):
+        if self.collide_point(*touch.pos):
+            if self.group is not None:
+                logging.info('LRectangle: self=%s group=%s' %
+                             (self, self.group))
+                if '<1>' in self.group.bindings:
+                    # logging.info('LRectangle: size=%s' % (self.size))
+                    ppos, psize = self.group.canvas.KivyToCore(touch.pos)
+                    event = LEvent()
+                    event.x = ppos[0]
+                    event.y = ppos[1]
+                    self.group.bindings['<1>'](event)
+                    return True
+        return False
+
+    def on_touch_up(self, touch):
+        if self.collide_point(*touch.pos):
+            if self.group is not None:
+                logging.info('LRectangle: self=%s group=%s' %
+                             (self, self.group))
+                if '<ButtonRelease-1>' in self.group.bindings:
+                    ppos, psize = self.group.canvas.KivyToCore(touch.pos)
+                    event = LEvent()
+                    event.x = ppos[0]
+                    event.y = ppos[1]
+                    self.group.bindings['<ButtonRelease-1>'](event)
+                    return True
+        return False
+
+# =============================================================================
+
+
+class LImageItem(BoxLayout):
+    def __init__(self, **kw):
+        super(LImageItem, self).__init__(**kw)
+        self.game = None
+        self.card = None
+        self.group = None
+        if 'game' in kw:
+            self.game = kw['game']
+        if 'card' in kw:
+            self.card = kw['card']
+        if 'group' in kw:
+            self.group = kw['group']
+        self.dragstart = None
+        # ev. noch globales cache für stacks->game und cards->stack
+        # einrichten. Aber: stacks hängt vom jeweiligen spiel ab.
+
+    def send_event_pressed_1(self, event):
+        if self.group and '<1>' in self.group.bindings:
+            self.group.bindings['<1>'](event)
+
+    def on_touch_down(self, touch):
+
+        if self.collide_point(*touch.pos):
+
+            for c in self.children:
+                # print('child at %s' % c)
+                if (c.on_touch_down(touch) and self.game):
+                    for stack in self.game.allstacks:
+                        for i in range(len(stack.cards)):
+                            if stack.cards[i] == self.card:
+                                print('LCardImage: stack = %s' % stack)
+                                print('LCardImage: touch = %s' % str(touch))
+                                print('grab')
+                                # grab the touch!
+                                touch.grab(self)
+                                ppos, psize = self.game.canvas.KivyToCore(
+                                    touch.pos, self.size)
+                                event = LEvent()
+                                event.x = ppos[0]
+                                event.y = ppos[1]
+                                self.dragstart = touch.pos
+                                event.cardid = i
+                                self.send_event_pressed_1(event)
+                                return True
+
+            if self.group is not None:
+                print('LCardImage: self=%s group=%s' % (self, self.group))
+                if '<1>' in self.group.bindings:
+                    ppos, psize = self.group.canvas.KivyToCore(
+                        touch.pos, self.size)
+                    event = LEvent()
+                    event.x = ppos[0]
+                    event.y = ppos[1]
+                    self.group.bindings['<1>'](event)
+                    return True
+
+            if self.card is None:
+                return False
+            if self.game is None:
+                return False
+
+        # print('LCardImage: touch_down on %s' % str(touch.pos))
+        return False
+
+    def send_event_released_1(self, event):
+        if self.group and '<ButtonRelease-1>' in self.group.bindings:
+            self.group.bindings['<ButtonRelease-1>'](event)
+
+    def on_touch_up(self, touch):
+        if touch.grab_current is self:
+                # release my grabbed touch!
+            print('ungrab')
+            touch.ungrab(self)
+            return True
+
+        if self.collide_point(*touch.pos):
+
+            for c in self.children:
+                # print('child at %s' % c)
+
+                if (c.on_touch_up(touch) and self.game):
+                    for stack in self.game.allstacks:
+                        for i in range(len(stack.cards)):
+                            if stack.cards[i] == self.card:
+                                print('LCardImage: stack = %s' % stack)
+                                ppos, psize = self.game.canvas.KivyToCore(
+                                    touch.pos, self.size)
+                                event = LEvent()
+                                event.x = ppos[0]
+                                event.y = ppos[1]
+                                event.cardid = i
+                                self.send_event_released_1(event)
+                                return True
+
+            if self.group is not None:
+                print('LCardImage: self=%s group=%s' % (self, self.group))
+                if '<ButtonRelease-1>' in self.group.bindings:
+                    ppos, psize = self.group.canvas.KivyToCore(
+                        touch.pos, self.size)
+                    event = LEvent()
+                    event.x = ppos[0]
+                    event.y = ppos[1]
+                    self.group.bindings['<ButtonRelease-1>'](event)
+                    return True
+
+            if self.card is None:
+                return False
+            if self.game is None:
+                return False
+
+        # print('LCardImage: touch_up on %s' % str(touch.pos))
+        return False
+
+    def on_touch_move(self, touch):
+        # behandeln nur wenn grabbed
+        if touch.grab_current is not self:
+            return False
+        if 'pos' not in touch.profile:
+            return False
+
+        print('LCardImage: touch_move on %s' % str(touch.pos))
+
+        for stack in self.game.allstacks:
+            for i in range(len(stack.cards)):
+                if stack.cards[i] == self.card:
+                    print('LCardImage: stack = %s/%s' % (stack, touch))
+                    ppos, psize = self.game.canvas.KivyToCore(
+                        touch.pos, self.size)
+                    event = LEvent()
+                    event.x = ppos[0]
+                    event.y = ppos[1]
+                    event.cardid = i
+                    stack._motionEventHandler(event)
+                    return True
+
+        # print('LCardImage: touch_move on %s' % str(touch.pos))
+        return False
+
+# =============================================================================
+# Treeview
+
+
+class LTreeRoot(TreeView):
+    def __init__(self, **kw):
+        super(LTreeRoot, self).__init__(**kw)
+        self.kw = kw
+
+
+class LTreeNode(ButtonBehavior, TreeViewLabel):
+
+    # def __init__(self, gameview, **kw):
+    def __init__(self, **kw):
+        self.command = None
+        if 'command' in kw:
+            self.command = kw['command']
+        self.variable = None
+        if 'variable' in kw:
+            self.variable = kw['variable']
+        if 'value' in kw:
+            self.value = kw['value']
+        if ('text' in kw):
+            self.title = kw['text']
+
+        super(LTreeNode, self).__init__(markup=True, **kw)
+
+        if self.variable:
+            self.variable.bind(value=self.onVarChange)
+            self.onVarChange(self.variable, self.variable.get())
+
+        # self.gameview = gameview
+        self.coreFont = self.font_size
+        # self.scaleFont(self.gameview.size[1])
+        # self.gameview.bind(size=self.scaleFontCB)
+        # nicht skalieren!
+
+        self.bind(on_release=self.on_released)
+        self.bind(is_selected=self.onSelect)
+        self.bind(is_open=self.onOpen)
+
+    def onVarChange(self, instance, value):
+        # print('LTreeNode: onVarChange(%s, %s, %s)'
+        # % (instance, value, type(value)))
+        if type(value) is bool:
+            self.setCheck(value)
+        if type(value) is int:
+            self.setVal(value)
+        if type(value) is str:
+            self.setVal(value)
+        # if type(value) is unicode:
+        #     self.setVal(value)
+
+    def setCheck(self, value):
+        # print('LTreeNode: setCheck(%s)' % value)
+        if value:
+            # self.text = '+ '+self.title
+            self.text = '[b]+[/b] ' + self.title
+        else:
+            self.text = '- ' + self.title
+        self.texture_update()
+
+    def setVal(self, value):
+        # print('LTreeNode: setVal(%s)' % value)
+        if value == self.value:
+            # fs = str(int(self.font_size+2))
+            # print ('%s.%s' % (self.font_size, fs))
+            # self.text = '[size='+fs+'][b]'+self.title+'[/b][/size]'
+            # self.text = 'o '+self.title
+            self.text = '[b]o[/b] ' + self.title
+            # self.text = u'\u25cf '+self.title  # unicode filled circle
+        else:
+            self.text = self.title
+            self.text = u'    ' + self.title
+            # self.text = u'\u25cb  '+self.title # unicode open circle
+        self.texture_update()
+
+    # font skalierung.
+
+    def scaleFont(self, value):
+        self.font_size = int(self.coreFont * value / 550.0)
+
+    def scaleFontCB(self, instance, value):
+        self.scaleFont(value[1])
+
+    # benutzer interaktion.
+
+    def onSelect(self, instance, val):
+        if val:
+            print('select %s' % self.title)
+        else:
+            print('deselect %s' % self.title)
+        pass
+
+    def collapseChildren(self, deep=False):
+
+        def cc(p, n):
+            for c in n.nodes:
+                if c.is_open:
+                    cc(p, c)
+                    p.toggle_node(c)
+
+        p = self.parent
+        if p and isinstance(p, LTreeRoot):
+            for n in self.nodes:
+                if n.is_open:
+                    # n.collapseChildren()   # ginge nur mit LTreeNode!
+                    if deep:
+                        cc(p, n)            # geht mit allen TreeViewNode
+                    p.toggle_node(n)
+
+    def collapseSiblings(self, deep=True):
+
+        def cc(p, n):
+            for c in n.nodes:
+                if c.is_open:
+                    cc(p, c)
+                    p.toggle_node(c)
+
+        p = self.parent
+        if p and isinstance(p, LTreeRoot):
+            # print('expand: LTreeRoot')
+            for n in p.root.nodes:
+                # print('expand: -> check %s' % n.title)
+                if n != self and n.is_open and n.level >= self.level:
+                    # print('expand: -> close %s' % n.title)
+                    if deep:
+                        cc(p, n)
+                    p.toggle_node(n)
+
+            pn = self.parent_node
+            if pn and isinstance(pn, LTreeNode):
+                # print('expand: LTreeNode')
+                for n in pn.nodes:
+                    # print('expand: -> check %s' % n.title)
+                    if n != self and n.is_open and n.level >= self.level:
+                        # print('expand: -> close %s' % n.title)
+                        if deep:
+                            cc(p, n)
+                        p.toggle_node(n)
+
+    def onOpen(self, instance, val):
+        if val:
+            # print('expand %s, %s' % (self.level, self.title))
+            self.collapseSiblings(deep=False)
+        else:
+            # print('collapse %s, %s' % (self.level, self.title))
+            pass
+
+    def on_released(self, v):
+        if self.command:
+            Clock.schedule_once(self.commandCB, 0.1)
+        else:
+            Clock.schedule_once(self.toggleCB, 0.1)
+
+    def commandCB(self, d):
+        self.command()
+
+    def toggleCB(self, d):
+        # hier könnte der knoten ev. auch neu aufgebaut werden ?!
+        self.parent.toggle_node(self)
+
+# =============================================================================
+
+
+class LTopLevelContent(BoxLayout):
+    def __init__(self, **kw):
+        super(LTopLevelContent, self).__init__(**kw)
+
+        # beispiel zu canvas (hintergrund)
+        with self.canvas.before:
+            Color(0.45, 0.5, 0.5, 1.0)
+            self.rect = Rectangle(pos=self.pos, size=self.size)
+        self.bind(pos=self.update_rect)
+        self.bind(size=self.update_rect)
+
+    def update_rect(self, *args):
+        self.rect.pos = self.pos
+        self.rect.size = self.size
+
+    def wm_minsize(self, w, h):
+        pass
+
+# =============================================================================
+
+
+class LTopLine(ButtonBehavior, Label):
+
+    def __init__(self, **kw):
+        super(LTopLine, self).__init__(**kw)
+        with self.canvas.before:
+            Color(0.45, 0.3, 0.3, 1.0)
+            self.rect = Rectangle(pos=self.pos, size=self.size)
+        self.bind(pos=self.update_rect)
+        self.bind(size=self.update_rect)
+
+    def update_rect(self, *args):
+        self.rect.pos = self.pos
+        self.rect.size = self.size
+
+    def on_press(self):
+        print('press')
+
+    def on_release(self):
+        print('release')
+
+# =============================================================================
+
+
+class LTopLevel0(BoxLayout):
+    def __init__(self, top, title=None, **kw):
+        self.main = top
+        super(LTopLevel0, self).__init__(orientation="vertical", **kw)
+
+        # self.canvas.add(Color(0, 1, 0, 0.4))
+        # self.canvas.add(Rectangle(pos=(100, 100), size=(100, 100)))
+
+        self.size_hint = (0.5, 1.0)
+        '''
+        self.titleline = BoxLayout(
+            orientation="horizontal", size_hint=[1.0, 0.15], **kw)
+        self.button = Button(text="X", size_hint=[0.15, 1.0], **kw)
+        if not title:
+            title = '<>'
+        self.title = Label(text=title, **kw)
+        self.titleline.add_widget(self.title)
+        self.titleline.add_widget(self.button)
+        '''
+        self.titleline = LTopLine(text=title, size_hint=[1.0, 0.15])
+        self.title = title
+
+        # self.content = BoxLayout(orientation="vertical", **kw)
+        self.content = LTopLevelContent(orientation="vertical", **kw)
+        self.add_widget(self.titleline)
+        self.add_widget(self.content)
+        '''
+        self.button.bind(on_press=self.onClick)
+        '''
+        self.titleline.bind(on_press=self.onClick)
+        self.main.pushWork(self.title, self)
+
+    def onClick(self, event):
+        print('LTopLevel: onClick')
+        self.main.popWork(self.title)
+
+# =============================================================================
+
+
+class LTopLevel(BoxLayout):
+    def __init__(self, parent, title=None, **kw):
+        self.mainwindow = parent
+        super(LTopLevel, self).__init__(orientation="vertical", **kw)
+
+        if ('size_hint' not in kw):
+            self.size_hint = (0.5, 1.0)
+        else:
+            del kw['size_hint']
+        self.titleline = LTopLine(text=title, size_hint=(1.0, 0.10))
+
+        self.content = LTopLevelContent(orientation="vertical", **kw)
+        self.add_widget(self.titleline)
+        self.add_widget(self.content)
+
+# =============================================================================
+
+# class LMenuBar(ActionBar):
+
+
+class LMenuBar(BoxLayout):
+    def __init__(self, **kw):
+        super(LMenuBar, self).__init__(**kw)
+        self.menu = None
+        self.size_hint = (1.0, 0.08)
+
+    def setMenu(self, menu):
+        print('LMenuBar: setMenu %s, %s' % (self, menu))
+
+        # Letztes Menu entfernen
+        last = self.menu
+        if (last is not None):
+            self.remove_widget(last)
+            self.menu = None
+
+        # Neues Menu einfügen
+        if (menu is not None):
+            self.add_widget(menu)
+            self.menu = menu
+            menu.setBar(self)
+
+    def getMenu(self):
+        return self.menu
+
+# =============================================================================
+
+
+class LMenu(ActionView):
+    def __init__(self, prev, **kw):
+        super(LMenu, self).__init__(**kw)
+        self.ap = ap = ActionPrevious(
+            with_previous=prev, size_hint=(.01, 1), **kw)
+        ap.app_icon = 'data/images/misc/pysol01.png'
+        self.add_widget(ap)
+        self.bar = None
+        self.uppermenu = None
+
+    def addItem(self, mi):
+        # print ('LMenu: addItem '+str(mi)+' '+str(self.bar))
+        mi.setBar(self.bar)
+        self.add_widget(mi)
+
+    def setBar(self, bar):
+        # print ('LMenu: setBar %s, %s' % (self, bar))
+        self.bar = bar
+
+    def prev(self, menu):
+        # print ('LMenu: prev = %s' % menu)
+        self.uppermenu = menu
+        self.ap.bind(on_release=self.upper)
+        pass
+
+    def upper(self, event):
+        print('upper')
+        self.bar.setMenu(self.uppermenu)
+
+    def delete(self, pos, mode):
+        # print ('LMenu(%s): delete(%s, %s)' % (self, pos, mode))
+
+        items = []
+        menues = []
+        for c in self.children:
+            if (type(c) is LMenuItem):
+                # print ('LMenu: to delete child %s' % c)
+                items.append(c)
+            elif (type(c) is LMenu):
+                # print ('LMenu: to delete child %s' % c)
+                menues.append(c)
+            else:
+                # print ('LMenu: unknown child %s' % c)
+                pass
+
+        for c in items:
+                # print ('LMenu: delete child %s' % c)
+            self.clear_widgets([c])
+        for c in menues:
+            # print ('LMenu: delete child %s' % c)
+            self.clear_widgets([c])
+            c.delete(pos, mode)
+
+    # def __str__(self):
+    #   return hex(id(self))
+
+# =============================================================================
+
+
+class LMenuItem(ActionButton):
+
+    def __init__(self, menu, **kw):
+        super(LMenuItem, self).__init__(**kw)
+        self.bar = None
+        self.submenu = None
+        self.menu = menu
+        self.menu.addItem(self)
+        self.minimum_width = '200sp'
+        if 'command' in kw:
+            self.setCommand(kw['command'])
+        if 'submenu' in kw:
+            self.setSubMenu(kw['submenu'])
+
+    def setBar(self, bar):
+        # print ('LMenuItem: setBar %s, %s' % (self, bar))
+        self.bar = bar
+
+    def onClick(self, event):
+        # print('LMenuItem: onClick')
+        # print('LMenuItem: submenu vorh: '+str(self.submenu))
+        self.bar.setMenu(self.submenu)
+        return True
+
+    def setSubMenu(self, submenu):
+        # print('LMenuItem: setSubMenu')
+        self.submenu = submenu
+        # print('LMenuItem: setSubMenu: '+str(self.submenu))
+        self.submenu.prev(self.menu)
+        self.submenu.setBar(self.bar)
+        self.bind(on_release=self.onClick)
+        pass
+
+    def setCommand(self, cmd):
+        # print('LMenuItem: setCommand')
+        self.bind(on_release=cmd)
+
+    # def __str__(self):
+    #   return hex(id(self))
+
+# =============================================================================
+
+
+class LScrollView(ScrollView):
+    def __init__(self, **kw):
+        super(LScrollView, self).__init__(**kw)
+        self.delayDown = False
+        self.touch = None
+
+    def delayReset(self, dt):
+        if not self.delayDown:
+            return
+        self.delayDown = False
+        ScrollView.on_touch_down(self, self.touch)
+
+    # Scroll ist original viel zu flink auf den Touchgeräten.
+    # Wir versuchen das hier etwas abzuschwächen.
+
+    def on_touch_down(self, touch):
+        self.delayDown = True
+        self.touch = touch
+        Clock.schedule_once(self.delayReset, 0.15)
+
+    def on_touch_up(self, touch):
+        if self.delayDown:
+            ScrollView.on_touch_down(self, self.touch)
+        self.delayDown = False
+        return ScrollView.on_touch_up(self, touch)
+
+    def on_touch_move(self, touch):
+        return ScrollView.on_touch_move(self, touch)
+
+# =============================================================================
+
+
+class LWorkWindow(Widget):
+    def __init__(self):
+        super(LWorkWindow, self).__init__()
+
+        # beispiel zu canvas (hintergrund)
+        with self.canvas.before:
+            Color(0, 1, 1, 0.4)
+            self.rect = Rectangle(pos=self.pos, size=self.size)
+        self.bind(pos=self.update_rect)
+        self.bind(size=self.update_rect)
+
+    def update_rect(self, *args):
+        self.rect.pos = self.pos
+        self.rect.size = self.size
+
+    def on_touch_down(self, touch):
+        print('LWorkWindow: touch_down on %s' % str(touch.pos))
+        # return True
+
+# =============================================================================
+
+
+class LTkBase:
+    # Tk Emulation needs.
+    def __init__(self):
+        self.title = "default title"
+        self.icontitle = "default title"
+        logging.info("LTkBase: __init__()")
+        self.sleeping = False
+        self.in_loop = False
+
+    def cget(self, strg):
+        return False
+
+    def wm_title(self, strg):
+        self.title = strg
+        logging.info("LTkBase: wm_title %s" % strg)
+        if (self.app):
+            # self.app.top.topLine.text = strg
+            self.app.top.getMenu().ap.title = strg
+
+    def wm_iconname(self, strg):
+        self.icontitle = strg
+        logging.info("LTkBase: wm_iconname %s" % strg)
+
+    def winfo_screenwidth(self):
+        logging.info("LTkBase: winfo_screenwidth %s" % str(self.size[0]))
+        return self.size[0]
+
+    def winfo_screenheight(self):
+        logging.info("LTkBase: winfo_screenheight %s" % str(self.size[1]))
+        return self.size[1]
+
+    def winfo_screendepth(self):
+        return 32
+
+    def wm_minsize(self, x, y):
+        pass
+
+    def option_add(self, a, b, c):
+        pass
+
+    def option_get(self, a, b):
+        return 0
+
+    def wm_withdraw(self):
+        logging.info("LTkBase: wm_withdraw")
+        pass
+
+    def busyUpdate(self):
+        print('LTkBase: busyUpdate()')
+        pass
+
+    def grid_columnconfigure(self, a, weight):
+        pass
+
+    def grid_rowconfigure(self, a, weight):
+        pass
+
+    def connectApp(self, app):
+        logging.info("LTkBase: connectApp %s" % str(app))
+        self.app = app
+        pass
+
+    def wm_geometry(self, val):
+        logging.info("LTkBase: wm_geometry %s" % str(val))
+        pass
+
+    def update_idletasks(self):
+        logging.info("LTkBase: update_idletasks")
+        try:
+            if len(EventLoop.event_listeners) > 0:
+                self.in_loop = True
+                EventLoop.idle()
+                self.in_loop = False
+            else:
+                logging.info("LTkBase: update_idletasks: terminating")
+        except Exception:
+            self.in_loop = False
+            logging.info("LTkBase: update_idletasks: exception")
+
+    def wm_state(self):
+        return ""
+
+    def wm_deiconify(self):
+        pass
+
+    def mainloop(self):
+        logging.info("LTkBase: mainloop")
+        pass
+
+    def quit(self):
+        logging.info("LTkBase: quit")
+        stopTouchApp()
+
+    def interruptSleep(self):
+        logging.info('LTkBase: interruptSleep')
+        self.update_idletasks()
+        # self.sleep_var = 1
+        return
+
+    def mainquit(self):
+        logging.info('LTkBase: mainquit')
+        lapp = App.get_running_app()
+        lapp.mainloop.send(None)    # Spielprozess verlassen
+        return
+
+    def onWakeUp(self, dt):
+        self.sleeping = False
+
+    def sleep(self, seconds):
+        logging.info('LTkBase: sleep %s seconds' % seconds)
+        self.sleeping = True
+        Clock.schedule_once(self.onWakeUp, seconds)
+        while self.sleeping:
+            # time.sleep(0.05)
+            self.in_loop = True
+            EventLoop.idle()
+            self.in_loop = False
+
+    def waitCondition(self, condition):
+        logging.info('LTkBase: wait condition start')
+        while condition():
+            self.in_loop = True
+            EventLoop.idle()
+            self.in_loop = False
+        logging.info('LTkBase: wait condition end')
+
+    def tkraise(self):
+        pass
+
+    def winfo_ismapped(self):
+        return True
+        # ???
+
+# =============================================================================
+
+
+class LStack:
+    def __init__(self):
+        self.items = []
+
+    def isEmpty(self):
+        return self.items == []
+
+    def push(self, key, item):
+        self.items.append((key, item))
+
+    def pop(self, key):
+        for i in range(len(self.items)):
+            t = self.items[i]
+            if (t[0] == key):
+                self.items.pop(i)
+                return t[1]
+        return None
+
+    def peek(self, key):
+        for i in range(len(self.items)):
+            t = self.items[i]
+            if (t[0] == key):
+                return t
+        return None
+
+    def size(self):
+        return len(self.items)
+
+# =============================================================================
+
+
+class LMainWindow(BoxLayout, LTkBase):
+    def __init__(self, **kw):
+        super(LMainWindow, self).__init__(orientation='vertical')
+        LTkBase.__init__(self)
+        self.menuArea = LMenuBar()
+        self.workContainer = LBoxLayout(orientation='horizontal')
+        self.workContainerO = LBoxLayout(orientation='horizontal')
+        self.workArea = None
+        self.toolBar = None
+        self.toolBarPos = 0
+        self.bindings = {}
+        self._w = '.'
+        self.topLine = Button(
+            size_hint=(1.0, 0.01),
+            background_down='atlas:'
+                            '//data/images/defaulttheme/action_item_down',
+            background_normal='atlas:'
+                              '//data/images/defaulttheme/action_item',
+            border=(0, 0, 0, 0))
+        self.topLine1 = Label(
+            size_hint=(1.0, 0.01),
+            background_down='atlas:'
+                            '//data/images/defaulttheme/action_item_down',
+            background_normal='atlas:'
+                              '//data/images/defaulttheme/action_item',
+            border=(0, 0, 0, 0))
+        self.add_widget(self.topLine)
+        self.add_widget(self.menuArea)
+        self.add_widget(self.topLine1)
+        self.add_widget(self.workContainerO)
+        self.workContainerO.add_widget(self.workContainer)
+        # self.add_widget(Button(size_hint = (1.0, 0.01)))
+
+        self.workStack = LStack()
+        self.app = None
+
+        # beispiel zu canvas (hintergrund)
+        # with self.canvas.before:
+        #   Color(0, 1, 0.7, 0.5)
+        #   self.rect = Rectangle(pos=self.pos, size=self.size)
+        # self.bind(pos=self.update_rect)
+        # self.bind(size=self.update_rect)
+
+    # def update_rect(self, *args):
+    #   self.rect.pos = self.pos
+    #   self.rect.size = self.size
+
+    # Events.
+
+    def on_touch_down(self, touch):
+        ret = False
+
+        # (Eventloop reentrancy check)
+        if self.in_loop:
+            return ret
+
+        # (demo mode stop - nur auf spielfläche)
+        if '<KeyPress>' in self.bindings:
+            pgs = self.workStack.peek('playground')
+            if pgs:
+                pg = pgs[1]
+                if pg.collide_point(*touch.pos):
+                    event = LEvent()
+                    event.char = True
+                    self.bindings['<KeyPress>'](event)
+
+        # standard notifikation:
+        for c in self.children:
+            ret = c.on_touch_down(touch)
+            if ret:
+                break
+        return ret
+
+    def on_touch_up(self, touch):
+        ret = False
+        # standard notifikation:
+        for c in self.children:
+            ret = c.on_touch_up(touch)
+            if ret:
+                break
+        return ret
+
+    # Menubar:
+
+    def setMenu(self, menu):
+        self.menuArea.setMenu(menu)
+
+    def getMenu(self):
+        return self.menuArea.getMenu()
+
+    # Toolbar:
+
+    def setTool(self, toolbar, pos=0):
+        if (toolbar is not None):
+            self.toolBar = toolbar
+        self.toolBarPos = pos
+        self.rebuildContainer()
+
+    # Workarea:
+
+    def rebuildContainer(self):
+        self.workContainer.clear_widgets()
+        self.workContainerO.clear_widgets()
+
+        if self.toolBar is not None and self.toolBarPos == 3:
+            self.workContainerO.add_widget(self.toolBar)
+        self.workContainerO.add_widget(self.workContainer)
+        if self.toolBar is not None and self.toolBarPos == 4:
+            self.workContainerO.add_widget(self.toolBar)
+
+        for w in self.workStack.items:
+            self.workContainer.add_widget(w[1])
+
+    def pushWork(self, key, widget):
+        if (widget):
+            self.workStack.push(key, widget)
+            self.rebuildContainer()
+
+    def popWork(self, key):
+        w = None
+        if self.workStack.size() > 0:
+            w = self.workStack.pop(key)
+            self.rebuildContainer()
+        return w
+
+    def setWork(self, key, widget):
+        self.pushWork(key, widget)
+
+    def getWork(self, key):
+        return self.workStack.peek(key)
+
+# =============================================================================
+
+
+class LApp(App):
+
+    # Handling of android return key
+    def key_input(self, window, key, scancode, codepoint, modifier):
+        if key == 27:
+            # Back key of Android.
+            lapp = App.get_running_app()
+            app = lapp.app
+            if app is None:
+                return False  # delegate
+
+            # redirect to game undo last step
+            app.menubar.mUndo()
+            return True     # consumed
+        else:
+            return False    # delegate
+
+    def __init__(self):
+        super(LApp, self).__init__()
+        self.mainWindow = LMainWindow()
+        logging.info('top = %s' % str(self.mainWindow))
+        Cache.register('LAppCache', limit=10)
+        Cache.append('LAppCache', 'mainWindow', self.mainWindow, timeout=0)
+        Cache.append('LAppCache', 'mainApp', self, timeout=0)
+        self.startCode = 0
+
+    # Es gibt hier offensichtlich nur einen Bilschirm mit Höhe und Breite.
+    # Alles andere stellt das Betriebssystem zur Verfügung. Wir wissen auch
+    # nicht, wie das Gerät gerade orientiert ist, ist nicht unsere Sache.
+    # Alles was wir tun können ist Höhe und Breite zu verfolgen, sobald wir
+    # dazu informiert werden. (Android informiert leider nicht immer, wenn
+    # es nötig wäre).
+    # Update:
+    # Nachdem im Manifest nun steht 'configChange=...|screenSize' bekommen
+    # wir auch nach dem on_resume ein Signal. Zum Update rufen wir
+    # rebuildContainer verzögert auf. Aus unerfindlichen Gründen ist es
+    # jedoch notwendig die Verzögerung 2-stufig zu organisieren. Der erste
+    # Delay wird offensichtlich unter gegebenen Umständen ignoriert.
+    # LB170517.
+
+    def delayedRebuild(self, dt):
+        logging.info("LApp: delayedRebuild")
+        self.mainWindow.rebuildContainer()
+
+    def makeDelayedRebuild(self):
+        def delayedRebuild(dt):
+            Clock.schedule_once(self.delayedRebuild, 0.01)
+        return delayedRebuild
+
+    def doSize(self, obj, val):
+        mval = self.mainWindow.size
+        logging.info("LApp: size changed %s - %s (%s)" % (obj, val, mval))
+        # Clock.schedule_once(self.delayedRebuild, 0.01)
+        Clock.schedule_once(self.makeDelayedRebuild(), 0.01)
+        pass
+
+    def on_start(self):
+        logging.info('mw = %s,  w = %s' % (self.mainWindow, Window))
+
+        Window.bind(on_keyboard=self.key_input)
+        Window.bind(size=self.doSize)
+
+        if self.startCode > 0:
+            logging.info("LApp: on_start fails")
+            return
+
+        logging.info("LApp: on_start")
+        self.mainloop = self.app.mainproc()  # Einrichten
+        self.mainloop.send(None)                # Spielprozess starten
+        logging.info("LApp: on_start processed")
+
+    def on_stop(self):
+        # Achtung wird u.U. 2 mal aufgerufen !!!
+        logging.info("LApp: on_stop")
+        if self.startCode > 0:
+            return
+        # lapp: erweiterte klasse dieser (mit pysolfc app members).
+        lapp = App.get_running_app()
+        lapp.app.menubar.mHoldAndQuit()
+
+    def on_pause(self):
+        logging.info("LApp: on_pause")
+        # return True: wenn wir wirklich in pause gehen. Dann wird auch
+        # resume aufgerufen falls die app wieder aktiviert wird.
+        # return False: app wird gestoppt (on_stop wird aufgerufen)
+        if self.startCode > 0:
+            return False
+
+        pauseSupport = True
+        # True ist die bessere Variante.
+
+        lapp = App.get_running_app()
+        app = lapp.app
+        if app is None:
+            return
+
+        logging.info("LApp: on_pause - pause on")
+        # set pause
+        if not app.game.pause:
+            app.game.doPause()
+
+        logging.info("LApp: on_pause - savegame")
+        # save game
+        try:
+            app.game.gstats.holded = 1
+            app.game._saveGame(app.fn.holdgame)
+            app.opt.game_holded = app.game.id
+            app.opt.last_gameid = app.game.id
+        except Exception:
+            traceback.print_exc()
+            pass
+        # save options
+        try:
+            app.saveOptions()
+        except Exception:
+            traceback.print_exc()
+            pass
+        # save statistics
+        try:
+            app.saveStatistics()
+        except Exception:
+            traceback.print_exc()
+            pass
+        # save comments
+        try:
+            app.saveComments()
+        except Exception:
+            traceback.print_exc()
+            pass
+        logging.info("LApp: on_pause - gamesaved")
+
+        logging.info("LApp: on_pause, Window.size=%s" % str(Window.size))
+
+        return pauseSupport
+
+    def on_resume(self):
+        logging.info("LApp: on_resume")
+
+        lapp = App.get_running_app()
+        app = lapp.app
+        if app is None:
+            return
+
+        logging.info("LApp: on_resume, Window.size=%s" % str(Window.size))
+        # ANM:
+        # Nicht einmal das Basiswindow wird hier über eine
+        # Orientierungsänderung informiert, die während der Pause eintrat.
+        # Eine korrekte Darstellung kann daher nicht garantiert werden.
+        # Wenn die sensoren ev. später für eine korrektur sorgen, erfolgt
+        # ebenfalls kein update, weil sich die parameter am Basiswindow ja
+        # zum alten bekannten Wert hin ändern (also gar nicht).
+
+        if app.game.pause:
+            Clock.schedule_once(self.makeEndPauseCmd(app), 3.0)
+
+    def makeEndPauseCmd(self, app):
+        def endPauseCmd(dt):
+            if app.game.pause:
+                logging.info("LApp: on_resume - pause off")
+                app.game.doPause()
+        return endPauseCmd
diff --git a/pysollib/kivy/__init__.py b/pysollib/kivy/__init__.py
new file mode 100644
index 00000000..bdea2cb2
--- /dev/null
+++ b/pysollib/kivy/__init__.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
diff --git a/pysollib/kivy/card.py b/pysollib/kivy/card.py
new file mode 100644
index 00000000..dc208240
--- /dev/null
+++ b/pysollib/kivy/card.py
@@ -0,0 +1,278 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# PySol imports
+from pysollib.acard import AbstractCard
+
+# Toolkit imports
+from pysollib.kivy.tkcanvas import MfxCanvasGroup, MfxCanvasImage
+
+# from tkutil import Image
+from pysollib.kivy.LApp import LImageItem
+from pysollib.kivy.LApp import LImage
+
+__all__ = ['Card']
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class _HideableCard(AbstractCard):
+    def hide(self, stack):
+        if stack is self.hide_stack:
+            return
+        self.item.config(state="hidden")
+        self.hide_stack = stack
+        # print "hide:", self.id, self.item.coords()
+
+    def unhide(self):
+        if self.hide_stack is None:
+            return 0
+        # print "unhide:", self.id, self.item.coords()
+        self.item.config(state="normal")
+        self.hide_stack = None
+        return 1
+
+    # moveBy aus Basisklasse überschreiben.
+    def moveBy(self, dx, dy):
+        # wir verwenden direkt den float Wert.
+        if dx or dy:
+            self.x = self.x + dx
+            self.y = self.y + dy
+            self.item.move(dx, dy)
+
+
+# ************************************************************************
+# * New implemetation since 2.10
+# *
+# * We use a single CanvasImage and call CanvasImage.config() to
+# * turn the card.
+# * This makes turning cards a little bit slower, but dragging cards
+# * around is noticeable faster as the total number of images is
+# * reduced by half.
+# ************************************************************************
+# * Kivy Implementation
+# * Wir verwenden ein BoxLayout und installieren je nach Status das
+# * face oder das back Image.
+# ************************************************************************
+
+
+class _OneImageCard(_HideableCard):
+    def __init__(self, id, deck, suit, rank, game, x=0, y=0):
+        _HideableCard.__init__(self, id, deck, suit, rank, game, x=x, y=y)
+
+        fimage = game.getCardFaceImage(deck, suit, rank)
+        bimage = game.getCardBackImage(deck, suit, rank)
+
+        self._face_image = LImage(texture=fimage.texture)
+        self._back_image = LImage(texture=bimage.texture)
+        # self._face_image = Image(source=fimage.source)
+        # self._back_image = Image(source=bimage.source)
+        self._shade_image = game.getCardShadeImage()
+
+        aimage = LImageItem(
+            pos=(x, -y), size=self._face_image.size, game=game, card=self)
+        aimage.add_widget(self._back_image)
+        self._active_image = aimage
+
+        self.item = MfxCanvasImage(
+            game.canvas, self.x, self.y, image=aimage, anchor="nw")
+        self.shade_item = None
+
+        # print ('card: face = %s xy=%s/%s' % (self._face_image.source, x, y))
+        # print ('card: back = %s xy=%s/%s' % (self._back_image.source, x, y))
+        # y = self.yy
+
+    def _setImage(self, image):
+        self._active_image.clear_widgets()
+        self._active_image.add_widget(image)
+
+    def showFace(self, unhide=1):
+        # print ('card: showFace = %s' % self._face_image.source)
+        if not self.face_up:
+            self._setImage(image=self._face_image)
+            self.tkraise(unhide)
+            self.face_up = 1
+
+    def showBack(self, unhide=1):
+        # print ('card: showBack = %s' % self._back_image.source)
+        if self.face_up:
+            self._setImage(image=self._back_image)
+            self.tkraise(unhide)
+            self.face_up = 0
+
+    def updateCardBackground(self, image):
+        print('card: updateCardBackground = %s' % image.source)
+        self._back_image = LImage(texture=image.texture)
+        if not self.face_up:
+            self._setImage(image=self._back_image)
+
+    def setSelected(self, s, group=None):
+        print('card: setselected(%s, %s)' % (s, group))
+        # wird nicht bedient.
+        pass
+
+    def animatedMove(self, dx, dy, duration=0.2):
+        self.item.animatedMove(dx, dy, duration)
+
+# ************************************************************************
+# * New idea since 3.00
+# *
+# * Hide a card by configuring the canvas image to None.
+# ************************************************************************
+
+
+class _OneImageCardWithHideByConfig(_OneImageCard):
+    def hide(self, stack):
+        if stack is self.hide_stack:
+            return
+        self._setImage(image=None)
+        self.hide_stack = stack
+
+    def unhide(self):
+        if self.hide_stack is None:
+            return 0
+        if self.face_up:
+            self._setImage(image=self._face_image)
+        else:
+            self._setImage(image=self._back_image)
+        self.hide_stack = None
+        return 1
+
+    #
+    # much like in _OneImageCard
+    #
+
+    def showFace(self, unhide=1):
+        if not self.face_up:
+            if unhide:
+                self._setImage(image=self._face_image)
+            self.item.tkraise()
+            self.face_up = 1
+
+    def showBack(self, unhide=1):
+        if self.face_up:
+            if unhide:
+                self._setImage(image=self._back_image)
+            self.item.tkraise()
+            self.face_up = 0
+
+    def updateCardBackground(self, image):
+        self._back_image = image
+        if not self.face_up and not self.hide_stack:
+            self._setImage(image=image)
+
+
+# ************************************************************************
+# * Old implemetation prior to 2.10
+# *
+# * The card consists of two CanvasImages. To show the card face up,
+# * the face item is placed in front of the back. To show it face
+# * down, this is reversed.
+# ************************************************************************
+
+
+class _TwoImageCard(_HideableCard):
+    # Private instance variables:
+    #   __face, __back -- the canvas items making up the card
+    def __init__(self, id, deck, suit, rank, game, x=0, y=0):
+        _HideableCard.__init__(self, id, deck, suit, rank, game, x=x, y=y)
+        self.item = MfxCanvasGroup(game.canvas)
+        self.__face = MfxCanvasImage(
+            game.canvas, self.x, self.y,
+            image=game.getCardFaceImage(deck, suit, rank), anchor="nw")
+        self.__back = MfxCanvasImage(
+            game.canvas, self.x, self.y,
+            image=game.getCardBackImage(deck, suit, rank), anchor="nw")
+        self.__face.addtag(self.item)
+        self.__back.addtag(self.item)
+
+    def showFace(self, unhide=1):
+        if not self.face_up:
+            self.__face.tkraise()
+            self.tkraise(unhide)
+            self.face_up = 1
+
+    def showBack(self, unhide=1):
+        if self.face_up:
+            self.__back.tkraise()
+            self.tkraise(unhide)
+            self.face_up = 0
+
+    def updateCardBackground(self, image):
+        self.__back.config(image=image)
+
+
+# ************************************************************************
+# * New idea since 2.90
+# *
+# * The card consists of two CanvasImages. Instead of raising
+# * one image above the other we move the inactive image out
+# * of the visible canvas.
+# ************************************************************************
+
+
+class _TwoImageCardWithHideItem(_HideableCard):
+    # Private instance variables:
+    #   __face, __back -- the canvas items making up the card
+    def __init__(self, id, deck, suit, rank, game, x=0, y=0):
+        _HideableCard.__init__(self, id, deck, suit, rank, game, x=x, y=y)
+        self.item = MfxCanvasGroup(game.canvas)
+        self.__face = MfxCanvasImage(
+            game.canvas, self.x, self.y + 11000,
+            image=game.getCardFaceImage(deck, suit, rank), anchor="nw")
+        self.__back = MfxCanvasImage(
+            game.canvas, self.x, self.y,
+            image=game.getCardBackImage(deck, suit, rank), anchor="nw")
+        self.__face.addtag(self.item)
+        self.__back.addtag(self.item)
+
+    def showFace(self, unhide=1):
+        if not self.face_up:
+            self.__back.move(0, 10000)
+            # self.__face.tkraise()
+            self.__face.move(0, -11000)
+            self.tkraise(unhide)
+            self.face_up = 1
+
+    def showBack(self, unhide=1):
+        if self.face_up:
+            self.__face.move(0, 11000)
+            # self.__back.tkraise()
+            self.__back.move(0, -10000)
+            self.tkraise(unhide)
+            self.face_up = 0
+
+    def updateCardBackground(self, image):
+        self.__back.config(image=image)
+
+
+# choose the implementation
+# Card = _TwoImageCardWithHideItem
+# Card = _TwoImageCard
+# Card = _OneImageCardWithHideByConfig
+Card = _OneImageCard
+
+
+'''end of file'''
diff --git a/pysollib/kivy/colorsdialog.py b/pysollib/kivy/colorsdialog.py
new file mode 100644
index 00000000..2399d2fa
--- /dev/null
+++ b/pysollib/kivy/colorsdialog.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# Toolkit imports
+from tkwidget import MfxDialog
+
+__all__ = ['ColorsDialog']
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class ColorsDialog(MfxDialog):
+    def __init__(self, parent, title, app, **kw):
+        kw = self.initKw(kw)
+        MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
+        # not used in kivy version.
+        return
+
+
+'''end of file'''
diff --git a/pysollib/kivy/edittextdialog.py b/pysollib/kivy/edittextdialog.py
new file mode 100644
index 00000000..79090e31
--- /dev/null
+++ b/pysollib/kivy/edittextdialog.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# Toolkit imports
+from tkwidget import MfxDialog
+
+__all__ = ['EditTextDialog']
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class EditTextDialog(MfxDialog):
+
+    def __init__(self, parent, title, text, **kw):
+        # not used with kivy.
+        pass
+
+    def initKw(self, kw):
+        pass
+
+    def destroy(self):
+        pass
+
+    def wmDeleteWindow(self, *event):   # ignore
+        pass
+
+    def mCancel(self, *event):          # ignore <Escape>
+        pass
+
+
+'''end of file'''
diff --git a/pysollib/kivy/findcarddialog.py b/pysollib/kivy/findcarddialog.py
new file mode 100644
index 00000000..fc37a482
--- /dev/null
+++ b/pysollib/kivy/findcarddialog.py
@@ -0,0 +1,91 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# imports
+# import os
+# import traceback
+
+# PySol imports
+
+# Toolkit imports
+# from tkutil import after, after_cancel
+# from tkutil import bind, unbind_destroy, makeImage
+# from tkcanvas import MfxCanvas, MfxCanvasGroup
+# from tkcanvas import MfxCanvasImage, MfxCanvasRectangle
+
+# from pysollib.settings import TITLE
+
+__all__ = ['create_find_card_dialog',
+           'connect_game_find_card_dialog',
+           'destroy_find_card_dialog',
+           ]
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+LARGE_EMBLEMS_SIZE = (38, 34)
+SMALL_EMBLEMS_SIZE = (31, 21)
+
+
+find_card_dialog = None
+
+
+def create_find_card_dialog(parent, game, dir):
+    pass
+    '''
+    global find_card_dialog
+    try:
+        find_card_dialog.wm_deiconify()
+        find_card_dialog.tkraise()
+    except:
+        # traceback.print_exc()
+        find_card_dialog = FindCardDialog(parent, game, dir)
+    '''
+
+
+def connect_game_find_card_dialog(game):
+    pass
+    '''
+    try:
+        find_card_dialog.connectGame(game)
+    except:
+        pass
+    '''
+
+
+def destroy_find_card_dialog():
+    pass
+    '''
+    global find_card_dialog
+    try:
+        find_card_dialog.destroy()
+    except:
+        # traceback.print_exc()
+        pass
+    find_card_dialog = None
+    '''
+
+
+'''
+'''
diff --git a/pysollib/kivy/fontsdialog.py b/pysollib/kivy/fontsdialog.py
new file mode 100644
index 00000000..9fc07bea
--- /dev/null
+++ b/pysollib/kivy/fontsdialog.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# Toolkit imports
+from tkwidget import MfxDialog
+
+__all__ = ['FontsDialog']
+
+# ************************************************************************
+# *
+# ************************************************************************
+# not supported.
+
+
+class FontsDialog(MfxDialog):
+    def __init__(self, parent, title, app, **kw):
+        pass
diff --git a/pysollib/kivy/gameinfodialog.py b/pysollib/kivy/gameinfodialog.py
new file mode 100644
index 00000000..f670d123
--- /dev/null
+++ b/pysollib/kivy/gameinfodialog.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+
+# PySol imports
+# from pysollib.mfxutil import KwStruct
+# from pysollib.gamedb import GI
+
+# Toolkit imports
+from tkwidget import MfxDialog
+
+__all__ = ['GameInfoDialog']
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class GameInfoDialog(MfxDialog):
+    def __init__(self, parent, title, app, **kw):
+        pass
+
+
+'''
+'''
diff --git a/pysollib/kivy/menubar.py b/pysollib/kivy/menubar.py
new file mode 100644
index 00000000..d5675f1f
--- /dev/null
+++ b/pysollib/kivy/menubar.py
@@ -0,0 +1,2349 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+# Copyright (C) 2017 LB
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# imports
+import math
+import os
+# import sys
+import re
+# import logging
+# import traceback
+
+# PySol imports
+# from pysollib.mygettext import _, n_
+from pysollib.mygettext import _
+# from pysollib.mfxutil import Struct, kwdefault
+from pysollib.mfxutil import Struct
+# from pysollib.mfxutil import Image
+from pysollib.util import CARDSET
+# from pysollib.settings import TITLE, WIN_SYSTEM
+from pysollib.settings import TITLE
+# from pysollib.settings import TOP_TITLE
+from pysollib.settings import SELECT_GAME_MENU
+# from pysollib.settings import USE_FREECELL_SOLVER
+# from pysollib.settings import DEBUG
+from pysollib.gamedb import GI
+# from pysollib.pysoltk import MfxMenu
+# from pysollib.pysoltk import SelectCardsetDialogWithPreview
+
+# toolkit imports
+from pysollib.kivy.tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH
+from pysollib.kivy.tkutil import bind
+from pysollib.kivy.tkutil import after_idle
+from pysollib.kivy.selectcardset import SelectCardsetDialogWithPreview
+
+from selectgame import SelectGameDialog
+from findcarddialog import connect_game_find_card_dialog
+from findcarddialog import destroy_find_card_dialog
+from solverdialog import connect_game_solver_dialog
+from tkconst import TOOLBAR_BUTTONS
+
+# Kivy
+
+# from kivy.uix.treeview import TreeView
+# from kivy.uix.treeview import TreeViewLabel
+# from kivy.uix.treeview import TreeViewNode
+# from kivy.uix.label import Label
+# from kivy.uix.button import Button
+# from kivy.uix.behaviors import ButtonBehavior
+# from kivy.uix.scrollview import ScrollView
+
+# from kivy.clock import Clock
+from kivy.properties import BooleanProperty
+from kivy.properties import NumericProperty
+from kivy.properties import StringProperty
+
+from kivy.event import EventDispatcher
+
+from LApp import LMenu
+from LApp import LTreeNode
+from LApp import LMenuItem
+from LApp import LTopLevel
+from LApp import LScrollView
+from LApp import LTreeRoot
+
+
+__all__ = ['PysolMenubarTk']
+
+# ************************************************************************
+# * tk emuls:
+# ************************************************************************
+
+
+class TkVarObj(EventDispatcher):
+    def __init(self):
+        self.value = None
+
+    def set(self, v):
+        if v is None:
+            if type(self.value) is str:
+                v = ''
+        self.value = v
+
+    def get(self):
+        return self.value
+
+
+class BooleanVar(TkVarObj):
+    value = BooleanProperty(False)
+
+
+class IntVar(TkVarObj):
+    value = NumericProperty(0)
+
+
+class StringVar(TkVarObj):
+    value = StringProperty('')
+
+# ************************************************************************
+# * Menu Dialogs
+# ************************************************************************
+
+
+class LMenuDialog(object):
+
+    dialogCache = {}
+
+    def make_pop_command(self, parent, title):
+        def pop_command(event):
+            print('event = %s' % event)
+            parent.popWork(title)
+        return pop_command
+
+    def __init__(self, menubar, parent, title, app, **kw):
+        super(LMenuDialog, self).__init__()
+
+        self.menubar = menubar
+        self.parent = parent
+        self.app = app
+        self.title = title
+        self.window = None
+        self.running = False
+        self.persist = False
+        if 'persist' in kw:
+            self.persist = kw['persist']
+
+        # prüfen ob noch aktiv - toggle.
+
+        if parent.workStack.peek(title) is not None:
+            parent.popWork(title)
+            return
+
+        if self.persist and title in self.dialogCache:
+            parent.pushWork(title, self.dialogCache[title])
+            return
+
+        pc = self.closeWindow = self.make_pop_command(parent, title)
+
+        # neuen Dialog aufbauen.
+
+        window = LTopLevel(parent, title, **kw)
+        window.titleline.bind(on_press=pc)
+        self.parent.pushWork(title, window)
+        self.window = window
+        self.running = True
+
+        if self.persist:
+            self.dialogCache[title] = window
+
+        # Tree skelett.
+
+        tv = self.tvroot = LTreeRoot(root_options=dict(text='EditTree'))
+        tv.hide_root = True
+        tv.size_hint = 1, None
+        tv.bind(minimum_height=tv.setter('height'))
+
+        # menupunkte aufbauen.
+
+        self.buildTree(tv, None)
+
+        # tree in einem Scrollwindow präsentieren.
+
+        root = LScrollView(pos=(0, 0))
+        root.add_widget(tv)
+        self.window.content.add_widget(root)
+
+    def buildTree(self, tree, node):
+        print('buildTree base')
+        # to implement in dervied class
+        pass
+
+# ************************************************************************
+
+
+class MainMenuDialog(LMenuDialog):
+
+    def __init__(self, menubar, parent, title, app, **kw):
+        kw['size_hint'] = (0.2, 1)
+        kw['persist'] = True
+        super(MainMenuDialog, self).__init__(
+            menubar, parent, title, app, **kw)
+
+    def make_game_command(self, command):
+        def game_command():
+            command()
+            self.closeWindow(0)
+        return game_command
+
+    def buildTree(self, tv, node):
+        rg = tv.add_node(
+            LTreeNode(
+                text="File",
+                command=self.make_game_command(self.menubar.mFileMenuDialog)))
+        rg = tv.add_node(
+            LTreeNode(
+                text="Games",
+                command=self.make_game_command(
+                    self.menubar.mSelectGameDialog)))
+        rg = tv.add_node(
+            LTreeNode(
+                text="Tools",
+                command=self.make_game_command(self.menubar.mEditMenuDialog)))
+        rg = tv.add_node(
+            LTreeNode(
+                text="Statistics",
+                command=self.make_game_command(self.menubar.mGameMenuDialog)))
+        rg = tv.add_node(
+            LTreeNode(
+                text="Assist",
+                command=self.make_game_command(
+                    self.menubar.mAssistMenuDialog)))
+        rg = tv.add_node(
+            LTreeNode(
+                text="Options",
+                command=self.make_game_command(
+                    self.menubar.mOptionsMenuDialog)))
+        rg = tv.add_node(
+            LTreeNode(
+                text="Help",
+                command=self.make_game_command(self.menubar.mHelpMenuDialog)))
+        del rg
+
+# ************************************************************************
+
+
+class FileMenuDialog(LMenuDialog):
+
+    def __init__(self, menubar, parent, title, app, **kw):
+        kw['size_hint'] = (0.3, 1)
+        super(FileMenuDialog, self).__init__(
+            menubar, parent, title, app, **kw)
+
+    def make_game_command(self, key, command):
+        def game_command():
+            command(key)
+        return game_command
+
+    def buildTree(self, tv, node):
+        rg = tv.add_node(
+            LTreeNode(text='Recent games'))
+        # Recent Liste
+        recids = self.app.opt.recent_gameid
+        # recgames = []
+        for rid in recids:
+            gi = self.app.getGameInfo(rid)
+            if gi:
+                command = self.make_game_command(
+                    rid, self.menubar._mSelectGame)
+                tv.add_node(
+                    LTreeNode(text=gi.name, command=command), rg)
+
+        rg = tv.add_node(
+            LTreeNode(text='Favorite games'))
+        if rg:
+            tv.add_node(LTreeNode(
+                text='<Add>', command=self.menubar.mAddFavor), rg)
+            tv.add_node(LTreeNode(
+                text='<Remove>', command=self.menubar.mDelFavor), rg)
+
+            # Recent Liste
+            favids = self.app.opt.favorite_gameid
+            # favgames = []
+            for fid in favids:
+                gi = self.app.getGameInfo(fid)
+                if gi:
+                    command = self.make_game_command(
+                        fid, self.menubar._mSelectGame)
+                    tv.add_node(
+                        LTreeNode(text=gi.name, command=command), rg)
+
+        tv.add_node(LTreeNode(
+            text='Load', command=self.menubar.mOpen))
+        tv.add_node(LTreeNode(
+            text='Save', command=self.menubar.mSaveAs))
+
+        tv.add_node(LTreeNode(
+            text='Quit', command=self.menubar.mHoldAndQuit))
+
+# ************************************************************************
+
+
+class EditMenuDialog(LMenuDialog):  # Tools
+
+    def __init__(self, menubar, parent, title, app, **kw):
+        kw['size_hint'] = (0.2, 1)
+        kw['persist'] = True
+        super(EditMenuDialog, self).__init__(
+            menubar, parent, title, app, **kw)
+
+    def make_auto_command(self, variable, command):
+        def auto_command():
+            variable.set(not variable.get())
+            command()
+        return auto_command
+
+    def addCheckNode(self, tv, rg, title, auto_var, auto_com):
+        command = self.make_auto_command(auto_var, auto_com)
+        rg1 = tv.add_node(
+            LTreeNode(text=title, command=command, variable=auto_var), rg)
+        return rg1
+
+    def buildTree(self, tv, node):
+        tv.add_node(LTreeNode(
+            text='New game', command=self.menubar.mNewGame))
+        tv.add_node(LTreeNode(
+            text='Restart game', command=self.menubar.mRestart))
+
+        tv.add_node(LTreeNode(
+            text='Undo', command=self.menubar.mUndo))
+        tv.add_node(LTreeNode(
+            text='Redo', command=self.menubar.mRedo))
+        tv.add_node(LTreeNode(
+            text='Redo all', command=self.menubar.mRedoAll))
+
+        tv.add_node(LTreeNode(
+            text='Auto drop', command=self.menubar.mDrop))
+        tv.add_node(LTreeNode(
+            text='Shuffle tiles', command=self.menubar.mShuffle))
+        tv.add_node(LTreeNode(
+            text='Deal cards', command=self.menubar.mDeal))
+
+        self.addCheckNode(tv, None,
+                          'Pause',
+                          self.menubar.tkopt.pause,
+                          self.menubar.mPause)
+
+        tv.add_node(LTreeNode(
+            text='Load game', command=self.menubar.mOpen))
+        tv.add_node(LTreeNode(
+            text='Save game', command=self.menubar.mSaveAs))
+
+        tv.add_node(LTreeNode(
+            text='Help', command=self.menubar.mHelpRules))
+
+        # -------------------------------------------
+        # TBD ?
+        '''
+        menu.add_separator()
+        submenu = MfxMenu(menu, label=n_("&Set bookmark"))
+        for i in range(9):
+            label = _("Bookmark %d") % (i + 1)
+            submenu.add_command(
+                label=label, command=lambda i=i: self.mSetBookmark(i))
+        submenu = MfxMenu(menu, label=n_("Go&to bookmark"))
+        for i in range(9):
+            label = _("Bookmark %d") % (i + 1)
+            acc = m + "%d" % (i + 1)
+            submenu.add_command(
+                label=label,
+                command=lambda i=i: self.mGotoBookmark(i),
+                accelerator=acc)
+        menu.add_command(
+            label=n_("&Clear bookmarks"), command=self.mClearBookmarks)
+        menu.add_separator()
+        '''
+        # und solitär wizard (-> custom games).
+        '''
+        tv.add_node(LTreeNode(
+            text='Solitaire &Wizard', command=self.menubar.mWizard))
+        tv.add_node(LTreeNode(
+                text='Edit current game', command=self.menubar.mWizardEdit))
+        '''
+
+# ************************************************************************
+
+
+class GameMenuDialog(LMenuDialog):
+
+    def __init__(self, menubar, parent, title, app, **kw):
+        kw['size_hint'] = (0.2, 1)
+        kw['persist'] = True
+        super(GameMenuDialog, self).__init__(
+            menubar, parent, title, app, **kw)
+
+    def make_command(self, key, command):
+        def stats_command():
+            kw = {}
+            kw['mode'] = key
+            command(**kw)
+        return stats_command
+
+    def buildTree(self, tv, node):
+        tv.add_node(LTreeNode(
+            text='Current game ...',
+            command=self.make_command(101, self.menubar.mPlayerStats)), None)
+
+        # tv.add_node(LTreeNode(
+        #   text='All games ...',
+        #   command=self.make_command(102, self.menubar.mPlayerStats)), None)
+
+    # -------------------------------------------
+    # TBD ? - just to remember original tk code.
+    '''
+        menu.add_command(
+            label=n_("S&tatus..."),
+            command=lambda x: self.mPlayerStats(mode=100), accelerator=m+"Y")
+        menu.add_checkbutton(
+            label=n_("&Comments..."), variable=self.tkopt.comment,
+            command=self.mEditGameComment)
+    '''
+    '''
+        menu.add_separator()
+        submenu = MfxMenu(menu, label=n_("&Statistics"))
+        submenu.add_command(
+            label=n_("Current game..."),
+            command=lambda x: self.mPlayerStats(mode=101))
+        submenu.add_command(
+            label=n_("All games..."),
+            command=lambda x: self.mPlayerStats(mode=102))
+        submenu.add_separator()
+        submenu.add_command(
+            label=n_("Session log..."),
+            command=lambda x: self.mPlayerStats(mode=104))
+        submenu.add_command(
+            label=n_("Full log..."),
+            command=lambda x: self.mPlayerStats(mode=103))
+        submenu.add_separator()
+        submenu.add_command(
+            label=TOP_TITLE+"...",
+            command=lambda x: self.mPlayerStats(mode=105),
+            accelerator=m+"T")
+        submenu.add_command(
+            label=n_("Progression..."),
+            command=lambda x: self.mPlayerStats(mode=107))
+        submenu = MfxMenu(menu, label=n_("D&emo statistics"))
+        submenu.add_command(
+            label=n_("Current game..."),
+            command=lambda x: self.mPlayerStats(mode=1101))
+        submenu.add_command(
+            label=n_("All games..."),
+            command=lambda x: self.mPlayerStats(mode=1102))
+    '''
+
+# ************************************************************************
+
+
+class AssistMenuDialog(LMenuDialog):
+
+    def __init__(self, menubar, parent, title, app, **kw):
+        kw['size_hint'] = (0.2, 1)
+        kw['persist'] = True
+        super(AssistMenuDialog, self).__init__(
+            menubar, parent, title, app, **kw)
+
+    def buildTree(self, tv, node):
+        tv.add_node(LTreeNode(
+            text='Hint', command=self.menubar.mHint))
+
+        tv.add_node(LTreeNode(
+            text='Highlight piles', command=self.menubar.mHighlightPiles))
+
+        # tv.add_node(LTreeNode(
+        #   text='Find Card', command=self.menubar.mFindCard))
+
+        tv.add_node(LTreeNode(
+            text='Demo', command=self.menubar.mDemo))
+
+        # -------------------------------------------
+        # TBD. How ?
+
+        '''
+        menu.add_command(
+            label=n_("Demo (&all games)"), command=self.mMixedDemo)
+        if USE_FREECELL_SOLVER:
+            menu.add_command(label=n_("&Solver"), command=self.mSolver)
+        else:
+            menu.add_command(label=n_("&Solver"), state='disabled')
+        menu.add_separator()
+        menu.add_command(
+            label=n_("&Piles description"),
+            command=self.mStackDesk, accelerator="F2")
+        '''
+
+# ************************************************************************
+
+
+class OptionsMenuDialog(LMenuDialog):
+
+    def __init__(self, menubar, parent, title, app, **kw):
+        kw['size_hint'] = (0.5, 1)
+        kw['persist'] = True
+        super(OptionsMenuDialog, self).__init__(
+            menubar, parent, title, app, **kw)
+
+    def make_auto_command(self, variable, command):
+        def auto_command():
+            variable.set(not variable.get())
+            command()
+        return auto_command
+
+    def addCheckNode(self, tv, rg, title, auto_var, auto_com):
+        command = self.make_auto_command(auto_var, auto_com)
+        rg1 = tv.add_node(
+            LTreeNode(text=title, command=command, variable=auto_var), rg)
+        return rg1
+
+    def make_val_command(self, variable, value, command):
+        def val_command():
+            variable.set(value)
+            command()
+        return val_command
+
+    def make_vars_command(self, command, key):
+        def vars_command():
+            command(key)
+        return vars_command
+
+    def addRadioNode(self, tv, rg, title, auto_var, auto_val, auto_com):
+        command = self.make_val_command(auto_var, auto_val, auto_com)
+        rg1 = tv.add_node(
+            LTreeNode(text=title,
+                      command=command,
+                      variable=auto_var, value=auto_val), rg)
+        return rg1
+
+    def buildTree(self, tv, node):
+
+        # -------------------------------------------
+        # Automatic play settings
+
+        rg = tv.add_node(
+            LTreeNode(text='Automatic play'))
+        if rg:
+            self.addCheckNode(tv, rg,
+                              'Auto face up',
+                              self.menubar.tkopt.autofaceup,
+                              self.menubar.mOptAutoFaceUp)
+
+            self.addCheckNode(tv, rg,
+                              'Auto drop',
+                              self.menubar.tkopt.autodrop,
+                              self.menubar.mOptAutoDrop)
+
+            self.addCheckNode(tv, rg,
+                              'Auto deal',
+                              self.menubar.tkopt.autodeal,
+                              self.menubar.mOptAutoDeal)
+
+            # submenu.add_separator()
+
+            self.addCheckNode(tv, rg,
+                              'Quick play',
+                              self.menubar.tkopt.quickplay,
+                              self.menubar.mOptQuickPlay)
+
+        # -------------------------------------------
+        # Player assistance
+
+        rg = tv.add_node(
+            LTreeNode(text='Assist level'))
+        if rg:
+            self.addCheckNode(tv, rg,
+                              'Enable undo',
+                              self.menubar.tkopt.undo,
+                              self.menubar.mOptEnableUndo)
+
+            self.addCheckNode(tv, rg,
+                              'Enable bookmarks',
+                              self.menubar.tkopt.bookmarks,
+                              self.menubar.mOptEnableBookmarks)
+
+            self.addCheckNode(tv, rg,
+                              'Enable hint',
+                              self.menubar.tkopt.hint,
+                              self.menubar.mOptEnableHint)
+
+            self.addCheckNode(tv, rg,
+                              'Enable shuffle',
+                              self.menubar.tkopt.shuffle,
+                              self.menubar.mOptEnableShuffle)
+
+            self.addCheckNode(tv, rg,
+                              'Enable highlight piles',
+                              self.menubar.tkopt.highlight_piles,
+                              self.menubar.mOptEnableHighlightPiles)
+
+            self.addCheckNode(tv, rg,
+                              'Enable highlight cards',
+                              self.menubar.tkopt.highlight_cards,
+                              self.menubar.mOptEnableHighlightCards)
+
+            self.addCheckNode(tv, rg,
+                              'Enable highlight same rank',
+                              self.menubar.tkopt.highlight_samerank,
+                              self.menubar.mOptEnableHighlightSameRank)
+
+            self.addCheckNode(tv, rg,
+                              'Highlight no matching',
+                              self.menubar.tkopt.highlight_not_matching,
+                              self.menubar.mOptEnableHighlightNotMatching)
+
+            # submenu.add_separator()
+
+            self.addCheckNode(tv, rg,
+                              'Show removed tiles (in Mahjongg games)',
+                              self.menubar.tkopt.mahjongg_show_removed,
+                              self.menubar.mOptMahjonggShowRemoved)
+
+            self.addCheckNode(tv, rg,
+                              'Show hint arrow (in Shisen-Sho games)',
+                              self.menubar.tkopt.shisen_show_hint,
+                              self.menubar.mOptShisenShowHint)
+
+            # submenu.add_separator()
+
+        # -------------------------------------------
+        # Sound options
+
+        rg = tv.add_node(
+            LTreeNode(text='Sound'))
+        if rg:
+            self.addCheckNode(tv, rg,
+                              'Enable',
+                              self.menubar.tkopt.sound,
+                              self.menubar.mOptSoundDialog)
+
+            rg1 = tv.add_node(
+                LTreeNode(text='Volume'), rg)
+            if rg1:
+                self.addRadioNode(tv, rg1,
+                                  '100%',
+                                  self.menubar.tkopt.sound_sample_volume, 100,
+                                  self.menubar.mOptSoundSampleVol)
+                self.addRadioNode(tv, rg1,
+                                  '75%',
+                                  self.menubar.tkopt.sound_sample_volume, 75,
+                                  self.menubar.mOptSoundSampleVol)
+                self.addRadioNode(tv, rg1,
+                                  '50%',
+                                  self.menubar.tkopt.sound_sample_volume, 50,
+                                  self.menubar.mOptSoundSampleVol)
+                self.addRadioNode(tv, rg1,
+                                  '25%',
+                                  self.menubar.tkopt.sound_sample_volume, 25,
+                                  self.menubar.mOptSoundSampleVol)
+
+            rg1 = tv.add_node(
+                LTreeNode(text='Samples'), rg)
+            if rg1:
+                key = 'areyousure'
+                self.addCheckNode(
+                    tv, rg1,
+                    'are you sure',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'autodrop'
+                self.addCheckNode(
+                    tv, rg1,
+                    'auto drop',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'autoflip'
+                self.addCheckNode(
+                    tv, rg1,
+                    'auto flip',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'autopilotlost'
+                self.addCheckNode(
+                    tv, rg1,
+                    'auto pilot lost',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'autopilotwon'
+                self.addCheckNode(
+                    tv, rg1,
+                    'auto pilot won',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'deal'
+                self.addCheckNode(
+                    tv, rg1,
+                    'deal',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'dealwaste'
+                self.addCheckNode(
+                    tv, rg1,
+                    'deal waste',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'droppair'
+                self.addCheckNode(
+                    tv, rg1,
+                    'drop pair',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'drop'
+                self.addCheckNode(
+                    tv, rg1,
+                    'drop',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'flip'
+                self.addCheckNode(
+                    tv, rg1,
+                    'flip',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'move'
+                self.addCheckNode(
+                    tv, rg1,
+                    'move',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'nomove'
+                self.addCheckNode(
+                    tv, rg1,
+                    'no move',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'redo'
+                self.addCheckNode(
+                    tv, rg1,
+                    'redo',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'startdrag'
+                self.addCheckNode(
+                    tv, rg1,
+                    'start drag',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'turnwaste'
+                self.addCheckNode(
+                    tv, rg1,
+                    'turn waste',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'undo'
+                self.addCheckNode(
+                    tv, rg1,
+                    'undo',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'gamefinished'
+                self.addCheckNode(
+                    tv, rg1,
+                    'game finished',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'gamelost'
+                self.addCheckNode(
+                    tv, rg1,
+                    'game lost',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'gameperfect'
+                self.addCheckNode(
+                    tv, rg1,
+                    'game perfect',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+                key = 'gamewon'
+                self.addCheckNode(
+                    tv, rg1,
+                    'game won',
+                    self.menubar.tkopt.sound_sample_vars[key],
+                    self.make_vars_command(self.menubar.mOptSoundSample, key))
+
+        # -------------------------------------------
+        # Cardsets and card backside options
+
+        rg = tv.add_node(
+            LTreeNode(text='Cardsets'))
+        if rg:
+            self.menubar.tkopt.cardset.set(self.app.cardset.index)
+
+            csm = self.app.cardset_manager
+            # cnt = csm.len()
+            i = 0
+            while 1:
+                cs = csm.get(i)
+                if cs is None:
+                    break
+                rg1 = self.addRadioNode(tv, rg,
+                                        cs.name,
+                                        self.menubar.tkopt.cardset, i,
+                                        self.menubar.mOptCardset)
+                if rg1:
+                    cbs = cs.backnames
+                    self.menubar.tkopt.cardbacks[i] = IntVar()
+                    self.menubar.tkopt.cardbacks[i].set(cs.backindex)
+
+                    bcnt = len(cbs)
+                    bi = 0
+                    while 1:
+                        if bi == bcnt:
+                            break
+                        cb = cbs[bi]
+                        self.addRadioNode(
+                            tv, rg1,
+                            cb,
+                            self.menubar.tkopt.cardbacks[i], bi,
+                            self.make_vars_command(
+                                self.menubar.mOptSetCardback, i))
+                        bi = bi + 1
+
+                i = i + 1
+
+        # -------------------------------------------
+        # Table background settings
+
+        rg = tv.add_node(
+            LTreeNode(text='Table'))
+        if rg:
+            rg1 = tv.add_node(
+                LTreeNode(text='Solid colors'), rg)
+            if rg1:
+                key = 'table'
+                self.addRadioNode(
+                    tv, rg1,
+                    'Blue',
+                    self.menubar.tkopt.color_vars[key], '#0082df',
+                    self.menubar.mOptTableColor)
+                self.addRadioNode(
+                    tv, rg1,
+                    'Green',
+                    self.menubar.tkopt.color_vars[key], '#008200',
+                    self.menubar.mOptTableColor)
+                self.addRadioNode(
+                    tv, rg1,
+                    'Navy',
+                    self.menubar.tkopt.color_vars[key], '#000086',
+                    self.menubar.mOptTableColor)
+                self.addRadioNode(
+                    tv, rg1,
+                    'Olive',
+                    self.menubar.tkopt.color_vars[key], '#868200',
+                    self.menubar.mOptTableColor)
+                self.addRadioNode(
+                    tv, rg1,
+                    'Orange',
+                    self.menubar.tkopt.color_vars[key], '#f79600',
+                    self.menubar.mOptTableColor)
+                self.addRadioNode(
+                    tv, rg1,
+                    'Teal',
+                    self.menubar.tkopt.color_vars[key], '#008286',
+                    self.menubar.mOptTableColor)
+
+            rg1 = tv.add_node(
+                LTreeNode(text='Tiles and Images'), rg)
+
+            if rg1:
+                tm = self.app.tabletile_manager
+                # cnt = tm.len()
+                i = 1
+                while 1:
+                    ti = tm.get(i)
+                    if ti is None:
+                        break
+                    self.addRadioNode(tv, rg1,
+                                      ti.name,
+                                      self.menubar.tkopt.tabletile, i,
+                                      self.menubar.mOptTileSet)
+                    i = i + 1
+
+        # -------------------------------------------
+        # Card view options
+
+        rg = tv.add_node(
+            LTreeNode(text='Card view'))
+        if rg:
+            self.addCheckNode(tv, rg,
+                              'Card shadow',
+                              self.menubar.tkopt.shadow,
+                              self.menubar.mOptShadow)
+
+            self.addCheckNode(tv, rg,
+                              'Shade legal moves',
+                              self.menubar.tkopt.shade,
+                              self.menubar.mOptShade)
+
+            self.addCheckNode(tv, rg,
+                              'Negative cards bottom',
+                              self.menubar.tkopt.negative_bottom,
+                              self.menubar.mOptNegativeBottom)
+
+            self.addCheckNode(tv, rg,
+                              'Shrink face-down cards',
+                              self.menubar.tkopt.shrink_face_down,
+                              self.menubar.mOptShrinkFaceDown)
+
+            self.addCheckNode(tv, rg,
+                              'Shade filled stacks',
+                              self.menubar.tkopt.shade_filled_stacks,
+                              self.menubar.mOptShadeFilledStacks)
+
+        # -------------------------------------------
+        # Animation settins
+
+        rg = tv.add_node(
+            LTreeNode(text='Animations'))
+        if rg:
+            self.addRadioNode(tv, rg,
+                              'None',
+                              self.menubar.tkopt.animations, 0,
+                              self.menubar.mOptAnimations)
+
+            self.addRadioNode(tv, rg,
+                              'Very fast',
+                              self.menubar.tkopt.animations, 1,
+                              self.menubar.mOptAnimations)
+
+            self.addRadioNode(tv, rg,
+                              'Fast',
+                              self.menubar.tkopt.animations, 2,
+                              self.menubar.mOptAnimations)
+
+            self.addRadioNode(tv, rg,
+                              'Medium',
+                              self.menubar.tkopt.animations, 3,
+                              self.menubar.mOptAnimations)
+
+            self.addRadioNode(tv, rg,
+                              'Slow',
+                              self.menubar.tkopt.animations, 4,
+                              self.menubar.mOptAnimations)
+
+            self.addRadioNode(tv, rg,
+                              'Very slow',
+                              self.menubar.tkopt.animations, 5,
+                              self.menubar.mOptAnimations)
+
+            # submenu.add_separator()
+
+            self.addCheckNode(tv, rg,
+                              'Redeal animation',
+                              self.menubar.tkopt.redeal_animation,
+                              self.menubar.mRedealAnimation)
+
+            self.addCheckNode(tv, rg,
+                              'Winning animation',
+                              self.menubar.tkopt.win_animation,
+                              self.menubar.mWinAnimation)
+
+        # -------------------------------------------
+        # Touch mode settings
+
+        rg = tv.add_node(
+            LTreeNode(text='Touch mode'))
+        if rg:
+            self.addRadioNode(tv, rg,
+                              'Drag-and-Drop',
+                              self.menubar.tkopt.mouse_type, u'drag-n-drop',
+                              self.menubar.mOptMouseType)
+
+            self.addRadioNode(tv, rg,
+                              'Point-and-Click',
+                              self.menubar.tkopt.mouse_type, u'point-n-click',
+                              self.menubar.mOptMouseType)
+
+            # sinnlos mit touch-device:
+            # self.addRadioNode(tv, rg,
+            #   'Sticky mouse',
+            #   self.menubar.tkopt.mouse_type, u'sticky-mouse',
+            #   self.menubar.mOptMouseType)
+
+            # submenu.add_separator()
+
+            # sinnlos mit touch-device:
+            # self.addCheckNode(tv, rg,
+            #   'Use mouse for undo/redo',
+            #   self.menubar.tkopt.mouse_undo,
+            #   self.menubar.mOptMouseUndo)
+
+        # submenu.add_separator()
+
+        # -------------------------------------------
+        # TBD ?
+
+        '''
+        menu.add_command(label=n_("&Fonts..."), command=self.mOptFonts)
+        menu.add_command(label=n_("&Colors..."), command=self.mOptColors)
+        menu.add_command(label=n_("Time&outs..."), command=self.mOptTimeouts)
+        menu.add_separator()
+        '''
+
+        # -------------------------------------------
+        # Toolbar options
+
+        rg = tv.add_node(
+            LTreeNode(text='Toolbar'))
+        if rg:
+            self.addRadioNode(tv, rg,
+                              'Hide',
+                              self.menubar.tkopt.toolbar, 0,
+                              self.menubar.mOptToolbar)
+
+            # not supported: Top, Bottom
+            # self.addRadioNode(tv, rg,
+            #   'Top',
+            #   self.menubar.tkopt.toolbar, 1,
+            #   self.menubar.mOptToolbar)
+            # self.addRadioNode(tv, rg,
+            #   'Bottom',
+            #   self.menubar.tkopt.toolbar, 2,
+            #   self.menubar.mOptToolbar)
+
+            self.addRadioNode(tv, rg,
+                              'Left',
+                              self.menubar.tkopt.toolbar, 3,
+                              self.menubar.mOptToolbar)
+            self.addRadioNode(tv, rg,
+                              'Right',
+                              self.menubar.tkopt.toolbar, 4,
+                              self.menubar.mOptToolbar)
+
+        # -------------------------------------------
+        # Statusbar - not implemented
+
+        '''
+        submenu = MfxMenu(menu, label=n_("Stat&usbar"))
+        submenu.add_checkbutton(
+             label=n_("Show &statusbar"),
+             variable=self.tkopt.statusbar,
+             command=self.mOptStatusbar)
+        submenu.add_checkbutton(
+            label=n_("Show &number of cards"),
+            variable=self.tkopt.num_cards,
+            command=self.mOptNumCards)
+        submenu.add_checkbutton(
+            label=n_("Show &help bar"),
+            variable=self.tkopt.helpbar,
+            command=self.mOptHelpbar)
+        '''
+
+        # -------------------------------------------
+        # general options
+
+        # self.addCheckNode(tv, None,
+        #   'Save games geometry',
+        #   self.menubar.tkopt.save_games_geometry,
+        #   self.menubar.mOptSaveGamesGeometry)
+
+        # self.addCheckNode(tv, None,
+        #   'Demo logo',
+        #   self.menubar.tkopt.demo_logo,
+        #   self.menubar.mOptDemoLogo)
+
+        self.addCheckNode(tv, None,
+                          'Startup splash screen',
+                          self.menubar.tkopt.splashscreen,
+                          self.menubar.mOptSplashscreen)
+
+        self.addCheckNode(tv, None,
+                          'Winning splash',
+                          self.menubar.tkopt.display_win_message,
+                          self.menubar.mWinDialog)
+
+# ************************************************************************
+
+
+class HelpMenuDialog(LMenuDialog):
+
+    def __init__(self, menubar, parent, title, app, **kw):
+        kw['size_hint'] = (0.3, 1)
+        kw['persist'] = True
+        super(HelpMenuDialog, self).__init__(
+            menubar, parent, title, app, **kw)
+
+    def buildTree(self, tv, node):
+        tv.add_node(LTreeNode(
+            text='Contents', command=self.menubar.mHelp))
+
+        tv.add_node(LTreeNode(
+            text='How to play', command=self.menubar.mHelpHowToPlay))
+        tv.add_node(LTreeNode(
+            text='Rules for this game', command=self.menubar.mHelpRules))
+        tv.add_node(LTreeNode(
+            text='License terms', command=self.menubar.mHelpLicense))
+
+        tv.add_node(LTreeNode(
+            text='About' + TITLE + '...', command=self.menubar.mHelpAbout))
+
+        # tv.add_node(LTreeNode(
+        #   text='AboutKivy ...',
+        #   command=self.makeHtmlCommand(self.menubar, "kivy.html")))
+
+    def makeHtmlCommand(self, bar, htmlfile):
+        def htmlCommand():
+            bar.mHelpHtml(htmlfile)
+        return htmlCommand
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class EmulTkMenu(object):
+
+    def __init__(self, master, **kw):
+
+        # tearoff = 0
+        # self.n = kw["tearoff"] = int(kw.get("tearoff", tearoff))
+
+        self.name = kw["name"]
+        self.n = 0
+        self._w = None
+        if (self.name):
+            if master._w == '.':
+                self._w = '.' + self.name
+            else:
+                self._w = master._w + '.' + self.name
+        else:
+            self.name = "<>"
+
+        # print('self._w = %s' % self._w)
+
+    def labeltoname(self, label):
+        # print label, type(label)
+        name = re.sub(r"[^0-9a-zA-Z]", "", label).lower()
+        label = _(label)
+        underline = label.find('&')
+        if underline >= 0:
+            label = label.replace('&', '')
+        return name, label, underline
+
+    def add_cascade(self, cnf={}, **kw):
+        # print('add_cascade: %s, %s' % (cnf, kw))
+        self.add('cascade', cnf or kw)
+        pass
+
+    def add(self, itemType, cnf={}):
+        label = cnf.get("label")
+        # print('add: label=%s' % label)
+        if label:
+            name = cnf.get('name')
+            if name:
+                # LB ?????
+                #   del cnf['name'] # TclError: unknown option "-name"
+                # else:
+                name, label, underline = self.labeltoname(label)
+                cnf["underline"] = cnf.get("underline", underline)
+                cnf["label"] = label
+                if name and self.addPath:
+                    path = str(self._w) + "." + name
+                    self.addPath(path, self, self.n, cnf.get("menu"))
+
+        # Tkinter.Menu.add(self, itemType, cnf)
+        # self.n = self.n + 1
+
+    def cget(self, key):
+        return key
+
+# ************************************************************************
+
+
+class MfxMenubar(EmulTkMenu):
+    addPath = None
+
+    def __init__(self, master, **kw):
+        super(MfxMenubar, self).__init__(master, **kw)
+        topmenu = self.name == 'menubar'
+
+        self.menu = LMenu(not topmenu, text=self.name)
+        if topmenu:
+            master.setMenu(self.menu)
+
+# ************************************************************************
+# * - create menubar
+# * - update menubar
+# * - menu actions
+# ************************************************************************
+
+
+class PysolMenubarTk:
+    def __init__(self, app, top, progress=None):
+        self._createTkOpt()
+        self._setOptions()
+        # init columnbreak
+#        self.__cb_max = int(self.top.winfo_screenheight()/23)
+        self.__cb_max = 8
+#         sh = self.top.winfo_screenheight()
+#         self.__cb_max = 22
+#         if sh >= 600: self.__cb_max = 27
+#         if sh >= 768: self.__cb_max = 32
+#         if sh >= 1024: self.__cb_max = 40
+        self.progress = progress
+        # create menus
+        self.__menubar = None
+        self.__menupath = {}
+        self.__keybindings = {}
+        self._createMenubar()
+        self.top = top
+
+        if self.progress:
+            self.progress.update(step=1)
+
+        # set the menubar
+        # self.updateBackgroundImagesMenu()
+        # self.top.config(menu=self.__menubar)
+
+    def _createTkOpt(self):
+        # structure to convert menu-options to Toolkit variables
+        self.tkopt = Struct(
+            gameid=IntVar(),
+            gameid_popular=IntVar(),
+            comment=BooleanVar(),
+            autofaceup=BooleanVar(),
+            autodrop=BooleanVar(),
+            autodeal=BooleanVar(),
+            quickplay=BooleanVar(),
+            undo=BooleanVar(),
+            bookmarks=BooleanVar(),
+            hint=BooleanVar(),
+            shuffle=BooleanVar(),
+            highlight_piles=BooleanVar(),
+            highlight_cards=BooleanVar(),
+            highlight_samerank=BooleanVar(),
+            highlight_not_matching=BooleanVar(),
+            mahjongg_show_removed=BooleanVar(),
+            shisen_show_hint=BooleanVar(),
+            sound=BooleanVar(),
+            sound_sample_volume=IntVar(),
+            sound_music_volume=IntVar(),
+            cardback=IntVar(),
+            tabletile=IntVar(),
+            animations=IntVar(),
+            redeal_animation=BooleanVar(),
+            win_animation=BooleanVar(),
+            shadow=BooleanVar(),
+            shade=BooleanVar(),
+            shade_filled_stacks=BooleanVar(),
+            shrink_face_down=BooleanVar(),
+            toolbar=IntVar(),
+            toolbar_style=StringVar(),
+            toolbar_relief=StringVar(),
+            toolbar_compound=StringVar(),
+            toolbar_size=IntVar(),
+            statusbar=BooleanVar(),
+            num_cards=BooleanVar(),
+            helpbar=BooleanVar(),
+            save_games_geometry=BooleanVar(),
+            splashscreen=BooleanVar(),
+            demo_logo=BooleanVar(),
+            mouse_type=StringVar(),
+            mouse_undo=BooleanVar(),
+            negative_bottom=BooleanVar(),
+            display_win_message=BooleanVar(),
+            pause=BooleanVar(),
+            cardset=IntVar(),
+            cardbacks={},
+            toolbar_vars={},
+            sound_sample_vars={},
+            color_vars={},
+        )
+        for w in TOOLBAR_BUTTONS:
+            self.tkopt.toolbar_vars[w] = BooleanVar()
+        for k in self.app.opt.sound_samples:
+            self.tkopt.sound_sample_vars[k] = BooleanVar()
+        for k in self.app.opt.colors:
+            self.tkopt.color_vars[k] = StringVar()
+
+    def _setOptions(self):
+        tkopt, opt = self.tkopt, self.app.opt
+        # set state of the menu items
+        tkopt.autofaceup.set(opt.autofaceup)
+        tkopt.autodrop.set(opt.autodrop)
+        tkopt.autodeal.set(opt.autodeal)
+        tkopt.quickplay.set(opt.quickplay)
+        tkopt.undo.set(opt.undo)
+        tkopt.hint.set(opt.hint)
+        tkopt.shuffle.set(opt.shuffle)
+        tkopt.bookmarks.set(opt.bookmarks)
+        tkopt.highlight_piles.set(opt.highlight_piles)
+        tkopt.highlight_cards.set(opt.highlight_cards)
+        tkopt.highlight_samerank.set(opt.highlight_samerank)
+        tkopt.highlight_not_matching.set(opt.highlight_not_matching)
+        tkopt.shrink_face_down.set(opt.shrink_face_down)
+        tkopt.shade_filled_stacks.set(opt.shade_filled_stacks)
+        tkopt.mahjongg_show_removed.set(opt.mahjongg_show_removed)
+        tkopt.shisen_show_hint.set(opt.shisen_show_hint)
+        tkopt.sound.set(opt.sound)
+        tkopt.sound_sample_volume.set(opt.sound_sample_volume)
+        tkopt.sound_music_volume.set(opt.sound_music_volume)
+        tkopt.cardback.set(self.app.cardset.backindex)
+        tkopt.tabletile.set(self.app.tabletile_index)
+        tkopt.animations.set(opt.animations)
+        tkopt.redeal_animation.set(opt.redeal_animation)
+        tkopt.win_animation.set(opt.win_animation)
+        tkopt.shadow.set(opt.shadow)
+        tkopt.shade.set(opt.shade)
+        tkopt.toolbar.set(opt.toolbar)
+        tkopt.toolbar_style.set(opt.toolbar_style)
+        tkopt.toolbar_relief.set(opt.toolbar_relief)
+        tkopt.toolbar_compound.set(opt.toolbar_compound)
+        tkopt.toolbar_size.set(opt.toolbar_size)
+        tkopt.toolbar_relief.set(opt.toolbar_relief)
+        tkopt.statusbar.set(opt.statusbar)
+        tkopt.num_cards.set(opt.num_cards)
+        tkopt.helpbar.set(opt.helpbar)
+        tkopt.save_games_geometry.set(opt.save_games_geometry)
+        tkopt.demo_logo.set(opt.demo_logo)
+        tkopt.splashscreen.set(opt.splashscreen)
+        tkopt.mouse_type.set(opt.mouse_type)
+        tkopt.mouse_undo.set(opt.mouse_undo)
+        tkopt.negative_bottom.set(opt.negative_bottom)
+        tkopt.display_win_message.set(opt.display_win_message)
+        tkopt.cardset.set(self.app.cardset_manager.getSelected())
+
+        for w in TOOLBAR_BUTTONS:
+            tkopt.toolbar_vars[w].set(opt.toolbar_vars.get(w, False))
+        for k in self.app.opt.sound_samples:
+            self.tkopt.sound_sample_vars[k].set(
+                opt.sound_samples.get(k, False))
+        for k in self.app.opt.colors:
+            self.tkopt.color_vars[k].set(opt.colors.get(k, '#000000'))
+
+    def connectGame(self, game):
+        self.game = game
+        if game is None:
+            return
+        assert self.app is game.app
+        tkopt = self.tkopt
+        # opt = self.app.opt
+        tkopt.gameid.set(game.id)
+        tkopt.gameid_popular.set(game.id)
+        tkopt.comment.set(bool(game.gsaveinfo.comment))
+        tkopt.pause.set(self.game.pause)
+        if game.canFindCard():
+            connect_game_find_card_dialog(game)
+        else:
+            destroy_find_card_dialog()
+        connect_game_solver_dialog(game)
+
+    # create a GTK-like path
+    def _addPath(self, path, menu, index, submenu):
+        # print ('MfxMenubar: _addPath %s, %s' % (path, menu))
+        # y = self.yy
+        if path not in self.__menupath:
+            # print path, menu, index, submenu
+            self.__menupath[path] = (menu, index, submenu)
+
+    def _getEnabledState(self, enabled):
+        print('_getEnabledState: %s' % enabled)
+        if enabled:
+            return "normal"
+        return "disabled"
+
+    def updateProgress(self):
+        if self.progress:
+            self.progress.update(step=1)
+
+    #
+    # create the menubar
+    #
+
+    def _createMenubar(self):
+        MfxMenubar.addPath = self._addPath
+        kw = {"name": "menubar"}
+        self.__menubar = MfxMenubar(self.top, **kw)
+
+        # init keybindings
+        bind(self.top, "<KeyPress>", self._keyPressHandler)
+
+        # LMainMenuDialog()
+        LMenuItem(self.__menubar.menu,
+                  text="Menu", command=self.mMainMenuDialog)
+
+        MfxMenubar.addPath = None
+
+    #
+    # key binding utility
+    #
+
+    def _bindKey(self, modifier, key, func):
+        #         if 0 and not modifier and len(key) == 1:
+        #             self.__keybindings[key.lower()] = func
+        #             self.__keybindings[key.upper()] = func
+        #             return
+        if not modifier and len(key) == 1:
+            # ignore Ctrl/Shift/Alt
+            # but don't ignore NumLock (state == 16)
+            def lfunc(e, func=func):
+                return e.state in (0, 16) and func(e)
+            func = lfunc
+            # func = lambda e, func=func: e.state in (0, 16) and func(e)
+        sequence = "<" + modifier + "KeyPress-" + key + ">"
+        bind(self.top, sequence, func)
+        if len(key) == 1 and key != key.upper():
+            key = key.upper()
+            sequence = "<" + modifier + "KeyPress-" + key + ">"
+            bind(self.top, sequence, func)
+
+    def _keyPressHandler(self, event):
+        r = EVENT_PROPAGATE
+        if event and self.game:
+            # print event.__dict__
+            if self.game.demo:
+                # stop the demo by setting self.game.demo.keypress
+                if event.char:    # ignore Ctrl/Shift/etc.
+                    self.game.demo.keypress = event.char
+                    r = EVENT_HANDLED
+#             func = self.__keybindings.get(event.char)
+#             if func and (event.state & ~2) == 0:
+#                 func(event)
+#                 r = EVENT_HANDLED
+        return r
+
+    #
+    # Select Game menu creation
+    #
+    '''
+    def _addSelectGameMenu(self, menu):
+        games = map(self.app.gdb.get, self.app.gdb.getGamesIdSortedByName())
+        m = "Ctrl-"
+        if sys.platform == "darwin":
+            m = "Cmd-"
+        menu.add_command(label=n_("All &games..."), accelerator=m + "W",
+                         command=self.mSelectGameDialog)
+
+    def _addSelectGameSubMenu(self, games, menu, select_data,
+                              command, variable):
+        # print select_data
+        need_sep = 0
+        for label, select_func in select_data:
+            if label is None:
+                need_sep = 1
+                continue
+            g = filter(select_func, games)
+            if not g:
+                continue
+            if need_sep:
+                menu.add_separator()
+                need_sep = 0
+            submenu = MfxMenu(menu, label=label)
+            self._addSelectGameSubSubMenu(g, submenu, command, variable)
+
+    def _getNumGames(self, games, select_data):
+        ngames = 0
+        for label, select_func in select_data:
+            ngames += len(filter(select_func, games))
+        return ngames
+
+    def _addSelectMahjonggGameSubMenu(self, games, menu, command, variable):
+        def select_func(gi): return gi.si.game_type == GI.GT_MAHJONGG
+        mahjongg_games = filter(select_func, games)
+        if len(mahjongg_games) == 0:
+            return
+        #
+        menu = MfxMenu(menu, label=n_("&Mahjongg games"))
+
+        def add_menu(games, c0, c1, menu=menu,
+                     variable=variable, command=command):
+            if not games:
+                return
+            label = c0 + ' - ' + c1
+            if c0 == c1:
+                label = c0
+            submenu = MfxMenu(menu, label=label, name=None)
+            self._addSelectGameSubSubMenu(games, submenu, command,
+                                          variable, short_name=True)
+
+        games = {}
+        for gi in mahjongg_games:
+            c = gi.short_name.strip()[0]
+            if c in games:
+                games[c].append(gi)
+            else:
+                games[c] = [gi]
+        games = games.items()
+        games.sort()
+        g0 = []
+        c0 = c1 = games[0][0]
+        for c, g1 in games:
+            if len(g0) + len(g1) >= self.__cb_max:
+                add_menu(g0, c0, c1)
+                g0 = g1
+                c0 = c1 = c
+            else:
+                g0 += g1
+                c1 = c
+        add_menu(g0, c0, c1)
+
+    def _addSelectPopularGameSubMenu(self, games, menu, command, variable):
+        def select_func(gi): return gi.si.game_flags & GI.GT_POPULAR
+        if len(filter(select_func, games)) == 0:
+            return
+        data = (n_("&Popular games"), select_func)
+        self._addSelectGameSubMenu(games, menu, (data, ),
+                                   self.mSelectGamePopular,
+                                   self.tkopt.gameid_popular)
+
+    def _addSelectFrenchGameSubMenu(self, games, menu, command, variable):
+        if self._getNumGames(games, GI.SELECT_GAME_BY_TYPE) == 0:
+            return
+        submenu = MfxMenu(menu, label=n_("&French games"))
+        self._addSelectGameSubMenu(games, submenu, GI.SELECT_GAME_BY_TYPE,
+                                   self.mSelectGame, self.tkopt.gameid)
+
+    def _addSelectOrientalGameSubMenu(self, games, menu, command, variable):
+        if self._getNumGames(games, GI.SELECT_ORIENTAL_GAME_BY_TYPE) == 0:
+            return
+        submenu = MfxMenu(menu, label=n_("&Oriental games"))
+        self._addSelectGameSubMenu(games, submenu,
+                                   GI.SELECT_ORIENTAL_GAME_BY_TYPE,
+                                   self.mSelectGame, self.tkopt.gameid)
+
+    def _addSelectSpecialGameSubMenu(self, games, menu, command, variable):
+        if self._getNumGames(games, GI.SELECT_ORIENTAL_GAME_BY_TYPE) == 0:
+            return
+        submenu = MfxMenu(menu, label=n_("&Special games"))
+        self._addSelectGameSubMenu(games, submenu,
+                                   GI.SELECT_SPECIAL_GAME_BY_TYPE,
+                                   self.mSelectGame, self.tkopt.gameid)
+
+    def _addSelectCustomGameSubMenu(self, games, menu, command, variable):
+        submenu = MfxMenu(menu, label=n_("&Custom games"))
+
+        def select_func(gi): return gi.si.game_type == GI.GT_CUSTOM
+        games = filter(select_func, games)
+        self.updateGamesMenu(submenu, games)
+    '''
+
+    def _addSelectAllGameSubMenu(self, games, menu, command, variable):
+        # LB
+        # herausgenommen: zu aufwendig !
+        return
+        '''
+        menu = MfxMenu(menu, label=n_("&All games by name"))
+        n, d = 0, self.__cb_max
+        i = 0
+        while True:
+            if self.progress:
+                self.progress.update(step=1)
+            columnbreak = i > 0 and (i % d) == 0
+            i += 1
+            if not games[n:n + d]:
+                break
+            m = min(n + d - 1, len(games) - 1)
+            label = games[n].name[:3] + ' - ' + games[m].name[:3]
+
+            submenu = MfxMenu(menu, label=label, name=None)
+            self._addSelectGameSubSubMenu(games[n:n + d], submenu,
+                                          command, variable)
+            n += d
+            # if columnbreak:
+            #    menu.entryconfigure(i, columnbreak=columnbreak)
+        '''
+
+    # Eine 'closure' in Python? - voila!
+    def make_gamesetter(self, n, variable, command):
+        def gamesetter(x):
+            variable.set(n)
+            command()
+        return gamesetter
+
+    def _addSelectGameSubSubMenu(self, games, menu, command, variable,
+                                 short_name=False):
+
+        # cb = self.__cb_max
+        for i in range(len(games)):
+            gi = games[i]
+            # columnbreak = i > 0 and (i % cb) == 0
+            if short_name:
+                label = gi.short_name
+            else:
+                label = gi.name
+
+            # optimized by inlining
+
+            # geht nicht mehr 'optimiert' mit kivy
+            # die Funktionalität des tk.calls kann mit hilfe
+            # einer 'closure' rekonstruiert werden (s.o).
+            # LB
+
+            gsetter = self.make_gamesetter(gi.id, variable, command)
+            menu.add_command(label=label, command=gsetter)
+
+            # menu.tk.call((menu._w, 'add', 'radiobutton') +
+            #             menu._options({'command': command,
+            #                            'variable': variable,
+            #                            'columnbreak': columnbreak,
+            #                            'value': gi.id,
+            #                            'label': label}))
+
+    def updateGamesMenu(self, menu, games):
+
+        def cmp2(a, b):
+            """python 3 replacement for python 2 cmp function"""
+            return (a > b) - (a < b)
+
+        menu.delete(0, 'last')
+
+        if len(games) == 0:
+            menu.add_radiobutton(label='<none>', name=None, state='disabled')
+        elif len(games) > self.__cb_max * 4:
+            games.sort(lambda a, b: cmp2(a.name, b.name))
+            self._addSelectAllGameSubMenu(games, menu,
+                                          command=self.mSelectGame,
+                                          variable=self.tkopt.gameid)
+        else:
+            self._addSelectGameSubSubMenu(games, menu,
+                                          command=self.mSelectGame,
+                                          variable=self.tkopt.gameid)
+
+    def mMainMenuDialog(self, *event):
+        MainMenuDialog(self, self.top, title=_("Main Menu"), app=self.app)
+        return EVENT_HANDLED
+
+    def mFileMenuDialog(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.game.setCursor(cursor=CURSOR_WATCH)
+        after_idle(self.top, self.__restoreCursor)
+        FileMenuDialog(self, self.top, title=_("File Menu"), app=self.app)
+        return EVENT_HANDLED
+
+    def mEditMenuDialog(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.game.setCursor(cursor=CURSOR_WATCH)
+        after_idle(self.top, self.__restoreCursor)
+        EditMenuDialog(self, self.top, title=_("Tools"), app=self.app)
+        return EVENT_HANDLED
+
+    def mGameMenuDialog(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.game.setCursor(cursor=CURSOR_WATCH)
+        after_idle(self.top, self.__restoreCursor)
+        GameMenuDialog(self, self.top, title=_("Statistics"), app=self.app)
+        return EVENT_HANDLED
+
+    def mAssistMenuDialog(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.game.setCursor(cursor=CURSOR_WATCH)
+        after_idle(self.top, self.__restoreCursor)
+        AssistMenuDialog(self, self.top, title=_("Assists"), app=self.app)
+        return EVENT_HANDLED
+
+    def mOptionsMenuDialog(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.game.setCursor(cursor=CURSOR_WATCH)
+        after_idle(self.top, self.__restoreCursor)
+        OptionsMenuDialog(self, self.top, title=_("Options"), app=self.app)
+        return EVENT_HANDLED
+
+    def mHelpMenuDialog(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.game.setCursor(cursor=CURSOR_WATCH)
+        after_idle(self.top, self.__restoreCursor)
+        HelpMenuDialog(self, self.top, title=_("Help"), app=self.app)
+        return EVENT_HANDLED
+    #
+    # Select Game menu actions
+    #
+
+    def mSelectGame(self, *args):
+        print('mSelectGame %s' % self)
+        self._mSelectGame(self.tkopt.gameid.get())
+
+    def mSelectGamePopular(self, *args):
+        self._mSelectGame(self.tkopt.gameid_popular.get())
+
+    def _mSelectGameDialog(self, d):
+        if d.gameid != self.game.id:
+            self.tkopt.gameid.set(d.gameid)
+            self.tkopt.gameid_popular.set(d.gameid)
+            self._cancelDrag()
+            self.game.endGame()
+            self.game.quitGame(d.gameid, random=d.random)
+        return EVENT_HANDLED
+
+    def __restoreCursor(self, *event):
+        self.game.setCursor(cursor=self.app.top_cursor)
+
+    def mSelectGameDialog(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.game.setCursor(cursor=CURSOR_WATCH)
+        after_idle(self.top, self.__restoreCursor)
+        d = SelectGameDialog(self.top, title=_("Select game"),
+                             app=self.app, gameid=self.game.id)
+        return self._mSelectGameDialog(d)
+
+    #
+    # menubar overrides
+    #
+
+    def updateFavoriteGamesMenu(self):
+        return
+
+        # TBD ?
+        '''
+        gameids = self.app.opt.favorite_gameid
+
+        print('favorite_gameids = %s' % gameids)
+
+        submenu = self.__menupath[".menubar.file.favoritegames"][2]
+        games = []
+        for id in gameids:
+            gi = self.app.getGameInfo(id)
+            if gi:
+                games.append(gi)
+        self.updateGamesMenu(submenu, games)
+
+        # das folgende ist nur das enable/disable des add/remove buttons.
+        # geht mit kivy nicht so.
+
+#        state = self._getEnabledState
+#        in_favor = self.app.game.id in gameids
+
+# menu, index, submenu = self.__menupath[".menubar.file.addtofavorites"]
+# menu.entryconfig(index, state=state(not in_favor))
+
+# menu, index, submenu = self.__menupath[".menubar.file.removefromfavorites"]
+# menu.entryconfig(index, state=state(in_favor))
+        '''
+
+    def updateRecentGamesMenu(self, gameids):
+        return
+
+        # TBD ?
+        '''
+        submenu = self.__menupath[".menubar.file.recentgames"][2]
+        games = []
+        for id in gameids:
+            gi = self.app.getGameInfo(id)
+            if gi:
+                games.append(gi)
+        self.updateGamesMenu(submenu, games)
+        '''
+
+    def updateBookmarkMenuState(self):
+        # LB:
+        print('updateBookmarkMenuState - fake')
+        return
+
+        state = self._getEnabledState
+        mp1 = self.__menupath.get(".menubar.edit.setbookmark")
+        mp2 = self.__menupath.get(".menubar.edit.gotobookmark")
+        mp3 = self.__menupath.get(".menubar.edit.clearbookmarks")
+        if mp1 is None or mp2 is None or mp3 is None:
+            return
+        x = self.app.opt.bookmarks and self.game.canSetBookmark()
+        #
+        menu, index, submenu = mp1
+        for i in range(9):
+            submenu.entryconfig(i, state=state(x))
+        menu.entryconfig(index, state=state(x))
+        #
+        menu, index, submenu = mp2
+        ms = 0
+        for i in range(9):
+            s = self.game.gsaveinfo.bookmarks.get(i) is not None
+            submenu.entryconfig(i, state=state(s and x))
+            ms = ms or s
+        menu.entryconfig(index, state=state(ms and x))
+        #
+        menu, index, submenu = mp3
+        menu.entryconfig(index, state=state(ms and x))
+
+    def updateBackgroundImagesMenu(self):
+        # LB:
+        print('updateBackgroundImagesMenu - fake')
+        return
+
+        mp = self.__menupath.get(".menubar.options.cardbackground")
+        # delete all entries
+        submenu = mp[2]
+        submenu.delete(0, "last")
+        # insert new cardbacks
+        mbacks = self.app.images.getCardbacks()
+        cb = int(math.ceil(math.sqrt(len(mbacks))))
+        for i in range(len(mbacks)):
+            columnbreak = i > 0 and (i % cb) == 0
+            submenu.add_radiobutton(
+                    label=mbacks[i].name,
+                    image=mbacks[i].menu_image,
+                    variable=self.tkopt.cardback,
+                    value=i,
+                    command=self.mOptCardback,
+                    columnbreak=columnbreak,
+                    indicatoron=0,
+                    hidemargin=0)
+    #
+    # menu updates
+    #
+
+    def setMenuState(self, state, path):
+        # LB: not used
+        return
+
+    def setToolbarState(self, state, path):
+        # LB: not used
+        return
+
+    def _setCommentMenu(self, v):
+        self.tkopt.comment.set(v)
+
+    def _setPauseMenu(self, v):
+        self.tkopt.pause.set(v)
+
+    #
+    # menu actions
+    #
+
+    DEFAULTEXTENSION = ".pso"
+    FILETYPES = ((TITLE + " files", "*" + DEFAULTEXTENSION),
+                 ("All files", "*"))
+
+    def mAddFavor(self, *event):
+        gameid = self.app.game.id
+        if gameid not in self.app.opt.favorite_gameid:
+            self.app.opt.favorite_gameid.append(gameid)
+            self.updateFavoriteGamesMenu()
+
+    def mDelFavor(self, *event):
+        gameid = self.app.game.id
+        if gameid in self.app.opt.favorite_gameid:
+            self.app.opt.favorite_gameid.remove(gameid)
+            self.updateFavoriteGamesMenu()
+
+    def mOpen(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        # filename = self.game.filename
+        filename = "lastgame.pso"
+        if filename:
+            idir, ifile = os.path.split(os.path.normpath(filename))
+        else:
+            idir, ifile = "", ""
+        if not idir:
+            idir = self.app.dn.savegames
+#        d = tkFileDialog.Open()
+#        filename = d.show(filetypes=self.FILETYPES,
+#                          defaultextension=self.DEFAULTEXTENSION,
+#                          initialdir=idir, initialfile=ifile)
+        filename = idir + "/" + ifile
+
+        print('filename = %s' % filename)
+        if filename:
+            filename = os.path.normpath(filename)
+            # filename = os.path.normcase(filename)
+            if os.path.isfile(filename):
+                self.game.loadGame(filename)
+
+    def mSaveAs(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        if not self.menustate.save_as:
+            return
+        # filename = self.game.filename
+        filename = "lastgame.pso"
+        if not filename:
+            filename = self.app.getGameSaveName(self.game.id)
+            if os.name == "posix":
+                filename = filename + "-" + self.game.getGameNumber(format=0)
+            elif os.path.supports_unicode_filenames:  # new in python 2.3
+                filename = filename + "-" + self.game.getGameNumber(format=0)
+            else:
+                filename = filename + "-01"
+            filename = filename + self.DEFAULTEXTENSION
+        idir, ifile = os.path.split(os.path.normpath(filename))
+        if not idir:
+            idir = self.app.dn.savegames
+        # print self.game.filename, ifile
+        # d = tkFileDialog.SaveAs()
+        # filename = d.show(filetypes=self.FILETYPES,
+        #                  defaultextension=self.DEFAULTEXTENSION,
+        #                  initialdir=idir, initialfile=ifile)
+        filename = idir + "/" + ifile
+        if filename:
+            filename = os.path.normpath(filename)
+            # filename = os.path.normcase(filename)
+            self.game.saveGame(filename)
+            self.updateMenus()
+
+    def mPause(self, *args):
+        if not self.game:
+            return
+        if not self.game.pause:
+            if self._cancelDrag():
+                return
+        self.game.doPause()
+        self.tkopt.pause.set(self.game.pause)
+
+    def mOptSoundDialog(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.sound = self.tkopt.sound.get()
+
+    def mOptSoundSampleVol(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.sound_sample_volume = self.tkopt.sound_sample_volume.get()
+
+    def mOptSoundMusicVol(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.sound_music_volume = self.tkopt.sound_music_volume.get()
+
+    def mOptSoundSample(self, key, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.sound_samples[key] = \
+            self.tkopt.sound_sample_vars[key].get()
+
+    def mOptTableColor(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        nv = self.tkopt.color_vars['table'].get()
+        ov = self.app.opt.colors['table']
+        self.app.opt.colors['table'] = nv
+        if ov != nv:
+            self.app.top_bg = nv
+            self.app.tabletile_index = 0
+            self.app.setTile(0, force=True)
+            self.tkopt.tabletile.set(0)
+
+    def mOptTileSet(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        idx = self.tkopt.tabletile.get()
+        if idx > 0 and idx != self.app.tabletile_index:
+            self.app.setTile(idx)
+            self.tkopt.color_vars['table'].set('#008285')
+
+    def mOptAutoFaceUp(self, *args):
+        if self._cancelDrag():
+            return
+        self.app.opt.autofaceup = self.tkopt.autofaceup.get()
+        if self.app.opt.autofaceup:
+            self.game.autoPlay()
+
+    def mOptAutoDrop(self, *args):
+        if self._cancelDrag():
+            return
+        self.app.opt.autodrop = self.tkopt.autodrop.get()
+        if self.app.opt.autodrop:
+            self.game.autoPlay()
+
+    def mOptAutoDeal(self, *args):
+        if self._cancelDrag():
+            return
+        self.app.opt.autodeal = self.tkopt.autodeal.get()
+        if self.app.opt.autodeal:
+            self.game.autoPlay()
+
+    def mOptQuickPlay(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.quickplay = self.tkopt.quickplay.get()
+
+    def mOptEnableUndo(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.undo = self.tkopt.undo.get()
+        self.game.updateMenus()
+
+    def mOptEnableBookmarks(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.bookmarks = self.tkopt.bookmarks.get()
+        self.game.updateMenus()
+
+    def mOptEnableHint(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.hint = self.tkopt.hint.get()
+        self.game.updateMenus()
+
+    def mOptEnableShuffle(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.shuffle = self.tkopt.shuffle.get()
+        self.game.updateMenus()
+
+    def mOptEnableHighlightPiles(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.highlight_piles = self.tkopt.highlight_piles.get()
+        self.game.updateMenus()
+
+    def mOptEnableHighlightCards(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.highlight_cards = self.tkopt.highlight_cards.get()
+        self.game.updateMenus()
+
+    def mOptEnableHighlightSameRank(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.highlight_samerank = self.tkopt.highlight_samerank.get()
+        # self.game.updateMenus()
+
+    def mOptEnableHighlightNotMatching(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.highlight_not_matching = \
+            self.tkopt.highlight_not_matching.get()
+        # self.game.updateMenus()
+
+    def mOptAnimations(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.animations = self.tkopt.animations.get()
+
+    def mRedealAnimation(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.redeal_animation = self.tkopt.redeal_animation.get()
+
+    def mWinAnimation(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.win_animation = self.tkopt.win_animation.get()
+
+    def mWinDialog(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.display_win_message = self.tkopt.display_win_message.get()
+
+    def mOptShadow(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.shadow = self.tkopt.shadow.get()
+
+    def mOptShade(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.shade = self.tkopt.shade.get()
+
+    def mOptShrinkFaceDown(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.shrink_face_down = self.tkopt.shrink_face_down.get()
+        self.game.endGame(bookmark=1)
+        self.game.quitGame(bookmark=1)
+
+    def mOptShadeFilledStacks(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.shade_filled_stacks = self.tkopt.shade_filled_stacks.get()
+        self.game.endGame(bookmark=1)
+        self.game.quitGame(bookmark=1)
+
+    def mOptMahjonggShowRemoved(self, *args):
+        if self._cancelDrag():
+            return
+        self.app.opt.mahjongg_show_removed = \
+            self.tkopt.mahjongg_show_removed.get()
+        # self.game.updateMenus()
+        self.game.endGame(bookmark=1)
+        self.game.quitGame(bookmark=1)
+
+    def mOptShisenShowHint(self, *args):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.shisen_show_hint = self.tkopt.shisen_show_hint.get()
+        # self.game.updateMenus()
+
+    def mOptCardset(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        idx = self.tkopt.cardset.get()
+        cs = self.app.cardset_manager.get(idx)
+        if cs is None or idx == self.app.cardset.index:
+            return
+        if idx >= 0:
+            self.app.nextgame.cardset = cs
+            self._cancelDrag()
+            self.game.endGame(bookmark=1)
+            self.game.quitGame(bookmark=1)
+
+    def mSelectCardsetDialog(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        # strings, default = ("&OK", "&Load", "&Cancel"), 0
+        strings, default = (None, _("&Load"), _("&Cancel"), ), 1
+        # if os.name == "posix":
+        strings, default = (None, _("&Load"), _(
+            "&Cancel"), _("&Info..."), ), 1
+        t = CARDSET
+        key = self.app.nextgame.cardset.index
+        d = SelectCardsetDialogWithPreview(
+                self.top, title=_("Select ") + t,
+                app=self.app, manager=self.app.cardset_manager, key=key,
+                strings=strings, default=default)
+
+        cs = self.app.cardset_manager.get(d.key)
+        if cs is None or d.key == self.app.cardset.index:
+            return
+        if d.status == 0 and d.button in (0, 1) and d.key >= 0:
+            self.app.nextgame.cardset = cs
+            if d.button == 1:
+                self._cancelDrag()
+                self.game.endGame(bookmark=1)
+                self.game.quitGame(bookmark=1)
+
+    def mOptSetCardback(self, key, *event):
+        val = self.tkopt.cardbacks[key].get()
+        cs = self.app.cardset_manager.get(key)
+        cs.updateCardback(backindex=val)
+        # ANM: wir können den Background nur für das aktuell
+        # selektierte Cardset wirklich ändern. Nur dieses wird
+        # wird in den Optionen gespeichert.
+        if (cs == self.app.cardset):
+            self.app.updateCardset(self.game.id)
+            self.app.cardset.backindex = val
+            image = self.app.images.getBack(update=True)
+            for card in self.game.cards:
+                card.updateCardBackground(image=image)
+            self.app.canvas.update_idletasks()
+
+    def _mOptCardback(self, index):
+        if self._cancelDrag(break_pause=False):
+            return
+        cs = self.app.cardset
+        old_index = cs.backindex
+        cs.updateCardback(backindex=index)
+        if cs.backindex == old_index:
+            return
+        self.app.updateCardset(self.game.id)
+        image = self.app.images.getBack(update=True)
+        for card in self.game.cards:
+            card.updateCardBackground(image=image)
+        self.app.canvas.update_idletasks()
+        self.tkopt.cardback.set(cs.backindex)
+
+    def mOptCardback(self, *event):
+        self._mOptCardback(self.tkopt.cardback.get())
+
+    def mOptChangeCardback(self, *event):
+        self._mOptCardback(self.app.cardset.backindex + 1)
+
+    def mOptToolbar(self, *event):
+        # if self._cancelDrag(break_pause=False): return
+        self.setToolbarSide(self.tkopt.toolbar.get())
+
+    def mOptToolbarStyle(self, *event):
+        # if self._cancelDrag(break_pause=False): return
+        self.setToolbarStyle(self.tkopt.toolbar_style.get())
+
+    def mOptToolbarCompound(self, *event):
+        # if self._cancelDrag(break_pause=False): return
+        self.setToolbarCompound(self.tkopt.toolbar_compound.get())
+
+    def mOptToolbarSize(self, *event):
+        # if self._cancelDrag(break_pause=False): return
+        self.setToolbarSize(self.tkopt.toolbar_size.get())
+
+    def mOptToolbarRelief(self, *event):
+        # if self._cancelDrag(break_pause=False): return
+        self.setToolbarRelief(self.tkopt.toolbar_relief.get())
+
+    def mOptToolbarConfig(self, w):
+        self.toolbarConfig(w, self.tkopt.toolbar_vars[w].get())
+
+    def mOptStatusbar(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        if not self.app.statusbar:
+            return
+        side = self.tkopt.statusbar.get()
+        self.app.opt.statusbar = side
+        resize = not self.app.opt.save_games_geometry
+        if self.app.statusbar.show(side, resize=resize):
+            self.top.update_idletasks()
+
+    def mOptNumCards(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.num_cards = self.tkopt.num_cards.get()
+
+    def mOptHelpbar(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        if not self.app.helpbar:
+            return
+        show = self.tkopt.helpbar.get()
+        self.app.opt.helpbar = show
+        resize = not self.app.opt.save_games_geometry
+        if self.app.helpbar.show(show, resize=resize):
+            self.top.update_idletasks()
+
+    def mOptSaveGamesGeometry(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.save_games_geometry = self.tkopt.save_games_geometry.get()
+
+    def mOptDemoLogo(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.demo_logo = self.tkopt.demo_logo.get()
+
+    def mOptSplashscreen(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.splashscreen = self.tkopt.splashscreen.get()
+
+    def mOptMouseType(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.mouse_type = self.tkopt.mouse_type.get()
+
+    def mOptMouseUndo(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.mouse_undo = self.tkopt.mouse_undo.get()
+
+    def mOptNegativeBottom(self, *event):
+        if self._cancelDrag():
+            return
+        self.app.opt.negative_bottom = self.tkopt.negative_bottom.get()
+        self.app.updateCardset()
+        self.game.endGame(bookmark=1)
+        self.game.quitGame(bookmark=1)
+
+    #
+    # toolbar support
+    #
+
+    def setToolbarSide(self, side):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.toolbar = side
+        self.tkopt.toolbar.set(side)                    # update radiobutton
+        resize = not self.app.opt.save_games_geometry
+        if self.app.toolbar.show(side, resize=resize):
+            self.top.update_idletasks()
+
+    def setToolbarSize(self, size):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.toolbar_size = size
+        self.tkopt.toolbar_size.set(size)                # update radiobutton
+        dir = self.app.getToolbarImagesDir()
+        if self.app.toolbar.updateImages(dir, size):
+            self.game.updateStatus(player=self.app.opt.player)
+            self.top.update_idletasks()
+
+    def setToolbarStyle(self, style):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.toolbar_style = style
+        # update radiobutton
+        self.tkopt.toolbar_style.set(style)
+        dir = self.app.getToolbarImagesDir()
+        size = self.app.opt.toolbar_size
+        if self.app.toolbar.updateImages(dir, size):
+            # self.game.updateStatus(player=self.app.opt.player)
+            self.top.update_idletasks()
+
+    def setToolbarCompound(self, compound):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.toolbar_compound = compound
+        self.tkopt.toolbar_compound.set(
+            compound)          # update radiobutton
+        if self.app.toolbar.setCompound(compound):
+            self.game.updateStatus(player=self.app.opt.player)
+            self.top.update_idletasks()
+
+    def setToolbarRelief(self, relief):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.toolbar_relief = relief
+        self.tkopt.toolbar_relief.set(relief)           # update radiobutton
+        self.app.toolbar.setRelief(relief)
+        self.top.update_idletasks()
+
+    def toolbarConfig(self, w, v):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.app.opt.toolbar_vars[w] = v
+        self.app.toolbar.config(w, v)
+        self.top.update_idletasks()
+
+    #
+    # stacks descriptions
+    #
+
+    def mStackDesk(self, *event):
+        if self.game.stackdesc_list:
+            self.game.deleteStackDesc()
+        else:
+            if self._cancelDrag(break_pause=True):
+                return
+            self.game.showStackDesc()
+
+    def wizardDialog(self, edit=False):
+        from pysollib.wizardutil import write_game, reset_wizard
+        from wizarddialog import WizardDialog
+
+        if edit:
+            reset_wizard(self.game)
+        else:
+            reset_wizard(None)
+        d = WizardDialog(self.top, _('Solitaire Wizard'), self.app)
+        if d.status == 0 and d.button == 0:
+            try:
+                if edit:
+                    gameid = write_game(self.app, game=self.game)
+                else:
+                    gameid = write_game(self.app)
+            except Exception:
+                return
+            if SELECT_GAME_MENU:
+                menu = self.__menupath[".menubar.select.customgames"][2]
+
+                def select_func(gi): return gi.si.game_type == GI.GT_CUSTOM
+                games = map(self.app.gdb.get,
+                            self.app.gdb.getGamesIdSortedByName())
+                games = filter(select_func, games)
+                self.updateGamesMenu(menu, games)
+
+            self.tkopt.gameid.set(gameid)
+            self._mSelectGame(gameid, force=True)
+
+    def mWizard(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.wizardDialog()
+
+    def mWizardEdit(self, *event):
+        if self._cancelDrag(break_pause=False):
+            return
+        self.wizardDialog(edit=True)
+
+
+'''
+'''
diff --git a/pysollib/kivy/playeroptionsdialog.py b/pysollib/kivy/playeroptionsdialog.py
new file mode 100644
index 00000000..d3b5f9a1
--- /dev/null
+++ b/pysollib/kivy/playeroptionsdialog.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# Toolkit imports
+from tkwidget import MfxDialog
+
+__all__ = ['PlayerOptionsDialog']
+
+# ************************************************************************
+# *
+# ************************************************************************
+# not implemented with kivy.
+
+
+class PlayerOptionsDialog(MfxDialog):
+    def __init__(self, parent, title, app, **kw):
+        pass
+
+# ************************************************************************
+# *
+# ************************************************************************
diff --git a/pysollib/kivy/progressbar.py b/pysollib/kivy/progressbar.py
new file mode 100644
index 00000000..9970ef6b
--- /dev/null
+++ b/pysollib/kivy/progressbar.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+from kivy.uix.popup import Popup
+
+# ************************************************************************
+# * a simple progress bar
+# ************************************************************************
+# not really supportable with kivy. dummy def.
+
+
+class PysolProgressBar(Popup):
+    def __init__(self, app, parent, title=None, images=None, color="blue",
+                 width=300, height=25, show_text=1, norm=1):
+        self.percent = 100
+        return
+
+    def update(self, **kw):
+        return
+
+    def destroy(self):
+        return
+
+    def reset(self, percent=0):
+        return
diff --git a/pysollib/kivy/selectcardset.py b/pysollib/kivy/selectcardset.py
new file mode 100644
index 00000000..49841d52
--- /dev/null
+++ b/pysollib/kivy/selectcardset.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+
+# imports
+# import os
+
+# PySol imports
+from pysollib.mygettext import _
+# from pysollib.resource import CSI
+from pysollib.mfxutil import kwdefault
+
+# Toolkit imports
+from tkwidget import MfxDialog
+# from tkcanvas import MfxCanvas, MfxCanvasImage
+# from tkutil import loadImage
+
+# ************************************************************************
+# * Dialog
+# ************************************************************************
+# not used with kivy. dummy def.
+
+
+class SelectCardsetDialogWithPreview(MfxDialog):
+    _cardset_store = None
+
+    def __init__(self, parent, title, app, manager, key=None, **kw):
+        kw = self.initKw(kw)
+        MfxDialog.__init__(self, parent, title, **kw)
+        #
+        if key is None:
+            key = manager.getSelected()
+        self.app = app
+        self.manager = manager
+        self.key = key
+        self.preview_key = -1
+        self.all_keys = []
+        self.status = -1
+
+    def getSelected(self):
+        return None
+
+    def showSelected(self, w):
+        pass
+
+    def updatePreview(self, key):
+        pass
+
+    def initKw(self, kw):
+        kwdefault(kw,
+                  strings=(_("&Load"), _("&Cancel"), _("&Info..."), ),
+                  default=1,
+                  resizable=1,
+                  padx=10, pady=10,
+                  width=600, height=400,
+                  )
+        return MfxDialog.initKw(self, kw)
+
+    def createInfo(self):
+        pass
+
+    def done(self, button):
+        pass
diff --git a/pysollib/kivy/selectgame.py b/pysollib/kivy/selectgame.py
new file mode 100644
index 00000000..967b75bd
--- /dev/null
+++ b/pysollib/kivy/selectgame.py
@@ -0,0 +1,508 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# imports
+# import os
+from UserList import UserList
+
+# PySol imports
+# from pysollib.mygettext import _, n_
+from pysollib.mygettext import _
+# from pysollib.mfxutil import destruct, Struct, KwStruct
+# from pysollib.mfxutil import format_time
+from pysollib.gamedb import GI
+# from pysollib.help import help_html
+# from pysollib.resource import CSI
+
+# Toolkit imports
+# from tkutil import unbind_destroy
+# from tkwidget import MfxDialog, MfxScrolledCanvas
+from selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode
+from selecttree import SelectDialogTreeData  # , SelectDialogTreeCanvas
+
+# Kivy imports
+# from kivy.uix.treeview import TreeView
+# from kivy.uix.treeview import TreeViewLabel
+# from kivy.uix.treeview import TreeViewNode
+# from kivy.uix.label import Label
+# from kivy.uix.button import Button
+# from kivy.uix.behaviors import ButtonBehavior
+# from kivy.uix.scrollview import ScrollView
+from kivy.clock import Clock
+
+from LApp import LScrollView
+from LApp import LTopLevel
+from LApp import LTreeNode
+from LApp import LTreeRoot
+
+
+# ************************************************************************
+# * Nodes
+# ************************************************************************
+
+class SelectGameLeaf(SelectDialogTreeLeaf):
+    pass
+
+
+class SelectGameNode(SelectDialogTreeNode):
+    def _getContents(self):
+        contents = []
+        if isinstance(self.select_func, UserList):
+            # key/value pairs
+            for id, name in self.select_func:
+                if id and name:
+                    node = SelectGameLeaf(self.tree, self, name, key=id)
+                    contents.append(node)
+        else:
+            # for gi in self.tree.data.all_games_gi:
+            for gi in self.tree.all_games_gi:
+                if gi and self.select_func is None:
+                    # All games
+                    # name = '%s (%s)' % (gi.name, CSI.TYPE_NAME[gi.category])
+                    name = gi.name
+                    node = SelectGameLeaf(self.tree, self, name, key=gi.id)
+                    contents.append(node)
+                elif gi and self.select_func(gi):
+                    name = gi.name
+                    node = SelectGameLeaf(self.tree, self, name, key=gi.id)
+                    contents.append(node)
+        return contents or self.tree.data.no_games
+
+
+# ************************************************************************
+# * Tree database
+# ************************************************************************
+
+class SelectGameData(SelectDialogTreeData):
+    def __init__(self, app):
+        SelectDialogTreeData.__init__(self)
+
+        # originale.
+        self.all_games_gi = map(app.gdb.get, app.gdb.getGamesIdSortedByName())
+        self.no_games = [SelectGameLeaf(None, None, _("(no games)"), None), ]
+        #
+        s_by_type = s_oriental = s_special = None
+        s_original = s_contrib = s_mahjongg = None
+        g = []
+        for data in (GI.SELECT_GAME_BY_TYPE,
+                     GI.SELECT_ORIENTAL_GAME_BY_TYPE,
+                     GI.SELECT_SPECIAL_GAME_BY_TYPE,
+                     GI.SELECT_ORIGINAL_GAME_BY_TYPE,
+                     GI.SELECT_CONTRIB_GAME_BY_TYPE,
+                     ):
+            gg = []
+            for name, select_func in data:
+                if name is None or not filter(select_func, self.all_games_gi):
+                    continue
+                gg.append(SelectGameNode(None, _(name), select_func))
+            g.append(gg)
+
+        def select_mahjongg_game(gi): return gi.si.game_type == GI.GT_MAHJONGG
+        gg = None
+        if filter(select_mahjongg_game, self.all_games_gi):
+            gg = SelectGameNode(None, _("Mahjongg Games"),
+                                select_mahjongg_game)
+        g.append(gg)
+        if g[0]:
+            s_by_type = SelectGameNode(None, _("French games"),
+                                       tuple(g[0]), expanded=1)
+        if g[1]:
+            s_oriental = SelectGameNode(None, _("Oriental Games"),
+                                        tuple(g[1]))
+        if g[2]:
+            s_special = SelectGameNode(None, _("Special Games"),
+                                       tuple(g[2]))
+        if g[3]:
+            s_original = SelectGameNode(None, _("Original Games"),
+                                        tuple(g[3]))
+#         if g[4]:
+#           s_contrib = SelectGameNode(None, "Contributed Games", tuple(g[4]))
+        if g[5]:
+            s_mahjongg = g[5]
+        #
+        # all games sorted (in pieces).
+        s_all_games, gg = None, []
+        agames = self.all_games_gi
+        n, d = 0, 17
+        i = 0
+        while True:
+            # columnbreak = i > 0 and (i % d) == 0
+            i += 1
+            if not agames[n:n + d]:
+                break
+            m = min(n + d - 1, len(agames) - 1)
+            label = agames[n].name[:4] + ' - ' + agames[m].name[:4]
+            # print('label = %s' % label)
+
+            ggg = []
+            for ag in agames[n:n + d]:
+                # print('game, id = %s, %s' % (ag.name, ag.id))
+                ggg.append((ag.id, ag.name + ' (' + str(ag.id) + ')'))
+
+            gg.append(SelectGameNode(None, label, UserList(ggg)))
+            n += d
+        if 1 and gg:
+            s_all_games = SelectGameNode(None, _("All Games"), tuple(gg))
+        #
+        s_by_compatibility, gg = None, []
+        for name, games in GI.GAMES_BY_COMPATIBILITY:
+            def select_func(gi, games=games):
+                return gi.id in games
+            if name is None or not list(filter(
+                    select_func, self.all_games_gi)):
+                continue
+            gg.append(SelectGameNode(None, name, select_func))
+        if 1 and gg:
+            s_by_compatibility = SelectGameNode(None, _("by Compatibility"),
+                                                tuple(gg))
+            pass
+        #
+        s_by_pysol_version, gg = None, []
+        for name, games in GI.GAMES_BY_PYSOL_VERSION:
+            def select_func(gi, games=games):
+                return gi.id in games
+            if name is None or not list(filter(
+                    select_func, self.all_games_gi)):
+                continue
+            name = _("New games in v. ") + name
+            gg.append(SelectGameNode(None, name, select_func))
+        if 1 and gg:
+            s_by_pysol_version = SelectGameNode(None, _("by PySol version"),
+                                                tuple(gg))
+        #
+        s_by_inventors, gg = None, []
+        for name, games in GI.GAMES_BY_INVENTORS:
+            def select_func(gi, games=games):
+                return gi.id in games
+            if name is None or not list(filter(
+                    select_func, self.all_games_gi)):
+                continue
+            gg.append(SelectGameNode(None, name, select_func))
+        if 1 and gg:
+            s_by_inventors = SelectGameNode(None, _("by Inventors"),
+                                            tuple(gg))
+        #
+        ul_alternate_names = UserList(
+            list(app.gdb.getGamesTuplesSortedByAlternateName()))
+        #
+        self.rootnodes = filter(None, (
+            # SelectGameNode(None, _("All Games"), None),
+            SelectGameNode(None, _("Popular Games"),
+                           lambda gi: gi.si.game_flags & GI.GT_POPULAR),
+            s_mahjongg,
+            s_oriental,
+            s_special,
+            # SelectGameNode(None, _("Custom Games"),
+            #               lambda gi: gi.si.game_type == GI.GT_CUSTOM),
+            SelectGameNode(None, _("Alternate Names"), ul_alternate_names),
+            s_by_type,
+            s_all_games,
+            SelectGameNode(None, _('by Skill Level'), (
+                SelectGameNode(None, _('Luck only'),
+                           lambda gi: gi.skill_level == GI.SL_LUCK),
+                SelectGameNode(None, _('Mostly luck'),
+                           lambda gi: gi.skill_level == GI.SL_MOSTLY_LUCK),
+                SelectGameNode(None, _('Balanced'),
+                           lambda gi: gi.skill_level == GI.SL_BALANCED),
+                SelectGameNode(None, _('Mostly skill'),
+                           lambda gi: gi.skill_level == GI.SL_MOSTLY_SKILL),
+                SelectGameNode(None, _('Skill only'),
+                           lambda gi: gi.skill_level == GI.SL_SKILL),
+            )),
+            SelectGameNode(None, _("by Game Feature"), (
+                SelectGameNode(None, _("by Number of Cards"), (
+                    SelectGameNode(None, _("32 cards"),
+                                   lambda gi: gi.si.ncards == 32),
+                    SelectGameNode(None, _("48 cards"),
+                                   lambda gi: gi.si.ncards == 48),
+                    SelectGameNode(None, _("52 cards"),
+                                   lambda gi: gi.si.ncards == 52),
+                    SelectGameNode(None, _("64 cards"),
+                                   lambda gi: gi.si.ncards == 64),
+                    SelectGameNode(None, _("78 cards"),
+                                   lambda gi: gi.si.ncards == 78),
+                    SelectGameNode(None, _("104 cards"),
+                                   lambda gi: gi.si.ncards == 104),
+                    SelectGameNode(None, _("144 cards"),
+                                   lambda gi: gi.si.ncards == 144),
+                    SelectGameNode(None, _("Other number"),
+                                   lambda gi: gi.si.ncards not in
+                                   (32, 48, 52, 64, 78, 104, 144)),
+                )),
+                SelectGameNode(None, _("by Number of Decks"), (
+                    SelectGameNode(None, _("1 deck games"),
+                                   lambda gi: gi.si.decks == 1),
+                    SelectGameNode(None, _("2 deck games"),
+                                   lambda gi: gi.si.decks == 2),
+                    SelectGameNode(None, _("3 deck games"),
+                                   lambda gi: gi.si.decks == 3),
+                    SelectGameNode(None, _("4 deck games"),
+                                   lambda gi: gi.si.decks == 4),
+                )),
+                SelectGameNode(None, _("by Number of Redeals"), (
+                    SelectGameNode(None, _("No redeal"),
+                               lambda gi: gi.si.redeals == 0),
+                    SelectGameNode(None, _("1 redeal"),
+                               lambda gi: gi.si.redeals == 1),
+                    SelectGameNode(None, _("2 redeals"),
+                               lambda gi: gi.si.redeals == 2),
+                    SelectGameNode(None, _("3 redeals"),
+                               lambda gi: gi.si.redeals == 3),
+                    SelectGameNode(None, _("Unlimited redeals"),
+                               lambda gi: gi.si.redeals == -1),
+                    SelectGameNode(None, "Variable redeals",
+                               lambda gi: gi.si.redeals == -2),
+                    SelectGameNode(None, _("Other number of redeals"),
+                               lambda gi: gi.si.redeals not in
+                               (-1, 0, 1, 2, 3)),
+                )),
+                s_by_compatibility,
+            )),
+            s_by_pysol_version,
+            s_by_inventors,
+            SelectGameNode(None, _("Other Categories"), (
+                SelectGameNode(None, _("Games for Children (very easy)"),
+                               lambda gi: gi.si.game_flags & GI.GT_CHILDREN),
+                SelectGameNode(None, _("Games with Scoring"),
+                               lambda gi: gi.si.game_flags & GI.GT_SCORE),
+                SelectGameNode(None, _("Games with Separate Decks"),
+                           lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS),
+                SelectGameNode(None, _("Open Games (all cards visible)"),
+                               lambda gi: gi.si.game_flags & GI.GT_OPEN),
+                SelectGameNode(None, _("Relaxed Variants"),
+                               lambda gi: gi.si.game_flags & GI.GT_RELAXED),
+            )),
+            s_original,
+            s_contrib,
+        ))
+
+
+# ************************************************************************
+# * Canvas that shows the tree
+# ************************************************************************
+'''
+class SelectGameTreeWithPreview(SelectDialogTreeCanvas):
+    data = None
+
+
+class SelectGameTree(SelectGameTreeWithPreview):
+    def singleClick(self, event=None):
+        self.doubleClick(event)
+'''
+# ************************************************************************
+# * Kivy support
+# ************************************************************************
+
+
+class LGameRoot(LTreeRoot):
+    def __init__(self, gametree, gameview, **kw):
+        super(LGameRoot, self).__init__(**kw)
+        self.gametree = gametree
+        self.gameview = gameview
+        self.kw = kw
+
+
+class LGameNode(LTreeNode):
+    def __init__(self, gamenode, gameview, **kw):
+
+        self.lastpos = None
+        self.gamenode = gamenode
+        self.gameview = gameview
+        super(LGameNode, self).__init__(**kw)
+
+        self.coreFont = self.font_size
+        # self.scaleFont(self.gameview.size[1])
+        # self.gameview.bind(size=self.scaleFontCB)
+
+        self.command = None
+        if 'command' in kw:
+            self.command = kw['command']
+        self.bind(on_release=self.on_released)
+
+    # font skalierung.
+
+    def scaleFont(self, value):
+        self.font_size = int(self.coreFont * value / 550.0)
+
+    def scaleFontCB(self, instance, value):
+        self.scaleFont(value[1])
+
+    # benutzer interaktion.
+
+    def on_released(self, v):
+        if self.gamenode.key:
+            if self.command:
+                # print('game number = %s' % self.gamenode.key)
+                Clock.schedule_once(self.commandCB, 0.1)
+        else:
+            # verzögert aufrufen, wegen user feedback.
+            Clock.schedule_once(self.toggleCB, 0.1)
+    '''
+    def on_touch_move(self, touch):
+        if self.collide_point(*touch.pos):
+            if self.lastpos==None:
+                self.lastpos = touch.pos
+                print('touch.pos %s' % str(touch.pos))
+                return
+
+            print ('touch move on %s - %s' % (self.text, touch.profile))
+            print('touch.pos(2) %s' % str(touch.pos))
+            # tbd: nur wenn horizontal move !
+            if (touch.pos[0]+2) < self.lastpos[0]:
+                Clock.schedule_once(self.collapseParentCB, 0.1)
+        pass
+    '''
+
+    def commandCB(self, d):
+        self.command(self.gamenode.key)
+
+    def toggleCB(self, d):
+        self.parent.toggle_node(self)
+
+    '''
+    def collapseParentCB(self, d):
+        if self.parent:
+            if self.parent_node.is_open:
+                self.parent.toggle_node(self.parent_node)
+            self.lastpos = None
+    '''
+# ************************************************************************
+# * Dialog
+# ************************************************************************
+
+
+class SelectGameDialog(object):
+
+    # Dialog, einmal erzeugt, wird rezykliert.
+    SingleInstance = None
+
+    def onClick(self, event):
+        print('LTopLevel: onClick')
+        SelectGameDialog.SingleInstance.parent.popWork('SelectGame')
+        SelectGameDialog.SingleInstance.running = False
+
+    def selectCmd(self, gameid):
+        self.app.menubar._mSelectGame(gameid)
+
+    def __init__(self, parent, title, app, gameid, **kw):
+        super(SelectGameDialog, self).__init__()
+
+        self.parent = parent
+        self.app = app
+        self.gameid = gameid
+        self.random = None
+        self.running = False
+        self.window = None
+
+        # bestehenden Dialog rezyklieren.
+
+        si = SelectGameDialog.SingleInstance
+        # if (si and si.running): return
+        if (si and si.running):
+            si.parent.popWork('SelectGame')
+            si.running = False
+            return
+        if (si):
+            si.parent.pushWork('SelectGame', si.window)
+            si.running = True
+            return
+
+        # neuen Dialog aufbauen.
+
+        window = LTopLevel(parent, title)
+        window.titleline.bind(on_press=self.onClick)
+        self.parent.pushWork('SelectGame', window)
+        self.window = window
+        self.running = True
+        SelectGameDialog.SingleInstance = self
+
+        # Asynchron laden.
+
+        def loaderCB(treeview, node):
+
+            # Beispielcode aus doku:
+            #
+            # for name in ('Item 1', 'Item 2'):
+            #   yield TreeViewLabel(text=name, parent=node)
+            #
+            # LGameNode ist ein Button. Es stellt sich heraus, dass
+            # wir (ev. darum) parent=node NICHT setzen dürfen, da das
+            # sonst zum versuchten doppelten einfügen des gleichen
+            # widget im tree führt.
+
+            if node:
+                if not hasattr(node, "gamenode"):
+                    # (das löst ein problem mit dem root knoten),
+                    return
+
+            v = treeview.gameview
+            if node:
+                n = node.gamenode
+                n.tree = treeview.gametree
+
+                nodes = n.getContents()
+                if type(nodes) is list:
+                    # Blaetter
+                    for l in nodes:
+                        # print ('**game=%s' % l.text)
+                        yield LGameNode(
+                            l, v, text=l.text,
+                            is_leaf=True,
+                            command=self.selectCmd)
+
+                if type(nodes) is tuple:
+                    # Knoten
+                    for nn in nodes:
+                        # print ('**node=%s' % nn.text)
+                        newnode = LGameNode(
+                            nn, v, text=nn.text, is_leaf=False)
+                        yield newnode
+
+                    print('all nodes done')
+            else:
+                # Knoten
+                nodes = treeview.gametree.rootnodes[:]
+                for n in nodes:
+                    newnode = LGameNode(n, v, text=n.text, is_leaf=False)
+                    # print ('**node=%s' % newnode)
+                    yield newnode
+
+        # treeview aufsetzen.
+
+        tree = SelectGameData(app)
+        tv = self.tvroot = LGameRoot(
+            tree,
+            self.app.canvas,
+            root_options=dict(text='Tree One'))
+        tv.size_hint = 1, None
+        tv.hide_root = True
+        tv.load_func = loaderCB
+        tv.bind(minimum_height=tv.setter('height'))
+
+        # tree in einem Scrollwindow präsentieren.
+
+        root = LScrollView(pos=(0, 0))
+        root.add_widget(tv)
+        window.content.add_widget(root)
+
+# ************************************************************************
diff --git a/pysollib/kivy/selecttree.py b/pysollib/kivy/selecttree.py
new file mode 100644
index 00000000..aec81c96
--- /dev/null
+++ b/pysollib/kivy/selecttree.py
@@ -0,0 +1,104 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# imports
+# import tkFont
+
+# Toolkit imports
+# from pysollib.mygettext import _, n_
+from tktree import MfxTreeLeaf, MfxTreeNode, MfxTreeInCanvas
+
+__all__ = ['SelectDialogTreeData']
+
+# ************************************************************************
+# * Nodes
+# ************************************************************************
+
+
+class SelectDialogTreeLeaf(MfxTreeLeaf):
+    def drawSymbol(self, x, y, **kw):
+        pass
+        '''
+        if self.tree.nodes.get(self.symbol_id) is not self:
+            self.symbol_id = self.tree.canvas.create_image(x, y,
+               image=self.tree.data.img[2 + (self.key is None)], anchor="nw")
+            self.tree.nodes[self.symbol_id] = self
+        '''
+
+
+class SelectDialogTreeNode(MfxTreeNode):
+    def __init__(self, tree, text, select_func, expanded=0, parent_node=None):
+        MfxTreeNode.__init__(self, tree, parent_node,
+                             text, key=None, expanded=expanded)
+        # callable or a tuple/list of MfxTreeNodes
+        self.select_func = select_func
+
+    def drawSymbol(self, x, y, **kw):
+        pass
+        '''
+        if self.tree.nodes.get(self.symbol_id) is not self:
+            self.symbol_id = self.tree.canvas.create_image(x, y,
+                image=self.tree.data.img[self.expanded], anchor="nw")
+            self.tree.nodes[self.symbol_id] = self
+        '''
+    def getContents(self):
+        # cached values
+        if self.subnodes is not None:
+            return self.subnodes
+        # print self.whoami()
+        if isinstance(self.select_func, (tuple, list)):
+            return self.select_func
+        return self._getContents()
+
+    def _getContents(self):
+        # subclass
+        return []
+
+
+# ************************************************************************
+# * Tree database
+# ************************************************************************
+
+
+class SelectDialogTreeData():
+    img = []  # loaded in Application.loadImages3
+
+    def __init__(self):
+        self.tree_xview = (0.0, 1.0)
+        self.tree_yview = (0.0, 1.0)
+
+
+# ************************************************************************
+# * Canvas that shows the tree (left side)
+# ************************************************************************
+
+
+class SelectDialogTreeCanvas(MfxTreeInCanvas):
+    def __init__(self, dialog, parent, key, default,
+                 font=None, width=-1, height=-1, hbar=2, vbar=3):
+        pass
+    # not needed with kivy
+
+
+'''
+'''
diff --git a/pysollib/kivy/solverdialog.py b/pysollib/kivy/solverdialog.py
new file mode 100644
index 00000000..ce03d78f
--- /dev/null
+++ b/pysollib/kivy/solverdialog.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# imports
+
+# PySol imports
+# from pysollib.mfxutil import KwStruct
+# from pysollib.settings import TITLE
+
+# Toolkit imports
+# from tkconst import EVENT_HANDLED
+# from tkwidget import MfxDialog
+
+__all__ = [
+    # 'SolverDialog',
+    'create_solver_dialog',
+    'connect_game_solver_dialog',
+    'destroy_solver_dialog',
+    'reset_solver_dialog',
+]
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+solver_dialog = None
+
+
+def create_solver_dialog(parent, game):
+    pass
+
+
+def connect_game_solver_dialog(game):
+    pass
+
+
+def destroy_solver_dialog():
+    global solver_dialog
+    solver_dialog = None
+
+
+def reset_solver_dialog():
+    pass
diff --git a/pysollib/kivy/statusbar.py b/pysollib/kivy/statusbar.py
new file mode 100644
index 00000000..6a943a3f
--- /dev/null
+++ b/pysollib/kivy/statusbar.py
@@ -0,0 +1,88 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# imports
+import os
+import sys
+
+if __name__ == '__main__':
+    d = os.path.abspath(os.path.join(sys.path[0], os.pardir, os.pardir))
+    sys.path.append(d)
+    import gettext
+    gettext.install('pysol', d, unicode=True)
+
+# PySol imports
+
+# Toolkit imports
+# from pysollib.settings import WIN_SYSTEM
+
+
+__all__ = ['PysolStatusbar',
+           'HelpStatusbar']
+
+# ************************************************************************
+# *
+# ************************************************************************
+# statusbar not used.
+
+
+class MfxStatusbar:
+    def __init__(self, top, row, column, columnspan):
+        pass
+
+    def _createLabel(self, name, expand=False, width=0, tooltip=None):
+        pass
+
+    def show(self, on):
+        pass
+
+    def updateText(self, **kw):
+        pass
+
+    def config(self, a, b):
+        pass
+
+
+class PysolStatusbar(MfxStatusbar):
+    def __init__(self, top):
+        pass
+
+
+class HelpStatusbar(MfxStatusbar):
+    def __init__(self, top):
+        MfxStatusbar.__init__(self, top, row=4, column=0, columnspan=3)
+        # l = self._createLabel('info', expand=True)
+        # l.config(justify='left', anchor='w', padx=8)
+
+
+class HtmlStatusbar(MfxStatusbar):
+    def __init__(self, top, row, column, columnspan):
+        MfxStatusbar.__init__(self, top, row=row,
+                              column=column, columnspan=columnspan)
+        # l = self._createLabel('url', expand=True)
+        # l.config(justify='left', anchor='w', padx=8)
+
+
+# ************************************************************************
+# *
+# ************************************************************************
diff --git a/pysollib/kivy/timeoutsdialog.py b/pysollib/kivy/timeoutsdialog.py
new file mode 100644
index 00000000..10cd79df
--- /dev/null
+++ b/pysollib/kivy/timeoutsdialog.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# Toolkit imports
+from pysollib.kivy.tkwidget import MfxDialog
+
+__all__ = ['TimeoutsDialog']
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class TimeoutsDialog(MfxDialog):
+    def __init__(self, parent, title, app, **kw):
+        pass
diff --git a/pysollib/kivy/tkcanvas.py b/pysollib/kivy/tkcanvas.py
new file mode 100644
index 00000000..9c4b6e02
--- /dev/null
+++ b/pysollib/kivy/tkcanvas.py
@@ -0,0 +1,860 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+# Copyright (C) 2017 LB
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+from __future__ import division
+import logging
+
+# PySol imports
+# from pysollib.mfxutil import Image, ImageTk
+from pysollib.kivy.LApp import LImage
+from pysollib.kivy.LApp import LImage as Image
+from pysollib.kivy.LApp import LImageItem
+from pysollib.kivy.LApp import LColorToKivy
+from pysollib.kivy.LApp import LText
+from pysollib.kivy.LApp import LRectangle
+from pysollib.kivy.LApp import LLine
+from pysollib.kivy.LApp import LAnimationManager
+
+# kivy imports
+from kivy.uix.widget import Widget
+from kivy.uix.anchorlayout import AnchorLayout
+from kivy.clock import Clock
+from kivy.graphics import Color
+from kivy.graphics import Rectangle
+
+'''
+__all__ = ['MfxCanvasGroup',
+           'MfxCanvasImage',
+           'MfxCanvasText',
+           'MfxCanvasLine',
+           'MfxCanvasRectangle',
+           'MfxCanvas']
+'''
+# ************************************************************************
+# * canvas items helpers
+# ************************************************************************
+
+
+def addAnchorOffset(pos, anchor, size):
+    # print ('MfxCanvas: anchor=%s' % (anchor))
+    x = pos[0]
+    y = pos[1]
+    xa = 0
+    ya = 0
+    if anchor == "n":
+        ya = -1
+    elif anchor == "w":
+        xa = -1
+    elif anchor == "s":
+        ya = 1
+    elif anchor == "e":
+        xa = 1
+    elif anchor == "ne":
+        ya = -1
+        xa = 1
+    elif anchor == "nw":
+        ya = -1
+        xa = -1
+    elif anchor == "se":
+        ya = 1
+        xa = 1
+    elif anchor == "sw":
+        ya = 1
+        xa = -1
+
+    if xa == 0:
+        x = x - size[0] / 2.0
+    elif xa == 1:
+        x = x - size[0]
+    if ya == 0:
+        y = y - size[1] / 2.0
+    elif ya == 1:
+        y = y - size[1]
+    return (x, y)
+
+
+def subAnchorOffset(pos, anchor, size):
+    # print ('MfxCanvas: anchor=%s' % (anchor))
+    x = pos[0]
+    y = pos[1]
+    xa = 0
+    ya = 0
+    if anchor == "n":
+        ya = -1
+    elif anchor == "w":
+        xa = -1
+    elif anchor == "s":
+        ya = 1
+    elif anchor == "e":
+        xa = 1
+    elif anchor == "ne":
+        ya = -1
+        xa = 1
+    elif anchor == "nw":
+        ya = -1
+        xa = -1
+    elif anchor == "se":
+        ya = 1
+        xa = 1
+    elif anchor == "sw":
+        ya = 1
+        xa = -1
+
+    if xa == 0:
+        x = x + size[0] / 2.0
+    elif xa == 1:
+        x = x + size[0]
+    if ya == 0:
+        y = y + size[1] / 2.0
+    elif ya == 1:
+        y = y + size[1]
+    return (x, y)
+
+# ************************************************************************
+# * canvas items
+# ************************************************************************
+
+
+class MfxCanvasGroup():
+    def __init__(self, canvas, tag=None):
+        # logging.info('MfxCanvasGroup: __init__() %s - %s' %
+        #  (str(canvas), str(tag)))
+        self.canvas = canvas
+        self.bindings = {}
+        self.stack = None
+
+    def tkraise(self):
+        pass
+
+    def addtag(self, tag, option="withtag"):
+        # logging.info('MfxCanvasGroup: addtag(%s, %s)' % (tag, option))
+        # self.canvas.addtag(tag, option, self.id)
+        pass
+
+    def delete(self):
+        # logging.info('MfxCanvasGroup: delete()')
+        # del self.canvas.items[self.id]
+        pass
+
+    def gettags(self):
+        # logging.info('MfxCanvasGroup: gettags()')
+        # return self.canvas.tk.splitlist(self._do("gettags"))
+        return None
+
+
+class MfxCanvasImage(object):
+    def __init__(self, canvas, *args, **kwargs):
+
+        # print ('MfxCanvasImage: %s | %s | %s' % (canvas, args, kwargs))
+
+        group = None
+        if 'group' in kwargs:
+            group = kwargs['group']
+            del kwargs['group']
+        self._image = None
+        if 'image' in kwargs:
+            self._image = kwargs['image']
+        self._anchor = None
+        if 'anchor' in kwargs:
+            self._anchor = kwargs['anchor']
+
+        super(MfxCanvasImage, self).__init__()
+        self.canvas = canvas
+        self.animation = None
+
+        ed = kwargs['image']
+        size = ed.size
+
+        if type(ed) is LImageItem:
+            aimage = ed
+        else:
+            if (ed.source is None):
+                image = LImage(texture=ed.texture)
+                image.size = [ed.getWidth(), ed.getHeight()]
+                aimage = LImageItem(size=image.size, group=group)
+                aimage.add_widget(image)
+                size = image.size
+            else:
+                image = LImage(texture=ed.texture)
+                # image = LImage(source=ed.source)
+                image.size = [ed.getWidth(), ed.getHeight()]
+                aimage = LImageItem(size=ed.size, group=group)
+                aimage.add_widget(image)
+                size = image.size
+
+        xy = addAnchorOffset(args, self._anchor, size)
+
+        aimage.coreSize = (aimage.size[0], aimage.size[1])
+        aimage.corePos = (xy[0], xy[1])
+
+        aimage.pos, aimage.size = canvas.CoreToKivy(xy, aimage.size)
+        self.canvas.add_widget(aimage)
+        self.image = aimage
+        self.widget = aimage
+
+        if group:
+            self.addtag(group)
+
+    def __del__(self):
+        print('MfxCanvasImage: __del__()')
+        self.canvas.clear_widgets([self.image])
+
+    def config(self, **kw):
+        pass
+
+    def tkraise(self, aboveThis=None):
+        # print('MfxCanvasImage: tkraise')
+        abitm = None
+        if aboveThis:
+            abitm = aboveThis.widget
+        if not self.animation:
+            self.canvas.tag_raise(self.image, abitm)
+        pass
+
+    def addtag(self, tag):
+        # print('MfxCanvasImage: addtag %s' % tag)
+        self.group = tag
+        if (self.image):
+            self.image.group = tag
+        pass
+
+    def dtag(self, tag):
+        # print('MfxCanvasImage: remtag %s' % tag)
+        self.group = None
+        if (self.image):
+            self.image.group = None
+        pass
+
+    def delete(self):
+        # print('MfxCanvasImage: delete()')
+        self.canvas.clear_widgets([self.image])
+
+    def move(self, dx, dy):
+        # print ('MfxCanvasImage: move %s, %s' % (dx, dy))
+        image = self.image
+        dsize = image.coreSize
+        dpos = (image.corePos[0] + dx, image.corePos[1] + dy)
+        image.corePos = dpos
+        if not self.animation:
+            image.pos, image.size = self.canvas.CoreToKivy(dpos, dsize)
+
+    def makeAnimStart(self):
+        def animStart(anim, widget):
+            # print('MfxCanvasImage: animStart')
+            image = self.image
+            self.canvas.tag_raise(image, None)
+            pass
+        return animStart
+
+    def makeAnimEnd(self, dpos, dsize):
+        def animEnd(anim, widget):
+            # print('MfxCanvasImage: animEnd %s' % self)
+            self.animation = False
+            image = self.image
+            image.pos, image.size = self.canvas.CoreToKivy(dpos, dsize)
+            pass
+        return animEnd
+
+    def animatedMove(self, dx, dy, duration=0.2):
+        # print ('MfxCanvasImage: animatedMove %s, %s' % (dx, dy))
+
+        image = self.image
+        dsize = image.coreSize
+        dpos = (image.corePos[0] + dx, image.corePos[1] + dy)
+        pos, size = self.canvas.CoreToKivy(dpos, dsize)
+        transition1 = 'out_expo'
+        # transition2 = 'out_cubic'
+        # transition3 = 'out_quad'
+        # transition4 = 'out_quint'
+        # transition5 = 'out_sine'
+        transition6 = 'in_out_quad'
+        # transition7 = 'in_bounce'
+        # transition8 = 'in_elastic'
+        transition = transition6
+        if self.canvas.wmain.app.game.demo:
+            transition = transition1
+
+        self.animation = True
+        ssize = image.coreSize
+        spos = (image.corePos[0], image.corePos[1])
+        spos, ssize = self.canvas.CoreToKivy(spos, ssize)
+        LAnimationManager.create(
+            spos,
+            image,
+            x=pos[0], y=pos[1],
+            duration=duration, transition=transition,
+            bindS=self.makeAnimStart(),
+            bindE=self.makeAnimEnd(dpos, dsize))
+
+    # def moveTo(self, x, y):
+    #    c = self.coords()
+    #    self.move(x - int(c[0]), y - int(c[1]))
+
+    def show(self):
+        self.config(state='normal')
+
+    def hide(self):
+        self.config(state='hidden')
+
+
+class MfxCanvasLine(object):
+    def __init__(self, canvas, *args, **kwargs):
+        print('MfxCanvasLine: %s %s' % (args, kwargs))
+
+        self.canvas = canvas
+        line = LLine(canvas, args, **kwargs)
+        line.pos, line.size = canvas.CoreToKivy(line.corePos, line.coreSize)
+        canvas.add_widget(line)
+        self.canvas = canvas
+        self.line = line
+        self.widget = line
+
+    def delete_deferred(self, seconds):
+        print('MfxCanvasLine: delete_deferred(%s)' % seconds)
+        Clock.schedule_once(lambda dt: self.delete(), seconds)
+
+    def delete(self):
+        print('MfxCanvasLine: delete()')
+        self.canvas.clear_widgets([self.line])
+
+
+class MfxCanvasRectangle(object):
+    def __init__(self, canvas, *args, **kwargs):
+
+        # logging.info('MfxCanvasRectangle: %s %s' % (args, kwargs))
+
+        rect = LRectangle(canvas, args, **kwargs)
+        rect.pos, rect.size = canvas.CoreToKivy(rect.corePos, rect.coreSize)
+        canvas.add_widget(rect)
+        self.canvas = canvas
+        self.rect = rect
+        self.widget = rect
+
+    def delete(self):
+        # print('MfxCanvasRectangle: delete()')
+        self.canvas.clear_widgets([self.rect])
+
+    def __del__(self):
+        # print('MfxCanvasRectangle: __del__()')
+        self.delete()
+
+    def delete_deferred_step(self, seconds):
+        # print ('MfxCanvasRectangle: delete_deferred_step(%s)' % seconds)
+        Clock.schedule_once(lambda dt: self.delete(), seconds)
+
+    def delete_deferred(self, seconds):
+        # self.canvas.canvas.ask_update()
+        # print ('MfxCanvasRectangle: delete_deferred(%s)' % seconds)
+        Clock.schedule_once(
+            lambda dt: self.delete_deferred_step(seconds), 0.05)
+
+    def addtag(self, tag):
+        logging.info('MfxCanvasRectangle: addtag(%s) - fake' % tag)
+        pass
+
+    def tkraise(self, aboveThis=None):
+        # logging.info('MfxCanvasRectangle: tkraise(%s) - fake' % item)
+        abitm = None
+        if aboveThis:
+            abitm = aboveThis.widget
+        self.canvas.tag_raise(self.rect, abitm)
+        pass
+
+
+class MfxCanvasText(object):
+    def __init__(self, canvas, x, y, preview=-1, **kwargs):
+
+        print(
+            'MfxCanvasText: %s | %s, %s, %s | %s'
+            % (canvas, x, y, preview, kwargs))
+
+        if preview < 0:
+            preview = canvas.preview
+        if preview > 1:
+            return
+        if "fill" not in kwargs:
+            kwargs["fill"] = canvas._text_color
+        if 'group' in kwargs:
+            del kwargs['group']
+
+        super(MfxCanvasText, self).__init__()
+
+        label = LText(canvas, x, y, **kwargs)
+        label.pos, label.size = canvas.CoreToKivy(
+            label.corePos, label.coreSize)
+        canvas.add_widget(label)
+        self.canvas = canvas
+        self.label = label
+        self.widget = label
+
+    def config(self, **kw):
+        print('MfxCanvasText: config %s' % kw)
+        if ('text' in kw):
+            self.label.text = kw['text']
+
+    def tkraise(self, aboveThis=None):
+        abitm = None
+        if aboveThis:
+            abitm = aboveThis.widget
+        self.canvas.tag_raise(self.label, abitm)
+        pass
+
+    def bbox(self):
+        # Dimensionen als 2x2 array zurückgeben.
+        # (aufruf z.B. bei games/special/poker.py und bei Memory!)
+        label = self.label
+        canvas = self.canvas
+        pos = label.pos
+        size = label.size
+        pos, size = canvas.KivyToCore(pos, size)
+        ret = [[pos[0], pos[1]], [pos[0] + size[0], pos[1] + size[1]]]
+        return ret
+
+    def addtag(self, tag):
+        pass
+
+# ************************************************************************
+# * canvas
+# ************************************************************************
+
+
+class MfxCanvas(Widget):
+
+    def __init__(self, wmain, *args, **kw):
+        super(MfxCanvas, self).__init__(**kw)
+
+        # self.tags = {}   # bei basisklasse widget (ev. nur vorläufig)
+
+        self.wmain = wmain
+        print('MfxCanvas: wmain = %s' % self.wmain)
+
+        # Tkinter.Canvas.__init__(self, *args, **kw)
+        self.preview = 0
+        self.busy = False
+        self._text_color = '#000000'
+        self._bg_color = '#00ffff'
+        self._stretch_bg_image = 0
+        self._save_aspect_bg_image = 0
+        #
+        self.xmargin, self.ymargin = 0.0, 0.0
+        self.topImage = None
+
+        # Skalierung
+        # self.lastsize = (self.size[0], self.size[1])
+        # self.lastpos = (self.pos[0], self.pos[1])
+
+        self.scale = 1.2
+        self.r_width = None
+        self.r_height = None
+
+        self.bindings = {}
+        self.bind(pos=self.update_widget)
+        self.bind(size=self.update_widget)
+
+    def KivyToCoreP(self, pos, size, scale):
+        cpos = pos
+        cpos = (cpos[0] - self.pos[0], self.pos[1] +
+                self.size[1] - cpos[1] - size[1])
+        cpos = (1.0 * cpos[0] / scale, 1.0 * cpos[1] / scale)
+        csize = (1.0 * size[0] / scale, 1.0 * size[1] / scale)
+        return cpos, csize
+
+    def CoreToKivyP(self, cpos, csize, scale):
+        size = (1.0 * csize[0] * scale, 1.0 * csize[1] * scale)
+        pos = (1.0 * cpos[0] * scale, 1.0 * cpos[1] * scale)
+        pos = (self.pos[0] + pos[0], self.pos[1] +
+               self.size[1] - pos[1] - size[1])
+        return pos, size
+
+    def KivyToCore(self, pos, size=(0.0, 0.0)):
+        return self.KivyToCoreP(pos, size, self.scale)
+
+    def CoreToKivy(self, cpos, csize=(0.0, 0.0)):
+        return self.CoreToKivyP(cpos, csize, self.scale)
+
+    def move(self, itm, dx, dy):
+            # print ('MfxCanvas: move %s %s %s' % (itm, dx, dy))
+        scale = self.scale
+        dx = scale * dx
+        dy = scale * dy
+        itm.pos = (itm.pos[0] + dx, itm.pos[1] - dy)
+
+    def scalefactor(self):
+        if self.r_width is None:
+            return self.scale
+        if self.r_height is None:
+            return self.scale
+
+        scfx = self.size[0] / self.r_width
+        scfy = self.size[1] / self.r_height
+
+        scf = scfx
+        if (scfx < scfy):
+            # print('scale factor by x = %s' % (scfx))
+            scf = scfx
+        else:
+            # print('scale factor by y = %s' % (scfy))
+            scf = scfy
+
+        return scf
+
+    def update_widget(self, posorobj, size):
+
+        print('MfxCanvas: update_widget size=(%s, %s)' %
+              (self.size[0], self.size[1]))
+
+        # Update Skalierungsparameter
+
+        oldscale = self.scale
+        newscale = self.scalefactor()
+        print('MfxCanvas: scale factor old= %s, new=%s' %
+              (oldscale, newscale))
+        self.scale = newscale
+
+        # Anpassung Skalierung.
+
+        for c in self.children:
+            if not hasattr(c, 'corePos'):
+                continue
+            if not hasattr(c, 'coreSize'):
+                continue
+
+            bpos = c.corePos
+            bsiz = c.coreSize
+            if bpos and bsiz:
+                npos, nsiz = self.CoreToKivy(bpos, bsiz)
+                c.pos = npos
+                c.size = nsiz
+
+        # Hintergrund update.
+
+        self.canvas.before.clear()
+        texture = None
+        if self._bg_img:
+            texture = self._bg_img.texture
+
+            # Color only: Nur eine Hintergrundfarbe wird installiert.
+        if texture is None:
+            kc = LColorToKivy(self._bg_color)
+            self.canvas.before.add(
+                Color(kc[0], kc[1], kc[2], kc[3]))
+            self.canvas.before.add(
+                Rectangle(pos=self.pos, size=self.size))
+            return
+
+        # Image: Das Bild wird im Fenster expandiert.
+        if self._stretch_bg_image:
+            if self._save_aspect_bg_image == 0:
+                self.canvas.before.add(
+                    Rectangle(texture=texture, pos=self.pos, size=self.size))
+            else:
+                # TBD: gesucht: aspect erhaltende skalierung
+                self.canvas.before.add(
+                    Rectangle(texture=texture, pos=self.pos, size=self.size))
+            return
+
+            # Tiles: Die Kacheln werden im Fenster ausgelegt und minim
+        # skaliert, damit sie genau passen.
+        else:
+            print('tiles !')
+            stsize = (texture.size[0] * self.scale,
+                      texture.size[1] * self.scale)
+            stepsy = int(self.size[1] / stsize[1]) + 1
+            stepsx = int(self.size[0] / stsize[0]) + 1
+
+            scaley = 1.0 * self.size[1] / (stepsy * stsize[1])
+            sy = scaley * stsize[1]
+            scalex = 1.0 * self.size[0] / (stepsx * stsize[0])
+            sx = scalex * stsize[0]
+            tsize = (sx, sy)
+
+            # print ('self.size = %s, %s' % (self.size[0], self.size[1]))
+            # print ('sx, sy = %s, %s' % (stepsx, stepsy))
+            for y in range(0, stepsy):
+                py = y * sy
+                for x in range(0, stepsx):
+                    px = x * sx
+                    tpos = (self.pos[0] + px, self.pos[1] + py)
+                    self.canvas.before.add(
+                        Rectangle(texture=texture, pos=tpos, size=tsize))
+
+    def setBackgroundImage(self, event=None):
+
+        print('setBackgroundImage', self._bg_img)
+
+        if not self._bg_img:  # solid color
+            return
+        return 1
+
+    # Funktionen, welche vom Core aufgerufen werden.
+
+    def winfo_width(self):
+        # return self.r_width
+        cpos, csize = self.KivyToCoreP(self.pos, self.size, self.scale)
+        print('MfxCanvas: winfo_width %s' % (csize[0]))
+        return csize[0]
+
+    def winfo_height(self):
+        # return self.r_height
+        cpos, csize = self.KivyToCoreP(self.pos, self.size, self.scale)
+        print('MfxCanvas: winfo_height %s' % (csize[1]))
+        return csize[1]
+
+    def cget(self, f):
+        print('MfxCanvas: cget %s -> %s, %s' % (f, self.pos, self.size))
+        cpos, csize = self.KivyToCoreP(self.pos, self.size, self.scale)
+        if f == 'width':
+            print('MfxCanvas: cget %s -> x=%s' % (f, cpos[0]))
+            return cpos[0]
+        if f == 'height':
+            print('MfxCanvas: cget %s -> y=%s' % (f, cpos[1]))
+            return cpos[1]
+        # if f=='bg':
+        #    return background-color
+        print('MfxCanvas: cget unsupported token')
+        return 1
+
+    def xview(self):
+        print('MfxCanvas: xview')
+        return [1, 1]
+        pass
+
+    def yview(self):
+        print('MfxCanvas: yview')
+        return [1, 1]
+        pass
+
+    #
+    # top-image support
+    #
+
+    def tag_raise(self, itm, abitm=None):
+        # print('MfxCanvas: tag_raise, itm=%s, aboveThis=%s' % (itm, abitm))
+        if (itm is not None):
+            if (abitm is None):
+                # print('MfxCanvas: tag_raise: to top')
+                self.clear_widgets([itm])
+                self.add_widget(itm)
+            else:
+                print('MfxCanvas: tag_raise: to specified position')
+                ws = []
+                for c in reversed(self.children):   # reversed!
+                    if c != itm and c != abitm:
+                        ws.append(c)
+                    if c == itm:
+                        ws.append(abitm)
+                        ws.append(itm)    # (~shadow image!)
+                self.clear_widgets()
+                for w in ws:
+                    self.add_widget(w)
+
+    def tag_lower(self, id, belowThis=None):
+        print('MfxCanvas: tag_lower(%s, %s)' % (id, belowThis))
+        # y = self.yy  # kommt das vor ?
+        pass
+
+    #
+    #
+    #
+    def setInitialSize(self, width, height):
+        print('MfxCanvas: setInitialSize request %s/%s' % (width, height))
+        print(
+            'MfxCanvas: setInitialSize actual  %s/%s'
+            % (self.size[0], self.size[1]))
+        self.r_width = width
+        self.r_height = height
+
+        # ev. update anstossen
+        self.update_widget(self.pos, self.size)
+
+        # self.size[0] = width
+        # self.size[1] = height
+        return
+
+        # print 'setInitialSize:', width, height
+        if self.preview:
+            self.config(width=width, height=height,
+                        scrollregion=(0, 0, width, height))
+        else:
+            # add margins
+            # dx, dy = 40, 40
+            dx, dy = self.xmargin, self.ymargin
+            self.config(width=dx + width + dx, height=dy + height + dy,
+                        scrollregion=(-dx, -dy, width + dx, height + dy))
+
+    #
+    #
+    #
+
+    # delete all CanvasItems, but keep the background and top tiles
+    def deleteAllItems(self):
+        print('MfxCanvas: deleteAllItems')
+        self.clear_widgets()
+        pass
+
+    def findCard(self, stack, event):
+        print('MfxCanvas: findCard(%s, %s)' % (stack, event))
+        if (event.cardid > -1):
+            return event.cardid
+
+        print('MfxCanvas: findCard no cardid')
+        return -1
+
+    def setTextColor(self, color):
+        print('MfxCanvas: setTextColor1 %s' % color)
+        if color is None:
+            c = self.cget("bg")
+            if not isinstance(c, str) or c[0] != "#" or len(c) != 7:
+                return
+            v = []
+            for i in (1, 3, 5):
+                v.append(int(c[i:i + 2], 16))
+            luminance = (0.212671 * v[0] + 0.715160 *
+                         v[1] + 0.072169 * v[2]) / 255
+            # print c, ":", v, "luminance", luminance
+            color = ("#000000", "#ffffff")[luminance < 0.3]
+
+        print('MfxCanvas: setTextColor2 %s' % color)
+        if self._text_color != color:
+            self._text_color = color
+
+            # falls wir das wollen in kivy:
+            # -> text_color als property deklarieren, und a.a.O binden.
+            # for item in self._text_items:
+            #    item.config(fill=self._text_color)
+
+    def setTile(self, image, stretch=0, save_aspect=0):
+
+        print('setTile: %s, %s' % (image, stretch))
+        if image:
+            try:
+                # print ('setTile: image.open %s, %s' % (image, Image))
+                bs = False
+                if stretch > 0:
+                    bs = True
+                self._bg_img = Image(source=image, allow_stretch=bs)
+
+                self._stretch_bg_image = stretch
+                self._save_aspect_bg_image = save_aspect
+                self.setBackgroundImage()
+                self.update_widget(self.pos, self.size)
+            except Exception:
+                return 0
+        else:
+            # print ('setTile: no image!')
+            self._bg_img = None
+            self.update_widget(self.pos, self.size)
+        return 1
+
+    def setTopImage(self, image, cw=0, ch=0):
+        print('MfxCanvas: setTopImage %s' % image)
+
+        if self.topImage:
+            self.clear_widgets([self.topImage])
+            self.topImage = None
+
+        if image:
+            tex = LImage(texture=image.texture)
+            tex.size_hint = (0.4, 0.4)
+            lay = AnchorLayout(anchor_y='bottom')
+            lay.size = self.size
+            lay.add_widget(tex)
+
+            self.topImage = lay
+            self.add_widget(self.topImage)
+
+        return 1
+    #
+    # Pause support
+    #
+
+    def hideAllItems(self):
+        print('MfxCanvas: hideAllItems')
+        # TBD
+        # Wir lassen das. Das TopImage deckt alles ab. Spielen ist
+        # nicht möglich.
+        pass
+
+    def showAllItems(self):
+        print('MfxCanvas: showAllItems')
+        # TBD
+        pass
+
+    # Erweiterungen fuer Tk Canvas (prüfen was noch nötig!!).
+
+    def itemconfig(self, tagOrId, cnf=None, **kw):
+        """Configure resources of an item TAGORID.
+
+        The values for resources are specified as keyword
+        arguments. To get an overview about
+        the allowed keyword arguments call the method without arguments.
+        """
+        print(
+            'MfxCanvas: itemconfigure tagOrId=%s, cnf=%s, kw=%s'
+            % (tagOrId, cnf, kw))
+
+        if 'image' in cnf:
+            # tagOrId ist ein Image oder ein CardImage
+            # self.clear_widgets([cnf['image']])
+            # self.add_widget(cnf['image'])
+            # y = self.yy
+            pass
+        if 'text' in cnf:
+            # tagOrId ist das Label.
+            tagOrId.text = cnf['text']
+            pass
+
+    def config(self, cnf={}, **kw):
+        print('MfxCanvas: config %s %s' % (cnf, kw))
+        if ('cursor' in kw):
+            pass
+        if ('width' in kw):
+            self.size[0] = kw['width']
+        if ('height' in kw):
+            self.size[1] = kw['height']
+        if ('bg' in kw):
+            self._bg_color = kw['bg']
+            self.update_widget(self.pos, self.size)
+
+    def dtag(self, tag, b=None):
+        # print ('Canvas: dtag %s %s' % (tag, b))
+        # if (tag in self.tags):
+        #  if (self.tags[tag]==b):
+        #    del self.tags[tag]
+        pass
+
+    def addtag(self, tag, b, c):
+            # print ('Canvas: addtag %s %s %s' % (tag, b, c))
+            # self.tags[c] = tag
+            # self.tags.append(tag)
+        pass
+
+    def delete(self, tag):
+            # print ('MfxCanvas: delete tag=%s' % tag)
+            # y = self.yy
+        pass
+
+    def update_idletasks(self):
+        print('MfxCanvas: update_idletasks')
+        self.wmain.update_idletasks()
diff --git a/pysollib/kivy/tkconst.py b/pysollib/kivy/tkconst.py
new file mode 100644
index 00000000..4c77879f
--- /dev/null
+++ b/pysollib/kivy/tkconst.py
@@ -0,0 +1,86 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+__all__ = ['EVENT_HANDLED',
+           'EVENT_PROPAGATE',
+           'CURSOR_DRAG',
+           'CURSOR_WATCH',
+           'CURSOR_DOWN_ARROW',
+           'ANCHOR_CENTER',
+           'ANCHOR_N',
+           'ANCHOR_NW',
+           'ANCHOR_NE',
+           'ANCHOR_S',
+           'ANCHOR_SW',
+           'ANCHOR_SE',
+           'ANCHOR_W',
+           'ANCHOR_E',
+           'TOOLBAR_BUTTONS',
+           ]
+
+# ************************************************************************
+# * constants
+# ************************************************************************
+
+EVENT_HANDLED = "break"
+EVENT_PROPAGATE = None
+
+CURSOR_DRAG = "hand1"
+CURSOR_WATCH = "watch"
+CURSOR_DOWN_ARROW = 'sb_down_arrow'
+
+ANCHOR_CENTER = 'center'
+ANCHOR_N = 'n'
+ANCHOR_NW = 'nw'
+ANCHOR_NE = 'ne'
+ANCHOR_S = 's'
+ANCHOR_SW = 'sw'
+ANCHOR_SE = 'se'
+ANCHOR_W = 'w'
+ANCHOR_E = 'e'
+'''
+COMPOUNDS = (
+    # (Tkinter.BOTTOM,  'bottom'),
+    # (Tkinter.CENTER,  'center'),
+    # (Tkinter.RIGHT,    'right'),
+    (Tkinter.NONE,   n_('Icons only')),
+    (Tkinter.TOP,    n_('Text below icons')),
+    (Tkinter.LEFT,   n_('Text beside icons')),
+    ('text',         n_('Text only')),
+    )
+'''
+TOOLBAR_BUTTONS = (
+    "new",
+    "restart",
+    "open",
+    "save",
+    "undo",
+    "redo",
+    "autodrop",
+    "shuffle",
+    "pause",
+    "statistics",
+    "rules",
+    "quit",
+    "player",
+)
diff --git a/pysollib/kivy/tkhtml.py b/pysollib/kivy/tkhtml.py
new file mode 100644
index 00000000..65a2c7b7
--- /dev/null
+++ b/pysollib/kivy/tkhtml.py
@@ -0,0 +1,701 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# imports
+import os
+import htmllib
+import formatter
+
+# PySol imports
+from pysollib.mygettext import _
+from pysollib.pysoltk import bind, unbind_destroy
+from pysollib.mfxutil import Struct, openURL
+from pysollib.settings import TITLE
+from pysollib.kivy.LApp import LTopLevel
+from pysollib.kivy.LApp import LScrollView
+from pysollib.pysoltk import MfxMessageDialog
+
+from kivy.uix.boxlayout import BoxLayout
+from kivy.uix.label import Label
+from kivy.uix.button import Button
+# from kivy.uix.behaviors import ButtonBehavior
+# from kivy.uix.scrollview import ScrollView
+# from kivy.clock import Clock
+
+REMOTE_PROTOCOLS = ("ftp:", "gopher:", "http:", "mailto:", "news:", "telnet:")
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+def cmp2(a, b):
+    """python 3 replacement for python 2 cmp function"""
+    return (a > b) - (a < b)
+
+
+class tkHTMLWriter(formatter.NullWriter):
+    def __init__(self, text, viewer, app):
+        formatter.NullWriter.__init__(self)
+
+        self.text = text
+        self.viewer = viewer
+
+        #
+        if app:
+            font = app.getFont("sans")
+            fixed = app.getFont("fixed")
+        else:
+            font = ('helvetica', 12)
+            fixed = ('courier', 12)
+        size = font[1]
+        sign = 1
+        if size < 0:
+            sign = -1
+        self.fontmap = {
+            "h1": (font[0], size + 12 * sign, "bold"),
+            "h2": (font[0], size + 8 * sign, "bold"),
+            "h3": (font[0], size + 6 * sign, "bold"),
+            "h4": (font[0], size + 4 * sign, "bold"),
+            "h5": (font[0], size + 2 * sign, "bold"),
+            "h6": (font[0], size + 1 * sign, "bold"),
+            "bold": (font[0], size, "bold"),
+            "italic": (font[0], size, "italic"),
+            "pre": fixed,
+        }
+
+        self.text.config(cursor=self.viewer.defcursor, font=font)
+        for f in self.fontmap.keys():
+            self.text.tag_config(f, font=self.fontmap[f])
+
+        self.anchor = None
+        self.anchor_mark = None
+        self.font = None
+        self.font_mark = None
+        self.indent = ""
+        self.text.label.bind(on_ref_press=self.refpress)
+
+    def createCallback(self, href):
+        class Functor:
+            def __init__(self, viewer, arg):
+                self.viewer = viewer
+                self.arg = arg
+
+            def __call__(self, *args):
+                self.viewer.updateHistoryXYView()
+                return self.viewer.display(self.arg)
+        return Functor(self.viewer, href)
+
+    def write(self, data):
+        print('writer: write %s' % data)
+        self.text.insert("insert", data)
+
+    def anchor_bgn(self, href, name, type):
+        print('writer: anchor_bgn %s - %s' % (href, name))
+        if href:
+            # self.text.update_idletasks()   # update display during parsing
+            self.anchor = (href, name, type)
+            self.anchor_mark = self.text.index("insert")
+            self.write('[ref=' + href + ']')
+
+            url = self.anchor[0]
+            fg = '0000cc'
+            u = self.viewer.normurl(url, with_protocol=False)
+            if u in self.viewer.visited_urls:
+                fg = '660099'
+            self.write('[color=' + fg + '][i]')
+            # self.text.tag_config(tag, foreground=fg, underline=1)
+
+    def refpress(self, instance, value):
+        print('writer: refpress %s, %s' % (instance, value))
+
+    def anchor_end(self):
+        print('writer: anchor_end')
+        if self.anchor:
+
+            self.anchor = None
+            self.write('[/i][/color]')
+            self.write('[/ref]')
+
+    def anchor_enter(self, url):
+        url = self.viewer.normurl(url)
+        self.viewer.statusbar.updateText(url=url)
+        self.text.config(cursor=self.viewer.handcursor)
+
+    def anchor_leave(self, *args):
+        self.viewer.statusbar.updateText(url='')
+        self.text.config(cursor=self.viewer.defcursor)
+
+    def new_font(self, font):
+        print('writer: new_font %s' % str(font))
+        # end the current font
+        if self.font:
+            # print "end_font(%s)" % `self.font`
+            self.text.tag_add(self.font, self.font_mark, "insert")
+            self.font = None
+        # start the new font
+        if font:
+            # print "start_font(%s)" % `font`
+            self.font_mark = self.text.index("insert")
+            if font[0] in self.fontmap:
+                self.font = font[0]
+            elif font[3]:
+                self.font = "pre"
+            elif font[2]:
+                self.font = "bold"
+            elif font[1]:
+                self.font = "italic"
+            else:
+                self.font = None
+
+    def new_margin(self, margin, level):
+        print('writer: new_margin %s, %s' % (margin, level))
+        self.indent = "    " * level
+
+    def send_label_data(self, data):
+        print('writer: send_label_data %s' % (data))
+        # self.write(self.indent + data + " ")
+        self.write(self.indent)
+        if data == '*':  # <li>
+            img = self.viewer.symbols_img.get('disk')
+            if img:
+                self.text.image_create(index='insert', image=img,
+                                       padx=0, pady=0)
+            else:
+                self.write('*')
+        else:
+            self.write(data)
+        self.write(' ')
+
+    def send_paragraph(self, blankline):
+        print('writer: send_paragraph %s' % (blankline))
+        self.write('\n' * blankline)
+
+    def send_line_break(self):
+        print('writer: send_break')
+        self.write('\n')
+
+    def send_hor_rule(self, *args):
+        if (args):
+            print('writer: send_hor_rule %s' % (args))
+        # width = int(int(self.text["width"]) * 0.9)
+        width = 20
+        self.write("_" * width)
+        self.write("\n")
+
+    def send_literal_data(self, data):
+        print('writer: send_literal_data %s' % (data))
+        self.write(data)
+
+    def send_flowing_data(self, data):
+        print('writer: send_flowing_data %s' % (data))
+        self.write(data)
+
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+class tkHTMLParser(htmllib.HTMLParser):
+    def anchor_bgn(self, href, name, type):
+        self.formatter.flush_softspace()
+        htmllib.HTMLParser.anchor_bgn(self, href, name, type)
+        self.formatter.writer.anchor_bgn(href, name, type)
+
+    def close(self):
+        print('tkHTMLParser1: close()')
+        self.formatter.writer.text.applyBuffer()
+        label = self.formatter.writer.text.label
+        print('tkHTMLParser: label.refs %s' % str(label.refs))
+        # print ('tkHTMLParser: label.refs %s' % str(Label.refs))
+
+        print('tkHTMLParser2: close()')
+        htmllib.HTMLParser.close(self)
+
+    def anchor_end(self):
+        if self.anchor:
+            self.anchor = None
+        self.formatter.writer.anchor_end()
+
+    def do_dt(self, attrs):
+        self.formatter.end_paragraph(1)
+        self.ddpop()
+
+    def handle_image(self, src, alt, ismap, align, width, height):
+        self.formatter.writer.viewer.showImage(
+            src, alt, ismap, align, width, height)
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class HTMLButton(Button):
+    def __init__(self, **kw):
+        super(HTMLButton, self).__init__(**kw)
+
+    def config(self, **kw):
+        pass
+
+
+class HTMLLabel(Label):
+    def __init__(self, **kw):
+        super(HTMLLabel, self).__init__(**kw)
+
+        self.bind(size=self.onUpdate)
+        self.bind(pos=self.onUpdate)
+        self.bind(text=self.onUpdate)
+
+    def onUpdate(self, instance, size):
+        self.size_hint_y = None
+        self.text_size = self.width, None
+        self.texture_update()
+        self.height = self.texture_size[1]
+
+
+class HTMLText(LScrollView):
+    def __init__(self, **kw):
+        super(HTMLText, self).__init__(**kw)
+
+        self.label = HTMLLabel(text='', markup=True)
+        self.tags = {}
+        self.textbuffer = ''
+        self.add_widget(self.label)
+
+    def applyBuffer(self):
+        print('applybuffer:')
+        self.label.text = self.textbuffer
+
+    def config(self, **kw):
+        print('config: %s' % kw)
+        pass
+
+    def update_idletasks(self):
+        pass
+
+    def delete(self, val, val1):
+        pass
+
+    def insert(self, cmd, data):
+        # print('insert text: %s' % data)
+        self.textbuffer = self.textbuffer + data
+        # self.label.text = self.textbuffer
+        pass
+
+    def index(self, cmd):
+        print('index: %s' % cmd)
+        # was sollen wir hier zuruckgeben ?
+        return 0
+
+    def tag_add(self, font, fontmark, cmd):
+        print('tag_add: %s, %s, %s' % (font, fontmark, cmd))
+        pass
+
+    def tag_config(self, tag, **kw):
+        print('tag_config: %s, %s' % (tag, kw))
+        # self.tags[tag] = kw
+
+        # for t, k in self.tags:
+        #    print('tagslist: %s, %s' % (t, k))
+
+        pass
+
+    def xview_moveto(self, xview):
+        print('xview_moveto: %s' % xview)
+        pass
+
+    def yview_moveto(self, yview):
+        print('yview_moveto: %s' % yview)
+        pass
+
+
+class HTMLViewer:
+    symbols_fn = {}  # filenames, loaded in Application.loadImages3
+    symbols_img = {}
+
+    def make_pop_command(self, parent, title):
+        def pop_command(event):
+            print('event = %s' % event)
+            parent.popWork(title)
+        return pop_command
+
+    def __init__(self, parent, app=None, home=None):
+        self.parent = parent
+        self.app = app
+        self.home = home
+        self.url = None
+        self.history = Struct(
+            list=[],
+            index=0,
+        )
+        self.visited_urls = []
+        self.images = {}
+        # need to keep a reference because of garbage collection
+        self.defcursor = "default"
+        # self.defcursor = parent["cursor"]
+        # self.defcursor = 'xterm'
+        self.handcursor = "hand2"
+
+        self.title = "Browser"
+        self.window = None
+        self.running = False
+
+        # prüfen ob noch aktiv.
+
+        if parent.workStack.peek(self.title) is not None:
+            parent.popWork(self.title)
+
+        pc = self.make_pop_command(parent, self.title)
+
+        # neuen Dialog aufbauen.
+
+        window = LTopLevel(app.top, self.title, size_hint=(1.8, 1.0))
+        window.titleline.bind(on_press=pc)
+        self.parent.pushWork(self.title, window)
+        self.window = window
+        self.running = True
+
+        content = BoxLayout(orientation='vertical')
+        # buttonline =
+        #   BoxLayout(orientation='horizontal', size_hint=(1.0, 0.1))
+
+        # create buttons
+        self.homeButton = HTMLButton(text="Index", on_release=self.goHome)
+        self.backButton = HTMLButton(text="Back", on_release=self.goBack)
+        self.forwardButton = HTMLButton(
+            text="Forward", on_release=self.goForward)
+        self.closeButton = HTMLButton(text="Close", on_release=self.goHome)
+
+        '''
+        buttonline.add_widget(self.homeButton)
+        buttonline.add_widget(self.backButton)
+        buttonline.add_widget(self.forwardButton)
+        buttonline.add_widget(self.closeButton)
+        content.add_widget(buttonline)
+        '''
+
+        '''
+        self.homeButton = Tkinter.Button(parent, text=_("Index"),
+                                         width=button_width,
+                                         command=self.goHome)
+        self.homeButton.grid(row=0, column=0, sticky='w')
+        self.backButton = Tkinter.Button(parent, text=_("Back"),
+                                         width=button_width,
+                                         command=self.goBack)
+        self.backButton.grid(row=0, column=1, sticky='w')
+        self.forwardButton = Tkinter.Button(parent, text=_("Forward"),
+                                            width=button_width,
+                                            command=self.goForward)
+        self.forwardButton.grid(row=0, column=2, sticky='w')
+        self.closeButton = Tkinter.Button(parent, text=_("Close"),
+                                          width=button_width,
+                                          command=self.destroy)
+        self.closeButton.grid(row=0, column=3, sticky='e')
+        '''
+
+        # create text widget
+
+        self.text = HTMLText(text="hallo", size_hint=(1.0, 1.0))
+        # textouter = BoxLayout(size_hint=(1.0, 1.0))
+        # textouter.add_widget(self.text)
+        content.add_widget(self.text)
+        '''
+        text_frame = Tkinter.Frame(parent)
+        text_frame.grid(row=1, column=0, columnspan=4, sticky='nsew')
+        text_frame.grid_propagate(False)
+        vbar = Tkinter.Scrollbar(text_frame)
+        vbar.pack(side='right', fill='y')
+        self.text = Tkinter.Text(text_frame,
+                                 fg='black', bg='white',
+                                 bd=1, relief='sunken',
+                                 cursor=self.defcursor,
+                                 wrap='word', padx=10)
+        self.text.pack(side='left', fill='both', expand=True)
+        self.text["yscrollcommand"] = vbar.set
+        vbar["command"] = self.text.yview
+        '''
+
+        self.window.content.add_widget(content)
+
+        # statusbar
+        # self.statusbar = HtmlStatusbar(parent, row=2, column=0, columnspan=4)
+
+        # parent.columnconfigure(2, weight=1)
+        # parent.rowconfigure(1, weight=1)
+
+        # load images
+        for name, fn in self.symbols_fn.items():
+            self.symbols_img[name] = self.getImage(fn)
+
+        # self.initBindings()
+
+    def initBindings(self):
+        w = self.parent
+        bind(w, "WM_DELETE_WINDOW", self.destroy)
+        bind(w, "<Escape>", self.destroy)
+        bind(w, "<KeyPress-Prior>", self.page_up)
+        bind(w, "<KeyPress-Next>", self.page_down)
+        bind(w, "<KeyPress-Up>", self.unit_up)
+        bind(w, "<KeyPress-Down>", self.unit_down)
+        bind(w, "<KeyPress-Begin>", self.scroll_top)
+        bind(w, "<KeyPress-Home>", self.scroll_top)
+        bind(w, "<KeyPress-End>", self.scroll_bottom)
+        bind(w, "<KeyPress-BackSpace>", self.goBack)
+
+    def destroy(self, *event):
+        unbind_destroy(self.parent)
+        try:
+            self.parent.wm_withdraw()
+        except Exception:
+            pass
+        try:
+            self.parent.destroy()
+        except Exception:
+            pass
+        self.parent = None
+
+    def _yview(self, *args):
+        self.text.yview(*args)
+        return 'break'
+
+    def page_up(self, *event):
+        return self._yview('scroll', -1, 'page')
+
+    def page_down(self, *event):
+        return self._yview('scroll', 1, 'page')
+
+    def unit_up(self, *event):
+        return self._yview('scroll', -1, 'unit')
+
+    def unit_down(self, *event):
+        return self._yview('scroll', 1, 'unit')
+
+    def scroll_top(self, *event):
+        return self._yview('moveto', 0)
+
+    def scroll_bottom(self, *event):
+        return self._yview('moveto', 1)
+
+    # locate a file relative to the current self.url
+    def basejoin(self, url, baseurl=None, relpath=1):
+        if baseurl is None:
+            baseurl = self.url
+        if 0:
+            import urllib
+            url = urllib.pathname2url(url)
+            if relpath and self.url:
+                url = urllib.basejoin(baseurl, url)
+        else:
+            url = os.path.normpath(url)
+            if relpath and baseurl and not os.path.isabs(url):
+                h1, t1 = os.path.split(url)
+                h2, t2 = os.path.split(baseurl)
+                if cmp2(h1, h2) != 0:
+                    url = os.path.join(h2, h1, t1)
+                url = os.path.normpath(url)
+        return url
+
+    def normurl(self, url, with_protocol=True):
+        for p in REMOTE_PROTOCOLS:
+            if url.startswith(p):
+                break
+        else:
+            url = self.basejoin(url)
+            if with_protocol:
+                if os.name == 'nt':
+                    url = url.replace('\\', '/')
+                url = 'file://' + url
+        return url
+
+    def openfile(self, url):
+        if url[-1:] == "/" or os.path.isdir(url):
+            url = os.path.join(url, "index.html")
+        url = os.path.normpath(url)
+        return open(url, "rb"), url
+
+    def display(self, url, add=1, relpath=1, xview=0, yview=0):
+        # for some reason we have to stop the PySol demo
+        # (is this a multithread problem with Tkinter ?)
+        if self.app and self.app.game:
+            self.app.game.stopDemo()
+            # self.app.game._cancelDrag()
+            # pass
+
+        # ftp: and http: would work if we use urllib, but this widget is
+        # far too limited to display anything but our documentation...
+        for p in REMOTE_PROTOCOLS:
+            if url.startswith(p):
+                if not openURL(url):
+                    return
+
+        # locate the file relative to the current url
+        url = self.basejoin(url, relpath=relpath)
+
+        # read the file
+        try:
+            file = None
+            if 0:
+                import urllib
+                file = urllib.urlopen(url)
+            else:
+                file, url = self.openfile(url)
+            data = file.read()
+            file.close()
+            file = None
+        except Exception:
+            if file:
+                file.close()
+            self.errorDialog(_("Unable to service request:\n") + url)
+            return
+
+        self.url = url
+        if self.home is None:
+            self.home = self.url
+        if add:
+            self.addHistory(self.url, xview=xview, yview=yview)
+
+        # print self.history.index, self.history.list
+        if self.history.index > 1:
+            self.backButton.config(state="normal")
+        else:
+            self.backButton.config(state="disabled")
+        if self.history.index < len(self.history.list):
+            self.forwardButton.config(state="normal")
+        else:
+            self.forwardButton.config(state="disabled")
+
+        old_c1, old_c2 = self.defcursor, self.handcursor
+        self.defcursor = self.handcursor = "watch"
+        self.text.config(cursor=self.defcursor)
+        self.text.update_idletasks()
+        # self.frame.config(cursor=self.defcursor)
+        # self.frame.update_idletasks()
+        self.text.config(state="normal")
+        self.text.delete("1.0", "end")
+        # self.images = {}
+        writer = tkHTMLWriter(self.text, self, self.app)
+        fmt = formatter.AbstractFormatter(writer)
+        parser = tkHTMLParser(fmt)
+        parser.feed(data)
+        parser.close()
+        self.text.config(state="disabled")
+        if 0.0 <= xview <= 1.0:
+            self.text.xview_moveto(xview)
+        if 0.0 <= yview <= 1.0:
+            self.text.yview_moveto(yview)
+        # self.parent.wm_title(parser.title)
+        self.window.titleline.text = parser.title
+        self.parent.wm_iconname(parser.title)
+        self.defcursor, self.handcursor = old_c1, old_c2
+        self.text.config(cursor=self.defcursor)
+        # self.frame.config(cursor=self.defcursor)
+
+    def addHistory(self, url, xview=0, yview=0):
+        if url not in self.visited_urls:
+            self.visited_urls.append(url)
+        if self.history.index > 0:
+            u, xv, yv = self.history.list[self.history.index - 1]
+            if cmp2(u, url) == 0:
+                self.updateHistoryXYView()
+                return
+        del self.history.list[self.history.index:]
+        self.history.list.append((url, xview, yview))
+        self.history.index = self.history.index + 1
+
+    def updateHistoryXYView(self):
+        if self.history.index > 0:
+            url, xview, yview = self.history.list[self.history.index - 1]
+            xview = self.text.xview()[0]
+            yview = self.text.yview()[0]
+            self.history.list[self.history.index - 1] = (url, xview, yview)
+
+    def goBack(self, *event):
+        if self.history.index > 1:
+            self.updateHistoryXYView()
+            self.history.index = self.history.index - 1
+            url, xview, yview = self.history.list[self.history.index - 1]
+            self.display(url, add=0, relpath=0, xview=xview, yview=yview)
+
+    def goForward(self, *event):
+        if self.history.index < len(self.history.list):
+            self.updateHistoryXYView()
+            url, xview, yview = self.history.list[self.history.index]
+            self.history.index = self.history.index + 1
+            self.display(url, add=0, relpath=0, xview=xview, yview=yview)
+
+    def goHome(self, *event):
+        if self.home and cmp2(self.home, self.url) != 0:
+            self.updateHistoryXYView()
+            self.display(self.home, relpath=0)
+
+    def errorDialog(self, msg):
+        MfxMessageDialog(self.parent, title=TITLE + " HTML Problem",
+                         text=msg,
+                         # bitmap="warning"
+                         # FIXME: this interp don't have images
+                         strings=(_("&OK"), ), default=0)
+
+    def getImage(self, fn):
+        if fn in self.images:
+            return self.images[fn]
+        else:
+            return None
+        '''
+        try:
+            img = Tkinter.PhotoImage(master=self.parent, file=fn)
+        except:
+            img = None
+        self.images[fn] = img
+        return img
+        '''
+
+    def showImage(self, src, alt, ismap, align, width, height):
+        url = self.basejoin(src)
+        img = self.getImage(url)
+        if img:
+            self.text.image_create(index="insert", image=img, padx=0, pady=0)
+
+
+''
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+'''
+def tkhtml_main(args):
+    try:
+        url = args[1]
+    except:
+        url = os.path.join(os.pardir, os.pardir, "data", "html", "index.html")
+    top = Tkinter.Tk()
+    top.wm_minsize(400, 200)
+    viewer = HTMLViewer(top)
+    viewer.app = None
+    viewer.display(url)
+    top.mainloop()
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(tkhtml_main(sys.argv))
+'''
diff --git a/pysollib/kivy/tkstats.py b/pysollib/kivy/tkstats.py
new file mode 100644
index 00000000..3700a9f0
--- /dev/null
+++ b/pysollib/kivy/tkstats.py
@@ -0,0 +1,322 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+'''
+__all__ = ['SingleGame_StatsDialog',
+           'AllGames_StatsDialog',
+           'FullLog_StatsDialog',
+           'SessionLog_StatsDialog',
+           'Status_StatsDialog',
+           'Top_StatsDialog',
+           'ProgressionDialog',
+           ]
+'''
+# imports
+# import os
+# import time
+
+# PySol imports
+# from pysollib.mygettext import _, n_
+from pysollib.mygettext import _
+# from pysollib.mfxutil import kwdefault, KwStruct
+from pysollib.mfxutil import KwStruct
+# from pysollib.mfxutil import format_time
+# from pysollib.util import *
+# from pysollib.stats import PysolStatsFormatter, ProgressionFormatter
+from pysollib.settings import TOP_TITLE
+from pysollib.kivy.LApp import LImage
+
+# Toolkit imports
+# from tkutil import bind, unbind_destroy, loadImage
+from pysollib.pysoltk import MfxDialog, MfxMessageDialog
+# from pysollib.pysoltk import MfxScrolledCanvas
+
+# Kivy
+# from LApp import *
+from kivy.uix.label import Label
+from kivy.uix.widget import Widget
+from kivy.graphics import Color
+from kivy.graphics import Line
+
+# FIXME - this file a quick hack and needs a rewrite
+
+# Note almoust not used in the kivy implementation. Only a simple text
+# is displayed, for single user Statisics. The code from tk implementation was
+# kept as an examlple what could eventually be done once ....
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class LPieChart(Widget):
+    def __init__(self, prnt, args, **kw):
+        super(LPieChart, self).__init__(**kw)
+        self.prnt = prnt
+
+        # print('width   %s' % kw['width'])
+        # print('outline %s' % kw['outline'])
+        # print('fill    %s' % kw['fill'])
+
+        # width = 10.0
+        # if ('width' in kw):
+        #     width = float(kw['width'])
+
+        bcolor = '#ffa000a0'
+        if ('outline') in kw:
+            bcolor = kw['outline']
+        if (not bcolor or len(bcolor) < 7):
+            bcolor = '#ffa000a0'
+
+        fcolor = '#00aaff20'
+        if ('fill') in kw:
+            fcolor = kw['fill']
+        if (not fcolor or len(fcolor) < 7):
+            fcolor = '#00aaff20'
+
+        self.group = None
+        if 'group' in kw:
+            self.group = kw['group']
+
+        self.center = (0.0, 0.0)
+        if ('center') in kw:
+            self.center = kw['center']
+
+        self.radius = (0.0, 0.0)
+        if ('radius') in kw:
+            self.radius = kw['radius']
+
+        self.fcolor = (0.9, 0.1, 0.3, 0.5)
+        self.bind(size=self.updateCanvas)
+        self.bind(pos=self.updateCanvas)
+
+    def updateCanvas(self, instance, value):
+
+        self.canvas.clear()
+        with self.canvas:
+            Color(self.fcolor[0], self.fcolor[1],
+                  self.fcolor[2], self.fcolor[3])
+
+            center = (self.pos[0] + self.size[0] / 2.0,
+                      self.pos[1] + self.size[1] / 2.0)
+            radius = (self.size[0] * 0.45)
+            radius2 = (self.size[1] * 0.45)
+            if (radius > radius2):
+                radius = radius2
+
+            # Rectangle(pos=pos, size=size)
+            Line(circle=(center[0], center[1], radius), width=2.0, close=True)
+
+            # kreis kann nicht gefüllt werden !!! - man sollte eine Funktion
+            # haben die einen geschlossenen pfad füllt.
+            # TBD.vertices/Mesh. versuchen, kreis annähern.
+
+            # Color(self.bcolor[0], self.bcolor[1],
+            #    self.bcolor[2], self.bcolor[3])
+            # Line(points=poly, width=border)
+
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+class SingleGame_StatsDialog(MfxDialog):
+    def __init__(self, parent, title, app, player, gameid, **kw):
+        kw['size_hint'] = (0.5, 1)
+        self.app = app
+        self.selected_game = None
+        kw = self.initKw(kw)
+        print('SingleGame_StatsDialog: p=%s, g=%s, kw=%s' %
+              (player, gameid, kw))
+        if isinstance(kw, KwStruct):
+            print('kw=%s' % kw.getKw())
+
+        MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
+        top_frame, bottom_frame = self.createFrames(kw)
+        self.top_frame = top_frame
+
+#        self.createBitmaps(top_frame, kw)
+        #
+        self.player = player or _("Demo games")
+        self.top.wm_minsize(200, 200)
+        self.button = kw.default
+        #
+        # createChart = self.create3DBarChart
+        # createChart = self.createPieChart
+        # createChart = self.createSimpleChart
+        #         if parent.winfo_screenwidth() < 800
+        #            or parent.winfo_screenheight() < 600:
+        #             createChart = self.createPieChart
+        #             createChart = self.createSimpleChart
+        #
+        self.font = self.app.getFont("default")
+#        self.tk_font = tkFont.Font(self.top, self.font)
+#        self.font_metrics = self.tk_font.metrics()
+        self._calc_tabs()
+
+        if (kw.image):
+            image = LImage(texture=kw.image.texture, size_hint=(1, 1))
+            self.top.add_widget(image)
+
+        #
+        won, lost = app.stats.getStats(player, gameid)
+        pwon, plost = self._getPwon(won, lost)
+
+        print('Stats(p): won=%s, lost=%s' % (won, lost))
+
+        text1 = 'Total:\n   won: %s ... %s%%\n   lost: %s ... %s%%\n\n' % (
+            won, int(round(100.0 * pwon)), lost, int(round(100.0 * plost)))
+
+#        createChart(app, won, lost, _("Total"))
+        won, lost = app.stats.getSessionStats(player, gameid)
+        pwon, plost = self._getPwon(won, lost)
+
+        print('Stats(s): won=%s, lost=%s' % (won, lost))
+
+        text2 = \
+            'Current Session:\n   won: %s ... %s%%\n   lost: %s ... %s%%\n' % \
+            (won, int(round(100.0 * pwon)), lost, int(round(100.0 * plost)))
+        # text2 = 'Current Session:\n   won=%s, lost=%s\n' % (won, lost)
+
+#        createChart(app, won, lost, _("Current session"))
+
+        self.top.add_widget(Label(text=text1 + text2))
+
+        # self.top.add_widget(Button(text='reset', size_hint=(1, 0.15)))
+        #
+#        focus = self.createButtons(bottom_frame, kw)
+#        self.mainloop(focus, kw.timeout)
+
+    #
+    # helpers
+    #
+
+    def _calc_tabs(self):
+        return
+
+    def _getPwon(self, won, lost):
+        pwon, plost = 0.0, 0.0
+        if won + lost > 0:
+            pwon = float(won) / float(won + lost)
+            pwon = min(max(pwon, 0.00001), 0.99999)
+            plost = 1.0 - float(pwon)
+        return pwon, plost
+
+    def _createChartTexts(self, tx, ty, won, lost):
+        c, tfont, fg = self.canvas, self.font, self.fg
+        pwon, plost = self._getPwon(won, lost)
+        #
+        x = tx[0]
+        dy = int(self.font_metrics['ascent']) - 10
+        dy = dy / 2
+        c.create_text(x, ty[0] - dy, text=_("Won:"),
+                      anchor="nw", font=tfont, fill=fg)
+        c.create_text(x, ty[1] - dy, text=_("Lost:"),
+                      anchor="nw", font=tfont, fill=fg)
+        c.create_text(x, ty[2] - dy, text=_("Total:"),
+                      anchor="nw", font=tfont, fill=fg)
+        x = tx[1] - 16
+        c.create_text(x, ty[0] - dy, text="%d" %
+                      won, anchor="ne", font=tfont, fill=fg)
+        c.create_text(x, ty[1] - dy, text="%d" %
+                      lost, anchor="ne", font=tfont, fill=fg)
+        c.create_text(x, ty[2] - dy, text="%d" %
+                      (won + lost), anchor="ne", font=tfont, fill=fg)
+        y = ty[2] - 11
+        c.create_line(tx[0], y, x, y, fill=fg)
+        if won + lost > 0:
+            x = tx[2]
+            pw = int(round(100.0 * pwon))
+            c.create_text(x, ty[0] - dy, text="%d%%" %
+                          pw, anchor="ne", font=tfont, fill=fg)
+            c.create_text(x, ty[1] - dy, text="%d%%" %
+                          (100 - pw), anchor="ne", font=tfont, fill=fg)
+
+    #
+    # charts
+    #
+
+    def initKw(self, kw):
+        kw = KwStruct(kw,
+                      strings=(_("&OK"),
+                               (_("&All games..."), 102),
+                               (TOP_TITLE + "...", 105),
+                               (_("&Reset..."), 302)), default=0,
+                      image=self.app.gimages.logos[5],
+                      padx=10, pady=10,
+                      )
+        return MfxDialog.initKw(self, kw)
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class AllGames_StatsDialog(MfxDialog):
+
+    YVIEW = 0
+    FONT_TYPE = "default"
+
+    def __init__(self, parent, title, app, player, **kw):
+        self.status = 0
+        print('AllGames_StatsDialog')
+        pass
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class FullLog_StatsDialog(AllGames_StatsDialog):
+    pass
+
+
+class SessionLog_StatsDialog(FullLog_StatsDialog):
+    pass
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class Status_StatsDialog(MfxMessageDialog):
+    def __init__(self, parent, game):
+        self.status = 0
+        pass
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class Top_StatsDialog(MfxDialog):
+    def __init__(self, parent, title, app, player, gameid, **kw):
+        pass
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class ProgressionDialog(MfxDialog):
+    def __init__(self, parent, title, app, player, gameid, **kw):
+        pass
diff --git a/pysollib/kivy/tktree.py b/pysollib/kivy/tktree.py
new file mode 100644
index 00000000..94cfdcfd
--- /dev/null
+++ b/pysollib/kivy/tktree.py
@@ -0,0 +1,416 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# imports
+# import os
+
+# Toolkit imports
+# from tkutil import bind
+from tkwidget import MfxScrolledCanvas
+
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+class MfxTreeBaseNode:
+    def __init__(self, tree, parent_node, text, key):
+        self.tree = tree
+        self.parent_node = parent_node
+        self.text = text
+        self.key = key
+        # state
+        self.selected = 0
+        self.subnodes = None
+        # canvas item ids
+        self.symbol_id = None
+        self.text_id = None
+        self.textrect_id = None
+
+    def registerKey(self):
+        if self.key is not None:
+            lk = self.tree.keys.get(self.key, [])
+            lk.append(self)
+            self.tree.keys[self.key] = lk
+
+    def whoami(self):
+        if self.parent_node is None:
+            return (self.text, )
+        else:
+            return self.parent_node.whoami() + (self.text, )
+
+    # drawing functions not used with kivy.
+    '''
+    def draw(self, x, y, lastx=None, lasty=None):
+        canvas, style = self.tree.canvas, self.tree.style
+        topleftx = x + style.distx
+        toplefty = y - style.height / 2  # +++
+        # draw the horizontal line
+        if lastx is not None:
+            canvas.create_line(x, y, topleftx, y,
+                               stipple=style.linestyle, fill=style.linecolor)
+        # draw myself - ugly, ugly...
+        self.selected = 0
+        self.symbol_id = -1
+        self.drawSymbol(topleftx, toplefty)
+        linestart = style.distx + style.width + 5
+        self.text_id = -1
+        self.drawText(x + linestart, y)
+        return x, y, x, y + style.disty
+
+    #
+    #
+    #
+
+    def drawText(self, x, y):
+        canvas, style = self.tree.canvas, self.tree.style
+        if self.selected:
+            fg, bg = style.text_selected_fg, style.text_selected_bg
+        else:
+            fg, bg = style.text_normal_fg, style.text_normal_bg
+        #
+        if self.tree.nodes.get(self.text_id) is self:
+            canvas.itemconfig(self.text_id, fill=fg)
+        else:
+            # note: I don't use Label + canvas.create_window here
+            #   because it doesn't propagate events to the canvas
+            #   and has some other re-display annoyances
+            # print 'style.font:', style.font
+            self.text_id = canvas.create_text(x + 1, y, text=self.text,
+                                              anchor="w", justify="left",
+                                              font=style.font,
+                                              fill=fg)
+            self.tree.nodes[self.text_id] = self
+        #
+        if self.tree.nodes.get(self.textrect_id) is self:
+            try:
+                # _tkinter.TclError: unknown option "-fill" ???
+                canvas.itemconfig(self.textrect_id, fill=bg)
+            except Tkinter.TclError:
+                pass
+        elif self.selected:
+            b = canvas.bbox(self.text_id)
+            self.textrect_id = canvas.create_rectangle(
+                b[0] - 1, b[1] - 1, b[2] + 1, b[3] + 1, fill=bg, outline="")
+            canvas.tag_lower(self.textrect_id, self.text_id)
+            self.tree.nodes[self.textrect_id] = self
+
+    def updateText(self):
+        if self.tree.nodes.get(self.text_id) is self:
+            self.drawText(-1, -1)
+
+    #
+    #
+    #
+
+    def drawSymbol(self, x, y, **kw):
+        canvas, style = self.tree.canvas, self.tree.style
+        color = kw.get("color")
+        if color is None:
+            if self.selected:
+                color = "darkgreen"
+            else:
+                color = "green"
+        # note: rectangle outline is one pixel
+        if self.tree.nodes.get(self.symbol_id) is self:
+            canvas.itemconfig(self.symbol_id, fill=color)
+        else:
+            self.symbol_id = canvas.create_rectangle(
+                x + 1, y + 1, x + style.width, y + style.height, fill=color)
+            self.tree.nodes[self.symbol_id] = self
+
+    def updateSymbol(self):
+        if self.tree.nodes.get(self.symbol_id) is self:
+            self.drawSymbol(-1, -1)
+    '''
+
+# ************************************************************************
+# * Terminal and non-terminal nodes
+# ************************************************************************
+
+
+class MfxTreeLeaf(MfxTreeBaseNode):
+    def drawText(self, x, y):
+        if self.text_id < 0:
+            self.registerKey()
+        MfxTreeBaseNode.drawText(self, x, y)
+
+
+class MfxTreeNode(MfxTreeBaseNode):
+    def __init__(self, tree, parent_node, text, key, expanded=0):
+        MfxTreeBaseNode.__init__(self, tree, parent_node, text, key)
+        self.expanded = expanded
+
+    def drawChildren(self, x, y, lastx, lasty):
+        # get subnodes
+        self.subnodes = self.tree.getContents(self)
+        # draw subnodes
+        lx, ly = lastx, lasty
+        nx, ny = x, y
+        for node in self.subnodes:
+            # update tree
+            node.tree = self.tree
+            # draw node
+            lx, ly, nx, ny = node.draw(nx, ny, lx, ly)
+        # draw the vertical line
+        if self.subnodes:
+            style = self.tree.style
+            dy = (style.disty - style.width) / 2
+            y = y - style.disty / 2 - dy
+            self.tree.canvas.create_line(x, y, nx, ly,
+                                         stipple=style.linestyle,
+                                         fill=style.linecolor)
+        return ny
+
+    def draw(self, x, y, ilastx=None, ilasty=None):
+        # draw myself
+        lx, ly, nx, ny = MfxTreeBaseNode.draw(self, x, y, ilastx, ilasty)
+        if self.expanded:
+            style = self.tree.style
+            childx = nx + style.distx + style.width / 2
+            childy = ny
+            clastx = nx + style.distx + style.width / 2
+            clasty = ly + style.height / 2
+            ny = self.drawChildren(childx, childy, clastx, clasty)
+        return lx, ly, x, ny
+
+    #
+    #
+    #
+
+    def drawSymbol(self, x, y, **kw):
+        color = kw.get("color")
+        if color is None:
+            if self.expanded:
+                color = "red"
+            else:
+                color = "pink"
+        MfxTreeBaseNode.drawSymbol(self, x, y, color=color)
+
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+class MfxTreeInCanvas(MfxScrolledCanvas):
+    pass
+    '''
+    class Style:
+        def __init__(self):
+            self.distx = 16
+            self.disty = 18
+            self.width = 16         # width of symbol
+            self.height = 16        # height of symbol
+            self.originx = 0
+            self.originy = 0
+            self.text_normal_fg = "black"
+            self.text_normal_bg = "white"
+            self.text_selected_fg = "white"
+            self.text_selected_bg = "#00008b"       # "darkblue"
+            self.font = None
+            self.linestyle = "gray50"
+            self.linecolor = "black"
+
+    def __init__(self, parent, rootnodes, **kw):
+        # LB bg = kw["bg"] = kw.get("bg") or parent.cget("bg")
+        kw['bd'] = 0
+        MfxScrolledCanvas.__init__(self, parent, **kw)
+        #
+        self.rootnodes = rootnodes
+        self.updateNodesWithTree(self.rootnodes, self)
+        self.selection_key = None
+        self.nodes = {}
+        self.keys = {}
+        #
+        self.style = self.Style()
+        # self.style.text_normal_fg = self.canvas.cget("insertbackground")
+        self.style.text_normal_fg = self.canvas.option_get(
+            'foreground', '') or self.canvas.cget("insertbackground")
+        self.style.text_normal_bg = bg
+        #
+        bind(self.canvas, "<ButtonPress-1>", self.singleClick)
+        bind(self.canvas, "<Double-Button-1>", self.doubleClick)
+        # bind(self.canvas, "<ButtonRelease-1>", xxx)
+        self.pack(fill='both', expand=True)
+
+    def destroy(self):
+        for node in self.keys.get(self.selection_key, []):
+            node.selected = 0
+        MfxScrolledCanvas.destroy(self)
+
+    def findNode(self, event=None):
+        id = self.canvas.find_withtag('current')
+        if id:
+            return self.nodes.get(id[0])
+        return None
+
+    #
+    # draw nodes
+    #
+
+    def draw(self):
+        nx, ny = self.style.originx, self.style.originy
+        # Account for initial offsets, see topleft[xy] in BaseNode.draw().
+        # We do this so that our bounding box always starts at (0, 0)
+        # and the yscrollincrement works nicely.
+        nx = nx - self.style.distx
+        ny = ny + self.style.height / 2
+        for node in self.rootnodes:
+            # update tree
+            node.tree = self
+            # draw
+            try:
+                lx, ly, nx, ny = node.draw(nx, ny, None, None)
+            except Tkinter.TclError:
+                # FIXME: Tk bug ???
+                raise
+        # set scroll region
+        bbox = self.canvas.bbox("all")
+        # self.canvas.config(scrollregion=bbox)
+        self.canvas.config(scrollregion=(0, 0, bbox[2], bbox[3]))
+        self.canvas.config(yscrollincrement=self.style.disty)
+
+    def clear(self):
+        self.nodes = {}
+        self.keys = {}
+        self.canvas.delete("all")
+
+    def redraw(self):
+        oldcur = self.canvas["cursor"]
+        self.canvas["cursor"] = "watch"
+        self.canvas.update_idletasks()
+        self.clear()
+        self.draw()
+        self.updateSelection(self.selection_key)
+        self.canvas["cursor"] = oldcur
+
+    #
+    #
+    #
+
+    def getContents(self, node):
+        # Overload this, supposed to return a list of subnodes of node.
+        pass
+
+    def singleClick(self, event=None):
+        # Overload this if you want to know when a node is clicked on.
+        pass
+
+    def doubleClick(self, event=None):
+        # Overload this if you want to know when a node is d-clicked on.
+        self.singleClick(event)
+
+    #
+    #
+    #
+
+    def updateSelection(self, key):
+        l1 = self.keys.get(self.selection_key, [])
+        l2 = self.keys.get(key, [])
+        for node in l1:
+            if node.selected and node not in l2:
+                node.selected = 0
+                node.updateSymbol()
+                node.updateText()
+        for node in l2:
+            if not node.selected:
+                node.selected = 1
+                node.updateSymbol()
+                node.updateText()
+        self.selection_key = key
+
+    def updateNodesWithTree(self, nodes, tree):
+        for node in nodes:
+            node.tree = tree
+            if node.subnodes:
+                self.updateNodesWithTree(node.subnodes, tree)
+    '''
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+'''
+class DirectoryBrowser(MfxTreeInCanvas):
+    def __init__(self, parent, dirs):
+        nodes = []
+        if isinstance(dirs, str):
+            dirs = (dirs, )
+        for dir in dirs:
+            self.addNode(nodes, None, dir, dir)
+        # note: best results if height is a multiple of style.disty
+        MfxTreeInCanvas.__init__(self, parent, nodes, height=25 * 18)
+        self.draw()
+
+    def addNode(self, list, node, filename, text):
+        try:
+            if os.path.isdir(filename):
+                list.append(MfxTreeNode(self, node, text, key=filename))
+            else:
+                list.append(MfxTreeLeaf(self, node, text, key=filename))
+        except EnvironmentError:
+            pass
+
+    def getContents(self, node):
+        # use cached values
+        if node.subnodes is not None:
+            return node.subnodes
+        #
+        dir = node.key
+        print "Getting %s" % dir
+        try:
+            filenames = os.listdir(dir)
+            filenames.sort()
+        except EnvironmentError:
+            return ()
+        contents = []
+        for filename in filenames:
+            self.addNode(contents, node, os.path.join(
+                dir, filename), filename)
+        # print "gotten"
+        return contents
+
+    def singleClick(self, event=None):
+        node = self.findNode(event)
+        if not node:
+            return
+        print "Clicked node %s %s" % (node.text, node.key)
+        if isinstance(node, MfxTreeLeaf):
+            self.updateSelection(key=node.key)
+        elif isinstance(node, MfxTreeNode):
+            node.expanded = not node.expanded
+            self.redraw()
+        return "break"
+'''
+
+if __name__ == "__main__":
+    '''
+    tk = Tkinter.Tk()
+    if os.name == "nt":
+        app = DirectoryBrowser(tk, ("c:\\", "c:\\windows"))
+    else:
+        app = DirectoryBrowser(tk, ("/", "/home"))
+    tk.mainloop()
+    '''
+    pass
diff --git a/pysollib/kivy/tkutil.py b/pysollib/kivy/tkutil.py
new file mode 100644
index 00000000..724cd674
--- /dev/null
+++ b/pysollib/kivy/tkutil.py
@@ -0,0 +1,415 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+# kivy implementation:
+# most of the code will not be used, but some important function have been
+# emulated.
+
+from __future__ import division
+
+'''
+__all__ = ['wm_withdraw',
+           'wm_map',
+           'setTransient',
+           'makeToplevel',
+           'make_help_toplevel',
+           'bind',
+           'unbind_destroy',
+           'after',
+           'after_idle',
+           'after_cancel',
+           # 'makeImage',
+           'copyImage',
+           'loadImage',
+           # 'fillImage',
+           'createImage',
+           'shadowImage',
+           'markImage',
+           'createBottom',
+           'get_text_width',
+           ]
+'''
+
+# imports
+import logging
+from array import array
+
+# PySol imports
+# from pysollib.mfxutil import Image
+from pysollib.kivy.LApp import LTopLevel0
+from pysollib.kivy.LApp import LImage
+
+# Kivy imports
+from kivy.core.text import Label as CoreLabel
+from kivy.clock import Clock
+from kivy.graphics.texture import Texture
+
+# ************************************************************************
+# * window manager util
+# ************************************************************************
+
+
+def wm_withdraw(window):
+    window.wm_withdraw()
+
+
+def wm_map(window, maximized=0):
+    return
+
+# ************************************************************************
+# * window util
+# ************************************************************************
+
+
+def setTransient(window, parent, relx=None, rely=None, expose=1):
+    # Make an existing toplevel window transient for a parent.
+    #
+    # The window must exist but should not yet have been placed; in
+    # other words, this should be called after creating all the
+    # subwidget but before letting the user interact.
+
+    # not used in kivy (highly tk specific).
+    return
+
+
+def makeToplevel(parent, title=None):
+    print('tkutil: makeTopLevel')
+
+    # Create a Toplevel window.
+    #
+    window = LTopLevel0(parent, title)
+    # window = LTopLevelPopup(parent, title)
+    return window.content
+
+
+def make_help_toplevel(app, title=None):
+    # Create an independent Toplevel window.
+
+    window = app.top
+
+    # from pysollib.winsystems import init_root_window
+    # window = Tkinter.Tk(className=TITLE)
+    # init_root_window(window, app)
+    return window
+
+# ************************************************************************
+# * bind wrapper - Tkinter doesn't properly delete all bindings
+# ************************************************************************
+
+
+__mfx_bindings = {}
+__mfx_wm_protocols = ("WM_DELETE_WINDOW", "WM_TAKE_FOCUS", "WM_SAVE_YOURSELF")
+
+
+def bind(widget, sequence, func, add=None):
+
+    # logging.info('tkutil: bind  %s %s %s %s '
+    #              % (widget, sequence, func, add))
+
+    # logging.info('tkutil: bind canvas = ' % str(widget.canvas))
+
+    if hasattr(widget, 'bindings'):
+        # logging.info('tkutil: bind  %s %s %s %s '
+        #              % (sequence, widget, func, add))
+        widget.bindings[sequence] = func
+    else:
+        # logging.info('tkutil: bind failed %s %s' % (sequence, widget))
+        pass
+
+    if (sequence == '<KeyPress-Left>'):
+        return
+    if (sequence == '<KeyPress-Right>'):
+        return
+    if (sequence == '<KeyPress-Prior>'):
+        return
+    if (sequence == '<KeyPress-Next>'):
+        return
+    if (sequence == '<KeyPress-Up>'):
+        return
+    if (sequence == '<KeyPress-Down>'):
+        return
+    if (sequence == '<KeyPress-Begin>'):
+        return
+    if (sequence == '<KeyPress-Home>'):
+        return
+    if (sequence == '<KeyPress-End>'):
+        return
+    if (sequence == '<KeyPress-Down>'):
+        return
+
+    if (sequence == '<4>'):
+        return
+    if (sequence == '<5>'):
+        return
+
+    if (sequence == '<1>'):
+        return
+    if (sequence == '<Motion>'):
+        return
+    if (sequence == '<ButtonRelease-1>'):
+        return
+    if (sequence == '<Control-1>'):
+        return
+    if (sequence == '<Shift-1>'):
+        return
+    if (sequence == '<Double-1>'):
+        return
+    if (sequence == '<3>'):
+        return
+    if (sequence == '<2>'):
+        return
+    if (sequence == '<Control-3>'):
+        return
+    if (sequence == '<Enter>'):
+        return
+    if (sequence == '<Leave>'):
+        return
+    if (sequence == '<Unmap>'):
+        return
+    if (sequence == '<Configure>'):
+        return
+    pass
+
+
+def unbind_destroy(widget):
+    # logging.info('tkutil: unbind  %s' % (widget))
+    widget.bindings = []
+    pass
+
+# ************************************************************************
+# * timer wrapper - Tkinter doesn't properly delete all commands
+# ************************************************************************
+
+
+def after(widget, ms, func, *args):
+    print('tkutil: after(%s, %s, %s, %s)' % (widget, ms, func, args))
+    if (ms == 'idle'):
+        print('demo use')
+        Clock.schedule_once(lambda dt: func(), 1.0)
+    elif (isinstance(ms, int)):
+        # print('ms: play timer (accounting)')
+        # Clock.schedule_once(lambda dt: func(), float(ms)/1000.0)
+        # makes not sense, drains battery!
+        pass
+
+
+def after_idle(widget, func, *args):
+    print('tkutil: after_idle()')
+    return after(widget, "idle", func, *args)
+
+
+def after_cancel(t):
+    print('tkutil: after_cancel()')
+    pass
+
+
+# ************************************************************************
+# * image handling
+# ************************************************************************
+
+
+def makeImage(file=None, data=None, dither=None, alpha=None):
+    kw = {}
+    if data is None:
+        assert file is not None
+        kw["source"] = file
+        # print('makeImage: source = %s' % file)
+        # if (file=='/home/lb/PRG/Python/Kivy/pysolfc/data/images/redeal.gif'):
+        #    y = self.yy
+    else:
+        assert data is not None
+        kw["texture"] = data
+        # ob das geht ?? - kommt das vor ?
+        # yy = self.yy
+
+    '''
+    if 'source' in kw:
+        logging.info ("makeImage: " + kw["source"])
+    if 'texture' in kw:
+        logging.info ("makeImage: " + str(kw["texture"]))
+    '''
+
+    return LImage(**kw)
+
+
+loadImage = makeImage
+
+
+def copyImage(image, x, y, width, height):
+
+    # return Image(source=image.source)
+    # return Image(texture=image.texture)
+    return image
+
+
+def fillTexture(texture, fill, outline=None, owidth=1):
+
+    logging.info("fillImage: t=%s, f=%s o=%s, w=%s" %
+                 (texture, fill, outline, owidth))
+    # O.K. Kivy
+
+    if not fill and not outline:
+        return
+
+    width = texture.width
+    height = texture.height
+
+    ox = round(owidth)
+    ow = int(ox)    # muss int sein!
+    if width <= 2 * ow or height <= 2 * ow:
+        fill = fill or outline
+        outline = None
+
+    if not fill:
+        fi0 = 0
+        fi1 = 0
+        fi2 = 0
+        fi3 = 0
+    else:
+        # wir erwarten Werte als '#xxxxxx' (color Werte in Tk notation)
+        # (optional mit transparenz)
+        if (fill[0] == '#'):
+            fill = fill[1:]
+        fi0 = int(fill[0:2], 16)
+        fi1 = int(fill[2:4], 16)
+        fi2 = int(fill[4:6], 16)
+        fi3 = 255
+        if len(fill) >= 8:
+            fi3 = int(fill[6:8], 16)
+
+    if not outline:
+        f = (fi0, fi1, fi2, fi3) * width
+        f = (f, ) * height
+        assert len(f) == height
+        f = sum(f, ())
+        assert len(f) == height * width * 4
+        arr = array('B', f)
+        texture.blit_buffer(arr, colorfmt='rgba', bufferfmt='ubyte')
+    else:
+        if (outline[0] == '#'):
+            outline = outline[1:]
+        ou0 = int(outline[0:2], 16)
+        ou1 = int(outline[2:4], 16)
+        ou2 = int(outline[4:6], 16)
+        ou3 = 255
+        if len(outline) >= 8:
+            ou3 = int(outline[6:8], 16)
+
+        l1 = (ou0, ou1, ou2, ou3, ) * width
+        l2 = (ou0, ou1, ou2, ou3, ) * ow + (fi0, fi1, fi2, fi3, ) * \
+            (width - 2 * ow) + (ou0, ou1, ou2, ou3, ) * ow
+        f = (l1, ) * ow + (l2, ) * (height - 2 * ow) + (l1, ) * ow
+        assert len(f) == height
+        f = sum(f, ())
+        assert len(f) == height * width * 4
+        arr = array('B', f)
+        texture.blit_buffer(arr, colorfmt='rgba', bufferfmt='ubyte')
+
+    logging.info("fillImage: filled")
+
+
+def createImage(width, height, fill, outline=None, outwidth=1):
+
+    logging.info("createImage: w=%s, h=%s, f=%s, o=%s, ow=%s" %
+                 (width, height, fill, outline, outwidth))
+
+    # test stellungen:
+    # if (fill==None):
+    #   fill = '#00cc00'
+    # if (outline==None):
+    #   outline = '#ff00ff'
+    if (fill is None and (outline is None or outline == '')):
+        outline = '#fff000'
+        outwidth = 1
+
+    texture = Texture.create(size=(width, height), colorfmt='rgba')
+    fillTexture(texture, fill, outline, outwidth)
+    image = LImage(texture=texture)
+    logging.info("createImage: LImage create %s" % image)
+    return image
+
+
+def shadowImage(image, color='#3896f8', factor=0.3):
+
+    logging.info("shadowImage: ")
+    # TBD.
+    return None
+    # Kivy nicht benötigt. aber - was tut das ?
+    # wurde aufgerufen, als der erste König auf die Foundation
+    # gezogen wurde. (möglicherweise eine Gewonnen! - Markierung).
+
+
+def markImage(image):
+    logging.info("markImage: ")
+    return None
+
+
+def createBottom(image, color='white', backfile=None):
+
+    logging.info("createBottom: ")
+    # TBD.
+    # y = self.yy
+
+    if not hasattr(image, '_pil_image'):
+        return None
+
+    # obviously not used.
+    return None
+    '''
+    im = image._pil_image
+    th = 1                              # thickness
+    sh = Image.new('RGBA', im.size, color)
+    out = Image.composite(sh, im, im)
+    w, h = im.size
+    size = (w - th * 2, h - th * 2)
+    tmp = Image.new('RGBA', size, color)
+    tmp.putalpha(60)
+    mask = out.resize(size, Image.ANTIALIAS)
+    out.paste(tmp, (th, th), mask)
+    if backfile:
+        back = Image.open(backfile).convert('RGBA')
+        w0, h0 = back.size
+        w1, h1 = im.size
+        a = min(float(w1) / w0, float(h1) / h0)
+        a = a * 0.9
+        w0, h0 = int(w0 * a), int(h0 * a)
+        back = back.resize((w0, h0), Image.ANTIALIAS)
+        x, y = (w1 - w0) / 2, (h1 - h0) / 2
+        out.paste(back, (x, y), back)
+    return PIL_Image(image=out)
+    '''
+
+# ************************************************************************
+# * font utils
+# ************************************************************************
+
+
+def get_text_width(text, font, root=None):
+
+    logging.info("get_text_width: %s  %s" % (text, font))
+
+    label = CoreLabel()
+    label.text = text
+    label.refresh()
+    return label.content_width
+    # return Font(root=root, font=font).measure(text)
diff --git a/pysollib/kivy/tkwidget.py b/pysollib/kivy/tkwidget.py
new file mode 100644
index 00000000..bd2b535d
--- /dev/null
+++ b/pysollib/kivy/tkwidget.py
@@ -0,0 +1,845 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+# Copyright (C) 2017 LB
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+# Note:
+# Many classes or some methods of classes are dead code resulting from the tk
+# implementation. If executed it would throw exceptions.
+#
+# Kivy Implementation used: MfxScrolledCanvas, MfxDialog (partly)
+
+# imports
+from __future__ import division
+import logging
+
+# PySol imports
+from pysollib.mfxutil import kwdefault, KwStruct
+from pysollib.settings import WIN_SYSTEM
+from pysollib.mygettext import _
+
+# Toolkit imports
+from pysollib.kivy.tkutil import bind, unbind_destroy
+from pysollib.kivy.tkutil import makeToplevel
+from pysollib.kivy.tkcanvas import MfxCanvas
+from pysollib.kivy.LApp import LImage
+from pysollib.kivy.LApp import LTopLevel
+from pysollib.kivy.LApp import LBoxLayout
+from pysollib.kivy.LApp import LScrollView
+
+# kivy
+from kivy.uix.boxlayout import BoxLayout
+from kivy.clock import Clock
+from kivy.uix.label import Label
+from kivy.uix.anchorlayout import AnchorLayout
+
+# ************************************************************************
+# * abstract base class for the dialogs in this module
+# ************************************************************************
+
+
+class MfxDialog:  # ex. _ToplevelDialog
+    img = {}
+    button_img = {}
+
+    def __init__(self, parent, title="", resizable=False, default=-1):
+        self.parent = parent
+        self.status = 0
+        self.button = default
+        self.timer = None
+        self.buttons = []
+        self.accel_keys = {}
+        self.top = makeToplevel(parent, title=title)
+
+    '''
+    def mainloop(self, focus=None, timeout=0, transient=True):
+        bind(self.top, "<Escape>", self.mCancel)
+        bind(self.top, '<Alt-Key>', self.altKeyEvent)  # for accelerators
+        if focus is not None:
+            focus.focus()
+        if transient:
+            setTransient(self.top, self.parent)
+            try:
+                self.top.grab_set()
+            except Tkinter.TclError:
+                if traceback:
+                    traceback.print_exc()
+                pass
+            if timeout > 0:
+                self.timer = after(self.top, timeout, self.mTimeout)
+            try:
+                self.top.mainloop()
+            except SystemExit:
+                pass
+            self.destroy()
+
+    def destroy(self):
+        after_cancel(self.timer)
+        unbind_destroy(self.top)
+        try:
+            self.top.wm_withdraw()
+        except:
+            if traceback:
+                traceback.print_exc()
+            pass
+        try:
+            self.top.destroy()
+        except:
+            if traceback:
+                traceback.print_exc()
+            pass
+        # destruct(self.top)
+        if 1 and self.parent:  # ???
+            try:
+                # self.parent.update_idletasks()
+                # FIXME: why do we need this under Windows ?
+                if hasattr(self.parent, "busyUpdate"):
+                    self.parent.busyUpdate()
+                else:
+                    self.parent.update()
+            except:
+                if traceback:
+                    traceback.print_exc()
+                pass
+        self.top = None
+        self.parent = None
+    '''
+
+    def wmDeleteWindow(self, *event):
+        self.status = 1
+        raise SystemExit
+        # return EVENT_HANDLED
+
+    def mCancel(self, *event):
+        self.status = 1
+        raise SystemExit
+
+    def mTimeout(self, *event):
+        self.status = 2
+        raise SystemExit
+
+    def mDone(self, button):
+        self.button = button
+        raise SystemExit
+
+    def altKeyEvent(self, event):
+        key = event.char
+        # key = unicode(key, 'utf-8')
+        key = key.lower()
+        button = self.accel_keys.get(key)
+        if button is not None:
+            self.mDone(button)
+
+    def initKw(self, kw):
+        kw = KwStruct(kw,
+                      timeout=0, resizable=False,
+                      text="", justify="center",
+                      strings=(_("&OK"), ),
+                      default=0,
+                      width=0,
+                      padx=20, pady=20,
+                      bitmap=None, bitmap_side="left",
+                      bitmap_padx=10, bitmap_pady=20,
+                      image=None, image_side="left",
+                      image_padx=10, image_pady=20,
+                      )
+        # default to separator if more than one button
+        sep = len(kw.strings) > 1
+        kwdefault(kw.__dict__, separator=sep)
+        return kw
+
+    def createFrames(self, kw):
+        a = LBoxLayout(orientation="vertical")
+        b = LBoxLayout(orientation="vertical")
+        return a, b
+        '''
+        bottom_frame = Tkinter.Frame(self.top)
+        bottom_frame.pack(side='bottom', fill='both', expand=False,
+                          ipadx=3, ipady=3)
+        if kw.separator:
+            separator = Tkinter.Frame(self.top, relief="sunken",
+                    height=2, width=2, borderwidth=1)
+            separator.pack(side='bottom', fill='x')
+        top_frame = Tkinter.Frame(self.top)
+        top_frame.pack(side='top', fill='both', expand=True)
+        return top_frame, bottom_frame
+        '''
+
+    '''
+    def createBitmaps(self, frame, kw):
+        if kw.bitmap:  # in ("error", "info", "question", "warning")
+            img = self.img.get(kw.bitmap)
+            b = Tkinter.Label(frame, image=img)
+            b.pack(side=kw.bitmap_side,
+                   padx=kw.bitmap_padx, pady=kw.bitmap_pady)
+        elif kw.image:
+            b = Tkinter.Label(frame, image=kw.image)
+            b.pack(side=kw.image_side, padx=kw.image_padx, pady=kw.image_pady)
+    '''
+
+    '''
+    def createButtons(self, frame, kw):
+        button = -1
+        column = 0
+        # padx, pady = kw.get("buttonpadx", 10), kw.get("buttonpady", 10)
+        focus = None
+        max_len = 0
+        for s in kw.strings:
+            if isinstance(s, tuple):
+                s = s[0]
+            if s:
+                # if os.name == 'posix':
+                #    s = s.replace('...', '.')
+                s = s.replace('&', '')
+                max_len = max(max_len, len(s))
+            # print s, len(s)
+        # if max_len > 12 and WIN_SYSTEM == 'x11':
+        #     button_width = max_len
+        # elif max_len > 9:
+        #     button_width = max_len + 1
+        # elif max_len > 6:
+        #     button_width = max_len + 2
+        # else:
+        #     button_width = 8
+        # print 'button_width =', button_width
+        #
+        #
+        for s in kw.strings:
+            xbutton = button = button + 1
+            if isinstance(s, tuple):
+                assert len(s) == 2
+                button = int(s[1])
+                s = s[0]
+            if s is None:
+                continue
+            # accel_indx = s.find('&')
+            s = s.replace('&', '')
+            if button < 0:
+                # b = Tkinter.Button(frame, text=s, state="disabled")
+                button = xbutton
+            else:
+                # b = Tkinter.Button(frame, text=s, default="normal",
+                #                   command=(lambda self=self,
+                #                   button=button: self.mDone(button)))
+                b = Button(text=s, size_hint=(1, 1))
+                frame.add_widget(b)
+                # if button == kw.default:
+                #    focus = b
+                #    focus.config(default="active")
+            # self.buttons.append(b)
+            #
+            # b.config(width=button_width)
+            # if accel_indx >= 0:
+                # key accelerator
+            #    b.config(underline=accel_indx)
+            #    key = s[accel_indx]
+            #    self.accel_keys[key.lower()] = button
+            #
+#             img = None
+#             if self.button_img:
+#                 img = self.button_img.get(s)
+#             b.config(compound='left', image=img)
+            column += 1
+            # b.grid(column=column, row=0, sticky="ns", padx=padx, pady=pady)
+        # if focus is not None:
+            # l = (lambda event=None,
+            #   selScrollViewf=self, button=kw.default: self.mDone(button))
+            # bind(self.top, "<Return>", l)
+            # bind(self.top, "<KP_Enter>", l)
+        # frame.columnconfigure(0, weight=1)
+        # frame.columnconfigure(99, weight=1)
+        return focus
+    '''
+
+
+# ************************************************************************
+# Needed Labels.
+
+class MfxSimpleEntry:
+    pass
+
+
+class MfxToolTip:
+    pass
+
+# ************************************************************************
+# * replacement for the tk_dialog script
+# ************************************************************************
+# Kivy implementation helpers.
+
+
+class FLabel(Label):
+    def __init__(self, **kw):
+        super(FLabel, self).__init__(**kw)
+
+        self.bind(size=self.onUpdate)
+        self.bind(pos=self.onUpdate)
+        self.bind(text=self.onUpdate)
+
+    def onUpdate(self, instance, size):
+        self.size_hint_y = None
+        self.text_size = self.width, None
+        self.texture_update()
+        self.height = self.texture_size[1]
+
+
+class FText(LScrollView):
+    def __init__(self, **kw):
+        super(FText, self).__init__(**kw)
+
+        self.label = FLabel(**kw)
+        self.add_widget(self.label)
+
+
+class MfxMessageDialog(MfxDialog):
+    def __init__(self, parent, title, **kw):
+        kw = self.initKw(kw)
+        MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
+
+        if (kw.image):
+            image = LImage(texture=kw.image.texture, size_hint=(1, 1))
+            self.top.add_widget(image)
+
+        label = FText(text=kw.text, halign='center')
+        self.top.add_widget(label)
+
+        # LB
+        # nicht automatisch ein neues spiel laden.
+        if (title == "Game won"):
+            self.status = 1
+            # self.button = 0
+        if (title == "Game finished"):
+            self.status = 1
+            # self.button =
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class MfxExceptionDialog(MfxMessageDialog):
+    def __init__(self, parent, ex, title="Error", **kw):
+        kw = KwStruct(kw, bitmap="error")
+        text = kw.get("text", "")
+        if not text.endswith("\n"):
+            text = text + "\n"
+        text = text + "\n"
+        if isinstance(ex, EnvironmentError) and ex.filename is not None:
+            t = "[Errno %s] %s:\n%s" % (
+                ex.errno, ex.strerror, repr(ex.filename))
+        else:
+            t = str(ex)
+        kw.text = text + t
+        MfxMessageDialog.__init__(self, parent, title, **kw.getKw())
+
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+class PysolAboutDialog(object):
+
+    # Die einzige Instanz.
+    AboutDialog = None
+
+    def onClick(self, event):
+        print('LTopLevel: onClick')
+        PysolAboutDialog.AboutDialog.parent.popWork('AboutDialog')
+        PysolAboutDialog.AboutDialog.running = False
+
+    def __init__(self, app, parent, title, **kw):
+        logging.info('PysolAboutDialog:')
+        super(PysolAboutDialog, self).__init__()
+
+        self._url = kw['url']
+        logging.info('PysolAboutDialog: txt=%s' % title)
+
+        text = kw['text']
+        text = text + '\n' + self._url
+        logging.info('PysolAboutDialog: txt=%s' % text)
+
+        text = text + '\n\n' + 'Adaptation to Kivy/Android\n' + \
+            ' Copyright (C) (2016-17) LB'
+
+        self.parent = parent
+        self.app = app
+        self.window = None
+        self.running = False
+        self.status = 1  # -> von help.py so benötigt
+        self.button = 0  # -> von help.py so benötigt
+
+        # bestehenden Dialog rezyklieren.
+
+        logging.info('PysolAboutDialog: 1')
+        onlyone = PysolAboutDialog.AboutDialog
+        if (onlyone and onlyone.running):
+            return
+        if (onlyone):
+            onlyone.parent.pushWork('AboutDialog', onlyone.window)
+            onlyone.running = True
+            return
+
+        # neuen Dialog aufbauen.
+
+        window = LTopLevel(parent, title, size_hint=(1.0, 1.0))
+        window.titleline.bind(on_press=self.onClick)
+        self.parent.pushWork('AboutDialog', window)
+        self.window = window
+        self.running = True
+        PysolAboutDialog.AboutDialog = self
+
+        if kw['image']:
+            image = LImage(texture=kw['image'].texture)
+            image.size_hint = (1, 0.8)
+            al = AnchorLayout()
+            al.add_widget(image)
+            al.size_hint = (1, 0.3)
+            window.content.add_widget(al)
+
+        label = FText(text=text, halign='center', size_hint=(1, 1))
+        window.content.add_widget(label)
+
+        '''
+        label = LLabel(text=text)
+        label.texture_update()
+        label.size = label.texture_size
+        image = LImage(texture=label.texture)
+        window.content.add_widget(image)
+        '''
+
+# ************************************************************************
+# * a simple tooltip
+# ************************************************************************
+# ToolTip - not used in Kivy - would not run without adaptations.
+
+
+'''
+class MfxTooltip:
+    last_leave_time = 0
+
+    def __init__(self, widget):
+        # private vars
+        self.widget = widget
+        self.text = None
+        self.timer = None
+        self.cancel_timer = None
+        self.tooltip = None
+        self.label = None
+        self.bindings = []
+        self.bindings.append(self.widget.bind("<Enter>", self._enter))
+        self.bindings.append(self.widget.bind("<Leave>", self._leave))
+        self.bindings.append(self.widget.bind("<ButtonPress>", self._leave))
+        # user overrideable settings
+        self.timeout = 800                    # milliseconds
+        self.cancel_timeout = 5000
+        self.leave_timeout = 400
+        self.relief = 'solid'
+        self.justify = 'left'
+        self.fg = "#000000"
+        self.bg = "#ffffe0"
+        self.xoffset = 0
+        self.yoffset = 4
+
+    def setText(self, text):
+        self.text = text
+
+    def _unbind(self):
+        if self.bindings and self.widget:
+            self.widget.unbind("<Enter>", self.bindings[0])
+            self.widget.unbind("<Leave>", self.bindings[1])
+            self.widget.unbind("<ButtonPress>", self.bindings[2])
+            self.bindings = []
+
+    def destroy(self):
+        self._unbind()
+        self._leave()
+
+    def _enter(self, *event):
+        after_cancel(self.timer)
+        after_cancel(self.cancel_timer)
+        self.cancel_timer = None
+        timediff = time.time() - MfxTooltip.last_leave_time
+        if timediff < self.leave_timeout / 1000.:
+            self._showTip()
+        else:
+            self.timer = after(self.widget, self.timeout, self._showTip)
+
+    def _leave(self, *event):
+        after_cancel(self.timer)
+        after_cancel(self.cancel_timer)
+        self.timer = self.cancel_timer = None
+        if self.tooltip:
+            self.label.destroy()
+            destruct(self.label)
+            self.label = None
+            self.tooltip.destroy()
+            destruct(self.tooltip)
+            self.tooltip = None
+            MfxTooltip.last_leave_time = time.time()
+
+    def _showTip(self):
+        self.timer = None
+        if self.tooltip or not self.text:
+            return
+#         if isinstance(self.widget, (Tkinter.Button, Tkinter.Checkbutton)):
+#             if self.widget["state"] == 'disabled':
+#                 return
+        # x = self.widget.winfo_rootx()
+        x = self.widget.winfo_pointerx()
+        y = self.widget.winfo_rooty() + self.widget.winfo_height()
+        x += self.xoffset
+        y += self.yoffset
+        self.tooltip = Tkinter.Toplevel()
+        self.tooltip.wm_iconify()
+        self.tooltip.wm_overrideredirect(1)
+        self.tooltip.wm_protocol("WM_DELETE_WINDOW", self.destroy)
+        self.label = Tkinter.Label(self.tooltip, text=self.text,
+                                   relief=self.relief, justify=self.justify,
+                                   fg=self.fg, bg=self.bg, bd=1, takefocus=0)
+        self.label.pack(ipadx=1, ipady=1)
+        self.tooltip.wm_geometry("%+d%+d" % (x, y))
+        self.tooltip.wm_deiconify()
+        self.cancel_timer = after(
+            self.widget, self.cancel_timeout, self._leave)
+        # self.tooltip.tkraise()
+'''
+
+# ************************************************************************
+# * A canvas widget with scrollbars and some useful bindings.
+# ************************************************************************
+# Kivy implementation of MfxScrolledCanvas.
+
+
+class LScrollFrame(BoxLayout):
+    def __init__(self, **kw):
+        super(LScrollFrame, self).__init__(orientation="vertical", **kw)
+
+
+class MfxScrolledCanvas(object):
+    def __init__(self, parent, hbar=True, vbar=True, propagate=False, **kw):
+        kwdefault(kw, highlightthickness=0, bd=1, relief='sunken')
+        self.parent = parent
+
+        # workarea = parent.getWork()
+        print('MfxScrolledCanvas: parent=%s' % (parent))
+
+        super(MfxScrolledCanvas, self).__init__()
+        self.createFrame(kw)
+        self.canvas = None
+        # do_scroll_x = None
+        # do_scroll_y = None
+        # self.hbar = None
+        # self.vbar = None
+        self.hbar_show = False
+        self.vbar_show = False
+        self.createCanvas(kw)
+        # self.frame.grid_rowconfigure(0, weight=1)
+        # self.frame.grid_columnconfigure(0, weight=1)
+        # self.frame.grid_propagate(propagate)
+        if hbar:
+            self.createHbar()
+            self.bindHbar()
+        if vbar:
+            self.createVbar()
+            self.bindVbar()
+        # self.canvas.focus_set()
+
+    def destroy(self):
+        logging.info('MfxRoot: destroy')
+        self.unbind_all()
+        self.canvas.destroy()
+        self.frame.destroy()
+
+    def pack(self, **kw):
+        pass
+        # self.frame.pack(**kw)
+
+    def grid(self, **kw):
+        pass
+        # self.frame.grid(**kw)
+
+    #
+    #
+    #
+
+    def setTile(self, app, i, force=False):
+        logging.info('MfxRoot: setTitle app=%s' % app)
+
+        tile = app.tabletile_manager.get(i)
+
+        print('setTile: (tile) %s, index=%s' % (tile, i))
+
+        if tile is None or tile.error:
+            return False
+
+        # print i, tile
+        if i == 0:
+            assert tile.color
+            assert tile.filename is None
+        else:
+            assert tile.color is None
+            assert tile.filename
+            assert tile.basename
+        if not force:
+            if (i == app.tabletile_index and
+                    tile.color == app.opt.colors['table']):
+                return False
+        #
+        print('setTile2: %s' % (tile.filename))
+
+        if not self.canvas.setTile(
+                tile.filename, tile.stretch, tile.save_aspect):
+            tile.error = True
+            return False
+
+        print(
+            'MfxScrolledCanvas: tile.color, app.top_bg %s, %s'
+            % (tile.color, app.top_bg))
+        if i == 0:
+            if force:
+                tile.color = app.opt.colors['table']
+            self.canvas.config(bg=tile.color)
+        else:
+            if type(app.top_bg) is str:
+                self.canvas.config(bg=app.top_bg)
+
+        self.canvas.setTextColor(app.opt.colors['text'])
+        return True
+    #
+    #
+    #
+
+    def deleteAllItems(self):
+        logging.info('MfxRoot: deleteAllItems')
+        # self.parent.getWork()
+        # self.parent.popWork()
+        # self.frame.clear_widgets()
+        self.canvas.clear_widgets()
+
+    def update_idletasks(self):
+        logging.info('MfxRoot: update_idletasks')
+        Clock.schedule_once(lambda x: self.canvas.canvas.ask_update)
+
+    def unbind_all(self):
+        unbind_destroy(self.hbar)
+        unbind_destroy(self.vbar)
+        unbind_destroy(self.canvas)
+        unbind_destroy(self.frame)
+
+    def createFrame(self, kw):
+        logging.info('MfxRoot: createFrame')
+        # width = kw.get("width")
+        # height = kw.get("height")
+        print('createFrame: kw=%s' % kw)
+        # self.frame = Tkinter.Frame(self.parent, width=width, height=height)
+
+        self.frame = LScrollFrame(size_hint=(1, 1))
+
+        print("createFrame: self.parent %s" % str(self.frame))
+
+    def createCanvas(self, kw):
+        logging.info('MfxRoot: createCanvas')
+        # bd = kw['bd']
+        kw['bd'] = 0
+        # relief = kw['relief']
+        del kw['relief']
+        # frame = Tkinter.Frame(self.frame, bd=bd, relief=relief)
+        # frame.grid(row=0, column=0, sticky="news")
+        '''
+        self.canvas = MfxCanvas(self.frame, **kw)
+        self.frame.add_widget(self.canvas)
+        self.parent.pushWork(self.frame)
+        '''
+        self.canvas = MfxCanvas(self.parent, **kw)
+        self.frame = self.canvas
+        self.parent.pushWork('playground', self.frame)
+        ''
+        # self.canvas.pack(expand=True, fill='both')
+
+    def createHbar(self):
+        pass
+        '''
+        self.hbar = Tkinter.Scrollbar(self.frame, takefocus=0,
+                                      orient="horizontal")
+        self.canvas["xscrollcommand"] = self._setHbar
+        self.hbar["command"] = self.canvas.xview
+        self.hbar.grid(row=1, column=0, sticky="we")
+        self.hbar.grid_remove()
+        '''
+
+    def createVbar(self):
+        pass
+        '''
+        self.vbar = Tkinter.Scrollbar(self.frame, takefocus=0)
+        self.canvas["yscrollcommand"] = self._setVbar
+        self.vbar["command"] = self.canvas.yview
+        self.vbar.grid(row=0, column=1, sticky="ns")
+        self.vbar.grid_remove()
+        '''
+
+    def bindHbar(self, w=None):
+        if w is None:
+            w = self.canvas
+        bind(w, "<KeyPress-Left>", self.unit_left)
+        bind(w, "<KeyPress-Right>", self.unit_right)
+
+    def bindVbar(self, w=None):
+        if w is None:
+            w = self.canvas
+        bind(w, "<KeyPress-Prior>", self.page_up)
+        bind(w, "<KeyPress-Next>", self.page_down)
+        bind(w, "<KeyPress-Up>", self.unit_up)
+        bind(w, "<KeyPress-Down>", self.unit_down)
+        bind(w, "<KeyPress-Begin>", self.scroll_top)
+        bind(w, "<KeyPress-Home>", self.scroll_top)
+        bind(w, "<KeyPress-End>", self.scroll_bottom)
+        # mousewheel support
+        if WIN_SYSTEM == 'x11':
+            bind(w, '<4>', self.mouse_wheel_up)
+            bind(w, '<5>', self.mouse_wheel_down)
+        # don't work on Linux
+        # bind(w, '<MouseWheel>', self.mouse_wheel)
+
+    def mouse_wheel(self, *args):
+        pass
+
+    def _setHbar(self, first, last):
+        if self.canvas.busy:
+            return
+        sb = self.hbar
+        if float(first) <= 0 and float(last) >= 1:
+            sb.grid_remove()
+            self.hbar_show = False
+        else:
+            if self.canvas.winfo_ismapped():
+                sb.grid()
+                self.hbar_show = True
+        sb.set(first, last)
+
+    def _setVbar(self, first, last):
+        if self.canvas.busy:
+            return
+        sb = self.vbar
+        if float(first) <= 0 and float(last) >= 1:
+            sb.grid_remove()
+            self.vbar_show = False
+        else:
+            if self.canvas.winfo_ismapped():
+                sb.grid()
+                self.vbar_show = True
+        sb.set(first, last)
+
+    def _xview(self, *args):
+        if self.hbar_show:
+            self.canvas.xview(*args)
+        return 'break'
+
+    def _yview(self, *args):
+        if self.vbar_show:
+            self.canvas.yview(*args)
+        return 'break'
+
+    def page_up(self, *event):
+        return self._yview('scroll', -1, 'page')
+
+    def page_down(self, *event):
+        return self._yview('scroll', 1, 'page')
+
+    def unit_up(self, *event):
+        return self._yview('scroll', -1, 'unit')
+
+    def unit_down(self, *event):
+        return self._yview('scroll', 1, 'unit')
+
+    def mouse_wheel_up(self, *event):
+        return self._yview('scroll', -5, 'unit')
+
+    def mouse_wheel_down(self, *event):
+        return self._yview('scroll', 5, 'unit')
+
+    def page_left(self, *event):
+        return self._xview('scroll', -1, 'page')
+
+    def page_right(self, *event):
+        return self._xview('scroll', 1, 'page')
+
+    def unit_left(self, *event):
+        return self._xview('scroll', -1, 'unit')
+
+    def unit_right(self, *event):
+        return self._xview('scroll', 1, 'unit')
+
+    def scroll_top(self, *event):
+        return self._yview('moveto', 0)
+
+    def scroll_bottom(self, *event):
+        return self._yview('moveto', 1)
+
+# ************************************************************************
+# *
+# ************************************************************************
+# not used witch kivy. would not nun as it refers TkInter.
+
+
+'''
+class StackDesc:
+
+    def __init__(self, game, stack):
+        self.game = game
+        self.stack = stack
+        self.canvas = game.canvas
+        self.bindings = []
+
+        font = game.app.getFont('canvas_small')
+        # print self.app.cardset.CARDW, self.app.images.CARDW
+        cardw = game.app.images.CARDW
+        x, y = stack.x + cardw / 2, stack.y
+        text = stack.getHelp() + '\n' + stack.getBaseCard()
+        text = text.strip()
+        if text:
+            frame = Tkinter.Frame(self.canvas)
+            self.frame = frame
+            label = Tkinter.Message(frame, font=font, text=text,
+                                    width=cardw - 8, relief='solid',
+                                    fg='#000000', bg='#ffffe0', bd=1)
+            label.pack()
+            self.label = label
+            self.id = self.canvas.create_window(
+                x, y, window=frame, anchor='n')
+            self.bindings.append(label.bind(
+                '<ButtonPress>', self._buttonPressEvent))
+            # self.bindings.append(label.bind('<Enter>', self._enterEvent))
+        else:
+            self.id = None
+
+    def _buttonPressEvent(self, *event):
+        # self.game.deleteStackDesc()
+        self.frame.tkraise()
+
+    def _enterEvent(self, *event):
+        self.frame.tkraise()
+
+    def delete(self):
+        if self.id:
+            self.canvas.delete(self.id)
+            for b in self.bindings:
+                self.label.unbind('<ButtonPress>', b)
+'''
diff --git a/pysollib/kivy/tkwrap.py b/pysollib/kivy/tkwrap.py
new file mode 100644
index 00000000..805959cc
--- /dev/null
+++ b/pysollib/kivy/tkwrap.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+#
+# Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer
+# Copyright (C) 2003 Mt. Hood Playing Card Co.
+# Copyright (C) 2005-2009 Skomoroh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+__all__ = ['TclError',
+           'MfxRoot']
+
+E402Fix = True
+if E402Fix:
+    import logging
+    from kivy.cache import Cache
+
+TclError = 0
+
+
+def MfxRoot(**kw):
+    mainWindow = Cache.get('LAppCache', 'mainWindow')
+    logging.info('tkwrap: top = %s' % str(mainWindow))
+    return mainWindow
diff --git a/pysollib/kivy/toolbar.py b/pysollib/kivy/toolbar.py
new file mode 100644
index 00000000..692f6b43
--- /dev/null
+++ b/pysollib/kivy/toolbar.py
@@ -0,0 +1,331 @@
+#!/usr/bin/env python
+# -*- mode: python; coding: utf-8; -*-
+# ---------------------------------------------------------------------------#
+# Copyright (C) 2016-2017 LB
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ---------------------------------------------------------------------------#
+
+__all__ = ['PysolToolbarTk']
+
+E402Fix = True
+
+if E402Fix:
+    # imports
+    import os
+
+    # PySol imports
+    # from pysollib.mfxutil import destruct
+    from pysollib.util import IMAGE_EXTENSIONS
+    from pysollib.settings import TITLE
+    from pysollib.winsystems import TkSettings
+    from pysollib.mygettext import _, n_
+
+# ************************************************************************
+# *
+# ************************************************************************
+
+
+class AbstractToolbarButton:
+    def __init__(self, parent, toolbar, toolbar_name, position):
+        self.toolbar = toolbar
+        self.toolbar_name = toolbar_name
+        self.position = position
+        self.visible = False
+
+    def show(self, orient, force=False):
+        if self.visible and not force:
+            return
+        self.visible = True
+        padx, pady = 2, 2
+        if orient == 'horizontal':
+            self.grid(row=0,
+                      column=self.position,
+                      ipadx=padx, ipady=pady,
+                      sticky='nsew')
+        else:
+            self.grid(row=self.position,
+                      column=0,
+                      ipadx=padx, ipady=pady,
+                      sticky='nsew')
+
+    def hide(self):
+        if not self.visible:
+            return
+        self.visible = False
+        self.grid_forget()
+
+# ************************************************************************
+
+
+if E402Fix:
+    from LApp import LImage
+    # from LApp import LMainWindow
+    from kivy.uix.boxlayout import BoxLayout
+    # from kivy.uix.button import Button
+    from kivy.uix.behaviors import ButtonBehavior
+    # from kivy.uix.behaviors import ToggleButtonBehavior
+    from kivy.uix.image import Image as KivyImage
+
+# ************************************************************************
+
+
+class MyButton(ButtonBehavior, KivyImage):
+    def __init__(self, **kwargs):
+        super(MyButton, self).__init__(**kwargs)
+        self.src = None
+        if ('image' in kwargs):
+            self.src = kwargs['image'].source
+        self.command = None
+        if ('command' in kwargs):
+            self.command = kwargs['command']
+        self.source = self.src
+        self.allow_stretch = True
+
+    def on_press(self):
+        self.allow_stretch = False
+
+    def on_release(self):
+        self.allow_stretch = True
+        if (self.command is not None):
+            self.command()
+
+
+class MyCheckButton(ButtonBehavior, KivyImage):
+    def __init__(self, **kwargs):
+        super(MyCheckButton, self).__init__(**kwargs)
+        self.src = None
+        if ('image' in kwargs):
+            self.src = kwargs['image'].source
+        self.command = None
+        if ('command' in kwargs):
+            self.command = kwargs['command']
+        self.variable = None
+        if ('variable' in kwargs):
+            self.variable = kwargs['variable']
+        self.win = None
+        if ('win' in kwargs):
+            self.win = kwargs['win']
+        self.source = self.src
+        self.allow_stretch = True
+        self.checked = False
+
+        # self.variable = self.win.app.menubar.tkopt.pause
+        if self.variable:
+            self.variable.bind(value=self.updateState)
+
+    def updateState(self, obj, val):
+        if (val):
+            self.allow_stretch = False
+        else:
+            self.allow_stretch = True
+
+    def isChecked(self):
+        return self.checked
+
+    def on_press(self):
+        if self.win is None:
+            return
+        if self.win.app is None:
+            return
+        if self.win.app.game is None:
+            return
+
+        game = self.win.app.game
+        if game.finished:
+            return
+        if game.demo:
+            return
+
+        # if self.win.app.menubar == None: return
+        # mb = self.win.app.menubar
+
+        if game.pause:
+            self.allow_stretch = True
+            self.checked = False
+            if (self.command is not None):
+                self.command()
+        else:
+            self.allow_stretch = False
+            self.checked = True
+            if (self.command is not None):
+                self.command()
+
+    def on_release(self):
+        pass
+
+# ************************************************************************
+# * Note: Applications should call show/hide after constructor.
+# ************************************************************************
+
+
+class PysolToolbarTk(BoxLayout):
+    def __init__(
+            self,
+            top,
+            menubar,
+            dir,
+            size=0,
+            relief='flat',
+            compound='none'):
+
+        super(PysolToolbarTk, self).__init__(orientation='vertical')
+        self.size_hint = (0.05, 1.0)
+        # self.size_hint=(None, 1.0)
+        # self.width = 50
+        self.win = top
+        self.menubar = menubar
+        self.dir = dir
+        self.win.setTool(self, 3)
+
+        for label, f, t in (
+            (n_("New"),      self.mNewGame,   _("New game")),
+            (n_("Restart"),  self.mRestart,   _("Restart the\ncurrent game")),
+            (None,           None,            None),
+            # (n_("Open"),     self.mOpen,      _("Open a\nsaved game")),
+            # (n_("Save"),     self.mSave,      _("Save game")),
+            (None,           None,            None),
+            (n_("Undo"),     self.mUndo,      _("Undo last move")),
+            (n_("Redo"),     self.mRedo,      _("Redo last move")),
+            (n_("Autodrop"), self.mDrop,      _("Auto drop cards")),
+            (n_("Shuffle"),  self.mShuffle,   _("Shuffle tiles")),
+            (n_("Pause"),    self.mPause,     _("Pause game")),
+            (None,           None,            None),
+            # (n_("Statistics"), self.mPlayerStats, _("View statistics")),
+            (n_("Rules"),    self.mHelpRules, _("Rules for this game")),
+            (None,           None,            None),
+            (n_("Quit"),     self.mHoldAndQuit,      _("Quit ") + TITLE),
+        ):
+            if label is None:
+                # sep = self._createSeparator()
+                # sep.bind("<1>", self.clickHandler)
+                # sep.bind("<3>", self.rightclickHandler)
+                pass
+            elif label == 'Pause':
+                self._createButton(label, f, check=True, tooltip=t)
+            else:
+                self._createButton(label, f, tooltip=t)
+
+            # hier gibt es noch ein 'player label' mit contextmenu, wo
+            # der spielername gewählt und die spielstatistik etc.
+            # angezeigt werden könnte (TBD):
+            '''
+        sep = self._createFlatSeparator()
+        sep.bind("<1>", self.clickHandler)
+        sep.bind("<3>", self.rightclickHandler)
+        self._createLabel("player", label=n_('Player'),
+                          tooltip=_("Player options"))
+        #
+        self.player_label.bind("<1>", self.mOptPlayerOptions)
+        # self.player_label.bind("<3>", self.mOptPlayerOptions)
+        self.popup = MfxMenu(master=None, label=n_('Toolbar'), tearoff=0)
+        createToolbarMenu(menubar, self.popup)
+        self.frame.bind("<1>", self.clickHandler)
+        self.frame.bind("<3>", self.rightclickHandler)
+        #
+        self.setCompound(compound, force=True)
+            '''
+
+    def show(self, on, **kw):
+        side = self.menubar.tkopt.toolbar.get()
+        self.win.setTool(None, side)
+        return False
+
+    def mHoldAndQuit(self, *args):
+        if not self._busy():
+            self.menubar.mHoldAndQuit()
+        return 1
+
+    def getSize(self):
+        return 0
+
+    def updateText(self, **kw):
+        pass
+
+    def config(self, w, v):
+        print('PysolToolbarTk: config %s, %s' % (w, v))
+        # y = self.yy
+        pass
+
+    # Lokale.
+
+    def _loadImage(self, name):
+        file = os.path.join(self.dir, name)
+        image = None
+        for ext in IMAGE_EXTENSIONS:
+            file = os.path.join(self.dir, name + ext)
+            if os.path.isfile(file):
+                image = LImage(source=file)
+                # print('_loadImage: file=%s' % file)
+                # image = Tkinter.PhotoImage(file=file)
+                break
+        return image
+
+    def _createButton(self, label, command, check=False, tooltip=None):
+        name = label.lower()
+        image = self._loadImage(name)
+        # position = len(self._widgets)
+        button_relief = TkSettings.toolbar_button_relief
+        bd = TkSettings.toolbar_button_borderwidth
+        padx, pady = TkSettings.toolbar_button_padding
+        kw = {
+            # 'position'     : position,
+            'toolbar': self,
+            'toolbar_name': name,
+            'command': command,
+            'takefocus': 0,
+            'text': _(label),
+            'bd': bd,
+            'relief': button_relief,
+            'padx': padx,
+            'pady': pady,
+            'overrelief': 'raised',
+        }
+        # print ('toolbar:  print %s' % self.win)
+        # print ('toolbar:  print %s' % self.win.app)
+        kw['win'] = self.win
+        if image:
+            kw['image'] = image
+        if check:
+            kw['offrelief'] = button_relief
+            kw['indicatoron'] = False
+            kw['selectcolor'] = ''
+
+            button = MyCheckButton(**kw)
+        else:
+            button = MyButton(**kw)
+
+        # button.show(orient=self.orient)
+        setattr(self, name + "_image", image)
+        setattr(self, name + "_button", button)
+        # self._widgets.append(button)
+        self.add_widget(button)
+
+        # TBD: tooltip ev. auf basis einer statuszeile implementieren
+        # if tooltip:
+        #   b = MfxTooltip(button)
+        #   self._tooltips.append(b)
+        #   b.setText(tooltip)
+        return button
+
+    def _busy(self):
+        # if not self.side or not self.game or not self.menubar:
+        #   return 1
+        if not self.game or not self.menubar:
+            return 1
+        print('_busy:')
+        self.game.stopDemo()
+        self.game.interruptSleep()
+        return self.game.busy
diff --git a/pysollib/main.py b/pysollib/main.py
index 8cceb8ac..d32d227a 100644
--- a/pysollib/main.py
+++ b/pysollib/main.py
@@ -21,7 +21,6 @@
 #
 # ---------------------------------------------------------------------------##
 
-
 # imports
 import os
 import sys
@@ -38,8 +37,8 @@ from pysollib.gamedb import GAME_DB
 from pysollib.pysolaudio import AbstractAudioClient, \
         PysolSoundServerModuleClient
 from pysollib.pysolaudio import Win32AudioClient, OSSAudioClient, \
-        PyGameAudioClient
-from pysollib.settings import TITLE, SOUND_MOD
+        PyGameAudioClient, KivyAudioClient
+from pysollib.settings import TITLE, SOUND_MOD, TOOLKIT
 from pysollib.winsystems import init_root_window
 
 # Toolkit imports
@@ -48,15 +47,30 @@ from pysollib.pysoltk import MfxMessageDialog
 from pysollib.pysoltk import MfxRoot
 from pysollib.pysoltk import PysolProgressBar
 
-
 # ************************************************************************
 # *
 # ************************************************************************
 
-def fatal_no_cardsets(app):
-    app.wm_withdraw()
-    MfxMessageDialog(app.top, title=_("%s installation error") % TITLE,
-                     text=_('''No cardsets were found !!!
+if TOOLKIT == 'kivy':
+    from pysollib.mfxutil import getprefdir
+    from pysollib.settings import PACKAGE
+
+    def fatal_no_cardsets(app):
+        app.wm_withdraw()
+        MfxMessageDialog(app.top, title=_("%s installation error") % TITLE,
+                         text=_('''No cardsets were found !!!
+
+Cardsets should be installed into:
+%s/cardsets/
+
+Please check your %s installation.
+''') % (getprefdir(PACKAGE), TITLE),
+            bitmap="error", strings=(_("&Quit"),))
+else:
+    def fatal_no_cardsets(app):
+        app.wm_withdraw()
+        MfxMessageDialog(app.top, title=_("%s installation error") % TITLE,
+                         text=_('''No cardsets were found !!!
 
 Main data directory is:
 %s
@@ -242,17 +256,23 @@ def pysol_init(app, args):
               'pygame':  PyGameAudioClient,
               'oss':     OSSAudioClient,
               'win':     Win32AudioClient}
+    if TOOLKIT == 'kivy':
+        sounds['kivy'] = KivyAudioClient
     if opts["nosound"] or SOUND_MOD == 'none':
         app.audio = AbstractAudioClient()
     elif opts['sound-mod']:
         c = sounds[opts['sound-mod']]
         app.audio = c()
     elif SOUND_MOD == 'auto':
-        for c in (PyGameAudioClient,
-                  PysolSoundServerModuleClient,
-                  OSSAudioClient,
-                  Win32AudioClient,
-                  AbstractAudioClient):
+        snd = []
+        snd.append(PyGameAudioClient)
+        if TOOLKIT == 'kivy':
+            snd.append(KivyAudioClient)
+        snd.append(PysolSoundServerModuleClient)
+        snd.append(OSSAudioClient)
+        snd.append(Win32AudioClient)
+        snd.append(AbstractAudioClient)
+        for c in snd:
             try:
                 app.audio = c()
                 app.audio.startServer()
@@ -363,11 +383,37 @@ Please check your %s installation.
 # * main
 # ************************************************************************
 
-def main(args=None):
-    # create the application
-    app = Application()
-    r = pysol_init(app, args)
-    if r != 0:
-        return r
-    # let's go - enter the mainloop
-    app.mainloop()
+
+if TOOLKIT == 'kivy':
+        from pysollib.kivy.LApp import LApp
+        import logging
+
+        class KivyApp(LApp):
+            def __init__(self, args):
+                super(KivyApp, self).__init__()
+                self.args = args
+
+            def build(self):
+                logging.info("KivyApp: build")
+
+                self.app = app = Application()
+                app.top = self.mainWindow
+                self.startCode = pysol_init(app, self.args)
+
+                logging.info('Main: App Initialised - starting main loop')
+                return self.mainWindow
+
+        def main(args=None):
+            logging.basicConfig(level=logging.INFO)
+            KivyApp(args).run()
+
+else:
+
+    def main(args=None):
+        # create the application
+        app = Application()
+        r = pysol_init(app, args)
+        if r != 0:
+            return r
+        # let's go - enter the mainloop
+        app.mainloop()
diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py
index 31742dd5..41540930 100644
--- a/pysollib/mfxutil.py
+++ b/pysollib/mfxutil.py
@@ -104,7 +104,10 @@ def print_err(s, level=1):
         ss = PACKAGE+': WARNING:'
     elif level == 2:
         ss = PACKAGE+': DEBUG WARNING:'
-    print_(ss, s.encode(locale.getpreferredencoding()), file=sys.stderr)
+    try:
+        print_(ss, s.encode(locale.getpreferredencoding()), file=sys.stderr)
+    except Exception:
+        print_(ss, s, file=sys.stderr)
     sys.stderr.flush()
 
 
@@ -122,6 +125,13 @@ def getusername():
 
 
 def getprefdir(package):
+
+    if (TOOLKIT == 'kivy'):
+      from kivy.LApp import get_platform
+      plat = get_platform()
+      if plat == 'android':
+         os.environ['HOME'] = '/sdcard'
+
     if os.name == "nt":
         return win32_getprefdir(package)
     home = os.environ.get("HOME", "").strip()
@@ -170,6 +180,8 @@ def win32_getprefdir(package):
 # ************************************************************************
 
 def destruct(obj):
+    if TOOLKIT=='kivy': return
+
     # assist in breaking circular references
     if obj is not None:
         for k in obj.__dict__.keys():
diff --git a/pysollib/mygettext.py b/pysollib/mygettext.py
index 944cedb4..296f948e 100644
--- a/pysollib/mygettext.py
+++ b/pysollib/mygettext.py
@@ -20,7 +20,11 @@ def fix_gettext():
                                     gettext._localedirs.get(domain, None))
         except IOError:
             return message
-        return t.ugettext(message)
+        if sys.version_info >= (3, 0):
+            return t.gettext(message)
+        else:
+            return t.ugettext(message)
+
     gettext.ugettext = ugettext
 
     def ungettext(msgid1, msgid2, n):
@@ -38,7 +42,10 @@ def fix_gettext():
                 return msgid1
             else:
                 return msgid2
-        return t.ungettext(msgid1, msgid2, n)
+        if sys.version_info >= (3, 0):
+            return t.ngettext(msgid1, msgid2, n)
+        else:
+            return t.ungettext(msgid1, msgid2, n)
     gettext.ungettext = ungettext
 
 
diff --git a/pysollib/options.py b/pysollib/options.py
index 279affc7..cfe78576 100644
--- a/pysollib/options.py
+++ b/pysollib/options.py
@@ -33,7 +33,7 @@ from pysollib.configobj import configobj, validate
 import pysollib.settings
 
 # Toolkit imports
-from pysollib.pysoltk import TOOLBAR_BUTTONS
+from pysollib.pysoltk import TOOLBAR_BUTTONS, TOOLKIT
 
 from pysollib.mygettext import _
 
@@ -113,6 +113,7 @@ translate_game_names = boolean
 solver_presets = string_list
 solver_show_progress = boolean
 solver_max_iterations = integer
+display_win_message = boolean
 
 [sound_samples]
 move = boolean
@@ -251,6 +252,7 @@ class Options:
         # ('toolbar_vars', 'list'),
         # ('recent_gameid', 'list'),
         # ('favorite_gameid', 'list'),
+        ('display_win_message', 'bool'),
         ]
 
     def __init__(self):
@@ -277,11 +279,16 @@ class Options:
         self.highlight_not_matching = True
         self.mahjongg_show_removed = False
         self.mahjongg_create_solvable = 2  # 0 - none, 1 - easy, 2 - hard
+        if TOOLKIT == 'kivy':
+            self.mahjongg_create_solvable = 1  # 0 - none, 1 - easy, 2 - hard
         self.shisen_show_hint = True
         self.shisen_show_matching = False
         self.animations = 3             # default to Medium
         self.redeal_animation = True
         self.win_animation = True
+        if TOOLKIT == 'kivy':
+            self.redeal_animation = False
+            self.win_animation = False
         self.flip_animation = True
         self.compact_stacks = True
         self.shadow = True
@@ -293,6 +300,8 @@ class Options:
         self.default_tile_theme = 'default'
         self.toolbar = 1       # 0 == hide, 1,2,3,4 == top, bottom, lef, right
         # self.toolbar_style = 'default'
+        if TOOLKIT == 'kivy':
+            self.toolbar = 4  # 0 == hide, 1,2,3,4 == top, bottom, lef, right
         self.toolbar_style = 'bluecurve'
         self.toolbar_relief = 'flat'
         self.toolbar_compound = 'none'  # icons only
@@ -310,10 +319,11 @@ class Options:
         self.mouse_undo = False         # use mouse for undo/redo
         self.negative_bottom = True
         self.translate_game_names = True
+        self.display_win_message = True
         # sound
         self.sound = True
         self.sound_mode = 1
-        self.sound_sample_volume = 80
+        self.sound_sample_volume = 75
         self.sound_music_volume = 100
         self.sound_sample_buffer_size = 1  # 1 - 4 (1024 - 4096 bytes)
         self.sound_samples = {
@@ -377,6 +387,10 @@ class Options:
         self.num_recent_games = 15
         self.recent_gameid = []
         self.favorite_gameid = []
+        if TOOLKIT == 'kivy':
+            self.favorite_gameid = [2, 7, 8, 19, 140, 116, 152, 176, 181,
+                                    194, 207, 706, 721, 756, 903, 5034,
+                                    11004, 14405, 14410, 15411, 22225]
         self.last_gameid = 0            # last game played
         self.game_holded = 0            # gameid or 0
         self.wm_maximized = 0
@@ -454,6 +468,9 @@ class Options:
         c = "Standard"
         if sw < 800 or sh < 600:
             c = "2000"
+        if TOOLKIT == 'kivy':
+            c = "Standard"
+
         # if sw > 1024 and sh > 768:
         #    c = 'Dondorf'
         self.cardset = {
@@ -503,7 +520,8 @@ class Options:
         visible_buttons = [b for b in self.toolbar_vars
                            if self.toolbar_vars[b]]
         config['general']['visible_buttons'] = visible_buttons
-        config['general']['solver_presets'].remove('none')
+        if 'none' in config['general']['solver_presets']:
+            config['general']['solver_presets'].remove('none')
 
         # sound_samples
         config['sound_samples'] = self.sound_samples
diff --git a/pysollib/pysolaudio.py b/pysollib/pysolaudio.py
index 8115805a..78a27cd0 100644
--- a/pysollib/pysolaudio.py
+++ b/pysollib/pysolaudio.py
@@ -258,6 +258,79 @@ class PysolSoundServerModuleClient(AbstractAudioClient):
                 traceback.print_exc()
 
 
+# ************************************************************************
+# * Kivy audio
+# ************************************************************************
+
+class KivyAudioClient(AbstractAudioClient):
+
+    CAN_PLAY_SOUND = True
+    CAN_PLAY_MUSIC = False
+
+    def __init__(self):
+        AbstractAudioClient.__init__(self)
+        from kivy.LApp import LSoundLoader
+        self.audiodev = LSoundLoader
+        self.sound = None
+        self.queue = []
+        self.sounds = {}
+
+    def startServer(self):
+        pass
+
+    def _condPlaySample(self):
+        # print("_condPlaySample: queue = %s" % self.sounds)
+        for k in self.sounds:
+            # print("%s" % (k))
+            pass
+
+        if self.sound:
+            sound = self.sound
+            sound.stop()
+            return
+
+        if self.sound is None:
+            if len(self.queue) > 0:
+                # print("Sound play start")
+                filename = self.queue[0]
+                self.queue = self.queue[1:]
+                self.sound = self.sounds[filename]
+                if self.sound:
+                    vol = float(self.app.opt.sound_sample_volume)/100.0
+                    self.sound.volume = vol
+                    self.sound.play()
+                    print("Sound plays %s" % self.sound.source)
+                    # print("Sound is %.3f seconds" % self.sound.length)
+                    # print("Sound volume is %s" % self.sound.volume)
+            else:
+                # print("Sound queue is empty")
+                pass
+        else:
+            # print("Sound play start deferred")
+            pass
+
+    def _playSample(self, filename, priority, loop, volume):
+        self.queue.append(filename)
+        if filename not in self.sounds:
+            sound = self.audiodev.load(filename)
+            sound.bind(on_stop=self._endSample)
+            self.sounds[filename] = sound
+            # print("Sound found at %s" % sound.source)
+        self._condPlaySample()
+
+    def _endSample(self, a):
+        print('Sound: stopped, %s' % self.sound)
+        self.sound = None
+        self._condPlaySample()
+
+    def _stopSamples(self):
+        print("Sound play stop")
+        self.queue = []
+        if self.sound:
+            self.sound.stop()
+            self.sound = None
+
+
 # ************************************************************************
 # * Win32 winsound audio
 # ************************************************************************
diff --git a/pysollib/pysoltk.py b/pysollib/pysoltk.py
index 502e7178..4070f21c 100644
--- a/pysollib/pysoltk.py
+++ b/pysollib/pysoltk.py
@@ -67,6 +67,31 @@ if TOOLKIT == 'tk':
         from pysollib.tk.selectcardset import *
         from pysollib.tk.selecttree import *
 
+elif TOOLKIT=='kivy':
+     from pysollib.kivy.tkconst import *
+     from pysollib.kivy.tkutil import *
+     from pysollib.kivy.card import *
+     from pysollib.kivy.tkcanvas import *
+     from pysollib.kivy.tkwrap import *
+     from pysollib.kivy.findcarddialog import *
+     from pysollib.kivy.tkwidget import *
+     from pysollib.kivy.tkhtml import *
+     from pysollib.kivy.edittextdialog import *
+     from pysollib.kivy.tkstats import *
+     from pysollib.kivy.playeroptionsdialog import *
+     #from pysollib.kivy.soundoptionsdialog import *
+     from pysollib.kivy.timeoutsdialog import *
+     from pysollib.kivy.colorsdialog import *
+     from pysollib.kivy.fontsdialog import *
+     from pysollib.kivy.solverdialog import *
+     from pysollib.kivy.gameinfodialog import *
+     from pysollib.kivy.toolbar import *
+     from pysollib.kivy.statusbar import *
+     from pysollib.kivy.progressbar import *
+     from pysollib.kivy.menubar import *
+     from pysollib.kivy.selectcardset import *
+     from pysollib.kivy.selecttree import *
+
 else: # gtk
     from pysollib.pysolgtk.tkconst import *
     from pysollib.pysolgtk.tkutil import *
diff --git a/pysollib/stack.py b/pysollib/stack.py
index 952f9078..599ab1fc 100644
--- a/pysollib/stack.py
+++ b/pysollib/stack.py
@@ -223,6 +223,11 @@ class Stack:
         view.INIT_CARD_OFFSETS = (0, 0)
         view.INIT_CARD_YOFFSET = 0      # for reallocateCards
         view.group = MfxCanvasGroup(view.canvas)
+
+        if (TOOLKIT == 'kivy'):
+            if hasattr(view.group, 'stack'):
+                view.group.stack = self
+
         view.shrink_face_down = 1
         # image items
         view.images = Struct(
@@ -1117,6 +1122,10 @@ class Stack:
             handler(event)
         return EVENT_HANDLED
 
+    if (TOOLKIT == 'kivy'):
+        def _motionEventHandler(self, event):
+            return self.__motionEventHandler(event)
+
     def __clickEventHandler(self, event):
         if self.game.app.opt.mouse_type == 'drag-n-drop':
             cancel_drag = 1
@@ -1185,6 +1194,14 @@ class Stack:
         if self.game.busy:
             return EVENT_HANDLED
         if self.game.app.opt.mouse_type == 'drag-n-drop':
+
+            if TOOLKIT == 'kivy':
+                drag = self.game.drag
+                if drag and drag.stack:
+                    drag.stack.keepDrag(event)
+                    drag.stack.finishDrag(event)
+                return EVENT_HANDLED
+
             self.keepDrag(event)
             self.finishDrag(event)
         return EVENT_HANDLED
@@ -1363,7 +1380,13 @@ class Stack:
             return ()
         if img0 and img1:
             cx, cy = c0.x + cw + dx, c0.y + ch + dy
-            s1 = MfxCanvasImage(self.canvas, cx, cy - img0.height(),
+
+            if TOOLKIT == 'kivy':
+                height0 = img0.getHeight()
+            else:
+                height0 = img0.height()
+
+            s1 = MfxCanvasImage(self.game.canvas, cx, cy - height0,
                                 image=img1, anchor=ANCHOR_SE)
             s2 = MfxCanvasImage(self.canvas, cx, cy,
                                 image=img0, anchor=ANCHOR_SE)
@@ -1859,6 +1882,8 @@ class TalonStack(Stack,
                                                     group=self.group)
                 if TOOLKIT == 'tk':
                     self.images.redeal.tkraise(self.top_bottom)
+                elif TOOLKIT == 'kivy':
+                    self.images.redeal.tkraise(self.top_bottom)
                 elif TOOLKIT == 'gtk':
                     # FIXME
                     pass
@@ -1882,6 +1907,8 @@ class TalonStack(Stack,
                                                   group=self.group)
                 if TOOLKIT == 'tk':
                     self.texts.redeal.tkraise(self.top_bottom)
+                elif TOOLKIT == 'kivy':
+                    self.texts.redeal.tkraise(self.top_bottom)
                 elif TOOLKIT == 'gtk':
                     # FIXME
                     pass
@@ -1903,6 +1930,10 @@ class TalonStack(Stack,
         self.init_redeal.img_coord = cx, cy
         self.init_redeal.txt_coord = cx, ty
 
+        # At least display a redealImage at start, if USE_PIL is not set.
+        if USE_PIL is False:
+            self._addRedealImage()
+
     getBottomImage = Stack._getTalonBottomImage
 
     def getRedealImages(self):
diff --git a/pysollib/util.py b/pysollib/util.py
index ff4497e3..a5c03904 100644
--- a/pysollib/util.py
+++ b/pysollib/util.py
@@ -26,7 +26,7 @@ import sys
 import os
 
 # PySol imports
-from pysollib.settings import DATA_DIRS
+from pysollib.settings import DATA_DIRS, TOOLKIT
 from pysollib.mfxutil import Image
 
 from pysollib.mygettext import _
@@ -64,7 +64,7 @@ VARIABLE_REDEALS = -2
 
 CARDSET = _("cardset")
 
-IMAGE_EXTENSIONS = (".gif", ".ppm",)
+IMAGE_EXTENSIONS = (".gif", ".ppm", ".png")
 if 1 and os.name == "nt":
     IMAGE_EXTENSIONS = (".png", ".gif", ".ppm", ".jpg",)
     pass
@@ -72,11 +72,14 @@ if 1 and os.name == "nt":
 if Image:
     IMAGE_EXTENSIONS = (".png", ".gif", ".jpg", ".ppm", ".bmp")
 
+if TOOLKIT == 'kivy':
+    IMAGE_EXTENSIONS = (".png", ".bmp", ".ppm", ".jpg", ".tiff")
 
 # ************************************************************************
 # * DataLoader
 # ************************************************************************
 
+
 class DataLoader:
     def __init__(self, argv0, filenames, path=[]):
         self.dir = None
@@ -120,7 +123,6 @@ class DataLoader:
         else:
             raise OSError(str(argv0)+": DataLoader could not find " +
                           str(filenames))
-        # print path, self.path, self.dir
 
     def __findFile(self, func, filename, subdirs=None, do_raise=1):
         if subdirs is None:
diff --git a/pysollib/winsystems/common.py b/pysollib/winsystems/common.py
index efce370c..0ed2bbc1 100644
--- a/pysollib/winsystems/common.py
+++ b/pysollib/winsystems/common.py
@@ -30,8 +30,10 @@ from pysollib.settings import VERSION
 from pysollib.settings import TOOLKIT, USE_TILE
 from pysollib.settings import DEBUG
 from pysollib.mfxutil import print_err
-if USE_TILE:
-    from pysollib.tile import ttk
+
+if TOOLKIT == 'tk':
+    if USE_TILE:
+        from pysollib.tile import ttk
 
 
 def init_tile(app, top):
@@ -62,6 +64,10 @@ def set_theme(app, top, theme):
 def get_font_name(font):
     # create font name
     # i.e. "helvetica 12" -> ("helvetica", 12, "roman", "normal")
+
+    if (TOOLKIT == 'kivy'):
+        return "helvetica 12"
+
     from six.moves.tkinter_font import Font
     font_name = None
     try:
@@ -92,6 +98,8 @@ def base_init_root_window(root, app):
 
     if TOOLKIT == 'gtk':
         pass
+    if TOOLKIT == 'kivy':
+        pass
     elif USE_TILE:
         theme = app.opt.tile_theme
         init_tile(app, root)
diff --git a/pysollib/winsystems/x11.py b/pysollib/winsystems/x11.py
index d4b9ee5c..76fb1b9f 100644
--- a/pysollib/winsystems/x11.py
+++ b/pysollib/winsystems/x11.py
@@ -28,8 +28,9 @@ from pysollib.settings import TITLE
 from pysollib.settings import TOOLKIT, USE_TILE
 from pysollib.winsystems.common import base_init_root_window, \
         BaseTkSettings, get_font_name
-if USE_TILE:
-    from pysollib.tile import ttk
+if TOOLKIT == 'tk':
+    if USE_TILE:
+        from pysollib.tile import ttk
 
 
 # ************************************************************************
@@ -47,6 +48,8 @@ def init_root_window(root, app):
     # root.self.wm_maxsize(9999, 9999) # unlimited
     if TOOLKIT == 'gtk':
         pass
+    elif TOOLKIT == 'kivy':
+        pass
     elif USE_TILE:
         f = os.path.join(app.dataloader.dir, 'tcl', 'menu8.4.tcl')
         if os.path.exists(f):
diff --git a/scripts/cardconv b/scripts/cardconv
new file mode 100755
index 00000000..7ed8e7ba
--- /dev/null
+++ b/scripts/cardconv
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# converts cardset images and config files in current
+# directory from input-format to output-format.
+#
+# example to convert from gif format to png:
+#
+# $> cardconv gif png
+#
+# needs package 'ImageMagick' beeing installed.
+
+ifo=''
+if [ $1 ]
+then
+  ifo=$1
+else
+  echo 'use: cardconv <input-format> <output-format>'
+  exit
+fi
+
+ofo=''
+if [ $2 ]
+then
+  ofo=$2
+else
+  echo 'use: cardconv <input-format> <output-format>'
+  exit
+fi
+
+# alle images.
+for i in *.${ifo}; do convert $i `basename $i .${ifo}`.${ofo}; rm -f $i; done
+
+# config.txt
+if [ -f config.txt ]
+then
+  cp -a config.txt tmp.txt
+  cat tmp.txt | sed "s/.${ifo}/.${ofo}/g" >config.txt
+  rm -f tmp.txt
+fi
diff --git a/scripts/cardsetsgiftobmp b/scripts/cardsetsgiftobmp
new file mode 100755
index 00000000..1b0ecefa
--- /dev/null
+++ b/scripts/cardsetsgiftobmp
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# creates a bmp copy off all gif cardsets in the current dir.
+# uses package 'ImageMagick'
+
+ifo='gif'
+if [ $1 ]
+then
+  ifo=$1
+fi
+
+ofo='bmp'
+if [ $2 ]
+then
+  ofo=$2
+fi
+
+function chkdir()
+{
+  # convert all images
+  cd $1
+  if [ -f config.txt ]
+  then
+    g=`grep -i ".${ifo}" config.txt`
+    #echo $g
+    if [[ $g == "" ]]
+    then
+      cd ..
+      return 1
+    else
+      cd ..
+      return 0
+    fi
+  fi
+  cd ..
+  return 0
+}
+
+function convdir()
+{
+  # convert all images
+  for i in *.${ifo}; do convert $i `basename $i .${ifo}`.${ofo}; rm -f $i; done
+
+  # convert config.txt
+  if [ -f config.txt ]
+  then
+    cp -a config.txt tmp.txt
+    cat tmp.txt | sed "s/.${ifo}/.${ofo}/g" >config.txt
+    rm -f tmp.txt
+  fi
+}
+
+# check all cardsets.
+
+for k in cardset-*
+do
+  x=${k%-bmp}
+  y=$x-${ofo}
+
+  if chkdir $k
+  then
+    if [ $k != $y ]
+    then
+      if [ -a $y ]
+      then
+    	  echo "$y exists already - skipped"
+      else
+    	  echo "$y processing ..."
+        cp -a $k $y
+        cd $y
+        convdir
+        cd ..
+    	  echo "$y created"
+      fi
+    fi
+  fi
+done
diff --git a/setup.py b/setup.py
index c032b022..57721458 100644
--- a/setup.py
+++ b/setup.py
@@ -80,6 +80,7 @@ kw = {
                  'pysollib.pysolgtk',
                  'pysollib.ui',
                  'pysollib.ui.tktile',
+                 'pysollib.kivy',
                  'pysollib.games',
                  'pysollib.games.special',
                  'pysollib.games.ultra',