diff --git a/App.xaml.cs b/App.xaml.cs
index 8f64b0b..0bcb75b 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -1,50 +1,79 @@
-using Microsoft.UI.Xaml;
+using H.NotifyIcon;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
-using Microsoft.UI.Xaml.Shapes;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace ThreeFingersDragOnWindows
+using System.Diagnostics;
+using ThreeFingersDragOnWindows.src.settings;
+using ThreeFingersDragOnWindows.src.touchpad;
+using ThreeFingersDragOnWindows.src.Utils;
+
+namespace ThreeFingersDragOnWindows;
+
+public partial class App : Application
 {
-    /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class.
-    /// </summary>
-    public partial class App : Application
+
+    public static SettingsData SettingsData;
+    private SettingsWindow _settingsWindow;
+
+
+    public HandlerWindow HandlerWindow;
+    
+
+    public App()
+    {
+        Debug.WriteLine("Starting ThreeFingersDragOnWindows...");
+        this.InitializeComponent();
+
+        SettingsData = SettingsData.load();
+
+
+        HandlerWindow = new HandlerWindow(this);
+        //if (SettingsData.IsFirstRun) ShowSettingsWindow();
+
+
+        //_notifyIcon.Icon = new Icon("Resources/icon.ico");
+        //_notifyIcon.Text = "ThreeFingersDragOnWindows";
+        //_notifyIcon.Click += (_, _) => ShowSettingsWindow();
+
+        //var button = new ToolStripButton("Quit");
+        //button.Click += (_, _) => Quit();
+        //_notifyIcon.ContextMenuStrip = new ContextMenuStrip();
+        //_notifyIcon.ContextMenuStrip.Items.Add(button);
+        //_notifyIcon.Visible = true;
+    }
+
+
+    public void OpenSettingsWindow()
+    {
+        _settingsWindow = new SettingsWindow(this);
+        _settingsWindow.Activate();
+    }
+
+    public void OnClosePrefsWindow()
+    {
+        SettingsData = null;
+    }
+
+    public void Quit()
     {
-        /// <summary>
-        /// Initializes the singleton application object.  This is the first line of authored code
-        /// executed, and as such is the logical equivalent of main() or WinMain().
-        /// </summary>
-        public App()
-        {
-            this.InitializeComponent();
-        }
-
-        /// <summary>
-        /// Invoked when the application is launched.
-        /// </summary>
-        /// <param name="args">Details about the launch request and process.</param>
-        protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
-        {
-            m_window = new SettingsWindow();
-            m_window.Activate();
-        }
-
-        private Window m_window;
+        HandlerWindow?.Close();
+        _settingsWindow?.Close();
     }
+
+    public void OnTouchpadContact(TouchpadContact[] contacts)
+    {
+        _settingsWindow?.OnTouchpadContact(contacts);
+    }
+
+    public bool DoTouchpadExist()
+    {
+        return HandlerWindow.TouchpadExists;
+    }
+
+    public bool DoTouchpadRegistered()
+    {
+        return HandlerWindow.TouchpadRegistered;
+    }
+
+
 }
+
diff --git a/Assets/icon.ico b/Assets/icon.ico
index 19eeec3..caf0a50 100644
Binary files a/Assets/icon.ico and b/Assets/icon.ico differ
diff --git a/Assets/icon.png b/Assets/icon.png
new file mode 100644
index 0000000..77ecfa9
Binary files /dev/null and b/Assets/icon.png differ
diff --git a/SettingsData.cs b/SettingsData.cs
new file mode 100644
index 0000000..01cfddd
--- /dev/null
+++ b/SettingsData.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Xml.Serialization;
+using Windows.Storage;
+
+namespace ThreeFingersDragOnWindows.src.settings;
+
+public class SettingsData
+{
+    public bool AllowReleaseAndRestart { get; set; } = true;
+    public int ReleaseDelay { get; set; } = 500;
+
+    public bool ThreeFingersMove { get; set; } = true;
+    public float MouseSpeed { get; set; } = 30;
+    public float MouseAcceleration { get; set; } = 1;
+
+    public static bool IsFirstRun { get; set; } = true;
+
+    public static SettingsData load()
+    {
+        var mySerializer = new XmlSerializer(typeof(SettingsData));
+        var myFileStream = new FileStream(getPath(true), FileMode.Open);
+        var up = (SettingsData) mySerializer.Deserialize(myFileStream);
+        myFileStream.Close();
+        return up;
+    }
+
+    public void save()
+    {
+        var mySerializer = new XmlSerializer(typeof(SettingsData));
+        var myWriter = new StreamWriter(getPath(false));
+        mySerializer.Serialize(myWriter, this);
+        myWriter.Close();
+    }
+
+    private static string getPath(bool createIfEmpty)
+    {
+        var dirPath = ApplicationData.Current.LocalFolder.Path;
+        var filePath = Path.Combine(dirPath, "preferences.xml");
+
+        if (!Directory.Exists(dirPath) || !File.Exists(filePath))
+        {
+            Debug.WriteLine("First run: creating settings file");
+            Directory.CreateDirectory(dirPath);
+            IsFirstRun = true;
+            if (createIfEmpty) new SettingsData().save();
+        }
+
+        return filePath;
+    }
+}
\ No newline at end of file
diff --git a/SettingsWindow.xaml b/SettingsWindow.xaml
index a5cef89..c30646a 100644
--- a/SettingsWindow.xaml
+++ b/SettingsWindow.xaml
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-
 <Window
-    x:Class="ThreeFingersDragOnWindows.SettingsWindow"
+    x:Class="ThreeFingersDragOnWindows.src.settings.SettingsWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:ThreeFingersDragOnWindows"
+    xmlns:local="using:ThreeFingersDragOnWindows.src.settings"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
+    mc:Ignorable="d"
+    Closed="Window_Closed">
 
 
     <RelativePanel>
