diff --git a/Info.plist b/Info.plist
index 8d1f38a..6c91055 100644
--- a/Info.plist
+++ b/Info.plist
@@ -350,11 +350,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>x.x</string>
 	<key>CFBundleSignature</key>
 	<string>Scid</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.0</string>
+	<string>x.x</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.4</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/Makefile.conf.darwin b/Makefile.conf.darwin
index a705d4d..78ef1fd 100644
--- a/Makefile.conf.darwin
+++ b/Makefile.conf.darwin
@@ -324,6 +324,7 @@ scid_app: all
 	install -m 755 -d dist/Scid.app/Contents/Resources/share/scid/html
 	install -m 755 -d dist/Scid.app/Contents/Resources/share/scid/sounds
 	#install -m 755 -d dist/Scid.app/Contents/Resources/share/scid/engines
+	install -m 755 -d dist/Scid.app/Contents/Resources/Scripts
 	#install -m 755 $(SCRIPTS) $(EXECS) dist/Scid.app/Contents/Resources/bin/
 	install -m 755 $(EXECS) dist/Scid.app/Contents/Resources/bin/
 	install -m 644 -p scid.eco dist/Scid.app/Contents/Resources/share/scid/data/
@@ -335,13 +336,14 @@ scid_app: all
 	install -m 644 -p ./mac_icons/Scid*.icns dist/Scid.app/Contents/Resources/
 	ditto ./html dist/Scid.app/Contents/Resources/share/scid/html
 	install -m 666 Info.plist dist/Scid.app/Contents/
-	perl -pi -e "s|\<string\>Scid x\.x\</string\>|\<string\>Scid $(SCID_VERSION)</string\>|" dist/Scid.app/Contents/Info.plist
+	perl -pi -e "s|x\.x\</string\>|$(SCID_VERSION)</string\>|" dist/Scid.app/Contents/Info.plist
 	cd dist/Scid.app/Contents/Resources/bin/ && ln -sf ../share/scid/sounds
 	cd dist/Scid.app/Contents/Resources/bin/ && ln -sf ../share/scid/html
 	sed -e 's|exec .*tkscid|exec "$(SCID_APP_BIN)tkscid"|' < scid > dist/Scid.app/Contents/Resources/bin/scid
 	for script in $(SCRIPTS); do sed -e 's|exec .*tcscid|exec "$(SCID_APP_BIN)tcscid"|' < $${script} > dist/Scid.app/Contents/Resources/bin/$${script};done
 	chmod +x dist/Scid.app/Contents/Resources/bin/*
-	cd dist/Scid.app/Contents/MacOS && ln -sf ../Resources/bin/scid
+	cd dist/Scid.app/Contents/MacOS && ln -sf ../Resources/bin/tkscid scid
+	cd dist/Scid.app/Contents/Resources/Scripts && ln -sf ../bin/scid AppMain.tcl
 
 scid_dmg: scid_app
 	install -m 755 -d dist/bitmaps
diff --git a/tcl/menus.tcl b/tcl/menus.tcl
index db0708e..444fb29 100644
--- a/tcl/menus.tcl
+++ b/tcl/menus.tcl
@@ -108,6 +108,36 @@ option add *Menu*TearOff 0
 
 menu .menu
 
+## Mac Application menu has to be before any call to configure.
+if { $macOS } {
+  # Application menu:
+  .menu add cascade -label Scid -menu .menu.apple
+  menu .menu.apple
+  
+  set menuindex -1
+  set m .menu.apple
+  
+  $m add command -label HelpAbout -command helpAbout
+  set helpMessage($m,[incr menuindex]) HelpAbout
+  
+  $m add separator
+  incr menuindex
+  
+  # To Quit
+  bind all <Command-q> "exit"
+  bind all <Command-Q> "exit"
+  
+  ## To get Help
+  bind all <Command-?> {helpWindow Contents}
+  bind all <Help> {helpWindow Contents}
+
+  # Fix Quitting on MacOS X, now it will save options on quit:
+  proc exit {}  {
+    ::file::Exit
+  }
+
+}
+
 if { $::docking::USE_DOCKING } {
   . configure -menu .menu
 } else  {
@@ -1345,37 +1383,6 @@ set helpMessage($m,[incr menuindex]) HelpAbout
 
 bind $dot_w <F1> {helpWindow Contents}
 
-### Mac Application Menu:
-
-if { $macOS } {
-  # Application menu:
-  .menu add cascade -label Scid -menu .menu.apple
-  menu .menu.apple
-  
-  set menuindex -1
-  set m .menu.apple
-  
-  $m add command -label HelpAbout -command helpAbout
-  set helpMessage($m,[incr menuindex]) HelpAbout
-  
-  $m add separator
-  incr menuindex
-  
-  # To Quit
-  bind all <Command-q> "exit"
-  bind all <Command-Q> "exit"
-  
-  # To get Help
-  bind all <Command-?> {helpWindow Contents}
-  bind all <Help> {helpWindow Contents}
-  
-  # Fix Quitting on MacOS X, now it will save options on quit:
-  proc exit {}  {
-    ::file::Exit
-  }
-}
-
-
 ##################################################
 
 # updateMenuStates:
diff --git a/tcl/start.tcl b/tcl/start.tcl
index 8e63b09..f584a15 100644
--- a/tcl/start.tcl
+++ b/tcl/start.tcl
@@ -231,10 +231,10 @@ if {$windowsOS} {
   set fontOptions(Fixed)   [list systemfixed      9 normal roman]
 } elseif {$macOS} {
   set fontOptions(Regular) [list system    11 normal roman]
-  set fontOptions(Menu)    [list system    10 normal roman]
+  set fontOptions(Menu)    [list menu      14 normal roman]
   set fontOptions(Small)   [list system    10 normal roman]
   set fontOptions(Tiny)    [list system     9 normal roman]
-  set fontOptions(Fixed)   [list fixed     10 normal roman]
+  set fontOptions(Fixed)   [list Monaco    10 normal roman]
 } else {
   set fontOptions(Regular) [list helvetica 11 normal roman]
   set fontOptions(Menu)    [list helvetica 10 normal roman]