diff --git a/MANIFEST.in b/MANIFEST.in
index 6580affe..9bf48565 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,7 +5,8 @@
 ##
 include pysol setup.py setup.cfg MANIFEST.in Makefile COPYING README
 #recursive-include pysollib *.py
-include pysollib/*.py pysollib/tk/*.py pysollib/tile/*.py pysollib/pysolgtk/*.py
+include pysollib/*.py pysollib/macosx/*.py
+include pysollib/tk/*.py pysollib/tile/*.py pysollib/pysolgtk/*.py
 include pysollib/games/*.py pysollib/games/special/*.py
 include pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py
 include data/tcl/*.tcl
diff --git a/pysollib/app.py b/pysollib/app.py
index cac0cd59..0078266e 100644
--- a/pysollib/app.py
+++ b/pysollib/app.py
@@ -110,9 +110,11 @@ class Options:
         self.tile_theme = 'default'
         if WIN_SYSTEM == 'win32':
             self.tile_theme = 'winnative'
+            if sys.getwindowsversion() >= (5, 1): # xp
+                self.tile_theme = 'xpnative'
         elif WIN_SYSTEM == 'x11':
             self.tile_theme = 'step'
-        else:                           # aqua
+        elif WIN_SYSTEM == 'aqua':
             self.tile_theme = 'aqua'
         self.toolbar = 1       # 0 == hide, 1,2,3,4 == top, bottom, lef, right
         ##self.toolbar_style = 'default'
diff --git a/pysollib/tile/menubar.py b/pysollib/tile/menubar.py
index 42a91ee5..3ce355c7 100644
--- a/pysollib/tile/menubar.py
+++ b/pysollib/tile/menubar.py
@@ -1328,12 +1328,12 @@ the next time you restart """)+PACKAGE,
         all_themes.sort()
         #
         tn = {
-            'default':     'Default',
-            'classic':     'Classic',
-            'alt':         'Revitalized',
-            'winnative':   'Windows native',
-            'xpnative':    'XP Native',
-            'aqua':        'Aqua',
+            'default':     _('Default'),
+            'classic':     _('Classic'),
+            'alt':         _('Revitalized'),
+            'winnative':   _('Windows native'),
+            'xpnative':    _('XP Native'),
+            'aqua':        _('Aqua'),
             }
         for t in all_themes:
             try:
diff --git a/pysollib/tile/tkutil.py b/pysollib/tile/tkutil.py
index 4f95f651..b1cdc383 100644
--- a/pysollib/tile/tkutil.py
+++ b/pysollib/tile/tkutil.py
@@ -148,7 +148,7 @@ def makeToplevel(parent, title=None):
     window = Tkinter.Toplevel(parent) #, class_=PACKAGE)
     ##window.wm_group(parent)
     ##window.wm_command("")
-    if os.name == "posix":
+    if WIN_SYSTEM == "x11":
         window.wm_command("/bin/true")
     ##window.wm_protocol("WM_SAVE_YOURSELF", None)
     if title:
diff --git a/pysollib/tile/tkwidget.py b/pysollib/tile/tkwidget.py
index 840d6769..2f0785ab 100644
--- a/pysollib/tile/tkwidget.py
+++ b/pysollib/tile/tkwidget.py
@@ -443,17 +443,11 @@ class MfxScrolledCanvas:
         self.frame.grid_rowconfigure(0, weight=1)
         self.frame.grid_columnconfigure(0, weight=1)
         if hbar:
-            if hbar == 3:
-                w = 21
-                self.frame.grid_rowconfigure(1, minsize=w)
             self.createHbar()
             if not vbar:
                 bind(self.hbar, "<Map>", self._mapBar)
             self.bindHbar()
         if vbar:
-            if vbar == 3:
-                w = 21
-                self.frame.grid_columnconfigure(1, minsize=w)
             self.createVbar()
             bind(self.vbar, "<Map>", self._mapBar)
             self.bindVbar()
@@ -567,7 +561,6 @@ class MfxScrolledCanvas:
         # don't work on Linux
         #bind(w, '<MouseWheel>', self.mouse_wheel)
 
-
     def mouse_wheel(self, *args):
         print 'MfxScrolledCanvas.mouse_wheel', args
 
diff --git a/pysollib/tk/tkutil.py b/pysollib/tk/tkutil.py
index 629d170a..8d273af6 100644
--- a/pysollib/tk/tkutil.py
+++ b/pysollib/tk/tkutil.py
@@ -146,7 +146,7 @@ def makeToplevel(parent, title=None):
     window = Tkinter.Toplevel(parent) #, class_=PACKAGE)
     ##window.wm_group(parent)
     ##window.wm_command("")
-    if os.name == "posix":
+    if WIN_SYSTEM == "x11":
         window.wm_command("/bin/true")
     ##window.wm_protocol("WM_SAVE_YOURSELF", None)
     if title:
diff --git a/pysollib/tk/tkwrap.py b/pysollib/tk/tkwrap.py
index 327ece7e..4b9a852f 100644
--- a/pysollib/tk/tkwrap.py
+++ b/pysollib/tk/tkwrap.py
@@ -47,7 +47,7 @@ from tkFont import Font
 
 # PySol imports
 from pysollib.mfxutil import destruct, Struct
-from pysollib.settings import PACKAGE, VERSION
+from pysollib.settings import PACKAGE, VERSION, WIN_SYSTEM
 from pysollib.macosx.appSupport import setupApp
 from tkutil import after_idle, wm_set_icon
 from tkconst import EVENT_HANDLED, EVENT_PROPAGATE
diff --git a/setup.py b/setup.py
index 6acd58d6..cbdf0056 100644
--- a/setup.py
+++ b/setup.py
@@ -65,6 +65,7 @@ kw = {
     'license'      : 'GPL',
     'scripts'      : ['pysol'],
     'packages'     : ['pysollib',
+                      'pysollib.macosx',
                       'pysollib.tk',
                       'pysollib.tile',
                       'pysollib.pysolgtk',