diff --git a/etc/controllerrc b/etc/controllerrc
index 94bf218a1d..17f424034a 100644
--- a/etc/controllerrc
+++ b/etc/controllerrc
@@ -5,16 +5,16 @@
     (debug-events no)
     (controller "GimpControllerWheel")
     (mapping
-        (map "scroll-up-alt"                 "tools-opacity-increase-skip")
-        (map "scroll-down-alt"               "tools-opacity-decrease-skip")
-        (map "scroll-up-primary-alt"         "context-gradient-select-next")
-        (map "scroll-down-primary-alt"       "context-gradient-select-previous")
-        (map "scroll-up-shift-alt"           "context-pattern-select-next")
-        (map "scroll-down-shift-alt"         "context-pattern-select-previous")
-        (map "scroll-up-shift-primary"       "context-brush-select-next")
-        (map "scroll-down-shift-primary"     "context-brush-select-previous")
-        (map "scroll-up-shift-primary-alt"   "context-font-select-next")
-        (map "scroll-down-shift-primary-alt" "context-font-select-previous")))
+        (map "scroll-up-alt"                 "tools-opacity-increase")
+        (map "scroll-down-alt"               "tools-opacity-decrease")
+        (map "scroll-up-shift-primary"       "tools-aspect-increase")
+        (map "scroll-down-shift-primary"     "tools-aspect-decrease")
+        (map "scroll-up-shift-alt"           "tools-angle-increase")
+        (map "scroll-down-shift-alt"         "tools-angle-decrease")
+        (map "scroll-up-primary-alt"         "tools-size-increase")
+        (map "scroll-down-primary-alt"       "tools-size-decrease")
+        (map "scroll-up-shift-primary-alt"   "tools-spacing-increase")
+        (map "scroll-down-shift-primary-alt" "tools-spacing-decrease")))
 
 (GimpControllerInfo "Main Keyboard"
     (enabled yes)
@@ -29,10 +29,10 @@
         (map "cursor-down-primary"  "view-scroll-bottom-border")
         (map "cursor-left-primary"  "view-scroll-left-border")
         (map "cursor-right-primary" "view-scroll-right-border")
-        (map "cursor-up-alt"        "tools-value-1-increase-skip")
-        (map "cursor-down-alt"      "tools-value-1-decrease-skip")
-        (map "cursor-left-alt"      "tools-value-1-decrease")
-        (map "cursor-right-alt"     "tools-value-1-increase")))
+        (map "cursor-up-alt"        "tools-size-increase-skip")
+        (map "cursor-down-alt"      "tools-size-decrease-skip")
+        (map "cursor-left-alt"      "tools-size-decrease")
+        (map "cursor-right-alt"     "tools-size-increase")))
 
 # (GimpControllerInfo "Linux Input Example"
 #    (enabled yes)