diff --git a/mac/gramps.bundle b/mac/gramps.bundle
index e3f9ca8e1..1562cbf4e 100644
--- a/mac/gramps.bundle
+++ b/mac/gramps.bundle
@@ -32,7 +32,12 @@
   </binary>
 <!-- Copy in the input methods. Dunno if they actually work with OSX. -->
   <binary>
-    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/im-quartz.so
+  </binary>
+
+<!-- Copy in the theme engines, -->
+  <binary>
+    ${prefix}/lib/gtk-3.0/${pkg:${gtk}:gtk_binary_version}/theming-engines/*.so
   </binary>
 
 <!-- And the print backends -->
@@ -201,6 +206,10 @@
     ${prefix}/share/themes
   </data>
 
+  <data>
+    ${prefix}/share/icons
+  </data>
+
   <!-- Copy icons. Note that the .icns file is an Apple format which
        contains up to 4 sizes of icon. You can use
        /Developer/Applications/Utilities/Icon Composer.app to import
@@ -213,17 +222,9 @@
     ${project}/gramps.accel
   </data>
 
-  <!-- Icon themes to copy. The "icons" property can be either of
-       "auto", "all", or "none". All or none should be
-       self-explanatory, while auto means that the script will try to
-       figure out which icons are needed. This is done by getting all
-       the strings from all copied binaries, and matching them against
-       icon names. To be safe, you should use "all". "none" is useful
-       if you want just the index.theme file but no icons, mostly
-       needed for the "hicolor" base theme.
-  >
-  <icon-theme icons="auto">
-    Tango
-  </icon-theme -->
+  <!-- Default settings file to set the theme. -->
+  <data dest="${bundle}/Contents/Resources/etc/gtk-3.0/settings.ini">
+    ${project}/settings.ini
+  </data>
 
 </app-bundle>
diff --git a/mac/gramps.modules b/mac/gramps.modules
index b73332f7d..61079d419 100644
--- a/mac/gramps.modules
+++ b/mac/gramps.modules
@@ -62,6 +62,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
 	    checkoutdir="gramps-git"/>
     <dependencies>
       <dep package="meta-gtk-osx-python-gtk3"/>
+      <dep package="meta-gtk-osx-gtk3-core-themes"/>
       <dep package="goocanvas2"/>
       <dep package="librsvg"/>
       <dep package="shared-mime-info"/>
@@ -97,7 +98,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
     <branch module="gramps-addons/trunk/contrib"
 	    repo="gramps-addons"/>
     <dependencies>
-      <dep package="gramps-svn"/>
+      <dep package="gramps-git"/>
     </dependencies>
   </distutils>
 
diff --git a/mac/settings.ini b/mac/settings.ini
new file mode 100644
index 000000000..8113c1ab7
--- /dev/null
+++ b/mac/settings.ini
@@ -0,0 +1,4 @@
+[Settings]
+gtk-key-theme-name = Emacs
+gtk-theme-name = Adwaita
+