diff --git a/.gitignore b/.gitignore
index 151b533..35e56bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /gala-a71e8c1.tar.gz
 /gala-f02b776.tar.gz
 /gala-3661cbd.tar.gz
+/gala-985baa0.tar.gz
diff --git a/00-fedora-default-settings.patch b/00-fedora-default-settings.patch
index fb968d2..48bcfb9 100644
--- a/00-fedora-default-settings.patch
+++ b/00-fedora-default-settings.patch
@@ -1,8 +1,26 @@
 diff --git a/data/org.pantheon.desktop.gala.gschema.xml.in b/data/org.pantheon.desktop.gala.gschema.xml.in
-index 591cea4..80f31cf 100644
+index eba5b25..e47967e 100644
 --- a/data/org.pantheon.desktop.gala.gschema.xml.in
 +++ b/data/org.pantheon.desktop.gala.gschema.xml.in
-@@ -67,7 +67,7 @@
+@@ -18,7 +18,7 @@
+ 	
+ 	<schema path="/org/pantheon/desktop/gala/behavior/" id="org.pantheon.desktop.gala.behavior" gettext-domain="@GETTEXT_PACKAGE@">
+ 		<key enum="GalaActionType" name="hotcorner-topleft">
+-			<default>'none'</default>
++			<default>'open-launcher'</default>
+ 			<summary>Action for the top left corner</summary>
+ 			<description></description>
+ 		</key>
+@@ -58,7 +58,7 @@
+ 			<description>If enabled, dropping windows on vertical screen edges maximizes them vertically and resizes them horizontally to cover half of the available area. Dropping windows on the top screen edge maximizes them completely.</description>
+ 		</key>
+ 		<key type="s" name="panel-main-menu-action">
+-			<default>''</default>
++			<default>'wingpanel --toggle-indicator=app-launcher'</default>
+ 			<summary>Panel main menu action</summary>
+ 			<description>Sets the command to run when the panel-main-menu keybinding is pressed</description>
+ 		</key>
+@@ -68,7 +68,7 @@
  			<description></description>
  		</key>
  		<key type="s" name="overlay-action">
@@ -11,7 +29,7 @@ index 591cea4..80f31cf 100644
  			<summary></summary>
  			<description></description>
  		</key>
-@@ -155,7 +155,7 @@
+@@ -156,7 +156,7 @@
  			<description>When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window.</description>
  		</key>
  		<key type="s" name="button-layout">
diff --git a/gala.spec b/gala.spec
index a4da77e..2717e25 100644
--- a/gala.spec
+++ b/gala.spec
@@ -1,27 +1,25 @@
 %global __provides_exclude_from ^%{_libdir}/gala/.*\\.so$
 
-%global commit      3661cbd77a8d188d22612dc0796db8aa8030e614
+%global commit      985baa08bd2ad6fab5f3f702e12fdf298d5d41d9
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate  20180603
+%global commitdate  20180607
 
 Name:           gala
 Summary:        Gala window manager
 Version:        0.3.1
-Release:        0.3.%{commitdate}.git%{shortcommit}%{?dist}
+Release:        0.4.%{commitdate}.git%{shortcommit}%{?dist}
 License:        GPLv3+
 
 URL:            https://github.com/elementary/%{name}
 Source0:        %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 
-# Include a patch to set the default button layout to match fedora's settings
+# Include a patch to set some default settings to better match fedora
 Patch0:         00-fedora-default-settings.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
-BuildRequires:  gettext-devel
 BuildRequires:  meson
 BuildRequires:  vala
-BuildRequires:  vala-tools
 
 BuildRequires:  pkgconfig(clutter-1.0) >= 1.12.0
 BuildRequires:  pkgconfig(clutter-gtk-1.0)
@@ -124,6 +122,9 @@ desktop-file-validate \
 
 
 %changelog
+* Wed Jun 13 2018 Fabio Valentini <decathorpe@gmail.com> - 0.3.1-0.4.20180607.git985baa0
+- Bump to commit 985baa0 and update default settings overrides.
+
 * Sun Jun 03 2018 Fabio Valentini <decathorpe@gmail.com> - 0.3.1-0.3.20180603.git3661cbd
 - Bump to commit 3661cbd.
 
diff --git a/sources b/sources
index b88ccb3..a2ce8d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gala-3661cbd.tar.gz) = ac08d1b5fb0e1c8244b0da47fe6b5c9609da764f3ab451bac59deb7d223b751a5b52ca6fe1f1bce4b1f78b0a10e6c042195846b6ac0d84ff72921e73b4dac4c5
+SHA512 (gala-985baa0.tar.gz) = 3eda966b276f404dfd0f056524a3de8e691306ae687b2b8de1d34e57b3578b36b061f390190235ad0ee7c76714e610df259dab3e06cc2bd322d0c8012a3220d3