diff --git a/README.md b/README.md
index 888b62a..2fe75e0 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@ Mod Shift|j|Move active client down stack
 Mod|k|Focus previous client on stack
 Mod Shift|k|Move active client up stack
 Mod|v|Focus first client on stack
-Mod|space|Move active client to top of stack
-Mod Shift|space|Make active client float
+Mod|Enter|Move active client to top of stack
+Mod Shift|Enter|Make active client float
 
 # Layout Control
 Modifier(s)|Key|Action
@@ -47,9 +47,9 @@ Mod|e|Toggle LF (File Manager) scratchpad
 Mod Shift|e|Spawn an LF (File Manager) window
 Mod|u|Spawn launcher menu
 Mod|backslash|Toggle calculator scratchpad
-Mod|Return|Spawn a terminal window
-Mod Shift|Return|Spawn a terminal scratchpad
-Mod Alt|Return|Spawn a terminal window in working directory of active client
+Mod|Space|Spawn a terminal window
+Mod Shift|Space|Spawn a terminal scratchpad
+Mod Alt|Space|Spawn a terminal window in working directory of active client
 Mod|b|Spawn an NMTUI (Network Manager) window
 Mod|w|Spawn Ferdium
 
diff --git a/config.h b/config.h
index 1b69d22..bc13fda 100644
--- a/config.h
+++ b/config.h
@@ -199,9 +199,8 @@ static const Key keys[] = {
     { MODKEY | ShiftMask,  XK_minus,           setlayout,          {.v = &layouts[5]} },
     { MODKEY,              XK_backslash,       togglescratch,      {.v = spqalc} },
     // { MODKEY | ShiftMask,  XK_backslash,       spawn,              {.v = (const char *[]){NULL}} },
-    { MODKEY,              XK_Return,          spawn,              {.v = (const char *[]){TERMINAL, "-d", "~", NULL}} },
-    { MODKEY | ShiftMask,  XK_Return,          togglescratch,      {.v = spterm} },
-    { MODKEY | Mod3Mask,   XK_Return,          spawn,              {.v = (const char *[]){"sd", NULL}} },
+    { MODKEY,              XK_Return,          zoom,               {0} },
+    { MODKEY | ShiftMask,  XK_Return,          togglefloating,     {0} },
     // { MODKEY,              XK_semicolon,       spawn,              {.v = (const char *[]){NULL}} },
     // { MODKEY | ShiftMask,  XK_semicolon,       spawn,              {.v = (const char *[]){NULL}} },
     { MODKEY,              XK_q,               killclient,         {0} },
@@ -218,12 +217,13 @@ static const Key keys[] = {
     { MODKEY | ShiftMask,  XK_m,               spawn,              {.v = (const char *[]){"playerctl", "-a", "stop"}} },
     { MODKEY,              XK_w,               spawn,              {.v = (const char *[]){"ferdium", NULL}} },
     // { MODKEY | ShiftMask,  XK_w,               spawn,              {.v = (const char *[]){NULL}} },
-    { MODKEY,              XK_v,             focusstack,         {.i = 0} },
-    { MODKEY | ShiftMask,  XK_v,             pushstack,          {.i = 0} },
+    { MODKEY,              XK_v,               focusstack,         {.i = 0} },
+    { MODKEY | ShiftMask,  XK_v,               pushstack,          {.i = 0} },
     // { MODKEY,              XK_z,               spawn,              {.v = (const char *[]){NULL}} },
     // { MODKEY | ShiftMask,  XK_z,               spawn,              {.v = (const char *[]){NULL}} },
-    { MODKEY,              XK_space,           zoom,               {0} },
-    { MODKEY | ShiftMask,  XK_space,           togglefloating,     {0} },
+    { MODKEY,              XK_space,           spawn,              {.v = (const char *[]){TERMINAL, "-d", "~", NULL}} },
+    { MODKEY | ShiftMask,  XK_space,           togglescratch,      {.v = spterm} },
+    { MODKEY | Mod3Mask,   XK_space,           spawn,              {.v = (const char *[]){"sd", NULL}} },
     { 0,                   XK_Print,           spawn,              SHCMD("maim ~/Photos/Screenshots/pic-full-$(date '+%y%m%d-%H%M-%S').png") },
     { ShiftMask,           XK_Print,           spawn,              {.v = (const char *[]){"dmenumaim", NULL}} },
     // { 0,                   XK_Print,           spawn,              SHCMD("flameshot full -p ${XDG_PICTURES_DIR:-$HOME/Pictures}/$(date '+%y%m%d-%H%M-%S').png") },