diff --git a/devices/wim/config/ags/js/misc/cursorbox.js b/devices/wim/config/ags/js/misc/cursorbox.js
index cc820d8e..cc7d606c 100644
--- a/devices/wim/config/ags/js/misc/cursorbox.js
+++ b/devices/wim/config/ags/js/misc/cursorbox.js
@@ -1,4 +1,4 @@
-import { Widget } from 'resource:///com/github/Aylur/ags/widget.js';
+import { Button, EventBox } from 'resource:///com/github/Aylur/ags/widget.js';
 
 import Gdk from 'gi://Gdk';
 const display = Gdk.Display.get_default();
@@ -10,7 +10,7 @@ export default ({
     ...props
 }) => {
     if (!isButton) {
-        return Widget.EventBox({
+        return EventBox({
             ...props,
             onHover: self => {
                 if (!self.child.sensitive || !self.sensitive)
@@ -26,7 +26,7 @@ export default ({
         });
     }
     else {
-        return Widget.Button({
+        return Button({
             ...props,
             onHover: self => {
                 if (!self.child.sensitive || !self.sensitive)
diff --git a/devices/wim/config/ags/js/quick-settings/toggle-button.js b/devices/wim/config/ags/js/quick-settings/toggle-button.js
index d74a9857..474b0de2 100644
--- a/devices/wim/config/ags/js/quick-settings/toggle-button.js
+++ b/devices/wim/config/ags/js/quick-settings/toggle-button.js
@@ -4,6 +4,8 @@ import { Icon } from 'resource:///com/github/Aylur/ags/widget.js';
 import Gtk from 'gi://Gtk';
 import EventBox from '../misc/cursorbox.js';
 
+
+// TODO: use Widget.ToggleButton instead
 export default () => {
     const widget = EventBox({});