diff --git a/wayvr/src/subsystem/hid/mod.rs b/wayvr/src/subsystem/hid/mod.rs
index 940a4ac8..7ebcbaeb 100644
--- a/wayvr/src/subsystem/hid/mod.rs
+++ b/wayvr/src/subsystem/hid/mod.rs
@@ -1,5 +1,5 @@
 use glam::Vec2;
-use idmap::{idmap, IdMap};
+use idmap::{IdMap, idmap};
 use idmap_derive::IntegerId;
 use libc::{input_event, timeval};
 use serde::Deserialize;
@@ -10,9 +10,9 @@ use xkbcommon::xkb;
 #[cfg(feature = "wayland")]
 pub mod wayland;
 
+pub mod provider;
 #[cfg(feature = "x11")]
 mod x11;
-pub mod provider;
 
 #[derive(Debug)]
 pub struct WheelDelta {
diff --git a/wayvr/src/subsystem/hid/provider/dummy.rs b/wayvr/src/subsystem/hid/provider/dummy.rs
index 578f5f6a..ecc9b4e2 100644
--- a/wayvr/src/subsystem/hid/provider/dummy.rs
+++ b/wayvr/src/subsystem/hid/provider/dummy.rs
@@ -1,6 +1,6 @@
-use glam::Vec2;
-use crate::subsystem::hid::{VirtualKey, WheelDelta, XkbKeymap};
 use crate::subsystem::hid::provider::HidProvider;
+use crate::subsystem::hid::{VirtualKey, WheelDelta, XkbKeymap};
+use glam::Vec2;
 
 pub struct DummyProvider;
 
@@ -16,4 +16,4 @@ impl HidProvider for DummyProvider {
     fn set_keymap(&mut self, _keymap: &XkbKeymap) {}
 
     fn commit(&mut self) {}
-}
\ No newline at end of file
+}
diff --git a/wayvr/src/subsystem/hid/provider/mod.rs b/wayvr/src/subsystem/hid/provider/mod.rs
index ab2581b2..f3dbb7f6 100644
--- a/wayvr/src/subsystem/hid/provider/mod.rs
+++ b/wayvr/src/subsystem/hid/provider/mod.rs
@@ -1,9 +1,9 @@
-use glam::Vec2;
 use crate::subsystem::hid::{VirtualKey, WheelDelta, XkbKeymap};
+use glam::Vec2;
 
+pub mod dummy;
 pub mod uinput;
 pub mod wl_virtual;
-pub mod dummy;
 
 pub trait HidProvider: Sync + Send {
     // Pointer Functions
@@ -12,12 +12,12 @@ pub trait HidProvider: Sync + Send {
     fn wheel(&mut self, delta: WheelDelta);
     fn set_desktop_extent(&mut self, extent: Vec2);
     fn set_desktop_origin(&mut self, origin: Vec2);
-    
+
     // Keyboard Functions
     fn set_modifiers(&mut self, mods: u8);
     fn send_key(&self, key: VirtualKey, down: bool);
     fn set_keymap(&mut self, keymap: &XkbKeymap);
-    
+
     // Common Functions
     fn commit(&mut self);
-}
\ No newline at end of file
+}
diff --git a/wayvr/src/subsystem/hid/provider/uinput.rs b/wayvr/src/subsystem/hid/provider/uinput.rs
index 15e9168e..367575f8 100644
--- a/wayvr/src/subsystem/hid/provider/uinput.rs
+++ b/wayvr/src/subsystem/hid/provider/uinput.rs
@@ -1,13 +1,19 @@
+use crate::overlays::toast::Toast;
+use crate::subsystem::hid::provider::HidProvider;
+use crate::subsystem::hid::{
+    EV_ABS, EV_KEY, EV_REL, EV_SYN, MODS_TO_KEYS, MOUSE_EXTENT, MOUSE_LEFT, MOUSE_MIDDLE,
+    MouseAction, MouseButtonAction, VirtualKey, WheelDelta, XkbKeymap, get_time, new_event,
+};
+use glam::Vec2;
+use input_linux::{
+    AbsoluteAxis, AbsoluteInfo, AbsoluteInfoSetup, EventKind, InputId, Key, RelativeAxis,
+    UInputHandle,
+};
 use std::fs::File;
 use std::intrinsics::transmute;
 use std::sync::atomic::AtomicBool;
-use glam::Vec2;
 use strum::IntoEnumIterator;
-use input_linux::{AbsoluteAxis, AbsoluteInfo, AbsoluteInfoSetup, EventKind, InputId, Key, RelativeAxis, UInputHandle};
 use wlx_common::overlays::ToastTopic;
-use crate::overlays::toast::Toast;
-use crate::subsystem::hid::{get_time, new_event, MouseAction, MouseButtonAction, VirtualKey, WheelDelta, XkbKeymap, EV_ABS, EV_KEY, EV_REL, EV_SYN, MODS_TO_KEYS, MOUSE_EXTENT, MOUSE_LEFT, MOUSE_MIDDLE};
-use crate::subsystem::hid::provider::HidProvider;
 
 pub struct UInputProvider {
     keyboard_handle: UInputHandle<File>,
@@ -238,7 +244,7 @@ Check if you're in input group, run: id -nG";
             String::with_capacity(0),
             String::from(UINPUT_DISABLED),
         )
-            .with_timeout(5.0));
+        .with_timeout(5.0));
     }
 
     if let Some(uinput) = UInputProvider::try_new() {
@@ -263,5 +269,5 @@ Check if you're in input group, run: id -nG";
         String::with_capacity(0),
         full_uinput_error,
     )
-        .with_timeout(30.0))
-}
\ No newline at end of file
+    .with_timeout(30.0))
+}
diff --git a/wayvr/src/subsystem/hid/provider/wl_virtual.rs b/wayvr/src/subsystem/hid/provider/wl_virtual.rs
index edae24a8..6bdcecb5 100644
--- a/wayvr/src/subsystem/hid/provider/wl_virtual.rs
+++ b/wayvr/src/subsystem/hid/provider/wl_virtual.rs
@@ -150,7 +150,10 @@ impl HidProvider for WlVirtualProvider {
 
     fn set_keymap(&mut self, keymap: &XkbKeymap) {
         #[cfg(debug_assertions)]
-        log::trace!("Keyboard keymap: {:?}", keymap.inner.layouts().next().unwrap_or("Unknown"));
+        log::trace!(
+            "Keyboard keymap: {:?}",
+            keymap.inner.layouts().next().unwrap_or("Unknown")
+        );
 
         let mut bytes = keymap
             .inner