diff --git a/data/init.in b/data/init.in
index 1fb45e1b..c0bb93a0 100644
--- a/data/init.in
+++ b/data/init.in
@@ -15,7 +15,6 @@ session.screen0.fullMaximization:	False
 session.screen0.edgeSnapThreshold:	0
 session.screen0.rowPlacementDirection:	LeftToRight
 session.screen0.workspaces:	4
-session.screen0.focusLastWindow:	True
 session.screen0.colPlacementDirection:	TopToBottom
 session.screen0.windowPlacement:	RowSmartPlacement
 session.screen0.tab.width:	64
@@ -31,4 +30,4 @@ session.colorsPerChannel:	4
 session.doubleClickInterval:	250
 session.cacheMax:	200
 session.imageDither:	True
-session.configVersion:	5
+session.configVersion:	6
diff --git a/data/keys b/data/keys
index 85d1f719..29f90e82 100644
--- a/data/keys
+++ b/data/keys
@@ -10,6 +10,10 @@ OnToolbar Mouse5 :PrevWorkspace
 OnWindow Mod1 Mouse1 :StartMoving
 OnWindow Mod1 Mouse3 :StartResizing
 
+OnTitlebar Double Mouse1 :Shade
+OnTitlebar Mouse3 :WindowMenu
+OnTitlebar Mouse2 :Lower
+
 Mod1 Tab :NextWindow
 Mod1 Shift Tab :PrevWindow
 Mod1 F1 :Workspace 1
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index ac1d2a2f..4e6666e6 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -245,7 +245,7 @@ int run_updates(int old_version, FbTk::ResourceManager &rm) {
         // let's put our new keybindings first, so they're easy to find
         new_keyfile += "!mouse actions added by fluxbox-update_configs\n";
         new_keyfile += "OnTitlebar Double Mouse1 :Shade\n";
-        new_keyfile += "OnTitlebar Mouse3 :Windowmenu\n";
+        new_keyfile += "OnTitlebar Mouse3 :WindowMenu\n";
         new_keyfile += "OnTitlebar Mouse2 :Lower\n";
 
         FbTk::Resource<bool> rc_reverse(rm, false,"session.screen0.reversewheeling", "Session.Screen0.ReverseWheeling");