diff --git a/build.gradle.kts b/build.gradle.kts
index 57cf63cc8..afc176b14 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -169,7 +169,7 @@ dependencies {
 	// implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
 
 	// Examples using mod jars from ./libs
-	// implementation(fg.deobf("blank:MouseTweaks-forge-mc1.19:2.23"))
+	compileOnly("yalter.mousetweaks:MouseTweaks:2.23:api")
 
 	// compile against the JEI API but do not include it at runtime
 	//compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api")
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.kt
index 40e971ac5..2546a532e 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.kt
@@ -10,7 +10,9 @@ import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
 import ru.dbotthepony.mc.otm.core.maxScrollDivision
 import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem
 import ru.dbotthepony.mc.otm.menu.DriveViewerMenu
+import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak
 
+@MouseTweaksDisableWheelTweak
 class DriveViewerScreen(menu: DriveViewerMenu, inventory: Inventory, title: Component) :
 	MatteryScreen<DriveViewerMenu>(menu, inventory, title) {
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt
index 1b027f2fc..f5a7a02d2 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt
@@ -10,7 +10,9 @@ import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.menu.ExoSuitInventoryMenu
 import ru.dbotthepony.mc.otm.network.ExoSuitMenuOpen
 import ru.dbotthepony.mc.otm.network.MatteryPlayerNetworkChannel
+import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak
 
+@MouseTweaksDisableWheelTweak
 class ExoSuitInventoryScreen(menu: ExoSuitInventoryMenu) : MatteryScreen<ExoSuitInventoryMenu>(menu, TranslatableComponent("otm.gui.exosuit")) {
 	override fun makeMainFrame(): FramePanel {
 		val frame = FramePanel(this, width = 200f, height = 180f, title = this.title)
@@ -133,10 +135,6 @@ class ExoSuitInventoryScreen(menu: ExoSuitInventoryMenu) : MatteryScreen<ExoSuit
 		ru.dbotthepony.mc.otm.client.minecraft.player?.containerMenu = menu
 	}
 
-	override fun onClose() {
-		super.onClose()
-	}
-
 	companion object {
 		val ENTITY_RECTANGLE = INVENTORY_LOCATION.element(25f, 7f, 51f, 72f)
 		val STATUS_EFFECT_BG = INVENTORY_LOCATION.element(0f, 166f, 120f, 32f)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt
index c2d990d77..34b3279fd 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt
@@ -21,7 +21,9 @@ import ru.dbotthepony.mc.otm.core.formatReadableNumber
 import ru.dbotthepony.mc.otm.core.formatSiComponent
 import ru.dbotthepony.mc.otm.menu.ItemMonitorMenu
 import ru.dbotthepony.mc.otm.storage.ITEM_STORAGE
+import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak
 
+@MouseTweaksDisableWheelTweak
 class ItemMonitorScreen(menu: ItemMonitorMenu, inventory: Inventory, title: Component) :
 	MatteryScreen<ItemMonitorMenu>(menu, inventory, title) {
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.kt
index 4cd607e14..d4e96d4e3 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.kt
@@ -15,7 +15,9 @@ import ru.dbotthepony.mc.otm.core.maxScrollDivision
 import ru.dbotthepony.mc.otm.menu.MatterPanelMenu
 import ru.dbotthepony.mc.otm.menu.ReplicationRequestPacket
 import ru.dbotthepony.mc.otm.network.MenuNetworkChannel
+import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak
 
+@MouseTweaksDisableWheelTweak
 class MatterPanelScreen(
 	menu: MatterPanelMenu,
 	inventory: Inventory,