diff --git a/config.def.h b/config.def.h
index 44ded49..a93dde2 100644
--- a/config.def.h
+++ b/config.def.h
@@ -178,14 +178,14 @@ static unsigned int defaultattr = 11;
 static uint forcemousemod = ShiftMask;
 
 /*
- * The number of lines to scroll by when using the mouse wheel.
+ * The number of lines to scroll by.
  */
-const unsigned int mousescrollrate = 1;
+const unsigned int scrollrate = 1;
 
 /*
  * The rate to zoom in (adjust the font size).
  */
-const int zoomrate = 1;
+const unsigned int zoomrate = 1;
 
 /*
  * Internal mouse shortcuts.
@@ -193,8 +193,8 @@ const int zoomrate = 1;
  */
 static MouseShortcut mshortcuts[] = {
 	/* mask                 button   function        argument       release */
-        { XK_ANY_MOD,           Button4, kscrollup,      {.i = mousescrollrate}, 0, /* !alt */ -1 },
-	{ XK_ANY_MOD,           Button5, kscrolldown,    {.i = mousescrollrate}, 0, /* !alt */ -1 },
+        { XK_ANY_MOD,           Button4, kscrollup,      {.i = scrollrate}, 0, /* !alt */ -1 },
+	{ XK_ANY_MOD,           Button5, kscrolldown,    {.i = scrollrate}, 0, /* !alt */ -1 },
 	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
 	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
 	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
@@ -212,16 +212,16 @@ static Shortcut shortcuts[] = {
 	{ ControlMask,          XK_Print,       toggleprinter,  {.i =  0} },
 	{ ShiftMask,            XK_Print,       printscreen,    {.i =  0} },
 	{ XK_ANY_MOD,           XK_Print,       printsel,       {.i =  0} },
-	{ TERMMOD,              XK_Prior,       zoom,           {.f = zoomrate * +1} },
-	{ TERMMOD,              XK_Next,        zoom,           {.f = zoomrate * -1} },
+	{ TERMMOD,              XK_Prior,       zoom,           {.f = +1 * zoomrate} },
+	{ TERMMOD,              XK_Next,        zoom,           {.f = -1 * zoomrate} },
 	{ TERMMOD,              XK_Home,        zoomreset,      {.f =  0} },
 	{ TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
 	{ TERMMOD,              XK_V,           clippaste,      {.i =  0} },
 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
 	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
-	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
+	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1 * scrollrate} },
+	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1 * scrollrate} },
 };
 
 /*