diff --git a/SettingsWindow.xaml.cs b/SettingsWindow.xaml.cs
index 0dcf27d..515d9d6 100644
--- a/SettingsWindow.xaml.cs
+++ b/SettingsWindow.xaml.cs
@@ -1,36 +1,107 @@
-using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Navigation;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.ApplicationModel.Core;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.ViewManagement;
-
-namespace ThreeFingersDragOnWindows
+using System.Diagnostics;
+using ThreeFingersDragOnWindows.src.Utils;
+
+namespace ThreeFingersDragOnWindows.src.settings;
+
+
+public sealed partial class SettingsWindow : Window
 {
 
-    public sealed partial class SettingsWindow : Window
+    private readonly App _app;
+
+    public SettingsWindow(App app)
     {
-        public SettingsWindow()
-        {
-            this.InitializeComponent();
-            ExtendsContentIntoTitleBar = true; // enable custom titlebar
-            SetTitleBar(TitleBar); // set user ui element as titlebar
-        }
+        _app = app;
+        Debug.WriteLine("Starting SettingssWindow...");
+
+
+        this.InitializeComponent();
+        //ExtendsContentIntoTitleBar = true; // enable custom titlebar
+        //SetTitleBar(TitleBar); // set TitleBar element as titlebar
+
+        /* TouchpadExists.Text = _app.DoTouchpadExist() ? "Yes" : "No";
+        TouchpadRegistered.Text = _app.DoTouchpadRegistered() ? "Yes" : "No";
+
+        AllowReleaseAndRestart.IsChecked = App.Prefs.AllowReleaseAndRestart;
+        AllowReleaseAndRestart.Checked += (_, _) => App.Prefs.AllowReleaseAndRestart = true;
+        AllowReleaseAndRestart.Unchecked += (_, _) => App.Prefs.AllowReleaseAndRestart = false;
+        ReleaseDelay.Text = App.Prefs.ReleaseDelay.ToString();
+        ReleaseDelay.TextChanged += (_, _) => {
+            if (!int.TryParse(ReleaseDelay.Text, out var delay))
+            {
+                ReleaseDelay.Text = App.Prefs.ReleaseDelay.ToString();
+                return;
+            }
+
+            App.Prefs.ReleaseDelay = delay;
+        };
+
+        ThreeFingersMove.IsChecked = App.Prefs.ThreeFingersMove;
+        ThreeFingersMove.Checked += (_, _) => App.Prefs.ThreeFingersMove = true;
+        ThreeFingersMove.Unchecked += (_, _) => App.Prefs.ThreeFingersMove = false;
+        MouseSpeed.Value = App.Prefs.MouseSpeed;
+        MouseSpeed.ValueChanged += (_, _) => App.Prefs.MouseSpeed = (float)MouseSpeed.Value;
+        MouseAcceleration.Value = App.Prefs.MouseAcceleration;
+        MouseAcceleration.ValueChanged += (_, _) => App.Prefs.MouseAcceleration = (float)MouseAcceleration.Value; */
+    }
+
+
+    private void NavigationView_SelectionChanged(object sender, NavigationViewSelectionChangedEventArgs e)
+    {
+        Debug.WriteLine("Selection Changed");
+    }
+
+
+    ////////// Close & quit //////////
 
-        private void NavigationView_SelectionChanged(object sender, NavigationViewSelectionChangedEventArgs e)
+    private void CloseButton_Click(object sender, RoutedEventArgs e)
+    {
+        Close();
+    }
+
+    private void QuitButton_Click(object sender, RoutedEventArgs e)
+    {
+        _app.Quit();
+    }
+
+    private void Window_Closed(object sender, WindowEventArgs e)
+    {
+        Debug.WriteLine("Hiding PrefsWindow, saving data...");
+        //App.SettingsData.save();
+        //_app.OnClosePrefsWindow();
+    }
+
+
+    ////////// UI Tools //////////
+
+    /*private void NumberValidationTextBox(object sender, TextCompositionEventArgs e)
+    {
+        var regex = new Regex("[^0-9]+");
+        e.Handled = regex.IsMatch(e.Text);
+    }*/
+
+    private long _lastContact = 0;
+    private int _inputCount = 0;
+    private long _lastEventSpeed = 0;
+    public void OnTouchpadContact(TouchpadContact[] contacts)
+    {
+        _inputCount++;
+
+        if (_inputCount >= 20)
         {
-            Console.WriteLine("Selection Changed");
+            _inputCount = 0;
+            _lastEventSpeed = (Ctms() - _lastContact) / 20;
+            _lastContact = Ctms();
         }
+        //TouchpadContacts = string.Join(" | ", contacts.Select(c => c.ToString())) + " | Event speed: " + _lastEventSpeed + "ms";
     }
+
+    private long Ctms()
+    {
+        return new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
+    }
+
 }
diff --git a/ThreeFingersDragOnWindows.csproj b/ThreeFingersDragOnWindows.csproj
index bada873..44ebd01 100755
--- a/ThreeFingersDragOnWindows.csproj
+++ b/ThreeFingersDragOnWindows.csproj
@@ -13,6 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+	<Content Include="Assets\icon.ico" />
+	<Content Include="Assets\icon.png" />
     <Content Include="Assets\SplashScreen.scale-200.png" />
     <Content Include="Assets\LockScreenLogo.scale-200.png" />
     <Content Include="Assets\Square150x150Logo.scale-200.png" />
@@ -23,8 +25,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.755" />
+    <PackageReference Include="H.NotifyIcon.WinUI" Version="2.0.115" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.230822000" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
@@ -34,7 +37,12 @@
     package has not yet been restored.
   -->
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <ProjectCapability Include="Msix"/>
+    <ProjectCapability Include="Msix" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="src\touchpad\HandlerWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
 
   <!-- 
diff --git a/src/touchpad/ContactsManager.cs b/src/touchpad/ContactsManager.cs
index 6e88b20..727f3ff 100644
--- a/src/touchpad/ContactsManager.cs
+++ b/src/touchpad/ContactsManager.cs
@@ -1,34 +1,40 @@
-using System;
+using Microsoft.UI.Xaml;
+using System;
 using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Interop;
+//using System.Windows.Interop;
 using ThreeFingersDragOnWindows.src.utils;
+using ThreeFingersDragOnWindows.src.Utils;
 
 namespace ThreeFingersDragOnWindows.src.touchpad;
 
-public class ContactsManager<T> where T : Window, IContactsManager {
+public class ContactsManager<T> where T : Window, IContactsManager
+{
     private readonly List<TouchpadContact> _lastContacts = new();
     private readonly T _source;
-    private HwndSource _targetSource;
+    //private HwndSource _targetSource;
 
     private long _lastInput;
-    
-    public ContactsManager(T source){
+
+    public ContactsManager(T source)
+    {
         _source = source;
     }
 
-    public void InitializeSource(){
-        _targetSource = PresentationSource.FromVisual(_source) as HwndSource;
-        _targetSource?.AddHook(WndProc);
+    public void InitializeSource()
+    {
+        //_targetSource = PresentationSource.FromVisual(_source) as HwndSource;
+        //_targetSource?.AddHook(WndProc);
 
         var touchpadExists = TouchpadHelper.Exists();
-        var success = touchpadExists && _targetSource != null && TouchpadHelper.RegisterInput(_targetSource.Handle);
+        //var success = touchpadExists && _targetSource != null && TouchpadHelper.RegisterInput(_targetSource.Handle);
 
-        _source.OnTouchpadInitialized(touchpadExists, success);
+        _source.OnTouchpadInitialized(touchpadExists, /*success*/false);
     }
 
-    private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled){
-        switch(msg){
+    private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+    {
+        switch (msg)
+        {
             case TouchpadHelper.WM_INPUT:
                 var contacts = TouchpadHelper.ParseInput(lParam);
                 RegisterTouchpadContacts(contacts);
@@ -38,15 +44,19 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
         return IntPtr.Zero;
     }
 
-    private void RegisterTouchpadContacts(TouchpadContact[] contacts){
-        foreach(var contact in contacts) RegisterTouchpadContact(contact);
+    private void RegisterTouchpadContacts(TouchpadContact[] contacts)
+    {
+        foreach (var contact in contacts) RegisterTouchpadContact(contact);
     }
 
-    private void RegisterTouchpadContact(TouchpadContact contact){
-        foreach(var lastContact in _lastContacts)
-            if(lastContact.ContactId == contact.ContactId){
+    private void RegisterTouchpadContact(TouchpadContact contact)
+    {
+        foreach (var lastContact in _lastContacts)
+            if (lastContact.ContactId == contact.ContactId)
+            {
                 // A contact is registered twice: send the event with the list of all contacts
-                if (Ctms() - _lastInput < 50){ // If contacts have all been released for a long time, cancel the last contact list
+                if (Ctms() - _lastInput < 50)
+                { // If contacts have all been released for a long time, cancel the last contact list
                     _source.OnTouchpadContact(_lastContacts.ToArray());
                 }
                 _lastContacts.Clear();
@@ -57,13 +67,15 @@ private void RegisterTouchpadContact(TouchpadContact contact){
         // Add the contact to the list
         _lastContacts.Add(contact);
     }
-    
-    private long Ctms(){
+
+    private long Ctms()
+    {
         return new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
     }
 }
 
-public interface IContactsManager {
+public interface IContactsManager
+{
     // Called when the touchpad is detected and the events handlers are registered (or not)
     public void OnTouchpadInitialized(bool touchpadExists, bool touchpadRegistered);
 
diff --git a/src/touchpad/HandlerWindow.xaml b/src/touchpad/HandlerWindow.xaml
new file mode 100644
index 0000000..f49ee18
--- /dev/null
+++ b/src/touchpad/HandlerWindow.xaml
@@ -0,0 +1,50 @@
+<Window
+    x:Class="ThreeFingersDragOnWindows.src.touchpad.HandlerWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:ThreeFingersDragOnWindows.src.touchpad"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tb="using:H.NotifyIcon"
+    mc:Ignorable="d">
+
+    <Grid>
+
+        <Grid.Resources>
+            <XamlUICommand 
+                x:Uid="Taskbar_Menu_QuitApp"
+                x:Key="QuitAppCommand"
+                ExecuteRequested="QuitApp"
+                Label="Quit App">
+                <XamlUICommand.IconSource>
+                    <SymbolIconSource Symbol="Cancel" />
+                </XamlUICommand.IconSource>
+            </XamlUICommand>
+            <XamlUICommand 
+                x:Uid="Taskbar_Menu_OpenSettingsWindow"
+                x:Key="OpenSettingsWindowCommand"
+                ExecuteRequested="OpenSettingsWindow"
+                Label="Open Settings Window">
+                <XamlUICommand.IconSource>
+                    <SymbolIconSource Symbol="Setting" />
+                </XamlUICommand.IconSource>
+            </XamlUICommand>
+        </Grid.Resources>
+
+        <tb:TaskbarIcon
+            x:Name="TaskbarIcon"
+            ToolTipText="Click to open ThreeFingersDragOnWindows' settings window."
+            IconSource="ms-appx:///Assets/icon.ico"
+            MenuActivation="RightClick"
+            NoLeftClickDelay="True"
+            LeftClickCommand="{StaticResource OpenSettingsWindowCommand}">
+
+            <tb:TaskbarIcon.ContextFlyout>
+                <MenuFlyout x:Name="MenuFlyout1" AreOpenCloseAnimationsEnabled="True">
+                    <MenuFlyoutItem Command="{StaticResource OpenSettingsWindowCommand}"/>
+                    <MenuFlyoutItem Command="{StaticResource QuitAppCommand}"/>
+                </MenuFlyout>
+            </tb:TaskbarIcon.ContextFlyout>
+        </tb:TaskbarIcon>
+    </Grid>
+</Window>
diff --git a/src/touchpad/HandlerWindow.xaml.cs b/src/touchpad/HandlerWindow.xaml.cs
new file mode 100644
index 0000000..651bbdc
--- /dev/null
+++ b/src/touchpad/HandlerWindow.xaml.cs
@@ -0,0 +1,71 @@
+using H.NotifyIcon;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
+using System;
+using System.Diagnostics;
+using System.Windows.Input;
+using ThreeFingersDragOnWindows.src.Utils;
+
+namespace ThreeFingersDragOnWindows.src.touchpad;
+
+public sealed partial class HandlerWindow : Window//, IContactsManager
+{
+    private readonly App _app;
+    //private readonly ContactsManager<HandlerWindow> _contactsManager;
+    //private readonly ThreeFingersDrag _threeFingersDrag;
+
+    public bool TouchpadExists;
+    public bool TouchpadRegistered;
+
+    public HandlerWindow(App app)
+    {
+        Debug.WriteLine("Starting HandlerWindow...");
+        this.InitializeComponent();
+
+        _app = app;
+        //_contactsManager = new ContactsManager<HandlerWindow>(this);
+
+        //_threeFingersDrag = new ThreeFingersDrag();
+
+
+
+        //WindowExtensions.Hide(this, false);
+        //Show();
+        //Hide();
+        //WindowState = WindowState.Minimized;
+        //ShowInTaskbar = false;
+    }
+    private void OpenSettingsWindow(object sender, ExecuteRequestedEventArgs e)
+    {
+        Debug.WriteLine("Opening SettingsWindow from HandlerWindow TaskbarIcon");
+        _app.OpenSettingsWindow();
+    }
+    private void QuitApp(object sender, ExecuteRequestedEventArgs e)
+    {
+        Debug.WriteLine("Quitting App from HandlerWindow TaskbarIcon");
+        _app.Quit();
+    }
+
+
+
+    /* public void OnTouchpadInitialized(bool touchpadExists, bool touchpadRegistered)
+     {
+         TouchpadExists = touchpadExists;
+         TouchpadRegistered = touchpadRegistered;
+         if (!touchpadExists) Debug.WriteLine("Touchpad is not detected.");
+         else if (!touchpadRegistered) Debug.WriteLine("Touchpad is detected but not registered.");
+         else Debug.WriteLine("Touchpad is detected and registered.");
+     }
+
+
+     public void OnTouchpadContact(TouchpadContact[] contacts)
+     {
+         _threeFingersDrag.OnTouchpadContact(contacts);
+         _app.OnTouchpadContact(contacts);
+     }
+
+     protected void OnSourceInitialized(EventArgs e)
+     {
+         _contactsManager.InitializeSource();
+     }*/
+}
\ No newline at end of file
diff --git a/src/touchpad/ThreeFingersDrag.cs b/src/touchpad/ThreeFingersDrag.cs
index e134d98..6b361ae 100644
--- a/src/touchpad/ThreeFingersDrag.cs
+++ b/src/touchpad/ThreeFingersDrag.cs
@@ -1,11 +1,12 @@
-using System;
+using System;
 using System.Timers;
-using Microsoft.VisualBasic.Devices;
 using ThreeFingersDragOnWindows.src.utils;
+using ThreeFingersDragOnWindows.src.Utils;
 
 namespace ThreeFingersDragOnWindows.src.touchpad;
 
-public class ThreeFingersDrag {
+public class ThreeFingersDrag
+{
     private readonly Timer _dragEndTimer = new(50);
     private readonly Timer _oneFingerTimer = new(20);
 
@@ -16,18 +17,20 @@ public class ThreeFingersDrag {
     private long _firstOneFingerContact;
     private long _lastOneFingerContact;
 
-    
+
     private ThreeFingersPoints _lastThreeFingersPoints = ThreeFingersPoints.Empty;
     private bool _isFirstThreeFingersInput;
     private long _firstThreeFingersContact;
     private long _lastThreeFingersContact;
     private IntMousePoint _lastDragMousePoint = new IntMousePoint(0, 0);
 
-    public ThreeFingersDrag(){
+    public ThreeFingersDrag()
+    {
         // Setup timer
         _dragEndTimer.Elapsed += (_, _) => CheckDragEnd();
         _oneFingerTimer.Elapsed += (_, _) => {
-            if (Ctms() - _lastThreeFingersContact > 250){
+            if (Ctms() - _lastThreeFingersContact > 250)
+            {
                 stopDrag();
             }
         };
@@ -35,48 +38,56 @@ public ThreeFingersDrag(){
         _oneFingerTimer.AutoReset = false;
     }
 
-    public void OnTouchpadContact(TouchpadContact[] contacts){
+    public void OnTouchpadContact(TouchpadContact[] contacts)
+    {
         ThreeFingersPoints points = new(contacts);
-        
-        if(contacts.Length == 3){
+
+        if (contacts.Length == 3)
+        {
             _isFirstOneFingerInput = true;
-            if(_isFirstThreeFingersInput){
+            if (_isFirstThreeFingersInput)
+            {
                 _firstThreeFingersContact = Ctms();
                 _isFirstThreeFingersInput = false;
             }
-            
-            if(!_isDragging){
-                if (Ctms() - _firstThreeFingersContact > 100){ // When placing four fingers, a three fingers input can be detected for less than 100ms
+
+            if (!_isDragging)
+            {
+                if (Ctms() - _firstThreeFingersContact > 100)
+                { // When placing four fingers, a three fingers input can be detected for less than 100ms
                     _isDragging = true;
                     MouseOperations.LeftClick(true);
                 }
-            }else{
+            }
+            else
+            {
                 var dist2d = points.GetLongestDist2D(_lastThreeFingersPoints);
                 //var dist2d = new MousePoint(_lastThreeFingersPoints.x1 - points.x1, _lastThreeFingersPoints.y1 - points.y1);
-                    
-                if (App.Prefs.ThreeFingersMove // Three Fingers drag enabled in preferences
+
+                if (App.SettingsData.ThreeFingersMove // Three Fingers drag enabled in preferences
                     && _lastThreeFingersPoints != ThreeFingersPoints.Empty // Last contact is a three fingers drag contact
-                    && Math.Sqrt(Math.Pow(dist2d.x, 2) + Math.Pow(dist2d.y, 2)) <= 30){ // Fingers can be released and replaced without catching any one/two finger contact. This makes sure the fingers haven't been replaced on the touchpad
-                    
+                    && Math.Sqrt(Math.Pow(dist2d.x, 2) + Math.Pow(dist2d.y, 2)) <= 30)
+                { // Fingers can be released and replaced without catching any one/two finger contact. This makes sure the fingers haven't been replaced on the touchpad
+
                     float elapsed = _lastThreeFingersContact == 0 ? 0 : Ctms() - _lastThreeFingersContact;
-                    
+
                     // Apply the Mouse Speed preference
-                    dist2d.Multiply(App.Prefs.MouseSpeed / 60);
+                    dist2d.Multiply(App.SettingsData.MouseSpeed / 60);
 
                     // Calculate the mouse velocity
                     var mouseVelocity = (float)Math.Max(0.2, Math.Min(dist2d.Length() / elapsed, 20));
                     if (float.IsNaN(mouseVelocity) || float.IsInfinity(mouseVelocity)) mouseVelocity = 1;
 
                     // Calculate the pointer velocity in function of the mouse velocity and the preference
-                    var pointerVelocity = (float)(App.Prefs.MouseAcceleration / 10 * Math.Pow(mouseVelocity, 2) +
+                    var pointerVelocity = (float)(App.SettingsData.MouseAcceleration / 10 * Math.Pow(mouseVelocity, 2) +
                                                   0.4 * mouseVelocity);
                     pointerVelocity = (float)Math.Max(0.4, Math.Min(pointerVelocity, 1.6)); // Clamp
-                    if (App.Prefs.MouseAcceleration == 0) pointerVelocity = 1; // Disable acceleration
+                    if (App.SettingsData.MouseAcceleration == 0) pointerVelocity = 1; // Disable acceleration
                     // Apply acceleration
                     dist2d.Multiply(pointerVelocity);
 
                     MouseOperations.ShiftCursorPosition(dist2d.x, dist2d.y);
-                    
+
                 }
 
                 _lastDragMousePoint = MouseOperations.GetCursorPosition();
@@ -85,27 +96,32 @@ public void OnTouchpadContact(TouchpadContact[] contacts){
                 _dragEndTimer.Start();
             }
             _lastThreeFingersContact = Ctms();
-            _lastThreeFingersPoints = points; 
+            _lastThreeFingersPoints = points;
         }
-        else{
+        else
+        {
             _isFirstThreeFingersInput = true;
-            if (!_isDragging){
+            if (!_isDragging)
+            {
                 _isFirstOneFingerInput = true;
                 return;
             }
 
-            if(_isFirstOneFingerInput || points.Length != _firstOneFingerPoints.Length || Ctms() - _lastOneFingerContact > 50){
+            if (_isFirstOneFingerInput || points.Length != _firstOneFingerPoints.Length || Ctms() - _lastOneFingerContact > 50)
+            {
                 _isFirstOneFingerInput = false;
                 _firstOneFingerContact = Ctms();
                 _firstOneFingerPoints = points;
             }
-            
-            if (!App.Prefs.AllowReleaseAndRestart) stopDrag();
-            else if (_firstOneFingerPoints.GetLongestDist(points) > 30){
+
+            if (!App.SettingsData.AllowReleaseAndRestart) stopDrag();
+            else if (_firstOneFingerPoints.GetLongestDist(points) > 30)
+            {
                 // When RELEASING and then REPLACING the fingers, one finger or two can be detected and send some events.
                 stopDrag();
             }
-            else{
+            else
+            {
                 MouseOperations.SetCursorPosition(_lastDragMousePoint.x, _lastDragMousePoint.y);
             }
 
@@ -114,27 +130,33 @@ public void OnTouchpadContact(TouchpadContact[] contacts){
         }
     }
 
-    private void CheckDragEnd(){
+    private void CheckDragEnd()
+    {
         // minus 15 to avoid bugs when the timer ends before the time elapsed
-        if (_isDragging && Ctms() - _lastThreeFingersContact >= GetReleaseDelay() - 15){
+        if (_isDragging && Ctms() - _lastThreeFingersContact >= GetReleaseDelay() - 15)
+        {
             stopDrag();
         }
     }
 
-    private void stopDrag(){
+    private void stopDrag()
+    {
         _isDragging = false;
         MouseOperations.LeftClick(false);
     }
 
-    private int GetReleaseDelay(){
-        return App.Prefs.AllowReleaseAndRestart ? Math.Max(App.Prefs.ReleaseDelay, 50) : 50;
+    private int GetReleaseDelay()
+    {
+        return App.SettingsData.AllowReleaseAndRestart ? Math.Max(App.SettingsData.ReleaseDelay, 50) : 50;
     }
 
-    private long Ctms(){
+    private long Ctms()
+    {
         return new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
     }
 
-    private float MouseSpeedFactor(){
-        return App.Prefs.MouseSpeed / 30;
+    private float MouseSpeedFactor()
+    {
+        return App.SettingsData.MouseSpeed / 30;
     }
 }
\ No newline at end of file
diff --git a/src/utils/MouseOperations.cs b/src/utils/MouseOperations.cs
index 07ac6be..f3a6211 100644
--- a/src/utils/MouseOperations.cs
+++ b/src/utils/MouseOperations.cs
@@ -1,17 +1,17 @@
-using System;
-using System.Drawing;
+using System;
 using System.Runtime.InteropServices;
-using System.Security.Cryptography.Xml;
-using Microsoft.VisualBasic.Devices;
+using ThreeFingersDragOnWindows.src.Utils;
 
 
 // From https://stackoverflow.com/questions/2416748/how-do-you-simulate-mouse-click-in-c
 
 namespace ThreeFingersDragOnWindows.src.utils;
 
-public class MouseOperations {
+public class MouseOperations
+{
     [Flags]
-    public enum MouseEventFlags {
+    public enum MouseEventFlags
+    {
         LeftDown = 0x00000002,
         LeftUp = 0x00000004,
         MiddleDown = 0x00000020,
@@ -33,54 +33,61 @@ public enum MouseEventFlags {
     [DllImport("user32.dll")]
     private static extern void mouse_event(int dwFlags, int dx, int dy, int dwData, int dwExtraInfo);
 
-    public static IntMousePoint GetCursorPosition(){
+    public static IntMousePoint GetCursorPosition()
+    {
         IntMousePoint currentIntMousePoint;
         var gotPoint = GetCursorPos(out currentIntMousePoint);
-        if(!gotPoint) currentIntMousePoint = new IntMousePoint(0, 0);
+        if (!gotPoint) currentIntMousePoint = new IntMousePoint(0, 0);
         return currentIntMousePoint;
     }
-    
+
     // moving the cursor does not work with floating point values
     // decimal parts are kept and then added to be taken in account
     private static float _decimalX;
     private static float _decimalY;
-    
-    public static void ShiftCursorPosition(float x, float y){
-        var intX = (int) (x + _decimalX);
-        var intY = (int) (y + _decimalY);
+
+    public static void ShiftCursorPosition(float x, float y)
+    {
+        var intX = (int)(x + _decimalX);
+        var intY = (int)(y + _decimalY);
         _decimalX = (x + _decimalX) - intX;
         _decimalY = (y + _decimalY) - intY;
-        
+
         Move(intX, intY);
     }
-    public static void SetCursorPosition(float x, float y){
-        var intX = (int) (x + _decimalX);
-        var intY = (int) (y + _decimalY);
+    public static void SetCursorPosition(float x, float y)
+    {
+        var intX = (int)(x + _decimalX);
+        var intY = (int)(y + _decimalY);
         _decimalX = (x + _decimalX) - intX;
         _decimalY = (y + _decimalY) - intY;
         var point = GetCursorPosition();
-        
+
         Move(intX - point.x, intY - point.y);
     }
 
-    public static void Move(int dx, int dy) {
+    public static void Move(int dx, int dy)
+    {
         MouseEvent(MouseOperations.MouseEventFlags.Move, dx, dy);
     }
 
-    public static void LeftClick(bool down) {
+    public static void LeftClick(bool down)
+    {
         var position = GetCursorPosition();
         MouseEvent(down ? MouseOperations.MouseEventFlags.LeftDown : MouseOperations.MouseEventFlags.LeftUp, position.x, position.y);
     }
-    public static void RightClick(bool down) {
+    public static void RightClick(bool down)
+    {
         var position = GetCursorPosition();
         MouseEvent(down ? MouseOperations.MouseEventFlags.RightDown : MouseOperations.MouseEventFlags.RightUp, position.x, position.y);
     }
-    
-    
-    
-    public static void MouseEvent(MouseEventFlags value, int dx, int dy){
+
+
+
+    public static void MouseEvent(MouseEventFlags value, int dx, int dy)
+    {
         mouse_event
-            ((int) value,
+            ((int)value,
                 dx,
                 dy,
                 0,
diff --git a/src/utils/TouchpadContact.cs b/src/utils/TouchpadContact.cs
index 4be29cf..b919830 100644
--- a/src/utils/TouchpadContact.cs
+++ b/src/utils/TouchpadContact.cs
@@ -1,52 +1,66 @@
 using System;
 
-namespace ThreeFingersDragOnWindows.src.utils;
+namespace ThreeFingersDragOnWindows.src.Utils;
 
-public struct TouchpadContact : IEquatable<TouchpadContact> {
-    public int ContactId{ get; }
-    public int X{ get; }
-    public int Y{ get; }
+// From  emoacht/RawInput.Touchpad
+public struct TouchpadContact : IEquatable<TouchpadContact>
+{
+    public int ContactId { get; }
+    public int X { get; }
+    public int Y { get; }
 
-    public TouchpadContact(int contactId, int x, int y){
+    public TouchpadContact(int contactId, int x, int y)
+    {
         (ContactId, X, Y) = (contactId, x, y);
     }
 
-    public override bool Equals(object obj){
+    public override bool Equals(object obj)
+    {
         return obj is TouchpadContact other && Equals(other);
     }
 
-    public bool Equals(TouchpadContact other){
+    public bool Equals(TouchpadContact other)
+    {
         return ContactId == other.ContactId && X == other.X && Y == other.Y;
     }
 
-    public static bool operator ==(TouchpadContact a, TouchpadContact b){
+    public static bool operator ==(TouchpadContact a, TouchpadContact b)
+    {
         return a.Equals(b);
     }
 
-    public static bool operator !=(TouchpadContact a, TouchpadContact b){
+    public static bool operator !=(TouchpadContact a, TouchpadContact b)
+    {
         return !(a == b);
     }
 
-    public override int GetHashCode(){
+    public override int GetHashCode()
+    {
         return (ContactId, X, Y).GetHashCode();
     }
 
-    public override string ToString(){
+    public override string ToString()
+    {
         return $"ID: {ContactId} x,y: {X},{Y}";
     }
 
-    public MousePoint getMousePoint(){
+    public MousePoint getMousePoint()
+    {
         return new MousePoint(X, Y);
     }
 }
 
-internal class TouchpadContactCreator {
-    public int? ContactId{ get; set; }
-    public int? X{ get; set; }
-    public int? Y{ get; set; }
+// From  emoacht/RawInput.Touchpad
+internal class TouchpadContactCreator
+{
+    public int? ContactId { get; set; }
+    public int? X { get; set; }
+    public int? Y { get; set; }
 
-    public bool TryCreate(out TouchpadContact contact){
-        if(ContactId.HasValue && X.HasValue && Y.HasValue){
+    public bool TryCreate(out TouchpadContact contact)
+    {
+        if (ContactId.HasValue && X.HasValue && Y.HasValue)
+        {
             contact = new TouchpadContact(ContactId.Value, X.Value, Y.Value);
             return true;
         }
@@ -55,7 +69,8 @@ public bool TryCreate(out TouchpadContact contact){
         return false;
     }
 
-    public void Clear(){
+    public void Clear()
+    {
         ContactId = null;
         X = null;
         Y = null;
diff --git a/src/utils/TouchpadHelper.cs b/src/utils/TouchpadHelper.cs
index 339fcd3..5f0af7d 100644
--- a/src/utils/TouchpadHelper.cs
+++ b/src/utils/TouchpadHelper.cs
@@ -2,19 +2,23 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
+using ThreeFingersDragOnWindows.src.Utils;
 
 namespace ThreeFingersDragOnWindows.src.utils;
 
-internal static class TouchpadHelper {
+// From  emoacht/RawInput.Touchpad
+internal static class TouchpadHelper
+{
     public const int WM_INPUT = 0x00FF;
     public const int RIM_INPUT = 0;
     public const int RIM_INPUTSINK = 1;
 
-    public static bool Exists(){
+    public static bool Exists()
+    {
         uint deviceListCount = 0;
-        var rawInputDeviceListSize = (uint) Marshal.SizeOf<RAWINPUTDEVICELIST>();
+        var rawInputDeviceListSize = (uint)Marshal.SizeOf<RAWINPUTDEVICELIST>();
 
-        if(GetRawInputDeviceList(
+        if (GetRawInputDeviceList(
                null,
                ref deviceListCount,
                rawInputDeviceListSize) != 0)
@@ -22,32 +26,33 @@ public static bool Exists(){
 
         var devices = new RAWINPUTDEVICELIST[deviceListCount];
 
-        if(GetRawInputDeviceList(
+        if (GetRawInputDeviceList(
                devices,
                ref deviceListCount,
                rawInputDeviceListSize) != deviceListCount)
             return false;
 
-        foreach(var device in devices.Where(x => x.dwType == RIM_TYPEHID)){
+        foreach (var device in devices.Where(x => x.dwType == RIM_TYPEHID))
+        {
             uint deviceInfoSize = 0;
 
-            if(GetRawInputDeviceInfo(
+            if (GetRawInputDeviceInfo(
                    device.hDevice,
                    RIDI_DEVICEINFO,
                    IntPtr.Zero,
                    ref deviceInfoSize) != 0)
                 continue;
 
-            var deviceInfo = new RID_DEVICE_INFO{ cbSize = deviceInfoSize };
+            var deviceInfo = new RID_DEVICE_INFO { cbSize = deviceInfoSize };
 
-            if(GetRawInputDeviceInfo(
+            if (GetRawInputDeviceInfo(
                    device.hDevice,
                    RIDI_DEVICEINFO,
                    ref deviceInfo,
-                   ref deviceInfoSize) == unchecked((uint) -1))
+                   ref deviceInfoSize) == unchecked((uint)-1))
                 continue;
 
-            if(deviceInfo.hid.usUsagePage == 0x000D &&
+            if (deviceInfo.hid.usUsagePage == 0x000D &&
                deviceInfo.hid.usUsage == 0x0005)
                 return true;
         }
@@ -55,25 +60,28 @@ public static bool Exists(){
         return false;
     }
 
-    public static bool RegisterInput(IntPtr windowHandle){
+    public static bool RegisterInput(IntPtr windowHandle)
+    {
         // Precision Touchpad (PTP) in HID Clients Supported in Windows
         // https://docs.microsoft.com/en-us/windows-hardware/drivers/hid/hid-architecture#hid-clients-supported-in-windows
-        var device = new RAWINPUTDEVICE{
+        var device = new RAWINPUTDEVICE
+        {
             usUsagePage = 0x000D,
             usUsage = 0x0005,
             dwFlags = 0x00000100, // Messages come even if the window is in the foreground.
             hwndTarget = windowHandle
         };
 
-        return RegisterRawInputDevices(new[]{ device }, 1, (uint) Marshal.SizeOf<RAWINPUTDEVICE>());
+        return RegisterRawInputDevices(new[] { device }, 1, (uint)Marshal.SizeOf<RAWINPUTDEVICE>());
     }
 
-    public static TouchpadContact[] ParseInput(IntPtr lParam){
+    public static TouchpadContact[] ParseInput(IntPtr lParam)
+    {
         // Get RAWINPUT.
         uint rawInputSize = 0;
-        var rawInputHeaderSize = (uint) Marshal.SizeOf<RAWINPUTHEADER>();
+        var rawInputHeaderSize = (uint)Marshal.SizeOf<RAWINPUTHEADER>();
 
-        if(GetRawInputData(
+        if (GetRawInputData(
                lParam,
                RID_INPUT,
                IntPtr.Zero,
@@ -85,10 +93,11 @@ public static TouchpadContact[] ParseInput(IntPtr lParam){
         byte[] rawHidRawData;
 
         var rawInputPointer = IntPtr.Zero;
-        try{
-            rawInputPointer = Marshal.AllocHGlobal((int) rawInputSize);
+        try
+        {
+            rawInputPointer = Marshal.AllocHGlobal((int)rawInputSize);
 
-            if(GetRawInputData(
+            if (GetRawInputData(
                    lParam,
                    RID_INPUT,
                    rawInputPointer,
@@ -102,10 +111,11 @@ public static TouchpadContact[] ParseInput(IntPtr lParam){
             Marshal.Copy(rawInputPointer, rawInputData, 0, rawInputData.Length);
 
             rawHidRawData = new byte[rawInput.Hid.dwSizeHid * rawInput.Hid.dwCount];
-            var rawInputOffset = (int) rawInputSize - rawHidRawData.Length;
+            var rawInputOffset = (int)rawInputSize - rawHidRawData.Length;
             Buffer.BlockCopy(rawInputData, rawInputOffset, rawHidRawData, 0, rawHidRawData.Length);
         }
-        finally{
+        finally
+        {
             Marshal.FreeHGlobal(rawInputPointer);
         }
 
@@ -114,26 +124,27 @@ public static TouchpadContact[] ParseInput(IntPtr lParam){
         Marshal.Copy(rawHidRawData, 0, rawHidRawDataPointer, rawHidRawData.Length);
 
         var preparsedDataPointer = IntPtr.Zero;
-        try{
+        try
+        {
             uint preparsedDataSize = 0;
 
-            if(GetRawInputDeviceInfo(
+            if (GetRawInputDeviceInfo(
                    rawInput.Header.hDevice,
                    RIDI_PREPARSEDDATA,
                    IntPtr.Zero,
                    ref preparsedDataSize) != 0)
                 return null;
 
-            preparsedDataPointer = Marshal.AllocHGlobal((int) preparsedDataSize);
+            preparsedDataPointer = Marshal.AllocHGlobal((int)preparsedDataSize);
 
-            if(GetRawInputDeviceInfo(
+            if (GetRawInputDeviceInfo(
                    rawInput.Header.hDevice,
                    RIDI_PREPARSEDDATA,
                    preparsedDataPointer,
                    ref preparsedDataSize) != preparsedDataSize)
                 return null;
 
-            if(HidP_GetCaps(
+            if (HidP_GetCaps(
                    preparsedDataPointer,
                    out var caps) != HIDP_STATUS_SUCCESS)
                 return null;
@@ -141,7 +152,7 @@ public static TouchpadContact[] ParseInput(IntPtr lParam){
             var valueCapsLength = caps.NumberInputValueCaps;
             var valueCaps = new HIDP_VALUE_CAPS[valueCapsLength];
 
-            if(HidP_GetValueCaps(
+            if (HidP_GetValueCaps(
                    HIDP_REPORT_TYPE.HidP_Input,
                    valueCaps,
                    ref valueCapsLength,
@@ -153,8 +164,9 @@ public static TouchpadContact[] ParseInput(IntPtr lParam){
             TouchpadContactCreator creator = new();
             List<TouchpadContact> contacts = new();
 
-            foreach(var valueCap in valueCaps.OrderBy(x => x.LinkCollection)){
-                if(HidP_GetUsageValue(
+            foreach (var valueCap in valueCaps.OrderBy(x => x.LinkCollection))
+            {
+                if (HidP_GetUsageValue(
                        HIDP_REPORT_TYPE.HidP_Input,
                        valueCap.UsagePage,
                        valueCap.LinkCollection,
@@ -162,14 +174,16 @@ public static TouchpadContact[] ParseInput(IntPtr lParam){
                        out var value,
                        preparsedDataPointer,
                        rawHidRawDataPointer,
-                       (uint) rawHidRawData.Length) != HIDP_STATUS_SUCCESS)
+                       (uint)rawHidRawData.Length) != HIDP_STATUS_SUCCESS)
                     continue;
 
                 // Usage Page and ID in Windows Precision Touchpad input reports
                 // https://docs.microsoft.com/en-us/windows-hardware/design/component-guidelines/windows-precision-touchpad-required-hid-top-level-collections#windows-precision-touchpad-input-reports
-                switch(valueCap.LinkCollection){
+                switch (valueCap.LinkCollection)
+                {
                     case 0:
-                        switch (valueCap.UsagePage, valueCap.Usage){
+                        switch (valueCap.UsagePage, valueCap.Usage)
+                        {
                             case (0x0D, 0x56): // Scan Time
                                 scanTime = value;
                                 break;
@@ -182,26 +196,28 @@ public static TouchpadContact[] ParseInput(IntPtr lParam){
                         break;
 
                     default:
-                        switch (valueCap.UsagePage, valueCap.Usage){
+                        switch (valueCap.UsagePage, valueCap.Usage)
+                        {
                             case (0x0D, 0x51): // Contact ID
-                                creator.ContactId = (int) value;
+                                creator.ContactId = (int)value;
                                 break;
 
                             case (0x01, 0x30): // X
-                                creator.X = (int) value;
+                                creator.X = (int)value;
                                 break;
 
                             case (0x01, 0x31): // Y
-                                creator.Y = (int) value;
+                                creator.Y = (int)value;
                                 break;
                         }
 
                         break;
                 }
 
-                if(creator.TryCreate(out var contact)){
+                if (creator.TryCreate(out var contact))
+                {
                     contacts.Add(contact);
-                    if(contacts.Count >= contactCount)
+                    if (contacts.Count >= contactCount)
                         break;
 
                     creator.Clear();
@@ -210,7 +226,8 @@ public static TouchpadContact[] ParseInput(IntPtr lParam){
 
             return contacts.ToArray();
         }
-        finally{
+        finally
+        {
             Marshal.FreeHGlobal(rawHidRawDataPointer);
             Marshal.FreeHGlobal(preparsedDataPointer);
         }
@@ -225,7 +242,8 @@ private static extern uint GetRawInputDeviceList(
         uint cbSize);
 
     [StructLayout(LayoutKind.Sequential)]
-    private struct RAWINPUTDEVICELIST {
+    private struct RAWINPUTDEVICELIST
+    {
         public readonly IntPtr hDevice;
         public readonly uint dwType; // RIM_TYPEMOUSE or RIM_TYPEKEYBOARD or RIM_TYPEHID
     }
@@ -242,7 +260,8 @@ private static extern bool RegisterRawInputDevices(
         uint cbSize);
 
     [StructLayout(LayoutKind.Sequential)]
-    private struct RAWINPUTDEVICE {
+    private struct RAWINPUTDEVICE
+    {
         public ushort usUsagePage;
         public ushort usUsage;
         public uint dwFlags; // RIDEV_INPUTSINK
@@ -262,13 +281,15 @@ private static extern uint GetRawInputData(
     private const uint RID_INPUT = 0x10000003;
 
     [StructLayout(LayoutKind.Sequential)]
-    private struct RAWINPUT {
+    private struct RAWINPUT
+    {
         public readonly RAWINPUTHEADER Header;
         public readonly RAWHID Hid;
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    private struct RAWINPUTHEADER {
+    private struct RAWINPUTHEADER
+    {
         public readonly uint dwType; // RIM_TYPEMOUSE or RIM_TYPEKEYBOARD or RIM_TYPEHID
         public readonly uint dwSize;
         public readonly IntPtr hDevice;
@@ -276,7 +297,8 @@ private struct RAWINPUTHEADER {
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    private struct RAWHID {
+    private struct RAWHID
+    {
         public readonly uint dwSizeHid;
         public readonly uint dwCount;
         public readonly IntPtr bRawData; // This is not for use.
@@ -300,14 +322,16 @@ private static extern uint GetRawInputDeviceInfo(
     private const uint RIDI_DEVICEINFO = 0x2000000b;
 
     [StructLayout(LayoutKind.Sequential)]
-    private struct RID_DEVICE_INFO {
+    private struct RID_DEVICE_INFO
+    {
         public uint cbSize; // This is determined to accommodate RID_DEVICE_INFO_KEYBOARD.
         public readonly uint dwType;
         public readonly RID_DEVICE_INFO_HID hid;
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    private struct RID_DEVICE_INFO_HID {
+    private struct RID_DEVICE_INFO_HID
+    {
         public readonly uint dwVendorId;
         public readonly uint dwProductId;
         public readonly uint dwVersionNumber;
@@ -323,7 +347,8 @@ private static extern uint HidP_GetCaps(
     private const uint HIDP_STATUS_SUCCESS = 0x00110000;
 
     [StructLayout(LayoutKind.Sequential)]
-    private struct HIDP_CAPS {
+    private struct HIDP_CAPS
+    {
         public readonly ushort Usage;
         public readonly ushort UsagePage;
         public readonly ushort InputReportByteLength;
@@ -352,14 +377,16 @@ private static extern uint HidP_GetValueCaps(
         ref ushort ValueCapsLength,
         IntPtr PreparsedData);
 
-    private enum HIDP_REPORT_TYPE {
+    private enum HIDP_REPORT_TYPE
+    {
         HidP_Input,
         HidP_Output,
         HidP_Feature
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    private struct HIDP_VALUE_CAPS {
+    private struct HIDP_VALUE_CAPS
+    {
         public readonly ushort UsagePage;
         public readonly byte ReportID;
 
diff --git a/src/utils/Utils.cs b/src/utils/Utils.cs
index c9b42c4..2fdc392 100644
--- a/src/utils/Utils.cs
+++ b/src/utils/Utils.cs
@@ -1,78 +1,93 @@
 using System;
-using System.Windows.Documents;
 
-namespace ThreeFingersDragOnWindows.src.utils;
+namespace ThreeFingersDragOnWindows.src.Utils;
 
-public static class Utils {
-    public static MousePoint AverageCoordinate(TouchpadContact[] contacts){
+public static class Utils
+{
+    public static MousePoint AverageCoordinate(TouchpadContact[] contacts)
+    {
         var totalX = 0;
         var totalY = 0;
         var count = 0;
-        foreach(var contact in contacts){
+        foreach (var contact in contacts)
+        {
             totalX += contact.X;
             totalY += contact.Y;
             count++;
         }
 
-        if(count == 0) return new MousePoint(0, 0);
+        if (count == 0) return new MousePoint(0, 0);
         return new MousePoint(totalX / count, totalY / count);
     }
-    
-    public static float Dist(float x1, float y1, float x2, float y2){
-        return (float) Math.Sqrt(Math.Pow(x1 - x2, 2) + Math.Pow(y1 - y2, 2));
+
+    public static float Dist(float x1, float y1, float x2, float y2)
+    {
+        return (float)Math.Sqrt(Math.Pow(x1 - x2, 2) + Math.Pow(y1 - y2, 2));
     }
 }
 
-public struct MousePoint {
+public struct MousePoint
+{
     public float x;
     public float y;
 
-    public MousePoint(float x, float y){
+    public MousePoint(float x, float y)
+    {
         this.x = x;
         this.y = y;
     }
-    public MousePoint(IntMousePoint point){
+    public MousePoint(IntMousePoint point)
+    {
         this.x = point.x;
         this.y = point.y;
     }
 
-    public void Multiply(float multiplicator){
+    public void Multiply(float multiplicator)
+    {
         x = x * multiplicator;
         y = y * multiplicator;
     }
 
-    public float Length(){
-        return (float) Math.Sqrt(Math.Pow(x, 2) + Math.Pow(y, 2));
+    public float Length()
+    {
+        return (float)Math.Sqrt(Math.Pow(x, 2) + Math.Pow(y, 2));
     }
 
-    public float DistTo(MousePoint point){
-        return (float) Math.Sqrt(Math.Pow(x - point.x, 2) + Math.Pow(y - point.y, 2));
+    public float DistTo(MousePoint point)
+    {
+        return (float)Math.Sqrt(Math.Pow(x - point.x, 2) + Math.Pow(y - point.y, 2));
     }
-    public float DistTo(IntMousePoint point){
-        return (float) Math.Sqrt(Math.Pow(x - point.x, 2) + Math.Pow(y - point.y, 2));
+    public float DistTo(IntMousePoint point)
+    {
+        return (float)Math.Sqrt(Math.Pow(x - point.x, 2) + Math.Pow(y - point.y, 2));
     }
 
     public static MousePoint Empty = new(0, 0);
-    
-    public static bool operator ==(MousePoint a, MousePoint b){
+
+    public static bool operator ==(MousePoint a, MousePoint b)
+    {
         return a.x == b.x && a.y == b.y;
     }
-    public static bool operator !=(MousePoint a, MousePoint b){
+    public static bool operator !=(MousePoint a, MousePoint b)
+    {
         return a.x != b.x || a.y != b.y;
     }
 }
 
-public struct IntMousePoint {
+public struct IntMousePoint
+{
     public int x;
     public int y;
 
-    public IntMousePoint(int x, int y){
+    public IntMousePoint(int x, int y)
+    {
         this.x = x;
         this.y = y;
     }
 }
 
-public struct ThreeFingersPoints {
+public struct ThreeFingersPoints
+{
     public int Length;
     public float x1;
     public float y1;
@@ -80,7 +95,8 @@ public struct ThreeFingersPoints {
     public float y2;
     public float x3;
     public float y3;
-    public ThreeFingersPoints(){
+    public ThreeFingersPoints()
+    {
         this.Length = 0;
         this.x1 = 0;
         this.y1 = 0;
@@ -89,40 +105,57 @@ public ThreeFingersPoints(){
         this.x3 = 0;
         this.y3 = 0;
     }
-    public ThreeFingersPoints(float x1, float y1, float x2, float y2, float x3, float y3){
+    public ThreeFingersPoints(float x1, float y1, float x2, float y2, float x3, float y3)
+    {
         this.x1 = x1;
         this.y1 = y1;
         this.x2 = x2;
         this.y2 = y2;
         this.x3 = x3;
         this.y3 = y3;
-        if (x1 == 0 && y1 == 0 && x2 == 0 && y2 == 0 && x3 == 0 && y3 == 0){
+        if (x1 == 0 && y1 == 0 && x2 == 0 && y2 == 0 && x3 == 0 && y3 == 0)
+        {
             this.Length = 0;
-        }else if (x2 == 0 && y2 == 0 && x3 == 0 && y3 == 0){
+        }
+        else if (x2 == 0 && y2 == 0 && x3 == 0 && y3 == 0)
+        {
             this.Length = 1;
-        }else if (x3 == 0 && y3 == 0){
+        }
+        else if (x3 == 0 && y3 == 0)
+        {
             this.Length = 2;
-        }else this.Length = 3;
+        }
+        else this.Length = 3;
     }
-    public ThreeFingersPoints(TouchpadContact[] contacts){
-        if(contacts.Length >= 1){
+    public ThreeFingersPoints(TouchpadContact[] contacts)
+    {
+        if (contacts.Length >= 1)
+        {
             this.x1 = contacts[0].X;
             this.y1 = contacts[0].Y;
-        }else{
+        }
+        else
+        {
             this.x1 = 0;
             this.y1 = 0;
         }
-        if(contacts.Length >= 2){
+        if (contacts.Length >= 2)
+        {
             this.x2 = contacts[1].X;
             this.y2 = contacts[1].Y;
-        }else{
+        }
+        else
+        {
             this.x2 = contacts[0].X;
             this.y2 = contacts[0].Y;
         }
-        if(contacts.Length >= 3){
+        if (contacts.Length >= 3)
+        {
             this.x3 = contacts[2].X;
             this.y3 = contacts[2].Y;
-        }else{
+        }
+        else
+        {
             this.x3 = contacts[0].X;
             this.y3 = contacts[0].Y;
         }
@@ -130,48 +163,56 @@ public ThreeFingersPoints(TouchpadContact[] contacts){
     }
     public static ThreeFingersPoints Empty = new();
 
-    public static bool operator ==(ThreeFingersPoints a, ThreeFingersPoints b){
+    public static bool operator ==(ThreeFingersPoints a, ThreeFingersPoints b)
+    {
         return a.x1 == b.x1 && a.y1 == b.y1 && a.x2 == b.x2 && a.y2 == b.y2 && a.x3 == b.x3 && a.y3 == b.y3;
     }
-    public static bool operator !=(ThreeFingersPoints a, ThreeFingersPoints b){
+    public static bool operator !=(ThreeFingersPoints a, ThreeFingersPoints b)
+    {
         return a.x1 != b.x1 || a.y1 != b.y1 || a.x2 != b.x2 || a.y2 != b.y2 || a.x3 != b.x3 || a.y3 != b.y3;
     }
 
-    public MousePoint GetLongestDistPoint(ThreeFingersPoints points){
+    public MousePoint GetLongestDistPoint(ThreeFingersPoints points)
+    {
         var d1 = Utils.Dist(x1, y1, points.x1, points.y1);
         var d2 = Utils.Dist(x2, y2, points.x2, points.y2);
         var d3 = Utils.Dist(x3, y3, points.x3, points.y3);
-        if(d1 > d2 && d1 > d3) return new MousePoint(x1, y1);
-        if(d2 > d1 && d2 > d3) return new MousePoint(x2, y2);
+        if (d1 > d2 && d1 > d3) return new MousePoint(x1, y1);
+        if (d2 > d1 && d2 > d3) return new MousePoint(x2, y2);
         return new MousePoint(x3, y3);
     }
-    public MousePoint GetLongestDist2D(ThreeFingersPoints points){
-        return GetLongestDistNumber(points) switch{
+    public MousePoint GetLongestDist2D(ThreeFingersPoints points)
+    {
+        return GetLongestDistNumber(points) switch
+        {
             1 => new MousePoint(x1 - points.x1, y1 - points.y1),
             2 => new MousePoint(x2 - points.x2, y2 - points.y2),
             3 => new MousePoint(x3 - points.x3, y3 - points.y3),
             _ => new MousePoint(0, 0)
         };
     }
-    public int GetLongestDistNumber(ThreeFingersPoints points){
+    public int GetLongestDistNumber(ThreeFingersPoints points)
+    {
         var d1 = Utils.Dist(x1, y1, points.x1, points.y1);
         var d2 = Utils.Dist(x2, y2, points.x2, points.y2);
         var d3 = Utils.Dist(x3, y3, points.x3, points.y3);
-        if(d1 > d2 && d1 > d3) return 1;
-        if(d2 > d1 && d2 > d3) return 2;
+        if (d1 > d2 && d1 > d3) return 1;
+        if (d2 > d1 && d2 > d3) return 2;
         return 3;
     }
 
-    public float GetLongestDist(ThreeFingersPoints points){
+    public float GetLongestDist(ThreeFingersPoints points)
+    {
         var d1 = Utils.Dist(x1, y1, points.x1, points.y1);
         var d2 = Utils.Dist(x2, y2, points.x2, points.y2);
         var d3 = Utils.Dist(x3, y3, points.x3, points.y3);
-        if(d1 > d2 && d1 > d3) return d1;
-        if(d2 > d1 && d2 > d3) return d2;
+        if (d1 > d2 && d1 > d3) return d1;
+        if (d2 > d1 && d2 > d3) return d2;
         return d3;
     }
 
-    public override string ToString(){
+    public override string ToString()
+    {
         return "{x1: " + x1 + " y1: " + y1 + " x2: " + x2 + " y2: " + y2 + " x3: " + x3 + " y3: " + y3 + "}";
     }
 }
\ No newline at end of file