From 8a9dc7c4fe0c15f1dc5e8bfc4bd183c511bfa60d Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 24 Mar 2018 17:32:15 +0200
Subject: [PATCH 01/83] Driver restart button

---
 TabletDriverGUI/MainWindow.xaml    |  8 +++++++-
 TabletDriverGUI/MainWindow.xaml.cs | 21 ++++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 7e47861..616a34b 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:TabletDriverGUI"
         mc:Ignorable="d"
-        Title="TabletDriverGUI" Height="670" Width="750"
+        Title="TabletDriverGUI" Height="703" Width="750"
         >
   <Window.Resources>
     <Style TargetType="GroupBox">
@@ -523,6 +523,12 @@
                 ToolTip="Saves settings to Config.xml">Save</Button>
         <Button Name="buttonApplySettings" Margin="5,5,0,5" Width="50" Click="ApplySettings"
                 ToolTip="Applies driver settings.">Apply</Button>
+        <Button Name="buttonRestartDriver" Margin="25,5,0,5" Width="90"
+              HorizontalAlignment="Right"
+              Click="RestartDriverClick"
+                ToolTip="Restarts the TabletDriverService">Restart Driver</Button>
+
+
       </StackPanel>
       <CheckBox Name="checkRunAtStartup"
                 HorizontalAlignment="Right" VerticalAlignment="Center" VerticalContentAlignment="Center"
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 19e74b7..91ab541 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -222,7 +222,7 @@ private void MainWindow_Closing(object sender, System.ComponentModel.CancelEvent
         // Window loaded -> Start driver
         private void MainWindow_Loaded(object sender, RoutedEventArgs e)
         {
-            
+
             // Configuration filename
             configFilename = "config/config.xml";
 
@@ -268,8 +268,6 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
             // Update the settings back to the configuration
             UpdateSettingsToConfiguration();
 
-            // Console timer
-            timerConsoleUpdate.Start();
 
             // Set run at startup
             SetRunAtStartup(config.RunAtStartup);
@@ -1687,6 +1685,10 @@ void Start()
             try
             {
                 running = true;
+
+                // Console timer
+                timerConsoleUpdate.Start();
+
                 driver.Start(config.DriverPath, config.DriverArguments);
                 if (!driver.IsRunning)
                 {
@@ -1715,6 +1717,18 @@ void Stop()
             timerConsoleUpdate.Stop();
         }
 
+        //
+        // Restart Driver button click
+        //
+        private void RestartDriverClick(object sender, RoutedEventArgs e)
+        {
+            if (running)
+            {
+                Stop();
+            }
+            Start();
+        }
+
         #endregion
 
 
@@ -2120,6 +2134,7 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
             return IntPtr.Zero;
         }
 
+
         #endregion
 
 

From c203bbe22366e8e4cb6b564ae69ce63525521f22 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 24 Mar 2018 17:40:32 +0200
Subject: [PATCH 02/83] Experimental support for Wacom driver devices

This allows that the Wacom drivers can be left installed on the system, but the Pen_Tablet/Wacom_Tablet.exe needs to be killed before starting the TabletDriverGUI

Currently supported tablets:
- CTL-470
- CTL-480
- CTH-480
- CTL-4100
---
 TabletDriverGUI/App.xaml.cs            | 37 ++++++++++++++
 TabletDriverService/HIDDevice.cpp      | 10 +++-
 TabletDriverService/HIDDevice.h        |  1 +
 TabletDriverService/ProcessCommand.cpp | 47 +++++++++++++----
 TabletDriverService/Tablet.cpp         | 44 ++++++++++------
 TabletDriverService/TabletSettings.h   |  3 +-
 TabletDriverService/config/tablet.cfg  | 71 +++++++++++++++++++++++++-
 7 files changed, 185 insertions(+), 28 deletions(-)

diff --git a/TabletDriverGUI/App.xaml.cs b/TabletDriverGUI/App.xaml.cs
index 9a061a2..1072268 100644
--- a/TabletDriverGUI/App.xaml.cs
+++ b/TabletDriverGUI/App.xaml.cs
@@ -49,6 +49,43 @@ public App()
                     }
                 }
 
+                //
+                // Check Wacom processes
+                //
+                string[] wacomProcessNames =
+                {
+                    "Pen_Tablet",
+                    "Wacom_Tablet"
+                };
+
+                processes = Process.GetProcesses();
+                foreach (Process process in processes)
+                {
+                    foreach (string wacomProcessName in wacomProcessNames)
+                    {
+                        if (process.ProcessName.ToLower() == wacomProcessName.ToLower())
+                        {
+                            try
+                            {
+                                process.Kill();
+                            }
+                            catch (Exception)
+                            {
+                                MessageBox.Show(
+                                    "You have Wacom driver processes running in the background:\n  " +
+                                    string.Join("\n  ", wacomProcessNames) +
+                                    "\n\nPlease shutdown those before starting the GUI!",
+                                    "Error!", MessageBoxButton.OK, MessageBoxImage.Error
+                                );
+                                instanceMutex.ReleaseMutex();
+                                Shutdown();
+                                return;
+                            }
+                        }
+                    }
+                }
+
+
                 MainWindow mainWindow = new MainWindow();
                 mainWindow.Show();
                 Exit += App_Exit;
diff --git a/TabletDriverService/HIDDevice.cpp b/TabletDriverService/HIDDevice.cpp
index b77ee0b..a3073ff 100644
--- a/TabletDriverService/HIDDevice.cpp
+++ b/TabletDriverService/HIDDevice.cpp
@@ -171,7 +171,7 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 	return false;
 }
 
-
+// Read HID report
 int HIDDevice::Read(void *buffer, int length) {
 	//return HidD_GetInputReport(_deviceHandle, buffer, length);
 	DWORD bytesRead;
@@ -181,6 +181,7 @@ int HIDDevice::Read(void *buffer, int length) {
 	return 0;
 }
 
+// Write HID report
 int HIDDevice::Write(void *buffer, int length) {
 	DWORD bytesWritten;
 	if(WriteFile(_deviceHandle, buffer, length, &bytesWritten, 0)) {
@@ -189,10 +190,17 @@ int HIDDevice::Write(void *buffer, int length) {
 	return 0;
 }
 
+// Set feature report
 bool HIDDevice::SetFeature(void *buffer, int length) {
 	return HidD_SetFeature(_deviceHandle, buffer, length);
 }
 
+// Get feature report
+bool HIDDevice::GetFeature(void *buffer, int length) {
+	return HidD_GetFeature(_deviceHandle, buffer, length);
+}
+
+// Close the device
 void HIDDevice::CloseDevice() {
 	if(isOpen && _deviceHandle != NULL && _deviceHandle != INVALID_HANDLE_VALUE) {
 		try {
diff --git a/TabletDriverService/HIDDevice.h b/TabletDriverService/HIDDevice.h
index 4de3f44..ee0b917 100644
--- a/TabletDriverService/HIDDevice.h
+++ b/TabletDriverService/HIDDevice.h
@@ -31,5 +31,6 @@ class HIDDevice {
 	int Read(void *buffer, int length);
 	int Write(void *buffer, int length);
 	bool SetFeature(void *buffer, int length);
+	bool GetFeature(void *buffer, int length);
 	void CloseDevice();
 };
\ No newline at end of file
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index ac59dc2..c095330 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -211,11 +211,18 @@ bool ProcessCommand(CommandLine *cmd) {
 		// Wacom Intuos (490)
 		if(cmd->GetStringLower(0, "") == "wacomintuos") {
 			tablet->settings.type = TabletSettings::TypeWacomIntuos;
+		}
 
 		// Wacom CTL-4100
-		} else if(cmd->GetStringLower(0, "") == "wacom4100") {
+		else if(cmd->GetStringLower(0, "") == "wacom4100") {
 			tablet->settings.type = TabletSettings::TypeWacom4100;
 		}
+
+		// Wacom Drivers
+		else if(cmd->GetStringLower(0, "") == "wacomdrivers") {
+			tablet->settings.type = TabletSettings::TypeWacomDrivers;
+		}
+
 		LOG_INFO("Tablet type = %d\n", tablet->settings.type);
 	}
 
@@ -245,34 +252,54 @@ bool ProcessCommand(CommandLine *cmd) {
 
 
 	//
-	// Send Feature Report
+	// Set Feature Report
 	//
-	else if((cmd->is("FeatureReport") || cmd->is("Feature")) && cmd->valueCount > 0) {
+	else if((cmd->is("SetFeature") || cmd->is("Feature")) && cmd->valueCount > 1) {
 		if(tablet == NULL) return false;
 		if(tablet->hidDevice == NULL) return false;
-		int length = cmd->valueCount;
+		int length = cmd->GetInt(0, 1);
 		BYTE *buffer = new BYTE[length];
 		for(int i = 0; i < length; i++) {
-			buffer[i] = cmd->GetInt(i, 0);
+			buffer[i] = cmd->GetInt(i + 1, 0);
 		}
+		LOG_INFOBUFFER(buffer, length, "Set Feature Report (%d): ", length);
 		tablet->hidDevice->SetFeature(buffer, length);
-		LOG_INFOBUFFER(buffer, length, "Tablet HID Feature Report: ");
+		LOG_INFO("HID Feature set!\n");
 		delete buffer;
 	}
 
+	//
+	// Get Feature Report
+	//
+	else if(cmd->is("GetFeature") && cmd->valueCount > 1) {
+		if(tablet == NULL) return false;
+		if(tablet->hidDevice == NULL) return false;
+		int length = cmd->GetInt(0, 1);
+		BYTE *buffer = new BYTE[length];
+		for(int i = 0; i < length; i++) {
+			buffer[i] = cmd->GetInt(i + 1, 0);
+		}
+		LOG_INFOBUFFER(buffer, length, "Get Feature Report (%d): ", length);
+		tablet->hidDevice->GetFeature(buffer, length);
+		LOG_INFOBUFFER(buffer, length, "Result Feature Report (%d): ", length);
+		delete buffer;
+	}
+
+
 	//
 	// Send Output Report
 	//
-	else if((cmd->is("OutputReport") || cmd->is("Report")) && cmd->valueCount > 0) {
+	else if((cmd->is("OutputReport") || cmd->is("Report")) && cmd->valueCount > 1) {
 		if(tablet == NULL) return false;
 		if(tablet->hidDevice == NULL) return false;
-		int length = cmd->valueCount;
+		int length = cmd->GetInt(0, 1);
 		BYTE *buffer = new BYTE[length];
 		for(int i = 0; i < length; i++) {
-			buffer[i] = cmd->GetInt(i, 0);
+			buffer[i] = cmd->GetInt(i + 1, 0);
 		}
+		LOG_INFOBUFFER(buffer, length, "Sending HID Report: ");
 		tablet->hidDevice->Write(buffer, length);
-		LOG_INFOBUFFER(buffer, length, "Tablet HID Output Report: ");
+		LOG_INFO("Report sent!\n");
 		delete buffer;
 	}
 
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index e44e227..1214397 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -149,6 +149,7 @@ bool Tablet::IsConfigured() {
 //
 int Tablet::ReadPosition() {
 	UCHAR buffer[1024];
+	UCHAR *data;
 	int buttonIndex;
 
 
@@ -163,20 +164,23 @@ int Tablet::ReadPosition() {
 		return Tablet::PacketInvalid;
 	}
 
-	// Validate packet id
-	if(settings.reportId > 0 && buffer[0] != settings.reportId) {
-		return Tablet::PacketInvalid;
+
+	// Set data pointer
+	if(settings.type == TabletSettings::TypeWacomDrivers) {
+		data = buffer + 1;
+	} else {
+		data = buffer;
 	}
 
 	//
 	// Wacom Intuos data format
 	//
 	if(settings.type == TabletSettings::TypeWacomIntuos) {
-		reportData.x = ((buffer[2] * 0x100 + buffer[3]) << 1) | ((buffer[9] >> 1) & 1);
-		reportData.y = ((buffer[4] * 0x100 + buffer[5]) << 1) | (buffer[9] & 1);
-		reportData.pressure = (buffer[6] << 3) | ((buffer[7] & 0xC0) >> 5) | (buffer[1] & 1);
-		reportData.reportId = buffer[0];
-		reportData.buttons = buffer[1] & ~0x01;
+		reportData.reportId = data[0];
+		reportData.buttons = data[1] & ~0x01;
+		reportData.x = ((data[2] * 0x100 + data[3]) << 1) | ((data[9] >> 1) & 1);
+		reportData.y = ((data[4] * 0x100 + data[5]) << 1) | (data[9] & 1);
+		reportData.pressure = (data[6] << 3) | ((data[7] & 0xC0) >> 5) | (data[1] & 1);
 		//distance = buffer[9] >> 2;
 
 	//
@@ -184,22 +188,32 @@ int Tablet::ReadPosition() {
 	//
 	} else if(settings.type == TabletSettings::TypeWacom4100) {
 
-		reportData.x = (buffer[2] | (buffer[3] << 8) | (buffer[4] << 16) );
- 
-		reportData.y = (buffer[5] | (buffer[6] << 8) | (buffer[7] << 16) );
+		// Wacom driver device
+		if(settings.reportLength == 193) {
+			data = buffer + 1;
+		}
 
-		reportData.pressure = (buffer[8] | (buffer[9] << 8));
-		reportData.reportId = buffer[0];
-		reportData.buttons = buffer[1] & ~0x01;
+		reportData.reportId = data[0];
+		reportData.buttons = data[1] & ~0x01;
+		reportData.x = (data[2] | (data[3] << 8) | (data[4] << 16));
+		reportData.y = (data[5] | (data[6] << 8) | (data[7] << 16));
+		reportData.pressure = (data[8] | (data[9] << 8));
 
 	//
 	// Copy buffer to struct
 	//
 	} else {
-		memcpy(&reportData, buffer, sizeof(reportData));
+		memcpy(&reportData, data, sizeof(reportData));
 	}
 
 
+	// Validate packet id
+	if(settings.reportId > 0 && reportData.reportId != settings.reportId) {
+		return Tablet::PacketInvalid;
+	}
+
+
+
 	// Validate position
 	if(settings.buttonMask > 0 && (reportData.buttons & settings.buttonMask) != settings.buttonMask) {
 		return Tablet::PacketPositionInvalid;
diff --git a/TabletDriverService/TabletSettings.h b/TabletDriverService/TabletSettings.h
index f667af7..a3855c6 100644
--- a/TabletDriverService/TabletSettings.h
+++ b/TabletDriverService/TabletSettings.h
@@ -5,7 +5,8 @@ class TabletSettings {
 	enum TabletType {
 		TabletNormal,
 		TypeWacomIntuos,
-		TypeWacom4100
+		TypeWacom4100,
+		TypeWacomDrivers
 	};
 
 	BYTE buttonMask;
diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index b0646f3..496777f 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -1,11 +1,33 @@
 #
-# Wacom CTL-470
+# Example tablet definition:
+#   Tablet 0x056a 0x00dd 0x0D 0x01
 #
 # VID: 0x056a
 # PID: 0x00dd
 # HID Usage Page: 0x0D
 # HID Usage: 0x01
 #
+
+
+#
+# Wacom CTL-470 (Wacom drivers installed)
+#
+Tablet 0x056a 0x00dd 0xFF00 0x000A
+Name "Wacom CTL-470 (Wacom drivers installed)"
+ReportId 0x02
+ReportLength 11
+ButtonMask 0x40
+MaxX 14720
+MaxY 9200
+MaxPressure 1023
+Width 147.2
+Height 92.0
+Type WacomDrivers
+
+
+#
+# Wacom CTL-470
+#
 Tablet 0x056a 0x00dd 0x0D 0x01
 Name "Wacom CTL-470"
 ReportId 0x02
@@ -113,6 +135,22 @@ Height 135.00
 InitFeature 0x02 0x02
 
 
+#
+# Wacom CTL-480 (Wacom drivers installed)
+#
+Tablet 0x056a 0x030e 0xFF00 0x000A
+Name "Wacom CTL-480 (Wacom drivers installed)"
+ReportId 0x02
+ReportLength 11
+ButtonMask 0x40
+MaxX 15200
+MaxY 9500
+MaxPressure 1023
+Width 152.0
+Height 95.0
+Type WacomDrivers
+
+
 #
 # Wacom CTL-480
 #
@@ -129,6 +167,22 @@ Height 95.0
 InitFeature 0x02 0x02
 
 
+#
+# Wacom CTH-480 (Wacom drivers installed)
+#
+Tablet 0x056a 0x0302 0xFF00 0x000A
+Name "Wacom CTH-480 (Wacom drivers installed)"
+ReportId 0x02
+ReportLength 11
+ButtonMask 0x40
+MaxX 15200
+MaxY 9500
+MaxPressure 1023
+Width 152.0
+Height 95.0
+Type WacomDrivers
+
+
 #
 # Wacom CTH-480
 #
@@ -228,6 +282,21 @@ Width 152.0
 Height 95.0
 Type Wacom4100
 
+#
+# Wacom CTL-4100 (Wacom drivers installed)
+#
+Tablet 0x056a 0x0376 0xFF00 0x000A
+Name "Wacom CTL-4100 (Wacom drivers installed)"
+ReportId 0x10
+ReportLength 193
+ButtonMask 0x40
+MaxX 15200
+MaxY 9500
+MaxPressure 4095
+Width 152.0
+Height 95.0
+Type Wacom4100
+
 
 #
 # Wacom CTL-4100 Bluetooth

From 852fe436a9f06218920fb55d71802dc365ab3fcf Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 24 Mar 2018 18:41:06 +0200
Subject: [PATCH 03/83] v0.1.2

---
 README.md                          |  8 +++++++-
 TabletDriverGUI/MainWindow.xaml    | 32 ++++++++++++++++++++----------
 TabletDriverGUI/MainWindow.xaml.cs |  2 +-
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 1a84096..62d3775 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 
 ## Download
 
-### http://hwk.fi/TabletDriver/TabletDriverV0.1.1.zip
+### http://hwk.fi/TabletDriver/TabletDriverV0.1.2.zip
 
 #
 
@@ -90,6 +90,12 @@ If you want to compile the code and don't want to install anything from the Tabl
 #
 
 ## Changelog
+>**v0.1.2:**
+> - Added experimental support for leaving the Wacom drivers installed on the system.
+>   Supported tablets: CTL-470, CTL-480, CTH-480, CTL-4100
+> - Added `disable_wacom_drivers.bat` and `enable_wacom_drivers.bat` to the `tools` folder.
+>   These scripts are used to disable and enable Wacom drivers when using the experimental Wacom driver support.
+> - Added driver restart button.
 
 >**v0.1.1:**
 > - Added support for Wacom CTL-4100 (USB and Bluetooth)
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 616a34b..36536a4 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -20,7 +20,7 @@
   </Window.Resources>
 
   <Grid Background="Transparent" Margin="0,0,0,0">
-    
+
     <DockPanel Background="White">
       <Menu DockPanel.Dock="Top"  Background="White">
         <MenuItem Header="_File">
@@ -32,7 +32,7 @@
       </Menu>
       <TextBox AcceptsReturn="True" />
     </DockPanel>
-    
+
     <TabControl Name="tabControl" Margin="0,20,0,59"  Selector.IsSelected="True" Background="White">
       <TabItem Header="Settings">
         <ScrollViewer VerticalScrollBarVisibility="Auto">
@@ -518,22 +518,32 @@
     </TabControl>
 
     <Grid Margin="5,5,5,25" Height="35" VerticalAlignment="Bottom">
+
       <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-        <Button Name="buttonSaveSettings" Margin="0,5,0,5" Width="50" Click="SaveSettings"
-                ToolTip="Saves settings to Config.xml">Save</Button>
-        <Button Name="buttonApplySettings" Margin="5,5,0,5" Width="50" Click="ApplySettings"
+
+        <!-- Apply -->
+        <Button Name="buttonApplySettings" Margin="0,5,5,5" Padding="10,0,10,0" Click="ApplySettings"
                 ToolTip="Applies driver settings.">Apply</Button>
-        <Button Name="buttonRestartDriver" Margin="25,5,0,5" Width="90"
-              HorizontalAlignment="Right"
-              Click="RestartDriverClick"
-                ToolTip="Restarts the TabletDriverService">Restart Driver</Button>
 
+        <!-- Save -->
+        <Button Name="buttonSaveSettings" Margin="0,5,5,5" Padding="10,0,10,0" Click="SaveSettings"
+                ToolTip="Saves settings to Config.xml">Save</Button>
 
       </StackPanel>
-      <CheckBox Name="checkRunAtStartup"
-                HorizontalAlignment="Right" VerticalAlignment="Center" VerticalContentAlignment="Center"
+
+      <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+
+        <!-- Restart Driver -->
+        <Button Name="buttonRestartDriver" Margin="5,5,15,5" Padding="5,0,5,0"
+              Click="RestartDriverClick"
+                ToolTip="Restarts the TabletDriverService">Restart Driver</Button>
+
+        <!-- Run at Startup -->
+        <CheckBox Name="checkRunAtStartup"
+                VerticalAlignment="Center" VerticalContentAlignment="Center"
                 Checked="CheckboxChanged" Unchecked="CheckboxChanged"
                 ToolTip="Starts and hides the TabletDriverGUI at Windows startup">Run at Windows startup</CheckBox>
+      </StackPanel>
     </Grid>
 
     <StatusBar Height="25" VerticalAlignment="Bottom">
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 91ab541..250f9ed 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -24,7 +24,7 @@ public partial class MainWindow : Window
     {
 
         // Version
-        public string Version = "0.1.1";
+        public string Version = "0.1.2";
 
         // Console stuff
         private List<string> commandHistory;

From e17089509d3e314a9c5b520fdf9bc1f828505229 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 25 Mar 2018 12:47:57 +0300
Subject: [PATCH 04/83] Noise filter fix

---
 .../TabletFilterNoiseReduction.cpp                | 15 +++++++++------
 TabletDriverService/TabletFilterSmoothing.cpp     |  2 +-
 TabletDriverService/TabletFilterSmoothing.h       |  2 --
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/TabletDriverService/TabletFilterNoiseReduction.cpp b/TabletDriverService/TabletFilterNoiseReduction.cpp
index 30b201e..deeb78d 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.cpp
+++ b/TabletDriverService/TabletFilterNoiseReduction.cpp
@@ -39,12 +39,6 @@ void TabletFilterNoiseReduction::SetBufferLength(int length) {
 
 // Set target position
 void TabletFilterNoiseReduction::SetTarget(Vector2D targetVector) {
-	if(isValid) {
-		double distance = lastTarget.Distance(targetVector);
-		if(distance > distanceThreshold) {
-			ResetBuffer();
-		}
-	}
 	lastTarget.Set(targetVector);
 	AddBuffer(targetVector);
 }
@@ -65,6 +59,15 @@ bool TabletFilterNoiseReduction::GetPosition(Vector2D *outputVector) {
 // Update
 void TabletFilterNoiseReduction::Update() {
 	GetGeometricMedianVector(&position, iterations);
+
+	// Reset the buffer when distance to last target position is larger than the threshold
+	if(isValid) {
+		double distance = lastTarget.Distance(position);
+		if(distance > distanceThreshold) {
+			ResetBuffer();
+			position.Set(lastTarget);
+		}
+	}
 }
 
 
diff --git a/TabletDriverService/TabletFilterSmoothing.cpp b/TabletDriverService/TabletFilterSmoothing.cpp
index af39330..c95d53b 100644
--- a/TabletDriverService/TabletFilterSmoothing.cpp
+++ b/TabletDriverService/TabletFilterSmoothing.cpp
@@ -55,7 +55,7 @@ void TabletFilterSmoothing::Update() {
 		position.x += deltaX * weight;
 		position.y += deltaY * weight;
 
-		// Too small distance -> set output values as target values
+	// Too small distance -> set output values as target values
 	} else {
 		position.x = target.x;
 		position.y = target.y;
diff --git a/TabletDriverService/TabletFilterSmoothing.h b/TabletDriverService/TabletFilterSmoothing.h
index 9c6c70b..88b4a4e 100644
--- a/TabletDriverService/TabletFilterSmoothing.h
+++ b/TabletDriverService/TabletFilterSmoothing.h
@@ -14,8 +14,6 @@ class TabletFilterSmoothing : public TabletFilter {
 	TabletFilterSmoothing();
 	~TabletFilterSmoothing();
 
-	
-	//double SetTarget(double x, double y);
 	void SetTarget(Vector2D vector);
 	void SetPosition(Vector2D vector);
 	bool GetPosition(Vector2D *outputVector);

From 4711fe395f0a3f19e3f05cd3d6ba97c507d095df Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 25 Mar 2018 12:56:04 +0300
Subject: [PATCH 05/83] Left handed mode

---
 TabletDriverGUI/Configuration.cs   |  1 +
 TabletDriverGUI/MainWindow.xaml    | 36 ++++++++++++++++++++++--------
 TabletDriverGUI/MainWindow.xaml.cs | 33 ++++++++++++++++++++++-----
 3 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index bd98f71..384e1d4 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -15,6 +15,7 @@ public class Configuration
         public Area TabletFullArea;
         public bool ForceAspectRatio;
         public double Rotation;
+        public bool Invert;
         public bool ForceFullArea;
         public OutputModes OutputMode;
         public enum OutputModes
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 36536a4..813efa1 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -141,7 +141,7 @@
                     <LineBreak/>
                     - Drag + Shift = Move area Y direction.
                     <LineBreak/>
-                    - For left handed mode, use rotation value of 180 degrees.
+                    - For left handed mode, enable the "Left handed (Inverted)" checkbox or use a rotation value of 180 degrees.
                     <LineBreak/>
                     - Click Wacom Area button to type in the Wacom driver area settings.
                   </TextBlock>
@@ -156,18 +156,34 @@
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="*"/>
                   </Grid.ColumnDefinitions>
-                  <!-- Tablet area canvas -->
-                  <StackPanel Grid.Column="0" HorizontalAlignment="Right">
 
+                  <StackPanel Grid.Column="0" HorizontalAlignment="Right">
 
-                    <GroupBox Header="Rotation" Height="50" Width="100" Margin="5,0,0,0" HorizontalAlignment="Left">
-                      <Grid>
-                        <TextBox Name="textTabletAreaRotation" Padding="4,0,0,0"
+                    <StackPanel Orientation="Horizontal">
+                      
+                      <!-- Invert -->
+                      <CheckBox Name="checkBoxInvert" Margin="5"
+                                VerticalAlignment="Center"
+                                VerticalContentAlignment="Center"
+                            Checked="CheckboxChanged"
+                            Unchecked="CheckboxChanged">
+                        <TextBlock>
+                          Left handed
+                          <LineBreak/>
+                          (Inverted)
+                        </TextBlock>
+                      </CheckBox>
+                      
+                      <!-- Rotation -->
+                      <GroupBox Header="Rotation" Height="50" Width="100" Margin="5,0,0,0" HorizontalAlignment="Left">
+                        <Grid>
+                          <TextBox Name="textTabletAreaRotation" Padding="4,0,0,0"
                                HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
                                TextChanged="TextChanged">0</TextBox>
-                        <Label Width="30" HorizontalAlignment="Right">degrees</Label>
-                      </Grid>
-                    </GroupBox>
+                          <Label Width="30" HorizontalAlignment="Right">degrees</Label>
+                        </Grid>
+                      </GroupBox>
+                    </StackPanel>
 
                     <Button Name="buttonWacomArea" Content="Wacom Area" Width="80"
                             Padding="5 5 5 5" Margin="5"
@@ -175,6 +191,8 @@
                             Click="ButtonWacomArea_Click" />
 
                   </StackPanel>
+
+                  <!-- Tablet area canvas -->
                   <Canvas Grid.Column="1" Name="canvasTabletArea"
                       Cursor="Hand"
                       Height="120" Margin="5,0,5,0"
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 250f9ed..5254415 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -390,6 +390,7 @@ private void LoadSettingsFromConfiguration()
                     break;
             }
             textTabletAreaRotation.Text = Utils.GetNumberString(config.TabletArea.Rotation);
+            checkBoxInvert.IsChecked = config.Invert;
 
 
             //
@@ -545,6 +546,7 @@ private void UpdateSettingsToConfiguration()
             if (Utils.ParseNumber(textTabletAreaRotation.Text, out val))
                 config.TabletArea.Rotation = val;
 
+            config.Invert = (bool)checkBoxInvert.IsChecked;
             config.ForceAspectRatio = (bool)checkBoxForceAspect.IsChecked;
             config.ForceFullArea = (bool)checkBoxForceFullArea.IsChecked;
 
@@ -1614,14 +1616,33 @@ private void SendSettingsToDriver()
                 Utils.GetNumberString(config.ScreenArea.X) + " " + Utils.GetNumberString(config.ScreenArea.Y)
             );
 
+
+            //
             // Tablet area
-            driver.SendCommand("Area " +
-                Utils.GetNumberString(config.TabletArea.Width) + " " + Utils.GetNumberString(config.TabletArea.Height) + " " +
-                Utils.GetNumberString(config.TabletArea.X) + " " + Utils.GetNumberString(config.TabletArea.Y)
-            );
+            //
+            // Inverted
+            if (config.Invert)
+            {
+                driver.SendCommand("TabletArea " +
+                    Utils.GetNumberString(config.TabletArea.Width) + " " +
+                    Utils.GetNumberString(config.TabletArea.Height) + " " +
+                    Utils.GetNumberString(config.TabletFullArea.Width - config.TabletArea.X) + " " +
+                    Utils.GetNumberString(config.TabletFullArea.Height - config.TabletArea.Y)
+                );
+                driver.SendCommand("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation + 180));
+            }
+            // Normal
+            else
+            {
+                driver.SendCommand("TabletArea " +
+                    Utils.GetNumberString(config.TabletArea.Width) + " " +
+                    Utils.GetNumberString(config.TabletArea.Height) + " " +
+                    Utils.GetNumberString(config.TabletArea.X) + " " +
+                    Utils.GetNumberString(config.TabletArea.Y)
+                );
+                driver.SendCommand("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation));
+            }
 
-            // Rotation
-            driver.SendCommand("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation));
 
             // Output Mode
             switch (config.OutputMode)

From 6175a04e339466e8f994a36386a713c193bf7fcc Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 25 Mar 2018 13:18:01 +0300
Subject: [PATCH 06/83] Experimental Wacom driver support for CTL-471 and 472

---
 TabletDriverService/config/tablet.cfg | 31 +++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 496777f..fe5f50d 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -73,6 +73,21 @@ Height 137.0
 InitFeature 0x02 0x02
 
 
+#
+# Wacom CTL-471 (Wacom drivers installed)
+#
+Tablet 0x056a 0x0300 0xFF00 0x000A
+Name "Wacom CTL-471 (Wacom drivers installed)"
+ReportLength 11
+ButtonMask 0x40
+MaxX 14720
+MaxY 9225
+MaxPressure 1023
+Width 147.2
+Height 92.25
+Type WacomDrivers
+
+
 #
 # Wacom CTL-471
 #
@@ -103,6 +118,22 @@ Height 135.30
 InitFeature 0x02 0x02
 
 
+#
+# Wacom CTL-472
+#
+Tablet 0x056a 0x037a 0xFF00 0x000A
+Name "Wacom CTL-472 (Wacom drivers installed)"
+ReportId 0x02
+ReportLength 11
+ButtonMask 0x40
+MaxX 15200
+MaxY 9500
+MaxPressure 2047
+Width 152.0
+Height 95.0
+Type WacomDrivers
+
+
 #
 # Wacom CTL-472
 #

From eac303b08869295bd78845381c809e34b2830f04 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 25 Mar 2018 13:35:14 +0300
Subject: [PATCH 07/83] v0.1.3

---
 README.md                          | 7 ++++++-
 TabletDriverGUI/MainWindow.xaml.cs | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 62d3775..f565700 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 
 ## Download
 
-### http://hwk.fi/TabletDriver/TabletDriverV0.1.2.zip
+### http://hwk.fi/TabletDriver/TabletDriverV0.1.3.zip
 
 #
 
@@ -90,6 +90,11 @@ If you want to compile the code and don't want to install anything from the Tabl
 #
 
 ## Changelog
+>**v0.1.3:**
+> - Added left handed mode / tablet invert option.
+> - Added Wacom driver device support for the CTL-471 and 472
+> - Noise reduction filter improvement (`Noise` command)
+
 >**v0.1.2:**
 > - Added experimental support for leaving the Wacom drivers installed on the system.
 >   Supported tablets: CTL-470, CTL-480, CTH-480, CTL-4100
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 5254415..3ba6f75 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -24,7 +24,7 @@ public partial class MainWindow : Window
     {
 
         // Version
-        public string Version = "0.1.2";
+        public string Version = "0.1.3";
 
         // Console stuff
         private List<string> commandHistory;

From ad891b562780989dc15263199dcb2fefc0dcdc41 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 25 Mar 2018 16:32:57 +0300
Subject: [PATCH 08/83] Wacom CTL-471 area size

---
 TabletDriverService/config/tablet.cfg | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index fe5f50d..e04430f 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -80,11 +80,11 @@ Tablet 0x056a 0x0300 0xFF00 0x000A
 Name "Wacom CTL-471 (Wacom drivers installed)"
 ReportLength 11
 ButtonMask 0x40
-MaxX 14720
-MaxY 9225
+MaxX 15200
+MaxY 9500
 MaxPressure 1023
-Width 147.2
-Height 92.25
+Width 152.00
+Height 95.00
 Type WacomDrivers
 
 
@@ -95,11 +95,11 @@ Tablet 0x056a 0x0300 0xFF0D 0x01
 Name "Wacom CTL-471"
 ReportLength 10
 ButtonMask 0x40
-MaxX 14720
-MaxY 9225
+MaxX 15200
+MaxY 9500
 MaxPressure 1023
-Width 147.2
-Height 92.25
+Width 152.00
+Height 95.00
 InitFeature 0x02 0x02
 
 

From 819db8b17ca4722dba34d478ad31a652966f4b61 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 25 Mar 2018 16:33:46 +0300
Subject: [PATCH 09/83] Readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f565700..8c03d0a 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
   - Wacom CTL-480
   - Wacom CTH-480
   - Wacom CTL-490
-  - XP Pen G430 (New 2016-2017 "Model B")
+  - XP Pen G430 (New 2017+ "Model B")
   - XP Pen G640
   - Huion 420
   - Huion H640P

From fda49a09e2b15869eedc0478c8cdd11d6e926b89 Mon Sep 17 00:00:00 2001
From: mojobojo <mojobojo@live.com>
Date: Fri, 30 Mar 2018 02:58:15 -0400
Subject: [PATCH 10/83] Support for the Intuos PTH-850 Large

---
 TabletDriverService/config/tablet.cfg | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index e04430f..daa9b09 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -360,6 +360,21 @@ InitFeature 0x02 0x02
 Type WacomIntuos
 
 
+# This one is very similar to PTH-851 which is already present in wacom.cfg
+# Wacom PTH-850
+Tablet 0x056A 0x0028 0x00D 0x0001
+Name "Wacom PTH-850"
+ReportLength 10
+ButtonMask 0x40
+MaxX 65024
+MaxY 40640
+MaxPressure 2047
+Width 325.120
+Height 203.200
+InitFeature 0x02 0x02
+Type WacomIntuos
+
+
 #
 # XP-Pen G430
 #

From 74ed938267b92036be1c8a1028b27f96290c8050 Mon Sep 17 00:00:00 2001
From: mojobojo <mojobojo@live.com>
Date: Fri, 30 Mar 2018 03:05:57 -0400
Subject: [PATCH 11/83] Fixed the button mask on PTH-850 because a mouse 4
 event was triggered when the pen entered the tablet.

---
 TabletDriverService/config/tablet.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index daa9b09..af23791 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -365,7 +365,7 @@ Type WacomIntuos
 Tablet 0x056A 0x0028 0x00D 0x0001
 Name "Wacom PTH-850"
 ReportLength 10
-ButtonMask 0x40
+ButtonMask 0xE0
 MaxX 65024
 MaxY 40640
 MaxPressure 2047

From d6d4ddd4f93f5fc6779c9b16878b5271f6d7c4cc Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Fri, 30 Mar 2018 13:35:03 +0300
Subject: [PATCH 12/83] Renamed ButtonMask to DetectMask and added IgnoreMask

---
 TabletDriverService/ProcessCommand.cpp | 18 ++++++--
 TabletDriverService/Tablet.cpp         |  9 +++-
 TabletDriverService/TabletSettings.cpp |  3 +-
 TabletDriverService/TabletSettings.h   |  3 +-
 TabletDriverService/config/tablet.cfg  | 62 +++++++++++++------------
 TabletDriverService/config/wacom.cfg   | 64 +++++++++++++-------------
 6 files changed, 88 insertions(+), 71 deletions(-)

diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index c095330..0b0315f 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -139,11 +139,18 @@ bool ProcessCommand(CommandLine *cmd) {
 		LOG_INFO("Tablet report length = %d\n", tablet->settings.reportLength);
 	}
 
-	// Button Mask
-	else if(cmd->is("ButtonMask")) {
+	// Detect Mask
+	else if(cmd->is("DetectMask")) {
 		if(tablet == NULL) return false;
-		tablet->settings.buttonMask = cmd->GetInt(0, tablet->settings.buttonMask);
-		LOG_INFO("Tablet button mask = %02X\n", tablet->settings.buttonMask);
+		tablet->settings.detectMask = cmd->GetInt(0, tablet->settings.detectMask);
+		LOG_INFO("Tablet detect mask = %02X\n", tablet->settings.detectMask);
+	}
+
+	// Ignore Mask
+	else if(cmd->is("IgnoreMask")) {
+		if(tablet == NULL) return false;
+		tablet->settings.ignoreMask = cmd->GetInt(0, tablet->settings.ignoreMask);
+		LOG_INFO("Tablet ignore mask = %02X\n", tablet->settings.ignoreMask);
 	}
 
 	// Max X
@@ -784,7 +791,8 @@ void LogInformation() {
 	LOG_INFO("  Keep Tip Down = %d packets\n", tablet->settings.keepTipDown);
 	LOG_INFO("  Report Id = %02X\n", tablet->settings.reportId);
 	LOG_INFO("  Report Length = %d bytes\n", tablet->settings.reportLength);
-	LOG_INFO("  Button Mask = 0x%02X\n", tablet->settings.buttonMask);
+	LOG_INFO("  Detect Mask = 0x%02X\n", tablet->settings.detectMask);
+	LOG_INFO("  Ignore Mask = 0x%02X\n", tablet->settings.ignoreMask);
 
 	for(int i = 0; i < 8; i++) {
 		stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "%d ", tablet->buttonMap[i]);
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 1214397..cf50c3d 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -214,8 +214,13 @@ int Tablet::ReadPosition() {
 
 
 
-	// Validate position
-	if(settings.buttonMask > 0 && (reportData.buttons & settings.buttonMask) != settings.buttonMask) {
+	// Detect mask
+	if(settings.detectMask > 0 && (reportData.buttons & settings.detectMask) != settings.detectMask) {
+		return Tablet::PacketPositionInvalid;
+	}
+
+	// Ignore mask
+	if(settings.ignoreMask > 0 && (reportData.buttons & settings.ignoreMask) == settings.ignoreMask) {
 		return Tablet::PacketPositionInvalid;
 	}
 
diff --git a/TabletDriverService/TabletSettings.cpp b/TabletDriverService/TabletSettings.cpp
index 228cc6c..afbae83 100644
--- a/TabletDriverService/TabletSettings.cpp
+++ b/TabletDriverService/TabletSettings.cpp
@@ -9,7 +9,8 @@ TabletSettings::TabletSettings() {
 	// Initial settings
 	reportId = 0;
 	reportLength = 8;
-	buttonMask = 0x00;
+	detectMask = 0x00;
+	ignoreMask = 0x00;
 	maxX = 1;
 	maxY = 1;
 	maxPressure = 1;
diff --git a/TabletDriverService/TabletSettings.h b/TabletDriverService/TabletSettings.h
index a3855c6..7b4a92e 100644
--- a/TabletDriverService/TabletSettings.h
+++ b/TabletDriverService/TabletSettings.h
@@ -9,7 +9,8 @@ class TabletSettings {
 		TypeWacomDrivers
 	};
 
-	BYTE buttonMask;
+	BYTE detectMask;
+	BYTE ignoreMask;
 	int maxX;
 	int maxY;
 	int maxPressure;
diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index af23791..953d3a4 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -16,7 +16,7 @@ Tablet 0x056a 0x00dd 0xFF00 0x000A
 Name "Wacom CTL-470 (Wacom drivers installed)"
 ReportId 0x02
 ReportLength 11
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9200
 MaxPressure 1023
@@ -32,7 +32,7 @@ Tablet 0x056a 0x00dd 0x0D 0x01
 Name "Wacom CTL-470"
 ReportId 0x02
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9200
 MaxPressure 1023
@@ -48,7 +48,7 @@ Tablet 0x056a 0x00de 0x0D 0x01
 Name "Wacom CTH-470"
 ReportId 0x02
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9200
 MaxPressure 1023
@@ -64,7 +64,7 @@ Tablet 0x056a 0x00df 0x0D 0x01
 Name "Wacom CTH-670"
 ReportId 0x02
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21648
 MaxY 13700
 MaxPressure 1023
@@ -79,7 +79,7 @@ InitFeature 0x02 0x02
 Tablet 0x056a 0x0300 0xFF00 0x000A
 Name "Wacom CTL-471 (Wacom drivers installed)"
 ReportLength 11
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 1023
@@ -94,7 +94,7 @@ Type WacomDrivers
 Tablet 0x056a 0x0300 0xFF0D 0x01
 Name "Wacom CTL-471"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 1023
@@ -109,7 +109,7 @@ InitFeature 0x02 0x02
 Tablet 0x056a 0x0301 0xFF0D 0x01
 Name "Wacom CTL-671"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21648
 MaxY 13530
 MaxPressure 1023
@@ -125,7 +125,7 @@ Tablet 0x056a 0x037a 0xFF00 0x000A
 Name "Wacom CTL-472 (Wacom drivers installed)"
 ReportId 0x02
 ReportLength 11
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 2047
@@ -141,7 +141,7 @@ Tablet 0x056a 0x037a 0xFF0D 0x0001
 Name "Wacom CTL-472"
 ReportId 0x02
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 2047
@@ -157,7 +157,7 @@ Tablet 0x056a 0x037b 0xFF0D 0x0001
 Name "Wacom CTL-672"
 ReportId 0x02
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21600
 MaxY 13500
 MaxPressure 2047
@@ -173,7 +173,7 @@ Tablet 0x056a 0x030e 0xFF00 0x000A
 Name "Wacom CTL-480 (Wacom drivers installed)"
 ReportId 0x02
 ReportLength 11
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 1023
@@ -189,7 +189,7 @@ Tablet 0x056a 0x030e 0xFF0D 0x0001
 Name "Wacom CTL-480"
 ReportId 0x02
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 1023
@@ -205,7 +205,7 @@ Tablet 0x056a 0x0302 0xFF00 0x000A
 Name "Wacom CTH-480 (Wacom drivers installed)"
 ReportId 0x02
 ReportLength 11
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 1023
@@ -221,7 +221,7 @@ Tablet 0x056a 0x0302 0xFF0D 0x0001
 Name "Wacom CTH-480"
 ReportId 0x02
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 1023
@@ -237,7 +237,7 @@ Tablet 0x056a 0x0323 0xFF0D 0x0001
 Name "Wacom CTL-680"
 ReportId 0x02
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21600
 MaxY 13500
 MaxPressure 1023
@@ -253,7 +253,7 @@ Tablet 0x056a 0x0303 0xFF0D 0x0001
 Name "Wacom CTH-680"
 ReportId 0x02
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21600
 MaxY 13500
 MaxPressure 1023
@@ -269,7 +269,7 @@ Tablet 0x056a 0x033b 0xFF0D 0x0001
 Name "Wacom CTL-490"
 ReportId 0x10
 ReportLength 10
-ButtonMask 0xA0
+DetectMask 0xA0
 MaxX 15200
 MaxY 9500
 MaxPressure 2047
@@ -287,7 +287,7 @@ Tablet 0x056a 0x033c 0xFF0D 0x0001
 Name "Wacom CTH-490"
 ReportId 0x10
 ReportLength 10
-ButtonMask 0xA0
+DetectMask 0xA0
 MaxX 15200
 MaxY 9500
 MaxPressure 2047
@@ -305,7 +305,7 @@ Tablet 0x056a 0x0376 0xFF0D 0x0001
 Name "Wacom CTL-4100"
 ReportId 0x10
 ReportLength 192
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 4095
@@ -320,7 +320,7 @@ Tablet 0x056a 0x0376 0xFF00 0x000A
 Name "Wacom CTL-4100 (Wacom drivers installed)"
 ReportId 0x10
 ReportLength 193
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 4095
@@ -336,7 +336,7 @@ Name "Wacom CTL-4100 Bluetooth (Experimental)"
 ReportId100 Bluetooth
 # 0x81
 ReportLength 361
-ButtonMask 0xE0
+DetectMask 0xE0
 MaxX 15200
 MaxY 9500
 MaxPressure 4095
@@ -350,7 +350,7 @@ Height 95.0
 Tablet 0x056a 0x0314 0xFF0D 0x01
 Name "Wacom PTH-451"
 ReportLength 10
-ButtonMask 0xE0
+DetectMask 0xE0
 MaxX 31496
 MaxY 19685
 MaxPressure 2047
@@ -360,12 +360,13 @@ InitFeature 0x02 0x02
 Type WacomIntuos
 
 
-# This one is very similar to PTH-851 which is already present in wacom.cfg
+#
 # Wacom PTH-850
+#
 Tablet 0x056A 0x0028 0x00D 0x0001
 Name "Wacom PTH-850"
 ReportLength 10
-ButtonMask 0xE0
+DetectMask 0xE0
 MaxX 65024
 MaxY 40640
 MaxPressure 2047
@@ -375,6 +376,7 @@ InitFeature 0x02 0x02
 Type WacomIntuos
 
 
+
 #
 # XP-Pen G430
 #
@@ -382,7 +384,7 @@ Tablet 0x28BD 0x0075 0xFF0A 0x0001
 Name "XP-Pen G430"
 ReportId 0x02
 ReportLength 8
-ButtonMask 0x80
+DetectMask 0x80
 MaxX 45720
 MaxY 29210
 MaxPressure 2047
@@ -398,7 +400,7 @@ Tablet 0x28BD 0x0094 0xFF0A 0x0001
 Name "XP-Pen G640"
 ReportId 0x02
 ReportLength 8
-ButtonMask 0x80
+DetectMask 0x80
 MaxX 32000
 MaxY 20000
 MaxPressure 8191
@@ -414,7 +416,7 @@ Tablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}" 6 420
 Name "Huion 420"
 ReportId 0x07
 ReportLength 8
-ButtonMask 0x80
+DetectMask 0x80
 MaxX 8340
 MaxY 4680
 MaxPressure 2047
@@ -428,7 +430,7 @@ Height 56.6
 Tablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}" 6 H420
 Name "Huion H420"
 ReportLength 8
-ButtonMask 0x80
+DetectMask 0x80
 MaxX 8340
 MaxY 4680
 MaxPressure 2047
@@ -443,7 +445,7 @@ Tablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}" 201 HUION_T173
 Name "Huion H640P"
 ReportId 0x08
 ReportLength 8
-ButtonMask 0x80
+DetectMask 0x80
 MaxX 31999
 MaxY 20000
 MaxPressure 8191
@@ -458,7 +460,7 @@ Tablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}" 201 HUION_T156
 Name "Gaomon S56K"
 ReportId 0x07
 ReportLength 8
-ButtonMask 0x80
+DetectMask 0x80
 MaxX 25196
 MaxY 18896
 MaxPressure 2047
diff --git a/TabletDriverService/config/wacom.cfg b/TabletDriverService/config/wacom.cfg
index 0970bc4..3b7a1bd 100644
--- a/TabletDriverService/config/wacom.cfg
+++ b/TabletDriverService/config/wacom.cfg
@@ -15,7 +15,7 @@ Tablet 0x056A 0x0314 0xFF0D 0x0001
 Tablet 0x056A 0x0314 0x000D 0x0001
 Name "Wacom PTH-451"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 31496
 MaxY 19685
 MaxPressure 2047
@@ -30,7 +30,7 @@ Tablet 0x056A 0x0315 0xFF0D 0x0001
 Tablet 0x056A 0x0315 0x000D 0x0001
 Name "Wacom PTH-651"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 44704
 MaxY 27940
 MaxPressure 2047
@@ -45,7 +45,7 @@ Tablet 0x056A 0x0317 0xFF0D 0x0001
 Tablet 0x056A 0x0317 0x000D 0x0001
 Name "Wacom PTH-851"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 65024
 MaxY 40640
 MaxPressure 2047
@@ -60,7 +60,7 @@ Tablet 0x056A 0x0065 0xFF0D 0x0001
 Tablet 0x056A 0x0065 0x000D 0x0001
 Name "Wacom MTE-450"
 ReportLength 9
-ButtonMask 0x00
+DetectMask 0x00
 MaxX 14760
 MaxY 9225
 MaxPressure 511
@@ -74,7 +74,7 @@ Tablet 0x056A 0x00D0 0xFF0D 0x0001
 Tablet 0x056A 0x00D0 0x000D 0x0001
 Name "Wacom CTT-460"
 ReportLength 9
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9200
 MaxPressure 1023
@@ -88,7 +88,7 @@ Tablet 0x056A 0x00D4 0xFF0D 0x0001
 Tablet 0x056A 0x00D4 0x000D 0x0001
 Name "Wacom CTL-460"
 ReportLength 9
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9200
 MaxPressure 1023
@@ -102,7 +102,7 @@ Tablet 0x056A 0x00DD 0xFF0D 0x0001
 Tablet 0x056A 0x00DD 0x000D 0x0001
 Name "Wacom CTL-470"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9200
 MaxPressure 1023
@@ -116,7 +116,7 @@ Tablet 0x056A 0x0300 0xFF0D 0x0001
 Tablet 0x056A 0x0300 0x000D 0x0001
 Name "Wacom CTL-471"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9225
 MaxPressure 1023
@@ -130,7 +130,7 @@ Tablet 0x056A 0x037A 0xFF0D 0x0001
 Tablet 0x056A 0x037A 0x000D 0x0001
 Name "Wacom CTL-472"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 2047
@@ -144,7 +144,7 @@ Tablet 0x056A 0x030E 0xFF0D 0x0001
 Tablet 0x056A 0x030E 0x000D 0x0001
 Name "Wacom CTL-480"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 1023
@@ -158,7 +158,7 @@ Tablet 0x056A 0x033B 0xFF0D 0x0001
 Tablet 0x056A 0x033B 0x000D 0x0001
 Name "Wacom CTL-490"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 2047
@@ -173,7 +173,7 @@ Tablet 0x056A 0x00D5 0xFF0D 0x0001
 Tablet 0x056A 0x00D5 0x000D 0x0001
 Name "Wacom CTL-660"
 ReportLength 9
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21648
 MaxY 13700
 MaxPressure 1023
@@ -187,7 +187,7 @@ Tablet 0x056A 0x0301 0xFF0D 0x0001
 Tablet 0x056A 0x0301 0x000D 0x0001
 Name "Wacom CTL-671"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21648
 MaxY 13530
 MaxPressure 1023
@@ -201,7 +201,7 @@ Tablet 0x056A 0x037B 0xFF0D 0x0001
 Tablet 0x056A 0x037B 0x000D 0x0001
 Name "Wacom CTL-672"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21600
 MaxY 13500
 MaxPressure 2047
@@ -215,7 +215,7 @@ Tablet 0x056A 0x0323 0xFF0D 0x0001
 Tablet 0x056A 0x0323 0x000D 0x0001
 Name "Wacom CTL-680"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21600
 MaxY 13500
 MaxPressure 1023
@@ -229,7 +229,7 @@ Tablet 0x056A 0x033D 0xFF0D 0x0001
 Tablet 0x056A 0x033D 0x000D 0x0001
 Name "Wacom CTL-690"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21600
 MaxY 13500
 MaxPressure 2047
@@ -244,7 +244,7 @@ Tablet 0x056A 0x00D6 0xFF0D 0x0001
 Tablet 0x056A 0x00D6 0x000D 0x0001
 Name "Wacom CTH-460(A)"
 ReportLength 9
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9200
 MaxPressure 1023
@@ -258,7 +258,7 @@ Tablet 0x056A 0x00D7 0xFF0D 0x0001
 Tablet 0x056A 0x00D7 0x000D 0x0001
 Name "Wacom CTH-461(A)"
 ReportLength 9
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9200
 MaxPressure 1023
@@ -272,7 +272,7 @@ Tablet 0x056A 0x00DA 0xFF0D 0x0001
 Tablet 0x056A 0x00DA 0x000D 0x0001
 Name "Wacom CTH-461SE"
 ReportLength 9
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9200
 MaxPressure 1023
@@ -286,7 +286,7 @@ Tablet 0x056A 0x00D1 0xFF0D 0x0001
 Tablet 0x056A 0x00D1 0x000D 0x0001
 Name "Wacom CTH-460"
 ReportLength 9
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9200
 MaxPressure 1023
@@ -300,7 +300,7 @@ Tablet 0x056A 0x00D2 0xFF0D 0x0001
 Tablet 0x056A 0x00D2 0x000D 0x0001
 Name "Wacom CTH-461"
 ReportLength 9
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9200
 MaxPressure 1023
@@ -314,7 +314,7 @@ Tablet 0x056A 0x00DE 0xFF0D 0x0001
 Tablet 0x056A 0x00DE 0x000D 0x0001
 Name "Wacom CTH-470"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 14720
 MaxY 9200
 MaxPressure 1023
@@ -328,7 +328,7 @@ Tablet 0x056A 0x0302 0xFF0D 0x0001
 Tablet 0x056A 0x0302 0x000D 0x0001
 Name "Wacom CTH-480"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 1023
@@ -342,7 +342,7 @@ Tablet 0x056A 0x033C 0xFF0D 0x0001
 Tablet 0x056A 0x033C 0x000D 0x0001
 Name "Wacom CTH-490"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 2047
@@ -357,7 +357,7 @@ Tablet 0x056A 0x00D3 0xFF0D 0x0001
 Tablet 0x056A 0x00D3 0x000D 0x0001
 Name "Wacom CTH-661"
 ReportLength 9
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21648
 MaxY 13700
 MaxPressure 1023
@@ -371,7 +371,7 @@ Tablet 0x056A 0x00D8 0xFF0D 0x0001
 Tablet 0x056A 0x00D8 0x000D 0x0001
 Name "Wacom CTH-661(A)"
 ReportLength 9
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21648
 MaxY 13700
 MaxPressure 1023
@@ -385,7 +385,7 @@ Tablet 0x056A 0x00DB 0xFF0D 0x0001
 Tablet 0x056A 0x00DB 0x000D 0x0001
 Name "Wacom CTH-661SE"
 ReportLength 9
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21648
 MaxY 13700
 MaxPressure 1023
@@ -399,7 +399,7 @@ Tablet 0x056A 0x00DF 0xFF0D 0x0001
 Tablet 0x056A 0x00DF 0x000D 0x0001
 Name "Wacom CTH-670"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21648
 MaxY 13700
 MaxPressure 1023
@@ -413,7 +413,7 @@ Tablet 0x056A 0x0303 0xFF0D 0x0001
 Tablet 0x056A 0x0303 0x000D 0x0001
 Name "Wacom CTH-680"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21600
 MaxY 13500
 MaxPressure 1023
@@ -427,7 +427,7 @@ Tablet 0x056A 0x033E 0xFF0D 0x0001
 Tablet 0x056A 0x033E 0x000D 0x0001
 Name "Wacom CTH-690"
 ReportLength 10
-ButtonMask 0x40
+DetectMask 0x40
 MaxX 21600
 MaxY 13500
 MaxPressure 2047
@@ -442,7 +442,7 @@ Tablet 0x056A 0x0017 0xFF0D 0x0001
 Tablet 0x056A 0x0017 0x000D 0x0001
 Name "Wacom CTE-450"
 ReportLength 9
-ButtonMask 0x00
+DetectMask 0x00
 MaxX 14760
 MaxY 9225
 MaxPressure 511
@@ -456,7 +456,7 @@ Tablet 0x056A 0x0018 0xFF0D 0x0001
 Tablet 0x056A 0x0018 0x000D 0x0001
 Name "Wacom CTE-650"
 ReportLength 9
-ButtonMask 0x00
+DetectMask 0x00
 MaxX 21648
 MaxY 13530
 MaxPressure 511

From b5ffc2ad9c2a50429a81b2886473eec831a9698e Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Fri, 30 Mar 2018 13:35:39 +0300
Subject: [PATCH 13/83] Huion H430P configuration

---
 TabletDriverService/config/tablet.cfg | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 953d3a4..bfe1703 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -438,6 +438,22 @@ Width 101.6
 Height 56.6
 
 
+#
+# Huion H430P
+#
+Tablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}" 201 HUION_T176
+Name "Huion H430P"
+ReportId 0x08
+ReportLength 12
+DetectMask 0x80
+IgnoreMask 0x60
+MaxX 24384
+MaxY 15240
+MaxPressure 4095
+Width 121.92
+Height 76.20
+
+
 #
 # Huion H640P
 #

From 12861b257b902da27b1c904e829fe3e28fd3cc42 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Fri, 30 Mar 2018 13:36:16 +0300
Subject: [PATCH 14/83] Added Intuos5 tablets to the wacom.cfg

---
 TabletDriverService/config/wacom.cfg | 86 ++++++++++++++++++++++++++--
 1 file changed, 81 insertions(+), 5 deletions(-)

diff --git a/TabletDriverService/config/wacom.cfg b/TabletDriverService/config/wacom.cfg
index 3b7a1bd..d0dc2a8 100644
--- a/TabletDriverService/config/wacom.cfg
+++ b/TabletDriverService/config/wacom.cfg
@@ -10,6 +10,51 @@
 #
 
 
+# Wacom PTK-450
+Tablet 0x056A 0x0029 0xFF0D 0x0001
+Tablet 0x056A 0x0029 0x000D 0x0001
+Name "Wacom PTK-450"
+ReportLength 10
+DetectMask 0xE0
+MaxX 31496
+MaxY 19685
+MaxPressure 2047
+Width 157.480
+Height 98.425
+InitFeature 0x02 0x02
+Type WacomIntuos
+
+
+# Wacom PTK-650
+Tablet 0x056A 0x002A 0xFF0D 0x0001
+Tablet 0x056A 0x002A 0x000D 0x0001
+Name "Wacom PTK-650"
+ReportLength 10
+DetectMask 0xE0
+MaxX 44704
+MaxY 27940
+MaxPressure 2047
+Width 223.520
+Height 139.700
+InitFeature 0x02 0x02
+Type WacomIntuos
+
+
+# Wacom PTH-450
+Tablet 0x056A 0x0026 0xFF0D 0x0001
+Tablet 0x056A 0x0026 0x000D 0x0001
+Name "Wacom PTH-450"
+ReportLength 10
+DetectMask 0xE0
+MaxX 31496
+MaxY 19685
+MaxPressure 2047
+Width 157.480
+Height 98.425
+InitFeature 0x02 0x02
+Type WacomIntuos
+
+
 # Wacom PTH-451
 Tablet 0x056A 0x0314 0xFF0D 0x0001
 Tablet 0x056A 0x0314 0x000D 0x0001
@@ -25,6 +70,21 @@ InitFeature 0x02 0x02
 Type WacomIntuos
 
 
+# Wacom PTH-650
+Tablet 0x056A 0x0027 0xFF0D 0x0001
+Tablet 0x056A 0x0027 0x000D 0x0001
+Name "Wacom PTH-650"
+ReportLength 10
+DetectMask 0xE0
+MaxX 44704
+MaxY 27940
+MaxPressure 2047
+Width 223.520
+Height 139.700
+InitFeature 0x02 0x02
+Type WacomIntuos
+
+
 # Wacom PTH-651
 Tablet 0x056A 0x0315 0xFF0D 0x0001
 Tablet 0x056A 0x0315 0x000D 0x0001
@@ -40,6 +100,21 @@ InitFeature 0x02 0x02
 Type WacomIntuos
 
 
+# Wacom PTH-850
+Tablet 0x056A 0x0028 0xFF0D 0x0001
+Tablet 0x056A 0x0028 0x000D 0x0001
+Name "Wacom PTH-850"
+ReportLength 10
+DetectMask 0xE0
+MaxX 65024
+MaxY 40640
+MaxPressure 2047
+Width 325.120
+Height 203.200
+InitFeature 0x02 0x02
+Type WacomIntuos
+
+
 # Wacom PTH-851
 Tablet 0x056A 0x0317 0xFF0D 0x0001
 Tablet 0x056A 0x0317 0x000D 0x0001
@@ -466,9 +541,10 @@ InitFeature 0x02 0x02
 
 
 #
-# Automatically generated Wacom tablet configurations (32):
-#   PTH-451, PTH-651, PTH-851, MTE-450, CTT-460, CTL-460, CTL-470, CTL-471, 
-#   CTL-472, CTL-480, CTL-490, CTL-660, CTL-671, CTL-672, CTL-680, CTL-690, 
-#   CTH-460(A), CTH-461(A), CTH-461SE, CTH-460, CTH-461, CTH-470, CTH-480, CTH-490, 
-#   CTH-661, CTH-661(A), CTH-661SE, CTH-670, CTH-680, CTH-690, CTE-450, CTE-650
+# Automatically generated Wacom tablet configurations (37):
+#   PTK-450, PTK-650, PTH-450, PTH-451, PTH-650, PTH-651, PTH-850, PTH-851, 
+#   MTE-450, CTT-460, CTL-460, CTL-470, CTL-471, CTL-472, CTL-480, CTL-490, 
+#   CTL-660, CTL-671, CTL-672, CTL-680, CTL-690, CTH-460(A), CTH-461(A), CTH-461SE, 
+#   CTH-460, CTH-461, CTH-470, CTH-480, CTH-490, CTH-661, CTH-661(A), CTH-661SE, 
+#   CTH-670, CTH-680, CTH-690, CTE-450, CTE-650
 #

From 7849a25549d124a0da7ea41d2db399196c8443e7 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Fri, 30 Mar 2018 13:37:26 +0300
Subject: [PATCH 15/83] Added new Huion init message (string id 200)

---
 TabletDriverService/Tablet.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index cf50c3d..53151d8 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -119,13 +119,15 @@ bool Tablet::Init() {
 	// USB (Huion)
 	if(usbDevice != NULL) {
 		BYTE buffer[64];
-		if(usbDevice->ControlTransfer(0x80, 0x06, (0x03 << 8) | 100, 0x0409, buffer, 64) > 0) {
+		int status;
+		status = usbDevice->ControlTransfer(0x80, 0x06, (0x03 << 8) | 200, 0x0409, buffer, 64);
+		status += usbDevice->ControlTransfer(0x80, 0x06, (0x03 << 8) | 100, 0x0409, buffer, 64);
+		if(status > 0) {
 			return true;
 		}
 		return false;
 	}
-
-
+	
 	return true;
 }
 

From 294039f9358302bf51a8224d3fb75427781352c4 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Fri, 30 Mar 2018 13:41:27 +0300
Subject: [PATCH 16/83] SendInput mode

Experimental version. Tested only on Windows 10.
---
 TabletDriverService/ProcessCommand.cpp | 12 +++-
 TabletDriverService/VMulti.cpp         | 85 +++++++++++++++++++++++++-
 TabletDriverService/VMulti.h           | 15 ++++-
 3 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 0b0315f..49997b8 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -447,8 +447,18 @@ bool ProcessCommand(CommandLine *cmd) {
 				vmulti->ResetReport();
 			vmulti->mode = VMulti::ModeDigitizer;
 			LOG_INFO("Output Mode = Digitizer\n");
+		}
 
-		} else {
+		// SendInput
+		else if(mode.compare(0, 4, "send") == 0) {
+			if(vmulti->mode != VMulti::ModeSendInput)
+				vmulti->ResetReport();
+			vmulti->mode = VMulti::ModeSendInput;
+			vmulti->UpdateMonitorInfo();
+			LOG_INFO("Output Mode = SendInput\n");
+		}
+
+		else {
 			LOG_ERROR("Unknown output mode '%s'\n", mode.c_str());
 		}
 
diff --git a/TabletDriverService/VMulti.cpp b/TabletDriverService/VMulti.cpp
index 727b95c..85be417 100644
--- a/TabletDriverService/VMulti.cpp
+++ b/TabletDriverService/VMulti.cpp
@@ -8,6 +8,7 @@
 VMulti::VMulti() {
 	isOpen = false;
 	debugEnabled = false;
+	lastButtons = 0;
 
 	mode = ModeAbsoluteMouse;
 
@@ -38,6 +39,9 @@ VMulti::VMulti() {
 	memset(&relativeData, 0, sizeof(relativeData));
 	relativeData.sensitivity = 1;
 
+	// Monitor info
+	UpdateMonitorInfo();
+
 	// Report buffers
 	memset(reportBuffer, 0, 65);
 	memset(lastReportBuffer, 0, 65);
@@ -70,7 +74,9 @@ bool VMulti::HasReportChanged() {
 	return true;
 }
 
-
+//
+// Reset relative mouse data
+//
 void VMulti::ResetRelativeData(double x, double y) {
 	relativeData.targetPosition.Set(x, y);
 	relativeData.lastPosition.Set(x, y);
@@ -78,6 +84,20 @@ void VMulti::ResetRelativeData(double x, double y) {
 	relativeData.currentPosition.y = (int)y;
 }
 
+
+//
+// Update monitor information
+//
+void VMulti::UpdateMonitorInfo() {
+	monitorInfo.primaryWidth = GetSystemMetrics(SM_CXSCREEN);
+	monitorInfo.primaryHeight = GetSystemMetrics(SM_CYSCREEN);
+	monitorInfo.virtualWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+	monitorInfo.virtualHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+	monitorInfo.virtualX = GetSystemMetrics(SM_XVIRTUALSCREEN);
+	monitorInfo.virtualY = GetSystemMetrics(SM_YVIRTUALSCREEN);
+}
+
+
 //
 // Create report
 //
@@ -159,6 +179,49 @@ void VMulti::CreateReport(BYTE buttons, double x, double y, double pressure) {
 		}
 	}
 
+	//
+	// SendInput
+	//
+	else if(mode == ModeSendInput) {
+
+		if(debugEnabled) {
+			LOG_DEBUG("%0.0f,%0.0f | %0.0f,%0.0f | %0.0f,%0.0f\n",
+				monitorInfo.primaryWidth, monitorInfo.primaryHeight,
+				monitorInfo.virtualWidth, monitorInfo.virtualHeight,
+				monitorInfo.virtualX, monitorInfo.virtualY
+			);
+		}
+		INPUT input = {0};
+		input.type = INPUT_MOUSE;
+		input.mi.mouseData = 0;
+		input.mi.dx = (LONG)floor(
+			x * 65535.0 * (monitorInfo.virtualWidth / monitorInfo.primaryWidth)
+			+ (monitorInfo.virtualX / monitorInfo.primaryWidth * 65535.0)
+		);
+		input.mi.dy = (LONG)floor(
+			y * 65535.0 * (monitorInfo.virtualHeight / monitorInfo.primaryHeight)
+			+ (monitorInfo.virtualY / monitorInfo.primaryHeight * 65535.0)
+		);
+		input.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE;
+
+		// Mouse 1
+		if((buttons & 0x01) && !(lastButtons & 0x01)) input.mi.dwFlags |= MOUSEEVENTF_LEFTDOWN;
+		else if(!(buttons & 0x01) && (lastButtons & 0x01)) input.mi.dwFlags |= MOUSEEVENTF_LEFTUP;
+
+		// Mouse 2
+		if((buttons & 0x02) && !(lastButtons & 0x02)) input.mi.dwFlags |= MOUSEEVENTF_RIGHTDOWN;
+		else if(!(buttons & 0x02) && (lastButtons & 0x02)) input.mi.dwFlags |= MOUSEEVENTF_RIGHTUP;
+
+		// Mouse 3
+		if((buttons & 0x04) && !(lastButtons & 0x04)) input.mi.dwFlags |= MOUSEEVENTF_MIDDLEDOWN;
+		else if(!(buttons & 0x04) && (lastButtons & 0x04)) input.mi.dwFlags |= MOUSEEVENTF_MIDDLEUP;
+
+		lastButtons = buttons;
+
+		memcpy(reportBuffer, &input, sizeof(INPUT));
+	}
+
+
 }
 
 
@@ -188,7 +251,21 @@ int VMulti::ResetReport() {
 		reportDigitizer.buttons = 0;
 		reportDigitizer.pressure = 0;
 		memcpy(reportBuffer, &reportDigitizer, sizeof(reportDigitizer));
+
+	// Send Input
+	} else if(mode == ModeSendInput) {
+		INPUT input = {0};
+		input.type = INPUT_MOUSE;
+		input.mi.mouseData = 0;
+		input.mi.dx = 0;
+		input.mi.dy = 0;
+		input.mi.dwFlags = MOUSEEVENTF_LEFTUP | MOUSEEVENTF_RIGHTUP | MOUSEEVENTF_MIDDLEUP;
+		memcpy(reportBuffer, &input, sizeof(INPUT));
+		memcpy(lastReportBuffer, reportBuffer, 65);
+		return 0;
 	}
+
+	memcpy(lastReportBuffer, reportBuffer, 65);
 	return hidDevice->Write(reportBuffer, 65);
 }
 
@@ -201,5 +278,9 @@ int VMulti::WriteReport() {
 
 	memcpy(lastReportBuffer, reportBuffer, 65);
 
-	return hidDevice->Write(reportBuffer, 65);
+	if(mode == ModeSendInput) {
+		return SendInput(1, (LPINPUT)reportBuffer, sizeof(INPUT));
+	} else {
+		return hidDevice->Write(reportBuffer, 65);
+	}
 }
\ No newline at end of file
diff --git a/TabletDriverService/VMulti.h b/TabletDriverService/VMulti.h
index d37bda7..342f406 100644
--- a/TabletDriverService/VMulti.h
+++ b/TabletDriverService/VMulti.h
@@ -13,7 +13,8 @@ class VMulti {
 	enum VMultiMode {
 		ModeAbsoluteMouse,
 		ModeRelativeMouse,
-		ModeDigitizer
+		ModeDigitizer,
+		ModeSendInput
 	};
 
 	struct {
@@ -61,10 +62,21 @@ class VMulti {
 		double sensitivity;
 	} relativeData;
 
+
+	struct {
+		double primaryWidth = GetSystemMetrics(SM_CXSCREEN);
+		double primaryHeight = GetSystemMetrics(SM_CYSCREEN);
+		double virtualWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+		double virtualHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+		double virtualX = GetSystemMetrics(SM_XVIRTUALSCREEN);
+		double virtualY = GetSystemMetrics(SM_YVIRTUALSCREEN);
+	} monitorInfo;
+
 	VMultiMode mode;
 	bool isOpen;
 	bool debugEnabled;
 	bool outputEnabled;
+	int lastButtons;
 
 
 
@@ -72,6 +84,7 @@ class VMulti {
 	~VMulti();
 	bool HasReportChanged();
 	void ResetRelativeData(double x, double y);
+	void UpdateMonitorInfo();
 	void CreateReport(BYTE buttons, double x, double y, double pressure);
 	int ResetReport();
 	int WriteReport();

From c9ae393913507dbb3a0671052852ff09010c2e2b Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Fri, 30 Mar 2018 13:42:46 +0300
Subject: [PATCH 17/83] Skip the geometric median calculation if there is only
 a one position in the buffer.

---
 TabletDriverService/TabletFilterNoiseReduction.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/TabletDriverService/TabletFilterNoiseReduction.cpp b/TabletDriverService/TabletFilterNoiseReduction.cpp
index deeb78d..2ba06a5 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.cpp
+++ b/TabletDriverService/TabletFilterNoiseReduction.cpp
@@ -58,6 +58,15 @@ bool TabletFilterNoiseReduction::GetPosition(Vector2D *outputVector) {
 
 // Update
 void TabletFilterNoiseReduction::Update() {
+
+	// One position in the buffer?
+	if(bufferPositionCount == 1) {
+		position.x = buffer[0].x;
+		position.y = buffer[0].y;
+		return;
+	}
+
+	// Calculate geometric median from the buffer positions
 	GetGeometricMedianVector(&position, iterations);
 
 	// Reset the buffer when distance to last target position is larger than the threshold
@@ -72,6 +81,9 @@ void TabletFilterNoiseReduction::Update() {
 
 
 
+//
+// Reset buffer
+//
 void TabletFilterNoiseReduction::ResetBuffer() {
 	bufferPositionCount = 0;
 	bufferCurrentIndex = 0;

From 50914711e1d6ee188b2e02f0b1452c73829a8ab9 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 31 Mar 2018 13:37:31 +0300
Subject: [PATCH 18/83] v0.1.4

---
 README.md                          | 10 +++++++++-
 TabletDriverGUI/MainWindow.xaml.cs |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8c03d0a..be73ad4 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 
 ## Download
 
-### http://hwk.fi/TabletDriver/TabletDriverV0.1.3.zip
+### http://hwk.fi/TabletDriver/TabletDriverV0.1.4.zip
 
 #
 
@@ -39,6 +39,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
   
 ### Configured, but not properly tested:
   - Huion H420
+  - Huion H430P
   - Wacom CTL-4100 USB
   - Wacom CTL-4100 Bluetooth
   - Wacom CTH-470
@@ -49,6 +50,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
   - Wacom CTH-680
   - Wacom CTH-490
   - Wacom PTH-451
+  - Wacom PTH-850
 
 #
 
@@ -90,6 +92,12 @@ If you want to compile the code and don't want to install anything from the Tabl
 #
 
 ## Changelog
+>**v0.1.4:**
+> - Modified the Wacom CTL-471 full area size (147.20 x 92.25 mm to 152 x 95 mm)
+> - New tablet configurations: Wacom PTH-850 and Huion H430P
+>   The PTH-850 configuration is made by [mojobojo](https://github.com/mojobojo)
+> - Regenerated the wacom.cfg with new parameters, so it now includes PTH-450/650/850 and PTK-450/650
+
 >**v0.1.3:**
 > - Added left handed mode / tablet invert option.
 > - Added Wacom driver device support for the CTL-471 and 472
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 3ba6f75..7801ed7 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -24,7 +24,7 @@ public partial class MainWindow : Window
     {
 
         // Version
-        public string Version = "0.1.3";
+        public string Version = "0.1.4";
 
         // Console stuff
         private List<string> commandHistory;

From b03343605db168776cf25521f6a211d58b82a694 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 15 Apr 2018 18:47:31 +0300
Subject: [PATCH 19/83] v0.1.5

 - New tablet configurations:
Wacom CTL-4100 (USB only model), XP-Pen G540 Pro, XP-Pen Deco 01 and Huion osu!tablet
- Added `ResetDistance` command
- Code refactoring.
---
 README.md                                     | 10 +-
 TabletDriverGUI/MainWindow.xaml.cs            | 15 ++-
 TabletDriverService/Main.cpp                  | 94 ++++++++++++------
 TabletDriverService/PositionRingBuffer.cpp    | 97 +++++++++++++++++++
 TabletDriverService/PositionRingBuffer.h      | 25 +++++
 TabletDriverService/ProcessCommand.cpp        | 17 +++-
 TabletDriverService/Tablet.cpp                | 14 ++-
 TabletDriverService/Tablet.h                  | 10 +-
 .../TabletDriverService.vcxproj               |  4 +
 .../TabletDriverService.vcxproj.filters       | 12 +++
 .../TabletFilterNoiseReduction.cpp            | 89 +++++------------
 .../TabletFilterNoiseReduction.h              | 14 +--
 TabletDriverService/TabletFilterPeak.cpp      | 77 +++++++++++++++
 TabletDriverService/TabletFilterPeak.h        | 22 +++++
 TabletDriverService/VMulti.cpp                |  5 +-
 TabletDriverService/VMulti.h                  |  1 +
 TabletDriverService/config/tablet.cfg         | 50 +++++++++-
 17 files changed, 436 insertions(+), 120 deletions(-)
 create mode 100644 TabletDriverService/PositionRingBuffer.cpp
 create mode 100644 TabletDriverService/PositionRingBuffer.h
 create mode 100644 TabletDriverService/TabletFilterPeak.cpp
 create mode 100644 TabletDriverService/TabletFilterPeak.h

diff --git a/README.md b/README.md
index be73ad4..01a0765 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 
 ## Download
 
-### http://hwk.fi/TabletDriver/TabletDriverV0.1.4.zip
+### http://hwk.fi/TabletDriver/TabletDriverV0.1.5.zip
 
 #
 
@@ -61,7 +61,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
     * https://aka.ms/vs/15/release/vc_redist.x86.exe
 
 2. Unzip the driver to a folder (Shorter path is recommended, for example `C:\Temp\TabletDriver`)
-3. Uninstall all other tablet drivers.
+3. Uninstall all other tablet drivers. If you have problems with uninstalling the Wacom drivers, check the GitHub issue [#1](https://github.com/hawku/TabletDriver/issues/1)
 4. Run `install_vmulti_driver.bat`. It might need a restart if there is another vmulti driver installed.
 5. If you have Huion or Gaomon tablet, you need to run `install_huion_64.bat`, which is in the `driver_huion` directory.
 6. Start the TabletDriverGUI.exe
@@ -92,6 +92,12 @@ If you want to compile the code and don't want to install anything from the Tabl
 #
 
 ## Changelog
+>**v0.1.5:**
+> - New tablet configurations: Wacom CTL-4100 (USB only model), XP-Pen G540 Pro, XP-Pen Deco 01 and Huion osu!tablet
+>   Thanks to /u/THEqrunt for capturing the XP-Pen Deco 01 USB data.
+> - Added `ResetDistance` command, it controls the relative mode position reset distance.
+> - Code refactoring.
+
 >**v0.1.4:**
 > - Modified the Wacom CTL-471 full area size (147.20 x 92.25 mm to 152 x 95 mm)
 > - New tablet configurations: Wacom PTH-850 and Huion H430P
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 7801ed7..5f4d1bc 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -24,7 +24,7 @@ public partial class MainWindow : Window
     {
 
         // Version
-        public string Version = "0.1.4";
+        public string Version = "0.1.5";
 
         // Console stuff
         private List<string> commandHistory;
@@ -1546,8 +1546,17 @@ private void ParseDriverStatus(string line)
             //
             if (variableName == "tablet")
             {
-                Title = "TabletDriverGUI - " + stringValue;
-                notifyIcon.Text = Title;
+                string title = "TabletDriverGUI - " + stringValue;
+                Title = title;
+
+                // Limit notify icon text length
+                if (title.Length > 63)
+                {
+                    notifyIcon.Text = title.Substring(0, 63);
+                } else
+                {
+                    notifyIcon.Text = title;
+                }
                 SetStatus("Connected to " + stringValue);
             }
 
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index d8de81e..be4a980 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -46,6 +46,8 @@ void RunTabletThread() {
 	bool isFirstReport = true;
 	bool isResent = false;
 	double x, y;
+	TabletFilter *filter;
+	bool filterTimedEnabled;
 
 	chrono::high_resolution_clock::time_point timeBegin = chrono::high_resolution_clock::now();
 	chrono::high_resolution_clock::time_point timeNow = chrono::high_resolution_clock::now();
@@ -60,10 +62,10 @@ void RunTabletThread() {
 		// Read tablet position
 		//
 		status = tablet->ReadPosition();
+
 		// Position OK
 		if(status == Tablet::PacketValid) {
 			isResent = false;
-			// Position invalid
 
 		// Invalid packet id
 		} else if(status == Tablet::PacketInvalid) {
@@ -111,17 +113,40 @@ void RunTabletThread() {
 		}
 
 		//
-		// Packet filter
+		// Packet filters
 		//
-		if(tablet->filterPacket != NULL && tablet->filterPacket->isEnabled) {
-			tablet->filterPacket->SetTarget(tablet->state.position);
-			tablet->filterPacket->Update();
-			tablet->filterPacket->GetPosition(&tablet->state.position);
+		// Is there any filters?
+		if(tablet->filterPacketCount > 0) {
+
+			// Loop through filters
+			for(int filterIndex = 0; filterIndex < tablet->filterPacketCount; filterIndex++) {
+
+				// Filter
+				filter = tablet->filterPacket[filterIndex];
+
+				// Enabled?
+				if(filter != NULL && filter->isEnabled) {
+
+					// Process
+					filter->SetTarget(tablet->state.position);
+					filter->Update();
+					filter->GetPosition(&tablet->state.position);
+				}
+
+			}
+		}
+
+
+		// Timed filter enabled?
+		filterTimedEnabled = false;
+		for(int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
+			if(tablet->filterTimed[filterIndex]->isEnabled)
+				filterTimedEnabled = true;
 		}
 
 
 		// Do not write report when timed filter is enabled
-		if(tablet->filterTimed == NULL || !tablet->filterTimed->isEnabled) {
+		if(tablet->filterTimedCount == 0 || !filterTimedEnabled) {
 
 			// Relative mode
 			if(vmulti->mode == VMulti::ModeRelativeMouse) {
@@ -165,34 +190,40 @@ void RunTabletThread() {
 //
 VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWaitFired) {
 	Vector2D position;
+	TabletFilter *filter;
+
+	// Set position
+	position.Set(tablet->state.position);
 
-	TabletFilter *filter = tablet->filterTimed;
+	// Loop through filters
+	for(int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
 
-	// Filter enabled?
-	if(!filter->isEnabled) return;
+		// Filter
+		filter = tablet->filterTimed[filterIndex];
 
-	// Set filter targets
-	filter->SetTarget(tablet->state.position);
+		// Filter enabled?
+		if(!filter->isEnabled) return;
 
-	// Update filter position
-	filter->Update();
+		// Set filter targets
+		filter->SetTarget(position);
 
-	// Set output vector
-	filter->GetPosition(&position);
+		// Update filter position
+		filter->Update();
 
+		// Set output vector
+		filter->GetPosition(&position);
 
+	}
+
+
+	//
 	// Relative mode
+	//
 	if(vmulti->mode == VMulti::ModeRelativeMouse) {
 
 		// Map position to virtual screen (values between 0 and 1)
 		mapper->GetRotatedTabletPosition(&position.x, &position.y);
 
-		// Large distance -> Reset relative position
-		double distance = tablet->state.position.Distance(vmulti->relativeData.lastPosition);
-		if(distance > 10) {
-			vmulti->ResetRelativeData(position.x, position.y);
-		}
-
 		// Create VMulti report
 		vmulti->CreateReport(
 			tablet->state.buttons,
@@ -207,12 +238,17 @@ VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWa
 			vmulti->reportRelativeMouse.x != 0
 			||
 			vmulti->reportRelativeMouse.y != 0
-		) {
+			) {
 			vmulti->WriteReport();
 		}
 
+
+	}
+
+	//
 	// Absolute / Digitizer mode
-	} else {
+	//
+	else {
 
 
 		// Map position to virtual screen (values betweeb 0->1)
@@ -338,8 +374,10 @@ int main(int argc, char**argv) {
 				running = true;
 
 				// Timed filter timer
-				tablet->filterTimed->callback = FilterTimerCallback;
-				tablet->filterTimed->StartTimer();
+				if(tablet->filterPacketCount > 0) {
+					tablet->filterTimed[0]->callback = FilterTimerCallback;
+					tablet->filterTimed[0]->StartTimer();
+				}
 
 				// Start the tablet thread
 				tabletThread = new thread(RunTabletThread);
@@ -389,8 +427,8 @@ void CleanupAndExit(int code) {
 
 	// Delete filter timer
 	if(tablet != NULL) {
-		if(tablet->filterTimed != NULL) {
-			tablet->filterTimed->StopTimer();
+		if(tablet->filterTimedCount != 0) {
+			tablet->filterTimed[0]->StopTimer();
 		}
 	}
 
diff --git a/TabletDriverService/PositionRingBuffer.cpp b/TabletDriverService/PositionRingBuffer.cpp
new file mode 100644
index 0000000..7a5acbb
--- /dev/null
+++ b/TabletDriverService/PositionRingBuffer.cpp
@@ -0,0 +1,97 @@
+#include "stdafx.h"
+#include "PositionRingBuffer.h"
+
+
+//
+// Constructor
+//
+PositionRingBuffer::PositionRingBuffer() {
+	maxLength = sizeof(buffer) / sizeof(Vector2D);
+	length = 0;
+	count = 0;
+	index = 0;
+	isValid = false;
+}
+
+
+//
+// Destructor
+//
+PositionRingBuffer::~PositionRingBuffer() {
+}
+
+
+//
+// Set buffer length
+//
+void PositionRingBuffer::SetLength(int len) {
+	if(len > maxLength) {
+		length = maxLength;
+	} else {
+		length = len;
+	}
+}
+
+
+//
+// Add position to buffer
+//
+void PositionRingBuffer::Add(Vector2D vector) {
+	buffer[index].x = vector.x;
+	buffer[index].y = vector.y;
+	index++;
+	count++;
+	if(count > length) {
+		count = length;
+	}
+	if(index >= length) {
+		index = 0;
+	}
+	isValid = true;
+}
+
+
+//
+// Get position history from the buffer
+//
+bool PositionRingBuffer::GetLatest(Vector2D *output, int delta) {
+	int newIndex;
+
+	// Buffer empty?
+	if(count == 0) return false;
+
+	// Valid delta?
+	if(delta > 0 || delta <= -count) return false;
+
+	newIndex = index - 1 + delta;
+
+	// Limits
+	if(newIndex < 0) newIndex = count + newIndex;
+
+	if(newIndex < 0 || newIndex >= count) {
+		return false;
+	}
+
+	output->x = buffer[newIndex].x;
+	output->y = buffer[newIndex].y;
+	return true;
+}
+
+
+//
+// Reset buffer
+//
+void PositionRingBuffer::Reset() {
+	count = 0;
+	index = 0;
+	isValid = false;
+}
+
+
+
+//
+// [] operator
+//
+Vector2D *PositionRingBuffer::operator[](std::size_t index) {
+	return &(buffer[index]);
+}
\ No newline at end of file
diff --git a/TabletDriverService/PositionRingBuffer.h b/TabletDriverService/PositionRingBuffer.h
new file mode 100644
index 0000000..f41fe42
--- /dev/null
+++ b/TabletDriverService/PositionRingBuffer.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "Vector2D.h"
+
+class PositionRingBuffer {
+public:
+	Vector2D buffer[100];
+	int maxLength;
+	int length;
+	int count;
+	int index;
+	bool isValid;
+
+	void SetLength(int length);
+	void Add(Vector2D vector);
+	bool GetLatest(Vector2D *output, int delta);
+	void Reset();
+
+	Vector2D *operator[](std::size_t index);
+
+
+	PositionRingBuffer();
+	~PositionRingBuffer();
+};
+
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 49997b8..e4d90e3 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -211,7 +211,7 @@ bool ProcessCommand(CommandLine *cmd) {
 		LOG_INFO("Tablet skew = Shift X-axis %0.2f mm per Y-axis mm\n", tablet->settings.skew);
 	}
 
-	// Skew
+	// Type
 	else if(cmd->is("Type")) {
 		if(tablet == NULL) return false;
 
@@ -418,6 +418,15 @@ bool ProcessCommand(CommandLine *cmd) {
 		LOG_INFO("Relative mode sensitivity = %0.2f px/mm\n", vmulti->relativeData.sensitivity);
 	}
 
+	//
+	// Relative mode reset distance
+	//
+	else if(cmd->is("ResetDistance")) {
+		if(!CheckTablet()) return true;
+		vmulti->relativeData.resetDistance = cmd->GetDouble(0, vmulti->relativeData.resetDistance);
+		LOG_INFO("Relative mode reset distance = %0.2f mm\n", vmulti->relativeData.resetDistance);
+	}
+
 
 	//
 	// VMulti output mode
@@ -545,7 +554,7 @@ bool ProcessCommand(CommandLine *cmd) {
 		// Set parameters
 		} else {
 
-			int length = cmd->GetInt(0, tablet->noise.bufferLength);
+			int length = cmd->GetInt(0, tablet->noise.buffer.length);
 			double distanceThreshold = cmd->GetDouble(1, tablet->noise.distanceThreshold);
 			int iterations = cmd->GetInt(2, tablet->noise.iterations);
 
@@ -560,12 +569,12 @@ bool ProcessCommand(CommandLine *cmd) {
 			else if(iterations > 100) iterations = 100;
 
 			// Set
-			tablet->noise.SetBufferLength(length);
+			tablet->noise.buffer.SetLength(length);
 			tablet->noise.distanceThreshold = distanceThreshold;
 			tablet->noise.iterations = iterations;
 
 			// Enable filter
-			if(tablet->noise.bufferLength > 0) {
+			if(tablet->noise.buffer.length > 0) {
 				tablet->noise.isEnabled = true;
 				LOG_INFO("Noise Reduction = %d packets, %0.3f mm threshold, %d iterations\n", length, distanceThreshold, iterations);
 			} else {
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 53151d8..5705238 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -54,8 +54,13 @@ Tablet::Tablet() {
 	memset(&state, 0, sizeof(state));
 
 	// Filters
-	filterTimed = &smoothing;
-	filterPacket = &noise;
+	filterTimed[0] = &smoothing;
+	filterTimedCount = 1;
+	filterPacket[0] = &noise;
+	//filterPacket[1] = &peak;
+	filterPacketCount = 1;
+
+	peak.isEnabled = true;
 
 	// Button map
 	memset(&buttonMap, 0, sizeof(buttonMap));
@@ -120,8 +125,13 @@ bool Tablet::Init() {
 	if(usbDevice != NULL) {
 		BYTE buffer[64];
 		int status;
+
+		// String Id 200
 		status = usbDevice->ControlTransfer(0x80, 0x06, (0x03 << 8) | 200, 0x0409, buffer, 64);
+
+		// String Id 100
 		status += usbDevice->ControlTransfer(0x80, 0x06, (0x03 << 8) | 100, 0x0409, buffer, 64);
+
 		if(status > 0) {
 			return true;
 		}
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 4d482f2..ed0a4ba 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -7,6 +7,7 @@
 #include "TabletSettings.h"
 #include "TabletFilterSmoothing.h"
 #include "TabletFilterNoiseReduction.h"
+#include "TabletFilterPeak.h"
 #include "TabletBenchmark.h"
 #include "Vector2D.h"
 
@@ -66,11 +67,16 @@ class Tablet {
 	// Noise reduction filter
 	TabletFilterNoiseReduction noise;
 
+	// Peak filter
+	TabletFilterPeak peak;
+
 	// Timed filter
-	TabletFilter *filterTimed;
+	TabletFilter *filterTimed[10];
+	int filterTimedCount;
 
 	// Packet filter
-	TabletFilter *filterPacket;
+	TabletFilter *filterPacket[10];
+	int filterPacketCount;
 
 	// Benchmark
 	TabletBenchmark benchmark;
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index 900ca69..082859c 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -171,6 +171,7 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClInclude Include="CommandLine.h" />
     <ClInclude Include="HIDDevice.h" />
     <ClInclude Include="Logger.h" />
+    <ClInclude Include="PositionRingBuffer.h" />
     <ClInclude Include="ProcessCommand.h" />
     <ClInclude Include="ScreenMapper.h" />
     <ClInclude Include="stdafx.h" />
@@ -178,6 +179,7 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClInclude Include="TabletBenchmark.h" />
     <ClInclude Include="TabletFilter.h" />
     <ClInclude Include="TabletFilterNoiseReduction.h" />
+    <ClInclude Include="TabletFilterPeak.h" />
     <ClInclude Include="TabletFilterSmoothing.h" />
     <ClInclude Include="TabletSettings.h" />
     <ClInclude Include="targetver.h" />
@@ -189,12 +191,14 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClCompile Include="CommandLine.cpp" />
     <ClCompile Include="HIDDevice.cpp" />
     <ClCompile Include="Logger.cpp" />
+    <ClCompile Include="PositionRingBuffer.cpp" />
     <ClCompile Include="ProcessCommand.cpp" />
     <ClCompile Include="ScreenMapper.cpp" />
     <ClCompile Include="Tablet.cpp" />
     <ClCompile Include="TabletBenchmark.cpp" />
     <ClCompile Include="TabletFilter.cpp" />
     <ClCompile Include="TabletFilterNoiseReduction.cpp" />
+    <ClCompile Include="TabletFilterPeak.cpp" />
     <ClCompile Include="TabletFilterSmoothing.cpp" />
     <ClCompile Include="TabletSettings.cpp" />
     <ClCompile Include="USBDevice.cpp" />
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index 8e46824..4b88f4e 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -63,6 +63,12 @@
     <ClInclude Include="TabletSettings.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="TabletFilterPeak.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="PositionRingBuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -113,6 +119,12 @@
     <ClCompile Include="TabletSettings.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="TabletFilterPeak.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PositionRingBuffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">
diff --git a/TabletDriverService/TabletFilterNoiseReduction.cpp b/TabletDriverService/TabletFilterNoiseReduction.cpp
index 2ba06a5..9d3cb10 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.cpp
+++ b/TabletDriverService/TabletFilterNoiseReduction.cpp
@@ -6,10 +6,6 @@
 // Constructor
 //
 TabletFilterNoiseReduction::TabletFilterNoiseReduction() {
-	bufferMaxLength = sizeof(buffer) / sizeof(Vector2D);
-	bufferLength = 0;
-	bufferPositionCount = 0;
-	bufferCurrentIndex = 0;
 	distanceThreshold = 0;
 	iterations = 10;
 }
@@ -20,19 +16,6 @@ TabletFilterNoiseReduction::TabletFilterNoiseReduction() {
 TabletFilterNoiseReduction::~TabletFilterNoiseReduction() {
 }
 
-
-//
-// Set buffer length
-//
-void TabletFilterNoiseReduction::SetBufferLength(int length) {
-	if(length > bufferMaxLength) {
-		bufferLength = bufferMaxLength;
-	} else {
-		bufferLength = length;
-	}
-}
-
-
 //
 // TabletFilter methods
 //
@@ -40,16 +23,16 @@ void TabletFilterNoiseReduction::SetBufferLength(int length) {
 // Set target position
 void TabletFilterNoiseReduction::SetTarget(Vector2D targetVector) {
 	lastTarget.Set(targetVector);
-	AddBuffer(targetVector);
+	buffer.Add(targetVector);
 }
 
-// Get current position
+// Set position
 void TabletFilterNoiseReduction::SetPosition(Vector2D vector) {
 	position.x = vector.x;
 	position.y = vector.y;
 }
 
-// Get current position
+// Get position
 bool TabletFilterNoiseReduction::GetPosition(Vector2D *outputVector) {
 	outputVector->x = position.x;
 	outputVector->y = position.y;
@@ -60,9 +43,9 @@ bool TabletFilterNoiseReduction::GetPosition(Vector2D *outputVector) {
 void TabletFilterNoiseReduction::Update() {
 
 	// One position in the buffer?
-	if(bufferPositionCount == 1) {
-		position.x = buffer[0].x;
-		position.y = buffer[0].y;
+	if(buffer.count == 1) {
+		position.x = buffer[0]->x;
+		position.y = buffer[0]->y;
 		return;
 	}
 
@@ -70,57 +53,29 @@ void TabletFilterNoiseReduction::Update() {
 	GetGeometricMedianVector(&position, iterations);
 
 	// Reset the buffer when distance to last target position is larger than the threshold
-	if(isValid) {
+	if(buffer.isValid) {
 		double distance = lastTarget.Distance(position);
 		if(distance > distanceThreshold) {
-			ResetBuffer();
+			buffer.Reset();
 			position.Set(lastTarget);
 		}
 	}
 }
 
-
-
-//
-// Reset buffer
-//
-void TabletFilterNoiseReduction::ResetBuffer() {
-	bufferPositionCount = 0;
-	bufferCurrentIndex = 0;
-	isValid = false;
-}
-
-//
-// Add position to buffer
-//
-void TabletFilterNoiseReduction::AddBuffer(Vector2D vector) {
-	buffer[bufferCurrentIndex].x = vector.x;
-	buffer[bufferCurrentIndex].y = vector.y;
-	bufferCurrentIndex++;
-	bufferPositionCount++;
-	if(bufferPositionCount > bufferLength) {
-		bufferPositionCount = bufferLength;
-	}
-	if(bufferCurrentIndex >= bufferLength) {
-		bufferCurrentIndex = 0;
-	}
-	isValid = true;
-}
-
 //
 // Average Position Vector
 //
 bool TabletFilterNoiseReduction::GetAverageVector(Vector2D *output) {
 	double x, y;
-	if(!isValid) return false;
+	if(!buffer.isValid) return false;
 
 	x = y = 0;
-	for(int i = 0; i < bufferPositionCount; i++) {
-		x += buffer[i].x;
-		y += buffer[i].y;
+	for(int i = 0; i < buffer.count; i++) {
+		x += buffer[i]->x;
+		y += buffer[i]->y;
 	}
-	output->x = x / bufferPositionCount;
-	output->y = y / bufferPositionCount;
+	output->x = x / buffer.count;
+	output->y = y / buffer.count;
 	return true;
 }
 
@@ -147,9 +102,9 @@ bool TabletFilterNoiseReduction::GetGeometricMedianVector(Vector2D *output, int
 		denominator = 0;
 
 		// Loop through the buffer and calculate a denominator.
-		for(i = 0; i < bufferPositionCount; i++) {
-			dx = candidate.x - buffer[i].x;
-			dy = candidate.y - buffer[i].y;
+		for(i = 0; i < buffer.count; i++) {
+			dx = candidate.x - buffer[i]->x;
+			dy = candidate.y - buffer[i]->y;
 			distance = sqrt(dx*dx + dy * dy);
 			if(distance > minimumDistance) {
 				denominator += 1.0 / distance;
@@ -163,9 +118,9 @@ bool TabletFilterNoiseReduction::GetGeometricMedianVector(Vector2D *output, int
 		next.y = 0;
 
 		// Loop through the buffer and calculate a weighted average
-		for(i = 0; i < bufferPositionCount; i++) {
-			dx = candidate.x - buffer[i].x;
-			dy = candidate.y - buffer[i].y;
+		for(i = 0; i < buffer.count; i++) {
+			dx = candidate.x - buffer[i]->x;
+			dy = candidate.y - buffer[i]->y;
 			distance = sqrt(dx*dx + dy * dy);
 			if(distance > minimumDistance) {
 				weight = 1.0 / distance;
@@ -173,8 +128,8 @@ bool TabletFilterNoiseReduction::GetGeometricMedianVector(Vector2D *output, int
 				weight = 1.0 / minimumDistance;
 			}
 
-			next.x += buffer[i].x * weight / denominator;
-			next.y += buffer[i].y * weight / denominator;
+			next.x += buffer[i]->x * weight / denominator;
+			next.y += buffer[i]->y * weight / denominator;
 		}
 
 		// Set the new candidate vector
diff --git a/TabletDriverService/TabletFilterNoiseReduction.h b/TabletDriverService/TabletFilterNoiseReduction.h
index 7ca33a9..fba34ed 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.h
+++ b/TabletDriverService/TabletFilterNoiseReduction.h
@@ -1,14 +1,13 @@
 #pragma once
+
+#include "PositionRingBuffer.h"
+
 class TabletFilterNoiseReduction : public TabletFilter {
 public:
-	Vector2D buffer[100];
-	int bufferMaxLength;
-	int bufferLength;
-	int bufferPositionCount;
-	int bufferCurrentIndex;
+
+	PositionRingBuffer buffer;
 	Vector2D position;
 	Vector2D lastTarget;
-	bool isValid;
 
 	int iterations;
 	double distanceThreshold;
@@ -18,9 +17,6 @@ class TabletFilterNoiseReduction : public TabletFilter {
 	bool GetPosition(Vector2D *outputVector);
 	void Update();
 
-	void SetBufferLength(int length);
-	void ResetBuffer();
-	void AddBuffer(Vector2D vector);
 	bool GetAverageVector(Vector2D *output);
 	bool GetGeometricMedianVector(Vector2D *output, int iterations);
 
diff --git a/TabletDriverService/TabletFilterPeak.cpp b/TabletDriverService/TabletFilterPeak.cpp
new file mode 100644
index 0000000..22448e5
--- /dev/null
+++ b/TabletDriverService/TabletFilterPeak.cpp
@@ -0,0 +1,77 @@
+#include "stdafx.h"
+#include "TabletFilterPeak.h"
+
+#define LOG_MODULE "Peak"
+#include "Logger.h"
+
+//
+// Constructor
+//
+TabletFilterPeak::TabletFilterPeak() {
+
+	// Buffer length
+	buffer.SetLength(3);
+
+	// Default distance threshold
+	distanceThreshold = 10;
+}
+
+
+//
+// Destructor
+//
+TabletFilterPeak::~TabletFilterPeak() {
+}
+
+
+//
+// TabletFilter methods
+//
+// Set target position
+void TabletFilterPeak::SetTarget(Vector2D targetVector) {
+	buffer.Add(targetVector);
+}
+// Set position
+void TabletFilterPeak::SetPosition(Vector2D vector) {
+	position.x = vector.x;
+	position.y = vector.y;
+}
+// Get position
+bool TabletFilterPeak::GetPosition(Vector2D *outputVector) {
+	outputVector->x = position.x;
+	outputVector->y = position.y;
+	return true;
+}
+// Update
+void TabletFilterPeak::Update() {
+	Vector2D oldPosition;
+	double distance;
+
+	// Buffer valid?
+	if(
+		buffer.GetLatest(&oldPosition, -1)
+		&&
+		buffer.GetLatest(&position, 0)
+	) {
+
+		// Jump longer than the distance threshold?
+		distance = oldPosition.Distance(position);
+		if(distance > distanceThreshold) {
+
+			/*
+			LOG_DEBUG("PEAK! %0.2f,%0.2f -> %0.2f,%0.2f = %0.2f mm\n",
+				oldPosition.x, oldPosition.y,
+				position.x, position.y,
+				distance
+			);
+			*/
+
+			position.x = oldPosition.x;
+			position.y = oldPosition.y;
+
+			// Reset buffer
+			buffer.Reset();
+
+		}
+	}
+}
\ No newline at end of file
diff --git a/TabletDriverService/TabletFilterPeak.h b/TabletDriverService/TabletFilterPeak.h
new file mode 100644
index 0000000..9396b49
--- /dev/null
+++ b/TabletDriverService/TabletFilterPeak.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "PositionRingBuffer.h"
+#include "Vector2D.h"
+
+class TabletFilterPeak : public TabletFilter {
+public:
+
+	PositionRingBuffer buffer;
+	Vector2D position;
+	double distanceThreshold;
+
+	void SetTarget(Vector2D targetVector);
+	void SetPosition(Vector2D vector);
+	bool GetPosition(Vector2D *outputVector);
+	void Update();
+
+
+	TabletFilterPeak();
+	~TabletFilterPeak();
+};
+
diff --git a/TabletDriverService/VMulti.cpp b/TabletDriverService/VMulti.cpp
index 85be417..918a962 100644
--- a/TabletDriverService/VMulti.cpp
+++ b/TabletDriverService/VMulti.cpp
@@ -38,6 +38,7 @@ VMulti::VMulti() {
 	// Relative mouse data
 	memset(&relativeData, 0, sizeof(relativeData));
 	relativeData.sensitivity = 1;
+	relativeData.resetDistance = 50;
 
 	// Monitor info
 	UpdateMonitorInfo();
@@ -131,8 +132,8 @@ void VMulti::CreateReport(BYTE buttons, double x, double y, double pressure) {
 		dy = y - relativeData.lastPosition.y;
 		distance = sqrt(dx * dx + dy * dy);
 
-		// Reset position when position jumps 10 millimeters
-		if(distance > 10) {
+		// Reset relative position when the move distance is long enough
+		if(distance > relativeData.resetDistance) {
 			ResetRelativeData(x, y);
 			dx = 0;
 			dy = 0;
diff --git a/TabletDriverService/VMulti.h b/TabletDriverService/VMulti.h
index 342f406..cf6fadb 100644
--- a/TabletDriverService/VMulti.h
+++ b/TabletDriverService/VMulti.h
@@ -60,6 +60,7 @@ class VMulti {
 		Vector2D lastPosition;
 		Vector2D targetPosition;
 		double sensitivity;
+		double resetDistance;
 	} relativeData;
 
 
diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index bfe1703..8966573 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -276,6 +276,7 @@ MaxPressure 2047
 KeepTipDown 2 packets
 Width 152.0
 Height 95.0
+#Feature 0x83 0x02 0x00
 InitFeature 0x02 0x02
 Type WacomIntuos
 
@@ -302,6 +303,7 @@ Type WacomIntuos
 # Wacom CTL-4100
 #
 Tablet 0x056a 0x0376 0xFF0D 0x0001
+Tablet 0x056a 0x0374 0xFF0D 0x0001
 Name "Wacom CTL-4100"
 ReportId 0x10
 ReportLength 192
@@ -317,6 +319,7 @@ Type Wacom4100
 # Wacom CTL-4100 (Wacom drivers installed)
 #
 Tablet 0x056a 0x0376 0xFF00 0x000A
+Tablet 0x056a 0x0374 0xFF00 0x000A
 Name "Wacom CTL-4100 (Wacom drivers installed)"
 ReportId 0x10
 ReportLength 193
@@ -393,6 +396,22 @@ Height 76.2
 InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
 
 
+#
+# XP-Pen G540 Pro
+#
+Tablet 0x28BD 0x0061 0xFF0A 0x0001
+Name "XP-Pen G540 Pro"
+ReportId 0x02
+ReportLength 8
+DetectMask 0x80
+MaxX 45720
+MaxY 29210
+MaxPressure 8191
+Width 147.0
+Height 101.6
+InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
+
+
 #
 # XP-Pen G640
 #
@@ -404,11 +423,27 @@ DetectMask 0x80
 MaxX 32000
 MaxY 20000
 MaxPressure 8191
-width 160.0
+Width 160.0
 Height 100.0
 InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
 
 
+#
+# XP-Pen Deco 01
+#
+Tablet 0x28BD 0x0042 0xFF0A 0x0001
+Name "XP-Pen Deco 01"
+ReportId 0x02
+ReportLength 8
+DetectMask 0x80
+MaxX 25400
+MaxY 15875
+MaxPressure 8191
+Width 254.0
+Height 158.75
+InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
+
+
 #
 # Huion 420
 #
@@ -484,4 +519,17 @@ Width 160.0
 Height 120.0
 
 
+#
+# Huion osu!tablet
+#
+Tablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}" 200 HVAN
+Name "Huion osu!tablet (check the GitHub issue #99)"
+ReportId 0x07
+ReportLength 8
+DetectMask 0x80
+MaxX 8340
+MaxY 4680
+MaxPressure 2047
+Width 101.6
+Height 56.6
 

From 33bd37360da3a092b697d1b912ebeb5a89b79f5e Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 15 Apr 2018 18:54:30 +0300
Subject: [PATCH 20/83] Readme

---
 README.md | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 01a0765..1029640 100644
--- a/README.md
+++ b/README.md
@@ -26,31 +26,34 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 
 ### Supported tablets:
   - Wacom CTL-470
+  - Wacom CTH-470
   - Wacom CTL-471
   - Wacom CTL-472
   - Wacom CTL-480
   - Wacom CTH-480
   - Wacom CTL-490
-  - XP Pen G430 (New 2017+ "Model B")
-  - XP Pen G640
+  - Wacom CTH-490
+  - Wacom CTL-671
+  - Wacom CTL-672
+  - Wacom CTL-680
+  - Wacom CTH-680
+  - Wacom PTH-451
+  - Wacom PTH-850
+  - XP-Pen G430 (New 2017+ "Model B")
+  - XP-Pen G540 Pro
+  - XP-Pen G640
   - Huion 420
+  - Huion H420
+  - Huion H430P
   - Huion H640P
   - Gaomon S56K
   
 ### Configured, but not properly tested:
-  - Huion H420
-  - Huion H430P
+  - Huion osu!tablet
+  - XP-Pen Deco 01
   - Wacom CTL-4100 USB
   - Wacom CTL-4100 Bluetooth
-  - Wacom CTH-470
-  - Wacom CTH-670
-  - Wacom CTL-671
-  - Wacom CTL-672
-  - Wacom CTL-680
-  - Wacom CTH-680
-  - Wacom CTH-490
-  - Wacom PTH-451
-  - Wacom PTH-850
+  - https://github.com/hawku/TabletDriver/blob/master/TabletDriverService/config/wacom.cfg
 
 #
 
@@ -177,7 +180,7 @@ If you want to compile the code and don't want to install anything from the Tabl
 > - New tablet configurations: Wacom CTH-470, CTH-670, PTH-451
 > - Fix for the smoothing filter. The filter didn't turn on when the settings were applied.
 > - Fix for the Huion H640P clicking problem and also added better data validation for Huion 420,
->   Gaomon S56K, XP Pen G430 and G640.
+>   Gaomon S56K, XP-Pen G430 and G640.
 > - Modified click detection on CTL-490 and CTH-490 (tablet.cfg ClickPressure).
 
 >**v0.0.9:**

From 5b8eae71d30b21d767d4d2dcf9723b747f7cdfdc Mon Sep 17 00:00:00 2001
From: Poliwrath <Poliwrath@users.noreply.github.com>
Date: Fri, 6 Jul 2018 22:38:00 -0400
Subject: [PATCH 21/83] Add CTE-440 support

---
 TabletDriverService/config/tablet.cfg | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 8966573..53840e4 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -533,3 +533,19 @@ MaxPressure 2047
 Width 101.6
 Height 56.6
 
+
+#
+# Wacom CTE-440 (Graphite4 4x5)
+#
+Tablet 0x056A 0x0015 0xFF0D 0x0001
+Tablet 0x056A 0x0015 0x000D 0x0001
+Name "Wacom CTE-440"
+ReportLength 9
+DetectMask 0x00
+MaxX 10208
+MaxY 7424
+MaxPressure 511
+Width 102.08
+Height 74.24
+InitFeature 0x02 0x02
+

From 055ac1600156b87f6f5d101bd5709cfe39e20b32 Mon Sep 17 00:00:00 2001
From: Implojin <implosionwow@gmail.com>
Date: Thu, 15 Nov 2018 15:24:12 -0600
Subject: [PATCH 22/83] Add PTH-660 config.

This adds support for the Intuos Pro M (2017) over USB, USB with the official drivers installed, and Bluetooth. This commit is using the CTL-4100's codepath for packet handling.

Note that https://github.com/linuxwacom/input-wacom/wiki/Device-IDs lists the PTH-660 as using a 2nd-generation Wacom USB interface, while it lists the CTL-4100 as using 3rd-generation. It's possible some incompatibility may crop up here from treating this internally as a CTL-4100. I have tested this config with a PTH-660 on all 3 included interfaces, and it seems to handle pen position and button clicks properly.
---
 TabletDriverService/config/tablet.cfg | 46 +++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 8966573..a9fcbee 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -379,6 +379,52 @@ InitFeature 0x02 0x02
 Type WacomIntuos
 
 
+#
+# Wacom PTH-660 (USB)
+#
+Tablet 0x056A 0x0357 0xFF0D 0x0001
+Name "Wacom PTH-660"
+ReportId 0x10
+ReportLength 192
+DetectMask 0x40
+MaxX 44800
+MaxY 29600
+MaxPressure 8191
+Width 226.0
+Height 150.0
+Type Wacom4100
+
+
+#
+# Wacom PTH-660 (USB) (Wacom drivers installed)
+#
+Tablet 0x056A 0x0357 0xFF00 0x000A
+Name "Wacom PTH-660 (Wacom drivers installed)"
+ReportId 0x10
+ReportLength 193
+DetectMask 0x40
+MaxX 44800
+MaxY 29600
+MaxPressure 8191
+Width 226.0
+Height 150.0
+Type Wacom4100
+
+
+#
+# Wacom PTH-660 (Bluetooth)
+#
+Tablet 0x056a 0x0360 0xFF0D 0x0001
+Name "Wacom PTH-660 Bluetooth (Experimental)"
+ReportId100 Bluetooth
+ReportLength 361
+DetectMask 0xE0
+MaxX 44800
+MaxY 29600
+MaxPressure 8191
+Width 226.0
+Height 150.0
+
 
 #
 # XP-Pen G430

From 6cd97982bbc371ed0bcb12c7c4f6799e2f91d09d Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 24 Nov 2018 18:40:31 +0200
Subject: [PATCH 23/83] Code refactoring

Refactored the tablet output code to multiple files.
---
 TabletDriverService/Main.cpp                  | 132 +++++-----
 TabletDriverService/Output.cpp                |   8 +
 TabletDriverService/Output.h                  |  18 ++
 TabletDriverService/OutputManager.cpp         |  74 ++++++
 TabletDriverService/OutputManager.h           |  44 ++++
 .../OutputSendInputAbsolute.cpp               | 120 +++++++++
 TabletDriverService/OutputSendInputAbsolute.h |  29 +++
 TabletDriverService/OutputSettings.cpp        |  21 ++
 TabletDriverService/OutputSettings.h          |  28 +++
 TabletDriverService/OutputVMultiAbsolute.cpp  |  70 ++++++
 TabletDriverService/OutputVMultiAbsolute.h    |  25 ++
 .../OutputVMultiAbsoluteV2.cpp                |  70 ++++++
 TabletDriverService/OutputVMultiAbsoluteV2.h  |  25 ++
 TabletDriverService/OutputVMultiDigitizer.cpp |  71 ++++++
 TabletDriverService/OutputVMultiDigitizer.h   |  23 ++
 TabletDriverService/OutputVMultiRelative.cpp  | 111 ++++++++
 TabletDriverService/OutputVMultiRelative.h    |  26 ++
 TabletDriverService/ProcessCommand.cpp        |  30 +--
 TabletDriverService/RelativeMouseState.cpp    |  10 +
 TabletDriverService/RelativeMouseState.h      |  22 ++
 TabletDriverService/Tablet.cpp                |   3 -
 TabletDriverService/Tablet.h                  |  10 +-
 .../TabletDriverService.vcxproj               |  23 ++
 .../TabletDriverService.vcxproj.filters       |  65 +++++
 TabletDriverService/TabletFilter.h            |   2 +
 .../TabletFilterNoiseReduction.h              |   2 +-
 TabletDriverService/TabletState.cpp           |  15 ++
 TabletDriverService/TabletState.h             |  15 ++
 TabletDriverService/VMulti.cpp                | 238 +-----------------
 TabletDriverService/VMulti.h                  |  71 +-----
 TabletDriverService/stdafx.h                  |   2 +
 31 files changed, 996 insertions(+), 407 deletions(-)
 create mode 100644 TabletDriverService/Output.cpp
 create mode 100644 TabletDriverService/Output.h
 create mode 100644 TabletDriverService/OutputManager.cpp
 create mode 100644 TabletDriverService/OutputManager.h
 create mode 100644 TabletDriverService/OutputSendInputAbsolute.cpp
 create mode 100644 TabletDriverService/OutputSendInputAbsolute.h
 create mode 100644 TabletDriverService/OutputSettings.cpp
 create mode 100644 TabletDriverService/OutputSettings.h
 create mode 100644 TabletDriverService/OutputVMultiAbsolute.cpp
 create mode 100644 TabletDriverService/OutputVMultiAbsolute.h
 create mode 100644 TabletDriverService/OutputVMultiAbsoluteV2.cpp
 create mode 100644 TabletDriverService/OutputVMultiAbsoluteV2.h
 create mode 100644 TabletDriverService/OutputVMultiDigitizer.cpp
 create mode 100644 TabletDriverService/OutputVMultiDigitizer.h
 create mode 100644 TabletDriverService/OutputVMultiRelative.cpp
 create mode 100644 TabletDriverService/OutputVMultiRelative.h
 create mode 100644 TabletDriverService/RelativeMouseState.cpp
 create mode 100644 TabletDriverService/RelativeMouseState.h
 create mode 100644 TabletDriverService/TabletState.cpp
 create mode 100644 TabletDriverService/TabletState.h

diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index be4a980..9188d59 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -21,8 +21,10 @@
 // Global variables...
 Tablet *tablet;
 VMulti *vmulti;
+OutputManager *outputManager;
 ScreenMapper *mapper;
 thread *tabletThread;
+void SetOutput(TabletState *state);
 
 //
 // Init console parameters
@@ -45,7 +47,6 @@ void RunTabletThread() {
 	int status;
 	bool isFirstReport = true;
 	bool isResent = false;
-	double x, y;
 	TabletFilter *filter;
 	bool filterTimedEnabled;
 
@@ -144,43 +145,13 @@ void RunTabletThread() {
 				filterTimedEnabled = true;
 		}
 
-
 		// Do not write report when timed filter is enabled
-		if(tablet->filterTimedCount == 0 || !filterTimedEnabled) {
-
-			// Relative mode
-			if(vmulti->mode == VMulti::ModeRelativeMouse) {
-
-				x = tablet->state.position.x;
-				y = tablet->state.position.y;
-
-				// Map position to virtual screen (values between 0 and 1)
-				mapper->GetRotatedTabletPosition(&x, &y);
-
-				// Create VMulti report
-				vmulti->CreateReport(tablet->state.buttons, x, y, tablet->state.pressure);
-
-				// Write report to VMulti device
-				vmulti->WriteReport();
-
-
-
-			// Absolute / Digitizer mode
-			} else {
-				// Get x & y from the tablet state
-				x = tablet->state.position.x;
-				y = tablet->state.position.y;
-
-				// Map position to virtual screen (values betweeb 0->1)
-				mapper->GetScreenPosition(&x, &y);
+		if(filterTimedEnabled) {
+			continue;
+		}
 
-				// Create VMulti report
-				vmulti->CreateReport(tablet->state.buttons, x, y, tablet->state.pressure);
+		SetOutput(&tablet->state);
 
-				// Write report to VMulti device
-				vmulti->WriteReport();
-			}
-		}
 	}
 
 }
@@ -191,6 +162,8 @@ void RunTabletThread() {
 VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWaitFired) {
 	Vector2D position;
 	TabletFilter *filter;
+	TabletState outputState;
+	bool filterEnabled = false;
 
 	// Set position
 	position.Set(tablet->state.position);
@@ -202,7 +175,11 @@ VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWa
 		filter = tablet->filterTimed[filterIndex];
 
 		// Filter enabled?
-		if(!filter->isEnabled) return;
+		if(filter->isEnabled) {
+			filterEnabled = true;
+		} else {
+			continue;
+		}
 
 		// Set filter targets
 		filter->SetTarget(position);
@@ -215,65 +192,67 @@ VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWa
 
 	}
 
+	if(!filterEnabled) {
+		return;
+	}
+
+	memcpy(&outputState, &tablet->state, sizeof(outputState));
+	outputState.position.Set(position);
+	SetOutput(&outputState);
+}
+
+
+
+//
+// Set Output
+//
+
+void SetOutput(TabletState *outputState) {
+
+	double x, y;
+
 
-	//
 	// Relative mode
-	//
-	if(vmulti->mode == VMulti::ModeRelativeMouse) {
+	if(outputManager->mode == OutputManager::ModeVMultiRelative) {
+
+		x = outputState->position.x;
+		y = outputState->position.y;
 
 		// Map position to virtual screen (values between 0 and 1)
-		mapper->GetRotatedTabletPosition(&position.x, &position.y);
-
-		// Create VMulti report
-		vmulti->CreateReport(
-			tablet->state.buttons,
-			position.x,
-			position.y,
-			tablet->state.pressure
-		);
-
-		// Write report to VMulti device if report has changed
-		if(vmulti->HasReportChanged()
-			||
-			vmulti->reportRelativeMouse.x != 0
-			||
-			vmulti->reportRelativeMouse.y != 0
-			) {
-			vmulti->WriteReport();
-		}
+		mapper->GetRotatedTabletPosition(&x, &y);
+
+		outputManager->Set(outputState->buttons, x, y, outputState->pressure);
+		outputManager->Write();
 
 
 	}
 
-	//
 	// Absolute / Digitizer mode
-	//
 	else {
-
+		// Get x & y from the tablet state
+		x = outputState->position.x;
+		y = outputState->position.y;
 
 		// Map position to virtual screen (values betweeb 0->1)
-		mapper->GetScreenPosition(&position.x, &position.y);
-
-		// Create VMulti report
-		vmulti->CreateReport(
-			tablet->state.buttons,
-			position.x,
-			position.y,
-			tablet->state.pressure
-		);
+		mapper->GetScreenPosition(&x, &y);
 
+		outputManager->Set(outputState->buttons, x, y, outputState->pressure);
+		outputManager->Write();
+		/*
+			// Create VMulti report
+			vmulti->CreateReport(outputState->buttons, x, y, outputState->pressure);
 
-		// Write report to VMulti device
-		if(vmulti->HasReportChanged() && tablet->state.isValid) {
+			// Write report to VMulti device
 			vmulti->WriteReport();
-		}
-	}
 
+		*/
 
+	}
 }
 
 
 
+
 //
 // Main
 //
@@ -287,6 +266,7 @@ int main(int argc, char**argv) {
 	vmulti = NULL;
 	tablet = NULL;
 	tabletThread = NULL;
+	outputManager = new OutputManager();
 
 	// Init console
 	InitConsole();
@@ -432,8 +412,8 @@ void CleanupAndExit(int code) {
 		}
 	}
 
-	if(vmulti != NULL) {
-		vmulti->ResetReport();
+	if(outputManager != NULL) {
+		outputManager->Reset();
 	}
 	LOGGER_STOP();
 	Sleep(500);
diff --git a/TabletDriverService/Output.cpp b/TabletDriverService/Output.cpp
new file mode 100644
index 0000000..0f7790c
--- /dev/null
+++ b/TabletDriverService/Output.cpp
@@ -0,0 +1,8 @@
+#include "stdafx.h"
+#include "Output.h"
+
+Output::Output() {
+	isEnabled = false;
+	debugEnabled = false;
+	settings = NULL;
+}
diff --git a/TabletDriverService/Output.h b/TabletDriverService/Output.h
new file mode 100644
index 0000000..950ff8d
--- /dev/null
+++ b/TabletDriverService/Output.h
@@ -0,0 +1,18 @@
+#pragma once
+#include "OutputSettings.h"
+
+class Output {
+public:
+
+	OutputSettings * settings;
+	bool isEnabled;
+	bool debugEnabled;
+
+
+	virtual bool Set(unsigned char buttons, double x, double y, double pressure) = 0;
+	virtual bool Write() = 0;
+	virtual bool Reset() = 0;
+
+	Output();
+
+};
diff --git a/TabletDriverService/OutputManager.cpp b/TabletDriverService/OutputManager.cpp
new file mode 100644
index 0000000..b6e2140
--- /dev/null
+++ b/TabletDriverService/OutputManager.cpp
@@ -0,0 +1,74 @@
+#include "stdafx.h"
+#include "OutputManager.h"
+
+#define LOG_MODULE "OutputManager"
+#include "Logger.h"
+
+
+OutputManager::OutputManager() {
+	output = &vmultiAbsolute;
+	mode = ModeVMultiAbsolute;
+
+	outputs[ModeVMultiAbsolute] = &vmultiAbsolute;
+	outputs[ModeVMultiAbsoluteV2] = &vmultiAbsoluteV2;
+	outputs[ModeVMultiRelative] = &vmultiRelative;
+	outputs[ModeVMultiDigitizer] = &vmultiDigitizer;
+	outputs[ModeSendInputAbsolute] = &sendInputAbsolute;
+	outputs[ModeSendInputRelative] = &sendInputAbsolute;
+
+
+	settings = new OutputSettings();
+
+	for(int i = 0; i < (sizeof(outputs) / sizeof(Output*)); i++) {
+		outputs[i]->settings = settings;
+		LOG_DEBUG("LOOP!\n");
+	}
+
+}
+
+
+OutputManager::~OutputManager() {
+}
+
+void OutputManager::SetOutputMode(OutputMode newMode) {
+
+	// Reset old output
+	if(newMode != mode) {
+		Reset();
+	}
+	mode = newMode;
+
+	switch(newMode) {
+	case ModeVMultiAbsolute:
+	case ModeVMultiAbsoluteV2:
+	case ModeVMultiRelative:
+	case ModeVMultiDigitizer:
+		output = outputs[newMode];
+		break;
+	case ModeSendInputAbsolute:
+		output = outputs[newMode];
+		sendInputAbsolute.UpdateMonitorInfo();
+		break;
+	default:
+		LOG_ERROR("Unknown Output Mode!\n");
+		output = NULL;
+		break;
+	}
+
+	//Reset();
+}
+
+bool OutputManager::Set(unsigned char buttons, double x, double y, double pressure) {
+	if(output == NULL) return false;
+	return output->Set(buttons, x, y, pressure);
+}
+
+bool OutputManager::Write() {
+	if(output == NULL) return false;
+	return output->Write();
+}
+
+bool OutputManager::Reset() {
+	if(output == NULL) return false;
+	return output->Reset();
+}
diff --git a/TabletDriverService/OutputManager.h b/TabletDriverService/OutputManager.h
new file mode 100644
index 0000000..72f7ef3
--- /dev/null
+++ b/TabletDriverService/OutputManager.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "Output.h"
+#include "OutputVMultiAbsolute.h"
+#include "OutputVMultiAbsoluteV2.h"
+#include "OutputVMultiRelative.h"
+#include "OutputVMultiDigitizer.h"
+#include "OutputSendInputAbsolute.h"
+
+
+class OutputManager : public Output {
+public:
+
+	enum OutputMode {
+		ModeVMultiAbsolute,
+		ModeVMultiAbsoluteV2,
+		ModeVMultiRelative,
+		ModeVMultiDigitizer,
+		ModeSendInputAbsolute,
+		ModeSendInputRelative,
+	};
+
+	Output * output;
+	Output *outputs[6];
+	
+	OutputVMultiAbsolute vmultiAbsolute;
+	OutputVMultiAbsoluteV2 vmultiAbsoluteV2;
+	OutputVMultiRelative vmultiRelative;
+	OutputVMultiDigitizer vmultiDigitizer;
+	OutputSendInputAbsolute sendInputAbsolute;
+	
+	OutputMode mode;
+
+	void SetOutputMode(OutputMode newMode);
+
+	bool Set(unsigned char buttons, double x, double y, double pressure);
+	bool Write();
+	bool Reset();
+
+	OutputManager();
+	~OutputManager();
+
+};
+
diff --git a/TabletDriverService/OutputSendInputAbsolute.cpp b/TabletDriverService/OutputSendInputAbsolute.cpp
new file mode 100644
index 0000000..8c670f1
--- /dev/null
+++ b/TabletDriverService/OutputSendInputAbsolute.cpp
@@ -0,0 +1,120 @@
+#include "stdafx.h"
+#include "OutputSendInputAbsolute.h"
+
+#define LOG_MODULE "SendInputAbsolute"
+#include "Logger.h"
+
+
+//
+// Constructor
+//
+OutputSendInputAbsolute::OutputSendInputAbsolute() {
+	lastButtons = 0;
+
+	UpdateMonitorInfo();
+}
+
+
+//
+// Destructor
+//
+OutputSendInputAbsolute::~OutputSendInputAbsolute() {
+}
+
+
+//
+// Update monitor information
+//
+void OutputSendInputAbsolute::UpdateMonitorInfo() {
+	monitorInfo.primaryWidth = GetSystemMetrics(SM_CXSCREEN);
+	monitorInfo.primaryHeight = GetSystemMetrics(SM_CYSCREEN);
+	monitorInfo.virtualWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+	monitorInfo.virtualHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+	monitorInfo.virtualX = GetSystemMetrics(SM_XVIRTUALSCREEN);
+	monitorInfo.virtualY = GetSystemMetrics(SM_YVIRTUALSCREEN);
+}
+
+
+//
+// Set output
+//
+bool OutputSendInputAbsolute::Set(unsigned char buttons, double x, double y, double pressure) {
+
+
+	if(debugEnabled) {
+		LOG_DEBUG("%0.0f,%0.0f | %0.0f,%0.0f | %0.0f,%0.0f\n",
+			monitorInfo.primaryWidth, monitorInfo.primaryHeight,
+			monitorInfo.virtualWidth, monitorInfo.virtualHeight,
+			monitorInfo.virtualX, monitorInfo.virtualY
+		);
+	}
+
+	input.type = INPUT_MOUSE;
+	input.mi.mouseData = 0;
+	input.mi.dx = (LONG)floor(
+		x * 65535.0 * (monitorInfo.virtualWidth / monitorInfo.primaryWidth)
+		+ (monitorInfo.virtualX / monitorInfo.primaryWidth * 65535.0)
+	);
+	input.mi.dy = (LONG)floor(
+		y * 65535.0 * (monitorInfo.virtualHeight / monitorInfo.primaryHeight)
+		+ (monitorInfo.virtualY / monitorInfo.primaryHeight * 65535.0)
+	);
+	input.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE;
+
+	// Mouse 1
+	if((buttons & 0x01) && !(lastButtons & 0x01)) input.mi.dwFlags |= MOUSEEVENTF_LEFTDOWN;
+	else if(!(buttons & 0x01) && (lastButtons & 0x01)) input.mi.dwFlags |= MOUSEEVENTF_LEFTUP;
+
+	// Mouse 2
+	if((buttons & 0x02) && !(lastButtons & 0x02)) input.mi.dwFlags |= MOUSEEVENTF_RIGHTDOWN;
+	else if(!(buttons & 0x02) && (lastButtons & 0x02)) input.mi.dwFlags |= MOUSEEVENTF_RIGHTUP;
+
+	// Mouse 3
+	if((buttons & 0x04) && !(lastButtons & 0x04)) input.mi.dwFlags |= MOUSEEVENTF_MIDDLEDOWN;
+	else if(!(buttons & 0x04) && (lastButtons & 0x04)) input.mi.dwFlags |= MOUSEEVENTF_MIDDLEUP;
+
+	lastButtons = buttons;
+
+	return true;
+}
+
+//
+// Write output
+//
+bool OutputSendInputAbsolute::Write() {
+
+	// Send input if changed
+	if(memcmp(&lastInput, &input, sizeof(INPUT)) != 0) {
+
+		// SendInput
+		SendInput(1, &input, sizeof(INPUT));
+
+		// Copy last input
+		memcpy(&lastInput, &input, sizeof(INPUT));
+
+		return true;
+	}
+	return false;
+}
+
+
+//
+// Reset output
+//
+bool OutputSendInputAbsolute::Reset() {
+
+	INPUT input = {0};
+	input.type = INPUT_MOUSE;
+	input.mi.mouseData = 0;
+	input.mi.dx = 0;
+	input.mi.dy = 0;
+	input.mi.dwFlags = 0;
+	if(lastButtons & 0x01) input.mi.dwFlags |= MOUSEEVENTF_LEFTUP;
+	if(lastButtons & 0x02) input.mi.dwFlags |= MOUSEEVENTF_RIGHTUP;
+	if(lastButtons & 0x04) input.mi.dwFlags |= MOUSEEVENTF_MIDDLEUP;
+	
+	SendInput(1, &input, sizeof(INPUT));
+
+	return true;
+}
+
diff --git a/TabletDriverService/OutputSendInputAbsolute.h b/TabletDriverService/OutputSendInputAbsolute.h
new file mode 100644
index 0000000..332f6f6
--- /dev/null
+++ b/TabletDriverService/OutputSendInputAbsolute.h
@@ -0,0 +1,29 @@
+#pragma once
+class OutputSendInputAbsolute : public Output {
+public:
+
+	struct {
+		double primaryWidth = GetSystemMetrics(SM_CXSCREEN);
+		double primaryHeight = GetSystemMetrics(SM_CYSCREEN);
+		double virtualWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+		double virtualHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+		double virtualX = GetSystemMetrics(SM_XVIRTUALSCREEN);
+		double virtualY = GetSystemMetrics(SM_YVIRTUALSCREEN);
+	} monitorInfo;
+
+	INPUT input = {0};
+	INPUT lastInput = {0};
+	unsigned char lastButtons;
+
+
+	void UpdateMonitorInfo();
+
+	bool Set(unsigned char buttons, double x, double y, double pressure);
+	bool Write();
+	bool Reset();
+
+
+	OutputSendInputAbsolute();
+	~OutputSendInputAbsolute();
+};
+
diff --git a/TabletDriverService/OutputSettings.cpp b/TabletDriverService/OutputSettings.cpp
new file mode 100644
index 0000000..ee8674b
--- /dev/null
+++ b/TabletDriverService/OutputSettings.cpp
@@ -0,0 +1,21 @@
+#include "stdafx.h"
+#include "OutputSettings.h"
+
+OutputSettings::OutputSettings() {
+	relativeSensitivity = 1;
+	relativeResetDistance = 25;
+	ResetRelativeState(0, 0);
+}
+
+
+OutputSettings::~OutputSettings() {
+}
+
+
+void OutputSettings::ResetRelativeState(double x, double y) {
+	relativeState.targetPosition.Set(x, y);
+	relativeState.lastPosition.Set(x, y);
+	relativeState.pixelPosition.x = (int)x;
+	relativeState.pixelPosition.y = (int)y;
+
+}
diff --git a/TabletDriverService/OutputSettings.h b/TabletDriverService/OutputSettings.h
new file mode 100644
index 0000000..e9b4ecd
--- /dev/null
+++ b/TabletDriverService/OutputSettings.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "Vector2D.h"
+
+class OutputSettings {
+public:
+
+	// PixelPosition
+	typedef struct {
+		int x;
+		int y;
+	} PixelPosition;
+
+	struct {
+		PixelPosition pixelPosition;
+		Vector2D lastPosition;
+		Vector2D targetPosition;
+	} relativeState;
+
+	double relativeSensitivity;
+	double relativeResetDistance;
+
+	void ResetRelativeState(double x, double y);
+
+	OutputSettings();
+	~OutputSettings();
+};
+
diff --git a/TabletDriverService/OutputVMultiAbsolute.cpp b/TabletDriverService/OutputVMultiAbsolute.cpp
new file mode 100644
index 0000000..ab646f8
--- /dev/null
+++ b/TabletDriverService/OutputVMultiAbsolute.cpp
@@ -0,0 +1,70 @@
+#include "stdafx.h"
+#include "OutputVMultiAbsolute.h"
+
+#define LOG_MODULE "VMultiAbsolute"
+#include "Logger.h"
+
+
+//
+// Constructor
+//
+OutputVMultiAbsolute::OutputVMultiAbsolute() {
+
+	// Absolute mouse vmulti report
+	report.vmultiId = 0x40;
+	report.reportLength = 7;
+	report.reportId = 3;
+	report.buttons = 0;
+	report.wheel = 0;
+
+}
+
+
+//
+// Destructor
+//
+OutputVMultiAbsolute::~OutputVMultiAbsolute() {
+}
+
+
+//
+// Set output
+//
+bool OutputVMultiAbsolute::Set(unsigned char buttons, double x, double y, double pressure) {
+	report.buttons = buttons;
+	report.x = (USHORT)round(x * 32767.0);
+	report.y = (USHORT)round(y * 32767.0);
+	vmulti->SetReport(&report, sizeof(report));
+
+	if(debugEnabled) {
+		LOG_DEBUGBUFFER(&report, 9, "Report: ");
+	}
+
+	return true;
+}
+
+//
+// Write output
+//
+bool OutputVMultiAbsolute::Write() {
+
+	// Write report to VMulti device if report has changed
+	if(vmulti->HasReportChanged()) {
+		vmulti->WriteReport();
+		return true;
+	}
+	return false;
+}
+
+
+//
+// Reset output
+//
+bool OutputVMultiAbsolute::Reset() {
+	report.buttons = 0;
+	report.wheel = 0;
+	vmulti->SetReport(&report, sizeof(report));
+	vmulti->WriteReport();
+	return true;
+}
+
diff --git a/TabletDriverService/OutputVMultiAbsolute.h b/TabletDriverService/OutputVMultiAbsolute.h
new file mode 100644
index 0000000..a02c50f
--- /dev/null
+++ b/TabletDriverService/OutputVMultiAbsolute.h
@@ -0,0 +1,25 @@
+#pragma once
+#include "Output.h"
+
+class OutputVMultiAbsolute : public Output {
+public:
+
+	// Absolute mouse vmulti report
+	struct {
+		BYTE vmultiId;
+		BYTE reportLength;
+		BYTE reportId;
+		unsigned char buttons;
+		USHORT x;
+		USHORT y;
+		BYTE wheel;
+	} report;
+
+	bool Set(unsigned char buttons, double x, double y, double pressure);
+	bool Write();
+	bool Reset();
+
+	OutputVMultiAbsolute();
+	~OutputVMultiAbsolute();
+};
+
diff --git a/TabletDriverService/OutputVMultiAbsoluteV2.cpp b/TabletDriverService/OutputVMultiAbsoluteV2.cpp
new file mode 100644
index 0000000..5075c82
--- /dev/null
+++ b/TabletDriverService/OutputVMultiAbsoluteV2.cpp
@@ -0,0 +1,70 @@
+#include "stdafx.h"
+#include "OutputVMultiAbsoluteV2.h"
+
+#define LOG_MODULE "VMultiAbsoluteV2"
+#include "Logger.h"
+
+
+//
+// Constructor
+//
+OutputVMultiAbsoluteV2::OutputVMultiAbsoluteV2() {
+
+	// Absolute mouse vmulti report
+	report.vmultiId = 0x40;
+	report.reportLength = 8;
+	report.reportId = 9;
+	report.buttons = 0;
+	report.pressure = 0;
+
+}
+
+
+//
+// Destructor
+//
+OutputVMultiAbsoluteV2::~OutputVMultiAbsoluteV2() {
+}
+
+
+//
+// Set output
+//
+bool OutputVMultiAbsoluteV2::Set(unsigned char buttons, double x, double y, double pressure) {
+	report.buttons = buttons;
+	report.x = (USHORT)round(x * 32767.0);
+	report.y = (USHORT)round(y * 32767.0);
+	vmulti->SetReport(&report, sizeof(report));
+
+	if(debugEnabled) {
+		LOG_DEBUGBUFFER(&report, 10, "Report: ");
+	}
+
+	return true;
+}
+
+//
+// Write output
+//
+bool OutputVMultiAbsoluteV2::Write() {
+
+	// Write report to VMulti device if report has changed
+	if(vmulti->HasReportChanged()) {
+		vmulti->WriteReport();
+		return true;
+	}
+	return false;
+}
+
+
+//
+// Reset output
+//
+bool OutputVMultiAbsoluteV2::Reset() {
+	report.buttons = 0;
+	report.pressure = 0;
+	vmulti->SetReport(&report, sizeof(report));
+	vmulti->WriteReport();
+	return true;
+}
+
diff --git a/TabletDriverService/OutputVMultiAbsoluteV2.h b/TabletDriverService/OutputVMultiAbsoluteV2.h
new file mode 100644
index 0000000..9cb567c
--- /dev/null
+++ b/TabletDriverService/OutputVMultiAbsoluteV2.h
@@ -0,0 +1,25 @@
+#pragma once
+#include "Output.h"
+
+class OutputVMultiAbsoluteV2 : public Output {
+public:
+
+	// Absolute mouse vmulti report
+	struct {
+		BYTE vmultiId;
+		BYTE reportLength;
+		BYTE reportId;
+		unsigned char buttons;
+		USHORT x;
+		USHORT y;
+		USHORT pressure;
+	} report;
+
+	bool Set(unsigned char buttons, double x, double y, double pressure);
+	bool Write();
+	bool Reset();
+
+	OutputVMultiAbsoluteV2();
+	~OutputVMultiAbsoluteV2();
+};
+
diff --git a/TabletDriverService/OutputVMultiDigitizer.cpp b/TabletDriverService/OutputVMultiDigitizer.cpp
new file mode 100644
index 0000000..a459a75
--- /dev/null
+++ b/TabletDriverService/OutputVMultiDigitizer.cpp
@@ -0,0 +1,71 @@
+#include "stdafx.h"
+#include "OutputVMultiDigitizer.h"
+
+#define LOG_MODULE "VMultiDigitizer"
+#include "Logger.h"
+
+
+//
+// Constructor
+//
+OutputVMultiDigitizer::OutputVMultiDigitizer() {
+
+	// VMulti digitizer report
+	report.vmultiId = 0x40;
+	report.reportLength = 8;
+	report.reportId = 5;
+	report.buttons = 0;
+	report.pressure = 0;
+
+}
+
+
+//
+// Destructor
+//
+OutputVMultiDigitizer::~OutputVMultiDigitizer() {
+}
+
+
+//
+// Set output
+//
+bool OutputVMultiDigitizer::Set(unsigned char buttons, double x, double y, double pressure) {
+	report.buttons = buttons | 0x20;
+	report.x = (USHORT)round(x * 32767.0);
+	report.y = (USHORT)round(y * 32767.0);
+	vmulti->SetReport(&report, sizeof(report));
+
+	if(debugEnabled) {
+		LOG_DEBUGBUFFER(&report, 9, "Report: ");
+	}
+
+	return true;
+}
+
+
+//
+// Write output
+//
+bool OutputVMultiDigitizer::Write() {
+
+	// Write report to VMulti device if report has changed
+	if(vmulti->HasReportChanged()) {
+		vmulti->WriteReport();
+		return true;
+	}
+	return false;
+}
+
+
+//
+// Reset output
+//
+bool OutputVMultiDigitizer::Reset() {
+	report.buttons = 0;
+	report.pressure = 0;
+	vmulti->SetReport(&report, sizeof(report));
+	vmulti->WriteReport();
+	return true;
+}
+
diff --git a/TabletDriverService/OutputVMultiDigitizer.h b/TabletDriverService/OutputVMultiDigitizer.h
new file mode 100644
index 0000000..e4f1aaa
--- /dev/null
+++ b/TabletDriverService/OutputVMultiDigitizer.h
@@ -0,0 +1,23 @@
+#pragma once
+class OutputVMultiDigitizer : public Output {
+public:
+
+	// Digitizer vmulti report
+	struct {
+		BYTE vmultiId;
+		BYTE reportLength;
+		BYTE reportId;
+		BYTE buttons;
+		USHORT x;
+		USHORT y;
+		USHORT pressure;
+	} report;
+
+	bool Set(unsigned char buttons, double x, double y, double pressure);
+	bool Write();
+	bool Reset();
+
+	OutputVMultiDigitizer();
+	~OutputVMultiDigitizer();
+};
+
diff --git a/TabletDriverService/OutputVMultiRelative.cpp b/TabletDriverService/OutputVMultiRelative.cpp
new file mode 100644
index 0000000..b3c9e1c
--- /dev/null
+++ b/TabletDriverService/OutputVMultiRelative.cpp
@@ -0,0 +1,111 @@
+#include "stdafx.h"
+#include "OutputVMultiRelative.h"
+
+#define LOG_MODULE "VMultiRelative"
+#include "Logger.h"
+
+//
+// Constructor
+//
+OutputVMultiRelative::OutputVMultiRelative() {
+
+	// Relative mouse vmulti report
+	report.vmultiId = 0x40;
+	report.reportLength = 5;
+	report.reportId = 4;
+	report.buttons = 0;
+	report.x = 0;
+	report.y = 0;
+	report.wheel = 0;
+}
+
+//
+// Destructor
+//
+OutputVMultiRelative::~OutputVMultiRelative() {
+}
+
+
+
+
+//
+// Set output
+//
+bool OutputVMultiRelative::Set(unsigned char buttons, double x, double y, double pressure) {
+	double dx, dy, distance;
+
+	// Buttons
+	report.buttons = buttons;
+
+	// Mouse move delta
+	dx = x - settings->relativeState.lastPosition.x;
+	dy = y - settings->relativeState.lastPosition.y;
+	distance = sqrt(dx * dx + dy * dy);
+
+	// Reset relative position when the move distance is long enough
+	if(distance > settings->relativeResetDistance) {
+		settings->ResetRelativeState(x, y);
+		dx = 0;
+		dy = 0;
+	}
+
+	// Sensitivity
+	dx *= settings->relativeSensitivity;
+	dy *= settings->relativeSensitivity;
+
+	// Move target position
+	settings->relativeState.targetPosition.Add(dx, dy);
+
+	// Set coordinates between current position and the target position
+	int relativeX = (int)settings->relativeState.targetPosition.x - settings->relativeState.pixelPosition.x;
+	int relativeY = (int)settings->relativeState.targetPosition.y - settings->relativeState.pixelPosition.y;
+
+	// Limit values
+	if(relativeX > 127) relativeX = 127;
+	else if(relativeX < -127) relativeX = -127;
+	if(relativeY > 127) relativeY = 127;
+	else if(relativeY < -127) relativeY = -127;
+
+	// Move current position
+	settings->relativeState.pixelPosition.x += relativeX;
+	settings->relativeState.pixelPosition.y += relativeY;
+
+	// Last position
+	settings->relativeState.lastPosition.Set(x, y);
+
+	// Set relative mouse report output
+	report.x = (char)relativeX;
+	report.y = (char)relativeY;
+
+	vmulti->SetReport(&report, sizeof(report));
+	if(debugEnabled) {
+		LOG_DEBUGBUFFER(&report, 10, "Report: ");
+	}
+	return true;
+}
+
+//
+// Write output
+//
+bool OutputVMultiRelative::Write() {
+
+	// Write report to VMulti device if report has changed
+	if(vmulti->HasReportChanged() || report.x != 0 || report.y != 0) {
+		vmulti->WriteReport();
+		return true;
+	}
+	return false;
+}
+
+
+//
+// Reset output
+//
+bool OutputVMultiRelative::Reset() {
+	report.buttons = 0;
+	report.wheel = 0;
+	vmulti->SetReport(&report, sizeof(report));
+	vmulti->WriteReport();
+	return true;
+}
+
diff --git a/TabletDriverService/OutputVMultiRelative.h b/TabletDriverService/OutputVMultiRelative.h
new file mode 100644
index 0000000..dfe2ad8
--- /dev/null
+++ b/TabletDriverService/OutputVMultiRelative.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "Vector2D.h"
+
+class OutputVMultiRelative : public Output {
+public:
+
+	// Relative mouse vmulti report
+	struct {
+		BYTE vmultiId;
+		BYTE reportLength;
+		BYTE reportId;
+		BYTE buttons;
+		signed char x;
+		signed char y;
+		BYTE wheel;
+	} report;
+
+	bool Set(unsigned char buttons, double x, double y, double pressure);
+	bool Write();
+	bool Reset();
+
+	OutputVMultiRelative();
+	~OutputVMultiRelative();
+};
+
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index e4d90e3..3449893 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -414,8 +414,8 @@ bool ProcessCommand(CommandLine *cmd) {
 	//
 	else if(cmd->is("Sensitivity")) {
 		if(!CheckTablet()) return true;
-		vmulti->relativeData.sensitivity = cmd->GetDouble(0, vmulti->relativeData.sensitivity);
-		LOG_INFO("Relative mode sensitivity = %0.2f px/mm\n", vmulti->relativeData.sensitivity);
+		outputManager->settings->relativeSensitivity = cmd->GetDouble(0, outputManager->settings->relativeSensitivity);
+		LOG_INFO("Relative mode sensitivity = %0.2f px/mm\n", outputManager->settings->relativeSensitivity);
 	}
 
 	//
@@ -423,8 +423,8 @@ bool ProcessCommand(CommandLine *cmd) {
 	//
 	else if(cmd->is("ResetDistance")) {
 		if(!CheckTablet()) return true;
-		vmulti->relativeData.resetDistance = cmd->GetDouble(0, vmulti->relativeData.resetDistance);
-		LOG_INFO("Relative mode reset distance = %0.2f mm\n", vmulti->relativeData.resetDistance);
+		outputManager->settings->relativeResetDistance = cmd->GetDouble(0, outputManager->settings->relativeResetDistance);
+		LOG_INFO("Relative mode reset distance = %0.2f mm\n", outputManager->settings->relativeResetDistance);
 	}
 
 
@@ -436,35 +436,27 @@ bool ProcessCommand(CommandLine *cmd) {
 
 		// Absolute mouse
 		if(mode.compare(0, 3, "abs") == 0) {
-			if(vmulti->mode != VMulti::ModeAbsoluteMouse)
-				vmulti->ResetReport();
-			vmulti->mode = VMulti::ModeAbsoluteMouse;
+			outputManager->SetOutputMode(OutputManager::ModeVMultiAbsolute);
 			LOG_INFO("Output Mode = Absolute\n");
 		}
 
 		// Relative mouse
 		else if(mode.compare(0, 3, "rel") == 0) {
-			if(vmulti->mode != VMulti::ModeRelativeMouse)
-				vmulti->ResetReport();
-			vmulti->mode = VMulti::ModeRelativeMouse;
+			outputManager->SetOutputMode(OutputManager::ModeVMultiRelative);
 			LOG_INFO("Output Mode = Relative\n");
 		}
 
 		// Digitizer
 		else if(mode.compare(0, 3, "dig") == 0 || mode.compare(0, 3, "pen") == 0) {
-			if(vmulti->mode != VMulti::ModeDigitizer)
-				vmulti->ResetReport();
-			vmulti->mode = VMulti::ModeDigitizer;
+
+			outputManager->SetOutputMode(OutputManager::ModeVMultiDigitizer);
 			LOG_INFO("Output Mode = Digitizer\n");
 		}
 
 		// SendInput
-		else if(mode.compare(0, 4, "send") == 0) {
-			if(vmulti->mode != VMulti::ModeSendInput)
-				vmulti->ResetReport();
-			vmulti->mode = VMulti::ModeSendInput;
-			vmulti->UpdateMonitorInfo();
-			LOG_INFO("Output Mode = SendInput\n");
+		else if(mode.compare(0, 12, "sendinputabs") == 0) {
+			outputManager->SetOutputMode(OutputManager::ModeSendInputAbsolute);
+			LOG_INFO("Output Mode = SendInput Absolute\n");
 		}
 
 		else {
diff --git a/TabletDriverService/RelativeMouseState.cpp b/TabletDriverService/RelativeMouseState.cpp
new file mode 100644
index 0000000..87f29b2
--- /dev/null
+++ b/TabletDriverService/RelativeMouseState.cpp
@@ -0,0 +1,10 @@
+#include "stdafx.h"
+#include "RelativeMouseState.h"
+
+
+RelativeMouseState::RelativeMouseState() {
+}
+
+
+RelativeMouseState::~RelativeMouseState() {
+}
diff --git a/TabletDriverService/RelativeMouseState.h b/TabletDriverService/RelativeMouseState.h
new file mode 100644
index 0000000..f85f564
--- /dev/null
+++ b/TabletDriverService/RelativeMouseState.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "Vector2D.h"
+
+class RelativeMouseState {
+public:
+	// PixelPosition
+	typedef struct {
+		int x;
+		int y;
+	} PixelPosition;
+
+	PixelPosition pixelPosition;
+	Vector2D lastPosition;
+	Vector2D targetPosition;
+	double sensitivity;
+	double resetDistance;
+
+	RelativeMouseState();
+	~RelativeMouseState();
+};
+
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 5705238..03490ac 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -50,9 +50,6 @@ Tablet::Tablet() {
 	initReport = NULL;
 	initReportLength = 0;
 
-	// Reset state
-	memset(&state, 0, sizeof(state));
-
 	// Filters
 	filterTimed[0] = &smoothing;
 	filterTimedCount = 1;
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index ed0a4ba..bad3387 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -5,6 +5,7 @@
 #include "USBDevice.h"
 #include "HIDDevice.h"
 #include "TabletSettings.h"
+#include "TabletState.h"
 #include "TabletFilterSmoothing.h"
 #include "TabletFilterNoiseReduction.h"
 #include "TabletFilterPeak.h"
@@ -49,14 +50,9 @@ class Tablet {
 	} reportData;
 
 	//
-	// Tablet state
+	// Tablet State
 	//
-	struct {
-		bool isValid;
-		BYTE buttons;
-		Vector2D position;
-		double pressure;
-	} state;
+	TabletState state;
 
 	// Settings
 	TabletSettings settings;
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index 082859c..d5837a8 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -171,8 +171,17 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClInclude Include="CommandLine.h" />
     <ClInclude Include="HIDDevice.h" />
     <ClInclude Include="Logger.h" />
+    <ClInclude Include="Output.h" />
+    <ClInclude Include="OutputManager.h" />
+    <ClInclude Include="OutputSendInputAbsolute.h" />
+    <ClInclude Include="OutputSettings.h" />
+    <ClInclude Include="OutputVMultiAbsolute.h" />
+    <ClInclude Include="OutputVMultiAbsoluteV2.h" />
+    <ClInclude Include="OutputVMultiDigitizer.h" />
+    <ClInclude Include="OutputVMultiRelative.h" />
     <ClInclude Include="PositionRingBuffer.h" />
     <ClInclude Include="ProcessCommand.h" />
+    <ClInclude Include="RelativeMouseState.h" />
     <ClInclude Include="ScreenMapper.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="Tablet.h" />
@@ -182,6 +191,7 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClInclude Include="TabletFilterPeak.h" />
     <ClInclude Include="TabletFilterSmoothing.h" />
     <ClInclude Include="TabletSettings.h" />
+    <ClInclude Include="TabletState.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="USBDevice.h" />
     <ClInclude Include="Vector2D.h" />
@@ -191,8 +201,17 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClCompile Include="CommandLine.cpp" />
     <ClCompile Include="HIDDevice.cpp" />
     <ClCompile Include="Logger.cpp" />
+    <ClCompile Include="Output.cpp" />
+    <ClCompile Include="OutputManager.cpp" />
+    <ClCompile Include="OutputSendInputAbsolute.cpp" />
+    <ClCompile Include="OutputSettings.cpp" />
+    <ClCompile Include="OutputVMultiAbsolute.cpp" />
+    <ClCompile Include="OutputVMultiAbsoluteV2.cpp" />
+    <ClCompile Include="OutputVMultiDigitizer.cpp" />
+    <ClCompile Include="OutputVMultiRelative.cpp" />
     <ClCompile Include="PositionRingBuffer.cpp" />
     <ClCompile Include="ProcessCommand.cpp" />
+    <ClCompile Include="RelativeMouseState.cpp" />
     <ClCompile Include="ScreenMapper.cpp" />
     <ClCompile Include="Tablet.cpp" />
     <ClCompile Include="TabletBenchmark.cpp" />
@@ -201,6 +220,7 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClCompile Include="TabletFilterPeak.cpp" />
     <ClCompile Include="TabletFilterSmoothing.cpp" />
     <ClCompile Include="TabletSettings.cpp" />
+    <ClCompile Include="TabletState.cpp" />
     <ClCompile Include="USBDevice.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -218,6 +238,9 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <None Include="config\user.cfg" />
     <None Include="config\wacom.cfg" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="docs\VMulti_Report_Descriptor.txt" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index 4b88f4e..00b377d 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -69,6 +69,36 @@
     <ClInclude Include="PositionRingBuffer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Output.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputVMultiAbsolute.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputVMultiRelative.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RelativeMouseState.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TabletState.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputVMultiDigitizer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputSendInputAbsolute.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputVMultiAbsoluteV2.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -125,6 +155,36 @@
     <ClCompile Include="PositionRingBuffer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Output.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputVMultiAbsolute.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputVMultiRelative.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RelativeMouseState.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TabletState.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputVMultiDigitizer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputSendInputAbsolute.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputVMultiAbsoluteV2.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">
@@ -140,4 +200,9 @@
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="docs\VMulti_Report_Descriptor.txt">
+      <Filter>Resource Files</Filter>
+    </Text>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/TabletDriverService/TabletFilter.h b/TabletDriverService/TabletFilter.h
index 9988e6b..b85d07d 100644
--- a/TabletDriverService/TabletFilter.h
+++ b/TabletDriverService/TabletFilter.h
@@ -1,4 +1,6 @@
 #pragma once
+#include "Vector2D.h"
+
 class TabletFilter {
 public:
 	virtual void SetTarget(Vector2D vector) = 0;
diff --git a/TabletDriverService/TabletFilterNoiseReduction.h b/TabletDriverService/TabletFilterNoiseReduction.h
index fba34ed..1d725a8 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.h
+++ b/TabletDriverService/TabletFilterNoiseReduction.h
@@ -1,5 +1,5 @@
 #pragma once
-
+#include "TabletFilter.h"
 #include "PositionRingBuffer.h"
 
 class TabletFilterNoiseReduction : public TabletFilter {
diff --git a/TabletDriverService/TabletState.cpp b/TabletDriverService/TabletState.cpp
new file mode 100644
index 0000000..d9b28ff
--- /dev/null
+++ b/TabletDriverService/TabletState.cpp
@@ -0,0 +1,15 @@
+#include "stdafx.h"
+#include "TabletState.h"
+
+
+TabletState::TabletState() {
+	buttons = 0;
+	position.x = 0;
+	position.y = 0;
+	pressure = 0;
+	isValid = false;
+}
+
+
+TabletState::~TabletState() {
+}
diff --git a/TabletDriverService/TabletState.h b/TabletDriverService/TabletState.h
new file mode 100644
index 0000000..da47fd5
--- /dev/null
+++ b/TabletDriverService/TabletState.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "Vector2D.h"
+
+class TabletState {
+public:
+	unsigned char buttons;
+	Vector2D position;
+	double pressure;
+	bool isValid;
+
+	TabletState();
+	~TabletState();
+};
+
diff --git a/TabletDriverService/VMulti.cpp b/TabletDriverService/VMulti.cpp
index 918a962..00c5d93 100644
--- a/TabletDriverService/VMulti.cpp
+++ b/TabletDriverService/VMulti.cpp
@@ -10,39 +10,6 @@ VMulti::VMulti() {
 	debugEnabled = false;
 	lastButtons = 0;
 
-	mode = ModeAbsoluteMouse;
-
-	// Absolute mouse init
-	reportAbsoluteMouse.vmultiId = 0x40;
-	reportAbsoluteMouse.reportLength = 7;
-	reportAbsoluteMouse.reportId = 3;
-	reportAbsoluteMouse.buttons = 0;
-	reportAbsoluteMouse.wheel = 0;
-
-	// Relative mouse init
-	reportRelativeMouse.vmultiId = 0x40;
-	reportRelativeMouse.reportLength = 5;
-	reportRelativeMouse.reportId = 4;
-	reportRelativeMouse.buttons = 0;
-	reportRelativeMouse.x = 0;
-	reportRelativeMouse.y = 0;
-	reportRelativeMouse.wheel = 0;
-
-	// Digitizer / Windows Ink init
-	reportDigitizer.vmultiId = 0x40;
-	reportDigitizer.reportLength = 8;
-	reportDigitizer.reportId = 5;
-	reportDigitizer.buttons = 0;
-	reportDigitizer.pressure = 0;
-
-	// Relative mouse data
-	memset(&relativeData, 0, sizeof(relativeData));
-	relativeData.sensitivity = 1;
-	relativeData.resetDistance = 50;
-
-	// Monitor info
-	UpdateMonitorInfo();
-
 	// Report buffers
 	memset(reportBuffer, 0, 65);
 	memset(lastReportBuffer, 0, 65);
@@ -68,7 +35,6 @@ VMulti::~VMulti() {
 // Has report data changed?
 //
 bool VMulti::HasReportChanged() {
-
 	if(memcmp(reportBuffer, lastReportBuffer, 65) == 0) {
 		return false;
 	}
@@ -76,212 +42,22 @@ bool VMulti::HasReportChanged() {
 }
 
 //
-// Reset relative mouse data
-//
-void VMulti::ResetRelativeData(double x, double y) {
-	relativeData.targetPosition.Set(x, y);
-	relativeData.lastPosition.Set(x, y);
-	relativeData.currentPosition.x = (int)x;
-	relativeData.currentPosition.y = (int)y;
-}
-
-
-//
-// Update monitor information
+// Set VMulti Report
 //
-void VMulti::UpdateMonitorInfo() {
-	monitorInfo.primaryWidth = GetSystemMetrics(SM_CXSCREEN);
-	monitorInfo.primaryHeight = GetSystemMetrics(SM_CYSCREEN);
-	monitorInfo.virtualWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
-	monitorInfo.virtualHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-	monitorInfo.virtualX = GetSystemMetrics(SM_XVIRTUALSCREEN);
-	monitorInfo.virtualY = GetSystemMetrics(SM_YVIRTUALSCREEN);
+void VMulti::SetReport(void * buffer, int length) {
+	memcpy(reportBuffer, buffer, length);
 }
 
-
-//
-// Create report
-//
-void VMulti::CreateReport(BYTE buttons, double x, double y, double pressure) {
-	double dx, dy, distance;
-
-	//
-	// Absolute mouse
-	//
-	if(mode == VMulti::ModeAbsoluteMouse) {
-		reportAbsoluteMouse.buttons = buttons;
-		reportAbsoluteMouse.x = (USHORT)round(x * 32767.0);
-		reportAbsoluteMouse.y = (USHORT)round(y * 32767.0);
-
-		memcpy(reportBuffer, &reportAbsoluteMouse, sizeof(reportAbsoluteMouse));
-		if(debugEnabled) {
-			LOG_DEBUGBUFFER(&reportAbsoluteMouse, 9, "VMulti Absolute: ");
-		}
-	}
-
-	//
-	// Relative mouse
-	//
-	else if(mode == VMulti::ModeRelativeMouse) {
-
-		// Buttons
-		reportRelativeMouse.buttons = buttons;
-
-		// Mouse move delta
-		dx = x - relativeData.lastPosition.x;
-		dy = y - relativeData.lastPosition.y;
-		distance = sqrt(dx * dx + dy * dy);
-
-		// Reset relative position when the move distance is long enough
-		if(distance > relativeData.resetDistance) {
-			ResetRelativeData(x, y);
-			dx = 0;
-			dy = 0;
-		}
-
-		// Sensitivity
-		dx *= relativeData.sensitivity;
-		dy *= relativeData.sensitivity;
-
-		// Move target position
-		relativeData.targetPosition.Add(dx, dy);
-
-		// Send difference of current position and target position
-		reportRelativeMouse.x = (BYTE)(relativeData.targetPosition.x - relativeData.currentPosition.x);
-		reportRelativeMouse.y = (BYTE)(relativeData.targetPosition.y - relativeData.currentPosition.y);
-
-		// Add report position to real position
-		relativeData.currentPosition.x += reportRelativeMouse.x;
-		relativeData.currentPosition.y += reportRelativeMouse.y;
-
-		// Last position
-		relativeData.lastPosition.Set(x, y);
-
-		memcpy(reportBuffer, &reportRelativeMouse, sizeof(reportRelativeMouse));
-		if(debugEnabled) {
-			LOG_DEBUGBUFFER(&reportRelativeMouse, 10, "VMulti Relative: ");
-		}
-	}
-
-	//
-	// Digitizer
-	//
-	else if(mode == VMulti::ModeDigitizer) {
-		reportDigitizer.buttons = buttons | 0x20;
-		reportDigitizer.x = (USHORT)floor(x * 32767.0 - 5);
-		reportDigitizer.y = (USHORT)floor(y * 32767.0 - 5);
-		reportDigitizer.pressure = (USHORT)floor(pressure * 2047.0);
-		if(reportDigitizer.pressure > 2047) {
-			reportDigitizer.pressure = 2047;
-		}
-		memcpy(reportBuffer, &reportDigitizer, sizeof(reportDigitizer));
-		if(debugEnabled) {
-			LOG_DEBUGBUFFER(&reportDigitizer, 10, "VMulti Digitizer: ");
-		}
-	}
-
-	//
-	// SendInput
-	//
-	else if(mode == ModeSendInput) {
-
-		if(debugEnabled) {
-			LOG_DEBUG("%0.0f,%0.0f | %0.0f,%0.0f | %0.0f,%0.0f\n",
-				monitorInfo.primaryWidth, monitorInfo.primaryHeight,
-				monitorInfo.virtualWidth, monitorInfo.virtualHeight,
-				monitorInfo.virtualX, monitorInfo.virtualY
-			);
-		}
-		INPUT input = {0};
-		input.type = INPUT_MOUSE;
-		input.mi.mouseData = 0;
-		input.mi.dx = (LONG)floor(
-			x * 65535.0 * (monitorInfo.virtualWidth / monitorInfo.primaryWidth)
-			+ (monitorInfo.virtualX / monitorInfo.primaryWidth * 65535.0)
-		);
-		input.mi.dy = (LONG)floor(
-			y * 65535.0 * (monitorInfo.virtualHeight / monitorInfo.primaryHeight)
-			+ (monitorInfo.virtualY / monitorInfo.primaryHeight * 65535.0)
-		);
-		input.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE;
-
-		// Mouse 1
-		if((buttons & 0x01) && !(lastButtons & 0x01)) input.mi.dwFlags |= MOUSEEVENTF_LEFTDOWN;
-		else if(!(buttons & 0x01) && (lastButtons & 0x01)) input.mi.dwFlags |= MOUSEEVENTF_LEFTUP;
-
-		// Mouse 2
-		if((buttons & 0x02) && !(lastButtons & 0x02)) input.mi.dwFlags |= MOUSEEVENTF_RIGHTDOWN;
-		else if(!(buttons & 0x02) && (lastButtons & 0x02)) input.mi.dwFlags |= MOUSEEVENTF_RIGHTUP;
-
-		// Mouse 3
-		if((buttons & 0x04) && !(lastButtons & 0x04)) input.mi.dwFlags |= MOUSEEVENTF_MIDDLEDOWN;
-		else if(!(buttons & 0x04) && (lastButtons & 0x04)) input.mi.dwFlags |= MOUSEEVENTF_MIDDLEUP;
-
-		lastButtons = buttons;
-
-		memcpy(reportBuffer, &input, sizeof(INPUT));
-	}
-
-
-}
-
-
-
-//
-// Send reset report
-//
-int VMulti::ResetReport() {
-	if(!outputEnabled) return true;
-
-	// Absolute
-	if(mode == ModeAbsoluteMouse) {
-		reportAbsoluteMouse.buttons = 0;
-		reportAbsoluteMouse.wheel = 0;
-		memcpy(reportBuffer, &reportAbsoluteMouse, sizeof(reportAbsoluteMouse));
-
-	// Relative
-	} else if(mode == ModeRelativeMouse) {
-		reportRelativeMouse.buttons = 0;
-		reportRelativeMouse.x = 0;
-		reportRelativeMouse.y = 0;
-		reportRelativeMouse.wheel = 0;
-		memcpy(reportBuffer, &reportRelativeMouse, sizeof(reportRelativeMouse));
-
-	// Digitizer
-	} else if(mode == ModeDigitizer) {
-		reportDigitizer.buttons = 0;
-		reportDigitizer.pressure = 0;
-		memcpy(reportBuffer, &reportDigitizer, sizeof(reportDigitizer));
-
-	// Send Input
-	} else if(mode == ModeSendInput) {
-		INPUT input = {0};
-		input.type = INPUT_MOUSE;
-		input.mi.mouseData = 0;
-		input.mi.dx = 0;
-		input.mi.dy = 0;
-		input.mi.dwFlags = MOUSEEVENTF_LEFTUP | MOUSEEVENTF_RIGHTUP | MOUSEEVENTF_MIDDLEUP;
-		memcpy(reportBuffer, &input, sizeof(INPUT));
-		memcpy(lastReportBuffer, reportBuffer, 65);
-		return 0;
-	}
-
-	memcpy(lastReportBuffer, reportBuffer, 65);
-	return hidDevice->Write(reportBuffer, 65);
-}
-
-
 //
 // Write report
 //
 int VMulti::WriteReport() {
 	if(!outputEnabled) return true;
 
+	// Copy last report
 	memcpy(lastReportBuffer, reportBuffer, 65);
 
-	if(mode == ModeSendInput) {
-		return SendInput(1, (LPINPUT)reportBuffer, sizeof(INPUT));
-	} else {
-		return hidDevice->Write(reportBuffer, 65);
-	}
+	// Write
+	return hidDevice->Write(reportBuffer, 65);
+
 }
\ No newline at end of file
diff --git a/TabletDriverService/VMulti.h b/TabletDriverService/VMulti.h
index cf6fadb..f89114e 100644
--- a/TabletDriverService/VMulti.h
+++ b/TabletDriverService/VMulti.h
@@ -10,84 +10,15 @@ class VMulti {
 	BYTE lastReportBuffer[65];
 public:
 
-	enum VMultiMode {
-		ModeAbsoluteMouse,
-		ModeRelativeMouse,
-		ModeDigitizer,
-		ModeSendInput
-	};
-
-	struct {
-		BYTE vmultiId;
-		BYTE reportLength;
-		BYTE reportId;
-		BYTE buttons;
-		USHORT x;
-		USHORT y;
-		BYTE wheel;
-	} reportAbsoluteMouse;
-
-	struct {
-		BYTE vmultiId;
-		BYTE reportLength;
-		BYTE reportId;
-		BYTE buttons;
-		BYTE x;
-		BYTE y;
-		BYTE wheel;
-	} reportRelativeMouse;
-
-	struct {
-		BYTE vmultiId;
-		BYTE reportLength;
-		BYTE reportId;
-		BYTE buttons;
-		USHORT x;
-		USHORT y;
-		USHORT pressure;
-	} reportDigitizer;
-
-
-	// Position Integer
-	typedef struct {
-		int x;
-		int y;
-	} PositionInt;
-
-	// Relative mouse data
-	struct {
-		PositionInt currentPosition;
-		Vector2D lastPosition;
-		Vector2D targetPosition;
-		double sensitivity;
-		double resetDistance;
-	} relativeData;
-
-
-	struct {
-		double primaryWidth = GetSystemMetrics(SM_CXSCREEN);
-		double primaryHeight = GetSystemMetrics(SM_CYSCREEN);
-		double virtualWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
-		double virtualHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-		double virtualX = GetSystemMetrics(SM_XVIRTUALSCREEN);
-		double virtualY = GetSystemMetrics(SM_YVIRTUALSCREEN);
-	} monitorInfo;
-
-	VMultiMode mode;
 	bool isOpen;
 	bool debugEnabled;
 	bool outputEnabled;
 	int lastButtons;
 
-
-
 	VMulti();
 	~VMulti();
 	bool HasReportChanged();
-	void ResetRelativeData(double x, double y);
-	void UpdateMonitorInfo();
-	void CreateReport(BYTE buttons, double x, double y, double pressure);
-	int ResetReport();
+	void SetReport(void *buffer, int length);
 	int WriteReport();
 };
 
diff --git a/TabletDriverService/stdafx.h b/TabletDriverService/stdafx.h
index 9a366cf..835c2f5 100644
--- a/TabletDriverService/stdafx.h
+++ b/TabletDriverService/stdafx.h
@@ -12,10 +12,12 @@
 #include "VMulti.h"
 #include "Tablet.h"
 #include "ScreenMapper.h"
+#include "OutputManager.h"
 
 // Global variables...
 extern VMulti *vmulti;
 extern Tablet *tablet;
+extern OutputManager *outputManager;
 extern ScreenMapper *mapper;
 extern void CleanupAndExit(int code);
 

From fd4a7ae98c6594243ba9db4821308c6954e2522a Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 24 Nov 2018 18:41:30 +0200
Subject: [PATCH 24/83] Better input detection for CTL-472 and CTL-4100

---
 TabletDriverService/config/tablet.cfg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index a9fcbee..6e8026b 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -125,7 +125,7 @@ Tablet 0x056a 0x037a 0xFF00 0x000A
 Name "Wacom CTL-472 (Wacom drivers installed)"
 ReportId 0x02
 ReportLength 11
-DetectMask 0x40
+DetectMask 0x20
 MaxX 15200
 MaxY 9500
 MaxPressure 2047
@@ -141,7 +141,7 @@ Tablet 0x056a 0x037a 0xFF0D 0x0001
 Name "Wacom CTL-472"
 ReportId 0x02
 ReportLength 10
-DetectMask 0x40
+DetectMask 0x20
 MaxX 15200
 MaxY 9500
 MaxPressure 2047
@@ -307,7 +307,7 @@ Tablet 0x056a 0x0374 0xFF0D 0x0001
 Name "Wacom CTL-4100"
 ReportId 0x10
 ReportLength 192
-DetectMask 0x40
+DetectMask 0x20
 MaxX 15200
 MaxY 9500
 MaxPressure 4095
@@ -323,7 +323,7 @@ Tablet 0x056a 0x0374 0xFF00 0x000A
 Name "Wacom CTL-4100 (Wacom drivers installed)"
 ReportId 0x10
 ReportLength 193
-DetectMask 0x40
+DetectMask 0x20
 MaxX 15200
 MaxY 9500
 MaxPressure 4095

From 763e64fafcdeecd2ef46e494f518c2ce8847603b Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 24 Nov 2018 18:42:02 +0200
Subject: [PATCH 25/83] Updated the VMulti driver link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1029640..543f637 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 If you want to compile the code and don't want to install anything from the TabletDriver binary package, you will need extract the missing drivers from these installation packages:
 
 **VMulti driver:**
-- https://www.xp-pen.com/upload/download/20180130/XP-PenWin(20180130).zip
+- https://www.xp-pen.com/upload/download/20181019/osuWin(20181019).zip
 
 **Huion WinUSB driver:**
 - https://www.huiontablet.com/drivers/WinDriver/HuionTablet_WinDriver_v13.15.16.zip

From 5dab61df204f551f6df50d00796298101134df27 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 24 Nov 2018 18:42:13 +0200
Subject: [PATCH 26/83] gitignore startuplog.txt

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 378a352..5bf2d11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /TabletDriverService/Release/
 /TabletDriverService/Debug/
 
+TabletDriverService/startuplog.txt

From ed626abc6ee341a48e5c4df9a61a1deb370a4422 Mon Sep 17 00:00:00 2001
From: Dillon Modine-Thuen <itsyuka101@gmail.com>
Date: Mon, 26 Nov 2018 16:02:12 -0600
Subject: [PATCH 27/83] Fix for the XP-Pen Deco 01

Correct Product ID, init and report length
---
 TabletDriverService/config/tablet.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 6e8026b..1f9cbc6 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -477,17 +477,17 @@ InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
 #
 # XP-Pen Deco 01
 #
-Tablet 0x28BD 0x0042 0xFF0A 0x0001
+Tablet 0x28BD 0x0902 0xFF0A 0x0001
 Name "XP-Pen Deco 01"
 ReportId 0x02
-ReportLength 8
+ReportLength 10
 DetectMask 0x80
 MaxX 25400
 MaxY 15875
 MaxPressure 8191
 Width 254.0
 Height 158.75
-InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
+InitReport 0x02 0xB0 0x04 0x00 0x00 0x00 0x00 0x00
 
 
 #

From 8f8fc9b0306b5d70858db53c0a51e69ebdbb0008 Mon Sep 17 00:00:00 2001
From: "[Hidekazu]" <itsyuka101@gmail.com>
Date: Tue, 27 Nov 2018 12:33:38 -0600
Subject: [PATCH 28/83] Revert "Fix for the XP-Pen Deco 01"

This reverts commit ed626abc6ee341a48e5c4df9a61a1deb370a4422.
---
 TabletDriverService/config/tablet.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 1f9cbc6..6e8026b 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -477,17 +477,17 @@ InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
 #
 # XP-Pen Deco 01
 #
-Tablet 0x28BD 0x0902 0xFF0A 0x0001
+Tablet 0x28BD 0x0042 0xFF0A 0x0001
 Name "XP-Pen Deco 01"
 ReportId 0x02
-ReportLength 10
+ReportLength 8
 DetectMask 0x80
 MaxX 25400
 MaxY 15875
 MaxPressure 8191
 Width 254.0
 Height 158.75
-InitReport 0x02 0xB0 0x04 0x00 0x00 0x00 0x00 0x00
+InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
 
 
 #

From 80d50496f8c12d5b4cec67077ded905c6a22fd24 Mon Sep 17 00:00:00 2001
From: "[Hidekazu]" <itsyuka101@gmail.com>
Date: Tue, 27 Nov 2018 12:35:02 -0600
Subject: [PATCH 29/83] Create a new entry for Deco 01 v2

---
 TabletDriverService/config/tablet.cfg | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 6e8026b..3ebb98d 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -489,6 +489,21 @@ Width 254.0
 Height 158.75
 InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
 
+#
+# XP-Pen Deco 01 v2
+#
+Tablet 0x28BD 0x0902 0xFF0A 0x0001
+Name "XP-Pen Deco 01 v2"
+ReportId 0x02
+ReportLength 10
+DetectMask 0x80
+MaxX 25400
+MaxY 15875
+MaxPressure 8191
+Width 254.0
+Height 158.75
+InitReport 0x02 0xB0 0x04 0x00 0x00 0x00 0x00 0x00
+
 
 #
 # Huion 420

From 2379eb91a3cca4895c8b3ae53ad852db6323f0f5 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Tue, 27 Nov 2018 22:36:13 +0200
Subject: [PATCH 30/83] Fixed Windows Ink pen pressure

---
 TabletDriverService/OutputVMultiDigitizer.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TabletDriverService/OutputVMultiDigitizer.cpp b/TabletDriverService/OutputVMultiDigitizer.cpp
index a459a75..0e8719d 100644
--- a/TabletDriverService/OutputVMultiDigitizer.cpp
+++ b/TabletDriverService/OutputVMultiDigitizer.cpp
@@ -34,6 +34,7 @@ bool OutputVMultiDigitizer::Set(unsigned char buttons, double x, double y, doubl
 	report.buttons = buttons | 0x20;
 	report.x = (USHORT)round(x * 32767.0);
 	report.y = (USHORT)round(y * 32767.0);
+	report.pressure = (USHORT)round(pressure * 2047.0);
 	vmulti->SetReport(&report, sizeof(report));
 
 	if(debugEnabled) {

From 45a6f624ccd6c8f2bae0d89bd4a0a507c34dc17a Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Tue, 27 Nov 2018 22:38:29 +0200
Subject: [PATCH 31/83] Fixed invalid cursor movements at the startup.

---
 TabletDriverService/Main.cpp                 | 6 +++++-
 TabletDriverService/OutputVMultiRelative.cpp | 9 +++++++++
 TabletDriverService/OutputVMultiRelative.h   | 1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index 9188d59..66c9f95 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -166,7 +166,11 @@ VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWa
 	bool filterEnabled = false;
 
 	// Set position
-	position.Set(tablet->state.position);
+	if(tablet->state.isValid) {
+		position.Set(tablet->state.position);
+	} else {
+		return;
+	}
 
 	// Loop through filters
 	for(int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
diff --git a/TabletDriverService/OutputVMultiRelative.cpp b/TabletDriverService/OutputVMultiRelative.cpp
index b3c9e1c..b73e68d 100644
--- a/TabletDriverService/OutputVMultiRelative.cpp
+++ b/TabletDriverService/OutputVMultiRelative.cpp
@@ -17,6 +17,8 @@ OutputVMultiRelative::OutputVMultiRelative() {
 	report.x = 0;
 	report.y = 0;
 	report.wheel = 0;
+
+	firstReport = true;
 }
 
 //
@@ -34,6 +36,13 @@ OutputVMultiRelative::~OutputVMultiRelative() {
 bool OutputVMultiRelative::Set(unsigned char buttons, double x, double y, double pressure) {
 	double dx, dy, distance;
 
+
+	if(firstReport) {
+		settings->relativeState.lastPosition.x = x;
+		settings->relativeState.lastPosition.y = y;
+		firstReport = false;
+	}
+
 	// Buttons
 	report.buttons = buttons;
 
diff --git a/TabletDriverService/OutputVMultiRelative.h b/TabletDriverService/OutputVMultiRelative.h
index dfe2ad8..88b2fa6 100644
--- a/TabletDriverService/OutputVMultiRelative.h
+++ b/TabletDriverService/OutputVMultiRelative.h
@@ -15,6 +15,7 @@ class OutputVMultiRelative : public Output {
 		signed char y;
 		BYTE wheel;
 	} report;
+	bool firstReport;
 
 	bool Set(unsigned char buttons, double x, double y, double pressure);
 	bool Write();

From ec5e1aeed24ccf554033bb2e61f6c77fcab37429 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Tue, 27 Nov 2018 22:39:41 +0200
Subject: [PATCH 32/83] README.md: Updated the Huion driver link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 543f637..a0a2d3f 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ If you want to compile the code and don't want to install anything from the Tabl
 - https://www.xp-pen.com/upload/download/20181019/osuWin(20181019).zip
 
 **Huion WinUSB driver:**
-- https://www.huiontablet.com/drivers/WinDriver/HuionTablet_WinDriver_v13.15.16.zip
+- https://www.huiontablet.com/drivers/WinDriver/HuionTablet_WinDriver_v14.7.60.zip
 
 #
 

From 896a708802e12916dbff013296fcf3db1a02f842 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Tue, 27 Nov 2018 22:41:50 +0200
Subject: [PATCH 33/83] Readonly variables.

---
 TabletDriverGUI/TabletDriver.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TabletDriverGUI/TabletDriver.cs b/TabletDriverGUI/TabletDriver.cs
index 11c0de7..eec13cc 100644
--- a/TabletDriverGUI/TabletDriver.cs
+++ b/TabletDriverGUI/TabletDriver.cs
@@ -33,11 +33,11 @@ public DriverEventArgs(DriverEventType type, string message)
         // Console stuff
         public List<string> ConsoleBuffer;
         public bool HasConsoleUpdated;
-        private int ConsoleMaxLines;
+        private readonly int ConsoleMaxLines;
         private System.Threading.Mutex mutexConsoleUpdate;
 
         // Other variables
-        private string servicePath;
+        private readonly string servicePath;
         private Process processService;
         private Timer timerWatchdog;
         private bool running;

From 088b3abb2b078fd426ff5e942b7e74db9b4877fb Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Tue, 27 Nov 2018 22:53:25 +0200
Subject: [PATCH 34/83] Noise reduction, Measurement, Draw area, 1000Hz

- Improved the noise reduction filter and added the settings to the GUI.
- Added `Measure` command that can be used to measure distances between pen clicks.
- Added ability to "draw" the tablet area by clicking two points in the tablet with a pen.
- Added restart driver button to the notification menu.
- Unlocked 1000 Hz smoothing filter rate.
---
 TabletDriverGUI/Configuration.cs              |  10 ++
 TabletDriverGUI/MainWindow.xaml               | 155 +++++++++++++----
 TabletDriverGUI/MainWindow.xaml.cs            | 160 +++++++++++++++++-
 TabletDriverService/ProcessCommand.cpp        | 146 +++++++++++++---
 TabletDriverService/Tablet.cpp                |   9 +-
 TabletDriverService/Tablet.h                  |   6 +-
 TabletDriverService/TabletBenchmark.cpp       |  48 ------
 TabletDriverService/TabletBenchmark.h         |  20 ---
 .../TabletDriverService.vcxproj               |   4 +-
 .../TabletDriverService.vcxproj.filters       |  12 +-
 .../TabletFilterNoiseReduction.cpp            |  59 ++++++-
 .../TabletFilterNoiseReduction.h              |   2 +-
 TabletDriverService/TabletMeasurement.cpp     | 103 +++++++++++
 TabletDriverService/TabletMeasurement.h       |  28 +++
 14 files changed, 612 insertions(+), 150 deletions(-)
 delete mode 100644 TabletDriverService/TabletBenchmark.cpp
 delete mode 100644 TabletDriverService/TabletBenchmark.h
 create mode 100644 TabletDriverService/TabletMeasurement.cpp
 create mode 100644 TabletDriverService/TabletMeasurement.h

diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index 384e1d4..ff0a9f5 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -27,10 +27,16 @@ public enum OutputModes
 
         public Area ScreenArea;
 
+        // Smoothing filter
         public double SmoothingLatency;
         public int SmoothingInterval;
         public bool SmoothingEnabled;
 
+        // Noise filter
+        public int NoiseFilterSamples;
+        public double NoiseFilterThreshold;
+        public bool NoiseFilterEnabled;
+
         public Area DesktopSize;
         public bool AutomaticDesktopSize;
 
@@ -83,6 +89,10 @@ public Configuration()
             SmoothingLatency = 0;
             SmoothingInterval = 4;
 
+            NoiseFilterEnabled = false;
+            NoiseFilterSamples = 10;
+            NoiseFilterThreshold = 0.5;
+
             CommandsAfter = new string[] { "" };
             CommandsBefore = new string[] { "" };
 
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 813efa1..83fe94c 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -160,7 +160,7 @@
                   <StackPanel Grid.Column="0" HorizontalAlignment="Right">
 
                     <StackPanel Orientation="Horizontal">
-                      
+
                       <!-- Invert -->
                       <CheckBox Name="checkBoxInvert" Margin="5"
                                 VerticalAlignment="Center"
@@ -173,7 +173,9 @@
                           (Inverted)
                         </TextBlock>
                       </CheckBox>
-                      
+
+
+
                       <!-- Rotation -->
                       <GroupBox Header="Rotation" Height="50" Width="100" Margin="5,0,0,0" HorizontalAlignment="Left">
                         <Grid>
@@ -185,11 +187,25 @@
                       </GroupBox>
                     </StackPanel>
 
-                    <Button Name="buttonWacomArea" Content="Wacom Area" Width="80"
+
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                      
+                      <!-- Draw Area -->
+                      <Button Name="buttonDrawArea" Content="Draw Area" Width="80"
+                            Padding="5 5 5 5" Margin="5 5 0 5"
+                            Click="ButtonDrawArea_Click"
+                              ToolTip="To set the area, click the top left and the bottom right corners of the area with your tablet pen."
+                              />
+
+                      <!-- Wacom Area -->
+                      <Button Name="buttonWacomArea" Content="Wacom Area" Width="80"
                             Padding="5 5 5 5" Margin="5"
-                            HorizontalAlignment="Right"
                             Click="ButtonWacomArea_Click" />
 
+                    </StackPanel>
+
+
+
                   </StackPanel>
 
                   <!-- Tablet area canvas -->
@@ -336,8 +352,61 @@
 
 
 
+              <!-- Desktop size -->
+              <GroupBox Name="groupDesktopSize" Header="Desktop Size" VerticalAlignment="Bottom" Margin="5,0,0,0" HorizontalAlignment="Left"
+                        >
+                <GroupBox.ToolTip>
+                  <StackPanel>
+                    <TextBlock FontWeight="Bold">
+                    Desktop Size
+                    </TextBlock>
+                    <TextBlock>
+                      - In some cases you may have to disable the auto size and manually type in the main monitor resolution.
+                      <LineBreak/>
+                      - If you don't have problems with screen mapping, leave the automatic desktop size enabled.
+                    </TextBlock>
+                  </StackPanel>
+                </GroupBox.ToolTip>
+                <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+
+                  <!-- Desktop Width -->
+                  <GroupBox Header="Width" Height="50" Width="80" Margin="0,0,0,0">
+                    <Grid>
+                      <TextBox Name="textDesktopWidth" Padding="4,0,0,0"
+                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
+                               TextChanged="TextChanged">1920</TextBox>
+                      <Label Width="30" HorizontalAlignment="Right">px</Label>
+                    </Grid>
+                  </GroupBox>
+
+                  <!-- Desktop Height -->
+                  <GroupBox Header="Height" Height="50" Width="80" Margin="5,0,0,0">
+                    <Grid>
+                      <TextBox Name="textDesktopHeight" Padding="4,0,0,0"
+                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
+                               TextChanged="TextChanged">1080</TextBox>
+                      <Label Width="30" HorizontalAlignment="Right">px</Label>
+                    </Grid>
+                  </GroupBox>
+
+                  <CheckBox Name="checkBoxAutomaticDesktopSize"
+                            VerticalAlignment="Center" Margin="5"
+                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">Auto</CheckBox>
+                </StackPanel>
+              </GroupBox>
+
+
+          
+            </StackPanel>
+
+
+            <!-- Desktop Size -->
+            <StackPanel Orientation="Horizontal"  HorizontalAlignment="Center">
+
+
+
               <!-- Smoothing -->
-              <GroupBox Name="groupFilter" Header="Smoothing Filter" VerticalAlignment="Bottom" Margin="5,0,0,0" HorizontalAlignment="Left"
+              <GroupBox Name="groupSmoothingFilter" Header="Smoothing Filter" VerticalAlignment="Bottom" Margin="5,0,0,0" HorizontalAlignment="Left"
                         >
                 <GroupBox.ToolTip>
                   <StackPanel>
@@ -345,7 +414,7 @@
                     Cursor position smoothing filter
                     </TextBlock>
                     <TextBlock>
-                      - Smoothing filter adds latency to the input, so don't enable it if you want to have the lowest possible input lag.
+                      - Smoothing filter adds latency to the input, so don't enable it if you want to have the lowest possible input latency.
                       <LineBreak/>
                       - On Wacom tablets you can use latency value between 15 and 25 to have a similar smoothing as in the Wacom drivers.
                       <LineBreak/>
@@ -373,8 +442,7 @@
                   <!-- Filter Rate -->
                   <GroupBox Header="Rate" VerticalAlignment="Top" HorizontalAlignment="Left" Width="85" Height="50">
                     <ComboBox Name="comboBoxSmoothingRate" SelectionChanged="ItemSelectionChanged" VerticalContentAlignment="Center">
-
-
+                      <ComboBoxItem>1000 Hz</ComboBoxItem>
                       <ComboBoxItem>500 Hz</ComboBoxItem>
                       <ComboBoxItem>333 Hz</ComboBoxItem>
                       <ComboBoxItem Selector.IsSelected="True">250 Hz</ComboBoxItem>
@@ -394,56 +462,70 @@
 
 
 
-
-            </StackPanel>
-
-
-            <!-- Desktop Size -->
-            <StackPanel Orientation="Horizontal"  HorizontalAlignment="Center">
-              <!-- Desktop size -->
-              <GroupBox Name="groupDesktopSize" Header="Desktop Size" VerticalAlignment="Bottom" Margin="5,0,0,0" HorizontalAlignment="Left"
+              <!-- Noise filter -->
+              <GroupBox Name="groupNoiseFilter" Header="Noise Reduction Filter" VerticalAlignment="Bottom" Margin="5,0,0,0" HorizontalAlignment="Left"
                         >
                 <GroupBox.ToolTip>
                   <StackPanel>
                     <TextBlock FontWeight="Bold">
-                    Desktop Size
+                    Pen signal noise reduction filter
                     </TextBlock>
                     <TextBlock>
-                      - In some cases you may have to disable the auto size and manually type in the main monitor resolution.
+                      - It is recommend only to use this filter with older Wacom tablets.
                       <LineBreak/>
-                      - If you don't have problems with screen mapping, leave the automatic desktop size enabled.
+                      - Noise filter adds latency to the input, so don't enable it if you want to have the lowest possible input latency.
+                      <LineBreak/>
+                      - Samples value means how many pen positions will be stored to filter buffer. Lower value means lower latency, but lower noise reduction.
+                      <LineBreak/>
+                      - Threshold value is the limit where the noise reduction will be at maximum strength.
+                      <LineBreak/>
+                      - If the pen position moves suddenly more than this threshold, then noise reduction will be lower.
+                      <LineBreak/>
+                      - Recommended values: samples 5 - 20, threshold 0.5 - 1.0 mm.
+                      <LineBreak/>
+                      - You can try larger filter settings, but at some point the latency will be very noticable.
+                      <LineBreak/>
+                      - If the pen movement is greatly faster than the threshold value then the noise reduction and latency caused by the filter is almost zero. 
                     </TextBlock>
                   </StackPanel>
                 </GroupBox.ToolTip>
+
+
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
 
-                  <!-- Desktop Width -->
-                  <GroupBox Header="Width" Height="50" Width="80" Margin="0,0,0,0">
-                    <Grid>
-                      <TextBox Name="textDesktopWidth" Padding="4,0,0,0"
+                  <!-- Noise filter packets -->
+                  <GroupBox Header="Samples" Height="50" Width="80" Margin="0,0,0,0">
+                      <TextBox Name="textNoiseSamples" Padding="4,0,0,0"
                                HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                               TextChanged="TextChanged">1920</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">px</Label>
-                    </Grid>
+                               TextChanged="TextChanged">10</TextBox>
                   </GroupBox>
 
-                  <!-- Desktop Height -->
-                  <GroupBox Header="Height" Height="50" Width="80" Margin="5,0,0,0">
+                  <!-- Noise filter threshold -->
+                  <GroupBox Header="Threshold" Height="50" Width="80" Margin="0,0,0,0">
                     <Grid>
-                      <TextBox Name="textDesktopHeight" Padding="4,0,0,0"
+                      <TextBox Name="textNoiseThreshold" Padding="4,0,0,0"
                                HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                               TextChanged="TextChanged">1080</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">px</Label>
+                               TextChanged="TextChanged">1.0</TextBox>
+                      <Label Width="30" HorizontalAlignment="Right">mm</Label>
                     </Grid>
                   </GroupBox>
-
-                  <CheckBox Name="checkBoxAutomaticDesktopSize"
-                            VerticalAlignment="Center" Margin="5"
-                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">Auto</CheckBox>
+                  
+                  <!-- Noise filter enabled -->
+                  <CheckBox Name="checkBoxNoiseFilter"
+                            VerticalAlignment="Center"
+                            Margin="5"
+                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">
+                    Enabled
+                  </CheckBox>
                 </StackPanel>
+
+
               </GroupBox>
 
 
+
+
+
             </StackPanel>
 
           </StackPanel>
@@ -510,6 +592,9 @@
                   <MenuItem Name="menuOpenDebug" Header="Open Latest Debug Log" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuRunBenchmark" Header="Run Benchmark" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuCopyBenchmark" Header="Copy Benchmark Result" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuMeasure2" Header="Measure 2 points" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuMeasure3" Header="Measure 3 points" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuMeasure4" Header="Measure 4 points" Click="ConsoleMenuClick"></MenuItem>
                   <Separator/>
                   <MenuItem Name="menuOpenStartup" Header="Open Startup Log" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuOpenFolder" Header="Open TabletDriver Folder" Click="ConsoleMenuClick"></MenuItem>
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 5f4d1bc..5e6a1c3 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -78,6 +78,9 @@ public MouseDrag()
         }
         MouseDrag mouseDrag;
 
+        // Measurement to area
+        private bool isEnabledMeasurementToArea = false;
+
         //
         // Constructor
         //
@@ -109,6 +112,7 @@ public MainWindow()
                 ContextMenu = new System.Windows.Forms.ContextMenu(new System.Windows.Forms.MenuItem[]
                 {
                     new System.Windows.Forms.MenuItem("TabletDriverGUI " + Version),
+                    new System.Windows.Forms.MenuItem("Restart Driver", NotifyRestartDriver),
                     new System.Windows.Forms.MenuItem("Show", NotifyShowWindow),
                     new System.Windows.Forms.MenuItem("Exit", NotifyExit)
                 })
@@ -183,11 +187,11 @@ public MainWindow()
             // Smoothing rate ComboBox
             //
             comboBoxSmoothingRate.Items.Clear();
-            for (int i = 2; i <= 8; i++)
+            for (int i = 1; i <= 8; i++)
             {
                 comboBoxSmoothingRate.Items.Add((1000.0 / i).ToString("0") + " Hz");
             }
-            comboBoxSmoothingRate.SelectedIndex = 2;
+            comboBoxSmoothingRate.SelectedIndex = 3;
 
             // Process command line arguments
             ProcessCommandLineArguments();
@@ -335,6 +339,13 @@ protected override void OnStateChanged(EventArgs e)
             }
         }
 
+
+        // 'Restart driver' handler for taskbar menu
+        void NotifyRestartDriver(object sender, EventArgs e)
+        {
+            RestartDriverClick(sender, null);
+        }
+
         // 'Hide' handler for taskbar menu
         void NotifyHideWindow(object sender, EventArgs e)
         {
@@ -479,7 +490,7 @@ private void LoadSettingsFromConfiguration()
             //
             checkBoxSmoothing.IsChecked = config.SmoothingEnabled;
             textSmoothingLatency.Text = Utils.GetNumberString(config.SmoothingLatency);
-            comboBoxSmoothingRate.SelectedIndex = config.SmoothingInterval - 2;
+            comboBoxSmoothingRate.SelectedIndex = config.SmoothingInterval - 1;
             if (config.SmoothingEnabled)
             {
                 textSmoothingLatency.IsEnabled = true;
@@ -491,6 +502,25 @@ private void LoadSettingsFromConfiguration()
                 comboBoxSmoothingRate.IsEnabled = false;
             }
 
+
+            //
+            // Noise filter
+            //
+            checkBoxNoiseFilter.IsChecked = config.NoiseFilterEnabled;
+            textNoiseSamples.Text = Utils.GetNumberString(config.NoiseFilterSamples);
+            textNoiseThreshold.Text = Utils.GetNumberString(config.NoiseFilterThreshold);
+            if (config.NoiseFilterEnabled)
+            {
+                textNoiseSamples.IsEnabled = true;
+                textNoiseThreshold.IsEnabled = true;
+            }
+            else
+            {
+                textNoiseSamples.IsEnabled = false;
+                textNoiseThreshold.IsEnabled = false;
+            }
+
+
             //
             // Run at startup
             //
@@ -620,9 +650,9 @@ private void UpdateSettingsToConfiguration()
 
 
 
-            // Filter
+            // Smoothing filter
             config.SmoothingEnabled = (bool)checkBoxSmoothing.IsChecked;
-            config.SmoothingInterval = comboBoxSmoothingRate.SelectedIndex + 2;
+            config.SmoothingInterval = comboBoxSmoothingRate.SelectedIndex + 1;
             if (Utils.ParseNumber(textSmoothingLatency.Text, out val))
                 config.SmoothingLatency = val;
 
@@ -637,6 +667,25 @@ private void UpdateSettingsToConfiguration()
                 comboBoxSmoothingRate.IsEnabled = false;
             }
 
+            // Noise filter
+            config.NoiseFilterEnabled = (bool)checkBoxNoiseFilter.IsChecked;
+            if (Utils.ParseNumber(textNoiseSamples.Text, out val))
+                config.NoiseFilterSamples = (int)val;
+            if (Utils.ParseNumber(textNoiseThreshold.Text, out val))
+                config.NoiseFilterThreshold = val;
+            if (config.NoiseFilterEnabled)
+            {
+                textNoiseSamples.IsEnabled = true;
+                textNoiseThreshold.IsEnabled = true;
+            }
+            else
+            {
+                textNoiseSamples.IsEnabled = false;
+                textNoiseThreshold.IsEnabled = false;
+            }
+
+
+
             //
             // Run at startup
             //
@@ -1553,7 +1602,8 @@ private void ParseDriverStatus(string line)
                 if (title.Length > 63)
                 {
                     notifyIcon.Text = title.Substring(0, 63);
-                } else
+                }
+                else
                 {
                     notifyIcon.Text = title;
                 }
@@ -1592,6 +1642,54 @@ private void ParseDriverStatus(string line)
 
                 }
             }
+
+
+            //
+            // Tablet measurement to tablet area
+            //
+            if (variableName == "measurement" && isEnabledMeasurementToArea)
+            {
+                string[] stringValues = stringValue.Split(' ');
+                int valueCount = stringValues.Count();
+                if (valueCount >= 4)
+                {
+                    double minimumX = 10000;
+                    double minimumY = 10000;
+                    double maximumX = -10000;
+                    double maximumY = -10000;
+                    for (int i = 0; i < valueCount; i += 2)
+                    {
+                        if (
+                            Utils.ParseNumber(stringValues[i], out double x)
+                            &&
+                            Utils.ParseNumber(stringValues[i + 1], out double y)
+                        )
+                        {
+                            // Find limits
+                            if (x > maximumX) maximumX = x;
+                            if (x < minimumX) minimumX = x;
+                            if (y > maximumY) maximumY = y;
+                            if (y < minimumY) minimumY = y;
+                        }
+                    }
+                    double areaWidth = maximumX - minimumX;
+                    double areaHeight = maximumY - minimumY;
+                    double centerX = minimumX + areaWidth / 2.0;
+                    double centerY = minimumY + areaHeight / 2.0;
+                    //MessageBox.Show("Area: " + areaWidth + " x " + areaHeight + " @ " + centerX + ", " + centerY);
+                    config.TabletArea.Width = areaWidth;
+                    config.TabletArea.Height = areaHeight;
+                    config.TabletArea.X = centerX;
+                    config.TabletArea.Y = centerY;
+                    LoadSettingsFromConfiguration();
+                    UpdateSettingsToConfiguration();
+
+
+                }
+                isEnabledMeasurementToArea = false;
+                buttonDrawArea.IsEnabled = true;
+                SetStatus("");
+            }
         }
 
         //
@@ -1690,6 +1788,16 @@ private void SendSettingsToDriver()
                 driver.SendCommand("Smoothing 0");
             }
 
+            // Noise filter
+            if (config.NoiseFilterEnabled)
+            {
+                driver.SendCommand("Noise " + Utils.GetNumberString(config.NoiseFilterSamples) + " " + Utils.GetNumberString(config.NoiseFilterThreshold));
+            }
+            else
+            {
+                driver.SendCommand("Noise 0");
+            }
+
             // Commands after settings
             if (config.CommandsAfter.Length > 0)
             {
@@ -1958,7 +2066,7 @@ private void ConsoleMenuClick(object sender, RoutedEventArgs e)
             // Start debug log
             else if (sender == menuStartDebug)
             {
-                string logFilename = "debug_" + DateTime.Now.ToString("yyyy-MM-dd_hh_mm_ss") + ".txt";
+                string logFilename = "debug_" + DateTime.Now.ToString("yyyy-MM-dd_HH_mm_ss") + ".txt";
                 ConsoleSendCommand("log " + logFilename);
                 ConsoleSendCommand("debug 1");
             }
@@ -2024,6 +2132,26 @@ private void ConsoleMenuClick(object sender, RoutedEventArgs e)
                 }
             }
 
+
+            // Measure 2 points
+            else if (sender == menuMeasure2)
+            {
+                ConsoleSendCommand("Measure 2");
+            }
+
+            // Measure 3 points
+            else if (sender == menuMeasure3)
+            {
+                ConsoleSendCommand("Measure 3");
+            }
+
+            // Measure 4 points
+            else if (sender == menuMeasure4)
+            {
+                ConsoleSendCommand("Measure 4");
+            }
+
+
             // Open startup log
             else if (sender == menuOpenStartup)
             {
@@ -2080,7 +2208,7 @@ private void ConsoleMenuClick(object sender, RoutedEventArgs e)
 
 
 
-        #region Wacom
+        #region Wacom / Draw area
 
         //
         // Wacom Area
@@ -2126,6 +2254,21 @@ private void ButtonWacomArea_Click(object sender, RoutedEventArgs e)
             wacom.Close();
         }
 
+
+        //
+        // Draw area
+        //
+        private void ButtonDrawArea_Click(object sender, RoutedEventArgs e)
+        {
+            if (!isEnabledMeasurementToArea)
+            {
+                isEnabledMeasurementToArea = true;
+                driver.SendCommand("Measure 2");
+                SetStatus("Click the top left and the bottom right corners of the area with your tablet pen!");
+                buttonDrawArea.IsEnabled = false;
+            }
+        }
+
         #endregion
 
 
@@ -2165,6 +2308,7 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
         }
 
 
+
         #endregion
 
 
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 3449893..38c67f5 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -638,7 +638,9 @@ bool ProcessCommand(CommandLine *cmd) {
 		LogStatus();
 	}
 
+	//
 	// Benchmark
+	//
 	else if(cmd->is("Benchmark") || cmd->is("Bench")) {
 		if(!CheckTablet()) return true;
 
@@ -654,60 +656,164 @@ bool ProcessCommand(CommandLine *cmd) {
 		if(timeLimit < 1000) timeLimit = 1000;
 
 		// Log
-		LOG_DEBUG("Tablet benchmark starting in 3 seconds!\n");
-		LOG_DEBUG("Keep the pen stationary on top of the tablet!\n");
+		LOG_INFO("Tablet benchmark starting in 3 seconds!\n");
+		LOG_INFO("Keep the pen stationary on top of the tablet!\n");
 		Sleep(3000);
-		LOG_DEBUG("Benchmark started!\n");
+		LOG_INFO("Benchmark started!\n");
 
-		// Benchmark
-		tablet->benchmark.Start(packetCount);
+		// Start measurement
+		tablet->measurement.Start(packetCount);
 
 		// Wait for the benchmark to finish
 		for(int i = 0; i < timeLimit / 100; i++) {
 			Sleep(100);
 
-			// Benchmark result
-			if(tablet->benchmark.packetCounter <= 0) {
+			// Benchmark results
+			if(tablet->measurement.packetCounter <= 0) {
 
-				double width = tablet->benchmark.maxX - tablet->benchmark.minX;
-				double height = tablet->benchmark.maxY - tablet->benchmark.minY;
-				LOG_DEBUG("\n");
-				LOG_DEBUG("Benchmark result (%d positions):\n", tablet->benchmark.totalPackets);
-				LOG_DEBUG("  Tablet: %s\n", tablet->name.c_str());
-				LOG_DEBUG("  Area: %0.2f mm x %0.2f mm (%0.0f px x %0.0f px)\n",
+				double width = tablet->measurement.maximum.x - tablet->measurement.minimum.x;
+				double height = tablet->measurement.maximum.y - tablet->measurement.minimum.y;
+				LOG_INFO("\n");
+				LOG_INFO("Benchmark result (%d positions):\n", tablet->measurement.totalPackets);
+				LOG_INFO("  Tablet: %s\n", tablet->name.c_str());
+				LOG_INFO("  Area: %0.2f mm x %0.2f mm (%0.0f px x %0.0f px)\n",
 					mapper->areaTablet.width,
 					mapper->areaTablet.height,
 					mapper->areaScreen.width,
 					mapper->areaScreen.height
 				);
-				LOG_DEBUG("  X range: %0.3f mm <-> %0.3f mm\n", tablet->benchmark.minX, tablet->benchmark.maxX);
-				LOG_DEBUG("  Y range: %0.3f mm <-> %0.3f mm\n", tablet->benchmark.minY, tablet->benchmark.maxY);
-				LOG_DEBUG("  Width: %0.3f mm (%0.2f px)\n",
+				LOG_INFO("  X range: %0.3f mm <-> %0.3f mm\n", tablet->measurement.minimum.x, tablet->measurement.maximum.x);
+				LOG_INFO("  Y range: %0.3f mm <-> %0.3f mm\n", tablet->measurement.minimum.y, tablet->measurement.maximum.y);
+				LOG_INFO("  Width: %0.3f mm (%0.2f px)\n",
 					width,
 					mapper->areaScreen.width / mapper->areaTablet.width * width
 				);
-				LOG_DEBUG("  Height: %0.3f mm (%0.2f px)\n",
+				LOG_INFO("  Height: %0.3f mm (%0.2f px)\n",
 					height,
 					mapper->areaScreen.height / mapper->areaTablet.height* height
 				);
-				LOG_DEBUG("\n");
-				LOG_STATUS("BENCHMARK %d %0.3f %0.3f %s\n", tablet->benchmark.totalPackets, width, height, tablet->name.c_str());
+				LOG_INFO("\n");
+				LOG_INFO("BENCHMARK %d %0.3f %0.3f %s\n", tablet->measurement.totalPackets, width, height, tablet->name.c_str());
 				break;
 			}
 		}
 
+		// Stop measurement
+		tablet->measurement.Stop();
+
 		// Benchmark failed
-		if(tablet->benchmark.packetCounter > 0) {
+		if(tablet->measurement.packetCounter > 0) {
 			LOG_ERROR("Benchmark failed!\n");
 			LOG_ERROR("Not enough packets captured in %0.2f seconds!\n",
 				timeLimit / 1000.0
 			);
 		}
+	}
+
+
+
+	//
+	// Measurement
+	//
+	else if(cmd->is("Measure")) {
+		if(!CheckTablet()) return true;
+
+		int timeLimit = 30000;
+		int pointCount = cmd->GetInt(0, 1);
+
+		// Limits
+		if(pointCount < 1) pointCount = 1;
+		if(pointCount > 10) pointCount = 10;
+
+		// Log
+		LOG_INFO("Measurement started!\n");
+
+		// Start measurement
+		tablet->measurement.Start();
+
+		// Wait for the measurement to finish
+		for(int i = 0; i < timeLimit / 100; i++) {
+			Sleep(100);
+
+			// Result
+			if(tablet->measurement.pointCount >= pointCount) {
+				double distance = 0;
+				double lastX = 0;
+				double lastY = 0;
+				Vector2D point, lastPoint;
+				Vector2D minimum;
+				Vector2D maximum;
+
+				minimum.Set(10000, 10000);
+				maximum.Set(-10000, -10000);
+
+				LOG_INFO("\n");
+				LOG_INFO("Measurement results:\n");
+				for(int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
+
+					point.Set(tablet->measurement.points[pointIndex]);
+
+					// Limits
+					if(point.x < minimum.x) minimum.x = point.x;
+					if(point.x > maximum.x) maximum.x = point.x;
+					if(point.y < minimum.y) minimum.y = point.y;
+					if(point.y > maximum.y) maximum.y = point.y;
+
+					LOG_INFO(
+						"  #%d: X = %0.2f mm, Y = %0.2f mm\n",
+						pointIndex + 1,
+						point.x,
+						point.y
+					);
+
+					// Distance calculation
+					if(pointIndex > 0) {
+						distance += point.Distance(lastPoint);
+					}
+					lastPoint.Set(point);
+
+				}
+				if(tablet->measurement.pointCount > 1) {
+					LOG_INFO("  Distance: %0.2f mm\n", distance);
+					LOG_INFO("  Maximum area: %0.2f mm x %0.2f mm\n",
+						maximum.x - minimum.x, maximum.y - minimum.y
+					);
+				}
+
+				// Status message
+				char pointString[1024];
+				char pointStringIndex = 0;
+
+				// Build point string
+				for(int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
+					point.Set(tablet->measurement.points[pointIndex]);
+					pointStringIndex += sprintf_s(pointString + pointStringIndex, 1024 - pointStringIndex, "%0.3f %0.3f ", point.x, point.y);
+				}
+
+				// Output measurement results
+				LOG_STATUS("MEASUREMENT %s\n", pointString);
+
+				LOG_INFO("\n");
+
+				break;
+			}
+		}
+
+		// Stop measurement
+		tablet->measurement.Stop();
+
+		// Measurement failed
+		if(tablet->measurement.pointCount < pointCount) {
+			LOG_ERROR("Measurement failed! No enough points detected in %0.0f seconds!\n", timeLimit / 1000.0);
+			LOG_STATUS("MEASUREMENT 0\n");
+		}
 
 
 	}
 
 
+
+
 	// Include
 	else if(cmd->is("Include")) {
 		string filename = cmd->GetString(0, "");
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 03490ac..6173e9c 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -65,6 +65,7 @@ Tablet::Tablet() {
 	buttonMap[1] = 2;
 	buttonMap[2] = 3;
 
+
 	// Tablet connection open
 	isOpen = false;
 
@@ -284,8 +285,12 @@ int Tablet::ReadPosition() {
 	}
 	state.pressure = ((double)reportData.pressure / (double)settings.maxPressure);
 
-	// Tablet benchmark update
-	benchmark.Update(state.position);
+	// Tablet measurement update
+	if(measurement.isRunning) {
+		state.buttons = reportData.buttons & 0x0F;
+		measurement.Update(state);
+		return Tablet::PacketInvalid;
+	}
 
 	// Packet and position is valid
 	return Tablet::PacketValid;
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index bad3387..b9b2988 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -9,7 +9,7 @@
 #include "TabletFilterSmoothing.h"
 #include "TabletFilterNoiseReduction.h"
 #include "TabletFilterPeak.h"
-#include "TabletBenchmark.h"
+#include "TabletMeasurement.h"
 #include "Vector2D.h"
 
 using namespace std;
@@ -74,8 +74,8 @@ class Tablet {
 	TabletFilter *filterPacket[10];
 	int filterPacketCount;
 
-	// Benchmark
-	TabletBenchmark benchmark;
+	// Measurement
+	TabletMeasurement measurement;
 
 	// Button map
 	BYTE buttonMap[16];
diff --git a/TabletDriverService/TabletBenchmark.cpp b/TabletDriverService/TabletBenchmark.cpp
deleted file mode 100644
index 1108c4a..0000000
--- a/TabletDriverService/TabletBenchmark.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "stdafx.h"
-#include "TabletBenchmark.h"
-
-//
-// Constructor
-//
-TabletBenchmark::TabletBenchmark() {
-	maxX = 0;
-	minX = 0;
-	maxY = 0;
-	minY = 0;
-	totalPackets = 0;
-	packetCounter = 0;
-}
-
-//
-// Destructor
-//
-TabletBenchmark::~TabletBenchmark() {
-}
-
-
-//
-// Start tablet benchmark
-//
-void TabletBenchmark::Start(int packetCount) {
-	maxX = -10000;
-	maxY = -10000;
-	minX = 10000;
-	minY = 10000;
-	totalPackets = packetCount;
-	packetCounter = packetCount;
-	isRunning = true;
-}
-
-void TabletBenchmark::Update(Vector2D position) {
-	if(isRunning) {
-		if(packetCounter > 0) {
-			if(position.x < minX) minX = position.x;
-			if(position.x > maxX) maxX = position.x;
-			if(position.y < minY) minY = position.y;
-			if(position.y > maxY) maxY = position.y;
-			packetCounter--;
-		} else {
-			isRunning = false;
-		}
-	}
-}
\ No newline at end of file
diff --git a/TabletDriverService/TabletBenchmark.h b/TabletDriverService/TabletBenchmark.h
deleted file mode 100644
index 500da44..0000000
--- a/TabletDriverService/TabletBenchmark.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "Vector2D.h"
-
-class TabletBenchmark {
-public:
-	double minX;
-	double maxX;
-	double minY;
-	double maxY;
-	int totalPackets;
-	int packetCounter;
-	bool isRunning;
-
-	TabletBenchmark();
-	~TabletBenchmark();
-	void Start(int packetCount);
-	void Update(Vector2D position);
-};
-
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index d5837a8..f43166b 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -185,7 +185,7 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClInclude Include="ScreenMapper.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="Tablet.h" />
-    <ClInclude Include="TabletBenchmark.h" />
+    <ClInclude Include="TabletMeasurement.h" />
     <ClInclude Include="TabletFilter.h" />
     <ClInclude Include="TabletFilterNoiseReduction.h" />
     <ClInclude Include="TabletFilterPeak.h" />
@@ -214,7 +214,7 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClCompile Include="RelativeMouseState.cpp" />
     <ClCompile Include="ScreenMapper.cpp" />
     <ClCompile Include="Tablet.cpp" />
-    <ClCompile Include="TabletBenchmark.cpp" />
+    <ClCompile Include="TabletMeasurement.cpp" />
     <ClCompile Include="TabletFilter.cpp" />
     <ClCompile Include="TabletFilterNoiseReduction.cpp" />
     <ClCompile Include="TabletFilterPeak.cpp" />
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index 00b377d..f1dd940 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -45,9 +45,6 @@
     <ClInclude Include="ProcessCommand.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TabletBenchmark.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Vector2D.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -99,6 +96,9 @@
     <ClInclude Include="OutputVMultiAbsoluteV2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="TabletMeasurement.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -131,9 +131,6 @@
     <ClCompile Include="ProcessCommand.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="TabletBenchmark.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Vector2D.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -185,6 +182,9 @@
     <ClCompile Include="OutputVMultiAbsoluteV2.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="TabletMeasurement.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">
diff --git a/TabletDriverService/TabletFilterNoiseReduction.cpp b/TabletDriverService/TabletFilterNoiseReduction.cpp
index 9d3cb10..be8f11b 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.cpp
+++ b/TabletDriverService/TabletFilterNoiseReduction.cpp
@@ -2,6 +2,10 @@
 #include "TabletFilterNoiseReduction.h"
 
 
+#define LOG_MODULE "Noise"
+#include "Logger.h"
+
+
 //
 // Constructor
 //
@@ -22,7 +26,7 @@ TabletFilterNoiseReduction::~TabletFilterNoiseReduction() {
 
 // Set target position
 void TabletFilterNoiseReduction::SetTarget(Vector2D targetVector) {
-	lastTarget.Set(targetVector);
+	latestTarget.Set(targetVector);
 	buffer.Add(targetVector);
 }
 
@@ -52,14 +56,59 @@ void TabletFilterNoiseReduction::Update() {
 	// Calculate geometric median from the buffer positions
 	GetGeometricMedianVector(&position, iterations);
 
-	// Reset the buffer when distance to last target position is larger than the threshold
+	// Reset the buffer when distance to latest target position is larger than the threshold
 	if(buffer.isValid) {
-		double distance = lastTarget.Distance(position);
+
+		// Distance between latest position and ring buffer geometric median
+		double distance = latestTarget.Distance(position);
+
+		// Distance larger than threshold -> modify the ring buffer
 		if(distance > distanceThreshold) {
-			buffer.Reset();
-			position.Set(lastTarget);
+
+			// Distance factor
+			double distanceFactor = 1;
+			if(distanceThreshold > 0) {
+				distanceFactor = distance / distanceThreshold;
+			}
+
+			// Buffer fill count (distance 10 times larger than threshold -> fill whole buffer)
+			int fillCount = (int)(distanceFactor * 0.1 * buffer.length);
+			if(fillCount > buffer.length) fillCount = buffer.length;
+
+			// Fill part of the ring buffer with the latest position
+			for(int i = 0; i < fillCount; i++) {
+				buffer.Add(latestTarget);
+			}
+
+			// Debug
+			if(tablet->debugEnabled) {
+				LOG_DEBUG("Noise distance threshold! D:%0.2f Fa:%0.2f Fi:%d\n", distance, distanceFactor, fillCount);
+			}
+
+
+			// Max fill -> set the position to latest target position
+			if(fillCount >= buffer.length) {
+				position.Set(latestTarget);
+
+			// Calculate a new geometric median
+			} else {
+				GetGeometricMedianVector(&position, iterations);
+			}
+
 		}
 	}
+
+	// Debug
+	if(tablet->debugEnabled) {
+		LOG_DEBUG("Noise: B:%d T:%0.2f,%0.2f O:%0.2f,%0.2f D:%0.2f\n",
+			buffer.count,
+			latestTarget.x, latestTarget.y,
+			position.x, position.y,
+			position.Distance(latestTarget)
+		);
+	}
+
+
 }
 
 //
diff --git a/TabletDriverService/TabletFilterNoiseReduction.h b/TabletDriverService/TabletFilterNoiseReduction.h
index 1d725a8..06467e5 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.h
+++ b/TabletDriverService/TabletFilterNoiseReduction.h
@@ -7,7 +7,7 @@ class TabletFilterNoiseReduction : public TabletFilter {
 
 	PositionRingBuffer buffer;
 	Vector2D position;
-	Vector2D lastTarget;
+	Vector2D latestTarget;
 
 	int iterations;
 	double distanceThreshold;
diff --git a/TabletDriverService/TabletMeasurement.cpp b/TabletDriverService/TabletMeasurement.cpp
new file mode 100644
index 0000000..8a3aef7
--- /dev/null
+++ b/TabletDriverService/TabletMeasurement.cpp
@@ -0,0 +1,103 @@
+#include "stdafx.h"
+#include "TabletMeasurement.h"
+
+#define LOG_MODULE "Measurement"
+#include "Logger.h"
+
+//
+// Constructor
+//
+TabletMeasurement::TabletMeasurement() {
+	minimum.Set(0, 0);
+	maximum.Set(0, 0);
+	pointCount = 0;
+	totalPackets = 0;
+	packetCounter = 0;
+	lastState.buttons = 0;
+	lastState.isValid = false;
+}
+
+//
+// Destructor
+//
+TabletMeasurement::~TabletMeasurement() {
+}
+
+
+//
+// Start measurement
+//
+void TabletMeasurement::Start() {
+	Start(-1);
+}
+
+//
+// Start measurement
+//
+void TabletMeasurement::Start(int packetCount) {
+
+	// Limits
+	minimum.Set(10000, 10000);
+	maximum.Set(-10000, -10000);
+
+	pointCount = 0;
+	totalPackets = packetCount;
+	packetCounter = packetCount;
+
+	// Last tablet state
+	lastState.buttons = 0;
+	lastState.isValid = false;
+
+	lastPointTime = 0;
+
+	isRunning = true;
+}
+
+//
+// Stop measurement
+//
+void TabletMeasurement::Stop() {
+	isRunning = false;
+}
+
+
+//
+// Update measurement 
+//
+void TabletMeasurement::Update(TabletState state) {
+
+	DWORD time;
+	
+
+	if(isRunning) {
+		if(packetCounter > 0 || packetCounter <= -1) {
+
+			// X Limits
+			if(state.position.x < minimum.x) minimum.x = state.position.x;
+			else if(state.position.x > maximum.x) maximum.x = state.position.x;
+
+			// Y Limits
+			if(state.position.y < minimum.y) minimum.y = state.position.y;
+			else if(state.position.y > maximum.y) maximum.y = state.position.y;
+
+			// Detect pen tip release
+			if((state.buttons & 0x01) == 0 && lastState.isValid && (lastState.buttons & 0x01) == 1 && pointCount < 10) {
+
+				time = GetTickCount();
+
+				// Pen tip debounce (100 ms)
+				if(time - lastPointTime > 100) {
+					lastPointTime = time;
+					points[pointCount].Set(state.position);
+					pointCount++;
+				}
+			}
+
+			lastState.buttons = state.buttons;
+			lastState.isValid = true;
+			packetCounter--;
+		} else {
+			isRunning = false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/TabletDriverService/TabletMeasurement.h b/TabletDriverService/TabletMeasurement.h
new file mode 100644
index 0000000..9b4557c
--- /dev/null
+++ b/TabletDriverService/TabletMeasurement.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "Vector2D.h"
+#include "TabletState.h"
+
+class TabletMeasurement {
+public:
+	Vector2D minimum;
+	Vector2D maximum;
+	Vector2D points[10];
+	int pointCount;
+
+	int totalPackets;
+	int packetCounter;
+	bool isRunning;
+
+	TabletState lastState;
+	DWORD lastPointTime;
+
+
+	TabletMeasurement();
+	~TabletMeasurement();
+	void Start();
+	void Start(int packetCount);
+	void Stop();
+	void Update(TabletState state);
+};
+

From 9aaba9992052e2bc265bde04b69d21e7a69853c5 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Tue, 27 Nov 2018 22:57:13 +0200
Subject: [PATCH 35/83] Removed broken and unused code

---
 TabletDriverService/TabletFilterSmoothing.cpp | 11 -----------
 TabletDriverService/TabletFilterSmoothing.h   |  1 -
 2 files changed, 12 deletions(-)

diff --git a/TabletDriverService/TabletFilterSmoothing.cpp b/TabletDriverService/TabletFilterSmoothing.cpp
index c95d53b..febe740 100644
--- a/TabletDriverService/TabletFilterSmoothing.cpp
+++ b/TabletDriverService/TabletFilterSmoothing.cpp
@@ -63,17 +63,6 @@ void TabletFilterSmoothing::Update() {
 
 }
 
-
-
-
-
-// Set position
-double TabletFilterSmoothing::SetPosition(double x, double y) {
-	this->position.x = x;
-	this->position.y = y;
-}
-
-
 //
 // Calculate filter latency
 //
diff --git a/TabletDriverService/TabletFilterSmoothing.h b/TabletDriverService/TabletFilterSmoothing.h
index 88b4a4e..a55d176 100644
--- a/TabletDriverService/TabletFilterSmoothing.h
+++ b/TabletDriverService/TabletFilterSmoothing.h
@@ -19,7 +19,6 @@ class TabletFilterSmoothing : public TabletFilter {
 	bool GetPosition(Vector2D *outputVector);
 	void Update();
 
-	double SetPosition(double x, double y);
 	double GetLatency(double filterWeight, double interval, double threshold);
 	double GetLatency(double filterWeight);
 	double GetLatency();

From 7a89ecfae49cb82dd79eeb31fa9e418dcfa03c46 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Wed, 28 Nov 2018 12:47:11 +0200
Subject: [PATCH 36/83] Fixed invalid cursor movements when changing modes

---
 TabletDriverService/OutputVMultiAbsolute.cpp   | 3 +++
 TabletDriverService/OutputVMultiAbsoluteV2.cpp | 2 ++
 TabletDriverService/OutputVMultiDigitizer.cpp  | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/TabletDriverService/OutputVMultiAbsolute.cpp b/TabletDriverService/OutputVMultiAbsolute.cpp
index ab646f8..1746742 100644
--- a/TabletDriverService/OutputVMultiAbsolute.cpp
+++ b/TabletDriverService/OutputVMultiAbsolute.cpp
@@ -34,6 +34,7 @@ bool OutputVMultiAbsolute::Set(unsigned char buttons, double x, double y, double
 	report.buttons = buttons;
 	report.x = (USHORT)round(x * 32767.0);
 	report.y = (USHORT)round(y * 32767.0);
+	report.wheel = 0;
 	vmulti->SetReport(&report, sizeof(report));
 
 	if(debugEnabled) {
@@ -63,6 +64,8 @@ bool OutputVMultiAbsolute::Write() {
 bool OutputVMultiAbsolute::Reset() {
 	report.buttons = 0;
 	report.wheel = 0;
+	report.x = 0;
+	report.y = 0;
 	vmulti->SetReport(&report, sizeof(report));
 	vmulti->WriteReport();
 	return true;
diff --git a/TabletDriverService/OutputVMultiAbsoluteV2.cpp b/TabletDriverService/OutputVMultiAbsoluteV2.cpp
index 5075c82..7a45c01 100644
--- a/TabletDriverService/OutputVMultiAbsoluteV2.cpp
+++ b/TabletDriverService/OutputVMultiAbsoluteV2.cpp
@@ -63,6 +63,8 @@ bool OutputVMultiAbsoluteV2::Write() {
 bool OutputVMultiAbsoluteV2::Reset() {
 	report.buttons = 0;
 	report.pressure = 0;
+	report.x = 0;
+	report.y = 0;
 	vmulti->SetReport(&report, sizeof(report));
 	vmulti->WriteReport();
 	return true;
diff --git a/TabletDriverService/OutputVMultiDigitizer.cpp b/TabletDriverService/OutputVMultiDigitizer.cpp
index 0e8719d..ccb8ad4 100644
--- a/TabletDriverService/OutputVMultiDigitizer.cpp
+++ b/TabletDriverService/OutputVMultiDigitizer.cpp
@@ -65,6 +65,8 @@ bool OutputVMultiDigitizer::Write() {
 bool OutputVMultiDigitizer::Reset() {
 	report.buttons = 0;
 	report.pressure = 0;
+	report.x = 0;
+	report.y = 0;
 	vmulti->SetReport(&report, sizeof(report));
 	vmulti->WriteReport();
 	return true;

From bf84802eae3b184f758e0dceeb70c0b5c31e09c9 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Thu, 29 Nov 2018 21:12:34 +0200
Subject: [PATCH 37/83] Noise filter improvements and some code refactoring

Transition from filtered output to zero latency output should be now much smoother.
---
 TabletDriverGUI/MainWindow.xaml               |  4 +-
 TabletDriverGUI/MainWindow.xaml.cs            |  4 +-
 TabletDriverService/Main.cpp                  | 22 ++---
 TabletDriverService/PositionRingBuffer.cpp    |  9 ++
 TabletDriverService/PositionRingBuffer.h      |  1 +
 TabletDriverService/ProcessCommand.cpp        | 60 ++++++++----
 TabletDriverService/Tablet.cpp                | 36 ++++----
 TabletDriverService/Tablet.h                  | 20 ++--
 .../TabletFilterNoiseReduction.cpp            | 92 +++++++++++++------
 .../TabletFilterNoiseReduction.h              | 10 ++
 TabletDriverService/TabletMeasurement.cpp     | 14 +--
 TabletDriverService/TabletMeasurement.h       |  6 +-
 TabletDriverService/Vector2D.cpp              |  8 ++
 TabletDriverService/Vector2D.h                |  2 +-
 TabletDriverService/config/tablet.cfg         |  4 +-
 15 files changed, 190 insertions(+), 102 deletions(-)

diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 83fe94c..5b1f491 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -481,7 +481,7 @@
                       <LineBreak/>
                       - If the pen position moves suddenly more than this threshold, then noise reduction will be lower.
                       <LineBreak/>
-                      - Recommended values: samples 5 - 20, threshold 0.5 - 1.0 mm.
+                      - Recommended values: samples 5 - 20, threshold 0.2 - 1.0 mm.
                       <LineBreak/>
                       - You can try larger filter settings, but at some point the latency will be very noticable.
                       <LineBreak/>
@@ -493,7 +493,7 @@
 
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
 
-                  <!-- Noise filter packets -->
+                  <!-- Noise filter samples -->
                   <GroupBox Header="Samples" Height="50" Width="80" Margin="0,0,0,0">
                       <TextBox Name="textNoiseSamples" Padding="4,0,0,0"
                                HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 5e6a1c3..9514412 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -2115,13 +2115,13 @@ private void ConsoleMenuClick(object sender, RoutedEventArgs e)
                     if (m.Success)
                     {
                         string tabletName = m.Groups[4].ToString();
-                        string totalPackets = m.Groups[1].ToString();
+                        string totalReports = m.Groups[1].ToString();
                         string noiseWidth = m.Groups[2].ToString();
                         string noiseHeight = m.Groups[3].ToString();
                         clipboard =
                             "Tablet(" + tabletName + ") " +
                             "Noise(" + noiseWidth + " mm x " + noiseHeight + " mm) " +
-                            "Packets(" + totalPackets + ")\r\n";
+                            "Reports(" + totalReports + ")\r\n";
                     }
                 }
 
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index 66c9f95..4ae4fb9 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -65,15 +65,15 @@ void RunTabletThread() {
 		status = tablet->ReadPosition();
 
 		// Position OK
-		if(status == Tablet::PacketValid) {
+		if(status == Tablet::ReportValid) {
 			isResent = false;
 
-		// Invalid packet id
-		} else if(status == Tablet::PacketInvalid) {
+		// Invalid report id
+		} else if(status == Tablet::ReportInvalid) {
 			continue;
 
-		// Valid packet but position is not in-range or invalid
-		} else if(status == Tablet::PacketPositionInvalid) {
+		// Valid report but position is not in-range or invalid
+		} else if(status == Tablet::ReportPositionInvalid) {
 			if(!isResent && tablet->state.isValid) {
 				isResent = true;
 				tablet->state.isValid = false;
@@ -109,21 +109,21 @@ void RunTabletThread() {
 
 
 		// Set output values
-		if(status == Tablet::PacketPositionInvalid) {
+		if(status == Tablet::ReportPositionInvalid) {
 			tablet->state.buttons = 0;
 		}
 
 		//
-		// Packet filters
+		// Report filters
 		//
 		// Is there any filters?
-		if(tablet->filterPacketCount > 0) {
+		if(tablet->filterReportCount > 0) {
 
 			// Loop through filters
-			for(int filterIndex = 0; filterIndex < tablet->filterPacketCount; filterIndex++) {
+			for(int filterIndex = 0; filterIndex < tablet->filterReportCount; filterIndex++) {
 
 				// Filter
-				filter = tablet->filterPacket[filterIndex];
+				filter = tablet->filterReport[filterIndex];
 
 				// Enabled?
 				if(filter != NULL && filter->isEnabled) {
@@ -358,7 +358,7 @@ int main(int argc, char**argv) {
 				running = true;
 
 				// Timed filter timer
-				if(tablet->filterPacketCount > 0) {
+				if(tablet->filterReportCount > 0) {
 					tablet->filterTimed[0]->callback = FilterTimerCallback;
 					tablet->filterTimed[0]->StartTimer();
 				}
diff --git a/TabletDriverService/PositionRingBuffer.cpp b/TabletDriverService/PositionRingBuffer.cpp
index 7a5acbb..c3ecfa2 100644
--- a/TabletDriverService/PositionRingBuffer.cpp
+++ b/TabletDriverService/PositionRingBuffer.cpp
@@ -50,6 +50,15 @@ void PositionRingBuffer::Add(Vector2D vector) {
 	isValid = true;
 }
 
+//
+// Move buffer positions towards a target with linear interpolation
+//
+void PositionRingBuffer::LerpAdd(Vector2D target, double t) {
+	for(int i = 0; i < count; i++) {
+		buffer[i].LerpAdd(target, t);
+	}
+}
+
 
 //
 // Get position history from the buffer
diff --git a/TabletDriverService/PositionRingBuffer.h b/TabletDriverService/PositionRingBuffer.h
index f41fe42..8cb3ef5 100644
--- a/TabletDriverService/PositionRingBuffer.h
+++ b/TabletDriverService/PositionRingBuffer.h
@@ -13,6 +13,7 @@ class PositionRingBuffer {
 
 	void SetLength(int length);
 	void Add(Vector2D vector);
+	void LerpAdd(Vector2D target, double t);
 	bool GetLatest(Vector2D *output, int delta);
 	void Reset();
 
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 38c67f5..e4a934e 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -186,7 +186,7 @@ bool ProcessCommand(CommandLine *cmd) {
 	else if(cmd->is("KeepTipDown")) {
 		if(tablet == NULL) return false;
 		tablet->settings.keepTipDown = cmd->GetInt(0, tablet->settings.keepTipDown);
-		LOG_INFO("Tablet pen tip keep down = %d packets\n", tablet->settings.keepTipDown);
+		LOG_INFO("Tablet pen tip keep down = %d reports\n", tablet->settings.keepTipDown);
 	}
 
 
@@ -543,32 +543,51 @@ bool ProcessCommand(CommandLine *cmd) {
 			tablet->noise.isEnabled = false;
 			LOG_INFO("Noise Reduction = off\n");
 
-		// Set parameters
+		// Enable
 		} else {
 
+			// Position buffer length
 			int length = cmd->GetInt(0, tablet->noise.buffer.length);
+
+			// Threshold where the noise filter starts to reduce the amount of filtering.
 			double distanceThreshold = cmd->GetDouble(1, tablet->noise.distanceThreshold);
-			int iterations = cmd->GetInt(2, tablet->noise.iterations);
+
+			// Distance where the amount of filtering will be zero. Default maximum is 2 times the threshold.
+			double distanceMaximum = cmd->GetDouble(2, distanceThreshold * 2.0);
+
+			// Geometric median calculation iteration count
+			int iterations = cmd->GetInt(3, tablet->noise.iterations);
 
 			// Limits
 			if(length < 0) length = 0;
 			else if(length > 50) length = 50;
 
-			if(distanceThreshold < 0) distanceThreshold = 0;
-			else if(distanceThreshold > 100) distanceThreshold = 100;
+			if(distanceThreshold < 0.0) distanceThreshold = 0.0;
+			else if(distanceThreshold > 1000) distanceThreshold = 1000;
+
+			if(distanceMaximum < 0.1) distanceMaximum = 0.1;
+			else if(distanceMaximum > 1000) distanceMaximum = 1000;
+
+			if(distanceThreshold > distanceMaximum) distanceThreshold = distanceMaximum;
 
 			if(iterations < 1) iterations = 1;
 			else if(iterations > 100) iterations = 100;
 
-			// Set
+			// Set noise filter values
 			tablet->noise.buffer.SetLength(length);
 			tablet->noise.distanceThreshold = distanceThreshold;
+			tablet->noise.distanceMaximum = distanceMaximum;
 			tablet->noise.iterations = iterations;
 
 			// Enable filter
 			if(tablet->noise.buffer.length > 0) {
 				tablet->noise.isEnabled = true;
-				LOG_INFO("Noise Reduction = %d packets, %0.3f mm threshold, %d iterations\n", length, distanceThreshold, iterations);
+				LOG_INFO("Noise Reduction = [\n");
+				LOG_INFO("  %d samples\n", length);
+				LOG_INFO("  %0.2f mm threshold (Wacom %0.2f mm/s)\n", distanceThreshold, distanceThreshold * 133.0);
+				LOG_INFO("  %0.2f mm maximum (Wacom %0.2f mm/s)\n", distanceMaximum, distanceMaximum * 133.0);
+				LOG_INFO("  %d iterations\n", iterations);
+				LOG_INFO("]\n");
 			} else {
 				tablet->noise.isEnabled = false;
 				LOG_INFO("Noise Reduction = off\n");
@@ -645,14 +664,14 @@ bool ProcessCommand(CommandLine *cmd) {
 		if(!CheckTablet()) return true;
 
 		int timeLimit;
-		int packetCount = cmd->GetInt(0, 200);
+		int reportCount = cmd->GetInt(0, 200);
 
-		// Limit packet count
-		if(packetCount < 10) packetCount = 10;
-		if(packetCount > 1000) packetCount = 1000;
+		// Limit report count
+		if(reportCount < 10) reportCount = 10;
+		if(reportCount > 1000) reportCount = 1000;
 
 		// Time limit
-		timeLimit = packetCount * 10;
+		timeLimit = reportCount * 10;
 		if(timeLimit < 1000) timeLimit = 1000;
 
 		// Log
@@ -662,19 +681,19 @@ bool ProcessCommand(CommandLine *cmd) {
 		LOG_INFO("Benchmark started!\n");
 
 		// Start measurement
-		tablet->measurement.Start(packetCount);
+		tablet->measurement.Start(reportCount);
 
 		// Wait for the benchmark to finish
 		for(int i = 0; i < timeLimit / 100; i++) {
 			Sleep(100);
 
 			// Benchmark results
-			if(tablet->measurement.packetCounter <= 0) {
+			if(tablet->measurement.reportCounter <= 0) {
 
 				double width = tablet->measurement.maximum.x - tablet->measurement.minimum.x;
 				double height = tablet->measurement.maximum.y - tablet->measurement.minimum.y;
 				LOG_INFO("\n");
-				LOG_INFO("Benchmark result (%d positions):\n", tablet->measurement.totalPackets);
+				LOG_INFO("Benchmark result (%d positions):\n", tablet->measurement.totalReports);
 				LOG_INFO("  Tablet: %s\n", tablet->name.c_str());
 				LOG_INFO("  Area: %0.2f mm x %0.2f mm (%0.0f px x %0.0f px)\n",
 					mapper->areaTablet.width,
@@ -692,8 +711,11 @@ bool ProcessCommand(CommandLine *cmd) {
 					height,
 					mapper->areaScreen.height / mapper->areaTablet.height* height
 				);
+				LOG_INFO("  Noise filter threshold: %0.2f mm\n", sqrt(width * width + height * height));
+
+
 				LOG_INFO("\n");
-				LOG_INFO("BENCHMARK %d %0.3f %0.3f %s\n", tablet->measurement.totalPackets, width, height, tablet->name.c_str());
+				LOG_STATUS("BENCHMARK %d %0.3f %0.3f %s\n", tablet->measurement.totalReports, width, height, tablet->name.c_str());
 				break;
 			}
 		}
@@ -702,9 +724,9 @@ bool ProcessCommand(CommandLine *cmd) {
 		tablet->measurement.Stop();
 
 		// Benchmark failed
-		if(tablet->measurement.packetCounter > 0) {
+		if(tablet->measurement.reportCounter > 0) {
 			LOG_ERROR("Benchmark failed!\n");
-			LOG_ERROR("Not enough packets captured in %0.2f seconds!\n",
+			LOG_ERROR("Not enough reports captured in %0.2f seconds!\n",
 				timeLimit / 1000.0
 			);
 		}
@@ -905,7 +927,7 @@ void LogInformation() {
 	LOG_INFO("  Max Y = %d\n", tablet->settings.maxY);
 	LOG_INFO("  Max Pressure = %d\n", tablet->settings.maxPressure);
 	LOG_INFO("  Click Pressure = %d\n", tablet->settings.clickPressure);
-	LOG_INFO("  Keep Tip Down = %d packets\n", tablet->settings.keepTipDown);
+	LOG_INFO("  Keep Tip Down = %d reports\n", tablet->settings.keepTipDown);
 	LOG_INFO("  Report Id = %02X\n", tablet->settings.reportId);
 	LOG_INFO("  Report Length = %d bytes\n", tablet->settings.reportLength);
 	LOG_INFO("  Detect Mask = 0x%02X\n", tablet->settings.detectMask);
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 6173e9c..5c6d15f 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -53,9 +53,9 @@ Tablet::Tablet() {
 	// Filters
 	filterTimed[0] = &smoothing;
 	filterTimedCount = 1;
-	filterPacket[0] = &noise;
-	//filterPacket[1] = &peak;
-	filterPacketCount = 1;
+	filterReport[0] = &noise;
+	//filterReport[1] = &peak;
+	filterReportCount = 1;
 
 	peak.isEnabled = true;
 
@@ -72,10 +72,10 @@ Tablet::Tablet() {
 	// Debug output
 	debugEnabled = false;
 
-	// Skip first packets, some of those might be invalid.
-	skipPackets = 5;
+	// Skip first reports, some of those might be invalid.
+	skipReports = 5;
 
-	// Keep tip down packet counter
+	// Keep tip down report counter
 	tipDownCounter = 0;
 
 }
@@ -168,10 +168,10 @@ int Tablet::ReadPosition() {
 		return -1;
 	}
 
-	// Skip packets
-	if(skipPackets > 0) {
-		skipPackets--;
-		return Tablet::PacketInvalid;
+	// Skip reports
+	if(skipReports > 0) {
+		skipReports--;
+		return Tablet::ReportInvalid;
 	}
 
 
@@ -217,21 +217,21 @@ int Tablet::ReadPosition() {
 	}
 
 
-	// Validate packet id
+	// Validate report id
 	if(settings.reportId > 0 && reportData.reportId != settings.reportId) {
-		return Tablet::PacketInvalid;
+		return Tablet::ReportInvalid;
 	}
 
 
 
 	// Detect mask
 	if(settings.detectMask > 0 && (reportData.buttons & settings.detectMask) != settings.detectMask) {
-		return Tablet::PacketPositionInvalid;
+		return Tablet::ReportPositionInvalid;
 	}
 
 	// Ignore mask
 	if(settings.ignoreMask > 0 && (reportData.buttons & settings.ignoreMask) == settings.ignoreMask) {
-		return Tablet::PacketPositionInvalid;
+		return Tablet::ReportPositionInvalid;
 	}
 
 	//
@@ -248,7 +248,7 @@ int Tablet::ReadPosition() {
 		reportData.buttons |= 1;
 	}
 
-	// Keep pen tip button down for a few packets
+	// Keep pen tip button down for a few reports
 	if(settings.keepTipDown > 0) {
 		if(reportData.buttons & 0x01) {
 			tipDownCounter = settings.keepTipDown;
@@ -289,11 +289,11 @@ int Tablet::ReadPosition() {
 	if(measurement.isRunning) {
 		state.buttons = reportData.buttons & 0x0F;
 		measurement.Update(state);
-		return Tablet::PacketInvalid;
+		return Tablet::ReportInvalid;
 	}
 
-	// Packet and position is valid
-	return Tablet::PacketValid;
+	// Report and position is valid
+	return Tablet::ReportValid;
 }
 
 
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index b9b2988..3497631 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -30,11 +30,11 @@ class Tablet {
 		Button5, Button6, Button7, Button8
 	};
 
-	// Tablet packet state
-	enum TabletPacketState {
-		PacketPositionInvalid = 0,
-		PacketValid = 1,
-		PacketInvalid = 2
+	// Tablet report state
+	enum TabletReportState {
+		ReportPositionInvalid = 0,
+		ReportValid = 1,
+		ReportInvalid = 2
 	};
 
 	//
@@ -66,13 +66,13 @@ class Tablet {
 	// Peak filter
 	TabletFilterPeak peak;
 
-	// Timed filter
+	// Timed filters
 	TabletFilter *filterTimed[10];
 	int filterTimedCount;
 
-	// Packet filter
-	TabletFilter *filterPacket[10];
-	int filterPacketCount;
+	// Report filters
+	TabletFilter *filterReport[10];
+	int filterReportCount;
 
 	// Measurement
 	TabletMeasurement measurement;
@@ -84,7 +84,7 @@ class Tablet {
 	string name = "Unknown";
 	bool isOpen;
 	bool debugEnabled;
-	int skipPackets;
+	int skipReports;
 
 	// Pen tip button keep down
 	int tipDownCounter;
diff --git a/TabletDriverService/TabletFilterNoiseReduction.cpp b/TabletDriverService/TabletFilterNoiseReduction.cpp
index be8f11b..8a91010 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.cpp
+++ b/TabletDriverService/TabletFilterNoiseReduction.cpp
@@ -11,7 +11,12 @@
 //
 TabletFilterNoiseReduction::TabletFilterNoiseReduction() {
 	distanceThreshold = 0;
+	distanceMaximum = 1;
 	iterations = 10;
+	reportRate = 1;
+	timeBegin = chrono::high_resolution_clock::now();
+	timeLastReport = timeBegin;
+	timeNow = timeBegin;
 }
 
 //
@@ -46,10 +51,24 @@ bool TabletFilterNoiseReduction::GetPosition(Vector2D *outputVector) {
 // Update
 void TabletFilterNoiseReduction::Update() {
 
+	// Report rate calculation
+	timeNow = chrono::high_resolution_clock::now();
+	double timeDelta = (timeNow - timeLastReport).count() / 1000000.0;
+	if(timeDelta >= 1 && timeDelta <= 10) {
+		reportRate += ((1000.0 / timeDelta) - reportRate) * (timeDelta / 1000.0) * 5.0;
+	}
+	timeLastReport = timeNow;
+
+	// Velocity calculation
+	double velocity = latestTarget.Distance(lastTarget) * reportRate;
+	lastTarget.Set(latestTarget);
+
+	
+
+
 	// One position in the buffer?
 	if(buffer.count == 1) {
-		position.x = buffer[0]->x;
-		position.y = buffer[0]->y;
+		position.Set(latestTarget);
 		return;
 	}
 
@@ -63,48 +82,67 @@ void TabletFilterNoiseReduction::Update() {
 		double distance = latestTarget.Distance(position);
 
 		// Distance larger than threshold -> modify the ring buffer
-		if(distance > distanceThreshold) {
-
-			// Distance factor
-			double distanceFactor = 1;
-			if(distanceThreshold > 0) {
-				distanceFactor = distance / distanceThreshold;
-			}
+		if(distance > distanceThreshold && distanceMaximum > 0) {
 
-			// Buffer fill count (distance 10 times larger than threshold -> fill whole buffer)
-			int fillCount = (int)(distanceFactor * 0.1 * buffer.length);
-			if(fillCount > buffer.length) fillCount = buffer.length;
+			// Ratio between current distance and maximum distance
+			double distanceRatio;
 
-			// Fill part of the ring buffer with the latest position
-			for(int i = 0; i < fillCount; i++) {
-				buffer.Add(latestTarget);
-			}
+			// Skip distance ratio calculation
+			if(distanceThreshold >= distanceMaximum) {
+				distanceRatio = 1;
 
-			// Debug
-			if(tablet->debugEnabled) {
-				LOG_DEBUG("Noise distance threshold! D:%0.2f Fa:%0.2f Fi:%d\n", distance, distanceFactor, fillCount);
+			// Distance ratio should be between 0.0 and 1.0
+			// 0.0 -> distance == distanceThreshold
+			// 1.0 -> distance == distanceMaximum
+			} else {
+				distanceRatio = (distance - distanceThreshold) / (distanceMaximum - distanceThreshold);
 			}
 
-
-			// Max fill -> set the position to latest target position
-			if(fillCount >= buffer.length) {
+			// Distance larger than maximum -> fill buffer with the latest target position
+			if(distanceRatio >= 1.0) {
+				for(int i = 0; i < buffer.count; i++) {
+					buffer[i]->Set(latestTarget);
+				}
 				position.Set(latestTarget);
 
-			// Calculate a new geometric median
+			// Move buffer positions and current position towards the latest target using linear interpolation
+			// Amount of movement is the distance ratio between threshold and maximum
 			} else {
-				GetGeometricMedianVector(&position, iterations);
+				buffer.LerpAdd(latestTarget, distanceRatio);
+				position.LerpAdd(latestTarget, distanceRatio);
+			}
+
+			// Debug message
+			if(tablet->debugEnabled) {
+				LOG_DEBUG("Threshold! D=%0.2f mm, R=%0.2f, V=%0.2f mm/s, V2=%0.2f mm/s\n",
+					distance,
+					distanceRatio,
+					velocity, // True velocity
+					distance * reportRate // Distance to velocity
+				);
 			}
 
 		}
 	}
 
-	// Debug
+	// Debug message
 	if(tablet->debugEnabled) {
-		LOG_DEBUG("Noise: B:%d T:%0.2f,%0.2f O:%0.2f,%0.2f D:%0.2f\n",
+		double distance = position.Distance(latestTarget);
+		double latency;
+		if(velocity <= 0) {
+			latency = 0;
+		} else {
+			latency = distance / velocity * 1000.0;
+		}
+		LOG_DEBUG("T=%0.0f B=%d T=[%0.2f,%0.2f] P=[%0.2f,%0.2f] D=%0.2f R=%0.2f V=%0.2f L=%0.2f\n",
+			(timeNow - timeBegin).count() / 1000000.0,
 			buffer.count,
 			latestTarget.x, latestTarget.y,
 			position.x, position.y,
-			position.Distance(latestTarget)
+			distance,
+			reportRate,
+			velocity,
+			latency
 		);
 	}
 
diff --git a/TabletDriverService/TabletFilterNoiseReduction.h b/TabletDriverService/TabletFilterNoiseReduction.h
index 06467e5..5d322bb 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.h
+++ b/TabletDriverService/TabletFilterNoiseReduction.h
@@ -2,15 +2,25 @@
 #include "TabletFilter.h"
 #include "PositionRingBuffer.h"
 
+#include <chrono>
+
+
 class TabletFilterNoiseReduction : public TabletFilter {
 public:
 
 	PositionRingBuffer buffer;
 	Vector2D position;
 	Vector2D latestTarget;
+	Vector2D lastTarget;
 
 	int iterations;
 	double distanceThreshold;
+	double distanceMaximum;
+	double reportRate;
+	chrono::high_resolution_clock::time_point timeBegin;
+	chrono::high_resolution_clock::time_point timeLastReport;
+	chrono::high_resolution_clock::time_point timeNow;
+
 
 	void SetTarget(Vector2D targetVector);
 	void SetPosition(Vector2D vector);
diff --git a/TabletDriverService/TabletMeasurement.cpp b/TabletDriverService/TabletMeasurement.cpp
index 8a3aef7..a9bac90 100644
--- a/TabletDriverService/TabletMeasurement.cpp
+++ b/TabletDriverService/TabletMeasurement.cpp
@@ -11,8 +11,8 @@ TabletMeasurement::TabletMeasurement() {
 	minimum.Set(0, 0);
 	maximum.Set(0, 0);
 	pointCount = 0;
-	totalPackets = 0;
-	packetCounter = 0;
+	totalReports = 0;
+	reportCounter = 0;
 	lastState.buttons = 0;
 	lastState.isValid = false;
 }
@@ -34,15 +34,15 @@ void TabletMeasurement::Start() {
 //
 // Start measurement
 //
-void TabletMeasurement::Start(int packetCount) {
+void TabletMeasurement::Start(int reportCount) {
 
 	// Limits
 	minimum.Set(10000, 10000);
 	maximum.Set(-10000, -10000);
 
 	pointCount = 0;
-	totalPackets = packetCount;
-	packetCounter = packetCount;
+	totalReports = reportCount;
+	reportCounter = reportCount;
 
 	// Last tablet state
 	lastState.buttons = 0;
@@ -70,7 +70,7 @@ void TabletMeasurement::Update(TabletState state) {
 	
 
 	if(isRunning) {
-		if(packetCounter > 0 || packetCounter <= -1) {
+		if(reportCounter > 0 || reportCounter <= -1) {
 
 			// X Limits
 			if(state.position.x < minimum.x) minimum.x = state.position.x;
@@ -95,7 +95,7 @@ void TabletMeasurement::Update(TabletState state) {
 
 			lastState.buttons = state.buttons;
 			lastState.isValid = true;
-			packetCounter--;
+			reportCounter--;
 		} else {
 			isRunning = false;
 		}
diff --git a/TabletDriverService/TabletMeasurement.h b/TabletDriverService/TabletMeasurement.h
index 9b4557c..46bafac 100644
--- a/TabletDriverService/TabletMeasurement.h
+++ b/TabletDriverService/TabletMeasurement.h
@@ -10,8 +10,8 @@ class TabletMeasurement {
 	Vector2D points[10];
 	int pointCount;
 
-	int totalPackets;
-	int packetCounter;
+	int totalReports;
+	int reportCounter;
 	bool isRunning;
 
 	TabletState lastState;
@@ -21,7 +21,7 @@ class TabletMeasurement {
 	TabletMeasurement();
 	~TabletMeasurement();
 	void Start();
-	void Start(int packetCount);
+	void Start(int reportCount);
 	void Stop();
 	void Update(TabletState state);
 };
diff --git a/TabletDriverService/Vector2D.cpp b/TabletDriverService/Vector2D.cpp
index 6f86f63..6ed5e86 100644
--- a/TabletDriverService/Vector2D.cpp
+++ b/TabletDriverService/Vector2D.cpp
@@ -44,3 +44,11 @@ double Vector2D::Distance(Vector2D target) {
 	return sqrt(dx * dx + dy * dy);
 }
 
+//
+// Linear interpolation add
+//
+void Vector2D::LerpAdd(Vector2D target, double t) {
+	x += (target.x - x) * t;
+	y += (target.y - y) * t;
+}
+
diff --git a/TabletDriverService/Vector2D.h b/TabletDriverService/Vector2D.h
index 6548a10..aa99675 100644
--- a/TabletDriverService/Vector2D.h
+++ b/TabletDriverService/Vector2D.h
@@ -12,6 +12,6 @@ class Vector2D {
 	void Add(Vector2D vector);
 	void Multiply(double value);
 	double Distance(Vector2D target);
-	void CopyTo(Vector2D target);
+	void LerpAdd(Vector2D target, double t);
 };
 
diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 3ebb98d..7b567bc 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -273,7 +273,7 @@ DetectMask 0xA0
 MaxX 15200
 MaxY 9500
 MaxPressure 2047
-KeepTipDown 2 packets
+KeepTipDown 2
 Width 152.0
 Height 95.0
 #Feature 0x83 0x02 0x00
@@ -292,7 +292,7 @@ DetectMask 0xA0
 MaxX 15200
 MaxY 9500
 MaxPressure 2047
-KeepTipDown 2 packets
+KeepTipDown 2
 Width 152.0
 Height 95.0
 InitFeature 0x02 0x02

From bee769e6a42a3f3989f0e34323a187d2c7923c70 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Fri, 30 Nov 2018 21:26:37 +0200
Subject: [PATCH 38/83] Updated wacom.cfg

---
 TabletDriverService/config/wacom.cfg | 136 ++++++++++++++++-----------
 1 file changed, 82 insertions(+), 54 deletions(-)

diff --git a/TabletDriverService/config/wacom.cfg b/TabletDriverService/config/wacom.cfg
index d0dc2a8..c262006 100644
--- a/TabletDriverService/config/wacom.cfg
+++ b/TabletDriverService/config/wacom.cfg
@@ -186,6 +186,35 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTL-671
+Tablet 0x056A 0x0301 0xFF0D 0x0001
+Tablet 0x056A 0x0301 0x000D 0x0001
+Name "Wacom CTL-671"
+ReportLength 10
+DetectMask 0x40
+MaxX 21648
+MaxY 13530
+MaxPressure 1023
+Width 216.480
+Height 135.300
+InitFeature 0x02 0x02
+
+
+# Wacom CTL-690
+Tablet 0x056A 0x033D 0xFF0D 0x0001
+Tablet 0x056A 0x033D 0x000D 0x0001
+Name "Wacom CTL-690"
+ReportLength 10
+DetectMask 0x40
+MaxX 21600
+MaxY 13500
+MaxPressure 2047
+Width 216.000
+Height 135.000
+InitFeature 0x02 0x02
+Type WacomIntuos
+
+
 # Wacom CTL-471
 Tablet 0x056A 0x0300 0xFF0D 0x0001
 Tablet 0x056A 0x0300 0x000D 0x0001
@@ -257,20 +286,6 @@ Height 137.000
 InitFeature 0x02 0x02
 
 
-# Wacom CTL-671
-Tablet 0x056A 0x0301 0xFF0D 0x0001
-Tablet 0x056A 0x0301 0x000D 0x0001
-Name "Wacom CTL-671"
-ReportLength 10
-DetectMask 0x40
-MaxX 21648
-MaxY 13530
-MaxPressure 1023
-Width 216.480
-Height 135.300
-InitFeature 0x02 0x02
-
-
 # Wacom CTL-672
 Tablet 0x056A 0x037B 0xFF0D 0x0001
 Tablet 0x056A 0x037B 0x000D 0x0001
@@ -299,25 +314,10 @@ Height 135.000
 InitFeature 0x02 0x02
 
 
-# Wacom CTL-690
-Tablet 0x056A 0x033D 0xFF0D 0x0001
-Tablet 0x056A 0x033D 0x000D 0x0001
-Name "Wacom CTL-690"
-ReportLength 10
-DetectMask 0x40
-MaxX 21600
-MaxY 13500
-MaxPressure 2047
-Width 216.000
-Height 135.000
-InitFeature 0x02 0x02
-Type WacomIntuos
-
-
-# Wacom CTH-460(A)
-Tablet 0x056A 0x00D6 0xFF0D 0x0001
-Tablet 0x056A 0x00D6 0x000D 0x0001
-Name "Wacom CTH-460(A)"
+# Wacom CTH-460
+Tablet 0x056A 0x00D1 0xFF0D 0x0001
+Tablet 0x056A 0x00D1 0x000D 0x0001
+Name "Wacom CTH-460"
 ReportLength 9
 DetectMask 0x40
 MaxX 14720
@@ -328,10 +328,10 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
-# Wacom CTH-461(A)
-Tablet 0x056A 0x00D7 0xFF0D 0x0001
-Tablet 0x056A 0x00D7 0x000D 0x0001
-Name "Wacom CTH-461(A)"
+# Wacom CTH-460(A)
+Tablet 0x056A 0x00D6 0xFF0D 0x0001
+Tablet 0x056A 0x00D6 0x000D 0x0001
+Name "Wacom CTH-460(A)"
 ReportLength 9
 DetectMask 0x40
 MaxX 14720
@@ -342,10 +342,10 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
-# Wacom CTH-461SE
-Tablet 0x056A 0x00DA 0xFF0D 0x0001
-Tablet 0x056A 0x00DA 0x000D 0x0001
-Name "Wacom CTH-461SE"
+# Wacom CTH-461
+Tablet 0x056A 0x00D2 0xFF0D 0x0001
+Tablet 0x056A 0x00D2 0x000D 0x0001
+Name "Wacom CTH-461"
 ReportLength 9
 DetectMask 0x40
 MaxX 14720
@@ -356,10 +356,10 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
-# Wacom CTH-460
-Tablet 0x056A 0x00D1 0xFF0D 0x0001
-Tablet 0x056A 0x00D1 0x000D 0x0001
-Name "Wacom CTH-460"
+# Wacom CTH-461(A)
+Tablet 0x056A 0x00D7 0xFF0D 0x0001
+Tablet 0x056A 0x00D7 0x000D 0x0001
+Name "Wacom CTH-461(A)"
 ReportLength 9
 DetectMask 0x40
 MaxX 14720
@@ -370,10 +370,10 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
-# Wacom CTH-461
-Tablet 0x056A 0x00D2 0xFF0D 0x0001
-Tablet 0x056A 0x00D2 0x000D 0x0001
-Name "Wacom CTH-461"
+# Wacom CTH-461SE
+Tablet 0x056A 0x00DA 0xFF0D 0x0001
+Tablet 0x056A 0x00DA 0x000D 0x0001
+Name "Wacom CTH-461SE"
 ReportLength 9
 DetectMask 0x40
 MaxX 14720
@@ -512,6 +512,20 @@ InitFeature 0x02 0x02
 Type WacomIntuos
 
 
+# Wacom CTE-440
+Tablet 0x056A 0x0015 0xFF0D 0x0001
+Tablet 0x056A 0x0015 0x000D 0x0001
+Name "Wacom CTE-440"
+ReportLength 8
+DetectMask 0x80
+MaxX 10208
+MaxY 7424
+MaxPressure 511
+Width 127.600
+Height 92.800
+InitFeature 0x02 0x02
+
+
 # Wacom CTE-450
 Tablet 0x056A 0x0017 0xFF0D 0x0001
 Tablet 0x056A 0x0017 0x000D 0x0001
@@ -526,6 +540,20 @@ Height 92.250
 InitFeature 0x02 0x02
 
 
+# Wacom CTE-640
+Tablet 0x056A 0x0016 0xFF0D 0x0001
+Tablet 0x056A 0x0016 0x000D 0x0001
+Name "Wacom CTE-640"
+ReportLength 8
+DetectMask 0x80
+MaxX 16704
+MaxY 12064
+MaxPressure 511
+Width 208.800
+Height 150.800
+InitFeature 0x02 0x02
+
+
 # Wacom CTE-650
 Tablet 0x056A 0x0018 0xFF0D 0x0001
 Tablet 0x056A 0x0018 0x000D 0x0001
@@ -541,10 +569,10 @@ InitFeature 0x02 0x02
 
 
 #
-# Automatically generated Wacom tablet configurations (37):
+# Automatically generated Wacom tablet configurations (39):
 #   PTK-450, PTK-650, PTH-450, PTH-451, PTH-650, PTH-651, PTH-850, PTH-851, 
-#   MTE-450, CTT-460, CTL-460, CTL-470, CTL-471, CTL-472, CTL-480, CTL-490, 
-#   CTL-660, CTL-671, CTL-672, CTL-680, CTL-690, CTH-460(A), CTH-461(A), CTH-461SE, 
-#   CTH-460, CTH-461, CTH-470, CTH-480, CTH-490, CTH-661, CTH-661(A), CTH-661SE, 
-#   CTH-670, CTH-680, CTH-690, CTE-450, CTE-650
+#   MTE-450, CTT-460, CTL-460, CTL-470, CTL-671, CTL-690, CTL-471, CTL-472, 
+#   CTL-480, CTL-490, CTL-660, CTL-672, CTL-680, CTH-460, CTH-460(A), CTH-461, 
+#   CTH-461(A), CTH-461SE, CTH-470, CTH-480, CTH-490, CTH-661, CTH-661(A), CTH-661SE, 
+#   CTH-670, CTH-680, CTH-690, CTE-440, CTE-450, CTE-640, CTE-650
 #

From 071c0fb6f950845064042f614438f15596aec1e9 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Fri, 30 Nov 2018 21:44:30 +0200
Subject: [PATCH 39/83] Added anti-smoothing filter and filter tester

Anti-smoothing filter reduces latency by using position prediction on tablets that use hardware smoothing.

Example console commands:
XP-PEN G640/G430:
`AntiSmoothing 0.3 20`

Huion H630P/H430P:
`AntiSmoothing 0.4 50`
---
 TabletDriverService/ProcessCommand.cpp        |  87 +++++++++
 TabletDriverService/ProcessCommand.h          |   1 +
 TabletDriverService/Tablet.cpp                |   8 +-
 TabletDriverService/Tablet.h                  |   5 +-
 .../TabletDriverService.vcxproj               |   4 +
 .../TabletDriverService.vcxproj.filters       |  12 ++
 .../TabletFilterAntiSmoothing.cpp             | 136 +++++++++++++
 .../TabletFilterAntiSmoothing.h               |  40 ++++
 TabletDriverService/TabletFilterTester.cpp    | 178 ++++++++++++++++++
 TabletDriverService/TabletFilterTester.h      |  54 ++++++
 10 files changed, 518 insertions(+), 7 deletions(-)
 create mode 100644 TabletDriverService/TabletFilterAntiSmoothing.cpp
 create mode 100644 TabletDriverService/TabletFilterAntiSmoothing.h
 create mode 100644 TabletDriverService/TabletFilterTester.cpp
 create mode 100644 TabletDriverService/TabletFilterTester.h

diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index e4a934e..4e3b0f2 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -594,12 +594,99 @@ bool ProcessCommand(CommandLine *cmd) {
 			}
 
 		}
+	}
+
+	//
+	// Anti-smoothing filter
+	//
+	else if(cmd->is("AntiSmoothing") || cmd->is("Anti")) {
+
+		string stringValue = cmd->GetStringLower(0, "");
+
+		// Off / False
+		if(stringValue == "off" || stringValue == "false") {
+			tablet->antiSmoothing.isEnabled = false;
+			LOG_INFO("Anti-smoothing = off\n");
+
+		// Enable
+		} else {
+
+			double power = cmd->GetDouble(0, 1.0);
+			double multiplier = cmd->GetDouble(1, 1.0);
+
+			if(power <= 0) {
+				tablet->antiSmoothing.isEnabled = false;
+				LOG_INFO("Anti-smoothing = off\n");
+			}
+			else {
+				tablet->antiSmoothing.power = power;
+				tablet->antiSmoothing.multiplier = multiplier;
+				tablet->antiSmoothing.isEnabled = true;
+				LOG_INFO("Anti-smoothing = P:%0.2f M:%0.2f\n",
+					tablet->antiSmoothing.power,
+					tablet->antiSmoothing.multiplier
+				);
+			}
+		}
+	}
 
+	//
+	// Filter tester
+	//
+	else if(cmd->is("FilterTester") || cmd->is("Tester")) {
+
+		string filterName = cmd->GetStringLower(0, "");
+		string inputFilepath = cmd->GetStringLower(1, "tester_input.txt");
+		string outputFilepath = cmd->GetStringLower(2, "tester_output.txt");
+		TabletFilter *filter = NULL;
+		TabletFilterTester *tester = NULL;
+
+		if(filterName.compare(0, 4, "anti") == 0) {
+			LOG_DEBUG("Anti!\n");
+			filter = new TabletFilterAntiSmoothing();
+			((TabletFilterAntiSmoothing*)filter)->power = tablet->antiSmoothing.power;
+			((TabletFilterAntiSmoothing*)filter)->multiplier = tablet->antiSmoothing.multiplier;
+
+		} else if(filterName.compare(0, 5, "noise") == 0) {
+			filter = new TabletFilterNoiseReduction();
+			((TabletFilterNoiseReduction*)filter)->buffer.SetLength(tablet->noise.buffer.length);
+			((TabletFilterNoiseReduction*)filter)->distanceThreshold = tablet->noise.distanceThreshold;
+			((TabletFilterNoiseReduction*)filter)->distanceMaximum = tablet->noise.distanceMaximum;
+			((TabletFilterNoiseReduction*)filter)->iterations = tablet->noise.iterations;
+			
 
+		}
+		if(filter != NULL) {
 
+			LOG_INFO("Filter test starting!\n");
+			Sleep(100);
+			tester = new TabletFilterTester(filter, inputFilepath, outputFilepath);
+			bool result = tester->Start();
+			if(!result) {
+				LOG_ERROR("Filter tester startup failed!\n");
+			}
+			while(tester->isRunning) {
+				Sleep(100);
+			}
+			tester->Stop();
+			LOG_INFO("Filter test ended!\n");
+			Sleep(100);
+
+		} else {
+			LOG_INFO("Usage: FilterTester <filter name>\n");
+		}
+
+		if(filter != NULL) {
+			delete filter;
+		}
+		if(tester != NULL) {
+			delete tester;
+		}
 
 	}
 
+
+
 	// Debug
 	else if(cmd->is("Debug")) {
 		if(!CheckTablet()) return true;
diff --git a/TabletDriverService/ProcessCommand.h b/TabletDriverService/ProcessCommand.h
index af58f27..5dff2bb 100644
--- a/TabletDriverService/ProcessCommand.h
+++ b/TabletDriverService/ProcessCommand.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "CommandLine.h"
+#include "TabletFilterTester.h"
 
 bool ProcessCommand(CommandLine *cmd);
 bool ReadCommandFile(string filename);
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 5c6d15f..de6b7e0 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -53,11 +53,9 @@ Tablet::Tablet() {
 	// Filters
 	filterTimed[0] = &smoothing;
 	filterTimedCount = 1;
-	filterReport[0] = &noise;
-	//filterReport[1] = &peak;
-	filterReportCount = 1;
-
-	peak.isEnabled = true;
+	filterReport[0] = &antiSmoothing;
+	filterReport[1] = &noise;
+	filterReportCount = 2;
 
 	// Button map
 	memset(&buttonMap, 0, sizeof(buttonMap));
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 3497631..08719ab 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -8,6 +8,7 @@
 #include "TabletState.h"
 #include "TabletFilterSmoothing.h"
 #include "TabletFilterNoiseReduction.h"
+#include "TabletFilterAntiSmoothing.h"
 #include "TabletFilterPeak.h"
 #include "TabletMeasurement.h"
 #include "Vector2D.h"
@@ -63,8 +64,8 @@ class Tablet {
 	// Noise reduction filter
 	TabletFilterNoiseReduction noise;
 
-	// Peak filter
-	TabletFilterPeak peak;
+	// Anti-smoothing filter
+	TabletFilterAntiSmoothing antiSmoothing;
 
 	// Timed filters
 	TabletFilter *filterTimed[10];
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index f43166b..b53ef02 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -185,6 +185,8 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClInclude Include="ScreenMapper.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="Tablet.h" />
+    <ClInclude Include="TabletFilterAntiSmoothing.h" />
+    <ClInclude Include="TabletFilterTester.h" />
     <ClInclude Include="TabletMeasurement.h" />
     <ClInclude Include="TabletFilter.h" />
     <ClInclude Include="TabletFilterNoiseReduction.h" />
@@ -214,6 +216,8 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClCompile Include="RelativeMouseState.cpp" />
     <ClCompile Include="ScreenMapper.cpp" />
     <ClCompile Include="Tablet.cpp" />
+    <ClCompile Include="TabletFilterAntiSmoothing.cpp" />
+    <ClCompile Include="TabletFilterTester.cpp" />
     <ClCompile Include="TabletMeasurement.cpp" />
     <ClCompile Include="TabletFilter.cpp" />
     <ClCompile Include="TabletFilterNoiseReduction.cpp" />
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index f1dd940..3567779 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -99,6 +99,12 @@
     <ClInclude Include="TabletMeasurement.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="TabletFilterAntiSmoothing.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TabletFilterTester.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -185,6 +191,12 @@
     <ClCompile Include="TabletMeasurement.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="TabletFilterAntiSmoothing.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TabletFilterTester.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.cpp b/TabletDriverService/TabletFilterAntiSmoothing.cpp
new file mode 100644
index 0000000..c701db1
--- /dev/null
+++ b/TabletDriverService/TabletFilterAntiSmoothing.cpp
@@ -0,0 +1,136 @@
+#include "stdafx.h"
+#include "TabletFilterAntiSmoothing.h"
+
+
+#define LOG_MODULE "AntiSmoothing"
+#include "Logger.h"
+
+
+//
+// Constructor
+//
+TabletFilterAntiSmoothing::TabletFilterAntiSmoothing() {
+	power = 1.0;
+	multiplier = 1;
+
+	reportRate = 1;
+	velocity = 0;
+	acceleration = 0;
+	jerk = 0;
+
+	lastVelocity = 0;
+	lastAcceleration = 0;
+	lastJerk = 0;
+
+	timeBegin = chrono::high_resolution_clock::now();
+	timeLastReport = timeBegin;
+	timeNow = timeBegin;
+}
+
+//
+// Destructor
+//
+TabletFilterAntiSmoothing::~TabletFilterAntiSmoothing() {
+}
+
+//
+// TabletFilter methods
+//
+
+// Set target position
+void TabletFilterAntiSmoothing::SetTarget(Vector2D targetVector) {
+	latestTarget.Set(targetVector);
+	buffer.Add(targetVector);
+}
+
+// Set position
+void TabletFilterAntiSmoothing::SetPosition(Vector2D vector) {
+	position.x = vector.x;
+	position.y = vector.y;
+}
+
+// Get position
+bool TabletFilterAntiSmoothing::GetPosition(Vector2D *outputVector) {
+	outputVector->x = position.x;
+	outputVector->y = position.y;
+	return true;
+}
+
+// Update
+void TabletFilterAntiSmoothing::Update() {
+
+	Vector2D predictedPosition;
+
+	// Report rate calculation (moving average)
+	timeNow = chrono::high_resolution_clock::now();
+	double timeDelta = (timeNow - timeLastReport).count() / 1000000.0;
+	if(timeDelta >= 1 && timeDelta <= 10) {
+		reportRate += ((1000.0 / timeDelta) - reportRate) * (timeDelta / 1000.0) / 0.1;
+	} else {
+		timeLastReport = timeNow;
+		return;
+	}
+	timeLastReport = timeNow;
+
+	// Velocity, acceleration and jerk calculation
+	velocity = latestTarget.Distance(lastTarget) * reportRate;
+	acceleration = (velocity - lastVelocity) * reportRate;
+	jerk = (acceleration - lastAcceleration) * reportRate;
+
+	// Last values
+	lastVelocity = velocity;
+	lastAcceleration = acceleration;
+	lastJerk = jerk;
+
+	// Velocity prediction
+	double predictedVelocity = velocity + (acceleration + jerk / reportRate) / reportRate;
+
+	// Velocity validation
+	if(
+		velocity > 0.1 && predictedVelocity > 0.1
+		&&
+		velocity < 2000 && predictedVelocity < 2000
+	) {
+		//
+		// Extrapolate a position by using the difference between predicted velocity and current velocity.
+		// LerpAdd (linear interpolation) method will move the position beyond the target position when the second parameter is larger than 1
+		//
+		// Power: Exponential prediction modifier
+		// Multiplier: Linear prediction modifier
+		// 
+		predictedPosition.Set(lastTarget);
+		predictedPosition.LerpAdd(latestTarget, pow(predictedVelocity / velocity * multiplier, power));
+		position.Set(predictedPosition);
+
+	// Invalid velocity -> set the position to the latest target
+	} else {
+		position.Set(latestTarget);
+	}
+
+
+	// Debug message
+	if(tablet->debugEnabled) {
+		double delta = position.Distance(latestTarget);
+		LOG_DEBUG("T=%0.0f B=%d T=[%0.2f,%0.2f] P=[%0.2f,%0.2f] D=%0.2f R=%0.2f V=%0.2f PV=%0.2f A=%0.0f J=%0.0f\n",
+			(timeNow - timeBegin).count() / 1000000.0,
+			buffer.count,
+			latestTarget.x, latestTarget.y,
+			position.x, position.y,
+			delta,
+			reportRate,
+			velocity,
+			predictedVelocity,
+			acceleration,
+			jerk
+		);
+	}
+
+	// Set last target
+	lastTarget.Set(latestTarget);
+
+
+
+}
+
+
+
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.h b/TabletDriverService/TabletFilterAntiSmoothing.h
new file mode 100644
index 0000000..a3f05ab
--- /dev/null
+++ b/TabletDriverService/TabletFilterAntiSmoothing.h
@@ -0,0 +1,40 @@
+#pragma once
+#include "TabletFilter.h"
+#include "PositionRingBuffer.h"
+
+#include <chrono>
+
+
+class TabletFilterAntiSmoothing : public TabletFilter {
+public:
+	PositionRingBuffer buffer;
+	Vector2D position;
+	Vector2D latestTarget;
+	Vector2D lastTarget;
+
+	double power;
+	double multiplier;
+
+	double reportRate;
+	double velocity;
+	double acceleration;
+	double jerk;
+	double lastVelocity;
+	double lastAcceleration;
+	double lastJerk;
+
+
+
+	chrono::high_resolution_clock::time_point timeBegin;
+	chrono::high_resolution_clock::time_point timeLastReport;
+	chrono::high_resolution_clock::time_point timeNow;
+
+	void SetTarget(Vector2D targetVector);
+	void SetPosition(Vector2D vector);
+	bool GetPosition(Vector2D *outputVector);
+	void Update();
+
+	TabletFilterAntiSmoothing();
+	~TabletFilterAntiSmoothing();
+};
+
diff --git a/TabletDriverService/TabletFilterTester.cpp b/TabletDriverService/TabletFilterTester.cpp
new file mode 100644
index 0000000..59fd803
--- /dev/null
+++ b/TabletDriverService/TabletFilterTester.cpp
@@ -0,0 +1,178 @@
+#include "stdafx.h"
+#include "TabletFilterTester.h"
+
+#define LOG_MODULE "Tester"
+#include "Logger.h"
+
+
+// Constructor
+TabletFilterTester::TabletFilterTester(TabletFilter *f, string input, string output) {
+	this->filter = f;
+	this->inputFilepath = input;
+	this->outputFilepath = output;
+	isRunning = false;
+}
+
+// Destructor
+TabletFilterTester::~TabletFilterTester() {
+}
+
+//
+// Start test
+//
+bool TabletFilterTester::Start() {
+
+	isRunning = false;
+	callback = TimerCallback;
+
+
+	inputFile = ifstream(inputFilepath, ifstream::in);
+	if(!inputFile) return false;
+
+	outputFile = ofstream(outputFilepath, ofstream::out);
+	if(!outputFile) return false;
+
+
+	BOOL result = CreateTimerQueueTimer(
+		&timer,
+		NULL, callback,
+		this,
+		0,
+		1,
+		WT_EXECUTEDEFAULT
+	);
+	if(!result) return false;
+
+	firstReport = true;
+	isRunning = true;
+
+	timeNow = chrono::high_resolution_clock::now();
+	timeBegin = timeNow;
+	inputTimeOffset = 0;
+	nextInputTime = 0;
+	nextInputPosition.Set(0, 0);
+
+	return true;
+}
+
+
+//
+// Stop test
+//
+bool TabletFilterTester::Stop() {
+	if(timer == NULL) return false;
+	bool result = DeleteTimerQueueTimer(NULL, timer, NULL);
+	if(result) {
+		timer = NULL;
+	}
+	isRunning = false;
+
+	if(inputFile && inputFile.is_open()) {
+		inputFile.close();
+	}
+	if(outputFile && outputFile.is_open()) {
+		outputFile.close();
+	}
+	return result;
+}
+
+//
+// Timer tick
+//
+void TabletFilterTester::OnTimerTick() {
+	if(!isRunning) return;
+
+	timeNow = chrono::high_resolution_clock::now();
+
+	double timePosition = round((timeNow - timeBegin).count() / 1000000.0);
+	Vector2D newPosition;
+	double distance;
+
+	//LOG_DEBUG("TIME POSITION = %0.2f\n", timePosition);
+	if(timePosition > 100) {
+		//isRunning = false;
+	}
+
+	
+	string line;
+
+	// EOF?
+	if(inputFile.eof()) {
+		isRunning = false;
+		return;
+	}
+
+
+	// Wait for the next report time
+	if(!firstReport && timePosition < nextInputTime) {
+		return;
+	}
+
+	// Time position reached the next input time
+	if(!firstReport && timePosition >= nextInputTime) {
+		
+		filter->SetTarget(nextInputPosition);
+		filter->Update();
+		filter->GetPosition(&newPosition);
+
+		distance = nextInputPosition.Distance(newPosition);
+
+		LOG_DEBUG("Output: %0.0f/%0.0f ms, %0.2f, %0.2f (%0.3f mm)\n",
+			nextInputTime,
+			timePosition,
+			newPosition.x,
+			newPosition.y,
+			distance
+		);
+
+		
+		outputFile << "position " << nextInputTime << " " << newPosition.x << " " << newPosition.y << fixed << setprecision(2) << "\n";
+
+
+
+	}
+
+
+
+	// Read input
+	try {
+		getline(inputFile, line);
+	} catch(exception) {
+		isRunning = false;
+		return;
+	}
+
+	// Parse input
+	CommandLine cmd(line);
+	if(cmd.is("position")) {
+		Vector2D position, newPosition;
+		double time;
+
+		time = cmd.GetDouble(0, 0) - inputTimeOffset;
+		position.x = cmd.GetDouble(1, 0);
+		position.y = cmd.GetDouble(2, 0);
+		LOG_DEBUG("Input: %0.0f ms, %0.2f, %0.2f\n",
+			time,
+			position.x,
+			position.y
+		);
+		
+		// Init settings on first report
+		if(firstReport) {
+			inputTimeOffset = time;
+			timeBegin = timeNow;
+			firstReport = false;
+
+			nextInputTime = 0;
+			nextInputPosition.Set(position);
+
+			LOG_DEBUG("First report: %0.2f, %0.2f, %0.2f\n", inputTimeOffset, position.x, position.y);
+
+		} else {
+			nextInputTime = time;
+			nextInputPosition.Set(position);
+		}
+	}
+	
+
+}
\ No newline at end of file
diff --git a/TabletDriverService/TabletFilterTester.h b/TabletDriverService/TabletFilterTester.h
new file mode 100644
index 0000000..25ad2be
--- /dev/null
+++ b/TabletDriverService/TabletFilterTester.h
@@ -0,0 +1,54 @@
+#pragma once
+#include "Vector2D.h"
+#include "TabletFilter.h"
+#include "TabletFilterAntiSmoothing.h"
+#include "TabletFilterNoiseReduction.h"
+#include "CommandLine.h"
+
+#include <iostream>
+#include <iomanip>
+#include <sstream>
+#include <fstream>
+
+
+class TabletFilterTester {
+public:
+	HANDLE timer;
+	WAITORTIMERCALLBACK callback;
+
+	TabletFilter *filter;
+	string inputFilepath;
+	string outputFilepath;
+
+	ifstream inputFile;
+	ofstream outputFile;
+
+	bool firstReport;
+	double inputTime;
+	double inputTimeOffset;
+
+	double nextInputTime;
+	Vector2D nextInputPosition;
+
+
+
+	chrono::high_resolution_clock::time_point timeBegin;
+	chrono::high_resolution_clock::time_point timeNow;
+
+	bool isRunning;
+
+	TabletFilterTester(TabletFilter *filter, string inputFilepath, string outputFilepath);
+	~TabletFilterTester();
+
+	bool Start();
+	bool Stop();
+	void OnTimerTick();
+	
+private:
+	
+	static VOID CALLBACK TimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWaitFired) {
+		TabletFilterTester *tester = (TabletFilterTester *)lpParameter;
+		tester->OnTimerTick();
+	}
+};
+

From aa6bff0e8a10d5d4ac9d3f8f46ff3fa089aaa3af Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Mon, 3 Dec 2018 15:07:16 +0200
Subject: [PATCH 40/83] Huion H420/420 area size and H640P ignore mask

- H420/420 area width and height now matches with the 2000 LPI resolution.
- H640P didn't have IgnoreMask, so pressing buttons on tablet caused invalid cursor movements.
---
 TabletDriverService/config/tablet.cfg | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 1012fcf..36173fc 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -516,8 +516,8 @@ DetectMask 0x80
 MaxX 8340
 MaxY 4680
 MaxPressure 2047
-Width 101.6
-Height 56.6
+Width 105.918
+Height 59.436
 
 
 #
@@ -530,8 +530,9 @@ DetectMask 0x80
 MaxX 8340
 MaxY 4680
 MaxPressure 2047
-Width 101.6
-Height 56.6
+Width 105.918
+Height 59.436
+
 
 
 #
@@ -558,6 +559,7 @@ Name "Huion H640P"
 ReportId 0x08
 ReportLength 8
 DetectMask 0x80
+IgnoreMask 0x60
 MaxX 31999
 MaxY 20000
 MaxPressure 8191

From 32ade0150fbf5cd0931dac66d386d157df80ab50 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Mon, 3 Dec 2018 15:16:28 +0200
Subject: [PATCH 41/83] Anti-smoothing to GUI and new filters tab

- Added anti-smoothing filter to GUI and added invalid data detection.
- Moved filters to own tab on GUI.
- Improved filter tester.
- Some code refactoring.
---
 TabletDriverGUI/Configuration.cs              |  15 +-
 TabletDriverGUI/MainWindow.xaml               | 374 +++++++++++++-----
 TabletDriverGUI/MainWindow.xaml.cs            |  64 ++-
 TabletDriverService/Logger.cpp                |   1 +
 TabletDriverService/Logger.h                  |   1 +
 TabletDriverService/Main.cpp                  |  21 +-
 TabletDriverService/OutputVMultiAbsolute.cpp  |   2 +-
 TabletDriverService/ProcessCommand.cpp        |  54 ++-
 TabletDriverService/Tablet.cpp                |  14 +-
 TabletDriverService/Tablet.h                  |   4 +-
 TabletDriverService/TabletFilter.h            |   4 +-
 .../TabletFilterAntiSmoothing.cpp             |  96 +++--
 .../TabletFilterAntiSmoothing.h               |  32 +-
 .../TabletFilterNoiseReduction.cpp            |  16 +-
 .../TabletFilterNoiseReduction.h              |   4 +-
 TabletDriverService/TabletFilterPeak.cpp      |   4 +-
 TabletDriverService/TabletFilterPeak.h        |   2 +-
 TabletDriverService/TabletFilterSmoothing.cpp |   7 +-
 TabletDriverService/TabletFilterSmoothing.h   |   2 +-
 TabletDriverService/TabletFilterTester.cpp    | 205 ++++------
 TabletDriverService/TabletFilterTester.h      |  28 +-
 TabletDriverService/TabletState.cpp           |   1 +
 TabletDriverService/TabletState.h             |   2 +
 TabletDriverService/VMulti.cpp                |   5 +
 TabletDriverService/Vector2D.cpp              |   6 +
 TabletDriverService/Vector2D.h                |   1 +
 26 files changed, 584 insertions(+), 381 deletions(-)

diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index ff0a9f5..8d7d2f5 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -33,10 +33,15 @@ public enum OutputModes
         public bool SmoothingEnabled;
 
         // Noise filter
-        public int NoiseFilterSamples;
+        public int NoiseFilterBuffer;
         public double NoiseFilterThreshold;
         public bool NoiseFilterEnabled;
 
+        // Anti-smoothing filter
+        public double AntiSmoothingShape;
+        public double AntiSmoothingCompensation;
+        public bool AntiSmoothingEnabled;
+
         public Area DesktopSize;
         public bool AutomaticDesktopSize;
 
@@ -90,13 +95,17 @@ public Configuration()
             SmoothingInterval = 4;
 
             NoiseFilterEnabled = false;
-            NoiseFilterSamples = 10;
+            NoiseFilterBuffer = 10;
             NoiseFilterThreshold = 0.5;
 
+            AntiSmoothingEnabled = false;
+            AntiSmoothingShape = 0.5;
+            AntiSmoothingCompensation = 4.0;
+
             CommandsAfter = new string[] { "" };
             CommandsBefore = new string[] { "" };
 
-            WindowWidth = 800;
+            WindowWidth = 700;
             WindowHeight = 710;
 
             RunAtStartup = false;
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 5b1f491..548ac1f 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:TabletDriverGUI"
         mc:Ignorable="d"
-        Title="TabletDriverGUI" Height="703" Width="750"
+        Title="TabletDriverGUI" Height="703" Width="680"
         >
   <Window.Resources>
     <Style TargetType="GroupBox">
@@ -34,16 +34,22 @@
     </DockPanel>
 
     <TabControl Name="tabControl" Margin="0,20,0,59"  Selector.IsSelected="True" Background="White">
-      <TabItem Header="Settings">
+
+      <!-- General settings -->
+      <TabItem>
+        <TabItem.Header>
+          <TextBlock Foreground="#006600" FontWeight="Bold">Settings</TextBlock>
+        </TabItem.Header>
+
         <ScrollViewer VerticalScrollBarVisibility="Auto">
-          <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
+          <StackPanel Orientation="Vertical" HorizontalAlignment="Left" Margin="5,0">
 
             <!-- Screen Mapping -->
             <GroupBox Header="Screen Map" VerticalAlignment="Top" HorizontalAlignment="Left" Width="650">
 
               <GroupBox.ToolTip>
                 <StackPanel>
-                  <TextBlock FontWeight="Bold">
+                  <TextBlock FontWeight="Bold" FontSize="16">
                     Screen Map
                   </TextBlock>
                   <TextBlock>
@@ -131,7 +137,7 @@
             <GroupBox Header="Tablet Area" VerticalAlignment="Top" HorizontalAlignment="Left" Width="650" Margin="0,5,0,5">
               <GroupBox.ToolTip>
                 <StackPanel>
-                  <TextBlock FontWeight="Bold">
+                  <TextBlock FontWeight="Bold" FontSize="16">
                     Tablet Area
                   </TextBlock>
                   <TextBlock>
@@ -189,7 +195,7 @@
 
 
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                      
+
                       <!-- Draw Area -->
                       <Button Name="buttonDrawArea" Content="Draw Area" Width="80"
                             Padding="5 5 5 5" Margin="5 5 0 5"
@@ -310,7 +316,7 @@
               <GroupBox Header="Button Mapping" VerticalAlignment="Top" HorizontalAlignment="Left" Height="73">
                 <GroupBox.ToolTip>
                   <StackPanel>
-                    <TextBlock FontWeight="Bold">
+                    <TextBlock FontWeight="Bold" FontSize="16">
                     Button Mapping
                     </TextBlock>
                     <TextBlock>
@@ -357,7 +363,7 @@
                         >
                 <GroupBox.ToolTip>
                   <StackPanel>
-                    <TextBlock FontWeight="Bold">
+                    <TextBlock FontWeight="Bold" FontSize="16">
                     Desktop Size
                     </TextBlock>
                     <TextBlock>
@@ -396,143 +402,293 @@
               </GroupBox>
 
 
-          
-            </StackPanel>
-
-
-            <!-- Desktop Size -->
-            <StackPanel Orientation="Horizontal"  HorizontalAlignment="Center">
 
+            </StackPanel>
 
+          </StackPanel>
+        </ScrollViewer>
+      </TabItem>
 
-              <!-- Smoothing -->
-              <GroupBox Name="groupSmoothingFilter" Header="Smoothing Filter" VerticalAlignment="Bottom" Margin="5,0,0,0" HorizontalAlignment="Left"
-                        >
-                <GroupBox.ToolTip>
-                  <StackPanel>
+      <TabItem>
+        <TabItem.Header>
+          <TextBlock Foreground="#000099" FontWeight="Bold">Filters</TextBlock>
+        </TabItem.Header>
+        <ScrollViewer VerticalScrollBarVisibility="Auto" Foreground="Black">
+          <StackPanel Orientation="Vertical" HorizontalAlignment="Left" Margin="5,0">
+
+            <!-- Smoothing filter -->
+            <GroupBox Name="groupSmoothingFilter" Header="Smoothing Filter"
+                      VerticalAlignment="Bottom"
+                      HorizontalAlignment="Left"
+                      Margin="0"
+                      Width="300"
+            >
+              <GroupBox.ToolTip>
+                <StackPanel>
+                  <TextBlock FontWeight="Bold" FontSize="16">
+                    Smoothing Filter
+                  </TextBlock>
+                  <TextBlock>
+                    Smoothing filter adds latency to the input, so don't enable it if you want to have the lowest possible input latency.
+                    <LineBreak/>
+                    Check the checkbox to enable the filter.
+                    <LineBreak/>
+                    <LineBreak/>
                     <TextBlock FontWeight="Bold">
-                    Cursor position smoothing filter
-                    </TextBlock>
-                    <TextBlock>
-                      - Smoothing filter adds latency to the input, so don't enable it if you want to have the lowest possible input latency.
-                      <LineBreak/>
-                      - On Wacom tablets you can use latency value between 15 and 25 to have a similar smoothing as in the Wacom drivers.
-                      <LineBreak/>
-                      - You can test out different filter values, but recommended maximum for osu! is around 50 milliseconds.
-                      <LineBreak/>
-                      - Filter latency value lower than 4 milliseconds isn't recommended. It is just better to disable the smoothing filter.
-                      <LineBreak/>
-                      - You don't have to change the filter rate, but you can use the highest rate your computer can run without performance problems.
+                      Recommendations
                     </TextBlock>
-                  </StackPanel>
-                </GroupBox.ToolTip>
-
-                <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+                    <LineBreak/>
+                    On Wacom tablets you can use latency value between 15 and 25 to have a similar smoothing as in the Wacom drivers.
+                    <LineBreak/>
+                    You can test out different filter values, but recommended maximum for osu! is around 50 milliseconds.
+                    <LineBreak/>
+                    Filter latency value lower than 4 milliseconds isn't recommended. It is just better to disable the smoothing filter.
+                    <LineBreak/>
+                    You don't have to change the filter rate, but you can use the highest rate your computer can run without performance problems.
+                  </TextBlock>
+                </StackPanel>
+              </GroupBox.ToolTip>
 
-                  <!-- Filter Latency -->
-                  <GroupBox Header="Latency" Height="50" Width="80" Margin="0,0,0,0">
-                    <Grid>
-                      <TextBox Name="textSmoothingLatency" Padding="4,0,0,0"
-                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                               TextChanged="TextChanged">0</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">ms</Label>
-                    </Grid>
-                  </GroupBox>
+              <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
 
-                  <!-- Filter Rate -->
-                  <GroupBox Header="Rate" VerticalAlignment="Top" HorizontalAlignment="Left" Width="85" Height="50">
-                    <ComboBox Name="comboBoxSmoothingRate" SelectionChanged="ItemSelectionChanged" VerticalContentAlignment="Center">
-                      <ComboBoxItem>1000 Hz</ComboBoxItem>
-                      <ComboBoxItem>500 Hz</ComboBoxItem>
-                      <ComboBoxItem>333 Hz</ComboBoxItem>
-                      <ComboBoxItem Selector.IsSelected="True">250 Hz</ComboBoxItem>
-                      <ComboBoxItem>125 Hz</ComboBoxItem>
-                    </ComboBox>
-                  </GroupBox>
 
-                  <!-- Filter enabled -->
-                  <CheckBox Name="checkBoxSmoothing"
+                <!-- Filter enabled -->
+                <CheckBox Name="checkBoxSmoothing"
                             VerticalAlignment="Center"
-                            Margin="5"
+                            Margin="5,10,5,0"
                             Checked="CheckboxChanged" Unchecked="CheckboxChanged">
-                    Enabled
-                  </CheckBox>
-                </StackPanel>
-              </GroupBox>
+                </CheckBox>
 
 
+                <!-- Filter Latency -->
+                <GroupBox Header="Latency" Height="50" Width="80" Margin="0,0,0,0">
+                  <Grid>
+                    <TextBox Name="textSmoothingLatency" Padding="4,0,0,0"
+                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
+                               TextChanged="TextChanged">0</TextBox>
+                    <Label Width="30" HorizontalAlignment="Right">ms</Label>
+                  </Grid>
+                </GroupBox>
+
+                <!-- Filter Rate -->
+                <GroupBox Header="Rate" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90" Height="50">
+                  <ComboBox Name="comboBoxSmoothingRate" SelectionChanged="ItemSelectionChanged" VerticalContentAlignment="Center">
+                    <ComboBoxItem>1000 Hz</ComboBoxItem>
+                    <ComboBoxItem>500 Hz</ComboBoxItem>
+                    <ComboBoxItem>333 Hz</ComboBoxItem>
+                    <ComboBoxItem Selector.IsSelected="True">250 Hz</ComboBoxItem>
+                    <ComboBoxItem>125 Hz</ComboBoxItem>
+                  </ComboBox>
+                </GroupBox>
+
+              </StackPanel>
+            </GroupBox>
 
-              <!-- Noise filter -->
-              <GroupBox Name="groupNoiseFilter" Header="Noise Reduction Filter" VerticalAlignment="Bottom" Margin="5,0,0,0" HorizontalAlignment="Left"
+            <!-- Noise filter -->
+            <GroupBox Name="groupNoiseFilter" Header="Noise Reduction Filter"
+                      VerticalAlignment="Bottom"
+                      HorizontalAlignment="Left"
+                      Margin="0,5,0,0" 
+                      Width="300"
                         >
-                <GroupBox.ToolTip>
-                  <StackPanel>
+              <GroupBox.ToolTip>
+                <StackPanel>
+                  <TextBlock FontWeight="Bold" FontSize="16">
+                    Noise Reduction Filter
+                  </TextBlock>
+                  <TextBlock>
+                    It is recommend to use this filter only with older Wacom tablets.
+                    <LineBreak/>
+                    Check the checkbox to enable the filter.
+                    <LineBreak/>
+                    <LineBreak/>
                     <TextBlock FontWeight="Bold">
-                    Pen signal noise reduction filter
+                      Buffer
                     </TextBlock>
-                    <TextBlock>
-                      - It is recommend only to use this filter with older Wacom tablets.
-                      <LineBreak/>
-                      - Noise filter adds latency to the input, so don't enable it if you want to have the lowest possible input latency.
-                      <LineBreak/>
-                      - Samples value means how many pen positions will be stored to filter buffer. Lower value means lower latency, but lower noise reduction.
-                      <LineBreak/>
-                      - Threshold value is the limit where the noise reduction will be at maximum strength.
-                      <LineBreak/>
-                      - If the pen position moves suddenly more than this threshold, then noise reduction will be lower.
-                      <LineBreak/>
-                      - Recommended values: samples 5 - 20, threshold 0.2 - 1.0 mm.
-                      <LineBreak/>
-                      - You can try larger filter settings, but at some point the latency will be very noticable.
-                      <LineBreak/>
-                      - If the pen movement is greatly faster than the threshold value then the noise reduction and latency caused by the filter is almost zero. 
+                    <LineBreak/>
+                    Buffer value means how many latest pen positions will be stored in buffer.
+                    <LineBreak/>
+                    Lower buffer value means lower latency, but lower noise reduction.
+                    <LineBreak/>
+                    At 133 RPS report rate the buffer size of 10 means maximum latency of 75 milliseconds.
+                    <LineBreak/>
+                    <LineBreak/>
+                    <TextBlock FontWeight="Bold">
+                      Threshold
                     </TextBlock>
-                  </StackPanel>
-                </GroupBox.ToolTip>
+                    <LineBreak/>
+                    Threshold value sets the movement distance threshold per pen position report.
+                    <LineBreak/>
+                    The amount of noise reduction will be at the maximum if the pen movement is shorter than the threshold value.
+                    <LineBreak/>
+                    Noise reduction and latency will be almost zero if the pen position movement is double the distance of the threshold value.
+                    <LineBreak/>
+                    At 133 RPS report rate a 0.5 mm threshold value means speeds of ~66.5 mm/s and the noise reduction and latency will be almost zero at ~133 mm/s.
+                    <LineBreak/>
+                    <LineBreak/>
+                    <TextBlock FontWeight="Bold">
+                      Recommendations
+                    </TextBlock>
+                    <LineBreak/>
+                    Recommended values: Samples = 5 - 20, Threshold = 0.2 - 1.0 mm.
+                    <LineBreak/>
+                    You can use "Benchmark" command in the console to test out your tablet's noise performance.
+                    <LineBreak/>
+                    Tablet benchmark will give you a recommended threshold value, but you can use larger value if you hover.
+                  </TextBlock>
+                </StackPanel>
+              </GroupBox.ToolTip>
 
 
-                <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+              <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
 
-                  <!-- Noise filter samples -->
-                  <GroupBox Header="Samples" Height="50" Width="80" Margin="0,0,0,0">
-                      <TextBox Name="textNoiseSamples" Padding="4,0,0,0"
+                <!-- Noise filter enabled -->
+                <CheckBox Name="checkBoxNoiseFilter"
+                            VerticalAlignment="Center"
+                            Margin="5,10,5,0"
+                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">
+                </CheckBox>
+
+                <!-- Noise filter buffer size -->
+                <GroupBox Header="Buffer" Height="50" Margin="0,0,0,0">
+                  <TextBox Name="textNoiseBuffer" Padding="4,0,0,0"
                                HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
                                TextChanged="TextChanged">10</TextBox>
-                  </GroupBox>
+                </GroupBox>
 
-                  <!-- Noise filter threshold -->
-                  <GroupBox Header="Threshold" Height="50" Width="80" Margin="0,0,0,0">
-                    <Grid>
-                      <TextBox Name="textNoiseThreshold" Padding="4,0,0,0"
+                <!-- Noise filter threshold -->
+                <GroupBox Header="Threshold" Height="50" Width="80" Margin="0,0,0,0">
+                  <Grid>
+                    <TextBox Name="textNoiseThreshold" Padding="4,0,0,0"
                                HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
                                TextChanged="TextChanged">1.0</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">mm</Label>
-                    </Grid>
-                  </GroupBox>
-                  
-                  <!-- Noise filter enabled -->
-                  <CheckBox Name="checkBoxNoiseFilter"
-                            VerticalAlignment="Center"
-                            Margin="5"
-                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">
-                    Enabled
-                  </CheckBox>
-                </StackPanel>
+                    <Label Width="30" HorizontalAlignment="Right">mm</Label>
+                  </Grid>
+                </GroupBox>
+
+              </StackPanel>
 
 
-              </GroupBox>
+            </GroupBox>
+
+            <!-- Anti-smoothing filter -->
+            <GroupBox Name="groupAntiSmoothingFilter" Header="Anti-smoothing Filter"
+                      VerticalAlignment="Bottom"
+                      HorizontalAlignment="Left"
+                      Margin="0,5,0,0"
+                      Width="300"
+            >
+              <GroupBox.ToolTip>
+                <StackPanel>
+                  <TextBlock FontWeight="Bold" FontSize="16">
+                    Anti-smoothing Filter
+                  </TextBlock>
+                  <TextBlock>
+                    It is recommend to use this filter only with tablets that do the pen position smoothing in hardware/firmware.
+                    <LineBreak/>
+                    <TextBlock Foreground="#990000">
+                      WARNING! Some tablets will send broken position data when the pen buttons are pressed, so don't press buttons...
+                    </TextBlock>
+                    <LineBreak/>
+                    Check the checkbox to enable the filter.
+                    <LineBreak/>
+                    <LineBreak/>
+                    <TextBlock FontWeight="Bold">
+                    Shape
+                    </TextBlock>
+                    <LineBreak/>
+                    Shape value is the how the filter handles pen acceleration. Start with a neutral 0.5 shape value and try to keep it around that.
+                    <LineBreak/>
+                    Use a lower value when there are are too much artifacts in sharp corners and increase the value if corners are too smooth.
+                    <LineBreak/>
+                    <LineBreak/>
+                    <TextBlock FontWeight="Bold">
+                    Compensation
+                    </TextBlock>
+                    <LineBreak/>                    
+                    Compensation value is the amount of latency compensation.
+                    <LineBreak/>
+                    You can test out the compensation value by spinning the pen in circles with different speeds.
+                    <LineBreak/>
+                    Circle size shouldn't change too much with different spinning speeds.
+                    <LineBreak/>
+                    Use lower compensation value if there are too much artifacting at high speeds.
+                    <LineBreak/>
+                    Try to find a balance between response time and artifacting.
+                    <LineBreak/>
+                    <LineBreak/>
+                    <TextBlock FontWeight="Bold">
+                      Recommended value ranges
+                    </TextBlock>
+                    <LineBreak/>
+                    Shape: 0.1 - 0.9
+                    <LineBreak/>
+                    Compensation: 2.0 - 8.0
+                    <LineBreak/>
+                    <LineBreak/>                    
+                    <TextBlock FontWeight="Bold">
+                    Example values:
+                    </TextBlock>
+                    <LineBreak/>
+                    <TextBlock Margin="5,0,0,0">
+                      <TextBlock FontWeight="Bold">Gaomon S56K:</TextBlock>
+                      Shape 0.7, Compensation = 5.0
+                      <LineBreak/>                     
+                      <TextBlock FontWeight="Bold">Huion 420 &amp; H420:</TextBlock>
+                      Shape = 0.5, Compensation = 3.5
+                      <LineBreak/>
+                      <TextBlock FontWeight="Bold">Huion H430P &amp; H640P:</TextBlock>
+                      Shape = 0.7, Compensation = 6.0 - 8.0
+                      <LineBreak/>
+                      <TextBlock FontWeight="Bold">XP-PEN G430 &amp; G640:</TextBlock>
+                      Shape = 0.5, Compensation = 3.5, Invalid low speed data, use noise reduction 10/0.5 mm
+                      <LineBreak/>                   
+                      <TextBlock FontWeight="Bold">Wacom CTL-490 Hover:</TextBlock>
+                      Shape = 0.5, Compensation = 3.5
+                      </TextBlock>
+                  </TextBlock>
+                </StackPanel>
+              </GroupBox.ToolTip>
 
+              <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
 
+                <!-- Anti-smoothing filter enabled -->
+                <CheckBox Name="checkBoxAntiSmoothing"
+                            VerticalAlignment="Center"
+                            Margin="5,10,5,0"
+                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">
+                </CheckBox>
+
+                <!-- Anti-smoothing power -->
+                <GroupBox Header="Shape" Height="50" Margin="0,0,0,0">
+                  <TextBox Name="textAntiSmoothingShape" Padding="4,0,0,0"
+                      HorizontalContentAlignment="Left"
+                      VerticalContentAlignment="Center"
+                      TextChanged="TextChanged"
+                  >0.3</TextBox>
+                </GroupBox>
+
+                <!-- Anti-smoothing compensation -->
+                <GroupBox Header="Compensation" Height="50" Margin="0,0,0,0">
+                  <TextBox Name="textAntiSmoothingCompensation" Padding="4,0,0,0"
+                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
+                               TextChanged="TextChanged">20</TextBox>
+                </GroupBox>
 
+              </StackPanel>
 
 
-            </StackPanel>
+            </GroupBox>
+
 
           </StackPanel>
         </ScrollViewer>
       </TabItem>
+
+
+
       <TabItem Name="tabCommands" Header="Commands">
-        <Grid>
+        <Grid Margin="5,0">
           <!-- Define Columns -->
           <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
@@ -568,7 +724,7 @@
         </Grid>
       </TabItem>
       <TabItem Name="tabConsole" Header="Console">
-        <Grid>
+        <Grid Margin="5,0">
           <ScrollViewer Name="scrollConsole" Margin="5,5,5,30"
                         VerticalScrollBarVisibility="Auto"
                         HorizontalScrollBarVisibility="Auto">
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 9514412..5dd6134 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -24,7 +24,7 @@ public partial class MainWindow : Window
     {
 
         // Version
-        public string Version = "0.1.5";
+        public string Version = "0.2";
 
         // Console stuff
         private List<string> commandHistory;
@@ -507,20 +507,38 @@ private void LoadSettingsFromConfiguration()
             // Noise filter
             //
             checkBoxNoiseFilter.IsChecked = config.NoiseFilterEnabled;
-            textNoiseSamples.Text = Utils.GetNumberString(config.NoiseFilterSamples);
+            textNoiseBuffer.Text = Utils.GetNumberString(config.NoiseFilterBuffer);
             textNoiseThreshold.Text = Utils.GetNumberString(config.NoiseFilterThreshold);
             if (config.NoiseFilterEnabled)
             {
-                textNoiseSamples.IsEnabled = true;
+                textNoiseBuffer.IsEnabled = true;
                 textNoiseThreshold.IsEnabled = true;
             }
             else
             {
-                textNoiseSamples.IsEnabled = false;
+                textNoiseBuffer.IsEnabled = false;
                 textNoiseThreshold.IsEnabled = false;
             }
 
 
+            //
+            // Anti-smoothing filter
+            //
+            checkBoxAntiSmoothing.IsChecked = config.AntiSmoothingEnabled;
+            textAntiSmoothingShape.Text = Utils.GetNumberString(config.AntiSmoothingShape, "0.00");
+            textAntiSmoothingCompensation.Text = Utils.GetNumberString(config.AntiSmoothingCompensation, "0.00");
+            if (config.AntiSmoothingEnabled)
+            {
+                textAntiSmoothingShape.IsEnabled = true;
+                textAntiSmoothingCompensation.IsEnabled = true;
+            }
+            else
+            {
+                textAntiSmoothingShape.IsEnabled = false;
+                textAntiSmoothingCompensation.IsEnabled = false;
+            }
+
+
             //
             // Run at startup
             //
@@ -669,21 +687,38 @@ private void UpdateSettingsToConfiguration()
 
             // Noise filter
             config.NoiseFilterEnabled = (bool)checkBoxNoiseFilter.IsChecked;
-            if (Utils.ParseNumber(textNoiseSamples.Text, out val))
-                config.NoiseFilterSamples = (int)val;
+            if (Utils.ParseNumber(textNoiseBuffer.Text, out val))
+                config.NoiseFilterBuffer = (int)val;
             if (Utils.ParseNumber(textNoiseThreshold.Text, out val))
                 config.NoiseFilterThreshold = val;
             if (config.NoiseFilterEnabled)
             {
-                textNoiseSamples.IsEnabled = true;
+                textNoiseBuffer.IsEnabled = true;
                 textNoiseThreshold.IsEnabled = true;
             }
             else
             {
-                textNoiseSamples.IsEnabled = false;
+                textNoiseBuffer.IsEnabled = false;
                 textNoiseThreshold.IsEnabled = false;
             }
 
+            // Anti-smoothing filter
+            config.AntiSmoothingEnabled = (bool)checkBoxAntiSmoothing.IsChecked;
+            if (Utils.ParseNumber(textAntiSmoothingShape.Text, out val))
+                config.AntiSmoothingShape = val;
+            if (Utils.ParseNumber(textAntiSmoothingCompensation.Text, out val))
+                config.AntiSmoothingCompensation = val;
+            if (config.AntiSmoothingEnabled)
+            {
+                textAntiSmoothingShape.IsEnabled = true;
+                textAntiSmoothingCompensation.IsEnabled = true;
+            }
+            else
+            {
+                textAntiSmoothingShape.IsEnabled = false;
+                textAntiSmoothingCompensation.IsEnabled = false;
+            }
+
 
 
             //
@@ -1791,13 +1826,24 @@ private void SendSettingsToDriver()
             // Noise filter
             if (config.NoiseFilterEnabled)
             {
-                driver.SendCommand("Noise " + Utils.GetNumberString(config.NoiseFilterSamples) + " " + Utils.GetNumberString(config.NoiseFilterThreshold));
+                driver.SendCommand("Noise " + Utils.GetNumberString(config.NoiseFilterBuffer) + " " + Utils.GetNumberString(config.NoiseFilterThreshold));
             }
             else
             {
                 driver.SendCommand("Noise 0");
             }
 
+
+            // Anti-smoothing filter
+            if (config.AntiSmoothingEnabled)
+            {
+                driver.SendCommand("AntiSmoothing " + Utils.GetNumberString(config.AntiSmoothingShape) + " " + Utils.GetNumberString(config.AntiSmoothingCompensation));
+            }
+            else
+            {
+                driver.SendCommand("AntiSmoothing 0");
+            }
+
             // Commands after settings
             if (config.CommandsAfter.Length > 0)
             {
diff --git a/TabletDriverService/Logger.cpp b/TabletDriverService/Logger.cpp
index 2b66539..af586bb 100644
--- a/TabletDriverService/Logger.cpp
+++ b/TabletDriverService/Logger.cpp
@@ -8,6 +8,7 @@ Logger::Logger() {
 	verbosity = LogLevelDebug;
 	newMessage = false;
 	directPrint = false;
+	debugEnabled = false;
 }
 
 
diff --git a/TabletDriverService/Logger.h b/TabletDriverService/Logger.h
index dd20b89..a3cfe38 100644
--- a/TabletDriverService/Logger.h
+++ b/TabletDriverService/Logger.h
@@ -93,6 +93,7 @@ class Logger {
 	};
 	bool isRunning;
 	bool directPrint;
+	bool debugEnabled;
 	string logFilename = "";
 
 	void OutputMessage(LogItem *message);
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index 4ae4fb9..c1b27eb 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -80,7 +80,12 @@ void RunTabletThread() {
 			} else {
 				continue;
 			}
-			// Reading failed
+
+		// Ignore report
+		} else if(status == Tablet::ReportIgnore) {
+			continue;
+
+		// Reading failed
 		} else {
 			LOG_ERROR("Tablet Read Error!\n");
 			CleanupAndExit(1);
@@ -95,7 +100,7 @@ void RunTabletThread() {
 		}
 
 		// Debug messages
-		if(tablet->debugEnabled) {
+		if(logger.debugEnabled) {
 			timeNow = chrono::high_resolution_clock::now();
 			double delta = (timeNow - timeBegin).count() / 1000000.0;
 			LOG_DEBUG("STATE: %0.3f, %d, %0.3f, %0.3f, %0.3f\n",
@@ -129,7 +134,7 @@ void RunTabletThread() {
 				if(filter != NULL && filter->isEnabled) {
 
 					// Process
-					filter->SetTarget(tablet->state.position);
+					filter->SetTarget(&tablet->state);
 					filter->Update();
 					filter->GetPosition(&tablet->state.position);
 				}
@@ -172,6 +177,10 @@ VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWa
 		return;
 	}
 
+	memcpy(&outputState, &tablet->state, sizeof(outputState));
+	
+
+
 	// Loop through filters
 	for(int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
 
@@ -186,13 +195,13 @@ VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWa
 		}
 
 		// Set filter targets
-		filter->SetTarget(position);
+		filter->SetTarget(&outputState);
 
 		// Update filter position
 		filter->Update();
 
 		// Set output vector
-		filter->GetPosition(&position);
+		filter->GetPosition(&outputState.position);
 
 	}
 
@@ -200,8 +209,6 @@ VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWa
 		return;
 	}
 
-	memcpy(&outputState, &tablet->state, sizeof(outputState));
-	outputState.position.Set(position);
 	SetOutput(&outputState);
 }
 
diff --git a/TabletDriverService/OutputVMultiAbsolute.cpp b/TabletDriverService/OutputVMultiAbsolute.cpp
index 1746742..a275c53 100644
--- a/TabletDriverService/OutputVMultiAbsolute.cpp
+++ b/TabletDriverService/OutputVMultiAbsolute.cpp
@@ -37,7 +37,7 @@ bool OutputVMultiAbsolute::Set(unsigned char buttons, double x, double y, double
 	report.wheel = 0;
 	vmulti->SetReport(&report, sizeof(report));
 
-	if(debugEnabled) {
+	if(logger.debugEnabled) {
 		LOG_DEBUGBUFFER(&report, 9, "Report: ");
 	}
 
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 4e3b0f2..1d890b2 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -611,20 +611,20 @@ bool ProcessCommand(CommandLine *cmd) {
 		// Enable
 		} else {
 
-			double power = cmd->GetDouble(0, 1.0);
-			double multiplier = cmd->GetDouble(1, 1.0);
+			double shape = cmd->GetDouble(0, 1.0);
+			double compensation = cmd->GetDouble(1, 1.0);
 
-			if(power <= 0) {
+			if(shape <= 0) {
 				tablet->antiSmoothing.isEnabled = false;
 				LOG_INFO("Anti-smoothing = off\n");
 			}
 			else {
-				tablet->antiSmoothing.power = power;
-				tablet->antiSmoothing.multiplier = multiplier;
+				tablet->antiSmoothing.shape = shape;
+				tablet->antiSmoothing.compensation = compensation;
 				tablet->antiSmoothing.isEnabled = true;
-				LOG_INFO("Anti-smoothing = P:%0.2f M:%0.2f\n",
-					tablet->antiSmoothing.power,
-					tablet->antiSmoothing.multiplier
+				LOG_INFO("Anti-smoothing = Shape:%0.2f Compensation:%0.2f\n",
+					tablet->antiSmoothing.shape,
+					tablet->antiSmoothing.compensation
 				);
 			}
 		}
@@ -640,12 +640,17 @@ bool ProcessCommand(CommandLine *cmd) {
 		string outputFilepath = cmd->GetStringLower(2, "tester_output.txt");
 		TabletFilter *filter = NULL;
 		TabletFilterTester *tester = NULL;
+		char settingsString[1024];
 
 		if(filterName.compare(0, 4, "anti") == 0) {
 			LOG_DEBUG("Anti!\n");
 			filter = new TabletFilterAntiSmoothing();
-			((TabletFilterAntiSmoothing*)filter)->power = tablet->antiSmoothing.power;
-			((TabletFilterAntiSmoothing*)filter)->multiplier = tablet->antiSmoothing.multiplier;
+			((TabletFilterAntiSmoothing*)filter)->shape = tablet->antiSmoothing.shape;
+			((TabletFilterAntiSmoothing*)filter)->compensation = tablet->antiSmoothing.compensation;
+			sprintf_s(settingsString, "settings AntiSmoothing shape=%0.3f compensation=%0.3f",
+				tablet->antiSmoothing.shape,
+				tablet->antiSmoothing.compensation
+			);
 
 		} else if(filterName.compare(0, 5, "noise") == 0) {
 			filter = new TabletFilterNoiseReduction();
@@ -653,24 +658,32 @@ bool ProcessCommand(CommandLine *cmd) {
 			((TabletFilterNoiseReduction*)filter)->distanceThreshold = tablet->noise.distanceThreshold;
 			((TabletFilterNoiseReduction*)filter)->distanceMaximum = tablet->noise.distanceMaximum;
 			((TabletFilterNoiseReduction*)filter)->iterations = tablet->noise.iterations;
+			sprintf_s(settingsString, "settings NoiseReduction buffer=%d threshold=%0.3f maximum=%0.3f iterations=%d",
+				tablet->noise.buffer.length,
+				tablet->noise.distanceThreshold,
+				tablet->noise.distanceMaximum,
+				tablet->noise.iterations
+			);
 			
 
 		}
 		if(filter != NULL) {
 
+			logger.directPrint = true;
+
 			LOG_INFO("Filter test starting!\n");
-			Sleep(100);
+
 			tester = new TabletFilterTester(filter, inputFilepath, outputFilepath);
-			bool result = tester->Start();
+			bool result = tester->Open();
 			if(!result) {
-				LOG_ERROR("Filter tester startup failed!\n");
-			}
-			while(tester->isRunning) {
-				Sleep(100);
+				LOG_ERROR("Filter tester can't open files!\n");
 			}
-			tester->Stop();
+			tester->outputFile << settingsString << "\n";
+			tester->Run();
 			LOG_INFO("Filter test ended!\n");
-			Sleep(100);
+
+			logger.ProcessMessages();
+			logger.directPrint = false;
 
 		} else {
 			LOG_INFO("Usage: FilterTester <filter name>\n");
@@ -690,9 +703,8 @@ bool ProcessCommand(CommandLine *cmd) {
 	// Debug
 	else if(cmd->is("Debug")) {
 		if(!CheckTablet()) return true;
-		tablet->debugEnabled = cmd->GetBoolean(0, tablet->debugEnabled);
-		//vmulti->debugEnabled = tablet->debugEnabled;
-		LOG_INFO("Tablet debug = %s\n", tablet->debugEnabled ? "True" : "False");
+		logger.debugEnabled = cmd->GetBoolean(0, logger.debugEnabled);
+		LOG_INFO("Debug logging = %s\n", logger.debugEnabled ? "True" : "False");
 	}
 
 
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index de6b7e0..e302408 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -50,9 +50,11 @@ Tablet::Tablet() {
 	initReport = NULL;
 	initReportLength = 0;
 
-	// Filters
+	// Timed filters
 	filterTimed[0] = &smoothing;
 	filterTimedCount = 1;
+
+	// Report filters
 	filterReport[0] = &antiSmoothing;
 	filterReport[1] = &noise;
 	filterReportCount = 2;
@@ -67,9 +69,6 @@ Tablet::Tablet() {
 	// Tablet connection open
 	isOpen = false;
 
-	// Debug output
-	debugEnabled = false;
-
 	// Skip first reports, some of those might be invalid.
 	skipReports = 5;
 
@@ -229,7 +228,7 @@ int Tablet::ReadPosition() {
 
 	// Ignore mask
 	if(settings.ignoreMask > 0 && (reportData.buttons & settings.ignoreMask) == settings.ignoreMask) {
-		return Tablet::ReportPositionInvalid;
+		return Tablet::ReportIgnore;
 	}
 
 	//
@@ -260,6 +259,9 @@ int Tablet::ReadPosition() {
 	// Set valid
 	state.isValid = true;
 
+	state.time = chrono::high_resolution_clock::now();
+
+
 	// Button map
 	reportData.buttons = reportData.buttons & 0x0F;
 	state.buttons = 0;
@@ -306,7 +308,7 @@ bool Tablet::Read(void *buffer, int length) {
 	} else if(hidDevice != NULL) {
 		status = hidDevice->Read(buffer, length);
 	}
-	if(debugEnabled && status) {
+	if(logger.debugEnabled && status) {
 		LOG_DEBUGBUFFER(buffer, length, "Read: ");
 	}
 	return status;
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 08719ab..3d3e0fc 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -35,7 +35,8 @@ class Tablet {
 	enum TabletReportState {
 		ReportPositionInvalid = 0,
 		ReportValid = 1,
-		ReportInvalid = 2
+		ReportInvalid = 2,
+		ReportIgnore = 3
 	};
 
 	//
@@ -84,7 +85,6 @@ class Tablet {
 	//
 	string name = "Unknown";
 	bool isOpen;
-	bool debugEnabled;
 	int skipReports;
 
 	// Pen tip button keep down
diff --git a/TabletDriverService/TabletFilter.h b/TabletDriverService/TabletFilter.h
index b85d07d..8edbcd0 100644
--- a/TabletDriverService/TabletFilter.h
+++ b/TabletDriverService/TabletFilter.h
@@ -1,9 +1,11 @@
 #pragma once
 #include "Vector2D.h"
+#include "TabletState.h"
+#include <chrono>
 
 class TabletFilter {
 public:
-	virtual void SetTarget(Vector2D vector) = 0;
+	virtual void SetTarget(TabletState *tabletState) = 0;
 	virtual void SetPosition(Vector2D vector) = 0;
 	virtual bool GetPosition(Vector2D *vector) = 0;
 	virtual void Update() = 0;
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.cpp b/TabletDriverService/TabletFilterAntiSmoothing.cpp
index c701db1..47e85c8 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.cpp
+++ b/TabletDriverService/TabletFilterAntiSmoothing.cpp
@@ -10,17 +10,19 @@
 // Constructor
 //
 TabletFilterAntiSmoothing::TabletFilterAntiSmoothing() {
-	power = 1.0;
-	multiplier = 1;
+	shape = 1.0;
+	compensation = 1;
 
 	reportRate = 1;
 	velocity = 0;
 	acceleration = 0;
 	jerk = 0;
 
-	lastVelocity = 0;
-	lastAcceleration = 0;
-	lastJerk = 0;
+	oldVelocity = 0;
+	oldAcceleration = 0;
+	oldJerk = 0;
+
+	ignoreInvalidReports = 0;
 
 	timeBegin = chrono::high_resolution_clock::now();
 	timeLastReport = timeBegin;
@@ -38,9 +40,9 @@ TabletFilterAntiSmoothing::~TabletFilterAntiSmoothing() {
 //
 
 // Set target position
-void TabletFilterAntiSmoothing::SetTarget(Vector2D targetVector) {
-	latestTarget.Set(targetVector);
-	buffer.Add(targetVector);
+void TabletFilterAntiSmoothing::SetTarget(TabletState *tabletState) {
+	latestTarget.Set(tabletState->position);
+	timeNow = tabletState->time;
 }
 
 // Set position
@@ -59,34 +61,66 @@ bool TabletFilterAntiSmoothing::GetPosition(Vector2D *outputVector) {
 // Update
 void TabletFilterAntiSmoothing::Update() {
 
+	double timeDelta;
 	Vector2D predictedPosition;
 
 	// Report rate calculation (moving average)
-	timeNow = chrono::high_resolution_clock::now();
-	double timeDelta = (timeNow - timeLastReport).count() / 1000000.0;
+	timeDelta = (timeNow - timeLastReport).count() / 1000000.0;
 	if(timeDelta >= 1 && timeDelta <= 10) {
 		reportRate += ((1000.0 / timeDelta) - reportRate) * (timeDelta / 1000.0) / 0.1;
 	} else {
-		timeLastReport = timeNow;
-		return;
+		//timeLastReport = timeNow;
+		//return;
 	}
 	timeLastReport = timeNow;
 
 	// Velocity, acceleration and jerk calculation
-	velocity = latestTarget.Distance(lastTarget) * reportRate;
-	acceleration = (velocity - lastVelocity) * reportRate;
-	jerk = (acceleration - lastAcceleration) * reportRate;
+	velocity = latestTarget.Distance(oldTarget) * reportRate;
+	acceleration = (velocity - oldVelocity) * reportRate;
+	jerk = (acceleration - oldAcceleration) * reportRate;
+
+	//
+	// Invalid position data detection.
+	// Some tablets do send invalid/broken data when buttons are pressed.
+	//
+	// TODO: Improve this...
+	//
+	if(
+		timeDelta > 10
+		//||
+		//(abs(acceleration) > 30000 && abs(jerk) > 10000000)
+	) {
 
-	// Last values
-	lastVelocity = velocity;
-	lastAcceleration = acceleration;
-	lastJerk = jerk;
+		if(logger.debugEnabled) {
+			LOG_DEBUG("INVALID! V=%0.2f mm/s, A=%0.0f mm/s^2, J=%0.0f mm/s^3 D=%0.2f ms\n",
+				velocity,
+				acceleration,
+				jerk,
+				timeDelta
+			);
+		}
+		ignoreInvalidReports = 2;
+	}
 
 	// Velocity prediction
 	double predictedVelocity = velocity + (acceleration + jerk / reportRate) / reportRate;
 
+	// Skip invalid reports by setting the position as latest target
+	if(ignoreInvalidReports > 0) {
+		if(logger.debugEnabled) {
+			LOG_DEBUG("IGNORE! V=%0.2f mm/s, A=%0.0f mm/s^2, J=%0.0f mm/s^3 D=%0.2f ms\n",
+				velocity,
+				acceleration,
+				jerk,
+				timeDelta
+			);
+		}
+		position.Set(latestTarget);
+		ignoreInvalidReports--;
+
+
 	// Velocity validation
-	if(
+	} else if(
 		velocity > 0.1 && predictedVelocity > 0.1
 		&&
 		velocity < 2000 && predictedVelocity < 2000
@@ -95,11 +129,8 @@ void TabletFilterAntiSmoothing::Update() {
 		// Extrapolate a position by using the difference between predicted velocity and current velocity.
 		// LerpAdd (linear interpolation) method will move the position beyond the target position when the second parameter is larger than 1
 		//
-		// Power: Exponential prediction modifier
-		// Multiplier: Linear prediction modifier
-		// 
-		predictedPosition.Set(lastTarget);
-		predictedPosition.LerpAdd(latestTarget, pow(predictedVelocity / velocity * multiplier, power));
+		predictedPosition.Set(oldTarget);
+		predictedPosition.LerpAdd(latestTarget, pow(predictedVelocity / velocity, shape) * compensation);
 		position.Set(predictedPosition);
 
 	// Invalid velocity -> set the position to the latest target
@@ -109,11 +140,10 @@ void TabletFilterAntiSmoothing::Update() {
 
 
 	// Debug message
-	if(tablet->debugEnabled) {
+	if(logger.debugEnabled) {
 		double delta = position.Distance(latestTarget);
-		LOG_DEBUG("T=%0.0f B=%d T=[%0.2f,%0.2f] P=[%0.2f,%0.2f] D=%0.2f R=%0.2f V=%0.2f PV=%0.2f A=%0.0f J=%0.0f\n",
+		LOG_DEBUG("T=%0.0f T=[%0.2f,%0.2f] P=[%0.2f,%0.2f] D=%0.3f R=%0.2f V=%0.2f PV=%0.2f A=%0.0f J=%0.0f L=%0.2f\n",
 			(timeNow - timeBegin).count() / 1000000.0,
-			buffer.count,
 			latestTarget.x, latestTarget.y,
 			position.x, position.y,
 			delta,
@@ -121,12 +151,16 @@ void TabletFilterAntiSmoothing::Update() {
 			velocity,
 			predictedVelocity,
 			acceleration,
-			jerk
+			jerk,
+			(velocity > 0) ? (delta / velocity * 1000) : 0
 		);
 	}
 
-	// Set last target
-	lastTarget.Set(latestTarget);
+	// Update old values
+	oldVelocity = velocity;
+	oldAcceleration = acceleration;
+	oldJerk = jerk;
+	oldTarget.Set(latestTarget);
 
 
 
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.h b/TabletDriverService/TabletFilterAntiSmoothing.h
index a3f05ab..4846aae 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.h
+++ b/TabletDriverService/TabletFilterAntiSmoothing.h
@@ -7,34 +7,32 @@
 
 class TabletFilterAntiSmoothing : public TabletFilter {
 public:
-	PositionRingBuffer buffer;
 	Vector2D position;
 	Vector2D latestTarget;
-	Vector2D lastTarget;
+	Vector2D oldTarget;
 
-	double power;
-	double multiplier;
+	double shape;
+	double compensation;
 
+	void SetTarget(TabletState *tabletState);
+	void SetPosition(Vector2D vector);
+	bool GetPosition(Vector2D *outputVector);
+	void Update();
+
+	TabletFilterAntiSmoothing();
+	~TabletFilterAntiSmoothing();
+private:
 	double reportRate;
 	double velocity;
 	double acceleration;
 	double jerk;
-	double lastVelocity;
-	double lastAcceleration;
-	double lastJerk;
-
-
-
+	double oldVelocity;
+	double oldAcceleration;
+	double oldJerk;
+	int ignoreInvalidReports;
 	chrono::high_resolution_clock::time_point timeBegin;
 	chrono::high_resolution_clock::time_point timeLastReport;
 	chrono::high_resolution_clock::time_point timeNow;
 
-	void SetTarget(Vector2D targetVector);
-	void SetPosition(Vector2D vector);
-	bool GetPosition(Vector2D *outputVector);
-	void Update();
-
-	TabletFilterAntiSmoothing();
-	~TabletFilterAntiSmoothing();
 };
 
diff --git a/TabletDriverService/TabletFilterNoiseReduction.cpp b/TabletDriverService/TabletFilterNoiseReduction.cpp
index 8a91010..5b7b3f8 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.cpp
+++ b/TabletDriverService/TabletFilterNoiseReduction.cpp
@@ -30,9 +30,10 @@ TabletFilterNoiseReduction::~TabletFilterNoiseReduction() {
 //
 
 // Set target position
-void TabletFilterNoiseReduction::SetTarget(Vector2D targetVector) {
-	latestTarget.Set(targetVector);
-	buffer.Add(targetVector);
+void TabletFilterNoiseReduction::SetTarget(TabletState *tabletState) {
+	latestTarget.Set(tabletState->position);
+	buffer.Add(tabletState->position);
+	timeNow = tablet->state.time;
 }
 
 // Set position
@@ -52,7 +53,6 @@ bool TabletFilterNoiseReduction::GetPosition(Vector2D *outputVector) {
 void TabletFilterNoiseReduction::Update() {
 
 	// Report rate calculation
-	timeNow = chrono::high_resolution_clock::now();
 	double timeDelta = (timeNow - timeLastReport).count() / 1000000.0;
 	if(timeDelta >= 1 && timeDelta <= 10) {
 		reportRate += ((1000.0 / timeDelta) - reportRate) * (timeDelta / 1000.0) * 5.0;
@@ -60,8 +60,8 @@ void TabletFilterNoiseReduction::Update() {
 	timeLastReport = timeNow;
 
 	// Velocity calculation
-	double velocity = latestTarget.Distance(lastTarget) * reportRate;
-	lastTarget.Set(latestTarget);
+	double velocity = latestTarget.Distance(oldTarget) * reportRate;
+	oldTarget.Set(latestTarget);
 
 	
 
@@ -113,7 +113,7 @@ void TabletFilterNoiseReduction::Update() {
 			}
 
 			// Debug message
-			if(tablet->debugEnabled) {
+			if(logger.debugEnabled) {
 				LOG_DEBUG("Threshold! D=%0.2f mm, R=%0.2f, V=%0.2f mm/s, V2=%0.2f mm/s\n",
 					distance,
 					distanceRatio,
@@ -126,7 +126,7 @@ void TabletFilterNoiseReduction::Update() {
 	}
 
 	// Debug message
-	if(tablet->debugEnabled) {
+	if(logger.debugEnabled) {
 		double distance = position.Distance(latestTarget);
 		double latency;
 		if(velocity <= 0) {
diff --git a/TabletDriverService/TabletFilterNoiseReduction.h b/TabletDriverService/TabletFilterNoiseReduction.h
index 5d322bb..5357f2b 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.h
+++ b/TabletDriverService/TabletFilterNoiseReduction.h
@@ -11,7 +11,7 @@ class TabletFilterNoiseReduction : public TabletFilter {
 	PositionRingBuffer buffer;
 	Vector2D position;
 	Vector2D latestTarget;
-	Vector2D lastTarget;
+	Vector2D oldTarget;
 
 	int iterations;
 	double distanceThreshold;
@@ -22,7 +22,7 @@ class TabletFilterNoiseReduction : public TabletFilter {
 	chrono::high_resolution_clock::time_point timeNow;
 
 
-	void SetTarget(Vector2D targetVector);
+	void SetTarget(TabletState *tabletState);
 	void SetPosition(Vector2D vector);
 	bool GetPosition(Vector2D *outputVector);
 	void Update();
diff --git a/TabletDriverService/TabletFilterPeak.cpp b/TabletDriverService/TabletFilterPeak.cpp
index 22448e5..b8ae179 100644
--- a/TabletDriverService/TabletFilterPeak.cpp
+++ b/TabletDriverService/TabletFilterPeak.cpp
@@ -28,8 +28,8 @@ TabletFilterPeak::~TabletFilterPeak() {
 // TabletFilter methods
 //
 // Set target position
-void TabletFilterPeak::SetTarget(Vector2D targetVector) {
-	buffer.Add(targetVector);
+void TabletFilterPeak::SetTarget(TabletState *tabletState) {
+	buffer.Add(tabletState->position);
 }
 // Set position
 void TabletFilterPeak::SetPosition(Vector2D vector) {
diff --git a/TabletDriverService/TabletFilterPeak.h b/TabletDriverService/TabletFilterPeak.h
index 9396b49..611723e 100644
--- a/TabletDriverService/TabletFilterPeak.h
+++ b/TabletDriverService/TabletFilterPeak.h
@@ -10,7 +10,7 @@ class TabletFilterPeak : public TabletFilter {
 	Vector2D position;
 	double distanceThreshold;
 
-	void SetTarget(Vector2D targetVector);
+	void SetTarget(TabletState *tabletState);
 	void SetPosition(Vector2D vector);
 	bool GetPosition(Vector2D *outputVector);
 	void Update();
diff --git a/TabletDriverService/TabletFilterSmoothing.cpp b/TabletDriverService/TabletFilterSmoothing.cpp
index febe740..3be36d0 100644
--- a/TabletDriverService/TabletFilterSmoothing.cpp
+++ b/TabletDriverService/TabletFilterSmoothing.cpp
@@ -23,9 +23,8 @@ TabletFilterSmoothing::~TabletFilterSmoothing() {
 //
 
 // Set target position
-void TabletFilterSmoothing::SetTarget(Vector2D vector) {
-	this->target.x = vector.x;
-	this->target.y = vector.y;
+void TabletFilterSmoothing::SetTarget(TabletState *tabletState) {
+	target.Set(tabletState->position);
 }
 
 // Set current position
@@ -55,7 +54,7 @@ void TabletFilterSmoothing::Update() {
 		position.x += deltaX * weight;
 		position.y += deltaY * weight;
 
-	// Too small distance -> set output values as target values
+	// Too short distance -> set output values as target values
 	} else {
 		position.x = target.x;
 		position.y = target.y;
diff --git a/TabletDriverService/TabletFilterSmoothing.h b/TabletDriverService/TabletFilterSmoothing.h
index a55d176..6fee16b 100644
--- a/TabletDriverService/TabletFilterSmoothing.h
+++ b/TabletDriverService/TabletFilterSmoothing.h
@@ -14,7 +14,7 @@ class TabletFilterSmoothing : public TabletFilter {
 	TabletFilterSmoothing();
 	~TabletFilterSmoothing();
 
-	void SetTarget(Vector2D vector);
+	void SetTarget(TabletState *tabletState);
 	void SetPosition(Vector2D vector);
 	bool GetPosition(Vector2D *outputVector);
 	void Update();
diff --git a/TabletDriverService/TabletFilterTester.cpp b/TabletDriverService/TabletFilterTester.cpp
index 59fd803..2bb9cc2 100644
--- a/TabletDriverService/TabletFilterTester.cpp
+++ b/TabletDriverService/TabletFilterTester.cpp
@@ -10,21 +10,17 @@ TabletFilterTester::TabletFilterTester(TabletFilter *f, string input, string out
 	this->filter = f;
 	this->inputFilepath = input;
 	this->outputFilepath = output;
-	isRunning = false;
 }
 
 // Destructor
 TabletFilterTester::~TabletFilterTester() {
 }
 
+
 //
-// Start test
+// Open files
 //
-bool TabletFilterTester::Start() {
-
-	isRunning = false;
-	callback = TimerCallback;
-
+bool TabletFilterTester::Open() {
 
 	inputFile = ifstream(inputFilepath, ifstream::in);
 	if(!inputFile) return false;
@@ -32,147 +28,92 @@ bool TabletFilterTester::Start() {
 	outputFile = ofstream(outputFilepath, ofstream::out);
 	if(!outputFile) return false;
 
-
-	BOOL result = CreateTimerQueueTimer(
-		&timer,
-		NULL, callback,
-		this,
-		0,
-		1,
-		WT_EXECUTEDEFAULT
-	);
-	if(!result) return false;
-
-	firstReport = true;
-	isRunning = true;
-
-	timeNow = chrono::high_resolution_clock::now();
-	timeBegin = timeNow;
-	inputTimeOffset = 0;
-	nextInputTime = 0;
-	nextInputPosition.Set(0, 0);
-
-	return true;
-}
-
-
-//
-// Stop test
-//
-bool TabletFilterTester::Stop() {
-	if(timer == NULL) return false;
-	bool result = DeleteTimerQueueTimer(NULL, timer, NULL);
-	if(result) {
-		timer = NULL;
-	}
-	isRunning = false;
-
-	if(inputFile && inputFile.is_open()) {
-		inputFile.close();
-	}
-	if(outputFile && outputFile.is_open()) {
-		outputFile.close();
-	}
-	return result;
+	return false;
 }
 
 //
-// Timer tick
+// Run filter test
 //
-void TabletFilterTester::OnTimerTick() {
-	if(!isRunning) return;
-
-	timeNow = chrono::high_resolution_clock::now();
+void TabletFilterTester::Run() {
 
-	double timePosition = round((timeNow - timeBegin).count() / 1000000.0);
-	Vector2D newPosition;
-	double distance;
-
-	//LOG_DEBUG("TIME POSITION = %0.2f\n", timePosition);
-	if(timePosition > 100) {
-		//isRunning = false;
-	}
-
-	
+	double time;
+	chrono::high_resolution_clock::time_point timeBegin;
+	chrono::high_resolution_clock::time_point timeNow;
+	Vector2D position, newPosition;
 	string line;
+	bool firstReport;
+	double distance;
+	TabletState tabletState;
 
-	// EOF?
-	if(inputFile.eof()) {
-		isRunning = false;
-		return;
-	}
-
-
-	// Wait for the next report time
-	if(!firstReport && timePosition < nextInputTime) {
-		return;
-	}
-
-	// Time position reached the next input time
-	if(!firstReport && timePosition >= nextInputTime) {
-		
-		filter->SetTarget(nextInputPosition);
-		filter->Update();
-		filter->GetPosition(&newPosition);
+	firstReport = true;
 
-		distance = nextInputPosition.Distance(newPosition);
+	// Loop
+	while(!inputFile.eof()) {
 
-		LOG_DEBUG("Output: %0.0f/%0.0f ms, %0.2f, %0.2f (%0.3f mm)\n",
-			nextInputTime,
-			timePosition,
-			newPosition.x,
-			newPosition.y,
-			distance
-		);
+		// Read line from input file
+		try {
+			getline(inputFile, line);
+		} catch(exception) {
+			break;
+		}
 
-		
-		outputFile << "position " << nextInputTime << " " << newPosition.x << " " << newPosition.y << fixed << setprecision(2) << "\n";
+		// Parse input
+		CommandLine cmd(line);
+		if(cmd.is("position")) {
+			time = cmd.GetDouble(0, 0) ;
+			position.x = cmd.GetDouble(1, 0);
+			position.y = cmd.GetDouble(2, 0);
+			LOG_DEBUG("Input: %0.3f ms, %0.2f, %0.2f\n",
+				time,
+				position.x,
+				position.y
+			);
+
+			// Init settings on first report
+			if(firstReport) {
+				timeBegin = chrono::high_resolution_clock::now();
+				firstReport = false;
+				newPosition.Set(position);
+				LOG_DEBUG("First report: %0.3f, %0.2f, %0.2f\n", time, position.x, position.y);
+				
+			} else {
+				tabletState.time = timeNow;
+				tabletState.position.Set(position);
+				filter->SetTarget(&tabletState);
+				filter->Update();
+				filter->GetPosition(&newPosition);
+			}
+
+			timeNow = timeBegin + chrono::microseconds((int)(time * 1000.0));
+			distance = position.Distance(newPosition);
+
+			LOG_DEBUG("Output: %0.3f ms, %0.2f, %0.2f (%0.3f mm)\n",
+				time,
+				position.x,
+				position.y,
+				distance
+			);
+
+			outputFile << "position " << time << " " << newPosition.x << " " << newPosition.y << fixed << setprecision(2) << "\n";
 
 
+		}
 
 	}
 
+}
 
-
-	// Read input
-	try {
-		getline(inputFile, line);
-	} catch(exception) {
-		isRunning = false;
-		return;
+//
+// Close files
+//
+bool TabletFilterTester::Close() {
+	
+	if(inputFile && inputFile.is_open()) {
+		inputFile.close();
 	}
-
-	// Parse input
-	CommandLine cmd(line);
-	if(cmd.is("position")) {
-		Vector2D position, newPosition;
-		double time;
-
-		time = cmd.GetDouble(0, 0) - inputTimeOffset;
-		position.x = cmd.GetDouble(1, 0);
-		position.y = cmd.GetDouble(2, 0);
-		LOG_DEBUG("Input: %0.0f ms, %0.2f, %0.2f\n",
-			time,
-			position.x,
-			position.y
-		);
-		
-		// Init settings on first report
-		if(firstReport) {
-			inputTimeOffset = time;
-			timeBegin = timeNow;
-			firstReport = false;
-
-			nextInputTime = 0;
-			nextInputPosition.Set(position);
-
-			LOG_DEBUG("First report: %0.2f, %0.2f, %0.2f\n", inputTimeOffset, position.x, position.y);
-
-		} else {
-			nextInputTime = time;
-			nextInputPosition.Set(position);
-		}
+	if(outputFile && outputFile.is_open()) {
+		outputFile.close();
 	}
-	
 
-}
\ No newline at end of file
+	return true;
+}
diff --git a/TabletDriverService/TabletFilterTester.h b/TabletDriverService/TabletFilterTester.h
index 25ad2be..f075dbd 100644
--- a/TabletDriverService/TabletFilterTester.h
+++ b/TabletDriverService/TabletFilterTester.h
@@ -23,32 +23,12 @@ class TabletFilterTester {
 	ifstream inputFile;
 	ofstream outputFile;
 
-	bool firstReport;
-	double inputTime;
-	double inputTimeOffset;
-
-	double nextInputTime;
-	Vector2D nextInputPosition;
-
-
-
-	chrono::high_resolution_clock::time_point timeBegin;
-	chrono::high_resolution_clock::time_point timeNow;
-
-	bool isRunning;
-
 	TabletFilterTester(TabletFilter *filter, string inputFilepath, string outputFilepath);
 	~TabletFilterTester();
 
-	bool Start();
-	bool Stop();
-	void OnTimerTick();
-	
-private:
-	
-	static VOID CALLBACK TimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWaitFired) {
-		TabletFilterTester *tester = (TabletFilterTester *)lpParameter;
-		tester->OnTimerTick();
-	}
+	bool Open();
+	void Run();
+	bool Close();
+
 };
 
diff --git a/TabletDriverService/TabletState.cpp b/TabletDriverService/TabletState.cpp
index d9b28ff..a9bba4a 100644
--- a/TabletDriverService/TabletState.cpp
+++ b/TabletDriverService/TabletState.cpp
@@ -3,6 +3,7 @@
 
 
 TabletState::TabletState() {
+	time = chrono::high_resolution_clock::now();
 	buttons = 0;
 	position.x = 0;
 	position.y = 0;
diff --git a/TabletDriverService/TabletState.h b/TabletDriverService/TabletState.h
index da47fd5..8eab124 100644
--- a/TabletDriverService/TabletState.h
+++ b/TabletDriverService/TabletState.h
@@ -1,9 +1,11 @@
 #pragma once
 
 #include "Vector2D.h"
+#include <chrono>
 
 class TabletState {
 public:
+	chrono::high_resolution_clock::time_point time;
 	unsigned char buttons;
 	Vector2D position;
 	double pressure;
diff --git a/TabletDriverService/VMulti.cpp b/TabletDriverService/VMulti.cpp
index 00c5d93..4c6ebf2 100644
--- a/TabletDriverService/VMulti.cpp
+++ b/TabletDriverService/VMulti.cpp
@@ -57,6 +57,11 @@ int VMulti::WriteReport() {
 	// Copy last report
 	memcpy(lastReportBuffer, reportBuffer, 65);
 
+	// Debug
+	if(logger.debugEnabled) {
+		LOG_DEBUGBUFFER(reportBuffer, 12, "Write: ");
+	}
+
 	// Write
 	return hidDevice->Write(reportBuffer, 65);
 
diff --git a/TabletDriverService/Vector2D.cpp b/TabletDriverService/Vector2D.cpp
index 6ed5e86..75a2fd3 100644
--- a/TabletDriverService/Vector2D.cpp
+++ b/TabletDriverService/Vector2D.cpp
@@ -44,6 +44,12 @@ double Vector2D::Distance(Vector2D target) {
 	return sqrt(dx * dx + dy * dy);
 }
 
+double Vector2D::Angle(Vector2D target) {
+	double dx = target.x - this->x;
+	double dy = target.y - this->y;
+	return atan2(dx, dy);
+}
+
 //
 // Linear interpolation add
 //
diff --git a/TabletDriverService/Vector2D.h b/TabletDriverService/Vector2D.h
index aa99675..ebf9b20 100644
--- a/TabletDriverService/Vector2D.h
+++ b/TabletDriverService/Vector2D.h
@@ -12,6 +12,7 @@ class Vector2D {
 	void Add(Vector2D vector);
 	void Multiply(double value);
 	double Distance(Vector2D target);
+	double Angle(Vector2D target);
 	void LerpAdd(Vector2D target, double t);
 };
 

From f52a187ce5de2e524bb2f25c2fea65d7b54b6b04 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Mon, 3 Dec 2018 16:28:21 +0200
Subject: [PATCH 42/83] Improved report rate detection

---
 TabletDriverService/TabletFilterAntiSmoothing.cpp | 13 ++++++++++---
 TabletDriverService/TabletFilterAntiSmoothing.h   |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/TabletDriverService/TabletFilterAntiSmoothing.cpp b/TabletDriverService/TabletFilterAntiSmoothing.cpp
index 47e85c8..8d14b4b 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.cpp
+++ b/TabletDriverService/TabletFilterAntiSmoothing.cpp
@@ -13,7 +13,8 @@ TabletFilterAntiSmoothing::TabletFilterAntiSmoothing() {
 	shape = 1.0;
 	compensation = 1;
 
-	reportRate = 1;
+	reportRate = 100;
+	reportRateAverage = 100;
 	velocity = 0;
 	acceleration = 0;
 	jerk = 0;
@@ -67,7 +68,12 @@ void TabletFilterAntiSmoothing::Update() {
 	// Report rate calculation (moving average)
 	timeDelta = (timeNow - timeLastReport).count() / 1000000.0;
 	if(timeDelta >= 1 && timeDelta <= 10) {
-		reportRate += ((1000.0 / timeDelta) - reportRate) * (timeDelta / 1000.0) / 0.1;
+		reportRateAverage += ((1000.0 / timeDelta) - reportRateAverage) * (timeDelta / 1000.0) * 10;
+		if(reportRateAverage > reportRate) {
+			reportRate = reportRateAverage;
+		} else {
+			reportRate -= reportRate * (timeDelta / 1000.0) * 0.1;
+		}
 	} else {
 		//timeLastReport = timeNow;
 		//return;
@@ -142,12 +148,13 @@ void TabletFilterAntiSmoothing::Update() {
 	// Debug message
 	if(logger.debugEnabled) {
 		double delta = position.Distance(latestTarget);
-		LOG_DEBUG("T=%0.0f T=[%0.2f,%0.2f] P=[%0.2f,%0.2f] D=%0.3f R=%0.2f V=%0.2f PV=%0.2f A=%0.0f J=%0.0f L=%0.2f\n",
+		LOG_DEBUG("T=%0.2f T=[%0.2f,%0.2f] P=[%0.2f,%0.2f] D=%0.3f R=%0.2f RA=%0.2f V=%0.2f PV=%0.2f A=%0.0f J=%0.0f L=%0.2f\n",
 			(timeNow - timeBegin).count() / 1000000.0,
 			latestTarget.x, latestTarget.y,
 			position.x, position.y,
 			delta,
 			reportRate,
+			reportRateAverage,
 			velocity,
 			predictedVelocity,
 			acceleration,
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.h b/TabletDriverService/TabletFilterAntiSmoothing.h
index 4846aae..b19fc98 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.h
+++ b/TabletDriverService/TabletFilterAntiSmoothing.h
@@ -23,6 +23,7 @@ class TabletFilterAntiSmoothing : public TabletFilter {
 	~TabletFilterAntiSmoothing();
 private:
 	double reportRate;
+	double reportRateAverage;
 	double velocity;
 	double acceleration;
 	double jerk;

From 2981857a41b73787797a65461a03dc93f4168f28 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Mon, 3 Dec 2018 16:51:37 +0200
Subject: [PATCH 43/83] Fixed logger level clamp

---
 TabletDriverService/Logger.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TabletDriverService/Logger.cpp b/TabletDriverService/Logger.cpp
index af586bb..1c1ddda 100644
--- a/TabletDriverService/Logger.cpp
+++ b/TabletDriverService/Logger.cpp
@@ -113,8 +113,8 @@ void Logger::LogBuffer(int level, string module, void *buffer, int length, const
 	// Clamp level
 	if(level < 2)
 		level = 2;
-	else if(level > 7)
-		level = 7;
+	else if(level > 8)
+		level = 8;
 
 	if(level <= verbosity) {
 		index = 0;

From c918e5b07533ac16acde885cc307d2768a7f1879 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Tue, 4 Dec 2018 00:00:35 +0200
Subject: [PATCH 44/83] Dummy output mode and code refactoring

---
 TabletDriverService/Main.cpp                  | 46 +------------------
 TabletDriverService/Output.cpp                |  6 +--
 TabletDriverService/Output.h                  | 13 ++----
 TabletDriverService/OutputDummy.cpp           | 42 +++++++++++++++++
 TabletDriverService/OutputDummy.h             | 16 +++++++
 TabletDriverService/OutputManager.cpp         | 34 +++++---------
 TabletDriverService/OutputManager.h           | 14 +++---
 .../OutputSendInputAbsolute.cpp               | 19 ++++++--
 TabletDriverService/OutputSendInputAbsolute.h |  3 +-
 TabletDriverService/OutputVMultiAbsolute.cpp  | 11 ++++-
 TabletDriverService/OutputVMultiAbsolute.h    |  2 +-
 .../OutputVMultiAbsoluteV2.cpp                | 14 ++++--
 TabletDriverService/OutputVMultiAbsoluteV2.h  |  2 +-
 TabletDriverService/OutputVMultiDigitizer.cpp | 15 ++++--
 TabletDriverService/OutputVMultiDigitizer.h   |  2 +-
 TabletDriverService/OutputVMultiRelative.cpp  | 12 +++--
 TabletDriverService/OutputVMultiRelative.h    |  2 +-
 TabletDriverService/ProcessCommand.cpp        |  6 +++
 .../TabletDriverService.vcxproj               |  2 +
 .../TabletDriverService.vcxproj.filters       |  6 +++
 20 files changed, 162 insertions(+), 105 deletions(-)
 create mode 100644 TabletDriverService/OutputDummy.cpp
 create mode 100644 TabletDriverService/OutputDummy.h

diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index c1b27eb..4805a41 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -213,57 +213,15 @@ VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWa
 }
 
 
-
 //
 // Set Output
 //
-
 void SetOutput(TabletState *outputState) {
-
-	double x, y;
-
-
-	// Relative mode
-	if(outputManager->mode == OutputManager::ModeVMultiRelative) {
-
-		x = outputState->position.x;
-		y = outputState->position.y;
-
-		// Map position to virtual screen (values between 0 and 1)
-		mapper->GetRotatedTabletPosition(&x, &y);
-
-		outputManager->Set(outputState->buttons, x, y, outputState->pressure);
-		outputManager->Write();
-
-
-	}
-
-	// Absolute / Digitizer mode
-	else {
-		// Get x & y from the tablet state
-		x = outputState->position.x;
-		y = outputState->position.y;
-
-		// Map position to virtual screen (values betweeb 0->1)
-		mapper->GetScreenPosition(&x, &y);
-
-		outputManager->Set(outputState->buttons, x, y, outputState->pressure);
-		outputManager->Write();
-		/*
-			// Create VMulti report
-			vmulti->CreateReport(outputState->buttons, x, y, outputState->pressure);
-
-			// Write report to VMulti device
-			vmulti->WriteReport();
-
-		*/
-
-	}
+	outputManager->Set(outputState);
+	outputManager->Write();
 }
 
 
-
-
 //
 // Main
 //
diff --git a/TabletDriverService/Output.cpp b/TabletDriverService/Output.cpp
index 0f7790c..7ddb88c 100644
--- a/TabletDriverService/Output.cpp
+++ b/TabletDriverService/Output.cpp
@@ -1,8 +1,6 @@
 #include "stdafx.h"
 #include "Output.h"
 
-Output::Output() {
-	isEnabled = false;
-	debugEnabled = false;
-	settings = NULL;
+void Output::Init() {
 }
+
diff --git a/TabletDriverService/Output.h b/TabletDriverService/Output.h
index 950ff8d..038a7fb 100644
--- a/TabletDriverService/Output.h
+++ b/TabletDriverService/Output.h
@@ -1,18 +1,13 @@
 #pragma once
 #include "OutputSettings.h"
+#include "TabletState.h"
 
 class Output {
 public:
+	OutputSettings *settings = NULL;
 
-	OutputSettings * settings;
-	bool isEnabled;
-	bool debugEnabled;
-
-
-	virtual bool Set(unsigned char buttons, double x, double y, double pressure) = 0;
+	virtual void Init();
+	virtual bool Set(TabletState *tabletState) = 0;
 	virtual bool Write() = 0;
 	virtual bool Reset() = 0;
-
-	Output();
-
 };
diff --git a/TabletDriverService/OutputDummy.cpp b/TabletDriverService/OutputDummy.cpp
new file mode 100644
index 0000000..e96d4ca
--- /dev/null
+++ b/TabletDriverService/OutputDummy.cpp
@@ -0,0 +1,42 @@
+#include "stdafx.h"
+#include "OutputDummy.h"
+
+
+#define LOG_MODULE "Dummy"
+#include "Logger.h"
+
+
+void OutputDummy::Init() {
+	timeBegin = chrono::high_resolution_clock::now();
+}
+
+bool OutputDummy::Set(TabletState *tabletState) {
+
+	double timeDelta = (tabletState->time - timeBegin).count() / 1000000.0;
+
+	LOG_DEBUG("T=%0.3f B=%d X=%0.2f Y=%0.2f P=%0.4f\n",
+		timeDelta,
+		tabletState->buttons,
+		tabletState->position.x,
+		tabletState->position.y,
+		tabletState->pressure
+	);
+
+
+	return true;
+}
+
+bool OutputDummy::Write() {
+	return true;
+}
+
+bool OutputDummy::Reset() {
+	return true;
+}
+
+OutputDummy::OutputDummy() {
+}
+
+
+OutputDummy::~OutputDummy() {
+}
diff --git a/TabletDriverService/OutputDummy.h b/TabletDriverService/OutputDummy.h
new file mode 100644
index 0000000..cd37c75
--- /dev/null
+++ b/TabletDriverService/OutputDummy.h
@@ -0,0 +1,16 @@
+#pragma once
+#include "Output.h"
+class OutputDummy : public Output {
+public:
+
+	chrono::high_resolution_clock::time_point timeBegin;
+
+	void Init() override;
+	bool Set(TabletState *tabletState);
+	bool Write();
+	bool Reset();
+
+	OutputDummy();
+	~OutputDummy();
+};
+
diff --git a/TabletDriverService/OutputManager.cpp b/TabletDriverService/OutputManager.cpp
index b6e2140..3f0b5db 100644
--- a/TabletDriverService/OutputManager.cpp
+++ b/TabletDriverService/OutputManager.cpp
@@ -9,25 +9,27 @@ OutputManager::OutputManager() {
 	output = &vmultiAbsolute;
 	mode = ModeVMultiAbsolute;
 
+	// Set outputs array
 	outputs[ModeVMultiAbsolute] = &vmultiAbsolute;
 	outputs[ModeVMultiAbsoluteV2] = &vmultiAbsoluteV2;
 	outputs[ModeVMultiRelative] = &vmultiRelative;
 	outputs[ModeVMultiDigitizer] = &vmultiDigitizer;
 	outputs[ModeSendInputAbsolute] = &sendInputAbsolute;
 	outputs[ModeSendInputRelative] = &sendInputAbsolute;
+	outputs[ModeDummy] = &dummy;
 
-
+	// Use same settings on all outputs
 	settings = new OutputSettings();
-
 	for(int i = 0; i < (sizeof(outputs) / sizeof(Output*)); i++) {
 		outputs[i]->settings = settings;
-		LOG_DEBUG("LOOP!\n");
 	}
 
 }
 
 
 OutputManager::~OutputManager() {
+	if(settings != NULL)
+		delete settings;
 }
 
 void OutputManager::SetOutputMode(OutputMode newMode) {
@@ -38,29 +40,17 @@ void OutputManager::SetOutputMode(OutputMode newMode) {
 	}
 	mode = newMode;
 
-	switch(newMode) {
-	case ModeVMultiAbsolute:
-	case ModeVMultiAbsoluteV2:
-	case ModeVMultiRelative:
-	case ModeVMultiDigitizer:
-		output = outputs[newMode];
-		break;
-	case ModeSendInputAbsolute:
-		output = outputs[newMode];
-		sendInputAbsolute.UpdateMonitorInfo();
-		break;
-	default:
-		LOG_ERROR("Unknown Output Mode!\n");
-		output = NULL;
-		break;
-	}
+	// Set new output
+	output = outputs[newMode];
+
+	// Initialize new output
+	output->Init();
 
-	//Reset();
 }
 
-bool OutputManager::Set(unsigned char buttons, double x, double y, double pressure) {
+bool OutputManager::Set(TabletState *tabletState) {
 	if(output == NULL) return false;
-	return output->Set(buttons, x, y, pressure);
+	return output->Set(tabletState);
 }
 
 bool OutputManager::Write() {
diff --git a/TabletDriverService/OutputManager.h b/TabletDriverService/OutputManager.h
index 72f7ef3..34a5b9c 100644
--- a/TabletDriverService/OutputManager.h
+++ b/TabletDriverService/OutputManager.h
@@ -6,7 +6,7 @@
 #include "OutputVMultiRelative.h"
 #include "OutputVMultiDigitizer.h"
 #include "OutputSendInputAbsolute.h"
-
+#include "OutputDummy.h"
 
 class OutputManager : public Output {
 public:
@@ -18,22 +18,24 @@ class OutputManager : public Output {
 		ModeVMultiDigitizer,
 		ModeSendInputAbsolute,
 		ModeSendInputRelative,
+		ModeDummy
 	};
 
-	Output * output;
-	Output *outputs[6];
-	
+	Output *output;
+	Output *outputs[7];
+
 	OutputVMultiAbsolute vmultiAbsolute;
 	OutputVMultiAbsoluteV2 vmultiAbsoluteV2;
 	OutputVMultiRelative vmultiRelative;
 	OutputVMultiDigitizer vmultiDigitizer;
 	OutputSendInputAbsolute sendInputAbsolute;
-	
+	OutputDummy dummy;
+
 	OutputMode mode;
 
 	void SetOutputMode(OutputMode newMode);
 
-	bool Set(unsigned char buttons, double x, double y, double pressure);
+	bool Set(TabletState *tabletState);
 	bool Write();
 	bool Reset();
 
diff --git a/TabletDriverService/OutputSendInputAbsolute.cpp b/TabletDriverService/OutputSendInputAbsolute.cpp
index 8c670f1..e873323 100644
--- a/TabletDriverService/OutputSendInputAbsolute.cpp
+++ b/TabletDriverService/OutputSendInputAbsolute.cpp
@@ -10,7 +10,6 @@
 //
 OutputSendInputAbsolute::OutputSendInputAbsolute() {
 	lastButtons = 0;
-
 	UpdateMonitorInfo();
 }
 
@@ -34,14 +33,28 @@ void OutputSendInputAbsolute::UpdateMonitorInfo() {
 	monitorInfo.virtualY = GetSystemMetrics(SM_YVIRTUALSCREEN);
 }
 
+//
+// Initialize
+//
+void OutputSendInputAbsolute::Init() {
+	UpdateMonitorInfo();
+}
 
 //
 // Set output
 //
-bool OutputSendInputAbsolute::Set(unsigned char buttons, double x, double y, double pressure) {
+bool OutputSendInputAbsolute::Set(TabletState *tabletState) {
+
+	double x = tabletState->position.x;
+	double y = tabletState->position.y;
+	unsigned char buttons = tabletState->buttons;
 
+	// Map position to virtual screen (values between 0 and 1)
+	mapper->GetScreenPosition(&x, &y);
+
+	
 
-	if(debugEnabled) {
+	if(logger.debugEnabled) {
 		LOG_DEBUG("%0.0f,%0.0f | %0.0f,%0.0f | %0.0f,%0.0f\n",
 			monitorInfo.primaryWidth, monitorInfo.primaryHeight,
 			monitorInfo.virtualWidth, monitorInfo.virtualHeight,
diff --git a/TabletDriverService/OutputSendInputAbsolute.h b/TabletDriverService/OutputSendInputAbsolute.h
index 332f6f6..f8c7311 100644
--- a/TabletDriverService/OutputSendInputAbsolute.h
+++ b/TabletDriverService/OutputSendInputAbsolute.h
@@ -18,7 +18,8 @@ class OutputSendInputAbsolute : public Output {
 
 	void UpdateMonitorInfo();
 
-	bool Set(unsigned char buttons, double x, double y, double pressure);
+	void Init() override;
+	bool Set(TabletState *tabletState);
 	bool Write();
 	bool Reset();
 
diff --git a/TabletDriverService/OutputVMultiAbsolute.cpp b/TabletDriverService/OutputVMultiAbsolute.cpp
index a275c53..e4c7d8e 100644
--- a/TabletDriverService/OutputVMultiAbsolute.cpp
+++ b/TabletDriverService/OutputVMultiAbsolute.cpp
@@ -30,8 +30,15 @@ OutputVMultiAbsolute::~OutputVMultiAbsolute() {
 //
 // Set output
 //
-bool OutputVMultiAbsolute::Set(unsigned char buttons, double x, double y, double pressure) {
-	report.buttons = buttons;
+bool OutputVMultiAbsolute::Set(TabletState *tabletState) {
+
+	double x = tabletState->position.x;
+	double y = tabletState->position.y;
+
+	// Map position to virtual screen (values between 0 and 1)
+	mapper->GetScreenPosition(&x, &y);
+
+	report.buttons = tabletState->buttons;
 	report.x = (USHORT)round(x * 32767.0);
 	report.y = (USHORT)round(y * 32767.0);
 	report.wheel = 0;
diff --git a/TabletDriverService/OutputVMultiAbsolute.h b/TabletDriverService/OutputVMultiAbsolute.h
index a02c50f..d6c1c46 100644
--- a/TabletDriverService/OutputVMultiAbsolute.h
+++ b/TabletDriverService/OutputVMultiAbsolute.h
@@ -15,7 +15,7 @@ class OutputVMultiAbsolute : public Output {
 		BYTE wheel;
 	} report;
 
-	bool Set(unsigned char buttons, double x, double y, double pressure);
+	bool Set(TabletState *tabletState);
 	bool Write();
 	bool Reset();
 
diff --git a/TabletDriverService/OutputVMultiAbsoluteV2.cpp b/TabletDriverService/OutputVMultiAbsoluteV2.cpp
index 7a45c01..7ed7cb1 100644
--- a/TabletDriverService/OutputVMultiAbsoluteV2.cpp
+++ b/TabletDriverService/OutputVMultiAbsoluteV2.cpp
@@ -30,13 +30,21 @@ OutputVMultiAbsoluteV2::~OutputVMultiAbsoluteV2() {
 //
 // Set output
 //
-bool OutputVMultiAbsoluteV2::Set(unsigned char buttons, double x, double y, double pressure) {
-	report.buttons = buttons;
+bool OutputVMultiAbsoluteV2::Set(TabletState *tabletState) {
+
+	double x = tabletState->position.x;
+	double y = tabletState->position.y;
+
+	// Map position to virtual screen (values between 0 and 1)
+	mapper->GetScreenPosition(&x, &y);
+
+	report.buttons = tabletState->buttons;
 	report.x = (USHORT)round(x * 32767.0);
 	report.y = (USHORT)round(y * 32767.0);
+	//report.pressure = (USHORT)round(tabletState->pressure * 8191.0);
 	vmulti->SetReport(&report, sizeof(report));
 
-	if(debugEnabled) {
+	if(logger.debugEnabled) {
 		LOG_DEBUGBUFFER(&report, 10, "Report: ");
 	}
 
diff --git a/TabletDriverService/OutputVMultiAbsoluteV2.h b/TabletDriverService/OutputVMultiAbsoluteV2.h
index 9cb567c..5b9bc12 100644
--- a/TabletDriverService/OutputVMultiAbsoluteV2.h
+++ b/TabletDriverService/OutputVMultiAbsoluteV2.h
@@ -15,7 +15,7 @@ class OutputVMultiAbsoluteV2 : public Output {
 		USHORT pressure;
 	} report;
 
-	bool Set(unsigned char buttons, double x, double y, double pressure);
+	bool Set(TabletState *tabletState);
 	bool Write();
 	bool Reset();
 
diff --git a/TabletDriverService/OutputVMultiDigitizer.cpp b/TabletDriverService/OutputVMultiDigitizer.cpp
index ccb8ad4..90f7ec1 100644
--- a/TabletDriverService/OutputVMultiDigitizer.cpp
+++ b/TabletDriverService/OutputVMultiDigitizer.cpp
@@ -30,14 +30,21 @@ OutputVMultiDigitizer::~OutputVMultiDigitizer() {
 //
 // Set output
 //
-bool OutputVMultiDigitizer::Set(unsigned char buttons, double x, double y, double pressure) {
-	report.buttons = buttons | 0x20;
+bool OutputVMultiDigitizer::Set(TabletState *tabletState) {
+
+	double x = tabletState->position.x;
+	double y = tabletState->position.y;
+
+	// Map position to virtual screen (values between 0 and 1)
+	mapper->GetScreenPosition(&x, &y);
+
+	report.buttons = tabletState->buttons | 0x20;
 	report.x = (USHORT)round(x * 32767.0);
 	report.y = (USHORT)round(y * 32767.0);
-	report.pressure = (USHORT)round(pressure * 2047.0);
+	report.pressure = (USHORT)round(tabletState->pressure * 2047.0);
 	vmulti->SetReport(&report, sizeof(report));
 
-	if(debugEnabled) {
+	if(logger.debugEnabled) {
 		LOG_DEBUGBUFFER(&report, 9, "Report: ");
 	}
 
diff --git a/TabletDriverService/OutputVMultiDigitizer.h b/TabletDriverService/OutputVMultiDigitizer.h
index e4f1aaa..1ff9b73 100644
--- a/TabletDriverService/OutputVMultiDigitizer.h
+++ b/TabletDriverService/OutputVMultiDigitizer.h
@@ -13,7 +13,7 @@ class OutputVMultiDigitizer : public Output {
 		USHORT pressure;
 	} report;
 
-	bool Set(unsigned char buttons, double x, double y, double pressure);
+	bool Set(TabletState *tabletState);
 	bool Write();
 	bool Reset();
 
diff --git a/TabletDriverService/OutputVMultiRelative.cpp b/TabletDriverService/OutputVMultiRelative.cpp
index b73e68d..923388d 100644
--- a/TabletDriverService/OutputVMultiRelative.cpp
+++ b/TabletDriverService/OutputVMultiRelative.cpp
@@ -33,9 +33,15 @@ OutputVMultiRelative::~OutputVMultiRelative() {
 //
 // Set output
 //
-bool OutputVMultiRelative::Set(unsigned char buttons, double x, double y, double pressure) {
+bool OutputVMultiRelative::Set(TabletState *tabletState) {
+
 	double dx, dy, distance;
 
+	double x = tabletState->position.x;
+	double y = tabletState->position.y;
+
+	// Map position to virtual screen (values between 0 and 1)
+	mapper->GetRotatedTabletPosition(&x, &y);
 
 	if(firstReport) {
 		settings->relativeState.lastPosition.x = x;
@@ -44,7 +50,7 @@ bool OutputVMultiRelative::Set(unsigned char buttons, double x, double y, double
 	}
 
 	// Buttons
-	report.buttons = buttons;
+	report.buttons = tabletState->buttons;
 
 	// Mouse move delta
 	dx = x - settings->relativeState.lastPosition.x;
@@ -87,7 +93,7 @@ bool OutputVMultiRelative::Set(unsigned char buttons, double x, double y, double
 	report.y = (char)relativeY;
 
 	vmulti->SetReport(&report, sizeof(report));
-	if(debugEnabled) {
+	if(logger.debugEnabled) {
 		LOG_DEBUGBUFFER(&report, 10, "Report: ");
 	}
 	return true;
diff --git a/TabletDriverService/OutputVMultiRelative.h b/TabletDriverService/OutputVMultiRelative.h
index 88b2fa6..f58fbb2 100644
--- a/TabletDriverService/OutputVMultiRelative.h
+++ b/TabletDriverService/OutputVMultiRelative.h
@@ -17,7 +17,7 @@ class OutputVMultiRelative : public Output {
 	} report;
 	bool firstReport;
 
-	bool Set(unsigned char buttons, double x, double y, double pressure);
+	bool Set(TabletState *tabletState);
 	bool Write();
 	bool Reset();
 
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 1d890b2..928d7a8 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -459,6 +459,12 @@ bool ProcessCommand(CommandLine *cmd) {
 			LOG_INFO("Output Mode = SendInput Absolute\n");
 		}
 
+		// Dummy
+		else if(mode == "dummy") {
+			outputManager->SetOutputMode(OutputManager::ModeDummy);
+			LOG_INFO("Output Mode = Dummy\n");
+		}
+
 		else {
 			LOG_ERROR("Unknown output mode '%s'\n", mode.c_str());
 		}
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index b53ef02..91e9ae7 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -172,6 +172,7 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClInclude Include="HIDDevice.h" />
     <ClInclude Include="Logger.h" />
     <ClInclude Include="Output.h" />
+    <ClInclude Include="OutputDummy.h" />
     <ClInclude Include="OutputManager.h" />
     <ClInclude Include="OutputSendInputAbsolute.h" />
     <ClInclude Include="OutputSettings.h" />
@@ -204,6 +205,7 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClCompile Include="HIDDevice.cpp" />
     <ClCompile Include="Logger.cpp" />
     <ClCompile Include="Output.cpp" />
+    <ClCompile Include="OutputDummy.cpp" />
     <ClCompile Include="OutputManager.cpp" />
     <ClCompile Include="OutputSendInputAbsolute.cpp" />
     <ClCompile Include="OutputSettings.cpp" />
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index 3567779..d0d13be 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -105,6 +105,9 @@
     <ClInclude Include="TabletFilterTester.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="OutputDummy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -197,6 +200,9 @@
     <ClCompile Include="TabletFilterTester.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="OutputDummy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">

From 0d10314f6e1b0eb9fdf9a7534e833c3b9ecdcd66 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Tue, 4 Dec 2018 13:41:59 +0200
Subject: [PATCH 45/83] Anti-smoothing ignore when dragging

---
 TabletDriverGUI/Configuration.cs              |  1 +
 TabletDriverGUI/MainWindow.xaml               | 19 +++++++-
 TabletDriverGUI/MainWindow.xaml.cs            | 10 +++-
 TabletDriverService/Main.cpp                  |  8 ++--
 TabletDriverService/ProcessCommand.cpp        | 46 +++++++++++++------
 TabletDriverService/Tablet.cpp                |  6 +--
 TabletDriverService/Tablet.h                  |  6 +--
 .../TabletFilterAntiSmoothing.cpp             | 31 ++++++++++++-
 .../TabletFilterAntiSmoothing.h               |  3 ++
 .../TabletFilterNoiseReduction.cpp            |  2 +-
 10 files changed, 102 insertions(+), 30 deletions(-)

diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index 8d7d2f5..a09e43d 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -40,6 +40,7 @@ public enum OutputModes
         // Anti-smoothing filter
         public double AntiSmoothingShape;
         public double AntiSmoothingCompensation;
+        public bool AntiSmoothingIgnoreWhenDragging;
         public bool AntiSmoothingEnabled;
 
         public Area DesktopSize;
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 548ac1f..4265564 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -576,7 +576,7 @@
                       VerticalAlignment="Bottom"
                       HorizontalAlignment="Left"
                       Margin="0,5,0,0"
-                      Width="300"
+                      Width="340"
             >
               <GroupBox.ToolTip>
                 <StackPanel>
@@ -617,6 +617,13 @@
                     Try to find a balance between response time and artifacting.
                     <LineBreak/>
                     <LineBreak/>
+                    <TextBlock FontWeight="Bold">
+                    Ignore when dragging
+                    </TextBlock>
+                    <LineBreak/>
+                    This feature is mainly meant for Wacom CTL-490, but might be useful with other tablets too.
+                    <LineBreak/>
+                    <LineBreak/>
                     <TextBlock FontWeight="Bold">
                       Recommended value ranges
                     </TextBlock>
@@ -644,7 +651,7 @@
                       Shape = 0.5, Compensation = 3.5, Invalid low speed data, use noise reduction 10/0.5 mm
                       <LineBreak/>                   
                       <TextBlock FontWeight="Bold">Wacom CTL-490 Hover:</TextBlock>
-                      Shape = 0.5, Compensation = 3.5
+                      Shape = 0.5, Compensation = 3.5, Enable "Ignore when dragging"
                       </TextBlock>
                   </TextBlock>
                 </StackPanel>
@@ -675,6 +682,14 @@
                                TextChanged="TextChanged">20</TextBox>
                 </GroupBox>
 
+                <!-- Anti-smoothing filter enabled -->
+                <CheckBox Name="checkBoxAntiSmoothingIgnoreWhenDragging"
+                            VerticalAlignment="Center"
+                            Margin="5,10,5,0"
+                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">
+                  Ignore when dragging
+                </CheckBox>
+
               </StackPanel>
 
 
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 5dd6134..767c8f9 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -527,15 +527,18 @@ private void LoadSettingsFromConfiguration()
             checkBoxAntiSmoothing.IsChecked = config.AntiSmoothingEnabled;
             textAntiSmoothingShape.Text = Utils.GetNumberString(config.AntiSmoothingShape, "0.00");
             textAntiSmoothingCompensation.Text = Utils.GetNumberString(config.AntiSmoothingCompensation, "0.00");
+            checkBoxAntiSmoothingIgnoreWhenDragging.IsChecked = config.AntiSmoothingIgnoreWhenDragging;
             if (config.AntiSmoothingEnabled)
             {
                 textAntiSmoothingShape.IsEnabled = true;
                 textAntiSmoothingCompensation.IsEnabled = true;
+                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = true;
             }
             else
             {
                 textAntiSmoothingShape.IsEnabled = false;
                 textAntiSmoothingCompensation.IsEnabled = false;
+                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = false;
             }
 
 
@@ -708,15 +711,18 @@ private void UpdateSettingsToConfiguration()
                 config.AntiSmoothingShape = val;
             if (Utils.ParseNumber(textAntiSmoothingCompensation.Text, out val))
                 config.AntiSmoothingCompensation = val;
+            config.AntiSmoothingIgnoreWhenDragging = (bool)checkBoxAntiSmoothingIgnoreWhenDragging.IsChecked;
             if (config.AntiSmoothingEnabled)
             {
                 textAntiSmoothingShape.IsEnabled = true;
                 textAntiSmoothingCompensation.IsEnabled = true;
+                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = true;
             }
             else
             {
                 textAntiSmoothingShape.IsEnabled = false;
                 textAntiSmoothingCompensation.IsEnabled = false;
+                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = false;
             }
 
 
@@ -1837,7 +1843,9 @@ private void SendSettingsToDriver()
             // Anti-smoothing filter
             if (config.AntiSmoothingEnabled)
             {
-                driver.SendCommand("AntiSmoothing " + Utils.GetNumberString(config.AntiSmoothingShape) + " " + Utils.GetNumberString(config.AntiSmoothingCompensation));
+                driver.SendCommand("AntiSmoothing " + Utils.GetNumberString(config.AntiSmoothingShape) + " " +
+                    Utils.GetNumberString(config.AntiSmoothingCompensation) + " " +
+                    (config.AntiSmoothingIgnoreWhenDragging ? "true" : "false"));
             }
             else
             {
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index 4805a41..d11875b 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -10,7 +10,7 @@
 #include "CommandLine.h"
 #include "ProcessCommand.h"
 
-#define LOG_MODULE ""
+#define LOG_MODULE "Main"
 #include "Logger.h"
 
 #pragma comment(lib, "hid.lib")
@@ -51,7 +51,6 @@ void RunTabletThread() {
 	bool filterTimedEnabled;
 
 	chrono::high_resolution_clock::time_point timeBegin = chrono::high_resolution_clock::now();
-	chrono::high_resolution_clock::time_point timeNow = chrono::high_resolution_clock::now();
 
 	//
 	// Main Loop
@@ -101,9 +100,8 @@ void RunTabletThread() {
 
 		// Debug messages
 		if(logger.debugEnabled) {
-			timeNow = chrono::high_resolution_clock::now();
-			double delta = (timeNow - timeBegin).count() / 1000000.0;
-			LOG_DEBUG("STATE: %0.3f, %d, %0.3f, %0.3f, %0.3f\n",
+			double delta = (tablet->state.time - timeBegin).count() / 1000000.0;
+			LOG_DEBUG("TabletState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f\n",
 				delta,
 				tablet->state.buttons,
 				tablet->state.position.x,
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 928d7a8..1b5a9fb 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -97,27 +97,41 @@ bool ProcessCommand(CommandLine *cmd) {
 	}
 
 
-	// HID Device 2
-	else if(cmd->is("HID2")) {
+	// HID Auxiliary Device
+	else if(cmd->is("HIDAux") || cmd->is("HIDAuxiliary")) {
 
 		if(cmd->valueCount == 4) {
 			USHORT vendorID = cmd->GetInt(0, 0);
 			USHORT productID = cmd->GetInt(1, 0);
 			USHORT usagePage = cmd->GetInt(2, 0);
 			USHORT usage = cmd->GetInt(3, 0);
-			if(tablet->hidDevice2 == NULL) {
-				tablet->hidDevice2 = new HIDDevice(vendorID, productID, usagePage, usage);
-				if(tablet->hidDevice2->isOpen) {
+			if(tablet->hidDeviceAux == NULL) {
+				tablet->hidDeviceAux = new HIDDevice(vendorID, productID, usagePage, usage);
+				if(tablet->hidDeviceAux->isOpen) {
 					LOG_INFO("HID Device found!\n");
 				} else {
 					LOG_ERROR("Can't open HID device 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
-					delete tablet->hidDevice2;
-					tablet->hidDevice2 = NULL;
+					delete tablet->hidDeviceAux;
+					tablet->hidDeviceAux = NULL;
 				}
 			}
 		}
 	}
 
+	// Auxiliary Read Read
+	else if(cmd->is("HIDAuxRead")) {
+			
+		if(cmd->valueCount > 1 && tablet->hidDeviceAux != NULL) {
+			int length = cmd->GetInt(0, 1);
+			int count = cmd->GetInt(1, 1);
+			UCHAR buffer[1024];
+			for(int i = 0; i < count; i++) {
+				tablet->hidDeviceAux->Read(buffer, length);
+				LOG_INFOBUFFER(buffer, length, "Aux read(%d): ", i+1);
+			}
+		}
+	}
+
 	// Tablet Name
 	else if(cmd->is("Name")) {
 		if(tablet == NULL) return false;
@@ -619,18 +633,20 @@ bool ProcessCommand(CommandLine *cmd) {
 
 			double shape = cmd->GetDouble(0, 1.0);
 			double compensation = cmd->GetDouble(1, 1.0);
+			bool ignoreWhenDragging = cmd->GetBoolean(2, false);
 
 			if(shape <= 0) {
 				tablet->antiSmoothing.isEnabled = false;
 				LOG_INFO("Anti-smoothing = off\n");
-			}
-			else {
+			} else {
 				tablet->antiSmoothing.shape = shape;
 				tablet->antiSmoothing.compensation = compensation;
+				tablet->antiSmoothing.ignoreWhenDragging = ignoreWhenDragging;
 				tablet->antiSmoothing.isEnabled = true;
-				LOG_INFO("Anti-smoothing = Shape:%0.2f Compensation:%0.2f\n",
+				LOG_INFO("Anti-smoothing = Shape:%0.2f Compensation:%0.2f DragIgnore:%s\n",
 					tablet->antiSmoothing.shape,
-					tablet->antiSmoothing.compensation
+					tablet->antiSmoothing.compensation,
+					tablet->antiSmoothing.ignoreWhenDragging ? "true" : "false"
 				);
 			}
 		}
@@ -653,9 +669,11 @@ bool ProcessCommand(CommandLine *cmd) {
 			filter = new TabletFilterAntiSmoothing();
 			((TabletFilterAntiSmoothing*)filter)->shape = tablet->antiSmoothing.shape;
 			((TabletFilterAntiSmoothing*)filter)->compensation = tablet->antiSmoothing.compensation;
-			sprintf_s(settingsString, "settings AntiSmoothing shape=%0.3f compensation=%0.3f",
+			((TabletFilterAntiSmoothing*)filter)->ignoreWhenDragging = tablet->antiSmoothing.ignoreWhenDragging;
+			sprintf_s(settingsString, "settings AntiSmoothing shape=%0.3f compensation=%0.3f dragignore=%s",
 				tablet->antiSmoothing.shape,
-				tablet->antiSmoothing.compensation
+				tablet->antiSmoothing.compensation,
+				tablet->antiSmoothing.ignoreWhenDragging ? "true" : "false"
 			);
 
 		} else if(filterName.compare(0, 5, "noise") == 0) {
@@ -670,7 +688,7 @@ bool ProcessCommand(CommandLine *cmd) {
 				tablet->noise.distanceMaximum,
 				tablet->noise.iterations
 			);
-			
+
 
 		}
 		if(filter != NULL) {
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index e302408..f498a51 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -40,7 +40,7 @@ Tablet::Tablet() {
 	name = "Unknown";
 	usbDevice = NULL;
 	hidDevice = NULL;
-	hidDevice2 = NULL;
+	hidDeviceAux = NULL;
 
 	usbPipeId = 0;
 
@@ -86,8 +86,8 @@ Tablet::~Tablet() {
 		delete usbDevice;
 	if(hidDevice != NULL)
 		delete hidDevice;
-	if(hidDevice2 != NULL)
-		delete hidDevice2;
+	if(hidDeviceAux != NULL)
+		delete hidDeviceAux;
 	if(initReport != NULL)
 		delete initReport;
 	if(initFeature != NULL)
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 3d3e0fc..1713697 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -18,9 +18,9 @@ using namespace std;
 class Tablet {
 public:
 
-	USBDevice * usbDevice;
-	HIDDevice * hidDevice;
-	HIDDevice * hidDevice2;
+	USBDevice *usbDevice;
+	HIDDevice *hidDevice;
+	HIDDevice *hidDeviceAux;
 	int usbPipeId;
 
 	//
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.cpp b/TabletDriverService/TabletFilterAntiSmoothing.cpp
index 8d14b4b..2170a97 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.cpp
+++ b/TabletDriverService/TabletFilterAntiSmoothing.cpp
@@ -12,6 +12,7 @@
 TabletFilterAntiSmoothing::TabletFilterAntiSmoothing() {
 	shape = 1.0;
 	compensation = 1;
+	ignoreWhenDragging = false;
 
 	reportRate = 100;
 	reportRateAverage = 100;
@@ -44,6 +45,7 @@ TabletFilterAntiSmoothing::~TabletFilterAntiSmoothing() {
 void TabletFilterAntiSmoothing::SetTarget(TabletState *tabletState) {
 	latestTarget.Set(tabletState->position);
 	timeNow = tabletState->time;
+	memcpy(&this->tabletState, tabletState, sizeof(TabletState));
 }
 
 // Set position
@@ -108,6 +110,7 @@ void TabletFilterAntiSmoothing::Update() {
 		ignoreInvalidReports = 2;
 	}
 
+
 	// Velocity prediction
 	double predictedVelocity = velocity + (acceleration + jerk / reportRate) / reportRate;
 
@@ -145,6 +148,32 @@ void TabletFilterAntiSmoothing::Update() {
 	}
 
 
+	//
+	// Ignore filter when dragging
+	//
+	if(ignoreWhenDragging) {
+
+		// Ignore anti-smoothing pen pressure is detected
+		if(tabletState.pressure > 0) {
+			position.Set(latestTarget);
+		}
+
+		// Switching from drag to hover
+		if(tabletState.pressure == 0 && oldTabletState.pressure > 0) {
+			ignoreInvalidReports = 1;
+			position.Set(latestTarget);
+		}
+
+		// Switching from hover to drag
+		if(tabletState.pressure > 0 && oldTabletState.pressure == 0) {
+			ignoreInvalidReports = 1;
+			position.Set(latestTarget);
+		}
+
+	}
+
+
+
 	// Debug message
 	if(logger.debugEnabled) {
 		double delta = position.Distance(latestTarget);
@@ -168,7 +197,7 @@ void TabletFilterAntiSmoothing::Update() {
 	oldAcceleration = acceleration;
 	oldJerk = jerk;
 	oldTarget.Set(latestTarget);
-
+	memcpy(&this->oldTabletState, &this->tabletState, sizeof(TabletState));
 
 
 }
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.h b/TabletDriverService/TabletFilterAntiSmoothing.h
index b19fc98..7168749 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.h
+++ b/TabletDriverService/TabletFilterAntiSmoothing.h
@@ -10,9 +10,12 @@ class TabletFilterAntiSmoothing : public TabletFilter {
 	Vector2D position;
 	Vector2D latestTarget;
 	Vector2D oldTarget;
+	TabletState tabletState;
+	TabletState oldTabletState;
 
 	double shape;
 	double compensation;
+	bool ignoreWhenDragging;
 
 	void SetTarget(TabletState *tabletState);
 	void SetPosition(Vector2D vector);
diff --git a/TabletDriverService/TabletFilterNoiseReduction.cpp b/TabletDriverService/TabletFilterNoiseReduction.cpp
index 5b7b3f8..705827b 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.cpp
+++ b/TabletDriverService/TabletFilterNoiseReduction.cpp
@@ -134,7 +134,7 @@ void TabletFilterNoiseReduction::Update() {
 		} else {
 			latency = distance / velocity * 1000.0;
 		}
-		LOG_DEBUG("T=%0.0f B=%d T=[%0.2f,%0.2f] P=[%0.2f,%0.2f] D=%0.2f R=%0.2f V=%0.2f L=%0.2f\n",
+		LOG_DEBUG("T=%0.0f B=%d Ta=[%0.2f,%0.2f] Po=[%0.2f,%0.2f] D=%0.2f R=%0.2f V=%0.2f L=%0.2f\n",
 			(timeNow - timeBegin).count() / 1000000.0,
 			buffer.count,
 			latestTarget.x, latestTarget.y,

From 87f4a06d97e33724c6cad7968238b4fffaf0af1c Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Tue, 4 Dec 2018 17:01:58 +0200
Subject: [PATCH 46/83] Reverted CTL-472 DetectMask back to old value

DetectMask value of 0x40 cause to driver to miss some pen movements.
---
 TabletDriverService/config/tablet.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 36173fc..590992a 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -125,7 +125,7 @@ Tablet 0x056a 0x037a 0xFF00 0x000A
 Name "Wacom CTL-472 (Wacom drivers installed)"
 ReportId 0x02
 ReportLength 11
-DetectMask 0x20
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 2047
@@ -141,7 +141,7 @@ Tablet 0x056a 0x037a 0xFF0D 0x0001
 Name "Wacom CTL-472"
 ReportId 0x02
 ReportLength 10
-DetectMask 0x20
+DetectMask 0x40
 MaxX 15200
 MaxY 9500
 MaxPressure 2047

From c2404b9fed2ef8f65b61fd78a93a2c10546e1b96 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Tue, 4 Dec 2018 19:17:05 +0200
Subject: [PATCH 47/83] v0.2

---
 README.md | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a0a2d3f..6810452 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 
 ## Download
 
-### http://hwk.fi/TabletDriver/TabletDriverV0.1.5.zip
+### http://hwk.fi/TabletDriver/TabletDriverV0.2.zip
 
 #
 
@@ -25,6 +25,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 #
 
 ### Supported tablets:
+  - Wacom CTE-440
   - Wacom CTL-470
   - Wacom CTH-470
   - Wacom CTL-471
@@ -37,11 +38,14 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
   - Wacom CTL-672
   - Wacom CTL-680
   - Wacom CTH-680
+  - Wacom PTH-660
   - Wacom PTH-451
   - Wacom PTH-850
   - XP-Pen G430 (New 2017+ "Model B")
   - XP-Pen G540 Pro
   - XP-Pen G640
+  - XP-Pen Deco 01
+  - XP-Pen Deco 01 v2
   - Huion 420
   - Huion H420
   - Huion H430P
@@ -50,7 +54,6 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
   
 ### Configured, but not properly tested:
   - Huion osu!tablet
-  - XP-Pen Deco 01
   - Wacom CTL-4100 USB
   - Wacom CTL-4100 Bluetooth
   - https://github.com/hawku/TabletDriver/blob/master/TabletDriverService/config/wacom.cfg
@@ -95,6 +98,22 @@ If you want to compile the code and don't want to install anything from the Tabl
 #
 
 ## Changelog
+>**v0.2:**
+> - **Improved the noise reduction filter and added the settings to the GUI.**
+> - **Added an anti-smoothing filter which reduces the input latency on tablets that use hardware smoothing.**
+> - Wacom CTE-440 support by [Poliwrath](https://github.com/Poliwrath)
+> - Wacom PTH-660 support by [Implojin](https://github.com/Implojin)
+> - XP-PEN Deco 01 v2 support by [Itsyuka](https://github.com/Itsyuka)
+> - Modified Huion 420 and H420 tablet area size to match with the 2000 LPI resolution.
+> - Updated Huion drivers to the latest version.
+> - Moved the filter settings to filters tab in the GUI.
+> - Added `Measure` command. Measures distances between clicked points.
+> - Added an ability to "draw" tablet area by clicking two points with the pen.
+> - Added "Restart driver" option to the notification icon menu.
+> - Added 1000 Hz smoothing filter rate option to the GUI.
+> - Added few tablets to wacom.cfg
+> - Major code refactoring.
+
 >**v0.1.5:**
 > - New tablet configurations: Wacom CTL-4100 (USB only model), XP-Pen G540 Pro, XP-Pen Deco 01 and Huion osu!tablet
 >   Thanks to /u/THEqrunt for capturing the XP-Pen Deco 01 USB data.

From ddb989d4f95c8d7dd8055b9763d4686ebe91812e Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Fri, 7 Dec 2018 00:53:49 +0200
Subject: [PATCH 48/83] XP-Pen G640s and fixed some typos

G640s config is made by frodriguez96
---
 TabletDriverService/config/tablet.cfg | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 590992a..bb7a209 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -336,8 +336,7 @@ Type Wacom4100
 # Wacom CTL-4100 Bluetooth
 Tablet 0x056a 0x0377 0xFF0D 0x0001
 Name "Wacom CTL-4100 Bluetooth (Experimental)"
-ReportId100 Bluetooth
-# 0x81
+ReportId 0x81
 ReportLength 361
 DetectMask 0xE0
 MaxX 15200
@@ -416,7 +415,6 @@ Type Wacom4100
 #
 Tablet 0x056a 0x0360 0xFF0D 0x0001
 Name "Wacom PTH-660 Bluetooth (Experimental)"
-ReportId100 Bluetooth
 ReportLength 361
 DetectMask 0xE0
 MaxX 44800
@@ -474,6 +472,22 @@ Height 100.0
 InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
 
 
+#
+# XP-Pen G640s
+#
+Tablet 0x28BD 0x0906 0xFF0A 0x0001
+Name "XP-Pen G640s"
+ReportId 0x02
+ReportLength 10
+DetectMask 0x80
+MaxX 32000
+MaxY 20000
+MaxPressure 8191
+Width 160.0
+Height 100.0
+InitReport 0x02 0xB0 0x04 0x00 0x00 0x00 0x00 0x00
+
+
 #
 # XP-Pen Deco 01
 #

From 6cdcc503405f262bbe1ce8491c2ea442115e42d4 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Fri, 7 Dec 2018 01:27:33 +0200
Subject: [PATCH 49/83] Major code refactoring, command list, gravity filter

- Tablet filters now use TabletState as input and output.
- Commands are now stored in CommandHandler.
- "ListCommands" or "List" command will list commands.
- Added ability use multiple timed filters.
- Added a gravity filter. Main purpose of that filter is just to test that multiple timed filter will work correctly.
---
 TabletDriverGUI/MainWindow.xaml.cs            |    2 +-
 TabletDriverService/Command.cpp               |   23 +
 TabletDriverService/Command.h                 |   18 +
 TabletDriverService/CommandHandler.cpp        | 1525 +++++++++++++++++
 TabletDriverService/CommandHandler.h          |   30 +
 TabletDriverService/CommandLine.cpp           |   17 +
 TabletDriverService/CommandLine.h             |    2 +
 TabletDriverService/Main.cpp                  |  330 +---
 TabletDriverService/ProcessCommand.cpp        | 1121 +-----------
 TabletDriverService/ProcessCommand.h          |    5 -
 TabletDriverService/Tablet.cpp                |    5 +-
 TabletDriverService/Tablet.h                  |    6 +-
 .../TabletDriverService.vcxproj               |    8 +
 .../TabletDriverService.vcxproj.filters       |   24 +
 TabletDriverService/TabletFilter.cpp          |   40 +-
 TabletDriverService/TabletFilter.h            |   16 +-
 .../TabletFilterAntiSmoothing.cpp             |   42 +-
 .../TabletFilterAntiSmoothing.h               |    5 +-
 TabletDriverService/TabletFilterGravity.cpp   |  110 ++
 TabletDriverService/TabletFilterGravity.h     |   24 +
 .../TabletFilterNoiseReduction.cpp            |   29 +-
 .../TabletFilterNoiseReduction.h              |    4 +-
 TabletDriverService/TabletFilterPeak.cpp      |   22 +-
 TabletDriverService/TabletFilterPeak.h        |    3 -
 TabletDriverService/TabletFilterSmoothing.cpp |   49 +-
 TabletDriverService/TabletFilterSmoothing.h   |    7 +-
 TabletDriverService/TabletFilterTester.cpp    |   13 +-
 TabletDriverService/TabletHandler.cpp         |  278 +++
 TabletDriverService/TabletHandler.h           |   32 +
 TabletDriverService/Vector2D.cpp              |   24 +
 TabletDriverService/Vector2D.h                |    5 +
 TabletDriverService/stdafx.h                  |    4 +
 32 files changed, 2334 insertions(+), 1489 deletions(-)
 create mode 100644 TabletDriverService/Command.cpp
 create mode 100644 TabletDriverService/Command.h
 create mode 100644 TabletDriverService/CommandHandler.cpp
 create mode 100644 TabletDriverService/CommandHandler.h
 create mode 100644 TabletDriverService/TabletFilterGravity.cpp
 create mode 100644 TabletDriverService/TabletFilterGravity.h
 create mode 100644 TabletDriverService/TabletHandler.cpp
 create mode 100644 TabletDriverService/TabletHandler.h

diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 767c8f9..3d835fa 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -1821,8 +1821,8 @@ private void SendSettingsToDriver()
             // Smoothing filter
             if (config.SmoothingEnabled)
             {
+                driver.SendCommand("FilterTimerInterval " + Utils.GetNumberString(config.SmoothingInterval));
                 driver.SendCommand("Smoothing " + Utils.GetNumberString(config.SmoothingLatency));
-                driver.SendCommand("SmoothingInterval " + Utils.GetNumberString(config.SmoothingInterval));
             }
             else
             {
diff --git a/TabletDriverService/Command.cpp b/TabletDriverService/Command.cpp
new file mode 100644
index 0000000..dc27941
--- /dev/null
+++ b/TabletDriverService/Command.cpp
@@ -0,0 +1,23 @@
+#include "stdafx.h"
+#include "Command.h"
+
+
+bool Command::Execute(CommandLine *cmd) {
+	if(callback != NULL) {
+		return callback(cmd);
+	}
+	return false;
+}
+
+Command::Command() {
+	name = "";
+	callback = NULL;
+}
+
+Command::Command(string _name, function<bool(CommandLine*)> _callback) {
+	this->name = _name;
+	this->callback = _callback;
+}
+
+Command::~Command() {
+}
diff --git a/TabletDriverService/Command.h b/TabletDriverService/Command.h
new file mode 100644
index 0000000..8a57f0a
--- /dev/null
+++ b/TabletDriverService/Command.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "CommandLine.h"
+#include <string>
+
+
+class Command {
+public:
+
+	string name;
+	function<bool(CommandLine*)> callback;
+
+	bool Execute(CommandLine *cmd);
+
+	Command();
+	Command(string _name, function<bool(CommandLine*)> _callback);
+	~Command();
+};
diff --git a/TabletDriverService/CommandHandler.cpp b/TabletDriverService/CommandHandler.cpp
new file mode 100644
index 0000000..aef6562
--- /dev/null
+++ b/TabletDriverService/CommandHandler.cpp
@@ -0,0 +1,1525 @@
+#include "stdafx.h"
+#include "CommandHandler.h"
+
+#define LOG_MODULE ""
+#include "Logger.h"
+
+
+//
+// Constructor
+//
+CommandHandler::CommandHandler() {
+}
+
+
+//
+// Destructor
+//
+CommandHandler::~CommandHandler() {
+}
+
+
+
+//
+// Add command
+//
+bool CommandHandler::AddCommand(Command *command) {
+	string name = command->name;
+	transform(name.begin(), name.end(), name.begin(), ::tolower);
+	if(commands.count(name) <= 0) {
+		commands.insert(pair<string, Command*>(name, command));
+		return true;
+	}
+	return false;
+}
+
+//
+// Add command alias
+//
+bool CommandHandler::AddAlias(string alias, string commandName) {
+	transform(alias.begin(), alias.end(), alias.begin(), ::tolower);
+	transform(commandName.begin(), commandName.end(), commandName.begin(), ::tolower);
+
+	if(aliases.count(alias) <= 0) {
+		aliases.insert(pair<string, string>(alias, commandName));
+		return true;
+	}
+
+	return false;
+}
+
+bool CommandHandler::ExecuteCommand(string command, string parameters) {
+	CommandLine *cmd = new CommandLine(command + " " + parameters);
+	bool result = ExecuteCommand(command, cmd);
+	delete cmd;
+	return result;
+}
+
+//
+// Create commands
+//
+void CommandHandler::CreateCommands() {
+
+	//
+	// Command: Tablet
+	//
+	AddCommand(new Command("Tablet", [&](CommandLine *cmd) {
+
+		// USB Tablet
+		if(cmd->valueCount == 3) {
+			string guid = cmd->GetString(0, "");
+			int stringId = cmd->GetInt(1, 0);
+			string stringMatch = cmd->GetString(2, "");
+			if(tablet == NULL) {
+				tablet = new Tablet(guid, stringId, stringMatch);
+				if(tablet->isOpen) {
+					LOG_INFO("Tablet found!\n");
+				} else {
+					LOG_WARNING("Can't open USB tablet '%s' %d '%s'\n", guid.c_str(), stringId, stringMatch.c_str());
+					delete tablet;
+					tablet = NULL;
+				}
+			}
+		}
+
+		// HID Tablet
+		else if(cmd->valueCount == 4) {
+			USHORT vendorID = cmd->GetInt(0, 0);
+			USHORT productID = cmd->GetInt(1, 0);
+			USHORT usagePage = cmd->GetInt(2, 0);
+			USHORT usage = cmd->GetInt(3, 0);
+			if(tablet == NULL) {
+				tablet = new Tablet(vendorID, productID, usagePage, usage);
+				if(tablet->isOpen) {
+					LOG_INFO("Tablet found!\n");
+				} else {
+					LOG_WARNING("Can't open HID tablet 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
+					delete tablet;
+					tablet = NULL;
+				}
+			}
+		} else {
+			if(tablet != NULL) {
+				if(tablet->usbDevice != NULL) {
+					USBDevice *usb = tablet->usbDevice;
+					LOG_INFO("Tablet = USB(\"%s\", %d, \"%s\")\n",
+						usb->guid.c_str(),
+						usb->stringId,
+						usb->stringMatch.c_str()
+					);
+				} else if(tablet->hidDevice != NULL) {
+					HIDDevice *hid = tablet->hidDevice;
+					LOG_INFO("Tablet = HID(0x%04X 0x%04X 0x%04X 0x%04X)\n",
+						hid->vendorId,
+						hid->productId,
+						hid->usagePage,
+						hid->usage
+					);
+				}
+			} else {
+				LOG_INFO("Tablet is not defined.\n");
+			}
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: TabletIsValid
+	//
+	AddCommand(new Command("TabletValid", [&](CommandLine *cmd) {
+		if(tablet == NULL) {
+			return false;
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: CheckTablet
+	//
+	AddCommand(new Command("CheckTablet", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) {
+			LOG_ERROR("Tablet not found!\n");
+			LOG_ERROR("Check the list of supported tablets from the GitHub page.\n");
+			LOG_ERROR("http://github.com/hawku/TabletDriver\n");
+			CleanupAndExit(1);
+			return false;
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: HIDList
+	//
+	AddAlias("HIDAux", "HIDAuxiliary");
+	AddCommand(new Command("HIDList", [&](CommandLine *cmd) {
+		HANDLE hidHandle = 0;
+		HIDDevice *hid = new HIDDevice();
+		hid->debugEnabled = true;
+		hid->OpenDevice(&hidHandle, 1, 1, 1, 1);
+		if(hidHandle > 0) {
+			CloseHandle(hidHandle);
+		}
+		delete hid;
+
+		return true;
+	}));
+
+
+	//
+	// Command: HIDAux
+	//
+	AddCommand(new Command("HIDAuxiliary", [&](CommandLine *cmd) {
+
+		if(cmd->valueCount == 4) {
+			USHORT vendorID = cmd->GetInt(0, 0);
+			USHORT productID = cmd->GetInt(1, 0);
+			USHORT usagePage = cmd->GetInt(2, 0);
+			USHORT usage = cmd->GetInt(3, 0);
+			if(tablet->hidDeviceAux == NULL) {
+				tablet->hidDeviceAux = new HIDDevice(vendorID, productID, usagePage, usage);
+				if(tablet->hidDeviceAux->isOpen) {
+					LOG_INFO("HID Device found!\n");
+					return true;
+				} else {
+					LOG_ERROR("Can't open HID device 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
+					delete tablet->hidDeviceAux;
+					tablet->hidDeviceAux = NULL;
+				}
+			}
+		}
+
+		return false;
+	}));
+
+
+
+	//
+	// Command: HIDAuxRead
+	//
+	AddCommand(new Command("HIDAuxRead", [&](CommandLine *cmd) {
+
+		if(cmd->valueCount > 1 && tablet->hidDeviceAux != NULL) {
+			int length = cmd->GetInt(0, 1);
+			int count = cmd->GetInt(1, 1);
+			UCHAR buffer[1024];
+			for(int i = 0; i < count; i++) {
+				tablet->hidDeviceAux->Read(buffer, length);
+				LOG_INFOBUFFER(buffer, length, "Aux read(%d): ", i + 1);
+			}
+		}
+
+		return true;
+	}));
+
+	if(false) {
+
+	}
+
+
+	//
+	// Command: TabletName, Name
+	//
+	AddAlias("Name", "TabletName");
+	AddCommand(new Command("TabletName", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->name = cmd->GetString(0, tablet->name);
+		LOG_INFO("Tablet name = '%s'\n", tablet->name.c_str());
+		return true;
+	}));
+
+
+	//
+	// Command: ReportId
+	//
+	AddCommand(new Command("ReportId", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.reportId = cmd->GetInt(0, tablet->settings.reportId);
+		LOG_INFO("Tablet report id = %d\n", tablet->settings.reportId);
+		return true;
+	}));
+
+
+	//
+	// Command: ReportLength
+	//
+	AddCommand(new Command("ReportLength", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.reportLength = cmd->GetInt(0, tablet->settings.reportLength);
+		LOG_INFO("Tablet report length = %d\n", tablet->settings.reportLength);
+		return true;
+	}));
+
+
+	//
+	// Command: DetectMask
+	//
+	AddCommand(new Command("DetectMask", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.detectMask = cmd->GetInt(0, tablet->settings.detectMask);
+		LOG_INFO("Tablet detect mask = %02X\n", tablet->settings.detectMask);
+		return true;
+	}));
+
+
+	//
+	// Command: IgnoreMask
+	//
+	AddCommand(new Command("IgnoreMask", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.ignoreMask = cmd->GetInt(0, tablet->settings.ignoreMask);
+		LOG_INFO("Tablet ignore mask = %02X\n", tablet->settings.ignoreMask);
+		return true;
+	}));
+
+
+	//
+	// Command: MaxX
+	//
+	AddCommand(new Command("MaxX", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.maxX = cmd->GetInt(0, tablet->settings.maxX);
+		LOG_INFO("Tablet max X = %d\n", tablet->settings.maxX);
+		return true;
+	}));
+
+
+	//
+	// Command: MaxY
+	//
+	AddCommand(new Command("MaxY", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.maxY = cmd->GetInt(0, tablet->settings.maxY);
+		LOG_INFO("Tablet max Y = %d\n", tablet->settings.maxY);
+		return true;
+	}));
+
+
+	//
+	// Command: MaxPressure
+	//
+	AddCommand(new Command("MaxPressure", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.maxPressure = cmd->GetInt(0, tablet->settings.maxPressure);
+		LOG_INFO("Tablet max pressure = %d\n", tablet->settings.maxPressure);
+		return true;
+	}));
+
+	//
+	// Command: ClickPressure
+	//
+	AddCommand(new Command("ClickPressure", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.clickPressure = cmd->GetInt(0, tablet->settings.clickPressure);
+		LOG_INFO("Tablet click pressure = %d\n", tablet->settings.clickPressure);
+		return true;
+	}));
+
+
+	//
+	// Command: KeepTipDown
+	//
+	AddCommand(new Command("KeepTipDown", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.keepTipDown = cmd->GetInt(0, tablet->settings.keepTipDown);
+		LOG_INFO("Tablet pen tip keep down = %d reports\n", tablet->settings.keepTipDown);
+		return true;
+	}));
+
+
+	//
+	// Command: Width
+	//
+	AddCommand(new Command("Width", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.width = cmd->GetDouble(0, tablet->settings.width);
+		LOG_INFO("Tablet width = %0.2f mm\n", tablet->settings.width);
+		return true;
+	}));
+
+
+	//
+	// Command: Height
+	//
+	AddCommand(new Command("Height", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.height = cmd->GetDouble(0, tablet->settings.height);
+		LOG_INFO("Tablet height = %0.2f mm\n", tablet->settings.height);
+		return true;
+	}));
+
+
+	//
+	// Command: Skew
+	//
+	AddCommand(new Command("Skew", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.skew = cmd->GetDouble(0, tablet->settings.skew);
+		LOG_INFO("Tablet skew = Shift X-axis %0.2f mm per Y-axis mm\n", tablet->settings.skew);
+		return true;
+	}));
+
+
+	//
+	// Command: TabletType, Type
+	//
+	AddAlias("Type", "TabletType");
+	AddCommand(new Command("TabletType", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+
+		// Wacom Intuos (490)
+		if(cmd->GetStringLower(0, "") == "wacomintuos") {
+			tablet->settings.type = TabletSettings::TypeWacomIntuos;
+		}
+
+		// Wacom CTL-4100
+		else if(cmd->GetStringLower(0, "") == "wacom4100") {
+			tablet->settings.type = TabletSettings::TypeWacom4100;
+		}
+
+		// Wacom Drivers
+		else if(cmd->GetStringLower(0, "") == "wacomdrivers") {
+			tablet->settings.type = TabletSettings::TypeWacomDrivers;
+		}
+
+		LOG_INFO("Tablet type = %d\n", tablet->settings.type);
+
+		return true;
+	}));
+
+
+	//
+	// Command: InitFeature
+	//
+	AddCommand(new Command("InitFeature", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 0) return false;
+		if(tablet == NULL) return false;
+		tablet->initFeature = new BYTE[cmd->valueCount];
+		for(int i = 0; i < (int)cmd->valueCount; i++) {
+			tablet->initFeature[i] = cmd->GetInt(i, 0);
+		}
+		tablet->initFeatureLength = cmd->valueCount;
+		LOG_INFOBUFFER(tablet->initFeature, tablet->initFeatureLength, "Tablet init feature report: ");
+		return true;
+	}));
+
+
+	//
+	// Command: InitReport
+	//
+	// Initialization HID output report
+	//
+	AddCommand(new Command("InitReport", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 0) return false;
+
+		if(tablet == NULL) return false;
+		tablet->initReport = new BYTE[cmd->valueCount];
+		for(int i = 0; i < (int)cmd->valueCount; i++) {
+			tablet->initReport[i] = cmd->GetInt(i, 0);
+		}
+		tablet->initReportLength = cmd->valueCount;
+		LOG_INFOBUFFER(tablet->initReport, tablet->initReportLength, "Tablet init report: ");
+
+		return true;
+	}));
+
+
+	//
+	// Command: SetFeature, Feature
+	//
+	// Sends HID feature report
+	//
+	AddAlias("Feature", "SetFeature");
+	AddCommand(new Command("SetFeature", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 1) return false;
+		if(tablet == NULL) return false;
+		if(tablet->hidDevice == NULL) return false;
+		int length = cmd->GetInt(0, 1);
+		BYTE *buffer = new BYTE[length];
+		for(int i = 0; i < length; i++) {
+			buffer[i] = cmd->GetInt(i + 1, 0);
+		}
+		LOG_INFOBUFFER(buffer, length, "Set Feature Report (%d): ", length);
+		tablet->hidDevice->SetFeature(buffer, length);
+		LOG_INFO("HID Feature set!\n");
+		delete buffer;
+		return true;
+	}));
+
+
+
+	//
+	// Command: GetFeature
+	//
+	// Requests a HID feature report from the device
+	//
+	AddCommand(new Command("GetFeature", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 1) return false;
+		if(tablet == NULL) return false;
+		if(tablet->hidDevice == NULL) return false;
+		int length = cmd->GetInt(0, 1);
+		BYTE *buffer = new BYTE[length];
+		for(int i = 0; i < length; i++) {
+			buffer[i] = cmd->GetInt(i + 1, 0);
+		}
+		LOG_INFOBUFFER(buffer, length, "Get Feature Report (%d): ", length);
+		tablet->hidDevice->GetFeature(buffer, length);
+		LOG_INFOBUFFER(buffer, length, "Result Feature Report (%d): ", length);
+		delete buffer;
+		return true;
+	}));
+
+
+	//
+	// Command: OutputReport, Report
+	//
+	// Sends HID output report
+	//
+	AddAlias("Report", "OutputReport");
+	AddCommand(new Command("OutputReport", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 1) return false;
+		if(tablet == NULL) return false;
+		if(tablet->hidDevice == NULL) return false;
+		int length = cmd->GetInt(0, 1);
+		BYTE *buffer = new BYTE[length];
+		for(int i = 0; i < length; i++) {
+			buffer[i] = cmd->GetInt(i + 1, 0);
+		}
+		LOG_INFOBUFFER(buffer, length, "Sending HID Report: ");
+		tablet->hidDevice->Write(buffer, length);
+		LOG_INFO("Report sent!\n");
+		delete buffer;
+		return true;
+	}));
+	
+
+
+	//
+	// Command: LogTabletArea
+	//
+	// Prints current tablet area
+	//
+	AddCommand(new Command("LogTabletArea", [&](CommandLine *cmd) {
+		LOG_INFO("%s: (%0.2f mm x %0.2f mm X+%0.2f mm Y+%0.2f mm)\n",
+			cmd->GetParameterString().c_str(),
+			mapper->areaTablet.width,
+			mapper->areaTablet.height,
+			mapper->areaTablet.x,
+			mapper->areaTablet.y
+		);
+		return true;
+	}));
+
+
+	//
+	// Command: TabletArea, Area
+	//
+	// Sets the user tablet area
+	//
+	AddAlias("Area", "TabletArea");
+	AddCommand(new Command("TabletArea", [&](CommandLine *cmd) {
+
+		if(!ExecuteCommand("TabletValid")) return false;
+		mapper->areaTablet.width = cmd->GetDouble(0, mapper->areaTablet.width);
+		mapper->areaTablet.height = cmd->GetDouble(1, mapper->areaTablet.height);
+		mapper->areaTablet.x = cmd->GetDouble(2, mapper->areaTablet.x);
+		mapper->areaTablet.y = cmd->GetDouble(3, mapper->areaTablet.y);
+
+		ExecuteCommand("LogTabletArea", "Tablet area");
+		return true;
+	}));
+	
+
+
+
+	//
+	// Command: ButtonMap, Buttons
+	//
+	// Maps input buttons to output buttons
+	//
+	AddAlias("Buttons", "ButtonMap");
+	AddCommand(new Command("ButtonMap", [&](CommandLine *cmd) {
+
+		if(!ExecuteCommand("TabletValid")) return false;
+		char buttonMapBuffer[32];
+		int index = 0;
+		for(int i = 0; i < 8; i++) {
+			tablet->buttonMap[i] = cmd->GetInt(i, tablet->buttonMap[i]);
+			index += sprintf_s(buttonMapBuffer + index, 32 - index, "%d ", tablet->buttonMap[i]);
+		}
+		LOG_INFO("Button Map = %s\n", buttonMapBuffer);
+		return true;
+	}));
+	
+
+
+	//
+	// Command: ScreenArea
+	//
+	// Sets the monitor mapping
+	//
+	AddCommand(new Command("ScreenArea", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		mapper->areaScreen.width = cmd->GetDouble(0, mapper->areaScreen.width);
+		mapper->areaScreen.height = cmd->GetDouble(1, mapper->areaScreen.height);
+		mapper->areaScreen.x = cmd->GetDouble(2, mapper->areaScreen.x);
+		mapper->areaScreen.y = cmd->GetDouble(3, mapper->areaScreen.y);
+		LOG_INFO("Screen area = (w=%0.2f, h=%0.2f, x=%0.2f, y=%0.2f)\n",
+			mapper->areaScreen.width,
+			mapper->areaScreen.height,
+			mapper->areaScreen.x,
+			mapper->areaScreen.y
+		);
+		return true;
+	}));
+
+
+	//
+	// Command: DesktopSize
+	//
+	// Sets the desktop area that the driver output can reach
+	//
+	AddAlias("Desktop", "DesktopSize");
+	AddCommand(new Command("DesktopSize", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		mapper->areaVirtualScreen.width = cmd->GetDouble(0, mapper->areaVirtualScreen.width);
+		mapper->areaVirtualScreen.height = cmd->GetDouble(1, mapper->areaVirtualScreen.height);
+		LOG_INFO("Desktop size = (%0.2f px x %0.2f px)\n",
+			mapper->areaVirtualScreen.width,
+			mapper->areaVirtualScreen.height
+		);
+		return true;
+	}));
+	
+
+
+	//
+	// Command: TabletMove
+	//
+	// Move tablet area offset from the area borders
+	//
+	AddAlias("Move", "TabletMove");
+	AddCommand(new Command("TabletMove", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 0) return false;
+		if(!ExecuteCommand("TabletValid")) return false;
+		string border;
+		double offset;
+		bool moved = true;
+
+		for(int i = 0; i < cmd->valueCount; i += 2) {
+
+			border = cmd->GetStringLower(i, "");
+			offset = cmd->GetDouble(i + 1, 0.0);
+			moved = true;
+
+			if(border == "top") {
+				mapper->areaTablet.y = offset;
+			} else if(border == "bottom") {
+				mapper->areaTablet.y = tablet->settings.height - mapper->areaTablet.height - offset;
+			} else if(border == "left") {
+				mapper->areaTablet.x = offset;
+			} else if(border == "right") {
+				mapper->areaTablet.x = tablet->settings.width - mapper->areaTablet.width - offset;
+			} else {
+				moved = false;
+			}
+			if(moved) {
+				LOG_INFO("Tablet area moved to %s border with %0.2f mm margin.\n", border.c_str(), offset);
+				ExecuteCommand("LogTabletArea", "  New tablet area");
+			}
+		}
+		return true;
+	}));
+	
+
+
+	//
+	// Command: Rotate
+	//
+	// Sets tablet area rotation
+	//
+	AddCommand(new Command("Rotate", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		double value = cmd->GetDouble(0, 0);
+		mapper->SetRotation(value);
+		LOG_INFO("Rotation matrix = [%f,%f,%f,%f]\n",
+			mapper->rotationMatrix[0],
+			mapper->rotationMatrix[1],
+			mapper->rotationMatrix[2],
+			mapper->rotationMatrix[3]
+		);
+		return true;
+	}));
+
+
+	//
+	// Command: Sensitivity
+	//
+	// Sets the relative mouse output sensitivity
+	//
+	AddCommand(new Command("Sensitivity", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		outputManager->settings->relativeSensitivity = cmd->GetDouble(0, outputManager->settings->relativeSensitivity);
+		LOG_INFO("Relative mode sensitivity = %0.2f px/mm\n", outputManager->settings->relativeSensitivity);
+		return true;
+	}));
+
+
+	//
+	// Command: ResetDistance
+	//
+	// Sets relative mouse output reset distance
+	//
+	AddCommand(new Command("ResetDistance", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		outputManager->settings->relativeResetDistance = cmd->GetDouble(0, outputManager->settings->relativeResetDistance);
+		LOG_INFO("Relative mode reset distance = %0.2f mm\n", outputManager->settings->relativeResetDistance);
+		return true;
+	}));
+
+
+	//
+	// Command: OutputMode, Mode
+	//
+	// Sets driver output mode
+	//
+	AddAlias("Mode", "OutputMode");
+	AddCommand(new Command("OutputMode", [&](CommandLine *cmd) {
+
+		string mode = cmd->GetStringLower(0, "");
+
+		// Absolute mouse
+		if(mode.compare(0, 3, "abs") == 0) {
+			outputManager->SetOutputMode(OutputManager::ModeVMultiAbsolute);
+			LOG_INFO("Output Mode = Absolute\n");
+		}
+
+		// Relative mouse
+		else if(mode.compare(0, 3, "rel") == 0) {
+			outputManager->SetOutputMode(OutputManager::ModeVMultiRelative);
+			LOG_INFO("Output Mode = Relative\n");
+		}
+
+		// Digitizer
+		else if(mode.compare(0, 3, "dig") == 0 || mode.compare(0, 3, "pen") == 0) {
+
+			outputManager->SetOutputMode(OutputManager::ModeVMultiDigitizer);
+			LOG_INFO("Output Mode = Digitizer\n");
+		}
+
+		// SendInput
+		else if(mode.compare(0, 12, "sendinputabs") == 0) {
+			outputManager->SetOutputMode(OutputManager::ModeSendInputAbsolute);
+			LOG_INFO("Output Mode = SendInput Absolute\n");
+		}
+
+		// Dummy
+		else if(mode == "dummy") {
+			outputManager->SetOutputMode(OutputManager::ModeDummy);
+			LOG_INFO("Output Mode = Dummy\n");
+		}
+
+		else {
+			LOG_ERROR("Unknown output mode '%s'\n", mode.c_str());
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: SmoothingFilter, Smoothing
+	//
+	// Sets smoothing filter parameters
+	//
+	AddAlias("Smoothing", "SmoothingFilter");
+	AddCommand(new Command("SmoothingFilter", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		double latency = cmd->GetDouble(0, tablet->smoothing.GetLatency());
+		double threshold = cmd->GetDouble(1, tablet->smoothing.threshold * 100);
+
+		threshold /= 100;
+
+		string stringValue = cmd->GetStringLower(0, "");
+
+		// Off / False
+		if(stringValue == "off" || stringValue == "false") {
+			latency = 0;
+		}
+
+		// Limits
+		if(latency < 0) latency = 1;
+		if(latency > 1000) latency = 1000;
+		if(threshold < 0.1) threshold = 0.1;
+		if(threshold > 0.99) threshold = 0.99;
+
+		// Set threshold
+		tablet->smoothing.threshold = threshold;
+
+		// Set smoothing filter latency
+		tablet->smoothing.SetLatency(latency);
+
+		// Print output
+		if(tablet->smoothing.weight < 1.0) {
+			tablet->smoothing.isEnabled = true;
+			LOG_INFO("Smoothing = %0.2f ms to reach %0.0f%% (weight = %f)\n", latency, tablet->smoothing.threshold * 100, tablet->smoothing.weight);
+		} else {
+			tablet->smoothing.isEnabled = false;
+			LOG_INFO("Smoothing = off\n");
+		}
+
+		return true;
+	}));
+	
+
+
+	//
+	// Command: GravityFilter, Gravity
+	//
+	// Sets gravity filter parameters
+	//
+	AddAlias("Gravity", "GravityFilter");
+	AddCommand(new Command("GravityFilter", [&](CommandLine *cmd) {
+
+		if(!ExecuteCommand("TabletValid")) return false;
+		double gravity = cmd->GetDouble(0, tablet->gravityFilter.gravity);
+		double friction = cmd->GetDouble(1, 0);
+		double pressureGravity = cmd->GetDouble(2, 0);
+		double pressureFriction = cmd->GetDouble(3, 0);
+
+
+		// Limits
+		if(gravity < 0) gravity = 0.0;
+		if(gravity > 100) gravity = 100;
+		if(friction < 0.1) friction = 0.1;
+		if(friction > 1000) friction = 1000;
+
+		if(gravity > 0.1) {
+			tablet->gravityFilter.isEnabled = true;
+			tablet->gravityFilter.gravity = gravity;
+			tablet->gravityFilter.friction = friction;
+			tablet->gravityFilter.pressureGravity = pressureGravity;
+			tablet->gravityFilter.pressureFriction = pressureFriction;
+		} else {
+			tablet->gravityFilter.isEnabled = false;
+			tablet->gravityFilter.gravity = 0;
+			tablet->gravityFilter.friction = 0;
+			tablet->gravityFilter.pressureGravity = 0;
+			tablet->gravityFilter.pressureFriction = 0;
+
+		}
+
+		LOG_INFO("Gravity = %s (%0.2f gravity, %0.2f friction, %0.2f pressure gravity, %0.2f pressure friction)\n",
+			tablet->gravityFilter.isEnabled ? "True" : "False",
+			tablet->gravityFilter.gravity,
+			tablet->gravityFilter.friction,
+			tablet->gravityFilter.pressureGravity,
+			tablet->gravityFilter.pressureFriction
+		);
+		return true;
+	}));
+	
+
+
+	//
+	// Command: FilterTimerInterval
+	//
+	// Sets filter timer interval
+	//
+	AddCommand(new Command("FilterTimerInterval", [&](CommandLine *cmd) {
+		if(tabletHandler == NULL) return true;
+		int oldInterval = (int)round(tabletHandler->timerInterval);
+
+		int interval = cmd->GetInt(0, oldInterval);
+
+		// 10 Hz
+		if(interval > 100) interval = 100;
+
+		// 1000 Hz
+		if(interval < 1) interval = 1;
+
+		// Change interval
+		tabletHandler->ChangeTimerInterval(interval);
+
+		LOG_INFO("Filter Timer Interval = %0.0f (%0.2f Hz)\n",
+			tabletHandler->timerInterval,
+			1000.0 / tabletHandler->timerInterval
+		);
+		return true;
+	}));
+
+
+
+	//
+	// Command: NoiseReduction, Noise
+	//
+	// Sets noise reduction filter parameters
+	//
+	AddAlias("Noise", "NoiseReduction");
+	AddCommand(new Command("NoiseReduction", [&](CommandLine *cmd) {
+
+		string stringValue = cmd->GetStringLower(0, "");
+
+		// Off / False
+		if(stringValue == "off" || stringValue == "false") {
+			tablet->noiseFilter.isEnabled = false;
+			LOG_INFO("Noise Reduction = off\n");
+
+		// Enable
+		} else {
+
+			// Position buffer length
+			int length = cmd->GetInt(0, tablet->noiseFilter.buffer.length);
+
+			// Threshold where the noise filter starts to reduce the amount of filtering.
+			double distanceThreshold = cmd->GetDouble(1, tablet->noiseFilter.distanceThreshold);
+
+			// Distance where the amount of filtering will be zero. Default maximum is 2 times the threshold.
+			double distanceMaximum = cmd->GetDouble(2, distanceThreshold * 2.0);
+
+			// Geometric median calculation iteration count
+			int iterations = cmd->GetInt(3, tablet->noiseFilter.iterations);
+
+			// Limits
+			if(length < 0) length = 0;
+			else if(length > 50) length = 50;
+
+			if(distanceThreshold < 0.0) distanceThreshold = 0.0;
+			else if(distanceThreshold > 1000) distanceThreshold = 1000;
+
+			if(distanceMaximum < 0.1) distanceMaximum = 0.1;
+			else if(distanceMaximum > 1000) distanceMaximum = 1000;
+
+			if(distanceThreshold > distanceMaximum) distanceThreshold = distanceMaximum;
+
+			if(iterations < 1) iterations = 1;
+			else if(iterations > 100) iterations = 100;
+
+			// Set noise filter values
+			tablet->noiseFilter.buffer.SetLength(length);
+			tablet->noiseFilter.distanceThreshold = distanceThreshold;
+			tablet->noiseFilter.distanceMaximum = distanceMaximum;
+			tablet->noiseFilter.iterations = iterations;
+
+			// Enable filter
+			if(tablet->noiseFilter.buffer.length > 0) {
+				tablet->noiseFilter.isEnabled = true;
+				LOG_INFO("Noise Reduction = [\n");
+				LOG_INFO("  %d samples\n", length);
+				LOG_INFO("  %0.2f mm threshold (Wacom %0.2f mm/s)\n", distanceThreshold, distanceThreshold * 133.0);
+				LOG_INFO("  %0.2f mm maximum (Wacom %0.2f mm/s)\n", distanceMaximum, distanceMaximum * 133.0);
+				LOG_INFO("  %d iterations\n", iterations);
+				LOG_INFO("]\n");
+			} else {
+				tablet->noiseFilter.isEnabled = false;
+				LOG_INFO("Noise Reduction = off\n");
+			}
+
+		}
+		return true;
+	}));
+	
+
+
+	//
+	// Command: AntiSmoothingFilter, AntiSmoothing, Anti
+	//
+	// Sets anti-smoothing filter parameters
+	//
+	AddAlias("AntiSmoothing", "AntiSmoothingFilter");
+	AddAlias("Anti", "AntiSmoothingFilter");
+	AddCommand(new Command("AntiSmoothingFilter", [&](CommandLine *cmd) {
+
+		string stringValue = cmd->GetStringLower(0, "");
+
+		// Off / False
+		if(stringValue == "off" || stringValue == "false") {
+			tablet->antiSmoothing.isEnabled = false;
+			LOG_INFO("Anti-smoothing = off\n");
+
+		// Enable
+		} else {
+
+			double shape = cmd->GetDouble(0, 1.0);
+			double compensation = cmd->GetDouble(1, 1.0);
+			bool ignoreWhenDragging = cmd->GetBoolean(2, false);
+
+			if(shape <= 0) {
+				tablet->antiSmoothing.isEnabled = false;
+				LOG_INFO("Anti-smoothing = off\n");
+			} else {
+				tablet->antiSmoothing.shape = shape;
+				tablet->antiSmoothing.compensation = compensation;
+				tablet->antiSmoothing.ignoreWhenDragging = ignoreWhenDragging;
+				tablet->antiSmoothing.isEnabled = true;
+				LOG_INFO("Anti-smoothing = Shape:%0.2f Compensation:%0.2f DragIgnore:%s\n",
+					tablet->antiSmoothing.shape,
+					tablet->antiSmoothing.compensation,
+					tablet->antiSmoothing.ignoreWhenDragging ? "true" : "false"
+				);
+			}
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: FilterTester, Tester
+	//
+	AddAlias("Tester", "FilterTester");
+	AddCommand(new Command("FilterTester", [&](CommandLine *cmd) {
+
+		string filterName = cmd->GetStringLower(0, "");
+		string inputFilepath = cmd->GetStringLower(1, "tester_input.txt");
+		string outputFilepath = cmd->GetStringLower(2, "tester_output.txt");
+		TabletFilter *filter = NULL;
+		TabletFilterTester *tester = NULL;
+		char settingsString[1024];
+
+		if(filterName.compare(0, 4, "anti") == 0) {
+			LOG_DEBUG("Anti!\n");
+			filter = new TabletFilterAntiSmoothing();
+			((TabletFilterAntiSmoothing*)filter)->shape = tablet->antiSmoothing.shape;
+			((TabletFilterAntiSmoothing*)filter)->compensation = tablet->antiSmoothing.compensation;
+			((TabletFilterAntiSmoothing*)filter)->ignoreWhenDragging = tablet->antiSmoothing.ignoreWhenDragging;
+			sprintf_s(settingsString, "settings AntiSmoothing shape=%0.3f compensation=%0.3f dragignore=%s",
+				tablet->antiSmoothing.shape,
+				tablet->antiSmoothing.compensation,
+				tablet->antiSmoothing.ignoreWhenDragging ? "true" : "false"
+			);
+
+		} else if(filterName.compare(0, 5, "noise") == 0) {
+			filter = new TabletFilterNoiseReduction();
+			((TabletFilterNoiseReduction*)filter)->buffer.SetLength(tablet->noiseFilter.buffer.length);
+			((TabletFilterNoiseReduction*)filter)->distanceThreshold = tablet->noiseFilter.distanceThreshold;
+			((TabletFilterNoiseReduction*)filter)->distanceMaximum = tablet->noiseFilter.distanceMaximum;
+			((TabletFilterNoiseReduction*)filter)->iterations = tablet->noiseFilter.iterations;
+			sprintf_s(settingsString, "settings NoiseReduction buffer=%d threshold=%0.3f maximum=%0.3f iterations=%d",
+				tablet->noiseFilter.buffer.length,
+				tablet->noiseFilter.distanceThreshold,
+				tablet->noiseFilter.distanceMaximum,
+				tablet->noiseFilter.iterations
+			);
+
+
+		}
+		if(filter != NULL) {
+
+			logger.directPrint = true;
+
+			LOG_INFO("Filter test starting!\n");
+
+			tester = new TabletFilterTester(filter, inputFilepath, outputFilepath);
+			bool result = tester->Open();
+			if(!result) {
+				LOG_ERROR("Filter tester can't open files!\n");
+			}
+			tester->outputFile << settingsString << "\n";
+			tester->Run();
+			LOG_INFO("Filter test ended!\n");
+
+			logger.ProcessMessages();
+			logger.directPrint = false;
+
+		} else {
+			LOG_INFO("Usage: FilterTester <filter name>\n");
+		}
+
+		if(filter != NULL) {
+			delete filter;
+		}
+		if(tester != NULL) {
+			delete tester;
+		}
+		return true;
+	}));
+
+
+
+	//
+	// Command: Benchmark, Bench
+	//
+	AddAlias("Bench", "Benchmark");
+	AddCommand(new Command("Benchmark", [&](CommandLine *cmd) {
+
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		int timeLimit;
+		int reportCount = cmd->GetInt(0, 200);
+
+		// Limit report count
+		if(reportCount < 10) reportCount = 10;
+		if(reportCount > 1000) reportCount = 1000;
+
+		// Time limit
+		timeLimit = reportCount * 10;
+		if(timeLimit < 1000) timeLimit = 1000;
+
+		// Log
+		LOG_INFO("Tablet benchmark starting in 3 seconds!\n");
+		LOG_INFO("Keep the pen stationary on top of the tablet!\n");
+		Sleep(3000);
+		LOG_INFO("Benchmark started!\n");
+
+		// Start measurement
+		tablet->measurement.Start(reportCount);
+
+		// Wait for the benchmark to finish
+		for(int i = 0; i < timeLimit / 100; i++) {
+			Sleep(100);
+
+			// Benchmark results
+			if(tablet->measurement.reportCounter <= 0) {
+
+				double width = tablet->measurement.maximum.x - tablet->measurement.minimum.x;
+				double height = tablet->measurement.maximum.y - tablet->measurement.minimum.y;
+				LOG_INFO("\n");
+				LOG_INFO("Benchmark result (%d positions):\n", tablet->measurement.totalReports);
+				LOG_INFO("  Tablet: %s\n", tablet->name.c_str());
+				LOG_INFO("  Area: %0.2f mm x %0.2f mm (%0.0f px x %0.0f px)\n",
+					mapper->areaTablet.width,
+					mapper->areaTablet.height,
+					mapper->areaScreen.width,
+					mapper->areaScreen.height
+				);
+				LOG_INFO("  X range: %0.3f mm <-> %0.3f mm\n", tablet->measurement.minimum.x, tablet->measurement.maximum.x);
+				LOG_INFO("  Y range: %0.3f mm <-> %0.3f mm\n", tablet->measurement.minimum.y, tablet->measurement.maximum.y);
+				LOG_INFO("  Width: %0.3f mm (%0.2f px)\n",
+					width,
+					mapper->areaScreen.width / mapper->areaTablet.width * width
+				);
+				LOG_INFO("  Height: %0.3f mm (%0.2f px)\n",
+					height,
+					mapper->areaScreen.height / mapper->areaTablet.height* height
+				);
+				LOG_INFO("  Noise filter threshold: %0.2f mm\n", sqrt(width * width + height * height));
+
+
+				LOG_INFO("\n");
+				LOG_STATUS("BENCHMARK %d %0.3f %0.3f %s\n", tablet->measurement.totalReports, width, height, tablet->name.c_str());
+				break;
+			}
+		}
+
+		// Stop measurement
+		tablet->measurement.Stop();
+
+		// Benchmark failed
+		if(tablet->measurement.reportCounter > 0) {
+			LOG_ERROR("Benchmark failed!\n");
+			LOG_ERROR("Not enough reports captured in %0.2f seconds!\n",
+				timeLimit / 1000.0
+			);
+		}
+
+		return true;
+	}));
+
+
+
+
+	//
+	// Command: Measure
+	//
+	AddCommand(new Command("Measure", [&](CommandLine *cmd) {
+
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		int timeLimit = 30000;
+		int pointCount = cmd->GetInt(0, 1);
+
+		// Limits
+		if(pointCount < 1) pointCount = 1;
+		if(pointCount > 10) pointCount = 10;
+
+		// Log
+		LOG_INFO("Measurement started!\n");
+
+		// Start measurement
+		tablet->measurement.Start();
+
+		// Wait for the measurement to finish
+		for(int i = 0; i < timeLimit / 100; i++) {
+			Sleep(100);
+
+			// Result
+			if(tablet->measurement.pointCount >= pointCount) {
+				double distance = 0;
+				double lastX = 0;
+				double lastY = 0;
+				Vector2D point, lastPoint;
+				Vector2D minimum;
+				Vector2D maximum;
+
+				minimum.Set(10000, 10000);
+				maximum.Set(-10000, -10000);
+
+				LOG_INFO("\n");
+				LOG_INFO("Measurement results:\n");
+				for(int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
+
+					point.Set(tablet->measurement.points[pointIndex]);
+
+					// Limits
+					if(point.x < minimum.x) minimum.x = point.x;
+					if(point.x > maximum.x) maximum.x = point.x;
+					if(point.y < minimum.y) minimum.y = point.y;
+					if(point.y > maximum.y) maximum.y = point.y;
+
+					LOG_INFO(
+						"  #%d: X = %0.2f mm, Y = %0.2f mm\n",
+						pointIndex + 1,
+						point.x,
+						point.y
+					);
+
+					// Distance calculation
+					if(pointIndex > 0) {
+						distance += point.Distance(lastPoint);
+					}
+					lastPoint.Set(point);
+
+				}
+				if(tablet->measurement.pointCount > 1) {
+					LOG_INFO("  Distance: %0.2f mm\n", distance);
+					LOG_INFO("  Maximum area: %0.2f mm x %0.2f mm\n",
+						maximum.x - minimum.x, maximum.y - minimum.y
+					);
+				}
+
+				// Status message
+				char pointString[1024];
+				char pointStringIndex = 0;
+
+				// Build point string
+				for(int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
+					point.Set(tablet->measurement.points[pointIndex]);
+					pointStringIndex += sprintf_s(pointString + pointStringIndex, 1024 - pointStringIndex, "%0.3f %0.3f ", point.x, point.y);
+				}
+
+				// Output measurement results
+				LOG_STATUS("MEASUREMENT %s\n", pointString);
+
+				LOG_INFO("\n");
+
+				break;
+			}
+		}
+
+		// Stop measurement
+		tablet->measurement.Stop();
+
+		// Measurement failed
+		if(tablet->measurement.pointCount < pointCount) {
+			LOG_ERROR("Measurement failed! No enough points detected in %0.0f seconds!\n", timeLimit / 1000.0);
+			LOG_STATUS("MEASUREMENT 0\n");
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: Debug
+	//
+	// Enable/disable debugging output
+	//
+	AddCommand(new Command("Debug", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		logger.debugEnabled = cmd->GetBoolean(0, logger.debugEnabled);
+		LOG_INFO("Debug logging = %s\n", logger.debugEnabled ? "True" : "False");
+		return true;
+	}));
+
+
+	//
+	// Command: Log
+	//
+	// Start/stop logging messages to a log file
+	//
+	AddCommand(new Command("Log", [&](CommandLine *cmd) {
+		string logPath = cmd->GetString(0, "log.txt");
+		if(!cmd->GetBoolean(0, true)) {
+			logger.CloseLogFile();
+			LOG_INFO("Log file '%s' closed.\n", logger.logFilename.c_str());
+		} else if(logger.OpenLogFile(logPath)) {
+			LOG_INFO("Log file '%s' opened.\n", logPath.c_str());
+		} else {
+			LOG_ERROR("Cant open log file!\n");
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: Wait
+	//
+	AddCommand(new Command("Wait", [&](CommandLine *cmd) {
+		int waitTime = cmd->GetInt(0, 0);
+		Sleep(waitTime);
+		return true;
+	}));
+
+
+	//
+	// Command: LogDirect
+	//
+	// Enables/disables direct logging without queuing the messages.
+	//
+	AddCommand(new Command("LogDirect", [&](CommandLine *cmd) {
+		logger.ProcessMessages();
+		logger.directPrint = cmd->GetBoolean(0, logger.directPrint);
+		logger.ProcessMessages();
+
+		LOG_INFO("Log direct print = %s\n", logger.directPrint ? "True" : "False");
+		return true;
+	}));
+
+
+	//
+	// Command: Output
+	//
+	// Enables/disables VMulti output
+	//
+	AddCommand(new Command("Output", [&](CommandLine *cmd) {
+		vmulti->outputEnabled = cmd->GetBoolean(0, vmulti->outputEnabled);
+		LOG_INFO("Output enabled = %s\n", vmulti->outputEnabled ? "True" : "False");
+		return true;
+	}));
+
+
+	//
+	// Command: Information, Info
+	//
+	// Shows driver information
+	//
+	AddAlias("Info", "Information");
+	AddCommand(new Command("Information", [&](CommandLine *cmd) {
+
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		char stringBuffer[64];
+		int maxLength = sizeof(stringBuffer) - 1;
+		int stringIndex = 0;
+
+		LOG_INFO("\n");
+		LOG_INFO("Tablet: %s\n", tablet->name.c_str());
+		LOG_INFO("  Width = %0.2f mm\n", tablet->settings.width);
+		LOG_INFO("  Height = %0.2f mm\n", tablet->settings.height);
+		LOG_INFO("  Max X = %d\n", tablet->settings.maxX);
+		LOG_INFO("  Max Y = %d\n", tablet->settings.maxY);
+		LOG_INFO("  Max Pressure = %d\n", tablet->settings.maxPressure);
+		LOG_INFO("  Click Pressure = %d\n", tablet->settings.clickPressure);
+		LOG_INFO("  Keep Tip Down = %d reports\n", tablet->settings.keepTipDown);
+		LOG_INFO("  Report Id = 0x%02X\n", tablet->settings.reportId);
+		LOG_INFO("  Report Length = %d bytes\n", tablet->settings.reportLength);
+		LOG_INFO("  Detect Mask = 0x%02X\n", tablet->settings.detectMask);
+		LOG_INFO("  Ignore Mask = 0x%02X\n", tablet->settings.ignoreMask);
+
+		for(int i = 0; i < 8; i++) {
+			stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "%d ", tablet->buttonMap[i]);
+		}
+		LOG_INFO("  Button Map = %s\n", stringBuffer);
+
+
+		if(tablet->initFeatureLength > 0) {
+			LOG_INFOBUFFER(tablet->initFeature, tablet->initFeatureLength, "  Tablet init feature report: ");
+		}
+		if(tablet->initReportLength > 0) {
+			LOG_INFOBUFFER(tablet->initReport, tablet->initReportLength, "  Tablet init report: ");
+		}
+		LOG_INFO("\n");
+		LOG_INFO("Area:\n");
+		LOG_INFO("  Desktop = %0.0fpx x %0.0fpx\n",
+			mapper->areaVirtualScreen.width, mapper->areaVirtualScreen.height
+		);
+		LOG_INFO("  Screen Map = %0.0fpx x %0.0fpx @ X%+0.0fpx, Y%+0.0fpx\n",
+			mapper->areaScreen.width, mapper->areaScreen.height,
+			mapper->areaScreen.x, mapper->areaScreen.y
+		);
+		LOG_INFO("  Tablet =  %0.2fmm x %0.2fmm @ Min(%0.2fmm, %0.2fmm) Max(%0.2fmm, %0.2fmm)\n",
+			mapper->areaTablet.width, mapper->areaTablet.height,
+			mapper->areaTablet.x, mapper->areaTablet.y,
+			mapper->areaTablet.width + mapper->areaTablet.x, mapper->areaTablet.height + mapper->areaTablet.y
+		);
+		LOG_INFO("  Rotation matrix = [%f,%f,%f,%f]\n",
+			mapper->rotationMatrix[0],
+			mapper->rotationMatrix[1],
+			mapper->rotationMatrix[2],
+			mapper->rotationMatrix[3]
+		);
+		LOG_INFO("\n");
+
+		return true;
+	}));
+
+
+
+	//
+	// Command: Status
+	//
+	// Outputs driver infor as status messages
+	//
+	AddCommand(new Command("Status", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		LOG_STATUS("TABLET %s\n", tablet->name.c_str());
+
+		if(tablet->hidDevice != NULL) {
+			LOG_STATUS("HID %04X %04X %04X %04X\n",
+				tablet->hidDevice->vendorId,
+				tablet->hidDevice->productId,
+				tablet->hidDevice->usagePage,
+				tablet->hidDevice->usage
+			);
+		} else if(tablet->usbDevice != NULL) {
+			LOG_STATUS("USB %d %s\n",
+				tablet->usbDevice->stringId,
+				tablet->usbDevice->stringMatch.c_str()
+			);
+		}
+		LOG_STATUS("WIDTH %0.5f\n", tablet->settings.width);
+		LOG_STATUS("HEIGHT %0.5f\n", tablet->settings.height);
+		LOG_STATUS("MAX_X %d\n", tablet->settings.maxX);
+		LOG_STATUS("MAX_Y %d\n", tablet->settings.maxY);
+		LOG_STATUS("MAX_PRESSURE %d\n", tablet->settings.maxPressure);
+
+		return true;
+	}));
+
+
+	//
+	// Command: Include
+	//
+	// Reads commands from a file and stops if tablet is redefined.
+	//
+	AddCommand(new Command("Include", [&](CommandLine *cmd) {
+		string filename = cmd->GetString(0, "");
+		if(filename == "") {
+			LOG_ERROR("Invalid filename '%s'!\n", filename.c_str());
+			return false;
+		} else {
+			if(ExecuteFile(filename)) {
+			} else {
+				LOG_ERROR("Can't open file '%s'\n", filename.c_str());
+				return false;
+			}
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: ListCommands, List
+	//
+	// List all commands
+	//
+	AddAlias("List", "ListCommands");
+	AddCommand(new Command("ListCommands", [&](CommandLine *cmd) {
+
+		LOG_INFO("Commands: \n");
+		for(pair<string, Command*> cmdPair : commands) {
+			string commandName = cmdPair.second->name;
+			LOG_INFO("  %s\n", commandName.c_str());
+		}
+		
+		return true;
+	}));
+
+
+
+
+}
+
+//
+// Is valid command?
+//
+bool CommandHandler::IsValidCommand(string command) {
+	transform(command.begin(), command.end(), command.begin(), ::tolower);
+	if(aliases.count(command) > 0) {
+		command = aliases[command];
+	}
+	if(commands.count(command) > 0) {
+		return true;
+	}
+	return false;
+}
+
+//
+// Execute a command using command name
+//
+bool CommandHandler::ExecuteCommand(string command) {
+	return ExecuteCommand(command, NULL);
+}
+
+//
+// Execute a command using command line
+//
+bool CommandHandler::ExecuteCommand(CommandLine *cmd) {
+	return ExecuteCommand(cmd->command, cmd);
+}
+
+//
+// Execute a command
+//
+bool CommandHandler::ExecuteCommand(string command, CommandLine * cmd) {
+	transform(command.begin(), command.end(), command.begin(), ::tolower);
+	if(aliases.count(command) > 0) {
+		command = aliases[command];
+	}
+	if(commands.count(command) > 0) {
+		return commands[command]->Execute(cmd);
+	}
+	return false;
+}
+
+//
+// Execute commands from a file
+//
+bool CommandHandler::ExecuteFile(string filename) {
+
+	CommandLine *cmd;
+	ifstream file;
+	string line = "";
+
+	// Open file
+	file.open(filename);
+	if(!file.is_open()) {
+		return false;
+	}
+
+
+	LOG_INFO("\\ Reading '%s'\n", filename.c_str());
+
+	// Loop through lines
+	while(!file.eof()) {
+		getline(file, line);
+		if(line.length() == 0) continue;
+		cmd = new CommandLine(line);
+
+		//
+		// Do not redefine tablet if one is already open
+		//
+		if(cmd->is("Tablet") && tablet != NULL && tablet->IsConfigured()) {
+			LOG_INFO(">> %s\n", cmd->line.c_str());
+			LOG_INFO("Tablet is already defined!\n");
+			delete cmd;
+			break;
+		}
+		LOG_INFO(">> %s\n", cmd->line.c_str());
+
+		ExecuteCommand(cmd);
+
+		delete cmd;
+	}
+	file.close();
+
+	LOG_INFO("/ End of '%s'\n", filename.c_str());
+
+	return true;
+}
diff --git a/TabletDriverService/CommandHandler.h b/TabletDriverService/CommandHandler.h
new file mode 100644
index 0000000..2b3d96d
--- /dev/null
+++ b/TabletDriverService/CommandHandler.h
@@ -0,0 +1,30 @@
+#pragma once
+#include "Command.h"
+#include "TabletFilterTester.h"
+
+#include <string>
+#include <map>
+
+
+class CommandHandler {
+public:
+	map<string, Command*> commands;	
+	map<string, string> aliases;
+
+	CommandHandler();
+	~CommandHandler();
+
+	bool AddCommand(Command *command);
+	bool AddAlias(string commandName, string alias);
+	void CreateCommands();
+
+	bool IsValidCommand(string command);
+	bool ExecuteCommand(string command);
+	bool ExecuteCommand(CommandLine *cmd);
+	bool ExecuteCommand(string command, string parameters);
+	bool ExecuteCommand(string command, CommandLine *cmd);
+
+	bool ExecuteFile(string filename);
+
+};
+
diff --git a/TabletDriverService/CommandLine.cpp b/TabletDriverService/CommandLine.cpp
index 376a9ab..4b84cf1 100644
--- a/TabletDriverService/CommandLine.cpp
+++ b/TabletDriverService/CommandLine.cpp
@@ -33,6 +33,23 @@ bool CommandLine::is(string command) {
 	return false;
 }
 
+//
+// Get command in lower case
+//
+string CommandLine::GetCommandLowerCase() {
+	transform(command.begin(), command.end(), command.begin(), ::tolower);
+	return command;
+}
+
+//
+// Get command parameters as as string
+//
+string CommandLine::GetParameterString() {
+	if(command.size() < line.size())
+		return line.substr(command.size() + 1);
+	return "";
+}
+
 
 //
 // Parse
diff --git a/TabletDriverService/CommandLine.h b/TabletDriverService/CommandLine.h
index 2ef5656..376ec2a 100644
--- a/TabletDriverService/CommandLine.h
+++ b/TabletDriverService/CommandLine.h
@@ -20,6 +20,8 @@ class CommandLine {
 	CommandLine(string text);
 	~CommandLine();
 	bool is(string command);
+	string GetCommandLowerCase();
+	string GetParameterString();
 	int Parse(string text);
 	string ParseHex(string str);
 	string GetString(int index, string defaultValue);
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index d11875b..7c6952e 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -20,11 +20,13 @@
 
 // Global variables...
 Tablet *tablet;
+TabletHandler *tabletHandler;
 VMulti *vmulti;
+CommandHandler *commandHandler;
 OutputManager *outputManager;
 ScreenMapper *mapper;
-thread *tabletThread;
-void SetOutput(TabletState *state);
+//thread *tabletThread;
+
 
 //
 // Init console parameters
@@ -40,207 +42,101 @@ void InitConsole() {
 	SetConsoleMode(inputHandle, consoleMode);
 }
 
+
 //
-// Tablet process
+// Main
 //
-void RunTabletThread() {
-	int status;
-	bool isFirstReport = true;
-	bool isResent = false;
-	TabletFilter *filter;
-	bool filterTimedEnabled;
-
-	chrono::high_resolution_clock::time_point timeBegin = chrono::high_resolution_clock::now();
-
-	//
-	// Main Loop
-	//
-
-	while(true) {
-
-		//
-		// Read tablet position
-		//
-		status = tablet->ReadPosition();
-
-		// Position OK
-		if(status == Tablet::ReportValid) {
-			isResent = false;
-
-		// Invalid report id
-		} else if(status == Tablet::ReportInvalid) {
-			continue;
-
-		// Valid report but position is not in-range or invalid
-		} else if(status == Tablet::ReportPositionInvalid) {
-			if(!isResent && tablet->state.isValid) {
-				isResent = true;
-				tablet->state.isValid = false;
-			} else {
-				continue;
-			}
-
-		// Ignore report
-		} else if(status == Tablet::ReportIgnore) {
-			continue;
-
-		// Reading failed
-		} else {
-			LOG_ERROR("Tablet Read Error!\n");
-			CleanupAndExit(1);
-		}
-
-		//
-		// Don't send the first report
-		//
-		if(isFirstReport) {
-			isFirstReport = false;
-			continue;
-		}
-
-		// Debug messages
-		if(logger.debugEnabled) {
-			double delta = (tablet->state.time - timeBegin).count() / 1000000.0;
-			LOG_DEBUG("TabletState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f\n",
-				delta,
-				tablet->state.buttons,
-				tablet->state.position.x,
-				tablet->state.position.y,
-				tablet->state.pressure
-			);
-		}
-
-
-		// Set output values
-		if(status == Tablet::ReportPositionInvalid) {
-			tablet->state.buttons = 0;
-		}
+int main(int argc, char**argv) {
+	string line;
+	string filename;
+	CommandLine *cmd;
+	bool running = false;
 
-		//
-		// Report filters
-		//
-		// Is there any filters?
-		if(tablet->filterReportCount > 0) {
+	// Init global variables
+	vmulti = NULL;
+	tablet = NULL;
+	tabletHandler = NULL;
+	//tabletThread = NULL;
+	outputManager = new OutputManager();
 
-			// Loop through filters
-			for(int filterIndex = 0; filterIndex < tablet->filterReportCount; filterIndex++) {
+	// Init console
+	InitConsole();
 
-				// Filter
-				filter = tablet->filterReport[filterIndex];
+	// Screen mapper
+	mapper = new ScreenMapper(tablet);
+	mapper->SetRotation(0);
 
-				// Enabled?
-				if(filter != NULL && filter->isEnabled) {
+	// Command handler
+	commandHandler = new CommandHandler();
+	commandHandler->CreateCommands();
 
-					// Process
-					filter->SetTarget(&tablet->state);
-					filter->Update();
-					filter->GetPosition(&tablet->state.position);
-				}
+	//
+	// Command: Start
+	//
+	// Starts the driver
+	//
+	commandHandler->AddCommand(new Command("Start", [&](CommandLine *cmd) {
+		LOG_INFO(">> %s\n", cmd->line.c_str());
 
-			}
+		if(running) {
+			LOG_INFO("Driver is already started!\n");
+			return true;
 		}
 
-
-		// Timed filter enabled?
-		filterTimedEnabled = false;
-		for(int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
-			if(tablet->filterTimed[filterIndex]->isEnabled)
-				filterTimedEnabled = true;
+		// Unknown tablet
+		if(tablet == NULL) {
+			LOG_ERROR("Tablet not found!\n");
+			CleanupAndExit(1);
 		}
 
-		// Do not write report when timed filter is enabled
-		if(filterTimedEnabled) {
-			continue;
+		// Tablet init
+		if(!tablet->Init()) {
+			LOG_ERROR("Tablet init failed!\n");
+			LOG_ERROR("Possible fixes:\n");
+			LOG_ERROR("1) Uninstall other tablet drivers.\n");
+			LOG_ERROR("2) Stop other tablet driver services.\n");
+			CleanupAndExit(1);
 		}
 
-		SetOutput(&tablet->state);
-
-	}
-
-}
+		// Set screen mapper tablet
+		mapper->tablet = tablet;
 
-//
-// Tablet filter timer callback
-//
-VOID CALLBACK FilterTimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWaitFired) {
-	Vector2D position;
-	TabletFilter *filter;
-	TabletState outputState;
-	bool filterEnabled = false;
-
-	// Set position
-	if(tablet->state.isValid) {
-		position.Set(tablet->state.position);
-	} else {
-		return;
-	}
+		// Start tablet handler
+		tabletHandler->tablet = tablet;
+		tabletHandler->Start();
 
-	memcpy(&outputState, &tablet->state, sizeof(outputState));
-	
+		// Set running state
+		running = true;
 
 
-	// Loop through filters
-	for(int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
+		LOG_INFO("TabletDriver started!\n");
+		commandHandler->ExecuteCommand("Status");
 
-		// Filter
-		filter = tablet->filterTimed[filterIndex];
+		return true;
+	}));
 
-		// Filter enabled?
-		if(filter->isEnabled) {
-			filterEnabled = true;
+	//
+	// Command: Echo
+	//
+	commandHandler->AddCommand(new Command("Echo", [&](CommandLine *cmd) {
+		if(cmd->valueCount > 0) {
+			LOG_INFO("%s\n", cmd->line.c_str() + 5);
 		} else {
-			continue;
+			LOG_INFO("\n");
 		}
+		return true;
+	}));
 
-		// Set filter targets
-		filter->SetTarget(&outputState);
 
-		// Update filter position
-		filter->Update();
-
-		// Set output vector
-		filter->GetPosition(&outputState.position);
-
-	}
-
-	if(!filterEnabled) {
-		return;
-	}
-
-	SetOutput(&outputState);
-}
-
-
-//
-// Set Output
-//
-void SetOutput(TabletState *outputState) {
-	outputManager->Set(outputState);
-	outputManager->Write();
-}
-
-
-//
-// Main
-//
-int main(int argc, char**argv) {
-	string line;
-	string filename;
-	CommandLine *cmd;
-	bool running = false;
-
-	// Init global variables
-	vmulti = NULL;
-	tablet = NULL;
-	tabletThread = NULL;
-	outputManager = new OutputManager();
-
-	// Init console
-	InitConsole();
+	//
+	// Command: Exit
+	//
+	commandHandler->AddCommand(new Command("Exit", [&](CommandLine *cmd) {
+		LOG_INFO("Bye!\n");
+		CleanupAndExit(0);
+		return true;
+	}));
 
-	// Screen mapper
-	mapper = new ScreenMapper(tablet);
-	mapper->SetRotation(0);
 
 	// Logger
 	//LOGGER_DIRECT = true;
@@ -263,10 +159,12 @@ int main(int argc, char**argv) {
 	if(argc > 1) {
 		filename = argv[1];
 	}
-	if(!ReadCommandFile(filename)) {
+	if(!commandHandler->ExecuteFile(filename)) {
 		LOG_ERROR("Can't open '%s'\n", filename.c_str());
 	}
 
+	// Create tablet handler
+	tabletHandler = new TabletHandler();
 
 	//
 	// Main loop that reads input from the console.
@@ -286,70 +184,16 @@ int main(int argc, char**argv) {
 		// Process valid lines
 		if(line.length() > 0) {
 			cmd = new CommandLine(line);
-
-
-			//
-			// Start command
-			//
-			if(cmd->is("start")) {
-				LOG_INFO(">> %s\n", cmd->line.c_str());
-
-				if(running) {
-					LOG_INFO("Driver is already started!\n");
-					continue;
-				}
-
-				// Unknown tablet
-				if(tablet == NULL) {
-					LOG_ERROR("Tablet not found!\n");
-					CleanupAndExit(1);
-				}
-
-				// Tablet init
-				if(!tablet->Init()) {
-					LOG_ERROR("Tablet init failed!\n");
-					LOG_ERROR("Possible fixes:\n");
-					LOG_ERROR("1) Uninstall other tablet drivers.\n");
-					LOG_ERROR("2) Stop other tablet driver services.\n");
-					CleanupAndExit(1);
-				}
-
-				// Set screen mapper tablet
-				mapper->tablet = tablet;
-
-				// Set running state
-				running = true;
-
-				// Timed filter timer
-				if(tablet->filterReportCount > 0) {
-					tablet->filterTimed[0]->callback = FilterTimerCallback;
-					tablet->filterTimed[0]->StartTimer();
-				}
-
-				// Start the tablet thread
-				tabletThread = new thread(RunTabletThread);
-
-				LOG_INFO("TabletDriver started!\n");
-				LogStatus();
-
-
+			
 			//
-			// Echo
-			//
-			} else if(cmd->is("echo")) {
-				if(cmd->valueCount > 0) {
-					LOG_INFO("%s\n", cmd->line.c_str() + 5);
-				} else {
-					LOG_INFO("\n");
-				}
-
-
-			//
-			// Process all other commands
+			// Hide echo input 
 			//
+			if(cmd->is("Echo")) {
+				commandHandler->ExecuteCommand(cmd);
 			} else {
 				ProcessCommand(cmd);
 			}
+
 			delete cmd;
 		}
 
@@ -372,16 +216,16 @@ void CleanupAndExit(int code) {
 		delete vmulti;
 		*/
 
-	// Delete filter timer
-	if(tablet != NULL) {
-		if(tablet->filterTimedCount != 0) {
-			tablet->filterTimed[0]->StopTimer();
-		}
+	// Stop filter timer
+	if(tabletHandler != NULL) {
+		tabletHandler->StopTimer();
 	}
 
+	// Reset output
 	if(outputManager != NULL) {
 		outputManager->Reset();
 	}
+
 	LOGGER_STOP();
 	Sleep(500);
 
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
index 1b5a9fb..f9df670 100644
--- a/TabletDriverService/ProcessCommand.cpp
+++ b/TabletDriverService/ProcessCommand.cpp
@@ -10,976 +10,26 @@
 //
 bool ProcessCommand(CommandLine *cmd) {
 
-	LOG_INFO(">> %s\n", cmd->line.c_str());
-
-	//
-	// Tablet
-	//
-	if(cmd->is("Tablet")) {
-
-		// USB Tablet
-		if(cmd->valueCount == 3) {
-			string guid = cmd->GetString(0, "");
-			int stringId = cmd->GetInt(1, 0);
-			string stringMatch = cmd->GetString(2, "");
-			if(tablet == NULL) {
-				tablet = new Tablet(guid, stringId, stringMatch);
-				if(tablet->isOpen) {
-					LOG_INFO("Tablet found!\n");
-				} else {
-					LOG_WARNING("Can't open USB tablet '%s' %d '%s'\n", guid.c_str(), stringId, stringMatch.c_str());
-					delete tablet;
-					tablet = NULL;
-				}
-			}
-		}
-
-		// HID Tablet
-		else if(cmd->valueCount == 4) {
-			USHORT vendorID = cmd->GetInt(0, 0);
-			USHORT productID = cmd->GetInt(1, 0);
-			USHORT usagePage = cmd->GetInt(2, 0);
-			USHORT usage = cmd->GetInt(3, 0);
-			if(tablet == NULL) {
-				tablet = new Tablet(vendorID, productID, usagePage, usage);
-				if(tablet->isOpen) {
-					LOG_INFO("Tablet found!\n");
-				} else {
-					LOG_WARNING("Can't open HID tablet 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
-					delete tablet;
-					tablet = NULL;
-				}
-			}
-		} else {
-			if(tablet != NULL) {
-				if(tablet->usbDevice != NULL) {
-					USBDevice *usb = tablet->usbDevice;
-					LOG_INFO("Tablet = USB(\"%s\", %d, \"%s\")\n",
-						usb->guid.c_str(),
-						usb->stringId,
-						usb->stringMatch.c_str()
-					);
-				} else if(tablet->hidDevice != NULL) {
-					HIDDevice *hid = tablet->hidDevice;
-					LOG_INFO("Tablet = HID(0x%04X 0x%04X 0x%04X 0x%04X)\n",
-						hid->vendorId,
-						hid->productId,
-						hid->usagePage,
-						hid->usage
-					);
-				}
-			} else {
-				LOG_INFO("Tablet is not defined.\n");
-			}
-		}
-	}
-
-	// Check tablet
-	else if(cmd->is("CheckTablet")) {
-		if(!CheckTablet()) {
-			LOG_ERROR("Tablet not found!\n");
-			LOG_ERROR("Check the list of supported tablets from the GitHub page.\n");
-			LOG_ERROR("http://github.com/hawku/TabletDriver\n");
-			CleanupAndExit(1);
-		}
-	}
-
-	// HID List
-	else if(cmd->is("HIDList")) {
-		HANDLE hidHandle = 0;
-		HIDDevice *hid = new HIDDevice();
-		hid->debugEnabled = true;
-		hid->OpenDevice(&hidHandle, 1, 1, 1, 1);
-		if(hidHandle > 0) {
-			CloseHandle(hidHandle);
-		}
-		delete hid;
-	}
-
-
-	// HID Auxiliary Device
-	else if(cmd->is("HIDAux") || cmd->is("HIDAuxiliary")) {
-
-		if(cmd->valueCount == 4) {
-			USHORT vendorID = cmd->GetInt(0, 0);
-			USHORT productID = cmd->GetInt(1, 0);
-			USHORT usagePage = cmd->GetInt(2, 0);
-			USHORT usage = cmd->GetInt(3, 0);
-			if(tablet->hidDeviceAux == NULL) {
-				tablet->hidDeviceAux = new HIDDevice(vendorID, productID, usagePage, usage);
-				if(tablet->hidDeviceAux->isOpen) {
-					LOG_INFO("HID Device found!\n");
-				} else {
-					LOG_ERROR("Can't open HID device 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
-					delete tablet->hidDeviceAux;
-					tablet->hidDeviceAux = NULL;
-				}
-			}
-		}
-	}
-
-	// Auxiliary Read Read
-	else if(cmd->is("HIDAuxRead")) {
-			
-		if(cmd->valueCount > 1 && tablet->hidDeviceAux != NULL) {
-			int length = cmd->GetInt(0, 1);
-			int count = cmd->GetInt(1, 1);
-			UCHAR buffer[1024];
-			for(int i = 0; i < count; i++) {
-				tablet->hidDeviceAux->Read(buffer, length);
-				LOG_INFOBUFFER(buffer, length, "Aux read(%d): ", i+1);
-			}
-		}
-	}
-
-	// Tablet Name
-	else if(cmd->is("Name")) {
-		if(tablet == NULL) return false;
-		tablet->name = cmd->GetString(0, tablet->name);
-		LOG_INFO("Tablet name = '%s'\n", tablet->name.c_str());
-	}
-
-	// Report Id
-	else if(cmd->is("ReportId")) {
-		if(tablet == NULL) return false;
-		tablet->settings.reportId = cmd->GetInt(0, tablet->settings.reportId);
-		LOG_INFO("Tablet report id = %d\n", tablet->settings.reportId);
-	}
-
-	// Report Length
-	else if(cmd->is("ReportLength")) {
-		if(tablet == NULL) return false;
-		tablet->settings.reportLength = cmd->GetInt(0, tablet->settings.reportLength);
-		LOG_INFO("Tablet report length = %d\n", tablet->settings.reportLength);
-	}
-
-	// Detect Mask
-	else if(cmd->is("DetectMask")) {
-		if(tablet == NULL) return false;
-		tablet->settings.detectMask = cmd->GetInt(0, tablet->settings.detectMask);
-		LOG_INFO("Tablet detect mask = %02X\n", tablet->settings.detectMask);
-	}
-
-	// Ignore Mask
-	else if(cmd->is("IgnoreMask")) {
-		if(tablet == NULL) return false;
-		tablet->settings.ignoreMask = cmd->GetInt(0, tablet->settings.ignoreMask);
-		LOG_INFO("Tablet ignore mask = %02X\n", tablet->settings.ignoreMask);
-	}
-
-	// Max X
-	else if(cmd->is("MaxX")) {
-		if(tablet == NULL) return false;
-		tablet->settings.maxX = cmd->GetInt(0, tablet->settings.maxX);
-		LOG_INFO("Tablet max X = %d\n", tablet->settings.maxX);
-	}
-
-	// Max Y
-	else if(cmd->is("MaxY")) {
-		if(tablet == NULL) return false;
-		tablet->settings.maxY = cmd->GetInt(0, tablet->settings.maxY);
-		LOG_INFO("Tablet max Y = %d\n", tablet->settings.maxY);
-	}
-
-	// Max Pressure
-	else if(cmd->is("MaxPressure")) {
-		if(tablet == NULL) return false;
-		tablet->settings.maxPressure = cmd->GetInt(0, tablet->settings.maxPressure);
-		LOG_INFO("Tablet max pressure = %d\n", tablet->settings.maxPressure);
-	}
-
-	// Click Pressure
-	else if(cmd->is("ClickPressure")) {
-		if(tablet == NULL) return false;
-		tablet->settings.clickPressure = cmd->GetInt(0, tablet->settings.clickPressure);
-		LOG_INFO("Tablet click pressure = %d\n", tablet->settings.clickPressure);
-	}
-
-
-	// Keep pen tip down
-	else if(cmd->is("KeepTipDown")) {
-		if(tablet == NULL) return false;
-		tablet->settings.keepTipDown = cmd->GetInt(0, tablet->settings.keepTipDown);
-		LOG_INFO("Tablet pen tip keep down = %d reports\n", tablet->settings.keepTipDown);
-	}
-
-
-	// Width
-	else if(cmd->is("Width")) {
-		if(tablet == NULL) return false;
-		tablet->settings.width = cmd->GetDouble(0, tablet->settings.width);
-		LOG_INFO("Tablet width = %0.2f mm\n", tablet->settings.width);
-	}
-
-	// Height
-	else if(cmd->is("Height")) {
-		if(tablet == NULL) return false;
-		tablet->settings.height = cmd->GetDouble(0, tablet->settings.height);
-		LOG_INFO("Tablet height = %0.2f mm\n", tablet->settings.height);
-	}
-
-	// Skew
-	else if(cmd->is("Skew")) {
-		if(tablet == NULL) return false;
-		tablet->settings.skew = cmd->GetDouble(0, tablet->settings.skew);
-		LOG_INFO("Tablet skew = Shift X-axis %0.2f mm per Y-axis mm\n", tablet->settings.skew);
-	}
-
-	// Type
-	else if(cmd->is("Type")) {
-		if(tablet == NULL) return false;
-
-		// Wacom Intuos (490)
-		if(cmd->GetStringLower(0, "") == "wacomintuos") {
-			tablet->settings.type = TabletSettings::TypeWacomIntuos;
-		}
-
-		// Wacom CTL-4100
-		else if(cmd->GetStringLower(0, "") == "wacom4100") {
-			tablet->settings.type = TabletSettings::TypeWacom4100;
-		}
-
-		// Wacom Drivers
-		else if(cmd->GetStringLower(0, "") == "wacomdrivers") {
-			tablet->settings.type = TabletSettings::TypeWacomDrivers;
-		}
-
-		LOG_INFO("Tablet type = %d\n", tablet->settings.type);
-	}
-
-
-	// Init Feature Report
-	else if(cmd->is("InitFeature") && cmd->valueCount > 0) {
-		if(tablet == NULL) return false;
-		tablet->initFeature = new BYTE[cmd->valueCount];
-		for(int i = 0; i < (int)cmd->valueCount; i++) {
-			tablet->initFeature[i] = cmd->GetInt(i, 0);
-		}
-		tablet->initFeatureLength = cmd->valueCount;
-		LOG_INFOBUFFER(tablet->initFeature, tablet->initFeatureLength, "Tablet init feature report: ");
-	}
-
-	// Init Output Report
-	else if(cmd->is("InitReport") && cmd->valueCount > 0) {
-		if(tablet == NULL) return false;
-		tablet->initReport = new BYTE[cmd->valueCount];
-		for(int i = 0; i < (int)cmd->valueCount; i++) {
-			tablet->initReport[i] = cmd->GetInt(i, 0);
-		}
-		tablet->initReportLength = cmd->valueCount;
-		LOG_INFOBUFFER(tablet->initReport, tablet->initReportLength, "Tablet init report: ");
-
-	}
-
-
-	//
-	// Set Feature Report
-	//
-	else if((cmd->is("SetFeature") || cmd->is("Feature")) && cmd->valueCount > 1) {
-		if(tablet == NULL) return false;
-		if(tablet->hidDevice == NULL) return false;
-		int length = cmd->GetInt(0, 1);
-		BYTE *buffer = new BYTE[length];
-		for(int i = 0; i < length; i++) {
-			buffer[i] = cmd->GetInt(i + 1, 0);
-		}
-		LOG_INFOBUFFER(buffer, length, "Set Feature Report (%d): ", length);
-		tablet->hidDevice->SetFeature(buffer, length);
-		LOG_INFO("HID Feature set!\n");
-		delete buffer;
-	}
-
-	//
-	// Get Feature Report
-	//
-	else if(cmd->is("GetFeature") && cmd->valueCount > 1) {
-		if(tablet == NULL) return false;
-		if(tablet->hidDevice == NULL) return false;
-		int length = cmd->GetInt(0, 1);
-		BYTE *buffer = new BYTE[length];
-		for(int i = 0; i < length; i++) {
-			buffer[i] = cmd->GetInt(i + 1, 0);
-		}
-		LOG_INFOBUFFER(buffer, length, "Get Feature Report (%d): ", length);
-		tablet->hidDevice->GetFeature(buffer, length);
-		LOG_INFOBUFFER(buffer, length, "Result Feature Report (%d): ", length);
-		delete buffer;
-	}
-
-
-	//
-	// Send Output Report
-	//
-	else if((cmd->is("OutputReport") || cmd->is("Report")) && cmd->valueCount > 1) {
-		if(tablet == NULL) return false;
-		if(tablet->hidDevice == NULL) return false;
-		int length = cmd->GetInt(0, 1);
-		BYTE *buffer = new BYTE[length];
-		for(int i = 0; i < length; i++) {
-			buffer[i] = cmd->GetInt(i + 1, 0);
-		}
-		LOG_INFOBUFFER(buffer, length, "Sending HID Report: ");
-		tablet->hidDevice->Write(buffer, length);
-		LOG_INFO("Report sent!\n");
-		delete buffer;
-	}
-
-	//
-	// Tablet Area
-	//
-	else if(cmd->is("TabletArea") || cmd->is("Area")) {
-		if(!CheckTablet()) return true;
-		mapper->areaTablet.width = cmd->GetDouble(0, mapper->areaTablet.width);
-		mapper->areaTablet.height = cmd->GetDouble(1, mapper->areaTablet.height);
-		mapper->areaTablet.x = cmd->GetDouble(2, mapper->areaTablet.x);
-		mapper->areaTablet.y = cmd->GetDouble(3, mapper->areaTablet.y);
-
-		LogTabletArea("Tablet area");
-	}
-
-	// Button Map
-	else if(cmd->is("ButtonMap") || cmd->is("Buttons")) {
-		if(!CheckTablet()) return true;
-		char buttonMapBuffer[32];
-		int index = 0;
-		for(int i = 0; i < 8; i++) {
-			tablet->buttonMap[i] = cmd->GetInt(i, tablet->buttonMap[i]);
-			index += sprintf_s(buttonMapBuffer + index, 32 - index, "%d ", tablet->buttonMap[i]);
-		}
-		LOG_INFO("Button Map = %s\n", buttonMapBuffer);
-	}
-
-
-	// Screen Map Area
-	else if(cmd->is("ScreenArea") || cmd->is("Screen")) {
-		if(!CheckTablet()) return true;
-		mapper->areaScreen.width = cmd->GetDouble(0, mapper->areaScreen.width);
-		mapper->areaScreen.height = cmd->GetDouble(1, mapper->areaScreen.height);
-		mapper->areaScreen.x = cmd->GetDouble(2, mapper->areaScreen.x);
-		mapper->areaScreen.y = cmd->GetDouble(3, mapper->areaScreen.y);
-		LOG_INFO("Screen area = (w=%0.2f, h=%0.2f, x=%0.2f, y=%0.2f)\n",
-			mapper->areaScreen.width,
-			mapper->areaScreen.height,
-			mapper->areaScreen.x,
-			mapper->areaScreen.y
-		);
-	}
-
-	// Screen Map Area
-	else if(cmd->is("DesktopSize") || cmd->is("Desktop")) {
-		if(!CheckTablet()) return true;
-		mapper->areaVirtualScreen.width = cmd->GetDouble(0, mapper->areaVirtualScreen.width);
-		mapper->areaVirtualScreen.height = cmd->GetDouble(1, mapper->areaVirtualScreen.height);
-		LOG_INFO("Desktop size = (%0.2f px x %0.2f px)\n",
-			mapper->areaVirtualScreen.width,
-			mapper->areaVirtualScreen.height
-		);
-	}
-
-	// Move tablet area to border
-	else if(cmd->is("TabletMove") || cmd->is("Move") && cmd->valueCount > 0) {
-		if(!CheckTablet()) return true;
-		string border;
-		double offset;
-		bool moved = true;
-
-		for(int i = 0; i < cmd->valueCount; i += 2) {
-
-			border = cmd->GetStringLower(i, "");
-			offset = cmd->GetDouble(i + 1, 0.0);
-			moved = true;
-
-			if(border == "top") {
-				mapper->areaTablet.y = offset;
-			} else if(border == "bottom") {
-				mapper->areaTablet.y = tablet->settings.height - mapper->areaTablet.height - offset;
-			} else if(border == "left") {
-				mapper->areaTablet.x = offset;
-			} else if(border == "right") {
-				mapper->areaTablet.x = tablet->settings.width - mapper->areaTablet.width - offset;
-			} else {
-				moved = false;
-			}
-			if(moved) {
-				LOG_INFO("Tablet area moved to %s border with %0.2f mm margin.\n", border.c_str(), offset);
-				LogTabletArea("  New tablet area");
-			}
-		}
-	}
-
-	//
-	// Rotate tablet area
-	//
-	else if(cmd->is("Rotate")) {
-		if(!CheckTablet()) return true;
-		double value = cmd->GetDouble(0, 0);
-		mapper->SetRotation(value);
-		LOG_INFO("Rotation matrix = [%f,%f,%f,%f]\n",
-			mapper->rotationMatrix[0],
-			mapper->rotationMatrix[1],
-			mapper->rotationMatrix[2],
-			mapper->rotationMatrix[3]
-		);
-	}
-
-
-	//
-	// Relative mode sensitivity
-	//
-	else if(cmd->is("Sensitivity")) {
-		if(!CheckTablet()) return true;
-		outputManager->settings->relativeSensitivity = cmd->GetDouble(0, outputManager->settings->relativeSensitivity);
-		LOG_INFO("Relative mode sensitivity = %0.2f px/mm\n", outputManager->settings->relativeSensitivity);
-	}
-
-	//
-	// Relative mode reset distance
-	//
-	else if(cmd->is("ResetDistance")) {
-		if(!CheckTablet()) return true;
-		outputManager->settings->relativeResetDistance = cmd->GetDouble(0, outputManager->settings->relativeResetDistance);
-		LOG_INFO("Relative mode reset distance = %0.2f mm\n", outputManager->settings->relativeResetDistance);
-	}
-
-
-	//
-	// VMulti output mode
-	//
-	else if(cmd->is("Mode")) {
-		string mode = cmd->GetStringLower(0, "");
-
-		// Absolute mouse
-		if(mode.compare(0, 3, "abs") == 0) {
-			outputManager->SetOutputMode(OutputManager::ModeVMultiAbsolute);
-			LOG_INFO("Output Mode = Absolute\n");
-		}
-
-		// Relative mouse
-		else if(mode.compare(0, 3, "rel") == 0) {
-			outputManager->SetOutputMode(OutputManager::ModeVMultiRelative);
-			LOG_INFO("Output Mode = Relative\n");
-		}
-
-		// Digitizer
-		else if(mode.compare(0, 3, "dig") == 0 || mode.compare(0, 3, "pen") == 0) {
-
-			outputManager->SetOutputMode(OutputManager::ModeVMultiDigitizer);
-			LOG_INFO("Output Mode = Digitizer\n");
-		}
-
-		// SendInput
-		else if(mode.compare(0, 12, "sendinputabs") == 0) {
-			outputManager->SetOutputMode(OutputManager::ModeSendInputAbsolute);
-			LOG_INFO("Output Mode = SendInput Absolute\n");
-		}
-
-		// Dummy
-		else if(mode == "dummy") {
-			outputManager->SetOutputMode(OutputManager::ModeDummy);
-			LOG_INFO("Output Mode = Dummy\n");
-		}
-
-		else {
-			LOG_ERROR("Unknown output mode '%s'\n", mode.c_str());
-		}
-
-	}
-
-
-	//
-	// Smoothing filter
-	//
-	else if(cmd->is("Smoothing")) {
-		if(!CheckTablet()) return true;
-		double latency = cmd->GetDouble(0, tablet->smoothing.GetLatency());
-		double threshold = cmd->GetDouble(1, tablet->smoothing.threshold * 100);
-
-		threshold /= 100;
-
-		string stringValue = cmd->GetStringLower(0, "");
-
-		// Off / False
-		if(stringValue == "off" || stringValue == "false") {
-			latency = 0;
-		}
-
-		// Limits
-		if(latency < 0) latency = 1;
-		if(latency > 1000) latency = 1000;
-		if(threshold < 0.1) threshold = 0.1;
-		if(threshold > 0.99) threshold = 0.99;
-
-		// Set threshold
-		tablet->smoothing.threshold = threshold;
-
-		// Set smoothing filter latency
-		tablet->smoothing.SetLatency(latency);
-
-		// Print output
-		if(tablet->smoothing.weight < 1.0) {
-			tablet->smoothing.isEnabled = true;
-			LOG_INFO("Smoothing = %0.2f ms to reach %0.0f%% (weight = %f)\n", latency, tablet->smoothing.threshold * 100, tablet->smoothing.weight);
-		} else {
-			tablet->smoothing.isEnabled = false;
-			LOG_INFO("Smoothing = off\n");
-		}
-	}
-
-	//
-	// Smoothing filter interval
-	//
-	else if(cmd->is("SmoothingInterval")) {
-		int interval = cmd->GetInt(0, (int)round(tablet->smoothing.timerInterval));
-
-		// 10 Hz
-		if(interval > 100) interval = 100;
-
-		// 1000 Hz
-		if(interval < 1) interval = 1;
-
-		// Interval changed?
-		if(interval != (int)round(tablet->smoothing.timerInterval)) {
-			tablet->smoothing.timerInterval = interval;
-			tablet->smoothing.SetLatency(tablet->smoothing.latency);
-			if(tablet->smoothing.StopTimer()) {
-				tablet->smoothing.StartTimer();
-			}
-		}
-
-		LOG_INFO("Smoothing Interval = %d (%0.2f Hz, %0.2f ms, %f)\n", interval, 1000.0 / interval, tablet->smoothing.latency, tablet->smoothing.weight);
-
-	}
-
-
-	//
-	// Noise reduction filter
-	//
-	else if(cmd->is("Noise")) {
-
-		string stringValue = cmd->GetStringLower(0, "");
-
-		// Off / False
-		if(stringValue == "off" || stringValue == "false") {
-			tablet->noise.isEnabled = false;
-			LOG_INFO("Noise Reduction = off\n");
-
-		// Enable
-		} else {
-
-			// Position buffer length
-			int length = cmd->GetInt(0, tablet->noise.buffer.length);
-
-			// Threshold where the noise filter starts to reduce the amount of filtering.
-			double distanceThreshold = cmd->GetDouble(1, tablet->noise.distanceThreshold);
-
-			// Distance where the amount of filtering will be zero. Default maximum is 2 times the threshold.
-			double distanceMaximum = cmd->GetDouble(2, distanceThreshold * 2.0);
-
-			// Geometric median calculation iteration count
-			int iterations = cmd->GetInt(3, tablet->noise.iterations);
-
-			// Limits
-			if(length < 0) length = 0;
-			else if(length > 50) length = 50;
-
-			if(distanceThreshold < 0.0) distanceThreshold = 0.0;
-			else if(distanceThreshold > 1000) distanceThreshold = 1000;
-
-			if(distanceMaximum < 0.1) distanceMaximum = 0.1;
-			else if(distanceMaximum > 1000) distanceMaximum = 1000;
-
-			if(distanceThreshold > distanceMaximum) distanceThreshold = distanceMaximum;
-
-			if(iterations < 1) iterations = 1;
-			else if(iterations > 100) iterations = 100;
-
-			// Set noise filter values
-			tablet->noise.buffer.SetLength(length);
-			tablet->noise.distanceThreshold = distanceThreshold;
-			tablet->noise.distanceMaximum = distanceMaximum;
-			tablet->noise.iterations = iterations;
-
-			// Enable filter
-			if(tablet->noise.buffer.length > 0) {
-				tablet->noise.isEnabled = true;
-				LOG_INFO("Noise Reduction = [\n");
-				LOG_INFO("  %d samples\n", length);
-				LOG_INFO("  %0.2f mm threshold (Wacom %0.2f mm/s)\n", distanceThreshold, distanceThreshold * 133.0);
-				LOG_INFO("  %0.2f mm maximum (Wacom %0.2f mm/s)\n", distanceMaximum, distanceMaximum * 133.0);
-				LOG_INFO("  %d iterations\n", iterations);
-				LOG_INFO("]\n");
-			} else {
-				tablet->noise.isEnabled = false;
-				LOG_INFO("Noise Reduction = off\n");
-			}
-
-		}
-	}
-
-	//
-	// Anti-smoothing filter
-	//
-	else if(cmd->is("AntiSmoothing") || cmd->is("Anti")) {
-
-		string stringValue = cmd->GetStringLower(0, "");
-
-		// Off / False
-		if(stringValue == "off" || stringValue == "false") {
-			tablet->antiSmoothing.isEnabled = false;
-			LOG_INFO("Anti-smoothing = off\n");
-
-		// Enable
-		} else {
-
-			double shape = cmd->GetDouble(0, 1.0);
-			double compensation = cmd->GetDouble(1, 1.0);
-			bool ignoreWhenDragging = cmd->GetBoolean(2, false);
-
-			if(shape <= 0) {
-				tablet->antiSmoothing.isEnabled = false;
-				LOG_INFO("Anti-smoothing = off\n");
-			} else {
-				tablet->antiSmoothing.shape = shape;
-				tablet->antiSmoothing.compensation = compensation;
-				tablet->antiSmoothing.ignoreWhenDragging = ignoreWhenDragging;
-				tablet->antiSmoothing.isEnabled = true;
-				LOG_INFO("Anti-smoothing = Shape:%0.2f Compensation:%0.2f DragIgnore:%s\n",
-					tablet->antiSmoothing.shape,
-					tablet->antiSmoothing.compensation,
-					tablet->antiSmoothing.ignoreWhenDragging ? "true" : "false"
-				);
-			}
-		}
-	}
-
-	//
-	// Filter tester
-	//
-	else if(cmd->is("FilterTester") || cmd->is("Tester")) {
-
-		string filterName = cmd->GetStringLower(0, "");
-		string inputFilepath = cmd->GetStringLower(1, "tester_input.txt");
-		string outputFilepath = cmd->GetStringLower(2, "tester_output.txt");
-		TabletFilter *filter = NULL;
-		TabletFilterTester *tester = NULL;
-		char settingsString[1024];
-
-		if(filterName.compare(0, 4, "anti") == 0) {
-			LOG_DEBUG("Anti!\n");
-			filter = new TabletFilterAntiSmoothing();
-			((TabletFilterAntiSmoothing*)filter)->shape = tablet->antiSmoothing.shape;
-			((TabletFilterAntiSmoothing*)filter)->compensation = tablet->antiSmoothing.compensation;
-			((TabletFilterAntiSmoothing*)filter)->ignoreWhenDragging = tablet->antiSmoothing.ignoreWhenDragging;
-			sprintf_s(settingsString, "settings AntiSmoothing shape=%0.3f compensation=%0.3f dragignore=%s",
-				tablet->antiSmoothing.shape,
-				tablet->antiSmoothing.compensation,
-				tablet->antiSmoothing.ignoreWhenDragging ? "true" : "false"
-			);
-
-		} else if(filterName.compare(0, 5, "noise") == 0) {
-			filter = new TabletFilterNoiseReduction();
-			((TabletFilterNoiseReduction*)filter)->buffer.SetLength(tablet->noise.buffer.length);
-			((TabletFilterNoiseReduction*)filter)->distanceThreshold = tablet->noise.distanceThreshold;
-			((TabletFilterNoiseReduction*)filter)->distanceMaximum = tablet->noise.distanceMaximum;
-			((TabletFilterNoiseReduction*)filter)->iterations = tablet->noise.iterations;
-			sprintf_s(settingsString, "settings NoiseReduction buffer=%d threshold=%0.3f maximum=%0.3f iterations=%d",
-				tablet->noise.buffer.length,
-				tablet->noise.distanceThreshold,
-				tablet->noise.distanceMaximum,
-				tablet->noise.iterations
-			);
-
-
-		}
-		if(filter != NULL) {
-
-			logger.directPrint = true;
-
-			LOG_INFO("Filter test starting!\n");
-
-			tester = new TabletFilterTester(filter, inputFilepath, outputFilepath);
-			bool result = tester->Open();
-			if(!result) {
-				LOG_ERROR("Filter tester can't open files!\n");
-			}
-			tester->outputFile << settingsString << "\n";
-			tester->Run();
-			LOG_INFO("Filter test ended!\n");
-
-			logger.ProcessMessages();
-			logger.directPrint = false;
-
-		} else {
-			LOG_INFO("Usage: FilterTester <filter name>\n");
-		}
-
-		if(filter != NULL) {
-			delete filter;
-		}
-		if(tester != NULL) {
-			delete tester;
-		}
-
-	}
-
-
-
-	// Debug
-	else if(cmd->is("Debug")) {
-		if(!CheckTablet()) return true;
-		logger.debugEnabled = cmd->GetBoolean(0, logger.debugEnabled);
-		LOG_INFO("Debug logging = %s\n", logger.debugEnabled ? "True" : "False");
-	}
-
-
-	// Log
-	else if(cmd->is("Log") && cmd->valueCount > 0) {
-		string logPath = cmd->GetString(0, "log.txt");
-		if(!cmd->GetBoolean(0, true)) {
-			logger.CloseLogFile();
-			LOG_INFO("Log file '%s' closed.\n", logger.logFilename.c_str());
-		} else if(logger.OpenLogFile(logPath)) {
-			LOG_INFO("Log file '%s' opened.\n", logPath.c_str());
-		} else {
-			LOG_ERROR("Cant open log file!\n");
-		}
-	}
-
-
-	// Wait
-	else if(cmd->is("Wait")) {
-		int waitTime = cmd->GetInt(0, 0);
-		Sleep(waitTime);
-	}
-
-	// Direct logging
-	else if(cmd->is("LogDirect")) {
-		logger.ProcessMessages();
-		logger.directPrint = cmd->GetBoolean(0, logger.directPrint);
-		logger.ProcessMessages();
-
-		LOG_INFO("Log direct print = %s\n", logger.directPrint ? "True" : "False");
-	}
-
-
-	// Output
-	else if(cmd->is("Output")) {
-		vmulti->outputEnabled = cmd->GetBoolean(0, vmulti->outputEnabled);
-		LOG_INFO("Output enabled = %s\n", vmulti->outputEnabled ? "True" : "False");
-	}
-
-	// Info
-	else if(cmd->is("Info")) {
-		if(!CheckTablet()) return true;
-		LogInformation();
-	}
-
-	// Status
-	else if(cmd->is("Status")) {
-		if(!CheckTablet()) return true;
-		LogStatus();
-	}
-
-	//
-	// Benchmark
-	//
-	else if(cmd->is("Benchmark") || cmd->is("Bench")) {
-		if(!CheckTablet()) return true;
-
-		int timeLimit;
-		int reportCount = cmd->GetInt(0, 200);
-
-		// Limit report count
-		if(reportCount < 10) reportCount = 10;
-		if(reportCount > 1000) reportCount = 1000;
-
-		// Time limit
-		timeLimit = reportCount * 10;
-		if(timeLimit < 1000) timeLimit = 1000;
-
-		// Log
-		LOG_INFO("Tablet benchmark starting in 3 seconds!\n");
-		LOG_INFO("Keep the pen stationary on top of the tablet!\n");
-		Sleep(3000);
-		LOG_INFO("Benchmark started!\n");
-
-		// Start measurement
-		tablet->measurement.Start(reportCount);
-
-		// Wait for the benchmark to finish
-		for(int i = 0; i < timeLimit / 100; i++) {
-			Sleep(100);
-
-			// Benchmark results
-			if(tablet->measurement.reportCounter <= 0) {
-
-				double width = tablet->measurement.maximum.x - tablet->measurement.minimum.x;
-				double height = tablet->measurement.maximum.y - tablet->measurement.minimum.y;
-				LOG_INFO("\n");
-				LOG_INFO("Benchmark result (%d positions):\n", tablet->measurement.totalReports);
-				LOG_INFO("  Tablet: %s\n", tablet->name.c_str());
-				LOG_INFO("  Area: %0.2f mm x %0.2f mm (%0.0f px x %0.0f px)\n",
-					mapper->areaTablet.width,
-					mapper->areaTablet.height,
-					mapper->areaScreen.width,
-					mapper->areaScreen.height
-				);
-				LOG_INFO("  X range: %0.3f mm <-> %0.3f mm\n", tablet->measurement.minimum.x, tablet->measurement.maximum.x);
-				LOG_INFO("  Y range: %0.3f mm <-> %0.3f mm\n", tablet->measurement.minimum.y, tablet->measurement.maximum.y);
-				LOG_INFO("  Width: %0.3f mm (%0.2f px)\n",
-					width,
-					mapper->areaScreen.width / mapper->areaTablet.width * width
-				);
-				LOG_INFO("  Height: %0.3f mm (%0.2f px)\n",
-					height,
-					mapper->areaScreen.height / mapper->areaTablet.height* height
-				);
-				LOG_INFO("  Noise filter threshold: %0.2f mm\n", sqrt(width * width + height * height));
-
-
-				LOG_INFO("\n");
-				LOG_STATUS("BENCHMARK %d %0.3f %0.3f %s\n", tablet->measurement.totalReports, width, height, tablet->name.c_str());
-				break;
-			}
-		}
-
-		// Stop measurement
-		tablet->measurement.Stop();
-
-		// Benchmark failed
-		if(tablet->measurement.reportCounter > 0) {
-			LOG_ERROR("Benchmark failed!\n");
-			LOG_ERROR("Not enough reports captured in %0.2f seconds!\n",
-				timeLimit / 1000.0
-			);
-		}
-	}
-
+	bool logResult = false;
 
+	LOG_INFO(">> %s\n", cmd->line.c_str());
 
 	//
-	// Measurement
+	// Execute command handler command
 	//
-	else if(cmd->is("Measure")) {
-		if(!CheckTablet()) return true;
-
-		int timeLimit = 30000;
-		int pointCount = cmd->GetInt(0, 1);
-
-		// Limits
-		if(pointCount < 1) pointCount = 1;
-		if(pointCount > 10) pointCount = 10;
-
-		// Log
-		LOG_INFO("Measurement started!\n");
-
-		// Start measurement
-		tablet->measurement.Start();
-
-		// Wait for the measurement to finish
-		for(int i = 0; i < timeLimit / 100; i++) {
-			Sleep(100);
-
-			// Result
-			if(tablet->measurement.pointCount >= pointCount) {
-				double distance = 0;
-				double lastX = 0;
-				double lastY = 0;
-				Vector2D point, lastPoint;
-				Vector2D minimum;
-				Vector2D maximum;
-
-				minimum.Set(10000, 10000);
-				maximum.Set(-10000, -10000);
-
-				LOG_INFO("\n");
-				LOG_INFO("Measurement results:\n");
-				for(int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
-
-					point.Set(tablet->measurement.points[pointIndex]);
-
-					// Limits
-					if(point.x < minimum.x) minimum.x = point.x;
-					if(point.x > maximum.x) maximum.x = point.x;
-					if(point.y < minimum.y) minimum.y = point.y;
-					if(point.y > maximum.y) maximum.y = point.y;
-
-					LOG_INFO(
-						"  #%d: X = %0.2f mm, Y = %0.2f mm\n",
-						pointIndex + 1,
-						point.x,
-						point.y
-					);
-
-					// Distance calculation
-					if(pointIndex > 0) {
-						distance += point.Distance(lastPoint);
-					}
-					lastPoint.Set(point);
-
-				}
-				if(tablet->measurement.pointCount > 1) {
-					LOG_INFO("  Distance: %0.2f mm\n", distance);
-					LOG_INFO("  Maximum area: %0.2f mm x %0.2f mm\n",
-						maximum.x - minimum.x, maximum.y - minimum.y
-					);
-				}
-
-				// Status message
-				char pointString[1024];
-				char pointStringIndex = 0;
-
-				// Build point string
-				for(int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
-					point.Set(tablet->measurement.points[pointIndex]);
-					pointStringIndex += sprintf_s(pointString + pointStringIndex, 1024 - pointStringIndex, "%0.3f %0.3f ", point.x, point.y);
-				}
-
-				// Output measurement results
-				LOG_STATUS("MEASUREMENT %s\n", pointString);
-
-				LOG_INFO("\n");
-
-				break;
-			}
-		}
-
-		// Stop measurement
-		tablet->measurement.Stop();
-
-		// Measurement failed
-		if(tablet->measurement.pointCount < pointCount) {
-			LOG_ERROR("Measurement failed! No enough points detected in %0.0f seconds!\n", timeLimit / 1000.0);
-			LOG_STATUS("MEASUREMENT 0\n");
-		}
-
-
+	if(cmd->command.back() == '?') {
+		logResult = true;
+		cmd->command.pop_back();
 	}
-
-
-
-
-	// Include
-	else if(cmd->is("Include")) {
-		string filename = cmd->GetString(0, "");
-		if(filename == "") {
-			LOG_ERROR("Invalid filename '%s'!\n", filename.c_str());
-		} else {
-			if(ReadCommandFile(filename)) {
-			} else {
-				LOG_ERROR("Can't open file '%s'\n", filename.c_str());
-			}
+	if(commandHandler->IsValidCommand(cmd->command)) {
+		bool result = commandHandler->ExecuteCommand(cmd->command, cmd);
+		if(logResult) {
+			LOG_INFO("Result: %s\n", result ? "True" : "False");
 		}
-	}
-
+		return result;
 
-	// Exit
-	else if(cmd->is("Exit") || cmd->is("Quit")) {
-		LOG_INFO("Bye!\n");
-		CleanupAndExit(0);
 	}
 
-
 	// Unknown
 	else if(cmd->isValid) {
 		LOG_WARNING("Unknown command: %s\n", cmd->line.c_str());
@@ -988,152 +38,3 @@ bool ProcessCommand(CommandLine *cmd) {
 	return true;
 }
 
-
-
-//
-// Read command file
-//
-bool ReadCommandFile(string filename) {
-	CommandLine *cmd;
-	ifstream file;
-	string line = "";
-
-	// Open config file
-	file.open(filename);
-	if(!file.is_open()) {
-		return false;
-	}
-
-
-	LOG_INFO("\\ Reading '%s'\n", filename.c_str());
-
-	// Loop through lines
-	while(!file.eof()) {
-		getline(file, line);
-		if(line.length() == 0) continue;
-		cmd = new CommandLine(line);
-
-		//
-		// Do not redefine tablet if one is already open
-		//
-		if(cmd->is("Tablet") && tablet != NULL && tablet->IsConfigured()) {
-			LOG_INFO(">> %s\n", cmd->line.c_str());
-			LOG_INFO("Tablet is already defined!\n");
-			delete cmd;
-			break;
-		}
-		ProcessCommand(cmd);
-		delete cmd;
-	}
-	file.close();
-
-	LOG_INFO("/ End of '%s'\n", filename.c_str());
-
-	return true;
-}
-
-
-
-//
-// Log general information
-//
-void LogInformation() {
-	char stringBuffer[64];
-	int maxLength = sizeof(stringBuffer) - 1;
-	int stringIndex = 0;
-
-	LOG_INFO("\n");
-	LOG_INFO("Tablet: %s\n", tablet->name.c_str());
-	LOG_INFO("  Width = %0.2f mm\n", tablet->settings.width);
-	LOG_INFO("  Height = %0.2f mm\n", tablet->settings.height);
-	LOG_INFO("  Max X = %d\n", tablet->settings.maxX);
-	LOG_INFO("  Max Y = %d\n", tablet->settings.maxY);
-	LOG_INFO("  Max Pressure = %d\n", tablet->settings.maxPressure);
-	LOG_INFO("  Click Pressure = %d\n", tablet->settings.clickPressure);
-	LOG_INFO("  Keep Tip Down = %d reports\n", tablet->settings.keepTipDown);
-	LOG_INFO("  Report Id = %02X\n", tablet->settings.reportId);
-	LOG_INFO("  Report Length = %d bytes\n", tablet->settings.reportLength);
-	LOG_INFO("  Detect Mask = 0x%02X\n", tablet->settings.detectMask);
-	LOG_INFO("  Ignore Mask = 0x%02X\n", tablet->settings.ignoreMask);
-
-	for(int i = 0; i < 8; i++) {
-		stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "%d ", tablet->buttonMap[i]);
-	}
-	LOG_INFO("  Button Map = %s\n", stringBuffer);
-
-
-	if(tablet->initFeatureLength > 0) {
-		LOG_INFOBUFFER(tablet->initFeature, tablet->initFeatureLength, "  Tablet init feature report: ");
-	}
-	if(tablet->initReportLength > 0) {
-		LOG_INFOBUFFER(tablet->initReport, tablet->initReportLength, "  Tablet init report: ");
-	}
-	LOG_INFO("\n");
-	LOG_INFO("Area:\n");
-	LOG_INFO("  Desktop = %0.0fpx x %0.0fpx\n",
-		mapper->areaVirtualScreen.width, mapper->areaVirtualScreen.height
-	);
-	LOG_INFO("  Screen Map = %0.0fpx x %0.0fpx @ X%+0.0fpx, Y%+0.0fpx\n",
-		mapper->areaScreen.width, mapper->areaScreen.height,
-		mapper->areaScreen.x, mapper->areaScreen.y
-	);
-	LOG_INFO("  Tablet =  %0.2fmm x %0.2fmm @ Min(%0.2fmm, %0.2fmm) Max(%0.2fmm, %0.2fmm)\n",
-		mapper->areaTablet.width, mapper->areaTablet.height,
-		mapper->areaTablet.x, mapper->areaTablet.y,
-		mapper->areaTablet.width + mapper->areaTablet.x, mapper->areaTablet.height + mapper->areaTablet.y
-	);
-	LOG_INFO("  Rotation matrix = [%f,%f,%f,%f]\n",
-		mapper->rotationMatrix[0],
-		mapper->rotationMatrix[1],
-		mapper->rotationMatrix[2],
-		mapper->rotationMatrix[3]
-	);
-	LOG_INFO("\n");
-}
-
-//
-// Log Status
-//
-void LogStatus() {
-	LOG_STATUS("TABLET %s\n", tablet->name.c_str());
-
-	if(tablet->hidDevice != NULL) {
-		LOG_STATUS("HID %04X %04X %04X %04X\n",
-			tablet->hidDevice->vendorId,
-			tablet->hidDevice->productId,
-			tablet->hidDevice->usagePage,
-			tablet->hidDevice->usage
-		);
-	} else if(tablet->usbDevice != NULL) {
-		LOG_STATUS("USB %d %s\n",
-			tablet->usbDevice->stringId,
-			tablet->usbDevice->stringMatch.c_str()
-		);
-	}
-	LOG_STATUS("WIDTH %0.5f\n", tablet->settings.width);
-	LOG_STATUS("HEIGHT %0.5f\n", tablet->settings.height);
-	LOG_STATUS("MAX_X %d\n", tablet->settings.maxX);
-	LOG_STATUS("MAX_Y %d\n", tablet->settings.maxY);
-	LOG_STATUS("MAX_PRESSURE %d\n", tablet->settings.maxPressure);
-}
-
-//
-// Log tablet area
-//
-void LogTabletArea(string text) {
-	LOG_INFO("%s: (%0.2f mm x %0.2f mm X+%0.2f mm Y+%0.2f mm)\n",
-		text.c_str(),
-		mapper->areaTablet.width,
-		mapper->areaTablet.height,
-		mapper->areaTablet.x,
-		mapper->areaTablet.y
-	);
-}
-
-
-bool CheckTablet() {
-	if(tablet == NULL) {
-		return false;
-	}
-	return true;
-}
diff --git a/TabletDriverService/ProcessCommand.h b/TabletDriverService/ProcessCommand.h
index 5dff2bb..d87ffa3 100644
--- a/TabletDriverService/ProcessCommand.h
+++ b/TabletDriverService/ProcessCommand.h
@@ -3,8 +3,3 @@
 #include "TabletFilterTester.h"
 
 bool ProcessCommand(CommandLine *cmd);
-bool ReadCommandFile(string filename);
-void LogTabletArea(string text);
-void LogInformation();
-void LogStatus();
-bool CheckTablet();
\ No newline at end of file
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index f498a51..c1a9710 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -52,11 +52,12 @@ Tablet::Tablet() {
 
 	// Timed filters
 	filterTimed[0] = &smoothing;
-	filterTimedCount = 1;
+	filterTimed[1] = &gravityFilter;
+	filterTimedCount = 2;
 
 	// Report filters
 	filterReport[0] = &antiSmoothing;
-	filterReport[1] = &noise;
+	filterReport[1] = &noiseFilter;
 	filterReportCount = 2;
 
 	// Button map
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 1713697..3bf44ba 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -10,6 +10,7 @@
 #include "TabletFilterNoiseReduction.h"
 #include "TabletFilterAntiSmoothing.h"
 #include "TabletFilterPeak.h"
+#include "TabletFilterGravity.h"
 #include "TabletMeasurement.h"
 #include "Vector2D.h"
 
@@ -63,11 +64,14 @@ class Tablet {
 	TabletFilterSmoothing smoothing;
 
 	// Noise reduction filter
-	TabletFilterNoiseReduction noise;
+	TabletFilterNoiseReduction noiseFilter;
 
 	// Anti-smoothing filter
 	TabletFilterAntiSmoothing antiSmoothing;
 
+	// Gravity filter
+	TabletFilterGravity gravityFilter;
+
 	// Timed filters
 	TabletFilter *filterTimed[10];
 	int filterTimedCount;
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index 91e9ae7..7eaec42 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -168,6 +168,8 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="Command.h" />
+    <ClInclude Include="CommandHandler.h" />
     <ClInclude Include="CommandLine.h" />
     <ClInclude Include="HIDDevice.h" />
     <ClInclude Include="Logger.h" />
@@ -187,7 +189,9 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="Tablet.h" />
     <ClInclude Include="TabletFilterAntiSmoothing.h" />
+    <ClInclude Include="TabletFilterGravity.h" />
     <ClInclude Include="TabletFilterTester.h" />
+    <ClInclude Include="TabletHandler.h" />
     <ClInclude Include="TabletMeasurement.h" />
     <ClInclude Include="TabletFilter.h" />
     <ClInclude Include="TabletFilterNoiseReduction.h" />
@@ -201,6 +205,8 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClInclude Include="VMulti.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="Command.cpp" />
+    <ClCompile Include="CommandHandler.cpp" />
     <ClCompile Include="CommandLine.cpp" />
     <ClCompile Include="HIDDevice.cpp" />
     <ClCompile Include="Logger.cpp" />
@@ -219,7 +225,9 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClCompile Include="ScreenMapper.cpp" />
     <ClCompile Include="Tablet.cpp" />
     <ClCompile Include="TabletFilterAntiSmoothing.cpp" />
+    <ClCompile Include="TabletFilterGravity.cpp" />
     <ClCompile Include="TabletFilterTester.cpp" />
+    <ClCompile Include="TabletHandler.cpp" />
     <ClCompile Include="TabletMeasurement.cpp" />
     <ClCompile Include="TabletFilter.cpp" />
     <ClCompile Include="TabletFilterNoiseReduction.cpp" />
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index d0d13be..ddf3282 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -108,6 +108,18 @@
     <ClInclude Include="OutputDummy.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="TabletHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TabletFilterGravity.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Command.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="CommandHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -203,6 +215,18 @@
     <ClCompile Include="OutputDummy.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="TabletHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TabletFilterGravity.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Command.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CommandHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">
diff --git a/TabletDriverService/TabletFilter.cpp b/TabletDriverService/TabletFilter.cpp
index 5ee10dd..b561253 100644
--- a/TabletDriverService/TabletFilter.cpp
+++ b/TabletDriverService/TabletFilter.cpp
@@ -2,36 +2,32 @@
 #include "TabletFilter.h"
 
 
+//
+// Constructor
+//
 TabletFilter::TabletFilter() {
-	timer = NULL;
-	timerInterval = 2;
+	timerInterval = 10;
 	isValid = false;
 	isEnabled = false;
 }
 
+
 //
-// Start Timer
+// Set filter output position
 //
-bool TabletFilter::StartTimer() {
-	return CreateTimerQueueTimer(
-		&timer,
-		NULL, callback,
-		NULL,
-		0,
-		(int)timerInterval,
-		WT_EXECUTEDEFAULT
-	);
+void TabletFilter::SetOutput(TabletState * tabletState) {
+	memcpy(&outputState, tabletState, sizeof(TabletState));
 }
 
-
 //
-// Stop Timer
+// Get filter output position
 //
-bool TabletFilter::StopTimer() {
-	if(timer == NULL) return false;
-	bool result = DeleteTimerQueueTimer(NULL, timer, NULL);
-	if(result) {
-		timer = NULL;
-	}
-	return result;
-}
\ No newline at end of file
+bool TabletFilter::GetOutput(TabletState *tabletState) {
+	memcpy(tabletState, &outputState, sizeof(TabletState));
+	return true;
+}
+
+void TabletFilter::OnTimerIntervalChange(double oldInterval, double newInterval) {
+	timerInterval = newInterval;
+}
+
diff --git a/TabletDriverService/TabletFilter.h b/TabletDriverService/TabletFilter.h
index 8edbcd0..828ce9d 100644
--- a/TabletDriverService/TabletFilter.h
+++ b/TabletDriverService/TabletFilter.h
@@ -5,22 +5,20 @@
 
 class TabletFilter {
 public:
-	virtual void SetTarget(TabletState *tabletState) = 0;
-	virtual void SetPosition(Vector2D vector) = 0;
-	virtual bool GetPosition(Vector2D *vector) = 0;
-	virtual void Update() = 0;
 
-	HANDLE timer;
-	WAITORTIMERCALLBACK callback;
+	TabletState outputState;
 	double timerInterval;
-
 	bool isEnabled;
 	bool isValid;
 
 	TabletFilter();
 
-	bool StartTimer();
-	bool StopTimer();
+	virtual void SetTarget(TabletState *tabletState) = 0;
+	virtual void SetOutput(TabletState *tabletState);
+	virtual bool GetOutput(TabletState *tabletState);
+	virtual void OnTimerIntervalChange(double oldInterval, double newInterval);
+	virtual void Update() = 0;
 
+	
 };
 
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.cpp b/TabletDriverService/TabletFilterAntiSmoothing.cpp
index 2170a97..d7057a3 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.cpp
+++ b/TabletDriverService/TabletFilterAntiSmoothing.cpp
@@ -29,6 +29,8 @@ TabletFilterAntiSmoothing::TabletFilterAntiSmoothing() {
 	timeBegin = chrono::high_resolution_clock::now();
 	timeLastReport = timeBegin;
 	timeNow = timeBegin;
+	
+	outputPosition = &outputState.position;
 }
 
 //
@@ -37,31 +39,21 @@ TabletFilterAntiSmoothing::TabletFilterAntiSmoothing() {
 TabletFilterAntiSmoothing::~TabletFilterAntiSmoothing() {
 }
 
+
 //
-// TabletFilter methods
+// Set target
 //
-
-// Set target position
 void TabletFilterAntiSmoothing::SetTarget(TabletState *tabletState) {
 	latestTarget.Set(tabletState->position);
 	timeNow = tabletState->time;
 	memcpy(&this->tabletState, tabletState, sizeof(TabletState));
+	memcpy(&outputState, tabletState, sizeof(TabletState));
 }
 
-// Set position
-void TabletFilterAntiSmoothing::SetPosition(Vector2D vector) {
-	position.x = vector.x;
-	position.y = vector.y;
-}
-
-// Get position
-bool TabletFilterAntiSmoothing::GetPosition(Vector2D *outputVector) {
-	outputVector->x = position.x;
-	outputVector->y = position.y;
-	return true;
-}
 
-// Update
+//
+// Update filter
+//
 void TabletFilterAntiSmoothing::Update() {
 
 	double timeDelta;
@@ -124,7 +116,7 @@ void TabletFilterAntiSmoothing::Update() {
 				timeDelta
 			);
 		}
-		position.Set(latestTarget);
+		outputPosition->Set(latestTarget);
 		ignoreInvalidReports--;
 
 
@@ -140,11 +132,11 @@ void TabletFilterAntiSmoothing::Update() {
 		//
 		predictedPosition.Set(oldTarget);
 		predictedPosition.LerpAdd(latestTarget, pow(predictedVelocity / velocity, shape) * compensation);
-		position.Set(predictedPosition);
+		outputPosition->Set(predictedPosition);
 
 	// Invalid velocity -> set the position to the latest target
 	} else {
-		position.Set(latestTarget);
+		outputPosition->Set(latestTarget);
 	}
 
 
@@ -155,32 +147,30 @@ void TabletFilterAntiSmoothing::Update() {
 
 		// Ignore anti-smoothing pen pressure is detected
 		if(tabletState.pressure > 0) {
-			position.Set(latestTarget);
+			outputPosition->Set(latestTarget);
 		}
 
 		// Switching from drag to hover
 		if(tabletState.pressure == 0 && oldTabletState.pressure > 0) {
 			ignoreInvalidReports = 1;
-			position.Set(latestTarget);
+			outputPosition->Set(latestTarget);
 		}
 
 		// Switching from hover to drag
 		if(tabletState.pressure > 0 && oldTabletState.pressure == 0) {
 			ignoreInvalidReports = 1;
-			position.Set(latestTarget);
+			outputPosition->Set(latestTarget);
 		}
 
 	}
 
-
-
 	// Debug message
 	if(logger.debugEnabled) {
-		double delta = position.Distance(latestTarget);
+		double delta = outputPosition->Distance(latestTarget);
 		LOG_DEBUG("T=%0.2f T=[%0.2f,%0.2f] P=[%0.2f,%0.2f] D=%0.3f R=%0.2f RA=%0.2f V=%0.2f PV=%0.2f A=%0.0f J=%0.0f L=%0.2f\n",
 			(timeNow - timeBegin).count() / 1000000.0,
 			latestTarget.x, latestTarget.y,
-			position.x, position.y,
+			outputPosition->x, outputPosition->y,
 			delta,
 			reportRate,
 			reportRateAverage,
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.h b/TabletDriverService/TabletFilterAntiSmoothing.h
index 7168749..4ad3976 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.h
+++ b/TabletDriverService/TabletFilterAntiSmoothing.h
@@ -7,9 +7,10 @@
 
 class TabletFilterAntiSmoothing : public TabletFilter {
 public:
-	Vector2D position;
 	Vector2D latestTarget;
 	Vector2D oldTarget;
+	Vector2D *outputPosition;
+
 	TabletState tabletState;
 	TabletState oldTabletState;
 
@@ -18,8 +19,6 @@ class TabletFilterAntiSmoothing : public TabletFilter {
 	bool ignoreWhenDragging;
 
 	void SetTarget(TabletState *tabletState);
-	void SetPosition(Vector2D vector);
-	bool GetPosition(Vector2D *outputVector);
 	void Update();
 
 	TabletFilterAntiSmoothing();
diff --git a/TabletDriverService/TabletFilterGravity.cpp b/TabletDriverService/TabletFilterGravity.cpp
new file mode 100644
index 0000000..e9ee5f3
--- /dev/null
+++ b/TabletDriverService/TabletFilterGravity.cpp
@@ -0,0 +1,110 @@
+#include "stdafx.h"
+#include "TabletFilterGravity.h"
+
+#define LOG_MODULE "Gravity"
+#include "Logger.h"
+
+TabletFilterGravity::TabletFilterGravity() {
+	gravity = 10.0;
+	friction = 10.0;
+	pressureGravity = 0.0;
+	pressureFriction = 0.0;
+
+	velocityVector.Set(0, 0);
+	outputPosition.Set(0, 0);
+	ignoreButton = 0;
+
+	isEnabled = false;
+}
+
+
+TabletFilterGravity::~TabletFilterGravity() {
+}
+
+void TabletFilterGravity::SetTarget(TabletState *tabletState) {
+	targetPosition.Set(tabletState->position);
+	memcpy(&outputState, tabletState, sizeof(TabletState));
+}
+
+void TabletFilterGravity::Update() {
+
+	double timeDelta = timerInterval / 1000.0;
+
+	//
+	// Only use this filter when mouse 1, 2 or 3 is down
+	//
+	if((outputState.buttons & 0x07) == 0) {
+		if(ignoreButton-- > 0) {
+		} else {
+			outputPosition.Set(targetPosition);
+			velocityVector.Set(0, 0);
+		}
+	} else {
+		ignoreButton = 2;
+	}
+
+	// Target to output distance vector
+	Vector2D distanceVector(
+		targetPosition.x - outputPosition.x,
+		targetPosition.y - outputPosition.y
+	);
+	double distance = distanceVector.Magnitude();
+
+
+	//
+	// Gravity calculation
+	//
+	double gravityForce = pow(distance, 0.5) * (gravity + outputState.pressure * pressureGravity) * timeDelta;
+	Vector2D gravityVector(
+		(distanceVector.x / distance) * gravityForce,
+		(distanceVector.y / distance) * gravityForce
+	);
+	velocityVector.Add(gravityVector);
+
+
+	//
+	// Friction calculation
+	//
+	double velocityMagnitude = velocityVector.Magnitude();
+
+	// Apply friction when the velocity is over 1 mm/s and distance over 1 mm
+	if(velocityMagnitude > 1.0 * timeDelta && distance > 1.0) {
+
+		double frictionForce = velocityMagnitude * (friction + outputState.pressure * pressureFriction) * timeDelta;
+
+		Vector2D frictionVector(
+			-(velocityVector.x / velocityMagnitude) * frictionForce,
+			-(velocityVector.y / velocityMagnitude) * frictionForce
+		);
+		velocityVector.Add(frictionVector);
+
+	} else {
+		velocityVector.Set(0, 0);
+	}
+
+	//
+	// Move output position
+	//
+	outputPosition.Add(
+		velocityVector.x * timeDelta,
+		velocityVector.y * timeDelta
+	);
+
+
+	// Set output state
+	outputState.position.Set(outputPosition);
+
+
+	// Debug message
+	if(logger.debugEnabled) {
+		LOG_DEBUG("X=%0.2f Y=%0.2f DX=%0.2f DY=%0.2f VX=%0.2f VY=%0.2f\n",
+			outputPosition.x,
+			outputPosition.y,
+			distanceVector.x,
+			distanceVector.y,
+			velocityVector.x,
+			velocityVector.y
+		);
+	}
+
+}
diff --git a/TabletDriverService/TabletFilterGravity.h b/TabletDriverService/TabletFilterGravity.h
new file mode 100644
index 0000000..60ddfe1
--- /dev/null
+++ b/TabletDriverService/TabletFilterGravity.h
@@ -0,0 +1,24 @@
+#pragma once
+#include "TabletFilter.h"
+class TabletFilterGravity :
+	public TabletFilter {
+public:
+	Vector2D targetPosition;
+	Vector2D outputPosition;
+	
+	Vector2D velocityVector;
+
+	double gravity;
+	double friction;
+	double pressureGravity;
+	double pressureFriction;
+
+	int ignoreButton;
+
+	TabletFilterGravity();
+	~TabletFilterGravity();
+
+	void SetTarget(TabletState *tabletState);
+	void Update();
+};
+
diff --git a/TabletDriverService/TabletFilterNoiseReduction.cpp b/TabletDriverService/TabletFilterNoiseReduction.cpp
index 705827b..ba4872c 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.cpp
+++ b/TabletDriverService/TabletFilterNoiseReduction.cpp
@@ -17,6 +17,7 @@ TabletFilterNoiseReduction::TabletFilterNoiseReduction() {
 	timeBegin = chrono::high_resolution_clock::now();
 	timeLastReport = timeBegin;
 	timeNow = timeBegin;
+	outputPosition = &outputState.position;
 }
 
 //
@@ -34,19 +35,7 @@ void TabletFilterNoiseReduction::SetTarget(TabletState *tabletState) {
 	latestTarget.Set(tabletState->position);
 	buffer.Add(tabletState->position);
 	timeNow = tablet->state.time;
-}
-
-// Set position
-void TabletFilterNoiseReduction::SetPosition(Vector2D vector) {
-	position.x = vector.x;
-	position.y = vector.y;
-}
-
-// Get position
-bool TabletFilterNoiseReduction::GetPosition(Vector2D *outputVector) {
-	outputVector->x = position.x;
-	outputVector->y = position.y;
-	return true;
+	memcpy(&outputState, tabletState, sizeof(TabletState));
 }
 
 // Update
@@ -68,18 +57,18 @@ void TabletFilterNoiseReduction::Update() {
 
 	// One position in the buffer?
 	if(buffer.count == 1) {
-		position.Set(latestTarget);
+		outputPosition->Set(latestTarget);
 		return;
 	}
 
 	// Calculate geometric median from the buffer positions
-	GetGeometricMedianVector(&position, iterations);
+	GetGeometricMedianVector(outputPosition, iterations);
 
 	// Reset the buffer when distance to latest target position is larger than the threshold
 	if(buffer.isValid) {
 
 		// Distance between latest position and ring buffer geometric median
-		double distance = latestTarget.Distance(position);
+		double distance = latestTarget.Distance(outputPosition);
 
 		// Distance larger than threshold -> modify the ring buffer
 		if(distance > distanceThreshold && distanceMaximum > 0) {
@@ -103,13 +92,13 @@ void TabletFilterNoiseReduction::Update() {
 				for(int i = 0; i < buffer.count; i++) {
 					buffer[i]->Set(latestTarget);
 				}
-				position.Set(latestTarget);
+				outputPosition->Set(latestTarget);
 
 			// Move buffer positions and current position towards the latest target using linear interpolation
 			// Amount of movement is the distance ratio between threshold and maximum
 			} else {
 				buffer.LerpAdd(latestTarget, distanceRatio);
-				position.LerpAdd(latestTarget, distanceRatio);
+				outputPosition->LerpAdd(latestTarget, distanceRatio);
 			}
 
 			// Debug message
@@ -127,7 +116,7 @@ void TabletFilterNoiseReduction::Update() {
 
 	// Debug message
 	if(logger.debugEnabled) {
-		double distance = position.Distance(latestTarget);
+		double distance = outputPosition->Distance(latestTarget);
 		double latency;
 		if(velocity <= 0) {
 			latency = 0;
@@ -138,7 +127,7 @@ void TabletFilterNoiseReduction::Update() {
 			(timeNow - timeBegin).count() / 1000000.0,
 			buffer.count,
 			latestTarget.x, latestTarget.y,
-			position.x, position.y,
+			outputPosition->x, outputPosition->y,
 			distance,
 			reportRate,
 			velocity,
diff --git a/TabletDriverService/TabletFilterNoiseReduction.h b/TabletDriverService/TabletFilterNoiseReduction.h
index 5357f2b..de289c3 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.h
+++ b/TabletDriverService/TabletFilterNoiseReduction.h
@@ -9,9 +9,9 @@ class TabletFilterNoiseReduction : public TabletFilter {
 public:
 
 	PositionRingBuffer buffer;
-	Vector2D position;
 	Vector2D latestTarget;
 	Vector2D oldTarget;
+	Vector2D *outputPosition;
 
 	int iterations;
 	double distanceThreshold;
@@ -23,8 +23,6 @@ class TabletFilterNoiseReduction : public TabletFilter {
 
 
 	void SetTarget(TabletState *tabletState);
-	void SetPosition(Vector2D vector);
-	bool GetPosition(Vector2D *outputVector);
 	void Update();
 
 	bool GetAverageVector(Vector2D *output);
diff --git a/TabletDriverService/TabletFilterPeak.cpp b/TabletDriverService/TabletFilterPeak.cpp
index b8ae179..dc2600d 100644
--- a/TabletDriverService/TabletFilterPeak.cpp
+++ b/TabletDriverService/TabletFilterPeak.cpp
@@ -30,19 +30,12 @@ TabletFilterPeak::~TabletFilterPeak() {
 // Set target position
 void TabletFilterPeak::SetTarget(TabletState *tabletState) {
 	buffer.Add(tabletState->position);
+	memcpy(&outputState, tabletState, sizeof(TabletState));
 }
-// Set position
-void TabletFilterPeak::SetPosition(Vector2D vector) {
-	position.x = vector.x;
-	position.y = vector.y;
-}
-// Get position
-bool TabletFilterPeak::GetPosition(Vector2D *outputVector) {
-	outputVector->x = position.x;
-	outputVector->y = position.y;
-	return true;
-}
+
+//
 // Update
+//
 void TabletFilterPeak::Update() {
 	Vector2D oldPosition;
 	double distance;
@@ -51,11 +44,11 @@ void TabletFilterPeak::Update() {
 	if(
 		buffer.GetLatest(&oldPosition, -1)
 		&&
-		buffer.GetLatest(&position, 0)
+		buffer.GetLatest(&outputState.position, 0)
 	) {
 
 		// Jump longer than the distance threshold?
-		distance = oldPosition.Distance(position);
+		distance = oldPosition.Distance(outputState.position);
 		if(distance > distanceThreshold) {
 
 			/*
@@ -66,8 +59,7 @@ void TabletFilterPeak::Update() {
 			);
 			*/
 
-			position.x = oldPosition.x;
-			position.y = oldPosition.y;
+			outputState.position.Set(oldPosition);
 
 			// Reset buffer
 			buffer.Reset();
diff --git a/TabletDriverService/TabletFilterPeak.h b/TabletDriverService/TabletFilterPeak.h
index 611723e..6862572 100644
--- a/TabletDriverService/TabletFilterPeak.h
+++ b/TabletDriverService/TabletFilterPeak.h
@@ -7,12 +7,9 @@ class TabletFilterPeak : public TabletFilter {
 public:
 
 	PositionRingBuffer buffer;
-	Vector2D position;
 	double distanceThreshold;
 
 	void SetTarget(TabletState *tabletState);
-	void SetPosition(Vector2D vector);
-	bool GetPosition(Vector2D *outputVector);
 	void Update();
 
 
diff --git a/TabletDriverService/TabletFilterSmoothing.cpp b/TabletDriverService/TabletFilterSmoothing.cpp
index 3be36d0..6dea69a 100644
--- a/TabletDriverService/TabletFilterSmoothing.cpp
+++ b/TabletDriverService/TabletFilterSmoothing.cpp
@@ -1,6 +1,9 @@
 #include "stdafx.h"
 #include "TabletFilterSmoothing.h"
 
+#define LOG_MODULE "Smoothing"
+#include "Logger.h"
+
 //
 // Constructor
 //
@@ -25,19 +28,15 @@ TabletFilterSmoothing::~TabletFilterSmoothing() {
 // Set target position
 void TabletFilterSmoothing::SetTarget(TabletState *tabletState) {
 	target.Set(tabletState->position);
+	memcpy(&outputState, tabletState, sizeof(TabletState));
 }
 
-// Set current position
-void TabletFilterSmoothing::SetPosition(Vector2D vector) {
-	position.x = vector.x;
-	position.y = vector.y;
-}
-
-// Get current position
-bool TabletFilterSmoothing::GetPosition(Vector2D *outputVector) {
-	outputVector->x = position.x;
-	outputVector->y = position.y;
-	return true;
+//
+// Filter timer interval changed
+//
+void TabletFilterSmoothing::OnTimerIntervalChange(double oldInterval, double newInterval) {
+	timerInterval = newInterval;
+	SetLatency(latency);
 }
 
 // Update
@@ -45,21 +44,37 @@ void TabletFilterSmoothing::Update() {
 
 	double deltaX, deltaY, distance;
 
-	deltaX = target.x - position.x;
-	deltaY = target.y - position.y;
+	deltaX = target.x - outputPosition.x;
+	deltaY = target.y - outputPosition.y;
 	distance = sqrt(deltaX*deltaX + deltaY * deltaY);
 
+	if(logger.debugEnabled) {
+		LOG_DEBUG("TX=%0.2f TY=%0.2f OX=%0.2f OY=%0.2f DX=%0.2f DY=%0.2f D=%0.2f W=%0.3f\n",
+			target.x,
+			target.y,
+			outputPosition.x,
+			outputPosition.y,
+			deltaX,
+			deltaY,
+			distance,
+			weight
+		);
+	}
+	
+
 	// Distance large enough?
 	if(distance > 0.01) {
-		position.x += deltaX * weight;
-		position.y += deltaY * weight;
+		outputPosition.x += deltaX * weight;
+		outputPosition.y += deltaY * weight;
 
 	// Too short distance -> set output values as target values
 	} else {
-		position.x = target.x;
-		position.y = target.y;
+		outputPosition.x = target.x;
+		outputPosition.y = target.y;
 	}
 
+	outputState.position.Set(outputPosition);
+
 }
 
 //
diff --git a/TabletDriverService/TabletFilterSmoothing.h b/TabletDriverService/TabletFilterSmoothing.h
index 6fee16b..59db575 100644
--- a/TabletDriverService/TabletFilterSmoothing.h
+++ b/TabletDriverService/TabletFilterSmoothing.h
@@ -9,16 +9,17 @@ class TabletFilterSmoothing : public TabletFilter {
 	double weight;
 	double threshold;
 	Vector2D target;
-	Vector2D position;
+	Vector2D outputPosition;
 
 	TabletFilterSmoothing();
 	~TabletFilterSmoothing();
 
 	void SetTarget(TabletState *tabletState);
-	void SetPosition(Vector2D vector);
-	bool GetPosition(Vector2D *outputVector);
+	void OnTimerIntervalChange(double oldInterval, double newInterval) override;
 	void Update();
 
+
+
 	double GetLatency(double filterWeight, double interval, double threshold);
 	double GetLatency(double filterWeight);
 	double GetLatency();
diff --git a/TabletDriverService/TabletFilterTester.cpp b/TabletDriverService/TabletFilterTester.cpp
index 2bb9cc2..9abaf26 100644
--- a/TabletDriverService/TabletFilterTester.cpp
+++ b/TabletDriverService/TabletFilterTester.cpp
@@ -39,11 +39,11 @@ void TabletFilterTester::Run() {
 	double time;
 	chrono::high_resolution_clock::time_point timeBegin;
 	chrono::high_resolution_clock::time_point timeNow;
-	Vector2D position, newPosition;
+	Vector2D position;
 	string line;
 	bool firstReport;
 	double distance;
-	TabletState tabletState;
+	TabletState tabletState, outputState;
 
 	firstReport = true;
 
@@ -73,19 +73,20 @@ void TabletFilterTester::Run() {
 			if(firstReport) {
 				timeBegin = chrono::high_resolution_clock::now();
 				firstReport = false;
-				newPosition.Set(position);
+				outputState.position.Set(position);
 				LOG_DEBUG("First report: %0.3f, %0.2f, %0.2f\n", time, position.x, position.y);
 				
 			} else {
 				tabletState.time = timeNow;
 				tabletState.position.Set(position);
+				memcpy(&outputState, &tabletState, sizeof(TabletState));
 				filter->SetTarget(&tabletState);
 				filter->Update();
-				filter->GetPosition(&newPosition);
+				filter->GetOutput(&outputState);
 			}
 
 			timeNow = timeBegin + chrono::microseconds((int)(time * 1000.0));
-			distance = position.Distance(newPosition);
+			distance = position.Distance(outputState.position);
 
 			LOG_DEBUG("Output: %0.3f ms, %0.2f, %0.2f (%0.3f mm)\n",
 				time,
@@ -94,7 +95,7 @@ void TabletFilterTester::Run() {
 				distance
 			);
 
-			outputFile << "position " << time << " " << newPosition.x << " " << newPosition.y << fixed << setprecision(2) << "\n";
+			outputFile << "position " << time << " " << outputState.position.x << " " << outputState.position.y << fixed << setprecision(2) << "\n";
 
 
 		}
diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
new file mode 100644
index 0000000..e6eae07
--- /dev/null
+++ b/TabletDriverService/TabletHandler.cpp
@@ -0,0 +1,278 @@
+#include "stdafx.h"
+#include "TabletHandler.h"
+
+#define LOG_MODULE "TabletHandler"
+#include "Logger.h"
+
+//
+// Constructor
+//
+TabletHandler::TabletHandler() {
+	tablet = NULL;
+	tabletInputThread = NULL;
+	isRunning = false;
+	timerInterval = 10;
+}
+
+
+//
+// Destructor
+//
+TabletHandler::~TabletHandler() {
+	StopTimer();
+}
+
+
+//
+// Start tablet handler
+//
+bool TabletHandler::Start() {
+	if(tablet == NULL) return false;
+	ChangeTimerInterval((int)round(timerInterval));
+	tabletInputThread = new thread(&TabletHandler::RunTabletInputThread, this);
+	return true;
+}
+
+//
+// Stop tablet handler
+//
+bool TabletHandler::Stop() {
+	if(tablet == NULL) return false;
+	isRunning = false;
+	return true;
+}
+
+
+//
+// Start filter timer
+//
+bool TabletHandler::StartTimer() {
+	BOOL result = CreateTimerQueueTimer(
+		&timer,
+		NULL, TimerCallback,
+		this,
+		0,
+		(int)timerInterval,
+		WT_EXECUTEDEFAULT
+	);
+	if(!result) return false;
+
+	return true;
+}
+
+
+//
+// Stop filter timer
+//
+bool TabletHandler::StopTimer() {
+	if(timer == NULL) return true;
+	bool result = DeleteTimerQueueTimer(NULL, timer, NULL);
+	if(result) {
+		timer = NULL;
+		return true;
+	}
+	return false;
+}
+
+//
+// Change timer interval 
+//
+void TabletHandler::ChangeTimerInterval(int newInterval) {
+
+	double oldInterval = timerInterval;
+	timerInterval = newInterval;
+	
+	// Tell the new interval to timed filters
+	if(tablet != NULL) {
+		for(int i = 0; i < tablet->filterTimedCount; i++) {
+			tablet->filterTimed[i]->OnTimerIntervalChange(oldInterval, newInterval);
+		}
+	}
+
+	if(StopTimer()) {
+		StartTimer();
+	}
+}
+
+//
+// Tablet input thread
+//
+void TabletHandler::RunTabletInputThread() {
+	int status;
+	bool isFirstReport = true;
+	bool isResent = false;
+	TabletFilter *filter;
+	bool filterTimedEnabled;
+	TabletState outputState;
+
+	chrono::high_resolution_clock::time_point timeBegin = chrono::high_resolution_clock::now();
+
+	isRunning = true;
+
+	//
+	// Main Loop
+	//
+
+	while(isRunning) {
+
+		//
+		// Read tablet position
+		//
+		status = tablet->ReadPosition();
+
+		// Position OK
+		if(status == Tablet::ReportValid) {
+			isResent = false;
+
+		// Invalid report id
+		} else if(status == Tablet::ReportInvalid) {
+			tablet->state.isValid = false;
+			continue;
+
+		// Valid report but position is not in-range or invalid
+		} else if(status == Tablet::ReportPositionInvalid) {
+			if(!isResent && tablet->state.isValid) {
+				isResent = true;
+				tablet->state.isValid = false;
+			} else {
+				continue;
+			}
+
+		// Ignore report
+		} else if(status == Tablet::ReportIgnore) {
+			continue;
+
+		// Reading failed
+		} else {
+			LOG_ERROR("Tablet Read Error!\n");
+			CleanupAndExit(1);
+		}
+
+		//
+		// Don't send the first report
+		//
+		if(isFirstReport) {
+			isFirstReport = false;
+			continue;
+		}
+
+		// Debug messages
+		if(logger.debugEnabled) {
+			double delta = (tablet->state.time - timeBegin).count() / 1000000.0;
+			LOG_DEBUG("TabletState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f\n",
+				delta,
+				tablet->state.buttons,
+				tablet->state.position.x,
+				tablet->state.position.y,
+				tablet->state.pressure
+			);
+		}
+
+
+		// Set output values
+		if(status == Tablet::ReportPositionInvalid) {
+			tablet->state.buttons = 0;
+		}
+
+		// Copy input state values to ouput state
+		memcpy(&outputState, &tablet->state, sizeof(outputState));
+
+
+		//
+		// Report filters
+		//
+		// Is there any filters?
+		if(tablet->filterReportCount > 0) {
+
+			// Loop through filters
+			for(int filterIndex = 0; filterIndex < tablet->filterReportCount; filterIndex++) {
+
+				// Filter
+				filter = tablet->filterReport[filterIndex];
+
+				// Enabled?
+				if(filter != NULL && filter->isEnabled) {
+
+					// Process
+					filter->SetTarget(&outputState);
+					filter->Update();
+					filter->GetOutput(&outputState);
+				}
+
+			}
+		}
+
+
+		// Timed filter enabled?
+		filterTimedEnabled = false;
+		for(int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
+			if(tablet->filterTimed[filterIndex]->isEnabled)
+				filterTimedEnabled = true;
+		}
+
+		// Do not write report when timed filter is enabled
+		if(filterTimedEnabled) {
+			continue;
+		}
+
+		outputManager->Set(&outputState);
+		outputManager->Write();
+	}
+
+	isRunning = false;
+
+}
+
+//
+// Timer tick
+//
+void TabletHandler::OnTimerTick() {
+	if(tablet == NULL) return;
+
+	Vector2D position;
+	TabletFilter *filter;
+	TabletState outputState;
+	bool filterEnabled = false;
+
+	// Set position
+	if(tablet->state.isValid) {
+		position.Set(tablet->state.position);
+	} else {
+		return;
+	}
+
+	// Copy input state values to ouput state
+	memcpy(&outputState, &tablet->state, sizeof(TabletState));
+
+	// Loop through filters
+	for(int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
+
+		// Filter
+		filter = tablet->filterTimed[filterIndex];
+
+		// Filter enabled?
+		if(filter->isEnabled) {
+			filterEnabled = true;
+		} else {
+			continue;
+		}
+
+		// Set filter targets
+		filter->SetTarget(&outputState);
+
+		// Update filter position
+		filter->Update();
+
+		// Set output vector
+		filter->GetOutput(&outputState);
+
+	}
+
+	if(!filterEnabled) {
+		return;
+	}
+
+	outputManager->Set(&outputState);
+	outputManager->Write();
+
+}
diff --git a/TabletDriverService/TabletHandler.h b/TabletDriverService/TabletHandler.h
new file mode 100644
index 0000000..80f9e26
--- /dev/null
+++ b/TabletDriverService/TabletHandler.h
@@ -0,0 +1,32 @@
+#pragma once
+#include "Tablet.h"
+#include <thread>
+
+class TabletHandler {
+public:
+	Tablet *tablet;
+	thread *tabletInputThread;
+	HANDLE timer;
+	double timerInterval;
+	bool isRunning;
+
+	TabletHandler();
+	~TabletHandler();
+
+	bool Start();
+	bool Stop();
+	bool StartTimer();
+	bool StopTimer();
+	void ChangeTimerInterval(int newInterval);
+	void RunTabletInputThread();
+
+	void OnTimerTick();
+
+
+private:
+	static VOID CALLBACK TimerCallback(_In_ PVOID lpParameter, _In_ BOOLEAN TimerOrWaitFired) {
+		TabletHandler *tabletHandler = (TabletHandler *)lpParameter;
+		tabletHandler->OnTimerTick();
+	}
+};
+
diff --git a/TabletDriverService/Vector2D.cpp b/TabletDriverService/Vector2D.cpp
index 75a2fd3..7b186bd 100644
--- a/TabletDriverService/Vector2D.cpp
+++ b/TabletDriverService/Vector2D.cpp
@@ -8,6 +8,11 @@ Vector2D::Vector2D() {
 	x = 0;
 	y = 0;
 }
+Vector2D::Vector2D(double x, double y) {
+	this->x = x;
+	this->y = y;
+}
+
 
 //
 // Destructor
@@ -38,12 +43,31 @@ void Vector2D::Multiply(double value) {
 	this->y *= value;
 }
 
+void Vector2D::Divide(double value) {
+	this->x /= value;
+	this->y /= value;
+}
+
+void Vector2D::Normalize() {
+	Divide(Magnitude());
+}
+
+double Vector2D::Magnitude() {
+	return sqrt(x * x + y * y);
+}
+
+
+
 double Vector2D::Distance(Vector2D target) {
 	double dx = target.x - this->x;
 	double dy = target.y - this->y;
 	return sqrt(dx * dx + dy * dy);
 }
 
+double Vector2D::Distance(Vector2D * target) {
+	return Distance(*target);
+}
+
 double Vector2D::Angle(Vector2D target) {
 	double dx = target.x - this->x;
 	double dy = target.y - this->y;
diff --git a/TabletDriverService/Vector2D.h b/TabletDriverService/Vector2D.h
index ebf9b20..98f1365 100644
--- a/TabletDriverService/Vector2D.h
+++ b/TabletDriverService/Vector2D.h
@@ -4,6 +4,7 @@ class Vector2D {
 	double x;
 	double y;
 	Vector2D();
+	Vector2D(double x, double y);
 	~Vector2D();
 
 	void Set(double x, double y);
@@ -11,7 +12,11 @@ class Vector2D {
 	void Add(double x, double y);
 	void Add(Vector2D vector);
 	void Multiply(double value);
+	void Divide(double value);
+	void Normalize();
+	double Magnitude();
 	double Distance(Vector2D target);
+	double Distance(Vector2D *target);
 	double Angle(Vector2D target);
 	void LerpAdd(Vector2D target, double t);
 };
diff --git a/TabletDriverService/stdafx.h b/TabletDriverService/stdafx.h
index 835c2f5..e9ac935 100644
--- a/TabletDriverService/stdafx.h
+++ b/TabletDriverService/stdafx.h
@@ -13,10 +13,14 @@
 #include "Tablet.h"
 #include "ScreenMapper.h"
 #include "OutputManager.h"
+#include "TabletHandler.h"
+#include "CommandHandler.h"
 
 // Global variables...
 extern VMulti *vmulti;
+extern CommandHandler *commandHandler;
 extern Tablet *tablet;
+extern TabletHandler *tabletHandler;
 extern OutputManager *outputManager;
 extern ScreenMapper *mapper;
 extern void CleanupAndExit(int code);

From 4036809ab01aa07a30170ddae3aeea7bd1723fca Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 9 Dec 2018 00:15:06 +0200
Subject: [PATCH 50/83] Tablet detection, auto restart, tab completion, VEIKK,
 refactoring, etc.

- Added new way to detect tablets. Tablet detection can now be done more accurately to support more tablets.
- Multiple fixes and changes in WinUSB and HID device handling.
- "GetDeviceStrings" command to request strings from HID and WinUSB devices.
- "CheckDeviceString" command to validate tablet using a device string.
- "InitStrings" tablet setting to initialize tablet with string requests.
- Added ability to disable auto restart.
- Removed device list from driver startup (HIDList command). Might help with some problematic USB devices.
- VEIKK S640 configuration by frodriguez96
- Added tab completion to console input.
- Added ctrl+space completion to commands tab text fields.
- Fixed digitizer output offset.
- Relative mode position is now reset with time difference from last tablet report (default 100 ms).
- Smoothing filter output position is now stopped if last input state is older than 100 milliseconds.
- Added milliseconds to logger output.
- Split CommandHandler to multiple files.
- Split MainWindow.xaml.cs to multiple files.
- Code refactoring.
---
 TabletDriverGUI/Configuration.cs              |    2 +
 TabletDriverGUI/MainWindow.Console.cs         |  448 ++++
 TabletDriverGUI/MainWindow.Driver.cs          |  436 ++++
 TabletDriverGUI/MainWindow.Settings.cs        | 1176 ++++++++++
 TabletDriverGUI/MainWindow.xaml               |   38 +-
 TabletDriverGUI/MainWindow.xaml.cs            | 2056 +----------------
 TabletDriverGUI/TabletDriver.cs               |  180 +-
 TabletDriverGUI/TabletDriverGUI.csproj        |    3 +
 TabletDriverService/CommandHandler.Device.cpp |  467 ++++
 .../CommandHandler.Filters.cpp                |  342 +++
 TabletDriverService/CommandHandler.Other.cpp  |  587 +++++
 TabletDriverService/CommandHandler.Tablet.cpp |  426 ++++
 TabletDriverService/CommandHandler.cpp        | 1427 +-----------
 TabletDriverService/CommandHandler.h          |    9 +-
 TabletDriverService/CommandLine.cpp           |   20 +-
 TabletDriverService/HIDDevice.cpp             |   28 +-
 TabletDriverService/HIDDevice.h               |    2 +
 TabletDriverService/Logger.cpp                |   33 +-
 TabletDriverService/Logger.h                  |    1 +
 TabletDriverService/Main.cpp                  |  111 +-
 .../OutputSendInputAbsolute.cpp               |    6 +-
 TabletDriverService/OutputSendInputAbsolute.h |    4 +-
 TabletDriverService/OutputSettings.cpp        |    7 +-
 TabletDriverService/OutputSettings.h          |    6 +-
 TabletDriverService/OutputVMultiAbsolute.cpp  |   10 +-
 TabletDriverService/OutputVMultiDigitizer.cpp |   18 +-
 TabletDriverService/OutputVMultiRelative.cpp  |   38 +-
 TabletDriverService/PositionRingBuffer.cpp    |    3 +-
 TabletDriverService/ProcessCommand.cpp        |   40 -
 TabletDriverService/ProcessCommand.h          |    5 -
 TabletDriverService/ScreenMapper.cpp          |    2 +-
 TabletDriverService/Tablet.cpp                |  129 +-
 TabletDriverService/Tablet.h                  |    8 +-
 .../TabletDriverService.vcxproj               |    9 +-
 .../TabletDriverService.vcxproj.filters       |   18 +-
 TabletDriverService/TabletFilter.h            |    1 -
 .../TabletFilterAntiSmoothing.cpp             |   26 +-
 TabletDriverService/TabletFilterGravity.cpp   |   15 +-
 TabletDriverService/TabletFilterGravity.h     |    1 -
 .../TabletFilterNoiseReduction.cpp            |    2 +-
 TabletDriverService/TabletFilterPeak.h        |    3 +-
 TabletDriverService/TabletFilterSmoothing.cpp |   48 +-
 TabletDriverService/TabletFilterSmoothing.h   |    1 +
 TabletDriverService/TabletFilterTester.cpp    |   36 +-
 TabletDriverService/TabletFilterTester.h      |    7 +-
 TabletDriverService/TabletHandler.cpp         |  122 +-
 TabletDriverService/TabletHandler.h           |   10 +-
 TabletDriverService/TabletMeasurement.cpp     |    5 +-
 TabletDriverService/TabletSettings.cpp        |    2 +-
 TabletDriverService/TabletSettings.h          |   13 +-
 TabletDriverService/USBDevice.cpp             |  107 +-
 TabletDriverService/USBDevice.h               |    9 +-
 TabletDriverService/VMulti.cpp                |    3 +-
 TabletDriverService/config/tablet.cfg         |  200 +-
 TabletDriverService/config/wacom.cfg          |  180 +-
 TabletDriverService/stdafx.h                  |    2 +-
 56 files changed, 5062 insertions(+), 3826 deletions(-)
 create mode 100644 TabletDriverGUI/MainWindow.Console.cs
 create mode 100644 TabletDriverGUI/MainWindow.Driver.cs
 create mode 100644 TabletDriverGUI/MainWindow.Settings.cs
 create mode 100644 TabletDriverService/CommandHandler.Device.cpp
 create mode 100644 TabletDriverService/CommandHandler.Filters.cpp
 create mode 100644 TabletDriverService/CommandHandler.Other.cpp
 create mode 100644 TabletDriverService/CommandHandler.Tablet.cpp
 delete mode 100644 TabletDriverService/ProcessCommand.cpp
 delete mode 100644 TabletDriverService/ProcessCommand.h

diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index a09e43d..406d04c 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -62,6 +62,7 @@ public enum OutputModes
         public int WindowWidth;
         public int WindowHeight;
 
+        public bool AutomaticRestart;
         public bool RunAtStartup;
 
         public string DriverPath;
@@ -109,6 +110,7 @@ public Configuration()
             WindowWidth = 700;
             WindowHeight = 710;
 
+            AutomaticRestart = true;
             RunAtStartup = false;
 
             DriverPath = "bin/TabletDriverService.exe";
diff --git a/TabletDriverGUI/MainWindow.Console.cs b/TabletDriverGUI/MainWindow.Console.cs
new file mode 100644
index 0000000..6e6c751
--- /dev/null
+++ b/TabletDriverGUI/MainWindow.Console.cs
@@ -0,0 +1,448 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace TabletDriverGUI
+{
+    public partial class MainWindow : Window
+    {
+
+        //
+        // Console buffer to text
+        //
+        private void ConsoleBufferToText()
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+
+            // Lock console
+            driver.ConsoleLock();
+
+            // Get console status
+            if (!driver.HasConsoleUpdated)
+            {
+                driver.ConsoleUnlock();
+                return;
+            }
+            driver.HasConsoleUpdated = false;
+
+            // Create a string from buffer
+            foreach (string line in driver.ConsoleBuffer)
+            {
+                stringBuilder.Append(line);
+                stringBuilder.Append("\r\n");
+            }
+
+            // Unlock console
+            driver.ConsoleUnlock();
+
+            // Set output
+            textConsole.Text = stringBuilder.ToString();
+
+            // Scroll to end
+            scrollConsole.ScrollToEnd();
+
+        }
+
+
+        //
+        // Search text from rows
+        //
+        private List<string> SearchRows(List<string> rows, string search, int rowsBefore, int rowsAfter)
+        {
+            List<string> buffer = new List<string>(rowsBefore);
+            List<string> output = new List<string>();
+            int rowCounter = 0;
+
+            foreach (string row in rows)
+            {
+                if (row.Contains(search))
+                {
+                    if (buffer.Count > 0)
+                    {
+                        foreach (string bufferLine in buffer)
+                        {
+                            output.Add(bufferLine);
+                        }
+                        buffer.Clear();
+                    }
+                    output.Add(row.Trim());
+                    rowCounter = rowsAfter;
+                }
+                else if (rowCounter > 0)
+                {
+                    output.Add(row.Trim());
+                    rowCounter--;
+                }
+                else
+                {
+                    buffer.Add(row);
+                    if (buffer.Count > rowsBefore)
+                    {
+                        buffer.RemoveAt(0);
+                    }
+                }
+            }
+            return output;
+        }
+
+
+        //
+        // Send a command to driver
+        //
+        private void ConsoleSendCommand(string line)
+        {
+            if (commandHistory.Last<string>() != line)
+            {
+                commandHistory.Add(line);
+            }
+            commandHistoryIndex = commandHistory.Count();
+            textConsoleInput.Text = "";
+            textConsoleInput.ScrollToEnd();
+            try
+            {
+                driver.SendCommand(line);
+            }
+            catch (Exception e)
+            {
+                driver.ConsoleAddText("Error! " + e.Message);
+            }
+        }
+
+
+        //
+        // Console update timer tick
+        //
+        private void TimerConsoleUpdate_Tick(object sender, EventArgs e)
+        {
+            ConsoleBufferToText();
+        }
+
+
+        //
+        // Console input key down
+        //
+        private void TextConsoleInput_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                string line = textConsoleInput.Text;
+                ConsoleSendCommand(line);
+            }
+        }
+
+
+        //
+        // Console input preview key down
+        //
+        private void TextConsoleInput_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+
+            //
+            // Command tab complete
+            //
+            if (e.Key == Key.Tab)
+            {
+                string inputText = textConsoleInput.Text.Trim().ToLower();
+                string fill = driver.CompleteCommandName(inputText, true);
+                if (fill != inputText)
+                {
+                    textConsoleInput.Text = fill;
+                    textConsoleInput.CaretIndex = textConsoleInput.Text.Length;
+                }
+                ConsoleBufferToText();
+                e.Handled = true;
+            }
+
+
+            //
+            // Up arrow
+            //
+            else if (e.Key == Key.Up)
+            {
+                commandHistoryIndex--;
+                if (commandHistoryIndex < 0) commandHistoryIndex = 0;
+                textConsoleInput.Text = commandHistory[commandHistoryIndex];
+                textConsoleInput.CaretIndex = textConsoleInput.Text.Length;
+            }
+
+            //
+            // Down arrow
+            //
+            else if (e.Key == Key.Down)
+            {
+                commandHistoryIndex++;
+                if (commandHistoryIndex > commandHistory.Count() - 1)
+                {
+                    commandHistoryIndex = commandHistory.Count();
+                    textConsoleInput.Text = "";
+                }
+                else
+                {
+                    textConsoleInput.Text = commandHistory[commandHistoryIndex];
+                    textConsoleInput.CaretIndex = textConsoleInput.Text.Length;
+                }
+            }
+        }
+
+
+        //
+        // Commands textbox key down
+        //
+        private void TextCommands_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+
+            //
+            // Control + space command completion
+            //
+            if (
+                e.Key == Key.Space && e.KeyboardDevice.Modifiers == ModifierKeys.Control
+            )
+            {
+                TextBox textBoxSender = (TextBox)sender;
+
+                string commandName = "";
+                string text = textBoxSender.Text;
+
+                int caretIndex = textBoxSender.CaretIndex;
+                if (caretIndex >= text.Length)
+                    caretIndex = text.Length - 1;
+                if (caretIndex < 0) caretIndex = 0;
+
+                int startIndex = caretIndex;
+                int endIndex = caretIndex;
+
+                // Find word start index
+                for (startIndex = caretIndex; startIndex > 0; startIndex--)
+                {
+                    // Find space or new line
+                    if (text[startIndex] == '\r' || text[startIndex] == '\n' || text[startIndex] == ' ')
+                    {
+                        if (caretIndex == startIndex) continue;
+                        startIndex++;
+                        break;
+                    }
+                }
+
+                // Find word end index
+                caretIndex = caretIndex - 1;
+                if (caretIndex < 0) caretIndex = 0;
+                for (endIndex = caretIndex; endIndex < text.Length; endIndex++)
+                {
+                    // Find space or new line
+                    if (text[endIndex] == '\r' || text[endIndex] == '\n' || text[endIndex] == ' ')
+                    {
+                        if (caretIndex == endIndex) continue;
+                        break;
+                    }
+                }
+
+                // Select word
+                textBoxSender.SelectionStart = startIndex;
+                textBoxSender.SelectionLength = endIndex - startIndex;
+
+                // Command name completion
+                commandName = textBoxSender.SelectedText.Trim();
+                string completedCommand = driver.CompleteCommandName(commandName, false);
+                string newText = text;
+
+                // Set selected text as completed command name
+                if (completedCommand != commandName)
+                {
+                    textBoxSender.SelectedText = completedCommand;
+                }
+
+                // Set cursor position
+                textBoxSender.CaretIndex = textBoxSender.SelectionStart + textBoxSender.SelectionLength;
+
+                // Reset selection
+                textBoxSender.SelectionLength = 0;
+
+                e.Handled = true;
+            }
+        }
+
+
+        //
+        // Console output context menu
+        //
+        private void ConsoleMenuClick(object sender, RoutedEventArgs e)
+        {
+
+
+            // Copy all
+            if (sender == menuCopyAll)
+            {
+                Clipboard.SetText(textConsole.Text);
+                SetStatus("Console output copied to clipboard");
+            }
+
+            // Copy debug messages
+            else if (sender == menuCopyDebug)
+            {
+                string clipboard = "";
+                List<string> rows;
+                driver.ConsoleLock();
+                rows = SearchRows(driver.ConsoleBuffer, "[DEBUG]", 0, 0);
+                driver.ConsoleUnlock();
+                foreach (string row in rows)
+                    clipboard += row + "\r\n";
+                Clipboard.SetText(clipboard);
+                SetStatus("Debug message copied to clipboard");
+            }
+
+            // Copy error messages
+            else if (sender == menuCopyErrors)
+            {
+                string clipboard = "";
+                List<string> rows;
+                driver.ConsoleLock();
+                rows = SearchRows(driver.ConsoleBuffer, "[ERROR]", 1, 1);
+                driver.ConsoleUnlock();
+                foreach (string row in rows)
+                    clipboard += row + "\r\n";
+                Clipboard.SetText(clipboard);
+                SetStatus("Error message copied to clipboard");
+            }
+
+            // Start debug log
+            else if (sender == menuStartDebug)
+            {
+                string logFilename = "debug_" + DateTime.Now.ToString("yyyy-MM-dd_HH_mm_ss") + ".txt";
+                ConsoleSendCommand("log " + logFilename);
+                ConsoleSendCommand("debug 1");
+            }
+
+            // Stop debug log
+            else if (sender == menuStopDebug)
+            {
+                ConsoleSendCommand("log off");
+                ConsoleSendCommand("debug 0");
+            }
+
+            // Show latest debug log
+            else if (sender == menuFindLatestDebugLog)
+            {
+                try
+                {
+                    var files = Directory.GetFiles(".", "debug_*.txt").OrderBy(a => File.GetCreationTime(a));
+                    if (files.Count() > 0)
+                    {
+                        string file = files.Last().ToString();
+                        Process.Start("explorer.exe", "/n /e,/select," + file);
+                    }
+                }
+                catch (Exception)
+                {
+                }
+            }
+
+            // Run benchmark
+            else if (sender == menuRunBenchmark)
+            {
+                ConsoleSendCommand("Benchmark");
+            }
+
+            // Copy Benchmark
+            else if (sender == menuCopyBenchmark)
+            {
+                string clipboard = "";
+                List<string> rows;
+                driver.ConsoleLock();
+                rows = SearchRows(driver.ConsoleBuffer, " [STATUS] BENCHMARK ", 0, 0);
+                driver.ConsoleUnlock();
+                foreach (string row in rows)
+                {
+                    Match m = Regex.Match(row, " BENCHMARK ([0-9\\.]+) ([0-9\\.]+) ([0-9\\.]+) (.*)$");
+                    if (m.Success)
+                    {
+                        string tabletName = m.Groups[4].ToString();
+                        string totalReports = m.Groups[1].ToString();
+                        string noiseWidth = m.Groups[2].ToString();
+                        string noiseHeight = m.Groups[3].ToString();
+                        clipboard =
+                            "Tablet(" + tabletName + ") " +
+                            "Noise(" + noiseWidth + " mm x " + noiseHeight + " mm) " +
+                            "Reports(" + totalReports + ")\r\n";
+                    }
+                }
+
+                if (clipboard.Length > 0)
+                {
+                    Clipboard.SetText(clipboard);
+                    SetStatus("Benchmark result copied to clipboard");
+                }
+            }
+
+
+            // Measure 2 points
+            else if (sender == menuMeasure2)
+            {
+                ConsoleSendCommand("Measure 2");
+            }
+
+            // Open startup log
+            else if (sender == menuFindStartupLog)
+            {
+                if (File.Exists("startuplog.txt"))
+                {
+                    try { Process.Start("explorer.exe", "/n /e,/select,startuplog.txt"); } catch (Exception) { }
+                }
+                else
+                {
+                    MessageBox.Show(
+                        "Startup log not found!\n" +
+                        "Make sure that it is possible to create and edit files in the '" + Directory.GetCurrentDirectory() + "' directory.\n",
+                        "Error!", MessageBoxButton.OK, MessageBoxImage.Error
+                    );
+                }
+            }
+
+            // Open driver folder
+            else if (sender == menuOpenFolder)
+            {
+                try { Process.Start("."); } catch (Exception) { }
+            }
+
+            // Open GitHub page
+            else if (sender == menuOpenGithub)
+            {
+                try { Process.Start("https://github.com/hawku/TabletDriver"); } catch (Exception) { }
+            }
+
+            // Open Latest URL
+            else if (sender == menuOpenLatestURL)
+            {
+                Regex regex = new Regex("(http[s]?://.+?)($|\\s)", RegexOptions.IgnoreCase | RegexOptions.Multiline);
+                MatchCollection matches = regex.Matches(textConsole.Text);
+                if (matches.Count > 0)
+                {
+                    string url = matches[matches.Count - 1].Groups[0].ToString().Trim();
+                    try { Process.Start(url); } catch (Exception) { }
+                }
+            }
+
+            // Report a problem
+            else if (sender == menuReportProblem)
+            {
+                try { Process.Start("https://github.com/hawku/TabletDriver/wiki/FAQ"); } catch (Exception) { }
+            }
+
+
+        }
+
+
+    }
+}
diff --git a/TabletDriverGUI/MainWindow.Driver.cs b/TabletDriverGUI/MainWindow.Driver.cs
new file mode 100644
index 0000000..a1878f4
--- /dev/null
+++ b/TabletDriverGUI/MainWindow.Driver.cs
@@ -0,0 +1,436 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace TabletDriverGUI
+{
+    public partial class MainWindow : Window
+    {
+
+        //
+        // Start the driver
+        //
+        void StartDriver()
+        {
+            if (running) return;
+
+            // Try to start the driver
+            try
+            {
+                running = true;
+
+                // Console timer
+                timerConsoleUpdate.Start();
+
+                driver.Start(config.DriverPath, config.DriverArguments);
+                if (!driver.IsRunning)
+                {
+                    SetStatus("Can't start the driver! Check the console!");
+                    driver.ConsoleAddText("ERROR! Can't start the driver!");
+                }
+            }
+
+            // Start failed
+            catch (Exception e)
+            {
+                SetStatus("Can't start the driver! Check the console!");
+                driver.ConsoleAddText("ERROR! Can't start the driver!\n  " + e.Message);
+            }
+        }
+
+
+        //
+        // Stop the driver
+        //
+        void StopDriver()
+        {
+            if (!running) return;
+            running = false;
+            driver.Stop();
+            timerConsoleUpdate.Stop();
+        }
+
+
+        //
+        // Send settings to the driver
+        //
+        private void SendSettingsToDriver()
+        {
+            if (!driver.IsRunning) return;
+
+            // Commands before settings
+            if (config.CommandsBefore.Length > 0)
+            {
+                foreach (string command in config.CommandsBefore)
+                {
+                    string tmp = command.Trim();
+                    if (tmp.Length > 0)
+                    {
+                        driver.SendCommand(tmp);
+                    }
+                }
+            }
+
+
+            // Desktop size
+            driver.SendCommand("DesktopSize " + textDesktopWidth.Text + " " + textDesktopHeight.Text);
+
+
+            // Screen area
+            driver.SendCommand("ScreenArea " +
+                Utils.GetNumberString(config.ScreenArea.Width) + " " + Utils.GetNumberString(config.ScreenArea.Height) + " " +
+                Utils.GetNumberString(config.ScreenArea.X) + " " + Utils.GetNumberString(config.ScreenArea.Y)
+            );
+
+
+            //
+            // Tablet area
+            //
+            // Inverted
+            if (config.Invert)
+            {
+                driver.SendCommand("TabletArea " +
+                    Utils.GetNumberString(config.TabletArea.Width) + " " +
+                    Utils.GetNumberString(config.TabletArea.Height) + " " +
+                    Utils.GetNumberString(config.TabletFullArea.Width - config.TabletArea.X) + " " +
+                    Utils.GetNumberString(config.TabletFullArea.Height - config.TabletArea.Y)
+                );
+                driver.SendCommand("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation + 180));
+            }
+            // Normal
+            else
+            {
+                driver.SendCommand("TabletArea " +
+                    Utils.GetNumberString(config.TabletArea.Width) + " " +
+                    Utils.GetNumberString(config.TabletArea.Height) + " " +
+                    Utils.GetNumberString(config.TabletArea.X) + " " +
+                    Utils.GetNumberString(config.TabletArea.Y)
+                );
+                driver.SendCommand("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation));
+            }
+
+
+            // Output Mode
+            switch (config.OutputMode)
+            {
+                case Configuration.OutputModes.Absolute:
+                    driver.SendCommand("Mode Absolute");
+                    break;
+                case Configuration.OutputModes.Relative:
+                    driver.SendCommand("Mode Relative");
+                    driver.SendCommand("RelativeSensitivity " + Utils.GetNumberString(config.ScreenArea.Width / config.TabletArea.Width));
+                    break;
+                case Configuration.OutputModes.Digitizer:
+                    driver.SendCommand("Mode Digitizer");
+                    break;
+            }
+
+
+            // Button map
+            if (config.DisableButtons)
+            {
+                driver.SendCommand("ButtonMap 0 0 0");
+            }
+            else
+            {
+                driver.SendCommand("ButtonMap " + String.Join(" ", config.ButtonMap));
+            }
+
+            // Smoothing filter
+            if (config.SmoothingEnabled)
+            {
+                driver.SendCommand("FilterTimerInterval " + Utils.GetNumberString(config.SmoothingInterval));
+                driver.SendCommand("Smoothing " + Utils.GetNumberString(config.SmoothingLatency));
+            }
+            else
+            {
+                driver.SendCommand("FilterTimerInterval 10");
+                driver.SendCommand("Smoothing 0");
+            }
+
+            // Noise filter
+            if (config.NoiseFilterEnabled)
+            {
+                driver.SendCommand("Noise " + Utils.GetNumberString(config.NoiseFilterBuffer) + " " + Utils.GetNumberString(config.NoiseFilterThreshold));
+            }
+            else
+            {
+                driver.SendCommand("Noise 0");
+            }
+
+
+            // Anti-smoothing filter
+            if (config.AntiSmoothingEnabled)
+            {
+                driver.SendCommand("AntiSmoothing " + Utils.GetNumberString(config.AntiSmoothingShape) + " " +
+                    Utils.GetNumberString(config.AntiSmoothingCompensation) + " " +
+                    (config.AntiSmoothingIgnoreWhenDragging ? "true" : "false"));
+            }
+            else
+            {
+                driver.SendCommand("AntiSmoothing 0");
+            }
+
+            // Commands after settings
+            if (config.CommandsAfter.Length > 0)
+            {
+                foreach (string command in config.CommandsAfter)
+                {
+                    string tmp = command.Trim();
+                    if (tmp.Length > 0)
+                    {
+                        driver.SendCommand(tmp);
+                    }
+                }
+            }
+        }
+
+
+        //
+        // Driver event handlers
+        //
+        //
+
+        //
+        // Driver Messages
+        //
+        private void OnDriverMessageReceived(object sender, TabletDriver.DriverEventArgs e)
+        {
+            //ConsoleAddText(e.Message);
+        }
+
+
+        //
+        // Driver Errors
+        //
+        private void OnDriverErrorReceived(object sender, TabletDriver.DriverEventArgs e)
+        {
+            SetStatusWarning(e.Message);
+        }
+
+
+        //
+        // Driver Status messages
+        //
+        private void OnDriverStatusReceived(object sender, TabletDriver.DriverEventArgs e)
+        {
+            string variableName = e.Message;
+            string parameters = e.Parameters;
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                ProcessStatusMessage(variableName, parameters);
+            });
+        }
+        private void ProcessStatusMessage(string variableName, string parameters)
+        {
+
+            //
+            // Tablet Name
+            //
+            if (variableName == "tablet")
+            {
+                string title = "TabletDriverGUI - " + parameters;
+                Title = title;
+
+                // Limit notify icon text length
+                if (title.Length > 63)
+                {
+                    notifyIcon.Text = title.Substring(0, 63);
+                }
+                else
+                {
+                    notifyIcon.Text = title;
+                }
+                SetStatus("Connected to " + parameters);
+            }
+
+            //
+            // Tablet width
+            //
+            if (variableName == "width")
+            {
+                if (Utils.ParseNumber(parameters, out double val))
+                {
+                    config.TabletFullArea.Width = val;
+                    config.TabletFullArea.X = val / 2.0;
+                    LoadSettingsFromConfiguration();
+                    UpdateSettingsToConfiguration();
+                    if (isFirstStart)
+                        SendSettingsToDriver();
+                }
+            }
+
+            //
+            // Tablet height
+            //
+            if (variableName == "height")
+            {
+                if (Utils.ParseNumber(parameters, out double val))
+                {
+                    config.TabletFullArea.Height = val;
+                    config.TabletFullArea.Y = val / 2.0;
+                    LoadSettingsFromConfiguration();
+                    UpdateSettingsToConfiguration();
+                    if (isFirstStart)
+                        SendSettingsToDriver();
+
+                }
+            }
+
+
+            //
+            // Tablet measurement to tablet area
+            //
+            if (variableName == "measurement" && isEnabledMeasurementToArea)
+            {
+                string[] stringValues = parameters.Split(' ');
+                int valueCount = stringValues.Count();
+                if (valueCount >= 4)
+                {
+                    double minimumX = 10000;
+                    double minimumY = 10000;
+                    double maximumX = -10000;
+                    double maximumY = -10000;
+                    for (int i = 0; i < valueCount; i += 2)
+                    {
+                        if (
+                            Utils.ParseNumber(stringValues[i], out double x)
+                            &&
+                            Utils.ParseNumber(stringValues[i + 1], out double y)
+                        )
+                        {
+                            // Find limits
+                            if (x > maximumX) maximumX = x;
+                            if (x < minimumX) minimumX = x;
+                            if (y > maximumY) maximumY = y;
+                            if (y < minimumY) minimumY = y;
+                        }
+                    }
+                    double areaWidth = maximumX - minimumX;
+                    double areaHeight = maximumY - minimumY;
+                    double centerX = minimumX + areaWidth / 2.0;
+                    double centerY = minimumY + areaHeight / 2.0;
+                    //MessageBox.Show("Area: " + areaWidth + " x " + areaHeight + " @ " + centerX + ", " + centerY);
+                    config.TabletArea.Width = areaWidth;
+                    config.TabletArea.Height = areaHeight;
+                    config.TabletArea.X = centerX;
+                    config.TabletArea.Y = centerY;
+                    LoadSettingsFromConfiguration();
+                    UpdateSettingsToConfiguration();
+
+
+                }
+                isEnabledMeasurementToArea = false;
+                buttonDrawArea.IsEnabled = true;
+                SetStatus("");
+            }
+
+
+
+        }
+
+
+        //
+        // Driver Started
+        //
+        private void OnDriverStarted(object sender, EventArgs e)
+        {
+            driver.SendCommand("GetCommands");
+            driver.SendCommand("Echo");
+            driver.SendCommand("Echo   Driver version: " + Version);
+            try { driver.SendCommand("echo   Windows version: " + Environment.OSVersion.VersionString); } catch (Exception) { }
+            try
+            {
+                driver.SendCommand("Echo   Windows product: " +
+                    Microsoft.Win32.Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "ProductName", "").ToString());
+                driver.SendCommand("Echo   Windows release: " +
+                    Microsoft.Win32.Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "ReleaseId", "").ToString());
+            }
+            catch (Exception)
+            {
+            }
+            driver.SendCommand("Echo");
+            driver.SendCommand("CheckTablet");
+            SendSettingsToDriver();
+            driver.SendCommand("Info");
+            driver.SendCommand("Start");
+            driver.SendCommand("Log Off");
+            driver.SendCommand("LogDirect False");
+            driver.SendCommand("Echo");
+            driver.SendCommand("Echo Driver started!");
+            driver.SendCommand("Echo");
+        }
+
+
+        //
+        // Driver Stopped
+        //
+        private void OnDriverStopped(object sender, EventArgs e)
+        {
+            if (running)
+            {
+                if (config.AutomaticRestart)
+                {
+                    SetStatus("Driver stopped. Restarting! Check console !!!");
+                    driver.ConsoleAddText("Driver stopped. Restarting!");
+
+                    // Run in the main application thread
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        Title = "TabletDriverGUI";
+                        notifyIcon.Text = "";
+                        driver.Stop();
+                        timerRestart.Start();
+                    });
+
+                }
+                else
+                {
+                    SetStatus("Driver stopped!");
+                    driver.ConsoleAddText("Driver stopped!");
+                }
+            }
+        }
+
+
+        //
+        // Driver restart timer tick
+        //
+        private void TimerRestart_Tick(object sender, EventArgs e)
+        {
+            if (running)
+            {
+                driver.Start(config.DriverPath, config.DriverArguments);
+            }
+            timerRestart.Stop();
+        }
+
+
+        //
+        // Restart Driver button click
+        //
+        private void RestartDriverClick(object sender, RoutedEventArgs e)
+        {
+            if (running)
+            {
+                StopDriver();
+            }
+            StartDriver();
+        }
+
+
+    }
+}
diff --git a/TabletDriverGUI/MainWindow.Settings.cs b/TabletDriverGUI/MainWindow.Settings.cs
new file mode 100644
index 0000000..4961c9f
--- /dev/null
+++ b/TabletDriverGUI/MainWindow.Settings.cs
@@ -0,0 +1,1176 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace TabletDriverGUI
+{
+    public partial class MainWindow : Window
+    {
+
+
+        #region Driver configuration stuff
+
+        //
+        // Load settings from configuration
+        //
+        private void LoadSettingsFromConfiguration()
+        {
+            isLoadingSettings = true;
+
+            //
+            // Tablet area
+            //
+            textTabletAreaWidth.Text = Utils.GetNumberString(config.TabletArea.Width);
+            textTabletAreaHeight.Text = Utils.GetNumberString(config.TabletArea.Height);
+            textTabletAreaX.Text = Utils.GetNumberString(config.TabletArea.X);
+            textTabletAreaY.Text = Utils.GetNumberString(config.TabletArea.Y);
+            checkBoxForceAspect.IsChecked = config.ForceAspectRatio;
+            checkBoxForceFullArea.IsChecked = config.ForceFullArea;
+            switch (config.OutputMode)
+            {
+                case Configuration.OutputModes.Absolute:
+                    radioModeAbsolute.IsChecked = true;
+                    break;
+                case Configuration.OutputModes.Relative:
+                    radioModeRelative.IsChecked = true;
+                    break;
+                case Configuration.OutputModes.Digitizer:
+                    radioModeDigitizer.IsChecked = true;
+                    break;
+            }
+            textTabletAreaRotation.Text = Utils.GetNumberString(config.TabletArea.Rotation);
+            checkBoxInvert.IsChecked = config.Invert;
+
+
+            //
+            // Force full area
+            //
+            if (config.ForceFullArea)
+            {
+                textTabletAreaWidth.IsEnabled = false;
+                textTabletAreaHeight.IsEnabled = false;
+                textTabletAreaX.IsEnabled = false;
+                textTabletAreaY.IsEnabled = false;
+            }
+            else
+            {
+                textTabletAreaWidth.IsEnabled = true;
+                textTabletAreaHeight.IsEnabled = true;
+                textTabletAreaX.IsEnabled = true;
+                textTabletAreaY.IsEnabled = true;
+            }
+
+
+            //
+            // Screen area
+            //
+            textScreenAreaWidth.Text = Utils.GetNumberString(config.ScreenArea.Width, "0");
+            textScreenAreaHeight.Text = Utils.GetNumberString(config.ScreenArea.Height, "0");
+            textScreenAreaX.Text = Utils.GetNumberString(config.ScreenArea.X, "0");
+            textScreenAreaY.Text = Utils.GetNumberString(config.ScreenArea.Y, "0");
+
+
+            //
+            // Desktop size
+            //
+            if (config.AutomaticDesktopSize)
+            {
+                textDesktopWidth.Text = Utils.GetNumberString(GetVirtualDesktopSize().Width);
+                textDesktopHeight.Text = Utils.GetNumberString(GetVirtualDesktopSize().Height);
+                config.DesktopSize.Width = GetVirtualDesktopSize().Width;
+                config.DesktopSize.Height = GetVirtualDesktopSize().Height;
+                textDesktopWidth.IsEnabled = false;
+                textDesktopHeight.IsEnabled = false;
+            }
+            else
+            {
+                textDesktopWidth.Text = Utils.GetNumberString(config.DesktopSize.Width);
+                textDesktopHeight.Text = Utils.GetNumberString(config.DesktopSize.Height);
+            }
+            checkBoxAutomaticDesktopSize.IsChecked = config.AutomaticDesktopSize;
+
+
+            // Force aspect ratio
+            if (config.ForceAspectRatio)
+            {
+                config.TabletArea.Height = config.TabletArea.Width / (config.ScreenArea.Width / config.ScreenArea.Height);
+                textTabletAreaHeight.Text = Utils.GetNumberString(config.TabletArea.Height);
+                textTabletAreaHeight.IsEnabled = false;
+            }
+
+
+            //
+            // Move tablet area to a valid position
+            //
+            config.TabletArea.MoveInside(config.TabletFullArea);
+            textTabletAreaX.Text = Utils.GetNumberString(config.TabletArea.X);
+            textTabletAreaY.Text = Utils.GetNumberString(config.TabletArea.Y);
+
+
+            //
+            // Buttons
+            //
+            if (config.ButtonMap.Count() == 3)
+            {
+                comboBoxButton1.SelectedIndex = config.ButtonMap[0];
+                comboBoxButton2.SelectedIndex = config.ButtonMap[1];
+                comboBoxButton3.SelectedIndex = config.ButtonMap[2];
+            }
+            else
+            {
+                config.ButtonMap = new int[] { 1, 2, 3 };
+            }
+            checkBoxDisableButtons.IsChecked = config.DisableButtons;
+
+
+            //
+            // Smoothing filter
+            //
+            checkBoxSmoothing.IsChecked = config.SmoothingEnabled;
+            textSmoothingLatency.Text = Utils.GetNumberString(config.SmoothingLatency);
+            comboBoxSmoothingRate.SelectedIndex = config.SmoothingInterval - 1;
+            if (config.SmoothingEnabled)
+            {
+                textSmoothingLatency.IsEnabled = true;
+                comboBoxSmoothingRate.IsEnabled = true;
+            }
+            else
+            {
+                textSmoothingLatency.IsEnabled = false;
+                comboBoxSmoothingRate.IsEnabled = false;
+            }
+
+
+            //
+            // Noise filter
+            //
+            checkBoxNoiseFilter.IsChecked = config.NoiseFilterEnabled;
+            textNoiseBuffer.Text = Utils.GetNumberString(config.NoiseFilterBuffer);
+            textNoiseThreshold.Text = Utils.GetNumberString(config.NoiseFilterThreshold);
+            if (config.NoiseFilterEnabled)
+            {
+                textNoiseBuffer.IsEnabled = true;
+                textNoiseThreshold.IsEnabled = true;
+            }
+            else
+            {
+                textNoiseBuffer.IsEnabled = false;
+                textNoiseThreshold.IsEnabled = false;
+            }
+
+
+            //
+            // Anti-smoothing filter
+            //
+            checkBoxAntiSmoothing.IsChecked = config.AntiSmoothingEnabled;
+            textAntiSmoothingShape.Text = Utils.GetNumberString(config.AntiSmoothingShape, "0.00");
+            textAntiSmoothingCompensation.Text = Utils.GetNumberString(config.AntiSmoothingCompensation, "0.00");
+            checkBoxAntiSmoothingIgnoreWhenDragging.IsChecked = config.AntiSmoothingIgnoreWhenDragging;
+            if (config.AntiSmoothingEnabled)
+            {
+                textAntiSmoothingShape.IsEnabled = true;
+                textAntiSmoothingCompensation.IsEnabled = true;
+                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = true;
+            }
+            else
+            {
+                textAntiSmoothingShape.IsEnabled = false;
+                textAntiSmoothingCompensation.IsEnabled = false;
+                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = false;
+            }
+
+            //
+            // Automatic restart
+            //
+            checkBoxAutomaticRestart.IsChecked = config.AutomaticRestart;
+
+            //
+            // Run at startup
+            //
+            checkBoxRunAtStartup.IsChecked = config.RunAtStartup;
+
+
+            //
+            // Custom commands
+            //
+            string tmp = "";
+            foreach (string command in config.CommandsBefore)
+            {
+                if (command.Trim().Length > 0)
+                    tmp += command.Trim() + "\n";
+            }
+            textCommandsBefore.Text = tmp;
+
+            tmp = "";
+            foreach (string command in config.CommandsAfter)
+            {
+                if (command.Trim().Length > 0)
+                    tmp += command.Trim() + "\n";
+            }
+            textCommandsAfter.Text = tmp;
+
+
+            // Update canvases
+            UpdateCanvasElements();
+
+
+            isLoadingSettings = false;
+        }
+
+
+        //
+        // Update settings to configuration
+        //
+        private void UpdateSettingsToConfiguration()
+        {
+            if (isLoadingSettings)
+                return;
+
+            bool oldValue;
+
+            // Tablet area
+            if (Utils.ParseNumber(textTabletAreaWidth.Text, out double val))
+                config.TabletArea.Width = val;
+            if (Utils.ParseNumber(textTabletAreaHeight.Text, out val))
+                config.TabletArea.Height = val;
+            if (Utils.ParseNumber(textTabletAreaX.Text, out val))
+                config.TabletArea.X = val;
+            if (Utils.ParseNumber(textTabletAreaY.Text, out val))
+                config.TabletArea.Y = val;
+            if (Utils.ParseNumber(textTabletAreaRotation.Text, out val))
+                config.TabletArea.Rotation = val;
+
+            config.Invert = (bool)checkBoxInvert.IsChecked;
+            config.ForceAspectRatio = (bool)checkBoxForceAspect.IsChecked;
+            config.ForceFullArea = (bool)checkBoxForceFullArea.IsChecked;
+
+            // Output Mode
+            if (radioModeAbsolute.IsChecked == true) config.OutputMode = Configuration.OutputModes.Absolute;
+            if (radioModeRelative.IsChecked == true) config.OutputMode = Configuration.OutputModes.Relative;
+            if (radioModeDigitizer.IsChecked == true) config.OutputMode = Configuration.OutputModes.Digitizer;
+
+
+            // Force full area
+            if (config.ForceFullArea)
+            {
+                // Set tablet area size to full area
+                config.TabletArea.Width = config.TabletFullArea.Width;
+                config.TabletArea.Height = config.TabletFullArea.Height;
+
+                // Force aspect
+                if (config.ForceAspectRatio)
+                    config.TabletArea.Height = config.TabletArea.Width / (config.ScreenArea.Width / config.ScreenArea.Height);
+
+                // Fit area to full area
+                config.TabletArea.ScaleInside(config.TabletFullArea);
+
+                textTabletAreaWidth.Text = Utils.GetNumberString(config.TabletArea.Width);
+                textTabletAreaHeight.Text = Utils.GetNumberString(config.TabletArea.Height);
+
+            }
+
+            // Force the tablet area to be inside of the full area
+            config.TabletArea.MoveInside(config.TabletFullArea);
+
+            // Screen area
+            if (Utils.ParseNumber(textScreenAreaWidth.Text, out val))
+                config.ScreenArea.Width = val;
+            if (Utils.ParseNumber(textScreenAreaHeight.Text, out val))
+                config.ScreenArea.Height = val;
+            if (Utils.ParseNumber(textScreenAreaX.Text, out val))
+                config.ScreenArea.X = val;
+            if (Utils.ParseNumber(textScreenAreaY.Text, out val))
+                config.ScreenArea.Y = val;
+
+
+            // Desktop size
+            if (Utils.ParseNumber(textDesktopWidth.Text, out val))
+                config.DesktopSize.Width = val;
+            if (Utils.ParseNumber(textDesktopHeight.Text, out val))
+                config.DesktopSize.Height = val;
+            config.AutomaticDesktopSize = (bool)checkBoxAutomaticDesktopSize.IsChecked;
+            if (config.AutomaticDesktopSize == true)
+            {
+                textDesktopWidth.Text = Utils.GetNumberString(GetVirtualDesktopSize().Width);
+                textDesktopHeight.Text = Utils.GetNumberString(GetVirtualDesktopSize().Height);
+                config.DesktopSize.Width = GetVirtualDesktopSize().Width;
+                config.DesktopSize.Height = GetVirtualDesktopSize().Height;
+            }
+
+
+            // Force aspect ratio
+            if (config.ForceAspectRatio)
+            {
+                config.TabletArea.Height = config.TabletArea.Width / (config.ScreenArea.Width / config.ScreenArea.Height);
+                textTabletAreaHeight.Text = Utils.GetNumberString(config.TabletArea.Height);
+            }
+
+
+            // Button map 
+            config.ButtonMap[0] = comboBoxButton1.SelectedIndex;
+            config.ButtonMap[1] = comboBoxButton2.SelectedIndex;
+            config.ButtonMap[2] = comboBoxButton3.SelectedIndex;
+            config.DisableButtons = (bool)checkBoxDisableButtons.IsChecked;
+
+
+
+            // Smoothing filter
+            config.SmoothingEnabled = (bool)checkBoxSmoothing.IsChecked;
+            config.SmoothingInterval = comboBoxSmoothingRate.SelectedIndex + 1;
+            if (Utils.ParseNumber(textSmoothingLatency.Text, out val))
+                config.SmoothingLatency = val;
+
+            if (config.SmoothingEnabled)
+            {
+                textSmoothingLatency.IsEnabled = true;
+                comboBoxSmoothingRate.IsEnabled = true;
+            }
+            else
+            {
+                textSmoothingLatency.IsEnabled = false;
+                comboBoxSmoothingRate.IsEnabled = false;
+            }
+
+            // Noise filter
+            config.NoiseFilterEnabled = (bool)checkBoxNoiseFilter.IsChecked;
+            if (Utils.ParseNumber(textNoiseBuffer.Text, out val))
+                config.NoiseFilterBuffer = (int)val;
+            if (Utils.ParseNumber(textNoiseThreshold.Text, out val))
+                config.NoiseFilterThreshold = val;
+            if (config.NoiseFilterEnabled)
+            {
+                textNoiseBuffer.IsEnabled = true;
+                textNoiseThreshold.IsEnabled = true;
+            }
+            else
+            {
+                textNoiseBuffer.IsEnabled = false;
+                textNoiseThreshold.IsEnabled = false;
+            }
+
+            // Anti-smoothing filter
+            config.AntiSmoothingEnabled = (bool)checkBoxAntiSmoothing.IsChecked;
+            if (Utils.ParseNumber(textAntiSmoothingShape.Text, out val))
+                config.AntiSmoothingShape = val;
+            if (Utils.ParseNumber(textAntiSmoothingCompensation.Text, out val))
+                config.AntiSmoothingCompensation = val;
+            config.AntiSmoothingIgnoreWhenDragging = (bool)checkBoxAntiSmoothingIgnoreWhenDragging.IsChecked;
+            if (config.AntiSmoothingEnabled)
+            {
+                textAntiSmoothingShape.IsEnabled = true;
+                textAntiSmoothingCompensation.IsEnabled = true;
+                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = true;
+            }
+            else
+            {
+                textAntiSmoothingShape.IsEnabled = false;
+                textAntiSmoothingCompensation.IsEnabled = false;
+                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = false;
+            }
+
+            //
+            // Automatic restart
+            //
+            config.AutomaticRestart = (bool)checkBoxAutomaticRestart.IsChecked;
+
+
+            //
+            // Run at startup
+            //
+            oldValue = config.RunAtStartup;
+            config.RunAtStartup = (bool)checkBoxRunAtStartup.IsChecked;
+            if (config.RunAtStartup != oldValue)
+                SetRunAtStartup(config.RunAtStartup);
+
+
+            // Custom commands
+            List<string> commandList = new List<string>();
+            foreach (string command in textCommandsBefore.Text.Split('\n'))
+                if (command.Trim().Length > 0)
+                    commandList.Add(command.Trim());
+            config.CommandsBefore = commandList.ToArray();
+
+            commandList.Clear();
+            foreach (string command in textCommandsAfter.Text.Split('\n'))
+                if (command.Trim().Length > 0)
+                    commandList.Add(command.Trim());
+            config.CommandsAfter = commandList.ToArray();
+
+
+
+            UpdateCanvasElements();
+
+        }
+
+        #endregion
+
+
+
+        //
+        // Save settings
+        //
+        private void SaveSettings(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                config.Write(configFilename);
+                SendSettingsToDriver();
+                SetStatus("Settings saved!");
+            }
+            catch (Exception)
+            {
+                string dir = Directory.GetCurrentDirectory();
+                MessageBox.Show("Error occured while saving the configuration.\n" +
+                    "Make sure that it is possible to create and edit files in the '" + dir + "' directory.\n",
+                    "ERROR!", MessageBoxButton.OK, MessageBoxImage.Error
+                );
+            }
+        }
+
+
+        //
+        // Apply settings
+        //
+        private void ApplySettings(object sender, RoutedEventArgs e)
+        {
+            SendSettingsToDriver();
+            SetStatus("Settings applied!");
+        }
+
+
+        //
+        // Set run at startup
+        //
+        private void SetRunAtStartup(bool enabled)
+        {
+            try
+            {
+                string path = System.Reflection.Assembly.GetExecutingAssembly().Location;
+                string entryName = "TabletDriverGUI";
+                RegistryKey rk = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
+                if (enabled)
+                    rk.SetValue(entryName, "\"" + path + "\" --hide");
+                else
+                    rk.DeleteValue(entryName, false);
+
+                rk.Close();
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+
+        //
+        // Get desktop size
+        //
+        System.Drawing.Rectangle GetVirtualDesktopSize()
+        {
+            System.Drawing.Rectangle rect = new System.Drawing.Rectangle();
+
+            // Windows 8 or greater needed for the multiscreen absolute mode
+            if (VersionHelper.IsWindows8OrGreater() || config.OutputMode == Configuration.OutputModes.Digitizer)
+            {
+                rect.Width = System.Windows.Forms.SystemInformation.VirtualScreen.Width;
+                rect.Height = System.Windows.Forms.SystemInformation.VirtualScreen.Height;
+            }
+            else
+            {
+                rect.Width = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width;
+                rect.Height = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height;
+
+            }
+            return rect;
+        }
+
+
+        //
+        // Get available screens
+        //
+        System.Windows.Forms.Screen[] GetAvailableScreens()
+        {
+            System.Windows.Forms.Screen[] screens;
+
+            // Windows 8 or greater needed for the multiscreen absolute mode
+            if (VersionHelper.IsWindows8OrGreater() || config.OutputMode == Configuration.OutputModes.Digitizer)
+                screens = System.Windows.Forms.Screen.AllScreens;
+            else
+                screens = new System.Windows.Forms.Screen[] { System.Windows.Forms.Screen.PrimaryScreen };
+            return screens;
+        }
+
+
+
+        #region Canvas stuff
+
+        //
+        // Create canvas elements
+        //
+        void CreateCanvasElements()
+        {
+            //
+            // Screen map canvas
+            //
+            // Clear canvas
+            canvasScreenMap.Children.Clear();
+
+
+            // Monitor rectangles
+            rectangleMonitors = new Rectangle[16];
+            for (int i = 0; i < 16; i++)
+            {
+                rectangleMonitors[i] = new Rectangle
+                {
+                    Width = 10,
+                    Height = 10,
+                    Stroke = Brushes.Black,
+                    StrokeThickness = 1.0,
+                    Fill = Brushes.Transparent,
+                    Visibility = Visibility.Hidden
+                };
+                canvasScreenMap.Children.Add(rectangleMonitors[i]);
+            }
+
+            //
+            // Desktop area rectangle
+            //
+            rectangleDesktop = new Rectangle
+            {
+                Stroke = Brushes.Black,
+                StrokeThickness = 2.0,
+                Fill = Brushes.Transparent
+            };
+            canvasScreenMap.Children.Add(rectangleDesktop);
+
+
+            //
+            // Screen map area rectangle
+            //
+            Brush brushScreenMap = new SolidColorBrush(Color.FromArgb(50, 20, 20, 20));
+            rectangleScreenMap = new Rectangle
+            {
+                Stroke = Brushes.Black,
+                StrokeThickness = 2.0,
+                Fill = brushScreenMap
+            };
+            canvasScreenMap.Children.Add(rectangleScreenMap);
+
+            //
+            // Screen aspect ratio text
+            //
+            textScreenAspectRatio = new TextBlock
+            {
+                Text = "",
+                Foreground = Brushes.Black,
+                FontSize = 13,
+                FontWeight = FontWeights.Bold
+            };
+            canvasScreenMap.Children.Add(textScreenAspectRatio);
+
+
+
+            //
+            // Tablet area canvas
+            //
+            //
+            // Clear
+            canvasTabletArea.Children.Clear();
+
+            //
+            // Tablet full area polygon
+            //
+            polygonTabletFullArea = new Polygon
+            {
+                Stroke = new SolidColorBrush(Color.FromRgb(100, 100, 100)),
+                StrokeThickness = 2.0,
+                Points = new PointCollection
+                {
+                    new Point(0,0),
+                    new Point(0,0),
+                    new Point(0,0),
+                    new Point(0,0)
+                },
+            };
+            canvasTabletArea.Children.Add(polygonTabletFullArea);
+
+            //
+            // Tablet area polygon
+            //
+            polygonTabletArea = new Polygon
+            {
+                Stroke = new SolidColorBrush(Color.FromRgb(0, 0, 0)),
+                Fill = new SolidColorBrush(Color.FromArgb(50, 20, 20, 20)),
+                StrokeThickness = 2.0,
+                Points = new PointCollection
+                {
+                    new Point(0,0),
+                    new Point(0,0),
+                    new Point(0,0),
+                    new Point(0,0)
+                },
+            };
+            canvasTabletArea.Children.Add(polygonTabletArea);
+
+
+            //
+            // Tablet area arrow polygon
+            //
+            polygonTabletAreaArrow = new Polygon
+            {
+                Fill = new SolidColorBrush(Color.FromArgb(50, 20, 20, 20)),
+                Points = new PointCollection
+                {
+                    new Point(0,0),
+                    new Point(0,0),
+                    new Point(0,0)
+                },
+            };
+            canvasTabletArea.Children.Add(polygonTabletAreaArrow);
+
+
+            //
+            // Tablet area aspect ratio text
+            //
+            textTabletAspectRatio = new TextBlock
+            {
+                Text = "",
+                Foreground = Brushes.Black,
+                FontSize = 13,
+                FontWeight = FontWeights.Bold
+            };
+            canvasTabletArea.Children.Add(textTabletAspectRatio);
+
+
+
+
+            //
+            // Canvas mouse drag
+            //
+            mouseDrag = new MouseDrag();
+        }
+
+
+        //
+        // Update canvas elements
+        //
+        void UpdateCanvasElements()
+        {
+            UpdateScreenMapCanvas();
+            UpdateTabletAreaCanvas();
+        }
+
+
+        //
+        // Update screen map canvas elements
+        //
+        void UpdateScreenMapCanvas()
+        {
+            // Canvas element scaling
+            double scaleX = (canvasScreenMap.ActualWidth - 2) / config.DesktopSize.Width;
+            double scaleY = (canvasScreenMap.ActualHeight - 2) / config.DesktopSize.Height;
+            double scale = scaleX;
+            if (scaleX > scaleY)
+                scale = scaleY;
+
+            // Centered offset
+            double offsetX = canvasScreenMap.ActualWidth / 2.0 - config.DesktopSize.Width * scale / 2.0;
+            double offsetY = canvasScreenMap.ActualHeight / 2.0 - config.DesktopSize.Height * scale / 2.0;
+
+
+            // Full desktop area
+            rectangleDesktop.Width = config.DesktopSize.Width * scale;
+            rectangleDesktop.Height = config.DesktopSize.Height * scale;
+            Canvas.SetLeft(rectangleDesktop, offsetX);
+            Canvas.SetTop(rectangleDesktop, offsetY);
+
+
+            // Screen map area
+            rectangleScreenMap.Width = config.ScreenArea.Width * scale;
+            rectangleScreenMap.Height = config.ScreenArea.Height * scale;
+            Canvas.SetLeft(rectangleScreenMap, offsetX + config.ScreenArea.X * scale);
+            Canvas.SetTop(rectangleScreenMap, offsetY + config.ScreenArea.Y * scale);
+
+            // Screen aspect ratio text
+            textScreenAspectRatio.Text = Utils.GetNumberString(config.ScreenArea.Width / config.ScreenArea.Height, "0.###") + ":1";
+            Canvas.SetLeft(textScreenAspectRatio, offsetX +
+                (config.ScreenArea.X + config.ScreenArea.Width / 2.0) * scale -
+                textScreenAspectRatio.ActualWidth / 2.0
+            );
+            Canvas.SetTop(textScreenAspectRatio, offsetY +
+                (config.ScreenArea.Y + config.ScreenArea.Height / 2.0) * scale -
+                textScreenAspectRatio.ActualHeight / 2.0
+            );
+
+
+
+
+
+            // Screens
+            System.Windows.Forms.Screen[] screens = GetAvailableScreens();
+
+            // Monitor minimums
+            double minX = 99999;
+            double minY = 99999;
+            foreach (System.Windows.Forms.Screen screen in screens)
+            {
+                if (screen.Bounds.X < minX) minX = screen.Bounds.X;
+                if (screen.Bounds.Y < minY) minY = screen.Bounds.Y;
+            }
+
+
+            // Monitor rectangles
+            int rectangeIndex = 0;
+            foreach (System.Windows.Forms.Screen screen in screens)
+            {
+                double x = screen.Bounds.X - minX;
+                double y = screen.Bounds.Y - minY;
+
+                rectangleMonitors[rectangeIndex].Visibility = Visibility.Visible;
+                rectangleMonitors[rectangeIndex].Width = screen.Bounds.Width * scale;
+                rectangleMonitors[rectangeIndex].Height = screen.Bounds.Height * scale;
+                Canvas.SetLeft(rectangleMonitors[rectangeIndex], offsetX + x * scale);
+                Canvas.SetTop(rectangleMonitors[rectangeIndex], offsetY + y * scale);
+
+                rectangeIndex++;
+                if (rectangeIndex >= 16) break;
+            }
+
+        }
+
+
+        //
+        // Update tablet area canvas elements
+        //
+        void UpdateTabletAreaCanvas()
+        {
+            double fullWidth = config.TabletFullArea.Width;
+            double fullHeight = config.TabletFullArea.Height;
+
+            // Canvas element scaling
+            double scaleX = (canvasTabletArea.ActualWidth - 2) / fullWidth;
+            double scaleY = (canvasTabletArea.ActualHeight - 2) / fullHeight;
+            double scale = scaleX;
+            if (scaleX > scaleY)
+                scale = scaleY;
+
+
+            double offsetX = canvasTabletArea.ActualWidth / 2.0 - fullWidth * scale / 2.0;
+            double offsetY = canvasTabletArea.ActualHeight / 2.0 - fullHeight * scale / 2.0;
+
+            //
+            // Tablet full area
+            //
+            Point[] corners = config.TabletFullArea.Corners;
+            for (int i = 0; i < 4; i++)
+            {
+                Point p = corners[i];
+                p.X *= scale;
+                p.Y *= scale;
+                p.X += config.TabletFullArea.X * scale + offsetX;
+                p.Y += config.TabletFullArea.Y * scale + offsetY;
+                polygonTabletFullArea.Points[i] = p;
+            }
+
+
+            //
+            // Tablet area
+            //
+            corners = config.TabletArea.Corners;
+            for (int i = 0; i < 4; i++)
+            {
+                Point p = corners[i];
+                p.X *= scale;
+                p.Y *= scale;
+                p.X += config.TabletArea.X * scale + offsetX;
+                p.Y += config.TabletArea.Y * scale + offsetY;
+                polygonTabletArea.Points[i] = p;
+            }
+
+            //
+            // Tablet area arrow
+            //
+            polygonTabletAreaArrow.Points[0] = new Point(
+                offsetX + config.TabletArea.X * scale,
+                offsetY + config.TabletArea.Y * scale
+            );
+
+            polygonTabletAreaArrow.Points[1] = new Point(
+                offsetX + corners[2].X * scale + config.TabletArea.X * scale,
+                offsetY + corners[2].Y * scale + config.TabletArea.Y * scale
+            );
+
+            polygonTabletAreaArrow.Points[2] = new Point(
+                offsetX + corners[3].X * scale + config.TabletArea.X * scale,
+                offsetY + corners[3].Y * scale + config.TabletArea.Y * scale
+            );
+
+
+            //
+            // Tablet area aspect ratio text
+            //
+            textTabletAspectRatio.Text = Utils.GetNumberString(config.TabletArea.Width / config.TabletArea.Height, "0.###") + ":1";
+            Canvas.SetLeft(textTabletAspectRatio, offsetX + (config.TabletArea.X) * scale - textTabletAspectRatio.ActualWidth / 2.0);
+            Canvas.SetTop(textTabletAspectRatio, offsetY + (config.TabletArea.Y) * scale - textTabletAspectRatio.ActualHeight / 2.0);
+
+
+        }
+
+
+        //
+        // Canvas mouse events
+        //
+        //
+        // Canvas mouse down
+        private void Canvas_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+
+            mouseDrag.IsMouseDown = true;
+            mouseDrag.Source = (UIElement)sender;
+            mouseDrag.OriginMouse = e.GetPosition((UIElement)mouseDrag.Source);
+
+            // Screen Map
+            if (mouseDrag.Source == canvasScreenMap)
+            {
+                // Reset monitor selection
+                comboBoxMonitor.SelectedIndex = -1;
+
+                mouseDrag.OriginDraggable = new Point(config.ScreenArea.X, config.ScreenArea.Y);
+                canvasScreenMap.CaptureMouse();
+            }
+
+            // Tablet Area
+            else if (mouseDrag.Source == canvasTabletArea)
+            {
+                mouseDrag.OriginDraggable = new Point(config.TabletArea.X, config.TabletArea.Y);
+                canvasTabletArea.CaptureMouse();
+            }
+        }
+
+
+        //
+        // Canvas mouse up
+        //
+        private void Canvas_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            mouseDrag.IsMouseDown = false;
+            LoadSettingsFromConfiguration();
+            isLoadingSettings = true;
+            textScreenAreaX.Text = Utils.GetNumberString(config.ScreenArea.X, "0");
+            textScreenAreaY.Text = Utils.GetNumberString(config.ScreenArea.Y, "0");
+            textTabletAreaX.Text = Utils.GetNumberString(config.TabletArea.X);
+            textTabletAreaY.Text = Utils.GetNumberString(config.TabletArea.Y);
+            isLoadingSettings = false;
+            canvasScreenMap.ReleaseMouseCapture();
+            canvasTabletArea.ReleaseMouseCapture();
+        }
+
+
+        //
+        // Canvas mouse move
+        //
+        private void Canvas_MouseMove(object sender, MouseEventArgs e)
+        {
+            Point position;
+            double dx, dy;
+            double scaleX = 0, scaleY = 0, scale = 0;
+
+            // Canvas mouse drag
+            if (mouseDrag.IsMouseDown && mouseDrag.Source == sender)
+            {
+                position = e.GetPosition((UIElement)mouseDrag.Source);
+
+                dx = position.X - mouseDrag.OriginMouse.X;
+                dy = position.Y - mouseDrag.OriginMouse.Y;
+
+                if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift))
+                    dx = 0;
+                if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
+                    dy = 0;
+
+                // Screen map canvas
+                if (mouseDrag.Source == canvasScreenMap)
+                {
+                    scaleX = config.DesktopSize.Width / canvasScreenMap.ActualWidth;
+                    scaleY = config.DesktopSize.Height / canvasScreenMap.ActualHeight;
+                    scale = scaleY;
+                    if (scaleX > scaleY)
+                        scale = scaleX;
+
+                    config.ScreenArea.X = mouseDrag.OriginDraggable.X + dx * scale;
+                    config.ScreenArea.Y = mouseDrag.OriginDraggable.Y + dy * scale;
+                    UpdateScreenMapCanvas();
+                }
+
+                // Tablet area canvas
+                else if (mouseDrag.Source == canvasTabletArea)
+                {
+                    scaleX = config.TabletFullArea.Width / canvasTabletArea.ActualWidth;
+                    scaleY = config.TabletFullArea.Height / canvasTabletArea.ActualHeight;
+                    scale = scaleY;
+                    if (scaleX > scaleY)
+                        scale = scaleX;
+
+                    config.TabletArea.X = mouseDrag.OriginDraggable.X + dx * scale;
+                    config.TabletArea.Y = mouseDrag.OriginDraggable.Y + dy * scale;
+
+                    UpdateTabletAreaCanvas();
+                }
+
+
+            }
+        }
+
+        #endregion
+
+
+
+        //
+        // TextBox setting changed
+        //
+        private void TextChanged(object sender, TextChangedEventArgs e)
+        {
+            UpdateSettingsToConfiguration();
+        }
+
+
+        //
+        // Checkbox setting changed
+        //
+        private void CheckboxChanged(object sender, RoutedEventArgs e)
+        {
+            if (isLoadingSettings) return;
+
+
+            // Disable tablet area settings when full area is forced
+            if (checkBoxForceFullArea.IsChecked == true)
+            {
+                textTabletAreaWidth.IsEnabled = false;
+                textTabletAreaHeight.IsEnabled = false;
+                textTabletAreaX.IsEnabled = false;
+                textTabletAreaY.IsEnabled = false;
+            }
+            else
+            {
+                textTabletAreaWidth.IsEnabled = true;
+                textTabletAreaX.IsEnabled = true;
+                textTabletAreaY.IsEnabled = true;
+
+                // Disable tablet area height when aspect ratio is forced
+                if (checkBoxForceAspect.IsChecked == true)
+                    textTabletAreaHeight.IsEnabled = false;
+                else
+                    textTabletAreaHeight.IsEnabled = true;
+
+
+            }
+
+            // Disable button map selection when buttons are disabled
+            if (checkBoxDisableButtons.IsChecked == true)
+            {
+                comboBoxButton1.IsEnabled = false;
+                comboBoxButton2.IsEnabled = false;
+                comboBoxButton3.IsEnabled = false;
+            }
+            else
+            {
+                comboBoxButton1.IsEnabled = true;
+                comboBoxButton2.IsEnabled = true;
+                comboBoxButton3.IsEnabled = true;
+            }
+
+            // Disable desktop size settings when automatic is checked
+            if (checkBoxAutomaticDesktopSize.IsChecked == true)
+            {
+                textDesktopWidth.Text = Utils.GetNumberString(GetVirtualDesktopSize().Width);
+                textDesktopHeight.Text = Utils.GetNumberString(GetVirtualDesktopSize().Height);
+                textDesktopWidth.IsEnabled = false;
+                textDesktopHeight.IsEnabled = false;
+            }
+            else
+            {
+                textDesktopWidth.IsEnabled = true;
+                textDesktopHeight.IsEnabled = true;
+            }
+
+            UpdateSettingsToConfiguration();
+
+            if (sender == checkBoxForceFullArea)
+            {
+                LoadSettingsFromConfiguration();
+                UpdateSettingsToConfiguration();
+            }
+        }
+
+
+        //
+        // Selection settings changed
+        //
+        private void ItemSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            UpdateSettingsToConfiguration();
+        }
+
+
+        //
+        // Window size changed
+        //
+        private void MainWindow_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if (!IsLoaded || isLoadingSettings) return;
+            if (WindowState != WindowState.Maximized)
+            {
+                config.WindowWidth = (int)e.NewSize.Width;
+                config.WindowHeight = (int)e.NewSize.Height;
+            }
+        }
+
+
+        //
+        // Monitor combobox clicked -> create new monitor list
+        //
+        private void ComboBoxMonitor_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            comboBoxMonitor.Items.Clear();
+
+
+            System.Windows.Forms.Screen[] screens = GetAvailableScreens();
+            if (screens.Length > 1)
+            {
+                comboBoxMonitor.Items.Add("Full desktop");
+                foreach (System.Windows.Forms.Screen screen in screens)
+                {
+                    string name = screen.DeviceName;
+                    if (screen.Primary)
+                        name += " Main";
+
+                    comboBoxMonitor.Items.Add(name);
+                }
+            }
+            else
+            {
+                comboBoxMonitor.Items.Add(System.Windows.Forms.Screen.PrimaryScreen.DeviceName);
+            }
+
+        }
+
+
+        //
+        // Monitor selected -> change screen map
+        //
+        private void ComboBoxMonitor_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            System.Windows.Forms.Screen[] screens = GetAvailableScreens();
+            double minX = 99999;
+            double minY = 99999;
+            foreach (System.Windows.Forms.Screen screen in screens)
+            {
+                if (screen.Bounds.X < minX) minX = screen.Bounds.X;
+                if (screen.Bounds.Y < minY) minY = screen.Bounds.Y;
+            }
+
+            int index = comboBoxMonitor.SelectedIndex;
+            if (index == 0)
+            {
+                textScreenAreaX.Text = "0";
+                textScreenAreaY.Text = "0";
+                textScreenAreaWidth.Text = Utils.GetNumberString(config.DesktopSize.Width);
+                textScreenAreaHeight.Text = Utils.GetNumberString(config.DesktopSize.Height);
+            }
+            else if (index > 0)
+            {
+                index--;
+                if (index >= 0 && index < screens.Length)
+                {
+                    textScreenAreaX.Text = Utils.GetNumberString(screens[index].Bounds.X - minX);
+                    textScreenAreaY.Text = Utils.GetNumberString(screens[index].Bounds.Y - minY);
+                    textScreenAreaWidth.Text = Utils.GetNumberString(screens[index].Bounds.Width);
+                    textScreenAreaHeight.Text = Utils.GetNumberString(screens[index].Bounds.Height);
+                }
+            }
+            UpdateSettingsToConfiguration();
+        }
+
+
+        //
+        // Main Menu Click
+        //
+        private void MainMenuClick(object sender, RoutedEventArgs e)
+        {
+
+            // Import
+            if (sender == mainMenuImport)
+            {
+                OpenFileDialog dialog = new OpenFileDialog
+                {
+                    InitialDirectory = Directory.GetCurrentDirectory(),
+                    Filter = "XML File|*.xml"
+                };
+                if (dialog.ShowDialog() == true)
+                {
+                    try
+                    {
+                        Configuration tmpConfig = Configuration.CreateFromFile(dialog.FileName);
+                        config = tmpConfig;
+                        LoadSettingsFromConfiguration();
+                        SetStatus("Settings imported!");
+                    }
+                    catch (Exception)
+                    {
+                        MessageBox.Show("Settings import failed!", "ERROR!",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                }
+            }
+
+            // Export
+            else if (sender == mainMenuExport)
+            {
+                SaveFileDialog dialog = new SaveFileDialog
+                {
+                    InitialDirectory = Directory.GetCurrentDirectory(),
+                    AddExtension = true,
+                    DefaultExt = "xml",
+                    Filter = "XML File|*.xml"
+
+                };
+                if (dialog.ShowDialog() == true)
+                {
+                    try
+                    {
+                        UpdateSettingsToConfiguration();
+                        config.Write(dialog.FileName);
+                        SetStatus("Settings exported!");
+                    }
+                    catch (Exception)
+                    {
+                        MessageBox.Show("Settings export failed!", "ERROR!",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                }
+
+            }
+
+            // Exit
+            else if (sender == mainMenuExit)
+            {
+                Close();
+            }
+
+        }
+
+
+    }
+}
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 4265564..9bdca21 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -5,6 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:TabletDriverGUI"
         mc:Ignorable="d"
+        Keyboard.PreviewKeyDown="Window_PreviewKeyDown"
         Title="TabletDriverGUI" Height="703" Width="680"
         >
   <Window.Resources>
@@ -715,6 +716,7 @@
                     AcceptsReturn="True"
                     TextWrapping="NoWrap"
                     VerticalScrollBarVisibility="Auto"
+                    Keyboard.PreviewKeyDown="TextCommands_PreviewKeyDown"
                     TextChanged="TextChanged" />
             <GroupBox.ToolTip>
               <TextBlock>
@@ -729,6 +731,7 @@
                     AcceptsReturn="True"
                     TextWrapping="NoWrap"
                     VerticalScrollBarVisibility="Auto"
+                    Keyboard.PreviewKeyDown="TextCommands_PreviewKeyDown"
                     TextChanged="TextChanged" />
             <GroupBox.ToolTip>
               <TextBlock>
@@ -739,7 +742,7 @@
         </Grid>
       </TabItem>
       <TabItem Name="tabConsole" Header="Console">
-        <Grid Margin="5,0">
+        <Grid Margin="0,2,0,0">
           <ScrollViewer Name="scrollConsole" Margin="5,5,5,30"
                         VerticalScrollBarVisibility="Auto"
                         HorizontalScrollBarVisibility="Auto">
@@ -751,27 +754,26 @@
                      FontFamily="Courier New" FontSize="12"                   
                      >
               
-              <!-- Menu -->
+              <!-- Console Context Menu -->
               <TextBlock.ContextMenu>
                 <ContextMenu>
                   <MenuItem Name="menuCopyAll" Header="Copy all" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuCopyDebug" Header="Copy [DEBUG] messages" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuCopyErrors" Header="Copy [ERROR] messages" Click="ConsoleMenuClick"></MenuItem>
                   <Separator/>
-                  <MenuItem Name="menuStartDebug" Header="Start Debug Log" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuStopDebug" Header="Stop Debug Log" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuOpenDebug" Header="Open Latest Debug Log" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuRunBenchmark" Header="Run Benchmark" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuCopyBenchmark" Header="Copy Benchmark Result" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuMeasure2" Header="Measure 2 points" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuMeasure3" Header="Measure 3 points" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuMeasure4" Header="Measure 4 points" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuStartDebug" Header="Start debugging" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuStopDebug" Header="Stop debugging" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuFindLatestDebugLog" Header="Find latest debug log" Click="ConsoleMenuClick"></MenuItem>
                   <Separator/>
-                  <MenuItem Name="menuOpenStartup" Header="Open Startup Log" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuOpenFolder" Header="Open TabletDriver Folder" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuFindStartupLog" Header="Find startuplog.txt" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuOpenFolder" Header="Open TabletDriver folder" Click="ConsoleMenuClick"></MenuItem>
+                  <Separator/>
+                  <MenuItem Name="menuRunBenchmark" Header="Run benchmark" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuCopyBenchmark" Header="Copy benchmark result" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuMeasure2" Header="Measure 2 points" Click="ConsoleMenuClick"></MenuItem>
                   <Separator/>
                   <MenuItem Name="menuOpenGithub" Header="Open GitHub page" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuOpenLatestURL" Header="Open Latest URL" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuOpenLatestURL" Header="Open latest URL" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuReportProblem" Header="Report a problem" Click="ConsoleMenuClick"></MenuItem>
                 </ContextMenu>
               </TextBlock.ContextMenu>
@@ -808,12 +810,18 @@
       <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
 
         <!-- Restart Driver -->
-        <Button Name="buttonRestartDriver" Margin="5,5,15,5" Padding="5,0,5,0"
+        <Button Name="buttonRestartDriver" Margin="5,5,5,5" Padding="5,0,5,0"
               Click="RestartDriverClick"
                 ToolTip="Restarts the TabletDriverService">Restart Driver</Button>
 
+        <!-- Automatic restart -->
+        <CheckBox Name="checkBoxAutomaticRestart" Margin="5,5,5,5" 
+                VerticalAlignment="Center" VerticalContentAlignment="Center"
+                Checked="CheckboxChanged" Unchecked="CheckboxChanged"
+                ToolTip="Automatically restarts the driver when it shuts down.">Auto Restart</CheckBox>
+
         <!-- Run at Startup -->
-        <CheckBox Name="checkRunAtStartup"
+        <CheckBox Name="checkBoxRunAtStartup"
                 VerticalAlignment="Center" VerticalContentAlignment="Center"
                 Checked="CheckboxChanged" Unchecked="CheckboxChanged"
                 ToolTip="Starts and hides the TabletDriverGUI at Windows startup">Run at Windows startup</CheckBox>
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 3d835fa..9c05c63 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -24,7 +24,7 @@ public partial class MainWindow : Window
     {
 
         // Version
-        public string Version = "0.2";
+        public string Version = "0.2.1";
 
         // Console stuff
         private List<string> commandHistory;
@@ -36,8 +36,10 @@ public partial class MainWindow : Window
 
         // Driver
         private TabletDriver driver;
+        private Dictionary<String, String> driverCommands;
         private bool running;
 
+
         // Timers
         private DispatcherTimer timerStatusbar;
         private DispatcherTimer timerRestart;
@@ -89,6 +91,8 @@ public MainWindow()
             // Set the current directory as TabletDriverGUI.exe's directory.
             try { Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory); } catch (Exception) { }
 
+            //
+            // Prevent triggering input field events
             //
             isLoadingSettings = true;
 
@@ -121,6 +125,7 @@ public MainWindow()
 
             notifyIcon.Text = "";
             notifyIcon.DoubleClick += NotifyIcon_DoubleClick;
+            notifyIcon.Click += NotifyIcon_DoubleClick;
             notifyIcon.Visible = true;
             IsRealExit = false;
 
@@ -130,8 +135,10 @@ public MainWindow()
 
             // Init tablet driver
             driver = new TabletDriver("TabletDriverService.exe");
+            driverCommands = new Dictionary<string, string>();
             driver.MessageReceived += OnDriverMessageReceived;
             driver.ErrorReceived += OnDriverErrorReceived;
+            driver.StatusReceived += OnDriverStatusReceived;
             driver.Started += OnDriverStarted;
             driver.Stopped += OnDriverStopped;
             running = false;
@@ -201,12 +208,13 @@ public MainWindow()
             Loaded += MainWindow_Loaded;
             SizeChanged += MainWindow_SizeChanged;
 
+            //
+            // Allow input field events
             //
             isLoadingSettings = false;
         }
 
 
-
         #region Window events
 
         // Window is closing -> Stop driver
@@ -220,7 +228,7 @@ private void MainWindow_Closing(object sender, System.ComponentModel.CancelEvent
             catch (Exception)
             {
             }
-            Stop();
+            StopDriver();
         }
 
         // Window loaded -> Start driver
@@ -283,7 +291,23 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
             }
 
             // Start the driver
-            Start();
+            StartDriver();
+        }
+
+
+        //
+        // Window key down
+        //
+        private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+
+            // Control + S -> Save settings
+            if (e.Key == Key.S && e.KeyboardDevice.Modifiers == ModifierKeys.Control)
+            {
+                SaveSettings(sender, null);
+                e.Handled = true;
+            }
+
         }
 
 
@@ -357,6 +381,7 @@ void NotifyShowWindow(object sender, EventArgs e)
         {
             Show();
             WindowState = WindowState.Normal;
+            Activate();
         }
 
         // 'Exit' handler for taskbar menu
@@ -370,1985 +395,152 @@ void NotifyExit(object sender, EventArgs e)
 
 
 
-        #region Setting handlers
+        #region Statusbar
 
         //
-        // Load settings from configuration
+        // Update statusbar
         //
-        private void LoadSettingsFromConfiguration()
+        private void SetStatus(string text)
         {
-            isLoadingSettings = true;
-
-            //
-            // Tablet area
-            //
-            textTabletAreaWidth.Text = Utils.GetNumberString(config.TabletArea.Width);
-            textTabletAreaHeight.Text = Utils.GetNumberString(config.TabletArea.Height);
-            textTabletAreaX.Text = Utils.GetNumberString(config.TabletArea.X);
-            textTabletAreaY.Text = Utils.GetNumberString(config.TabletArea.Y);
-            checkBoxForceAspect.IsChecked = config.ForceAspectRatio;
-            checkBoxForceFullArea.IsChecked = config.ForceFullArea;
-            switch (config.OutputMode)
-            {
-                case Configuration.OutputModes.Absolute:
-                    radioModeAbsolute.IsChecked = true;
-                    break;
-                case Configuration.OutputModes.Relative:
-                    radioModeRelative.IsChecked = true;
-                    break;
-                case Configuration.OutputModes.Digitizer:
-                    radioModeDigitizer.IsChecked = true;
-                    break;
-            }
-            textTabletAreaRotation.Text = Utils.GetNumberString(config.TabletArea.Rotation);
-            checkBoxInvert.IsChecked = config.Invert;
-
-
-            //
-            // Force full area
-            //
-            if (config.ForceFullArea)
-            {
-                textTabletAreaWidth.IsEnabled = false;
-                textTabletAreaHeight.IsEnabled = false;
-                textTabletAreaX.IsEnabled = false;
-                textTabletAreaY.IsEnabled = false;
-            }
-            else
-            {
-                textTabletAreaWidth.IsEnabled = true;
-                textTabletAreaHeight.IsEnabled = true;
-                textTabletAreaX.IsEnabled = true;
-                textTabletAreaY.IsEnabled = true;
-            }
-
-
-            //
-            // Screen area
-            //
-            textScreenAreaWidth.Text = Utils.GetNumberString(config.ScreenArea.Width, "0");
-            textScreenAreaHeight.Text = Utils.GetNumberString(config.ScreenArea.Height, "0");
-            textScreenAreaX.Text = Utils.GetNumberString(config.ScreenArea.X, "0");
-            textScreenAreaY.Text = Utils.GetNumberString(config.ScreenArea.Y, "0");
-
-
-            //
-            // Desktop size
-            //
-            if (config.AutomaticDesktopSize)
-            {
-                textDesktopWidth.Text = Utils.GetNumberString(GetVirtualDesktopSize().Width);
-                textDesktopHeight.Text = Utils.GetNumberString(GetVirtualDesktopSize().Height);
-                config.DesktopSize.Width = GetVirtualDesktopSize().Width;
-                config.DesktopSize.Height = GetVirtualDesktopSize().Height;
-                textDesktopWidth.IsEnabled = false;
-                textDesktopHeight.IsEnabled = false;
-            }
-            else
-            {
-                textDesktopWidth.Text = Utils.GetNumberString(config.DesktopSize.Width);
-                textDesktopHeight.Text = Utils.GetNumberString(config.DesktopSize.Height);
-            }
-            checkBoxAutomaticDesktopSize.IsChecked = config.AutomaticDesktopSize;
-
-
-            // Force aspect ratio
-            if (config.ForceAspectRatio)
-            {
-                config.TabletArea.Height = config.TabletArea.Width / (config.ScreenArea.Width / config.ScreenArea.Height);
-                textTabletAreaHeight.Text = Utils.GetNumberString(config.TabletArea.Height);
-                textTabletAreaHeight.IsEnabled = false;
-            }
-
-
-            //
-            // Move tablet area to a valid position
-            //
-            config.TabletArea.MoveInside(config.TabletFullArea);
-            textTabletAreaX.Text = Utils.GetNumberString(config.TabletArea.X);
-            textTabletAreaY.Text = Utils.GetNumberString(config.TabletArea.Y);
-
-
-            //
-            // Buttons
-            //
-            if (config.ButtonMap.Count() == 3)
-            {
-                comboBoxButton1.SelectedIndex = config.ButtonMap[0];
-                comboBoxButton2.SelectedIndex = config.ButtonMap[1];
-                comboBoxButton3.SelectedIndex = config.ButtonMap[2];
-            }
-            else
-            {
-                config.ButtonMap = new int[] { 1, 2, 3 };
-            }
-            checkBoxDisableButtons.IsChecked = config.DisableButtons;
-
-
-            //
-            // Smoothing filter
-            //
-            checkBoxSmoothing.IsChecked = config.SmoothingEnabled;
-            textSmoothingLatency.Text = Utils.GetNumberString(config.SmoothingLatency);
-            comboBoxSmoothingRate.SelectedIndex = config.SmoothingInterval - 1;
-            if (config.SmoothingEnabled)
-            {
-                textSmoothingLatency.IsEnabled = true;
-                comboBoxSmoothingRate.IsEnabled = true;
-            }
-            else
-            {
-                textSmoothingLatency.IsEnabled = false;
-                comboBoxSmoothingRate.IsEnabled = false;
-            }
-
-
-            //
-            // Noise filter
-            //
-            checkBoxNoiseFilter.IsChecked = config.NoiseFilterEnabled;
-            textNoiseBuffer.Text = Utils.GetNumberString(config.NoiseFilterBuffer);
-            textNoiseThreshold.Text = Utils.GetNumberString(config.NoiseFilterThreshold);
-            if (config.NoiseFilterEnabled)
-            {
-                textNoiseBuffer.IsEnabled = true;
-                textNoiseThreshold.IsEnabled = true;
-            }
-            else
-            {
-                textNoiseBuffer.IsEnabled = false;
-                textNoiseThreshold.IsEnabled = false;
-            }
-
-
-            //
-            // Anti-smoothing filter
-            //
-            checkBoxAntiSmoothing.IsChecked = config.AntiSmoothingEnabled;
-            textAntiSmoothingShape.Text = Utils.GetNumberString(config.AntiSmoothingShape, "0.00");
-            textAntiSmoothingCompensation.Text = Utils.GetNumberString(config.AntiSmoothingCompensation, "0.00");
-            checkBoxAntiSmoothingIgnoreWhenDragging.IsChecked = config.AntiSmoothingIgnoreWhenDragging;
-            if (config.AntiSmoothingEnabled)
-            {
-                textAntiSmoothingShape.IsEnabled = true;
-                textAntiSmoothingCompensation.IsEnabled = true;
-                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = true;
-            }
-            else
-            {
-                textAntiSmoothingShape.IsEnabled = false;
-                textAntiSmoothingCompensation.IsEnabled = false;
-                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = false;
-            }
-
-
-            //
-            // Run at startup
-            //
-            checkRunAtStartup.IsChecked = config.RunAtStartup;
-
-
-            //
-            // Custom commands
-            //
-            string tmp = "";
-            foreach (string command in config.CommandsBefore)
-            {
-                if (command.Trim().Length > 0)
-                    tmp += command.Trim() + "\n";
-            }
-            textCommandsBefore.Text = tmp;
-
-            tmp = "";
-            foreach (string command in config.CommandsAfter)
+            Application.Current.Dispatcher.Invoke(() =>
             {
-                if (command.Trim().Length > 0)
-                    tmp += command.Trim() + "\n";
-            }
-            textCommandsAfter.Text = tmp;
-
-
-            // Update canvases
-            UpdateCanvasElements();
-
-
-            isLoadingSettings = false;
+                textStatus.Text = text;
+            });
+            timerStatusbar.Stop();
+            timerStatusbar.Start();
         }
 
         //
-        // Update settings to configuration
+        // Update statusbar
         //
-        private void UpdateSettingsToConfiguration()
+        private void SetStatusWarning(string text)
         {
-            if (isLoadingSettings)
-                return;
-
-            bool oldValue;
-
-            // Tablet area
-            if (Utils.ParseNumber(textTabletAreaWidth.Text, out double val))
-                config.TabletArea.Width = val;
-            if (Utils.ParseNumber(textTabletAreaHeight.Text, out val))
-                config.TabletArea.Height = val;
-            if (Utils.ParseNumber(textTabletAreaX.Text, out val))
-                config.TabletArea.X = val;
-            if (Utils.ParseNumber(textTabletAreaY.Text, out val))
-                config.TabletArea.Y = val;
-            if (Utils.ParseNumber(textTabletAreaRotation.Text, out val))
-                config.TabletArea.Rotation = val;
-
-            config.Invert = (bool)checkBoxInvert.IsChecked;
-            config.ForceAspectRatio = (bool)checkBoxForceAspect.IsChecked;
-            config.ForceFullArea = (bool)checkBoxForceFullArea.IsChecked;
-
-            // Output Mode
-            if (radioModeAbsolute.IsChecked == true) config.OutputMode = Configuration.OutputModes.Absolute;
-            if (radioModeRelative.IsChecked == true) config.OutputMode = Configuration.OutputModes.Relative;
-            if (radioModeDigitizer.IsChecked == true) config.OutputMode = Configuration.OutputModes.Digitizer;
-
-
-            // Force full area
-            if (config.ForceFullArea)
+            Application.Current.Dispatcher.Invoke(() =>
             {
-                // Set tablet area size to full area
-                config.TabletArea.Width = config.TabletFullArea.Width;
-                config.TabletArea.Height = config.TabletFullArea.Height;
-
-                // Force aspect
-                if (config.ForceAspectRatio)
-                    config.TabletArea.Height = config.TabletArea.Width / (config.ScreenArea.Width / config.ScreenArea.Height);
-
-                // Fit area to full area
-                config.TabletArea.ScaleInside(config.TabletFullArea);
-
-                textTabletAreaWidth.Text = Utils.GetNumberString(config.TabletArea.Width);
-                textTabletAreaHeight.Text = Utils.GetNumberString(config.TabletArea.Height);
+                textStatusWarning.Text = text;
+            });
+            timerStatusbar.Stop();
+            timerStatusbar.Start();
+        }
 
-            }
 
-            // Force the tablet area to be inside of the full area
-            config.TabletArea.MoveInside(config.TabletFullArea);
-
-            // Screen area
-            if (Utils.ParseNumber(textScreenAreaWidth.Text, out val))
-                config.ScreenArea.Width = val;
-            if (Utils.ParseNumber(textScreenAreaHeight.Text, out val))
-                config.ScreenArea.Height = val;
-            if (Utils.ParseNumber(textScreenAreaX.Text, out val))
-                config.ScreenArea.X = val;
-            if (Utils.ParseNumber(textScreenAreaY.Text, out val))
-                config.ScreenArea.Y = val;
-
-
-            // Desktop size
-            if (Utils.ParseNumber(textDesktopWidth.Text, out val))
-                config.DesktopSize.Width = val;
-            if (Utils.ParseNumber(textDesktopHeight.Text, out val))
-                config.DesktopSize.Height = val;
-            config.AutomaticDesktopSize = (bool)checkBoxAutomaticDesktopSize.IsChecked;
-            if (config.AutomaticDesktopSize == true)
+        //
+        // Statusbar warning text click
+        //
+        private void StatusWarning_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            // Open Task Manager 
+            if (textStatusWarning.Text.ToLower().Contains("priority"))
             {
-                textDesktopWidth.Text = Utils.GetNumberString(GetVirtualDesktopSize().Width);
-                textDesktopHeight.Text = Utils.GetNumberString(GetVirtualDesktopSize().Height);
-                config.DesktopSize.Width = GetVirtualDesktopSize().Width;
-                config.DesktopSize.Height = GetVirtualDesktopSize().Height;
+                try { Process.Start("taskmgr.exe"); } catch (Exception) { }
             }
+        }
 
 
-            // Force aspect ratio
-            if (config.ForceAspectRatio)
+        //
+        // Statusbar timer tick
+        //
+        private void TimerStatusbar_Tick(object sender, EventArgs e)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
             {
-                config.TabletArea.Height = config.TabletArea.Width / (config.ScreenArea.Width / config.ScreenArea.Height);
-                textTabletAreaHeight.Text = Utils.GetNumberString(config.TabletArea.Height);
-            }
+                textStatus.Text = "";
+                textStatusWarning.Text = "";
+            });
+            timerStatusbar.Stop();
+        }
 
+        #endregion
 
-            // Button map 
-            config.ButtonMap[0] = comboBoxButton1.SelectedIndex;
-            config.ButtonMap[1] = comboBoxButton2.SelectedIndex;
-            config.ButtonMap[2] = comboBoxButton3.SelectedIndex;
-            config.DisableButtons = (bool)checkBoxDisableButtons.IsChecked;
 
 
+        #region Wacom / Draw area
 
-            // Smoothing filter
-            config.SmoothingEnabled = (bool)checkBoxSmoothing.IsChecked;
-            config.SmoothingInterval = comboBoxSmoothingRate.SelectedIndex + 1;
-            if (Utils.ParseNumber(textSmoothingLatency.Text, out val))
-                config.SmoothingLatency = val;
+        //
+        // Wacom Area
+        //
+        private void ButtonWacomArea_Click(object sender, RoutedEventArgs e)
+        {
+            WacomArea wacom = new WacomArea();
+            wacom.textWacomLeft.Text = Utils.GetNumberString((config.TabletArea.X - config.TabletArea.Width / 2) * 100.0, "0");
+            wacom.textWacomRight.Text = Utils.GetNumberString((config.TabletArea.X + config.TabletArea.Width / 2) * 100.0, "0");
 
-            if (config.SmoothingEnabled)
-            {
-                textSmoothingLatency.IsEnabled = true;
-                comboBoxSmoothingRate.IsEnabled = true;
-            }
-            else
-            {
-                textSmoothingLatency.IsEnabled = false;
-                comboBoxSmoothingRate.IsEnabled = false;
-            }
+            wacom.textWacomTop.Text = Utils.GetNumberString((config.TabletArea.Y - config.TabletArea.Height / 2) * 100.0, "0");
+            wacom.textWacomBottom.Text = Utils.GetNumberString((config.TabletArea.Y + config.TabletArea.Height / 2) * 100.0, "0");
 
-            // Noise filter
-            config.NoiseFilterEnabled = (bool)checkBoxNoiseFilter.IsChecked;
-            if (Utils.ParseNumber(textNoiseBuffer.Text, out val))
-                config.NoiseFilterBuffer = (int)val;
-            if (Utils.ParseNumber(textNoiseThreshold.Text, out val))
-                config.NoiseFilterThreshold = val;
-            if (config.NoiseFilterEnabled)
-            {
-                textNoiseBuffer.IsEnabled = true;
-                textNoiseThreshold.IsEnabled = true;
-            }
-            else
-            {
-                textNoiseBuffer.IsEnabled = false;
-                textNoiseThreshold.IsEnabled = false;
-            }
+            wacom.ShowDialog();
 
-            // Anti-smoothing filter
-            config.AntiSmoothingEnabled = (bool)checkBoxAntiSmoothing.IsChecked;
-            if (Utils.ParseNumber(textAntiSmoothingShape.Text, out val))
-                config.AntiSmoothingShape = val;
-            if (Utils.ParseNumber(textAntiSmoothingCompensation.Text, out val))
-                config.AntiSmoothingCompensation = val;
-            config.AntiSmoothingIgnoreWhenDragging = (bool)checkBoxAntiSmoothingIgnoreWhenDragging.IsChecked;
-            if (config.AntiSmoothingEnabled)
-            {
-                textAntiSmoothingShape.IsEnabled = true;
-                textAntiSmoothingCompensation.IsEnabled = true;
-                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = true;
-            }
-            else
+            // Set button clicked
+            if (wacom.DialogResult == true)
             {
-                textAntiSmoothingShape.IsEnabled = false;
-                textAntiSmoothingCompensation.IsEnabled = false;
-                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = false;
+                if (
+                    Utils.ParseNumber(wacom.textWacomLeft.Text, out double left) &&
+                    Utils.ParseNumber(wacom.textWacomRight.Text, out double right) &&
+                    Utils.ParseNumber(wacom.textWacomTop.Text, out double top) &&
+                    Utils.ParseNumber(wacom.textWacomBottom.Text, out double bottom)
+                )
+                {
+                    double width, height;
+                    width = right - left;
+                    height = bottom - top;
+                    config.ForceAspectRatio = false;
+                    config.ForceFullArea = false;
+                    config.TabletArea.X = (left + width / 2.0) / 100.0;
+                    config.TabletArea.Y = (top + height / 2.0) / 100.0;
+                    config.TabletArea.Width = width / 100.0;
+                    config.TabletArea.Height = height / 100.0;
+                    LoadSettingsFromConfiguration();
+                }
+                else
+                {
+                    MessageBox.Show("Invalid values!", "Wacom area error!", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
             }
 
-
-
-            //
-            // Run at startup
-            //
-            oldValue = config.RunAtStartup;
-            config.RunAtStartup = (bool)checkRunAtStartup.IsChecked;
-            if (config.RunAtStartup != oldValue)
-                SetRunAtStartup(config.RunAtStartup);
-
-
-            // Custom commands
-            List<string> commandList = new List<string>();
-            foreach (string command in textCommandsBefore.Text.Split('\n'))
-                if (command.Trim().Length > 0)
-                    commandList.Add(command.Trim());
-            config.CommandsBefore = commandList.ToArray();
-
-            commandList.Clear();
-            foreach (string command in textCommandsAfter.Text.Split('\n'))
-                if (command.Trim().Length > 0)
-                    commandList.Add(command.Trim());
-            config.CommandsAfter = commandList.ToArray();
-
-
-
-            UpdateCanvasElements();
-
+            wacom.Close();
         }
 
+
         //
-        // Set run at startup
+        // Draw area
         //
-        private void SetRunAtStartup(bool enabled)
+        private void ButtonDrawArea_Click(object sender, RoutedEventArgs e)
         {
-            try
-            {
-                string path = System.Reflection.Assembly.GetExecutingAssembly().Location;
-                string entryName = "TabletDriverGUI";
-                RegistryKey rk = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
-                if (enabled)
-                    rk.SetValue(entryName, "\"" + path + "\" --hide");
-                else
-                    rk.DeleteValue(entryName, false);
-
-                rk.Close();
-            }
-            catch (Exception)
+            if (!isEnabledMeasurementToArea)
             {
+                isEnabledMeasurementToArea = true;
+                driver.SendCommand("Measure 2");
+                SetStatus("Click the top left and the bottom right corners of the area with your tablet pen!");
+                buttonDrawArea.IsEnabled = false;
             }
         }
 
-        //
-        // Get desktop size
-        //
-        System.Drawing.Rectangle GetVirtualDesktopSize()
-        {
-            System.Drawing.Rectangle rect = new System.Drawing.Rectangle();
+        #endregion
 
-            // Windows 8 or greater needed for the multiscreen absolute mode
-            if (VersionHelper.IsWindows8OrGreater() || config.OutputMode == Configuration.OutputModes.Digitizer)
-            {
-                rect.Width = System.Windows.Forms.SystemInformation.VirtualScreen.Width;
-                rect.Height = System.Windows.Forms.SystemInformation.VirtualScreen.Height;
-            }
-            else
-            {
-                rect.Width = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width;
-                rect.Height = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height;
 
-            }
-            return rect;
-        }
 
+        #region WndProc
 
         //
-        // Get available screens
+        // Add WndProc hook
         //
-        System.Windows.Forms.Screen[] GetAvailableScreens()
+        protected override void OnSourceInitialized(EventArgs e)
         {
-            System.Windows.Forms.Screen[] screens;
-
-            // Windows 8 or greater needed for the multiscreen absolute mode
-            if (VersionHelper.IsWindows8OrGreater() || config.OutputMode == Configuration.OutputModes.Digitizer)
-                screens = System.Windows.Forms.Screen.AllScreens;
-            else
-                screens = new System.Windows.Forms.Screen[] { System.Windows.Forms.Screen.PrimaryScreen };
-            return screens;
+            base.OnSourceInitialized(e);
+            HwndSource source = PresentationSource.FromVisual(this) as HwndSource;
+            source.AddHook(WndProc);
         }
 
-
         //
-        // Create canvas elements
+        // Process Windows messages
         //
-        void CreateCanvasElements()
+        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
-            //
-            // Screen map canvas
-            //
-            // Clear canvas
-            canvasScreenMap.Children.Clear();
-
 
-            // Monitor rectangles
-            rectangleMonitors = new Rectangle[16];
-            for (int i = 0; i < 16; i++)
+            // Show TabletDriverGUI
+            if (msg == NativeMethods.WM_SHOWTABLETDRIVERGUI)
             {
-                rectangleMonitors[i] = new Rectangle
-                {
-                    Width = 10,
-                    Height = 10,
-                    Stroke = Brushes.Black,
-                    StrokeThickness = 1.0,
-                    Fill = Brushes.Transparent,
-                    Visibility = Visibility.Hidden
-                };
-                canvasScreenMap.Children.Add(rectangleMonitors[i]);
-            }
-
-            //
-            // Desktop area rectangle
-            //
-            rectangleDesktop = new Rectangle
-            {
-                Stroke = Brushes.Black,
-                StrokeThickness = 2.0,
-                Fill = Brushes.Transparent
-            };
-            canvasScreenMap.Children.Add(rectangleDesktop);
-
-
-            //
-            // Screen map area rectangle
-            //
-            Brush brushScreenMap = new SolidColorBrush(Color.FromArgb(50, 20, 20, 20));
-            rectangleScreenMap = new Rectangle
-            {
-                Stroke = Brushes.Black,
-                StrokeThickness = 2.0,
-                Fill = brushScreenMap
-            };
-            canvasScreenMap.Children.Add(rectangleScreenMap);
-
-            //
-            // Screen aspect ratio text
-            //
-            textScreenAspectRatio = new TextBlock
-            {
-                Text = "",
-                Foreground = Brushes.Black,
-                FontSize = 13,
-                FontWeight = FontWeights.Bold
-            };
-            canvasScreenMap.Children.Add(textScreenAspectRatio);
-
-
-
-            //
-            // Tablet area canvas
-            //
-            //
-            // Clear
-            canvasTabletArea.Children.Clear();
-
-            //
-            // Tablet full area polygon
-            //
-            polygonTabletFullArea = new Polygon
-            {
-                Stroke = new SolidColorBrush(Color.FromRgb(100, 100, 100)),
-                StrokeThickness = 2.0,
-                Points = new PointCollection
-                {
-                    new Point(0,0),
-                    new Point(0,0),
-                    new Point(0,0),
-                    new Point(0,0)
-                },
-            };
-            canvasTabletArea.Children.Add(polygonTabletFullArea);
-
-            //
-            // Tablet area polygon
-            //
-            polygonTabletArea = new Polygon
-            {
-                Stroke = new SolidColorBrush(Color.FromRgb(0, 0, 0)),
-                Fill = new SolidColorBrush(Color.FromArgb(50, 20, 20, 20)),
-                StrokeThickness = 2.0,
-                Points = new PointCollection
-                {
-                    new Point(0,0),
-                    new Point(0,0),
-                    new Point(0,0),
-                    new Point(0,0)
-                },
-            };
-            canvasTabletArea.Children.Add(polygonTabletArea);
-
-
-            //
-            // Tablet area arrow polygon
-            //
-            polygonTabletAreaArrow = new Polygon
-            {
-                Fill = new SolidColorBrush(Color.FromArgb(50, 20, 20, 20)),
-                Points = new PointCollection
-                {
-                    new Point(0,0),
-                    new Point(0,0),
-                    new Point(0,0)
-                },
-            };
-            canvasTabletArea.Children.Add(polygonTabletAreaArrow);
-
-
-            //
-            // Tablet area aspect ratio text
-            //
-            textTabletAspectRatio = new TextBlock
-            {
-                Text = "",
-                Foreground = Brushes.Black,
-                FontSize = 13,
-                FontWeight = FontWeights.Bold
-            };
-            canvasTabletArea.Children.Add(textTabletAspectRatio);
-
-
-
-
-            //
-            // Canvas mouse drag
-            //
-            mouseDrag = new MouseDrag();
-        }
-
-        //
-        // Update canvas elements
-        //
-        void UpdateCanvasElements()
-        {
-            UpdateScreenMapCanvas();
-            UpdateTabletAreaCanvas();
-        }
-
-        //
-        // Update screen map canvas elements
-        //
-        void UpdateScreenMapCanvas()
-        {
-            // Canvas element scaling
-            double scaleX = (canvasScreenMap.ActualWidth - 2) / config.DesktopSize.Width;
-            double scaleY = (canvasScreenMap.ActualHeight - 2) / config.DesktopSize.Height;
-            double scale = scaleX;
-            if (scaleX > scaleY)
-                scale = scaleY;
-
-            // Centered offset
-            double offsetX = canvasScreenMap.ActualWidth / 2.0 - config.DesktopSize.Width * scale / 2.0;
-            double offsetY = canvasScreenMap.ActualHeight / 2.0 - config.DesktopSize.Height * scale / 2.0;
-
-
-            // Full desktop area
-            rectangleDesktop.Width = config.DesktopSize.Width * scale;
-            rectangleDesktop.Height = config.DesktopSize.Height * scale;
-            Canvas.SetLeft(rectangleDesktop, offsetX);
-            Canvas.SetTop(rectangleDesktop, offsetY);
-
-
-            // Screen map area
-            rectangleScreenMap.Width = config.ScreenArea.Width * scale;
-            rectangleScreenMap.Height = config.ScreenArea.Height * scale;
-            Canvas.SetLeft(rectangleScreenMap, offsetX + config.ScreenArea.X * scale);
-            Canvas.SetTop(rectangleScreenMap, offsetY + config.ScreenArea.Y * scale);
-
-            // Screen aspect ratio text
-            textScreenAspectRatio.Text = Utils.GetNumberString(config.ScreenArea.Width / config.ScreenArea.Height, "0.###") + ":1";
-            Canvas.SetLeft(textScreenAspectRatio, offsetX +
-                (config.ScreenArea.X + config.ScreenArea.Width / 2.0) * scale -
-                textScreenAspectRatio.ActualWidth / 2.0
-            );
-            Canvas.SetTop(textScreenAspectRatio, offsetY +
-                (config.ScreenArea.Y + config.ScreenArea.Height / 2.0) * scale -
-                textScreenAspectRatio.ActualHeight / 2.0
-            );
-
-
-
-
-
-            // Screens
-            System.Windows.Forms.Screen[] screens = GetAvailableScreens();
-
-            // Monitor minimums
-            double minX = 99999;
-            double minY = 99999;
-            foreach (System.Windows.Forms.Screen screen in screens)
-            {
-                if (screen.Bounds.X < minX) minX = screen.Bounds.X;
-                if (screen.Bounds.Y < minY) minY = screen.Bounds.Y;
-            }
-
-
-            // Monitor rectangles
-            int rectangeIndex = 0;
-            foreach (System.Windows.Forms.Screen screen in screens)
-            {
-                double x = screen.Bounds.X - minX;
-                double y = screen.Bounds.Y - minY;
-
-                rectangleMonitors[rectangeIndex].Visibility = Visibility.Visible;
-                rectangleMonitors[rectangeIndex].Width = screen.Bounds.Width * scale;
-                rectangleMonitors[rectangeIndex].Height = screen.Bounds.Height * scale;
-                Canvas.SetLeft(rectangleMonitors[rectangeIndex], offsetX + x * scale);
-                Canvas.SetTop(rectangleMonitors[rectangeIndex], offsetY + y * scale);
-
-                rectangeIndex++;
-                if (rectangeIndex >= 16) break;
-            }
-
-        }
-
-        //
-        // Update tablet area canvas elements
-        //
-        void UpdateTabletAreaCanvas()
-        {
-            double fullWidth = config.TabletFullArea.Width;
-            double fullHeight = config.TabletFullArea.Height;
-
-            // Canvas element scaling
-            double scaleX = (canvasTabletArea.ActualWidth - 2) / fullWidth;
-            double scaleY = (canvasTabletArea.ActualHeight - 2) / fullHeight;
-            double scale = scaleX;
-            if (scaleX > scaleY)
-                scale = scaleY;
-
-
-            double offsetX = canvasTabletArea.ActualWidth / 2.0 - fullWidth * scale / 2.0;
-            double offsetY = canvasTabletArea.ActualHeight / 2.0 - fullHeight * scale / 2.0;
-
-            //
-            // Tablet full area
-            //
-            Point[] corners = config.TabletFullArea.Corners;
-            for (int i = 0; i < 4; i++)
-            {
-                Point p = corners[i];
-                p.X *= scale;
-                p.Y *= scale;
-                p.X += config.TabletFullArea.X * scale + offsetX;
-                p.Y += config.TabletFullArea.Y * scale + offsetY;
-                polygonTabletFullArea.Points[i] = p;
-            }
-
-
-            //
-            // Tablet area
-            //
-            corners = config.TabletArea.Corners;
-            for (int i = 0; i < 4; i++)
-            {
-                Point p = corners[i];
-                p.X *= scale;
-                p.Y *= scale;
-                p.X += config.TabletArea.X * scale + offsetX;
-                p.Y += config.TabletArea.Y * scale + offsetY;
-                polygonTabletArea.Points[i] = p;
-            }
-
-            //
-            // Tablet area arrow
-            //
-            polygonTabletAreaArrow.Points[0] = new Point(
-                offsetX + config.TabletArea.X * scale,
-                offsetY + config.TabletArea.Y * scale
-            );
-
-            polygonTabletAreaArrow.Points[1] = new Point(
-                offsetX + corners[2].X * scale + config.TabletArea.X * scale,
-                offsetY + corners[2].Y * scale + config.TabletArea.Y * scale
-            );
-
-            polygonTabletAreaArrow.Points[2] = new Point(
-                offsetX + corners[3].X * scale + config.TabletArea.X * scale,
-                offsetY + corners[3].Y * scale + config.TabletArea.Y * scale
-            );
-
-
-            //
-            // Tablet area aspect ratio text
-            //
-            textTabletAspectRatio.Text = Utils.GetNumberString(config.TabletArea.Width / config.TabletArea.Height, "0.###") + ":1";
-            Canvas.SetLeft(textTabletAspectRatio, offsetX + (config.TabletArea.X) * scale - textTabletAspectRatio.ActualWidth / 2.0);
-            Canvas.SetTop(textTabletAspectRatio, offsetY + (config.TabletArea.Y) * scale - textTabletAspectRatio.ActualHeight / 2.0);
-
-
-        }
-
-
-
-
-        //
-        // Canvas mouse events
-        //
-        //
-        // Canvas mouse down
-        private void Canvas_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-
-            mouseDrag.IsMouseDown = true;
-            mouseDrag.Source = (UIElement)sender;
-            mouseDrag.OriginMouse = e.GetPosition((UIElement)mouseDrag.Source);
-
-            // Screen Map
-            if (mouseDrag.Source == canvasScreenMap)
-            {
-                // Reset monitor selection
-                comboBoxMonitor.SelectedIndex = -1;
-
-                mouseDrag.OriginDraggable = new Point(config.ScreenArea.X, config.ScreenArea.Y);
-                canvasScreenMap.CaptureMouse();
-            }
-
-            // Tablet Area
-            else if (mouseDrag.Source == canvasTabletArea)
-            {
-                mouseDrag.OriginDraggable = new Point(config.TabletArea.X, config.TabletArea.Y);
-                canvasTabletArea.CaptureMouse();
-            }
-        }
-
-        // Canvas mouse up
-        private void Canvas_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            mouseDrag.IsMouseDown = false;
-            LoadSettingsFromConfiguration();
-            isLoadingSettings = true;
-            textScreenAreaX.Text = Utils.GetNumberString(config.ScreenArea.X, "0");
-            textScreenAreaY.Text = Utils.GetNumberString(config.ScreenArea.Y, "0");
-            textTabletAreaX.Text = Utils.GetNumberString(config.TabletArea.X);
-            textTabletAreaY.Text = Utils.GetNumberString(config.TabletArea.Y);
-            isLoadingSettings = false;
-            canvasScreenMap.ReleaseMouseCapture();
-            canvasTabletArea.ReleaseMouseCapture();
-        }
-
-        // Canvas mouse move
-        private void Canvas_MouseMove(object sender, MouseEventArgs e)
-        {
-            Point position;
-            double dx, dy;
-            double scaleX = 0, scaleY = 0, scale = 0;
-
-            // Canvas mouse drag
-            if (mouseDrag.IsMouseDown && mouseDrag.Source == sender)
-            {
-                position = e.GetPosition((UIElement)mouseDrag.Source);
-
-                dx = position.X - mouseDrag.OriginMouse.X;
-                dy = position.Y - mouseDrag.OriginMouse.Y;
-
-                if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift))
-                    dx = 0;
-                if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
-                    dy = 0;
-
-                // Screen map canvas
-                if (mouseDrag.Source == canvasScreenMap)
-                {
-                    scaleX = config.DesktopSize.Width / canvasScreenMap.ActualWidth;
-                    scaleY = config.DesktopSize.Height / canvasScreenMap.ActualHeight;
-                    scale = scaleY;
-                    if (scaleX > scaleY)
-                        scale = scaleX;
-
-                    config.ScreenArea.X = mouseDrag.OriginDraggable.X + dx * scale;
-                    config.ScreenArea.Y = mouseDrag.OriginDraggable.Y + dy * scale;
-                    UpdateScreenMapCanvas();
-                }
-
-                // Tablet area canvas
-                else if (mouseDrag.Source == canvasTabletArea)
-                {
-                    scaleX = config.TabletFullArea.Width / canvasTabletArea.ActualWidth;
-                    scaleY = config.TabletFullArea.Height / canvasTabletArea.ActualHeight;
-                    scale = scaleY;
-                    if (scaleX > scaleY)
-                        scale = scaleX;
-
-                    config.TabletArea.X = mouseDrag.OriginDraggable.X + dx * scale;
-                    config.TabletArea.Y = mouseDrag.OriginDraggable.Y + dy * scale;
-
-                    UpdateTabletAreaCanvas();
-                }
-
-
-            }
-        }
-
-
-        // TextBox setting changed
-        private void TextChanged(object sender, TextChangedEventArgs e)
-        {
-            UpdateSettingsToConfiguration();
-        }
-
-        // Checkbox setting changed
-        private void CheckboxChanged(object sender, RoutedEventArgs e)
-        {
-            if (isLoadingSettings) return;
-
-
-            // Disable tablet area settings when full area is forced
-            if (checkBoxForceFullArea.IsChecked == true)
-            {
-                textTabletAreaWidth.IsEnabled = false;
-                textTabletAreaHeight.IsEnabled = false;
-                textTabletAreaX.IsEnabled = false;
-                textTabletAreaY.IsEnabled = false;
-            }
-            else
-            {
-                textTabletAreaWidth.IsEnabled = true;
-                textTabletAreaX.IsEnabled = true;
-                textTabletAreaY.IsEnabled = true;
-
-                // Disable tablet area height when aspect ratio is forced
-                if (checkBoxForceAspect.IsChecked == true)
-                    textTabletAreaHeight.IsEnabled = false;
-                else
-                    textTabletAreaHeight.IsEnabled = true;
-
-
-            }
-
-            // Disable button map selection when buttons are disabled
-            if (checkBoxDisableButtons.IsChecked == true)
-            {
-                comboBoxButton1.IsEnabled = false;
-                comboBoxButton2.IsEnabled = false;
-                comboBoxButton3.IsEnabled = false;
-            }
-            else
-            {
-                comboBoxButton1.IsEnabled = true;
-                comboBoxButton2.IsEnabled = true;
-                comboBoxButton3.IsEnabled = true;
-            }
-
-            // Disable desktop size settings when automatic is checked
-            if (checkBoxAutomaticDesktopSize.IsChecked == true)
-            {
-                textDesktopWidth.Text = Utils.GetNumberString(GetVirtualDesktopSize().Width);
-                textDesktopHeight.Text = Utils.GetNumberString(GetVirtualDesktopSize().Height);
-                textDesktopWidth.IsEnabled = false;
-                textDesktopHeight.IsEnabled = false;
-            }
-            else
-            {
-                textDesktopWidth.IsEnabled = true;
-                textDesktopHeight.IsEnabled = true;
-            }
-
-            UpdateSettingsToConfiguration();
-
-            if (sender == checkBoxForceFullArea)
-            {
-                LoadSettingsFromConfiguration();
-                UpdateSettingsToConfiguration();
-            }
-        }
-
-        // Selection settings changed
-        private void ItemSelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            UpdateSettingsToConfiguration();
-        }
-
-        // Window size changed
-        private void MainWindow_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            if (!IsLoaded || isLoadingSettings) return;
-            if (WindowState != WindowState.Maximized)
-            {
-                config.WindowWidth = (int)e.NewSize.Width;
-                config.WindowHeight = (int)e.NewSize.Height;
-            }
-        }
-
-        // Monitor combobox clicked -> create new monitor list
-        private void ComboBoxMonitor_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            comboBoxMonitor.Items.Clear();
-
-
-            System.Windows.Forms.Screen[] screens = GetAvailableScreens();
-            if (screens.Length > 1)
-            {
-                comboBoxMonitor.Items.Add("Full desktop");
-                foreach (System.Windows.Forms.Screen screen in screens)
-                {
-                    string name = screen.DeviceName;
-                    if (screen.Primary)
-                        name += " Main";
-
-                    comboBoxMonitor.Items.Add(name);
-                }
-            }
-            else
-            {
-                comboBoxMonitor.Items.Add(System.Windows.Forms.Screen.PrimaryScreen.DeviceName);
-            }
-
-        }
-
-        // Monitor selected -> change screen map
-        private void ComboBoxMonitor_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            System.Windows.Forms.Screen[] screens = GetAvailableScreens();
-            double minX = 99999;
-            double minY = 99999;
-            foreach (System.Windows.Forms.Screen screen in screens)
-            {
-                if (screen.Bounds.X < minX) minX = screen.Bounds.X;
-                if (screen.Bounds.Y < minY) minY = screen.Bounds.Y;
-            }
-
-            int index = comboBoxMonitor.SelectedIndex;
-            if (index == 0)
-            {
-                textScreenAreaX.Text = "0";
-                textScreenAreaY.Text = "0";
-                textScreenAreaWidth.Text = Utils.GetNumberString(config.DesktopSize.Width);
-                textScreenAreaHeight.Text = Utils.GetNumberString(config.DesktopSize.Height);
-            }
-            else if (index > 0)
-            {
-                index--;
-                if (index >= 0 && index < screens.Length)
-                {
-                    textScreenAreaX.Text = Utils.GetNumberString(screens[index].Bounds.X - minX);
-                    textScreenAreaY.Text = Utils.GetNumberString(screens[index].Bounds.Y - minY);
-                    textScreenAreaWidth.Text = Utils.GetNumberString(screens[index].Bounds.Width);
-                    textScreenAreaHeight.Text = Utils.GetNumberString(screens[index].Bounds.Height);
-                }
-            }
-            UpdateSettingsToConfiguration();
-        }
-
-        //
-        // Save settings
-        //
-        private void SaveSettings(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                config.Write(configFilename);
-                SendSettingsToDriver();
-                SetStatus("Settings saved!");
-            }
-            catch (Exception)
-            {
-                string dir = Directory.GetCurrentDirectory();
-                MessageBox.Show("Error occured while saving the configuration.\n" +
-                    "Make sure that it is possible to create and edit files in the '" + dir + "' directory.\n",
-                    "ERROR!", MessageBoxButton.OK, MessageBoxImage.Error
-                );
-            }
-        }
-
-        //
-        // Apply settings
-        //
-        private void ApplySettings(object sender, RoutedEventArgs e)
-        {
-            SendSettingsToDriver();
-            SetStatus("Settings applied!");
-        }
-
-
-        //
-        // Main Menu Click
-        //
-        private void MainMenuClick(object sender, RoutedEventArgs e)
-        {
-
-            // Import
-            if (sender == mainMenuImport)
-            {
-                OpenFileDialog dialog = new OpenFileDialog
-                {
-                    InitialDirectory = Directory.GetCurrentDirectory(),
-                    Filter = "XML File|*.xml"
-                };
-                if (dialog.ShowDialog() == true)
-                {
-                    try
-                    {
-                        Configuration tmpConfig = Configuration.CreateFromFile(dialog.FileName);
-                        config = tmpConfig;
-                        LoadSettingsFromConfiguration();
-                        SetStatus("Settings imported!");
-                    }
-                    catch (Exception)
-                    {
-                        MessageBox.Show("Settings import failed!", "ERROR!",
-                            MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
-                }
-            }
-
-            // Export
-            else if (sender == mainMenuExport)
-            {
-                SaveFileDialog dialog = new SaveFileDialog
-                {
-                    InitialDirectory = Directory.GetCurrentDirectory(),
-                    AddExtension = true,
-                    DefaultExt = "xml",
-                    Filter = "XML File|*.xml"
-
-                };
-                if (dialog.ShowDialog() == true)
-                {
-                    try
-                    {
-                        UpdateSettingsToConfiguration();
-                        config.Write(dialog.FileName);
-                        SetStatus("Settings exported!");
-                    }
-                    catch (Exception)
-                    {
-                        MessageBox.Show("Settings export failed!", "ERROR!",
-                            MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
-                }
-
-            }
-
-            // Exit
-            else if (sender == mainMenuExit)
-            {
-                Close();
-            }
-
-        }
-
-        #endregion
-
-
-
-        #region Statusbar
-
-        //
-        // Update statusbar
-        //
-        private void SetStatus(string text)
-        {
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                textStatus.Text = text;
-            });
-            timerStatusbar.Stop();
-            timerStatusbar.Start();
-        }
-
-        //
-        // Update statusbar
-        //
-        private void SetStatusWarning(string text)
-        {
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                textStatusWarning.Text = text;
-            });
-            timerStatusbar.Stop();
-            timerStatusbar.Start();
-        }
-
-
-        //
-        // Statusbar warning text click
-        //
-        private void StatusWarning_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            // Open Task Manager 
-            if (textStatusWarning.Text.ToLower().Contains("priority"))
-            {
-                try { Process.Start("taskmgr.exe"); } catch (Exception) { }
-            }
-        }
-
-
-        //
-        // Statusbar timer tick
-        //
-        private void TimerStatusbar_Tick(object sender, EventArgs e)
-        {
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                textStatus.Text = "";
-                textStatusWarning.Text = "";
-            });
-            timerStatusbar.Stop();
-        }
-
-        #endregion
-
-
-
-        #region Tablet Driver
-
-        //
-        // Driver event handlers
-        //
-        //
-        // Message
-        private void OnDriverMessageReceived(object sender, TabletDriver.DriverEventArgs e)
-        {
-            //ConsoleAddText(e.Message);
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                ParseDriverStatus(e.Message);
-            });
-        }
-        // Error
-        private void OnDriverErrorReceived(object sender, TabletDriver.DriverEventArgs e)
-        {
-            SetStatusWarning(e.Message);
-
-        }
-        // Started
-        private void OnDriverStarted(object sender, EventArgs e)
-        {
-            driver.SendCommand("HIDList");
-            driver.SendCommand("Echo");
-            driver.SendCommand("Echo   Driver version: " + Version);
-            try { driver.SendCommand("echo   Windows version: " + Environment.OSVersion.VersionString); } catch (Exception) { }
-            try
-            {
-                driver.SendCommand("Echo   Windows product: " +
-                    Microsoft.Win32.Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "ProductName", "").ToString());
-                driver.SendCommand("Echo   Windows release: " +
-                    Microsoft.Win32.Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion", "ReleaseId", "").ToString());
-            }
-            catch (Exception)
-            {
-            }
-            driver.SendCommand("Echo");
-            driver.SendCommand("CheckTablet");
-            SendSettingsToDriver();
-            driver.SendCommand("Info");
-            driver.SendCommand("Start");
-            driver.SendCommand("Log Off");
-            driver.SendCommand("LogDirect False");
-            driver.SendCommand("Echo");
-            driver.SendCommand("Echo Driver started!");
-        }
-        // Stopped
-        private void OnDriverStopped(object sender, EventArgs e)
-        {
-            if (running)
-            {
-                SetStatus("Driver stopped. Restarting! Check console !!!");
-                driver.ConsoleAddText("Driver stopped. Restarting!");
-
-                // Run in the main application thread
-                Application.Current.Dispatcher.Invoke(() =>
-                {
-                    Title = "TabletDriverGUI";
-                    notifyIcon.Text = "";
-                    driver.Stop();
-                    timerRestart.Start();
-                });
-
-            }
-        }
-        // Driver restart timer
-        private void TimerRestart_Tick(object sender, EventArgs e)
-        {
-            if (running)
-            {
-                driver.Start(config.DriverPath, config.DriverArguments);
-            }
-            timerRestart.Stop();
-        }
-
-
-
-        //
-        // Parse driver status messages
-        //
-        private void ParseDriverStatus(string line)
-        {
-            // Status line?
-            if (!line.Contains("[STATUS]")) return;
-
-            // Parse status variable and value
-            Match match = Regex.Match(line, "^.+\\[STATUS\\] ([^ ]+) (.*?)$");
-            if (!match.Success) return;
-
-            string variableName = match.Groups[1].ToString().ToLower();
-            string stringValue = match.Groups[2].ToString();
-
-            //
-            // Tablet Name
-            //
-            if (variableName == "tablet")
-            {
-                string title = "TabletDriverGUI - " + stringValue;
-                Title = title;
-
-                // Limit notify icon text length
-                if (title.Length > 63)
-                {
-                    notifyIcon.Text = title.Substring(0, 63);
-                }
-                else
-                {
-                    notifyIcon.Text = title;
-                }
-                SetStatus("Connected to " + stringValue);
-            }
-
-            //
-            // Tablet width
-            //
-            if (variableName == "width")
-            {
-                if (Utils.ParseNumber(stringValue, out double val))
-                {
-                    config.TabletFullArea.Width = val;
-                    config.TabletFullArea.X = val / 2.0;
-                    LoadSettingsFromConfiguration();
-                    UpdateSettingsToConfiguration();
-                    if (isFirstStart)
-                        SendSettingsToDriver();
-                }
-            }
-
-            //
-            // Tablet height
-            //
-            if (variableName == "height")
-            {
-                if (Utils.ParseNumber(stringValue, out double val))
-                {
-                    config.TabletFullArea.Height = val;
-                    config.TabletFullArea.Y = val / 2.0;
-                    LoadSettingsFromConfiguration();
-                    UpdateSettingsToConfiguration();
-                    if (isFirstStart)
-                        SendSettingsToDriver();
-
-                }
-            }
-
-
-            //
-            // Tablet measurement to tablet area
-            //
-            if (variableName == "measurement" && isEnabledMeasurementToArea)
-            {
-                string[] stringValues = stringValue.Split(' ');
-                int valueCount = stringValues.Count();
-                if (valueCount >= 4)
-                {
-                    double minimumX = 10000;
-                    double minimumY = 10000;
-                    double maximumX = -10000;
-                    double maximumY = -10000;
-                    for (int i = 0; i < valueCount; i += 2)
-                    {
-                        if (
-                            Utils.ParseNumber(stringValues[i], out double x)
-                            &&
-                            Utils.ParseNumber(stringValues[i + 1], out double y)
-                        )
-                        {
-                            // Find limits
-                            if (x > maximumX) maximumX = x;
-                            if (x < minimumX) minimumX = x;
-                            if (y > maximumY) maximumY = y;
-                            if (y < minimumY) minimumY = y;
-                        }
-                    }
-                    double areaWidth = maximumX - minimumX;
-                    double areaHeight = maximumY - minimumY;
-                    double centerX = minimumX + areaWidth / 2.0;
-                    double centerY = minimumY + areaHeight / 2.0;
-                    //MessageBox.Show("Area: " + areaWidth + " x " + areaHeight + " @ " + centerX + ", " + centerY);
-                    config.TabletArea.Width = areaWidth;
-                    config.TabletArea.Height = areaHeight;
-                    config.TabletArea.X = centerX;
-                    config.TabletArea.Y = centerY;
-                    LoadSettingsFromConfiguration();
-                    UpdateSettingsToConfiguration();
-
-
-                }
-                isEnabledMeasurementToArea = false;
-                buttonDrawArea.IsEnabled = true;
-                SetStatus("");
-            }
-        }
-
-        //
-        // Send settings to the driver
-        //
-        private void SendSettingsToDriver()
-        {
-            if (!driver.IsRunning) return;
-
-            // Commands before settings
-            if (config.CommandsBefore.Length > 0)
-            {
-                foreach (string command in config.CommandsBefore)
-                {
-                    string tmp = command.Trim();
-                    if (tmp.Length > 0)
-                    {
-                        driver.SendCommand(tmp);
-                    }
-                }
-            }
-
-
-            // Desktop size
-            driver.SendCommand("DesktopSize " + textDesktopWidth.Text + " " + textDesktopHeight.Text);
-
-
-            // Screen area
-            driver.SendCommand("ScreenArea " +
-                Utils.GetNumberString(config.ScreenArea.Width) + " " + Utils.GetNumberString(config.ScreenArea.Height) + " " +
-                Utils.GetNumberString(config.ScreenArea.X) + " " + Utils.GetNumberString(config.ScreenArea.Y)
-            );
-
-
-            //
-            // Tablet area
-            //
-            // Inverted
-            if (config.Invert)
-            {
-                driver.SendCommand("TabletArea " +
-                    Utils.GetNumberString(config.TabletArea.Width) + " " +
-                    Utils.GetNumberString(config.TabletArea.Height) + " " +
-                    Utils.GetNumberString(config.TabletFullArea.Width - config.TabletArea.X) + " " +
-                    Utils.GetNumberString(config.TabletFullArea.Height - config.TabletArea.Y)
-                );
-                driver.SendCommand("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation + 180));
-            }
-            // Normal
-            else
-            {
-                driver.SendCommand("TabletArea " +
-                    Utils.GetNumberString(config.TabletArea.Width) + " " +
-                    Utils.GetNumberString(config.TabletArea.Height) + " " +
-                    Utils.GetNumberString(config.TabletArea.X) + " " +
-                    Utils.GetNumberString(config.TabletArea.Y)
-                );
-                driver.SendCommand("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation));
-            }
-
-
-            // Output Mode
-            switch (config.OutputMode)
-            {
-                case Configuration.OutputModes.Absolute:
-                    driver.SendCommand("Mode Absolute");
-                    break;
-                case Configuration.OutputModes.Relative:
-                    driver.SendCommand("Mode Relative");
-                    driver.SendCommand("Sensitivity " + Utils.GetNumberString(config.ScreenArea.Width / config.TabletArea.Width));
-                    break;
-                case Configuration.OutputModes.Digitizer:
-                    driver.SendCommand("Mode Digitizer");
-                    break;
-            }
-
-
-            // Button map
-            if (config.DisableButtons)
-            {
-                driver.SendCommand("ButtonMap 0 0 0");
-            }
-            else
-            {
-                driver.SendCommand("ButtonMap " + String.Join(" ", config.ButtonMap));
-            }
-
-            // Smoothing filter
-            if (config.SmoothingEnabled)
-            {
-                driver.SendCommand("FilterTimerInterval " + Utils.GetNumberString(config.SmoothingInterval));
-                driver.SendCommand("Smoothing " + Utils.GetNumberString(config.SmoothingLatency));
-            }
-            else
-            {
-                driver.SendCommand("Smoothing 0");
-            }
-
-            // Noise filter
-            if (config.NoiseFilterEnabled)
-            {
-                driver.SendCommand("Noise " + Utils.GetNumberString(config.NoiseFilterBuffer) + " " + Utils.GetNumberString(config.NoiseFilterThreshold));
-            }
-            else
-            {
-                driver.SendCommand("Noise 0");
-            }
-
-
-            // Anti-smoothing filter
-            if (config.AntiSmoothingEnabled)
-            {
-                driver.SendCommand("AntiSmoothing " + Utils.GetNumberString(config.AntiSmoothingShape) + " " +
-                    Utils.GetNumberString(config.AntiSmoothingCompensation) + " " +
-                    (config.AntiSmoothingIgnoreWhenDragging ? "true" : "false"));
-            }
-            else
-            {
-                driver.SendCommand("AntiSmoothing 0");
-            }
-
-            // Commands after settings
-            if (config.CommandsAfter.Length > 0)
-            {
-                foreach (string command in config.CommandsAfter)
-                {
-                    string tmp = command.Trim();
-                    if (tmp.Length > 0)
-                    {
-                        driver.SendCommand(tmp);
-                    }
-                }
-            }
-        }
-
-        //
-        // Start driver
-        //
-        void Start()
-        {
-            if (running) return;
-
-            // Try to start the driver
-            try
-            {
-                running = true;
-
-                // Console timer
-                timerConsoleUpdate.Start();
-
-                driver.Start(config.DriverPath, config.DriverArguments);
-                if (!driver.IsRunning)
-                {
-                    SetStatus("Can't start the driver! Check the console!");
-                    driver.ConsoleAddText("ERROR! Can't start the driver!");
-                }
-            }
-
-            // Start failed
-            catch (Exception e)
-            {
-                SetStatus("Can't start the driver! Check the console!");
-                driver.ConsoleAddText("ERROR! Can't start the driver!\n  " + e.Message);
-            }
-        }
-
-
-        //
-        // Stop driver
-        //
-        void Stop()
-        {
-            if (!running) return;
-            running = false;
-            driver.Stop();
-            timerConsoleUpdate.Stop();
-        }
-
-        //
-        // Restart Driver button click
-        //
-        private void RestartDriverClick(object sender, RoutedEventArgs e)
-        {
-            if (running)
-            {
-                Stop();
-            }
-            Start();
-        }
-
-        #endregion
-
-
-
-        #region Console stuff
-
-        //
-        // Console buffer to text
-        //
-        private void ConsoleBufferToText()
-        {
-            StringBuilder stringBuilder = new StringBuilder();
-
-            // Lock console
-            driver.ConsoleLock();
-
-            // Get console status
-            if (!driver.HasConsoleUpdated)
-            {
-                driver.ConsoleUnlock();
-                return;
-            }
-            driver.HasConsoleUpdated = false;
-
-            // Create a string from buffer
-            foreach (string line in driver.ConsoleBuffer)
-            {
-                stringBuilder.Append(line);
-                stringBuilder.Append("\r\n");
-            }
-
-            // Unlock console
-            driver.ConsoleUnlock();
-
-            // Set output
-            textConsole.Text = stringBuilder.ToString();
-
-            // Scroll to end
-            scrollConsole.ScrollToEnd();
-
-        }
-
-        // Console update timer tick
-        private void TimerConsoleUpdate_Tick(object sender, EventArgs e)
-        {
-            ConsoleBufferToText();
-        }
-
-
-        //
-        // Send a command to driver
-        //
-        private void ConsoleSendCommand(string line)
-        {
-            if (commandHistory.Last<string>() != line)
-            {
-                commandHistory.Add(line);
-            }
-            commandHistoryIndex = commandHistory.Count();
-            textConsoleInput.Text = "";
-            textConsoleInput.ScrollToEnd();
-            try
-            {
-                driver.SendCommand(line);
-            }
-            catch (Exception e)
-            {
-                driver.ConsoleAddText("Error! " + e.Message);
-            }
-        }
-
-        //
-        // Console input key down
-        //
-        private void TextConsoleInput_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.Enter)
-            {
-                string line = textConsoleInput.Text;
-                ConsoleSendCommand(line);
-            }
-        }
-
-        //
-        // Console input preview key down
-        //
-        private void TextConsoleInput_PreviewKeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.Up)
-            {
-                commandHistoryIndex--;
-                if (commandHistoryIndex < 0) commandHistoryIndex = 0;
-                textConsoleInput.Text = commandHistory[commandHistoryIndex];
-                textConsoleInput.CaretIndex = textConsoleInput.Text.Length;
-            }
-            if (e.Key == Key.Down)
-            {
-                commandHistoryIndex++;
-                if (commandHistoryIndex > commandHistory.Count() - 1)
-                {
-                    commandHistoryIndex = commandHistory.Count();
-                    textConsoleInput.Text = "";
-                }
-                else
-                {
-                    textConsoleInput.Text = commandHistory[commandHistoryIndex];
-                    textConsoleInput.CaretIndex = textConsoleInput.Text.Length;
-                }
-            }
-        }
-
-
-        //
-        // Search rows
-        //
-        private List<string> SearchRows(List<string> rows, string search, int rowsBefore, int rowsAfter)
-        {
-            List<string> buffer = new List<string>(rowsBefore);
-            List<string> output = new List<string>();
-            int rowCounter = 0;
-
-            foreach (string row in rows)
-            {
-                if (row.Contains(search))
-                {
-                    if (buffer.Count > 0)
-                    {
-                        foreach (string bufferLine in buffer)
-                        {
-                            output.Add(bufferLine);
-                        }
-                        buffer.Clear();
-                    }
-                    output.Add(row.Trim());
-                    rowCounter = rowsAfter;
-                }
-                else if (rowCounter > 0)
-                {
-                    output.Add(row.Trim());
-                    rowCounter--;
-                }
-                else
-                {
-                    buffer.Add(row);
-                    if (buffer.Count > rowsBefore)
-                    {
-                        buffer.RemoveAt(0);
-                    }
-                }
-            }
-            return output;
-        }
-
-
-        //
-        // Console output context menu
-        //
-        private void ConsoleMenuClick(object sender, RoutedEventArgs e)
-        {
-
-
-            // Copy all
-            if (sender == menuCopyAll)
-            {
-                Clipboard.SetText(textConsole.Text);
-                SetStatus("Console output copied to clipboard");
-            }
-
-            // Copy debug messages
-            else if (sender == menuCopyDebug)
-            {
-                string clipboard = "";
-                List<string> rows;
-                driver.ConsoleLock();
-                rows = SearchRows(driver.ConsoleBuffer, "[DEBUG]", 0, 0);
-                driver.ConsoleUnlock();
-                foreach (string row in rows)
-                    clipboard += row + "\r\n";
-                Clipboard.SetText(clipboard);
-                SetStatus("Debug message copied to clipboard");
-            }
-
-            // Copy error messages
-            else if (sender == menuCopyErrors)
-            {
-                string clipboard = "";
-                List<string> rows;
-                driver.ConsoleLock();
-                rows = SearchRows(driver.ConsoleBuffer, "[ERROR]", 1, 1);
-                driver.ConsoleUnlock();
-                foreach (string row in rows)
-                    clipboard += row + "\r\n";
-                Clipboard.SetText(clipboard);
-                SetStatus("Error message copied to clipboard");
-            }
-
-            // Start debug log
-            else if (sender == menuStartDebug)
-            {
-                string logFilename = "debug_" + DateTime.Now.ToString("yyyy-MM-dd_HH_mm_ss") + ".txt";
-                ConsoleSendCommand("log " + logFilename);
-                ConsoleSendCommand("debug 1");
-            }
-
-            // Stop debug log
-            else if (sender == menuStopDebug)
-            {
-                ConsoleSendCommand("log off");
-                ConsoleSendCommand("debug 0");
-            }
-
-            // Open latest debug log
-            else if (sender == menuOpenDebug)
-            {
-                try
-                {
-                    var files = Directory.GetFiles(".", "debug_*.txt").OrderBy(a => File.GetCreationTime(a));
-                    if (files.Count() > 0)
-                    {
-                        string file = files.Last().ToString();
-                        Process.Start(file);
-                    }
-                }
-                catch (Exception)
-                {
-                }
-            }
-
-            // Run benchmark
-            else if (sender == menuRunBenchmark)
-            {
-                ConsoleSendCommand("Benchmark");
-            }
-
-            // Copy Benchmark
-            else if (sender == menuCopyBenchmark)
-            {
-                string clipboard = "";
-                List<string> rows;
-                driver.ConsoleLock();
-                rows = SearchRows(driver.ConsoleBuffer, " [STATUS] BENCHMARK ", 0, 0);
-                driver.ConsoleUnlock();
-                foreach (string row in rows)
-                {
-                    Match m = Regex.Match(row, " BENCHMARK ([0-9\\.]+) ([0-9\\.]+) ([0-9\\.]+) (.*)$");
-                    if (m.Success)
-                    {
-                        string tabletName = m.Groups[4].ToString();
-                        string totalReports = m.Groups[1].ToString();
-                        string noiseWidth = m.Groups[2].ToString();
-                        string noiseHeight = m.Groups[3].ToString();
-                        clipboard =
-                            "Tablet(" + tabletName + ") " +
-                            "Noise(" + noiseWidth + " mm x " + noiseHeight + " mm) " +
-                            "Reports(" + totalReports + ")\r\n";
-                    }
-                }
-
-                if (clipboard.Length > 0)
-                {
-                    Clipboard.SetText(clipboard);
-                    SetStatus("Benchmark result copied to clipboard");
-                }
-            }
-
-
-            // Measure 2 points
-            else if (sender == menuMeasure2)
-            {
-                ConsoleSendCommand("Measure 2");
-            }
-
-            // Measure 3 points
-            else if (sender == menuMeasure3)
-            {
-                ConsoleSendCommand("Measure 3");
-            }
-
-            // Measure 4 points
-            else if (sender == menuMeasure4)
-            {
-                ConsoleSendCommand("Measure 4");
-            }
-
-
-            // Open startup log
-            else if (sender == menuOpenStartup)
-            {
-                if (File.Exists("startuplog.txt"))
-                {
-                    try { Process.Start("startuplog.txt"); } catch (Exception) { }
-                }
-                else
-                {
-                    MessageBox.Show(
-                        "Startup log not found!\n" +
-                        "Make sure that it is possible to create and edit files in the '" + Directory.GetCurrentDirectory() + "' directory.\n",
-                        "Error!", MessageBoxButton.OK, MessageBoxImage.Error
-                    );
-                }
-            }
-
-            // Open driver folder
-            else if (sender == menuOpenFolder)
-            {
-                try { Process.Start("."); } catch (Exception) { }
-            }
-
-            // Open GitHub page
-            else if (sender == menuOpenGithub)
-            {
-                try { Process.Start("https://github.com/hawku/TabletDriver"); } catch (Exception) { }
-            }
-
-            // Open Latest URL
-            else if (sender == menuOpenLatestURL)
-            {
-                Regex regex = new Regex("(http[s]?://.+?)($|\\s)", RegexOptions.IgnoreCase | RegexOptions.Multiline);
-                MatchCollection matches = regex.Matches(textConsole.Text);
-                if (matches.Count > 0)
-                {
-                    string url = matches[matches.Count - 1].Groups[0].ToString().Trim();
-                    try { Process.Start(url); } catch (Exception) { }
-                }
-            }
-
-            // Report a problem
-            else if (sender == menuReportProblem)
-            {
-                try { Process.Start("https://github.com/hawku/TabletDriver/wiki/FAQ"); } catch (Exception) { }
-            }
-
-
-        }
-
-
-
-        #endregion
-
-
-
-        #region Wacom / Draw area
-
-        //
-        // Wacom Area
-        //
-        private void ButtonWacomArea_Click(object sender, RoutedEventArgs e)
-        {
-            WacomArea wacom = new WacomArea();
-            wacom.textWacomLeft.Text = Utils.GetNumberString((config.TabletArea.X - config.TabletArea.Width / 2) * 100.0, "0");
-            wacom.textWacomRight.Text = Utils.GetNumberString((config.TabletArea.X + config.TabletArea.Width / 2) * 100.0, "0");
-
-            wacom.textWacomTop.Text = Utils.GetNumberString((config.TabletArea.Y - config.TabletArea.Height / 2) * 100.0, "0");
-            wacom.textWacomBottom.Text = Utils.GetNumberString((config.TabletArea.Y + config.TabletArea.Height / 2) * 100.0, "0");
-
-            wacom.ShowDialog();
-
-            // Set button clicked
-            if (wacom.DialogResult == true)
-            {
-                if (
-                    Utils.ParseNumber(wacom.textWacomLeft.Text, out double left) &&
-                    Utils.ParseNumber(wacom.textWacomRight.Text, out double right) &&
-                    Utils.ParseNumber(wacom.textWacomTop.Text, out double top) &&
-                    Utils.ParseNumber(wacom.textWacomBottom.Text, out double bottom)
-                )
-                {
-                    double width, height;
-                    width = right - left;
-                    height = bottom - top;
-                    config.ForceAspectRatio = false;
-                    config.ForceFullArea = false;
-                    config.TabletArea.X = (left + width / 2.0) / 100.0;
-                    config.TabletArea.Y = (top + height / 2.0) / 100.0;
-                    config.TabletArea.Width = width / 100.0;
-                    config.TabletArea.Height = height / 100.0;
-                    LoadSettingsFromConfiguration();
-                }
-                else
-                {
-                    MessageBox.Show("Invalid values!", "Wacom area error!", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            }
-
-            wacom.Close();
-        }
-
-
-        //
-        // Draw area
-        //
-        private void ButtonDrawArea_Click(object sender, RoutedEventArgs e)
-        {
-            if (!isEnabledMeasurementToArea)
-            {
-                isEnabledMeasurementToArea = true;
-                driver.SendCommand("Measure 2");
-                SetStatus("Click the top left and the bottom right corners of the area with your tablet pen!");
-                buttonDrawArea.IsEnabled = false;
-            }
-        }
-
-        #endregion
-
-
-
-        #region WndProc
-
-        //
-        // Add WndProc hook
-        //
-        protected override void OnSourceInitialized(EventArgs e)
-        {
-            base.OnSourceInitialized(e);
-            HwndSource source = PresentationSource.FromVisual(this) as HwndSource;
-            source.AddHook(WndProc);
-        }
-
-        //
-        // Process Windows messages
-        //
-        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-
-            // Show TabletDriverGUI
-            if (msg == NativeMethods.WM_SHOWTABLETDRIVERGUI)
-            {
-                if (WindowState == WindowState.Minimized)
+                if (WindowState == WindowState.Minimized)
                 {
                     NotifyShowWindow(null, null);
                 }
@@ -2363,6 +555,8 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
 
 
 
+
+
         #endregion
 
 
diff --git a/TabletDriverGUI/TabletDriver.cs b/TabletDriverGUI/TabletDriver.cs
index eec13cc..9a0b84d 100644
--- a/TabletDriverGUI/TabletDriver.cs
+++ b/TabletDriverGUI/TabletDriver.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Text.RegularExpressions;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -12,29 +13,35 @@ public class TabletDriver
         public delegate void DriverEventHandler(object sender, DriverEventArgs e);
         public event DriverEventHandler MessageReceived;
         public event DriverEventHandler ErrorReceived;
+        public event DriverEventHandler StatusReceived;
         public event EventHandler Started;
         public event EventHandler Stopped;
         public enum DriverEventType
         {
             Error,
-            Message
+            Message,
+            Status
         }
         public class DriverEventArgs : EventArgs
         {
             public DriverEventType Type;
             public string Message;
-            public DriverEventArgs(DriverEventType type, string message)
+            public string Parameters;
+            public DriverEventArgs(DriverEventType type, string message, string parameters)
             {
                 Type = type;
                 Message = message;
+                Parameters = parameters;
             }
         }
 
+
         // Console stuff
         public List<string> ConsoleBuffer;
         public bool HasConsoleUpdated;
         private readonly int ConsoleMaxLines;
         private System.Threading.Mutex mutexConsoleUpdate;
+        private Dictionary<String, String> commands;
 
         // Other variables
         private readonly string servicePath;
@@ -56,6 +63,9 @@ public TabletDriver(string servicePath)
             ConsoleMaxLines = 300;
             ConsoleBuffer = new List<string>(ConsoleMaxLines);
             mutexConsoleUpdate = new System.Threading.Mutex();
+
+            commands = new Dictionary<string, string>();
+
         }
 
         //
@@ -125,12 +135,135 @@ public void ConsoleUnlock()
         }
 
 
+        //
+        // Command name complete
+        //
+        public string CompleteCommandName(string inputText, bool showCommands)
+        {
+            List<string> commandsFound = new List<string>();
+            string result = inputText;
+
+            // Find commands
+            foreach (var item in commands)
+            {
+                if (item.Key.StartsWith(inputText.ToLower()))
+                {
+                    commandsFound.Add(item.Value);
+                }
+            }
+           
+
+            // Only one command found
+            if (commandsFound.Count == 1)
+            {
+                result = commandsFound[0];
+            }
+
+            // Multiple commands found
+            else if (commandsFound.Count > 1)
+            {
+
+                // Sort 
+                commandsFound.Sort();
+
+                // Create a string from found commands
+                string commandsString = "  | ";
+                int maxWidth = 1;
+                foreach (string command in commandsFound)
+                {
+                    if (command.Length > maxWidth)
+                    {
+                        maxWidth = command.Length;
+                    }
+                }
+                int columns = (int)Math.Ceiling(100.0 / maxWidth);
+                int rows = (int)Math.Ceiling((double)commandsFound.Count / columns);
+
+                string[,] commandMatrix = new string[rows,columns];
+                int row = 0;
+                int column = 0;
+
+                foreach (string command in commandsFound)
+                {
+                    if (rows == 1)
+                    {
+                        commandMatrix[row, column] = command + " | ";
+                    }
+                    else
+                    {
+                        commandMatrix[row, column] = command.PadRight(maxWidth) + " | ";
+                    }
+                    row++;
+                    if (row >= rows)
+                    {
+                        row = 0;
+                        column++;
+                        if (column >= columns) break;
+                    }
+                }
+
+                for(row = 0; row < rows; row++) {
+                    if(row != 0)
+                    commandsString += "\r\n  | ";
+                    for (column = 0; column < columns; column++)
+                    {
+                        string commandString = commandMatrix[row, column];
+                        if (commandString != null)
+                        {
+                            commandsString += commandString;
+                        }
+                    }
+                }
+
+                // Add commands to console output
+                if (showCommands)
+                {
+                    ConsoleAddText("");
+                    ConsoleAddText("Commands: ");
+                    ConsoleAddText(commandsString);
+                }
+
+                // Fill input text
+                string completedText = inputText;
+
+                // Loop through commands
+                foreach (string name in commandsFound)
+                {
+                    for (int i = 1; i <= name.Length; i++)
+                    {
+                        string completeTest = name.Substring(0, i);
+                        bool completeOK = true;
+
+                        // Check if the command complete is OK
+                        foreach (string name2 in commandsFound)
+                        {
+                            // Not OK
+                            if (!name2.ToLower().StartsWith(completeTest.ToLower()))
+                            {
+                                completeOK = false;
+                                break;
+                            }
+                        }
+                        if (completeOK)
+                        {
+                            completedText = completeTest;
+                        }
+                    }
+                }
+
+                result = completedText;
+            }
+
+            return result;
+        }
+
+
         //
         // Raise error message
         //
         private void RaiseError(string text)
         {
-            ErrorReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Error, text));
+            ErrorReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Error, text, ""));
         }
 
         //
@@ -155,7 +288,7 @@ private void ProcessService_Exited(object sender, EventArgs e)
         private void ProcessService_ErrorDataReceived(object sender, DataReceivedEventArgs e)
         {
             ConsoleAddText("ERROR! " + e.Data);
-            ErrorReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Error, e.Data));
+            ErrorReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Error, e.Data, ""));
         }
 
         //
@@ -170,8 +303,45 @@ private void ProcessService_OutputDataReceived(object sender, DataReceivedEventA
             }
             else
             {
+                string line = e.Data;
+
+                // Status line?
+                if (line.Contains("[STATUS]")) {
+
+                    // Parse status variable and value
+                    Match match = Regex.Match(line, "^.+\\[STATUS\\] ([^ ]+) (.*?)$");
+                    if (!match.Success) return;
+
+                    string variableName = match.Groups[1].ToString().ToLower();
+                    string parameters = match.Groups[2].ToString();
+
+                    //
+                    // Commands status message
+                    //
+                    if (variableName == "commands")
+                    {
+                        string[] commandNames = parameters.Split(' ');
+                        string lowerCaseName;
+                        foreach (string name in commandNames)
+                        {
+                            lowerCaseName = name.Trim().ToLower();
+                            if (lowerCaseName.Length > 0)
+                            {
+                                if (!commands.ContainsKey(lowerCaseName))
+                                {
+                                    commands.Add(lowerCaseName, name);
+                                }
+                            }
+                        }
+                    }
+
+                    StatusReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Status, variableName, parameters));
+
+                }
+
+
                 ConsoleAddText(e.Data);
-                MessageReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Message, e.Data));
+                MessageReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Message, e.Data, ""));
             }
         }
 
diff --git a/TabletDriverGUI/TabletDriverGUI.csproj b/TabletDriverGUI/TabletDriverGUI.csproj
index ed30a36..77e01f0 100644
--- a/TabletDriverGUI/TabletDriverGUI.csproj
+++ b/TabletDriverGUI/TabletDriverGUI.csproj
@@ -77,6 +77,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="MainWindow.Driver.cs" />
+    <Compile Include="MainWindow.Console.cs" />
+    <Compile Include="MainWindow.Settings.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="TabletDriver.cs" />
     <Compile Include="NativeMethods.cs" />
diff --git a/TabletDriverService/CommandHandler.Device.cpp b/TabletDriverService/CommandHandler.Device.cpp
new file mode 100644
index 0000000..f4f25c7
--- /dev/null
+++ b/TabletDriverService/CommandHandler.Device.cpp
@@ -0,0 +1,467 @@
+#include "stdafx.h"
+#include "CommandHandler.h"
+
+#define LOG_MODULE ""
+#include "Logger.h"
+
+//
+// Create HID/USB device commands
+//
+void CommandHandler::CreateDeviceCommands() {
+
+	//
+	// Command: USBTablet
+	//
+	AddHelp("USBTablet", "Usage: USBTablet \"<WinUSB GUID>\"");
+	AddHelp("USBTablet", "");
+	AddCommand(new Command("USBTablet", [&](CommandLine *cmd) {
+
+		// 
+		if(cmd->valueCount >= 1) {
+			string guid = cmd->GetString(0, "");
+			if(tablet == NULL) {
+				tablet = new Tablet(guid);
+				if(tablet->isOpen) {
+					LOG_INFO("WinUSB tablet found!\n");
+				}
+				else {
+					LOG_WARNING("Can't open WinUSB tablet '%s'\n", guid.c_str());
+					delete tablet;
+					tablet = NULL;
+				}
+			}
+		}
+
+		//
+		else {
+			if(tablet != NULL) {
+				if(tablet->usbDevice != NULL) {
+					USBDevice *usb = tablet->usbDevice;
+					LOG_INFO("USBTablet = \"%s\"\n",
+						usb->guid.c_str()
+					);
+				}
+			}
+			else {
+				LOG_INFO("Tablet is not defined.\n");
+			}
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: HIDTablet
+	//
+	AddHelp("HIDTablet", "Usage: HIDTablet <VendorId> <ProductId> <Usage Page> <Usage>");
+	AddHelp("HIDTablet", "");
+	AddCommand(new Command("HIDTablet", [&](CommandLine *cmd) {
+
+		//
+		if(cmd->valueCount >= 4) {
+			USHORT vendorID = cmd->GetInt(0, 0);
+			USHORT productID = cmd->GetInt(1, 0);
+			USHORT usagePage = cmd->GetInt(2, 0);
+			USHORT usage = cmd->GetInt(3, 0);
+			if(tablet == NULL) {
+				tablet = new Tablet(vendorID, productID, usagePage, usage);
+				if(tablet->isOpen) {
+					LOG_INFO("Tablet found!\n");
+				}
+				else {
+					LOG_WARNING("Can't open HID tablet 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
+					delete tablet;
+					tablet = NULL;
+				}
+			}
+		}
+
+		//
+		else {
+			if(tablet != NULL) {
+				if(tablet->hidDevice != NULL) {
+					HIDDevice *hid = tablet->hidDevice;
+					LOG_INFO("Tablet = HID(0x%04X 0x%04X 0x%04X 0x%04X)\n",
+						hid->vendorId,
+						hid->productId,
+						hid->usagePage,
+						hid->usage
+					);
+				}
+			}
+			else {
+				LOG_INFO("Tablet is not defined.\n");
+			}
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: CloseTablet
+	//
+	AddCommand(new Command("CloseTablet", [&](CommandLine *cmd) {
+		if(tablet != NULL) {
+			delete tablet;
+			tablet = NULL;
+			LOG_INFO("Tablet closed!\n");
+			return true;
+		}
+		else {
+			LOG_INFO("Tablet is not open!\n");
+			return false;
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: HIDAux
+	//
+	AddCommand(new Command("HIDAuxiliary", [&](CommandLine *cmd) {
+
+		if(cmd->valueCount == 4) {
+			USHORT vendorID = cmd->GetInt(0, 0);
+			USHORT productID = cmd->GetInt(1, 0);
+			USHORT usagePage = cmd->GetInt(2, 0);
+			USHORT usage = cmd->GetInt(3, 0);
+			if(tablet->hidDeviceAux == NULL) {
+				tablet->hidDeviceAux = new HIDDevice(vendorID, productID, usagePage, usage);
+				if(tablet->hidDeviceAux->isOpen) {
+					LOG_INFO("HID Device found!\n");
+					return true;
+				}
+				else {
+					LOG_ERROR("Can't open HID device 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
+					delete tablet->hidDeviceAux;
+					tablet->hidDeviceAux = NULL;
+				}
+			}
+		}
+
+		return false;
+	}));
+
+
+	//
+	// Command: HIDAuxRead
+	//
+	AddCommand(new Command("HIDAuxRead", [&](CommandLine *cmd) {
+
+		if(cmd->valueCount > 1 && tablet->hidDeviceAux != NULL) {
+			int length = cmd->GetInt(0, 1);
+			int count = cmd->GetInt(1, 1);
+			UCHAR buffer[1024];
+			for(int i = 0; i < count; i++) {
+				tablet->hidDeviceAux->Read(buffer, length);
+				LOG_INFOBUFFER(buffer, length, "Aux read(%d): ", i + 1);
+			}
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: HIDList
+	//
+	AddAlias("HIDAux", "HIDAuxiliary");
+	AddCommand(new Command("HIDList", [&](CommandLine *cmd) {
+		HANDLE hidHandle = 0;
+		HIDDevice *hid = new HIDDevice();
+		hid->debugEnabled = true;
+		hid->OpenDevice(&hidHandle, 1, 1, 1, 1);
+		if(hidHandle > 0) {
+			CloseHandle(hidHandle);
+		}
+		delete hid;
+
+		return true;
+	}));
+
+
+	//
+	// Command: SetFeature, Feature
+	//
+	// Sends HID feature report
+	//
+	AddAlias("Feature", "SetFeature");
+	AddCommand(new Command("SetFeature", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 1) return false;
+		if(tablet == NULL) return false;
+		if(tablet->hidDevice == NULL) return false;
+		int length = cmd->GetInt(0, 1);
+		BYTE *buffer = new BYTE[length];
+		for(int i = 0; i < length; i++) {
+			buffer[i] = cmd->GetInt(i + 1, 0);
+		}
+		LOG_INFOBUFFER(buffer, length, "Set Feature Report (%d): ", length);
+		tablet->hidDevice->SetFeature(buffer, length);
+		LOG_INFO("HID Feature set!\n");
+		delete buffer;
+		return true;
+	}));
+
+
+	//
+	// Command: GetFeature
+	//
+	// Requests a HID feature report from the device
+	//
+	AddCommand(new Command("GetFeature", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 1) return false;
+		if(tablet == NULL) return false;
+		if(tablet->hidDevice == NULL) return false;
+		int length = cmd->GetInt(0, 1);
+		BYTE *buffer = new BYTE[length];
+		for(int i = 0; i < length; i++) {
+			buffer[i] = cmd->GetInt(i + 1, 0);
+		}
+		LOG_INFOBUFFER(buffer, length, "Get Feature Report (%d): ", length);
+		tablet->hidDevice->GetFeature(buffer, length);
+		LOG_INFOBUFFER(buffer, length, "Result Feature Report (%d): ", length);
+		delete buffer;
+		return true;
+	}));
+
+
+	//
+	// Command: OutputReport, Report
+	//
+	// Sends HID output report
+	//
+	AddAlias("Report", "OutputReport");
+	AddCommand(new Command("OutputReport", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 1) return false;
+		if(tablet == NULL) return false;
+		if(tablet->hidDevice == NULL) return false;
+		int length = cmd->GetInt(0, 1);
+		BYTE *buffer = new BYTE[length];
+		for(int i = 0; i < length; i++) {
+			buffer[i] = cmd->GetInt(i + 1, 0);
+		}
+		LOG_INFOBUFFER(buffer, length, "Sending HID Report: ");
+		tablet->hidDevice->Write(buffer, length);
+		LOG_INFO("Report sent!\n");
+		delete buffer;
+		return true;
+	}));
+
+
+	//
+	// Command: HIDStringRequest, HIDString
+	//
+	// Request a string from HID device
+	//
+	AddAlias("HIDString", "HIDStringRequest");
+	AddCommand(new Command("HIDStringRequest", [&](CommandLine *cmd) {
+		UCHAR buffer[256];
+		int bytesRead;
+		string stringReply = "";
+
+		if(cmd->valueCount <= 0) return false;
+		if(tablet == NULL) return false;
+		if(tablet->hidDevice == NULL) return false;
+		if(tabletHandler->isRunning) {
+			LOG_ERROR("This command can only be run during the tablet configuration!\n");
+			return false;
+		}
+		int stringIdMin = cmd->GetInt(0, 0);
+		int stringIdMax = cmd->GetInt(1, stringIdMin);
+
+		// Limits
+		if(stringIdMin < 1) stringIdMin = 1;
+		else if(stringIdMin > 256) stringIdMin = 256;
+		if(stringIdMax < 1) stringIdMax = 1;
+		else if(stringIdMax > 256) stringIdMax = 256;
+
+		// Loop through string ids
+		for(int stringId = stringIdMin; stringId <= stringIdMax; stringId++) {
+
+			// String request USB control transter
+			bytesRead = tablet->hidDevice->StringRequest(stringId, buffer, 256);
+
+			if(bytesRead > 0) {
+				// Bytes to string
+				stringReply = "";
+				for(int i = 0; i < bytesRead; i += 2) {
+					stringReply.push_back(buffer[i]);
+				}
+				LOG_INFO("HIDString (id %d, %d bytes): '%s'\n", stringId, bytesRead, stringReply.c_str());
+			}
+			else {
+				LOG_INFO("HIDString (id %d, 0 bytes)\n", stringId);
+			}
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: USBWrite
+	//
+	// Writes to WinUSB device
+	//
+	AddCommand(new Command("USBWrite", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 1) return false;
+
+		if(tablet == NULL) return false;
+		if(tablet->usbDevice == NULL) return false;
+		int pipeId = cmd->GetInt(0, 0x80);
+		int length = cmd->valueCount - 1;
+		BYTE *buffer = new BYTE[length];
+		for(int i = 0; i < length; i++) {
+			buffer[i] = cmd->GetInt(i + 1, 0);
+		}
+		LOG_INFOBUFFER(buffer, length, "Write to USB: ");
+		int written = tablet->usbDevice->Write(pipeId, buffer, length);
+		LOG_INFO("  %d bytes written!\n", written);
+		delete buffer;
+		return true;
+	}));
+
+
+	//
+	// Command: USBStringRequest, USBString
+	//
+	// Request a string from a WinUSB device
+	//
+	AddAlias("USBString", "USBStringRequest");
+	AddCommand(new Command("USBStringRequest", [&](CommandLine *cmd) {
+		UCHAR buffer[256];
+		int bytesRead;
+		string stringReply = "";
+
+		if(cmd->valueCount <= 0) return false;
+		if(tablet == NULL) return false;
+		if(tablet->usbDevice == NULL) return false;
+		int stringIdMin = cmd->GetInt(0, 0);
+		int stringIdMax = cmd->GetInt(1, stringIdMin);
+
+		// Limits
+		if(stringIdMin < 1) stringIdMin = 1;
+		else if(stringIdMin > 256) stringIdMin = 256;
+		if(stringIdMax < 1) stringIdMax = 1;
+		else if(stringIdMax > 256) stringIdMax = 256;
+
+		// Loop through string ids
+		for(int stringId = stringIdMin; stringId <= stringIdMax; stringId++) {
+
+			// String request USB control transter
+			bytesRead = tablet->usbDevice->StringRequest(stringId, buffer, 256);
+
+			if(bytesRead > 0) {
+				// Bytes to string
+				stringReply = "";
+				for(int i = 0; i < bytesRead; i += 2) {
+					stringReply.push_back(buffer[i]);
+				}
+				LOG_INFO("USBString (id %d, %d bytes): '%s'\n", stringId, bytesRead, stringReply.c_str());
+			}
+			else {
+				LOG_INFO("USBString (id %d, 0 bytes)\n", stringId);
+			}
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: GetDeviceStrings, GetStrings
+	//
+	// Request strings from HID or WinUSB device
+	//
+	AddAlias("GetStrings", "GetDeviceStrings");
+	AddCommand(new Command("GetDeviceStrings", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 0) return false;
+		if(tablet == NULL) return false;
+
+		int stringIdMin = cmd->GetInt(0, 0);
+		int stringIdMax = cmd->GetInt(1, stringIdMin);
+
+		// Limits
+		if(stringIdMin < 1) stringIdMin = 1;
+		else if(stringIdMin > 256) stringIdMin = 256;
+		if(stringIdMax < 1) stringIdMax = 1;
+		else if(stringIdMax > 256) stringIdMax = 256;
+
+		// Min > Max
+		if(stringIdMin > stringIdMax) {
+			int tmp = stringIdMax;
+			stringIdMax = stringIdMin;
+			stringIdMin = tmp;
+		}
+
+		// Multiple ids
+		if(stringIdMin != stringIdMax) {
+			LOG_INFO("Requesting strings from ids %d - %d:\n", stringIdMin, stringIdMax);
+		}
+
+		// Single id
+		else {
+			LOG_INFO("Requesting strings id %d:\n", stringIdMin);
+		}
+
+		// Loop through string ids
+		for(int stringId = stringIdMin; stringId <= stringIdMax; stringId++) {
+			try {
+				string deviceString = tablet->GetDeviceString(stringId);
+				LOG_INFO("  String (%d) = '%s'\n", stringId, deviceString.c_str());
+			} catch(const exception &e) {
+				LOG_ERROR("%s\n", e.what());
+				break;
+			}
+
+		}
+
+		return true;
+
+	}));
+
+
+	//
+	// Command: CheckDeviceString, CheckString
+	//
+	// Check if a device string matches
+	//
+	AddAlias("CheckString", "CheckDeviceString");
+	AddCommand(new Command("CheckDeviceString", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 1) return false;
+		if(tablet == NULL) return false;
+
+		int stringId = cmd->GetInt(0, 0);
+		string matchString = cmd->GetString(1, "");
+
+		// Request and read device string 
+		string deviceString = tablet->GetDeviceString(stringId);
+
+		// Does the string match?
+		if(deviceString.size() >= matchString.size() && deviceString.compare(0, matchString.size(), matchString) == 0) {
+			LOG_INFO("Device string (id %d) '%s' matches with '%s'\n",
+				stringId,
+				deviceString.c_str(),
+				matchString.c_str()
+			);
+			return true;
+		}
+
+		// Does not match
+		else {
+			LOG_INFO("Device string (id %d) '%s' does not match with '%s'. Tablet invalid!\n",
+				stringId,
+				deviceString.c_str(),
+				matchString.c_str()
+			);
+			delete tablet;
+			tablet = NULL;
+			return false;
+		}
+		return true;
+
+	}));
+
+}
\ No newline at end of file
diff --git a/TabletDriverService/CommandHandler.Filters.cpp b/TabletDriverService/CommandHandler.Filters.cpp
new file mode 100644
index 0000000..b8f7f3c
--- /dev/null
+++ b/TabletDriverService/CommandHandler.Filters.cpp
@@ -0,0 +1,342 @@
+#include "stdafx.h"
+#include "CommandHandler.h"
+
+#define LOG_MODULE ""
+#include "Logger.h"
+
+//
+// Create filter commands
+//
+void CommandHandler::CreateFilterCommands() {
+
+	//
+	// Command: SmoothingFilter, Smoothing
+	//
+	// Sets smoothing filter parameters
+	//
+	AddAlias("Smoothing", "SmoothingFilter");
+	AddCommand(new Command("SmoothingFilter", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		double latency = cmd->GetDouble(0, tablet->smoothing.GetLatency());
+		double threshold = cmd->GetDouble(1, tablet->smoothing.threshold * 100);
+
+		threshold /= 100;
+
+		string stringValue = cmd->GetStringLower(0, "");
+
+		// Off / False
+		if(stringValue == "off" || stringValue == "false") {
+			latency = 0;
+		}
+
+		// Limits
+		if(latency < 0) latency = 1;
+		if(latency > 1000) latency = 1000;
+		if(threshold < 0.1) threshold = 0.1;
+		if(threshold > 0.99) threshold = 0.99;
+
+		// Set threshold
+		tablet->smoothing.threshold = threshold;
+
+		// Set smoothing filter latency
+		tablet->smoothing.SetLatency(latency);
+
+		// Print output
+		if(tablet->smoothing.weight < 1.0) {
+			tablet->smoothing.isEnabled = true;
+			LOG_INFO("Smoothing = %0.2f ms to reach %0.0f%% (weight = %f)\n", latency, tablet->smoothing.threshold * 100, tablet->smoothing.weight);
+		}
+		else {
+			tablet->smoothing.isEnabled = false;
+			LOG_INFO("Smoothing = off\n");
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: GravityFilter, Gravity
+	//
+	// Sets gravity filter parameters
+	//
+	AddAlias("Gravity", "GravityFilter");
+	AddCommand(new Command("GravityFilter", [&](CommandLine *cmd) {
+
+		if(!ExecuteCommand("TabletValid")) return false;
+		double gravity = cmd->GetDouble(0, tablet->gravityFilter.gravity);
+		double friction = cmd->GetDouble(1, 0);
+		double pressureGravity = cmd->GetDouble(2, 0);
+		double pressureFriction = cmd->GetDouble(3, 0);
+
+
+		// Limits
+		if(gravity < 0) gravity = 0.0;
+		if(gravity > 100) gravity = 100;
+		if(friction < 0.1) friction = 0.1;
+		if(friction > 1000) friction = 1000;
+
+		if(gravity > 0.1) {
+			tablet->gravityFilter.isEnabled = true;
+			tablet->gravityFilter.gravity = gravity;
+			tablet->gravityFilter.friction = friction;
+			tablet->gravityFilter.pressureGravity = pressureGravity;
+			tablet->gravityFilter.pressureFriction = pressureFriction;
+		}
+		else {
+			tablet->gravityFilter.isEnabled = false;
+			tablet->gravityFilter.gravity = 0;
+			tablet->gravityFilter.friction = 0;
+			tablet->gravityFilter.pressureGravity = 0;
+			tablet->gravityFilter.pressureFriction = 0;
+
+		}
+
+		LOG_INFO("Gravity = %s (%0.2f gravity, %0.2f friction, %0.2f pressure gravity, %0.2f pressure friction)\n",
+			tablet->gravityFilter.isEnabled ? "True" : "False",
+			tablet->gravityFilter.gravity,
+			tablet->gravityFilter.friction,
+			tablet->gravityFilter.pressureGravity,
+			tablet->gravityFilter.pressureFriction
+		);
+		return true;
+	}));
+
+
+	//
+	// Command: NoiseReduction, Noise
+	//
+	// Sets noise reduction filter parameters
+	//
+	AddAlias("Noise", "NoiseReduction");
+	AddCommand(new Command("NoiseReduction", [&](CommandLine *cmd) {
+
+		string stringValue = cmd->GetStringLower(0, "");
+
+		// Off / False
+		if(stringValue == "off" || stringValue == "false") {
+			tablet->noiseFilter.isEnabled = false;
+			LOG_INFO("Noise Reduction = off\n");
+
+			// Enable
+		}
+		else {
+
+			// Position buffer length
+			int length = cmd->GetInt(0, tablet->noiseFilter.buffer.length);
+
+			// Threshold where the noise filter starts to reduce the amount of filtering.
+			double distanceThreshold = cmd->GetDouble(1, tablet->noiseFilter.distanceThreshold);
+
+			// Distance where the amount of filtering will be zero. Default maximum is 2 times the threshold.
+			double distanceMaximum = cmd->GetDouble(2, distanceThreshold * 2.0);
+
+			// Geometric median calculation iteration count
+			int iterations = cmd->GetInt(3, tablet->noiseFilter.iterations);
+
+			// Limits
+			if(length < 0) length = 0;
+			else if(length > 50) length = 50;
+
+			if(distanceThreshold < 0.0) distanceThreshold = 0.0;
+			else if(distanceThreshold > 1000) distanceThreshold = 1000;
+
+			if(distanceMaximum < 0.1) distanceMaximum = 0.1;
+			else if(distanceMaximum > 1000) distanceMaximum = 1000;
+
+			if(distanceThreshold > distanceMaximum) distanceThreshold = distanceMaximum;
+
+			if(iterations < 1) iterations = 1;
+			else if(iterations > 100) iterations = 100;
+
+			// Set noise filter values
+			tablet->noiseFilter.buffer.SetLength(length);
+			tablet->noiseFilter.distanceThreshold = distanceThreshold;
+			tablet->noiseFilter.distanceMaximum = distanceMaximum;
+			tablet->noiseFilter.iterations = iterations;
+
+			// Enable filter
+			if(tablet->noiseFilter.buffer.length > 0) {
+				tablet->noiseFilter.isEnabled = true;
+				LOG_INFO("Noise Reduction = [\n");
+				LOG_INFO("  %d samples\n", length);
+				LOG_INFO("  %0.2f mm threshold (Wacom %0.2f mm/s)\n", distanceThreshold, distanceThreshold * 133.0);
+				LOG_INFO("  %0.2f mm maximum (Wacom %0.2f mm/s)\n", distanceMaximum, distanceMaximum * 133.0);
+				LOG_INFO("  %d iterations\n", iterations);
+				LOG_INFO("]\n");
+			}
+			else {
+				tablet->noiseFilter.isEnabled = false;
+				LOG_INFO("Noise Reduction = off\n");
+			}
+
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: AntiSmoothingFilter, AntiSmoothing, Anti
+	//
+	// Sets anti-smoothing filter parameters
+	//
+	AddAlias("AntiSmoothing", "AntiSmoothingFilter");
+	AddAlias("Anti", "AntiSmoothingFilter");
+	AddCommand(new Command("AntiSmoothingFilter", [&](CommandLine *cmd) {
+
+		string stringValue = cmd->GetStringLower(0, "");
+
+		// Off / False
+		if(stringValue == "off" || stringValue == "false") {
+			tablet->antiSmoothing.isEnabled = false;
+			LOG_INFO("Anti-smoothing = off\n");
+
+			// Enable
+		}
+		else {
+
+			double shape = cmd->GetDouble(0, 1.0);
+			double compensation = cmd->GetDouble(1, 1.0);
+			bool ignoreWhenDragging = cmd->GetBoolean(2, false);
+
+			if(shape <= 0) {
+				tablet->antiSmoothing.isEnabled = false;
+				LOG_INFO("Anti-smoothing = off\n");
+			}
+			else {
+				tablet->antiSmoothing.shape = shape;
+				tablet->antiSmoothing.compensation = compensation;
+				tablet->antiSmoothing.ignoreWhenDragging = ignoreWhenDragging;
+				tablet->antiSmoothing.isEnabled = true;
+				LOG_INFO("Anti-smoothing = Shape:%0.2f Compensation:%0.2f DragIgnore:%s\n",
+					tablet->antiSmoothing.shape,
+					tablet->antiSmoothing.compensation,
+					tablet->antiSmoothing.ignoreWhenDragging ? "true" : "false"
+				);
+			}
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: FilterTimerInterval
+	//
+	// Sets filter timer interval
+	//
+	AddCommand(new Command("FilterTimerInterval", [&](CommandLine *cmd) {
+		if(tabletHandler == NULL) return true;
+		int oldInterval = (int)round(tabletHandler->timerInterval);
+
+		int interval = cmd->GetInt(0, oldInterval);
+
+		// 10 Hz
+		if(interval > 100) interval = 100;
+
+		// 1000 Hz
+		if(interval < 1) interval = 1;
+
+		// Change interval
+		tabletHandler->ChangeTimerInterval(interval);
+
+		LOG_INFO("Filter Timer Interval = %0.0f (%0.2f Hz)\n",
+			tabletHandler->timerInterval,
+			1000.0 / tabletHandler->timerInterval
+		);
+		return true;
+	}));
+
+
+	//
+	// Command: FilterTester, Tester
+	//
+	AddAlias("Tester", "FilterTester");
+	AddCommand(new Command("FilterTester", [&](CommandLine *cmd) {
+
+		string inputFilepath = cmd->GetString(0, "tester_input.txt");
+		string outputFilepath = cmd->GetString(1, "tester_output.txt");
+		TabletFilterAntiSmoothing *filterAntiSmoothing = NULL;
+		TabletFilterNoiseReduction *filterNoise = NULL;
+		TabletFilterTester *tester = NULL;
+		char settingsString[1024];
+		int settingsStringSize = 1024;
+		int settingsStringIndex = 0;
+
+		// Anti-smoothing
+		if(tablet->antiSmoothing.isEnabled) {
+			filterAntiSmoothing = new TabletFilterAntiSmoothing();
+			filterAntiSmoothing->shape = tablet->antiSmoothing.shape;
+			filterAntiSmoothing->compensation = tablet->antiSmoothing.compensation;
+			filterAntiSmoothing->ignoreWhenDragging = tablet->antiSmoothing.ignoreWhenDragging;
+			settingsStringIndex += sprintf_s((settingsString + settingsStringIndex), settingsStringSize - settingsStringIndex,
+				"settings AntiSmoothing shape=%0.3f compensation=%0.3f dragignore=%s\r\n",
+				tablet->antiSmoothing.shape,
+				tablet->antiSmoothing.compensation,
+				tablet->antiSmoothing.ignoreWhenDragging ? "true" : "false"
+			);
+		}
+
+		// Noise reduction
+		if(tablet->noiseFilter.isEnabled) {
+			filterNoise = new TabletFilterNoiseReduction();
+			filterNoise->buffer.SetLength(tablet->noiseFilter.buffer.length);
+			filterNoise->distanceThreshold = tablet->noiseFilter.distanceThreshold;
+			filterNoise->distanceMaximum = tablet->noiseFilter.distanceMaximum;
+			filterNoise->iterations = tablet->noiseFilter.iterations;
+			settingsStringIndex += sprintf_s((settingsString + settingsStringIndex), settingsStringSize - settingsStringIndex,
+				"settings NoiseReduction buffer=%d threshold=%0.3f maximum=%0.3f iterations=%d\r\n",
+				tablet->noiseFilter.buffer.length,
+				tablet->noiseFilter.distanceThreshold,
+				tablet->noiseFilter.distanceMaximum,
+				tablet->noiseFilter.iterations
+			);
+		}
+		if(filterAntiSmoothing != NULL || filterNoise != NULL) {
+
+			logger.directPrint = true;
+
+			LOG_INFO("Filter test starting!\n");
+
+			tester = new TabletFilterTester(inputFilepath, outputFilepath);
+
+			// Add filters
+			if(filterAntiSmoothing != NULL)
+				tester->AddFilter(filterAntiSmoothing);
+			if(filterNoise != NULL)
+				tester->AddFilter(filterNoise);
+
+			bool result = tester->Open();
+			if(!result) {
+				LOG_ERROR("Filter tester can't open files!\n");
+				return false;
+			}
+			tester->outputFile << settingsString;
+			tester->Run();
+			LOG_INFO("Filter test ended!\n");
+
+			logger.ProcessMessages();
+			logger.directPrint = false;
+
+		}
+		else {
+			LOG_INFO("No report filters enabled!\n");
+		}
+
+		if(filterAntiSmoothing != NULL) {
+			delete filterAntiSmoothing;
+		}
+
+		if(filterNoise != NULL) {
+			delete filterNoise;
+		}
+
+		if(tester != NULL) {
+			delete tester;
+		}
+
+		return true;
+	}));
+
+
+}
diff --git a/TabletDriverService/CommandHandler.Other.cpp b/TabletDriverService/CommandHandler.Other.cpp
new file mode 100644
index 0000000..8ecbb61
--- /dev/null
+++ b/TabletDriverService/CommandHandler.Other.cpp
@@ -0,0 +1,587 @@
+#include "stdafx.h"
+#include "CommandHandler.h"
+
+#define LOG_MODULE ""
+#include "Logger.h"
+
+//
+// Create other commands
+//
+void CommandHandler::CreateOtherCommands() {
+
+	//
+	// Command: ScreenArea
+	//
+	// Sets the monitor mapping
+	//
+	AddCommand(new Command("ScreenArea", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		mapper->areaScreen.width = cmd->GetDouble(0, mapper->areaScreen.width);
+		mapper->areaScreen.height = cmd->GetDouble(1, mapper->areaScreen.height);
+		mapper->areaScreen.x = cmd->GetDouble(2, mapper->areaScreen.x);
+		mapper->areaScreen.y = cmd->GetDouble(3, mapper->areaScreen.y);
+		LOG_INFO("Screen area = (w=%0.2f, h=%0.2f, x=%0.2f, y=%0.2f)\n",
+			mapper->areaScreen.width,
+			mapper->areaScreen.height,
+			mapper->areaScreen.x,
+			mapper->areaScreen.y
+		);
+		return true;
+	}));
+
+
+	//
+	// Command: DesktopSize
+	//
+	// Sets the desktop area that the driver output can reach
+	//
+	AddAlias("Desktop", "DesktopSize");
+	AddCommand(new Command("DesktopSize", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		mapper->areaVirtualScreen.width = cmd->GetDouble(0, mapper->areaVirtualScreen.width);
+		mapper->areaVirtualScreen.height = cmd->GetDouble(1, mapper->areaVirtualScreen.height);
+		LOG_INFO("Desktop size = (%0.2f px x %0.2f px)\n",
+			mapper->areaVirtualScreen.width,
+			mapper->areaVirtualScreen.height
+		);
+		return true;
+	}));
+
+
+	//
+	// Command: OutputMode, Mode
+	//
+	// Sets driver output mode
+	//
+	AddAlias("Mode", "OutputMode");
+	AddCommand(new Command("OutputMode", [&](CommandLine *cmd) {
+
+		string mode = cmd->GetStringLower(0, "");
+
+		// Absolute mouse
+		if(mode.compare(0, 3, "abs") == 0) {
+			outputManager->SetOutputMode(OutputManager::ModeVMultiAbsolute);
+			LOG_INFO("Output Mode = Absolute\n");
+		}
+
+		// Relative mouse
+		else if(mode.compare(0, 3, "rel") == 0) {
+			outputManager->SetOutputMode(OutputManager::ModeVMultiRelative);
+			LOG_INFO("Output Mode = Relative\n");
+		}
+
+		// Digitizer
+		else if(mode.compare(0, 3, "dig") == 0 || mode.compare(0, 3, "pen") == 0) {
+
+			outputManager->SetOutputMode(OutputManager::ModeVMultiDigitizer);
+			LOG_INFO("Output Mode = Digitizer\n");
+		}
+
+		// SendInput
+		else if(mode.compare(0, 12, "sendinputabs") == 0) {
+			outputManager->SetOutputMode(OutputManager::ModeSendInputAbsolute);
+			LOG_INFO("Output Mode = SendInput Absolute\n");
+		}
+
+		// Dummy
+		else if(mode == "dummy") {
+			outputManager->SetOutputMode(OutputManager::ModeDummy);
+			LOG_INFO("Output Mode = Dummy\n");
+		}
+
+		else {
+			LOG_ERROR("Unknown output mode '%s'\n", mode.c_str());
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: Benchmark, Bench
+	//
+	AddAlias("Bench", "Benchmark");
+	AddCommand(new Command("Benchmark", [&](CommandLine *cmd) {
+
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		int timeLimit;
+		int reportCount = cmd->GetInt(0, 200);
+
+		// Limit report count
+		if(reportCount < 10) reportCount = 10;
+		if(reportCount > 1000) reportCount = 1000;
+
+		// Time limit
+		timeLimit = reportCount * 10;
+		if(timeLimit < 1000) timeLimit = 1000;
+
+		// Log
+		LOG_INFO("Tablet benchmark starting in 3 seconds!\n");
+		LOG_INFO("Keep the pen stationary on top of the tablet!\n");
+		Sleep(3000);
+		LOG_INFO("Benchmark started!\n");
+
+		// Start measurement
+		tablet->measurement.Start(reportCount);
+
+		// Wait for the benchmark to finish
+		for(int i = 0; i < timeLimit / 100; i++) {
+			Sleep(100);
+
+			// Benchmark results
+			if(tablet->measurement.reportCounter <= 0) {
+
+				double width = tablet->measurement.maximum.x - tablet->measurement.minimum.x;
+				double height = tablet->measurement.maximum.y - tablet->measurement.minimum.y;
+				LOG_INFO("\n");
+				LOG_INFO("Benchmark result (%d positions):\n", tablet->measurement.totalReports);
+				LOG_INFO("  Tablet: %s\n", tablet->name.c_str());
+				LOG_INFO("  Area: %0.2f mm x %0.2f mm (%0.0f px x %0.0f px)\n",
+					mapper->areaTablet.width,
+					mapper->areaTablet.height,
+					mapper->areaScreen.width,
+					mapper->areaScreen.height
+				);
+				LOG_INFO("  X range: %0.3f mm <-> %0.3f mm\n", tablet->measurement.minimum.x, tablet->measurement.maximum.x);
+				LOG_INFO("  Y range: %0.3f mm <-> %0.3f mm\n", tablet->measurement.minimum.y, tablet->measurement.maximum.y);
+				LOG_INFO("  Width: %0.3f mm (%0.2f px)\n",
+					width,
+					mapper->areaScreen.width / mapper->areaTablet.width * width
+				);
+				LOG_INFO("  Height: %0.3f mm (%0.2f px)\n",
+					height,
+					mapper->areaScreen.height / mapper->areaTablet.height* height
+				);
+				LOG_INFO("  Noise filter threshold: %0.2f mm\n", sqrt(width * width + height * height));
+
+
+				LOG_INFO("\n");
+				LOG_STATUS("BENCHMARK %d %0.3f %0.3f %s\n", tablet->measurement.totalReports, width, height, tablet->name.c_str());
+				break;
+			}
+		}
+
+		// Stop measurement
+		tablet->measurement.Stop();
+
+		// Benchmark failed
+		if(tablet->measurement.reportCounter > 0) {
+			LOG_ERROR("Benchmark failed!\n");
+			LOG_ERROR("Not enough reports captured in %0.2f seconds!\n",
+				timeLimit / 1000.0
+			);
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: Measure
+	//
+	AddCommand(new Command("Measure", [&](CommandLine *cmd) {
+
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		int timeLimit = 30000;
+		int pointCount = cmd->GetInt(0, 1);
+
+		// Limits
+		if(pointCount < 1) pointCount = 1;
+		if(pointCount > 10) pointCount = 10;
+
+		// Log
+		LOG_INFO("Measurement started!\n");
+
+		// Start measurement
+		tablet->measurement.Start();
+
+		// Wait for the measurement to finish
+		for(int i = 0; i < timeLimit / 100; i++) {
+			Sleep(100);
+
+			// Result
+			if(tablet->measurement.pointCount >= pointCount) {
+				double distance = 0;
+				double lastX = 0;
+				double lastY = 0;
+				Vector2D point, lastPoint;
+				Vector2D minimum;
+				Vector2D maximum;
+
+				minimum.Set(10000, 10000);
+				maximum.Set(-10000, -10000);
+
+				LOG_INFO("\n");
+				LOG_INFO("Measurement results:\n");
+				for(int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
+
+					point.Set(tablet->measurement.points[pointIndex]);
+
+					// Limits
+					if(point.x < minimum.x) minimum.x = point.x;
+					if(point.x > maximum.x) maximum.x = point.x;
+					if(point.y < minimum.y) minimum.y = point.y;
+					if(point.y > maximum.y) maximum.y = point.y;
+
+					LOG_INFO(
+						"  #%d: X = %0.2f mm, Y = %0.2f mm\n",
+						pointIndex + 1,
+						point.x,
+						point.y
+					);
+
+					// Distance calculation
+					if(pointIndex > 0) {
+						distance += point.Distance(lastPoint);
+					}
+					lastPoint.Set(point);
+
+				}
+				if(tablet->measurement.pointCount > 1) {
+					LOG_INFO("  Distance: %0.2f mm\n", distance);
+					LOG_INFO("  Maximum area: %0.2f mm x %0.2f mm\n",
+						maximum.x - minimum.x, maximum.y - minimum.y
+					);
+				}
+
+				// Status message
+				char pointString[1024];
+				char pointStringIndex = 0;
+
+				// Build point string
+				for(int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
+					point.Set(tablet->measurement.points[pointIndex]);
+					pointStringIndex += sprintf_s(pointString + pointStringIndex, 1024 - pointStringIndex, "%0.3f %0.3f ", point.x, point.y);
+				}
+
+				// Output measurement results
+				LOG_STATUS("MEASUREMENT %s\n", pointString);
+
+				LOG_INFO("\n");
+
+				break;
+			}
+		}
+
+		// Stop measurement
+		tablet->measurement.Stop();
+
+		// Measurement failed
+		if(tablet->measurement.pointCount < pointCount) {
+			LOG_ERROR("Measurement failed! No enough points detected in %0.0f seconds!\n", timeLimit / 1000.0);
+			LOG_STATUS("MEASUREMENT 0\n");
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: LogTabletArea
+	//
+	// Prints current tablet area
+	//
+	AddCommand(new Command("LogTabletArea", [&](CommandLine *cmd) {
+		LOG_INFO("%s: (%0.2f mm x %0.2f mm X+%0.2f mm Y+%0.2f mm)\n",
+			cmd->GetParameterString().c_str(),
+			mapper->areaTablet.width,
+			mapper->areaTablet.height,
+			mapper->areaTablet.x,
+			mapper->areaTablet.y
+		);
+		return true;
+	}));
+
+
+	//
+	// Command: Debug
+	//
+	// Enable/disable debugging output
+	//
+	AddCommand(new Command("Debug", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		logger.debugEnabled = cmd->GetBoolean(0, logger.debugEnabled);
+		LOG_INFO("Debug logging = %s\n", logger.debugEnabled ? "True" : "False");
+		return true;
+	}));
+
+
+	//
+	// Command: Log
+	//
+	// Start/stop logging messages to a log file
+	//
+	AddCommand(new Command("Log", [&](CommandLine *cmd) {
+		string logPath = cmd->GetString(0, "log.txt");
+		if(!cmd->GetBoolean(0, true)) {
+			logger.CloseLogFile();
+			LOG_INFO("Log file '%s' closed.\n", logger.logFilename.c_str());
+		}
+		else if(logger.OpenLogFile(logPath)) {
+			LOG_INFO("Log file '%s' opened.\n", logPath.c_str());
+		}
+		else {
+			LOG_ERROR("Cant open log file!\n");
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: Wait
+	//
+	AddCommand(new Command("Wait", [&](CommandLine *cmd) {
+		int waitTime = cmd->GetInt(0, 0);
+		Sleep(waitTime);
+		return true;
+	}));
+
+
+	//
+	// Command: Echo
+	//
+	commandHandler->AddCommand(new Command("Echo", [&](CommandLine *cmd) {
+		if(cmd->valueCount > 0) {
+			LOG_INFO("%s\n", cmd->line.c_str() + 5);
+		}
+		else {
+			LOG_INFO("\n");
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: LogDirect
+	//
+	// Enables/disables direct logging without queuing the messages.
+	//
+	AddCommand(new Command("LogDirect", [&](CommandLine *cmd) {
+		logger.ProcessMessages();
+		logger.directPrint = cmd->GetBoolean(0, logger.directPrint);
+		logger.ProcessMessages();
+
+		LOG_INFO("Log direct print = %s\n", logger.directPrint ? "True" : "False");
+		return true;
+	}));
+
+
+	//
+	// Command: Output
+	//
+	// Enables/disables VMulti output
+	//
+	AddCommand(new Command("Output", [&](CommandLine *cmd) {
+		vmulti->outputEnabled = cmd->GetBoolean(0, vmulti->outputEnabled);
+		LOG_INFO("Output enabled = %s\n", vmulti->outputEnabled ? "True" : "False");
+		return true;
+	}));
+
+
+	//
+	// Command: Information, Info
+	//
+	// Shows driver information
+	//
+	AddAlias("Info", "Information");
+	AddCommand(new Command("Information", [&](CommandLine *cmd) {
+
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		char stringBuffer[64];
+		int maxLength = sizeof(stringBuffer) - 1;
+		int stringIndex = 0;
+
+		LOG_INFO("\n");
+		LOG_INFO("Tablet: %s\n", tablet->name.c_str());
+		LOG_INFO("  Width = %0.2f mm\n", tablet->settings.width);
+		LOG_INFO("  Height = %0.2f mm\n", tablet->settings.height);
+		LOG_INFO("  Max X = %d\n", tablet->settings.maxX);
+		LOG_INFO("  Max Y = %d\n", tablet->settings.maxY);
+		LOG_INFO("  Max Pressure = %d\n", tablet->settings.maxPressure);
+		LOG_INFO("  Click Pressure = %d\n", tablet->settings.clickPressure);
+		LOG_INFO("  Keep Tip Down = %d reports\n", tablet->settings.keepTipDown);
+		LOG_INFO("  Report Id = 0x%02X\n", tablet->settings.reportId);
+		LOG_INFO("  Report Length = %d bytes\n", tablet->settings.reportLength);
+		LOG_INFO("  Detect Mask = 0x%02X\n", tablet->settings.detectMask);
+		LOG_INFO("  Ignore Mask = 0x%02X\n", tablet->settings.ignoreMask);
+
+		for(int i = 0; i < 8; i++) {
+			stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "%d ", tablet->buttonMap[i]);
+		}
+		LOG_INFO("  Button Map = %s\n", stringBuffer);
+
+
+		if(tablet->initFeatureLength > 0) {
+			LOG_INFOBUFFER(tablet->initFeature, tablet->initFeatureLength, "  Tablet init feature report: ");
+		}
+		if(tablet->initReportLength > 0) {
+			LOG_INFOBUFFER(tablet->initReport, tablet->initReportLength, "  Tablet init report: ");
+		}
+		LOG_INFO("\n");
+		LOG_INFO("Area:\n");
+		LOG_INFO("  Desktop = %0.0fpx x %0.0fpx\n",
+			mapper->areaVirtualScreen.width, mapper->areaVirtualScreen.height
+		);
+		LOG_INFO("  Screen Map = %0.0fpx x %0.0fpx @ X%+0.0fpx, Y%+0.0fpx\n",
+			mapper->areaScreen.width, mapper->areaScreen.height,
+			mapper->areaScreen.x, mapper->areaScreen.y
+		);
+		LOG_INFO("  Tablet =  %0.2fmm x %0.2fmm @ Min(%0.2fmm, %0.2fmm) Max(%0.2fmm, %0.2fmm)\n",
+			mapper->areaTablet.width, mapper->areaTablet.height,
+			mapper->areaTablet.x, mapper->areaTablet.y,
+			mapper->areaTablet.width + mapper->areaTablet.x, mapper->areaTablet.height + mapper->areaTablet.y
+		);
+		LOG_INFO("  Rotation matrix = [%f,%f,%f,%f]\n",
+			mapper->rotationMatrix[0],
+			mapper->rotationMatrix[1],
+			mapper->rotationMatrix[2],
+			mapper->rotationMatrix[3]
+		);
+		LOG_INFO("\n");
+
+		return true;
+	}));
+
+
+	//
+	// Command: Status
+	//
+	// Outputs driver infor as status messages
+	//
+	AddCommand(new Command("Status", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		LOG_STATUS("TABLET %s\n", tablet->name.c_str());
+
+		if(tablet->hidDevice != NULL) {
+			LOG_STATUS("HID %04X %04X %04X %04X\n",
+				tablet->hidDevice->vendorId,
+				tablet->hidDevice->productId,
+				tablet->hidDevice->usagePage,
+				tablet->hidDevice->usage
+			);
+		}
+		else if(tablet->usbDevice != NULL) {
+			LOG_STATUS("USB %s\n", tablet->usbDevice->guid.c_str());
+		}
+		LOG_STATUS("WIDTH %0.5f\n", tablet->settings.width);
+		LOG_STATUS("HEIGHT %0.5f\n", tablet->settings.height);
+		LOG_STATUS("MAX_X %d\n", tablet->settings.maxX);
+		LOG_STATUS("MAX_Y %d\n", tablet->settings.maxY);
+		LOG_STATUS("MAX_PRESSURE %d\n", tablet->settings.maxPressure);
+
+		return true;
+	}));
+
+
+	//
+	// Command: Include
+	//
+	// Reads commands from a file and stops if tablet is redefined.
+	//
+	AddCommand(new Command("Include", [&](CommandLine *cmd) {
+		string filename = cmd->GetString(0, "");
+		if(filename == "") {
+			LOG_ERROR("Invalid filename '%s'!\n", filename.c_str());
+			return false;
+		}
+		else {
+			if(ExecuteFile(filename)) {
+			}
+			else {
+				LOG_ERROR("Can't open file '%s'\n", filename.c_str());
+				return false;
+			}
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: ListCommands, List
+	//
+	// List all commands
+	//
+	AddAlias("List", "ListCommands");
+	AddCommand(new Command("ListCommands", [&](CommandLine *cmd) {
+
+		LOG_INFO("Commands: \n");
+		for(pair<string, Command*> cmdPair : commands) {
+			string commandName = cmdPair.second->name;
+			string lowerCaseName = commandName;
+			transform(lowerCaseName.begin(), lowerCaseName.end(), lowerCaseName.begin(), ::tolower);
+
+			string aliasString = "";
+			for(pair<string, string> aliasPair : aliases) {
+				if(aliasPair.second == lowerCaseName) {
+					aliasString += ", " + aliasNames[aliasPair.first];
+				}
+			}
+			LOG_INFO("  %s%s\n", commandName.c_str(), aliasString.c_str());
+		}
+
+		return true;
+	}));
+
+	//
+	// Command: GetCommands
+	//
+	// Outputs all commands as status messages
+	//
+	AddCommand(new Command("GetCommands", [&](CommandLine *cmd) {
+
+		string commandsString = "";
+
+		for(pair<string, Command*> cmdPair : commands) {
+			string commandName = cmdPair.second->name;
+			string lowerCaseName = commandName;
+			transform(lowerCaseName.begin(), lowerCaseName.end(), lowerCaseName.begin(), ::tolower);
+
+			commandsString += commandName + " ";
+
+			string aliasString = "";
+			for(pair<string, string> aliasPair : aliases) {
+				if(aliasPair.second == lowerCaseName) {
+					commandsString += aliasNames[aliasPair.first] + " ";
+				}
+			}
+			
+			if(commandsString.size() > 80) {
+				LOG_STATUS("COMMANDS %s\n", commandsString.c_str());
+				commandsString = "";
+			}
+		}
+		if(commandsString.size() > 0) {
+			LOG_STATUS("COMMANDS %s\n", commandsString.c_str());
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: Help
+	//
+	// Shows help for a command
+	//
+	AddHelp("Help", "...");
+	AddCommand(new Command("Help", [&](CommandLine *cmd) {
+		string commandName = cmd->GetStringLower(0, "");
+		if(aliases.count(commandName) > 0) {
+			commandName = aliases[commandName];
+		}
+		if(help.count(commandName)) {
+			string helpText = help[commandName];
+			LOG_INFO("Help:\n\n%s\n", helpText.c_str());
+		}
+		else {
+			LOG_INFO("No help found :(\n");
+		}
+
+		return true;
+	}));
+
+}
diff --git a/TabletDriverService/CommandHandler.Tablet.cpp b/TabletDriverService/CommandHandler.Tablet.cpp
new file mode 100644
index 0000000..63457cf
--- /dev/null
+++ b/TabletDriverService/CommandHandler.Tablet.cpp
@@ -0,0 +1,426 @@
+#include "stdafx.h"
+#include "CommandHandler.h"
+
+#define LOG_MODULE ""
+#include "Logger.h"
+
+//
+// Create tablet commands
+//
+void CommandHandler::CreateTabletCommands() {
+
+	//
+	// Command: TabletIsValid
+	//
+	AddCommand(new Command("TabletValid", [&](CommandLine *cmd) {
+		if(tablet == NULL) {
+			return false;
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: CheckTablet
+	//
+	AddCommand(new Command("CheckTablet", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) {
+			LOG_ERROR("Tablet not found!\n");
+			LOG_ERROR("Check the list of supported tablets from the GitHub page.\n");
+			LOG_ERROR("http://github.com/hawku/TabletDriver\n");
+			CleanupAndExit(1);
+			return false;
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: TabletName, Name
+	//
+	AddAlias("Name", "TabletName");
+	AddCommand(new Command("TabletName", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->name = cmd->GetString(0, tablet->name);
+		LOG_INFO("Tablet name = '%s'\n", tablet->name.c_str());
+		return true;
+	}));
+
+
+	//
+	// Command: ReportId
+	//
+	AddCommand(new Command("ReportId", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.reportId = cmd->GetInt(0, tablet->settings.reportId);
+		LOG_INFO("Tablet report id = %d\n", tablet->settings.reportId);
+		return true;
+	}));
+
+
+	//
+	// Command: ReportLength
+	//
+	AddCommand(new Command("ReportLength", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.reportLength = cmd->GetInt(0, tablet->settings.reportLength);
+		LOG_INFO("Tablet report length = %d\n", tablet->settings.reportLength);
+		return true;
+	}));
+
+
+	//
+	// Command: DetectMask
+	//
+	AddCommand(new Command("DetectMask", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.detectMask = cmd->GetInt(0, tablet->settings.detectMask);
+		LOG_INFO("Tablet detect mask = %02X\n", tablet->settings.detectMask);
+		return true;
+	}));
+
+
+	//
+	// Command: IgnoreMask
+	//
+	AddCommand(new Command("IgnoreMask", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.ignoreMask = cmd->GetInt(0, tablet->settings.ignoreMask);
+		LOG_INFO("Tablet ignore mask = %02X\n", tablet->settings.ignoreMask);
+		return true;
+	}));
+
+
+	//
+	// Command: MaxX
+	//
+	AddCommand(new Command("MaxX", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.maxX = cmd->GetInt(0, tablet->settings.maxX);
+		LOG_INFO("Tablet max X = %d\n", tablet->settings.maxX);
+		return true;
+	}));
+
+
+	//
+	// Command: MaxY
+	//
+	AddCommand(new Command("MaxY", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.maxY = cmd->GetInt(0, tablet->settings.maxY);
+		LOG_INFO("Tablet max Y = %d\n", tablet->settings.maxY);
+		return true;
+	}));
+
+
+	//
+	// Command: MaxPressure
+	//
+	AddCommand(new Command("MaxPressure", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.maxPressure = cmd->GetInt(0, tablet->settings.maxPressure);
+		LOG_INFO("Tablet max pressure = %d\n", tablet->settings.maxPressure);
+		return true;
+	}));
+
+	//
+	// Command: ClickPressure
+	//
+	AddCommand(new Command("ClickPressure", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.clickPressure = cmd->GetInt(0, tablet->settings.clickPressure);
+		LOG_INFO("Tablet click pressure = %d\n", tablet->settings.clickPressure);
+		return true;
+	}));
+
+
+	//
+	// Command: KeepTipDown
+	//
+	AddCommand(new Command("KeepTipDown", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.keepTipDown = cmd->GetInt(0, tablet->settings.keepTipDown);
+		LOG_INFO("Tablet pen tip keep down = %d reports\n", tablet->settings.keepTipDown);
+		return true;
+	}));
+
+
+	//
+	// Command: Width
+	//
+	AddCommand(new Command("Width", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.width = cmd->GetDouble(0, tablet->settings.width);
+		LOG_INFO("Tablet width = %0.2f mm\n", tablet->settings.width);
+		return true;
+	}));
+
+
+	//
+	// Command: Height
+	//
+	AddCommand(new Command("Height", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.height = cmd->GetDouble(0, tablet->settings.height);
+		LOG_INFO("Tablet height = %0.2f mm\n", tablet->settings.height);
+		return true;
+	}));
+
+
+	//
+	// Command: Skew
+	//
+	AddCommand(new Command("Skew", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.skew = cmd->GetDouble(0, tablet->settings.skew);
+		LOG_INFO("Tablet skew = Shift X-axis %0.2f mm per Y-axis mm\n", tablet->settings.skew);
+		return true;
+	}));
+
+
+	//
+	// Command: TabletDataFormat, TabletFormat, Format
+	//
+	// Sets tablet data format
+	//
+	AddAlias("Format", "TabletDataFormat");
+	AddAlias("TabletFormat", "TabletDataFormat");
+	AddCommand(new Command("TabletDataFormat", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		string format = cmd->GetStringLower(0, "");
+
+		// Wacom Intuos Format V2 (Wacom CTL-490)
+		if(format == "wacomintuosv2") {
+			tablet->settings.dataFormat = TabletSettings::TabletFormatWacomIntuosV2;
+		}
+
+		// Wacom Intuos Format V3 (Wacom CTL-4100)
+		else if(format == "wacomintuosv3" || format == "wacom4100") {
+			tablet->settings.dataFormat = TabletSettings::TabletFormatWacomIntuosV3;
+		}
+
+		// Wacom Drivers
+		else if(format == "wacomdrivers") {
+			tablet->settings.dataFormat = TabletSettings::TabletFormatWacomDrivers;
+		}
+
+		// Skip first data byte (VEIKK S640)
+		else if(format == "skipfirstdatabyte") {
+			tablet->settings.dataFormat = TabletSettings::TabletFormatSkipFirstDataByte;
+		}
+
+		// Unknown type
+		else {
+			LOG_ERROR("Unknown tablet data format: %s\n", format.c_str());
+		}
+
+		LOG_INFO("Tablet format = %d\n", tablet->settings.dataFormat);
+
+		return true;
+	}));
+
+
+	//
+	// Command: InitFeature
+	//
+	AddCommand(new Command("InitFeature", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 0) return false;
+		if(tablet == NULL) return false;
+		tablet->initFeature = new BYTE[cmd->valueCount];
+		for(int i = 0; i < (int)cmd->valueCount; i++) {
+			tablet->initFeature[i] = cmd->GetInt(i, 0);
+		}
+		tablet->initFeatureLength = cmd->valueCount;
+		LOG_INFOBUFFER(tablet->initFeature, tablet->initFeatureLength, "Tablet initialization feature report: ");
+		return true;
+	}));
+
+
+	//
+	// Command: InitReport
+	//
+	// Initialization HID output report
+	//
+	AddCommand(new Command("InitReport", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 0) return false;
+
+		if(tablet == NULL) return false;
+		tablet->initReport = new BYTE[cmd->valueCount];
+		for(int i = 0; i < (int)cmd->valueCount; i++) {
+			tablet->initReport[i] = cmd->GetInt(i, 0);
+		}
+		tablet->initReportLength = cmd->valueCount;
+		LOG_INFOBUFFER(tablet->initReport, tablet->initReportLength, "Tablet initialization report: ");
+
+		return true;
+	}));
+
+
+	//
+	// Command: InitStrings, InitString
+	//
+	AddAlias("InitString", "InitStrings");
+	AddCommand(new Command("InitStrings", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 0) return false;
+		if(tablet == NULL) return false;
+		for(int i = 0; i < (int)cmd->valueCount; i++) {
+			int stringId = cmd->GetInt(i, 0);
+			if(stringId > 0 && stringId <= 256) {
+				tablet->initStrings.push_back(stringId);
+			}
+		}
+		string stringIdsString = "";
+		for(int stringId : tablet->initStrings) {
+			stringIdsString += to_string(stringId) + " ";
+		}
+		LOG_INFO("Tablet initialization string ids = %s\n", stringIdsString.c_str());
+
+		return true;
+	}));
+
+
+	//
+	// Command: TabletArea, Area
+	//
+	// Sets the user tablet area
+	//
+	AddAlias("Area", "TabletArea");
+	AddCommand(new Command("TabletArea", [&](CommandLine *cmd) {
+
+		if(!ExecuteCommand("TabletValid")) return false;
+		mapper->areaTablet.width = cmd->GetDouble(0, mapper->areaTablet.width);
+		mapper->areaTablet.height = cmd->GetDouble(1, mapper->areaTablet.height);
+		mapper->areaTablet.x = cmd->GetDouble(2, mapper->areaTablet.x);
+		mapper->areaTablet.y = cmd->GetDouble(3, mapper->areaTablet.y);
+
+		ExecuteCommand("LogTabletArea", "Tablet area");
+		return true;
+	}));
+
+
+	//
+	// Command: ButtonMap, Buttons
+	//
+	// Maps input buttons to output buttons
+	//
+	AddAlias("Buttons", "ButtonMap");
+	AddCommand(new Command("ButtonMap", [&](CommandLine *cmd) {
+
+		if(!ExecuteCommand("TabletValid")) return false;
+		char buttonMapBuffer[32];
+		int index = 0;
+		for(int i = 0; i < 8; i++) {
+			tablet->buttonMap[i] = cmd->GetInt(i, tablet->buttonMap[i]);
+			index += sprintf_s(buttonMapBuffer + index, 32 - index, "%d ", tablet->buttonMap[i]);
+		}
+		LOG_INFO("Button Map = %s\n", buttonMapBuffer);
+		return true;
+	}));
+
+
+	//
+	// Command: TabletMove
+	//
+	// Move tablet area offset from the area borders
+	//
+	AddAlias("Move", "TabletMove");
+	AddCommand(new Command("TabletMove", [&](CommandLine *cmd) {
+		if(cmd->valueCount <= 0) return false;
+		if(!ExecuteCommand("TabletValid")) return false;
+		string border;
+		double offset;
+		bool moved = true;
+
+		for(int i = 0; i < cmd->valueCount; i += 2) {
+
+			border = cmd->GetStringLower(i, "");
+			offset = cmd->GetDouble(i + 1, 0.0);
+			moved = true;
+
+			if(border == "top") {
+				mapper->areaTablet.y = offset + mapper->areaTablet.height / 2.0;
+			}
+			else if(border == "bottom") {
+				mapper->areaTablet.y = tablet->settings.height - mapper->areaTablet.height / 2.0 - offset;
+			}
+			else if(border == "left") {
+				mapper->areaTablet.x = offset + mapper->areaTablet.width / 2.0;;
+			}
+			else if(border == "right") {
+				mapper->areaTablet.x = tablet->settings.width - mapper->areaTablet.width / 2.0 - offset;
+			}
+			else {
+				moved = false;
+			}
+			if(moved) {
+				LOG_INFO("Tablet area moved to %s border with %0.2f mm margin.\n", border.c_str(), offset);
+				ExecuteCommand("LogTabletArea", "  New tablet area");
+			}
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: Rotate
+	//
+	// Sets tablet area rotation
+	//
+	AddCommand(new Command("Rotate", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		double value = cmd->GetDouble(0, 0);
+		mapper->SetRotation(value);
+		LOG_INFO("Rotation matrix = [%f,%f,%f,%f]\n",
+			mapper->rotationMatrix[0],
+			mapper->rotationMatrix[1],
+			mapper->rotationMatrix[2],
+			mapper->rotationMatrix[3]
+		);
+		return true;
+	}));
+
+
+	//
+	// Command: RelativeSensitivity, Sensitivity
+	//
+	// Sets the relative mouse output sensitivity
+	//
+	AddAlias("Sensitivity", "RelativeSensitivity");
+	AddCommand(new Command("RelativeSensitivity", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		outputManager->settings->relativeSensitivity = cmd->GetDouble(0, outputManager->settings->relativeSensitivity);
+		LOG_INFO("Relative mode sensitivity = %0.2f px/mm\n", outputManager->settings->relativeSensitivity);
+		return true;
+	}));
+
+
+	//
+	// Command: ResetDistance
+	//
+	// Sets relative mouse output reset distance
+	//
+	AddAlias("ResetDistance", "RelativeResetDistance");
+	AddCommand(new Command("RelativeResetDistance", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		outputManager->settings->relativeResetDistance = cmd->GetDouble(0, outputManager->settings->relativeResetDistance);
+		LOG_INFO("Relative mode reset distance = %0.2f mm\n", outputManager->settings->relativeResetDistance);
+		return true;
+	}));
+
+
+	//
+	// Command: ResetTime
+	//
+	// Sets relative mouse output reset distance
+	//
+	AddAlias("ResetTime", "RelativeResetTime");
+	AddCommand(new Command("RelativeResetTime", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		outputManager->settings->relativeResetTime = cmd->GetDouble(0, outputManager->settings->relativeResetTime);
+		LOG_INFO("Relative mode reset time = %0.2f milliseconds\n", outputManager->settings->relativeResetTime);
+		return true;
+	}));
+
+
+}
diff --git a/TabletDriverService/CommandHandler.cpp b/TabletDriverService/CommandHandler.cpp
index aef6562..fb74d5e 100644
--- a/TabletDriverService/CommandHandler.cpp
+++ b/TabletDriverService/CommandHandler.cpp
@@ -37,22 +37,33 @@ bool CommandHandler::AddCommand(Command *command) {
 // Add command alias
 //
 bool CommandHandler::AddAlias(string alias, string commandName) {
-	transform(alias.begin(), alias.end(), alias.begin(), ::tolower);
+
+	string aliasLowerCase = alias;
+	transform(aliasLowerCase.begin(), aliasLowerCase.end(), aliasLowerCase.begin(), ::tolower);
 	transform(commandName.begin(), commandName.end(), commandName.begin(), ::tolower);
 
-	if(aliases.count(alias) <= 0) {
-		aliases.insert(pair<string, string>(alias, commandName));
+	if(aliases.count(aliasLowerCase) <= 0) {
+		aliases.insert(pair<string, string>(aliasLowerCase, commandName));
+		aliasNames.insert(pair<string, string>(aliasLowerCase, alias));
 		return true;
 	}
 
 	return false;
 }
 
-bool CommandHandler::ExecuteCommand(string command, string parameters) {
-	CommandLine *cmd = new CommandLine(command + " " + parameters);
-	bool result = ExecuteCommand(command, cmd);
-	delete cmd;
-	return result;
+//
+// Add command help text
+//
+bool CommandHandler::AddHelp(string commandName, string line) {
+	transform(commandName.begin(), commandName.end(), commandName.begin(), ::tolower);
+	line.append("\n");
+	if(help.count(commandName) < 0) {
+		help.insert(pair<string, string>(commandName, line));
+	}
+	else {
+		help[commandName].append(line);
+	}
+	return false;
 }
 
 //
@@ -60,1379 +71,10 @@ bool CommandHandler::ExecuteCommand(string command, string parameters) {
 //
 void CommandHandler::CreateCommands() {
 
-	//
-	// Command: Tablet
-	//
-	AddCommand(new Command("Tablet", [&](CommandLine *cmd) {
-
-		// USB Tablet
-		if(cmd->valueCount == 3) {
-			string guid = cmd->GetString(0, "");
-			int stringId = cmd->GetInt(1, 0);
-			string stringMatch = cmd->GetString(2, "");
-			if(tablet == NULL) {
-				tablet = new Tablet(guid, stringId, stringMatch);
-				if(tablet->isOpen) {
-					LOG_INFO("Tablet found!\n");
-				} else {
-					LOG_WARNING("Can't open USB tablet '%s' %d '%s'\n", guid.c_str(), stringId, stringMatch.c_str());
-					delete tablet;
-					tablet = NULL;
-				}
-			}
-		}
-
-		// HID Tablet
-		else if(cmd->valueCount == 4) {
-			USHORT vendorID = cmd->GetInt(0, 0);
-			USHORT productID = cmd->GetInt(1, 0);
-			USHORT usagePage = cmd->GetInt(2, 0);
-			USHORT usage = cmd->GetInt(3, 0);
-			if(tablet == NULL) {
-				tablet = new Tablet(vendorID, productID, usagePage, usage);
-				if(tablet->isOpen) {
-					LOG_INFO("Tablet found!\n");
-				} else {
-					LOG_WARNING("Can't open HID tablet 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
-					delete tablet;
-					tablet = NULL;
-				}
-			}
-		} else {
-			if(tablet != NULL) {
-				if(tablet->usbDevice != NULL) {
-					USBDevice *usb = tablet->usbDevice;
-					LOG_INFO("Tablet = USB(\"%s\", %d, \"%s\")\n",
-						usb->guid.c_str(),
-						usb->stringId,
-						usb->stringMatch.c_str()
-					);
-				} else if(tablet->hidDevice != NULL) {
-					HIDDevice *hid = tablet->hidDevice;
-					LOG_INFO("Tablet = HID(0x%04X 0x%04X 0x%04X 0x%04X)\n",
-						hid->vendorId,
-						hid->productId,
-						hid->usagePage,
-						hid->usage
-					);
-				}
-			} else {
-				LOG_INFO("Tablet is not defined.\n");
-			}
-		}
-
-		return true;
-	}));
-
-
-	//
-	// Command: TabletIsValid
-	//
-	AddCommand(new Command("TabletValid", [&](CommandLine *cmd) {
-		if(tablet == NULL) {
-			return false;
-		}
-		return true;
-	}));
-
-
-	//
-	// Command: CheckTablet
-	//
-	AddCommand(new Command("CheckTablet", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) {
-			LOG_ERROR("Tablet not found!\n");
-			LOG_ERROR("Check the list of supported tablets from the GitHub page.\n");
-			LOG_ERROR("http://github.com/hawku/TabletDriver\n");
-			CleanupAndExit(1);
-			return false;
-		}
-		return true;
-	}));
-
-
-	//
-	// Command: HIDList
-	//
-	AddAlias("HIDAux", "HIDAuxiliary");
-	AddCommand(new Command("HIDList", [&](CommandLine *cmd) {
-		HANDLE hidHandle = 0;
-		HIDDevice *hid = new HIDDevice();
-		hid->debugEnabled = true;
-		hid->OpenDevice(&hidHandle, 1, 1, 1, 1);
-		if(hidHandle > 0) {
-			CloseHandle(hidHandle);
-		}
-		delete hid;
-
-		return true;
-	}));
-
-
-	//
-	// Command: HIDAux
-	//
-	AddCommand(new Command("HIDAuxiliary", [&](CommandLine *cmd) {
-
-		if(cmd->valueCount == 4) {
-			USHORT vendorID = cmd->GetInt(0, 0);
-			USHORT productID = cmd->GetInt(1, 0);
-			USHORT usagePage = cmd->GetInt(2, 0);
-			USHORT usage = cmd->GetInt(3, 0);
-			if(tablet->hidDeviceAux == NULL) {
-				tablet->hidDeviceAux = new HIDDevice(vendorID, productID, usagePage, usage);
-				if(tablet->hidDeviceAux->isOpen) {
-					LOG_INFO("HID Device found!\n");
-					return true;
-				} else {
-					LOG_ERROR("Can't open HID device 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
-					delete tablet->hidDeviceAux;
-					tablet->hidDeviceAux = NULL;
-				}
-			}
-		}
-
-		return false;
-	}));
-
-
-
-	//
-	// Command: HIDAuxRead
-	//
-	AddCommand(new Command("HIDAuxRead", [&](CommandLine *cmd) {
-
-		if(cmd->valueCount > 1 && tablet->hidDeviceAux != NULL) {
-			int length = cmd->GetInt(0, 1);
-			int count = cmd->GetInt(1, 1);
-			UCHAR buffer[1024];
-			for(int i = 0; i < count; i++) {
-				tablet->hidDeviceAux->Read(buffer, length);
-				LOG_INFOBUFFER(buffer, length, "Aux read(%d): ", i + 1);
-			}
-		}
-
-		return true;
-	}));
-
-	if(false) {
-
-	}
-
-
-	//
-	// Command: TabletName, Name
-	//
-	AddAlias("Name", "TabletName");
-	AddCommand(new Command("TabletName", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->name = cmd->GetString(0, tablet->name);
-		LOG_INFO("Tablet name = '%s'\n", tablet->name.c_str());
-		return true;
-	}));
-
-
-	//
-	// Command: ReportId
-	//
-	AddCommand(new Command("ReportId", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->settings.reportId = cmd->GetInt(0, tablet->settings.reportId);
-		LOG_INFO("Tablet report id = %d\n", tablet->settings.reportId);
-		return true;
-	}));
-
-
-	//
-	// Command: ReportLength
-	//
-	AddCommand(new Command("ReportLength", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->settings.reportLength = cmd->GetInt(0, tablet->settings.reportLength);
-		LOG_INFO("Tablet report length = %d\n", tablet->settings.reportLength);
-		return true;
-	}));
-
-
-	//
-	// Command: DetectMask
-	//
-	AddCommand(new Command("DetectMask", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->settings.detectMask = cmd->GetInt(0, tablet->settings.detectMask);
-		LOG_INFO("Tablet detect mask = %02X\n", tablet->settings.detectMask);
-		return true;
-	}));
-
-
-	//
-	// Command: IgnoreMask
-	//
-	AddCommand(new Command("IgnoreMask", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->settings.ignoreMask = cmd->GetInt(0, tablet->settings.ignoreMask);
-		LOG_INFO("Tablet ignore mask = %02X\n", tablet->settings.ignoreMask);
-		return true;
-	}));
-
-
-	//
-	// Command: MaxX
-	//
-	AddCommand(new Command("MaxX", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->settings.maxX = cmd->GetInt(0, tablet->settings.maxX);
-		LOG_INFO("Tablet max X = %d\n", tablet->settings.maxX);
-		return true;
-	}));
-
-
-	//
-	// Command: MaxY
-	//
-	AddCommand(new Command("MaxY", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->settings.maxY = cmd->GetInt(0, tablet->settings.maxY);
-		LOG_INFO("Tablet max Y = %d\n", tablet->settings.maxY);
-		return true;
-	}));
-
-
-	//
-	// Command: MaxPressure
-	//
-	AddCommand(new Command("MaxPressure", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->settings.maxPressure = cmd->GetInt(0, tablet->settings.maxPressure);
-		LOG_INFO("Tablet max pressure = %d\n", tablet->settings.maxPressure);
-		return true;
-	}));
-
-	//
-	// Command: ClickPressure
-	//
-	AddCommand(new Command("ClickPressure", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->settings.clickPressure = cmd->GetInt(0, tablet->settings.clickPressure);
-		LOG_INFO("Tablet click pressure = %d\n", tablet->settings.clickPressure);
-		return true;
-	}));
-
-
-	//
-	// Command: KeepTipDown
-	//
-	AddCommand(new Command("KeepTipDown", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->settings.keepTipDown = cmd->GetInt(0, tablet->settings.keepTipDown);
-		LOG_INFO("Tablet pen tip keep down = %d reports\n", tablet->settings.keepTipDown);
-		return true;
-	}));
-
-
-	//
-	// Command: Width
-	//
-	AddCommand(new Command("Width", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->settings.width = cmd->GetDouble(0, tablet->settings.width);
-		LOG_INFO("Tablet width = %0.2f mm\n", tablet->settings.width);
-		return true;
-	}));
-
-
-	//
-	// Command: Height
-	//
-	AddCommand(new Command("Height", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->settings.height = cmd->GetDouble(0, tablet->settings.height);
-		LOG_INFO("Tablet height = %0.2f mm\n", tablet->settings.height);
-		return true;
-	}));
-
-
-	//
-	// Command: Skew
-	//
-	AddCommand(new Command("Skew", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		tablet->settings.skew = cmd->GetDouble(0, tablet->settings.skew);
-		LOG_INFO("Tablet skew = Shift X-axis %0.2f mm per Y-axis mm\n", tablet->settings.skew);
-		return true;
-	}));
-
-
-	//
-	// Command: TabletType, Type
-	//
-	AddAlias("Type", "TabletType");
-	AddCommand(new Command("TabletType", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-
-		// Wacom Intuos (490)
-		if(cmd->GetStringLower(0, "") == "wacomintuos") {
-			tablet->settings.type = TabletSettings::TypeWacomIntuos;
-		}
-
-		// Wacom CTL-4100
-		else if(cmd->GetStringLower(0, "") == "wacom4100") {
-			tablet->settings.type = TabletSettings::TypeWacom4100;
-		}
-
-		// Wacom Drivers
-		else if(cmd->GetStringLower(0, "") == "wacomdrivers") {
-			tablet->settings.type = TabletSettings::TypeWacomDrivers;
-		}
-
-		LOG_INFO("Tablet type = %d\n", tablet->settings.type);
-
-		return true;
-	}));
-
-
-	//
-	// Command: InitFeature
-	//
-	AddCommand(new Command("InitFeature", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 0) return false;
-		if(tablet == NULL) return false;
-		tablet->initFeature = new BYTE[cmd->valueCount];
-		for(int i = 0; i < (int)cmd->valueCount; i++) {
-			tablet->initFeature[i] = cmd->GetInt(i, 0);
-		}
-		tablet->initFeatureLength = cmd->valueCount;
-		LOG_INFOBUFFER(tablet->initFeature, tablet->initFeatureLength, "Tablet init feature report: ");
-		return true;
-	}));
-
-
-	//
-	// Command: InitReport
-	//
-	// Initialization HID output report
-	//
-	AddCommand(new Command("InitReport", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 0) return false;
-
-		if(tablet == NULL) return false;
-		tablet->initReport = new BYTE[cmd->valueCount];
-		for(int i = 0; i < (int)cmd->valueCount; i++) {
-			tablet->initReport[i] = cmd->GetInt(i, 0);
-		}
-		tablet->initReportLength = cmd->valueCount;
-		LOG_INFOBUFFER(tablet->initReport, tablet->initReportLength, "Tablet init report: ");
-
-		return true;
-	}));
-
-
-	//
-	// Command: SetFeature, Feature
-	//
-	// Sends HID feature report
-	//
-	AddAlias("Feature", "SetFeature");
-	AddCommand(new Command("SetFeature", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 1) return false;
-		if(tablet == NULL) return false;
-		if(tablet->hidDevice == NULL) return false;
-		int length = cmd->GetInt(0, 1);
-		BYTE *buffer = new BYTE[length];
-		for(int i = 0; i < length; i++) {
-			buffer[i] = cmd->GetInt(i + 1, 0);
-		}
-		LOG_INFOBUFFER(buffer, length, "Set Feature Report (%d): ", length);
-		tablet->hidDevice->SetFeature(buffer, length);
-		LOG_INFO("HID Feature set!\n");
-		delete buffer;
-		return true;
-	}));
-
-
-
-	//
-	// Command: GetFeature
-	//
-	// Requests a HID feature report from the device
-	//
-	AddCommand(new Command("GetFeature", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 1) return false;
-		if(tablet == NULL) return false;
-		if(tablet->hidDevice == NULL) return false;
-		int length = cmd->GetInt(0, 1);
-		BYTE *buffer = new BYTE[length];
-		for(int i = 0; i < length; i++) {
-			buffer[i] = cmd->GetInt(i + 1, 0);
-		}
-		LOG_INFOBUFFER(buffer, length, "Get Feature Report (%d): ", length);
-		tablet->hidDevice->GetFeature(buffer, length);
-		LOG_INFOBUFFER(buffer, length, "Result Feature Report (%d): ", length);
-		delete buffer;
-		return true;
-	}));
-
-
-	//
-	// Command: OutputReport, Report
-	//
-	// Sends HID output report
-	//
-	AddAlias("Report", "OutputReport");
-	AddCommand(new Command("OutputReport", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 1) return false;
-		if(tablet == NULL) return false;
-		if(tablet->hidDevice == NULL) return false;
-		int length = cmd->GetInt(0, 1);
-		BYTE *buffer = new BYTE[length];
-		for(int i = 0; i < length; i++) {
-			buffer[i] = cmd->GetInt(i + 1, 0);
-		}
-		LOG_INFOBUFFER(buffer, length, "Sending HID Report: ");
-		tablet->hidDevice->Write(buffer, length);
-		LOG_INFO("Report sent!\n");
-		delete buffer;
-		return true;
-	}));
-	
-
-
-	//
-	// Command: LogTabletArea
-	//
-	// Prints current tablet area
-	//
-	AddCommand(new Command("LogTabletArea", [&](CommandLine *cmd) {
-		LOG_INFO("%s: (%0.2f mm x %0.2f mm X+%0.2f mm Y+%0.2f mm)\n",
-			cmd->GetParameterString().c_str(),
-			mapper->areaTablet.width,
-			mapper->areaTablet.height,
-			mapper->areaTablet.x,
-			mapper->areaTablet.y
-		);
-		return true;
-	}));
-
-
-	//
-	// Command: TabletArea, Area
-	//
-	// Sets the user tablet area
-	//
-	AddAlias("Area", "TabletArea");
-	AddCommand(new Command("TabletArea", [&](CommandLine *cmd) {
-
-		if(!ExecuteCommand("TabletValid")) return false;
-		mapper->areaTablet.width = cmd->GetDouble(0, mapper->areaTablet.width);
-		mapper->areaTablet.height = cmd->GetDouble(1, mapper->areaTablet.height);
-		mapper->areaTablet.x = cmd->GetDouble(2, mapper->areaTablet.x);
-		mapper->areaTablet.y = cmd->GetDouble(3, mapper->areaTablet.y);
-
-		ExecuteCommand("LogTabletArea", "Tablet area");
-		return true;
-	}));
-	
-
-
-
-	//
-	// Command: ButtonMap, Buttons
-	//
-	// Maps input buttons to output buttons
-	//
-	AddAlias("Buttons", "ButtonMap");
-	AddCommand(new Command("ButtonMap", [&](CommandLine *cmd) {
-
-		if(!ExecuteCommand("TabletValid")) return false;
-		char buttonMapBuffer[32];
-		int index = 0;
-		for(int i = 0; i < 8; i++) {
-			tablet->buttonMap[i] = cmd->GetInt(i, tablet->buttonMap[i]);
-			index += sprintf_s(buttonMapBuffer + index, 32 - index, "%d ", tablet->buttonMap[i]);
-		}
-		LOG_INFO("Button Map = %s\n", buttonMapBuffer);
-		return true;
-	}));
-	
-
-
-	//
-	// Command: ScreenArea
-	//
-	// Sets the monitor mapping
-	//
-	AddCommand(new Command("ScreenArea", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
-		mapper->areaScreen.width = cmd->GetDouble(0, mapper->areaScreen.width);
-		mapper->areaScreen.height = cmd->GetDouble(1, mapper->areaScreen.height);
-		mapper->areaScreen.x = cmd->GetDouble(2, mapper->areaScreen.x);
-		mapper->areaScreen.y = cmd->GetDouble(3, mapper->areaScreen.y);
-		LOG_INFO("Screen area = (w=%0.2f, h=%0.2f, x=%0.2f, y=%0.2f)\n",
-			mapper->areaScreen.width,
-			mapper->areaScreen.height,
-			mapper->areaScreen.x,
-			mapper->areaScreen.y
-		);
-		return true;
-	}));
-
-
-	//
-	// Command: DesktopSize
-	//
-	// Sets the desktop area that the driver output can reach
-	//
-	AddAlias("Desktop", "DesktopSize");
-	AddCommand(new Command("DesktopSize", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
-		mapper->areaVirtualScreen.width = cmd->GetDouble(0, mapper->areaVirtualScreen.width);
-		mapper->areaVirtualScreen.height = cmd->GetDouble(1, mapper->areaVirtualScreen.height);
-		LOG_INFO("Desktop size = (%0.2f px x %0.2f px)\n",
-			mapper->areaVirtualScreen.width,
-			mapper->areaVirtualScreen.height
-		);
-		return true;
-	}));
-	
-
-
-	//
-	// Command: TabletMove
-	//
-	// Move tablet area offset from the area borders
-	//
-	AddAlias("Move", "TabletMove");
-	AddCommand(new Command("TabletMove", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 0) return false;
-		if(!ExecuteCommand("TabletValid")) return false;
-		string border;
-		double offset;
-		bool moved = true;
-
-		for(int i = 0; i < cmd->valueCount; i += 2) {
-
-			border = cmd->GetStringLower(i, "");
-			offset = cmd->GetDouble(i + 1, 0.0);
-			moved = true;
-
-			if(border == "top") {
-				mapper->areaTablet.y = offset;
-			} else if(border == "bottom") {
-				mapper->areaTablet.y = tablet->settings.height - mapper->areaTablet.height - offset;
-			} else if(border == "left") {
-				mapper->areaTablet.x = offset;
-			} else if(border == "right") {
-				mapper->areaTablet.x = tablet->settings.width - mapper->areaTablet.width - offset;
-			} else {
-				moved = false;
-			}
-			if(moved) {
-				LOG_INFO("Tablet area moved to %s border with %0.2f mm margin.\n", border.c_str(), offset);
-				ExecuteCommand("LogTabletArea", "  New tablet area");
-			}
-		}
-		return true;
-	}));
-	
-
-
-	//
-	// Command: Rotate
-	//
-	// Sets tablet area rotation
-	//
-	AddCommand(new Command("Rotate", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
-
-		double value = cmd->GetDouble(0, 0);
-		mapper->SetRotation(value);
-		LOG_INFO("Rotation matrix = [%f,%f,%f,%f]\n",
-			mapper->rotationMatrix[0],
-			mapper->rotationMatrix[1],
-			mapper->rotationMatrix[2],
-			mapper->rotationMatrix[3]
-		);
-		return true;
-	}));
-
-
-	//
-	// Command: Sensitivity
-	//
-	// Sets the relative mouse output sensitivity
-	//
-	AddCommand(new Command("Sensitivity", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
-		outputManager->settings->relativeSensitivity = cmd->GetDouble(0, outputManager->settings->relativeSensitivity);
-		LOG_INFO("Relative mode sensitivity = %0.2f px/mm\n", outputManager->settings->relativeSensitivity);
-		return true;
-	}));
-
-
-	//
-	// Command: ResetDistance
-	//
-	// Sets relative mouse output reset distance
-	//
-	AddCommand(new Command("ResetDistance", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
-		outputManager->settings->relativeResetDistance = cmd->GetDouble(0, outputManager->settings->relativeResetDistance);
-		LOG_INFO("Relative mode reset distance = %0.2f mm\n", outputManager->settings->relativeResetDistance);
-		return true;
-	}));
-
-
-	//
-	// Command: OutputMode, Mode
-	//
-	// Sets driver output mode
-	//
-	AddAlias("Mode", "OutputMode");
-	AddCommand(new Command("OutputMode", [&](CommandLine *cmd) {
-
-		string mode = cmd->GetStringLower(0, "");
-
-		// Absolute mouse
-		if(mode.compare(0, 3, "abs") == 0) {
-			outputManager->SetOutputMode(OutputManager::ModeVMultiAbsolute);
-			LOG_INFO("Output Mode = Absolute\n");
-		}
-
-		// Relative mouse
-		else if(mode.compare(0, 3, "rel") == 0) {
-			outputManager->SetOutputMode(OutputManager::ModeVMultiRelative);
-			LOG_INFO("Output Mode = Relative\n");
-		}
-
-		// Digitizer
-		else if(mode.compare(0, 3, "dig") == 0 || mode.compare(0, 3, "pen") == 0) {
-
-			outputManager->SetOutputMode(OutputManager::ModeVMultiDigitizer);
-			LOG_INFO("Output Mode = Digitizer\n");
-		}
-
-		// SendInput
-		else if(mode.compare(0, 12, "sendinputabs") == 0) {
-			outputManager->SetOutputMode(OutputManager::ModeSendInputAbsolute);
-			LOG_INFO("Output Mode = SendInput Absolute\n");
-		}
-
-		// Dummy
-		else if(mode == "dummy") {
-			outputManager->SetOutputMode(OutputManager::ModeDummy);
-			LOG_INFO("Output Mode = Dummy\n");
-		}
-
-		else {
-			LOG_ERROR("Unknown output mode '%s'\n", mode.c_str());
-		}
-
-		return true;
-	}));
-
-
-	//
-	// Command: SmoothingFilter, Smoothing
-	//
-	// Sets smoothing filter parameters
-	//
-	AddAlias("Smoothing", "SmoothingFilter");
-	AddCommand(new Command("SmoothingFilter", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
-
-		double latency = cmd->GetDouble(0, tablet->smoothing.GetLatency());
-		double threshold = cmd->GetDouble(1, tablet->smoothing.threshold * 100);
-
-		threshold /= 100;
-
-		string stringValue = cmd->GetStringLower(0, "");
-
-		// Off / False
-		if(stringValue == "off" || stringValue == "false") {
-			latency = 0;
-		}
-
-		// Limits
-		if(latency < 0) latency = 1;
-		if(latency > 1000) latency = 1000;
-		if(threshold < 0.1) threshold = 0.1;
-		if(threshold > 0.99) threshold = 0.99;
-
-		// Set threshold
-		tablet->smoothing.threshold = threshold;
-
-		// Set smoothing filter latency
-		tablet->smoothing.SetLatency(latency);
-
-		// Print output
-		if(tablet->smoothing.weight < 1.0) {
-			tablet->smoothing.isEnabled = true;
-			LOG_INFO("Smoothing = %0.2f ms to reach %0.0f%% (weight = %f)\n", latency, tablet->smoothing.threshold * 100, tablet->smoothing.weight);
-		} else {
-			tablet->smoothing.isEnabled = false;
-			LOG_INFO("Smoothing = off\n");
-		}
-
-		return true;
-	}));
-	
-
-
-	//
-	// Command: GravityFilter, Gravity
-	//
-	// Sets gravity filter parameters
-	//
-	AddAlias("Gravity", "GravityFilter");
-	AddCommand(new Command("GravityFilter", [&](CommandLine *cmd) {
-
-		if(!ExecuteCommand("TabletValid")) return false;
-		double gravity = cmd->GetDouble(0, tablet->gravityFilter.gravity);
-		double friction = cmd->GetDouble(1, 0);
-		double pressureGravity = cmd->GetDouble(2, 0);
-		double pressureFriction = cmd->GetDouble(3, 0);
-
-
-		// Limits
-		if(gravity < 0) gravity = 0.0;
-		if(gravity > 100) gravity = 100;
-		if(friction < 0.1) friction = 0.1;
-		if(friction > 1000) friction = 1000;
-
-		if(gravity > 0.1) {
-			tablet->gravityFilter.isEnabled = true;
-			tablet->gravityFilter.gravity = gravity;
-			tablet->gravityFilter.friction = friction;
-			tablet->gravityFilter.pressureGravity = pressureGravity;
-			tablet->gravityFilter.pressureFriction = pressureFriction;
-		} else {
-			tablet->gravityFilter.isEnabled = false;
-			tablet->gravityFilter.gravity = 0;
-			tablet->gravityFilter.friction = 0;
-			tablet->gravityFilter.pressureGravity = 0;
-			tablet->gravityFilter.pressureFriction = 0;
-
-		}
-
-		LOG_INFO("Gravity = %s (%0.2f gravity, %0.2f friction, %0.2f pressure gravity, %0.2f pressure friction)\n",
-			tablet->gravityFilter.isEnabled ? "True" : "False",
-			tablet->gravityFilter.gravity,
-			tablet->gravityFilter.friction,
-			tablet->gravityFilter.pressureGravity,
-			tablet->gravityFilter.pressureFriction
-		);
-		return true;
-	}));
-	
-
-
-	//
-	// Command: FilterTimerInterval
-	//
-	// Sets filter timer interval
-	//
-	AddCommand(new Command("FilterTimerInterval", [&](CommandLine *cmd) {
-		if(tabletHandler == NULL) return true;
-		int oldInterval = (int)round(tabletHandler->timerInterval);
-
-		int interval = cmd->GetInt(0, oldInterval);
-
-		// 10 Hz
-		if(interval > 100) interval = 100;
-
-		// 1000 Hz
-		if(interval < 1) interval = 1;
-
-		// Change interval
-		tabletHandler->ChangeTimerInterval(interval);
-
-		LOG_INFO("Filter Timer Interval = %0.0f (%0.2f Hz)\n",
-			tabletHandler->timerInterval,
-			1000.0 / tabletHandler->timerInterval
-		);
-		return true;
-	}));
-
-
-
-	//
-	// Command: NoiseReduction, Noise
-	//
-	// Sets noise reduction filter parameters
-	//
-	AddAlias("Noise", "NoiseReduction");
-	AddCommand(new Command("NoiseReduction", [&](CommandLine *cmd) {
-
-		string stringValue = cmd->GetStringLower(0, "");
-
-		// Off / False
-		if(stringValue == "off" || stringValue == "false") {
-			tablet->noiseFilter.isEnabled = false;
-			LOG_INFO("Noise Reduction = off\n");
-
-		// Enable
-		} else {
-
-			// Position buffer length
-			int length = cmd->GetInt(0, tablet->noiseFilter.buffer.length);
-
-			// Threshold where the noise filter starts to reduce the amount of filtering.
-			double distanceThreshold = cmd->GetDouble(1, tablet->noiseFilter.distanceThreshold);
-
-			// Distance where the amount of filtering will be zero. Default maximum is 2 times the threshold.
-			double distanceMaximum = cmd->GetDouble(2, distanceThreshold * 2.0);
-
-			// Geometric median calculation iteration count
-			int iterations = cmd->GetInt(3, tablet->noiseFilter.iterations);
-
-			// Limits
-			if(length < 0) length = 0;
-			else if(length > 50) length = 50;
-
-			if(distanceThreshold < 0.0) distanceThreshold = 0.0;
-			else if(distanceThreshold > 1000) distanceThreshold = 1000;
-
-			if(distanceMaximum < 0.1) distanceMaximum = 0.1;
-			else if(distanceMaximum > 1000) distanceMaximum = 1000;
-
-			if(distanceThreshold > distanceMaximum) distanceThreshold = distanceMaximum;
-
-			if(iterations < 1) iterations = 1;
-			else if(iterations > 100) iterations = 100;
-
-			// Set noise filter values
-			tablet->noiseFilter.buffer.SetLength(length);
-			tablet->noiseFilter.distanceThreshold = distanceThreshold;
-			tablet->noiseFilter.distanceMaximum = distanceMaximum;
-			tablet->noiseFilter.iterations = iterations;
-
-			// Enable filter
-			if(tablet->noiseFilter.buffer.length > 0) {
-				tablet->noiseFilter.isEnabled = true;
-				LOG_INFO("Noise Reduction = [\n");
-				LOG_INFO("  %d samples\n", length);
-				LOG_INFO("  %0.2f mm threshold (Wacom %0.2f mm/s)\n", distanceThreshold, distanceThreshold * 133.0);
-				LOG_INFO("  %0.2f mm maximum (Wacom %0.2f mm/s)\n", distanceMaximum, distanceMaximum * 133.0);
-				LOG_INFO("  %d iterations\n", iterations);
-				LOG_INFO("]\n");
-			} else {
-				tablet->noiseFilter.isEnabled = false;
-				LOG_INFO("Noise Reduction = off\n");
-			}
-
-		}
-		return true;
-	}));
-	
-
-
-	//
-	// Command: AntiSmoothingFilter, AntiSmoothing, Anti
-	//
-	// Sets anti-smoothing filter parameters
-	//
-	AddAlias("AntiSmoothing", "AntiSmoothingFilter");
-	AddAlias("Anti", "AntiSmoothingFilter");
-	AddCommand(new Command("AntiSmoothingFilter", [&](CommandLine *cmd) {
-
-		string stringValue = cmd->GetStringLower(0, "");
-
-		// Off / False
-		if(stringValue == "off" || stringValue == "false") {
-			tablet->antiSmoothing.isEnabled = false;
-			LOG_INFO("Anti-smoothing = off\n");
-
-		// Enable
-		} else {
-
-			double shape = cmd->GetDouble(0, 1.0);
-			double compensation = cmd->GetDouble(1, 1.0);
-			bool ignoreWhenDragging = cmd->GetBoolean(2, false);
-
-			if(shape <= 0) {
-				tablet->antiSmoothing.isEnabled = false;
-				LOG_INFO("Anti-smoothing = off\n");
-			} else {
-				tablet->antiSmoothing.shape = shape;
-				tablet->antiSmoothing.compensation = compensation;
-				tablet->antiSmoothing.ignoreWhenDragging = ignoreWhenDragging;
-				tablet->antiSmoothing.isEnabled = true;
-				LOG_INFO("Anti-smoothing = Shape:%0.2f Compensation:%0.2f DragIgnore:%s\n",
-					tablet->antiSmoothing.shape,
-					tablet->antiSmoothing.compensation,
-					tablet->antiSmoothing.ignoreWhenDragging ? "true" : "false"
-				);
-			}
-		}
-		return true;
-	}));
-
-
-	//
-	// Command: FilterTester, Tester
-	//
-	AddAlias("Tester", "FilterTester");
-	AddCommand(new Command("FilterTester", [&](CommandLine *cmd) {
-
-		string filterName = cmd->GetStringLower(0, "");
-		string inputFilepath = cmd->GetStringLower(1, "tester_input.txt");
-		string outputFilepath = cmd->GetStringLower(2, "tester_output.txt");
-		TabletFilter *filter = NULL;
-		TabletFilterTester *tester = NULL;
-		char settingsString[1024];
-
-		if(filterName.compare(0, 4, "anti") == 0) {
-			LOG_DEBUG("Anti!\n");
-			filter = new TabletFilterAntiSmoothing();
-			((TabletFilterAntiSmoothing*)filter)->shape = tablet->antiSmoothing.shape;
-			((TabletFilterAntiSmoothing*)filter)->compensation = tablet->antiSmoothing.compensation;
-			((TabletFilterAntiSmoothing*)filter)->ignoreWhenDragging = tablet->antiSmoothing.ignoreWhenDragging;
-			sprintf_s(settingsString, "settings AntiSmoothing shape=%0.3f compensation=%0.3f dragignore=%s",
-				tablet->antiSmoothing.shape,
-				tablet->antiSmoothing.compensation,
-				tablet->antiSmoothing.ignoreWhenDragging ? "true" : "false"
-			);
-
-		} else if(filterName.compare(0, 5, "noise") == 0) {
-			filter = new TabletFilterNoiseReduction();
-			((TabletFilterNoiseReduction*)filter)->buffer.SetLength(tablet->noiseFilter.buffer.length);
-			((TabletFilterNoiseReduction*)filter)->distanceThreshold = tablet->noiseFilter.distanceThreshold;
-			((TabletFilterNoiseReduction*)filter)->distanceMaximum = tablet->noiseFilter.distanceMaximum;
-			((TabletFilterNoiseReduction*)filter)->iterations = tablet->noiseFilter.iterations;
-			sprintf_s(settingsString, "settings NoiseReduction buffer=%d threshold=%0.3f maximum=%0.3f iterations=%d",
-				tablet->noiseFilter.buffer.length,
-				tablet->noiseFilter.distanceThreshold,
-				tablet->noiseFilter.distanceMaximum,
-				tablet->noiseFilter.iterations
-			);
-
-
-		}
-		if(filter != NULL) {
-
-			logger.directPrint = true;
-
-			LOG_INFO("Filter test starting!\n");
-
-			tester = new TabletFilterTester(filter, inputFilepath, outputFilepath);
-			bool result = tester->Open();
-			if(!result) {
-				LOG_ERROR("Filter tester can't open files!\n");
-			}
-			tester->outputFile << settingsString << "\n";
-			tester->Run();
-			LOG_INFO("Filter test ended!\n");
-
-			logger.ProcessMessages();
-			logger.directPrint = false;
-
-		} else {
-			LOG_INFO("Usage: FilterTester <filter name>\n");
-		}
-
-		if(filter != NULL) {
-			delete filter;
-		}
-		if(tester != NULL) {
-			delete tester;
-		}
-		return true;
-	}));
-
-
-
-	//
-	// Command: Benchmark, Bench
-	//
-	AddAlias("Bench", "Benchmark");
-	AddCommand(new Command("Benchmark", [&](CommandLine *cmd) {
-
-		if(!ExecuteCommand("TabletValid")) return false;
-
-		int timeLimit;
-		int reportCount = cmd->GetInt(0, 200);
-
-		// Limit report count
-		if(reportCount < 10) reportCount = 10;
-		if(reportCount > 1000) reportCount = 1000;
-
-		// Time limit
-		timeLimit = reportCount * 10;
-		if(timeLimit < 1000) timeLimit = 1000;
-
-		// Log
-		LOG_INFO("Tablet benchmark starting in 3 seconds!\n");
-		LOG_INFO("Keep the pen stationary on top of the tablet!\n");
-		Sleep(3000);
-		LOG_INFO("Benchmark started!\n");
-
-		// Start measurement
-		tablet->measurement.Start(reportCount);
-
-		// Wait for the benchmark to finish
-		for(int i = 0; i < timeLimit / 100; i++) {
-			Sleep(100);
-
-			// Benchmark results
-			if(tablet->measurement.reportCounter <= 0) {
-
-				double width = tablet->measurement.maximum.x - tablet->measurement.minimum.x;
-				double height = tablet->measurement.maximum.y - tablet->measurement.minimum.y;
-				LOG_INFO("\n");
-				LOG_INFO("Benchmark result (%d positions):\n", tablet->measurement.totalReports);
-				LOG_INFO("  Tablet: %s\n", tablet->name.c_str());
-				LOG_INFO("  Area: %0.2f mm x %0.2f mm (%0.0f px x %0.0f px)\n",
-					mapper->areaTablet.width,
-					mapper->areaTablet.height,
-					mapper->areaScreen.width,
-					mapper->areaScreen.height
-				);
-				LOG_INFO("  X range: %0.3f mm <-> %0.3f mm\n", tablet->measurement.minimum.x, tablet->measurement.maximum.x);
-				LOG_INFO("  Y range: %0.3f mm <-> %0.3f mm\n", tablet->measurement.minimum.y, tablet->measurement.maximum.y);
-				LOG_INFO("  Width: %0.3f mm (%0.2f px)\n",
-					width,
-					mapper->areaScreen.width / mapper->areaTablet.width * width
-				);
-				LOG_INFO("  Height: %0.3f mm (%0.2f px)\n",
-					height,
-					mapper->areaScreen.height / mapper->areaTablet.height* height
-				);
-				LOG_INFO("  Noise filter threshold: %0.2f mm\n", sqrt(width * width + height * height));
-
-
-				LOG_INFO("\n");
-				LOG_STATUS("BENCHMARK %d %0.3f %0.3f %s\n", tablet->measurement.totalReports, width, height, tablet->name.c_str());
-				break;
-			}
-		}
-
-		// Stop measurement
-		tablet->measurement.Stop();
-
-		// Benchmark failed
-		if(tablet->measurement.reportCounter > 0) {
-			LOG_ERROR("Benchmark failed!\n");
-			LOG_ERROR("Not enough reports captured in %0.2f seconds!\n",
-				timeLimit / 1000.0
-			);
-		}
-
-		return true;
-	}));
-
-
-
-
-	//
-	// Command: Measure
-	//
-	AddCommand(new Command("Measure", [&](CommandLine *cmd) {
-
-		if(!ExecuteCommand("TabletValid")) return false;
-
-		int timeLimit = 30000;
-		int pointCount = cmd->GetInt(0, 1);
-
-		// Limits
-		if(pointCount < 1) pointCount = 1;
-		if(pointCount > 10) pointCount = 10;
-
-		// Log
-		LOG_INFO("Measurement started!\n");
-
-		// Start measurement
-		tablet->measurement.Start();
-
-		// Wait for the measurement to finish
-		for(int i = 0; i < timeLimit / 100; i++) {
-			Sleep(100);
-
-			// Result
-			if(tablet->measurement.pointCount >= pointCount) {
-				double distance = 0;
-				double lastX = 0;
-				double lastY = 0;
-				Vector2D point, lastPoint;
-				Vector2D minimum;
-				Vector2D maximum;
-
-				minimum.Set(10000, 10000);
-				maximum.Set(-10000, -10000);
-
-				LOG_INFO("\n");
-				LOG_INFO("Measurement results:\n");
-				for(int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
-
-					point.Set(tablet->measurement.points[pointIndex]);
-
-					// Limits
-					if(point.x < minimum.x) minimum.x = point.x;
-					if(point.x > maximum.x) maximum.x = point.x;
-					if(point.y < minimum.y) minimum.y = point.y;
-					if(point.y > maximum.y) maximum.y = point.y;
-
-					LOG_INFO(
-						"  #%d: X = %0.2f mm, Y = %0.2f mm\n",
-						pointIndex + 1,
-						point.x,
-						point.y
-					);
-
-					// Distance calculation
-					if(pointIndex > 0) {
-						distance += point.Distance(lastPoint);
-					}
-					lastPoint.Set(point);
-
-				}
-				if(tablet->measurement.pointCount > 1) {
-					LOG_INFO("  Distance: %0.2f mm\n", distance);
-					LOG_INFO("  Maximum area: %0.2f mm x %0.2f mm\n",
-						maximum.x - minimum.x, maximum.y - minimum.y
-					);
-				}
-
-				// Status message
-				char pointString[1024];
-				char pointStringIndex = 0;
-
-				// Build point string
-				for(int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
-					point.Set(tablet->measurement.points[pointIndex]);
-					pointStringIndex += sprintf_s(pointString + pointStringIndex, 1024 - pointStringIndex, "%0.3f %0.3f ", point.x, point.y);
-				}
-
-				// Output measurement results
-				LOG_STATUS("MEASUREMENT %s\n", pointString);
-
-				LOG_INFO("\n");
-
-				break;
-			}
-		}
-
-		// Stop measurement
-		tablet->measurement.Stop();
-
-		// Measurement failed
-		if(tablet->measurement.pointCount < pointCount) {
-			LOG_ERROR("Measurement failed! No enough points detected in %0.0f seconds!\n", timeLimit / 1000.0);
-			LOG_STATUS("MEASUREMENT 0\n");
-		}
-
-		return true;
-	}));
-
-
-	//
-	// Command: Debug
-	//
-	// Enable/disable debugging output
-	//
-	AddCommand(new Command("Debug", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
-		logger.debugEnabled = cmd->GetBoolean(0, logger.debugEnabled);
-		LOG_INFO("Debug logging = %s\n", logger.debugEnabled ? "True" : "False");
-		return true;
-	}));
-
-
-	//
-	// Command: Log
-	//
-	// Start/stop logging messages to a log file
-	//
-	AddCommand(new Command("Log", [&](CommandLine *cmd) {
-		string logPath = cmd->GetString(0, "log.txt");
-		if(!cmd->GetBoolean(0, true)) {
-			logger.CloseLogFile();
-			LOG_INFO("Log file '%s' closed.\n", logger.logFilename.c_str());
-		} else if(logger.OpenLogFile(logPath)) {
-			LOG_INFO("Log file '%s' opened.\n", logPath.c_str());
-		} else {
-			LOG_ERROR("Cant open log file!\n");
-		}
-		return true;
-	}));
-
-
-	//
-	// Command: Wait
-	//
-	AddCommand(new Command("Wait", [&](CommandLine *cmd) {
-		int waitTime = cmd->GetInt(0, 0);
-		Sleep(waitTime);
-		return true;
-	}));
-
-
-	//
-	// Command: LogDirect
-	//
-	// Enables/disables direct logging without queuing the messages.
-	//
-	AddCommand(new Command("LogDirect", [&](CommandLine *cmd) {
-		logger.ProcessMessages();
-		logger.directPrint = cmd->GetBoolean(0, logger.directPrint);
-		logger.ProcessMessages();
-
-		LOG_INFO("Log direct print = %s\n", logger.directPrint ? "True" : "False");
-		return true;
-	}));
-
-
-	//
-	// Command: Output
-	//
-	// Enables/disables VMulti output
-	//
-	AddCommand(new Command("Output", [&](CommandLine *cmd) {
-		vmulti->outputEnabled = cmd->GetBoolean(0, vmulti->outputEnabled);
-		LOG_INFO("Output enabled = %s\n", vmulti->outputEnabled ? "True" : "False");
-		return true;
-	}));
-
-
-	//
-	// Command: Information, Info
-	//
-	// Shows driver information
-	//
-	AddAlias("Info", "Information");
-	AddCommand(new Command("Information", [&](CommandLine *cmd) {
-
-		if(!ExecuteCommand("TabletValid")) return false;
-
-		char stringBuffer[64];
-		int maxLength = sizeof(stringBuffer) - 1;
-		int stringIndex = 0;
-
-		LOG_INFO("\n");
-		LOG_INFO("Tablet: %s\n", tablet->name.c_str());
-		LOG_INFO("  Width = %0.2f mm\n", tablet->settings.width);
-		LOG_INFO("  Height = %0.2f mm\n", tablet->settings.height);
-		LOG_INFO("  Max X = %d\n", tablet->settings.maxX);
-		LOG_INFO("  Max Y = %d\n", tablet->settings.maxY);
-		LOG_INFO("  Max Pressure = %d\n", tablet->settings.maxPressure);
-		LOG_INFO("  Click Pressure = %d\n", tablet->settings.clickPressure);
-		LOG_INFO("  Keep Tip Down = %d reports\n", tablet->settings.keepTipDown);
-		LOG_INFO("  Report Id = 0x%02X\n", tablet->settings.reportId);
-		LOG_INFO("  Report Length = %d bytes\n", tablet->settings.reportLength);
-		LOG_INFO("  Detect Mask = 0x%02X\n", tablet->settings.detectMask);
-		LOG_INFO("  Ignore Mask = 0x%02X\n", tablet->settings.ignoreMask);
-
-		for(int i = 0; i < 8; i++) {
-			stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "%d ", tablet->buttonMap[i]);
-		}
-		LOG_INFO("  Button Map = %s\n", stringBuffer);
-
-
-		if(tablet->initFeatureLength > 0) {
-			LOG_INFOBUFFER(tablet->initFeature, tablet->initFeatureLength, "  Tablet init feature report: ");
-		}
-		if(tablet->initReportLength > 0) {
-			LOG_INFOBUFFER(tablet->initReport, tablet->initReportLength, "  Tablet init report: ");
-		}
-		LOG_INFO("\n");
-		LOG_INFO("Area:\n");
-		LOG_INFO("  Desktop = %0.0fpx x %0.0fpx\n",
-			mapper->areaVirtualScreen.width, mapper->areaVirtualScreen.height
-		);
-		LOG_INFO("  Screen Map = %0.0fpx x %0.0fpx @ X%+0.0fpx, Y%+0.0fpx\n",
-			mapper->areaScreen.width, mapper->areaScreen.height,
-			mapper->areaScreen.x, mapper->areaScreen.y
-		);
-		LOG_INFO("  Tablet =  %0.2fmm x %0.2fmm @ Min(%0.2fmm, %0.2fmm) Max(%0.2fmm, %0.2fmm)\n",
-			mapper->areaTablet.width, mapper->areaTablet.height,
-			mapper->areaTablet.x, mapper->areaTablet.y,
-			mapper->areaTablet.width + mapper->areaTablet.x, mapper->areaTablet.height + mapper->areaTablet.y
-		);
-		LOG_INFO("  Rotation matrix = [%f,%f,%f,%f]\n",
-			mapper->rotationMatrix[0],
-			mapper->rotationMatrix[1],
-			mapper->rotationMatrix[2],
-			mapper->rotationMatrix[3]
-		);
-		LOG_INFO("\n");
-
-		return true;
-	}));
-
-
-
-	//
-	// Command: Status
-	//
-	// Outputs driver infor as status messages
-	//
-	AddCommand(new Command("Status", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
-
-		LOG_STATUS("TABLET %s\n", tablet->name.c_str());
-
-		if(tablet->hidDevice != NULL) {
-			LOG_STATUS("HID %04X %04X %04X %04X\n",
-				tablet->hidDevice->vendorId,
-				tablet->hidDevice->productId,
-				tablet->hidDevice->usagePage,
-				tablet->hidDevice->usage
-			);
-		} else if(tablet->usbDevice != NULL) {
-			LOG_STATUS("USB %d %s\n",
-				tablet->usbDevice->stringId,
-				tablet->usbDevice->stringMatch.c_str()
-			);
-		}
-		LOG_STATUS("WIDTH %0.5f\n", tablet->settings.width);
-		LOG_STATUS("HEIGHT %0.5f\n", tablet->settings.height);
-		LOG_STATUS("MAX_X %d\n", tablet->settings.maxX);
-		LOG_STATUS("MAX_Y %d\n", tablet->settings.maxY);
-		LOG_STATUS("MAX_PRESSURE %d\n", tablet->settings.maxPressure);
-
-		return true;
-	}));
-
-
-	//
-	// Command: Include
-	//
-	// Reads commands from a file and stops if tablet is redefined.
-	//
-	AddCommand(new Command("Include", [&](CommandLine *cmd) {
-		string filename = cmd->GetString(0, "");
-		if(filename == "") {
-			LOG_ERROR("Invalid filename '%s'!\n", filename.c_str());
-			return false;
-		} else {
-			if(ExecuteFile(filename)) {
-			} else {
-				LOG_ERROR("Can't open file '%s'\n", filename.c_str());
-				return false;
-			}
-		}
-		return true;
-	}));
-
-
-	//
-	// Command: ListCommands, List
-	//
-	// List all commands
-	//
-	AddAlias("List", "ListCommands");
-	AddCommand(new Command("ListCommands", [&](CommandLine *cmd) {
-
-		LOG_INFO("Commands: \n");
-		for(pair<string, Command*> cmdPair : commands) {
-			string commandName = cmdPair.second->name;
-			LOG_INFO("  %s\n", commandName.c_str());
-		}
-		
-		return true;
-	}));
-
-
-
+	CreateDeviceCommands();
+	CreateTabletCommands();
+	CreateFilterCommands();
+	CreateOtherCommands();
 
 }
 
@@ -1464,6 +106,16 @@ bool CommandHandler::ExecuteCommand(CommandLine *cmd) {
 	return ExecuteCommand(cmd->command, cmd);
 }
 
+//
+// Execute a command using command and parameter string
+//
+bool CommandHandler::ExecuteCommand(string command, string parameters) {
+	CommandLine *cmd = new CommandLine(command + " " + parameters);
+	bool result = ExecuteCommand(command, cmd);
+	delete cmd;
+	return result;
+}
+
 //
 // Execute a command
 //
@@ -1505,7 +157,18 @@ bool CommandHandler::ExecuteFile(string filename) {
 		//
 		// Do not redefine tablet if one is already open
 		//
-		if(cmd->is("Tablet") && tablet != NULL && tablet->IsConfigured()) {
+		if(
+			(
+				cmd->is("Tablet")
+				||
+				cmd->is("USBTablet")
+				||
+				cmd->is("HIDTablet")
+				)
+			&&
+			tablet != NULL &&
+			tablet->IsConfigured()
+		) {
 			LOG_INFO(">> %s\n", cmd->line.c_str());
 			LOG_INFO("Tablet is already defined!\n");
 			delete cmd;
diff --git a/TabletDriverService/CommandHandler.h b/TabletDriverService/CommandHandler.h
index 2b3d96d..6e0400d 100644
--- a/TabletDriverService/CommandHandler.h
+++ b/TabletDriverService/CommandHandler.h
@@ -8,15 +8,22 @@
 
 class CommandHandler {
 public:
-	map<string, Command*> commands;	
+	map<string, Command*> commands;
 	map<string, string> aliases;
+	map<string, string> aliasNames;
+	map<string, string> help;
 
 	CommandHandler();
 	~CommandHandler();
 
 	bool AddCommand(Command *command);
 	bool AddAlias(string commandName, string alias);
+	bool AddHelp(string commandName, string line);
 	void CreateCommands();
+	void CreateTabletCommands();
+	void CreateFilterCommands();
+	void CreateDeviceCommands();
+	void CreateOtherCommands();
 
 	bool IsValidCommand(string command);
 	bool ExecuteCommand(string command);
diff --git a/TabletDriverService/CommandLine.cpp b/TabletDriverService/CommandLine.cpp
index 4b84cf1..3004085 100644
--- a/TabletDriverService/CommandLine.cpp
+++ b/TabletDriverService/CommandLine.cpp
@@ -67,7 +67,7 @@ int CommandLine::Parse(string line) {
 	char currentChar;
 	char previousChar = 0;
 	char splitChars[] = " ,:(){}[]";
-	char endChars[] = {'\r', '\n', ';', 0};
+	char endChars[] = { '\r', '\n', ';', 0 };
 	char commentChar = '#';
 	char escapeChar = '\\';
 	char enclosingChar = '"';
@@ -152,7 +152,8 @@ int CommandLine::Parse(string line) {
 				item = "";
 				itemLength = 0;
 				itemCount++;
-			} else {
+			}
+			else {
 				item = "";
 				itemLength = 0;
 			}
@@ -163,11 +164,15 @@ int CommandLine::Parse(string line) {
 			}
 
 			// Add text to item
-		} else if(currentChar >= 32) {
+		}
+		else if(currentChar >= 32) {
 			if(itemCount == 0 && currentChar == '=') {
-			} else if(isEnclosingChar) {
-			} else if(currentChar == escapeChar && !isEnclosed) {
-			} else {
+			}
+			else if(isEnclosingChar) {
+			}
+			else if(currentChar == escapeChar && !isEnclosed) {
+			}
+			else {
 				item.push_back(currentChar);
 				itemLength++;
 			}
@@ -180,7 +185,8 @@ int CommandLine::Parse(string line) {
 	if(itemCount > 0) {
 		command = items[0];
 		isValid = true;
-	} else {
+	}
+	else {
 		isValid = false;
 	}
 
diff --git a/TabletDriverService/HIDDevice.cpp b/TabletDriverService/HIDDevice.cpp
index a3073ff..d64ad11 100644
--- a/TabletDriverService/HIDDevice.cpp
+++ b/TabletDriverService/HIDDevice.cpp
@@ -12,10 +12,12 @@ HIDDevice::HIDDevice(USHORT VendorId, USHORT ProductId, USHORT UsagePage, USHORT
 	if(this->OpenDevice(&this->_deviceHandle, this->vendorId, this->productId, this->usagePage, this->usage)) {
 		isOpen = true;
 	}
+	isReading = false;
 }
 
 HIDDevice::HIDDevice() {
 	isOpen = false;
+	isReading = false;
 	_deviceHandle = NULL;
 }
 
@@ -99,7 +101,8 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 						for(int i = 0; i < (int)sizeof(stringBytes); i += 2) {
 							if(stringBytes[i]) {
 								manufacturerName.push_back(stringBytes[i]);
-							} else {
+							}
+							else {
 								break;
 							}
 						}
@@ -110,7 +113,8 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 						for(int i = 0; i < (int)sizeof(stringBytes); i += 2) {
 							if(stringBytes[i]) {
 								productName.push_back(stringBytes[i]);
-							} else {
+							}
+							else {
 								break;
 							}
 						}
@@ -141,9 +145,10 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 					hidCapabilities.Usage == usage
 				) {
 					resultHandle = deviceHandle;
+				}
 
 				// Close the HID handle if the device is incorrect
-				} else {
+				else {
 					CloseHandle(deviceHandle);
 				}
 
@@ -175,6 +180,7 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 int HIDDevice::Read(void *buffer, int length) {
 	//return HidD_GetInputReport(_deviceHandle, buffer, length);
 	DWORD bytesRead;
+	isReading = true;
 	if(ReadFile(_deviceHandle, buffer, length, &bytesRead, 0)) {
 		return bytesRead;
 	}
@@ -200,6 +206,22 @@ bool HIDDevice::GetFeature(void *buffer, int length) {
 	return HidD_GetFeature(_deviceHandle, buffer, length);
 }
 
+// String request
+int HIDDevice::StringRequest(UCHAR stringId, UCHAR * buffer, int length)
+{
+	if(HidD_GetIndexedString(_deviceHandle, stringId, buffer, length)) {
+		int realLength = length;
+		for(int i = 0; i < length; i += 2) {
+			if(buffer[i] == 0) {
+				realLength = i;
+				break;
+			}
+		}
+		return realLength;
+	}
+	return 0;
+}
+
 // Close the device
 void HIDDevice::CloseDevice() {
 	if(isOpen && _deviceHandle != NULL && _deviceHandle != INVALID_HANDLE_VALUE) {
diff --git a/TabletDriverService/HIDDevice.h b/TabletDriverService/HIDDevice.h
index ee0b917..d6af4f8 100644
--- a/TabletDriverService/HIDDevice.h
+++ b/TabletDriverService/HIDDevice.h
@@ -19,6 +19,7 @@ class HIDDevice {
 public:
 	bool isOpen;
 	bool debugEnabled;
+	bool isReading;
 	USHORT vendorId;
 	USHORT productId;
 	USHORT usagePage;
@@ -32,5 +33,6 @@ class HIDDevice {
 	int Write(void *buffer, int length);
 	bool SetFeature(void *buffer, int length);
 	bool GetFeature(void *buffer, int length);
+	int StringRequest(UCHAR stringId, UCHAR *buffer, int length);
 	void CloseDevice();
 };
\ No newline at end of file
diff --git a/TabletDriverService/Logger.cpp b/TabletDriverService/Logger.cpp
index 1c1ddda..c057725 100644
--- a/TabletDriverService/Logger.cpp
+++ b/TabletDriverService/Logger.cpp
@@ -14,22 +14,35 @@ Logger::Logger() {
 
 void Logger::OutputMessage(LogItem *message) {
 	char timeBuffer[64];
+	char levelNameBuffer[128];
 	char moduleBuffer[128];
 
-	strftime(timeBuffer, 64, "%Y-%m-%d %H:%M:%S", &message->time);
+
+	int index = strftime(timeBuffer, 64, "[%Y-%m-%d %H:%M:%S", &message->time);
+	sprintf_s(timeBuffer + index, 64 - index, ".%03d] ", message->systemTime.wMilliseconds);
+
 	if(message->module.length() > 0) {
-		sprintf_s(moduleBuffer, " [%s]", message->module.c_str());
-	} else {
+		sprintf_s(moduleBuffer, "[%s] ", message->module.c_str());
+	}
+	else {
 		moduleBuffer[0] = 0;
 	}
 
+	if(message->level != LogLevelInfo) {
+		sprintf_s(levelNameBuffer, "[%s] ", levelNames[message->level].c_str());
+	}
+	else {
+		levelNameBuffer[0] = 0;
+	}
+
+
 	try {
-		cout << timeBuffer << moduleBuffer << " [" << levelNames[message->level] << "] " << message->text << flush;
+		cout << timeBuffer << levelNameBuffer << moduleBuffer << message->text << flush;
 	} catch(exception) {
 		exit(1);
 	}
 	if(logFile && logFile.is_open()) {
-		logFile << timeBuffer << moduleBuffer << " [" << levelNames[message->level] << "] " << message->text << flush;
+		logFile << timeBuffer << levelNameBuffer << moduleBuffer << message->text << flush;
 	}
 }
 
@@ -92,6 +105,7 @@ void Logger::LogMessage(int level, string module, const char *fmt, ...) {
 		// Add message
 		LogItem logItem;
 		localtime_s(&logItem.time, &t);
+		GetSystemTime(&logItem.systemTime);
 		logItem.level = level;
 		logItem.module = module;
 		logItem.text = message;
@@ -131,7 +145,8 @@ void Logger::LogBuffer(int level, string module, void *buffer, int length, const
 		if(newLine) {
 			if(index < maxLength) index += snprintf(message + index, maxLength - index, "  { ");
 
-		} else {
+		}
+		else {
 			if(index < maxLength) index += snprintf(message + index, maxLength - index, "{ ");
 		}
 
@@ -144,7 +159,8 @@ void Logger::LogBuffer(int level, string module, void *buffer, int length, const
 				if(index < maxLength) index += snprintf(message + index, maxLength - index, "0x%02x", ((unsigned char*)buffer)[i]);
 
 				//
-			} else {
+			}
+			else {
 				if(index < maxLength) index += snprintf(message + index, maxLength - index, "0x%02x, ", ((unsigned char*)buffer)[i]);
 
 			}
@@ -166,6 +182,7 @@ void Logger::LogBuffer(int level, string module, void *buffer, int length, const
 		// Add message
 		LogItem logItem;
 		localtime_s(&logItem.time, &t);
+		GetSystemTime(&logItem.systemTime);
 		logItem.level = level;
 		logItem.module = module;
 		logItem.text = message;
@@ -205,7 +222,7 @@ void Logger::run() {
 		// Wait for messages
 		if(newMessage) {
 
-		// Set new message flag to false
+			// Set new message flag to false
 			newMessage = false;
 
 			// Process messages
diff --git a/TabletDriverService/Logger.h b/TabletDriverService/Logger.h
index a3cfe38..2b301ad 100644
--- a/TabletDriverService/Logger.h
+++ b/TabletDriverService/Logger.h
@@ -75,6 +75,7 @@ class Logger {
 	};
 	typedef struct {
 		tm time;
+		SYSTEMTIME systemTime;
 		int level;
 		string module;
 		string text;
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index 7c6952e..ecb6cdf 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -8,9 +8,8 @@
 #include "Tablet.h"
 #include "ScreenMapper.h"
 #include "CommandLine.h"
-#include "ProcessCommand.h"
 
-#define LOG_MODULE "Main"
+#define LOG_MODULE ""
 #include "Logger.h"
 
 #pragma comment(lib, "hid.lib")
@@ -25,23 +24,9 @@ VMulti *vmulti;
 CommandHandler *commandHandler;
 OutputManager *outputManager;
 ScreenMapper *mapper;
-//thread *tabletThread;
-
-
-//
-// Init console parameters
-//
-void InitConsole() {
-	HANDLE inputHandle;
-	DWORD consoleMode = 0;
-	inputHandle = GetStdHandle(STD_INPUT_HANDLE);
-	GetConsoleMode(inputHandle, &consoleMode);
-	consoleMode = (consoleMode & ~ENABLE_QUICK_EDIT_MODE);
-	consoleMode = (consoleMode & ~ENABLE_MOUSE_INPUT);
-	consoleMode = (consoleMode & ~ENABLE_WINDOW_INPUT);
-	SetConsoleMode(inputHandle, consoleMode);
-}
 
+void InitConsole();
+bool ProcessCommand(CommandLine *cmd);
 
 //
 // Main
@@ -56,27 +41,30 @@ int main(int argc, char**argv) {
 	vmulti = NULL;
 	tablet = NULL;
 	tabletHandler = NULL;
-	//tabletThread = NULL;
-	outputManager = new OutputManager();
-
+	
 	// Init console
 	InitConsole();
 
-	// Screen mapper
-	mapper = new ScreenMapper(tablet);
-	mapper->SetRotation(0);
+	// Tablet handler
+	tabletHandler = new TabletHandler();
 
 	// Command handler
 	commandHandler = new CommandHandler();
 	commandHandler->CreateCommands();
 
+	// Screen mapper
+	mapper = new ScreenMapper(tablet);
+	mapper->SetRotation(0);
+
+	// Output manager
+	outputManager = new OutputManager();
+
 	//
 	// Command: Start
 	//
 	// Starts the driver
 	//
 	commandHandler->AddCommand(new Command("Start", [&](CommandLine *cmd) {
-		LOG_INFO(">> %s\n", cmd->line.c_str());
 
 		if(running) {
 			LOG_INFO("Driver is already started!\n");
@@ -108,26 +96,12 @@ int main(int argc, char**argv) {
 		// Set running state
 		running = true;
 
-
 		LOG_INFO("TabletDriver started!\n");
 		commandHandler->ExecuteCommand("Status");
 
 		return true;
 	}));
 
-	//
-	// Command: Echo
-	//
-	commandHandler->AddCommand(new Command("Echo", [&](CommandLine *cmd) {
-		if(cmd->valueCount > 0) {
-			LOG_INFO("%s\n", cmd->line.c_str() + 5);
-		} else {
-			LOG_INFO("\n");
-		}
-		return true;
-	}));
-
-
 	//
 	// Command: Exit
 	//
@@ -163,9 +137,6 @@ int main(int argc, char**argv) {
 		LOG_ERROR("Can't open '%s'\n", filename.c_str());
 	}
 
-	// Create tablet handler
-	tabletHandler = new TabletHandler();
-
 	//
 	// Main loop that reads input from the console.
 	//
@@ -184,13 +155,14 @@ int main(int argc, char**argv) {
 		// Process valid lines
 		if(line.length() > 0) {
 			cmd = new CommandLine(line);
-			
+
 			//
 			// Hide echo input 
 			//
 			if(cmd->is("Echo")) {
 				commandHandler->ExecuteCommand(cmd);
-			} else {
+			}
+			else {
 				ProcessCommand(cmd);
 			}
 
@@ -216,7 +188,7 @@ void CleanupAndExit(int code) {
 		delete vmulti;
 		*/
 
-	// Stop filter timer
+		// Stop filter timer
 	if(tabletHandler != NULL) {
 		tabletHandler->StopTimer();
 	}
@@ -234,3 +206,52 @@ void CleanupAndExit(int code) {
 	exit(code);
 }
 
+
+//
+// Process Command
+//
+bool ProcessCommand(CommandLine *cmd) {
+
+	bool logResult = false;
+
+	LOG_INFO(">> %s\n", cmd->line.c_str());
+
+	//
+	// Execute command handler command
+	//
+	if(cmd->command.back() == '?') {
+		logResult = true;
+		cmd->command.pop_back();
+	}
+	if(commandHandler->IsValidCommand(cmd->command)) {
+		bool result = commandHandler->ExecuteCommand(cmd->command, cmd);
+		if(logResult) {
+			LOG_INFO("Result: %s\n", result ? "True" : "False");
+		}
+		return result;
+
+	}
+
+	// Unknown
+	else if(cmd->isValid) {
+		LOG_WARNING("Unknown command: %s\n", cmd->line.c_str());
+	}
+
+	return true;
+}
+
+
+//
+// Init console parameters
+//
+void InitConsole() {
+	HANDLE inputHandle;
+	DWORD consoleMode = 0;
+	inputHandle = GetStdHandle(STD_INPUT_HANDLE);
+	GetConsoleMode(inputHandle, &consoleMode);
+	consoleMode = (consoleMode & ~ENABLE_QUICK_EDIT_MODE);
+	consoleMode = (consoleMode & ~ENABLE_MOUSE_INPUT);
+	consoleMode = (consoleMode & ~ENABLE_WINDOW_INPUT);
+	SetConsoleMode(inputHandle, consoleMode);
+}
+
diff --git a/TabletDriverService/OutputSendInputAbsolute.cpp b/TabletDriverService/OutputSendInputAbsolute.cpp
index e873323..6600a3f 100644
--- a/TabletDriverService/OutputSendInputAbsolute.cpp
+++ b/TabletDriverService/OutputSendInputAbsolute.cpp
@@ -52,7 +52,7 @@ bool OutputSendInputAbsolute::Set(TabletState *tabletState) {
 	// Map position to virtual screen (values between 0 and 1)
 	mapper->GetScreenPosition(&x, &y);
 
-	
+
 
 	if(logger.debugEnabled) {
 		LOG_DEBUG("%0.0f,%0.0f | %0.0f,%0.0f | %0.0f,%0.0f\n",
@@ -116,7 +116,7 @@ bool OutputSendInputAbsolute::Write() {
 //
 bool OutputSendInputAbsolute::Reset() {
 
-	INPUT input = {0};
+	INPUT input = { 0 };
 	input.type = INPUT_MOUSE;
 	input.mi.mouseData = 0;
 	input.mi.dx = 0;
@@ -125,7 +125,7 @@ bool OutputSendInputAbsolute::Reset() {
 	if(lastButtons & 0x01) input.mi.dwFlags |= MOUSEEVENTF_LEFTUP;
 	if(lastButtons & 0x02) input.mi.dwFlags |= MOUSEEVENTF_RIGHTUP;
 	if(lastButtons & 0x04) input.mi.dwFlags |= MOUSEEVENTF_MIDDLEUP;
-	
+
 	SendInput(1, &input, sizeof(INPUT));
 
 	return true;
diff --git a/TabletDriverService/OutputSendInputAbsolute.h b/TabletDriverService/OutputSendInputAbsolute.h
index f8c7311..7a4c97a 100644
--- a/TabletDriverService/OutputSendInputAbsolute.h
+++ b/TabletDriverService/OutputSendInputAbsolute.h
@@ -11,8 +11,8 @@ class OutputSendInputAbsolute : public Output {
 		double virtualY = GetSystemMetrics(SM_YVIRTUALSCREEN);
 	} monitorInfo;
 
-	INPUT input = {0};
-	INPUT lastInput = {0};
+	INPUT input = { 0 };
+	INPUT lastInput = { 0 };
 	unsigned char lastButtons;
 
 
diff --git a/TabletDriverService/OutputSettings.cpp b/TabletDriverService/OutputSettings.cpp
index ee8674b..90ec696 100644
--- a/TabletDriverService/OutputSettings.cpp
+++ b/TabletDriverService/OutputSettings.cpp
@@ -4,7 +4,8 @@
 OutputSettings::OutputSettings() {
 	relativeSensitivity = 1;
 	relativeResetDistance = 25;
-	ResetRelativeState(0, 0);
+	relativeResetTime = 100;
+	ResetRelativeState(0, 0, chrono::high_resolution_clock::now());
 }
 
 
@@ -12,10 +13,10 @@ OutputSettings::~OutputSettings() {
 }
 
 
-void OutputSettings::ResetRelativeState(double x, double y) {
+void OutputSettings::ResetRelativeState(double x, double y, chrono::high_resolution_clock::time_point time) {
 	relativeState.targetPosition.Set(x, y);
 	relativeState.lastPosition.Set(x, y);
 	relativeState.pixelPosition.x = (int)x;
 	relativeState.pixelPosition.y = (int)y;
-
+	relativeState.lastTime = time;
 }
diff --git a/TabletDriverService/OutputSettings.h b/TabletDriverService/OutputSettings.h
index e9b4ecd..a4aae60 100644
--- a/TabletDriverService/OutputSettings.h
+++ b/TabletDriverService/OutputSettings.h
@@ -13,14 +13,16 @@ class OutputSettings {
 
 	struct {
 		PixelPosition pixelPosition;
-		Vector2D lastPosition;
 		Vector2D targetPosition;
+		Vector2D lastPosition;
+		chrono::high_resolution_clock::time_point lastTime;
 	} relativeState;
 
 	double relativeSensitivity;
 	double relativeResetDistance;
+	double relativeResetTime;
 
-	void ResetRelativeState(double x, double y);
+	void ResetRelativeState(double x, double y, chrono::high_resolution_clock::time_point time);
 
 	OutputSettings();
 	~OutputSettings();
diff --git a/TabletDriverService/OutputVMultiAbsolute.cpp b/TabletDriverService/OutputVMultiAbsolute.cpp
index e4c7d8e..c9296ea 100644
--- a/TabletDriverService/OutputVMultiAbsolute.cpp
+++ b/TabletDriverService/OutputVMultiAbsolute.cpp
@@ -44,10 +44,6 @@ bool OutputVMultiAbsolute::Set(TabletState *tabletState) {
 	report.wheel = 0;
 	vmulti->SetReport(&report, sizeof(report));
 
-	if(logger.debugEnabled) {
-		LOG_DEBUGBUFFER(&report, 9, "Report: ");
-	}
-
 	return true;
 }
 
@@ -58,6 +54,12 @@ bool OutputVMultiAbsolute::Write() {
 
 	// Write report to VMulti device if report has changed
 	if(vmulti->HasReportChanged()) {
+
+		// Debug message
+		if(logger.debugEnabled) {
+			LOG_DEBUGBUFFER(&report, 9, "Report: ");
+		}
+
 		vmulti->WriteReport();
 		return true;
 	}
diff --git a/TabletDriverService/OutputVMultiDigitizer.cpp b/TabletDriverService/OutputVMultiDigitizer.cpp
index 90f7ec1..baf949e 100644
--- a/TabletDriverService/OutputVMultiDigitizer.cpp
+++ b/TabletDriverService/OutputVMultiDigitizer.cpp
@@ -38,16 +38,16 @@ bool OutputVMultiDigitizer::Set(TabletState *tabletState) {
 	// Map position to virtual screen (values between 0 and 1)
 	mapper->GetScreenPosition(&x, &y);
 
+	// Offset coordinates by one pixel
+	double offsetX = -(32767.0 / mapper->areaVirtualScreen.width);
+	double offsetY = -(32767.0 / mapper->areaVirtualScreen.height);
+
 	report.buttons = tabletState->buttons | 0x20;
-	report.x = (USHORT)round(x * 32767.0);
-	report.y = (USHORT)round(y * 32767.0);
+	report.x = (USHORT)round(x * 32767.0 + offsetX);
+	report.y = (USHORT)round(y * 32767.0 + offsetY);
 	report.pressure = (USHORT)round(tabletState->pressure * 2047.0);
 	vmulti->SetReport(&report, sizeof(report));
 
-	if(logger.debugEnabled) {
-		LOG_DEBUGBUFFER(&report, 9, "Report: ");
-	}
-
 	return true;
 }
 
@@ -59,6 +59,12 @@ bool OutputVMultiDigitizer::Write() {
 
 	// Write report to VMulti device if report has changed
 	if(vmulti->HasReportChanged()) {
+
+		// Debug message
+		if(logger.debugEnabled) {
+			LOG_DEBUGBUFFER(&report, 10, "Report: ");
+		}
+
 		vmulti->WriteReport();
 		return true;
 	}
diff --git a/TabletDriverService/OutputVMultiRelative.cpp b/TabletDriverService/OutputVMultiRelative.cpp
index 923388d..e904e86 100644
--- a/TabletDriverService/OutputVMultiRelative.cpp
+++ b/TabletDriverService/OutputVMultiRelative.cpp
@@ -57,13 +57,30 @@ bool OutputVMultiRelative::Set(TabletState *tabletState) {
 	dy = y - settings->relativeState.lastPosition.y;
 	distance = sqrt(dx * dx + dy * dy);
 
-	// Reset relative position when the move distance is long enough
-	if(distance > settings->relativeResetDistance) {
-		settings->ResetRelativeState(x, y);
+
+	//
+	// Reset relative state depenging on the reset time (milliseconds)
+	//
+	if(settings->relativeResetTime > 0) {
+		double timeDelta = (tabletState->time - settings->relativeState.lastTime).count() / 1000000.0;
+		if(timeDelta > settings->relativeResetTime) {
+			settings->ResetRelativeState(x, y, tabletState->time);
+			dx = 0;
+			dy = 0;
+			distance = 0;
+		}
+	}
+
+	//
+	// Reset relative position when the movement distance is long enough
+	//
+	else if(distance > settings->relativeResetDistance) {
+		settings->ResetRelativeState(x, y, tabletState->time);
 		dx = 0;
 		dy = 0;
 	}
 
+
 	// Sensitivity
 	dx *= settings->relativeSensitivity;
 	dy *= settings->relativeSensitivity;
@@ -85,17 +102,21 @@ bool OutputVMultiRelative::Set(TabletState *tabletState) {
 	settings->relativeState.pixelPosition.x += relativeX;
 	settings->relativeState.pixelPosition.y += relativeY;
 
-	// Last position
+	// Set last position
 	settings->relativeState.lastPosition.Set(x, y);
 
+	// Set last time if movement distance is long enough
+	if(distance > 0.1) {
+		settings->relativeState.lastTime = tabletState->time;
+	}
+
+
 	// Set relative mouse report output
 	report.x = (char)relativeX;
 	report.y = (char)relativeY;
 
 	vmulti->SetReport(&report, sizeof(report));
-	if(logger.debugEnabled) {
-		LOG_DEBUGBUFFER(&report, 10, "Report: ");
-	}
+
 	return true;
 }
 
@@ -106,6 +127,9 @@ bool OutputVMultiRelative::Write() {
 
 	// Write report to VMulti device if report has changed
 	if(vmulti->HasReportChanged() || report.x != 0 || report.y != 0) {
+		if(logger.debugEnabled) {
+			LOG_DEBUGBUFFER(&report, 10, "Report: ");
+		}
 		vmulti->WriteReport();
 		return true;
 	}
diff --git a/TabletDriverService/PositionRingBuffer.cpp b/TabletDriverService/PositionRingBuffer.cpp
index c3ecfa2..282148f 100644
--- a/TabletDriverService/PositionRingBuffer.cpp
+++ b/TabletDriverService/PositionRingBuffer.cpp
@@ -27,7 +27,8 @@ PositionRingBuffer::~PositionRingBuffer() {
 void PositionRingBuffer::SetLength(int len) {
 	if(len > maxLength) {
 		length = maxLength;
-	} else {
+	}
+	else {
 		length = len;
 	}
 }
diff --git a/TabletDriverService/ProcessCommand.cpp b/TabletDriverService/ProcessCommand.cpp
deleted file mode 100644
index f9df670..0000000
--- a/TabletDriverService/ProcessCommand.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "stdafx.h"
-#include "ProcessCommand.h"
-
-#define LOG_MODULE ""
-#include "Logger.h"
-
-
-//
-// Process Command
-//
-bool ProcessCommand(CommandLine *cmd) {
-
-	bool logResult = false;
-
-	LOG_INFO(">> %s\n", cmd->line.c_str());
-
-	//
-	// Execute command handler command
-	//
-	if(cmd->command.back() == '?') {
-		logResult = true;
-		cmd->command.pop_back();
-	}
-	if(commandHandler->IsValidCommand(cmd->command)) {
-		bool result = commandHandler->ExecuteCommand(cmd->command, cmd);
-		if(logResult) {
-			LOG_INFO("Result: %s\n", result ? "True" : "False");
-		}
-		return result;
-
-	}
-
-	// Unknown
-	else if(cmd->isValid) {
-		LOG_WARNING("Unknown command: %s\n", cmd->line.c_str());
-	}
-
-	return true;
-}
-
diff --git a/TabletDriverService/ProcessCommand.h b/TabletDriverService/ProcessCommand.h
deleted file mode 100644
index d87ffa3..0000000
--- a/TabletDriverService/ProcessCommand.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-#include "CommandLine.h"
-#include "TabletFilterTester.h"
-
-bool ProcessCommand(CommandLine *cmd);
diff --git a/TabletDriverService/ScreenMapper.cpp b/TabletDriverService/ScreenMapper.cpp
index 0af5318..bace894 100644
--- a/TabletDriverService/ScreenMapper.cpp
+++ b/TabletDriverService/ScreenMapper.cpp
@@ -139,5 +139,5 @@ bool ScreenMapper::GetScreenPosition(double *x, double *y) {
 	*x = mapX;
 	*y = mapY;
 
-	return 1;
+	return true;
 }
\ No newline at end of file
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index c1a9710..a91b40d 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "Tablet.h"
+#include "TabletHandler.h"
 
 #define LOG_MODULE "Tablet"
 #include "Logger.h"
@@ -8,12 +9,13 @@
 //
 // USB Device Constructor
 //
-Tablet::Tablet(string usbGUID, int stringId, string stringMatch) : Tablet() {
-	usbDevice = new USBDevice(usbGUID, stringId, stringMatch);
+Tablet::Tablet(string usbGUID) : Tablet() {
+	usbDevice = new USBDevice(usbGUID);
 	if(usbDevice->isOpen) {
 		this->isOpen = true;
 		usbPipeId = 0x81;
-	} else {
+	}
+	else {
 		delete usbDevice;
 		usbDevice = NULL;
 	}
@@ -26,7 +28,8 @@ Tablet::Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage
 	hidDevice = new HIDDevice(vendorId, productId, usagePage, usage);
 	if(hidDevice->isOpen) {
 		this->isOpen = true;
-	} else {
+	}
+	else {
 		delete hidDevice;
 		hidDevice = NULL;
 	}
@@ -101,6 +104,13 @@ Tablet::~Tablet() {
 //
 bool Tablet::Init() {
 
+	// Init string requests
+	if(initStrings.size() > 0) {
+		for(int stringId : initStrings) {
+			GetDeviceString(stringId);
+		}
+	}
+
 	// Feature report
 	if(initFeature != NULL) {
 		if(hidDevice->SetFeature(initFeature, initFeatureLength)) {
@@ -117,23 +127,6 @@ bool Tablet::Init() {
 		return false;
 	}
 
-	// USB (Huion)
-	if(usbDevice != NULL) {
-		BYTE buffer[64];
-		int status;
-
-		// String Id 200
-		status = usbDevice->ControlTransfer(0x80, 0x06, (0x03 << 8) | 200, 0x0409, buffer, 64);
-
-		// String Id 100
-		status += usbDevice->ControlTransfer(0x80, 0x06, (0x03 << 8) | 100, 0x0409, buffer, 64);
-
-		if(status > 0) {
-			return true;
-		}
-		return false;
-	}
-	
 	return true;
 }
 
@@ -152,6 +145,42 @@ bool Tablet::IsConfigured() {
 	return false;
 }
 
+
+//
+// Get a device string from HID or USB device.
+//
+string Tablet::GetDeviceString(UCHAR stringId)
+{
+	string resultString = "";
+	UCHAR buffer[256];
+	int bytesRead = 0;
+
+	// USB device
+	if(usbDevice != NULL) {
+		bytesRead = usbDevice->StringRequest(stringId, buffer, 256);
+	}
+
+	// HID device
+	else if(hidDevice != NULL) {
+		if(hidDevice->isReading) {
+			throw runtime_error("HID string request can't be sent when the device is in use!");
+		}
+		else {
+			bytesRead = hidDevice->StringRequest(stringId, buffer, 256);
+		}
+	}
+
+	// Reply received?
+	if(bytesRead > 0) {
+		for(int i = 0; i < bytesRead; i += 2) {
+			resultString.push_back(buffer[i]);
+		}
+	}
+
+	return resultString;
+}
+
+
 //
 // Read Position
 //
@@ -174,16 +203,24 @@ int Tablet::ReadPosition() {
 
 
 	// Set data pointer
-	if(settings.type == TabletSettings::TypeWacomDrivers) {
+	if(settings.dataFormat == TabletSettings::TabletFormatWacomDrivers) {
 		data = buffer + 1;
-	} else {
+	}
+	else {
 		data = buffer;
 	}
 
+
 	//
-	// Wacom Intuos data format
+	// Wacom Intuos data format V2
 	//
-	if(settings.type == TabletSettings::TypeWacomIntuos) {
+	if(settings.dataFormat == TabletSettings::TabletFormatWacomIntuosV2) {
+
+		// Wacom driver device
+		if(settings.reportLength == 11) {
+			data = buffer + 1;
+		}
+
 		reportData.reportId = data[0];
 		reportData.buttons = data[1] & ~0x01;
 		reportData.x = ((data[2] * 0x100 + data[3]) << 1) | ((data[9] >> 1) & 1);
@@ -191,10 +228,13 @@ int Tablet::ReadPosition() {
 		reportData.pressure = (data[6] << 3) | ((data[7] & 0xC0) >> 5) | (data[1] & 1);
 		//distance = buffer[9] >> 2;
 
+
+	}
+
 	//
-	// Wacom 4100 data format
+	// Wacom Intuos data format V3 (Wacom 4100)
 	//
-	} else if(settings.type == TabletSettings::TypeWacom4100) {
+	else if(settings.dataFormat == TabletSettings::TabletFormatWacomIntuosV3) {
 
 		// Wacom driver device
 		if(settings.reportLength == 193) {
@@ -207,10 +247,29 @@ int Tablet::ReadPosition() {
 		reportData.y = (data[5] | (data[6] << 8) | (data[7] << 16));
 		reportData.pressure = (data[8] | (data[9] << 8));
 
+	}
+
+	//
+	// Skip first data byte (VEIKK S640)
+	//
+	else if(settings.dataFormat == TabletSettings::TabletFormatSkipFirstDataByte) {
+
+		// Validate report length
+		if(settings.reportLength >= 9) {
+
+			// Offset report data
+			memcpy(&reportData, (data + 1), sizeof(reportData));
+
+			// Set report id
+			reportData.reportId = data[0];
+		}
+
+	}
+
 	//
 	// Copy buffer to struct
 	//
-	} else {
+	else {
 		memcpy(&reportData, data, sizeof(reportData));
 	}
 
@@ -241,8 +300,11 @@ int Tablet::ReadPosition() {
 			reportData.buttons |= 1;
 		}
 
+
+	}
+
 	// Force tip button down if pressure is detected
-	} else if(reportData.pressure > 10) {
+	else if(reportData.pressure > 10) {
 		reportData.buttons |= 1;
 	}
 
@@ -306,7 +368,8 @@ bool Tablet::Read(void *buffer, int length) {
 	bool status = false;
 	if(usbDevice != NULL) {
 		status = usbDevice->Read(usbPipeId, buffer, length) > 0;
-	} else if(hidDevice != NULL) {
+	}
+	else if(hidDevice != NULL) {
 		status = hidDevice->Read(buffer, length);
 	}
 	if(logger.debugEnabled && status) {
@@ -322,7 +385,8 @@ bool Tablet::Write(void *buffer, int length) {
 	if(!isOpen) return false;
 	if(usbDevice != NULL) {
 		return usbDevice->Write(usbPipeId, buffer, length) > 0;
-	} else if(hidDevice != NULL) {
+	}
+	else if(hidDevice != NULL) {
 		return hidDevice->Write(buffer, length);
 	}
 	return false;
@@ -335,7 +399,8 @@ void Tablet::CloseDevice() {
 	if(isOpen) {
 		if(usbDevice != NULL) {
 			usbDevice->CloseDevice();
-		} else if(hidDevice != NULL) {
+		}
+		else if(hidDevice != NULL) {
 			hidDevice->CloseDevice();
 		}
 	}
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 3bf44ba..5ef45aa 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 #include "USBDevice.h"
 #include "HIDDevice.h"
@@ -18,7 +19,6 @@ using namespace std;
 
 class Tablet {
 public:
-
 	USBDevice *usbDevice;
 	HIDDevice *hidDevice;
 	HIDDevice *hidDeviceAux;
@@ -99,8 +99,11 @@ class Tablet {
 	int initFeatureLength;
 	BYTE *initReport;
 	int initReportLength;
+	vector<int> initStrings;
+
+
 
-	Tablet(string usbGUID, int stringId, string stringMatch);
+	Tablet(string usbGUID);
 	Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage);
 	Tablet();
 	~Tablet();
@@ -108,6 +111,7 @@ class Tablet {
 	bool Init();
 	bool IsConfigured();
 
+	string GetDeviceString(UCHAR stringId);
 	int ReadPosition();
 	bool Write(void *buffer, int length);
 	bool Read(void *buffer, int length);
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index 7eaec42..2cc20b0 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -91,7 +91,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp14</LanguageStandard>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -122,6 +122,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -183,7 +184,6 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClInclude Include="OutputVMultiDigitizer.h" />
     <ClInclude Include="OutputVMultiRelative.h" />
     <ClInclude Include="PositionRingBuffer.h" />
-    <ClInclude Include="ProcessCommand.h" />
     <ClInclude Include="RelativeMouseState.h" />
     <ClInclude Include="ScreenMapper.h" />
     <ClInclude Include="stdafx.h" />
@@ -207,6 +207,10 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
   <ItemGroup>
     <ClCompile Include="Command.cpp" />
     <ClCompile Include="CommandHandler.cpp" />
+    <ClCompile Include="CommandHandler.Device.cpp" />
+    <ClCompile Include="CommandHandler.Filters.cpp" />
+    <ClCompile Include="CommandHandler.Other.cpp" />
+    <ClCompile Include="CommandHandler.Tablet.cpp" />
     <ClCompile Include="CommandLine.cpp" />
     <ClCompile Include="HIDDevice.cpp" />
     <ClCompile Include="Logger.cpp" />
@@ -220,7 +224,6 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClCompile Include="OutputVMultiDigitizer.cpp" />
     <ClCompile Include="OutputVMultiRelative.cpp" />
     <ClCompile Include="PositionRingBuffer.cpp" />
-    <ClCompile Include="ProcessCommand.cpp" />
     <ClCompile Include="RelativeMouseState.cpp" />
     <ClCompile Include="ScreenMapper.cpp" />
     <ClCompile Include="Tablet.cpp" />
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index ddf3282..58636c4 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -42,9 +42,6 @@
     <ClInclude Include="Logger.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ProcessCommand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Vector2D.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -149,9 +146,6 @@
     <ClCompile Include="Logger.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ProcessCommand.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Vector2D.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -227,6 +221,18 @@
     <ClCompile Include="CommandHandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="CommandHandler.Device.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CommandHandler.Filters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CommandHandler.Other.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CommandHandler.Tablet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">
diff --git a/TabletDriverService/TabletFilter.h b/TabletDriverService/TabletFilter.h
index 828ce9d..3f851b1 100644
--- a/TabletDriverService/TabletFilter.h
+++ b/TabletDriverService/TabletFilter.h
@@ -19,6 +19,5 @@ class TabletFilter {
 	virtual void OnTimerIntervalChange(double oldInterval, double newInterval);
 	virtual void Update() = 0;
 
-	
 };
 
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.cpp b/TabletDriverService/TabletFilterAntiSmoothing.cpp
index d7057a3..6b13e4f 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.cpp
+++ b/TabletDriverService/TabletFilterAntiSmoothing.cpp
@@ -29,7 +29,7 @@ TabletFilterAntiSmoothing::TabletFilterAntiSmoothing() {
 	timeBegin = chrono::high_resolution_clock::now();
 	timeLastReport = timeBegin;
 	timeNow = timeBegin;
-	
+
 	outputPosition = &outputState.position;
 }
 
@@ -65,10 +65,12 @@ void TabletFilterAntiSmoothing::Update() {
 		reportRateAverage += ((1000.0 / timeDelta) - reportRateAverage) * (timeDelta / 1000.0) * 10;
 		if(reportRateAverage > reportRate) {
 			reportRate = reportRateAverage;
-		} else {
+		}
+		else {
 			reportRate -= reportRate * (timeDelta / 1000.0) * 0.1;
 		}
-	} else {
+	}
+	else {
 		//timeLastReport = timeNow;
 		//return;
 	}
@@ -120,12 +122,13 @@ void TabletFilterAntiSmoothing::Update() {
 		ignoreInvalidReports--;
 
 
-	// Velocity validation
-	} else if(
-		velocity > 0.1 && predictedVelocity > 0.1
-		&&
-		velocity < 2000 && predictedVelocity < 2000
-	) {
+		// Velocity validation
+	}
+	else if(
+	 velocity > 0.1 && predictedVelocity > 0.1
+	 &&
+	 velocity < 2000 && predictedVelocity < 2000
+ ) {
 		//
 		// Extrapolate a position by using the difference between predicted velocity and current velocity.
 		// LerpAdd (linear interpolation) method will move the position beyond the target position when the second parameter is larger than 1
@@ -134,8 +137,9 @@ void TabletFilterAntiSmoothing::Update() {
 		predictedPosition.LerpAdd(latestTarget, pow(predictedVelocity / velocity, shape) * compensation);
 		outputPosition->Set(predictedPosition);
 
-	// Invalid velocity -> set the position to the latest target
-	} else {
+		// Invalid velocity -> set the position to the latest target
+	}
+	else {
 		outputPosition->Set(latestTarget);
 	}
 
diff --git a/TabletDriverService/TabletFilterGravity.cpp b/TabletDriverService/TabletFilterGravity.cpp
index e9ee5f3..8e10f4f 100644
--- a/TabletDriverService/TabletFilterGravity.cpp
+++ b/TabletDriverService/TabletFilterGravity.cpp
@@ -35,11 +35,13 @@ void TabletFilterGravity::Update() {
 	//
 	if((outputState.buttons & 0x07) == 0) {
 		if(ignoreButton-- > 0) {
-		} else {
+		}
+		else {
 			outputPosition.Set(targetPosition);
 			velocityVector.Set(0, 0);
 		}
-	} else {
+	}
+	else {
 		ignoreButton = 2;
 	}
 
@@ -67,8 +69,8 @@ void TabletFilterGravity::Update() {
 	//
 	double velocityMagnitude = velocityVector.Magnitude();
 
-	// Apply friction when the velocity is over 1 mm/s and distance over 1 mm
-	if(velocityMagnitude > 1.0 * timeDelta && distance > 1.0) {
+	// Apply friction when the velocity is over 1 mm/s
+	if(velocityMagnitude > 1.0 * timeDelta) {
 
 		double frictionForce = velocityMagnitude * (friction + outputState.pressure * pressureFriction) * timeDelta;
 
@@ -78,7 +80,8 @@ void TabletFilterGravity::Update() {
 		);
 		velocityVector.Add(frictionVector);
 
-	} else {
+	}
+	else {
 		velocityVector.Set(0, 0);
 	}
 
@@ -96,7 +99,7 @@ void TabletFilterGravity::Update() {
 
 
 	// Debug message
-	if(logger.debugEnabled) {
+	if(logger.debugEnabled && distance > 0.0) {
 		LOG_DEBUG("X=%0.2f Y=%0.2f DX=%0.2f DY=%0.2f VX=%0.2f VY=%0.2f\n",
 			outputPosition.x,
 			outputPosition.y,
diff --git a/TabletDriverService/TabletFilterGravity.h b/TabletDriverService/TabletFilterGravity.h
index 60ddfe1..d1fe920 100644
--- a/TabletDriverService/TabletFilterGravity.h
+++ b/TabletDriverService/TabletFilterGravity.h
@@ -5,7 +5,6 @@ class TabletFilterGravity :
 public:
 	Vector2D targetPosition;
 	Vector2D outputPosition;
-	
 	Vector2D velocityVector;
 
 	double gravity;
diff --git a/TabletDriverService/TabletFilterNoiseReduction.cpp b/TabletDriverService/TabletFilterNoiseReduction.cpp
index ba4872c..090bdf9 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.cpp
+++ b/TabletDriverService/TabletFilterNoiseReduction.cpp
@@ -34,7 +34,7 @@ TabletFilterNoiseReduction::~TabletFilterNoiseReduction() {
 void TabletFilterNoiseReduction::SetTarget(TabletState *tabletState) {
 	latestTarget.Set(tabletState->position);
 	buffer.Add(tabletState->position);
-	timeNow = tablet->state.time;
+	timeNow = tabletState->time;
 	memcpy(&outputState, tabletState, sizeof(TabletState));
 }
 
diff --git a/TabletDriverService/TabletFilterPeak.h b/TabletDriverService/TabletFilterPeak.h
index 6862572..bbf0314 100644
--- a/TabletDriverService/TabletFilterPeak.h
+++ b/TabletDriverService/TabletFilterPeak.h
@@ -15,5 +15,4 @@ class TabletFilterPeak : public TabletFilter {
 
 	TabletFilterPeak();
 	~TabletFilterPeak();
-};
-
+};
\ No newline at end of file
diff --git a/TabletDriverService/TabletFilterSmoothing.cpp b/TabletDriverService/TabletFilterSmoothing.cpp
index 6dea69a..7050b0e 100644
--- a/TabletDriverService/TabletFilterSmoothing.cpp
+++ b/TabletDriverService/TabletFilterSmoothing.cpp
@@ -11,6 +11,7 @@ TabletFilterSmoothing::TabletFilterSmoothing() {
 	latency = 2.0;
 	weight = 1.000;
 	threshold = 0.9;
+	lastTargetTime = chrono::high_resolution_clock::now();
 }
 
 
@@ -29,6 +30,14 @@ TabletFilterSmoothing::~TabletFilterSmoothing() {
 void TabletFilterSmoothing::SetTarget(TabletState *tabletState) {
 	target.Set(tabletState->position);
 	memcpy(&outputState, tabletState, sizeof(TabletState));
+
+	// Reset output position if last tablet state update is older than 100 milliseconds.
+	double timeDelta = (tabletState->time - lastTargetTime).count() / 1000000.0;
+	if(timeDelta > 100.0) {
+		outputPosition.Set(tabletState->position);
+	}
+
+	lastTargetTime = tabletState->time;
 }
 
 //
@@ -48,27 +57,34 @@ void TabletFilterSmoothing::Update() {
 	deltaY = target.y - outputPosition.y;
 	distance = sqrt(deltaX*deltaX + deltaY * deltaY);
 
-	if(logger.debugEnabled) {
-		LOG_DEBUG("TX=%0.2f TY=%0.2f OX=%0.2f OY=%0.2f DX=%0.2f DY=%0.2f D=%0.2f W=%0.3f\n",
-			target.x,
-			target.y,
-			outputPosition.x,
-			outputPosition.y,
-			deltaX,
-			deltaY,
-			distance,
-			weight
-		);
-	}
-	
+	double timeDelta = (chrono::high_resolution_clock::now() - outputState.time).count() / 1000000.0;
 
 	// Distance large enough?
 	if(distance > 0.01) {
-		outputPosition.x += deltaX * weight;
-		outputPosition.y += deltaY * weight;
 
+		// Move output position coordinates if last tablet update time is newer than 100 milliseconds.
+		if(timeDelta < 100.0) {
+			outputPosition.x += deltaX * weight;
+			outputPosition.y += deltaY * weight;
+		}
+
+		// Debug message
+		if(logger.debugEnabled) {
+			LOG_DEBUG("TX=%0.2f TY=%0.2f OX=%0.2f OY=%0.2f DX=%0.2f DY=%0.2f D=%0.2f W=%0.3f\n",
+				target.x,
+				target.y,
+				outputPosition.x,
+				outputPosition.y,
+				deltaX,
+				deltaY,
+				distance,
+				weight
+			);
+		}
+
+	}
 	// Too short distance -> set output values as target values
-	} else {
+	else {
 		outputPosition.x = target.x;
 		outputPosition.y = target.y;
 	}
diff --git a/TabletDriverService/TabletFilterSmoothing.h b/TabletDriverService/TabletFilterSmoothing.h
index 59db575..2a69e43 100644
--- a/TabletDriverService/TabletFilterSmoothing.h
+++ b/TabletDriverService/TabletFilterSmoothing.h
@@ -10,6 +10,7 @@ class TabletFilterSmoothing : public TabletFilter {
 	double threshold;
 	Vector2D target;
 	Vector2D outputPosition;
+	chrono::high_resolution_clock::time_point lastTargetTime;
 
 	TabletFilterSmoothing();
 	~TabletFilterSmoothing();
diff --git a/TabletDriverService/TabletFilterTester.cpp b/TabletDriverService/TabletFilterTester.cpp
index 9abaf26..05f83d3 100644
--- a/TabletDriverService/TabletFilterTester.cpp
+++ b/TabletDriverService/TabletFilterTester.cpp
@@ -6,8 +6,7 @@
 
 
 // Constructor
-TabletFilterTester::TabletFilterTester(TabletFilter *f, string input, string output) {
-	this->filter = f;
+TabletFilterTester::TabletFilterTester(string input, string output) {
 	this->inputFilepath = input;
 	this->outputFilepath = output;
 }
@@ -16,6 +15,14 @@ TabletFilterTester::TabletFilterTester(TabletFilter *f, string input, string out
 TabletFilterTester::~TabletFilterTester() {
 }
 
+//
+// Add filter
+//
+void TabletFilterTester::AddFilter(TabletFilter *filter)
+{
+	filters.push_back(filter);
+}
+
 
 //
 // Open files
@@ -25,10 +32,11 @@ bool TabletFilterTester::Open() {
 	inputFile = ifstream(inputFilepath, ifstream::in);
 	if(!inputFile) return false;
 
+
 	outputFile = ofstream(outputFilepath, ofstream::out);
 	if(!outputFile) return false;
 
-	return false;
+	return true;
 }
 
 //
@@ -60,10 +68,10 @@ void TabletFilterTester::Run() {
 		// Parse input
 		CommandLine cmd(line);
 		if(cmd.is("position")) {
-			time = cmd.GetDouble(0, 0) ;
+			time = cmd.GetDouble(0, 0);
 			position.x = cmd.GetDouble(1, 0);
 			position.y = cmd.GetDouble(2, 0);
-			LOG_DEBUG("Input: %0.3f ms, %0.2f, %0.2f\n",
+			LOG_DEBUG("IN : %0.3f ms, %0.2f, %0.2f\n",
 				time,
 				position.x,
 				position.y
@@ -75,20 +83,24 @@ void TabletFilterTester::Run() {
 				firstReport = false;
 				outputState.position.Set(position);
 				LOG_DEBUG("First report: %0.3f, %0.2f, %0.2f\n", time, position.x, position.y);
-				
-			} else {
+			}
+			else {
 				tabletState.time = timeNow;
 				tabletState.position.Set(position);
 				memcpy(&outputState, &tabletState, sizeof(TabletState));
-				filter->SetTarget(&tabletState);
-				filter->Update();
-				filter->GetOutput(&outputState);
+
+				// Process filters
+				for(TabletFilter *filter : filters) {
+					filter->SetTarget(&outputState);
+					filter->Update();
+					filter->GetOutput(&outputState);
+				}
 			}
 
 			timeNow = timeBegin + chrono::microseconds((int)(time * 1000.0));
 			distance = position.Distance(outputState.position);
 
-			LOG_DEBUG("Output: %0.3f ms, %0.2f, %0.2f (%0.3f mm)\n",
+			LOG_DEBUG("OUT: %0.3f ms, %0.2f, %0.2f (%0.3f mm)\n",
 				time,
 				position.x,
 				position.y,
@@ -108,7 +120,7 @@ void TabletFilterTester::Run() {
 // Close files
 //
 bool TabletFilterTester::Close() {
-	
+
 	if(inputFile && inputFile.is_open()) {
 		inputFile.close();
 	}
diff --git a/TabletDriverService/TabletFilterTester.h b/TabletDriverService/TabletFilterTester.h
index f075dbd..b1a596f 100644
--- a/TabletDriverService/TabletFilterTester.h
+++ b/TabletDriverService/TabletFilterTester.h
@@ -9,6 +9,7 @@
 #include <iomanip>
 #include <sstream>
 #include <fstream>
+#include <vector>
 
 
 class TabletFilterTester {
@@ -16,16 +17,18 @@ class TabletFilterTester {
 	HANDLE timer;
 	WAITORTIMERCALLBACK callback;
 
-	TabletFilter *filter;
+	vector<TabletFilter *> filters;
 	string inputFilepath;
 	string outputFilepath;
 
 	ifstream inputFile;
 	ofstream outputFile;
 
-	TabletFilterTester(TabletFilter *filter, string inputFilepath, string outputFilepath);
+	TabletFilterTester(string inputFilepath, string outputFilepath);
 	~TabletFilterTester();
 
+	void AddFilter(TabletFilter *filter);
+
 	bool Open();
 	void Run();
 	bool Close();
diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
index e6eae07..d04ad6a 100644
--- a/TabletDriverService/TabletHandler.cpp
+++ b/TabletDriverService/TabletHandler.cpp
@@ -81,7 +81,7 @@ void TabletHandler::ChangeTimerInterval(int newInterval) {
 
 	double oldInterval = timerInterval;
 	timerInterval = newInterval;
-	
+
 	// Tell the new interval to timed filters
 	if(tablet != NULL) {
 		for(int i = 0; i < tablet->filterTimedCount; i++) {
@@ -102,17 +102,16 @@ void TabletHandler::RunTabletInputThread() {
 	bool isFirstReport = true;
 	bool isResent = false;
 	TabletFilter *filter;
+	TabletState filterState;
 	bool filterTimedEnabled;
-	TabletState outputState;
 
-	chrono::high_resolution_clock::time_point timeBegin = chrono::high_resolution_clock::now();
+	timeBegin = chrono::high_resolution_clock::now();
 
 	isRunning = true;
 
 	//
-	// Main Loop
+	// Tablet input main loop
 	//
-
 	while(isRunning) {
 
 		//
@@ -123,31 +122,38 @@ void TabletHandler::RunTabletInputThread() {
 		// Position OK
 		if(status == Tablet::ReportValid) {
 			isResent = false;
+		}
 
 		// Invalid report id
-		} else if(status == Tablet::ReportInvalid) {
+		else if(status == Tablet::ReportInvalid) {
 			tablet->state.isValid = false;
 			continue;
+		}
 
 		// Valid report but position is not in-range or invalid
-		} else if(status == Tablet::ReportPositionInvalid) {
+		else if(status == Tablet::ReportPositionInvalid) {
 			if(!isResent && tablet->state.isValid) {
 				isResent = true;
 				tablet->state.isValid = false;
-			} else {
+				outputState.isValid = false;
+			}
+			else {
 				continue;
 			}
+		}
 
 		// Ignore report
-		} else if(status == Tablet::ReportIgnore) {
+		else if(status == Tablet::ReportIgnore) {
 			continue;
+		}
 
 		// Reading failed
-		} else {
+		else {
 			LOG_ERROR("Tablet Read Error!\n");
 			CleanupAndExit(1);
 		}
 
+
 		//
 		// Don't send the first report
 		//
@@ -159,12 +165,13 @@ void TabletHandler::RunTabletInputThread() {
 		// Debug messages
 		if(logger.debugEnabled) {
 			double delta = (tablet->state.time - timeBegin).count() / 1000000.0;
-			LOG_DEBUG("TabletState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f\n",
+			LOG_DEBUG("InputState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f V=%s\n",
 				delta,
 				tablet->state.buttons,
 				tablet->state.position.x,
 				tablet->state.position.y,
-				tablet->state.pressure
+				tablet->state.pressure,
+				tablet->state.isValid ? "True" : "False"
 			);
 		}
 
@@ -174,16 +181,16 @@ void TabletHandler::RunTabletInputThread() {
 			tablet->state.buttons = 0;
 		}
 
-		// Copy input state values to ouput state
-		memcpy(&outputState, &tablet->state, sizeof(outputState));
-
-
 		//
 		// Report filters
 		//
 		// Is there any filters?
 		if(tablet->filterReportCount > 0) {
 
+			// Copy input state values to filter state
+			memcpy(&filterState, &tablet->state, sizeof(TabletState));
+
+
 			// Loop through filters
 			for(int filterIndex = 0; filterIndex < tablet->filterReportCount; filterIndex++) {
 
@@ -194,12 +201,26 @@ void TabletHandler::RunTabletInputThread() {
 				if(filter != NULL && filter->isEnabled) {
 
 					// Process
-					filter->SetTarget(&outputState);
+					filter->SetTarget(&filterState);
 					filter->Update();
-					filter->GetOutput(&outputState);
+					filter->GetOutput(&filterState);
 				}
 
 			}
+
+			lock.lock();
+			memcpy(&outputState, &filterState, sizeof(TabletState));
+			lock.unlock();
+		}
+
+		// No filters
+		else {
+
+			// Copy input state values to output state
+			lock.lock();
+			memcpy(&outputState, &tablet->state, sizeof(TabletState));
+			lock.unlock();
+
 		}
 
 
@@ -210,13 +231,14 @@ void TabletHandler::RunTabletInputThread() {
 				filterTimedEnabled = true;
 		}
 
+
 		// Do not write report when timed filter is enabled
 		if(filterTimedEnabled) {
 			continue;
 		}
 
-		outputManager->Set(&outputState);
-		outputManager->Write();
+		// Write output state
+		WriteOutputState(&outputState);
 	}
 
 	isRunning = false;
@@ -228,22 +250,20 @@ void TabletHandler::RunTabletInputThread() {
 //
 void TabletHandler::OnTimerTick() {
 	if(tablet == NULL) return;
-
-	Vector2D position;
 	TabletFilter *filter;
-	TabletState outputState;
-	bool filterEnabled = false;
+	TabletState filterState;
+	bool filtersEnabled = false;
+
+	// Copy current input state values
+	lock.lock();
+	memcpy(&filterState, &outputState, sizeof(TabletState));
+	lock.unlock();
 
 	// Set position
-	if(tablet->state.isValid) {
-		position.Set(tablet->state.position);
-	} else {
+	if(!filterState.isValid) {
 		return;
 	}
 
-	// Copy input state values to ouput state
-	memcpy(&outputState, &tablet->state, sizeof(TabletState));
-
 	// Loop through filters
 	for(int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
 
@@ -252,27 +272,55 @@ void TabletHandler::OnTimerTick() {
 
 		// Filter enabled?
 		if(filter->isEnabled) {
-			filterEnabled = true;
-		} else {
+			filtersEnabled = true;
+		}
+		else {
 			continue;
 		}
 
 		// Set filter targets
-		filter->SetTarget(&outputState);
+		filter->SetTarget(&filterState);
 
 		// Update filter position
 		filter->Update();
 
 		// Set output vector
-		filter->GetOutput(&outputState);
+		filter->GetOutput(&filterState);
 
 	}
 
-	if(!filterEnabled) {
+	// Do not write to output if no filters are enabled
+	if(!filtersEnabled) {
 		return;
 	}
 
-	outputManager->Set(&outputState);
-	outputManager->Write();
+	// Write output state
+	WriteOutputState(&filterState);
+
+}
+
+//
+// Write output state with output manager
+//
+void TabletHandler::WriteOutputState(TabletState * outputState)
+{
+	bool result;
+	result = outputManager->Set(outputState);
+	if(result) {
+		result = outputManager->Write();
+	}
+
+	// Debug message
+	if(result && logger.debugEnabled) {
+		double delta = (chrono::high_resolution_clock::now() - timeBegin).count() / 1000000.0;
+		LOG_DEBUG("OutputState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f V=%s\n",
+			delta,
+			outputState->buttons,
+			outputState->position.x,
+			outputState->position.y,
+			outputState->pressure,
+			outputState->isValid ? "True" : "False"
+		);
+	}
 
 }
diff --git a/TabletDriverService/TabletHandler.h b/TabletDriverService/TabletHandler.h
index 80f9e26..23ed2d1 100644
--- a/TabletDriverService/TabletHandler.h
+++ b/TabletDriverService/TabletHandler.h
@@ -1,6 +1,7 @@
 #pragma once
-#include "Tablet.h"
 #include <thread>
+#include <mutex>
+#include "Tablet.h"
 
 class TabletHandler {
 public:
@@ -8,6 +9,11 @@ class TabletHandler {
 	thread *tabletInputThread;
 	HANDLE timer;
 	double timerInterval;
+	mutex lock;
+	chrono::high_resolution_clock::time_point timeBegin;
+	TabletState outputState;
+
+
 	bool isRunning;
 
 	TabletHandler();
@@ -19,8 +25,8 @@ class TabletHandler {
 	bool StopTimer();
 	void ChangeTimerInterval(int newInterval);
 	void RunTabletInputThread();
-
 	void OnTimerTick();
+	void WriteOutputState(TabletState *outputState);
 
 
 private:
diff --git a/TabletDriverService/TabletMeasurement.cpp b/TabletDriverService/TabletMeasurement.cpp
index a9bac90..4406eaf 100644
--- a/TabletDriverService/TabletMeasurement.cpp
+++ b/TabletDriverService/TabletMeasurement.cpp
@@ -67,7 +67,7 @@ void TabletMeasurement::Stop() {
 void TabletMeasurement::Update(TabletState state) {
 
 	DWORD time;
-	
+
 
 	if(isRunning) {
 		if(reportCounter > 0 || reportCounter <= -1) {
@@ -96,7 +96,8 @@ void TabletMeasurement::Update(TabletState state) {
 			lastState.buttons = state.buttons;
 			lastState.isValid = true;
 			reportCounter--;
-		} else {
+		}
+		else {
 			isRunning = false;
 		}
 	}
diff --git a/TabletDriverService/TabletSettings.cpp b/TabletDriverService/TabletSettings.cpp
index afbae83..97a7ea9 100644
--- a/TabletDriverService/TabletSettings.cpp
+++ b/TabletDriverService/TabletSettings.cpp
@@ -18,7 +18,7 @@ TabletSettings::TabletSettings() {
 	width = 1;
 	height = 1;
 	skew = 0;
-	type = TabletNormal;
+	dataFormat = TabletFormatNormal;
 }
 
 //
diff --git a/TabletDriverService/TabletSettings.h b/TabletDriverService/TabletSettings.h
index 7b4a92e..373b3c7 100644
--- a/TabletDriverService/TabletSettings.h
+++ b/TabletDriverService/TabletSettings.h
@@ -2,11 +2,12 @@
 class TabletSettings {
 public:
 
-	enum TabletType {
-		TabletNormal,
-		TypeWacomIntuos,
-		TypeWacom4100,
-		TypeWacomDrivers
+	enum TabletDataFormat {
+		TabletFormatNormal,
+		TabletFormatWacomIntuosV2,
+		TabletFormatWacomIntuosV3,
+		TabletFormatWacomDrivers,
+		TabletFormatSkipFirstDataByte
 	};
 
 	BYTE detectMask;
@@ -21,7 +22,7 @@ class TabletSettings {
 	BYTE reportId;
 	int reportLength;
 	double skew;
-	TabletType type;
+	TabletDataFormat dataFormat;
 
 	TabletSettings();
 	~TabletSettings();
diff --git a/TabletDriverService/USBDevice.cpp b/TabletDriverService/USBDevice.cpp
index 908d13d..272f718 100644
--- a/TabletDriverService/USBDevice.cpp
+++ b/TabletDriverService/USBDevice.cpp
@@ -4,12 +4,10 @@
 #define LOG_MODULE "USBDevice"
 #include "Logger.h"
 
-USBDevice::USBDevice(string Guid, int StringId, string StringMatch) {
+USBDevice::USBDevice(string Guid) {
 	this->guid = Guid;
-	this->stringId = StringId;
-	this->stringMatch = StringMatch;
 	isOpen = false;
-	if(this->OpenDevice(guid, stringId, stringMatch)) {
+	if(this->OpenDevice(&_deviceHandle, &_usbHandle, guid)) {
 		isOpen = true;
 	}
 }
@@ -18,7 +16,7 @@ USBDevice::~USBDevice() {
 }
 
 
-bool USBDevice::OpenDevice(string usbDeviceGUIDString, int stringId, string stringSearch) {
+bool USBDevice::OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *outUSBHandle, string usbDeviceGUIDString) {
 	GUID usbDeviceGUID;
 
 	HDEVINFO                         deviceInfo;
@@ -31,17 +29,18 @@ bool USBDevice::OpenDevice(string usbDeviceGUIDString, int stringId, string stri
 	HANDLE deviceHandle = 0;
 	WINUSB_INTERFACE_HANDLE usbHandle = 0;
 
+	bool deviceFound = false;
+
 	USB_INTERFACE_DESCRIPTOR usbInterfaceDescriptor;
 
 	ULONG readBytes = 0;
 
 
+
+
 	std::wstring stemp = std::wstring(usbDeviceGUIDString.begin(), usbDeviceGUIDString.end());
 	LPCWSTR wstringGUID = stemp.c_str();
 
-	_deviceHandle = NULL;
-	_usbHandle = NULL;
-
 	HRESULT hr = CLSIDFromString(wstringGUID, (LPCLSID)&usbDeviceGUID);
 	if(hr != S_OK) {
 		LOG_ERROR("Can't create the USB Device GUID!\n");
@@ -90,7 +89,7 @@ bool USBDevice::OpenDevice(string usbDeviceGUIDString, int stringId, string stri
 				// Init WinUsb
 				WinUsb_Initialize(deviceHandle, &usbHandle);
 				if(!usbHandle) {
-					LOG_ERROR("ERROR! Unable to start WinUSB for the device!\n");
+					LOG_ERROR("ERROR! Unable to initialize WinUSB!\n");
 					if(deviceHandle != INVALID_HANDLE_VALUE)
 						CloseHandle(deviceHandle);
 					return false;
@@ -99,47 +98,21 @@ bool USBDevice::OpenDevice(string usbDeviceGUIDString, int stringId, string stri
 
 				// Query interface settings
 				ZeroMemory(&usbInterfaceDescriptor, sizeof(USB_INTERFACE_DESCRIPTOR));
+
+				// Can query interface settings?
 				if(WinUsb_QueryInterfaceSettings(usbHandle, 0, &usbInterfaceDescriptor)) {
 
-					WINUSB_SETUP_PACKET setupPacket;
-					ULONG bytesRead;
-					BYTE buffer[64];
-					string str = "";
-
-					setupPacket.RequestType = 0x80;
-					setupPacket.Request = 0x06;
-					setupPacket.Value = (0x03 << 8) | stringId;
-					setupPacket.Index = 0x0409;
-					setupPacket.Length = 64;
-
-					// String request
-					if(WinUsb_ControlTransfer(usbHandle, setupPacket, buffer, 64, &bytesRead, NULL)) {
-						
-						// Create string from bytes
-						for(int i = 2; i < (int)bytesRead; i += 2) {
-							str.push_back(buffer[i]);
-						}
-						LOG_DEBUG("USB String (%d): %s\n", stringId, str.c_str());
-
-						// Device string longer than the search string 
-						if(bytesRead >= stringSearch.length() * 2) {
-
-							// Match!
-							if(str.compare(0, stringSearch.size(), stringSearch) == 0) {
-								_deviceHandle = deviceHandle;
-								_usbHandle = usbHandle;
-							}
-						}
-					}
-				} else {
-					LOG_ERROR("ERROR! Can't query interface settings!\n");
+					memcpy(outDeviceHandle, &deviceHandle, sizeof(HANDLE));
+					memcpy(outUSBHandle, &usbHandle, sizeof(WINUSB_INTERFACE_HANDLE));
+					deviceFound = true;
 				}
+				else {
+					if(usbHandle && usbHandle != INVALID_HANDLE_VALUE)
+						WinUsb_Free(usbHandle);
 
-				if(_usbHandle == NULL && usbHandle && usbHandle != INVALID_HANDLE_VALUE)
-					WinUsb_Free(usbHandle);
-
-				if(_deviceHandle == NULL && deviceHandle && deviceHandle != INVALID_HANDLE_VALUE)
-					CloseHandle(deviceHandle);
+					if(deviceHandle && deviceHandle != INVALID_HANDLE_VALUE)
+						CloseHandle(deviceHandle);
+				}
 			}
 		}
 
@@ -152,13 +125,7 @@ bool USBDevice::OpenDevice(string usbDeviceGUIDString, int stringId, string stri
 
 	SetupDiDestroyDeviceInfoList(deviceInfo);
 
-	if(_deviceHandle && _deviceHandle != INVALID_HANDLE_VALUE
-	   &&
-	   _usbHandle && _usbHandle != INVALID_HANDLE_VALUE
-	   )
-		return true;
-
-	return false;
+	return deviceFound;
 }
 
 
@@ -185,7 +152,7 @@ int USBDevice::Write(UCHAR pipeId, void *buffer, int length) {
 
 int USBDevice::ControlTransfer(UCHAR requestType, UCHAR request, USHORT value, USHORT index, void *buffer, USHORT length) {
 	WINUSB_SETUP_PACKET usbSetupPacket;
-	ULONG bytesRead;
+	ULONG bytesRead = 0;
 	usbSetupPacket.RequestType = requestType;
 	usbSetupPacket.Request = request;
 	usbSetupPacket.Length = length;
@@ -197,21 +164,45 @@ int USBDevice::ControlTransfer(UCHAR requestType, UCHAR request, USHORT value, U
 	return 0;
 }
 
+//
+// USB string request
+//
+int USBDevice::StringRequest(UCHAR stringId, UCHAR *buffer, int length)
+{
+	UCHAR *tmpBuffer;
+	int bytesRead = 0;
+	tmpBuffer = (UCHAR*)malloc(length);
+
+	bytesRead = ControlTransfer(0x80, 0x06, (0x03 << 8) | stringId, 0x0409, tmpBuffer, length);
+
+	// Offset copy to remove extra bytes
+	if(bytesRead > 3) {
+		memcpy(buffer, (tmpBuffer + 2), bytesRead - 2);
+		bytesRead -= 2;
+	}
+	else {
+		bytesRead = 0;
+	}
+	delete tmpBuffer;
+
+	return bytesRead;
+}
+
 void USBDevice::CloseDevice() {
 	if(_usbHandle != NULL && _usbHandle != INVALID_HANDLE_VALUE) {
 		try {
-			printf("ASD\n");
 			WinUsb_Free(_usbHandle);
+			_usbHandle = NULL;
 		} catch(exception &e) {
-			printf("WinUsb ERROR! %s\n", e.what());
+			LOG_ERROR("WinUSB WinUsb_Free ERROR! %s\n", e.what());
 		}
 	}
 	if(_deviceHandle != NULL && _deviceHandle != INVALID_HANDLE_VALUE) {
 		try {
-			printf("DAS\n");
 			CloseHandle(_deviceHandle);
+			_deviceHandle = NULL;
 		} catch(exception &e) {
-			printf("HID ERROR! %s\n", e.what());
+			LOG_ERROR("WinUSB CloseHandler ERROR! %s\n", e.what());
 		}
 	}
 	isOpen = false;
diff --git a/TabletDriverService/USBDevice.h b/TabletDriverService/USBDevice.h
index 32bd790..9214e63 100644
--- a/TabletDriverService/USBDevice.h
+++ b/TabletDriverService/USBDevice.h
@@ -19,17 +19,16 @@ class USBDevice {
 private:
 	HANDLE _deviceHandle;
 	WINUSB_INTERFACE_HANDLE _usbHandle;
-	bool OpenDevice(string usbDeviceGUIDString, int stringId, string stringMatch);
+	bool OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *outUSBHandle, string usbDeviceGUIDString);
 public:
 	string guid;
-	int stringId;
-	string stringMatch;
-
 	bool isOpen;
-	USBDevice(string Guid, int StringId, string StringMatch);
+
+	USBDevice(string Guid);
 	~USBDevice();
 	int Read(UCHAR pipeId, void *buffer, int length);
 	int Write(UCHAR pipeId, void *buffer, int length);
 	int ControlTransfer(UCHAR requestType, UCHAR request, USHORT value, USHORT index, void *buffer, USHORT length);
+	int StringRequest(UCHAR stringId, UCHAR *buffer, int length);
 	void CloseDevice();
 };
\ No newline at end of file
diff --git a/TabletDriverService/VMulti.cpp b/TabletDriverService/VMulti.cpp
index 4c6ebf2..ae81aaa 100644
--- a/TabletDriverService/VMulti.cpp
+++ b/TabletDriverService/VMulti.cpp
@@ -19,7 +19,8 @@ VMulti::VMulti() {
 		isOpen = true;
 		outputEnabled = true;
 
-	} else {
+	}
+	else {
 		delete hidDevice;
 		hidDevice = NULL;
 	}
diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index bb7a209..3574833 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -12,7 +12,7 @@
 #
 # Wacom CTL-470 (Wacom drivers installed)
 #
-Tablet 0x056a 0x00dd 0xFF00 0x000A
+HIDTablet  0x056a 0x00dd 0xFF00 0x000A
 Name "Wacom CTL-470 (Wacom drivers installed)"
 ReportId 0x02
 ReportLength 11
@@ -22,13 +22,13 @@ MaxY 9200
 MaxPressure 1023
 Width 147.2
 Height 92.0
-Type WacomDrivers
+TabletFormat WacomDrivers
 
 
 #
 # Wacom CTL-470
 #
-Tablet 0x056a 0x00dd 0x0D 0x01
+HIDTablet 0x056a 0x00dd 0x0D 0x01
 Name "Wacom CTL-470"
 ReportId 0x02
 ReportLength 10
@@ -44,7 +44,7 @@ InitFeature 0x02 0x02
 #
 # Wacom CTH-470 ???
 #
-Tablet 0x056a 0x00de 0x0D 0x01
+HIDTablet 0x056a 0x00de 0x0D 0x01
 Name "Wacom CTH-470"
 ReportId 0x02
 ReportLength 10
@@ -60,7 +60,7 @@ InitFeature 0x02 0x02
 #
 # Wacom CTH-670 ???
 #
-Tablet 0x056a 0x00df 0x0D 0x01
+HIDTablet 0x056a 0x00df 0x0D 0x01
 Name "Wacom CTH-670"
 ReportId 0x02
 ReportLength 10
@@ -76,8 +76,9 @@ InitFeature 0x02 0x02
 #
 # Wacom CTL-471 (Wacom drivers installed)
 #
-Tablet 0x056a 0x0300 0xFF00 0x000A
+HIDTablet 0x056a 0x0300 0xFF00 0x000A
 Name "Wacom CTL-471 (Wacom drivers installed)"
+GetString 1 20
 ReportLength 11
 DetectMask 0x40
 MaxX 15200
@@ -85,13 +86,13 @@ MaxY 9500
 MaxPressure 1023
 Width 152.00
 Height 95.00
-Type WacomDrivers
+TabletFormat WacomDrivers
 
 
 #
 # Wacom CTL-471
 #
-Tablet 0x056a 0x0300 0xFF0D 0x01
+HIDTablet 0x056a 0x0300 0xFF0D 0x01
 Name "Wacom CTL-471"
 ReportLength 10
 DetectMask 0x40
@@ -106,7 +107,7 @@ InitFeature 0x02 0x02
 #
 # Wacom CTL-671 ???
 #
-Tablet 0x056a 0x0301 0xFF0D 0x01
+HIDTablet 0x056a 0x0301 0xFF0D 0x01
 Name "Wacom CTL-671"
 ReportLength 10
 DetectMask 0x40
@@ -121,7 +122,7 @@ InitFeature 0x02 0x02
 #
 # Wacom CTL-472
 #
-Tablet 0x056a 0x037a 0xFF00 0x000A
+HIDTablet 0x056a 0x037a 0xFF00 0x000A
 Name "Wacom CTL-472 (Wacom drivers installed)"
 ReportId 0x02
 ReportLength 11
@@ -131,13 +132,13 @@ MaxY 9500
 MaxPressure 2047
 Width 152.0
 Height 95.0
-Type WacomDrivers
+TabletFormat WacomDrivers
 
 
 #
 # Wacom CTL-472
 #
-Tablet 0x056a 0x037a 0xFF0D 0x0001
+HIDTablet 0x056a 0x037a 0xFF0D 0x0001
 Name "Wacom CTL-472"
 ReportId 0x02
 ReportLength 10
@@ -153,7 +154,7 @@ InitFeature 0x02 0x02
 #
 # Wacom CTL-672 ???
 #
-Tablet 0x056a 0x037b 0xFF0D 0x0001
+HIDTablet 0x056a 0x037b 0xFF0D 0x0001
 Name "Wacom CTL-672"
 ReportId 0x02
 ReportLength 10
@@ -169,7 +170,7 @@ InitFeature 0x02 0x02
 #
 # Wacom CTL-480 (Wacom drivers installed)
 #
-Tablet 0x056a 0x030e 0xFF00 0x000A
+HIDTablet 0x056a 0x030e 0xFF00 0x000A
 Name "Wacom CTL-480 (Wacom drivers installed)"
 ReportId 0x02
 ReportLength 11
@@ -179,13 +180,13 @@ MaxY 9500
 MaxPressure 1023
 Width 152.0
 Height 95.0
-Type WacomDrivers
+TabletFormat WacomDrivers
 
 
 #
 # Wacom CTL-480
 #
-Tablet 0x056a 0x030e 0xFF0D 0x0001
+HIDTablet 0x056a 0x030e 0xFF0D 0x0001
 Name "Wacom CTL-480"
 ReportId 0x02
 ReportLength 10
@@ -201,7 +202,7 @@ InitFeature 0x02 0x02
 #
 # Wacom CTH-480 (Wacom drivers installed)
 #
-Tablet 0x056a 0x0302 0xFF00 0x000A
+HIDTablet 0x056a 0x0302 0xFF00 0x000A
 Name "Wacom CTH-480 (Wacom drivers installed)"
 ReportId 0x02
 ReportLength 11
@@ -211,13 +212,13 @@ MaxY 9500
 MaxPressure 1023
 Width 152.0
 Height 95.0
-Type WacomDrivers
+TabletFormat WacomDrivers
 
 
 #
 # Wacom CTH-480
 #
-Tablet 0x056a 0x0302 0xFF0D 0x0001
+HIDTablet 0x056a 0x0302 0xFF0D 0x0001
 Name "Wacom CTH-480"
 ReportId 0x02
 ReportLength 10
@@ -233,7 +234,7 @@ InitFeature 0x02 0x02
 #
 # Wacom CTL-680 ???
 #
-Tablet 0x056a 0x0323 0xFF0D 0x0001
+HIDTablet 0x056a 0x0323 0xFF0D 0x0001
 Name "Wacom CTL-680"
 ReportId 0x02
 ReportLength 10
@@ -249,7 +250,7 @@ InitFeature 0x02 0x02
 #
 # Wacom CTH-680 ???
 #
-Tablet 0x056a 0x0303 0xFF0D 0x0001
+HIDTablet 0x056a 0x0303 0xFF0D 0x0001
 Name "Wacom CTH-680"
 ReportId 0x02
 ReportLength 10
@@ -265,7 +266,7 @@ InitFeature 0x02 0x02
 #
 # Wacom CTL-490
 #
-Tablet 0x056a 0x033b 0xFF0D 0x0001
+HIDTablet 0x056a 0x033b 0xFF0D 0x0001
 Name "Wacom CTL-490"
 ReportId 0x10
 ReportLength 10
@@ -276,15 +277,31 @@ MaxPressure 2047
 KeepTipDown 2
 Width 152.0
 Height 95.0
-#Feature 0x83 0x02 0x00
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 #
-# Wacom CTH-490 ???
+# Wacom CTL-490 (Wacom drivers installed)
 #
-Tablet 0x056a 0x033c 0xFF0D 0x0001
+HIDTablet 0x056a 0x033b 0xFF00 0x000A
+Name "Wacom CTL-490 (Wacom drivers installed)"
+ReportId 0x10
+ReportLength 11
+DetectMask 0xA0
+MaxX 15200
+MaxY 9500
+MaxPressure 2047
+KeepTipDown 2
+Width 152.0
+Height 95.0
+TabletFormat WacomIntuosV2
+
+
+#
+# Wacom CTH-490
+#
+HIDTablet 0x056a 0x033c 0xFF0D 0x0001
 Name "Wacom CTH-490"
 ReportId 0x10
 ReportLength 10
@@ -296,14 +313,31 @@ KeepTipDown 2
 Width 152.0
 Height 95.0
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
+
+
+#
+# Wacom CTH-490 (Wacom drivers installed)
+#
+HIDTablet 0x056a 0x033c 0xFF00 0x000A
+Name "Wacom CTH-490 (Wacom drivers installed)"
+ReportId 0x10
+ReportLength 11
+DetectMask 0xA0
+MaxX 15200
+MaxY 9500
+MaxPressure 2047
+KeepTipDown 2
+Width 152.0
+Height 95.0
+TabletFormat WacomIntuosV2
 
 
 #
 # Wacom CTL-4100
 #
-Tablet 0x056a 0x0376 0xFF0D 0x0001
-Tablet 0x056a 0x0374 0xFF0D 0x0001
+HIDTablet 0x056a 0x0376 0xFF0D 0x0001
+HIDTablet 0x056a 0x0374 0xFF0D 0x0001
 Name "Wacom CTL-4100"
 ReportId 0x10
 ReportLength 192
@@ -313,13 +347,14 @@ MaxY 9500
 MaxPressure 4095
 Width 152.0
 Height 95.0
-Type Wacom4100
+TabletFormat WacomIntuosV3
+
 
 #
 # Wacom CTL-4100 (Wacom drivers installed)
 #
-Tablet 0x056a 0x0376 0xFF00 0x000A
-Tablet 0x056a 0x0374 0xFF00 0x000A
+HIDTablet 0x056a 0x0376 0xFF00 0x000A
+HIDTablet 0x056a 0x0374 0xFF00 0x000A
 Name "Wacom CTL-4100 (Wacom drivers installed)"
 ReportId 0x10
 ReportLength 193
@@ -329,12 +364,12 @@ MaxY 9500
 MaxPressure 4095
 Width 152.0
 Height 95.0
-Type Wacom4100
+TabletFormat WacomIntuosV3
 
 
 #
 # Wacom CTL-4100 Bluetooth
-Tablet 0x056a 0x0377 0xFF0D 0x0001
+HIDTablet 0x056a 0x0377 0xFF0D 0x0001
 Name "Wacom CTL-4100 Bluetooth (Experimental)"
 ReportId 0x81
 ReportLength 361
@@ -349,7 +384,7 @@ Height 95.0
 #
 # Wacom PTH-451 ???
 #
-Tablet 0x056a 0x0314 0xFF0D 0x01
+HIDTablet 0x056a 0x0314 0xFF0D 0x01
 Name "Wacom PTH-451"
 ReportLength 10
 DetectMask 0xE0
@@ -359,13 +394,13 @@ MaxPressure 2047
 Width 157.0
 Height 98.0
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 #
 # Wacom PTH-850
 #
-Tablet 0x056A 0x0028 0x00D 0x0001
+HIDTablet 0x056A 0x0028 0x00D 0x0001
 Name "Wacom PTH-850"
 ReportLength 10
 DetectMask 0xE0
@@ -375,13 +410,13 @@ MaxPressure 2047
 Width 325.120
 Height 203.200
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 #
 # Wacom PTH-660 (USB)
 #
-Tablet 0x056A 0x0357 0xFF0D 0x0001
+HIDTablet 0x056A 0x0357 0xFF0D 0x0001
 Name "Wacom PTH-660"
 ReportId 0x10
 ReportLength 192
@@ -391,13 +426,13 @@ MaxY 29600
 MaxPressure 8191
 Width 226.0
 Height 150.0
-Type Wacom4100
+TabletFormat WacomIntuosV3
 
 
 #
 # Wacom PTH-660 (USB) (Wacom drivers installed)
 #
-Tablet 0x056A 0x0357 0xFF00 0x000A
+HIDTablet 0x056A 0x0357 0xFF00 0x000A
 Name "Wacom PTH-660 (Wacom drivers installed)"
 ReportId 0x10
 ReportLength 193
@@ -407,13 +442,13 @@ MaxY 29600
 MaxPressure 8191
 Width 226.0
 Height 150.0
-Type Wacom4100
+TabletFormat WacomIntuosV3
 
 
 #
 # Wacom PTH-660 (Bluetooth)
 #
-Tablet 0x056a 0x0360 0xFF0D 0x0001
+HIDTablet 0x056a 0x0360 0xFF0D 0x0001
 Name "Wacom PTH-660 Bluetooth (Experimental)"
 ReportLength 361
 DetectMask 0xE0
@@ -427,7 +462,7 @@ Height 150.0
 #
 # XP-Pen G430
 #
-Tablet 0x28BD 0x0075 0xFF0A 0x0001
+HIDTablet 0x28BD 0x0075 0xFF0A 0x0001
 Name "XP-Pen G430"
 ReportId 0x02
 ReportLength 8
@@ -443,7 +478,7 @@ InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
 #
 # XP-Pen G540 Pro
 #
-Tablet 0x28BD 0x0061 0xFF0A 0x0001
+HIDTablet 0x28BD 0x0061 0xFF0A 0x0001
 Name "XP-Pen G540 Pro"
 ReportId 0x02
 ReportLength 8
@@ -459,7 +494,9 @@ InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
 #
 # XP-Pen G640
 #
-Tablet 0x28BD 0x0094 0xFF0A 0x0001
+HIDTablet 0x28BD 0x0094 0xFF0A 0x0001
+CheckString 1 "XP-PEN"
+CheckString 2 "STAR G640"
 Name "XP-Pen G640"
 ReportId 0x02
 ReportLength 8
@@ -475,7 +512,7 @@ InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
 #
 # XP-Pen G640s
 #
-Tablet 0x28BD 0x0906 0xFF0A 0x0001
+HIDTablet 0x28BD 0x0906 0xFF0A 0x0001
 Name "XP-Pen G640s"
 ReportId 0x02
 ReportLength 10
@@ -491,7 +528,7 @@ InitReport 0x02 0xB0 0x04 0x00 0x00 0x00 0x00 0x00
 #
 # XP-Pen Deco 01
 #
-Tablet 0x28BD 0x0042 0xFF0A 0x0001
+HIDTablet 0x28BD 0x0042 0xFF0A 0x0001
 Name "XP-Pen Deco 01"
 ReportId 0x02
 ReportLength 8
@@ -503,10 +540,11 @@ Width 254.0
 Height 158.75
 InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
 
+
 #
 # XP-Pen Deco 01 v2
 #
-Tablet 0x28BD 0x0902 0xFF0A 0x0001
+HIDTablet 0x28BD 0x0902 0xFF0A 0x0001
 Name "XP-Pen Deco 01 v2"
 ReportId 0x02
 ReportLength 10
@@ -522,7 +560,9 @@ InitReport 0x02 0xB0 0x04 0x00 0x00 0x00 0x00 0x00
 #
 # Huion 420
 #
-Tablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}" 6 420
+USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
+CheckString 6 "420"
+InitStrings 100 200
 Name "Huion 420"
 ReportId 0x07
 ReportLength 8
@@ -537,7 +577,9 @@ Height 59.436
 #
 # Huion H420
 #
-Tablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}" 6 H420
+USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
+CheckString 6 "H420"
+InitStrings 100 200
 Name "Huion H420"
 ReportLength 8
 DetectMask 0x80
@@ -552,7 +594,9 @@ Height 59.436
 #
 # Huion H430P
 #
-Tablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}" 201 HUION_T176
+USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
+CheckString 201 "HUION_T176"
+InitStrings 100 200
 Name "Huion H430P"
 ReportId 0x08
 ReportLength 12
@@ -568,7 +612,9 @@ Height 76.20
 #
 # Huion H640P
 #
-Tablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}" 201 HUION_T173
+USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
+CheckString 201 "HUION_T173"
+InitStrings 100 200
 Name "Huion H640P"
 ReportId 0x08
 ReportLength 8
@@ -584,7 +630,9 @@ Height 100.0
 #
 # Gaomon S56K
 #
-Tablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}" 201 HUION_T156
+USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
+CheckString 201 "HUION_T156"
+InitStrings 100 200
 Name "Gaomon S56K"
 ReportId 0x07
 ReportLength 8
@@ -599,7 +647,10 @@ Height 120.0
 #
 # Huion osu!tablet
 #
-Tablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}" 200 HVAN
+USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
+CheckString 200 "HVAN"
+InitStrings 100 200
+GetStrings 1 20
 Name "Huion osu!tablet (check the GitHub issue #99)"
 ReportId 0x07
 ReportLength 8
@@ -611,11 +662,28 @@ Width 101.6
 Height 56.6
 
 
+#
+# Unknown Huion Tablet
+#
+USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
+GetStrings 1 250
+InitStrings 100 200
+Name "Unknown Huion Tablet!"
+ReportId 0x07
+ReportLength 8
+DetectMask 0x80
+MaxX 10000
+MaxY 10000
+MaxPressure 2047
+Width 100
+Height 100
+
+
 #
 # Wacom CTE-440 (Graphite4 4x5)
 #
-Tablet 0x056A 0x0015 0xFF0D 0x0001
-Tablet 0x056A 0x0015 0x000D 0x0001
+HIDTablet 0x056A 0x0015 0xFF0D 0x0001
+HIDTablet 0x056A 0x0015 0x000D 0x0001
 Name "Wacom CTE-440"
 ReportLength 9
 DetectMask 0x00
@@ -626,3 +694,21 @@ Width 102.08
 Height 74.24
 InitFeature 0x02 0x02
 
+
+#
+# VEIKK S640
+#
+HIDTablet 0x2FEB 0x0001 0xFF0A 0x0001
+Name "VEIKK S640"
+ReportId 0x09
+ReportLength 9
+DetectMask 0x80
+MaxX 30480
+MaxY 20320
+MaxPressure 8191
+Width 152.4
+Height 101.6
+TabletFormat SkipFirstDataByte
+InitStrings 2 2 2 2 2 20 21
+InitReport 0x09 0x01 0x04 0x00 0x00 0x00 0x00 0x00 0x00
+
diff --git a/TabletDriverService/config/wacom.cfg b/TabletDriverService/config/wacom.cfg
index c262006..09b4e3a 100644
--- a/TabletDriverService/config/wacom.cfg
+++ b/TabletDriverService/config/wacom.cfg
@@ -11,8 +11,8 @@
 
 
 # Wacom PTK-450
-Tablet 0x056A 0x0029 0xFF0D 0x0001
-Tablet 0x056A 0x0029 0x000D 0x0001
+HIDTablet 0x056A 0x0029 0xFF0D 0x0001
+HIDTablet 0x056A 0x0029 0x000D 0x0001
 Name "Wacom PTK-450"
 ReportLength 10
 DetectMask 0xE0
@@ -22,12 +22,12 @@ MaxPressure 2047
 Width 157.480
 Height 98.425
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 # Wacom PTK-650
-Tablet 0x056A 0x002A 0xFF0D 0x0001
-Tablet 0x056A 0x002A 0x000D 0x0001
+HIDTablet 0x056A 0x002A 0xFF0D 0x0001
+HIDTablet 0x056A 0x002A 0x000D 0x0001
 Name "Wacom PTK-650"
 ReportLength 10
 DetectMask 0xE0
@@ -37,12 +37,12 @@ MaxPressure 2047
 Width 223.520
 Height 139.700
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 # Wacom PTH-450
-Tablet 0x056A 0x0026 0xFF0D 0x0001
-Tablet 0x056A 0x0026 0x000D 0x0001
+HIDTablet 0x056A 0x0026 0xFF0D 0x0001
+HIDTablet 0x056A 0x0026 0x000D 0x0001
 Name "Wacom PTH-450"
 ReportLength 10
 DetectMask 0xE0
@@ -52,12 +52,12 @@ MaxPressure 2047
 Width 157.480
 Height 98.425
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 # Wacom PTH-451
-Tablet 0x056A 0x0314 0xFF0D 0x0001
-Tablet 0x056A 0x0314 0x000D 0x0001
+HIDTablet 0x056A 0x0314 0xFF0D 0x0001
+HIDTablet 0x056A 0x0314 0x000D 0x0001
 Name "Wacom PTH-451"
 ReportLength 10
 DetectMask 0x40
@@ -67,12 +67,12 @@ MaxPressure 2047
 Width 157.480
 Height 98.425
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 # Wacom PTH-650
-Tablet 0x056A 0x0027 0xFF0D 0x0001
-Tablet 0x056A 0x0027 0x000D 0x0001
+HIDTablet 0x056A 0x0027 0xFF0D 0x0001
+HIDTablet 0x056A 0x0027 0x000D 0x0001
 Name "Wacom PTH-650"
 ReportLength 10
 DetectMask 0xE0
@@ -82,12 +82,12 @@ MaxPressure 2047
 Width 223.520
 Height 139.700
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 # Wacom PTH-651
-Tablet 0x056A 0x0315 0xFF0D 0x0001
-Tablet 0x056A 0x0315 0x000D 0x0001
+HIDTablet 0x056A 0x0315 0xFF0D 0x0001
+HIDTablet 0x056A 0x0315 0x000D 0x0001
 Name "Wacom PTH-651"
 ReportLength 10
 DetectMask 0x40
@@ -97,12 +97,12 @@ MaxPressure 2047
 Width 223.520
 Height 139.700
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 # Wacom PTH-850
-Tablet 0x056A 0x0028 0xFF0D 0x0001
-Tablet 0x056A 0x0028 0x000D 0x0001
+HIDTablet 0x056A 0x0028 0xFF0D 0x0001
+HIDTablet 0x056A 0x0028 0x000D 0x0001
 Name "Wacom PTH-850"
 ReportLength 10
 DetectMask 0xE0
@@ -112,12 +112,12 @@ MaxPressure 2047
 Width 325.120
 Height 203.200
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 # Wacom PTH-851
-Tablet 0x056A 0x0317 0xFF0D 0x0001
-Tablet 0x056A 0x0317 0x000D 0x0001
+HIDTablet 0x056A 0x0317 0xFF0D 0x0001
+HIDTablet 0x056A 0x0317 0x000D 0x0001
 Name "Wacom PTH-851"
 ReportLength 10
 DetectMask 0x40
@@ -127,12 +127,12 @@ MaxPressure 2047
 Width 325.120
 Height 203.200
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 # Wacom MTE-450
-Tablet 0x056A 0x0065 0xFF0D 0x0001
-Tablet 0x056A 0x0065 0x000D 0x0001
+HIDTablet 0x056A 0x0065 0xFF0D 0x0001
+HIDTablet 0x056A 0x0065 0x000D 0x0001
 Name "Wacom MTE-450"
 ReportLength 9
 DetectMask 0x00
@@ -145,8 +145,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTT-460
-Tablet 0x056A 0x00D0 0xFF0D 0x0001
-Tablet 0x056A 0x00D0 0x000D 0x0001
+HIDTablet 0x056A 0x00D0 0xFF0D 0x0001
+HIDTablet 0x056A 0x00D0 0x000D 0x0001
 Name "Wacom CTT-460"
 ReportLength 9
 DetectMask 0x40
@@ -159,8 +159,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTL-460
-Tablet 0x056A 0x00D4 0xFF0D 0x0001
-Tablet 0x056A 0x00D4 0x000D 0x0001
+HIDTablet 0x056A 0x00D4 0xFF0D 0x0001
+HIDTablet 0x056A 0x00D4 0x000D 0x0001
 Name "Wacom CTL-460"
 ReportLength 9
 DetectMask 0x40
@@ -173,8 +173,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTL-470
-Tablet 0x056A 0x00DD 0xFF0D 0x0001
-Tablet 0x056A 0x00DD 0x000D 0x0001
+HIDTablet 0x056A 0x00DD 0xFF0D 0x0001
+HIDTablet 0x056A 0x00DD 0x000D 0x0001
 Name "Wacom CTL-470"
 ReportLength 10
 DetectMask 0x40
@@ -187,8 +187,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTL-671
-Tablet 0x056A 0x0301 0xFF0D 0x0001
-Tablet 0x056A 0x0301 0x000D 0x0001
+HIDTablet 0x056A 0x0301 0xFF0D 0x0001
+HIDTablet 0x056A 0x0301 0x000D 0x0001
 Name "Wacom CTL-671"
 ReportLength 10
 DetectMask 0x40
@@ -201,8 +201,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTL-690
-Tablet 0x056A 0x033D 0xFF0D 0x0001
-Tablet 0x056A 0x033D 0x000D 0x0001
+HIDTablet 0x056A 0x033D 0xFF0D 0x0001
+HIDTablet 0x056A 0x033D 0x000D 0x0001
 Name "Wacom CTL-690"
 ReportLength 10
 DetectMask 0x40
@@ -212,12 +212,12 @@ MaxPressure 2047
 Width 216.000
 Height 135.000
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 # Wacom CTL-471
-Tablet 0x056A 0x0300 0xFF0D 0x0001
-Tablet 0x056A 0x0300 0x000D 0x0001
+HIDTablet 0x056A 0x0300 0xFF0D 0x0001
+HIDTablet 0x056A 0x0300 0x000D 0x0001
 Name "Wacom CTL-471"
 ReportLength 10
 DetectMask 0x40
@@ -230,8 +230,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTL-472
-Tablet 0x056A 0x037A 0xFF0D 0x0001
-Tablet 0x056A 0x037A 0x000D 0x0001
+HIDTablet 0x056A 0x037A 0xFF0D 0x0001
+HIDTablet 0x056A 0x037A 0x000D 0x0001
 Name "Wacom CTL-472"
 ReportLength 10
 DetectMask 0x40
@@ -244,8 +244,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTL-480
-Tablet 0x056A 0x030E 0xFF0D 0x0001
-Tablet 0x056A 0x030E 0x000D 0x0001
+HIDTablet 0x056A 0x030E 0xFF0D 0x0001
+HIDTablet 0x056A 0x030E 0x000D 0x0001
 Name "Wacom CTL-480"
 ReportLength 10
 DetectMask 0x40
@@ -258,8 +258,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTL-490
-Tablet 0x056A 0x033B 0xFF0D 0x0001
-Tablet 0x056A 0x033B 0x000D 0x0001
+HIDTablet 0x056A 0x033B 0xFF0D 0x0001
+HIDTablet 0x056A 0x033B 0x000D 0x0001
 Name "Wacom CTL-490"
 ReportLength 10
 DetectMask 0x40
@@ -269,12 +269,12 @@ MaxPressure 2047
 Width 152.000
 Height 95.000
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 # Wacom CTL-660
-Tablet 0x056A 0x00D5 0xFF0D 0x0001
-Tablet 0x056A 0x00D5 0x000D 0x0001
+HIDTablet 0x056A 0x00D5 0xFF0D 0x0001
+HIDTablet 0x056A 0x00D5 0x000D 0x0001
 Name "Wacom CTL-660"
 ReportLength 9
 DetectMask 0x40
@@ -287,8 +287,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTL-672
-Tablet 0x056A 0x037B 0xFF0D 0x0001
-Tablet 0x056A 0x037B 0x000D 0x0001
+HIDTablet 0x056A 0x037B 0xFF0D 0x0001
+HIDTablet 0x056A 0x037B 0x000D 0x0001
 Name "Wacom CTL-672"
 ReportLength 10
 DetectMask 0x40
@@ -301,8 +301,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTL-680
-Tablet 0x056A 0x0323 0xFF0D 0x0001
-Tablet 0x056A 0x0323 0x000D 0x0001
+HIDTablet 0x056A 0x0323 0xFF0D 0x0001
+HIDTablet 0x056A 0x0323 0x000D 0x0001
 Name "Wacom CTL-680"
 ReportLength 10
 DetectMask 0x40
@@ -315,8 +315,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-460
-Tablet 0x056A 0x00D1 0xFF0D 0x0001
-Tablet 0x056A 0x00D1 0x000D 0x0001
+HIDTablet 0x056A 0x00D1 0xFF0D 0x0001
+HIDTablet 0x056A 0x00D1 0x000D 0x0001
 Name "Wacom CTH-460"
 ReportLength 9
 DetectMask 0x40
@@ -329,8 +329,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-460(A)
-Tablet 0x056A 0x00D6 0xFF0D 0x0001
-Tablet 0x056A 0x00D6 0x000D 0x0001
+HIDTablet 0x056A 0x00D6 0xFF0D 0x0001
+HIDTablet 0x056A 0x00D6 0x000D 0x0001
 Name "Wacom CTH-460(A)"
 ReportLength 9
 DetectMask 0x40
@@ -343,8 +343,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-461
-Tablet 0x056A 0x00D2 0xFF0D 0x0001
-Tablet 0x056A 0x00D2 0x000D 0x0001
+HIDTablet 0x056A 0x00D2 0xFF0D 0x0001
+HIDTablet 0x056A 0x00D2 0x000D 0x0001
 Name "Wacom CTH-461"
 ReportLength 9
 DetectMask 0x40
@@ -357,8 +357,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-461(A)
-Tablet 0x056A 0x00D7 0xFF0D 0x0001
-Tablet 0x056A 0x00D7 0x000D 0x0001
+HIDTablet 0x056A 0x00D7 0xFF0D 0x0001
+HIDTablet 0x056A 0x00D7 0x000D 0x0001
 Name "Wacom CTH-461(A)"
 ReportLength 9
 DetectMask 0x40
@@ -371,8 +371,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-461SE
-Tablet 0x056A 0x00DA 0xFF0D 0x0001
-Tablet 0x056A 0x00DA 0x000D 0x0001
+HIDTablet 0x056A 0x00DA 0xFF0D 0x0001
+HIDTablet 0x056A 0x00DA 0x000D 0x0001
 Name "Wacom CTH-461SE"
 ReportLength 9
 DetectMask 0x40
@@ -385,8 +385,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-470
-Tablet 0x056A 0x00DE 0xFF0D 0x0001
-Tablet 0x056A 0x00DE 0x000D 0x0001
+HIDTablet 0x056A 0x00DE 0xFF0D 0x0001
+HIDTablet 0x056A 0x00DE 0x000D 0x0001
 Name "Wacom CTH-470"
 ReportLength 10
 DetectMask 0x40
@@ -399,8 +399,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-480
-Tablet 0x056A 0x0302 0xFF0D 0x0001
-Tablet 0x056A 0x0302 0x000D 0x0001
+HIDTablet 0x056A 0x0302 0xFF0D 0x0001
+HIDTablet 0x056A 0x0302 0x000D 0x0001
 Name "Wacom CTH-480"
 ReportLength 10
 DetectMask 0x40
@@ -413,8 +413,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-490
-Tablet 0x056A 0x033C 0xFF0D 0x0001
-Tablet 0x056A 0x033C 0x000D 0x0001
+HIDTablet 0x056A 0x033C 0xFF0D 0x0001
+HIDTablet 0x056A 0x033C 0x000D 0x0001
 Name "Wacom CTH-490"
 ReportLength 10
 DetectMask 0x40
@@ -424,12 +424,12 @@ MaxPressure 2047
 Width 152.000
 Height 95.000
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 # Wacom CTH-661
-Tablet 0x056A 0x00D3 0xFF0D 0x0001
-Tablet 0x056A 0x00D3 0x000D 0x0001
+HIDTablet 0x056A 0x00D3 0xFF0D 0x0001
+HIDTablet 0x056A 0x00D3 0x000D 0x0001
 Name "Wacom CTH-661"
 ReportLength 9
 DetectMask 0x40
@@ -442,8 +442,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-661(A)
-Tablet 0x056A 0x00D8 0xFF0D 0x0001
-Tablet 0x056A 0x00D8 0x000D 0x0001
+HIDTablet 0x056A 0x00D8 0xFF0D 0x0001
+HIDTablet 0x056A 0x00D8 0x000D 0x0001
 Name "Wacom CTH-661(A)"
 ReportLength 9
 DetectMask 0x40
@@ -456,8 +456,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-661SE
-Tablet 0x056A 0x00DB 0xFF0D 0x0001
-Tablet 0x056A 0x00DB 0x000D 0x0001
+HIDTablet 0x056A 0x00DB 0xFF0D 0x0001
+HIDTablet 0x056A 0x00DB 0x000D 0x0001
 Name "Wacom CTH-661SE"
 ReportLength 9
 DetectMask 0x40
@@ -470,8 +470,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-670
-Tablet 0x056A 0x00DF 0xFF0D 0x0001
-Tablet 0x056A 0x00DF 0x000D 0x0001
+HIDTablet 0x056A 0x00DF 0xFF0D 0x0001
+HIDTablet 0x056A 0x00DF 0x000D 0x0001
 Name "Wacom CTH-670"
 ReportLength 10
 DetectMask 0x40
@@ -484,8 +484,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-680
-Tablet 0x056A 0x0303 0xFF0D 0x0001
-Tablet 0x056A 0x0303 0x000D 0x0001
+HIDTablet 0x056A 0x0303 0xFF0D 0x0001
+HIDTablet 0x056A 0x0303 0x000D 0x0001
 Name "Wacom CTH-680"
 ReportLength 10
 DetectMask 0x40
@@ -498,8 +498,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTH-690
-Tablet 0x056A 0x033E 0xFF0D 0x0001
-Tablet 0x056A 0x033E 0x000D 0x0001
+HIDTablet 0x056A 0x033E 0xFF0D 0x0001
+HIDTablet 0x056A 0x033E 0x000D 0x0001
 Name "Wacom CTH-690"
 ReportLength 10
 DetectMask 0x40
@@ -509,12 +509,12 @@ MaxPressure 2047
 Width 216.000
 Height 135.000
 InitFeature 0x02 0x02
-Type WacomIntuos
+TabletFormat WacomIntuosV2
 
 
 # Wacom CTE-440
-Tablet 0x056A 0x0015 0xFF0D 0x0001
-Tablet 0x056A 0x0015 0x000D 0x0001
+HIDTablet 0x056A 0x0015 0xFF0D 0x0001
+HIDTablet 0x056A 0x0015 0x000D 0x0001
 Name "Wacom CTE-440"
 ReportLength 8
 DetectMask 0x80
@@ -527,8 +527,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTE-450
-Tablet 0x056A 0x0017 0xFF0D 0x0001
-Tablet 0x056A 0x0017 0x000D 0x0001
+HIDTablet 0x056A 0x0017 0xFF0D 0x0001
+HIDTablet 0x056A 0x0017 0x000D 0x0001
 Name "Wacom CTE-450"
 ReportLength 9
 DetectMask 0x00
@@ -541,8 +541,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTE-640
-Tablet 0x056A 0x0016 0xFF0D 0x0001
-Tablet 0x056A 0x0016 0x000D 0x0001
+HIDTablet 0x056A 0x0016 0xFF0D 0x0001
+HIDTablet 0x056A 0x0016 0x000D 0x0001
 Name "Wacom CTE-640"
 ReportLength 8
 DetectMask 0x80
@@ -555,8 +555,8 @@ InitFeature 0x02 0x02
 
 
 # Wacom CTE-650
-Tablet 0x056A 0x0018 0xFF0D 0x0001
-Tablet 0x056A 0x0018 0x000D 0x0001
+HIDTablet 0x056A 0x0018 0xFF0D 0x0001
+HIDTablet 0x056A 0x0018 0x000D 0x0001
 Name "Wacom CTE-650"
 ReportLength 9
 DetectMask 0x00
diff --git a/TabletDriverService/stdafx.h b/TabletDriverService/stdafx.h
index e9ac935..e4accf6 100644
--- a/TabletDriverService/stdafx.h
+++ b/TabletDriverService/stdafx.h
@@ -11,9 +11,9 @@
 
 #include "VMulti.h"
 #include "Tablet.h"
+#include "TabletHandler.h"
 #include "ScreenMapper.h"
 #include "OutputManager.h"
-#include "TabletHandler.h"
 #include "CommandHandler.h"
 
 // Global variables...

From 10db6772f8a07801c63649829118c1acf62dbf08 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 9 Dec 2018 01:16:55 +0200
Subject: [PATCH 51/83] Clear GUI and notification icon title when driver stops

---
 TabletDriverGUI/MainWindow.Driver.cs | 36 ++++++++++++++++------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/TabletDriverGUI/MainWindow.Driver.cs b/TabletDriverGUI/MainWindow.Driver.cs
index a1878f4..d9057cd 100644
--- a/TabletDriverGUI/MainWindow.Driver.cs
+++ b/TabletDriverGUI/MainWindow.Driver.cs
@@ -200,12 +200,7 @@ private void SendSettingsToDriver()
 
 
         //
-        // Driver event handlers
-        //
-        //
-
-        //
-        // Driver Messages
+        // Driver message received
         //
         private void OnDriverMessageReceived(object sender, TabletDriver.DriverEventArgs e)
         {
@@ -214,7 +209,7 @@ private void OnDriverMessageReceived(object sender, TabletDriver.DriverEventArgs
 
 
         //
-        // Driver Errors
+        // Driver error received
         //
         private void OnDriverErrorReceived(object sender, TabletDriver.DriverEventArgs e)
         {
@@ -223,7 +218,7 @@ private void OnDriverErrorReceived(object sender, TabletDriver.DriverEventArgs e
 
 
         //
-        // Driver Status messages
+        // Driver status message received
         //
         private void OnDriverStatusReceived(object sender, TabletDriver.DriverEventArgs e)
         {
@@ -234,6 +229,7 @@ private void OnDriverStatusReceived(object sender, TabletDriver.DriverEventArgs
                 ProcessStatusMessage(variableName, parameters);
             });
         }
+        // Process driver status message
         private void ProcessStatusMessage(string variableName, string parameters)
         {
 
@@ -242,19 +238,20 @@ private void ProcessStatusMessage(string variableName, string parameters)
             //
             if (variableName == "tablet")
             {
-                string title = "TabletDriverGUI - " + parameters;
+                string tabletName = parameters;
+                string title = "TabletDriverGUI - " + tabletName;
                 Title = title;
 
                 // Limit notify icon text length
                 if (title.Length > 63)
                 {
-                    notifyIcon.Text = title.Substring(0, 63);
+                    notifyIcon.Text = tabletName.Substring(0, 63);
                 }
                 else
                 {
-                    notifyIcon.Text = title;
+                    notifyIcon.Text = tabletName;
                 }
-                SetStatus("Connected to " + parameters);
+                SetStatus("Connected to " + tabletName);
             }
 
             //
@@ -319,11 +316,12 @@ private void ProcessStatusMessage(string variableName, string parameters)
                             if (y < minimumY) minimumY = y;
                         }
                     }
+
                     double areaWidth = maximumX - minimumX;
                     double areaHeight = maximumY - minimumY;
                     double centerX = minimumX + areaWidth / 2.0;
                     double centerY = minimumY + areaHeight / 2.0;
-                    //MessageBox.Show("Area: " + areaWidth + " x " + areaHeight + " @ " + centerX + ", " + centerY);
+
                     config.TabletArea.Width = areaWidth;
                     config.TabletArea.Height = areaHeight;
                     config.TabletArea.X = centerX;
@@ -382,6 +380,8 @@ private void OnDriverStopped(object sender, EventArgs e)
         {
             if (running)
             {
+
+                // Automatic restart?
                 if (config.AutomaticRestart)
                 {
                     SetStatus("Driver stopped. Restarting! Check console !!!");
@@ -390,8 +390,6 @@ private void OnDriverStopped(object sender, EventArgs e)
                     // Run in the main application thread
                     Application.Current.Dispatcher.Invoke(() =>
                     {
-                        Title = "TabletDriverGUI";
-                        notifyIcon.Text = "";
                         driver.Stop();
                         timerRestart.Start();
                     });
@@ -402,6 +400,14 @@ private void OnDriverStopped(object sender, EventArgs e)
                     SetStatus("Driver stopped!");
                     driver.ConsoleAddText("Driver stopped!");
                 }
+
+                // Run in the main application thread
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    Title = "TabletDriverGUI";
+                    notifyIcon.Text = "No tablet found";
+                });
+
             }
         }
 

From 229214a8f84247fce23b302fbca9e608476950da Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 9 Dec 2018 01:17:32 +0200
Subject: [PATCH 52/83] Fix for cursor jumping to corner when tablet
 disconnects or driver restarts.

---
 TabletDriverService/OutputSendInputAbsolute.cpp | 5 +++++
 TabletDriverService/OutputVMultiAbsolute.cpp    | 8 ++++++--
 TabletDriverService/OutputVMultiAbsoluteV2.cpp  | 9 +++++++--
 TabletDriverService/OutputVMultiDigitizer.cpp   | 8 ++++++--
 TabletDriverService/OutputVMultiRelative.cpp    | 6 ++++++
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/TabletDriverService/OutputSendInputAbsolute.cpp b/TabletDriverService/OutputSendInputAbsolute.cpp
index 6600a3f..1014710 100644
--- a/TabletDriverService/OutputSendInputAbsolute.cpp
+++ b/TabletDriverService/OutputSendInputAbsolute.cpp
@@ -116,6 +116,11 @@ bool OutputSendInputAbsolute::Write() {
 //
 bool OutputSendInputAbsolute::Reset() {
 
+	// Do not reset when buttons are not pressed
+	if(lastButtons == 0) {
+		return true;
+	}
+
 	INPUT input = { 0 };
 	input.type = INPUT_MOUSE;
 	input.mi.mouseData = 0;
diff --git a/TabletDriverService/OutputVMultiAbsolute.cpp b/TabletDriverService/OutputVMultiAbsolute.cpp
index c9296ea..ad4c714 100644
--- a/TabletDriverService/OutputVMultiAbsolute.cpp
+++ b/TabletDriverService/OutputVMultiAbsolute.cpp
@@ -71,10 +71,14 @@ bool OutputVMultiAbsolute::Write() {
 // Reset output
 //
 bool OutputVMultiAbsolute::Reset() {
+
+	// Do not reset when buttons are not pressed
+	if(report.buttons == 0) {
+		return true;
+	}
+
 	report.buttons = 0;
 	report.wheel = 0;
-	report.x = 0;
-	report.y = 0;
 	vmulti->SetReport(&report, sizeof(report));
 	vmulti->WriteReport();
 	return true;
diff --git a/TabletDriverService/OutputVMultiAbsoluteV2.cpp b/TabletDriverService/OutputVMultiAbsoluteV2.cpp
index 7ed7cb1..084649d 100644
--- a/TabletDriverService/OutputVMultiAbsoluteV2.cpp
+++ b/TabletDriverService/OutputVMultiAbsoluteV2.cpp
@@ -69,10 +69,15 @@ bool OutputVMultiAbsoluteV2::Write() {
 // Reset output
 //
 bool OutputVMultiAbsoluteV2::Reset() {
+
+
+	// Do not reset when buttons are not pressed
+	if(report.buttons == 0) {
+		return true;
+	}
+
 	report.buttons = 0;
 	report.pressure = 0;
-	report.x = 0;
-	report.y = 0;
 	vmulti->SetReport(&report, sizeof(report));
 	vmulti->WriteReport();
 	return true;
diff --git a/TabletDriverService/OutputVMultiDigitizer.cpp b/TabletDriverService/OutputVMultiDigitizer.cpp
index baf949e..35324e5 100644
--- a/TabletDriverService/OutputVMultiDigitizer.cpp
+++ b/TabletDriverService/OutputVMultiDigitizer.cpp
@@ -76,10 +76,14 @@ bool OutputVMultiDigitizer::Write() {
 // Reset output
 //
 bool OutputVMultiDigitizer::Reset() {
+
+	// Do not reset when buttons are not pressed
+	if(report.buttons == 0) {
+		return true;
+	}
+
 	report.buttons = 0;
 	report.pressure = 0;
-	report.x = 0;
-	report.y = 0;
 	vmulti->SetReport(&report, sizeof(report));
 	vmulti->WriteReport();
 	return true;
diff --git a/TabletDriverService/OutputVMultiRelative.cpp b/TabletDriverService/OutputVMultiRelative.cpp
index e904e86..f566d47 100644
--- a/TabletDriverService/OutputVMultiRelative.cpp
+++ b/TabletDriverService/OutputVMultiRelative.cpp
@@ -141,6 +141,12 @@ bool OutputVMultiRelative::Write() {
 // Reset output
 //
 bool OutputVMultiRelative::Reset() {
+
+	// Do not reset when buttons are not pressed
+	if(report.buttons == 0) {
+		return true;
+	}
+
 	report.buttons = 0;
 	report.wheel = 0;
 	vmulti->SetReport(&report, sizeof(report));

From 0d9e92fe7c08d3f031480d4f04520cf6dcc525e2 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 9 Dec 2018 01:33:02 +0200
Subject: [PATCH 53/83] tablet.cfg

---
 TabletDriverService/config/tablet.cfg | 31 +++++++++++++++++----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 3574833..fd20621 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -562,7 +562,6 @@ InitReport 0x02 0xB0 0x04 0x00 0x00 0x00 0x00 0x00
 #
 USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
 CheckString 6 "420"
-InitStrings 100 200
 Name "Huion 420"
 ReportId 0x07
 ReportLength 8
@@ -572,6 +571,7 @@ MaxY 4680
 MaxPressure 2047
 Width 105.918
 Height 59.436
+InitStrings 100 200
 
 
 #
@@ -579,7 +579,6 @@ Height 59.436
 #
 USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
 CheckString 6 "H420"
-InitStrings 100 200
 Name "Huion H420"
 ReportLength 8
 DetectMask 0x80
@@ -588,7 +587,7 @@ MaxY 4680
 MaxPressure 2047
 Width 105.918
 Height 59.436
-
+InitStrings 100 200
 
 
 #
@@ -596,7 +595,6 @@ Height 59.436
 #
 USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
 CheckString 201 "HUION_T176"
-InitStrings 100 200
 Name "Huion H430P"
 ReportId 0x08
 ReportLength 12
@@ -607,6 +605,7 @@ MaxY 15240
 MaxPressure 4095
 Width 121.92
 Height 76.20
+InitStrings 100 200
 
 
 #
@@ -614,7 +613,6 @@ Height 76.20
 #
 USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
 CheckString 201 "HUION_T173"
-InitStrings 100 200
 Name "Huion H640P"
 ReportId 0x08
 ReportLength 8
@@ -625,6 +623,7 @@ MaxY 20000
 MaxPressure 8191
 Width 160.0
 Height 100.0
+InitStrings 100 200
 
 
 #
@@ -632,7 +631,6 @@ Height 100.0
 #
 USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
 CheckString 201 "HUION_T156"
-InitStrings 100 200
 Name "Gaomon S56K"
 ReportId 0x07
 ReportLength 8
@@ -642,6 +640,7 @@ MaxY 18896
 MaxPressure 2047
 Width 160.0
 Height 120.0
+InitStrings 100 200
 
 
 #
@@ -649,8 +648,6 @@ Height 120.0
 #
 USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
 CheckString 200 "HVAN"
-InitStrings 100 200
-GetStrings 1 20
 Name "Huion osu!tablet (check the GitHub issue #99)"
 ReportId 0x07
 ReportLength 8
@@ -660,15 +657,23 @@ MaxY 4680
 MaxPressure 2047
 Width 101.6
 Height 56.6
+InitStrings 100 200
+
+# For debugging tablet detection:
+GetStrings 1 20
+
 
 
 #
 # Unknown Huion Tablet
 #
 USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
-GetStrings 1 250
-InitStrings 100 200
-Name "Unknown Huion Tablet!"
+Name "Unknown Huion Tablet! Check startuplog.txt!"
+#CheckString 1 "???"
+#CheckString 2 "???"
+#CheckString 6 "???"
+#CheckString 200 "???"
+#CheckString 201 "???"
 ReportId 0x07
 ReportLength 8
 DetectMask 0x80
@@ -677,6 +682,10 @@ MaxY 10000
 MaxPressure 2047
 Width 100
 Height 100
+InitStrings 100 200
+
+# For debugging tablet detection:
+GetStrings 1 250
 
 
 #

From 754ea7d803d3fffcd856675132a97a157d2a9e00 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 9 Dec 2018 14:06:18 +0200
Subject: [PATCH 54/83] osu! window, debug checkbox

- Added ability to change screen are to match with osu! or TabletDriverGUI window.
- Added debug checkbox to console tab.
---
 TabletDriverGUI/Configuration.cs       |  5 +-
 TabletDriverGUI/MainWindow.Driver.cs   | 17 ++++++
 TabletDriverGUI/MainWindow.Settings.cs | 77 +++++++++++++++++++++++++-
 TabletDriverGUI/MainWindow.xaml        | 29 ++++++++--
 TabletDriverGUI/NativeMethods.cs       | 44 +++++++++++++++
 5 files changed, 164 insertions(+), 8 deletions(-)

diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index 406d04c..bd47fc0 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -66,8 +66,9 @@ public enum OutputModes
         public bool RunAtStartup;
 
         public string DriverPath;
-        public string DriverArguments;        
+        public string DriverArguments;
 
+        public bool DebuggingEnabled;
         public bool DeveloperMode;
 
 
@@ -115,6 +116,8 @@ public Configuration()
 
             DriverPath = "bin/TabletDriverService.exe";
             DriverArguments = "config/init.cfg";
+
+            DebuggingEnabled = false;
             DeveloperMode = false;
         }
 
diff --git a/TabletDriverGUI/MainWindow.Driver.cs b/TabletDriverGUI/MainWindow.Driver.cs
index d9057cd..34c4453 100644
--- a/TabletDriverGUI/MainWindow.Driver.cs
+++ b/TabletDriverGUI/MainWindow.Driver.cs
@@ -184,6 +184,17 @@ private void SendSettingsToDriver()
                 driver.SendCommand("AntiSmoothing 0");
             }
 
+
+            // Debugging
+            if(config.DebuggingEnabled)
+            {
+                driver.SendCommand("Debug true");
+            } else
+            {
+                driver.SendCommand("Debug false");
+            }
+
+
             // Commands after settings
             if (config.CommandsAfter.Length > 0)
             {
@@ -346,6 +357,12 @@ private void ProcessStatusMessage(string variableName, string parameters)
         //
         private void OnDriverStarted(object sender, EventArgs e)
         {
+            // Debugging commands
+            if(config.DebuggingEnabled)
+            {
+                driver.SendCommand("HIDList");
+            }
+
             driver.SendCommand("GetCommands");
             driver.SendCommand("Echo");
             driver.SendCommand("Echo   Driver version: " + Version);
diff --git a/TabletDriverGUI/MainWindow.Settings.cs b/TabletDriverGUI/MainWindow.Settings.cs
index 4961c9f..7372891 100644
--- a/TabletDriverGUI/MainWindow.Settings.cs
+++ b/TabletDriverGUI/MainWindow.Settings.cs
@@ -202,7 +202,6 @@ private void LoadSettingsFromConfiguration()
             //
             checkBoxRunAtStartup.IsChecked = config.RunAtStartup;
 
-
             //
             // Custom commands
             //
@@ -222,6 +221,11 @@ private void LoadSettingsFromConfiguration()
             }
             textCommandsAfter.Text = tmp;
 
+            //
+            // Debugging
+            //
+            checkBoxDebugging.IsChecked = config.DebuggingEnabled;
+
 
             // Update canvases
             UpdateCanvasElements();
@@ -410,6 +414,11 @@ private void UpdateSettingsToConfiguration()
             config.CommandsAfter = commandList.ToArray();
 
 
+            //
+            // Debugging
+            //
+            config.DebuggingEnabled = (bool)checkBoxDebugging.IsChecked;
+
 
             UpdateCanvasElements();
 
@@ -953,7 +962,6 @@ private void CheckboxChanged(object sender, RoutedEventArgs e)
         {
             if (isLoadingSettings) return;
 
-
             // Disable tablet area settings when full area is forced
             if (checkBoxForceFullArea.IsChecked == true)
             {
@@ -1005,6 +1013,19 @@ private void CheckboxChanged(object sender, RoutedEventArgs e)
                 textDesktopHeight.IsEnabled = true;
             }
 
+            // Debugging checkbox
+            if (sender == checkBoxDebugging)
+            {
+                if (checkBoxDebugging.IsChecked == true)
+                {
+                    driver.SendCommand("Debug true");
+                }
+                else
+                {
+                    driver.SendCommand("Debug false");
+                }
+            }
+
             UpdateSettingsToConfiguration();
 
             if (sender == checkBoxForceFullArea)
@@ -1064,6 +1085,21 @@ private void ComboBoxMonitor_MouseDown(object sender, MouseButtonEventArgs e)
                 comboBoxMonitor.Items.Add(System.Windows.Forms.Screen.PrimaryScreen.DeviceName);
             }
 
+            // TabletDriverGUI window
+            comboBoxMonitor.Items.Add("This window");
+
+            // osu!.exe processes window
+            try
+            {
+                if (Process.GetProcessesByName("osu!").Length > 0)
+                {
+                    comboBoxMonitor.Items.Add("osu! window");
+                }
+            }
+            catch (Exception)
+            {
+            }
+
         }
 
 
@@ -1092,6 +1128,8 @@ private void ComboBoxMonitor_SelectionChanged(object sender, SelectionChangedEve
             else if (index > 0)
             {
                 index--;
+
+                // Monitors
                 if (index >= 0 && index < screens.Length)
                 {
                     textScreenAreaX.Text = Utils.GetNumberString(screens[index].Bounds.X - minX);
@@ -1099,6 +1137,41 @@ private void ComboBoxMonitor_SelectionChanged(object sender, SelectionChangedEve
                     textScreenAreaWidth.Text = Utils.GetNumberString(screens[index].Bounds.Width);
                     textScreenAreaHeight.Text = Utils.GetNumberString(screens[index].Bounds.Height);
                 }
+
+                // TabletDriverGUI window
+                else if (comboBoxMonitor.SelectedValue.ToString() == "This window")
+                {
+                    textScreenAreaX.Text = Utils.GetNumberString(Application.Current.MainWindow.Left - minX);
+                    textScreenAreaY.Text = Utils.GetNumberString(Application.Current.MainWindow.Top - minY);
+                    textScreenAreaWidth.Text = Utils.GetNumberString(Application.Current.MainWindow.Width);
+                    textScreenAreaHeight.Text = Utils.GetNumberString(Application.Current.MainWindow.Height);
+                }
+
+                // osu! window
+                else if (comboBoxMonitor.SelectedValue.ToString() == "osu! window")
+                {
+                    try
+                    {
+                        Process[] processes = Process.GetProcessesByName("osu!");
+
+                        if (processes.Length > 0)
+                        {
+                            IntPtr osuHandle = processes[0].MainWindowHandle;
+                            NativeMethods.RECT rect;
+                            NativeMethods.GetWindowRect(osuHandle, out rect);
+
+                            textScreenAreaX.Text = Utils.GetNumberString(rect.X - minX);
+                            textScreenAreaY.Text = Utils.GetNumberString(rect.Y - minY);
+                            textScreenAreaWidth.Text = Utils.GetNumberString(rect.Width);
+                            textScreenAreaHeight.Text = Utils.GetNumberString(rect.Height - 1);
+
+                        }
+                    }
+                    catch (Exception)
+                    {
+
+                    }
+                }
             }
             UpdateSettingsToConfiguration();
         }
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 9bdca21..8deb2ad 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -743,7 +743,11 @@
       </TabItem>
       <TabItem Name="tabConsole" Header="Console">
         <Grid Margin="0,2,0,0">
-          <ScrollViewer Name="scrollConsole" Margin="5,5,5,30"
+          <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+          <ScrollViewer Grid.Row="0" Name="scrollConsole" Margin="5,0,5,0"
                         VerticalScrollBarVisibility="Auto"
                         HorizontalScrollBarVisibility="Auto">
 
@@ -780,16 +784,31 @@
             </TextBlock>
           </ScrollViewer>
 
-          <!-- Console input -->
-          <TextBox Name="textConsoleInput" Margin="5,0,5,5" VerticalAlignment="Bottom"  Height="20" TextWrapping="Wrap" Text=""
+          <Grid Grid.Row="1" Height="25" Margin="5,0,5,0">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="*"/>
+              <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+
+            <!-- Console input -->
+            <TextBox Grid.Column="0" Name="textConsoleInput" Height="20" TextWrapping="Wrap" Text=""
+                     VerticalContentAlignment="Center"
+                     Padding="0"
                    FontFamily="Courier New" Background="White" Foreground="Black"
                    FontSize="12"
                    TabIndex="2"
                    PreviewKeyDown="TextConsoleInput_PreviewKeyDown"
-                   KeyDown="TextConsoleInput_KeyDown" Grid.ColumnSpan="2"
+                   KeyDown="TextConsoleInput_KeyDown"
              />
-
+            <CheckBox Grid.Column="1" Name="checkBoxDebugging"
+                      Height="16"
+                      Margin="5,1,0,0"
+                      Checked="CheckboxChanged"
+                      Unchecked="CheckboxChanged"
+            >Debug</CheckBox>
+          </Grid>
         </Grid>
+
       </TabItem>
     </TabControl>
 
diff --git a/TabletDriverGUI/NativeMethods.cs b/TabletDriverGUI/NativeMethods.cs
index f2e07dd..0223194 100644
--- a/TabletDriverGUI/NativeMethods.cs
+++ b/TabletDriverGUI/NativeMethods.cs
@@ -5,6 +5,46 @@ namespace TabletDriverGUI
 {
     public class NativeMethods
     {
+        [StructLayout(LayoutKind.Sequential)]
+        public struct RECT
+        {
+            public int Left, Top, Right, Bottom;
+
+            public RECT(int left, int top, int right, int bottom)
+            {
+                Left = left;
+                Top = top;
+                Right = right;
+                Bottom = bottom;
+            }
+
+            public RECT(System.Drawing.Rectangle r) : this(r.Left, r.Top, r.Right, r.Bottom) { }
+
+            public int X
+            {
+                get { return Left; }
+                set { Right -= (Left - value); Left = value; }
+            }
+
+            public int Y
+            {
+                get { return Top; }
+                set { Bottom -= (Top - value); Top = value; }
+            }
+
+            public int Height
+            {
+                get { return Bottom - Top; }
+                set { Bottom = value + Top; }
+            }
+
+            public int Width
+            {
+                get { return Right - Left; }
+                set { Right = value + Left; }
+            }
+        }
+
         public const int HWND_BROADCAST = 0xffff;
         public static readonly int WM_SHOWTABLETDRIVERGUI = RegisterWindowMessage("WM_SHOWTABLETDRIVERGUI");
 
@@ -12,5 +52,9 @@ public class NativeMethods
         public static extern bool PostMessage(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam);
         [DllImport("user32")]
         public static extern int RegisterWindowMessage(string message);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern bool GetWindowRect(IntPtr hwnd, out RECT lpRect);
+
     }
 }

From ea790dccf7a5ffcc038f0b35edeef8f1fe88dac3 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 9 Dec 2018 14:53:30 +0200
Subject: [PATCH 55/83] Kill XP-Pen driver processes

---
 TabletDriverGUI/App.xaml.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/TabletDriverGUI/App.xaml.cs b/TabletDriverGUI/App.xaml.cs
index 1072268..718f253 100644
--- a/TabletDriverGUI/App.xaml.cs
+++ b/TabletDriverGUI/App.xaml.cs
@@ -50,30 +50,33 @@ public App()
                 }
 
                 //
-                // Check Wacom processes
+                // Check other tablet driver processes
                 //
-                string[] wacomProcessNames =
+                string[] tabletDriverProcessNames =
                 {
                     "Pen_Tablet",
-                    "Wacom_Tablet"
+                    "Wacom_Tablet",
+                    "PentabletService",
+                    "Pentablet"
                 };
 
                 processes = Process.GetProcesses();
                 foreach (Process process in processes)
                 {
-                    foreach (string wacomProcessName in wacomProcessNames)
+                    foreach (string processName in tabletDriverProcessNames)
                     {
-                        if (process.ProcessName.ToLower() == wacomProcessName.ToLower())
+                        if (process.ProcessName.ToLower() == processName.ToLower())
                         {
                             try
                             {
                                 process.Kill();
+                                Thread.Sleep(100);
                             }
                             catch (Exception)
                             {
                                 MessageBox.Show(
-                                    "You have Wacom driver processes running in the background:\n  " +
-                                    string.Join("\n  ", wacomProcessNames) +
+                                    "You have other tablet driver processes running in the background:\n  " +
+                                    string.Join("\n  ", tabletDriverProcessNames) +
                                     "\n\nPlease shutdown those before starting the GUI!",
                                     "Error!", MessageBoxButton.OK, MessageBoxImage.Error
                                 );

From f6251d524fe0d3e76da43076793e3b3a25144921 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 9 Dec 2018 15:01:21 +0200
Subject: [PATCH 56/83] Kill VEIKK driver processes

---
 TabletDriverGUI/App.xaml.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/TabletDriverGUI/App.xaml.cs b/TabletDriverGUI/App.xaml.cs
index 718f253..d6b45de 100644
--- a/TabletDriverGUI/App.xaml.cs
+++ b/TabletDriverGUI/App.xaml.cs
@@ -54,10 +54,19 @@ public App()
                 //
                 string[] tabletDriverProcessNames =
                 {
+
+                    // Wacom
                     "Pen_Tablet",
                     "Wacom_Tablet",
+
+                    // XP-Pen
                     "PentabletService",
-                    "Pentablet"
+                    "Pentablet",
+
+                    // VEIKK
+                    "TabletDriverCenter",
+                    "TabletDriverSetting"
+
                 };
 
                 processes = Process.GetProcesses();

From 779f48dbf72be914ae3c6c373f8ca45082170b35 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 9 Dec 2018 15:55:58 +0200
Subject: [PATCH 57/83] Kill Huion driver process

---
 TabletDriverGUI/App.xaml.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/TabletDriverGUI/App.xaml.cs b/TabletDriverGUI/App.xaml.cs
index d6b45de..b336532 100644
--- a/TabletDriverGUI/App.xaml.cs
+++ b/TabletDriverGUI/App.xaml.cs
@@ -65,7 +65,10 @@ public App()
 
                     // VEIKK
                     "TabletDriverCenter",
-                    "TabletDriverSetting"
+                    "TabletDriverSetting",
+
+                    // Huion
+                    "Huion Tablet"
 
                 };
 

From 225d328bbdae85cfa3454749e709173dda07f341 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Mon, 10 Dec 2018 11:29:58 +0200
Subject: [PATCH 58/83] Added mode selection tooltip

---
 TabletDriverGUI/MainWindow.Settings.cs |  3 +--
 TabletDriverGUI/MainWindow.xaml        | 29 +++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/TabletDriverGUI/MainWindow.Settings.cs b/TabletDriverGUI/MainWindow.Settings.cs
index 7372891..10f8643 100644
--- a/TabletDriverGUI/MainWindow.Settings.cs
+++ b/TabletDriverGUI/MainWindow.Settings.cs
@@ -1157,8 +1157,7 @@ private void ComboBoxMonitor_SelectionChanged(object sender, SelectionChangedEve
                         if (processes.Length > 0)
                         {
                             IntPtr osuHandle = processes[0].MainWindowHandle;
-                            NativeMethods.RECT rect;
-                            NativeMethods.GetWindowRect(osuHandle, out rect);
+                            NativeMethods.GetWindowRect(osuHandle, out NativeMethods.RECT rect);
 
                             textScreenAreaX.Text = Utils.GetNumberString(rect.X - minX);
                             textScreenAreaY.Text = Utils.GetNumberString(rect.Y - minY);
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 8deb2ad..9530402 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -201,8 +201,15 @@
                       <Button Name="buttonDrawArea" Content="Draw Area" Width="80"
                             Padding="5 5 5 5" Margin="5 5 0 5"
                             Click="ButtonDrawArea_Click"
-                              ToolTip="To set the area, click the top left and the bottom right corners of the area with your tablet pen."
-                              />
+                              >
+                        <Button.ToolTip>
+                          <TextBlock>
+                            <TextBlock FontWeight="Bold" FontSize="14">Draw Area</TextBlock>
+                            <LineBreak/>
+                            To set the area, click the top left and the bottom right corners of the area with your tablet pen.
+                          </TextBlock>
+                        </Button.ToolTip>
+                      </Button>
 
                       <!-- Wacom Area -->
                       <Button Name="buttonWacomArea" Content="Wacom Area" Width="80"
@@ -235,14 +242,26 @@
                             Unchecked="CheckboxChanged">Full Area</CheckBox>
 
                     <!-- Output mode-->
-                    <GroupBox Header="Mode" Width="130" HorizontalAlignment="Left">
+                    <GroupBox Header="Mode" HorizontalAlignment="Left">
+                      <GroupBox.ToolTip>
+                        <TextBlock>
+                          <TextBlock FontWeight="Bold" FontSize="16">Mode</TextBlock>
+                          <LineBreak/>
+                          
+                          <TextBlock FontWeight="Bold">Absolute</TextBlock>: Use this with osu!
+                          <LineBreak/>
+                          <TextBlock FontWeight="Bold">Relative</TextBlock>: Mouse mode. Sensitivity is determined by your tablet area size.
+                          <LineBreak/>
+                          <TextBlock FontWeight="Bold">Windows Ink</TextBlock>: Pen pressure is enabled in this mode. Check if your drawing application supports Windows Ink.
+                        </TextBlock>
+                      </GroupBox.ToolTip>
                       <StackPanel>
                         <RadioButton Name="radioModeAbsolute" GroupName="OutputMode" Margin="2" Content="Absolute (osu!)" 
                                      IsChecked="True"
                                      Checked="CheckboxChanged" />
-                        <RadioButton Name="radioModeRelative" GroupName="OutputMode" Margin="2" Content="Relative (mouse)" 
+                        <RadioButton Name="radioModeRelative" GroupName="OutputMode" Margin="2" Content="Relative (Mouse)" 
                                      Checked="CheckboxChanged" />
-                        <RadioButton Name="radioModeDigitizer" GroupName="OutputMode" Margin="2" Content="Windows Ink" 
+                        <RadioButton Name="radioModeDigitizer" GroupName="OutputMode" Margin="2" Content="Windows Ink (Draw)"
                                      Checked="CheckboxChanged" />
 
                       </StackPanel>

From 90370cb378f685d29d1b2d957848c9a9d0c64cb2 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Mon, 10 Dec 2018 11:31:08 +0200
Subject: [PATCH 59/83] Better error message when other driver processes are
 running in the background

---
 TabletDriverGUI/App.xaml.cs | 56 +++++++++++++++++++++++++------------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/TabletDriverGUI/App.xaml.cs b/TabletDriverGUI/App.xaml.cs
index b336532..55afb50 100644
--- a/TabletDriverGUI/App.xaml.cs
+++ b/TabletDriverGUI/App.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -50,7 +51,7 @@ public App()
                 }
 
                 //
-                // Check other tablet driver processes
+                // Other tablet driver processes
                 //
                 string[] tabletDriverProcessNames =
                 {
@@ -72,34 +73,53 @@ public App()
 
                 };
 
+
+                //
+                // Find driver processes
+                //
                 processes = Process.GetProcesses();
+                List<Process> foundProcesses = new List<Process>();
                 foreach (Process process in processes)
                 {
                     foreach (string processName in tabletDriverProcessNames)
                     {
                         if (process.ProcessName.ToLower() == processName.ToLower())
                         {
-                            try
-                            {
-                                process.Kill();
-                                Thread.Sleep(100);
-                            }
-                            catch (Exception)
-                            {
-                                MessageBox.Show(
-                                    "You have other tablet driver processes running in the background:\n  " +
-                                    string.Join("\n  ", tabletDriverProcessNames) +
-                                    "\n\nPlease shutdown those before starting the GUI!",
-                                    "Error!", MessageBoxButton.OK, MessageBoxImage.Error
-                                );
-                                instanceMutex.ReleaseMutex();
-                                Shutdown();
-                                return;
-                            }
+                            foundProcesses.Add(process);
                         }
                     }
                 }
 
+                //
+                // Try to kill driver processes
+                //
+                foreach (Process process in foundProcesses)
+                {
+                    try
+                    {
+                        process.Kill();
+                        Thread.Sleep(100);
+                    }
+                    catch (Exception)
+                    {
+                        string processNames = "";
+                        foreach (Process p in foundProcesses)
+                        {
+                            processNames += "- " + p.ProcessName + ".exe\n  ";
+                        }
+
+                        MessageBox.Show(
+                            "You have other driver processes running:\n  " +
+                            processNames +
+                            "\nPlease shutdown those before starting this driver!",
+                            "TabletDriverGUI - Error!", MessageBoxButton.OK, MessageBoxImage.Error
+                        );
+                        instanceMutex.ReleaseMutex();
+                        Shutdown();
+                        return;
+                    }
+                }
+
 
                 MainWindow mainWindow = new MainWindow();
                 mainWindow.Show();

From a7e93c5487e8932d0d2e401c94ab40ef473420c8 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Mon, 10 Dec 2018 11:31:21 +0200
Subject: [PATCH 60/83] Typo fix

---
 TabletDriverService/CommandHandler.Device.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TabletDriverService/CommandHandler.Device.cpp b/TabletDriverService/CommandHandler.Device.cpp
index f4f25c7..5b24d7a 100644
--- a/TabletDriverService/CommandHandler.Device.cpp
+++ b/TabletDriverService/CommandHandler.Device.cpp
@@ -398,12 +398,12 @@ void CommandHandler::CreateDeviceCommands() {
 
 		// Multiple ids
 		if(stringIdMin != stringIdMax) {
-			LOG_INFO("Requesting strings from ids %d - %d:\n", stringIdMin, stringIdMax);
+			LOG_INFO("Requesting string ids from %d to %d:\n", stringIdMin, stringIdMax);
 		}
 
 		// Single id
 		else {
-			LOG_INFO("Requesting strings id %d:\n", stringIdMin);
+			LOG_INFO("Requesting string id %d:\n", stringIdMin);
 		}
 
 		// Loop through string ids

From 31ab4b13cd2ff472bfe758c49195328218e8981b Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Mon, 10 Dec 2018 12:49:09 +0200
Subject: [PATCH 61/83] v0.2.1

---
 README.md | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 6810452..882bf5a 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 
 ## Download
 
-### http://hwk.fi/TabletDriver/TabletDriverV0.2.zip
+### http://hwk.fi/TabletDriver/TabletDriverV0.2.1.zip
 
 #
 
@@ -34,6 +34,8 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
   - Wacom CTH-480
   - Wacom CTL-490
   - Wacom CTH-490
+  - Wacom CTL-4100 USB
+  - Wacom CTL-4100 Bluetooth
   - Wacom CTL-671
   - Wacom CTL-672
   - Wacom CTL-680
@@ -41,8 +43,8 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
   - Wacom PTH-660
   - Wacom PTH-451
   - Wacom PTH-850
-  - XP-Pen G430 (New 2017+ "Model B")
-  - XP-Pen G540 Pro
+  - XP-Pen G430 (New 2017+ "Model B". Old G430 or G430S is not supported)
+  - XP-Pen G540 Pro (G540 is not supported)
   - XP-Pen G640
   - XP-Pen Deco 01
   - XP-Pen Deco 01 v2
@@ -54,8 +56,8 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
   
 ### Configured, but not properly tested:
   - Huion osu!tablet
-  - Wacom CTL-4100 USB
-  - Wacom CTL-4100 Bluetooth
+  - XP-Pen G640S
+  - VEIKK S640
   - https://github.com/hawku/TabletDriver/blob/master/TabletDriverService/config/wacom.cfg
 
 #
@@ -98,12 +100,23 @@ If you want to compile the code and don't want to install anything from the Tabl
 #
 
 ## Changelog
+>**v0.2.1:**
+> - XP-Pen G640S and VEIKK S640 configurations by [FRodriguez96](https://github.com/frodriguez96)
+> - Original XP-Pen, Huion and VEIKK driver processes will now be killed when the TabletDriverGUI starts.
+> - Fixed cursor jumping to the corner when driver restarts or tablet disconnects.
+> - Removed device list from driver startup. Might help with the problems that the driver restart is causing other USB devices to glitch out.
+> - Relative mode position reset is now decided by when the last tablet movement was received (default 100 ms, `RelativeResetTime` command).
+> - Added ability to disable automatic restart.
+> - Added command name autocomplete to the console input (tab) and commands tab (control + space).
+> - Added gravity filter (`GravityFilter` command). It's just for fun and testing. Works only when pen buttons are pressed.
+> - Added 32-bit VMulti and Huion drivers to the driver zip file.
+
 >**v0.2:**
 > - **Improved the noise reduction filter and added the settings to the GUI.**
 > - **Added an anti-smoothing filter which reduces the input latency on tablets that use hardware smoothing.**
 > - Wacom CTE-440 support by [Poliwrath](https://github.com/Poliwrath)
 > - Wacom PTH-660 support by [Implojin](https://github.com/Implojin)
-> - XP-PEN Deco 01 v2 support by [Itsyuka](https://github.com/Itsyuka)
+> - XP-Pen Deco 01 v2 support by [Itsyuka](https://github.com/Itsyuka)
 > - Modified Huion 420 and H420 tablet area size to match with the 2000 LPI resolution.
 > - Updated Huion drivers to the latest version.
 > - Moved the filter settings to filters tab in the GUI.

From 3f4600073b1e509a52c1fdfd7d939ff8895a50f8 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Wed, 12 Dec 2018 21:34:06 +0200
Subject: [PATCH 62/83] Manufacturer, product and serial number information to
 WinUSB and HID devices

---
 TabletDriverService/HIDDevice.cpp | 176 +++++++++++++++++++++++-------
 TabletDriverService/HIDDevice.h   |  11 ++
 TabletDriverService/USBDevice.cpp | 141 +++++++++++++++++-------
 TabletDriverService/USBDevice.h   |   7 +-
 4 files changed, 255 insertions(+), 80 deletions(-)

diff --git a/TabletDriverService/HIDDevice.cpp b/TabletDriverService/HIDDevice.cpp
index d64ad11..ca2e60b 100644
--- a/TabletDriverService/HIDDevice.cpp
+++ b/TabletDriverService/HIDDevice.cpp
@@ -4,20 +4,27 @@
 #define LOG_MODULE "HIDDevice"
 #include "Logger.h"
 
-HIDDevice::HIDDevice(USHORT VendorId, USHORT ProductId, USHORT UsagePage, USHORT Usage) : HIDDevice() {
+HIDDevice::HIDDevice(USHORT VendorId, USHORT ProductId, USHORT UsagePage, USHORT Usage, bool IsExclusive) {
 	this->vendorId = VendorId;
 	this->productId = ProductId;
 	this->usagePage = UsagePage;
 	this->usage = Usage;
-	if(this->OpenDevice(&this->_deviceHandle, this->vendorId, this->productId, this->usagePage, this->usage)) {
+	this->isExclusive = IsExclusive;
+	if(this->OpenDevice(&this->_deviceHandle, this->vendorId, this->productId, this->usagePage, this->usage, this->isExclusive)) {
 		isOpen = true;
 	}
 	isReading = false;
 }
 
+HIDDevice::HIDDevice(USHORT VendorId, USHORT ProductId, USHORT UsagePage, USHORT Usage) : HIDDevice(VendorId, ProductId, UsagePage, Usage, false) {
+}
+
 HIDDevice::HIDDevice() {
 	isOpen = false;
 	isReading = false;
+	_manufacturerName = "";
+	_productName = "";
+	_serialNumber = "";
 	_deviceHandle = NULL;
 }
 
@@ -25,21 +32,58 @@ HIDDevice::~HIDDevice() {
 	CloseDevice();
 }
 
-bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage) {
+
+bool GetHIDStrings(HANDLE deviceHandle, string *manufacturerName, string *productName, string *serialNumber) {
+	BYTE buffer[1024];
+	int i;
+
+	// HID manufacturer string
+	if(HidD_GetManufacturerString(deviceHandle, &buffer, sizeof(buffer))) {
+		for(i = 0; i < (int)sizeof(buffer); i += 2) {
+			if(buffer[i]) manufacturerName->push_back(buffer[i]);
+			else break;
+		}
+	}
+
+	// HID product string
+	if(HidD_GetProductString(deviceHandle, &buffer, sizeof(buffer))) {
+		for(i = 0; i < (int)sizeof(buffer); i += 2) {
+			if(buffer[i]) productName->push_back(buffer[i]);
+			else break;
+		}
+	}
+
+	// HID serial number
+	if(HidD_GetSerialNumberString(deviceHandle, &buffer, sizeof(buffer))) {
+		for(i = 0; i < (int)sizeof(buffer); i += 2) {
+			if(buffer[i]) serialNumber->push_back(buffer[i]);
+			else break;
+		}
+	}
+
+	return true;
+}
+
+
+//
+// Open device
+//
+bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage, bool exclusive) {
 	HDEVINFO                         deviceInfo;
 	SP_DEVICE_INTERFACE_DATA         deviceInterfaceData;
 	PSP_DEVICE_INTERFACE_DETAIL_DATA deviceInterfaceDetailData;
 	SP_DEVINFO_DATA                  deviceInfoData;
 	DWORD dwSize, dwMemberIdx;
 	GUID hidGuid;
-	BYTE stringBytes[1024];
 
 	PHIDP_PREPARSED_DATA hidPreparsedData;
 	HIDD_ATTRIBUTES hidAttributes;
 	HIDP_CAPS hidCapabilities;
+	string manufacturerName;
+	string productName;
+	string serialNumber;
 
 	HANDLE deviceHandle;
-
 	HANDLE resultHandle = 0;
 
 	HidD_GetHidGuid(&hidGuid);
@@ -68,15 +112,29 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 		// Get interface detail
 		if(SetupDiGetDeviceInterfaceDetail(deviceInfo, &deviceInterfaceData, deviceInterfaceDetailData, dwSize, &dwSize, &deviceInfoData)) {
 
-			// Open HID
-			deviceHandle = CreateFile(
-				deviceInterfaceDetailData->DevicePath,
-				GENERIC_READ | GENERIC_WRITE,
-				FILE_SHARE_READ | FILE_SHARE_WRITE,
-				NULL,
-				OPEN_EXISTING,
-				0,
-				NULL);
+			// Open HID in exclusive mode
+			if(exclusive) {
+				deviceHandle = CreateFile(
+					deviceInterfaceDetailData->DevicePath,
+					GENERIC_READ | GENERIC_WRITE,
+					0, // No sharing
+					NULL,
+					OPEN_EXISTING,
+					0,
+					NULL);
+			}
+
+			// Open HID in sharing mode
+			else {
+				deviceHandle = CreateFile(
+					deviceInterfaceDetailData->DevicePath,
+					GENERIC_READ | GENERIC_WRITE,
+					FILE_SHARE_READ | FILE_SHARE_WRITE,
+					NULL,
+					OPEN_EXISTING,
+					0,
+					NULL);
+			}
 
 			// HID handle valid?
 			if(deviceHandle != INVALID_HANDLE_VALUE) {
@@ -93,34 +151,17 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 				// Debug logging
 				if(this->debugEnabled) {
 
-					string manufacturerName = "";
-					string productName = "";
-
-					// HID manufacturer string
-					if(HidD_GetManufacturerString(deviceHandle, &stringBytes, sizeof(stringBytes))) {
-						for(int i = 0; i < (int)sizeof(stringBytes); i += 2) {
-							if(stringBytes[i]) {
-								manufacturerName.push_back(stringBytes[i]);
-							}
-							else {
-								break;
-							}
-						}
-					}
-
-					// HID product string
-					if(HidD_GetProductString(deviceHandle, &stringBytes, sizeof(stringBytes))) {
-						for(int i = 0; i < (int)sizeof(stringBytes); i += 2) {
-							if(stringBytes[i]) {
-								productName.push_back(stringBytes[i]);
-							}
-							else {
-								break;
-							}
-						}
-					}
-
-					LOG_DEBUG("HID Device: Vendor: '%s' Product: '%s'\n", manufacturerName.c_str(), productName.c_str());
+					manufacturerName = "";
+					productName = "";
+					serialNumber = "";
+
+					GetHIDStrings(deviceHandle, &manufacturerName, &productName, &serialNumber);
+
+					LOG_DEBUG("HID Device: Vendor: '%s' Product: '%s', Serial: '%s'\n",
+						manufacturerName.c_str(),
+						productName.c_str(),
+						serialNumber.c_str()
+					);
 					LOG_DEBUG("  Vendor Id: 0x%04X, Product Id: 0x%04X\n",
 						hidAttributes.VendorID,
 						hidAttributes.ProductID
@@ -144,6 +185,8 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 					hidCapabilities.UsagePage == usagePage &&
 					hidCapabilities.Usage == usage
 				) {
+					GetHIDStrings(deviceHandle, &_manufacturerName, &_productName, &_serialNumber);
+
 					resultHandle = deviceHandle;
 				}
 
@@ -176,6 +219,14 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 	return false;
 }
 
+//
+// Open device
+//
+bool HIDDevice::OpenDevice(HANDLE * handle, USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage)
+{
+	return OpenDevice(handle, vendorId, productId, usagePage, usage, false);
+}
+
 // Read HID report
 int HIDDevice::Read(void *buffer, int length) {
 	//return HidD_GetInputReport(_deviceHandle, buffer, length);
@@ -222,6 +273,47 @@ int HIDDevice::StringRequest(UCHAR stringId, UCHAR * buffer, int length)
 	return 0;
 }
 
+string HIDDevice::GetString(UCHAR stringId)
+{
+	string resultString = "";
+	UCHAR buffer[256];
+	int bytesRead = 0;
+
+	if(isReading) {
+		throw runtime_error("HID string request can't be sent when the device is in use!");
+	}
+	else {
+		bytesRead = StringRequest(stringId, buffer, 256);
+	}
+
+	// Reply received?
+	if(bytesRead > 0) {
+		for(int i = 0; i < bytesRead; i += 2) {
+			resultString.push_back(buffer[i]);
+		}
+	}
+
+	return resultString;
+}
+
+// Get HID manufacturer name
+string HIDDevice::GetManufacturerName()
+{
+	return _manufacturerName;
+}
+
+// Get HID product name
+string HIDDevice::GetProductName()
+{
+	return _productName;
+}
+
+// Get HID serial number
+string HIDDevice::GetSerialNumber()
+{
+	return _serialNumber;
+}
+
 // Close the device
 void HIDDevice::CloseDevice() {
 	if(isOpen && _deviceHandle != NULL && _deviceHandle != INVALID_HANDLE_VALUE) {
diff --git a/TabletDriverService/HIDDevice.h b/TabletDriverService/HIDDevice.h
index d6af4f8..1ca2001 100644
--- a/TabletDriverService/HIDDevice.h
+++ b/TabletDriverService/HIDDevice.h
@@ -16,6 +16,9 @@ using namespace std;
 class HIDDevice {
 private:
 	HANDLE _deviceHandle;
+	string _manufacturerName;
+	string _productName;
+	string _serialNumber;
 public:
 	bool isOpen;
 	bool debugEnabled;
@@ -24,15 +27,23 @@ class HIDDevice {
 	USHORT productId;
 	USHORT usagePage;
 	USHORT usage;
+	bool isExclusive;
 
+
+	HIDDevice(USHORT VendorId, USHORT ProductId, USHORT UsagePage, USHORT Usage, bool IsExclusive);
 	HIDDevice(USHORT VendorId, USHORT ProductId, USHORT UsagePage, USHORT Usage);
 	HIDDevice();
 	~HIDDevice();
+	bool OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage, bool exclusive);
 	bool OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage);
 	int Read(void *buffer, int length);
 	int Write(void *buffer, int length);
 	bool SetFeature(void *buffer, int length);
 	bool GetFeature(void *buffer, int length);
 	int StringRequest(UCHAR stringId, UCHAR *buffer, int length);
+	string GetString(UCHAR stringId);
+	string GetManufacturerName();
+	string GetProductName();
+	string GetSerialNumber();
 	void CloseDevice();
 };
\ No newline at end of file
diff --git a/TabletDriverService/USBDevice.cpp b/TabletDriverService/USBDevice.cpp
index 272f718..e4762e4 100644
--- a/TabletDriverService/USBDevice.cpp
+++ b/TabletDriverService/USBDevice.cpp
@@ -7,7 +7,7 @@
 USBDevice::USBDevice(string Guid) {
 	this->guid = Guid;
 	isOpen = false;
-	if(this->OpenDevice(&_deviceHandle, &_usbHandle, guid)) {
+	if(this->OpenDevice(&_deviceHandle, &_usbHandle, &deviceDescriptor, guid)) {
 		isOpen = true;
 	}
 }
@@ -16,31 +16,29 @@ USBDevice::~USBDevice() {
 }
 
 
-bool USBDevice::OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *outUSBHandle, string usbDeviceGUIDString) {
+bool USBDevice::OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *outUSBHandle, USB_DEVICE_DESCRIPTOR *outDeviceDescriptor, string usbDeviceGUIDString) {
 	GUID usbDeviceGUID;
 
 	HDEVINFO                         deviceInfo;
 	SP_DEVICE_INTERFACE_DATA         deviceInterfaceData;
 	PSP_DEVICE_INTERFACE_DETAIL_DATA deviceInterfaceDetailData;
 	SP_DEVINFO_DATA                  deviceInfoData;
+	USB_DEVICE_DESCRIPTOR			 usbDeviceDescriptor;
+	USB_INTERFACE_DESCRIPTOR		 usbInterfaceDescriptor;
+
 	DWORD dwSize;
 	DWORD dwMemberIdx;
+	ULONG bytesRead = 0;
+	bool deviceFound = false;
 
 	HANDLE deviceHandle = 0;
 	WINUSB_INTERFACE_HANDLE usbHandle = 0;
 
-	bool deviceFound = false;
-
-	USB_INTERFACE_DESCRIPTOR usbInterfaceDescriptor;
-
-	ULONG readBytes = 0;
-
-
-
-
+	// Create GUID wstring
 	std::wstring stemp = std::wstring(usbDeviceGUIDString.begin(), usbDeviceGUIDString.end());
 	LPCWSTR wstringGUID = stemp.c_str();
 
+	// Create CLSID from GUID string
 	HRESULT hr = CLSIDFromString(wstringGUID, (LPCLSID)&usbDeviceGUID);
 	if(hr != S_OK) {
 		LOG_ERROR("Can't create the USB Device GUID!\n");
@@ -55,38 +53,39 @@ bool USBDevice::OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *out
 		return false;
 	}
 
-	// Enumerate device interface data
+	// Enumerate device interfaces
 	deviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
 	dwMemberIdx = 0;
 	SetupDiEnumDeviceInterfaces(deviceInfo, NULL, &usbDeviceGUID, dwMemberIdx, &deviceInterfaceData);
+
 	while(GetLastError() != ERROR_NO_MORE_ITEMS) {
 
-		// Get the required buffer size. 
+		// Get the required interface detail buffer size. 
 		deviceInfoData.cbSize = sizeof(deviceInfoData);
 		SetupDiGetDeviceInterfaceDetail(deviceInfo, &deviceInterfaceData, NULL, 0, &dwSize, NULL);
 
-		// Allocate memory
+		// Allocate memory for interface detail data
 		deviceInterfaceDetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA)malloc(dwSize);
 		deviceInterfaceDetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
 
 		// Get device interface detail data
 		if(SetupDiGetDeviceInterfaceDetail(deviceInfo, &deviceInterfaceData, deviceInterfaceDetailData, dwSize, &dwSize, &deviceInfoData)) {
 
-			//LOG_DEBUG("USB Device path: %S\n", deviceInterfaceDetailData->DevicePath);
-
-			// Create File            
-			deviceHandle = CreateFile(deviceInterfaceDetailData->DevicePath,
-									  GENERIC_READ | GENERIC_WRITE,
-									  FILE_SHARE_READ | FILE_SHARE_WRITE,
-									  NULL,
-									  OPEN_EXISTING,
-									  FILE_FLAG_OVERLAPPED,
-									  NULL);
-
+			// Create device file
+			deviceHandle = CreateFile(
+				deviceInterfaceDetailData->DevicePath,
+				GENERIC_READ | GENERIC_WRITE,
+				FILE_SHARE_READ | FILE_SHARE_WRITE,
+				NULL,
+				OPEN_EXISTING,
+				FILE_FLAG_OVERLAPPED,
+				NULL
+			);
+
+			// Check file handle
 			if(deviceHandle != INVALID_HANDLE_VALUE) {
-				//LOG_DEBUG("Handle: %lu\n", (ULONG)deviceHandle);
 
-				// Init WinUsb
+				// Initialize WinUsb
 				WinUsb_Initialize(deviceHandle, &usbHandle);
 				if(!usbHandle) {
 					LOG_ERROR("ERROR! Unable to initialize WinUSB!\n");
@@ -94,35 +93,63 @@ bool USBDevice::OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *out
 						CloseHandle(deviceHandle);
 					return false;
 				}
-				//LOG_DEBUG("USB Handle: %d\n", (ULONG)usbHandle);
-
-				// Query interface settings
-				ZeroMemory(&usbInterfaceDescriptor, sizeof(USB_INTERFACE_DESCRIPTOR));
-
-				// Can query interface settings?
-				if(WinUsb_QueryInterfaceSettings(usbHandle, 0, &usbInterfaceDescriptor)) {
 
+				// Clear descriptors
+				memset(&usbDeviceDescriptor, 0, sizeof(USB_DEVICE_DESCRIPTOR));
+				memset(&usbInterfaceDescriptor, 0, sizeof(USB_INTERFACE_DESCRIPTOR));
+				bytesRead = 0;
+
+				//
+				// Is the device valid?
+				//
+				if(
+					// Get device descriptor
+					WinUsb_GetDescriptor(
+						usbHandle, USB_DEVICE_DESCRIPTOR_TYPE, 0, 0x409,
+						(UCHAR*)&usbDeviceDescriptor,
+						sizeof(usbDeviceDescriptor),
+						&bytesRead
+					)
+					&&
+
+					// Get device interface settings
+					WinUsb_QueryInterfaceSettings(usbHandle, 0, &usbInterfaceDescriptor)
+				) {
+
+					// Copy handles
 					memcpy(outDeviceHandle, &deviceHandle, sizeof(HANDLE));
 					memcpy(outUSBHandle, &usbHandle, sizeof(WINUSB_INTERFACE_HANDLE));
+
+					// Copy device descriptor
+					memcpy(outDeviceDescriptor, &usbDeviceDescriptor, sizeof(usbDeviceDescriptor));
+
 					deviceFound = true;
 				}
+
+				//
+				// Invalid device
+				//
 				else {
+
+					// Free WinUSB handle
 					if(usbHandle && usbHandle != INVALID_HANDLE_VALUE)
 						WinUsb_Free(usbHandle);
 
+					// Free device file
 					if(deviceHandle && deviceHandle != INVALID_HANDLE_VALUE)
 						CloseHandle(deviceHandle);
 				}
 			}
 		}
 
-		// Free memory
-		std::free(deviceInterfaceDetailData);
+		// Destroy interface detail data
+		free(deviceInterfaceDetailData);
 
-		// Continue looping
+		// Enumerate to the next interface
 		SetupDiEnumDeviceInterfaces(deviceInfo, NULL, &usbDeviceGUID, ++dwMemberIdx, &deviceInterfaceData);
 	}
 
+	// Destroy device info list
 	SetupDiDestroyDeviceInfoList(deviceInfo);
 
 	return deviceFound;
@@ -188,6 +215,46 @@ int USBDevice::StringRequest(UCHAR stringId, UCHAR *buffer, int length)
 	return bytesRead;
 }
 
+string USBDevice::GetString(UCHAR stringId) {
+	string resultString = "";
+	UCHAR buffer[256];
+	int bytesRead = 0;
+
+	bytesRead = StringRequest(stringId, buffer, 256);
+
+	// Reply received?
+	if(bytesRead > 0) {
+		for(int i = 0; i < bytesRead; i += 2) {
+			resultString.push_back(buffer[i]);
+		}
+	}
+
+	return resultString;
+}
+
+// Get WinUSB device manufacturer name
+string USBDevice::GetManufacturerName() {
+	if(deviceDescriptor.iManufacturer == 0) return "";
+	return GetString(deviceDescriptor.iManufacturer);
+}
+
+// Get WinUSB device product name
+string USBDevice::GetProductName()
+{
+	if(deviceDescriptor.iProduct == 0) return "";
+	return GetString(deviceDescriptor.iProduct);
+}
+
+// Get WinUSB device serial number
+string USBDevice::GetSerialNumber()
+{
+	if(deviceDescriptor.iSerialNumber == 0) return "";
+	return GetString(deviceDescriptor.iSerialNumber);
+}
+
+//
+// Close WinUSB device
+//
 void USBDevice::CloseDevice() {
 	if(_usbHandle != NULL && _usbHandle != INVALID_HANDLE_VALUE) {
 		try {
diff --git a/TabletDriverService/USBDevice.h b/TabletDriverService/USBDevice.h
index 9214e63..a4f6967 100644
--- a/TabletDriverService/USBDevice.h
+++ b/TabletDriverService/USBDevice.h
@@ -19,9 +19,10 @@ class USBDevice {
 private:
 	HANDLE _deviceHandle;
 	WINUSB_INTERFACE_HANDLE _usbHandle;
-	bool OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *outUSBHandle, string usbDeviceGUIDString);
+	bool OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *outUSBHandle, USB_DEVICE_DESCRIPTOR *outDeviceDescriptor, string usbDeviceGUIDString);
 public:
 	string guid;
+	USB_DEVICE_DESCRIPTOR deviceDescriptor;
 	bool isOpen;
 
 	USBDevice(string Guid);
@@ -30,5 +31,9 @@ class USBDevice {
 	int Write(UCHAR pipeId, void *buffer, int length);
 	int ControlTransfer(UCHAR requestType, UCHAR request, USHORT value, USHORT index, void *buffer, USHORT length);
 	int StringRequest(UCHAR stringId, UCHAR *buffer, int length);
+	string GetString(UCHAR stringId);
+	string GetManufacturerName();
+	string GetProductName();
+	string GetSerialNumber();
 	void CloseDevice();
 };
\ No newline at end of file

From a1e4dfeebe7ac3af34f58e0666e86b7e56863beb Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Wed, 12 Dec 2018 21:35:36 +0200
Subject: [PATCH 63/83] Removed x64 platform

---
 TabletDriver.sln | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/TabletDriver.sln b/TabletDriver.sln
index 0b37878..f63dc75 100644
--- a/TabletDriver.sln
+++ b/TabletDriver.sln
@@ -15,33 +15,23 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6793EBBD-0EC4-4254-9573-A19ECA79F2C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6793EBBD-0EC4-4254-9573-A19ECA79F2C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6793EBBD-0EC4-4254-9573-A19ECA79F2C8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6793EBBD-0EC4-4254-9573-A19ECA79F2C8}.Debug|x64.Build.0 = Debug|Any CPU
 		{6793EBBD-0EC4-4254-9573-A19ECA79F2C8}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6793EBBD-0EC4-4254-9573-A19ECA79F2C8}.Debug|x86.Build.0 = Debug|Any CPU
 		{6793EBBD-0EC4-4254-9573-A19ECA79F2C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6793EBBD-0EC4-4254-9573-A19ECA79F2C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6793EBBD-0EC4-4254-9573-A19ECA79F2C8}.Release|x64.ActiveCfg = Release|Any CPU
-		{6793EBBD-0EC4-4254-9573-A19ECA79F2C8}.Release|x64.Build.0 = Release|Any CPU
 		{6793EBBD-0EC4-4254-9573-A19ECA79F2C8}.Release|x86.ActiveCfg = Release|Any CPU
 		{6793EBBD-0EC4-4254-9573-A19ECA79F2C8}.Release|x86.Build.0 = Release|Any CPU
 		{3101CEC2-8F39-45FD-943B-79A488AD05EA}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{3101CEC2-8F39-45FD-943B-79A488AD05EA}.Debug|x64.ActiveCfg = Debug|x64
-		{3101CEC2-8F39-45FD-943B-79A488AD05EA}.Debug|x64.Build.0 = Debug|x64
 		{3101CEC2-8F39-45FD-943B-79A488AD05EA}.Debug|x86.ActiveCfg = Debug|Win32
 		{3101CEC2-8F39-45FD-943B-79A488AD05EA}.Debug|x86.Build.0 = Debug|Win32
 		{3101CEC2-8F39-45FD-943B-79A488AD05EA}.Release|Any CPU.ActiveCfg = Release|Win32
-		{3101CEC2-8F39-45FD-943B-79A488AD05EA}.Release|x64.ActiveCfg = Release|x64
-		{3101CEC2-8F39-45FD-943B-79A488AD05EA}.Release|x64.Build.0 = Release|x64
 		{3101CEC2-8F39-45FD-943B-79A488AD05EA}.Release|x86.ActiveCfg = Release|Win32
 		{3101CEC2-8F39-45FD-943B-79A488AD05EA}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection

From 128c3159c75788e99fc6ea6efa0fcf982872a09f Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 15 Dec 2018 02:39:51 +0200
Subject: [PATCH 64/83] Tablet button support, pen pressure settings and much
 more.

- XP-Pen G430S configuration by frodriguez96 and riley-badour
- Huion New 1060 Plus configuration by riley-badour
- Huion Inspiroy Q11K configuration by octoberU
- Wacom CTL-690 and CTH-690 configurations moved to tablet.cfg and DetectMask fixed
- Custom tablet data format configuration (Check tablet.cfg for examples)
- Tablet button support for Wacom CTH-480, CTL-490, CTL-4100, Huion H430P, H640P
- Pen and tablet button mapping to a mouse buttons and keyboard keys
- Pen button mapping to scroll
- Windows Ink pressure settings and test canvas
- Smoothing filter now also smooths out pen pressure
- Smoothing can be set to only used when pen buttons are down
- Anti-smoothing filter compensation value is now in milliseconds
- Ability start TabletDriverService with correct settings without GUI (tools\RunServiceOnly.bat)
- Added enable/disable wacom drivers batch files to git
- Few more tablets can now be used while Wacom drivers are installed.
---
 .gitignore                                    |   3 +-
 TabletDriverGUI/ButtonMapping.xaml            |  64 ++
 TabletDriverGUI/ButtonMapping.xaml.cs         | 236 ++++++
 TabletDriverGUI/Configuration.cs              |  44 +-
 TabletDriverGUI/MainWindow.Console.cs         |  77 +-
 TabletDriverGUI/MainWindow.Driver.cs          | 185 ++--
 TabletDriverGUI/MainWindow.Ink.cs             | 200 +++++
 TabletDriverGUI/MainWindow.Settings.cs        | 278 ++++--
 TabletDriverGUI/MainWindow.xaml               | 793 ++++++++++++------
 TabletDriverGUI/MainWindow.xaml.cs            |  78 +-
 TabletDriverGUI/TabletDriver.cs               |   5 +-
 TabletDriverGUI/TabletDriverGUI.csproj        |   8 +
 .../CommandHandler.Auxiliary.cpp              | 107 +++
 TabletDriverService/CommandHandler.Device.cpp | 254 +++---
 .../CommandHandler.Filters.cpp                |  39 +-
 TabletDriverService/CommandHandler.Other.cpp  |  37 +-
 TabletDriverService/CommandHandler.Tablet.cpp | 246 +++++-
 TabletDriverService/CommandHandler.cpp        |   1 +
 TabletDriverService/CommandHandler.h          |   1 +
 TabletDriverService/CommandLine.cpp           |  39 +-
 TabletDriverService/CommandLine.h             |   2 +
 TabletDriverService/DataFormatter.cpp         |  95 +++
 TabletDriverService/DataFormatter.h           |  31 +
 TabletDriverService/HIDDevice.cpp             |   1 +
 TabletDriverService/InputEmulator.cpp         | 545 ++++++++++++
 TabletDriverService/InputEmulator.h           |  46 +
 TabletDriverService/Main.cpp                  |  51 +-
 TabletDriverService/OutputManager.cpp         |   1 +
 TabletDriverService/ScreenMapper.cpp          |  13 +-
 TabletDriverService/Tablet.cpp                | 246 +++++-
 TabletDriverService/Tablet.h                  |  50 +-
 .../TabletDriverService.vcxproj               |  26 +-
 .../TabletDriverService.vcxproj.filters       |  27 +
 .../TabletDriverService.vcxproj.user          |   4 +
 .../TabletFilterAntiSmoothing.cpp             |  32 +-
 .../TabletFilterAntiSmoothing.h               |  29 +-
 TabletDriverService/TabletFilterGravity.cpp   |   4 +-
 TabletDriverService/TabletFilterSmoothing.cpp |  89 +-
 TabletDriverService/TabletFilterSmoothing.h   |   6 +-
 TabletDriverService/TabletHandler.cpp         | 220 ++++-
 TabletDriverService/TabletHandler.h           |   5 +-
 TabletDriverService/TabletSettings.cpp        |  17 +
 TabletDriverService/TabletSettings.h          |  29 +-
 TabletDriverService/config/serviceonly.cfg    |   3 +
 TabletDriverService/config/tablet.cfg         | 371 +++++++-
 TabletDriverService/stdafx.h                  |   3 +
 .../tools/DisableWacomDrivers.bat             |  33 +
 .../tools/EnableWacomDrivers.bat              |  30 +
 TabletDriverService/tools/RunServiceOnly.bat  |   2 +
 49 files changed, 3914 insertions(+), 792 deletions(-)
 create mode 100644 TabletDriverGUI/ButtonMapping.xaml
 create mode 100644 TabletDriverGUI/ButtonMapping.xaml.cs
 create mode 100644 TabletDriverGUI/MainWindow.Ink.cs
 create mode 100644 TabletDriverService/CommandHandler.Auxiliary.cpp
 create mode 100644 TabletDriverService/DataFormatter.cpp
 create mode 100644 TabletDriverService/DataFormatter.h
 create mode 100644 TabletDriverService/InputEmulator.cpp
 create mode 100644 TabletDriverService/InputEmulator.h
 create mode 100644 TabletDriverService/config/serviceonly.cfg
 create mode 100644 TabletDriverService/tools/DisableWacomDrivers.bat
 create mode 100644 TabletDriverService/tools/EnableWacomDrivers.bat
 create mode 100644 TabletDriverService/tools/RunServiceOnly.bat

diff --git a/.gitignore b/.gitignore
index 5bf2d11..7b755d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,4 @@
 /TabletDriverGUI/obj/
 /TabletDriverService/Release/
 /TabletDriverService/Debug/
-
-TabletDriverService/startuplog.txt
+/TabletDriverService/startuplog.txt
\ No newline at end of file
diff --git a/TabletDriverGUI/ButtonMapping.xaml b/TabletDriverGUI/ButtonMapping.xaml
new file mode 100644
index 0000000..7b9f6ec
--- /dev/null
+++ b/TabletDriverGUI/ButtonMapping.xaml
@@ -0,0 +1,64 @@
+<Window x:Class="TabletDriverGUI.ButtonMapping"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:TabletDriverGUI"
+        mc:Ignorable="d"
+        Title="Button Mapping" Height="260" Width="300">
+  <Window.Resources>
+    <Style TargetType="GroupBox">
+      <Setter Property="HeaderTemplate">
+        <Setter.Value>
+          <DataTemplate>
+            <TextBlock Text="{Binding}" FontWeight="DemiBold"/>
+          </DataTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+  </Window.Resources>
+  <Grid>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="47*"/>
+      <ColumnDefinition Width="245*"/>
+    </Grid.ColumnDefinitions>
+    <StackPanel Orientation="Vertical" Margin="5" Grid.ColumnSpan="2">
+      <GroupBox Header="Mouse" Padding="2">
+        <ComboBox Name="comboBoxMouse"
+                  Padding="5"
+                  KeyUp="ComboBoxMouse_KeyUp"
+                  SelectionChanged="ComboBoxMouse_SelectionChanged"
+                  >
+          <ComboBoxItem IsSelected="True">None</ComboBoxItem>
+          <ComboBoxItem>Mouse 1 (Left / Tip)</ComboBoxItem>
+          <ComboBoxItem>Mouse 2 (Right / Barrel)</ComboBoxItem>
+          <ComboBoxItem>Mouse 3 (Middle / Eraser)</ComboBoxItem>
+          <ComboBoxItem>Mouse 4 (Back)</ComboBoxItem>
+          <ComboBoxItem>Mouse 5 (Forward)</ComboBoxItem>
+          <ComboBoxItem>Scroll Up/Down</ComboBoxItem>
+          <ComboBoxItem>Scroll Left/Right</ComboBoxItem>
+          <ComboBoxItem>Scroll Both</ComboBoxItem>
+        </ComboBox>
+      </GroupBox>
+      <GroupBox Header="Keyboard" Padding="2" Margin="0,5,0,5">
+        <TextBox Name="textKeyboard"
+                 BorderThickness="3"
+                 BorderBrush="Black"
+                 Padding="4"
+                 FontWeight="Bold"
+                 PreviewKeyDown="TextKeyboard_PreviewKeyDown"               
+                 >CTRL+SHIFT+Z</TextBox>
+      </GroupBox>
+      <GroupBox Header="Custom" Padding="2">
+        <TextBox Grid.Column="1" Name="textCustom"
+                 Padding="2"
+                 >CTRL+SHIFT+Z</TextBox>
+      </GroupBox>
+      <Grid>
+        <Button Name="buttonSet" HorizontalAlignment="Left" Padding="3" Width="50" Margin="5" Click="ButtonSet_Click">Set</Button>
+        <Button Name="buttonClear" HorizontalAlignment="Center" Padding="3" Width="50" Margin="5" Click="ButtonClear_Click">Clear</Button>
+        <Button Name="buttonCancel" HorizontalAlignment="Right" Padding="3" Width="50" Margin="5" Click="ButtonCancel_Click">Cancel</Button>
+      </Grid>
+    </StackPanel>
+  </Grid>
+</Window>
diff --git a/TabletDriverGUI/ButtonMapping.xaml.cs b/TabletDriverGUI/ButtonMapping.xaml.cs
new file mode 100644
index 0000000..3646def
--- /dev/null
+++ b/TabletDriverGUI/ButtonMapping.xaml.cs
@@ -0,0 +1,236 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace TabletDriverGUI
+{
+    /// <summary>
+    /// Interaction logic for ButtonMapping.xaml
+    /// </summary>
+    public partial class ButtonMapping : Window
+    {
+        // WPF Button
+        Button button;
+
+        public string Result;
+
+        public ButtonMapping()
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            Owner = Application.Current.MainWindow;
+
+            InitializeComponent();
+            Result = "";
+        }
+
+        public ButtonMapping(Button button, bool isPenButton) : this()
+        {
+            this.button = button;
+
+            // Tablet buttons don't need tip, barrel and eraser info
+            if (!isPenButton)
+            {
+                ((ComboBoxItem)comboBoxMouse.Items[1]).Content = "Mouse 1 (Left)";
+                ((ComboBoxItem)comboBoxMouse.Items[2]).Content = "Mouse 2 (Right)";
+                ((ComboBoxItem)comboBoxMouse.Items[3]).Content = "Mouse 3 (Middle)";
+
+                // Disable scroll
+                ((ComboBoxItem)comboBoxMouse.Items[6]).Visibility = Visibility.Collapsed;
+                ((ComboBoxItem)comboBoxMouse.Items[7]).Visibility = Visibility.Collapsed;
+                ((ComboBoxItem)comboBoxMouse.Items[8]).Visibility = Visibility.Collapsed;
+            }
+
+            // Enable scroll
+            else
+            {
+                ((ComboBoxItem)comboBoxMouse.Items[6]).Visibility = Visibility.Visible;
+                ((ComboBoxItem)comboBoxMouse.Items[7]).Visibility = Visibility.Visible;
+                ((ComboBoxItem)comboBoxMouse.Items[8]).Visibility = Visibility.Visible;
+            }
+            CheckButtonValue();
+        }
+
+        public void CheckButtonValue()
+        {
+            string keys = button.Content.ToString().ToUpper().Trim();
+
+            if (keys.StartsWith("MOUSE"))
+            {
+                switch (keys)
+                {
+                    case "MOUSE1": comboBoxMouse.SelectedIndex = 1; break;
+                    case "MOUSE2": comboBoxMouse.SelectedIndex = 2; break;
+                    case "MOUSE3": comboBoxMouse.SelectedIndex = 3; break;
+                    case "MOUSE4": comboBoxMouse.SelectedIndex = 4; break;
+                    case "MOUSE5": comboBoxMouse.SelectedIndex = 5; break;
+                    case "MOUSESCROLLV": comboBoxMouse.SelectedIndex = 6; break;
+                    case "MOUSESCROLLH": comboBoxMouse.SelectedIndex = 7; break;
+                    case "MOUSESCROLLB": comboBoxMouse.SelectedIndex = 8; break;
+                    default: break;
+                }
+                comboBoxMouse.Focus();
+            }
+            else
+            {
+                textKeyboard.Focus();
+            }
+
+            textKeyboard.Text = keys;
+            textCustom.Text = keys;
+        }
+
+
+        //
+        // Mouse button changed
+        //
+        private void ComboBoxMouse_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (!IsLoaded) return;
+            string key = "";
+
+
+            switch (comboBoxMouse.SelectedIndex)
+            {
+                case 1: key = "MOUSE1"; break;
+                case 2: key = "MOUSE2"; break;
+                case 3: key = "MOUSE3"; break;
+                case 4: key = "MOUSE4"; break;
+                case 5: key = "MOUSE5"; break;
+                case 6: key = "MOUSESCROLLV"; break;
+                case 7: key = "MOUSESCROLLH"; break;
+                case 8: key = "MOUSESCROLLB"; break;
+                default: break;
+            }
+            textKeyboard.Text = key;
+            textCustom.Text = key;
+        }
+
+
+        //
+        // Keyboard mapping key down
+        //
+        private void TextKeyboard_PreviewKeyDown(object sender, KeyEventArgs e)
+        {
+            System.Windows.Forms.KeysConverter keysConverter = new System.Windows.Forms.KeysConverter();
+            CultureInfo cultureInfo = new CultureInfo("en-US");
+            int keyCode;
+            List<string> keys = new List<string>();
+            HashSet<string> keyAdded = new HashSet<string>();
+            foreach (Key value in Enum.GetValues(typeof(Key)))
+            {
+                Key key = (Key)value;
+                if (key > Key.None && Keyboard.IsKeyDown(key))
+                {
+                    keyCode = KeyInterop.VirtualKeyFromKey(key);
+
+
+                    string keyName = keysConverter.ConvertToString(null, cultureInfo, keyCode).ToUpper();
+                    switch (key)
+                    {
+                        case Key.LeftAlt: keyName = "LALT"; break;
+                        case Key.RightAlt: keyName = "RALT"; break;
+                        case Key.LeftCtrl: keyName = "LCTRL"; break;
+                        case Key.RightCtrl: keyName = "RCTRL"; break;
+                        case Key.LeftShift: keyName = "LSHIFT"; break;
+                        case Key.RightShift: keyName = "RSHIFT"; break;
+                        default: break;
+                    }
+                    if (!keyAdded.Contains(keyName))
+                    {
+                        keys.Add(keyName);
+                        keyAdded.Add(keyName);
+                    }
+                }
+            }
+
+
+            keys.Sort(
+                (a, b) =>
+                {
+                    int value = 0;
+                    if (a.Contains("CTRL")) value--;
+                    if (a.Contains("ALT")) value--;
+                    if (a.Contains("SHIFT")) value--;
+                    if (b.Contains("CTRL")) value++;
+                    if (b.Contains("ALT")) value++;
+                    if (b.Contains("SHIFT")) value++;
+                    return value;
+                }
+            );
+
+            // Set textboxes
+            string keyText = string.Join("+", keys.ToArray());
+            textKeyboard.Text = keyText;
+            textCustom.Text = keyText;
+
+            comboBoxMouse.SelectedIndex = 0;
+
+            if (e != null)
+                e.Handled = true;
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        //
+        // Set
+        //
+        private void ButtonSet_Click(object sender, RoutedEventArgs e)
+        {
+            if (button != null)
+            {
+                Result = textCustom.Text;
+                DialogResult = true;
+                Close();
+            }
+        }
+
+
+        //
+        // Clear
+        //
+        private void ButtonClear_Click(object sender, RoutedEventArgs e)
+        {
+            if (button != null)
+            {
+                Result = "";
+                DialogResult = true;
+                Close();
+            }
+        }
+
+        //
+        // Cancel
+        //
+        private void ButtonCancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+
+
+        //
+        // Mouse combobox enter press -> set
+        //
+        private void ComboBoxMouse_KeyUp(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                ButtonSet_Click(sender, null);
+            }
+        }
+    }
+}
diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index bd47fc0..3e821e1 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -28,36 +28,44 @@ public enum OutputModes
         public Area ScreenArea;
 
         // Smoothing filter
+        public bool SmoothingEnabled;
         public double SmoothingLatency;
         public int SmoothingInterval;
-        public bool SmoothingEnabled;
+        public bool SmoothingOnlyWhenButtons;
 
         // Noise filter
+        public bool NoiseFilterEnabled;
         public int NoiseFilterBuffer;
         public double NoiseFilterThreshold;
-        public bool NoiseFilterEnabled;
 
         // Anti-smoothing filter
+        public bool AntiSmoothingEnabled;
         public double AntiSmoothingShape;
         public double AntiSmoothingCompensation;
-        public bool AntiSmoothingIgnoreWhenDragging;
-        public bool AntiSmoothingEnabled;
+        public bool AntiSmoothingOnlyWhenHover;
 
         public Area DesktopSize;
         public bool AutomaticDesktopSize;
 
         [XmlArray("ButtonMap")]
         [XmlArrayItem("Button")]
-        public int[] ButtonMap;
+        public string[] ButtonMap;
         public bool DisableButtons;
 
-        [XmlArray("CommandsAfter")]
-        [XmlArrayItem("Command")]
-        public string[] CommandsAfter;
+        [XmlArray("TabletButtonMap")]
+        [XmlArrayItem("Button")]
+        public string[] TabletButtonMap;
+        public bool DisableTabletButtons;
+
+        public double PressureSensitivity;
+        public double PressureDeadzone;
 
-        [XmlArray("CommandsBefore")]
+        public double ScrollSensitivity;
+        public double ScrollAcceleration;
+
+        [XmlArray("CustomCommands")]
         [XmlArrayItem("Command")]
-        public string[] CommandsBefore;
+        public string[] CustomCommands;
 
         public int WindowWidth;
         public int WindowHeight;
@@ -90,12 +98,21 @@ public Configuration()
             DesktopSize = new Area(0, 0, 0, 0);
             AutomaticDesktopSize = true;
 
-            ButtonMap = new int[] { 1, 2, 3 };
+            ButtonMap = new string[] { "MOUSE1", "MOUSE2", "MOUSE3" };
             DisableButtons = false;
 
+            TabletButtonMap = new string[16];
+            for (int i = 0; i < 16; i++) TabletButtonMap[i] = "";
+            DisableTabletButtons = false;
+
+            PressureSensitivity = 0;
+            ScrollSensitivity = 1.0;
+            ScrollAcceleration = 1.0;
+
             SmoothingEnabled = false;
             SmoothingLatency = 0;
             SmoothingInterval = 4;
+            SmoothingOnlyWhenButtons = false;
 
             NoiseFilterEnabled = false;
             NoiseFilterBuffer = 10;
@@ -103,10 +120,9 @@ public Configuration()
 
             AntiSmoothingEnabled = false;
             AntiSmoothingShape = 0.5;
-            AntiSmoothingCompensation = 4.0;
+            AntiSmoothingCompensation = 20.0;
 
-            CommandsAfter = new string[] { "" };
-            CommandsBefore = new string[] { "" };
+            CustomCommands = new string[] { "" };
 
             WindowWidth = 700;
             WindowHeight = 710;
diff --git a/TabletDriverGUI/MainWindow.Console.cs b/TabletDriverGUI/MainWindow.Console.cs
index 6e6c751..060659e 100644
--- a/TabletDriverGUI/MainWindow.Console.cs
+++ b/TabletDriverGUI/MainWindow.Console.cs
@@ -1,19 +1,14 @@
-using Microsoft.Win32;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Interop;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using System.Windows.Threading;
 
 namespace TabletDriverGUI
 {
@@ -153,15 +148,27 @@ private void TextConsoleInput_PreviewKeyDown(object sender, KeyEventArgs e)
             //
             // Command tab complete
             //
-            if (e.Key == Key.Tab)
+            if (e.Key == Key.Tab
+                ||
+                (e.Key == Key.Space && e.KeyboardDevice.Modifiers == ModifierKeys.Control)
+            )
             {
+                string fill;
                 string inputText = textConsoleInput.Text.Trim().ToLower();
-                string fill = driver.CompleteCommandName(inputText, true);
-                if (fill != inputText)
+                if (inputText.StartsWith("help "))
                 {
-                    textConsoleInput.Text = fill;
-                    textConsoleInput.CaretIndex = textConsoleInput.Text.Length;
+                    fill = driver.CompleteCommandName(inputText.Substring(5), true);
+                    if (fill != null)
+                        textConsoleInput.Text = "Help " + fill;
+                }
+                else
+                {
+                    fill = driver.CompleteCommandName(inputText, true);
+                    if (fill != null)
+                        textConsoleInput.Text = fill;
                 }
+                if (fill != null)
+                    textConsoleInput.CaretIndex = textConsoleInput.Text.Length;
                 ConsoleBufferToText();
                 e.Handled = true;
             }
@@ -259,9 +266,53 @@ private void TextCommands_PreviewKeyDown(object sender, KeyEventArgs e)
                 string newText = text;
 
                 // Set selected text as completed command name
-                if (completedCommand != commandName)
+                if (completedCommand != null)
                 {
+
+                    //
+                    // Close old tool tip
+                    //
+                    if (textBoxSender.ToolTip != null)
+                    {
+                        ((ToolTip)textBoxSender.ToolTip).IsOpen = false;
+                        ((ToolTip)textBoxSender.ToolTip).IsEnabled = false;
+                    }
                     textBoxSender.SelectedText = completedCommand;
+
+                    // Find commands
+                    string foundCommands = "Commands:\n";
+                    int commandCount = 1;
+                    foreach (var command in driver.Commands)
+                    {
+                        if (command.Key.ToLower().StartsWith(completedCommand.ToLower()))
+                        {
+                            foundCommands += command.Value + " ";
+                            if (commandCount % 10 == 0) foundCommands += "\n";
+                        }
+
+                        commandCount++;
+                    }
+
+                    //
+                    // Create tool tip
+                    //
+                    ToolTip toolTip = new ToolTip
+                    {
+                        Placement = System.Windows.Controls.Primitives.PlacementMode.Relative,
+                        PlacementTarget = textBoxSender,
+                        HorizontalOffset = 100
+                    };
+                    toolTip.Opened += async delegate (object obj1, RoutedEventArgs eventArgs1)
+                    {
+                        toolTip.Content = foundCommands;
+                        await Task.Delay(3000);
+                        toolTip.IsOpen = false;
+                        toolTip.IsEnabled = false;
+                        textBoxSender.ToolTip = null;
+                    };
+                    toolTip.IsOpen = true;
+                    textBoxSender.ToolTip = toolTip;
+
                 }
 
                 // Set cursor position
diff --git a/TabletDriverGUI/MainWindow.Driver.cs b/TabletDriverGUI/MainWindow.Driver.cs
index 34c4453..636a19a 100644
--- a/TabletDriverGUI/MainWindow.Driver.cs
+++ b/TabletDriverGUI/MainWindow.Driver.cs
@@ -1,19 +1,10 @@
-using Microsoft.Win32;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Interop;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using System.Windows.Threading;
 
 namespace TabletDriverGUI
 {
@@ -25,6 +16,7 @@ public partial class MainWindow : Window
         //
         void StartDriver()
         {
+
             if (running) return;
 
             // Try to start the driver
@@ -71,26 +63,13 @@ private void SendSettingsToDriver()
         {
             if (!driver.IsRunning) return;
 
-            // Commands before settings
-            if (config.CommandsBefore.Length > 0)
-            {
-                foreach (string command in config.CommandsBefore)
-                {
-                    string tmp = command.Trim();
-                    if (tmp.Length > 0)
-                    {
-                        driver.SendCommand(tmp);
-                    }
-                }
-            }
-
+            settingCommands.Clear();
 
             // Desktop size
-            driver.SendCommand("DesktopSize " + textDesktopWidth.Text + " " + textDesktopHeight.Text);
-
+            settingCommands.Add("DesktopSize " + textDesktopWidth.Text + " " + textDesktopHeight.Text);
 
             // Screen area
-            driver.SendCommand("ScreenArea " +
+            settingCommands.Add("ScreenArea " +
                 Utils.GetNumberString(config.ScreenArea.Width) + " " + Utils.GetNumberString(config.ScreenArea.Height) + " " +
                 Utils.GetNumberString(config.ScreenArea.X) + " " + Utils.GetNumberString(config.ScreenArea.Y)
             );
@@ -102,24 +81,24 @@ private void SendSettingsToDriver()
             // Inverted
             if (config.Invert)
             {
-                driver.SendCommand("TabletArea " +
+                settingCommands.Add("TabletArea " +
                     Utils.GetNumberString(config.TabletArea.Width) + " " +
                     Utils.GetNumberString(config.TabletArea.Height) + " " +
                     Utils.GetNumberString(config.TabletFullArea.Width - config.TabletArea.X) + " " +
                     Utils.GetNumberString(config.TabletFullArea.Height - config.TabletArea.Y)
                 );
-                driver.SendCommand("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation + 180));
+                settingCommands.Add("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation + 180));
             }
             // Normal
             else
             {
-                driver.SendCommand("TabletArea " +
+                settingCommands.Add("TabletArea " +
                     Utils.GetNumberString(config.TabletArea.Width) + " " +
                     Utils.GetNumberString(config.TabletArea.Height) + " " +
                     Utils.GetNumberString(config.TabletArea.X) + " " +
                     Utils.GetNumberString(config.TabletArea.Y)
                 );
-                driver.SendCommand("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation));
+                settingCommands.Add("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation));
             }
 
 
@@ -127,86 +106,156 @@ private void SendSettingsToDriver()
             switch (config.OutputMode)
             {
                 case Configuration.OutputModes.Absolute:
-                    driver.SendCommand("Mode Absolute");
+                    settingCommands.Add("Mode Absolute");
                     break;
                 case Configuration.OutputModes.Relative:
-                    driver.SendCommand("Mode Relative");
-                    driver.SendCommand("RelativeSensitivity " + Utils.GetNumberString(config.ScreenArea.Width / config.TabletArea.Width));
+                    settingCommands.Add("Mode Relative");
+                    settingCommands.Add("RelativeSensitivity " + Utils.GetNumberString(config.ScreenArea.Width / config.TabletArea.Width));
                     break;
                 case Configuration.OutputModes.Digitizer:
-                    driver.SendCommand("Mode Digitizer");
+                    settingCommands.Add("Mode Digitizer");
                     break;
             }
 
-
-            // Button map
+            //
+            // Pen button map
+            //
             if (config.DisableButtons)
             {
-                driver.SendCommand("ButtonMap 0 0 0");
+                settingCommands.Add("ClearButtonMap");
+            }
+            else
+            {
+                settingCommands.Add("ClearButtonMap");
+                int button = 1;
+                foreach (string key in config.ButtonMap)
+                {
+                    settingCommands.Add("ButtonMap " + button + " \"" + key + "\"");
+                    button++;
+                }
+            }
+
+            //
+            // Tablet button map
+            //
+            if (config.DisableTabletButtons)
+            {
+                settingCommands.Add("ClearAuxButtonMap");
             }
             else
             {
-                driver.SendCommand("ButtonMap " + String.Join(" ", config.ButtonMap));
+                settingCommands.Add("ClearAuxButtonMap");
+                int button = 1;
+                foreach (string key in config.TabletButtonMap)
+                {
+                    if (key != "")
+                    {
+                        settingCommands.Add("AuxButtonMap " + button + " \"" + key + "\"");
+                    }
+                    button++;
+                }
             }
 
+
+            //
+            // Pressure
+            //
+            settingCommands.Add("PressureSensitivity " + Utils.GetNumberString(config.PressureSensitivity));
+            settingCommands.Add("PressureDeadzone " + Utils.GetNumberString(config.PressureDeadzone));
+
+
+            //
+            // Scroll
+            //
+            settingCommands.Add("ScrollSensitivity " + Utils.GetNumberString(config.ScrollSensitivity));
+            settingCommands.Add("ScrollAcceleration " + Utils.GetNumberString(config.ScrollAcceleration));
+
+
             // Smoothing filter
             if (config.SmoothingEnabled)
             {
-                driver.SendCommand("FilterTimerInterval " + Utils.GetNumberString(config.SmoothingInterval));
-                driver.SendCommand("Smoothing " + Utils.GetNumberString(config.SmoothingLatency));
+                settingCommands.Add("FilterTimerInterval " + Utils.GetNumberString(config.SmoothingInterval));
+                settingCommands.Add(
+                    "Smoothing " + Utils.GetNumberString(config.SmoothingLatency) + " 90 " +
+                    (config.SmoothingOnlyWhenButtons ? "true" : "false")
+                );
             }
             else
             {
-                driver.SendCommand("FilterTimerInterval 10");
-                driver.SendCommand("Smoothing 0");
+                settingCommands.Add("FilterTimerInterval 10");
+                settingCommands.Add("Smoothing 0");
             }
 
             // Noise filter
             if (config.NoiseFilterEnabled)
             {
-                driver.SendCommand("Noise " + Utils.GetNumberString(config.NoiseFilterBuffer) + " " + Utils.GetNumberString(config.NoiseFilterThreshold));
+                settingCommands.Add("Noise " + Utils.GetNumberString(config.NoiseFilterBuffer) + " " + Utils.GetNumberString(config.NoiseFilterThreshold));
             }
             else
             {
-                driver.SendCommand("Noise 0");
+                settingCommands.Add("Noise 0");
             }
 
 
             // Anti-smoothing filter
             if (config.AntiSmoothingEnabled)
             {
-                driver.SendCommand("AntiSmoothing " + Utils.GetNumberString(config.AntiSmoothingShape) + " " +
+                settingCommands.Add("AntiSmoothing " + Utils.GetNumberString(config.AntiSmoothingShape) + " " +
                     Utils.GetNumberString(config.AntiSmoothingCompensation) + " " +
-                    (config.AntiSmoothingIgnoreWhenDragging ? "true" : "false"));
+                    (config.AntiSmoothingOnlyWhenHover ? "true" : "false"));
             }
             else
             {
-                driver.SendCommand("AntiSmoothing 0");
+                settingCommands.Add("AntiSmoothing 0");
             }
 
 
             // Debugging
-            if(config.DebuggingEnabled)
+            if (config.DebuggingEnabled)
             {
-                driver.SendCommand("Debug true");
-            } else
+                settingCommands.Add("Debug true");
+            }
+            else
             {
-                driver.SendCommand("Debug false");
+                settingCommands.Add("Debug false");
             }
 
 
             // Commands after settings
-            if (config.CommandsAfter.Length > 0)
+            if (config.CustomCommands.Length > 0)
             {
-                foreach (string command in config.CommandsAfter)
+                foreach (string command in config.CustomCommands)
                 {
                     string tmp = command.Trim();
                     if (tmp.Length > 0)
                     {
-                        driver.SendCommand(tmp);
+                        settingCommands.Add(tmp);
                     }
                 }
             }
+
+            //
+            // Send commands to the driver
+            //
+            foreach (string command in settingCommands)
+            {
+                // Skip comments
+                if (command.StartsWith("#")) continue;
+
+                driver.SendCommand(command);
+            }
+
+            //
+            // Write settings to usersettings.cfg
+            //
+            try
+            {
+                File.WriteAllLines("config\\usersettings.cfg", settingCommands.ToArray());
+            }
+            catch (Exception)
+            {
+            }
+
         }
 
 
@@ -348,7 +397,32 @@ private void ProcessStatusMessage(string variableName, string parameters)
             }
 
 
+            if (variableName == "aux_buttons")
+            {
+                if (Utils.ParseNumber(parameters, out double test))
+                {
+                    tabletButtonCount = (int)test;
+                    if(tabletButtonCount > 0)
+                    {
+                        for (int i = 0; i < 16; i++)
+                        {
+                            GroupBox box = (GroupBox)wrapPanelTabletButtons.Children[i];
+                            if (i >= tabletButtonCount) {
+                                box.Visibility = Visibility.Collapsed;
+                            }
+                            else
+                            {
+                                box.Visibility = Visibility.Visible;
+                            }
+                        }
+                        groupBoxTabletButtons.Visibility = Visibility.Visible;
+
+                    }
+                    if (isFirstStart)
+                        SendSettingsToDriver();
+                }
 
+            }
         }
 
 
@@ -358,7 +432,7 @@ private void ProcessStatusMessage(string variableName, string parameters)
         private void OnDriverStarted(object sender, EventArgs e)
         {
             // Debugging commands
-            if(config.DebuggingEnabled)
+            if (config.DebuggingEnabled)
             {
                 driver.SendCommand("HIDList");
             }
@@ -423,6 +497,7 @@ private void OnDriverStopped(object sender, EventArgs e)
                 {
                     Title = "TabletDriverGUI";
                     notifyIcon.Text = "No tablet found";
+                    groupBoxTabletButtons.Visibility = Visibility.Collapsed;
                 });
 
             }
diff --git a/TabletDriverGUI/MainWindow.Ink.cs b/TabletDriverGUI/MainWindow.Ink.cs
new file mode 100644
index 0000000..dacaf8a
--- /dev/null
+++ b/TabletDriverGUI/MainWindow.Ink.cs
@@ -0,0 +1,200 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace TabletDriverGUI
+{
+    public partial class MainWindow : Window
+    {
+
+        //
+        // Ink canvas stylys move
+        //
+        private void InkCanvas_StylusMove(object sender, StylusEventArgs e)
+        {
+            double pressure = 0;
+            int count = 0;
+            StylusPointCollection points = e.GetStylusPoints(inkCanvas);
+            foreach (var point in points)
+            {
+                pressure += point.PressureFactor;
+                count++;
+            }
+            progressPressure.Value = pressure / count;
+        }
+
+
+        //
+        // Ink canvas stylus up
+        //
+        private void InkCanvas_StylusUp(object sender, StylusEventArgs e)
+        {
+            progressPressure.Value = 0;
+
+            Random random = new Random();
+            byte shade = (byte)random.Next(0x33, 0x77);
+            inkCanvasDrawingAttributes.Color = Color.FromRgb(shade, shade, shade);
+            if (inkCanvasUndoHistory != null && inkCanvasUndoHistory.Count > 0)
+            {
+                inkCanvasUndoHistory.Clear();
+            }
+        }
+
+
+        //
+        // Ink canvas key down
+        //
+        private void InkCanvas_KeyDown(object sender, KeyEventArgs e)
+        {
+            // Ctrl + Z undo
+            if (e.Key == Key.Z && e.KeyboardDevice.Modifiers == ModifierKeys.Control)
+            {
+
+                ButtonInkUndo_Click(sender, null);
+            }
+
+            // Ctrl + Y redo
+            if (e.Key == Key.Y && e.KeyboardDevice.Modifiers == ModifierKeys.Control)
+            {
+                ButtonInkRedo_Click(sender, null);
+            }
+
+        }
+
+
+        //
+        // Windows Ink pressure sensitivity changed
+        //
+        private void SliderPressure_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            sliderPressureSensitivity.ToolTip = Utils.GetNumberString(-sliderPressureSensitivity.Value);
+            sliderPressureDeadzone.ToolTip = Utils.GetNumberString(sliderPressureDeadzone.Value * 100) + "%";
+
+            if (isLoadingSettings) return;
+
+            config.PressureSensitivity = sliderPressureSensitivity.Value;
+            config.PressureDeadzone = sliderPressureDeadzone.Value;
+
+
+            driver.SendCommand("PressureSensitivity " + Utils.GetNumberString(config.PressureSensitivity));
+            driver.SendCommand("PressureDeadzone " + Utils.GetNumberString(config.PressureDeadzone));
+        }
+
+
+        //
+        // Clear ink canvas
+        //
+        private void ButtonInkClear_Click(object sender, RoutedEventArgs e)
+        {
+            inkCanvas.Strokes.Clear();
+            inkCanvasUndoHistory.Clear();
+        }
+
+
+        //
+        // Undo ink canvas
+        //
+        private void ButtonInkUndo_Click(object sender, RoutedEventArgs e)
+        {
+            if (inkCanvas.Strokes.Count > 0)
+            {
+                inkCanvasUndoHistory.Add(inkCanvas.Strokes[inkCanvas.Strokes.Count - 1]);
+                inkCanvas.Strokes.RemoveAt(inkCanvas.Strokes.Count - 1);
+            }
+        }
+
+
+        //
+        // Redo ink canvas
+        //
+        private void ButtonInkRedo_Click(object sender, RoutedEventArgs e)
+        {
+            if (inkCanvasUndoHistory.Count > 0)
+            {
+                inkCanvas.Strokes.Add(inkCanvasUndoHistory.Last());
+                inkCanvasUndoHistory.RemoveAt(inkCanvasUndoHistory.Count - 1);
+            }
+        }
+
+
+        //
+        // Save ink canvas
+        //
+        private void ButtonInkSave_Click(object sender, RoutedEventArgs e)
+        {
+            SaveFileDialog fileDialog = new SaveFileDialog
+            {
+                DefaultExt = ".png",
+                Filter = "PNG Files (*.png)|*.png",
+                FileName = "inktest_" + DateTime.Now.ToString("yyyy-MM-dd_HHmmss") + ".png"
+            };
+
+            // File selection OK?
+            if (fileDialog.ShowDialog() == true)
+            {
+                try
+                {
+                    RenderInkCanvasToPNG(inkCanvas, 2.0, fileDialog.FileName);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("Saving failed!\n" + ex.Message, "ERROR!", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+        }
+
+
+        //
+        // Render Ink canvas to PNG
+        //
+        private void RenderInkCanvasToPNG(InkCanvas canvas, double scale, string filepath)
+        {
+            double inkWidth = canvas.ActualWidth * scale;
+            double inkHeight = canvas.ActualHeight * scale;
+
+            // Draw ink canvas to drawing visual
+            DrawingVisual drawingVisual = new DrawingVisual();
+            using (DrawingContext context = drawingVisual.RenderOpen())
+            {
+                VisualBrush visualBrush = new VisualBrush(canvas);
+                Brush borderBrush = new SolidColorBrush(inkCanvas.DefaultDrawingAttributes.Color);
+                Pen borderPen = new Pen(borderBrush, 5);
+                context.DrawRectangle(visualBrush, borderPen, new Rect(0, 0, inkWidth, inkHeight));
+            }
+
+            // Render drawing visual to a bitmap
+            RenderTargetBitmap targetBitmap = new RenderTargetBitmap(
+                (int)inkWidth,
+                (int)inkHeight,
+                96, 96,
+               PixelFormats.Default
+            );
+            targetBitmap.Render(drawingVisual);
+
+            // Encode bitmap to PNG
+            PngBitmapEncoder encoder = new PngBitmapEncoder();
+            encoder.Frames.Add(BitmapFrame.Create(targetBitmap));
+
+            // Save PNG to a file
+            FileStream fileStream = File.Open(filepath, FileMode.OpenOrCreate);
+            encoder.Save(fileStream);
+
+            // Close the file
+            fileStream.Close();
+
+            encoder = null;
+            targetBitmap = null;
+            drawingVisual = null;
+        }
+
+    }
+}
diff --git a/TabletDriverGUI/MainWindow.Settings.cs b/TabletDriverGUI/MainWindow.Settings.cs
index 10f8643..d530a17 100644
--- a/TabletDriverGUI/MainWindow.Settings.cs
+++ b/TabletDriverGUI/MainWindow.Settings.cs
@@ -2,26 +2,20 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Interop;
 using System.Windows.Media;
 using System.Windows.Shapes;
-using System.Windows.Threading;
 
 namespace TabletDriverGUI
 {
     public partial class MainWindow : Window
     {
 
-
-        #region Driver configuration stuff
+        #region Configuration Load / Update
 
         //
         // Load settings from configuration
@@ -51,6 +45,20 @@ private void LoadSettingsFromConfiguration()
                     radioModeDigitizer.IsChecked = true;
                     break;
             }
+
+
+            //
+            // Windows Ink pressure
+            //
+            if (config.OutputMode == Configuration.OutputModes.Digitizer)
+                groupBoxWindowsInkSettings.IsEnabled = true;
+            else
+                groupBoxWindowsInkSettings.IsEnabled = false;
+
+
+            //
+            // Rotation
+            //
             textTabletAreaRotation.Text = Utils.GetNumberString(config.TabletArea.Rotation);
             checkBoxInvert.IsChecked = config.Invert;
 
@@ -103,7 +111,9 @@ private void LoadSettingsFromConfiguration()
             checkBoxAutomaticDesktopSize.IsChecked = config.AutomaticDesktopSize;
 
 
+            //
             // Force aspect ratio
+            //
             if (config.ForceAspectRatio)
             {
                 config.TabletArea.Height = config.TabletArea.Width / (config.ScreenArea.Width / config.ScreenArea.Height);
@@ -121,36 +131,76 @@ private void LoadSettingsFromConfiguration()
 
 
             //
-            // Buttons
+            // Pen buttons
             //
             if (config.ButtonMap.Count() == 3)
             {
-                comboBoxButton1.SelectedIndex = config.ButtonMap[0];
-                comboBoxButton2.SelectedIndex = config.ButtonMap[1];
-                comboBoxButton3.SelectedIndex = config.ButtonMap[2];
+                buttonPenButton1.Content = config.ButtonMap[0];
+                buttonPenButton2.Content = config.ButtonMap[1];
+                buttonPenButton3.Content = config.ButtonMap[2];
             }
             else
             {
-                config.ButtonMap = new int[] { 1, 2, 3 };
+                config.ButtonMap = new string[] { "MOUSE1", "MOUSE2", "MOUSE3" };
             }
             checkBoxDisableButtons.IsChecked = config.DisableButtons;
 
 
+            //
+            // Tablet buttons
+            //
+            if (config.TabletButtonMap.Count() == 16)
+            {
+                for (int i = 0; i < 16; i++)
+                {
+                    GroupBox box = (GroupBox)wrapPanelTabletButtons.Children[i];
+                    Button button = (Button)(box.Content);
+                    button.Content = config.TabletButtonMap[i];
+                }
+            }
+            else
+            {
+                config.TabletButtonMap = new string[16];
+                for (int i = 0; i < 16; i++) config.TabletButtonMap[i] = "";
+            }
+            if (wrapPanelTabletButtons.Children.Count == 17)
+            {
+                ((CheckBox)wrapPanelTabletButtons.Children[16]).IsChecked = config.DisableTabletButtons;
+            }
+
+
+            //
+            // Pressure
+            //
+            sliderPressureSensitivity.Value = config.PressureSensitivity;
+            sliderPressureDeadzone.Value = config.PressureDeadzone;
+
+
+            //
+            // Scroll
+            //
+            textScrollSensitivity.Text = Utils.GetNumberString(config.ScrollSensitivity);
+            textScrollAcceleration.Text = Utils.GetNumberString(config.ScrollAcceleration);
+
+
             //
             // Smoothing filter
             //
             checkBoxSmoothing.IsChecked = config.SmoothingEnabled;
             textSmoothingLatency.Text = Utils.GetNumberString(config.SmoothingLatency);
             comboBoxSmoothingRate.SelectedIndex = config.SmoothingInterval - 1;
+            checkBoxSmoothingOnlyWhenButtons.IsChecked = config.SmoothingOnlyWhenButtons;
             if (config.SmoothingEnabled)
             {
                 textSmoothingLatency.IsEnabled = true;
                 comboBoxSmoothingRate.IsEnabled = true;
+                checkBoxSmoothingOnlyWhenButtons.IsEnabled = true;
             }
             else
             {
                 textSmoothingLatency.IsEnabled = false;
                 comboBoxSmoothingRate.IsEnabled = false;
+                checkBoxSmoothingOnlyWhenButtons.IsEnabled = false;
             }
 
 
@@ -176,20 +226,20 @@ private void LoadSettingsFromConfiguration()
             // Anti-smoothing filter
             //
             checkBoxAntiSmoothing.IsChecked = config.AntiSmoothingEnabled;
-            textAntiSmoothingShape.Text = Utils.GetNumberString(config.AntiSmoothingShape, "0.00");
-            textAntiSmoothingCompensation.Text = Utils.GetNumberString(config.AntiSmoothingCompensation, "0.00");
-            checkBoxAntiSmoothingIgnoreWhenDragging.IsChecked = config.AntiSmoothingIgnoreWhenDragging;
+            textAntiSmoothingShape.Text = Utils.GetNumberString(config.AntiSmoothingShape);
+            textAntiSmoothingCompensation.Text = Utils.GetNumberString(config.AntiSmoothingCompensation);
+            checkBoxAntiSmoothingOnlyWhenHover.IsChecked = config.AntiSmoothingOnlyWhenHover;
             if (config.AntiSmoothingEnabled)
             {
                 textAntiSmoothingShape.IsEnabled = true;
                 textAntiSmoothingCompensation.IsEnabled = true;
-                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = true;
+                checkBoxAntiSmoothingOnlyWhenHover.IsEnabled = true;
             }
             else
             {
                 textAntiSmoothingShape.IsEnabled = false;
                 textAntiSmoothingCompensation.IsEnabled = false;
-                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = false;
+                checkBoxAntiSmoothingOnlyWhenHover.IsEnabled = false;
             }
 
             //
@@ -206,20 +256,12 @@ private void LoadSettingsFromConfiguration()
             // Custom commands
             //
             string tmp = "";
-            foreach (string command in config.CommandsBefore)
-            {
-                if (command.Trim().Length > 0)
-                    tmp += command.Trim() + "\n";
-            }
-            textCommandsBefore.Text = tmp;
-
-            tmp = "";
-            foreach (string command in config.CommandsAfter)
+            foreach (string command in config.CustomCommands)
             {
                 if (command.Trim().Length > 0)
                     tmp += command.Trim() + "\n";
             }
-            textCommandsAfter.Text = tmp;
+            textCustomCommands.Text = tmp;
 
             //
             // Debugging
@@ -245,7 +287,10 @@ private void UpdateSettingsToConfiguration()
 
             bool oldValue;
 
+
+            //
             // Tablet area
+            //
             if (Utils.ParseNumber(textTabletAreaWidth.Text, out double val))
                 config.TabletArea.Width = val;
             if (Utils.ParseNumber(textTabletAreaHeight.Text, out val))
@@ -261,13 +306,18 @@ private void UpdateSettingsToConfiguration()
             config.ForceAspectRatio = (bool)checkBoxForceAspect.IsChecked;
             config.ForceFullArea = (bool)checkBoxForceFullArea.IsChecked;
 
+
+            //
             // Output Mode
+            //
             if (radioModeAbsolute.IsChecked == true) config.OutputMode = Configuration.OutputModes.Absolute;
             if (radioModeRelative.IsChecked == true) config.OutputMode = Configuration.OutputModes.Relative;
             if (radioModeDigitizer.IsChecked == true) config.OutputMode = Configuration.OutputModes.Digitizer;
 
 
+            //
             // Force full area
+            //
             if (config.ForceFullArea)
             {
                 // Set tablet area size to full area
@@ -286,10 +336,16 @@ private void UpdateSettingsToConfiguration()
 
             }
 
+
+            //
             // Force the tablet area to be inside of the full area
+            //
             config.TabletArea.MoveInside(config.TabletFullArea);
 
+
+            //
             // Screen area
+            //
             if (Utils.ParseNumber(textScreenAreaWidth.Text, out val))
                 config.ScreenArea.Width = val;
             if (Utils.ParseNumber(textScreenAreaHeight.Text, out val))
@@ -300,7 +356,9 @@ private void UpdateSettingsToConfiguration()
                 config.ScreenArea.Y = val;
 
 
+            //
             // Desktop size
+            //
             if (Utils.ParseNumber(textDesktopWidth.Text, out val))
                 config.DesktopSize.Width = val;
             if (Utils.ParseNumber(textDesktopHeight.Text, out val))
@@ -315,7 +373,9 @@ private void UpdateSettingsToConfiguration()
             }
 
 
+            //
             // Force aspect ratio
+            //
             if (config.ForceAspectRatio)
             {
                 config.TabletArea.Height = config.TabletArea.Width / (config.ScreenArea.Width / config.ScreenArea.Height);
@@ -323,32 +383,72 @@ private void UpdateSettingsToConfiguration()
             }
 
 
+            //
             // Button map 
-            config.ButtonMap[0] = comboBoxButton1.SelectedIndex;
-            config.ButtonMap[1] = comboBoxButton2.SelectedIndex;
-            config.ButtonMap[2] = comboBoxButton3.SelectedIndex;
+            //
+            config.ButtonMap[0] = buttonPenButton1.Content.ToString();
+            config.ButtonMap[1] = buttonPenButton2.Content.ToString();
+            config.ButtonMap[2] = buttonPenButton3.Content.ToString();
             config.DisableButtons = (bool)checkBoxDisableButtons.IsChecked;
 
 
+            //
+            // Tablet button map
+            //
+            for (int i = 0; i < 16; i++)
+            {
+                GroupBox box = (GroupBox)wrapPanelTabletButtons.Children[i];
+                Button button = (Button)(box.Content);
+                config.TabletButtonMap[i] = button.Content.ToString();
+            }
+            if (wrapPanelTabletButtons.Children.Count == 17)
+            {
+                config.DisableTabletButtons = (bool)(((CheckBox)wrapPanelTabletButtons.Children[16]).IsChecked);
+            }
+
+
+            //
+            // Pressure sensitivity
+            //
+            config.PressureSensitivity = sliderPressureSensitivity.Value;
+            config.PressureDeadzone = sliderPressureDeadzone.Value;
+
 
+            //
+            // Scroll
+            //
+            if (Utils.ParseNumber(textScrollSensitivity.Text, out val))
+                config.ScrollSensitivity = val;
+            if (Utils.ParseNumber(textScrollAcceleration.Text, out val))
+                config.ScrollAcceleration = val;
+
+
+            //
             // Smoothing filter
+            //
             config.SmoothingEnabled = (bool)checkBoxSmoothing.IsChecked;
             config.SmoothingInterval = comboBoxSmoothingRate.SelectedIndex + 1;
             if (Utils.ParseNumber(textSmoothingLatency.Text, out val))
                 config.SmoothingLatency = val;
+            config.SmoothingOnlyWhenButtons = (bool)checkBoxSmoothingOnlyWhenButtons.IsChecked;
 
             if (config.SmoothingEnabled)
             {
                 textSmoothingLatency.IsEnabled = true;
                 comboBoxSmoothingRate.IsEnabled = true;
+                checkBoxSmoothingOnlyWhenButtons.IsEnabled = true;
             }
             else
             {
                 textSmoothingLatency.IsEnabled = false;
                 comboBoxSmoothingRate.IsEnabled = false;
+                checkBoxSmoothingOnlyWhenButtons.IsEnabled = false;
             }
 
+
+            //
             // Noise filter
+            //
             config.NoiseFilterEnabled = (bool)checkBoxNoiseFilter.IsChecked;
             if (Utils.ParseNumber(textNoiseBuffer.Text, out val))
                 config.NoiseFilterBuffer = (int)val;
@@ -365,26 +465,30 @@ private void UpdateSettingsToConfiguration()
                 textNoiseThreshold.IsEnabled = false;
             }
 
+
+            //
             // Anti-smoothing filter
+            //
             config.AntiSmoothingEnabled = (bool)checkBoxAntiSmoothing.IsChecked;
             if (Utils.ParseNumber(textAntiSmoothingShape.Text, out val))
                 config.AntiSmoothingShape = val;
             if (Utils.ParseNumber(textAntiSmoothingCompensation.Text, out val))
                 config.AntiSmoothingCompensation = val;
-            config.AntiSmoothingIgnoreWhenDragging = (bool)checkBoxAntiSmoothingIgnoreWhenDragging.IsChecked;
+            config.AntiSmoothingOnlyWhenHover = (bool)checkBoxAntiSmoothingOnlyWhenHover.IsChecked;
             if (config.AntiSmoothingEnabled)
             {
                 textAntiSmoothingShape.IsEnabled = true;
                 textAntiSmoothingCompensation.IsEnabled = true;
-                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = true;
+                checkBoxAntiSmoothingOnlyWhenHover.IsEnabled = true;
             }
             else
             {
                 textAntiSmoothingShape.IsEnabled = false;
                 textAntiSmoothingCompensation.IsEnabled = false;
-                checkBoxAntiSmoothingIgnoreWhenDragging.IsEnabled = false;
+                checkBoxAntiSmoothingOnlyWhenHover.IsEnabled = false;
             }
 
+
             //
             // Automatic restart
             //
@@ -400,18 +504,14 @@ private void UpdateSettingsToConfiguration()
                 SetRunAtStartup(config.RunAtStartup);
 
 
+            //
             // Custom commands
+            //
             List<string> commandList = new List<string>();
-            foreach (string command in textCommandsBefore.Text.Split('\n'))
-                if (command.Trim().Length > 0)
-                    commandList.Add(command.Trim());
-            config.CommandsBefore = commandList.ToArray();
-
-            commandList.Clear();
-            foreach (string command in textCommandsAfter.Text.Split('\n'))
+            foreach (string command in textCustomCommands.Text.Split('\n'))
                 if (command.Trim().Length > 0)
                     commandList.Add(command.Trim());
-            config.CommandsAfter = commandList.ToArray();
+            config.CustomCommands = commandList.ToArray();
 
 
             //
@@ -420,6 +520,7 @@ private void UpdateSettingsToConfiguration()
             config.DebuggingEnabled = (bool)checkBoxDebugging.IsChecked;
 
 
+            // Update canvases
             UpdateCanvasElements();
 
         }
@@ -437,6 +538,15 @@ private void SaveSettings(object sender, RoutedEventArgs e)
             {
                 config.Write(configFilename);
                 SendSettingsToDriver();
+
+                //
+                // Enable/Disable Windows Ink pressure settings
+                //
+                if (config.OutputMode == Configuration.OutputModes.Digitizer)
+                    groupBoxWindowsInkSettings.IsEnabled = true;
+                else
+                    groupBoxWindowsInkSettings.IsEnabled = false;
+
                 SetStatus("Settings saved!");
             }
             catch (Exception)
@@ -450,16 +560,6 @@ private void SaveSettings(object sender, RoutedEventArgs e)
         }
 
 
-        //
-        // Apply settings
-        //
-        private void ApplySettings(object sender, RoutedEventArgs e)
-        {
-            SendSettingsToDriver();
-            SetStatus("Settings applied!");
-        }
-
-
         //
         // Set run at startup
         //
@@ -662,9 +762,6 @@ void CreateCanvasElements()
             };
             canvasTabletArea.Children.Add(textTabletAspectRatio);
 
-
-
-
             //
             // Canvas mouse drag
             //
@@ -908,6 +1005,7 @@ private void Canvas_MouseMove(object sender, MouseEventArgs e)
                     dx = 0;
                 if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
                     dy = 0;
+ 
 
                 // Screen map canvas
                 if (mouseDrag.Source == canvasScreenMap)
@@ -918,6 +1016,12 @@ private void Canvas_MouseMove(object sender, MouseEventArgs e)
                     if (scaleX > scaleY)
                         scale = scaleX;
 
+                    if (Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt))
+                    {
+                        dx = Math.Round(dx * scale / 80.0) * 80.0 / scale;
+                        dy = Math.Round(dy * scale / 80.0) * 80.0 / scale;
+                    }
+
                     config.ScreenArea.X = mouseDrag.OriginDraggable.X + dx * scale;
                     config.ScreenArea.Y = mouseDrag.OriginDraggable.Y + dy * scale;
                     UpdateScreenMapCanvas();
@@ -932,6 +1036,12 @@ private void Canvas_MouseMove(object sender, MouseEventArgs e)
                     if (scaleX > scaleY)
                         scale = scaleX;
 
+                    if (Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt))
+                    {
+                        dx = Math.Round(dx * scale / 5.0) * 5.0 / scale;
+                        dy = Math.Round(dy * scale / 5.0) * 5.0 / scale;
+                    }
+
                     config.TabletArea.X = mouseDrag.OriginDraggable.X + dx * scale;
                     config.TabletArea.Y = mouseDrag.OriginDraggable.Y + dy * scale;
 
@@ -985,20 +1095,6 @@ private void CheckboxChanged(object sender, RoutedEventArgs e)
 
             }
 
-            // Disable button map selection when buttons are disabled
-            if (checkBoxDisableButtons.IsChecked == true)
-            {
-                comboBoxButton1.IsEnabled = false;
-                comboBoxButton2.IsEnabled = false;
-                comboBoxButton3.IsEnabled = false;
-            }
-            else
-            {
-                comboBoxButton1.IsEnabled = true;
-                comboBoxButton2.IsEnabled = true;
-                comboBoxButton3.IsEnabled = true;
-            }
-
             // Disable desktop size settings when automatic is checked
             if (checkBoxAutomaticDesktopSize.IsChecked == true)
             {
@@ -1130,7 +1226,7 @@ private void ComboBoxMonitor_SelectionChanged(object sender, SelectionChangedEve
                 index--;
 
                 // Monitors
-                if (index >= 0 && index < screens.Length)
+                if (index >= 0 && index <= screens.Length && screens.Length > 1)
                 {
                     textScreenAreaX.Text = Utils.GetNumberString(screens[index].Bounds.X - minX);
                     textScreenAreaY.Text = Utils.GetNumberString(screens[index].Bounds.Y - minY);
@@ -1176,6 +1272,49 @@ private void ComboBoxMonitor_SelectionChanged(object sender, SelectionChangedEve
         }
 
 
+        //
+        // Button mapping click
+        //
+        private void ButtonMap_Click(object sender, RoutedEventArgs e)
+        {
+            Button button = (Button)sender;
+            //MessageBox.Show(button.Content.ToString());
+
+            bool isPenButton = false;
+
+            if (sender == buttonPenButton1) isPenButton = true;
+            else if (sender == buttonPenButton2) isPenButton = true;
+            else if (sender == buttonPenButton3) isPenButton = true;
+
+
+            ButtonMapping buttonMapping = new ButtonMapping(button, isPenButton);
+            buttonMapping.ShowDialog();
+            if (buttonMapping.DialogResult == true)
+            {
+                button.Content = buttonMapping.Result.ToUpper();
+                UpdateSettingsToConfiguration();
+            }
+
+        }
+
+
+        //
+        // Button map tooltip opening
+        //
+        private void ButtonMap_ToolTipOpening(object sender, ToolTipEventArgs e)
+        {
+            Button button = (Button)sender;
+            if (button.Content.ToString() == "")
+            {
+                button.ToolTip = "Empty";
+            }
+            else
+            {
+                button.ToolTip = button.Content;
+            }
+        }
+
+
         //
         // Main Menu Click
         //
@@ -1243,6 +1382,5 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
 
         }
 
-
     }
 }
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 9530402..811449e 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -13,7 +13,7 @@
       <Setter Property="HeaderTemplate">
         <Setter.Value>
           <DataTemplate>
-            <TextBlock Text="{Binding}" FontWeight="DemiBold"/>
+            <TextBlock Text="{Binding}" FontWeight="Bold"/>
           </DataTemplate>
         </Setter.Value>
       </Setter>
@@ -24,7 +24,7 @@
 
     <DockPanel Background="White">
       <Menu DockPanel.Dock="Top"  Background="White">
-        <MenuItem Header="_File">
+        <MenuItem Header="Fil_e">
           <MenuItem Name="mainMenuImport" Header="_Import Settings" Click="MainMenuClick" />
           <MenuItem Name="mainMenuExport" Header="_Export Settings" Click="MainMenuClick" />
           <Separator />
@@ -34,19 +34,29 @@
       <TextBox AcceptsReturn="True" />
     </DockPanel>
 
-    <TabControl Name="tabControl" Margin="0,20,0,59"  Selector.IsSelected="True" Background="White">
+    <TabControl Name="tabControl"
+                Margin="0,20,0,59"
+                Selector.IsSelected="True"
+                Background="White"
+                >
 
       <!-- General settings -->
       <TabItem>
         <TabItem.Header>
-          <TextBlock Foreground="#006600" FontWeight="Bold">Settings</TextBlock>
+          <TextBlock FontSize="14" Foreground="#006600" FontWeight="Bold">
+            <AccessText Text="_Settings"/>
+          </TextBlock>
         </TabItem.Header>
 
         <ScrollViewer VerticalScrollBarVisibility="Auto">
-          <StackPanel Orientation="Vertical" HorizontalAlignment="Left" Margin="5,0">
+          <StackPanel Orientation="Vertical"
+                      HorizontalAlignment="Left"
+                      Margin="5,0">
 
             <!-- Screen Mapping -->
-            <GroupBox Header="Screen Map" VerticalAlignment="Top" HorizontalAlignment="Left" Width="650">
+            <GroupBox Header="Screen Map"
+                      HorizontalAlignment="Center"
+                      Width="650">
 
               <GroupBox.ToolTip>
                 <StackPanel>
@@ -56,9 +66,11 @@
                   <TextBlock>
                     - You can drag the screen area with a mouse.
                     <LineBreak/>
-                    - Drag + Control = Move area in X direction.
+                    - Control + Drag = Move area in X direction.
+                    <LineBreak/>
+                    - Shift + Drag = Move area Y direction.          
                     <LineBreak/>
-                    - Drag + Shift = Move area Y direction.          
+                    - Alt + Drag = Move area 80 pixels at a time.
                     <LineBreak/>
                     - Use the "Set Area" to set the screen area to single monitor or full desktop.
                   </TextBlock>
@@ -135,7 +147,10 @@
 
 
             <!-- Tablet area -->
-            <GroupBox Header="Tablet Area" VerticalAlignment="Top" HorizontalAlignment="Left" Width="650" Margin="0,5,0,5">
+            <GroupBox Header="Tablet Area"
+                      HorizontalAlignment="Center"
+                      Margin="0,5,0,5"
+                      Width="650">
               <GroupBox.ToolTip>
                 <StackPanel>
                   <TextBlock FontWeight="Bold" FontSize="16">
@@ -144,10 +159,12 @@
                   <TextBlock>
                     - You can drag the tablet area with a mouse.
                     <LineBreak/>
-                    - Drag + Control = Move area in X direction.
+                    - Control + Drag = Move area in X direction.
                     <LineBreak/>
-                    - Drag + Shift = Move area Y direction.
+                    - Shift + Drag = Move area Y direction.
                     <LineBreak/>
+                    - Alt + Drag = Move area 5 mm at a time.
+                    <LineBreak/>                   
                     - For left handed mode, enable the "Left handed (Inverted)" checkbox or use a rotation value of 180 degrees.
                     <LineBreak/>
                     - Click Wacom Area button to type in the Wacom driver area settings.
@@ -329,130 +346,336 @@
             </GroupBox>
 
 
-            <!-- Button Mapping and Smoothing Filter -->
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
 
-              <!-- Button Map -->
-              <GroupBox Header="Button Mapping" VerticalAlignment="Top" HorizontalAlignment="Left" Height="73">
-                <GroupBox.ToolTip>
-                  <StackPanel>
-                    <TextBlock FontWeight="Bold" FontSize="16">
-                    Button Mapping
-                    </TextBlock>
-                    <TextBlock>
-                      - You can disable a single button by selecting "Disable" from the list.
+          </StackPanel>
+        </ScrollViewer>
+      </TabItem>
+
+      <TabItem>
+        <TabItem.Header>
+          <TextBlock FontSize="14" Foreground="#006699" FontWeight="Bold">
+            <AccessText Text="_Buttons"/>
+          </TextBlock>
+        </TabItem.Header>
+        <StackPanel Orientation="Vertical"
+                    Margin="5,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Width="650">
+
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="*" />
+              <ColumnDefinition Width="auto" />
+            </Grid.ColumnDefinitions>
+
+            <!-- Pen Button Mapping -->
+            <GroupBox Grid.Column="0" Header="Pen Buttons">
+              <GroupBox.ToolTip>
+                <StackPanel>
+                  <TextBlock FontWeight="Bold" FontSize="16">
+                    Pen Buttons
+                  </TextBlock>
+                  <TextBlock>
+                      - You can disable a single button by clicking "Clear" in the mapping dialog.
                       <LineBreak/>
-                      - The "Disable buttons" checkbox will disable all tablet buttons.
-                    </TextBlock>
-                  </StackPanel>
-                </GroupBox.ToolTip>
+                      - The "Disable buttons" checkbox will disable all pen buttons.
+                      <LineBreak/>
+                      - Use negative number in scroll sensitivity to invert the direction.
+                      <LineBreak/>
+                      - Scroll acceleration 1.0 = No acceleration.
+                  </TextBlock>
+                </StackPanel>
+              </GroupBox.ToolTip>
 
-                <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+              <StackPanel Orientation="Vertical">
 
-                  <!-- Tip -->
-                  <GroupBox Header="Tip" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90">
-                    <ComboBox Name="comboBoxButton1" SelectionChanged="ItemSelectionChanged">
+
+                <!-- Top -->
+                <GroupBox Header="Top" Width="90">
+                  <!--
+                    <ComboBox Name="comboBoxButton3" SelectionChanged="ItemSelectionChanged">
                     </ComboBox>
-                  </GroupBox>
+                    -->
+                  <Button Name="buttonPenButton3" Height="22"
+                            ToolTip=""
+                            ToolTipOpening="ButtonMap_ToolTipOpening"
+                            Padding="2,0,2,0"
+                            Background="White"
+                            Click="ButtonMap_Click"
+                            >MOUSE1</Button>
+                </GroupBox>
+
 
-                  <!-- Bottom -->
-                  <GroupBox Header="Bottom" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90">
+                <!-- Bottom -->
+                <GroupBox Header="Bottom" Width="90">
+                  <!--
                     <ComboBox Name="comboBoxButton2" SelectionChanged="ItemSelectionChanged">
                     </ComboBox>
-                  </GroupBox>
+                    -->
+                  <Button Name="buttonPenButton2" Height="22"
+                            ToolTip=""
+                            ToolTipOpening="ButtonMap_ToolTipOpening"
+                            Padding="2,0,2,0"
+                            Background="White"
+                            Click="ButtonMap_Click"
+                            >MOUSE1</Button>
+                </GroupBox>
 
-                  <!-- Top -->
-                  <GroupBox Header="Top" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90">
-                    <ComboBox Name="comboBoxButton3" SelectionChanged="ItemSelectionChanged">
+
+                <!-- Tip -->
+                <GroupBox Header="Tip" Width="90" Margin="2,0,0,0">
+                  <!--
+                    <ComboBox Name="comboBoxButton1" SelectionChanged="ItemSelectionChanged">
                     </ComboBox>
-                  </GroupBox>
+                    -->
+                  <Button Name="buttonPenButton1" Height="22"
+                            ToolTip=""
+                            ToolTipOpening="ButtonMap_ToolTipOpening"
+                            Padding="2,0,2,0"
+                            Background="White"
+                            Click="ButtonMap_Click"
+                            >MOUSE1</Button>
+                </GroupBox>
 
-                  <!-- Disable buttons -->
-                  <CheckBox Name="checkBoxDisableButtons"
-                            Margin="5"
-                            VerticalAlignment="Center"
-                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">Disable buttons</CheckBox>
-                </StackPanel>
-              </GroupBox>
 
+                <!-- Disable buttons -->
+                <CheckBox Name="checkBoxDisableButtons"
+                          HorizontalAlignment="Center"
+                          Margin="0,5,0,5"
+                          VerticalContentAlignment="Center"
+                          Checked="CheckboxChanged"
+                          Unchecked="CheckboxChanged">
+                  <TextBlock>
+                  Disable
+                    <LineBreak/>
+                    buttons
+                  </TextBlock>
+                </CheckBox>
 
 
+                <!-- Scroll sensitivity -->
+                <GroupBox Header="Scroll Sens.." Height="50" Width="90" Margin="5,0,0,0">
+                  <Grid>
+                    <TextBox Name="textScrollSensitivity" Padding="4,0,0,0"
+                             HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
+                             TextChanged="TextChanged">1.0</TextBox>
+                    <Label HorizontalAlignment="Right">s/mm</Label>
+                  </Grid>
+                </GroupBox>
 
-              <!-- Desktop size -->
-              <GroupBox Name="groupDesktopSize" Header="Desktop Size" VerticalAlignment="Bottom" Margin="5,0,0,0" HorizontalAlignment="Left"
-                        >
-                <GroupBox.ToolTip>
-                  <StackPanel>
-                    <TextBlock FontWeight="Bold" FontSize="16">
-                    Desktop Size
-                    </TextBlock>
-                    <TextBlock>
-                      - In some cases you may have to disable the auto size and manually type in the main monitor resolution.
-                      <LineBreak/>
-                      - If you don't have problems with screen mapping, leave the automatic desktop size enabled.
-                    </TextBlock>
+
+                <!-- Scroll acceleration -->
+                <GroupBox Header="Scroll Accel.." Height="50" Width="90" Margin="5,0,0,0">
+                  <Grid>
+                    <TextBox Name="textScrollAcceleration" Padding="4,0,0,0"
+                             HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
+                             TextChanged="TextChanged">1.0</TextBox>
+                  </Grid>
+                </GroupBox>
+
+              </StackPanel>
+            </GroupBox>
+
+            <!-- Windows Ink Pressure -->
+            <GroupBox Grid.Column="1" Name="groupBoxWindowsInkSettings" Header="Windows Ink Settings">
+              <StackPanel Orientation="Vertical">
+
+                <!-- Tip Firmness -->
+                <GroupBox Header="Tip Firmness">
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="auto"/>
+                      <ColumnDefinition Width="*"/>
+                      <ColumnDefinition Width="auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Grid.Column="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">Soft</Label>
+
+                    <!-- Pressure slider -->
+                    <Slider Grid.Column="1" Name="sliderPressureSensitivity"
+                            IsSnapToTickEnabled="True"
+                            TickFrequency="0.2"
+                            TickPlacement="Both"
+                            SmallChange="0.2"
+                            LargeChange="0.2"
+                            Value="0.0"
+                            Minimum="-2"
+                            Maximum="2"
+                            IsDirectionReversed="True"
+                            ValueChanged="SliderPressure_ValueChanged"
+                            >
+                    </Slider>
+                    <Label Grid.Column="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">Hard</Label>
+                  </Grid>
+                </GroupBox>
+
+                <!-- Pressure Deadzone -->
+                <GroupBox Header="Pressure Deadzone">
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="auto"/>
+                      <ColumnDefinition Width="*"/>
+                      <ColumnDefinition Width="auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Grid.Column="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">0%</Label>
+
+                    <!-- Deadzone slider -->
+                    <Slider Grid.Column="1" Name="sliderPressureDeadzone"
+                            IsSnapToTickEnabled="True"
+                            TickFrequency="0.01"
+                            TickPlacement="Both"
+                            SmallChange="0.01"
+                            LargeChange="0.01"
+                            Value="0.0"
+                            Minimum="0"
+                            Maximum="0.25"
+                            ToolTip="0%"
+                            ValueChanged="SliderPressure_ValueChanged"
+                            >
+                    </Slider>
+                    <Label Grid.Column="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">25%</Label>
+                  </Grid>
+                </GroupBox>
+
+
+
+                <!-- Pressure Tester  -->
+                <GroupBox Header="Test" Padding="2">
+                  <StackPanel Orientation="Vertical">
+                    <Border BorderThickness="2"
+                          BorderBrush="#335"
+                          >
+
+                      <!-- Ink Canvas -->
+                      <InkCanvas Width="500"
+                             Height="250"
+                             Name="inkCanvas"
+                             Background="#f6f6f6"
+                             StylusUp="InkCanvas_StylusUp"
+                             StylusMove="InkCanvas_StylusMove"
+                             KeyDown="InkCanvas_KeyDown"
+                             >
+                      </InkCanvas>
+                    </Border>
+
+                    <!-- Pressure Bar -->
+                    <ProgressBar Name="progressPressure"
+                             Minimum="0"
+                             Value="0.0"
+                             Maximum="1.0"
+                             Height="10"
+                             Background="#f6f6f6"
+                             Foreground="#555"
+                             />
                   </StackPanel>
-                </GroupBox.ToolTip>
-                <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+                </GroupBox>
 
-                  <!-- Desktop Width -->
-                  <GroupBox Header="Width" Height="50" Width="80" Margin="0,0,0,0">
-                    <Grid>
-                      <TextBox Name="textDesktopWidth" Padding="4,0,0,0"
-                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                               TextChanged="TextChanged">1920</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">px</Label>
-                    </Grid>
-                  </GroupBox>
+                <!-- Ink canvas buttons -->
+                <Grid Margin="2,4,2,0">
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition Width="*"/>
+                  </Grid.ColumnDefinitions>
 
-                  <!-- Desktop Height -->
-                  <GroupBox Header="Height" Height="50" Width="80" Margin="5,0,0,0">
-                    <Grid>
-                      <TextBox Name="textDesktopHeight" Padding="4,0,0,0"
-                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                               TextChanged="TextChanged">1080</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">px</Label>
-                    </Grid>
-                  </GroupBox>
+                  <!-- Clear Ink -->
+                  <Button Name="buttonInkClear" Content="Clear"
+                          Grid.Column="0"
+                          HorizontalAlignment="Left"
+                          Padding="5"
+                          Width="150"
+                          FontWeight="Bold"
+                          Click="ButtonInkClear_Click" />
+
+
+                  <!-- Undo -->
+                  <Button Name="buttonInkUndo" Content="Undo"
+                          Grid.Column="1"
+                          Width="80"
+                          Padding="5"
+                          Margin="0,0,3,0"
+                          FontWeight="Bold"
+                          Click="ButtonInkUndo_Click" />
+
+                  <!-- Redo -->
+                  <Button Name="buttonInkRedo" Content="Redo"
+                          Grid.Column="2"
+                          Width="80"
+                          Margin="3,0,0,0"
+                          Padding="5"
+                          FontWeight="Bold"
+                          Click="ButtonInkRedo_Click" />
+
+
+                  <!-- Save as PNG -->
+                  <Button Name="buttonInkSave" Content="Save as PNG"
+                          Grid.Column="3"
+                          HorizontalAlignment="Right"
+                          Width="150"
+                          Padding="5"
+                          FontWeight="Bold"
+                          Click="ButtonInkSave_Click" />
 
-                  <CheckBox Name="checkBoxAutomaticDesktopSize"
-                            VerticalAlignment="Center" Margin="5"
-                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">Auto</CheckBox>
-                </StackPanel>
-              </GroupBox>
 
+                </Grid>
 
 
-            </StackPanel>
+              </StackPanel>
+            </GroupBox>
 
-          </StackPanel>
-        </ScrollViewer>
+          </Grid>
+
+
+
+          <!-- Tablet buttons -->
+          <GroupBox Name="groupBoxTabletButtons" Header="Tablet Buttons"
+                      Margin="0,5,0,5" Width="650">
+            <GroupBox.ToolTip>
+              <StackPanel>
+                <TextBlock FontWeight="Bold" FontSize="16">
+                    Tablet Buttons
+                </TextBlock>
+                <TextBlock>
+                      - You can disable a single button by clicking "Clear" in the mapping dialog.
+                      <LineBreak/>
+                      - The "Disable buttons" checkbox will disable all tablet buttons.
+                </TextBlock>
+              </StackPanel>
+            </GroupBox.ToolTip>
+            <WrapPanel Name="wrapPanelTabletButtons"></WrapPanel>
+
+          </GroupBox>
+
+
+
+        </StackPanel>
       </TabItem>
 
       <TabItem>
         <TabItem.Header>
-          <TextBlock Foreground="#000099" FontWeight="Bold">Filters</TextBlock>
+          <TextBlock FontSize="14" Foreground="#003399" FontWeight="Bold">
+            <AccessText Text="_Filters"/>
+          </TextBlock>
         </TabItem.Header>
-        <ScrollViewer VerticalScrollBarVisibility="Auto" Foreground="Black">
-          <StackPanel Orientation="Vertical" HorizontalAlignment="Left" Margin="5,0">
+        <StackPanel Orientation="Vertical" Margin="5,0,5,0"  Width="650" HorizontalAlignment="Left">
 
-            <!-- Smoothing filter -->
-            <GroupBox Name="groupSmoothingFilter" Header="Smoothing Filter"
-                      VerticalAlignment="Bottom"
-                      HorizontalAlignment="Left"
-                      Margin="0"
-                      Width="300"
-            >
-              <GroupBox.ToolTip>
-                <StackPanel>
-                  <TextBlock FontWeight="Bold" FontSize="16">
+          <!-- Smoothing filter -->
+          <GroupBox Name="groupSmoothingFilter" Header="Smoothing Filter">
+            <GroupBox.ToolTip>
+              <StackPanel>
+                <TextBlock FontWeight="Bold" FontSize="16">
                     Smoothing Filter
-                  </TextBlock>
-                  <TextBlock>
+                </TextBlock>
+                <TextBlock>
                     Smoothing filter adds latency to the input, so don't enable it if you want to have the lowest possible input latency.
                     <LineBreak/>
                     Check the checkbox to enable the filter.
                     <LineBreak/>
+                    "Only when buttons down" enables the filter only when pen buttons or tip are pressed down.
+                    <LineBreak/>
                     <LineBreak/>
                     <TextBlock FontWeight="Bold">
                       Recommendations
@@ -466,59 +689,71 @@
                     <LineBreak/>
                     You don't have to change the filter rate, but you can use the highest rate your computer can run without performance problems.
                   </TextBlock>
-                </StackPanel>
-              </GroupBox.ToolTip>
+              </StackPanel>
+            </GroupBox.ToolTip>
 
-              <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
 
 
-                <!-- Filter enabled -->
-                <CheckBox Name="checkBoxSmoothing"
+              <!-- Filter enabled -->
+              <CheckBox Name="checkBoxSmoothing"
                             VerticalAlignment="Center"
                             Margin="5,10,5,0"
                             Checked="CheckboxChanged" Unchecked="CheckboxChanged">
-                </CheckBox>
+              </CheckBox>
 
 
-                <!-- Filter Latency -->
-                <GroupBox Header="Latency" Height="50" Width="80" Margin="0,0,0,0">
-                  <Grid>
-                    <TextBox Name="textSmoothingLatency" Padding="4,0,0,0"
+              <!-- Filter Latency -->
+              <GroupBox Header="Latency" Height="50" Width="80" Margin="0,0,0,0">
+                <Grid>
+                  <TextBox Name="textSmoothingLatency" Padding="4,0,0,0"
                                HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
                                TextChanged="TextChanged">0</TextBox>
-                    <Label Width="30" HorizontalAlignment="Right">ms</Label>
-                  </Grid>
-                </GroupBox>
+                  <Label Width="30" HorizontalAlignment="Right">ms</Label>
+                </Grid>
+              </GroupBox>
 
-                <!-- Filter Rate -->
-                <GroupBox Header="Rate" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90" Height="50">
-                  <ComboBox Name="comboBoxSmoothingRate" SelectionChanged="ItemSelectionChanged" VerticalContentAlignment="Center">
-                    <ComboBoxItem>1000 Hz</ComboBoxItem>
-                    <ComboBoxItem>500 Hz</ComboBoxItem>
-                    <ComboBoxItem>333 Hz</ComboBoxItem>
-                    <ComboBoxItem Selector.IsSelected="True">250 Hz</ComboBoxItem>
-                    <ComboBoxItem>125 Hz</ComboBoxItem>
-                  </ComboBox>
-                </GroupBox>
+              <!-- Filter Rate -->
+              <GroupBox Header="Rate" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90" Height="50">
+                <ComboBox Name="comboBoxSmoothingRate" SelectionChanged="ItemSelectionChanged" VerticalContentAlignment="Center">
+                  <ComboBoxItem>1000 Hz</ComboBoxItem>
+                  <ComboBoxItem>500 Hz</ComboBoxItem>
+                  <ComboBoxItem>333 Hz</ComboBoxItem>
+                  <ComboBoxItem Selector.IsSelected="True">250 Hz</ComboBoxItem>
+                  <ComboBoxItem>125 Hz</ComboBoxItem>
+                </ComboBox>
+              </GroupBox>
 
-              </StackPanel>
-            </GroupBox>
 
-            <!-- Noise filter -->
-            <GroupBox Name="groupNoiseFilter" Header="Noise Reduction Filter"
-                      VerticalAlignment="Bottom"
-                      HorizontalAlignment="Left"
-                      Margin="0,5,0,0" 
-                      Width="300"
-                        >
-              <GroupBox.ToolTip>
-                <StackPanel>
-                  <TextBlock FontWeight="Bold" FontSize="16">
+              <!-- Only when buttons are down -->
+              <CheckBox Name="checkBoxSmoothingOnlyWhenButtons"
+                            VerticalAlignment="Center"
+                          VerticalContentAlignment="Center"
+                            Margin="5,10,5,0"
+                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">
+                <TextBlock>
+                    Only when buttons down
+                </TextBlock>
+              </CheckBox>
+
+            </StackPanel>
+          </GroupBox>
+
+          <!-- Noise filter -->
+          <GroupBox Name="groupNoiseFilter" Header="Noise Reduction Filter"
+                      Margin="0,5,0,0" >
+            <GroupBox.ToolTip>
+              <StackPanel>
+                <TextBlock FontWeight="Bold" FontSize="16">
                     Noise Reduction Filter
-                  </TextBlock>
-                  <TextBlock>
+                </TextBlock>
+                <TextBlock>
                     It is recommend to use this filter only with older Wacom tablets.
                     <LineBreak/>
+                    <TextBlock Foreground="#AA0000">
+                    WARNING! This filter will cause more latency on smaller tablet areas (&lt;20 mm), so consider using a larger area to increase the performance.
+                    </TextBlock>
+                    <LineBreak/>
                     Check the checkbox to enable the filter.
                     <LineBreak/>
                     <LineBreak/>
@@ -556,60 +791,77 @@
                     <LineBreak/>
                     Tablet benchmark will give you a recommended threshold value, but you can use larger value if you hover.
                   </TextBlock>
-                </StackPanel>
-              </GroupBox.ToolTip>
+              </StackPanel>
+            </GroupBox.ToolTip>
 
 
-              <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
 
-                <!-- Noise filter enabled -->
-                <CheckBox Name="checkBoxNoiseFilter"
+              <!-- Noise filter enabled -->
+              <CheckBox Name="checkBoxNoiseFilter"
                             VerticalAlignment="Center"
                             Margin="5,10,5,0"
                             Checked="CheckboxChanged" Unchecked="CheckboxChanged">
-                </CheckBox>
+              </CheckBox>
 
-                <!-- Noise filter buffer size -->
-                <GroupBox Header="Buffer" Height="50" Margin="0,0,0,0">
-                  <TextBox Name="textNoiseBuffer" Padding="4,0,0,0"
+              <!-- Noise filter buffer size -->
+              <GroupBox Header="Buffer" Height="50" Margin="0,0,0,0">
+                <TextBox Name="textNoiseBuffer" Padding="4,0,0,0"
                                HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
                                TextChanged="TextChanged">10</TextBox>
-                </GroupBox>
+              </GroupBox>
 
-                <!-- Noise filter threshold -->
-                <GroupBox Header="Threshold" Height="50" Width="80" Margin="0,0,0,0">
-                  <Grid>
-                    <TextBox Name="textNoiseThreshold" Padding="4,0,0,0"
+              <!-- Noise filter threshold -->
+              <GroupBox Header="Threshold" Height="50" Width="80" Margin="0,0,0,0">
+                <Grid>
+                  <TextBox Name="textNoiseThreshold" Padding="4,0,0,0"
                                HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
                                TextChanged="TextChanged">1.0</TextBox>
-                    <Label Width="30" HorizontalAlignment="Right">mm</Label>
-                  </Grid>
+                  <Label Width="30" HorizontalAlignment="Right">mm</Label>
+                </Grid>
+              </GroupBox>
+
+              <!-- Noise filter presets -->
+              <!--
+                <GroupBox Header="Presets"
+                          VerticalAlignment="Top" HorizontalAlignment="Left"
+                          Height="50" Width="150">
+                  <ComboBox Name="comboBoxNoisePreset" SelectionChanged="ItemSelectionChanged" VerticalContentAlignment="Center"
+                            Text="">
+                    <ComboBoxItem IsSelected="True">-</ComboBoxItem>
+                    <ComboBoxItem>Wacom CTL-470</ComboBoxItem>
+                    <ComboBoxItem>Wacom CTL-471</ComboBoxItem>
+                    <ComboBoxItem>Wacom CTL-472</ComboBoxItem>
+                    <ComboBoxItem>Wacom CTL-480</ComboBoxItem>
+                  </ComboBox>
                 </GroupBox>
+                -->
 
-              </StackPanel>
+            </StackPanel>
 
 
-            </GroupBox>
+          </GroupBox>
 
-            <!-- Anti-smoothing filter -->
-            <GroupBox Name="groupAntiSmoothingFilter" Header="Anti-smoothing Filter"
-                      VerticalAlignment="Bottom"
-                      HorizontalAlignment="Left"
+          <!-- Anti-smoothing filter -->
+          <GroupBox Name="groupAntiSmoothingFilter" Header="Anti-smoothing Filter"
                       Margin="0,5,0,0"
-                      Width="340"
             >
-              <GroupBox.ToolTip>
-                <StackPanel>
-                  <TextBlock FontWeight="Bold" FontSize="16">
+            <GroupBox.ToolTip>
+              <StackPanel>
+                <TextBlock FontWeight="Bold" FontSize="16">
                     Anti-smoothing Filter
-                  </TextBlock>
-                  <TextBlock>
+                </TextBlock>
+                <TextBlock>
                     It is recommend to use this filter only with tablets that do the pen position smoothing in hardware/firmware.
                     <LineBreak/>
-                    <TextBlock Foreground="#990000">
+                    <TextBlock Foreground="#AA0000">
                       WARNING! Some tablets will send broken position data when the pen buttons are pressed, so don't press buttons...
                     </TextBlock>
                     <LineBreak/>
+                    <TextBlock Foreground="#AA0000">
+                      WARNING! Do not use this filter with small tablet areas (&lt;20 mm). Most tablets will send invalid data at low speeds.
+                    </TextBlock>
+                    <LineBreak/>
                     Check the checkbox to enable the filter.
                     <LineBreak/>
                     <LineBreak/>
@@ -638,7 +890,7 @@
                     <LineBreak/>
                     <LineBreak/>
                     <TextBlock FontWeight="Bold">
-                    Ignore when dragging
+                    Only when hovering
                     </TextBlock>
                     <LineBreak/>
                     This feature is mainly meant for Wacom CTL-490, but might be useful with other tablets too.
@@ -650,7 +902,7 @@
                     <LineBreak/>
                     Shape: 0.1 - 0.9
                     <LineBreak/>
-                    Compensation: 2.0 - 8.0
+                    Compensation: 10 - 30 ms
                     <LineBreak/>
                     <LineBreak/>                    
                     <TextBlock FontWeight="Bold">
@@ -659,108 +911,182 @@
                     <LineBreak/>
                     <TextBlock Margin="5,0,0,0">
                       <TextBlock FontWeight="Bold">Gaomon S56K:</TextBlock>
-                      Shape 0.7, Compensation = 5.0
+                      Shape 0.7, Compensation = 15 - 20 ms
                       <LineBreak/>                     
                       <TextBlock FontWeight="Bold">Huion 420 &amp; H420:</TextBlock>
-                      Shape = 0.5, Compensation = 3.5
+                      Shape = 0.5, Compensation = 15 - 20 ms
                       <LineBreak/>
                       <TextBlock FontWeight="Bold">Huion H430P &amp; H640P:</TextBlock>
-                      Shape = 0.7, Compensation = 6.0 - 8.0
+                      Shape = 0.7, Compensation = 20 - 30 ms
                       <LineBreak/>
                       <TextBlock FontWeight="Bold">XP-PEN G430 &amp; G640:</TextBlock>
-                      Shape = 0.5, Compensation = 3.5, Invalid low speed data, use noise reduction 10/0.5 mm
+                      Shape = 0.5, Compensation = 15 - 20 ms, Invalid low speed data, use noise reduction 10/0.5 mm
                       <LineBreak/>                   
                       <TextBlock FontWeight="Bold">Wacom CTL-490 Hover:</TextBlock>
-                      Shape = 0.5, Compensation = 3.5, Enable "Ignore when dragging"
+                      Shape = 0.5, Compensation = 25 - 30 ms, Enable "Only when hovering"
                       </TextBlock>
                   </TextBlock>
                 </StackPanel>
-              </GroupBox.ToolTip>
+            </GroupBox.ToolTip>
 
-              <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
 
-                <!-- Anti-smoothing filter enabled -->
-                <CheckBox Name="checkBoxAntiSmoothing"
+              <!-- Anti-smoothing filter enabled -->
+              <CheckBox Name="checkBoxAntiSmoothing"
                             VerticalAlignment="Center"
                             Margin="5,10,5,0"
                             Checked="CheckboxChanged" Unchecked="CheckboxChanged">
-                </CheckBox>
+              </CheckBox>
 
-                <!-- Anti-smoothing power -->
-                <GroupBox Header="Shape" Height="50" Margin="0,0,0,0">
-                  <TextBox Name="textAntiSmoothingShape" Padding="4,0,0,0"
+              <!-- Anti-smoothing power -->
+              <GroupBox Header="Shape" Height="50" Margin="0,0,0,0">
+                <TextBox Name="textAntiSmoothingShape" Padding="4,0,0,0"
                       HorizontalContentAlignment="Left"
                       VerticalContentAlignment="Center"
                       TextChanged="TextChanged"
                   >0.3</TextBox>
-                </GroupBox>
+              </GroupBox>
 
-                <!-- Anti-smoothing compensation -->
-                <GroupBox Header="Compensation" Height="50" Margin="0,0,0,0">
-                  <TextBox Name="textAntiSmoothingCompensation" Padding="4,0,0,0"
-                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                               TextChanged="TextChanged">20</TextBox>
-                </GroupBox>
+              <!-- Anti-smoothing compensation -->
+              <GroupBox Header="Compensation" Height="50" Margin="0,0,0,0">
+                <Grid>
+                  <TextBox Name="textAntiSmoothingCompensation"
+                         Padding="4,0,0,0"
+                         HorizontalContentAlignment="Left"
+                         VerticalContentAlignment="Center"
+                         TextChanged="TextChanged">20</TextBox>
+                  <Label HorizontalAlignment="Right">ms</Label>
 
-                <!-- Anti-smoothing filter enabled -->
-                <CheckBox Name="checkBoxAntiSmoothingIgnoreWhenDragging"
-                            VerticalAlignment="Center"
-                            Margin="5,10,5,0"
-                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">
-                  Ignore when dragging
-                </CheckBox>
+                </Grid>
+              </GroupBox>
 
-              </StackPanel>
+              <!-- Anti-smoothing only when hovering -->
+              <CheckBox Name="checkBoxAntiSmoothingOnlyWhenHover"
+                          VerticalAlignment="Center"
+                          VerticalContentAlignment="Center"
+                          Margin="5,10,5,0"
+                          Checked="CheckboxChanged" Unchecked="CheckboxChanged">
+                <TextBlock>
+                    Only when hovering
+                </TextBlock>
+              </CheckBox>
 
+            </StackPanel>
 
-            </GroupBox>
 
+          </GroupBox>
 
-          </StackPanel>
-        </ScrollViewer>
+
+        </StackPanel>
       </TabItem>
 
+      <!-- Misc tab -->
+      <TabItem>
+        <TabItem.Header>
+          <TextBlock FontSize="14" Foreground="#000066" FontWeight="Bold">
+            <AccessText Text="Misc"/>
+          </TextBlock>
+        </TabItem.Header>
 
+        <StackPanel Orientation="Vertical" Margin="5,0,5,0" Width="650" HorizontalAlignment="Left">
 
-      <TabItem Name="tabCommands" Header="Commands">
-        <Grid Margin="5,0">
-          <!-- Define Columns -->
-          <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="*"/>
-          </Grid.RowDefinitions>
-          <GroupBox Grid.Row="0" Header="Commands Before Settings">
-            <TextBox Name="textCommandsBefore"
-                    FontFamily="Courier New" FontSize="12"
-                    AcceptsReturn="True"
-                    TextWrapping="NoWrap"
-                    VerticalScrollBarVisibility="Auto"
-                    Keyboard.PreviewKeyDown="TextCommands_PreviewKeyDown"
-                    TextChanged="TextChanged" />
+
+          <!-- Desktop size -->
+          <GroupBox Grid.Column="1" Name="groupDesktopSize" Header="Desktop Size">
             <GroupBox.ToolTip>
-              <TextBlock>
-                 These commands are sent when the driver is started and the settings haven't yet been applied.
-              </TextBlock>
+              <StackPanel>
+                <TextBlock FontWeight="Bold" FontSize="16">
+                    Desktop Size
+                </TextBlock>
+                <TextBlock>
+                      - In some cases you may have to disable the auto size and manually type in the main monitor resolution.
+                      <LineBreak/>
+                      - If you don't have problems with screen mapping, leave the automatic desktop size enabled.
+                </TextBlock>
+              </StackPanel>
             </GroupBox.ToolTip>
+            <StackPanel Orientation="Horizontal">
+
+              <!-- Desktop Width -->
+              <GroupBox Header="Width" Width="80" Margin="2,0,0,0">
+                <Grid>
+                  <TextBox Name="textDesktopWidth" Padding="4,0,0,0"
+                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
+                               TextChanged="TextChanged">1920</TextBox>
+                  <Label Width="30" HorizontalAlignment="Right">px</Label>
+                </Grid>
+              </GroupBox>
+
+              <!-- Desktop Height -->
+              <GroupBox Header="Height" Width="80" Margin="5,0,0,0">
+                <Grid>
+                  <TextBox Name="textDesktopHeight" Padding="4,0,0,0"
+                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
+                               TextChanged="TextChanged">1080</TextBox>
+                  <Label Width="30" HorizontalAlignment="Right">px</Label>
+                </Grid>
+              </GroupBox>
+
+              <CheckBox Name="checkBoxAutomaticDesktopSize"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Margin="5,10,5,0"
+                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">Auto</CheckBox>
+            </StackPanel>
           </GroupBox>
 
-          <GroupBox Grid.Row="1" Header="Commands After Settings">
-            <TextBox Name="textCommandsAfter"
-                    FontFamily="Courier New" FontSize="12"
-                    AcceptsReturn="True"
-                    TextWrapping="NoWrap"
-                    VerticalScrollBarVisibility="Auto"
-                    Keyboard.PreviewKeyDown="TextCommands_PreviewKeyDown"
-                    TextChanged="TextChanged" />
+        </StackPanel>
+      </TabItem>
+
+      <TabItem Name="tabCommands">
+        <TabItem.Header>
+          <TextBlock FontSize="14">
+            <AccessText Text="C_ommands"/>
+          </TextBlock>
+        </TabItem.Header>
+        <Grid Margin="5,0">
+          <GroupBox Grid.Row="1" Header="Custom commands">
             <GroupBox.ToolTip>
               <TextBlock>
-                 These commands are sent when the driver is started and settings have been applied to the driver.
+              <TextBlock FontSize="16" FontWeight="Bold">
+                Custom commands
               </TextBlock>
+              <LineBreak/>
+              <TextBlock>
+                These commands/settings are applied to the driver after the GUI settings.
+                <LineBreak/>
+                You can autocomplete a command by pressing control+space.
+              </TextBlock>
+                </TextBlock>
             </GroupBox.ToolTip>
+            <TextBox Name="textCustomCommands"
+                     FontFamily="Courier New" FontSize="12"
+                     AcceptsReturn="True"
+                     TextWrapping="NoWrap"
+                     Padding="2,5,2,5"
+                     VerticalScrollBarVisibility="Auto"
+                     Keyboard.PreviewKeyDown="TextCommands_PreviewKeyDown"
+                     TextChanged="TextChanged">
+              <TextBox.ContextMenu>
+                <ContextMenu>
+                  <MenuItem Command="ApplicationCommands.Cut" />
+                  <MenuItem Command="ApplicationCommands.Copy" />
+                  <MenuItem Command="ApplicationCommands.Paste" />
+                  <MenuItem Command="ApplicationCommands.SelectAll" />
+                  <!-- <MenuItem Name="menuCommandsTest" Header="Test" /> -->
+                </ContextMenu>
+              </TextBox.ContextMenu>
+            </TextBox>
+
           </GroupBox>
         </Grid>
       </TabItem>
-      <TabItem Name="tabConsole" Header="Console">
+      <TabItem Name="tabConsole">
+        <TabItem.Header>
+          <TextBlock FontSize="14">
+            <AccessText Text="_Console"/>
+          </TextBlock>
+        </TabItem.Header>
         <Grid Margin="0,2,0,0">
           <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
@@ -787,9 +1113,8 @@
                   <MenuItem Name="menuStartDebug" Header="Start debugging" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuStopDebug" Header="Stop debugging" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuFindLatestDebugLog" Header="Find latest debug log" Click="ConsoleMenuClick"></MenuItem>
-                  <Separator/>
                   <MenuItem Name="menuFindStartupLog" Header="Find startuplog.txt" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuOpenFolder" Header="Open TabletDriver folder" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuSettingsToUserConfig" Header="Write settings to user.cfg" Click="ConsoleMenuClick"></MenuItem>
                   <Separator/>
                   <MenuItem Name="menuRunBenchmark" Header="Run benchmark" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuCopyBenchmark" Header="Copy benchmark result" Click="ConsoleMenuClick"></MenuItem>
@@ -798,6 +1123,8 @@
                   <MenuItem Name="menuOpenGithub" Header="Open GitHub page" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuOpenLatestURL" Header="Open latest URL" Click="ConsoleMenuClick"></MenuItem>
                   <MenuItem Name="menuReportProblem" Header="Report a problem" Click="ConsoleMenuClick"></MenuItem>
+                  <Separator/>
+                  <MenuItem Name="menuOpenFolder" Header="Open TabletDriver folder" Click="ConsoleMenuClick"></MenuItem>
                 </ContextMenu>
               </TextBlock.ContextMenu>
             </TextBlock>
@@ -835,13 +1162,9 @@
 
       <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
 
-        <!-- Apply -->
-        <Button Name="buttonApplySettings" Margin="0,5,5,5" Padding="10,0,10,0" Click="ApplySettings"
-                ToolTip="Applies driver settings.">Apply</Button>
-
         <!-- Save -->
         <Button Name="buttonSaveSettings" Margin="0,5,5,5" Padding="10,0,10,0" Click="SaveSettings"
-                ToolTip="Saves settings to Config.xml">Save</Button>
+                ToolTip="Saves settings to config.xml and send setting commands to driver">Save settings</Button>
 
       </StackPanel>
 
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 9c05c63..b669fc0 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -9,6 +9,7 @@
 using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
@@ -24,7 +25,7 @@ public partial class MainWindow : Window
     {
 
         // Version
-        public string Version = "0.2.1";
+        public string Version = "0.2.2";
 
         // Console stuff
         private List<string> commandHistory;
@@ -37,8 +38,9 @@ public partial class MainWindow : Window
         // Driver
         private TabletDriver driver;
         private Dictionary<String, String> driverCommands;
+        private List<string> settingCommands;
         private bool running;
-
+        private int tabletButtonCount;
 
         // Timers
         private DispatcherTimer timerStatusbar;
@@ -83,6 +85,14 @@ public MouseDrag()
         // Measurement to area
         private bool isEnabledMeasurementToArea = false;
 
+        // Ink canvas undo history
+        StrokeCollection inkCanvasUndoHistory;
+
+        // Ink canvas DrawingAttributes
+        DrawingAttributes inkCanvasDrawingAttributes;
+
+
+
         //
         // Constructor
         //
@@ -133,6 +143,9 @@ public MainWindow()
             commandHistory = new List<string> { "" };
             commandHistoryIndex = 0;
 
+            // Init setting commands list
+            settingCommands = new List<string>();
+
             // Init tablet driver
             driver = new TabletDriver("TabletDriverService.exe");
             driverCommands = new Dictionary<string, string>();
@@ -171,23 +184,43 @@ public MainWindow()
 
 
             //
-            // Buttom Map ComboBoxes
+            // Hide tablet button mapping
+            //
+            groupBoxTabletButtons.Visibility = Visibility.Collapsed;
+
+            //
+            // Create tablet button map WrapPanel items
             //
-            comboBoxButton1.Items.Clear();
-            comboBoxButton2.Items.Clear();
-            comboBoxButton3.Items.Clear();
-            comboBoxButton1.Items.Add("Disable");
-            comboBoxButton2.Items.Add("Disable");
-            comboBoxButton3.Items.Add("Disable");
-            for (int i = 1; i <= 5; i++)
+            for (int i = 0; i < 16; i++)
             {
-                comboBoxButton1.Items.Add("Mouse " + i);
-                comboBoxButton2.Items.Add("Mouse " + i);
-                comboBoxButton3.Items.Add("Mouse " + i);
+                GroupBox groupBox = new GroupBox
+                {
+                    Width = 90,
+                    Header = "Button " + (i + 1).ToString()
+                };
+                Button button = new Button
+                {
+                    Height = 22,
+                    Content = "",
+                    Padding = new Thickness(2,0,2,0),
+                    ToolTip = "Empty",
+                    Background = Brushes.White
+                };
+                button.Click += ButtonMap_Click;
+                button.ToolTipOpening += ButtonMap_ToolTipOpening;
+
+                groupBox.Content = button;
+                wrapPanelTabletButtons.Children.Add(groupBox);
             }
-            comboBoxButton1.SelectedIndex = 0;
-            comboBoxButton2.SelectedIndex = 0;
-            comboBoxButton3.SelectedIndex = 0;
+            CheckBox checkBox = new CheckBox
+            {
+                Content = "Disable buttons"
+            };
+            checkBox.Checked += CheckboxChanged;
+            checkBox.Unchecked += CheckboxChanged;
+            checkBox.VerticalAlignment = VerticalAlignment.Bottom;
+            checkBox.Margin = new Thickness(5, 5, 5, 10);
+            wrapPanelTabletButtons.Children.Add(checkBox);
 
 
             //
@@ -200,6 +233,18 @@ public MainWindow()
             }
             comboBoxSmoothingRate.SelectedIndex = 3;
 
+
+            // Ink canvas undo history
+            inkCanvasUndoHistory = new StrokeCollection();
+
+            // Ink canvas drawing attributes
+            inkCanvasDrawingAttributes = new DrawingAttributes();
+            inkCanvasDrawingAttributes.Width = 10;
+            inkCanvasDrawingAttributes.Height = 10;
+            inkCanvasDrawingAttributes.Color = Color.FromRgb(0x55, 0x55, 0x55);
+            inkCanvasDrawingAttributes.StylusTip = StylusTip.Ellipse;
+            inkCanvas.DefaultDrawingAttributes = inkCanvasDrawingAttributes;
+
             // Process command line arguments
             ProcessCommandLineArguments();
 
@@ -559,6 +604,5 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
 
         #endregion
 
-
     }
 }
\ No newline at end of file
diff --git a/TabletDriverGUI/TabletDriver.cs b/TabletDriverGUI/TabletDriver.cs
index 9a0b84d..2d90888 100644
--- a/TabletDriverGUI/TabletDriver.cs
+++ b/TabletDriverGUI/TabletDriver.cs
@@ -42,6 +42,7 @@ public DriverEventArgs(DriverEventType type, string message, string parameters)
         private readonly int ConsoleMaxLines;
         private System.Threading.Mutex mutexConsoleUpdate;
         private Dictionary<String, String> commands;
+        public Dictionary<String, String> Commands { get { return commands; } }
 
         // Other variables
         private readonly string servicePath;
@@ -66,6 +67,7 @@ public TabletDriver(string servicePath)
 
             commands = new Dictionary<string, string>();
 
+         
         }
 
         //
@@ -134,14 +136,13 @@ public void ConsoleUnlock()
             mutexConsoleUpdate.ReleaseMutex();
         }
 
-
         //
         // Command name complete
         //
         public string CompleteCommandName(string inputText, bool showCommands)
         {
             List<string> commandsFound = new List<string>();
-            string result = inputText;
+            string result = null;
 
             // Find commands
             foreach (var item in commands)
diff --git a/TabletDriverGUI/TabletDriverGUI.csproj b/TabletDriverGUI/TabletDriverGUI.csproj
index 77e01f0..b85d398 100644
--- a/TabletDriverGUI/TabletDriverGUI.csproj
+++ b/TabletDriverGUI/TabletDriverGUI.csproj
@@ -77,8 +77,12 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="ButtonMapping.xaml.cs">
+      <DependentUpon>ButtonMapping.xaml</DependentUpon>
+    </Compile>
     <Compile Include="MainWindow.Driver.cs" />
     <Compile Include="MainWindow.Console.cs" />
+    <Compile Include="MainWindow.Ink.cs" />
     <Compile Include="MainWindow.Settings.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="TabletDriver.cs" />
@@ -87,6 +91,10 @@
     <Compile Include="WacomArea.xaml.cs">
       <DependentUpon>WacomArea.xaml</DependentUpon>
     </Compile>
+    <Page Include="ButtonMapping.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/TabletDriverService/CommandHandler.Auxiliary.cpp b/TabletDriverService/CommandHandler.Auxiliary.cpp
new file mode 100644
index 0000000..1bfd73f
--- /dev/null
+++ b/TabletDriverService/CommandHandler.Auxiliary.cpp
@@ -0,0 +1,107 @@
+#include "stdafx.h"
+#include "CommandHandler.h"
+
+#define LOG_MODULE ""
+#include "Logger.h"
+
+//
+// Create auxiliary device commands
+//
+void CommandHandler::CreateAuxCommands() {
+
+	//
+	// Command: AuxHID
+	//
+	AddCommand(new Command("AuxHID", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		if(cmd->valueCount == 4) {
+			USHORT vendorID = cmd->GetInt(0, 0);
+			USHORT productID = cmd->GetInt(1, 0);
+			USHORT usagePage = cmd->GetInt(2, 0);
+			USHORT usage = cmd->GetInt(3, 0);
+			if(tablet->hidDeviceAux == NULL) {
+				tablet->hidDeviceAux = new HIDDevice(vendorID, productID, usagePage, usage);
+				if(tablet->hidDeviceAux->isOpen) {
+					LOG_INFO("HID auxiliary device found!\n");
+					return true;
+				}
+				else {
+					LOG_ERROR("Can't open auxiliary HID 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
+					delete tablet->hidDeviceAux;
+					tablet->hidDeviceAux = NULL;
+				}
+			}
+		}
+
+		return false;
+	}));
+
+
+	//
+	// Command: AuxReportId
+	//
+	AddCommand(new Command("AuxReportId", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.auxReportId = cmd->GetInt(0, tablet->settings.auxReportId);
+		LOG_INFO("Tablet aux report id = %d\n", tablet->settings.auxReportId);
+		return true;
+	}));
+
+
+	//
+	// Command: AuxReportLength
+	//
+	AddCommand(new Command("AuxReportLength", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.auxReportLength = cmd->GetInt(0, tablet->settings.auxReportLength);
+		LOG_INFO("Tablet aux report length = %d\n", tablet->settings.auxReportLength);
+		return true;
+	}));
+
+
+	//
+	// Command: AuxDetectMask
+	//
+	AddCommand(new Command("AuxDetectMask", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.auxDetectMask = cmd->GetInt(0, tablet->settings.auxDetectMask);
+		LOG_INFO("Tablet aux detect mask = 0x%02X\n", tablet->settings.auxDetectMask);
+		return true;
+	}));
+
+
+	//
+	// Command: AuxIgnoreMask
+	//
+	AddCommand(new Command("AuxIgnoreMask", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.auxIgnoreMask = cmd->GetInt(0, tablet->settings.auxIgnoreMask);
+		LOG_INFO("Tablet aux ignore mask = 0x%02X\n", tablet->settings.auxIgnoreMask);
+		return true;
+	}));
+
+
+	//
+	// Command: AuxButtonCount
+	//
+	AddCommand(new Command("AuxButtonCount", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.auxButtonCount = cmd->GetInt(0, tablet->settings.auxButtonCount);
+		LOG_INFO("Tablet aux button count = %d\n", tablet->settings.auxButtonCount);
+		return true;
+	}));
+
+
+	//
+	// Command: ClearAuxCustomData
+	//
+	// Clears custom auxiliary data formatter instructions
+	//
+	AddCommand(new Command("ClearAuxCustomData", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->auxDataFormatter.instructionCount = 0;
+		LOG_INFO("Custom aux data format instructions cleared!\n");
+		return true;
+	}));
+
+}
\ No newline at end of file
diff --git a/TabletDriverService/CommandHandler.Device.cpp b/TabletDriverService/CommandHandler.Device.cpp
index 5b24d7a..9a43b92 100644
--- a/TabletDriverService/CommandHandler.Device.cpp
+++ b/TabletDriverService/CommandHandler.Device.cpp
@@ -22,7 +22,11 @@ void CommandHandler::CreateDeviceCommands() {
 			if(tablet == NULL) {
 				tablet = new Tablet(guid);
 				if(tablet->isOpen) {
-					LOG_INFO("WinUSB tablet found!\n");
+					LOG_INFO("WinUSB tablet found! Manufacturer = '%s', Product = '%s', Serial = '%s'\n",
+						tablet->GetDeviceManufacturerName().c_str(),
+						tablet->GetDeviceProductName().c_str(),
+						tablet->GetDeviceSerialNumber().c_str()
+					);
 				}
 				else {
 					LOG_WARNING("Can't open WinUSB tablet '%s'\n", guid.c_str());
@@ -32,7 +36,7 @@ void CommandHandler::CreateDeviceCommands() {
 			}
 		}
 
-		//
+		// Show USB tablet info
 		else {
 			if(tablet != NULL) {
 				if(tablet->usbDevice != NULL) {
@@ -54,7 +58,7 @@ void CommandHandler::CreateDeviceCommands() {
 	//
 	// Command: HIDTablet
 	//
-	AddHelp("HIDTablet", "Usage: HIDTablet <VendorId> <ProductId> <Usage Page> <Usage>");
+	AddHelp("HIDTablet", "Usage: HIDTablet <VendorId> <ProductId> <Usage Page> <Usage> [Exclusive=True]");
 	AddHelp("HIDTablet", "");
 	AddCommand(new Command("HIDTablet", [&](CommandLine *cmd) {
 
@@ -64,29 +68,43 @@ void CommandHandler::CreateDeviceCommands() {
 			USHORT productID = cmd->GetInt(1, 0);
 			USHORT usagePage = cmd->GetInt(2, 0);
 			USHORT usage = cmd->GetInt(3, 0);
+			bool isExclusive = false;
+			for(int i = 4; i < cmd->valueCount; i += 2) {
+				string parameter = cmd->GetStringLower(i, "");
+				if(parameter == "exclusive") {
+					isExclusive = cmd->GetBoolean(i + 1, false);
+				}
+			}
 			if(tablet == NULL) {
-				tablet = new Tablet(vendorID, productID, usagePage, usage);
+				tablet = new Tablet(vendorID, productID, usagePage, usage, isExclusive);
 				if(tablet->isOpen) {
-					LOG_INFO("Tablet found!\n");
+					LOG_INFO("Tablet found! Manufacturer='%s', Product='%s', Serial='%s'\n",
+						tablet->GetDeviceManufacturerName().c_str(),
+						tablet->GetDeviceProductName().c_str(),
+						tablet->GetDeviceSerialNumber().c_str()
+					);
 				}
 				else {
-					LOG_WARNING("Can't open HID tablet 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
+					LOG_WARNING("Can't open HID tablet Vendor=0x%04X Product=0x%04X UsagePage=0x%04X Usage=0x%04X Exclusive=%s\n",
+						vendorID, productID, usagePage, usage,
+						isExclusive ? "True" : "False");
 					delete tablet;
 					tablet = NULL;
 				}
 			}
 		}
 
-		//
+		// Show HID tablet info
 		else {
 			if(tablet != NULL) {
 				if(tablet->hidDevice != NULL) {
 					HIDDevice *hid = tablet->hidDevice;
-					LOG_INFO("Tablet = HID(0x%04X 0x%04X 0x%04X 0x%04X)\n",
+					LOG_INFO("HIDTablet = [Vendor=0x%04X, Product=0x%04X, UsagePage=0x%04X, Usage=0x%04X, Exclusive=%s]\n",
 						hid->vendorId,
 						hid->productId,
 						hid->usagePage,
-						hid->usage
+						hid->usage,
+						hid->isExclusive ? "True" : "False"
 					);
 				}
 			}
@@ -117,57 +135,9 @@ void CommandHandler::CreateDeviceCommands() {
 	}));
 
 
-	//
-	// Command: HIDAux
-	//
-	AddCommand(new Command("HIDAuxiliary", [&](CommandLine *cmd) {
-
-		if(cmd->valueCount == 4) {
-			USHORT vendorID = cmd->GetInt(0, 0);
-			USHORT productID = cmd->GetInt(1, 0);
-			USHORT usagePage = cmd->GetInt(2, 0);
-			USHORT usage = cmd->GetInt(3, 0);
-			if(tablet->hidDeviceAux == NULL) {
-				tablet->hidDeviceAux = new HIDDevice(vendorID, productID, usagePage, usage);
-				if(tablet->hidDeviceAux->isOpen) {
-					LOG_INFO("HID Device found!\n");
-					return true;
-				}
-				else {
-					LOG_ERROR("Can't open HID device 0x%04X 0x%04X 0x%04X 0x%04X\n", vendorID, productID, usagePage, usage);
-					delete tablet->hidDeviceAux;
-					tablet->hidDeviceAux = NULL;
-				}
-			}
-		}
-
-		return false;
-	}));
-
-
-	//
-	// Command: HIDAuxRead
-	//
-	AddCommand(new Command("HIDAuxRead", [&](CommandLine *cmd) {
-
-		if(cmd->valueCount > 1 && tablet->hidDeviceAux != NULL) {
-			int length = cmd->GetInt(0, 1);
-			int count = cmd->GetInt(1, 1);
-			UCHAR buffer[1024];
-			for(int i = 0; i < count; i++) {
-				tablet->hidDeviceAux->Read(buffer, length);
-				LOG_INFOBUFFER(buffer, length, "Aux read(%d): ", i + 1);
-			}
-		}
-
-		return true;
-	}));
-
-
 	//
 	// Command: HIDList
 	//
-	AddAlias("HIDAux", "HIDAuxiliary");
 	AddCommand(new Command("HIDList", [&](CommandLine *cmd) {
 		HANDLE hidHandle = 0;
 		HIDDevice *hid = new HIDDevice();
@@ -250,56 +220,6 @@ void CommandHandler::CreateDeviceCommands() {
 	}));
 
 
-	//
-	// Command: HIDStringRequest, HIDString
-	//
-	// Request a string from HID device
-	//
-	AddAlias("HIDString", "HIDStringRequest");
-	AddCommand(new Command("HIDStringRequest", [&](CommandLine *cmd) {
-		UCHAR buffer[256];
-		int bytesRead;
-		string stringReply = "";
-
-		if(cmd->valueCount <= 0) return false;
-		if(tablet == NULL) return false;
-		if(tablet->hidDevice == NULL) return false;
-		if(tabletHandler->isRunning) {
-			LOG_ERROR("This command can only be run during the tablet configuration!\n");
-			return false;
-		}
-		int stringIdMin = cmd->GetInt(0, 0);
-		int stringIdMax = cmd->GetInt(1, stringIdMin);
-
-		// Limits
-		if(stringIdMin < 1) stringIdMin = 1;
-		else if(stringIdMin > 256) stringIdMin = 256;
-		if(stringIdMax < 1) stringIdMax = 1;
-		else if(stringIdMax > 256) stringIdMax = 256;
-
-		// Loop through string ids
-		for(int stringId = stringIdMin; stringId <= stringIdMax; stringId++) {
-
-			// String request USB control transter
-			bytesRead = tablet->hidDevice->StringRequest(stringId, buffer, 256);
-
-			if(bytesRead > 0) {
-				// Bytes to string
-				stringReply = "";
-				for(int i = 0; i < bytesRead; i += 2) {
-					stringReply.push_back(buffer[i]);
-				}
-				LOG_INFO("HIDString (id %d, %d bytes): '%s'\n", stringId, bytesRead, stringReply.c_str());
-			}
-			else {
-				LOG_INFO("HIDString (id %d, 0 bytes)\n", stringId);
-			}
-		}
-
-		return true;
-	}));
-
-
 	//
 	// Command: USBWrite
 	//
@@ -325,60 +245,36 @@ void CommandHandler::CreateDeviceCommands() {
 
 
 	//
-	// Command: USBStringRequest, USBString
+	// Command: GetDeviceStrings, GetStrings, GetString
 	//
-	// Request a string from a WinUSB device
+	// Request strings from HID or WinUSB device
 	//
-	AddAlias("USBString", "USBStringRequest");
-	AddCommand(new Command("USBStringRequest", [&](CommandLine *cmd) {
-		UCHAR buffer[256];
-		int bytesRead;
-		string stringReply = "";
-
+	AddAlias("GetStrings", "GetDeviceStrings");
+	AddAlias("GetString", "GetDeviceStrings");
+	AddCommand(new Command("GetDeviceStrings", [&](CommandLine *cmd) {
 		if(cmd->valueCount <= 0) return false;
 		if(tablet == NULL) return false;
-		if(tablet->usbDevice == NULL) return false;
-		int stringIdMin = cmd->GetInt(0, 0);
-		int stringIdMax = cmd->GetInt(1, stringIdMin);
 
-		// Limits
-		if(stringIdMin < 1) stringIdMin = 1;
-		else if(stringIdMin > 256) stringIdMin = 256;
-		if(stringIdMax < 1) stringIdMax = 1;
-		else if(stringIdMax > 256) stringIdMax = 256;
+		string stringName = cmd->GetStringLower(0, "");
+		string deviceString;
 
-		// Loop through string ids
-		for(int stringId = stringIdMin; stringId <= stringIdMax; stringId++) {
-
-			// String request USB control transter
-			bytesRead = tablet->usbDevice->StringRequest(stringId, buffer, 256);
-
-			if(bytesRead > 0) {
-				// Bytes to string
-				stringReply = "";
-				for(int i = 0; i < bytesRead; i += 2) {
-					stringReply.push_back(buffer[i]);
-				}
-				LOG_INFO("USBString (id %d, %d bytes): '%s'\n", stringId, bytesRead, stringReply.c_str());
-			}
-			else {
-				LOG_INFO("USBString (id %d, 0 bytes)\n", stringId);
-			}
+		// Manufacturer
+		if(stringName.compare(0, 3, "man") == 0) {
+			LOG_INFO("  Manufacturer string = '%s'\n", tablet->GetDeviceManufacturerName().c_str());
+			return true;
 		}
 
-		return true;
-	}));
-
+		// Product name
+		else if(stringName.compare(0, 3, "pro") == 0) {
+			LOG_INFO("  Product string = '%s'\n", tablet->GetDeviceProductName().c_str());
+			return true;
+		}
 
-	//
-	// Command: GetDeviceStrings, GetStrings
-	//
-	// Request strings from HID or WinUSB device
-	//
-	AddAlias("GetStrings", "GetDeviceStrings");
-	AddCommand(new Command("GetDeviceStrings", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 0) return false;
-		if(tablet == NULL) return false;
+		// Serial number
+		else if(stringName.compare(0, 3, "ser") == 0) {
+			LOG_INFO("  Serial number string = '%s'\n", tablet->GetDeviceSerialNumber().c_str());
+			return true;
+		}
 
 		int stringIdMin = cmd->GetInt(0, 0);
 		int stringIdMax = cmd->GetInt(1, stringIdMin);
@@ -429,20 +325,60 @@ void CommandHandler::CreateDeviceCommands() {
 	// Check if a device string matches
 	//
 	AddAlias("CheckString", "CheckDeviceString");
+	AddHelp("CheckDeviceString", "Usage:");
+	AddHelp("CheckDeviceString", "  CheckDeviceString <string id> \"<match>\"");
+	AddHelp("CheckDeviceString", "  CheckDeviceString Manufacturer \"<match>\"");
+	AddHelp("CheckDeviceString", "  CheckDeviceString Product \"<match>\"");
+	AddHelp("CheckDeviceString", "  CheckDeviceString SerialNumber \"<match>\"");
 	AddCommand(new Command("CheckDeviceString", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 1) return false;
+		if(cmd->valueCount <= 1) {
+			ExecuteCommand("Help", "CheckDeviceString");
+			return false;
+		}
 		if(tablet == NULL) return false;
 
 		int stringId = cmd->GetInt(0, 0);
+		string stringName = cmd->GetStringLower(0, "");
 		string matchString = cmd->GetString(1, "");
 
-		// Request and read device string 
-		string deviceString = tablet->GetDeviceString(stringId);
+		string deviceString = "";
+
+		// Manufacturer
+		if(stringName.compare(0, 3, "man") == 0) {
+			stringName = "Manufacturer";
+			deviceString = tablet->GetDeviceManufacturerName();
+		}
+
+		// Product name
+		else if(stringName.compare(0, 3, "pro") == 0) {
+			stringName = "Product";
+			deviceString = tablet->GetDeviceProductName();
+		}
+
+		// Serial number
+		else if(stringName.compare(0, 3, "ser") == 0) {
+			stringName = "SerialNumber";
+			deviceString = tablet->GetDeviceSerialNumber();
+		}
+
+		// Request device string 
+		else {
+			stringName = to_string(stringId);
+			if(stringId == 0) {
+				LOG_ERROR("Invalid string id!\n");
+				return false;
+			}
+			try {
+				deviceString = tablet->GetDeviceString(stringId);
+			} catch(exception&e) {
+				LOG_ERROR("%s\n", e.what());
+			}
+		}
 
 		// Does the string match?
 		if(deviceString.size() >= matchString.size() && deviceString.compare(0, matchString.size(), matchString) == 0) {
-			LOG_INFO("Device string (id %d) '%s' matches with '%s'\n",
-				stringId,
+			LOG_INFO("Device string (%s) '%s' matches with '%s'\n",
+				stringName.c_str(),
 				deviceString.c_str(),
 				matchString.c_str()
 			);
@@ -451,8 +387,8 @@ void CommandHandler::CreateDeviceCommands() {
 
 		// Does not match
 		else {
-			LOG_INFO("Device string (id %d) '%s' does not match with '%s'. Tablet invalid!\n",
-				stringId,
+			LOG_INFO("Device string (%s) '%s' does not match with '%s'. Tablet invalid!\n",
+				stringName.c_str(),
 				deviceString.c_str(),
 				matchString.c_str()
 			);
diff --git a/TabletDriverService/CommandHandler.Filters.cpp b/TabletDriverService/CommandHandler.Filters.cpp
index b8f7f3c..6773675 100644
--- a/TabletDriverService/CommandHandler.Filters.cpp
+++ b/TabletDriverService/CommandHandler.Filters.cpp
@@ -20,6 +20,7 @@ void CommandHandler::CreateFilterCommands() {
 
 		double latency = cmd->GetDouble(0, tablet->smoothing.GetLatency());
 		double threshold = cmd->GetDouble(1, tablet->smoothing.threshold * 100);
+		bool onlyWhenButtonsDown = cmd->GetBoolean(2, tablet->smoothing.onlyWhenButtonsDown);
 
 		threshold /= 100;
 
@@ -42,10 +43,18 @@ void CommandHandler::CreateFilterCommands() {
 		// Set smoothing filter latency
 		tablet->smoothing.SetLatency(latency);
 
+		// Only on button down
+		tablet->smoothing.onlyWhenButtonsDown = onlyWhenButtonsDown;
+
 		// Print output
 		if(tablet->smoothing.weight < 1.0) {
 			tablet->smoothing.isEnabled = true;
-			LOG_INFO("Smoothing = %0.2f ms to reach %0.0f%% (weight = %f)\n", latency, tablet->smoothing.threshold * 100, tablet->smoothing.weight);
+			LOG_INFO("Smoothing = %0.2f ms to reach %0.0f%% (weight = %f), OnlyWhenButtonDown=%s\n",
+				latency, tablet->smoothing.threshold * 100,
+				tablet->smoothing.weight,
+				tablet->smoothing.onlyWhenButtonsDown ? "True" : "False"
+
+			);
 		}
 		else {
 			tablet->smoothing.isEnabled = false;
@@ -112,6 +121,7 @@ void CommandHandler::CreateFilterCommands() {
 	AddAlias("Noise", "NoiseReduction");
 	AddCommand(new Command("NoiseReduction", [&](CommandLine *cmd) {
 
+		if(!ExecuteCommand("TabletValid")) return false;
 		string stringValue = cmd->GetStringLower(0, "");
 
 		// Off / False
@@ -196,23 +206,28 @@ void CommandHandler::CreateFilterCommands() {
 		}
 		else {
 
-			double shape = cmd->GetDouble(0, 1.0);
-			double compensation = cmd->GetDouble(1, 1.0);
-			bool ignoreWhenDragging = cmd->GetBoolean(2, false);
+			double shape = cmd->GetDouble(0, tablet->antiSmoothing.shape);
+			double compensation = cmd->GetDouble(1, tablet->antiSmoothing.compensation);
+			bool onlyWhenHover = cmd->GetBoolean(2, tablet->antiSmoothing.onlyWhenHover);
 
-			if(shape <= 0) {
+			if(cmd->valueCount == 0) {
+				LOG_INFO("Usage: %s <shape> <compensation> <only on hover> <target report rate>\n", cmd->command.c_str());
+			}
+			else if(shape <= 0) {
 				tablet->antiSmoothing.isEnabled = false;
 				LOG_INFO("Anti-smoothing = off\n");
 			}
 			else {
 				tablet->antiSmoothing.shape = shape;
 				tablet->antiSmoothing.compensation = compensation;
-				tablet->antiSmoothing.ignoreWhenDragging = ignoreWhenDragging;
+				tablet->antiSmoothing.onlyWhenHover = onlyWhenHover;
+
 				tablet->antiSmoothing.isEnabled = true;
-				LOG_INFO("Anti-smoothing = Shape:%0.2f Compensation:%0.2f DragIgnore:%s\n",
+				LOG_INFO("Anti-smoothing = Shape:%0.2f Compensation:%0.2f OnlyOnHover:%s\n",
 					tablet->antiSmoothing.shape,
 					tablet->antiSmoothing.compensation,
-					tablet->antiSmoothing.ignoreWhenDragging ? "true" : "false"
+					tablet->antiSmoothing.onlyWhenHover ? "true" : "false"
+
 				);
 			}
 		}
@@ -221,10 +236,12 @@ void CommandHandler::CreateFilterCommands() {
 
 
 	//
-	// Command: FilterTimerInterval
+	// Command: FilterTimerInterval, TimerInterval, Interval
 	//
 	// Sets filter timer interval
 	//
+	AddAlias("Interval", "FilterTimerInterval");
+	AddAlias("TimerInterval", "FilterTimerInterval");
 	AddCommand(new Command("FilterTimerInterval", [&](CommandLine *cmd) {
 		if(tabletHandler == NULL) return true;
 		int oldInterval = (int)round(tabletHandler->timerInterval);
@@ -268,12 +285,12 @@ void CommandHandler::CreateFilterCommands() {
 			filterAntiSmoothing = new TabletFilterAntiSmoothing();
 			filterAntiSmoothing->shape = tablet->antiSmoothing.shape;
 			filterAntiSmoothing->compensation = tablet->antiSmoothing.compensation;
-			filterAntiSmoothing->ignoreWhenDragging = tablet->antiSmoothing.ignoreWhenDragging;
+			filterAntiSmoothing->onlyWhenHover = tablet->antiSmoothing.onlyWhenHover;
 			settingsStringIndex += sprintf_s((settingsString + settingsStringIndex), settingsStringSize - settingsStringIndex,
 				"settings AntiSmoothing shape=%0.3f compensation=%0.3f dragignore=%s\r\n",
 				tablet->antiSmoothing.shape,
 				tablet->antiSmoothing.compensation,
-				tablet->antiSmoothing.ignoreWhenDragging ? "true" : "false"
+				tablet->antiSmoothing.onlyWhenHover ? "true" : "false"
 			);
 		}
 
diff --git a/TabletDriverService/CommandHandler.Other.cpp b/TabletDriverService/CommandHandler.Other.cpp
index 8ecbb61..fbfecd7 100644
--- a/TabletDriverService/CommandHandler.Other.cpp
+++ b/TabletDriverService/CommandHandler.Other.cpp
@@ -407,11 +407,22 @@ void CommandHandler::CreateOtherCommands() {
 		LOG_INFO("  Report Length = %d bytes\n", tablet->settings.reportLength);
 		LOG_INFO("  Detect Mask = 0x%02X\n", tablet->settings.detectMask);
 		LOG_INFO("  Ignore Mask = 0x%02X\n", tablet->settings.ignoreMask);
+		LOG_INFO("  Aux button count = %d\n", tablet->settings.auxButtonCount);
 
-		for(int i = 0; i < 8; i++) {
-			stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "%d ", tablet->buttonMap[i]);
+		for(int i = 0; i < tablet->settings.buttonCount; i++) {
+			stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "'%s' ", tablet->settings.buttonMap[i].c_str());
 		}
-		LOG_INFO("  Button Map = %s\n", stringBuffer);
+		LOG_INFO("  Pen button map = %s\n", stringBuffer);
+
+
+		if(tablet->settings.auxButtonCount > 0) {
+			stringIndex = 0;
+			for(int i = 0; i < tablet->settings.auxButtonCount; i++) {
+				stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "'%s' ", tablet->settings.auxButtonMap[i].c_str());
+			}
+			LOG_INFO("  Aux button map = %s\n", stringBuffer);
+		}
+
 
 
 		if(tablet->initFeatureLength > 0) {
@@ -472,6 +483,7 @@ void CommandHandler::CreateOtherCommands() {
 		LOG_STATUS("MAX_X %d\n", tablet->settings.maxX);
 		LOG_STATUS("MAX_Y %d\n", tablet->settings.maxY);
 		LOG_STATUS("MAX_PRESSURE %d\n", tablet->settings.maxPressure);
+		LOG_STATUS("AUX_BUTTONS %d\n", tablet->settings.auxButtonCount);
 
 		return true;
 	}));
@@ -526,6 +538,7 @@ void CommandHandler::CreateOtherCommands() {
 		return true;
 	}));
 
+
 	//
 	// Command: GetCommands
 	//
@@ -561,6 +574,24 @@ void CommandHandler::CreateOtherCommands() {
 		return true;
 	}));
 
+	//
+	// Command: ListKeys
+	//
+	// List all keys
+	//
+	AddCommand(new Command("ListKeys", [&](CommandLine *cmd) {
+
+		LOG_INFO("Keys:\n");
+		for(string key : tabletHandler->inputEmulator.keys) {
+			if(tabletHandler->inputEmulator.keyMap.count(key) > 0) {
+				string name = tabletHandler->inputEmulator.keyMap[key]->name;
+				LOG_INFO("  % -20s %s\n", key.c_str(), name.c_str());
+			}
+		}
+
+		return true;
+	}));
+
 
 	//
 	// Command: Help
diff --git a/TabletDriverService/CommandHandler.Tablet.cpp b/TabletDriverService/CommandHandler.Tablet.cpp
index 63457cf..cf6c475 100644
--- a/TabletDriverService/CommandHandler.Tablet.cpp
+++ b/TabletDriverService/CommandHandler.Tablet.cpp
@@ -75,7 +75,7 @@ void CommandHandler::CreateTabletCommands() {
 	AddCommand(new Command("DetectMask", [&](CommandLine *cmd) {
 		if(tablet == NULL) return false;
 		tablet->settings.detectMask = cmd->GetInt(0, tablet->settings.detectMask);
-		LOG_INFO("Tablet detect mask = %02X\n", tablet->settings.detectMask);
+		LOG_INFO("Tablet detect mask = 0x%02X\n", tablet->settings.detectMask);
 		return true;
 	}));
 
@@ -86,7 +86,7 @@ void CommandHandler::CreateTabletCommands() {
 	AddCommand(new Command("IgnoreMask", [&](CommandLine *cmd) {
 		if(tablet == NULL) return false;
 		tablet->settings.ignoreMask = cmd->GetInt(0, tablet->settings.ignoreMask);
-		LOG_INFO("Tablet ignore mask = %02X\n", tablet->settings.ignoreMask);
+		LOG_INFO("Tablet ignore mask = 0x%02X\n", tablet->settings.ignoreMask);
 		return true;
 	}));
 
@@ -97,7 +97,7 @@ void CommandHandler::CreateTabletCommands() {
 	AddCommand(new Command("MaxX", [&](CommandLine *cmd) {
 		if(tablet == NULL) return false;
 		tablet->settings.maxX = cmd->GetInt(0, tablet->settings.maxX);
-		LOG_INFO("Tablet max X = %d\n", tablet->settings.maxX);
+		LOG_INFO("Tablet maximum X value = %d\n", tablet->settings.maxX);
 		return true;
 	}));
 
@@ -108,7 +108,7 @@ void CommandHandler::CreateTabletCommands() {
 	AddCommand(new Command("MaxY", [&](CommandLine *cmd) {
 		if(tablet == NULL) return false;
 		tablet->settings.maxY = cmd->GetInt(0, tablet->settings.maxY);
-		LOG_INFO("Tablet max Y = %d\n", tablet->settings.maxY);
+		LOG_INFO("Tablet maximum Y value = %d\n", tablet->settings.maxY);
 		return true;
 	}));
 
@@ -119,10 +119,11 @@ void CommandHandler::CreateTabletCommands() {
 	AddCommand(new Command("MaxPressure", [&](CommandLine *cmd) {
 		if(tablet == NULL) return false;
 		tablet->settings.maxPressure = cmd->GetInt(0, tablet->settings.maxPressure);
-		LOG_INFO("Tablet max pressure = %d\n", tablet->settings.maxPressure);
+		LOG_INFO("Tablet maximum pressure value = %d\n", tablet->settings.maxPressure);
 		return true;
 	}));
 
+
 	//
 	// Command: ClickPressure
 	//
@@ -167,6 +168,52 @@ void CommandHandler::CreateTabletCommands() {
 	}));
 
 
+	//
+	// Command: PressureSensitivity
+	//
+	AddCommand(new Command("PressureSensitivity", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.pressureSensitivity = cmd->GetDouble(0, tablet->settings.pressureSensitivity);
+		LOG_INFO("Tablet pressure sensitivity = %0.5f\n", tablet->settings.pressureSensitivity);
+		return true;
+	}));
+
+
+	//
+	// Command: PressureDeadzone
+	//
+	AddCommand(new Command("PressureDeadzone", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.pressureDeadzone = cmd->GetDouble(0, tablet->settings.pressureDeadzone);
+		LOG_INFO("Tablet pressure deadzone = %0.2f\n", tablet->settings.pressureDeadzone);
+		return true;
+	}));
+
+
+	//
+	// Command: ScrollSensitivity
+	//
+	AddCommand(new Command("ScrollSensitivity", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.scrollSensitivity = cmd->GetDouble(0, tablet->settings.scrollSensitivity);
+		LOG_INFO("Tablet scroll sensitivity = %0.2f scrolls per millimeter\n", tablet->settings.scrollSensitivity);
+		return true;
+	}));
+
+
+	//
+	// Command: ScrollAcceleration, ScrollAcc
+	//
+	AddAlias("ScrollAcc", "ScrollAcceleration");
+	AddCommand(new Command("ScrollAcceleration", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.scrollAcceleration = cmd->GetDouble(0, tablet->settings.scrollAcceleration);
+		if(tablet->settings.scrollAcceleration < 0.1) tablet->settings.scrollAcceleration = 0.1;
+		LOG_INFO("Tablet scroll acceleration = %0.2f\n", tablet->settings.scrollAcceleration);
+		return true;
+	}));
+
+
 	//
 	// Command: Skew
 	//
@@ -209,6 +256,11 @@ void CommandHandler::CreateTabletCommands() {
 			tablet->settings.dataFormat = TabletSettings::TabletFormatSkipFirstDataByte;
 		}
 
+		// Custom data format
+		else if(format == "custom") {
+			tablet->settings.dataFormat = TabletSettings::TabletFormatCustom;
+		}
+
 		// Unknown type
 		else {
 			LOG_ERROR("Unknown tablet data format: %s\n", format.c_str());
@@ -220,6 +272,115 @@ void CommandHandler::CreateTabletCommands() {
 	}));
 
 
+	//
+	// Command: CustomDataInstruction, CustomData
+	//
+	// Sets tablet data format
+	//
+	// CustomData <target byte> [TargetMask=<target mask(&)>] [Source=<source byte>] [SourceMask=<source mask(&)>] [SourceShift=<bit shift (<<)>]
+	//
+	AddAlias("CustomData", "CustomDataInstruction");
+	AddAlias("AuxCustomData", "CustomDataInstruction");
+	AddCommand(new Command("CustomDataInstruction", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+
+		string commandName = cmd->GetCommandLowerCase();
+
+		if(cmd->valueCount >= 3) {
+
+			DataFormatter::DataInstruction instruction;
+
+			int targetByte = cmd->GetInt(0, 0);
+			string targetByteName = cmd->GetStringLower(0, "");
+			/*
+			int targetBitMask = cmd->GetInt(1, 0xFF);
+			int sourceByte = cmd->GetInt(2, 0);
+			int sourceBitMask = cmd->GetInt(3, 0xFF);
+			int sourceBitShift = cmd->GetInt(4, 0);
+			*/
+
+
+			// Auxiliary byte names
+			if(commandName.compare(0, 3, "aux") == 0) {
+				if(targetByteName == "reportid") targetByte = 0;
+				if(targetByteName == "buttonslow") targetByte = 1;
+				if(targetByteName == "buttonshigh") targetByte = 2;
+				if(targetByteName == "detect") targetByte = 3;
+
+			}
+
+			// Tablet byte names
+			else {
+				if(targetByteName == "reportid") targetByte = 0;
+				if(targetByteName == "buttons") targetByte = 1;
+				if(targetByteName == "xlow") targetByte = 2;
+				if(targetByteName == "xhigh") targetByte = 3;
+				if(targetByteName == "ylow") targetByte = 4;
+				if(targetByteName == "yhigh") targetByte = 5;
+				if(targetByteName == "pressurelow") targetByte = 6;
+				if(targetByteName == "pressurehigh") targetByte = 7;
+			}
+
+
+			instruction.targetByte = targetByte;
+
+			// Loop through parameters
+			for(int i = 1; i < cmd->valueCount; i += 2) {
+				string parameter = cmd->GetStringLower(i, "");
+				int value = cmd->GetInt(i + 1, -1);
+
+				// Set instruction parameters
+				if(parameter == "targetmask" || parameter == "mask") instruction.targetBitMask = value;
+				if(parameter == "source") instruction.sourceByte = value;
+				if(parameter == "sourcemask") instruction.sourceBitMask = value;
+				if(parameter == "sourceshift" || parameter == "shift") instruction.sourceBitShift = value;
+
+			}
+
+
+			// Add aux data format instruction
+			if(commandName.compare(0, 3, "aux") == 0) {
+				tablet->auxDataFormatter.AddInstruction(&instruction);
+			}
+			// Add tablet data format instruction
+			else {
+				tablet->dataFormatter.AddInstruction(&instruction);
+			}
+
+
+			//
+			LOG_INFO("Custom data format: Target=%d, TargetMask=0x%02X, Source=%d, SourceMask=0x%02X, SourceShift=%d\n",
+				instruction.targetByte,
+				instruction.targetBitMask,
+				instruction.sourceByte,
+				instruction.sourceBitMask,
+				instruction.sourceBitShift
+			);
+
+		}
+		else {
+			LOG_INFO("Usage: %s <target byte> [TargetMask=<target mask(&)>] [Source=<source byte>] [SourceMask=<source mask(&)>] [SourceShift=<bit shift (<<)>]\n",
+				cmd->command.c_str()
+			);
+		}
+
+		return true;
+	}));
+
+
+	//
+	// Command: ClearCustomData
+	//
+	// Clears custom data formatter instructions
+	//
+	AddCommand(new Command("ClearCustomData", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->dataFormatter.instructionCount = 0;
+		LOG_INFO("Custom data format instructions cleared!\n");
+		return true;
+	}));
+
+
 	//
 	// Command: InitFeature
 	//
@@ -299,21 +460,79 @@ void CommandHandler::CreateTabletCommands() {
 
 
 	//
-	// Command: ButtonMap, Buttons
+	// Command: ClearButtonMap
+	//
+	AddCommand(new Command("ClearButtonMap", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		for(int i = 0; i < 16; i++) {
+			tablet->settings.buttonMap[i] = "";
+		}
+		LOG_INFO("Pen button map cleared!\n");
+		return true;
+	}));
+	
+
+	//
+	// Command: ClearAuxButtonMap
+	//
+	AddCommand(new Command("ClearAuxButtonMap", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		for(int i = 0; i < 16; i++) {
+			tablet->settings.auxButtonMap[i] = "";
+		}
+		LOG_INFO("Aux button map cleared!\n");
+		return true;
+	}));
+
+
+	//
+	// Command: ButtonMap, Buttons, AuxButtonMap, AuxButtons
 	//
 	// Maps input buttons to output buttons
 	//
 	AddAlias("Buttons", "ButtonMap");
+	AddAlias("AuxButtonMap", "ButtonMap");
+	AddAlias("AuxButtons", "ButtonMap");
 	AddCommand(new Command("ButtonMap", [&](CommandLine *cmd) {
-
 		if(!ExecuteCommand("TabletValid")) return false;
-		char buttonMapBuffer[32];
-		int index = 0;
-		for(int i = 0; i < 8; i++) {
-			tablet->buttonMap[i] = cmd->GetInt(i, tablet->buttonMap[i]);
-			index += sprintf_s(buttonMapBuffer + index, 32 - index, "%d ", tablet->buttonMap[i]);
+
+		string commandName = cmd->GetCommandLowerCase();
+		int button = cmd->GetInt(0, 0);
+		string keys = "";
+		if(cmd->valueCount == 2) {
+			keys = cmd->GetString(1, "");
+			transform(keys.begin(), keys.end(), keys.begin(), ::toupper);
+		}
+		else {
+			for(int i = 1; i < cmd->valueCount; i++) {
+				string key = cmd->GetString(i, "");
+				key.erase(remove(key.begin(), key.end(), '+'), key.end());
+				if(key.size() > 0) {
+					std::transform(key.begin(), key.end(), key.begin(), ::toupper);
+					if(i != 1) keys += "+";
+					keys += key;
+				}
+			}
 		}
-		LOG_INFO("Button Map = %s\n", buttonMapBuffer);
+
+		if(button >= 1) {
+			if(commandName.compare(0, 3, "aux") == 0) {
+				if(button <= tablet->settings.auxButtonCount) {
+					tablet->settings.auxButtonMap[button - 1] = keys;
+					LOG_INFO("Aux button %d mapped to '%s'\n", button, keys.c_str());
+				}
+			}
+			else {
+				if(button <= tablet->settings.buttonCount) {
+					tablet->settings.buttonMap[button - 1] = keys;
+					LOG_INFO("Pen button %d mapped to '%s'\n", button, keys.c_str());
+				}
+			}
+		}
+		else {
+			LOG_INFO("Usage: %s <button> <key>\n", cmd->command.c_str());
+		}
+
 		return true;
 	}));
 
@@ -422,5 +641,4 @@ void CommandHandler::CreateTabletCommands() {
 		return true;
 	}));
 
-
 }
diff --git a/TabletDriverService/CommandHandler.cpp b/TabletDriverService/CommandHandler.cpp
index fb74d5e..c069971 100644
--- a/TabletDriverService/CommandHandler.cpp
+++ b/TabletDriverService/CommandHandler.cpp
@@ -73,6 +73,7 @@ void CommandHandler::CreateCommands() {
 
 	CreateDeviceCommands();
 	CreateTabletCommands();
+	CreateAuxCommands();
 	CreateFilterCommands();
 	CreateOtherCommands();
 
diff --git a/TabletDriverService/CommandHandler.h b/TabletDriverService/CommandHandler.h
index 6e0400d..17353ce 100644
--- a/TabletDriverService/CommandHandler.h
+++ b/TabletDriverService/CommandHandler.h
@@ -23,6 +23,7 @@ class CommandHandler {
 	void CreateTabletCommands();
 	void CreateFilterCommands();
 	void CreateDeviceCommands();
+	void CreateAuxCommands();
 	void CreateOtherCommands();
 
 	bool IsValidCommand(string command);
diff --git a/TabletDriverService/CommandLine.cpp b/TabletDriverService/CommandLine.cpp
index 3004085..6d7b1a0 100644
--- a/TabletDriverService/CommandLine.cpp
+++ b/TabletDriverService/CommandLine.cpp
@@ -66,7 +66,7 @@ int CommandLine::Parse(string line) {
 
 	char currentChar;
 	char previousChar = 0;
-	char splitChars[] = " ,:(){}[]";
+	char splitChars[] = " ,:(){}[]=";
 	char endChars[] = { '\r', '\n', ';', 0 };
 	char commentChar = '#';
 	char escapeChar = '\\';
@@ -215,6 +215,35 @@ string CommandLine::ParseHex(string str) {
 	return str;
 }
 
+//
+// Parse bit string (e.g. 0b10100101)
+//
+string CommandLine::ParseBits(string str) {
+	if(str.size() >= 3 && str[0] == '0' && str[1] == 'b') {
+		int length = str.size();
+		unsigned int output = 0;
+		try {
+			for(int i = 2; i < length; i++) {
+				char c = str.at(i);
+				if(c == '1') {
+					output |= 1 << (length - (i + 1));
+				}
+			}
+			return to_string(output);
+		} catch(exception) {
+		}
+	}
+	return str;
+}
+
+//
+// Parse hex and bits strings
+//
+string CommandLine::ParseHexBits(string str)
+{
+	return ParseBits(ParseHex(str));
+}
+
 
 //
 // Get string value
@@ -243,7 +272,7 @@ string CommandLine::GetStringLower(int index, string defaultValue) {
 int CommandLine::GetInt(int index, int defaultValue) {
 	if(index < valueCount) {
 		try {
-			auto value = stoi(ParseHex(values[index]));
+			auto value = stoi(ParseHexBits(values[index]));
 			return value;
 		} catch(exception) {}
 	}
@@ -257,7 +286,7 @@ int CommandLine::GetInt(int index, int defaultValue) {
 long CommandLine::GetLong(int index, long defaultValue) {
 	if(index < valueCount) {
 		try {
-			auto value = stol(ParseHex(values[index]));
+			auto value = stol(ParseHexBits(values[index]));
 			return value;
 		} catch(exception) {}
 	}
@@ -271,7 +300,7 @@ long CommandLine::GetLong(int index, long defaultValue) {
 double CommandLine::GetDouble(int index, double defaultValue) {
 	if(index < valueCount) {
 		try {
-			auto value = stod(ParseHex(values[index]));
+			auto value = stod(ParseHexBits(values[index]));
 			return value;
 		} catch(exception) {}
 	}
@@ -285,7 +314,7 @@ double CommandLine::GetDouble(int index, double defaultValue) {
 float CommandLine::GetFloat(int index, float defaultValue) {
 	if(index < valueCount) {
 		try {
-			auto value = stof(ParseHex(values[index]));
+			auto value = stof(ParseHexBits(values[index]));
 			return value;
 		} catch(exception) {}
 	}
diff --git a/TabletDriverService/CommandLine.h b/TabletDriverService/CommandLine.h
index 376ec2a..3d43010 100644
--- a/TabletDriverService/CommandLine.h
+++ b/TabletDriverService/CommandLine.h
@@ -24,6 +24,8 @@ class CommandLine {
 	string GetParameterString();
 	int Parse(string text);
 	string ParseHex(string str);
+	string ParseBits(string str);
+	string ParseHexBits(string str);
 	string GetString(int index, string defaultValue);
 	string GetStringLower(int index, string defaultValue);
 	int GetInt(int index, int defaultValue);
diff --git a/TabletDriverService/DataFormatter.cpp b/TabletDriverService/DataFormatter.cpp
new file mode 100644
index 0000000..ef413bf
--- /dev/null
+++ b/TabletDriverService/DataFormatter.cpp
@@ -0,0 +1,95 @@
+#include "stdafx.h"
+#include "DataFormatter.h"
+
+//#define LOG_MODULE "DataFormatter"
+//#include "Logger.h"
+
+
+DataFormatter::DataFormatter()
+{
+	instructionCount = 0;
+	targetLength = 0;
+	sourceLength = 0;
+}
+
+
+DataFormatter::~DataFormatter()
+{
+}
+
+bool DataFormatter::Format(void * targetBuffer, void * sourceBuffer)
+{
+	UCHAR *target = (UCHAR*)targetBuffer;
+	UCHAR *source = (UCHAR*)sourceBuffer;
+	DataInstruction *instruction;
+	unsigned int byte;
+
+	// Loop through instructions
+	for(int i = 0; i < instructionCount; i++) {
+		instruction = &instructions[i];
+
+		// Get source byte
+		byte = source[instruction->sourceByte];
+
+		// Source bit mask
+		byte &= instruction->sourceBitMask;
+
+		// Shift
+		byte <<= instruction->sourceBitShift;
+
+		// Target bit mask
+		byte &= instruction->targetBitMask;
+
+		// Set target byte
+		target[instruction->targetByte] |= byte & 0xFF;
+
+		/*
+		LOG_DEBUG("  INSTR T=%d TM=0x%02X S=%d SM=0x%02X SS=%d\n",
+			instruction->targetByte,
+			instruction->targetBitMask,
+			instruction->sourceByte,
+			instruction->sourceBitMask,
+			instruction->sourceBitShift
+		);
+		*/
+	}
+
+	return true;
+}
+
+bool DataFormatter::AddInstruction(int targetByte, int targetBitMask, int sourceByte, int sourceBitMask, int sourceBitShift)
+{
+	if(instructionCount >= 128) return false;
+
+	// Lengths
+	if(targetByte >= targetLength) targetLength = targetByte + 1;
+	if(sourceByte >= sourceLength) sourceLength = sourceByte + 1;
+
+	instructions[instructionCount].targetByte = targetByte;
+	instructions[instructionCount].targetBitMask = targetBitMask;
+	instructions[instructionCount].sourceByte = sourceByte;
+	instructions[instructionCount].sourceBitMask = sourceBitMask;
+	instructions[instructionCount].sourceBitShift = sourceBitShift;
+	instructionCount++;
+	return true;
+}
+
+bool DataFormatter::AddInstruction(DataInstruction * instruction)
+{
+	return AddInstruction(
+		instruction->targetByte,
+		instruction->targetBitMask,
+		instruction->sourceByte,
+		instruction->sourceBitMask,
+		instruction->sourceBitShift
+	);
+}
+
+DataFormatter::DataInstruction::DataInstruction()
+{
+	targetByte = 0;
+	targetBitMask = 0xFF;
+	sourceByte = 0;
+	sourceBitMask = 0xFF;
+	sourceBitShift = 0;
+}
diff --git a/TabletDriverService/DataFormatter.h b/TabletDriverService/DataFormatter.h
new file mode 100644
index 0000000..53235d1
--- /dev/null
+++ b/TabletDriverService/DataFormatter.h
@@ -0,0 +1,31 @@
+#pragma once
+class DataFormatter
+{
+public:
+	class DataInstruction {
+	public:
+		int targetByte;
+		int targetBitMask;
+
+		int sourceByte;
+		int sourceBitShift;
+		int sourceBitMask;
+
+		DataInstruction();
+	};
+
+	DataInstruction instructions[128];
+	int instructionCount;
+	int targetLength;
+	int sourceLength;
+
+	DataFormatter();
+	~DataFormatter();
+
+	bool Format(void *targetBuffer, void *sourceBuffer);
+	bool AddInstruction(int targetByte, int targetBitMask, int sourceByte, int sourceBitMask, int sourceBitShift);
+	bool AddInstruction(DataInstruction *instruction);
+
+
+};
+
diff --git a/TabletDriverService/HIDDevice.cpp b/TabletDriverService/HIDDevice.cpp
index ca2e60b..31cdaec 100644
--- a/TabletDriverService/HIDDevice.cpp
+++ b/TabletDriverService/HIDDevice.cpp
@@ -319,6 +319,7 @@ void HIDDevice::CloseDevice() {
 	if(isOpen && _deviceHandle != NULL && _deviceHandle != INVALID_HANDLE_VALUE) {
 		try {
 			CloseHandle(_deviceHandle);
+			_deviceHandle = NULL;
 		} catch(exception) {}
 	}
 	isOpen = false;
diff --git a/TabletDriverService/InputEmulator.cpp b/TabletDriverService/InputEmulator.cpp
new file mode 100644
index 0000000..98ed757
--- /dev/null
+++ b/TabletDriverService/InputEmulator.cpp
@@ -0,0 +1,545 @@
+#include "stdafx.h"
+#include "InputEmulator.h"
+
+#define LOG_MODULE "InputEmulator"
+#include "Logger.h"
+
+InputEmulator::InputEmulator()
+{
+	CreateKeyMap();
+	CreateVirtualKeyMap();
+}
+
+
+InputEmulator::~InputEmulator()
+{
+}
+
+//
+// Create key map
+//
+void InputEmulator::CreateKeyMap()
+{
+	// Disabled
+	AddKey("DISABLED", "Disabled", 0, 0);
+
+	// Mouse buttons
+	AddKey("MOUSE1", "Mouse 1", 0, 1);
+	AddKey("MOUSE2", "Mouse 2", 0, 2);
+	AddKey("MOUSE3", "Mouse 3", 0, 3);
+	AddKey("MOUSE4", "Mouse 4", 0, 4);
+	AddKey("MOUSE5", "Mouse 5", 0, 5);
+
+	// Mouse scroll
+	AddKey("MOUSESCROLLV", "Mouse Scroll Vertical", 0, 0x101);
+	AddKey("MOUSESCROLLH", "Mouse Scroll Horizontal", 0, 0x102);
+	AddKey("MOUSESCROLLB", "Mouse Scroll Both", 0, 0x103);
+
+	// Shift
+	AddKey("SHIFT", "Shift", VK_SHIFT);
+	AddKey("LSHIFT", "Left shift", VK_LSHIFT);
+	AddKey("RSHIFT", "Right shift", VK_RSHIFT);
+
+	// Control
+	AddKey("CTRL", "Control", VK_CONTROL);
+	AddKey("LCTRL", "Left control", VK_LCONTROL);
+	AddKey("RCTRL", "Right control", VK_RCONTROL);
+
+	// Alt
+	AddKey("ALT", "Alt", VK_MENU);
+	AddKey("LALT", "Left alt", VK_LMENU);
+	AddKey("RALT", "Right alt", VK_RMENU);
+
+	// Windows keys
+	AddKey("LWIN", "Left Windows key", VK_LWIN);
+	AddKey("RWIN", "Right Windows key", VK_RWIN);
+	AddKey("MENU", "Windows menu key", VK_APPS);
+
+	// 
+	AddKey("BACK", "Backspace", VK_BACK);
+	AddKey("TAB", "Tab", VK_TAB);
+	AddKey("ENTER", "Enter", VK_RETURN);
+	AddKey("ESC", "Escape", VK_ESCAPE);
+	AddKey("SPACE", "Space", VK_SPACE);
+	AddKey("PAGEUP", "Page up", VK_PRIOR);
+	AddKey("PAGEDOWN", "Page down", VK_NEXT);
+	AddKey("END", "End", VK_END);
+	AddKey("HOME", "Home", VK_HOME);
+	AddKey("DEL", "Delete", VK_DELETE);
+	AddKey("INS", "Insert", VK_INSERT);
+	AddKey("CAPSLOCK", "Caps lock", VK_CAPITAL);
+	AddKey("NUMLOCK", "Numlock", VK_NUMLOCK);
+	AddKey("SCROLLLOCK", "Scroll lock", VK_SCROLL);
+
+	// Arrow keys
+	AddKey("UP", "Up", VK_UP);
+	AddKey("DOWM", "Down", VK_DOWN);
+	AddKey("LEFT", "Left", VK_LEFT);
+	AddKey("RIGHT", "Right", VK_RIGHT);
+
+	// Function keys
+	AddKey("F1", "F1", VK_F1);
+	AddKey("F2", "F2", VK_F2);
+	AddKey("F3", "F3", VK_F3);
+	AddKey("F4", "F4", VK_F4);
+	AddKey("F5", "F5", VK_F5);
+	AddKey("F6", "F6", VK_F6);
+	AddKey("F7", "F7", VK_F7);
+	AddKey("F8", "F8", VK_F8);
+	AddKey("F9", "F9", VK_F9);
+	AddKey("F10", "F10", VK_F10);
+	AddKey("F11", "F11", VK_F11);
+	AddKey("F12", "F12", VK_F12);
+	AddKey("F13", "F13", VK_F13);
+	AddKey("F14", "F14", VK_F14);
+	AddKey("F15", "F15", VK_F15);
+	AddKey("F16", "F16", VK_F16);
+	AddKey("F17", "F17", VK_F17);
+	AddKey("F18", "F18", VK_F18);
+	AddKey("F19", "F19", VK_F19);
+	AddKey("F20", "F20", VK_F20);
+	AddKey("F21", "F21", VK_F21);
+	AddKey("F22", "F22", VK_F22);
+	AddKey("F23", "F23", VK_F23);
+	AddKey("F24", "F24", VK_F24);
+
+	// Numbpad
+	AddKey("NUMPAD0", "Numpad 0", VK_NUMPAD0);
+	AddKey("NUMPAD1", "Numpad 1", VK_NUMPAD1);
+	AddKey("NUMPAD2", "Numpad 2", VK_NUMPAD2);
+	AddKey("NUMPAD3", "Numpad 3", VK_NUMPAD3);
+	AddKey("NUMPAD4", "Numpad 4", VK_NUMPAD4);
+	AddKey("NUMPAD5", "Numpad 5", VK_NUMPAD5);
+	AddKey("NUMPAD6", "Numpad 6", VK_NUMPAD6);
+	AddKey("NUMPAD7", "Numpad 7", VK_NUMPAD7);
+	AddKey("NUMPAD8", "Numpad 8", VK_NUMPAD8);
+	AddKey("NUMPAD9", "Numpad 9", VK_NUMPAD9);
+
+	// Math
+	AddKey("MULTIPLY", "Multiply (*)", VK_MULTIPLY);
+	AddKey("DIVIDE", "Divide (/)", VK_DIVIDE);
+	AddKey("PLUS", "Plus (+)", VK_OEM_PLUS);
+	AddKey("MINUS", "Minus (-)", VK_OEM_MINUS);
+	AddKey("COMMA", "Comma (,)", VK_OEM_COMMA);
+	AddKey("PERIOD", "Period (.)", VK_OEM_PERIOD);
+
+	// Media keys
+	AddKey("VOLUMEUP", "Volume up", VK_VOLUME_UP);
+	AddKey("VOLUMEDOWN", "Volume down", VK_VOLUME_DOWN);
+	AddKey("VOLUMEMUTE", "Volume mute", VK_VOLUME_MUTE);
+	AddKey("MEDIANEXT", "Media next", VK_MEDIA_NEXT_TRACK);
+	AddKey("MEDIAPREV", "Media previous", VK_MEDIA_PREV_TRACK);
+	AddKey("MEDIASTOP", "Media stop", VK_MEDIA_STOP);
+	AddKey("MEDIAPLAY", "Media play/pause", VK_MEDIA_PLAY_PAUSE);
+
+}
+
+//
+// Create virtual key map
+//
+void InputEmulator::CreateVirtualKeyMap() {
+	AddKey("BACK", "Back", 8);
+	AddKey("TAB", "Tab", 9);
+	AddKey("LINEFEED", "LineFeed", 10);
+	AddKey("CLEAR", "Clear", 12);
+	AddKey("ENTER", "Enter", 13);
+	AddKey("SHIFTKEY", "ShiftKey", 16);
+	AddKey("CONTROLKEY", "ControlKey", 17);
+	AddKey("MENU", "Menu", 18);
+	AddKey("PAUSE", "Pause", 19);
+	AddKey("CAPITAL", "Capital", 20);
+	AddKey("KANAMODE", "KanaMode", 21);
+	AddKey("JUNJAMODE", "JunjaMode", 23);
+	AddKey("FINALMODE", "FinalMode", 24);
+	AddKey("HANJAMODE", "HanjaMode", 25);
+	AddKey("ESCAPE", "Escape", 27);
+	AddKey("IMECONVERT", "IMEConvert", 28);
+	AddKey("IMENONCONVERT", "IMENonconvert", 29);
+	AddKey("IMEACEEPT", "IMEAceept", 30);
+	AddKey("IMEMODECHANGE", "IMEModeChange", 31);
+	AddKey("SPACE", "Space", 32);
+	AddKey("PGUP", "PgUp", 33);
+	AddKey("PGDN", "PgDn", 34);
+	AddKey("END", "End", 35);
+	AddKey("HOME", "Home", 36);
+	AddKey("LEFT", "Left", 37);
+	AddKey("UP", "Up", 38);
+	AddKey("RIGHT", "Right", 39);
+	AddKey("DOWN", "Down", 40);
+	AddKey("SELECT", "Select", 41);
+	AddKey("PRINT", "Print", 42);
+	AddKey("EXECUTE", "Execute", 43);
+	AddKey("PRINTSCREEN", "PrintScreen", 44);
+	AddKey("INS", "Ins", 45);
+	AddKey("DEL", "Del", 46);
+	AddKey("HELP", "Help", 47);
+	AddKey("0", "0", 48);
+	AddKey("1", "1", 49);
+	AddKey("2", "2", 50);
+	AddKey("3", "3", 51);
+	AddKey("4", "4", 52);
+	AddKey("5", "5", 53);
+	AddKey("6", "6", 54);
+	AddKey("7", "7", 55);
+	AddKey("8", "8", 56);
+	AddKey("9", "9", 57);
+	AddKey("A", "A", 65);
+	AddKey("B", "B", 66);
+	AddKey("C", "C", 67);
+	AddKey("D", "D", 68);
+	AddKey("E", "E", 69);
+	AddKey("F", "F", 70);
+	AddKey("G", "G", 71);
+	AddKey("H", "H", 72);
+	AddKey("I", "I", 73);
+	AddKey("J", "J", 74);
+	AddKey("K", "K", 75);
+	AddKey("L", "L", 76);
+	AddKey("M", "M", 77);
+	AddKey("N", "N", 78);
+	AddKey("O", "O", 79);
+	AddKey("P", "P", 80);
+	AddKey("Q", "Q", 81);
+	AddKey("R", "R", 82);
+	AddKey("S", "S", 83);
+	AddKey("T", "T", 84);
+	AddKey("U", "U", 85);
+	AddKey("V", "V", 86);
+	AddKey("W", "W", 87);
+	AddKey("X", "X", 88);
+	AddKey("Y", "Y", 89);
+	AddKey("Z", "Z", 90);
+	AddKey("LWIN", "LWin", 91);
+	AddKey("RWIN", "RWin", 92);
+	AddKey("APPS", "Apps", 93);
+	AddKey("SLEEP", "Sleep", 95);
+	AddKey("NUMPAD0", "NumPad0", 96);
+	AddKey("NUMPAD1", "NumPad1", 97);
+	AddKey("NUMPAD2", "NumPad2", 98);
+	AddKey("NUMPAD3", "NumPad3", 99);
+	AddKey("NUMPAD4", "NumPad4", 100);
+	AddKey("NUMPAD5", "NumPad5", 101);
+	AddKey("NUMPAD6", "NumPad6", 102);
+	AddKey("NUMPAD7", "NumPad7", 103);
+	AddKey("NUMPAD8", "NumPad8", 104);
+	AddKey("NUMPAD9", "NumPad9", 105);
+	AddKey("MULTIPLY", "Multiply", 106);
+	AddKey("ADD", "Add", 107);
+	AddKey("SEPARATOR", "Separator", 108);
+	AddKey("SUBTRACT", "Subtract", 109);
+	AddKey("DECIMAL", "Decimal", 110);
+	AddKey("DIVIDE", "Divide", 111);
+	AddKey("F1", "F1", 112);
+	AddKey("F2", "F2", 113);
+	AddKey("F3", "F3", 114);
+	AddKey("F4", "F4", 115);
+	AddKey("F5", "F5", 116);
+	AddKey("F6", "F6", 117);
+	AddKey("F7", "F7", 118);
+	AddKey("F8", "F8", 119);
+	AddKey("F9", "F9", 120);
+	AddKey("F10", "F10", 121);
+	AddKey("F11", "F11", 122);
+	AddKey("F12", "F12", 123);
+	AddKey("F13", "F13", 124);
+	AddKey("F14", "F14", 125);
+	AddKey("F15", "F15", 126);
+	AddKey("F16", "F16", 127);
+	AddKey("F17", "F17", 128);
+	AddKey("F18", "F18", 129);
+	AddKey("F19", "F19", 130);
+	AddKey("F20", "F20", 131);
+	AddKey("F21", "F21", 132);
+	AddKey("F22", "F22", 133);
+	AddKey("F23", "F23", 134);
+	AddKey("F24", "F24", 135);
+	AddKey("NUMLOCK", "NumLock", 144);
+	AddKey("SCROLL", "Scroll", 145);
+	AddKey("LSHIFTKEY", "LShiftKey", 160);
+	AddKey("RSHIFTKEY", "RShiftKey", 161);
+	AddKey("LCONTROLKEY", "LControlKey", 162);
+	AddKey("RCONTROLKEY", "RControlKey", 163);
+	AddKey("LMENU", "LMenu", 164);
+	AddKey("RMENU", "RMenu", 165);
+	AddKey("BROWSERBACK", "BrowserBack", 166);
+	AddKey("BROWSERFORWARD", "BrowserForward", 167);
+	AddKey("BROWSERREFRESH", "BrowserRefresh", 168);
+	AddKey("BROWSERSTOP", "BrowserStop", 169);
+	AddKey("BROWSERSEARCH", "BrowserSearch", 170);
+	AddKey("BROWSERFAVORITES", "BrowserFavorites", 171);
+	AddKey("BROWSERHOME", "BrowserHome", 172);
+	AddKey("VOLUMEMUTE", "VolumeMute", 173);
+	AddKey("VOLUMEDOWN", "VolumeDown", 174);
+	AddKey("VOLUMEUP", "VolumeUp", 175);
+	AddKey("MEDIANEXTTRACK", "MediaNextTrack", 176);
+	AddKey("MEDIAPREVIOUSTRACK", "MediaPreviousTrack", 177);
+	AddKey("MEDIASTOP", "MediaStop", 178);
+	AddKey("MEDIAPLAYPAUSE", "MediaPlayPause", 179);
+	AddKey("LAUNCHMAIL", "LaunchMail", 180);
+	AddKey("SELECTMEDIA", "SelectMedia", 181);
+	AddKey("LAUNCHAPPLICATION1", "LaunchApplication1", 182);
+	AddKey("LAUNCHAPPLICATION2", "LaunchApplication2", 183);
+	AddKey("OEM1", "Oem1", 186);
+	AddKey("OEMPLUS", "Oemplus", 187);
+	AddKey("OEMCOMMA", "Oemcomma", 188);
+	AddKey("OEMMINUS", "OemMinus", 189);
+	AddKey("OEMPERIOD", "OemPeriod", 190);
+	AddKey("OEMQUESTION", "OemQuestion", 191);
+	AddKey("OEMTILDE", "Oemtilde", 192);
+	AddKey("OEMOPENBRACKETS", "OemOpenBrackets", 219);
+	AddKey("OEM5", "Oem5", 220);
+	AddKey("OEM6", "Oem6", 221);
+	AddKey("OEM7", "Oem7", 222);
+	AddKey("OEM8", "Oem8", 223);
+	AddKey("OEMBACKSLASH", "OemBackslash", 226);
+	AddKey("PROCESSKEY", "ProcessKey", 229);
+	AddKey("PACKET", "Packet", 231);
+	AddKey("ATTN", "Attn", 246);
+	AddKey("CRSEL", "Crsel", 247);
+	AddKey("EXSEL", "Exsel", 248);
+	AddKey("ERASEEOF", "EraseEof", 249);
+	AddKey("PLAY", "Play", 250);
+	AddKey("ZOOM", "Zoom", 251);
+	AddKey("NONAME", "NoName", 252);
+	AddKey("PA1", "Pa1", 253);
+	AddKey("OEMCLEAR", "OemClear", 254);
+
+}
+
+
+//
+// Add key to key map
+//
+void InputEmulator::AddKey(string key, string keyName, WORD virtualCode)
+{
+	AddKey(key, keyName, virtualCode, 0);
+}
+
+
+//
+// Add key to key map 
+//
+void InputEmulator::AddKey(string key, string keyName, WORD virtualCode, int button)
+{
+	std::transform(key.begin(), key.end(), key.begin(), ::toupper);
+	if(keyMap.count(key) <= 0) {
+		keyMap[key] = new KeyMapValue(keyName, virtualCode, button);
+		keys.push_back(key);
+	}
+}
+
+
+//
+// Get keycode
+//
+WORD InputEmulator::GetKeyCode(string key) {
+
+	WORD vkCode = 0;
+
+	// Convert the key string to uppercase
+	std::transform(key.begin(), key.end(), key.begin(), ::toupper);
+
+	if(keyMap.count(key) > 0 && keyMap[key]->virtualKey > 0) {
+		vkCode = keyMap[key]->virtualKey;
+	}
+
+	return vkCode;
+}
+
+
+//
+// Set mouse button state
+//
+void InputEmulator::MouseSet(int button, bool down) {
+	INPUT input = { 0 };
+
+	input.type = INPUT_MOUSE;
+	input.mi.mouseData = 0;
+	input.mi.dx = 0;
+	input.mi.dy = 0;
+	if(button == 1) {
+		if(down)
+			input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
+		else
+			input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
+	}
+	else if(button == 2) {
+		if(down)
+			input.mi.dwFlags = MOUSEEVENTF_RIGHTDOWN;
+		else
+			input.mi.dwFlags = MOUSEEVENTF_RIGHTUP;
+	}
+	else if(button == 3) {
+		if(down)
+			input.mi.dwFlags = MOUSEEVENTF_MIDDLEDOWN;
+		else
+			input.mi.dwFlags = MOUSEEVENTF_MIDDLEUP;
+	}
+	SendInput(1, &input, sizeof(INPUT));
+}
+
+
+//
+// Press mouse button
+//
+void InputEmulator::MousePress(int button, int time) {
+	MouseSet(button, true);
+	Sleep(time);
+	MouseSet(button, false);
+}
+
+
+//
+// Mouse scroll
+//
+void InputEmulator::MouseScroll(int delta, bool vertical) {
+
+	INPUT input = { 0 };
+
+	input.type = INPUT_MOUSE;
+	input.mi.dx = 0;
+	input.mi.dy = 0;
+	input.mi.time = 0;
+	input.mi.dwExtraInfo = 0;
+
+	// Vertical or horizontal?
+	if(vertical) {
+		input.mi.dwFlags = MOUSEEVENTF_WHEEL;
+	}
+	else {
+		input.mi.dwFlags = MOUSEEVENTF_HWHEEL;
+	}
+
+	// 120 == One scroll
+	input.mi.mouseData = delta * 120;
+	SendInput(1, &input, sizeof(INPUT));
+}
+
+
+//
+// Relative mouse move
+//
+void InputEmulator::MouseMove(int x, int y) {
+	INPUT input = { 0 };
+
+	input.type = INPUT_MOUSE;
+	input.mi.mouseData = 0;
+	input.mi.dx = x;
+	input.mi.dy = y;
+	input.mi.dwFlags = MOUSEEVENTF_MOVE;
+	SendInput(1, &input, sizeof(INPUT));
+
+}
+
+
+//
+// Absolute mouse move
+//
+void InputEmulator::MouseMoveTo(int x, int y) {
+	INPUT input = { 0 };
+
+	input.type = INPUT_MOUSE;
+	input.mi.mouseData = 0;
+	input.mi.dx = (x * 65536) / GetSystemMetrics(SM_CXSCREEN);
+	input.mi.dy = (y * 65536) / GetSystemMetrics(SM_CYSCREEN);
+	input.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE;
+	SendInput(1, &input, sizeof(INPUT));
+
+}
+
+
+//
+// Set keyboard key state with key name
+//
+void InputEmulator::SetKeyState(string key, bool down) {
+	INPUT input = { 0 };
+	WORD vkCode = 0;
+	vkCode = GetKeyCode(key);
+	SetKeyState(vkCode, down);
+}
+
+
+//
+// Set keyboard key state with virtual code
+//
+void InputEmulator::SetKeyState(WORD vkCode, bool down)
+{
+	INPUT input = { 0 };
+	if(down) {
+		input.type = INPUT_KEYBOARD;
+		input.ki.wVk = vkCode;
+		SendInput(1, &input, sizeof(INPUT));
+	}
+	else {
+		input.type = INPUT_KEYBOARD;
+		input.ki.dwFlags = KEYEVENTF_KEYUP;
+		input.ki.wVk = vkCode;
+		SendInput(1, &input, sizeof(INPUT));
+	}
+}
+
+
+//
+// Set mouse or keyboard input states
+//
+void InputEmulator::SetInputStates(string inputs, bool down)
+{
+	string input;
+	std::transform(inputs.begin(), inputs.end(), inputs.begin(), ::toupper);
+	stringstream stringStream(inputs);
+	KeyMapValue *keyMapValue;
+
+	while(getline(stringStream, input, '+')) {
+
+		// Key in map?
+		if(keyMap.count(input) > 0) {
+
+			keyMapValue = keyMap[input];
+
+			// Virtual key?
+			if(keyMapValue->virtualKey > 0) {
+
+				// Set keyboard key state
+				SetKeyState(keyMapValue->virtualKey, down);
+			}
+
+			// Mouse button?
+			else if(keyMapValue->mouseButton > 0) {
+
+				// Set mouse button state
+				MouseSet(keyMapValue->mouseButton, down);
+			}
+		}
+	}
+
+}
+
+
+//
+// Press keyboard key
+//
+void InputEmulator::KeyPress(string keys, int time) {
+	SetInputStates(keys, true);
+	Sleep(time);
+	SetInputStates(keys, false);
+}
+
+
+//
+// Key map value constructors
+//
+InputEmulator::KeyMapValue::KeyMapValue()
+{
+}
+InputEmulator::KeyMapValue::KeyMapValue(string name, WORD key, int button)
+{
+	this->name = name;
+	this->virtualKey = key;
+	this->mouseButton = button;
+}
+InputEmulator::KeyMapValue::KeyMapValue(string name, WORD key)
+{
+	this->name = name;
+	this->virtualKey = key;
+	this->mouseButton = 0;
+}
diff --git a/TabletDriverService/InputEmulator.h b/TabletDriverService/InputEmulator.h
new file mode 100644
index 0000000..48e7c55
--- /dev/null
+++ b/TabletDriverService/InputEmulator.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <map>
+
+class InputEmulator
+{
+private:
+	void CreateKeyMap();
+	void CreateVirtualKeyMap();
+public:
+
+	class KeyMapValue {
+	public:
+		string name;
+		WORD virtualKey;
+		int mouseButton;
+		KeyMapValue();
+		KeyMapValue(string name, WORD key, int button);
+		KeyMapValue(string name, WORD key);
+	};
+
+
+	map<string, KeyMapValue*> keyMap;
+	vector<string> keys;
+
+	InputEmulator();
+	~InputEmulator();
+
+
+	void AddKey(string key, string keyName, WORD virtualCode);
+	void AddKey(string key, string keyName, WORD virtualCode, int button);
+	WORD GetKeyCode(string key);
+	
+	void MouseSet(int button, bool down);
+	void MousePress(int button, int time);
+	void MouseMove(int x, int y);
+	void MouseMoveTo(int x, int y);
+	void MouseScroll(int delta, bool vertical);
+	void SetKeyState(string key, bool down);
+	void SetKeyState(WORD vkCode, bool down);
+	void SetInputStates(string inputs, bool down);
+	void KeyPress(string keys, int time);
+
+
+};
+
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index ecb6cdf..d08bef9 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -8,6 +8,7 @@
 #include "Tablet.h"
 #include "ScreenMapper.h"
 #include "CommandLine.h"
+#include "DataFormatter.h"
 
 #define LOG_MODULE ""
 #include "Logger.h"
@@ -35,7 +36,6 @@ int main(int argc, char**argv) {
 	string line;
 	string filename;
 	CommandLine *cmd;
-	bool running = false;
 
 	// Init global variables
 	vmulti = NULL;
@@ -66,7 +66,7 @@ int main(int argc, char**argv) {
 	//
 	commandHandler->AddCommand(new Command("Start", [&](CommandLine *cmd) {
 
-		if(running) {
+		if(tabletHandler->isRunning) {
 			LOG_INFO("Driver is already started!\n");
 			return true;
 		}
@@ -93,9 +93,6 @@ int main(int argc, char**argv) {
 		tabletHandler->tablet = tablet;
 		tabletHandler->Start();
 
-		// Set running state
-		running = true;
-
 		LOG_INFO("TabletDriver started!\n");
 		commandHandler->ExecuteCommand("Status");
 
@@ -103,8 +100,9 @@ int main(int argc, char**argv) {
 	}));
 
 	//
-	// Command: Exit
+	// Command: Exit, Quit
 	//
+	commandHandler->AddAlias("Quit", "Exit");
 	commandHandler->AddCommand(new Command("Exit", [&](CommandLine *cmd) {
 		LOG_INFO("Bye!\n");
 		CleanupAndExit(0);
@@ -112,8 +110,7 @@ int main(int argc, char**argv) {
 	}));
 
 
-	// Logger
-	//LOGGER_DIRECT = true;
+	// Start logger
 	LOGGER_START();
 
 	// VMulti Device
@@ -138,7 +135,7 @@ int main(int argc, char**argv) {
 	}
 
 	//
-	// Main loop that reads input from the console.
+	// Main loop
 	//
 	while(true) {
 
@@ -154,14 +151,21 @@ int main(int argc, char**argv) {
 
 		// Process valid lines
 		if(line.length() > 0) {
+
+			// Line to command line
 			cmd = new CommandLine(line);
 
-			//
-			// Hide echo input 
-			//
+			// Process echo command directly
 			if(cmd->is("Echo")) {
 				commandHandler->ExecuteCommand(cmd);
 			}
+
+			// Hide console (for the service only mode)
+			else if(cmd->is("Hide")) {
+				::ShowWindow(::GetConsoleWindow(), SW_HIDE);
+			}
+
+			// Process all other commands
 			else {
 				ProcessCommand(cmd);
 			}
@@ -181,23 +185,26 @@ int main(int argc, char**argv) {
 // Cleanup and exit
 //
 void CleanupAndExit(int code) {
-	/*
-	if(tablet != NULL)
-		delete tablet;
-	if(vmulti != NULL)
-		delete vmulti;
-		*/
 
-		// Stop filter timer
+	// TabletHandler
 	if(tabletHandler != NULL) {
-		tabletHandler->StopTimer();
+		delete tabletHandler;
 	}
 
-	// Reset output
+	// OutputManager
 	if(outputManager != NULL) {
-		outputManager->Reset();
+		delete outputManager;
 	}
 
+	// VMulti
+	if(vmulti != NULL)
+		delete vmulti;
+	
+	// Tablet
+	if(tablet != NULL)
+		delete tablet;
+
+	// Logger
 	LOGGER_STOP();
 	Sleep(500);
 
diff --git a/TabletDriverService/OutputManager.cpp b/TabletDriverService/OutputManager.cpp
index 3f0b5db..57da3fc 100644
--- a/TabletDriverService/OutputManager.cpp
+++ b/TabletDriverService/OutputManager.cpp
@@ -28,6 +28,7 @@ OutputManager::OutputManager() {
 
 
 OutputManager::~OutputManager() {
+	Reset();
 	if(settings != NULL)
 		delete settings;
 }
diff --git a/TabletDriverService/ScreenMapper.cpp b/TabletDriverService/ScreenMapper.cpp
index bace894..324d90e 100644
--- a/TabletDriverService/ScreenMapper.cpp
+++ b/TabletDriverService/ScreenMapper.cpp
@@ -20,15 +20,14 @@ ScreenMapper::ScreenMapper(Tablet *t) {
 	areaVirtualScreen.y = 0;
 
 	// Default Tablet Area
-	areaTablet.width = 80;
-	areaTablet.height = 45;
-	areaTablet.x = 10;
-	areaTablet.y = 10;
-
+	areaTablet.width = 100;
+	areaTablet.height = 50;
+	areaTablet.x = 50;
+	areaTablet.y = 25;
 
 	// Default Screen Area
-	areaScreen.width = 1920;
-	areaScreen.height = 1080;
+	areaScreen.width = areaVirtualScreen.width;
+	areaScreen.height = areaVirtualScreen.height;
 	areaScreen.x = 0;
 	areaScreen.y = 0;
 
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index a91b40d..5e394ce 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -24,8 +24,8 @@ Tablet::Tablet(string usbGUID) : Tablet() {
 //
 // HID Device Constructor
 //
-Tablet::Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage) : Tablet() {
-	hidDevice = new HIDDevice(vendorId, productId, usagePage, usage);
+Tablet::Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage, bool isExclusive) : Tablet() {
+	hidDevice = new HIDDevice(vendorId, productId, usagePage, usage, isExclusive);
 	if(hidDevice->isOpen) {
 		this->isOpen = true;
 	}
@@ -34,6 +34,9 @@ Tablet::Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage
 		hidDevice = NULL;
 	}
 }
+Tablet::Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage) :
+	Tablet(vendorId, productId, usagePage, usage, false) {
+}
 
 //
 // Common constructor
@@ -63,13 +66,6 @@ Tablet::Tablet() {
 	filterReport[1] = &noiseFilter;
 	filterReportCount = 2;
 
-	// Button map
-	memset(&buttonMap, 0, sizeof(buttonMap));
-	buttonMap[0] = 1;
-	buttonMap[1] = 2;
-	buttonMap[2] = 3;
-
-
 	// Tablet connection open
 	isOpen = false;
 
@@ -85,17 +81,20 @@ Tablet::Tablet() {
 // Destructor
 //
 Tablet::~Tablet() {
-	CloseDevice();
+	//CloseDevice();
 	if(usbDevice != NULL)
 		delete usbDevice;
 	if(hidDevice != NULL)
 		delete hidDevice;
+	/*
 	if(hidDeviceAux != NULL)
 		delete hidDeviceAux;
+
 	if(initReport != NULL)
 		delete initReport;
 	if(initFeature != NULL)
 		delete initFeature;
+		*/
 }
 
 
@@ -151,57 +150,97 @@ bool Tablet::IsConfigured() {
 //
 string Tablet::GetDeviceString(UCHAR stringId)
 {
-	string resultString = "";
-	UCHAR buffer[256];
-	int bytesRead = 0;
+	// USB device
+	if(usbDevice != NULL) {
+		return usbDevice->GetString(stringId);
+	}
 
+	// HID device
+	else if(hidDevice != NULL) {
+		return hidDevice->GetString(stringId);
+	}
+
+	return "";
+}
+
+//
+// Get HID or WinUSB device manufacturer name
+//
+string Tablet::GetDeviceManufacturerName()
+{
 	// USB device
 	if(usbDevice != NULL) {
-		bytesRead = usbDevice->StringRequest(stringId, buffer, 256);
+		return usbDevice->GetManufacturerName();
 	}
 
 	// HID device
 	else if(hidDevice != NULL) {
-		if(hidDevice->isReading) {
-			throw runtime_error("HID string request can't be sent when the device is in use!");
-		}
-		else {
-			bytesRead = hidDevice->StringRequest(stringId, buffer, 256);
-		}
+		return hidDevice->GetManufacturerName();
 	}
 
-	// Reply received?
-	if(bytesRead > 0) {
-		for(int i = 0; i < bytesRead; i += 2) {
-			resultString.push_back(buffer[i]);
-		}
+	return "";
+}
+
+//
+// Get HID or WinUSB device product name
+//
+string Tablet::GetDeviceProductName()
+{
+	// USB device
+	if(usbDevice != NULL) {
+		return usbDevice->GetProductName();
+	}
+
+	// HID device
+	else if(hidDevice != NULL) {
+		return hidDevice->GetProductName();
 	}
 
-	return resultString;
+	return "";
+}
+
+//
+// Get HID or WinUSB device serial number
+//
+string Tablet::GetDeviceSerialNumber()
+{
+	// USB device
+	if(usbDevice != NULL) {
+		return usbDevice->GetSerialNumber();
+	}
+
+	// HID device
+	else if(hidDevice != NULL) {
+		return hidDevice->GetSerialNumber();
+	}
+
+	return "";
 }
 
 
 //
 // Read Position
 //
-int Tablet::ReadPosition() {
+int Tablet::ReadState() {
 	UCHAR buffer[1024];
 	UCHAR *data;
-	int buttonIndex;
-
 
 	// Read report
 	if(!this->Read(buffer, settings.reportLength)) {
 		return -1;
 	}
 
+	// Process auxiliary data
+	if(settings.auxReportId > 0) {
+		ProcessAuxData(buffer, settings.reportLength);
+	}
+
 	// Skip reports
 	if(skipReports > 0) {
 		skipReports--;
 		return Tablet::ReportInvalid;
 	}
 
-
 	// Set data pointer
 	if(settings.dataFormat == TabletSettings::TabletFormatWacomDrivers) {
 		data = buffer + 1;
@@ -210,7 +249,6 @@ int Tablet::ReadPosition() {
 		data = buffer;
 	}
 
-
 	//
 	// Wacom Intuos data format V2
 	//
@@ -266,6 +304,27 @@ int Tablet::ReadPosition() {
 
 	}
 
+	//
+	// Custom data format
+	//
+	else if(settings.dataFormat == TabletSettings::TabletFormatCustom) {
+
+		// Data formatter target length valid?
+		if(dataFormatter.targetLength <= sizeof(reportData)) {
+
+			// Clear report data
+			memset(&reportData, 0, sizeof(reportData));
+
+			// Format data
+			dataFormatter.Format(&reportData, buffer);
+
+			//LOG_DEBUGBUFFER(buffer, dataFormatter.sourceLength, "Custom data source: ");
+			//LOG_DEBUGBUFFER(&reportData, dataFormatter.targetLength, "Custom data target: ");
+		}
+
+
+	}
+
 	//
 	// Copy buffer to struct
 	//
@@ -279,8 +338,6 @@ int Tablet::ReadPosition() {
 		return Tablet::ReportInvalid;
 	}
 
-
-
 	// Detect mask
 	if(settings.detectMask > 0 && (reportData.buttons & settings.detectMask) != settings.detectMask) {
 		return Tablet::ReportPositionInvalid;
@@ -325,20 +382,9 @@ int Tablet::ReadPosition() {
 	state.time = chrono::high_resolution_clock::now();
 
 
-	// Button map
+	// Buttons
 	reportData.buttons = reportData.buttons & 0x0F;
-	state.buttons = 0;
-	for(buttonIndex = 0; buttonIndex < sizeof(buttonMap); buttonIndex++) {
-
-		// Button is set
-		if(buttonMap[buttonIndex] > 0) {
-
-			// Button is pressed
-			if((reportData.buttons & (1 << buttonIndex)) > 0) {
-				state.buttons |= (1 << (buttonMap[buttonIndex] - 1));
-			}
-		}
-	}
+	state.buttons = reportData.buttons;
 
 	// Convert report data to state
 	state.position.x = ((double)reportData.x / (double)settings.maxX) * settings.width;
@@ -348,6 +394,44 @@ int Tablet::ReadPosition() {
 	}
 	state.pressure = ((double)reportData.pressure / (double)settings.maxPressure);
 
+
+	//
+	// Pressure deadzone
+	//
+	if(settings.pressureDeadzone > 0.0) {
+
+		// Minimum
+		if(state.pressure < settings.pressureDeadzone) {
+			state.pressure = 0.0;
+		}
+
+		// Maximum
+		else if(state.pressure > 1 - settings.pressureDeadzone) {
+			state.pressure = 1.0;
+		}
+
+		// Between
+		else {
+			double pressure;
+			pressure = state.pressure - settings.pressureDeadzone;
+			pressure /= (1 - settings.pressureDeadzone);
+			//LOG_DEBUG("Pressure: %0.2f -> %0.2f\n", state.pressure, pressure);
+			state.pressure = pressure;
+		}
+
+	}
+
+	//
+	// Pressure sensitivity 
+	//
+	if(settings.pressureSensitivity > 0.0) {
+		state.pressure = 1 - pow(1 - state.pressure, (1 + settings.pressureSensitivity));
+	}
+	else if(settings.pressureSensitivity < 0.0) {
+		state.pressure = pow(state.pressure, 1 - settings.pressureSensitivity);
+	}
+
+
 	// Tablet measurement update
 	if(measurement.isRunning) {
 		state.buttons = reportData.buttons & 0x0F;
@@ -378,6 +462,76 @@ bool Tablet::Read(void *buffer, int length) {
 	return status;
 }
 
+//
+// Process auxiliary device data
+//
+int Tablet::ProcessAuxData(void * buffer, int length)
+{
+
+	// Clear report data
+	memset(&auxReportData, 0, sizeof(auxReportData));
+
+	// Format data
+	auxDataFormatter.Format(&auxReportData, buffer);
+
+	// Report id valid?
+	if(auxReportData.reportId == settings.auxReportId) {
+
+		// Detect mask
+		if(settings.auxDetectMask > 0 && (auxReportData.detect & settings.auxDetectMask) != settings.auxDetectMask) {
+			return TabletAuxReportStatus::AuxReportInvalid;
+		}
+
+		// Ignore mask
+		if(settings.auxIgnoreMask > 0 && (auxReportData.detect & settings.auxIgnoreMask) == settings.auxIgnoreMask) {
+			return TabletAuxReportStatus::AuxReportIgnore;
+		}
+
+		// Update aux state
+		auxState.buttons = auxReportData.buttons;
+		auxState.isValid = true;
+
+		return TabletAuxReportStatus::AuxReportValid;
+	}
+
+	return TabletAuxReportStatus::AuxReportInvalid;
+}
+
+//
+// Read report from auxiliary device
+//
+int Tablet::ReadAuxReport()
+{
+	UCHAR buffer[1024];
+	int length = settings.auxReportLength;
+
+	// Read aux device
+	bool status = false;
+	if(hidDeviceAux != NULL) {
+		status = hidDeviceAux->Read(buffer, length);
+
+		// Debug message
+		if(logger.debugEnabled) {
+			LOG_DEBUGBUFFER(buffer, length, "Aux read: ");
+		}
+
+		return ProcessAuxData(buffer, length);
+
+	}
+	else if(usbDevice != NULL) {
+		if(auxState.isValid) {
+			Sleep(10);
+			return TabletAuxReportStatus::AuxReportValid;
+		}
+		else {
+			Sleep(10);
+			return TabletAuxReportStatus::AuxReportInvalid;
+		}
+	}
+	return TabletAuxReportStatus::AuxReportReadError;
+
+}
+
 //
 // Write report to the tablet
 //
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 5ef45aa..4f5e41a 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -13,7 +13,7 @@
 #include "TabletFilterPeak.h"
 #include "TabletFilterGravity.h"
 #include "TabletMeasurement.h"
-#include "Vector2D.h"
+#include "DataFormatter.h"
 
 using namespace std;
 
@@ -32,14 +32,23 @@ class Tablet {
 		Button5, Button6, Button7, Button8
 	};
 
-	// Tablet report state
-	enum TabletReportState {
+	// Tablet report status
+	enum TabletReportStatus {
 		ReportPositionInvalid = 0,
 		ReportValid = 1,
 		ReportInvalid = 2,
 		ReportIgnore = 3
 	};
 
+	// Tablet auxiliary report status
+	enum TabletAuxReportStatus {
+		AuxReportValid = 0,
+		AuxReportInvalid = 1,
+		AuxReportIgnore = 2,
+		AuxReportReadError = 3
+	};
+
+
 	//
 	// Position report data
 	//
@@ -52,6 +61,30 @@ class Tablet {
 		USHORT pressure;
 	} reportData;
 
+	//
+	// Auxiliary report data
+	//
+#pragma pack(1)
+	struct {
+		BYTE reportId;
+		USHORT buttons;
+		UCHAR detect;
+	} auxReportData;
+
+	class TabletAuxState {
+	public:
+		bool isValid;
+		bool isHandled;
+		USHORT buttons;
+	};
+	TabletAuxState auxState;
+
+	//
+	// Data formatters
+	//
+	DataFormatter dataFormatter;
+	DataFormatter auxDataFormatter;
+
 	//
 	// Tablet State
 	//
@@ -83,9 +116,6 @@ class Tablet {
 	// Measurement
 	TabletMeasurement measurement;
 
-	// Button map
-	BYTE buttonMap[16];
-
 	//
 	string name = "Unknown";
 	bool isOpen;
@@ -104,6 +134,7 @@ class Tablet {
 
 
 	Tablet(string usbGUID);
+	Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage, bool isExclusive);
 	Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage);
 	Tablet();
 	~Tablet();
@@ -112,9 +143,14 @@ class Tablet {
 	bool IsConfigured();
 
 	string GetDeviceString(UCHAR stringId);
-	int ReadPosition();
+	string GetDeviceManufacturerName();
+	string GetDeviceProductName();
+	string GetDeviceSerialNumber();
+	int ReadState();
 	bool Write(void *buffer, int length);
 	bool Read(void *buffer, int length);
+	int ProcessAuxData(void *buffer, int length);
+	int ReadAuxReport();
 	void CloseDevice();
 
 };
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index 2cc20b0..2f0b2a4 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -131,20 +131,25 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <CustomBuildStep>
-      <Command>xcopy /C /Y "$(TargetPath)" "$(SolutionDir)TabletDriverGUI\bin\Debug\bin\"
-xcopy /C /Y "$(TargetPath)" "$(SolutionDir)TabletDriverGUI\bin\Release\bin\"
+      <Command>xcopy /C /Y "$(TargetPath)" "$(SolutionDir)TabletDriverGUI\bin\Release\bin\"
 
 xcopy /C /Y "$(ProjectDir)config\tablet.cfg" "$(SolutionDir)TabletDriverGUI\bin\Release\config\"
-xcopy /C /Y "$(ProjectDir)config\tablet.cfg" "$(SolutionDir)TabletDriverGUI\bin\Debug\config\"
 
 xcopy /C /Y "$(ProjectDir)config\wacom.cfg" "$(SolutionDir)TabletDriverGUI\bin\Release\config\"
-xcopy /C /Y "$(ProjectDir)config\wacom.cfg" "$(SolutionDir)TabletDriverGUI\bin\Debug\config\"
 
 xcopy /C /Y "$(ProjectDir)config\user.cfg" "$(SolutionDir)TabletDriverGUI\bin\Release\config\"
-xcopy /C /Y "$(ProjectDir)config\user.cfg" "$(SolutionDir)TabletDriverGUI\bin\Debug\config\"
 
 xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\Release\config\"
-xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\Debug\config\"
+
+xcopy /C /Y "$(ProjectDir)config\serviceonly.cfg" "$(SolutionDir)TabletDriverGUI\bin\Release\config\"
+
+xcopy /C /Y "$(ProjectDir)tools\EnableWacomDrivers.bat" "$(SolutionDir)TabletDriverGUI\bin\Release\tools\"
+
+xcopy /C /Y "$(ProjectDir)tools\DisableWacomDrivers.bat" "$(SolutionDir)TabletDriverGUI\bin\Release\tools\"
+
+xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverGUI\bin\Release\tools\"
+
+
 </Command>
       <Message>Copy files</Message>
       <Outputs>copyfiles.txt</Outputs>
@@ -172,7 +177,9 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
     <ClInclude Include="Command.h" />
     <ClInclude Include="CommandHandler.h" />
     <ClInclude Include="CommandLine.h" />
+    <ClInclude Include="DataFormatter.h" />
     <ClInclude Include="HIDDevice.h" />
+    <ClInclude Include="InputEmulator.h" />
     <ClInclude Include="Logger.h" />
     <ClInclude Include="Output.h" />
     <ClInclude Include="OutputDummy.h" />
@@ -206,13 +213,16 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Command.cpp" />
+    <ClCompile Include="CommandHandler.Auxiliary.cpp" />
     <ClCompile Include="CommandHandler.cpp" />
     <ClCompile Include="CommandHandler.Device.cpp" />
     <ClCompile Include="CommandHandler.Filters.cpp" />
     <ClCompile Include="CommandHandler.Other.cpp" />
     <ClCompile Include="CommandHandler.Tablet.cpp" />
     <ClCompile Include="CommandLine.cpp" />
+    <ClCompile Include="DataFormatter.cpp" />
     <ClCompile Include="HIDDevice.cpp" />
+    <ClCompile Include="InputEmulator.cpp" />
     <ClCompile Include="Logger.cpp" />
     <ClCompile Include="Output.cpp" />
     <ClCompile Include="OutputDummy.cpp" />
@@ -251,9 +261,13 @@ xcopy /C /Y "$(ProjectDir)config\init.cfg" "$(SolutionDir)TabletDriverGUI\bin\De
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg" />
+    <None Include="config\serviceonly.cfg" />
     <None Include="config\tablet.cfg" />
     <None Include="config\user.cfg" />
     <None Include="config\wacom.cfg" />
+    <None Include="tools\DisableWacomDrivers.bat" />
+    <None Include="tools\EnableWacomDrivers.bat" />
+    <None Include="tools\RunServiceOnly.bat" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="docs\VMulti_Report_Descriptor.txt" />
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index 58636c4..57c2def 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -117,6 +117,12 @@
     <ClInclude Include="CommandHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="DataFormatter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="InputEmulator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -233,6 +239,15 @@
     <ClCompile Include="CommandHandler.Tablet.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="DataFormatter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="InputEmulator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="CommandHandler.Auxiliary.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">
@@ -247,6 +262,18 @@
     <None Include="config\wacom.cfg">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="config\serviceonly.cfg">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="tools\DisableWacomDrivers.bat">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="tools\EnableWacomDrivers.bat">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="tools\RunServiceOnly.bat">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="docs\VMulti_Report_Descriptor.txt">
diff --git a/TabletDriverService/TabletDriverService.vcxproj.user b/TabletDriverService/TabletDriverService.vcxproj.user
index b77a7d8..90d5734 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.user
+++ b/TabletDriverService/TabletDriverService.vcxproj.user
@@ -4,4 +4,8 @@
     <LocalDebuggerCommandArguments>config\init.cfg</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerCommandArguments>config\init.cfg</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.cpp b/TabletDriverService/TabletFilterAntiSmoothing.cpp
index 6b13e4f..91c147d 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.cpp
+++ b/TabletDriverService/TabletFilterAntiSmoothing.cpp
@@ -12,7 +12,7 @@
 TabletFilterAntiSmoothing::TabletFilterAntiSmoothing() {
 	shape = 1.0;
 	compensation = 1;
-	ignoreWhenDragging = false;
+	onlyWhenHover = false;
 
 	reportRate = 100;
 	reportRateAverage = 100;
@@ -67,7 +67,7 @@ void TabletFilterAntiSmoothing::Update() {
 			reportRate = reportRateAverage;
 		}
 		else {
-			reportRate -= reportRate * (timeDelta / 1000.0) * 0.1;
+			reportRate -= reportRate * (timeDelta / 1000.0) * 0.2;
 		}
 	}
 	else {
@@ -122,32 +122,40 @@ void TabletFilterAntiSmoothing::Update() {
 		ignoreInvalidReports--;
 
 
-		// Velocity validation
+
 	}
+
+	// Velocity validation
 	else if(
-	 velocity > 0.1 && predictedVelocity > 0.1
-	 &&
-	 velocity < 2000 && predictedVelocity < 2000
- ) {
+		velocity > 0.1 && predictedVelocity > 0.1
+		&&
+		velocity < 2000 && predictedVelocity < 2000
+	) {
 		//
 		// Extrapolate a position by using the difference between predicted velocity and current velocity.
 		// LerpAdd (linear interpolation) method will move the position beyond the target position when the second parameter is larger than 1
 		//
 		predictedPosition.Set(oldTarget);
-		predictedPosition.LerpAdd(latestTarget, pow(predictedVelocity / velocity, shape) * compensation);
+		predictedPosition.LerpAdd(latestTarget,
+			pow(predictedVelocity / velocity, shape)
+			*
+			compensation
+			*
+		(reportRate / 1000.0)
+		);
 		outputPosition->Set(predictedPosition);
-
-		// Invalid velocity -> set the position to the latest target
 	}
+
+	// Invalid velocity -> set the position to the latest target
 	else {
 		outputPosition->Set(latestTarget);
 	}
 
 
 	//
-	// Ignore filter when dragging
+	// Enabled only when hovering
 	//
-	if(ignoreWhenDragging) {
+	if(onlyWhenHover) {
 
 		// Ignore anti-smoothing pen pressure is detected
 		if(tabletState.pressure > 0) {
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.h b/TabletDriverService/TabletFilterAntiSmoothing.h
index 4ad3976..174780b 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.h
+++ b/TabletDriverService/TabletFilterAntiSmoothing.h
@@ -6,6 +6,20 @@
 
 
 class TabletFilterAntiSmoothing : public TabletFilter {
+private:
+	double reportRate;
+	double reportRateAverage;
+	double velocity;
+	double acceleration;
+	double jerk;
+	double oldVelocity;
+	double oldAcceleration;
+	double oldJerk;
+	int ignoreInvalidReports;
+	chrono::high_resolution_clock::time_point timeBegin;
+	chrono::high_resolution_clock::time_point timeLastReport;
+	chrono::high_resolution_clock::time_point timeNow;
+
 public:
 	Vector2D latestTarget;
 	Vector2D oldTarget;
@@ -16,26 +30,13 @@ class TabletFilterAntiSmoothing : public TabletFilter {
 
 	double shape;
 	double compensation;
-	bool ignoreWhenDragging;
+	bool onlyWhenHover;
 
 	void SetTarget(TabletState *tabletState);
 	void Update();
 
 	TabletFilterAntiSmoothing();
 	~TabletFilterAntiSmoothing();
-private:
-	double reportRate;
-	double reportRateAverage;
-	double velocity;
-	double acceleration;
-	double jerk;
-	double oldVelocity;
-	double oldAcceleration;
-	double oldJerk;
-	int ignoreInvalidReports;
-	chrono::high_resolution_clock::time_point timeBegin;
-	chrono::high_resolution_clock::time_point timeLastReport;
-	chrono::high_resolution_clock::time_point timeNow;
 
 };
 
diff --git a/TabletDriverService/TabletFilterGravity.cpp b/TabletDriverService/TabletFilterGravity.cpp
index 8e10f4f..2c9ce71 100644
--- a/TabletDriverService/TabletFilterGravity.cpp
+++ b/TabletDriverService/TabletFilterGravity.cpp
@@ -31,9 +31,9 @@ void TabletFilterGravity::Update() {
 	double timeDelta = timerInterval / 1000.0;
 
 	//
-	// Only use this filter when mouse 1, 2 or 3 is down
+	// Only use this filter when buttons are down
 	//
-	if((outputState.buttons & 0x07) == 0) {
+	if((outputState.buttons & 0x1F) == 0) {
 		if(ignoreButton-- > 0) {
 		}
 		else {
diff --git a/TabletDriverService/TabletFilterSmoothing.cpp b/TabletDriverService/TabletFilterSmoothing.cpp
index 7050b0e..06db9e4 100644
--- a/TabletDriverService/TabletFilterSmoothing.cpp
+++ b/TabletDriverService/TabletFilterSmoothing.cpp
@@ -11,6 +11,7 @@ TabletFilterSmoothing::TabletFilterSmoothing() {
 	latency = 2.0;
 	weight = 1.000;
 	threshold = 0.9;
+	onlyWhenButtonsDown = false;
 	lastTargetTime = chrono::high_resolution_clock::now();
 }
 
@@ -28,13 +29,20 @@ TabletFilterSmoothing::~TabletFilterSmoothing() {
 
 // Set target position
 void TabletFilterSmoothing::SetTarget(TabletState *tabletState) {
-	target.Set(tabletState->position);
-	memcpy(&outputState, tabletState, sizeof(TabletState));
+
+	// Set target state
+	memcpy(&target, tabletState, sizeof(TabletState));
+
+	// Set output state
+	outputState.time = target.time;
+	outputState.isValid = target.isValid;
+	outputState.buttons = target.buttons;
 
 	// Reset output position if last tablet state update is older than 100 milliseconds.
 	double timeDelta = (tabletState->time - lastTargetTime).count() / 1000000.0;
 	if(timeDelta > 100.0) {
-		outputPosition.Set(tabletState->position);
+		outputState.position.Set(tabletState->position);
+		outputState.pressure = tabletState->pressure;
 	}
 
 	lastTargetTime = tabletState->time;
@@ -51,45 +59,62 @@ void TabletFilterSmoothing::OnTimerIntervalChange(double oldInterval, double new
 // Update
 void TabletFilterSmoothing::Update() {
 
-	double deltaX, deltaY, distance;
-
-	deltaX = target.x - outputPosition.x;
-	deltaY = target.y - outputPosition.y;
-	distance = sqrt(deltaX*deltaX + deltaY * deltaY);
-
 	double timeDelta = (chrono::high_resolution_clock::now() - outputState.time).count() / 1000000.0;
 
-	// Distance large enough?
-	if(distance > 0.01) {
+	//
+	// Do not run the filter if the last state is older than 100 milliseconds.
+	//
+	if(timeDelta > 100) {
+		return;
+	}
 
-		// Move output position coordinates if last tablet update time is newer than 100 milliseconds.
-		if(timeDelta < 100.0) {
-			outputPosition.x += deltaX * weight;
-			outputPosition.y += deltaY * weight;
+	double deltaX, deltaY, deltaPressure, distance;
+
+	deltaX = target.position.x - outputState.position.x;
+	deltaY = target.position.y - outputState.position.y;
+	deltaPressure = target.pressure - outputState.pressure;
+	distance = sqrt(deltaX * deltaX + deltaY * deltaY);
+	
+	// Move output position only when buttons are down
+	if(onlyWhenButtonsDown) {
+
+		// Move output values
+		if((target.buttons & 0x1F) > 0) {
+			outputState.position.x += deltaX * weight;
+			outputState.position.y += deltaY * weight;
+			outputState.pressure += deltaPressure * weight;
 		}
 
-		// Debug message
-		if(logger.debugEnabled) {
-			LOG_DEBUG("TX=%0.2f TY=%0.2f OX=%0.2f OY=%0.2f DX=%0.2f DY=%0.2f D=%0.2f W=%0.3f\n",
-				target.x,
-				target.y,
-				outputPosition.x,
-				outputPosition.y,
-				deltaX,
-				deltaY,
-				distance,
-				weight
-			);
+		// Set output values same as target
+		else {
+			outputState.position.Set(target.position);
+			outputState.pressure = target.pressure;
 		}
-
 	}
-	// Too short distance -> set output values as target values
+
+	// Move output values
 	else {
-		outputPosition.x = target.x;
-		outputPosition.y = target.y;
+		outputState.position.x += deltaX * weight;
+		outputState.position.y += deltaY * weight;
+		outputState.pressure += deltaPressure * weight;
 	}
 
-	outputState.position.Set(outputPosition);
+	// Debug message
+	if(logger.debugEnabled) {
+		LOG_DEBUG("TX=%0.2f TY=%0.2f TP=%0.2f OX=%0.2f OY=%0.2f OP=%0.2f DX=%0.2f DY=%0.2f DP=%0.2f D=%0.2f W=%0.3f\n",
+			target.position.x,
+			target.position.y,
+			target.pressure,
+			outputState.position.x,
+			outputState.position.y,
+			outputState.pressure,
+			deltaX,
+			deltaY,
+			deltaPressure,
+			distance,
+			weight
+		);
+	}
 
 }
 
diff --git a/TabletDriverService/TabletFilterSmoothing.h b/TabletDriverService/TabletFilterSmoothing.h
index 2a69e43..c6dce67 100644
--- a/TabletDriverService/TabletFilterSmoothing.h
+++ b/TabletDriverService/TabletFilterSmoothing.h
@@ -8,9 +8,9 @@ class TabletFilterSmoothing : public TabletFilter {
 	double latency;
 	double weight;
 	double threshold;
-	Vector2D target;
-	Vector2D outputPosition;
+	TabletState target;
 	chrono::high_resolution_clock::time_point lastTargetTime;
+	bool onlyWhenButtonsDown;
 
 	TabletFilterSmoothing();
 	~TabletFilterSmoothing();
@@ -19,8 +19,6 @@ class TabletFilterSmoothing : public TabletFilter {
 	void OnTimerIntervalChange(double oldInterval, double newInterval) override;
 	void Update();
 
-
-
 	double GetLatency(double filterWeight, double interval, double threshold);
 	double GetLatency(double filterWeight);
 	double GetLatency();
diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
index d04ad6a..6ea919d 100644
--- a/TabletDriverService/TabletHandler.cpp
+++ b/TabletDriverService/TabletHandler.cpp
@@ -10,6 +10,7 @@
 TabletHandler::TabletHandler() {
 	tablet = NULL;
 	tabletInputThread = NULL;
+	auxInputThread = NULL;
 	isRunning = false;
 	timerInterval = 10;
 }
@@ -20,6 +21,23 @@ TabletHandler::TabletHandler() {
 //
 TabletHandler::~TabletHandler() {
 	StopTimer();
+	isRunning = false;
+
+	if(tablet->hidDevice != NULL)
+		tablet->hidDevice->CloseDevice();
+
+	if(tablet->hidDeviceAux != NULL)
+		tablet->hidDeviceAux->CloseDevice();
+
+	if(tablet->usbDevice != NULL)
+		tablet->usbDevice->CloseDevice();	
+
+	if(tabletInputThread != NULL)
+		tabletInputThread->join();
+
+	if(auxInputThread != NULL)
+		auxInputThread->join();
+
 }
 
 
@@ -29,7 +47,9 @@ TabletHandler::~TabletHandler() {
 bool TabletHandler::Start() {
 	if(tablet == NULL) return false;
 	ChangeTimerInterval((int)round(timerInterval));
+	isRunning = true;
 	tabletInputThread = new thread(&TabletHandler::RunTabletInputThread, this);
+	auxInputThread = new thread(&TabletHandler::RunAuxInputThread, this);
 	return true;
 }
 
@@ -104,11 +124,13 @@ void TabletHandler::RunTabletInputThread() {
 	TabletFilter *filter;
 	TabletState filterState;
 	bool filterTimedEnabled;
+	UCHAR buttons = 0;
+	UCHAR outButtons = 0;
+	UCHAR lastButtons = 0;
+	Vector2D lastScrollPosition;
 
 	timeBegin = chrono::high_resolution_clock::now();
 
-	isRunning = true;
-
 	//
 	// Tablet input main loop
 	//
@@ -117,7 +139,7 @@ void TabletHandler::RunTabletInputThread() {
 		//
 		// Read tablet position
 		//
-		status = tablet->ReadPosition();
+		status = tablet->ReadState();
 
 		// Position OK
 		if(status == Tablet::ReportValid) {
@@ -181,6 +203,111 @@ void TabletHandler::RunTabletInputThread() {
 			tablet->state.buttons = 0;
 		}
 
+		//
+		// Button map
+		//
+		buttons = tablet->state.buttons;
+		outButtons = 0;
+
+		if(buttons > 0 || lastButtons > 0) {
+			for(int buttonIndex = 0; buttonIndex < tablet->settings.buttonCount; buttonIndex++) {
+
+				// Button is not down, pressed or released?
+				if((buttons & (1 << buttonIndex)) == 0 && (lastButtons & (1 << buttonIndex)) == 0) {
+					continue;
+				}
+
+				bool isDown = buttons & (1 << buttonIndex);
+				bool isPressed = ((buttons & (1 << buttonIndex)) > 0 && (lastButtons & (1 << buttonIndex)) == 0);
+				bool isReleased = ((buttons & (1 << buttonIndex)) == 0 && (lastButtons & (1 << buttonIndex)) > 0);
+
+				// Button is set
+				if(tablet->settings.buttonMap[buttonIndex].size() > 0) {
+
+					string key = tablet->settings.buttonMap[buttonIndex];
+
+					if(inputEmulator.keyMap.count(key) > 0) {
+						InputEmulator::KeyMapValue *keyMapValue = inputEmulator.keyMap[key];
+
+						// Mouse buttons
+						if(keyMapValue->mouseButton > 0 && keyMapValue->mouseButton < 8) {
+							if(isDown) {
+								outButtons |= (1 << (keyMapValue->mouseButton - 1));
+							}
+						}
+
+						//
+						// Mouse scroll
+						//
+						else if(keyMapValue->mouseButton > 0x100) {
+
+							if(isDown) {
+
+								// Reset last scroll position when scroll button is pressed
+								if(isPressed) {
+									lastScrollPosition.Set(tablet->state.position);
+								}
+
+								// Delta from the last scroll position
+								Vector2D delta(
+									(tablet->state.position.x - lastScrollPosition.x) * tablet->settings.scrollSensitivity,
+									(tablet->state.position.y - lastScrollPosition.y) * tablet->settings.scrollSensitivity
+								);
+
+								if(delta.x > 0)
+									delta.x = round(pow(delta.x, tablet->settings.scrollAcceleration));
+								else
+									delta.x = -round(pow(-delta.x, tablet->settings.scrollAcceleration));
+
+								if(delta.y > 0)
+									delta.y = round(pow(delta.y, tablet->settings.scrollAcceleration));
+								else
+									delta.y = -round(pow(-delta.y, tablet->settings.scrollAcceleration));
+
+
+								// Vertical Scroll
+								if(delta.y != 0 && (keyMapValue->mouseButton & 0x101) > 0) {
+									inputEmulator.MouseScroll((int)delta.y, true);
+									lastScrollPosition.Set(tablet->state.position);
+								}
+
+								// Horizontal scroll
+								if(delta.x != 0 && (keyMapValue->mouseButton & 0x102) > 0) {
+									inputEmulator.MouseScroll((int)-delta.x, false);
+									lastScrollPosition.Set(tablet->state.position);
+								}
+
+							}
+						}
+
+						// Keyboard key
+						if(keyMapValue->virtualKey > 0) {
+							if(isPressed) {
+								inputEmulator.SetKeyState(keyMapValue->virtualKey, true);
+							}
+							else if(isReleased) {
+								inputEmulator.SetKeyState(keyMapValue->virtualKey, false);
+							}
+						}
+
+					}
+
+					// Keyboard keys
+					else {
+						if(isPressed) {
+							inputEmulator.SetInputStates(key, true);
+						}
+						else if(isReleased) {
+							inputEmulator.SetInputStates(key, false);
+						}
+					}
+				}
+
+			}
+		}
+		tablet->state.buttons = outButtons;
+		lastButtons = buttons;
+
 		//
 		// Report filters
 		//
@@ -245,6 +372,93 @@ void TabletHandler::RunTabletInputThread() {
 
 }
 
+//
+// Auxiliary input thread (tablet buttons, etc.)
+//
+void TabletHandler::RunAuxInputThread()
+{
+	int reportStatus;
+	USHORT buttons = 0;
+	USHORT lastButtons = 0;
+	Tablet::TabletAuxState auxState;
+
+	// No aux device
+	if(tablet->hidDeviceAux == NULL && tablet->usbDevice == NULL) {
+		return;
+	}
+
+	//
+	// Auxiliary input main loop
+	//
+	while(isRunning) {
+
+		// Read
+		reportStatus = tablet->ReadAuxReport();
+
+		// Read error
+		if(reportStatus == Tablet::AuxReportReadError) {
+			LOG_ERROR("Auxiliary device read error!\n");
+			break;
+		}
+
+		// Aux state invalid or ignored
+		if(reportStatus == Tablet::AuxReportInvalid || reportStatus == Tablet::AuxReportIgnore) {
+			continue;
+		}
+
+		// Skip invalid state
+		if(!tablet->auxState.isValid) continue;
+		memcpy(&auxState, &tablet->auxState, sizeof(Tablet::TabletAuxState));
+		tablet->auxState.isValid = false;
+
+		// Buttons
+		buttons = auxState.buttons;
+
+		if(logger.debugEnabled) {
+			LOG_DEBUG("Aux buttons: 0x%04X\n", buttons);
+		}
+
+		// Loop through buttons
+		for(int button = 1; button <= tablet->settings.auxButtonCount; button++) {
+
+			int buttonMask = 1 << (button - 1);
+
+			//
+			// Button pressed
+			//
+			if((buttons & buttonMask) == buttonMask && (lastButtons & buttonMask) != buttonMask) {
+
+				// Button mapped?
+				if(tablet->settings.auxButtonMap[button - 1].size() > 0) {
+
+					// Set key down
+					inputEmulator.SetInputStates(tablet->settings.auxButtonMap[button - 1], true);
+				}
+
+			}
+
+			//
+			// Button released
+			//
+			else if((buttons & buttonMask) != buttonMask && (lastButtons & buttonMask) == buttonMask) {
+
+				// Button mapped?
+				if(tablet->settings.auxButtonMap[button - 1].size() > 0) {
+
+					// Set key up
+					inputEmulator.SetInputStates(tablet->settings.auxButtonMap[button - 1], false);
+				}
+
+			}
+
+		}
+
+		lastButtons = buttons;
+
+	}
+
+}
+
 //
 // Timer tick
 //
diff --git a/TabletDriverService/TabletHandler.h b/TabletDriverService/TabletHandler.h
index 23ed2d1..4787fe2 100644
--- a/TabletDriverService/TabletHandler.h
+++ b/TabletDriverService/TabletHandler.h
@@ -2,17 +2,19 @@
 #include <thread>
 #include <mutex>
 #include "Tablet.h"
+#include "InputEmulator.h"
 
 class TabletHandler {
 public:
 	Tablet *tablet;
 	thread *tabletInputThread;
+	thread *auxInputThread;
 	HANDLE timer;
 	double timerInterval;
 	mutex lock;
 	chrono::high_resolution_clock::time_point timeBegin;
 	TabletState outputState;
-
+	InputEmulator inputEmulator;
 
 	bool isRunning;
 
@@ -25,6 +27,7 @@ class TabletHandler {
 	bool StopTimer();
 	void ChangeTimerInterval(int newInterval);
 	void RunTabletInputThread();
+	void RunAuxInputThread();
 	void OnTimerTick();
 	void WriteOutputState(TabletState *outputState);
 
diff --git a/TabletDriverService/TabletSettings.cpp b/TabletDriverService/TabletSettings.cpp
index 97a7ea9..1042823 100644
--- a/TabletDriverService/TabletSettings.cpp
+++ b/TabletDriverService/TabletSettings.cpp
@@ -6,6 +6,7 @@
 // Constructor
 //
 TabletSettings::TabletSettings() {
+	
 	// Initial settings
 	reportId = 0;
 	reportLength = 8;
@@ -17,8 +18,24 @@ TabletSettings::TabletSettings() {
 	clickPressure = 0;
 	width = 1;
 	height = 1;
+	pressureSensitivity = 0;
+	pressureDeadzone = 0;
+	scrollSensitivity = 1;
+	scrollAcceleration = 1;
 	skew = 0;
 	dataFormat = TabletFormatNormal;
+	buttonMap[0] = "MOUSE1";
+	buttonMap[1] = "MOUSE2";
+	buttonMap[2] = "MOUSE3";
+	buttonCount = 3;
+
+	// Aux
+	auxReportId = 0;
+	auxReportLength = 0;
+	auxDetectMask = 0;
+	auxIgnoreMask = 0;
+	auxFormat = AuxFormatCustom;
+	auxButtonCount = 0;
 }
 
 //
diff --git a/TabletDriverService/TabletSettings.h b/TabletDriverService/TabletSettings.h
index 373b3c7..eae4527 100644
--- a/TabletDriverService/TabletSettings.h
+++ b/TabletDriverService/TabletSettings.h
@@ -7,11 +7,20 @@ class TabletSettings {
 		TabletFormatWacomIntuosV2,
 		TabletFormatWacomIntuosV3,
 		TabletFormatWacomDrivers,
-		TabletFormatSkipFirstDataByte
+		TabletFormatSkipFirstDataByte,
+		TabletFormatCustom
 	};
 
+	enum TabletAuxFormat {
+		AuxFormatCustom
+	};
+
+	BYTE reportId;
+	int reportLength;
+
 	BYTE detectMask;
 	BYTE ignoreMask;
+
 	int maxX;
 	int maxY;
 	int maxPressure;
@@ -19,10 +28,24 @@ class TabletSettings {
 	int keepTipDown;
 	double width;
 	double height;
-	BYTE reportId;
-	int reportLength;
+	double pressureSensitivity;
+	double pressureDeadzone;
+	double scrollSensitivity;
+	double scrollAcceleration;
 	double skew;
 	TabletDataFormat dataFormat;
+	string buttonMap[16];
+	int buttonCount;
+
+
+	// Aux
+	BYTE auxReportId;
+	int auxReportLength;
+	BYTE auxDetectMask;
+	BYTE auxIgnoreMask;
+	TabletAuxFormat auxFormat;
+	string auxButtonMap[16];
+	int auxButtonCount;
 
 	TabletSettings();
 	~TabletSettings();
diff --git a/TabletDriverService/config/serviceonly.cfg b/TabletDriverService/config/serviceonly.cfg
new file mode 100644
index 0000000..8336db6
--- /dev/null
+++ b/TabletDriverService/config/serviceonly.cfg
@@ -0,0 +1,3 @@
+Include "config\init.cfg"
+Include "config\usersettings.cfg"
+Start
diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index fd20621..24ccae6 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -12,7 +12,7 @@
 #
 # Wacom CTL-470 (Wacom drivers installed)
 #
-HIDTablet  0x056a 0x00dd 0xFF00 0x000A
+HIDTablet 0x056a 0x00dd 0xFF00 0x000A
 Name "Wacom CTL-470 (Wacom drivers installed)"
 ReportId 0x02
 ReportLength 11
@@ -26,7 +26,7 @@ TabletFormat WacomDrivers
 
 
 #
-# Wacom CTL-470
+# Wacom CTL-470 
 #
 HIDTablet 0x056a 0x00dd 0x0D 0x01
 Name "Wacom CTL-470"
@@ -42,7 +42,23 @@ InitFeature 0x02 0x02
 
 
 #
-# Wacom CTH-470 ???
+# Wacom CTH-470 (Wacom drivers installed)
+#
+HIDTablet 0x056a 0x00de 0xFF00 0x000A
+Name "Wacom CTH-470 (Wacom drivers installed)"
+ReportId 0x02
+ReportLength 11
+DetectMask 0x40
+MaxX 14720
+MaxY 9200
+MaxPressure 1023
+Width 147.2
+Height 92.0
+TabletFormat WacomDrivers
+
+
+#
+# Wacom CTH-470
 #
 HIDTablet 0x056a 0x00de 0x0D 0x01
 Name "Wacom CTH-470"
@@ -58,7 +74,23 @@ InitFeature 0x02 0x02
 
 
 #
-# Wacom CTH-670 ???
+# Wacom CTH-670 (Wacom drivers installed)
+#
+HIDTablet 0x056a 0x00df 0xFF00 0x000A
+Name "Wacom CTH-670 (Wacom drivers installed)"
+ReportId 0x02
+ReportLength 11
+DetectMask 0x40
+MaxX 21648
+MaxY 13700
+MaxPressure 1023
+Width 216.48
+Height 137.0
+TabletFormat WacomDrivers
+
+
+#
+# Wacom CTH-670
 #
 HIDTablet 0x056a 0x00df 0x0D 0x01
 Name "Wacom CTH-670"
@@ -105,7 +137,22 @@ InitFeature 0x02 0x02
 
 
 #
-# Wacom CTL-671 ???
+# Wacom CTL-671 (Wacom drivers installed)
+#
+HIDTablet 0x056a 0x0301 0xFF00 0x000A
+Name "Wacom CTL-671 (Wacom drivers installed)"
+ReportLength 11
+DetectMask 0x40
+MaxX 21648
+MaxY 13530
+MaxPressure 1023
+Width 216.48
+Height 135.30
+TabletFormat WacomDrivers
+
+
+#
+# Wacom CTL-671
 #
 HIDTablet 0x056a 0x0301 0xFF0D 0x01
 Name "Wacom CTL-671"
@@ -120,7 +167,7 @@ InitFeature 0x02 0x02
 
 
 #
-# Wacom CTL-472
+# Wacom CTL-472 (Wacom drivers installed)
 #
 HIDTablet 0x056a 0x037a 0xFF00 0x000A
 Name "Wacom CTL-472 (Wacom drivers installed)"
@@ -152,7 +199,23 @@ InitFeature 0x02 0x02
 
 
 #
-# Wacom CTL-672 ???
+# Wacom CTL-672 (Wacom drivers installed)
+#
+HIDTablet 0x056a 0x037b 0xFF00 0x000A
+Name "Wacom CTL-672 (Wacom drivers installed)"
+ReportId 0x02
+ReportLength 10
+DetectMask 0x40
+MaxX 21600
+MaxY 13500
+MaxPressure 2047
+Width 216.00
+Height 135.00
+TabletFormat WacomDrivers
+
+
+#
+# Wacom CTL-672
 #
 HIDTablet 0x056a 0x037b 0xFF0D 0x0001
 Name "Wacom CTL-672"
@@ -229,10 +292,35 @@ MaxPressure 1023
 Width 152.0
 Height 95.0
 InitFeature 0x02 0x02
+AuxHID 0x056a 0x0302 0xFF00 0x0080
+AuxReportId 0x02
+AuxReportLength 64
+AuxDetectMask 0x80
+AuxIgnoreMask 0x81
+AuxCustomData ReportId Source=0
+AuxCustomData ButtonsLow Source=3 SourceMask=0x0F
+AuxCustomData Detect Source=2
+AuxButtonCount 4
+
+
+#
+# Wacom CTL-680 (Wacom drivers installed)
+#
+HIDTablet 0x056a 0x0323 0xFF00 0x000A
+Name "Wacom CTL-680"
+ReportId 0x02
+ReportLength 11
+DetectMask 0x40
+MaxX 21600
+MaxY 13500
+MaxPressure 1023
+Width 216.0
+Height 135.0
+TabletFormat WacomDrivers
 
 
 #
-# Wacom CTL-680 ???
+# Wacom CTL-680
 #
 HIDTablet 0x056a 0x0323 0xFF0D 0x0001
 Name "Wacom CTL-680"
@@ -248,7 +336,23 @@ InitFeature 0x02 0x02
 
 
 #
-# Wacom CTH-680 ???
+# Wacom CTH-680 (Wacom drivers installed)
+#
+HIDTablet 0x056a 0x0303 0xFF00 0x000A
+Name "Wacom CTH-680 (Wacom drivers installed)"
+ReportId 0x02
+ReportLength 11
+DetectMask 0x40
+MaxX 21600
+MaxY 13500
+MaxPressure 1023
+Width 216.0
+Height 135.0
+TabletFormat WacomDrivers
+
+
+#
+# Wacom CTH-680
 #
 HIDTablet 0x056a 0x0303 0xFF0D 0x0001
 Name "Wacom CTH-680"
@@ -263,6 +367,23 @@ Height 135.0
 InitFeature 0x02 0x02
 
 
+#
+# Wacom CTL-490 (Wacom drivers installed)
+#
+HIDTablet 0x056a 0x033b 0xFF00 0x000A
+Name "Wacom CTL-490 (Wacom drivers installed)"
+ReportId 0x10
+ReportLength 11
+DetectMask 0xA0
+MaxX 15200
+MaxY 9500
+MaxPressure 2047
+KeepTipDown 2
+Width 152.0
+Height 95.0
+TabletFormat WacomIntuosV2
+
+
 #
 # Wacom CTL-490
 #
@@ -279,13 +400,22 @@ Width 152.0
 Height 95.0
 InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
+AuxHID 0x056a 0x033b 0xFF00 0x0080
+AuxReportId 0x02
+AuxReportLength 64
+AuxDetectMask 0x80
+AuxIgnoreMask 0x81
+AuxCustomData ReportId Source=0
+AuxCustomData ButtonsLow Source=3 SourceMask=0x0F
+AuxCustomData Detect Source=2
+AuxButtonCount 4
 
 
 #
-# Wacom CTL-490 (Wacom drivers installed)
+# Wacom CTH-490 (Wacom drivers installed)
 #
-HIDTablet 0x056a 0x033b 0xFF00 0x000A
-Name "Wacom CTL-490 (Wacom drivers installed)"
+HIDTablet 0x056a 0x033c 0xFF00 0x000A
+Name "Wacom CTH-490 (Wacom drivers installed)"
 ReportId 0x10
 ReportLength 11
 DetectMask 0xA0
@@ -317,30 +447,83 @@ TabletFormat WacomIntuosV2
 
 
 #
-# Wacom CTH-490 (Wacom drivers installed)
+# Wacom CTL-690 (Wacom drivers installed)
 #
-HIDTablet 0x056a 0x033c 0xFF00 0x000A
-Name "Wacom CTH-490 (Wacom drivers installed)"
+HIDTablet 0x056A 0x033D 0xFF00 0x000A
+Name "Wacom CTL-690 (Wacom drivers installed)"
 ReportId 0x10
 ReportLength 11
 DetectMask 0xA0
-MaxX 15200
-MaxY 9500
+MaxX 21600
+MaxY 13500
 MaxPressure 2047
+Width 216.000
+Height 135.000
 KeepTipDown 2
-Width 152.0
-Height 95.0
 TabletFormat WacomIntuosV2
 
 
 #
-# Wacom CTL-4100
+# Wacom CTL-690
 #
-HIDTablet 0x056a 0x0376 0xFF0D 0x0001
-HIDTablet 0x056a 0x0374 0xFF0D 0x0001
-Name "Wacom CTL-4100"
+HIDTablet 0x056A 0x033D 0xFF0D 0x0001
+Name "Wacom CTL-690"
 ReportId 0x10
-ReportLength 192
+ReportLength 10
+DetectMask 0xA0
+MaxX 21600
+MaxY 13500
+MaxPressure 2047
+Width 216.000
+Height 135.000
+KeepTipDown 2
+InitFeature 0x02 0x02
+TabletFormat WacomIntuosV2
+
+
+#
+# Wacom CTH-690 (Wacom drivers installed)
+#
+HIDTablet 0x056A 0x033E 0xFF00 0x000A
+Name "Wacom CTH-690"
+ReportId 0x10
+ReportLength 11
+DetectMask 0xA0
+MaxX 21600
+MaxY 13500
+MaxPressure 2047
+Width 216.000
+Height 135.000
+KeepTipDown 2
+TabletFormat WacomIntuosV2
+
+
+#
+# Wacom CTH-690
+#
+HIDTablet 0x056A 0x033E 0xFF0D 0x0001
+Name "Wacom CTH-690"
+ReportId 0x10
+ReportLength 10
+DetectMask 0xA0
+MaxX 21600
+MaxY 13500
+MaxPressure 2047
+Width 216.000
+Height 135.000
+KeepTipDown 2
+InitFeature 0x02 0x02
+TabletFormat WacomIntuosV2
+
+
+#
+# Wacom CTL-4100 (Wacom drivers installed)
+#
+HIDTablet 0x056a 0x0376 0xFF00 0x000A
+HIDTablet 0x056a 0x0374 0xFF00 0x000A
+Name "Wacom CTL-4100 (Wacom drivers installed)"
+ReportId 0x10
+ReportLength 193
 DetectMask 0x20
 MaxX 15200
 MaxY 9500
@@ -351,13 +534,13 @@ TabletFormat WacomIntuosV3
 
 
 #
-# Wacom CTL-4100 (Wacom drivers installed)
+# Wacom CTL-4100
 #
-HIDTablet 0x056a 0x0376 0xFF00 0x000A
-HIDTablet 0x056a 0x0374 0xFF00 0x000A
-Name "Wacom CTL-4100 (Wacom drivers installed)"
+HIDTablet 0x056a 0x0376 0xFF0D 0x0001
+HIDTablet 0x056a 0x0374 0xFF0D 0x0001
+Name "Wacom CTL-4100"
 ReportId 0x10
-ReportLength 193
+ReportLength 192
 DetectMask 0x20
 MaxX 15200
 MaxY 9500
@@ -365,10 +548,18 @@ MaxPressure 4095
 Width 152.0
 Height 95.0
 TabletFormat WacomIntuosV3
+AuxHID 0x056a 0x0376 0xFF0D 0x0001
+AuxHID 0x056a 0x0374 0xFF0D 0x0001
+AuxReportId 0x11
+AuxReportLength 192
+AuxCustomData ReportId Source=0
+AuxCustomData ButtonsLow Source=1 SourceMask=0x0F
+AuxButtonCount 4
 
 
 #
 # Wacom CTL-4100 Bluetooth
+#
 HIDTablet 0x056a 0x0377 0xFF0D 0x0001
 Name "Wacom CTL-4100 Bluetooth (Experimental)"
 ReportId 0x81
@@ -459,10 +650,28 @@ Width 226.0
 Height 150.0
 
 
+#
+# XP-Pen G430S
+#
+HIDTablet 0x28BD 0x0075 0xFF0A 0x0001
+CheckString Product "G430S"
+Name "XP-Pen G430S"
+ReportId 0x02
+ReportLength 8
+DetectMask 0x80
+MaxX 20320
+MaxY 15240
+MaxPressure 8191
+Width 101.6
+Height 76.2
+InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
+
+
 #
 # XP-Pen G430
 #
 HIDTablet 0x28BD 0x0075 0xFF0A 0x0001
+CheckString Product "TABLET G3"
 Name "XP-Pen G430"
 ReportId 0x02
 ReportLength 8
@@ -495,8 +704,8 @@ InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
 # XP-Pen G640
 #
 HIDTablet 0x28BD 0x0094 0xFF0A 0x0001
-CheckString 1 "XP-PEN"
-CheckString 2 "STAR G640"
+#CheckString Manufacturer "XP-PEN"
+#CheckString Product "STAR G640"
 Name "XP-Pen G640"
 ReportId 0x02
 ReportLength 8
@@ -606,6 +815,14 @@ MaxPressure 4095
 Width 121.92
 Height 76.20
 InitStrings 100 200
+AuxReportId 0x08
+AuxReportLength 12
+AuxDetectMask 0xE0
+AuxgnoreMask 0x80
+AuxCustomData ReportId Source=0
+AuxCustomData ButtonsLow Source=4 SourceMask=0x0F
+AuxCustomData Detect Source=1
+AuxButtonCount 4
 
 
 #
@@ -615,7 +832,7 @@ USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
 CheckString 201 "HUION_T173"
 Name "Huion H640P"
 ReportId 0x08
-ReportLength 8
+ReportLength 12
 DetectMask 0x80
 IgnoreMask 0x60
 MaxX 31999
@@ -624,6 +841,50 @@ MaxPressure 8191
 Width 160.0
 Height 100.0
 InitStrings 100 200
+AuxReportId 0x08
+AuxReportLength 12
+AuxDetectMask 0xE0
+AuxgnoreMask 0x80
+AuxCustomData ReportId Source=0
+AuxCustomData ButtonsLow Source=4 SourceMask=0x3F
+AuxCustomData Detect Source=1
+AuxButtonCount 6
+
+
+#
+# Huion New 1060 Plus
+#
+USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
+CheckString 201 "HUION_T174"
+Name "Huion New 1060 Plus"
+ReportId 0x08
+ReportLength 12
+DetectMask 0x80
+IgnoreMask 0x60
+MaxX 50800
+MaxY 31750
+MaxPressure 8191
+Width 254
+Height 158.75
+InitStrings 100 200
+
+
+#
+# Huion Inspiroy Q11K
+#
+USBTablet "{62F12D4C-3431-4EFD-8DD7-8E9AAB18D30C}"
+CheckString 201 "HUION_T164"
+Name "Inspiroy Q11K"
+ReportId 0x08
+ReportLength 12
+DetectMask 0x80
+IgnoreMask 0x60
+MaxX 55880
+MaxY 34920
+MaxPressure 8191
+Width 279.4
+Height 174.6
+InitStrings 100 200
 
 
 #
@@ -663,7 +924,6 @@ InitStrings 100 200
 GetStrings 1 20
 
 
-
 #
 # Unknown Huion Tablet
 #
@@ -721,3 +981,48 @@ TabletFormat SkipFirstDataByte
 InitStrings 2 2 2 2 2 20 21
 InitReport 0x09 0x01 0x04 0x00 0x00 0x00 0x00 0x00 0x00
 
+
+#
+# XP-Pen G640 (Custom Data Example)
+#
+HIDTablet 0x28BD 0x0094 0xFF0A 0x0001
+CheckString Manufacturer "XP-PEN"
+CheckString Product "STAR G640"
+Name "XP-Pen G640 (Custom Data Example)"
+ReportId 0x02
+ReportLength 8
+DetectMask 0x80
+MaxX 32000
+MaxY 20000
+MaxPressure 8191
+Width 160.0
+Height 100.0
+InitReport 0x02 0xB0 0x02 0x00 0x00 0x00 0x00 0x00
+TabletFormat Custom
+#
+# CustomData <target byte> [TargetMask=<target mask(&)>] [Source=<source byte>] [SourceMask=<source mask(&)>] [SourceShift=<bit shift (<<)>]
+#
+# Report id
+CustomData ReportId Source=0
+
+# Buttons (In range + buttons 1-3)
+CustomData Buttons Source=1 TargetMask=0b10000111
+
+# X low byte
+CustomData XLow Source=2
+# X high byte
+CustomData XHigh Source=3
+
+# Y low byte
+CustomData YLow Source=4
+# Y high byte
+CustomData YHigh Source=5
+
+# Pressure low byte
+CustomData PressureLow Source=6
+# Pressure high byte
+CustomData PressureHigh Source=7
+
+#
+#
+#
diff --git a/TabletDriverService/stdafx.h b/TabletDriverService/stdafx.h
index e4accf6..2fd8c85 100644
--- a/TabletDriverService/stdafx.h
+++ b/TabletDriverService/stdafx.h
@@ -16,6 +16,9 @@
 #include "OutputManager.h"
 #include "CommandHandler.h"
 
+// IntelliSense "fix"...
+//#define memcpy memcpy
+
 // Global variables...
 extern VMulti *vmulti;
 extern CommandHandler *commandHandler;
diff --git a/TabletDriverService/tools/DisableWacomDrivers.bat b/TabletDriverService/tools/DisableWacomDrivers.bat
new file mode 100644
index 0000000..e1bdc8d
--- /dev/null
+++ b/TabletDriverService/tools/DisableWacomDrivers.bat
@@ -0,0 +1,33 @@
+
+REM  --> Check for permissions
+>nul 2>&1 "%SYSTEMROOT%\System32\cacls.exe" "%SYSTEMROOT%\System32\config\system"
+  
+REM --> If error flag set, we do not have admin.
+if '%ERRORLEVEL%' NEQ '0' (
+    echo Requesting administrative privileges...
+    goto UACPrompt
+) else ( goto HasAdminPrivilegesAlready )
+  
+:UACPrompt
+    echo Set UAC = CreateObject^("Shell.Application"^) > "%TEMP%\reqadmin.vbs"
+    echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%TEMP%\reqadmin.vbs"
+    "%TEMP%\reqadmin.vbs"
+    exit /B
+  
+:HasAdminPrivilegesAlready
+    if exist "%TEMP%\reqadmin.vbs" ( del "%TEMP%\reqadmin.vbs" )
+    pushd "%CD%"
+    CD /D "%~dp0"
+
+taskkill /F /IM Wacom_Tablet.exe
+taskkill /F /IM Pen_Tablet.exe
+
+net stop WTabletServicePro
+net start WTabletServicePro
+net stop WTabletServiceCon
+timeout /t 1
+net start WTabletServiceCon
+taskkill /F /IM WacomDesktopCenter.exe
+timeout /t 10
+taskkill /F /IM Wacom_Tablet.exe
+taskkill /F /IM Pen_Tablet.exe
\ No newline at end of file
diff --git a/TabletDriverService/tools/EnableWacomDrivers.bat b/TabletDriverService/tools/EnableWacomDrivers.bat
new file mode 100644
index 0000000..c6b5fcc
--- /dev/null
+++ b/TabletDriverService/tools/EnableWacomDrivers.bat
@@ -0,0 +1,30 @@
+
+REM  --> Check for permissions
+>nul 2>&1 "%SYSTEMROOT%\System32\cacls.exe" "%SYSTEMROOT%\System32\config\system"
+  
+REM --> If error flag set, we do not have admin.
+if '%ERRORLEVEL%' NEQ '0' (
+    echo Requesting administrative privileges...
+    goto UACPrompt
+) else ( goto HasAdminPrivilegesAlready )
+  
+:UACPrompt
+    echo Set UAC = CreateObject^("Shell.Application"^) > "%TEMP%\reqadmin.vbs"
+    echo UAC.ShellExecute "%~s0", "", "", "runas", 1 >> "%TEMP%\reqadmin.vbs"
+    "%TEMP%\reqadmin.vbs"
+    exit /B
+  
+:HasAdminPrivilegesAlready
+    if exist "%TEMP%\reqadmin.vbs" ( del "%TEMP%\reqadmin.vbs" )
+    pushd "%CD%"
+    CD /D "%~dp0"
+
+
+net stop WTabletServicePro
+net start WTabletServicePro
+net stop WTabletServiceCon
+net start WTabletServiceCon
+taskkill /F /IM WacomDesktopCenter.exe
+
+timeout /t 5
+
diff --git a/TabletDriverService/tools/RunServiceOnly.bat b/TabletDriverService/tools/RunServiceOnly.bat
new file mode 100644
index 0000000..2344495
--- /dev/null
+++ b/TabletDriverService/tools/RunServiceOnly.bat
@@ -0,0 +1,2 @@
+cd ..
+"bin\TabletDriverService.exe" "config\serviceonly.cfg"
\ No newline at end of file

From 3a51444fb43eb925a1f5eb7ec44f9bca8a56cd76 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 15 Dec 2018 18:06:53 +0200
Subject: [PATCH 65/83] Mouse scrolling changes and VEIKK anti-smoothing

- Fixed the wrong scrolling direction when tablet area was rotated.
- Added ability to stop the cursor when scrolling
- Added anti-smoothing filter workaround for VEIKK S640 that varies the compensation amount depending what the report rate is.
- Modified the anti-smoothing calculation to match correctly with the configured latency compensation value.
---
 TabletDriverGUI/Configuration.cs              |   4 +-
 TabletDriverGUI/MainWindow.Driver.cs          |   3 +-
 TabletDriverGUI/MainWindow.Settings.cs        |   4 +-
 TabletDriverGUI/MainWindow.xaml               | 242 ++++++++++--------
 .../CommandHandler.Filters.cpp                |  18 +-
 TabletDriverService/CommandHandler.Tablet.cpp |  12 +
 .../TabletFilterAntiSmoothing.cpp             |  49 +++-
 .../TabletFilterAntiSmoothing.h               |   1 +
 TabletDriverService/TabletHandler.cpp         |  41 ++-
 TabletDriverService/TabletSettings.cpp        |   1 +
 TabletDriverService/TabletSettings.h          |   1 +
 11 files changed, 237 insertions(+), 139 deletions(-)

diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index 3e821e1..4dc9f15 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -62,6 +62,7 @@ public enum OutputModes
 
         public double ScrollSensitivity;
         public double ScrollAcceleration;
+        public bool ScrollStopCursor;
 
         [XmlArray("CustomCommands")]
         [XmlArrayItem("Command")]
@@ -106,8 +107,9 @@ public Configuration()
             DisableTabletButtons = false;
 
             PressureSensitivity = 0;
-            ScrollSensitivity = 1.0;
+            ScrollSensitivity = 0.5;
             ScrollAcceleration = 1.0;
+            ScrollStopCursor = false;
 
             SmoothingEnabled = false;
             SmoothingLatency = 0;
diff --git a/TabletDriverGUI/MainWindow.Driver.cs b/TabletDriverGUI/MainWindow.Driver.cs
index 636a19a..56d3ac7 100644
--- a/TabletDriverGUI/MainWindow.Driver.cs
+++ b/TabletDriverGUI/MainWindow.Driver.cs
@@ -169,6 +169,7 @@ private void SendSettingsToDriver()
             //
             settingCommands.Add("ScrollSensitivity " + Utils.GetNumberString(config.ScrollSensitivity));
             settingCommands.Add("ScrollAcceleration " + Utils.GetNumberString(config.ScrollAcceleration));
+            settingCommands.Add("ScrollStopCursor " + (config.ScrollStopCursor ? "true" : "false"));
 
 
             // Smoothing filter
@@ -200,7 +201,7 @@ private void SendSettingsToDriver()
             // Anti-smoothing filter
             if (config.AntiSmoothingEnabled)
             {
-                settingCommands.Add("AntiSmoothing " + Utils.GetNumberString(config.AntiSmoothingShape) + " " +
+                settingCommands.Add("AntiSmoothing " + Utils.GetNumberString(config.AntiSmoothingShape, "0.000") + " " +
                     Utils.GetNumberString(config.AntiSmoothingCompensation) + " " +
                     (config.AntiSmoothingOnlyWhenHover ? "true" : "false"));
             }
diff --git a/TabletDriverGUI/MainWindow.Settings.cs b/TabletDriverGUI/MainWindow.Settings.cs
index d530a17..5911a09 100644
--- a/TabletDriverGUI/MainWindow.Settings.cs
+++ b/TabletDriverGUI/MainWindow.Settings.cs
@@ -181,6 +181,7 @@ private void LoadSettingsFromConfiguration()
             //
             textScrollSensitivity.Text = Utils.GetNumberString(config.ScrollSensitivity);
             textScrollAcceleration.Text = Utils.GetNumberString(config.ScrollAcceleration);
+            checkBoxScrollStopCursor.IsChecked = config.ScrollStopCursor;
 
 
             //
@@ -226,7 +227,7 @@ private void LoadSettingsFromConfiguration()
             // Anti-smoothing filter
             //
             checkBoxAntiSmoothing.IsChecked = config.AntiSmoothingEnabled;
-            textAntiSmoothingShape.Text = Utils.GetNumberString(config.AntiSmoothingShape);
+            textAntiSmoothingShape.Text = Utils.GetNumberString(config.AntiSmoothingShape, "0.000");
             textAntiSmoothingCompensation.Text = Utils.GetNumberString(config.AntiSmoothingCompensation);
             checkBoxAntiSmoothingOnlyWhenHover.IsChecked = config.AntiSmoothingOnlyWhenHover;
             if (config.AntiSmoothingEnabled)
@@ -421,6 +422,7 @@ private void UpdateSettingsToConfiguration()
                 config.ScrollSensitivity = val;
             if (Utils.ParseNumber(textScrollAcceleration.Text, out val))
                 config.ScrollAcceleration = val;
+            config.ScrollStopCursor = (bool)checkBoxScrollStopCursor.IsChecked;
 
 
             //
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 811449e..631c3da 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -369,8 +369,13 @@
               <ColumnDefinition Width="auto" />
             </Grid.ColumnDefinitions>
 
-            <!-- Pen Button Mapping -->
-            <GroupBox Grid.Column="0" Header="Pen Buttons">
+            <Grid.RowDefinitions>
+              <RowDefinition Height="auto" />
+              <RowDefinition Height="auto" />
+            </Grid.RowDefinitions>
+
+            <!-- Pen Buttons -->
+            <GroupBox Grid.Column="0" Grid.Row="0" Header="Pen Buttons">
               <GroupBox.ToolTip>
                 <StackPanel>
                   <TextBlock FontWeight="Bold" FontSize="16">
@@ -388,74 +393,74 @@
                 </StackPanel>
               </GroupBox.ToolTip>
 
-              <StackPanel Orientation="Vertical">
-
+              <StackPanel Orientation="Vertical" HorizontalAlignment="Center" >
 
                 <!-- Top -->
-                <GroupBox Header="Top" Width="90">
-                  <!--
+                  <GroupBox Header="Top" Width="120" HorizontalAlignment="Left">
+                    <!--
                     <ComboBox Name="comboBoxButton3" SelectionChanged="ItemSelectionChanged">
                     </ComboBox>
                     -->
-                  <Button Name="buttonPenButton3" Height="22"
+                    <Button Name="buttonPenButton3" Height="22"
                             ToolTip=""
                             ToolTipOpening="ButtonMap_ToolTipOpening"
                             Padding="2,0,2,0"
                             Background="White"
                             Click="ButtonMap_Click"
                             >MOUSE1</Button>
-                </GroupBox>
+                  </GroupBox>
 
 
-                <!-- Bottom -->
-                <GroupBox Header="Bottom" Width="90">
-                  <!--
+                  <!-- Bottom -->
+                <GroupBox Header="Bottom" Width="120" HorizontalAlignment="Left">
+                    <!--
                     <ComboBox Name="comboBoxButton2" SelectionChanged="ItemSelectionChanged">
                     </ComboBox>
                     -->
-                  <Button Name="buttonPenButton2" Height="22"
+                    <Button Name="buttonPenButton2" Height="22"
                             ToolTip=""
                             ToolTipOpening="ButtonMap_ToolTipOpening"
                             Padding="2,0,2,0"
                             Background="White"
                             Click="ButtonMap_Click"
                             >MOUSE1</Button>
-                </GroupBox>
+                  </GroupBox>
 
 
-                <!-- Tip -->
-                <GroupBox Header="Tip" Width="90" Margin="2,0,0,0">
-                  <!--
+                  <!-- Tip -->
+                <GroupBox Header="Tip" Width="120"  HorizontalAlignment="Left">
+                    <!--
                     <ComboBox Name="comboBoxButton1" SelectionChanged="ItemSelectionChanged">
                     </ComboBox>
                     -->
-                  <Button Name="buttonPenButton1" Height="22"
+                    <Button Name="buttonPenButton1" Height="22"
                             ToolTip=""
                             ToolTipOpening="ButtonMap_ToolTipOpening"
                             Padding="2,0,2,0"
                             Background="White"
                             Click="ButtonMap_Click"
                             >MOUSE1</Button>
-                </GroupBox>
+                  </GroupBox>
 
+                  <!-- Disable buttons -->
+                  <CheckBox Name="checkBoxDisableButtons"
+                            HorizontalAlignment="Left"
+                            Margin="7,5,0,0"
+                            Checked="CheckboxChanged"
+                            Unchecked="CheckboxChanged">
+                    <TextBlock>Disable buttons</TextBlock>
+                  </CheckBox>
+
+              </StackPanel>
+            </GroupBox>
 
-                <!-- Disable buttons -->
-                <CheckBox Name="checkBoxDisableButtons"
-                          HorizontalAlignment="Center"
-                          Margin="0,5,0,5"
-                          VerticalContentAlignment="Center"
-                          Checked="CheckboxChanged"
-                          Unchecked="CheckboxChanged">
-                  <TextBlock>
-                  Disable
-                    <LineBreak/>
-                    buttons
-                  </TextBlock>
-                </CheckBox>
 
+            <!-- Scroll -->
+            <GroupBox Grid.Row="1" Header="Scroll">
+              <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
 
                 <!-- Scroll sensitivity -->
-                <GroupBox Header="Scroll Sens.." Height="50" Width="90" Margin="5,0,0,0">
+                <GroupBox Header="Sensitivity" Height="50" Width="120" HorizontalAlignment="Left">
                   <Grid>
                     <TextBox Name="textScrollSensitivity" Padding="4,0,0,0"
                              HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
@@ -463,10 +468,9 @@
                     <Label HorizontalAlignment="Right">s/mm</Label>
                   </Grid>
                 </GroupBox>
-
-
+                
                 <!-- Scroll acceleration -->
-                <GroupBox Header="Scroll Accel.." Height="50" Width="90" Margin="5,0,0,0">
+                <GroupBox Header="Acceleration" Height="50" Width="120" HorizontalAlignment="Left">
                   <Grid>
                     <TextBox Name="textScrollAcceleration" Padding="4,0,0,0"
                              HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
@@ -474,11 +478,21 @@
                   </Grid>
                 </GroupBox>
 
+                <!-- Scroll stop cursor -->
+                <CheckBox Name="checkBoxScrollStopCursor"
+                          Margin="7,5,0,0"
+                          HorizontalAlignment="Left"
+                          Checked="CheckboxChanged"
+                          Unchecked="CheckboxChanged">
+                  <TextBlock>Stop cursor</TextBlock>
+                </CheckBox>
+
               </StackPanel>
             </GroupBox>
 
+            
             <!-- Windows Ink Pressure -->
-            <GroupBox Grid.Column="1" Name="groupBoxWindowsInkSettings" Header="Windows Ink Settings">
+            <GroupBox Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Name="groupBoxWindowsInkSettings" Header="Windows Ink Settings">
               <StackPanel Orientation="Vertical">
 
                 <!-- Tip Firmness -->
@@ -549,7 +563,7 @@
                           >
 
                       <!-- Ink Canvas -->
-                      <InkCanvas Width="500"
+                      <InkCanvas Width="470"
                              Height="250"
                              Name="inkCanvas"
                              Background="#f6f6f6"
@@ -586,7 +600,7 @@
                           Grid.Column="0"
                           HorizontalAlignment="Left"
                           Padding="5"
-                          Width="150"
+                          Width="100"
                           FontWeight="Bold"
                           Click="ButtonInkClear_Click" />
 
@@ -614,7 +628,7 @@
                   <Button Name="buttonInkSave" Content="Save as PNG"
                           Grid.Column="3"
                           HorizontalAlignment="Right"
-                          Width="150"
+                          Width="100"
                           Padding="5"
                           FontWeight="Bold"
                           Click="ButtonInkSave_Click" />
@@ -852,81 +866,89 @@
                     Anti-smoothing Filter
                 </TextBlock>
                 <TextBlock>
-                    It is recommend to use this filter only with tablets that do the pen position smoothing in hardware/firmware.
-                    <LineBreak/>
-                    <TextBlock Foreground="#AA0000">
-                      WARNING! Some tablets will send broken position data when the pen buttons are pressed, so don't press buttons...
-                    </TextBlock>
-                    <LineBreak/>
-                    <TextBlock Foreground="#AA0000">
-                      WARNING! Do not use this filter with small tablet areas (&lt;20 mm). Most tablets will send invalid data at low speeds.
-                    </TextBlock>
-                    <LineBreak/>
-                    Check the checkbox to enable the filter.
-                    <LineBreak/>
-                    <LineBreak/>
-                    <TextBlock FontWeight="Bold">
-                    Shape
-                    </TextBlock>
-                    <LineBreak/>
-                    Shape value is the how the filter handles pen acceleration. Start with a neutral 0.5 shape value and try to keep it around that.
-                    <LineBreak/>
-                    Use a lower value when there are are too much artifacts in sharp corners and increase the value if corners are too smooth.
-                    <LineBreak/>
-                    <LineBreak/>
-                    <TextBlock FontWeight="Bold">
-                    Compensation
-                    </TextBlock>
-                    <LineBreak/>                    
-                    Compensation value is the amount of latency compensation.
-                    <LineBreak/>
-                    You can test out the compensation value by spinning the pen in circles with different speeds.
-                    <LineBreak/>
-                    Circle size shouldn't change too much with different spinning speeds.
-                    <LineBreak/>
-                    Use lower compensation value if there are too much artifacting at high speeds.
-                    <LineBreak/>
-                    Try to find a balance between response time and artifacting.
-                    <LineBreak/>
-                    <LineBreak/>
-                    <TextBlock FontWeight="Bold">
+                  It is recommend to use this filter only with tablets that do the pen position smoothing in hardware/firmware.
+                  <LineBreak/>
+                  <TextBlock Foreground="#AA0000">
+                    WARNING! Some tablets will send broken position data when the pen buttons are pressed, so don't press buttons...
+                  </TextBlock>
+                  <LineBreak/>
+                  <TextBlock Foreground="#AA0000">
+                    WARNING! Do not use this filter with small tablet areas (&lt;20 mm). Most tablets will send invalid data at low speeds.
+                  </TextBlock>
+                  <LineBreak/>
+                  Check the checkbox to enable the filter.
+                  <LineBreak/>
+                  <LineBreak/>
+                  <TextBlock FontWeight="Bold">
+                  Shape
+                  </TextBlock>
+                  <LineBreak/>
+                  Shape value is the how the filter handles pen acceleration. Start with a neutral 0.5 shape value and try to keep it around that.
+                  <LineBreak/>
+                  Use a lower value when there are are too much artifacts in sharp corners and increase the value if corners are too smooth.
+                  <LineBreak/>
+                  <LineBreak/>
+                  <TextBlock FontWeight="Bold">
+                  Compensation
+                  </TextBlock>
+                  <LineBreak/>                    
+                  Compensation value is the amount of latency compensation.
+                  <LineBreak/>
+                  You can test out the compensation value by spinning the pen in circles with different speeds.
+                  <LineBreak/>
+                  Circle size shouldn't change too much with different spinning speeds.
+                  <LineBreak/>
+                  Use lower compensation value if there are too much artifacting at high speeds.
+                  <LineBreak/>
+                  Try to find a balance between response time and artifacting.
+                  <LineBreak/>
+                  <LineBreak/>
+                  <TextBlock FontWeight="Bold">
                     Only when hovering
-                    </TextBlock>
-                    <LineBreak/>
-                    This feature is mainly meant for Wacom CTL-490, but might be useful with other tablets too.
-                    <LineBreak/>
-                    <LineBreak/>
-                    <TextBlock FontWeight="Bold">
-                      Recommended value ranges
-                    </TextBlock>
+                  </TextBlock>
+                  <LineBreak/>
+                  This feature is mainly meant for Wacom CTL-490, but might be useful with other tablets too.
+                  <LineBreak/>
+                  <LineBreak/>
+                  <TextBlock FontWeight="Bold">
+                    Recommended value ranges
+                  </TextBlock>
+                  <LineBreak/>
+                  Shape: 0.1 - 0.9
+                  <LineBreak/>
+                  Compensation: 10 - 30 ms
+                  <LineBreak/>
+                  <LineBreak/>                    
+                  <TextBlock FontWeight="Bold">
+                  Example values:
+                  </TextBlock>
+                  <LineBreak/>
+                  <TextBlock Margin="5,0,0,0">
+                    <TextBlock FontWeight="Bold">Gaomon S56K:</TextBlock>
+                    Shape 0.7, Compensation = 15 - 20 ms
+                    <LineBreak/>                     
+                    <TextBlock FontWeight="Bold">Huion 420 &amp; H420:</TextBlock>
+                    Shape = 0.5, Compensation = 15 - 20 ms
                     <LineBreak/>
-                    Shape: 0.1 - 0.9
+                    <TextBlock FontWeight="Bold">Huion H430P &amp; H640P:</TextBlock>
+                    Shape = 0.7, Compensation = 20 - 30 ms
                     <LineBreak/>
-                    Compensation: 10 - 30 ms
+                    <TextBlock FontWeight="Bold">XP-PEN G430 &amp; G640:</TextBlock>
+                    Shape = 0.5, Compensation = 10 - 20 ms, Invalid low speed data, use noise reduction 10/0.5 mm
+                    <LineBreak/>                   
+                    <TextBlock FontWeight="Bold">Wacom CTL-490 Hover:</TextBlock>
+                    Shape = 0.5, Compensation = 10 - 20 ms, Enable "Only when hovering"
                     <LineBreak/>
-                    <LineBreak/>                    
-                    <TextBlock FontWeight="Bold">
-                    Example values:
-                    </TextBlock>
+                    <TextBlock FontWeight="Bold">VEIKK S640:</TextBlock>
                     <LineBreak/>
-                    <TextBlock Margin="5,0,0,0">
-                      <TextBlock FontWeight="Bold">Gaomon S56K:</TextBlock>
-                      Shape 0.7, Compensation = 15 - 20 ms
-                      <LineBreak/>                     
-                      <TextBlock FontWeight="Bold">Huion 420 &amp; H420:</TextBlock>
-                      Shape = 0.5, Compensation = 15 - 20 ms
-                      <LineBreak/>
-                      <TextBlock FontWeight="Bold">Huion H430P &amp; H640P:</TextBlock>
-                      Shape = 0.7, Compensation = 20 - 30 ms
+                    <TextBlock Margin="10,0,0,0">
+                      Shape = 0.5, Compensation = 10 - 20 ms, Filter will automatically adjust the compensation level.
                       <LineBreak/>
-                      <TextBlock FontWeight="Bold">XP-PEN G430 &amp; G640:</TextBlock>
-                      Shape = 0.5, Compensation = 15 - 20 ms, Invalid low speed data, use noise reduction 10/0.5 mm
-                      <LineBreak/>                   
-                      <TextBlock FontWeight="Bold">Wacom CTL-490 Hover:</TextBlock>
-                      Shape = 0.5, Compensation = 25 - 30 ms, Enable "Only when hovering"
-                      </TextBlock>
+                      The tablet does have a 166 RPS mode with higher smoothing latency.
+                    </TextBlock>
                   </TextBlock>
-                </StackPanel>
+                </TextBlock>
+              </StackPanel>
             </GroupBox.ToolTip>
 
             <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
@@ -939,7 +961,7 @@
               </CheckBox>
 
               <!-- Anti-smoothing power -->
-              <GroupBox Header="Shape" Height="50" Margin="0,0,0,0">
+              <GroupBox Header="Shape" Height="50" Margin="0,0,0,0" Width="60">
                 <TextBox Name="textAntiSmoothingShape" Padding="4,0,0,0"
                       HorizontalContentAlignment="Left"
                       VerticalContentAlignment="Center"
@@ -1040,7 +1062,7 @@
 
       <TabItem Name="tabCommands">
         <TabItem.Header>
-          <TextBlock FontSize="14">
+          <TextBlock FontSize="14" Foreground="#000" FontWeight="Bold">
             <AccessText Text="C_ommands"/>
           </TextBlock>
         </TabItem.Header>
@@ -1083,7 +1105,7 @@
       </TabItem>
       <TabItem Name="tabConsole">
         <TabItem.Header>
-          <TextBlock FontSize="14">
+          <TextBlock FontSize="14" Foreground="#000" FontWeight="Bold">
             <AccessText Text="_Console"/>
           </TextBlock>
         </TabItem.Header>
diff --git a/TabletDriverService/CommandHandler.Filters.cpp b/TabletDriverService/CommandHandler.Filters.cpp
index 6773675..bd22a9a 100644
--- a/TabletDriverService/CommandHandler.Filters.cpp
+++ b/TabletDriverService/CommandHandler.Filters.cpp
@@ -210,6 +210,18 @@ void CommandHandler::CreateFilterCommands() {
 			double compensation = cmd->GetDouble(1, tablet->antiSmoothing.compensation);
 			bool onlyWhenHover = cmd->GetBoolean(2, tablet->antiSmoothing.onlyWhenHover);
 
+			// Workaround for VEIKK S640
+			double defaultTargetReportRate = 0;
+			if(
+				tablet != NULL &&
+				tablet->hidDevice != NULL &&
+				tablet->hidDevice->vendorId == 0x2FEB
+			) {
+				defaultTargetReportRate = 250;
+			}
+			double targetReportRate = cmd->GetDouble(3, defaultTargetReportRate);
+			
+
 			if(cmd->valueCount == 0) {
 				LOG_INFO("Usage: %s <shape> <compensation> <only on hover> <target report rate>\n", cmd->command.c_str());
 			}
@@ -221,12 +233,14 @@ void CommandHandler::CreateFilterCommands() {
 				tablet->antiSmoothing.shape = shape;
 				tablet->antiSmoothing.compensation = compensation;
 				tablet->antiSmoothing.onlyWhenHover = onlyWhenHover;
+				tablet->antiSmoothing.targetReportRate = targetReportRate;
 
 				tablet->antiSmoothing.isEnabled = true;
-				LOG_INFO("Anti-smoothing = Shape:%0.2f Compensation:%0.2f OnlyOnHover:%s\n",
+				LOG_INFO("Anti-smoothing = Shape:%0.3f Compensation:%0.2f OnlyOnHover:%s TargetRPS:%0.2f\n",
 					tablet->antiSmoothing.shape,
 					tablet->antiSmoothing.compensation,
-					tablet->antiSmoothing.onlyWhenHover ? "true" : "false"
+					tablet->antiSmoothing.onlyWhenHover ? "true" : "false",
+					tablet->antiSmoothing.targetReportRate
 
 				);
 			}
diff --git a/TabletDriverService/CommandHandler.Tablet.cpp b/TabletDriverService/CommandHandler.Tablet.cpp
index cf6c475..fa45cba 100644
--- a/TabletDriverService/CommandHandler.Tablet.cpp
+++ b/TabletDriverService/CommandHandler.Tablet.cpp
@@ -214,6 +214,18 @@ void CommandHandler::CreateTabletCommands() {
 	}));
 
 
+	//
+	// Command: ScrollStopCursor
+	//
+	AddCommand(new Command("ScrollStopCursor", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.scrollStopCursor = cmd->GetBoolean(0, tablet->settings.scrollStopCursor);
+		LOG_INFO("Tablet scroll stop cursor = %s\n", tablet->settings.scrollStopCursor ? "true" : "false");
+		return true;
+	}));
+
+
+
 	//
 	// Command: Skew
 	//
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.cpp b/TabletDriverService/TabletFilterAntiSmoothing.cpp
index 91c147d..9d68ba5 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.cpp
+++ b/TabletDriverService/TabletFilterAntiSmoothing.cpp
@@ -13,6 +13,7 @@ TabletFilterAntiSmoothing::TabletFilterAntiSmoothing() {
 	shape = 1.0;
 	compensation = 1;
 	onlyWhenHover = false;
+	targetReportRate = 0;
 
 	reportRate = 100;
 	reportRateAverage = 100;
@@ -136,13 +137,29 @@ void TabletFilterAntiSmoothing::Update() {
 		// LerpAdd (linear interpolation) method will move the position beyond the target position when the second parameter is larger than 1
 		//
 		predictedPosition.Set(oldTarget);
-		predictedPosition.LerpAdd(latestTarget,
-			pow(predictedVelocity / velocity, shape)
-			*
-			compensation
-			*
-		(reportRate / 1000.0)
-		);
+
+		// Workaround for VEIKK S640 and other tablets with variable report rate and smoothing
+		if(targetReportRate > 0) {
+			predictedPosition.LerpAdd(latestTarget,
+				1 + pow(predictedVelocity / velocity, shape)
+				*
+				compensation
+				*
+				(targetReportRate / 1000.0)
+			);
+		}
+
+		// Other tablets
+		else {
+
+			predictedPosition.LerpAdd(latestTarget,
+				1 + pow(predictedVelocity / velocity, shape)
+				*
+				compensation
+				*
+				(reportRate / 1000.0)
+			);
+		}
 		outputPosition->Set(predictedPosition);
 	}
 
@@ -179,18 +196,22 @@ void TabletFilterAntiSmoothing::Update() {
 	// Debug message
 	if(logger.debugEnabled) {
 		double delta = outputPosition->Distance(latestTarget);
-		LOG_DEBUG("T=%0.2f T=[%0.2f,%0.2f] P=[%0.2f,%0.2f] D=%0.3f R=%0.2f RA=%0.2f V=%0.2f PV=%0.2f A=%0.0f J=%0.0f L=%0.2f\n",
+		double pixelDensity = (mapper->areaScreen.width / mapper->areaTablet.width);
+		LOG_DEBUG(
+			//"T=%0.2f T=[%0.2f,%0.2f] P=[%0.2f,%0.2f] D1=%0.3f D2=%0.3f R=%0.2f RA=%0.2f V=%0.2f PV=%0.2f A=%0.0f J=%0.0f L=%0.2f\n",
+			"T=%0.2f D=%0.2f R=%0.0f V=%0.0f PV=%0.0f L=%0.2f ms LP=%0.0f pixels\n",
 			(timeNow - timeBegin).count() / 1000000.0,
-			latestTarget.x, latestTarget.y,
-			outputPosition->x, outputPosition->y,
+			//latestTarget.x, latestTarget.y,
+			//outputPosition->x, outputPosition->y,
 			delta,
 			reportRate,
-			reportRateAverage,
+			//reportRateAverage,
 			velocity,
 			predictedVelocity,
-			acceleration,
-			jerk,
-			(velocity > 0) ? (delta / velocity * 1000) : 0
+			//acceleration,
+			//jerk,
+			(velocity > 0) ? (delta / velocity * 1000) : 0,
+			pixelDensity * delta
 		);
 	}
 
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.h b/TabletDriverService/TabletFilterAntiSmoothing.h
index 174780b..1e66074 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.h
+++ b/TabletDriverService/TabletFilterAntiSmoothing.h
@@ -31,6 +31,7 @@ class TabletFilterAntiSmoothing : public TabletFilter {
 	double shape;
 	double compensation;
 	bool onlyWhenHover;
+	double targetReportRate;
 
 	void SetTarget(TabletState *tabletState);
 	void Update();
diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
index 6ea919d..0144e39 100644
--- a/TabletDriverService/TabletHandler.cpp
+++ b/TabletDriverService/TabletHandler.cpp
@@ -128,6 +128,7 @@ void TabletHandler::RunTabletInputThread() {
 	UCHAR outButtons = 0;
 	UCHAR lastButtons = 0;
 	Vector2D lastScrollPosition;
+	Vector2D scrollStartPosition;
 
 	timeBegin = chrono::high_resolution_clock::now();
 
@@ -210,6 +211,8 @@ void TabletHandler::RunTabletInputThread() {
 		outButtons = 0;
 
 		if(buttons > 0 || lastButtons > 0) {
+
+			// Loop through buttons
 			for(int buttonIndex = 0; buttonIndex < tablet->settings.buttonCount; buttonIndex++) {
 
 				// Button is not down, pressed or released?
@@ -217,6 +220,7 @@ void TabletHandler::RunTabletInputThread() {
 					continue;
 				}
 
+				// Button state
 				bool isDown = buttons & (1 << buttonIndex);
 				bool isPressed = ((buttons & (1 << buttonIndex)) > 0 && (lastButtons & (1 << buttonIndex)) == 0);
 				bool isReleased = ((buttons & (1 << buttonIndex)) == 0 && (lastButtons & (1 << buttonIndex)) > 0);
@@ -239,26 +243,35 @@ void TabletHandler::RunTabletInputThread() {
 						//
 						// Mouse scroll
 						//
-						else if(keyMapValue->mouseButton > 0x100) {
+						else if((keyMapValue->mouseButton & 0x103) > 0) {
 
+							// Scroll pen button down?
 							if(isDown) {
 
-								// Reset last scroll position when scroll button is pressed
+								// Get rotated pen position
+								Vector2D scrollPosition;
+								scrollPosition.Set(tablet->state.position);
+								mapper->GetRotatedTabletPosition(&scrollPosition.x, &scrollPosition.y);
+
+								// Reset last scroll position and set the scroll start position
 								if(isPressed) {
-									lastScrollPosition.Set(tablet->state.position);
+									lastScrollPosition.Set(scrollPosition);
+									scrollStartPosition.Set(tablet->state.position);
 								}
 
 								// Delta from the last scroll position
 								Vector2D delta(
-									(tablet->state.position.x - lastScrollPosition.x) * tablet->settings.scrollSensitivity,
-									(tablet->state.position.y - lastScrollPosition.y) * tablet->settings.scrollSensitivity
+									(scrollPosition.x - lastScrollPosition.x) * tablet->settings.scrollSensitivity,
+									(scrollPosition.y - lastScrollPosition.y) * tablet->settings.scrollSensitivity
 								);
 
+								// X Acceleration
 								if(delta.x > 0)
 									delta.x = round(pow(delta.x, tablet->settings.scrollAcceleration));
 								else
 									delta.x = -round(pow(-delta.x, tablet->settings.scrollAcceleration));
 
+								// Y Acceleration
 								if(delta.y > 0)
 									delta.y = round(pow(delta.y, tablet->settings.scrollAcceleration));
 								else
@@ -266,15 +279,20 @@ void TabletHandler::RunTabletInputThread() {
 
 
 								// Vertical Scroll
-								if(delta.y != 0 && (keyMapValue->mouseButton & 0x101) > 0) {
+								if(delta.y != 0 && (keyMapValue->mouseButton & 0x101) == 0x101) {
 									inputEmulator.MouseScroll((int)delta.y, true);
-									lastScrollPosition.Set(tablet->state.position);
+									lastScrollPosition.Set(scrollPosition);
 								}
 
 								// Horizontal scroll
-								if(delta.x != 0 && (keyMapValue->mouseButton & 0x102) > 0) {
+								if(delta.x != 0 && (keyMapValue->mouseButton & 0x102) == 0x102) {
 									inputEmulator.MouseScroll((int)-delta.x, false);
-									lastScrollPosition.Set(tablet->state.position);
+									lastScrollPosition.Set(scrollPosition);
+								}
+
+								// Stop cursor
+								if(tablet->settings.scrollStopCursor) {
+									tablet->state.position.Set(scrollStartPosition);
 								}
 
 							}
@@ -305,13 +323,16 @@ void TabletHandler::RunTabletInputThread() {
 
 			}
 		}
+
+		// Set button values
 		tablet->state.buttons = outButtons;
 		lastButtons = buttons;
 
+
 		//
 		// Report filters
 		//
-		// Is there any filters?
+		// Are there any filters?
 		if(tablet->filterReportCount > 0) {
 
 			// Copy input state values to filter state
diff --git a/TabletDriverService/TabletSettings.cpp b/TabletDriverService/TabletSettings.cpp
index 1042823..acac997 100644
--- a/TabletDriverService/TabletSettings.cpp
+++ b/TabletDriverService/TabletSettings.cpp
@@ -22,6 +22,7 @@ TabletSettings::TabletSettings() {
 	pressureDeadzone = 0;
 	scrollSensitivity = 1;
 	scrollAcceleration = 1;
+	scrollStopCursor = false;
 	skew = 0;
 	dataFormat = TabletFormatNormal;
 	buttonMap[0] = "MOUSE1";
diff --git a/TabletDriverService/TabletSettings.h b/TabletDriverService/TabletSettings.h
index eae4527..a5c98a4 100644
--- a/TabletDriverService/TabletSettings.h
+++ b/TabletDriverService/TabletSettings.h
@@ -32,6 +32,7 @@ class TabletSettings {
 	double pressureDeadzone;
 	double scrollSensitivity;
 	double scrollAcceleration;
+	bool scrollStopCursor;
 	double skew;
 	TabletDataFormat dataFormat;
 	string buttonMap[16];

From 887e07e9b3eac8233be7c9918e3f8cb06eed306b Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 15 Dec 2018 19:07:07 +0200
Subject: [PATCH 66/83] Set custom key mapping with enter

---
 TabletDriverGUI/ButtonMapping.xaml    | 3 ++-
 TabletDriverGUI/ButtonMapping.xaml.cs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/TabletDriverGUI/ButtonMapping.xaml b/TabletDriverGUI/ButtonMapping.xaml
index 7b9f6ec..5be4473 100644
--- a/TabletDriverGUI/ButtonMapping.xaml
+++ b/TabletDriverGUI/ButtonMapping.xaml
@@ -26,7 +26,7 @@
       <GroupBox Header="Mouse" Padding="2">
         <ComboBox Name="comboBoxMouse"
                   Padding="5"
-                  KeyUp="ComboBoxMouse_KeyUp"
+                  KeyUp="OnEnterKeyUp"
                   SelectionChanged="ComboBoxMouse_SelectionChanged"
                   >
           <ComboBoxItem IsSelected="True">None</ComboBoxItem>
@@ -51,6 +51,7 @@
       </GroupBox>
       <GroupBox Header="Custom" Padding="2">
         <TextBox Grid.Column="1" Name="textCustom"
+                 KeyUp="OnEnterKeyUp"
                  Padding="2"
                  >CTRL+SHIFT+Z</TextBox>
       </GroupBox>
diff --git a/TabletDriverGUI/ButtonMapping.xaml.cs b/TabletDriverGUI/ButtonMapping.xaml.cs
index 3646def..82dc8cd 100644
--- a/TabletDriverGUI/ButtonMapping.xaml.cs
+++ b/TabletDriverGUI/ButtonMapping.xaml.cs
@@ -223,9 +223,9 @@ private void ButtonCancel_Click(object sender, RoutedEventArgs e)
 
 
         //
-        // Mouse combobox enter press -> set
+        // Mouse combobox or custom keys enter press -> set
         //
-        private void ComboBoxMouse_KeyUp(object sender, KeyEventArgs e)
+        private void OnEnterKeyUp(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
             {

From 073ec9b8a4469fc03eef423a9801f179887e3e1f Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 15 Dec 2018 19:09:54 +0200
Subject: [PATCH 67/83] Fix for tablet button triggering twice per button press

---
 TabletDriverService/Tablet.cpp        | 11 ++++-------
 TabletDriverService/TabletHandler.cpp |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 5e394ce..734b6e5 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -231,7 +231,7 @@ int Tablet::ReadState() {
 	}
 
 	// Process auxiliary data
-	if(settings.auxReportId > 0) {
+	if(settings.auxReportId > 0 && hidDeviceAux == NULL) {
 		ProcessAuxData(buffer, settings.reportLength);
 	}
 
@@ -318,8 +318,6 @@ int Tablet::ReadState() {
 			// Format data
 			dataFormatter.Format(&reportData, buffer);
 
-			//LOG_DEBUGBUFFER(buffer, dataFormatter.sourceLength, "Custom data source: ");
-			//LOG_DEBUGBUFFER(&reportData, dataFormatter.targetLength, "Custom data target: ");
 		}
 
 
@@ -415,7 +413,6 @@ int Tablet::ReadState() {
 			double pressure;
 			pressure = state.pressure - settings.pressureDeadzone;
 			pressure /= (1 - settings.pressureDeadzone);
-			//LOG_DEBUG("Pressure: %0.2f -> %0.2f\n", state.pressure, pressure);
 			state.pressure = pressure;
 		}
 
@@ -518,13 +515,13 @@ int Tablet::ReadAuxReport()
 		return ProcessAuxData(buffer, length);
 
 	}
-	else if(usbDevice != NULL) {
+	else if(usbDevice != NULL || settings.auxReportId > 0) {
 		if(auxState.isValid) {
-			Sleep(10);
+			Sleep(1);
 			return TabletAuxReportStatus::AuxReportValid;
 		}
 		else {
-			Sleep(10);
+			Sleep(1);
 			return TabletAuxReportStatus::AuxReportInvalid;
 		}
 	}
diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
index 0144e39..964d2f9 100644
--- a/TabletDriverService/TabletHandler.cpp
+++ b/TabletDriverService/TabletHandler.cpp
@@ -403,8 +403,8 @@ void TabletHandler::RunAuxInputThread()
 	USHORT lastButtons = 0;
 	Tablet::TabletAuxState auxState;
 
-	// No aux device
-	if(tablet->hidDeviceAux == NULL && tablet->usbDevice == NULL) {
+	// No aux device or not aux report id set
+	if(tablet->hidDeviceAux == NULL && tablet->usbDevice == NULL && tablet->settings.auxReportId <= 0) {
 		return;
 	}
 

From 2d29df082a9ee029ed9cb1555c3c5b58ec51c5fa Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 15 Dec 2018 19:39:44 +0200
Subject: [PATCH 68/83] Mouse scroll tooltip

---
 TabletDriverGUI/MainWindow.xaml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 631c3da..917c1af 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -456,7 +456,19 @@
 
 
             <!-- Scroll -->
-            <GroupBox Grid.Row="1" Header="Scroll">
+            <GroupBox Grid.Row="1" Header="Mouse Scroll">
+              <GroupBox.ToolTip>
+                <StackPanel>
+                  <TextBlock FontWeight="Bold" FontSize="16">
+                    Mouse Scroll
+                  </TextBlock>
+                  <TextBlock>
+                      - Use negative number in sensitivity to invert the direction.
+                      <LineBreak/>
+                      - Acceleration 1.0 = No acceleration. Recommended range is from 1 to 5.
+                  </TextBlock>
+                </StackPanel>
+              </GroupBox.ToolTip>
               <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
 
                 <!-- Scroll sensitivity -->
@@ -464,7 +476,7 @@
                   <Grid>
                     <TextBox Name="textScrollSensitivity" Padding="4,0,0,0"
                              HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                             TextChanged="TextChanged">1.0</TextBox>
+                             TextChanged="TextChanged">0.5</TextBox>
                     <Label HorizontalAlignment="Right">s/mm</Label>
                   </Grid>
                 </GroupBox>

From 095c07d2fb8e295f0879ce082c2e9ff6cce7c89f Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 15 Dec 2018 19:59:25 +0200
Subject: [PATCH 69/83] Tab names

---
 TabletDriverGUI/MainWindow.xaml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 917c1af..70960c9 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -40,11 +40,11 @@
                 Background="White"
                 >
 
-      <!-- General settings -->
+      <!-- Area tab -->
       <TabItem>
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#006600" FontWeight="Bold">
-            <AccessText Text="_Settings"/>
+            <AccessText Text="_Area"/>
           </TextBlock>
         </TabItem.Header>
 
@@ -351,6 +351,7 @@
         </ScrollViewer>
       </TabItem>
 
+      <!-- Buttons tab -->
       <TabItem>
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#006699" FontWeight="Bold">
@@ -680,6 +681,7 @@
         </StackPanel>
       </TabItem>
 
+      <!-- Filters tab -->
       <TabItem>
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#003399" FontWeight="Bold">
@@ -1018,7 +1020,7 @@
       <TabItem>
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#000066" FontWeight="Bold">
-            <AccessText Text="Misc"/>
+            <AccessText Text="_Misc"/>
           </TextBlock>
         </TabItem.Header>
 
@@ -1072,6 +1074,7 @@
         </StackPanel>
       </TabItem>
 
+      <!-- Commands tab -->
       <TabItem Name="tabCommands">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#000" FontWeight="Bold">
@@ -1115,6 +1118,8 @@
           </GroupBox>
         </Grid>
       </TabItem>
+      
+      <!-- Console tab -->
       <TabItem Name="tabConsole">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#000" FontWeight="Bold">
@@ -1190,6 +1195,7 @@
         </Grid>
 
       </TabItem>
+    
     </TabControl>
 
     <Grid Margin="5,5,5,25" Height="35" VerticalAlignment="Bottom">

From b5a7d939c9a35678da0748968cb32509d494e059 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sat, 15 Dec 2018 20:11:54 +0200
Subject: [PATCH 70/83] v0.2.2

---
 README.md | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 882bf5a..c4dbc91 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,15 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 
 ## Download
 
-### http://hwk.fi/TabletDriver/TabletDriverV0.2.1.zip
+### http://hwk.fi/TabletDriver/TabletDriverV0.2.2.zip
 
 #
 
 ### Supported operating systems:
-  - Windows 7 64-bit
-  - Windows 8 64-bit
-  - Windows 8.1 64-bit
   - Windows 10 64-bit
+  - Windows 8.1 64-bit
+  - Windows 8 64-bit
+  - Windows 7 64-bit (No multi-monitor support)
 
 #
 
@@ -40,25 +40,30 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
   - Wacom CTL-672
   - Wacom CTL-680
   - Wacom CTH-680
+  - Wacom CTL-690
+  - Wacom CTH-690
   - Wacom PTH-660
   - Wacom PTH-451
   - Wacom PTH-850
-  - XP-Pen G430 (New 2017+ "Model B". Old G430 or G430S is not supported)
+  - XP-Pen G430 (New 2017+ "Model B". Old G430 is not supported)
+  - XP-Pen G430S
   - XP-Pen G540 Pro (G540 is not supported)
   - XP-Pen G640
+  - XP-Pen G640S
   - XP-Pen Deco 01
   - XP-Pen Deco 01 v2
   - Huion 420
   - Huion H420
   - Huion H430P
   - Huion H640P
+  - Huion osu!tablet
   - Gaomon S56K
+  - VEIKK S640
   
 ### Configured, but not properly tested:
-  - Huion osu!tablet
-  - XP-Pen G640S
-  - VEIKK S640
-  - https://github.com/hawku/TabletDriver/blob/master/TabletDriverService/config/wacom.cfg
+> - Huion New 1060 Plus
+> - Huion Inspiroy Q11K
+  - Other Wacom tablets that might work: https://github.com/hawku/TabletDriver/blob/master/TabletDriverService/config/wacom.cfg
 
 #
 
@@ -100,8 +105,24 @@ If you want to compile the code and don't want to install anything from the Tabl
 #
 
 ## Changelog
+>**v0.2.2:**
+> - XP-Pen G430S configuration by [frodriguez96](https://github.com/frodriguez96) and [riley-badour](https://github.com/riley-badour)
+> - Huion New 1060 Plus configuration by [riley-badour](https://github.com/riley-badour)
+> - Huion Inspiroy Q11K configuration by [octoberU](https://github.com/octoberU)
+> - Wacom CTL-690 and CTH-690 configurations moved to tablet.cfg and DetectMask fixed.
+> - Few more Wacom tablets can now be used while the official drivers are installed (check tablet.cfg)
+> - Tablet button support for Wacom CTH-480, CTL-490, CTL-4100, Huion H430P and H640P.
+> - Custom tablet data format configuration (check tablet.cfg for examples)
+> - Pen and tablet button mapping to a mouse buttons and keyboard keys.
+> - Pen button mapping to scroll.
+> - Windows Ink pressure settings and test canvas.
+> - Smoothing filter now also smooths out pen pressure.
+> - Smoothing can be set to only smooth out when pen buttons are down.
+> - Anti-smoothing compensation value is now in milliseconds (check tooltip for example values)
+> - Ability start the TabletDriverService.exe without GUI (`tools\RunServiceOnly.bat`)
+
 >**v0.2.1:**
-> - XP-Pen G640S and VEIKK S640 configurations by [FRodriguez96](https://github.com/frodriguez96)
+> - XP-Pen G640S and VEIKK S640 configurations by [frodriguez96](https://github.com/frodriguez96)
 > - Original XP-Pen, Huion and VEIKK driver processes will now be killed when the TabletDriverGUI starts.
 > - Fixed cursor jumping to the corner when driver restarts or tablet disconnects.
 > - Removed device list from driver startup. Might help with the problems that the driver restart is causing other USB devices to glitch out.

From f8e388de8b956eeb0d0458841a5198b6394547a2 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 16 Dec 2018 13:41:32 +0200
Subject: [PATCH 71/83] Fix for stopped working error, relative mode
 sensitivity, etc.

- Fixed "TabletDriverService.exe has stopped working" error when a tablet is not connected.
- Relative mouse mode can now have different sensitivity on X and Y axis.
- Added SendInput output mode to GUI
- Support for VEIKK's VMulti driver with a higher pressure sensitivity resolution in the digitizer mode.
---
 TabletDriverGUI/Configuration.cs              |   3 +-
 TabletDriverGUI/MainWindow.Driver.cs          |  22 +-
 TabletDriverGUI/MainWindow.Settings.cs        |  78 ++-
 TabletDriverGUI/MainWindow.xaml               | 637 +++++++++---------
 TabletDriverGUI/MainWindow.xaml.cs            |  68 +-
 TabletDriverService/CommandHandler.Other.cpp  |  34 +-
 TabletDriverService/CommandHandler.Tablet.cpp |  13 +-
 TabletDriverService/Main.cpp                  |  21 +-
 TabletDriverService/OutputManager.cpp         |   1 -
 TabletDriverService/OutputManager.h           |   5 +-
 .../OutputSendInputAbsolute.cpp               |  22 +-
 TabletDriverService/OutputSettings.cpp        |   2 +-
 TabletDriverService/OutputSettings.h          |   2 +-
 TabletDriverService/OutputVMultiAbsolute.cpp  |  18 +-
 .../OutputVMultiAbsoluteV2.cpp                |  85 ---
 TabletDriverService/OutputVMultiAbsoluteV2.h  |  25 -
 TabletDriverService/OutputVMultiDigitizer.cpp |  22 +-
 TabletDriverService/OutputVMultiDigitizer.h   |   2 +
 TabletDriverService/OutputVMultiRelative.cpp  |  20 +-
 .../TabletDriverService.vcxproj               |   3 +-
 .../TabletDriverService.vcxproj.filters       |   9 +-
 TabletDriverService/TabletHandler.cpp         |  31 +-
 TabletDriverService/VMulti.cpp                |  17 +-
 TabletDriverService/VMulti.h                  |   7 +-
 .../docs/VEIKK_VMulti_Descriptor.txt          | 144 ++++
 25 files changed, 731 insertions(+), 560 deletions(-)
 delete mode 100644 TabletDriverService/OutputVMultiAbsoluteV2.cpp
 delete mode 100644 TabletDriverService/OutputVMultiAbsoluteV2.h
 create mode 100644 TabletDriverService/docs/VEIKK_VMulti_Descriptor.txt

diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index 4dc9f15..f6068d7 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -22,7 +22,8 @@ public enum OutputModes
         {
             Absolute = 0,
             Relative = 1,
-            Digitizer = 2
+            Digitizer = 2,
+            SendInput = 3
         }
 
         public Area ScreenArea;
diff --git a/TabletDriverGUI/MainWindow.Driver.cs b/TabletDriverGUI/MainWindow.Driver.cs
index 56d3ac7..a8ac04d 100644
--- a/TabletDriverGUI/MainWindow.Driver.cs
+++ b/TabletDriverGUI/MainWindow.Driver.cs
@@ -106,15 +106,24 @@ private void SendSettingsToDriver()
             switch (config.OutputMode)
             {
                 case Configuration.OutputModes.Absolute:
-                    settingCommands.Add("Mode Absolute");
+                    settingCommands.Add("OutputMode Absolute");
                     break;
                 case Configuration.OutputModes.Relative:
-                    settingCommands.Add("Mode Relative");
-                    settingCommands.Add("RelativeSensitivity " + Utils.GetNumberString(config.ScreenArea.Width / config.TabletArea.Width));
+                    settingCommands.Add("OutputMode Relative");
+                    settingCommands.Add("RelativeSensitivity " +
+                        Utils.GetNumberString(config.ScreenArea.Width / config.TabletArea.Width) +
+                        " " +
+                        Utils.GetNumberString(config.ScreenArea.Height / config.TabletArea.Height)
+                    );
                     break;
                 case Configuration.OutputModes.Digitizer:
-                    settingCommands.Add("Mode Digitizer");
+                    settingCommands.Add("OutputMode Digitizer");
                     break;
+
+                case Configuration.OutputModes.SendInput:
+                    settingCommands.Add("OutputMode SendInputAbsolute");
+                    break;
+
             }
 
             //
@@ -403,12 +412,13 @@ private void ProcessStatusMessage(string variableName, string parameters)
                 if (Utils.ParseNumber(parameters, out double test))
                 {
                     tabletButtonCount = (int)test;
-                    if(tabletButtonCount > 0)
+                    if (tabletButtonCount > 0)
                     {
                         for (int i = 0; i < 16; i++)
                         {
                             GroupBox box = (GroupBox)wrapPanelTabletButtons.Children[i];
-                            if (i >= tabletButtonCount) {
+                            if (i >= tabletButtonCount)
+                            {
                                 box.Visibility = Visibility.Collapsed;
                             }
                             else
diff --git a/TabletDriverGUI/MainWindow.Settings.cs b/TabletDriverGUI/MainWindow.Settings.cs
index 5911a09..e75e706 100644
--- a/TabletDriverGUI/MainWindow.Settings.cs
+++ b/TabletDriverGUI/MainWindow.Settings.cs
@@ -44,6 +44,9 @@ private void LoadSettingsFromConfiguration()
                 case Configuration.OutputModes.Digitizer:
                     radioModeDigitizer.IsChecked = true;
                     break;
+                case Configuration.OutputModes.SendInput:
+                    radioModeSendInput.IsChecked = true;
+                    break;
             }
 
 
@@ -312,8 +315,9 @@ private void UpdateSettingsToConfiguration()
             // Output Mode
             //
             if (radioModeAbsolute.IsChecked == true) config.OutputMode = Configuration.OutputModes.Absolute;
-            if (radioModeRelative.IsChecked == true) config.OutputMode = Configuration.OutputModes.Relative;
-            if (radioModeDigitizer.IsChecked == true) config.OutputMode = Configuration.OutputModes.Digitizer;
+            else if (radioModeRelative.IsChecked == true) config.OutputMode = Configuration.OutputModes.Relative;
+            else if (radioModeDigitizer.IsChecked == true) config.OutputMode = Configuration.OutputModes.Digitizer;
+            else if (radioModeSendInput.IsChecked == true) config.OutputMode = Configuration.OutputModes.SendInput;
 
 
             //
@@ -527,6 +531,42 @@ private void UpdateSettingsToConfiguration()
 
         }
 
+
+
+        //
+        // Initialize configuration
+        //
+        private void InitializeConfiguration()
+        {
+            isLoadingSettings = true;
+            Width = config.WindowWidth;
+            Height = config.WindowHeight;
+            isLoadingSettings = false;
+
+            // Invalid config -> Set defaults
+            if (config.ScreenArea.Width == 0 || config.ScreenArea.Height == 0)
+            {
+                config.DesktopSize.Width = GetVirtualDesktopSize().Width;
+                config.DesktopSize.Height = GetVirtualDesktopSize().Height;
+                config.ScreenArea.Width = config.DesktopSize.Width;
+                config.ScreenArea.Height = config.DesktopSize.Height;
+                config.ScreenArea.X = 0;
+                config.ScreenArea.Y = 0;
+            }
+
+            // Create canvas elements
+            CreateCanvasElements();
+
+            // Load settings from configuration
+            LoadSettingsFromConfiguration();
+
+            // Update the settings back to the configuration
+            UpdateSettingsToConfiguration();
+
+            // Set run at startup
+            SetRunAtStartup(config.RunAtStartup);
+        }
+
         #endregion
 
 
@@ -593,7 +633,7 @@ System.Drawing.Rectangle GetVirtualDesktopSize()
             System.Drawing.Rectangle rect = new System.Drawing.Rectangle();
 
             // Windows 8 or greater needed for the multiscreen absolute mode
-            if (VersionHelper.IsWindows8OrGreater() || config.OutputMode == Configuration.OutputModes.Digitizer)
+            if (VersionHelper.IsWindows8OrGreater() || config.OutputMode != Configuration.OutputModes.Absolute)
             {
                 rect.Width = System.Windows.Forms.SystemInformation.VirtualScreen.Width;
                 rect.Height = System.Windows.Forms.SystemInformation.VirtualScreen.Height;
@@ -616,7 +656,7 @@ System.Windows.Forms.Screen[] GetAvailableScreens()
             System.Windows.Forms.Screen[] screens;
 
             // Windows 8 or greater needed for the multiscreen absolute mode
-            if (VersionHelper.IsWindows8OrGreater() || config.OutputMode == Configuration.OutputModes.Digitizer)
+            if (VersionHelper.IsWindows8OrGreater() || config.OutputMode != Configuration.OutputModes.Absolute)
                 screens = System.Windows.Forms.Screen.AllScreens;
             else
                 screens = new System.Windows.Forms.Screen[] { System.Windows.Forms.Screen.PrimaryScreen };
@@ -1007,7 +1047,7 @@ private void Canvas_MouseMove(object sender, MouseEventArgs e)
                     dx = 0;
                 if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
                     dy = 0;
- 
+
 
                 // Screen map canvas
                 if (mouseDrag.Source == canvasScreenMap)
@@ -1323,7 +1363,9 @@ private void ButtonMap_ToolTipOpening(object sender, ToolTipEventArgs e)
         private void MainMenuClick(object sender, RoutedEventArgs e)
         {
 
-            // Import
+            //
+            // Import settings
+            //
             if (sender == mainMenuImport)
             {
                 OpenFileDialog dialog = new OpenFileDialog
@@ -1348,7 +1390,9 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
                 }
             }
 
-            // Export
+            //
+            // Export settings
+            //
             else if (sender == mainMenuExport)
             {
                 SaveFileDialog dialog = new SaveFileDialog
@@ -1376,7 +1420,27 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
 
             }
 
+            //
+            // Reset to default
+            //
+            else if (sender == mainMenuResetToDefault)
+            {
+                config = null;
+                isFirstStart = true;
+                config = new Configuration();
+
+                // Initialize configuration
+                InitializeConfiguration();
+
+                // Restart driver
+                StopDriver();
+                StartDriver();
+
+            }
+
+            //
             // Exit
+            //
             else if (sender == mainMenuExit)
             {
                 Close();
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 70960c9..9dd10bb 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -18,15 +18,31 @@
         </Setter.Value>
       </Setter>
     </Style>
+
+    <Style x:Key="ControlStyleTextBox" TargetType="Control">
+      <Setter Property="HorizontalContentAlignment" Value="Left"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+    </Style>
+    <Style BasedOn="{StaticResource ControlStyleTextBox}" TargetType="TextBox">
+      <Setter Property="Padding" Value="5,0"/>
+    </Style>
   </Window.Resources>
 
   <Grid Background="Transparent" Margin="0,0,0,0">
-
-    <DockPanel Background="White">
+    <Grid.RowDefinitions>
+      <RowDefinition Height="auto"/>
+      <RowDefinition Height="*"/>
+      <RowDefinition Height="auto"/>
+      <RowDefinition Height="auto"/>
+    </Grid.RowDefinitions>
+
+    <DockPanel Grid.Row="0" Background="White" Height="18">
       <Menu DockPanel.Dock="Top"  Background="White">
         <MenuItem Header="Fil_e">
           <MenuItem Name="mainMenuImport" Header="_Import Settings" Click="MainMenuClick" />
           <MenuItem Name="mainMenuExport" Header="_Export Settings" Click="MainMenuClick" />
+          <Separator/>
+          <MenuItem Name="mainMenuResetToDefault" Header="_Reset to default" Click="MainMenuClick" />
           <Separator />
           <MenuItem Name="mainMenuExit" Header="E_xit" Click="MainMenuClick" />
         </MenuItem>
@@ -34,14 +50,13 @@
       <TextBox AcceptsReturn="True" />
     </DockPanel>
 
-    <TabControl Name="tabControl"
-                Margin="0,20,0,59"
-                Selector.IsSelected="True"
+    <TabControl Grid.Row="1" Name="tabControl"
                 Background="White"
+                Selector.IsSelected="True"                
                 >
 
       <!-- Area tab -->
-      <TabItem>
+      <TabItem Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#006600" FontWeight="Bold">
             <AccessText Text="_Area"/>
@@ -78,58 +93,51 @@
               </GroupBox.ToolTip>
 
               <StackPanel>
+
                 <!-- Screen map canvas -->
                 <Canvas Name="canvasScreenMap"
-                      Cursor="Hand"
-                      Height="130" Margin="0,0,0,0"
-                      Background="Transparent"
-                      ClipToBounds="True"
-                       
-                      MouseDown="Canvas_MouseDown"
-                      MouseMove="Canvas_MouseMove"
-                      MouseUp="Canvas_MouseUp"
+                        Cursor="Hand"
+                        Height="130" Margin="0,0,0,0"
+                        Background="Transparent"
+                        ClipToBounds="True"
+                        MouseMove="Canvas_MouseMove"                        
+                        MouseDown="Canvas_MouseDown"
+                        MouseUp="Canvas_MouseUp"
                       >
                 </Canvas>
 
+                <!-- Screen map controls -->
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
 
                   <!-- Screen Area Width -->
-                  <GroupBox Header="Width" Height="50" Width="100" Margin="0,0,0,0">
+                  <GroupBox Header="Width" Height="50" Width="100">
                     <Grid>
-                      <TextBox Name="textScreenAreaWidth" Padding="4,0,0,0"
-                             HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                             TextChanged="TextChanged">1920</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">px</Label>
+                      <TextBox Name="textScreenAreaWidth" TextChanged="TextChanged">1920</TextBox>
+                      <Label HorizontalAlignment="Right">px</Label>
                     </Grid>
                   </GroupBox>
 
                   <!-- Screen Area Height -->
                   <GroupBox Header="Height" Height="50" Width="100" Margin="5,0,0,0">
                     <Grid>
-                      <TextBox Name="textScreenAreaHeight" Padding="4,0,0,0"
-                             HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                             TextChanged="TextChanged">1080</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">px</Label>
+                      <TextBox Name="textScreenAreaHeight" TextChanged="TextChanged">1080</TextBox>
+                      <Label HorizontalAlignment="Right">px</Label>
                     </Grid>
                   </GroupBox>
 
                   <!-- Screen Area Left -->
                   <GroupBox Header="Left Offset" Height="50" Width="100" Margin="5,0,0,0">
                     <Grid>
-                      <TextBox Name="textScreenAreaX" Padding="4,0,0,0"
-                             HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                             TextChanged="TextChanged">0</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">px</Label>
+                      <TextBox Name="textScreenAreaX" TextChanged="TextChanged">0</TextBox>
+                      <Label HorizontalAlignment="Right">px</Label>
                     </Grid>
                   </GroupBox>
 
                   <!-- Screen Area Top -->
                   <GroupBox Header="Top Offset" Height="50" Width="100" Margin="5,0,0,0">
                     <Grid>
-                      <TextBox Name="textScreenAreaY" Padding="4,0,0,0"
-                             HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                             TextChanged="TextChanged">0</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">px</Label>
+                      <TextBox Name="textScreenAreaY" TextChanged="TextChanged">0</TextBox>
+                      <Label HorizontalAlignment="Right">px</Label>
                     </Grid>
                   </GroupBox>
 
@@ -142,10 +150,10 @@
                   </GroupBox>
 
                 </StackPanel>
+
               </StackPanel>
             </GroupBox>
 
-
             <!-- Tablet area -->
             <GroupBox Header="Tablet Area"
                       HorizontalAlignment="Center"
@@ -181,43 +189,45 @@
                     <ColumnDefinition Width="*"/>
                   </Grid.ColumnDefinitions>
 
+                  <!-- Rotation + invert + area buttons -->
                   <StackPanel Grid.Column="0" HorizontalAlignment="Right">
 
+                    <!-- Rotation + Invert -->
                     <StackPanel Orientation="Horizontal">
 
                       <!-- Invert -->
                       <CheckBox Name="checkBoxInvert" Margin="5"
-                                VerticalAlignment="Center"
+                                VerticalAlignment="Bottom"
                                 VerticalContentAlignment="Center"
                             Checked="CheckboxChanged"
                             Unchecked="CheckboxChanged">
                         <TextBlock>
                           Left handed
                           <LineBreak/>
-                          (Inverted)
+                          (Invert)
                         </TextBlock>
                       </CheckBox>
 
-
-
                       <!-- Rotation -->
-                      <GroupBox Header="Rotation" Height="50" Width="100" Margin="5,0,0,0" HorizontalAlignment="Left">
+                      <GroupBox Header="Rotation" Height="50" Width="90" HorizontalAlignment="Left">
                         <Grid>
-                          <TextBox Name="textTabletAreaRotation" Padding="4,0,0,0"
-                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                               TextChanged="TextChanged">0</TextBox>
-                          <Label Width="30" HorizontalAlignment="Right">degrees</Label>
+                          <TextBox Name="textTabletAreaRotation" TextChanged="TextChanged">0</TextBox>
+                          <Label HorizontalAlignment="Right">deg</Label>
                         </Grid>
                       </GroupBox>
+
                     </StackPanel>
 
 
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <!-- Tablet area buttons -->
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,5,2,0">
 
                       <!-- Draw Area -->
-                      <Button Name="buttonDrawArea" Content="Draw Area" Width="80"
-                            Padding="5 5 5 5" Margin="5 5 0 5"
-                            Click="ButtonDrawArea_Click"
+                      <Button Name="buttonDrawArea"
+                              Width="80"
+                              Margin="0,0,5,0"
+                              Padding="5"
+                              Click="ButtonDrawArea_Click"
                               >
                         <Button.ToolTip>
                           <TextBlock>
@@ -226,12 +236,19 @@
                             To set the area, click the top left and the bottom right corners of the area with your tablet pen.
                           </TextBlock>
                         </Button.ToolTip>
+                        <TextBlock>
+                          Draw Area
+                        </TextBlock>
                       </Button>
 
                       <!-- Wacom Area -->
-                      <Button Name="buttonWacomArea" Content="Wacom Area" Width="80"
-                            Padding="5 5 5 5" Margin="5"
-                            Click="ButtonWacomArea_Click" />
+                      <Button Name="buttonWacomArea"
+                              Padding="5"
+                              Width="80"
+                              Margin="0,0,3,0"
+                              Click="ButtonWacomArea_Click">
+                        Wacom Area
+                      </Button>
 
                     </StackPanel>
 
@@ -241,35 +258,30 @@
 
                   <!-- Tablet area canvas -->
                   <Canvas Grid.Column="1" Name="canvasTabletArea"
-                      Cursor="Hand"
-                      Height="120" Margin="5,0,5,0"
-                      Background="Transparent"
-                      ClipToBounds="True"
-                      
-                      MouseDown="Canvas_MouseDown"
-                      MouseMove="Canvas_MouseMove"
-                      MouseUp="Canvas_MouseUp"
-                      >
-                  </Canvas>
-
+                          Cursor="Hand"
+                          Height="120" Margin="5,0,5,0"
+                          Background="Transparent"
+                          ClipToBounds="True"
+                          MouseMove="Canvas_MouseMove"                          
+                          MouseDown="Canvas_MouseDown"
+                          MouseUp="Canvas_MouseUp" />
+
+                  
+                  <!-- Output mode selector -->
                   <StackPanel Grid.Column="2">
-
-                    <CheckBox Name="checkBoxForceFullArea" Margin="5"
-                            Checked="CheckboxChanged"
-                            Unchecked="CheckboxChanged">Full Area</CheckBox>
-
-                    <!-- Output mode-->
+                    
                     <GroupBox Header="Mode" HorizontalAlignment="Left">
                       <GroupBox.ToolTip>
                         <TextBlock>
                           <TextBlock FontWeight="Bold" FontSize="16">Mode</TextBlock>
                           <LineBreak/>
-                          
                           <TextBlock FontWeight="Bold">Absolute</TextBlock>: Use this with osu!
                           <LineBreak/>
                           <TextBlock FontWeight="Bold">Relative</TextBlock>: Mouse mode. Sensitivity is determined by your tablet area size.
                           <LineBreak/>
                           <TextBlock FontWeight="Bold">Windows Ink</TextBlock>: Pen pressure is enabled in this mode. Check if your drawing application supports Windows Ink.
+                          <LineBreak/>
+                          <TextBlock FontWeight="Bold">SendInput</TextBlock>: This is for debugging and testing purposes. Use this if you have problems with the absolute mode.
                         </TextBlock>
                       </GroupBox.ToolTip>
                       <StackPanel>
@@ -280,109 +292,114 @@
                                      Checked="CheckboxChanged" />
                         <RadioButton Name="radioModeDigitizer" GroupName="OutputMode" Margin="2" Content="Windows Ink (Draw)"
                                      Checked="CheckboxChanged" />
-
+                        <RadioButton Name="radioModeSendInput" GroupName="OutputMode" Margin="2" Content="SendInput (Debug)"
+                                     Checked="CheckboxChanged" />
                       </StackPanel>
                     </GroupBox>
 
                   </StackPanel>
+
                 </Grid>
+
                 <!-- Tablet area settings -->
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
 
                   <!-- Tablet Area Width -->
                   <GroupBox Header="Width" Height="50" Width="90" Margin="0,0,0,0">
                     <Grid>
-                      <TextBox Name="textTabletAreaWidth" Padding="4,0,0,0"
-                             HorizontalContentAlignment="Left"
-                             VerticalContentAlignment="Center"
-                             TextChanged="TextChanged">80</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">mm</Label>
+                      <TextBox Name="textTabletAreaWidth" TextChanged="TextChanged">80</TextBox>
+                      <Label HorizontalAlignment="Right">mm</Label>
                     </Grid>
                   </GroupBox>
 
                   <!-- Tablet Area Height -->
                   <GroupBox Header="Height" Height="50" Width="90" Margin="5,0,0,0">
                     <Grid>
-                      <TextBox Name="textTabletAreaHeight" Padding="4,0,0,0"
-                             HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                             TextChanged="TextChanged">45</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">mm</Label>
+                      <TextBox Name="textTabletAreaHeight" TextChanged="TextChanged">45</TextBox>
+                      <Label HorizontalAlignment="Right">mm</Label>
                     </Grid>
                   </GroupBox>
 
                   <!-- Tablet Area Left -->
                   <GroupBox Header="X" Height="50" Width="90" Margin="5,0,0,0">
                     <Grid>
-                      <TextBox Name="textTabletAreaX" Padding="4,0,0,0"
-                             HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                             TextChanged="TextChanged">0</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">mm</Label>
+                      <TextBox Name="textTabletAreaX" TextChanged="TextChanged">0</TextBox>
+                      <Label HorizontalAlignment="Right">mm</Label>
                     </Grid>
                   </GroupBox>
 
                   <!-- Tablet Area Top -->
                   <GroupBox Header="Y" Height="50" Width="90" Margin="5,0,0,0">
                     <Grid>
-                      <TextBox Name="textTabletAreaY" Padding="4,0,0,0"
-                             HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                             TextChanged="TextChanged">0</TextBox>
-                      <Label Width="30" HorizontalAlignment="Right">mm</Label>
+                      <TextBox Name="textTabletAreaY" TextChanged="TextChanged">0</TextBox>
+                      <Label HorizontalAlignment="Right">mm</Label>
                     </Grid>
                   </GroupBox>
 
-                  <!-- Force Aspect Ratio -->
-                  <CheckBox Name="checkBoxForceAspect" VerticalAlignment="Center" Margin="5" VerticalContentAlignment="Center"
-                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">
-                    <StackPanel Orientation="Vertical">
-                      <TextBlock>Force</TextBlock>
-                      <TextBlock>Aspect Ratio</TextBlock>
+                  <!-- Talbet area checkboxes -->
+                  <StackPanel Orientation="Vertical" VerticalAlignment="Bottom">
 
-                    </StackPanel>
-                  </CheckBox>
+                    <!-- Full area checkbox -->
+                    <CheckBox Name="checkBoxForceFullArea"
+                              Margin="3"
+                              Checked="CheckboxChanged"
+                              Unchecked="CheckboxChanged">
+                      Full area
+                    </CheckBox>
+
+                    <!-- Force Aspect Ratio -->
+                    <CheckBox Name="checkBoxForceAspect"
+                            Margin="3"
+                            Checked="CheckboxChanged"
+                            Unchecked="CheckboxChanged">
+                      Force aspect ratio
+                    </CheckBox>
+
+                  </StackPanel>
 
                 </StackPanel>
 
               </StackPanel>
             </GroupBox>
 
-
-
           </StackPanel>
         </ScrollViewer>
       </TabItem>
 
       <!-- Buttons tab -->
-      <TabItem>
+      <TabItem Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#006699" FontWeight="Bold">
             <AccessText Text="_Buttons"/>
           </TextBlock>
         </TabItem.Header>
-        <StackPanel Orientation="Vertical"
-                    Margin="5,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Top"
-                    Width="650">
-
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="auto" />
-            </Grid.ColumnDefinitions>
+        <ScrollViewer VerticalScrollBarVisibility="Auto">
 
-            <Grid.RowDefinitions>
-              <RowDefinition Height="auto" />
-              <RowDefinition Height="auto" />
-            </Grid.RowDefinitions>
+          <StackPanel Orientation="Vertical"
+                      Margin="5,0"
+                      HorizontalAlignment="Left"
+                      VerticalAlignment="Top"
+                      Width="650">
 
-            <!-- Pen Buttons -->
-            <GroupBox Grid.Column="0" Grid.Row="0" Header="Pen Buttons">
-              <GroupBox.ToolTip>
-                <StackPanel>
-                  <TextBlock FontWeight="Bold" FontSize="16">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="auto" />
+              </Grid.ColumnDefinitions>
+
+              <Grid.RowDefinitions>
+                <RowDefinition Height="auto" />
+                <RowDefinition Height="auto" />
+              </Grid.RowDefinitions>
+
+              <!-- Pen Buttons -->
+              <GroupBox Grid.Column="0" Grid.Row="0" Header="Pen Buttons">
+                <GroupBox.ToolTip>
+                  <StackPanel>
+                    <TextBlock FontWeight="Bold" FontSize="16">
                     Pen Buttons
-                  </TextBlock>
-                  <TextBlock>
+                    </TextBlock>
+                    <TextBlock>
                       - You can disable a single button by clicking "Clear" in the mapping dialog.
                       <LineBreak/>
                       - The "Disable buttons" checkbox will disable all pen buttons.
@@ -390,57 +407,48 @@
                       - Use negative number in scroll sensitivity to invert the direction.
                       <LineBreak/>
                       - Scroll acceleration 1.0 = No acceleration.
-                  </TextBlock>
-                </StackPanel>
-              </GroupBox.ToolTip>
+                    </TextBlock>
+                  </StackPanel>
+                </GroupBox.ToolTip>
 
-              <StackPanel Orientation="Vertical" HorizontalAlignment="Center" >
+                <StackPanel Orientation="Vertical" HorizontalAlignment="Center" >
 
-                <!-- Top -->
+                  <!-- Top -->
                   <GroupBox Header="Top" Width="120" HorizontalAlignment="Left">
-                    <!--
-                    <ComboBox Name="comboBoxButton3" SelectionChanged="ItemSelectionChanged">
-                    </ComboBox>
-                    -->
                     <Button Name="buttonPenButton3" Height="22"
-                            ToolTip=""
-                            ToolTipOpening="ButtonMap_ToolTipOpening"
-                            Padding="2,0,2,0"
+                            Padding="2,0"
                             Background="White"
-                            Click="ButtonMap_Click"
-                            >MOUSE1</Button>
+                            ToolTip=""
+                            ToolTipOpening="ButtonMap_ToolTipOpening"                           
+                            Click="ButtonMap_Click">
+                      MOUSE1
+                    </Button>
                   </GroupBox>
 
 
                   <!-- Bottom -->
-                <GroupBox Header="Bottom" Width="120" HorizontalAlignment="Left">
-                    <!--
-                    <ComboBox Name="comboBoxButton2" SelectionChanged="ItemSelectionChanged">
-                    </ComboBox>
-                    -->
+                  <GroupBox Header="Bottom" Width="120" HorizontalAlignment="Left">
                     <Button Name="buttonPenButton2" Height="22"
-                            ToolTip=""
-                            ToolTipOpening="ButtonMap_ToolTipOpening"
-                            Padding="2,0,2,0"
+                            Padding="2,0"
                             Background="White"
-                            Click="ButtonMap_Click"
-                            >MOUSE1</Button>
+                            ToolTip=""
+                            ToolTipOpening="ButtonMap_ToolTipOpening"                           
+                            Click="ButtonMap_Click">
+                      MOUSE1
+                    </Button>
                   </GroupBox>
 
 
                   <!-- Tip -->
-                <GroupBox Header="Tip" Width="120"  HorizontalAlignment="Left">
-                    <!--
-                    <ComboBox Name="comboBoxButton1" SelectionChanged="ItemSelectionChanged">
-                    </ComboBox>
-                    -->
+                  <GroupBox Header="Tip" Width="120"  HorizontalAlignment="Left">
                     <Button Name="buttonPenButton1" Height="22"
-                            ToolTip=""
-                            ToolTipOpening="ButtonMap_ToolTipOpening"
-                            Padding="2,0,2,0"
+                            Padding="2,0"
                             Background="White"
-                            Click="ButtonMap_Click"
-                            >MOUSE1</Button>
+                            ToolTip=""
+                            ToolTipOpening="ButtonMap_ToolTipOpening"                           
+                            Click="ButtonMap_Click">
+                      MOUSE1
+                    </Button>
                   </GroupBox>
 
                   <!-- Disable buttons -->
@@ -452,75 +460,71 @@
                     <TextBlock>Disable buttons</TextBlock>
                   </CheckBox>
 
-              </StackPanel>
-            </GroupBox>
+                </StackPanel>
+              </GroupBox>
 
 
-            <!-- Scroll -->
-            <GroupBox Grid.Row="1" Header="Mouse Scroll">
-              <GroupBox.ToolTip>
-                <StackPanel>
-                  <TextBlock FontWeight="Bold" FontSize="16">
+              <!-- Scroll -->
+              <GroupBox Grid.Row="1" Header="Mouse Scroll">
+                <GroupBox.ToolTip>
+                  <StackPanel>
+                    <TextBlock FontWeight="Bold" FontSize="16">
                     Mouse Scroll
-                  </TextBlock>
-                  <TextBlock>
+                    </TextBlock>
+                    <TextBlock>
                       - Use negative number in sensitivity to invert the direction.
                       <LineBreak/>
                       - Acceleration 1.0 = No acceleration. Recommended range is from 1 to 5.
-                  </TextBlock>
-                </StackPanel>
-              </GroupBox.ToolTip>
-              <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
-
-                <!-- Scroll sensitivity -->
-                <GroupBox Header="Sensitivity" Height="50" Width="120" HorizontalAlignment="Left">
-                  <Grid>
-                    <TextBox Name="textScrollSensitivity" Padding="4,0,0,0"
-                             HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                             TextChanged="TextChanged">0.5</TextBox>
-                    <Label HorizontalAlignment="Right">s/mm</Label>
-                  </Grid>
-                </GroupBox>
-                
-                <!-- Scroll acceleration -->
-                <GroupBox Header="Acceleration" Height="50" Width="120" HorizontalAlignment="Left">
-                  <Grid>
-                    <TextBox Name="textScrollAcceleration" Padding="4,0,0,0"
-                             HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                             TextChanged="TextChanged">1.0</TextBox>
-                  </Grid>
-                </GroupBox>
+                    </TextBlock>
+                  </StackPanel>
+                </GroupBox.ToolTip>
+                <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
 
-                <!-- Scroll stop cursor -->
-                <CheckBox Name="checkBoxScrollStopCursor"
+                  <!-- Scroll sensitivity -->
+                  <GroupBox Header="Sensitivity" Height="50" Width="120" HorizontalAlignment="Left">
+                    <Grid>
+                      <TextBox Name="textScrollSensitivity" TextChanged="TextChanged">0.5</TextBox>
+                      <Label HorizontalAlignment="Right">s/mm</Label>
+                    </Grid>
+                  </GroupBox>
+
+                  <!-- Scroll acceleration -->
+                  <GroupBox Header="Acceleration" Height="50" Width="120" HorizontalAlignment="Left">
+                    <Grid>
+                      <TextBox Name="textScrollAcceleration" TextChanged="TextChanged">1.0</TextBox>
+                    </Grid>
+                  </GroupBox>
+
+                  <!-- Scroll stop cursor -->
+                  <CheckBox Name="checkBoxScrollStopCursor"
                           Margin="7,5,0,0"
                           HorizontalAlignment="Left"
                           Checked="CheckboxChanged"
                           Unchecked="CheckboxChanged">
-                  <TextBlock>Stop cursor</TextBlock>
-                </CheckBox>
+                    <TextBlock>Stop cursor</TextBlock>
+                  </CheckBox>
 
-              </StackPanel>
-            </GroupBox>
+                </StackPanel>
+              </GroupBox>
 
-            
-            <!-- Windows Ink Pressure -->
-            <GroupBox Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Name="groupBoxWindowsInkSettings" Header="Windows Ink Settings">
-              <StackPanel Orientation="Vertical">
 
-                <!-- Tip Firmness -->
-                <GroupBox Header="Tip Firmness">
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="auto"/>
-                      <ColumnDefinition Width="*"/>
-                      <ColumnDefinition Width="auto"/>
-                    </Grid.ColumnDefinitions>
+              <!-- Windows Ink Pressure -->
+              <GroupBox Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Name="groupBoxWindowsInkSettings" Header="Windows Ink Settings">
+                <StackPanel Orientation="Vertical">
 
-                    <Label Grid.Column="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">Soft</Label>
+                  <!-- Tip Firmness -->
+                  <GroupBox Header="Tip Firmness">
+                    <Grid>
+                      <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="auto"/>
+                      </Grid.ColumnDefinitions>
+
+                      <Label Grid.Column="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">Soft</Label>
 
-                    <!-- Pressure slider -->
-                    <Slider Grid.Column="1" Name="sliderPressureSensitivity"
+                      <!-- Pressure slider -->
+                      <Slider Grid.Column="1" Name="sliderPressureSensitivity"
                             IsSnapToTickEnabled="True"
                             TickFrequency="0.2"
                             TickPlacement="Both"
@@ -532,24 +536,24 @@
                             IsDirectionReversed="True"
                             ValueChanged="SliderPressure_ValueChanged"
                             >
-                    </Slider>
-                    <Label Grid.Column="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">Hard</Label>
-                  </Grid>
-                </GroupBox>
+                      </Slider>
+                      <Label Grid.Column="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">Hard</Label>
+                    </Grid>
+                  </GroupBox>
 
-                <!-- Pressure Deadzone -->
-                <GroupBox Header="Pressure Deadzone">
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="auto"/>
-                      <ColumnDefinition Width="*"/>
-                      <ColumnDefinition Width="auto"/>
-                    </Grid.ColumnDefinitions>
+                  <!-- Pressure Deadzone -->
+                  <GroupBox Header="Pressure Deadzone">
+                    <Grid>
+                      <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="auto"/>
+                      </Grid.ColumnDefinitions>
 
-                    <Label Grid.Column="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">0%</Label>
+                      <Label Grid.Column="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">0%</Label>
 
-                    <!-- Deadzone slider -->
-                    <Slider Grid.Column="1" Name="sliderPressureDeadzone"
+                      <!-- Deadzone slider -->
+                      <Slider Grid.Column="1" Name="sliderPressureDeadzone"
                             IsSnapToTickEnabled="True"
                             TickFrequency="0.01"
                             TickPlacement="Both"
@@ -561,22 +565,22 @@
                             ToolTip="0%"
                             ValueChanged="SliderPressure_ValueChanged"
                             >
-                    </Slider>
-                    <Label Grid.Column="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">25%</Label>
-                  </Grid>
-                </GroupBox>
+                      </Slider>
+                      <Label Grid.Column="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">25%</Label>
+                    </Grid>
+                  </GroupBox>
 
 
 
-                <!-- Pressure Tester  -->
-                <GroupBox Header="Test" Padding="2">
-                  <StackPanel Orientation="Vertical">
-                    <Border BorderThickness="2"
+                  <!-- Pressure Tester  -->
+                  <GroupBox Header="Test" Padding="2">
+                    <StackPanel Orientation="Vertical">
+                      <Border BorderThickness="2"
                           BorderBrush="#335"
                           >
 
-                      <!-- Ink Canvas -->
-                      <InkCanvas Width="470"
+                        <!-- Ink Canvas -->
+                        <InkCanvas Width="470"
                              Height="250"
                              Name="inkCanvas"
                              Background="#f6f6f6"
@@ -584,11 +588,11 @@
                              StylusMove="InkCanvas_StylusMove"
                              KeyDown="InkCanvas_KeyDown"
                              >
-                      </InkCanvas>
-                    </Border>
+                        </InkCanvas>
+                      </Border>
 
-                    <!-- Pressure Bar -->
-                    <ProgressBar Name="progressPressure"
+                      <!-- Pressure Bar -->
+                      <ProgressBar Name="progressPressure"
                              Minimum="0"
                              Value="0.0"
                              Maximum="1.0"
@@ -596,20 +600,20 @@
                              Background="#f6f6f6"
                              Foreground="#555"
                              />
-                  </StackPanel>
-                </GroupBox>
+                    </StackPanel>
+                  </GroupBox>
 
-                <!-- Ink canvas buttons -->
-                <Grid Margin="2,4,2,0">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="auto"/>
-                    <ColumnDefinition Width="auto"/>
-                    <ColumnDefinition Width="*"/>
-                  </Grid.ColumnDefinitions>
+                  <!-- Ink canvas buttons -->
+                  <Grid Margin="2,4,2,0">
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="*"/>
+                      <ColumnDefinition Width="auto"/>
+                      <ColumnDefinition Width="auto"/>
+                      <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
 
-                  <!-- Clear Ink -->
-                  <Button Name="buttonInkClear" Content="Clear"
+                    <!-- Clear Ink -->
+                    <Button Name="buttonInkClear" Content="Clear"
                           Grid.Column="0"
                           HorizontalAlignment="Left"
                           Padding="5"
@@ -618,8 +622,8 @@
                           Click="ButtonInkClear_Click" />
 
 
-                  <!-- Undo -->
-                  <Button Name="buttonInkUndo" Content="Undo"
+                    <!-- Undo -->
+                    <Button Name="buttonInkUndo" Content="Undo"
                           Grid.Column="1"
                           Width="80"
                           Padding="5"
@@ -627,8 +631,8 @@
                           FontWeight="Bold"
                           Click="ButtonInkUndo_Click" />
 
-                  <!-- Redo -->
-                  <Button Name="buttonInkRedo" Content="Redo"
+                    <!-- Redo -->
+                    <Button Name="buttonInkRedo" Content="Redo"
                           Grid.Column="2"
                           Width="80"
                           Margin="3,0,0,0"
@@ -637,8 +641,8 @@
                           Click="ButtonInkRedo_Click" />
 
 
-                  <!-- Save as PNG -->
-                  <Button Name="buttonInkSave" Content="Save as PNG"
+                    <!-- Save as PNG -->
+                    <Button Name="buttonInkSave" Content="Save as PNG"
                           Grid.Column="3"
                           HorizontalAlignment="Right"
                           Width="100"
@@ -647,42 +651,44 @@
                           Click="ButtonInkSave_Click" />
 
 
-                </Grid>
+                  </Grid>
 
 
-              </StackPanel>
-            </GroupBox>
+                </StackPanel>
+              </GroupBox>
 
-          </Grid>
+            </Grid>
 
 
 
-          <!-- Tablet buttons -->
-          <GroupBox Name="groupBoxTabletButtons" Header="Tablet Buttons"
+            <!-- Tablet buttons -->
+            <GroupBox Name="groupBoxTabletButtons" Header="Tablet Buttons"
                       Margin="0,5,0,5" Width="650">
-            <GroupBox.ToolTip>
-              <StackPanel>
-                <TextBlock FontWeight="Bold" FontSize="16">
+              <GroupBox.ToolTip>
+                <StackPanel>
+                  <TextBlock FontWeight="Bold" FontSize="16">
                     Tablet Buttons
-                </TextBlock>
-                <TextBlock>
+                  </TextBlock>
+                  <TextBlock>
                       - You can disable a single button by clicking "Clear" in the mapping dialog.
                       <LineBreak/>
                       - The "Disable buttons" checkbox will disable all tablet buttons.
-                </TextBlock>
-              </StackPanel>
-            </GroupBox.ToolTip>
-            <WrapPanel Name="wrapPanelTabletButtons"></WrapPanel>
+                  </TextBlock>
+                </StackPanel>
+              </GroupBox.ToolTip>
+              <WrapPanel Name="wrapPanelTabletButtons"></WrapPanel>
 
-          </GroupBox>
+            </GroupBox>
 
 
 
-        </StackPanel>
+          </StackPanel>
+
+        </ScrollViewer>
       </TabItem>
 
       <!-- Filters tab -->
-      <TabItem>
+      <TabItem Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#003399" FontWeight="Bold">
             <AccessText Text="_Filters"/>
@@ -734,10 +740,8 @@
               <!-- Filter Latency -->
               <GroupBox Header="Latency" Height="50" Width="80" Margin="0,0,0,0">
                 <Grid>
-                  <TextBox Name="textSmoothingLatency" Padding="4,0,0,0"
-                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                               TextChanged="TextChanged">0</TextBox>
-                  <Label Width="30" HorizontalAlignment="Right">ms</Label>
+                  <TextBox Name="textSmoothingLatency" TextChanged="TextChanged">0</TextBox>
+                  <Label HorizontalAlignment="Right">ms</Label>
                 </Grid>
               </GroupBox>
 
@@ -834,37 +838,17 @@
 
               <!-- Noise filter buffer size -->
               <GroupBox Header="Buffer" Height="50" Margin="0,0,0,0">
-                <TextBox Name="textNoiseBuffer" Padding="4,0,0,0"
-                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                               TextChanged="TextChanged">10</TextBox>
+                <TextBox Name="textNoiseBuffer" TextChanged="TextChanged">10</TextBox>
               </GroupBox>
 
               <!-- Noise filter threshold -->
               <GroupBox Header="Threshold" Height="50" Width="80" Margin="0,0,0,0">
                 <Grid>
-                  <TextBox Name="textNoiseThreshold" Padding="4,0,0,0"
-                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                               TextChanged="TextChanged">1.0</TextBox>
-                  <Label Width="30" HorizontalAlignment="Right">mm</Label>
+                  <TextBox Name="textNoiseThreshold" TextChanged="TextChanged">1.0</TextBox>
+                  <Label HorizontalAlignment="Right">mm</Label>
                 </Grid>
               </GroupBox>
 
-              <!-- Noise filter presets -->
-              <!--
-                <GroupBox Header="Presets"
-                          VerticalAlignment="Top" HorizontalAlignment="Left"
-                          Height="50" Width="150">
-                  <ComboBox Name="comboBoxNoisePreset" SelectionChanged="ItemSelectionChanged" VerticalContentAlignment="Center"
-                            Text="">
-                    <ComboBoxItem IsSelected="True">-</ComboBoxItem>
-                    <ComboBoxItem>Wacom CTL-470</ComboBoxItem>
-                    <ComboBoxItem>Wacom CTL-471</ComboBoxItem>
-                    <ComboBoxItem>Wacom CTL-472</ComboBoxItem>
-                    <ComboBoxItem>Wacom CTL-480</ComboBoxItem>
-                  </ComboBox>
-                </GroupBox>
-                -->
-
             </StackPanel>
 
 
@@ -976,23 +960,14 @@
 
               <!-- Anti-smoothing power -->
               <GroupBox Header="Shape" Height="50" Margin="0,0,0,0" Width="60">
-                <TextBox Name="textAntiSmoothingShape" Padding="4,0,0,0"
-                      HorizontalContentAlignment="Left"
-                      VerticalContentAlignment="Center"
-                      TextChanged="TextChanged"
-                  >0.3</TextBox>
+                <TextBox Name="textAntiSmoothingShape" TextChanged="TextChanged">0.3</TextBox>
               </GroupBox>
 
               <!-- Anti-smoothing compensation -->
               <GroupBox Header="Compensation" Height="50" Margin="0,0,0,0">
                 <Grid>
-                  <TextBox Name="textAntiSmoothingCompensation"
-                         Padding="4,0,0,0"
-                         HorizontalContentAlignment="Left"
-                         VerticalContentAlignment="Center"
-                         TextChanged="TextChanged">20</TextBox>
+                  <TextBox Name="textAntiSmoothingCompensation" TextChanged="TextChanged">20</TextBox>
                   <Label HorizontalAlignment="Right">ms</Label>
-
                 </Grid>
               </GroupBox>
 
@@ -1017,7 +992,7 @@
       </TabItem>
 
       <!-- Misc tab -->
-      <TabItem>
+      <TabItem Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#000066" FontWeight="Bold">
             <AccessText Text="_Misc"/>
@@ -1046,20 +1021,16 @@
               <!-- Desktop Width -->
               <GroupBox Header="Width" Width="80" Margin="2,0,0,0">
                 <Grid>
-                  <TextBox Name="textDesktopWidth" Padding="4,0,0,0"
-                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                               TextChanged="TextChanged">1920</TextBox>
-                  <Label Width="30" HorizontalAlignment="Right">px</Label>
+                  <TextBox Name="textDesktopWidth" TextChanged="TextChanged">1920</TextBox>
+                  <Label HorizontalAlignment="Right">px</Label>
                 </Grid>
               </GroupBox>
 
               <!-- Desktop Height -->
               <GroupBox Header="Height" Width="80" Margin="5,0,0,0">
                 <Grid>
-                  <TextBox Name="textDesktopHeight" Padding="4,0,0,0"
-                               HorizontalContentAlignment="Left" VerticalContentAlignment="Center"
-                               TextChanged="TextChanged">1080</TextBox>
-                  <Label Width="30" HorizontalAlignment="Right">px</Label>
+                  <TextBox Name="textDesktopHeight" TextChanged="TextChanged">1080</TextBox>
+                  <Label HorizontalAlignment="Right">px</Label>
                 </Grid>
               </GroupBox>
 
@@ -1075,7 +1046,7 @@
       </TabItem>
 
       <!-- Commands tab -->
-      <TabItem Name="tabCommands">
+      <TabItem Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#000" FontWeight="Bold">
             <AccessText Text="C_ommands"/>
@@ -1102,6 +1073,7 @@
                      TextWrapping="NoWrap"
                      Padding="2,5,2,5"
                      VerticalScrollBarVisibility="Auto"
+                     VerticalContentAlignment="Top"
                      Keyboard.PreviewKeyDown="TextCommands_PreviewKeyDown"
                      TextChanged="TextChanged">
               <TextBox.ContextMenu>
@@ -1118,9 +1090,9 @@
           </GroupBox>
         </Grid>
       </TabItem>
-      
+
       <!-- Console tab -->
-      <TabItem Name="tabConsole">
+      <TabItem Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#000" FontWeight="Bold">
             <AccessText Text="_Console"/>
@@ -1131,7 +1103,7 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto" />
           </Grid.RowDefinitions>
-          <ScrollViewer Grid.Row="0" Name="scrollConsole" Margin="5,0,5,0"
+          <ScrollViewer Grid.Row="0" Name="scrollConsole" Margin="5,3,5,0"
                         VerticalScrollBarVisibility="Auto"
                         HorizontalScrollBarVisibility="Auto">
 
@@ -1195,25 +1167,34 @@
         </Grid>
 
       </TabItem>
-    
+
     </TabControl>
 
-    <Grid Margin="5,5,5,25" Height="35" VerticalAlignment="Bottom">
+    <Grid Grid.Row="2" Margin="5,0">
 
       <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
 
         <!-- Save -->
-        <Button Name="buttonSaveSettings" Margin="0,5,5,5" Padding="10,0,10,0" Click="SaveSettings"
-                ToolTip="Saves settings to config.xml and send setting commands to driver">Save settings</Button>
+        <Button Name="buttonSaveSettings"
+                Margin="0,5"
+                Padding="10,5"
+                Click="SaveSettings"
+                ToolTip="Saves settings to config.xml and send setting commands to driver">
+          Save settings
+        </Button>
 
       </StackPanel>
 
       <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
 
         <!-- Restart Driver -->
-        <Button Name="buttonRestartDriver" Margin="5,5,5,5" Padding="5,0,5,0"
-              Click="RestartDriverClick"
-                ToolTip="Restarts the TabletDriverService">Restart Driver</Button>
+        <Button Name="buttonRestartDriver" 
+                Margin="0,5"
+                Padding="10,5"
+                Click="RestartDriverClick"
+                ToolTip="Restarts the TabletDriverService">
+          Restart Driver
+        </Button>
 
         <!-- Automatic restart -->
         <CheckBox Name="checkBoxAutomaticRestart" Margin="5,5,5,5" 
@@ -1229,7 +1210,7 @@
       </StackPanel>
     </Grid>
 
-    <StatusBar Height="25" VerticalAlignment="Bottom">
+    <StatusBar Grid.Row="3" Height="25" VerticalAlignment="Bottom">
       <StatusBarItem HorizontalAlignment="Left">
         <TextBlock Name="textStatus"></TextBlock>
       </StatusBarItem>
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index b669fc0..4dcc0b8 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -25,7 +25,7 @@ public partial class MainWindow : Window
     {
 
         // Version
-        public string Version = "0.2.2";
+        public string Version = "0.2.3";
 
         // Console stuff
         private List<string> commandHistory;
@@ -134,8 +134,7 @@ public MainWindow()
             notifyIcon.ContextMenu.MenuItems[0].Enabled = false;
 
             notifyIcon.Text = "";
-            notifyIcon.DoubleClick += NotifyIcon_DoubleClick;
-            notifyIcon.Click += NotifyIcon_DoubleClick;
+            notifyIcon.MouseClick += NotifyIcon_Click;
             notifyIcon.Visible = true;
             IsRealExit = false;
 
@@ -202,7 +201,7 @@ public MainWindow()
                 {
                     Height = 22,
                     Content = "",
-                    Padding = new Thickness(2,0,2,0),
+                    Padding = new Thickness(2, 0, 2, 0),
                     ToolTip = "Empty",
                     Background = Brushes.White
                 };
@@ -238,11 +237,13 @@ public MainWindow()
             inkCanvasUndoHistory = new StrokeCollection();
 
             // Ink canvas drawing attributes
-            inkCanvasDrawingAttributes = new DrawingAttributes();
-            inkCanvasDrawingAttributes.Width = 10;
-            inkCanvasDrawingAttributes.Height = 10;
-            inkCanvasDrawingAttributes.Color = Color.FromRgb(0x55, 0x55, 0x55);
-            inkCanvasDrawingAttributes.StylusTip = StylusTip.Ellipse;
+            inkCanvasDrawingAttributes = new DrawingAttributes
+            {
+                Width = 10,
+                Height = 10,
+                Color = Color.FromRgb(0x55, 0x55, 0x55),
+                StylusTip = StylusTip.Ellipse
+            };
             inkCanvas.DefaultDrawingAttributes = inkCanvasDrawingAttributes;
 
             // Process command line arguments
@@ -294,40 +295,10 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
                 isFirstStart = true;
                 config = new Configuration();
             }
-            isLoadingSettings = true;
-            Width = config.WindowWidth;
-            Height = config.WindowHeight;
-            isLoadingSettings = false;
-
 
-            if (!config.DeveloperMode)
-            {
-            }
-
-
-            // Invalid config -> Set defaults
-            if (config.ScreenArea.Width == 0 || config.ScreenArea.Height == 0)
-            {
-                config.DesktopSize.Width = GetVirtualDesktopSize().Width;
-                config.DesktopSize.Height = GetVirtualDesktopSize().Height;
-                config.ScreenArea.Width = config.DesktopSize.Width;
-                config.ScreenArea.Height = config.DesktopSize.Height;
-                config.ScreenArea.X = 0;
-                config.ScreenArea.Y = 0;
-            }
+            // Initialize configuration
+            InitializeConfiguration();
 
-            // Create canvas elements
-            CreateCanvasElements();
-
-            // Load settings from configuration
-            LoadSettingsFromConfiguration();
-
-            // Update the settings back to the configuration
-            UpdateSettingsToConfiguration();
-
-
-            // Set run at startup
-            SetRunAtStartup(config.RunAtStartup);
 
             // Hide the window if the GUI is started as minimized
             if (WindowState == WindowState.Minimized)
@@ -386,13 +357,22 @@ void ProcessCommandLineArguments()
 
         #region Notify icon stuff
 
-        // Notify icon double click -> show window
-        private void NotifyIcon_DoubleClick(object sender, EventArgs e)
+        //
+        // Notify icon click -> show window
+        //
+        private void NotifyIcon_Click(object sender, System.Windows.Forms.MouseEventArgs e)
         {
+            // Is not mouse left button?
+            if (e.Button != System.Windows.Forms.MouseButtons.Left)
+                return;
+
+            // Minimized -> Show window
             if (WindowState == WindowState.Minimized)
             {
                 NotifyShowWindow(sender, e);
             }
+
+            // Hide window
             else
             {
                 NotifyHideWindow(sender, e);
@@ -602,6 +582,8 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
 
 
 
+
+
         #endregion
 
     }
diff --git a/TabletDriverService/CommandHandler.Other.cpp b/TabletDriverService/CommandHandler.Other.cpp
index fbfecd7..97e64f7 100644
--- a/TabletDriverService/CommandHandler.Other.cpp
+++ b/TabletDriverService/CommandHandler.Other.cpp
@@ -395,6 +395,19 @@ void CommandHandler::CreateOtherCommands() {
 		int stringIndex = 0;
 
 		LOG_INFO("\n");
+
+		// VMulti type
+		switch(vmulti->type) {
+		case VMulti::TypeXPPen: LOG_INFO("VMulti: XP-Pen\n"); break;
+		case VMulti::TypeVEIKK: LOG_INFO("VMulti: VEIKK\n"); break;
+		default: break;
+		}
+
+		LOG_INFO("\n");
+
+		//
+		// Tablet
+		//
 		LOG_INFO("Tablet: %s\n", tablet->name.c_str());
 		LOG_INFO("  Width = %0.2f mm\n", tablet->settings.width);
 		LOG_INFO("  Height = %0.2f mm\n", tablet->settings.height);
@@ -407,7 +420,6 @@ void CommandHandler::CreateOtherCommands() {
 		LOG_INFO("  Report Length = %d bytes\n", tablet->settings.reportLength);
 		LOG_INFO("  Detect Mask = 0x%02X\n", tablet->settings.detectMask);
 		LOG_INFO("  Ignore Mask = 0x%02X\n", tablet->settings.ignoreMask);
-		LOG_INFO("  Aux button count = %d\n", tablet->settings.auxButtonCount);
 
 		for(int i = 0; i < tablet->settings.buttonCount; i++) {
 			stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "'%s' ", tablet->settings.buttonMap[i].c_str());
@@ -423,15 +435,27 @@ void CommandHandler::CreateOtherCommands() {
 			LOG_INFO("  Aux button map = %s\n", stringBuffer);
 		}
 
-
+		LOG_INFO("  Aux button count = %d\n", tablet->settings.auxButtonCount);
 
 		if(tablet->initFeatureLength > 0) {
-			LOG_INFOBUFFER(tablet->initFeature, tablet->initFeatureLength, "  Tablet init feature report: ");
+			LOG_INFOBUFFER(tablet->initFeature, tablet->initFeatureLength, "  Init feature report: ");
 		}
 		if(tablet->initReportLength > 0) {
-			LOG_INFOBUFFER(tablet->initReport, tablet->initReportLength, "  Tablet init report: ");
+			LOG_INFOBUFFER(tablet->initReport, tablet->initReportLength, "  Init report: ");
+		}
+		if(tablet->initStrings.size() > 0) {
+			string stringIds = "";
+			for(int stringId : tablet->initStrings) {
+				stringIds += to_string(stringId) + " ";
+			}
+			LOG_INFO("  Init string ids: %s\n", stringIds.c_str());
 		}
+
 		LOG_INFO("\n");
+
+		//
+		// Areas
+		//
 		LOG_INFO("Area:\n");
 		LOG_INFO("  Desktop = %0.0fpx x %0.0fpx\n",
 			mapper->areaVirtualScreen.width, mapper->areaVirtualScreen.height
@@ -561,7 +585,7 @@ void CommandHandler::CreateOtherCommands() {
 					commandsString += aliasNames[aliasPair.first] + " ";
 				}
 			}
-			
+
 			if(commandsString.size() > 80) {
 				LOG_STATUS("COMMANDS %s\n", commandsString.c_str());
 				commandsString = "";
diff --git a/TabletDriverService/CommandHandler.Tablet.cpp b/TabletDriverService/CommandHandler.Tablet.cpp
index fa45cba..385c0e8 100644
--- a/TabletDriverService/CommandHandler.Tablet.cpp
+++ b/TabletDriverService/CommandHandler.Tablet.cpp
@@ -620,8 +620,17 @@ void CommandHandler::CreateTabletCommands() {
 	AddAlias("Sensitivity", "RelativeSensitivity");
 	AddCommand(new Command("RelativeSensitivity", [&](CommandLine *cmd) {
 		if(!ExecuteCommand("TabletValid")) return false;
-		outputManager->settings->relativeSensitivity = cmd->GetDouble(0, outputManager->settings->relativeSensitivity);
-		LOG_INFO("Relative mode sensitivity = %0.2f px/mm\n", outputManager->settings->relativeSensitivity);
+		outputManager->settings->relativeSensitivity.x = cmd->GetDouble(0, outputManager->settings->relativeSensitivity.x);
+		outputManager->settings->relativeSensitivity.y = cmd->GetDouble(1, outputManager->settings->relativeSensitivity.y);
+
+		if(cmd->valueCount == 1) {
+			outputManager->settings->relativeSensitivity.y = outputManager->settings->relativeSensitivity.x;
+		}
+
+		LOG_INFO("Relative mode sensitivity = X=%0.2f px/mm, Y=%0.2f px/mm\n",
+			outputManager->settings->relativeSensitivity.x,
+			outputManager->settings->relativeSensitivity.y
+		);
 		return true;
 	}));
 
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index d08bef9..c582f8c 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -56,9 +56,6 @@ int main(int argc, char**argv) {
 	mapper = new ScreenMapper(tablet);
 	mapper->SetRotation(0);
 
-	// Output manager
-	outputManager = new OutputManager();
-
 	//
 	// Command: Start
 	//
@@ -113,8 +110,16 @@ int main(int argc, char**argv) {
 	// Start logger
 	LOGGER_START();
 
-	// VMulti Device
-	vmulti = new VMulti();
+	// VMulti XP-Pen
+	vmulti = new VMulti(VMulti::TypeXPPen);
+
+	// VMulti VEIKK
+	if(!vmulti->isOpen) {
+		LOG_ERROR("Can't open XP-Pen's VMulti! Trying VEIKK's VMulti!\n");
+		delete vmulti;
+		vmulti = new VMulti(VMulti::TypeVEIKK);
+	}
+
 	if(!vmulti->isOpen) {
 		LOG_ERROR("Can't open VMulti device!\n\n");
 		LOG_ERROR("Possible fixes:\n");
@@ -124,6 +129,10 @@ int main(int argc, char**argv) {
 		CleanupAndExit(1);
 	}
 
+	// Output manager
+	outputManager = new OutputManager();
+
+
 	// Read init file
 	filename = "init.cfg";
 
@@ -203,7 +212,7 @@ void CleanupAndExit(int code) {
 	// Tablet
 	if(tablet != NULL)
 		delete tablet;
-
+	
 	// Logger
 	LOGGER_STOP();
 	Sleep(500);
diff --git a/TabletDriverService/OutputManager.cpp b/TabletDriverService/OutputManager.cpp
index 57da3fc..3ead118 100644
--- a/TabletDriverService/OutputManager.cpp
+++ b/TabletDriverService/OutputManager.cpp
@@ -11,7 +11,6 @@ OutputManager::OutputManager() {
 
 	// Set outputs array
 	outputs[ModeVMultiAbsolute] = &vmultiAbsolute;
-	outputs[ModeVMultiAbsoluteV2] = &vmultiAbsoluteV2;
 	outputs[ModeVMultiRelative] = &vmultiRelative;
 	outputs[ModeVMultiDigitizer] = &vmultiDigitizer;
 	outputs[ModeSendInputAbsolute] = &sendInputAbsolute;
diff --git a/TabletDriverService/OutputManager.h b/TabletDriverService/OutputManager.h
index 34a5b9c..3aa5fc6 100644
--- a/TabletDriverService/OutputManager.h
+++ b/TabletDriverService/OutputManager.h
@@ -2,7 +2,6 @@
 
 #include "Output.h"
 #include "OutputVMultiAbsolute.h"
-#include "OutputVMultiAbsoluteV2.h"
 #include "OutputVMultiRelative.h"
 #include "OutputVMultiDigitizer.h"
 #include "OutputSendInputAbsolute.h"
@@ -13,7 +12,6 @@ class OutputManager : public Output {
 
 	enum OutputMode {
 		ModeVMultiAbsolute,
-		ModeVMultiAbsoluteV2,
 		ModeVMultiRelative,
 		ModeVMultiDigitizer,
 		ModeSendInputAbsolute,
@@ -22,10 +20,9 @@ class OutputManager : public Output {
 	};
 
 	Output *output;
-	Output *outputs[7];
+	Output *outputs[6];
 
 	OutputVMultiAbsolute vmultiAbsolute;
-	OutputVMultiAbsoluteV2 vmultiAbsoluteV2;
 	OutputVMultiRelative vmultiRelative;
 	OutputVMultiDigitizer vmultiDigitizer;
 	OutputSendInputAbsolute sendInputAbsolute;
diff --git a/TabletDriverService/OutputSendInputAbsolute.cpp b/TabletDriverService/OutputSendInputAbsolute.cpp
index 1014710..28846ed 100644
--- a/TabletDriverService/OutputSendInputAbsolute.cpp
+++ b/TabletDriverService/OutputSendInputAbsolute.cpp
@@ -52,16 +52,6 @@ bool OutputSendInputAbsolute::Set(TabletState *tabletState) {
 	// Map position to virtual screen (values between 0 and 1)
 	mapper->GetScreenPosition(&x, &y);
 
-
-
-	if(logger.debugEnabled) {
-		LOG_DEBUG("%0.0f,%0.0f | %0.0f,%0.0f | %0.0f,%0.0f\n",
-			monitorInfo.primaryWidth, monitorInfo.primaryHeight,
-			monitorInfo.virtualWidth, monitorInfo.virtualHeight,
-			monitorInfo.virtualX, monitorInfo.virtualY
-		);
-	}
-
 	input.type = INPUT_MOUSE;
 	input.mi.mouseData = 0;
 	input.mi.dx = (LONG)floor(
@@ -102,6 +92,18 @@ bool OutputSendInputAbsolute::Write() {
 		// SendInput
 		SendInput(1, &input, sizeof(INPUT));
 
+		// Debug message
+		if(logger.debugEnabled) {
+			LOG_DEBUG("%0.0f,%0.0f | %0.0f,%0.0f | %0.0f,%0.0f | %ld, %ld -> %0.0f,%0.0f\n",
+				monitorInfo.virtualWidth, monitorInfo.virtualHeight,
+				monitorInfo.virtualX, monitorInfo.virtualY,
+				monitorInfo.primaryWidth, monitorInfo.primaryHeight,
+				input.mi.dx, input.mi.dy,
+				input.mi.dx / 65535.0 * (monitorInfo.primaryWidth) - monitorInfo.virtualX,
+				input.mi.dy / 65535.0 * (monitorInfo.primaryHeight) - monitorInfo.virtualY
+			);
+		}
+
 		// Copy last input
 		memcpy(&lastInput, &input, sizeof(INPUT));
 
diff --git a/TabletDriverService/OutputSettings.cpp b/TabletDriverService/OutputSettings.cpp
index 90ec696..e9227d4 100644
--- a/TabletDriverService/OutputSettings.cpp
+++ b/TabletDriverService/OutputSettings.cpp
@@ -2,7 +2,7 @@
 #include "OutputSettings.h"
 
 OutputSettings::OutputSettings() {
-	relativeSensitivity = 1;
+	relativeSensitivity.Set(1,1);
 	relativeResetDistance = 25;
 	relativeResetTime = 100;
 	ResetRelativeState(0, 0, chrono::high_resolution_clock::now());
diff --git a/TabletDriverService/OutputSettings.h b/TabletDriverService/OutputSettings.h
index a4aae60..355eec5 100644
--- a/TabletDriverService/OutputSettings.h
+++ b/TabletDriverService/OutputSettings.h
@@ -18,7 +18,7 @@ class OutputSettings {
 		chrono::high_resolution_clock::time_point lastTime;
 	} relativeState;
 
-	double relativeSensitivity;
+	Vector2D relativeSensitivity;
 	double relativeResetDistance;
 	double relativeResetTime;
 
diff --git a/TabletDriverService/OutputVMultiAbsolute.cpp b/TabletDriverService/OutputVMultiAbsolute.cpp
index ad4c714..eccc1db 100644
--- a/TabletDriverService/OutputVMultiAbsolute.cpp
+++ b/TabletDriverService/OutputVMultiAbsolute.cpp
@@ -10,13 +10,25 @@
 //
 OutputVMultiAbsolute::OutputVMultiAbsolute() {
 
-	// Absolute mouse vmulti report
-	report.vmultiId = 0x40;
+	// Absolute mouse VMulti report
 	report.reportLength = 7;
-	report.reportId = 3;
 	report.buttons = 0;
+	report.x = 0;
+	report.y = 0;
 	report.wheel = 0;
 
+	// XP-Pen
+	if(vmulti->type == VMulti::TypeXPPen) {
+		report.vmultiId = 0x40;
+		report.reportId = 3;
+	}
+
+	// VEIKK
+	else if(vmulti->type == VMulti::TypeVEIKK) {
+		report.vmultiId = 0x09;
+		report.reportId = 1;
+	}
+
 }
 
 
diff --git a/TabletDriverService/OutputVMultiAbsoluteV2.cpp b/TabletDriverService/OutputVMultiAbsoluteV2.cpp
deleted file mode 100644
index 084649d..0000000
--- a/TabletDriverService/OutputVMultiAbsoluteV2.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "stdafx.h"
-#include "OutputVMultiAbsoluteV2.h"
-
-#define LOG_MODULE "VMultiAbsoluteV2"
-#include "Logger.h"
-
-
-//
-// Constructor
-//
-OutputVMultiAbsoluteV2::OutputVMultiAbsoluteV2() {
-
-	// Absolute mouse vmulti report
-	report.vmultiId = 0x40;
-	report.reportLength = 8;
-	report.reportId = 9;
-	report.buttons = 0;
-	report.pressure = 0;
-
-}
-
-
-//
-// Destructor
-//
-OutputVMultiAbsoluteV2::~OutputVMultiAbsoluteV2() {
-}
-
-
-//
-// Set output
-//
-bool OutputVMultiAbsoluteV2::Set(TabletState *tabletState) {
-
-	double x = tabletState->position.x;
-	double y = tabletState->position.y;
-
-	// Map position to virtual screen (values between 0 and 1)
-	mapper->GetScreenPosition(&x, &y);
-
-	report.buttons = tabletState->buttons;
-	report.x = (USHORT)round(x * 32767.0);
-	report.y = (USHORT)round(y * 32767.0);
-	//report.pressure = (USHORT)round(tabletState->pressure * 8191.0);
-	vmulti->SetReport(&report, sizeof(report));
-
-	if(logger.debugEnabled) {
-		LOG_DEBUGBUFFER(&report, 10, "Report: ");
-	}
-
-	return true;
-}
-
-//
-// Write output
-//
-bool OutputVMultiAbsoluteV2::Write() {
-
-	// Write report to VMulti device if report has changed
-	if(vmulti->HasReportChanged()) {
-		vmulti->WriteReport();
-		return true;
-	}
-	return false;
-}
-
-
-//
-// Reset output
-//
-bool OutputVMultiAbsoluteV2::Reset() {
-
-
-	// Do not reset when buttons are not pressed
-	if(report.buttons == 0) {
-		return true;
-	}
-
-	report.buttons = 0;
-	report.pressure = 0;
-	vmulti->SetReport(&report, sizeof(report));
-	vmulti->WriteReport();
-	return true;
-}
-
diff --git a/TabletDriverService/OutputVMultiAbsoluteV2.h b/TabletDriverService/OutputVMultiAbsoluteV2.h
deleted file mode 100644
index 5b9bc12..0000000
--- a/TabletDriverService/OutputVMultiAbsoluteV2.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-#include "Output.h"
-
-class OutputVMultiAbsoluteV2 : public Output {
-public:
-
-	// Absolute mouse vmulti report
-	struct {
-		BYTE vmultiId;
-		BYTE reportLength;
-		BYTE reportId;
-		unsigned char buttons;
-		USHORT x;
-		USHORT y;
-		USHORT pressure;
-	} report;
-
-	bool Set(TabletState *tabletState);
-	bool Write();
-	bool Reset();
-
-	OutputVMultiAbsoluteV2();
-	~OutputVMultiAbsoluteV2();
-};
-
diff --git a/TabletDriverService/OutputVMultiDigitizer.cpp b/TabletDriverService/OutputVMultiDigitizer.cpp
index 35324e5..a881783 100644
--- a/TabletDriverService/OutputVMultiDigitizer.cpp
+++ b/TabletDriverService/OutputVMultiDigitizer.cpp
@@ -10,13 +10,27 @@
 //
 OutputVMultiDigitizer::OutputVMultiDigitizer() {
 
-	// VMulti digitizer report
-	report.vmultiId = 0x40;
+	// Digitizer VMulti report
 	report.reportLength = 8;
-	report.reportId = 5;
 	report.buttons = 0;
+	report.x = 0;
+	report.y = 0;
 	report.pressure = 0;
 
+	// XP-Pen
+	if(vmulti->type == VMulti::TypeXPPen) {
+		report.vmultiId = 0x40;
+		report.reportId = 5;
+		maxPressure = 2047.0;
+	}
+
+	// VEIKK
+	else if(vmulti->type == VMulti::TypeVEIKK) {
+		report.vmultiId = 0x09;
+		report.reportId = 2;
+		maxPressure = 8191.0;
+	}
+
 }
 
 
@@ -45,7 +59,7 @@ bool OutputVMultiDigitizer::Set(TabletState *tabletState) {
 	report.buttons = tabletState->buttons | 0x20;
 	report.x = (USHORT)round(x * 32767.0 + offsetX);
 	report.y = (USHORT)round(y * 32767.0 + offsetY);
-	report.pressure = (USHORT)round(tabletState->pressure * 2047.0);
+	report.pressure = (USHORT)round(tabletState->pressure * maxPressure);
 	vmulti->SetReport(&report, sizeof(report));
 
 	return true;
diff --git a/TabletDriverService/OutputVMultiDigitizer.h b/TabletDriverService/OutputVMultiDigitizer.h
index 1ff9b73..0d1cdbc 100644
--- a/TabletDriverService/OutputVMultiDigitizer.h
+++ b/TabletDriverService/OutputVMultiDigitizer.h
@@ -13,6 +13,8 @@ class OutputVMultiDigitizer : public Output {
 		USHORT pressure;
 	} report;
 
+	double maxPressure;
+
 	bool Set(TabletState *tabletState);
 	bool Write();
 	bool Reset();
diff --git a/TabletDriverService/OutputVMultiRelative.cpp b/TabletDriverService/OutputVMultiRelative.cpp
index f566d47..2ce7da5 100644
--- a/TabletDriverService/OutputVMultiRelative.cpp
+++ b/TabletDriverService/OutputVMultiRelative.cpp
@@ -4,20 +4,31 @@
 #define LOG_MODULE "VMultiRelative"
 #include "Logger.h"
 
+
 //
 // Constructor
 //
 OutputVMultiRelative::OutputVMultiRelative() {
 
 	// Relative mouse vmulti report
-	report.vmultiId = 0x40;
 	report.reportLength = 5;
-	report.reportId = 4;
 	report.buttons = 0;
 	report.x = 0;
 	report.y = 0;
 	report.wheel = 0;
 
+	// XP-Pen
+	if(vmulti->type == VMulti::TypeXPPen) {
+		report.vmultiId = 0x40;
+		report.reportId = 4;
+	}
+
+	// VEIKK
+	else if(vmulti->type == VMulti::TypeVEIKK) {
+		report.vmultiId = 0x09;
+		report.reportId = 3;
+	}
+
 	firstReport = true;
 }
 
@@ -80,10 +91,9 @@ bool OutputVMultiRelative::Set(TabletState *tabletState) {
 		dy = 0;
 	}
 
-
 	// Sensitivity
-	dx *= settings->relativeSensitivity;
-	dy *= settings->relativeSensitivity;
+	dx *= settings->relativeSensitivity.x;
+	dy *= settings->relativeSensitivity.y;
 
 	// Move target position
 	settings->relativeState.targetPosition.Add(dx, dy);
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index 2f0b2a4..ea63d12 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -187,7 +187,6 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     <ClInclude Include="OutputSendInputAbsolute.h" />
     <ClInclude Include="OutputSettings.h" />
     <ClInclude Include="OutputVMultiAbsolute.h" />
-    <ClInclude Include="OutputVMultiAbsoluteV2.h" />
     <ClInclude Include="OutputVMultiDigitizer.h" />
     <ClInclude Include="OutputVMultiRelative.h" />
     <ClInclude Include="PositionRingBuffer.h" />
@@ -230,7 +229,6 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     <ClCompile Include="OutputSendInputAbsolute.cpp" />
     <ClCompile Include="OutputSettings.cpp" />
     <ClCompile Include="OutputVMultiAbsolute.cpp" />
-    <ClCompile Include="OutputVMultiAbsoluteV2.cpp" />
     <ClCompile Include="OutputVMultiDigitizer.cpp" />
     <ClCompile Include="OutputVMultiRelative.cpp" />
     <ClCompile Include="PositionRingBuffer.cpp" />
@@ -270,6 +268,7 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     <None Include="tools\RunServiceOnly.bat" />
   </ItemGroup>
   <ItemGroup>
+    <Text Include="docs\VEIKK_VMulti_Descriptor.txt" />
     <Text Include="docs\VMulti_Report_Descriptor.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index 57c2def..4821fc6 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -90,9 +90,6 @@
     <ClInclude Include="OutputSendInputAbsolute.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OutputVMultiAbsoluteV2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="TabletMeasurement.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -200,9 +197,6 @@
     <ClCompile Include="OutputSendInputAbsolute.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OutputVMultiAbsoluteV2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="TabletMeasurement.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -279,5 +273,8 @@
     <Text Include="docs\VMulti_Report_Descriptor.txt">
       <Filter>Resource Files</Filter>
     </Text>
+    <Text Include="docs\VEIKK_VMulti_Descriptor.txt">
+      <Filter>Resource Files</Filter>
+    </Text>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
index 964d2f9..2c8d69d 100644
--- a/TabletDriverService/TabletHandler.cpp
+++ b/TabletDriverService/TabletHandler.cpp
@@ -23,20 +23,16 @@ TabletHandler::~TabletHandler() {
 	StopTimer();
 	isRunning = false;
 
-	if(tablet->hidDevice != NULL)
-		tablet->hidDevice->CloseDevice();
-
-	if(tablet->hidDeviceAux != NULL)
-		tablet->hidDeviceAux->CloseDevice();
-
-	if(tablet->usbDevice != NULL)
-		tablet->usbDevice->CloseDevice();	
+	if(tablet != NULL) {
+		if(tablet->hidDevice != NULL)
+			tablet->hidDevice->CloseDevice();
 
-	if(tabletInputThread != NULL)
-		tabletInputThread->join();
+		if(tablet->hidDeviceAux != NULL)
+			tablet->hidDeviceAux->CloseDevice();
 
-	if(auxInputThread != NULL)
-		auxInputThread->join();
+		if(tablet->usbDevice != NULL)
+			tablet->usbDevice->CloseDevice();
+	}
 
 }
 
@@ -257,6 +253,17 @@ void TabletHandler::RunTabletInputThread() {
 								if(isPressed) {
 									lastScrollPosition.Set(scrollPosition);
 									scrollStartPosition.Set(tablet->state.position);
+
+									//
+									// Move normal mouse to digitizer position
+									//
+									if(outputManager->mode == OutputManager::ModeVMultiDigitizer) {
+										TabletState tmpState;
+										tmpState.position.Set(tablet->state.position);
+										outputManager->sendInputAbsolute.Set(&tmpState);
+										outputManager->sendInputAbsolute.Write();
+									}
+
 								}
 
 								// Delta from the last scroll position
diff --git a/TabletDriverService/VMulti.cpp b/TabletDriverService/VMulti.cpp
index ae81aaa..0205df8 100644
--- a/TabletDriverService/VMulti.cpp
+++ b/TabletDriverService/VMulti.cpp
@@ -5,16 +5,29 @@
 #include "Logger.h"
 
 // Constructor
-VMulti::VMulti() {
+VMulti::VMulti(int type) {
+
 	isOpen = false;
 	debugEnabled = false;
+	this->type = type;
 	lastButtons = 0;
+	
 
 	// Report buffers
 	memset(reportBuffer, 0, 65);
 	memset(lastReportBuffer, 0, 65);
 
-	hidDevice = new HIDDevice(0x00FF, 0xBACC, 0xFF00, 0x0001);
+	// XP-Pen VMulti
+	if(type == VMultiType::TypeXPPen) {
+		hidDevice = new HIDDevice(0x00FF, 0xBACC, 0xFF00, 0x0001);
+	}
+
+	// VEIKK VMulti
+	else if(type == VMultiType::TypeVEIKK) {
+		hidDevice = new HIDDevice(0x2FEB, 0xFFFF, 0xFF00, 0x0001);
+	}
+
+
 	if(hidDevice->isOpen) {
 		isOpen = true;
 		outputEnabled = true;
diff --git a/TabletDriverService/VMulti.h b/TabletDriverService/VMulti.h
index f89114e..e0b2edf 100644
--- a/TabletDriverService/VMulti.h
+++ b/TabletDriverService/VMulti.h
@@ -10,12 +10,17 @@ class VMulti {
 	BYTE lastReportBuffer[65];
 public:
 
+	enum VMultiType {
+		TypeXPPen,
+		TypeVEIKK
+	};
 	bool isOpen;
 	bool debugEnabled;
 	bool outputEnabled;
+	int type;
 	int lastButtons;
 
-	VMulti();
+	VMulti(int type);
 	~VMulti();
 	bool HasReportChanged();
 	void SetReport(void *buffer, int length);
diff --git a/TabletDriverService/docs/VEIKK_VMulti_Descriptor.txt b/TabletDriverService/docs/VEIKK_VMulti_Descriptor.txt
new file mode 100644
index 0000000..1fe8f87
--- /dev/null
+++ b/TabletDriverService/docs/VEIKK_VMulti_Descriptor.txt
@@ -0,0 +1,144 @@
+
+//
+// Absolute mouse
+//
+0x05, 0x01,        // Usage Page (Generic Desktop Ctrls)
+0x09, 0x02,        // Usage (Mouse)
+0xA1, 0x01,        // Collection (Application)
+0x85, 0x01,        //   Report ID (1)
+0x09, 0x01,        //   Usage (Pointer)
+0xA1, 0x00,        //   Collection (Physical)
+0x05, 0x09,        //     Usage Page (Button)
+0x19, 0x01,        //     Usage Minimum (0x01)
+0x29, 0x05,        //     Usage Maximum (0x05)
+0x15, 0x00,        //     Logical Minimum (0)
+0x25, 0x01,        //     Logical Maximum (1)
+0x75, 0x01,        //     Report Size (1)
+0x95, 0x05,        //     Report Count (5)
+0x81, 0x02,        //     Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0x95, 0x03,        //     Report Count (3)
+0x81, 0x03,        //     Input (Const,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0x05, 0x01,        //     Usage Page (Generic Desktop Ctrls)
+0x26, 0xFF, 0x7F,  //     Logical Maximum (32767)
+0x75, 0x10,        //     Report Size (16)
+0x95, 0x01,        //     Report Count (1)
+0x55, 0x0F,        //     Unit Exponent (-1)
+0x65, 0x11,        //     Unit (System: SI Linear, Length: Centimeter)
+0x35, 0x00,        //     Physical Minimum (0)
+0x45, 0x00,        //     Physical Maximum (0)
+0x09, 0x30,        //     Usage (X)
+0x81, 0x02,        //     Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0x09, 0x31,        //     Usage (Y)
+0x81, 0x02,        //     Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0x05, 0x01,        //     Usage Page (Generic Desktop Ctrls)
+0x09, 0x38,        //     Usage (Wheel)
+0x15, 0x81,        //     Logical Minimum (-127)
+0x25, 0x7F,        //     Logical Maximum (127)
+0x75, 0x08,        //     Report Size (8)
+0x95, 0x01,        //     Report Count (1)
+0x81, 0x06,        //     Input (Data,Var,Rel,No Wrap,Linear,Preferred State,No Null Position)
+0xC0,              //   End Collection
+0xC0,              // End Collection
+
+
+//
+// Relative mouse
+//
+0x05, 0x01,        // Usage Page (Generic Desktop Ctrls)
+0x09, 0x02,        // Usage (Mouse)
+0xA1, 0x01,        // Collection (Application)
+0x85, 0x03,        //   Report ID (3)
+0x09, 0x01,        //   Usage (Pointer)
+0xA1, 0x00,        //   Collection (Physical)
+0x05, 0x09,        //     Usage Page (Button)
+0x19, 0x01,        //     Usage Minimum (0x01)
+0x29, 0x05,        //     Usage Maximum (0x05)
+0x15, 0x00,        //     Logical Minimum (0)
+0x25, 0x01,        //     Logical Maximum (1)
+0x75, 0x01,        //     Report Size (1)
+0x95, 0x05,        //     Report Count (5)
+0x81, 0x02,        //     Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0x95, 0x03,        //     Report Count (3)
+0x81, 0x03,        //     Input (Const,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0x05, 0x01,        //     Usage Page (Generic Desktop Ctrls)
+0x09, 0x30,        //     Usage (X)
+0x09, 0x31,        //     Usage (Y)
+0x15, 0x81,        //     Logical Minimum (-127)
+0x25, 0x7F,        //     Logical Maximum (127)
+0x75, 0x08,        //     Report Size (8)
+0x95, 0x02,        //     Report Count (2)
+0x81, 0x06,        //     Input (Data,Var,Rel,No Wrap,Linear,Preferred State,No Null Position)
+0x05, 0x01,        //     Usage Page (Generic Desktop Ctrls)
+0x09, 0x38,        //     Usage (Wheel)
+0x15, 0x81,        //     Logical Minimum (-127)
+0x25, 0x7F,        //     Logical Maximum (127)
+0x75, 0x08,        //     Report Size (8)
+0x95, 0x01,        //     Report Count (1)
+0x81, 0x06,        //     Input (Data,Var,Rel,No Wrap,Linear,Preferred State,No Null Position)
+0xC0,              //   End Collection
+0xC0,              // End Collection
+
+//
+// Digitizer
+//
+0x05, 0x0D,        // Usage Page (Digitizer)
+0x09, 0x01,        // Usage (Digitizer)
+0xA1, 0x01,        // Collection (Application)
+0x85, 0x02,        //   Report ID (2)
+0x09, 0x20,        //   Usage (Stylus)
+0xA1, 0x00,        //   Collection (Physical)
+0x09, 0x42,        //     Usage (Tip Switch)
+0x09, 0x44,        //     Usage (Barrel Switch)
+0x09, 0x45,        //     Usage (Eraser)
+0x15, 0x00,        //     Logical Minimum (0)
+0x25, 0x01,        //     Logical Maximum (1)
+0x75, 0x01,        //     Report Size (1)
+0x95, 0x03,        //     Report Count (3)
+0x81, 0x02,        //     Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0x95, 0x02,        //     Report Count (2)
+0x81, 0x03,        //     Input (Const,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0x09, 0x32,        //     Usage (In Range)
+0x95, 0x01,        //     Report Count (1)
+0x81, 0x02,        //     Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0x95, 0x02,        //     Report Count (2)
+0x81, 0x03,        //     Input (Const,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0x75, 0x10,        //     Report Size (16)
+0x95, 0x01,        //     Report Count (1)
+0x35, 0x00,        //     Physical Minimum (0)
+0xA4,              //     Push
+0x05, 0x01,        //       Usage Page (Generic Desktop Ctrls)
+0x09, 0x30,        //       Usage (X)
+0x46, 0xCB, 0x02,  //       Physical Maximum (715)
+0x26, 0xFF, 0x7F,  //       Logical Maximum (32767)
+0x81, 0x02,        //       Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0x09, 0x31,        //       Usage (Y)
+0x46, 0xCB, 0x02,  //       Physical Maximum (715)
+0x26, 0xFF, 0x7F,  //       Logical Maximum (32767)
+0x81, 0x02,        //       Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0xB4,              //     Pop
+0x09, 0x30,        //     Usage (Tip Pressure)
+0x45, 0x00,        //     Physical Maximum (0)
+0x26, 0xFF, 0x1F,  //     Logical Maximum (8191)
+0x81, 0x02,        //     Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0xC0,              //   End Collection
+0xC0,              // End Collection
+
+//
+// VMulti
+//
+0x06, 0x00, 0xFF,  // Usage Page (Vendor Defined 0xFF00)
+0x09, 0x01,        // Usage (0x01)
+0xA1, 0x01,        // Collection (Application)
+0x85, 0x09,        //   Report ID (9)
+0x15, 0x00,        //   Logical Minimum (0)
+0x26, 0xFF, 0x00,  //   Logical Maximum (255)
+0x75, 0x08,        //   Report Size (8)
+0x95, 0x40,        //   Report Count (64)
+0x09, 0x02,        //   Usage (0x02)
+0x81, 0x02,        //   Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+0x95, 0x40,        //   Report Count (64)
+0x09, 0x02,        //   Usage (0x02)
+0x91, 0x02,        //   Output (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position,Non-volatile)
+0xC0,              // End Collection
+
+// 249 bytes

From e041d9f4f221603f8891ef84b5f19fc139b529eb Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 16 Dec 2018 13:49:54 +0200
Subject: [PATCH 72/83] v0.2.3

---
 README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c4dbc91..da9e4a3 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
 
 ## Download
 
-### http://hwk.fi/TabletDriver/TabletDriverV0.2.2.zip
+### http://hwk.fi/TabletDriver/TabletDriverV0.2.3.zip
 
 #
 
@@ -20,7 +20,7 @@ The GUI minimizes to system tray / notification area. You can reopen the GUI by
   - Windows 10 64-bit
   - Windows 8.1 64-bit
   - Windows 8 64-bit
-  - Windows 7 64-bit (No multi-monitor support)
+  - Windows 7 64-bit (Multiple monitors do not work in absolute mode)
 
 #
 
@@ -105,6 +105,12 @@ If you want to compile the code and don't want to install anything from the Tabl
 #
 
 ## Changelog
+
+>**v0.2.3:**
+> - Fixed "TabletDriverService.exe has stopped working" error when a tablet is not connected.
+> - Relative mouse mode can now have different sensitivity on X and Y axis.
+> - Added SendInput output mode to GUI
+
 >**v0.2.2:**
 > - XP-Pen G430S configuration by [frodriguez96](https://github.com/frodriguez96) and [riley-badour](https://github.com/riley-badour)
 > - Huion New 1060 Plus configuration by [riley-badour](https://github.com/riley-badour)

From dbcbb5844a947cbee6fd3745039e7292f2aae6d8 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Wed, 2 Jan 2019 20:21:45 +0200
Subject: [PATCH 73/83] VEIKK A50, Wacom CTL-6100, multiple areas, filter
 improvements, etc.

- Added VEIKK A50 configuration. Tablet buttons from 9 to 13 are the touchpad gestures
- Added Wacom CTL-6100 configuration
- Added support for multiple tablet areas (suggested by Devocub). Right-click the area for more options
- Added preset selector to the anti-smoothing and noise reduction filters
- Added advanced smoothing filter (no GUI settings yet)
- Added a tablet view tool that can be used to check how much filters are reducing or increasing the input latency (Menu->Tools->Tablet View)
- Added force proportions button to Wacom area tool
- Added 19 new tablets to wacom.cfg
- Added precise volume control to button maps. Example custom mapping: VOLUMEUP0.5
- Improved anti-smoothing filter
- Improved smoothing filter latency calculation. Latency is now higher if you use same latency value as with the older driver version
- System timer resolution will now be modified to match with the smoothing filter rate
- Relative positioning can now be used with every output mode
- On Windows 7 the driver is now using SendInput as a standard output mode, so multiple monitors should work without changing the output mode
- Windows Ink pressure deadzone can now be set separately for low and high pressure
- The TabletDriverGUI now communicates with the driver through named pipes
---
 .gitignore                                    |    3 +-
 TabletDriverGUI/App.xaml.cs                   |   12 +-
 TabletDriverGUI/Area.cs                       |   88 +-
 TabletDriverGUI/Configuration.cs              |  214 ++-
 TabletDriverGUI/MainWindow.Areas.cs           | 1542 ++++++++++++++++
 TabletDriverGUI/MainWindow.Console.cs         |   16 +-
 TabletDriverGUI/MainWindow.Driver.cs          |  262 ++-
 TabletDriverGUI/MainWindow.Ink.cs             |   30 +-
 TabletDriverGUI/MainWindow.Settings.cs        | 1581 +++++++++--------
 TabletDriverGUI/MainWindow.xaml               |  540 ++++--
 TabletDriverGUI/MainWindow.xaml.cs            |  224 +--
 TabletDriverGUI/MultimediaTimer.cs            |  145 ++
 TabletDriverGUI/NativeMethods.cs              |   17 +
 TabletDriverGUI/TabletDriver.cs               |  400 ++++-
 TabletDriverGUI/TabletDriverGUI.csproj        |   42 +-
 TabletDriverGUI/Utils.cs                      |   22 +
 TabletDriverGUI/WindowAreaEditor.xaml         |  120 ++
 TabletDriverGUI/WindowAreaEditor.xaml.cs      |  156 ++
 ...nMapping.xaml => WindowButtonMapping.xaml} |    6 +-
 ...ng.xaml.cs => WindowButtonMapping.xaml.cs} |  143 +-
 TabletDriverGUI/WindowMessageBox.xaml         |   39 +
 TabletDriverGUI/WindowMessageBox.xaml.cs      |   46 +
 TabletDriverGUI/WindowTabletView.xaml         |   62 +
 TabletDriverGUI/WindowTabletView.xaml.cs      |  634 +++++++
 TabletDriverGUI/WindowTabletViewSettings.xaml |  142 ++
 .../WindowTabletViewSettings.xaml.cs          |  206 +++
 .../{WacomArea.xaml => WindowWacomArea.xaml}  |  117 +-
 ...omArea.xaml.cs => WindowWacomArea.xaml.cs} |  374 ++--
 .../CommandHandler.Auxiliary.cpp              |   30 +-
 TabletDriverService/CommandHandler.Device.cpp |   28 +-
 .../CommandHandler.Filters.cpp                |  151 +-
 TabletDriverService/CommandHandler.Other.cpp  |  153 +-
 TabletDriverService/CommandHandler.Tablet.cpp |  153 +-
 TabletDriverService/DataFormatter.cpp         |   15 +-
 TabletDriverService/DataFormatter.h           |   10 +-
 TabletDriverService/HIDDevice.cpp             |   26 +-
 TabletDriverService/HIDDevice.h               |    2 +
 TabletDriverService/InputEmulator.cpp         |  131 +-
 TabletDriverService/InputEmulator.h           |   45 +
 TabletDriverService/Logger.cpp                |   66 +-
 TabletDriverService/Logger.h                  |    1 +
 TabletDriverService/Main.cpp                  |   31 +-
 TabletDriverService/OutputDummy.cpp           |   16 +-
 TabletDriverService/OutputManager.cpp         |   95 +-
 TabletDriverService/OutputManager.h           |   10 +-
 .../OutputSendInputAbsolute.cpp               |    5 +-
 .../OutputSendInputRelative.cpp               |  117 ++
 TabletDriverService/OutputSendInputRelative.h |   17 +
 TabletDriverService/OutputSettings.cpp        |    2 +
 TabletDriverService/OutputSettings.h          |    2 +
 TabletDriverService/OutputVMultiAbsolute.cpp  |    5 +-
 TabletDriverService/OutputVMultiDigitizer.cpp |    9 +-
 .../OutputVMultiDigitizerRelative.cpp         |  140 ++
 .../OutputVMultiDigitizerRelative.h           |   40 +
 TabletDriverService/OutputVMultiRelative.cpp  |   77 +-
 TabletDriverService/PipeHandler.cpp           |  338 ++++
 TabletDriverService/PipeHandler.h             |   55 +
 TabletDriverService/ScreenMapper.cpp          |  307 +++-
 TabletDriverService/ScreenMapper.h            |   48 +-
 TabletDriverService/Tablet.cpp                |  187 +-
 TabletDriverService/Tablet.h                  |   22 +-
 .../TabletDriverService.vcxproj               |    8 +
 .../TabletDriverService.vcxproj.filters       |   24 +
 .../TabletDriverService.vcxproj.user          |    4 +-
 .../TabletFilterAdvancedSmoothing.cpp         |  284 +++
 .../TabletFilterAdvancedSmoothing.h           |   52 +
 .../TabletFilterAntiSmoothing.cpp             |  205 ++-
 .../TabletFilterAntiSmoothing.h               |   19 +-
 .../TabletFilterNoiseReduction.cpp            |    3 -
 TabletDriverService/TabletFilterSmoothing.cpp |   55 +-
 TabletDriverService/TabletFilterSmoothing.h   |    3 +-
 TabletDriverService/TabletFilterTester.cpp    |   48 +-
 TabletDriverService/TabletHandler.cpp         |  181 +-
 TabletDriverService/TabletHandler.h           |    3 +
 TabletDriverService/TabletSettings.cpp        |   15 +-
 TabletDriverService/TabletSettings.h          |   23 +-
 TabletDriverService/TabletState.cpp           |   10 +-
 TabletDriverService/TabletState.h             |    7 +
 TabletDriverService/Vector2D.cpp              |    6 +
 TabletDriverService/Vector2D.h                |    1 +
 TabletDriverService/config/tablet.cfg         |  153 +-
 TabletDriverService/config/wacom.cfg          | 1130 +++++++++++-
 TabletDriverService/stdafx.h                  |    5 +-
 83 files changed, 9614 insertions(+), 2142 deletions(-)
 create mode 100644 TabletDriverGUI/MainWindow.Areas.cs
 create mode 100644 TabletDriverGUI/MultimediaTimer.cs
 create mode 100644 TabletDriverGUI/WindowAreaEditor.xaml
 create mode 100644 TabletDriverGUI/WindowAreaEditor.xaml.cs
 rename TabletDriverGUI/{ButtonMapping.xaml => WindowButtonMapping.xaml} (91%)
 rename TabletDriverGUI/{ButtonMapping.xaml.cs => WindowButtonMapping.xaml.cs} (57%)
 create mode 100644 TabletDriverGUI/WindowMessageBox.xaml
 create mode 100644 TabletDriverGUI/WindowMessageBox.xaml.cs
 create mode 100644 TabletDriverGUI/WindowTabletView.xaml
 create mode 100644 TabletDriverGUI/WindowTabletView.xaml.cs
 create mode 100644 TabletDriverGUI/WindowTabletViewSettings.xaml
 create mode 100644 TabletDriverGUI/WindowTabletViewSettings.xaml.cs
 rename TabletDriverGUI/{WacomArea.xaml => WindowWacomArea.xaml} (83%)
 rename TabletDriverGUI/{WacomArea.xaml.cs => WindowWacomArea.xaml.cs} (56%)
 create mode 100644 TabletDriverService/OutputSendInputRelative.cpp
 create mode 100644 TabletDriverService/OutputSendInputRelative.h
 create mode 100644 TabletDriverService/OutputVMultiDigitizerRelative.cpp
 create mode 100644 TabletDriverService/OutputVMultiDigitizerRelative.h
 create mode 100644 TabletDriverService/PipeHandler.cpp
 create mode 100644 TabletDriverService/PipeHandler.h
 create mode 100644 TabletDriverService/TabletFilterAdvancedSmoothing.cpp
 create mode 100644 TabletDriverService/TabletFilterAdvancedSmoothing.h

diff --git a/.gitignore b/.gitignore
index 7b755d8..ed15b76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 /TabletDriverGUI/obj/
 /TabletDriverService/Release/
 /TabletDriverService/Debug/
-/TabletDriverService/startuplog.txt
\ No newline at end of file
+/TabletDriverService/startuplog.txt
+TabletDriverService/config/usersettings.cfg
diff --git a/TabletDriverGUI/App.xaml.cs b/TabletDriverGUI/App.xaml.cs
index 55afb50..14b7892 100644
--- a/TabletDriverGUI/App.xaml.cs
+++ b/TabletDriverGUI/App.xaml.cs
@@ -127,12 +127,16 @@ public App()
             }
             else
             {
+                MessageBox.Show("TabletDriverGUI is already open!");
+
                 // Broadcast to the another instance to show itself
                 NativeMethods.PostMessage(
-                             (IntPtr)NativeMethods.HWND_BROADCAST,
-                             NativeMethods.WM_SHOWTABLETDRIVERGUI,
-                             IntPtr.Zero,
-                             IntPtr.Zero);
+                    (IntPtr)NativeMethods.HWND_BROADCAST,
+                    NativeMethods.WM_SHOWTABLETDRIVERGUI,
+                    IntPtr.Zero,
+                    IntPtr.Zero
+                );
+
                 Shutdown();
             }
         }
diff --git a/TabletDriverGUI/Area.cs b/TabletDriverGUI/Area.cs
index cccb7d4..d2ed205 100644
--- a/TabletDriverGUI/Area.cs
+++ b/TabletDriverGUI/Area.cs
@@ -43,20 +43,29 @@ public double Rotation
             {
                 double angle;
                 _rotation = value;
+
                 angle = _rotation * Math.PI / 180;
+
                 _rotationMatrix[0] = Math.Cos(angle);
                 _rotationMatrix[1] = Math.Sin(angle);
                 _rotationMatrix[2] = -Math.Sin(angle);
                 _rotationMatrix[3] = Math.Cos(angle);
+
                 UpdateCorners();
             }
         }
+        public bool IsEnabled;
+
+
 
         private double _rotation;
-        private double[] _rotationMatrix;
+        private readonly double[] _rotationMatrix;
+       private readonly Point[] _corners;
 
-        private Point[] _corners;
 
+        //
+        // Constructors
+        //
         public Area()
         {
             _corners = new Point[4] {
@@ -67,11 +76,11 @@ public Area()
             };
             _rotation = 0;
             _rotationMatrix = new double[4] { 1, 0, 0, 1 };
-
             _width = 0;
             _height = 0;
             X = 0;
             Y = 0;
+            IsEnabled = false;
 
         }
         public Area(double width, double height, double x, double y) : this()
@@ -80,10 +89,26 @@ public Area(double width, double height, double x, double y) : this()
             _height = height;
             X = x;
             Y = y;
+            IsEnabled = false;
             UpdateCorners();
         }
 
+        //
+        // Copy values from an another area
+        //
+        public void Set(Area area)
+        {
+            X = area.X;
+            Y = area.Y;
+            Width = area.Width;
+            Height = area.Height;
+            Rotation = area.Rotation;
+            IsEnabled = area.IsEnabled;
+        }
 
+        //
+        // Update corner positions
+        //
         private void UpdateCorners()
         {
             GetRotatedPoint(ref _corners[0], -_width / 2.0, -_height / 2.0);
@@ -92,6 +117,9 @@ private void UpdateCorners()
             GetRotatedPoint(ref _corners[3], -_width / 2.0, _height / 2.0);
         }
 
+        //
+        // Rotate point
+        //
         public void GetRotatedPoint(ref Point p, double x, double y)
         {
             p.X = x * _rotationMatrix[0] + y * _rotationMatrix[1];
@@ -99,13 +127,44 @@ public void GetRotatedPoint(ref Point p, double x, double y)
         }
 
         //
+        // Rotate point in reverse direction
         //
+        public void GetRotatedPointReverse(ref Point p, double x, double y)
+        {
+            p.X = x * _rotationMatrix[3] - y * _rotationMatrix[1];
+            p.Y = x * -_rotationMatrix[2] + y * _rotationMatrix[0];
+        }
+
+
+        //
+        // Check if a point is inside of the area
         //
-        public Point[] Corners
+        public bool IsInside(Point p)
         {
-            get { return _corners; }
+            double x1, y1, x2, y2;
+
+            x1 = p.X - X;
+            y1 = p.Y - Y;
+            x2 = x1 * _rotationMatrix[0] + y1 * _rotationMatrix[1];
+            y2 = x1 * _rotationMatrix[2] + y1 * _rotationMatrix[3];
+
+            if (
+                x2 > -Width / 2.0 &&
+                x2 < +Width / 2.0 &&
+                y2 > -Height / 2.0 &&
+                y2 < +Height / 2.0
+            )
+            {
+                return true;
+            }
+
+            return false;
         }
 
+        //
+        // Get corners
+        //
+        public Point[] Corners => _corners;
 
         //
         // Bounding Box
@@ -128,6 +187,7 @@ public double[] GetBoundingBox()
             return box;
         }
 
+
         //
         // Scale to fit inside another area
         //
@@ -146,6 +206,9 @@ public void ScaleInside(Area target)
             UpdateCorners();
         }
 
+        //
+        // Move area position inside of another area
+        //
         public void MoveInside(Area target)
         {
             double[] box = GetBoundingBox();
@@ -161,5 +224,20 @@ public void MoveInside(Area target)
                 Y = target.Y + targetBox[3] - box[3];
         }
 
+
+        //
+        // Convert to string
+        //
+        public override string ToString()
+        {
+            return
+                "Area[" +
+                    Utils.GetNumberString(X) + "," +
+                    Utils.GetNumberString(Y) + "," +
+                    Utils.GetNumberString(Width) + "," +
+                    Utils.GetNumberString(Height) +
+                "]";
+        }
+
     }
 }
diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index f6068d7..7976e6e 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -1,7 +1,6 @@
 using System;
-using System.Linq;
-using System.Collections;
 using System.IO;
+using System.Windows;
 using System.Xml;
 using System.Xml.Serialization;
 
@@ -11,22 +10,39 @@ namespace TabletDriverGUI
     public class Configuration
     {
         public int ConfigVersion;
+
+        public string TabletName;
+
+        public Area ScreenArea;
+        [XmlArray("ScreenAreas")]
+        [XmlArrayItem("ScreenArea")]
+        public Area[] ScreenAreas;
+        public Area SelectedScreenArea;
+
         public Area TabletArea;
+        [XmlArray("TabletAreas")]
+        [XmlArrayItem("TabletArea")]
+        public Area[] TabletAreas;
+        public Area SelectedTabletArea;
+
         public Area TabletFullArea;
         public bool ForceAspectRatio;
         public double Rotation;
         public bool Invert;
-        public bool ForceFullArea;
-        public OutputModes OutputMode;
-        public enum OutputModes
+        public OutputPositioning Positioning;
+        public OutputModes Mode;
+
+        public enum OutputPositioning
         {
             Absolute = 0,
-            Relative = 1,
-            Digitizer = 2,
-            SendInput = 3
+            Relative = 1
+        }
+        public enum OutputModes
+        {
+            Standard = 0,
+            WindowsInk = 1,
+            Compatibility = 2
         }
-
-        public Area ScreenArea;
 
         // Smoothing filter
         public bool SmoothingEnabled;
@@ -41,9 +57,25 @@ public enum OutputModes
 
         // Anti-smoothing filter
         public bool AntiSmoothingEnabled;
-        public double AntiSmoothingShape;
-        public double AntiSmoothingCompensation;
+        public class AntiSmoothingSetting
+        {
+            public bool Enabled;
+            public double Velocity;
+            public double Shape;
+            public double Compensation;
+            public AntiSmoothingSetting()
+            {
+                Enabled = false;
+                Velocity = 0;
+                Shape = 0.5;
+                Compensation = 0;
+            }
+        };
+        [XmlArray("AntiSmoothingSettingsList")]
+        [XmlArrayItem("AntiSmoothingSettings")]
+        public AntiSmoothingSetting[] AntiSmoothingSettings;
         public bool AntiSmoothingOnlyWhenHover;
+        public double AntiSmoothingDragMultiplier;
 
         public Area DesktopSize;
         public bool AutomaticDesktopSize;
@@ -59,11 +91,13 @@ public enum OutputModes
         public bool DisableTabletButtons;
 
         public double PressureSensitivity;
-        public double PressureDeadzone;
+        public double PressureDeadzoneLow;
+        public double PressureDeadzoneHigh;
 
         public double ScrollSensitivity;
         public double ScrollAcceleration;
         public bool ScrollStopCursor;
+        public bool ScrollDrag;
 
         [XmlArray("CustomCommands")]
         [XmlArrayItem("Command")]
@@ -72,6 +106,42 @@ public enum OutputModes
         public int WindowWidth;
         public int WindowHeight;
 
+        public class TabletViewSettings
+        {
+            public string BackgroundColor;
+            public string InfoColor;
+            public string InputColor;
+            public string OutputColor;
+            public string LatencyColor;
+            public string DrawColor;
+            public int InputTrailLength;
+            public int OutputTrailLength;
+            public int DrawLength;
+            public string Font;
+            public double FontSize;
+            public Point OffsetText;
+            public Point OffsetPressure;
+            public bool FadeInOut;
+            public TabletViewSettings()
+            {
+                BackgroundColor = "#FFFFFF";
+                InfoColor = "#000000";
+                InputColor = "#33AA33";
+                OutputColor = "#AA3333";
+                LatencyColor = "#3333AA";
+                DrawColor = "#000000";
+                InputTrailLength = 30;
+                OutputTrailLength = 30;
+                DrawLength = 0;
+                Font = "Arial";
+                FontSize = 25;
+                OffsetPressure = new Point(0, 0);
+                OffsetText = new Point(0, 0);
+                FadeInOut = false;
+            }
+        };
+        public TabletViewSettings TabletView;
+
         public bool AutomaticRestart;
         public bool RunAtStartup;
 
@@ -81,19 +151,46 @@ public enum OutputModes
         public bool DebuggingEnabled;
         public bool DeveloperMode;
 
+        public class Preset
+        {
+            public string Name;
+            public Action<Configuration> Action;
+            public Preset(string name, Action<Configuration> action)
+            {
+                Name = name;
+                Action = action;
+            }
+            public override string ToString()
+            {
+                return Name;
+            }
+        }
+
 
         public Configuration()
         {
-            ConfigVersion = 1;
+            ConfigVersion = 2;
 
             // Screen Map
-            ScreenArea = new Area(0, 0, 0, 0);
+            ScreenArea = null;
+            ScreenAreas = new Area[3];
+            for (int i = 0; i < ScreenAreas.Length; i++)
+            {
+                ScreenAreas[i] = new Area(0, 0, 0, 0)
+                {
+                    IsEnabled = false
+                };
+            }
+            ScreenAreas[0].IsEnabled = true;
+            ScreenAreas[1] = new Area(1000, 500, 500, 250);
 
             // Tablet area
-            TabletArea = new Area(80, 45, 40, 22.5);
+            TabletArea = null;
+            TabletAreas = new Area[ScreenAreas.Length];
+            for (int i = 0; i < GetAreaCount(); i++)
+                TabletAreas[i] = new Area(100, 56, 50, 28);
             TabletFullArea = new Area(100, 50, 50, 25);
-            ForceFullArea = true;
-            OutputMode = 0;
+            Mode = OutputModes.Standard;
             ForceAspectRatio = true;
             Rotation = 0;
 
@@ -122,13 +219,18 @@ public Configuration()
             NoiseFilterThreshold = 0.5;
 
             AntiSmoothingEnabled = false;
-            AntiSmoothingShape = 0.5;
-            AntiSmoothingCompensation = 20.0;
+            AntiSmoothingSettings = new AntiSmoothingSetting[5];
+            for (int i = 0; i < AntiSmoothingSettings.Length; i++)
+                AntiSmoothingSettings[i] = new AntiSmoothingSetting();
+            AntiSmoothingDragMultiplier = 1.0;
+            AntiSmoothingOnlyWhenHover = false;
 
             CustomCommands = new string[] { "" };
 
-            WindowWidth = 700;
-            WindowHeight = 710;
+            WindowWidth = 680;
+            WindowHeight = 650;
+
+            TabletView = new TabletViewSettings();
 
             AutomaticRestart = true;
             RunAtStartup = false;
@@ -141,6 +243,70 @@ public Configuration()
         }
 
 
+        //
+        // Get number of areas
+        //
+        public int GetAreaCount()
+        {
+            if (ScreenAreas.Length <= TabletAreas.Length)
+                return ScreenAreas.Length;
+            return TabletAreas.Length;
+        }
+
+
+        //
+        // Get maximum number of areas
+        //
+        public int GetMaxAreaCount()
+        {
+            return 5;
+        }
+
+
+        //
+        // Get number of enabled areas
+        //
+        public int GetEnabledAreaCount()
+        {
+            int count = 0;
+            foreach (Area area in ScreenAreas)
+            {
+                if (area.IsEnabled) count++;
+            }
+            return count;
+        }
+
+
+        //
+        // Clear anti-smoothing filter settings
+        //
+        public void ClearAntiSmoothingSettings()
+        {
+            for (int i = 0; i < AntiSmoothingSettings.Length; i++)
+            {
+                AntiSmoothingSettings[i].Enabled = false;
+                AntiSmoothingSettings[i].Velocity = 0;
+                AntiSmoothingSettings[i].Shape = 0.5;
+                AntiSmoothingSettings[i].Compensation = 0;
+            }
+        }
+
+
+        //
+        // Set anti-smoothing filter settings
+        //
+        public void SetAntiSmoothingSetting(int index, bool enabled, double velocity, double shape, double compensation)
+        {
+            AntiSmoothingSettings[index].Enabled = enabled;
+            AntiSmoothingSettings[index].Velocity = velocity;
+            AntiSmoothingSettings[index].Shape = shape;
+            AntiSmoothingSettings[index].Compensation = compensation;
+        }
+
+
+        //
+        // Write configuration to a XML file
+        //
         public void Write(string filename)
         {
             var fileWriter = new StreamWriter(filename);
@@ -160,6 +326,9 @@ public void Write(string filename)
             fileWriter.Close();
         }
 
+        //
+        // Create configuration from a XML file
+        //
         public static Configuration CreateFromFile(string filename)
         {
             Configuration config = null;
@@ -179,6 +348,7 @@ public static Configuration CreateFromFile(string filename)
             reader.Close();
             return config;
         }
+
     }
 
 
diff --git a/TabletDriverGUI/MainWindow.Areas.cs b/TabletDriverGUI/MainWindow.Areas.cs
new file mode 100644
index 0000000..87f8e53
--- /dev/null
+++ b/TabletDriverGUI/MainWindow.Areas.cs
@@ -0,0 +1,1542 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using System.Windows.Threading;
+
+namespace TabletDriverGUI
+{
+    public partial class MainWindow : Window
+    {
+
+        //
+        // Screen map canvas elements
+        //
+        private Rectangle[] rectangleMonitors;
+        private Rectangle rectangleDesktop;
+        private Rectangle[] rectangleScreenAreas;
+        private Image imageDesktopScreenshot;
+        private Area lastDesktopSize;
+        private Matrix matrixScreenAreaToCanvas;
+        private Matrix matrixCanvasToScreenArea;
+
+        //
+        // Tablet area canvas elements
+        //
+        private Polygon polygonTabletFullArea;
+        private Polygon[] polygonTabletAreas;
+        private Polygon polygonTabletAreaArrow;
+        private Ellipse ellipsePenPosition;
+        private Ellipse ellipsePenPosition2;
+        private int lastPenPositionIndex;
+        private Matrix matrixTabletAreaToCanvas;
+        private Matrix matrixCanvasToTabletArea;
+
+        // Area colors
+        private Brush[] brushBackgrounds;
+        private Brush brushStrokeSelected;
+        private Brush brushStrokeNormal;
+        private static double selectedStrokeThickness = 4.0;
+
+
+        // Canvas clicked area
+        private class MouseArea
+        {
+            public Area Area;
+            public Point Point;
+            public int Index;
+            public bool IsValid;
+            public MouseArea()
+            {
+                Area = null;
+                Point = new Point(0, 0);
+                Index = 0;
+                IsValid = false;
+            }
+        }
+        private MouseArea mouseArea;
+
+
+        // Canvas Mouse drag
+        private class MouseDrag
+        {
+            public bool IsMouseDown;
+            public object Source;
+            public Point OriginMouse;
+            public Point OriginDraggable;
+            public Area DragArea;
+            public MouseDrag()
+            {
+                IsMouseDown = false;
+                Source = null;
+                OriginMouse = new Point(0, 0);
+                OriginDraggable = new Point(0, 0);
+            }
+        }
+        MouseDrag mouseDrag;
+
+
+
+        //
+        // Get desktop size
+        //
+        System.Drawing.Rectangle GetVirtualDesktopSize()
+        {
+            System.Drawing.Rectangle rect = new System.Drawing.Rectangle();
+
+            // Windows 8 or greater needed for the multiscreen absolute mode
+            if (VersionHelper.IsWindows8OrGreater())
+            {
+                rect.Width = System.Windows.Forms.SystemInformation.VirtualScreen.Width;
+                rect.Height = System.Windows.Forms.SystemInformation.VirtualScreen.Height;
+            }
+            else if(config.Mode != Configuration.OutputModes.Compatibility)
+            {
+                rect.Width = System.Windows.Forms.SystemInformation.VirtualScreen.Width;
+                rect.Height = System.Windows.Forms.SystemInformation.VirtualScreen.Height;
+            }
+            else
+            {
+                rect.Width = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width;
+                rect.Height = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height;
+
+            }
+            return rect;
+        }
+
+
+        //
+        // Get available screens
+        //
+        System.Windows.Forms.Screen[] GetAvailableScreens()
+        {
+            System.Windows.Forms.Screen[] screens;
+
+            // Windows 8 or greater needed for the multiscreen absolute mode
+            if (VersionHelper.IsWindows8OrGreater())
+                screens = System.Windows.Forms.Screen.AllScreens;
+            else if (config.Mode != Configuration.OutputModes.Compatibility)
+                screens = System.Windows.Forms.Screen.AllScreens;
+            else
+                screens = new System.Windows.Forms.Screen[] { System.Windows.Forms.Screen.PrimaryScreen };
+            return screens;
+        }
+
+        //
+        // Get minimum screen position
+        //
+        Vector GetMinimumScreenPosition(System.Windows.Forms.Screen[] screens)
+        {
+
+            // Monitor minimums
+            double minX = 0;
+            double minY = 0;
+            bool first = true;
+            foreach (System.Windows.Forms.Screen screen in screens)
+            {
+                if (first)
+                {
+                    minX = screen.Bounds.X;
+                    minY = screen.Bounds.Y;
+                    first = false;
+                }
+                else
+                {
+                    if (screen.Bounds.X < minX) minX = screen.Bounds.X;
+                    if (screen.Bounds.Y < minY) minY = screen.Bounds.Y;
+                }
+            }
+
+            return new Vector(minX, minY);
+        }
+
+        //
+        // Fix tablet area dimension
+        //
+        void FixTabletAreaDimensions(Area tabletArea, Area screenArea)
+        {
+            // Limits
+            if (tabletArea.Width > config.TabletFullArea.Width)
+                tabletArea.Width = config.TabletFullArea.Width;
+            if (tabletArea.Height > config.TabletFullArea.Height)
+                tabletArea.Height = config.TabletFullArea.Height;
+
+            // Aspect ratio
+            if (config.ForceAspectRatio)
+            {
+                double aspectRatio = screenArea.Width / screenArea.Height;
+                tabletArea.Height = tabletArea.Width / aspectRatio;
+                if (tabletArea.Height > config.TabletFullArea.Height)
+                {
+                    tabletArea.Height = config.TabletFullArea.Height;
+                    tabletArea.Width = tabletArea.Height * aspectRatio;
+                }
+            }
+        }
+
+
+        //
+        // Create canvas elements
+        //
+        void CreateCanvasElements()
+        {
+            //
+            // Screen map canvas
+            //
+            // Clear canvas
+            canvasScreenMap.Children.Clear();
+
+            //
+            // Area background brushes
+            //
+            brushBackgrounds = new SolidColorBrush[10];
+            Color[] colors = new Color[10];
+            for (int i = 0; i < colors.Length; i++)
+            {
+                colors[i] = Color.FromArgb(20, 20, 20, 20);
+            }
+
+            colors[0] = Color.FromRgb(186, 255, 201);
+            colors[1] = Color.FromRgb(186, 225, 255);
+            colors[2] = Color.FromRgb(255, 223, 186);
+            colors[3] = Color.FromRgb(255, 179, 186);
+            colors[4] = Color.FromRgb(255, 255, 150);
+
+            for (int i = 0; i < brushBackgrounds.Length; i++)
+            {
+                double multiplier = 0.9;
+                colors[i].R = (byte)(Math.Round(colors[i].R * multiplier));
+                colors[i].G = (byte)(Math.Round(colors[i].G * multiplier));
+                colors[i].B = (byte)(Math.Round(colors[i].B * multiplier));
+                colors[i].A = 128;
+                brushBackgrounds[i] = new SolidColorBrush(colors[i]);
+            }
+
+            //
+            // Selected brushes
+            //
+            brushStrokeSelected = new SolidColorBrush(Color.FromArgb(128, 255, 30, 30));
+            brushStrokeNormal = new SolidColorBrush(Color.FromArgb(255, 0, 0, 0));
+
+
+            //
+            // Screen map desktop screenshot
+            //
+            imageDesktopScreenshot = new Image
+            {
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Width = 100,
+                Height = 100,
+                Opacity = 0.7
+            };
+            canvasScreenMap.Children.Add(imageDesktopScreenshot);
+            lastDesktopSize = new Area(0, 0, 0, 0);
+
+
+            // Monitor rectangles
+            rectangleMonitors = new Rectangle[16];
+            for (int i = 0; i < 16; i++)
+            {
+                rectangleMonitors[i] = new Rectangle
+                {
+                    Width = 10,
+                    Height = 10,
+                    Stroke = Brushes.Black,
+                    StrokeThickness = 1.0,
+                    Fill = Brushes.Transparent,
+                    Visibility = Visibility.Hidden
+                };
+                canvasScreenMap.Children.Add(rectangleMonitors[i]);
+            }
+
+            //
+            // Desktop area rectangle
+            //
+            rectangleDesktop = new Rectangle
+            {
+                Stroke = Brushes.Black,
+                StrokeThickness = 2.0,
+                Fill = Brushes.Transparent
+            };
+            canvasScreenMap.Children.Add(rectangleDesktop);
+
+
+            //
+            // Screen map area rectangles
+            //
+            rectangleScreenAreas = new Rectangle[config.GetMaxAreaCount()];
+            for (int i = config.GetMaxAreaCount() - 1; i >= 0; i--)
+            {
+                rectangleScreenAreas[i] = new Rectangle
+                {
+                    Stroke = Brushes.Black,
+                    StrokeThickness = 1.5,
+                    Fill = brushBackgrounds[i],
+                    Cursor = Cursors.Hand,
+                    Visibility = Visibility.Collapsed
+                };
+                canvasScreenMap.Children.Add(rectangleScreenAreas[i]);
+            }
+
+            // Screen area matrix
+            matrixScreenAreaToCanvas = new Matrix(0, 0, 0, 0, 0, 0);
+            matrixCanvasToScreenArea = new Matrix(0, 0, 0, 0, 0, 0);
+
+            //
+            // Tablet area canvas
+            //
+            //
+            // Clear
+            canvasTabletArea.Children.Clear();
+
+            //
+            // Tablet full area polygon
+            //
+            polygonTabletFullArea = new Polygon
+            {
+                Stroke = new SolidColorBrush(Color.FromRgb(100, 100, 100)),
+                StrokeThickness = 2.0,
+                Points = new PointCollection
+                {
+                    new Point(0,0),
+                    new Point(0,0),
+                    new Point(0,0),
+                    new Point(0,0)
+                }
+            };
+            canvasTabletArea.Children.Add(polygonTabletFullArea);
+
+            //
+            // Tablet area polygons
+            //
+            polygonTabletAreas = new Polygon[config.GetMaxAreaCount()];
+            for (int i = config.GetMaxAreaCount() - 1; i >= 0; i--)
+            {
+                polygonTabletAreas[i] = new Polygon
+                {
+                    Stroke = Brushes.Black,
+                    StrokeLineJoin = PenLineJoin.Round,
+                    Fill = brushBackgrounds[i],
+                    StrokeThickness = 1.5,
+                    Cursor = Cursors.Hand,
+                    Points = new PointCollection
+                {
+                    new Point(0,0),
+                    new Point(0,0),
+                    new Point(0,0),
+                    new Point(0,0)
+                },
+                };
+                canvasTabletArea.Children.Add(polygonTabletAreas[i]);
+            }
+
+
+            //
+            // Tablet area arrow polygon
+            //
+            polygonTabletAreaArrow = new Polygon
+            {
+                Fill = new SolidColorBrush(Color.FromArgb(50, 20, 20, 20)),
+                Cursor = Cursors.Hand,
+                Points = new PointCollection
+                {
+                    new Point(0,0),
+                    new Point(0,0),
+                    new Point(0,0)
+                },
+            };
+            canvasTabletArea.Children.Add(polygonTabletAreaArrow);
+
+            //
+            // Tablet area pen position
+            //
+            ellipsePenPosition = new Ellipse
+            {
+                Stroke = Brushes.Green,
+                StrokeThickness = 1,
+                Width = 5,
+                Height = 5,
+                Visibility = Visibility.Collapsed
+            };
+            canvasTabletArea.Children.Add(ellipsePenPosition);
+
+            ellipsePenPosition2 = new Ellipse
+            {
+                Stroke = Brushes.Red,
+                StrokeThickness = 1,
+                Width = 5,
+                Height = 5,
+                Visibility = Visibility.Collapsed
+            };
+            canvasTabletArea.Children.Add(ellipsePenPosition2);
+
+
+            timerUpdatePenPositions = new DispatcherTimer
+            {
+                Interval = new TimeSpan(0, 0, 0, 0, 20)
+            };
+            lastPenPositionIndex = 0;
+            timerUpdatePenPositions.Tick += (sender, e) =>
+            {
+                if (lastPenPositionIndex == 0)
+                {
+                    ellipsePenPosition.Visibility = Visibility.Visible;
+                    ellipsePenPosition2.Visibility = Visibility.Visible;
+                }
+                if (driver.tabletState.index != lastPenPositionIndex)
+                {
+                    UpdateTabletAreaCanvasPenPositions();
+                    lastPenPositionIndex = driver.tabletState.index;
+                }
+            };
+            timerUpdatePenPositions.Stop();
+
+
+            //
+            // Tablet area matrix
+            //
+            matrixTabletAreaToCanvas = new Matrix(0, 0, 0, 0, 0, 0);
+            matrixCanvasToTabletArea = new Matrix(0, 0, 0, 0, 0, 0);
+
+            // Canvas mouse area
+            mouseArea = new MouseArea();
+
+            //
+            // Canvas mouse drag
+            //
+            mouseDrag = new MouseDrag();
+        }
+
+
+        //
+        // Update canvas elements
+        //
+        void UpdateCanvasElements()
+        {
+            if (config == null) return;
+            if (isLoadingSettings) return;
+            UpdateDesktopImage();
+            UpdateScreenMapCanvas();
+            UpdateTabletAreaCanvas();
+            UpdateAreaInformation();
+        }
+
+
+        //
+        // Update screen map desktop image
+        //
+        void UpdateDesktopImage()
+        {
+            if (imageDesktopScreenshot != null && imageDesktopScreenshot.Source != null)
+            {
+                if (
+                    config.DesktopSize.Width == lastDesktopSize.Width
+                    &&
+                    config.DesktopSize.Height == lastDesktopSize.Height
+                )
+                {
+                    return;
+                }
+            }
+
+            try
+            {
+                int screenLeft = System.Windows.Forms.SystemInformation.VirtualScreen.Left;
+                int screenTop = System.Windows.Forms.SystemInformation.VirtualScreen.Top;
+                int screenWidth = System.Windows.Forms.SystemInformation.VirtualScreen.Width;
+                int screenHeight = System.Windows.Forms.SystemInformation.VirtualScreen.Height;
+
+
+                // Create desktop screenshot bitmap
+                System.Drawing.Bitmap bitmapDesktop = new System.Drawing.Bitmap(screenWidth, screenHeight);
+                System.Drawing.Graphics graphicsDesktop = System.Drawing.Graphics.FromImage(bitmapDesktop);
+                graphicsDesktop.CopyFromScreen(screenLeft, screenTop, 0, 0, bitmapDesktop.Size, System.Drawing.CopyPixelOperation.SourceCopy);
+
+
+                // Create downscaled bitmap
+                double scaleX = canvasScreenMap.ActualWidth / screenWidth;
+                double scaleY = canvasScreenMap.ActualHeight / screenHeight;
+                double scale = scaleX;
+                if (scaleX > scaleY)
+                    scale = scaleY;
+                System.Drawing.Bitmap bitmapDownscaled = new System.Drawing.Bitmap(
+                    (int)Math.Round(screenWidth * scale),
+                    (int)Math.Round(screenHeight * scale)
+                );
+                System.Drawing.Graphics graphicsDownscaled = System.Drawing.Graphics.FromImage(bitmapDownscaled);
+                graphicsDownscaled.DrawImage(bitmapDesktop, 0, 0, bitmapDownscaled.Width, bitmapDownscaled.Height);
+
+
+                // Create source from the bitmap
+                IntPtr handleBitmap = bitmapDownscaled.GetHbitmap();
+                BitmapSource bitmapSource = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(
+                        handleBitmap,
+                        IntPtr.Zero,
+                        Int32Rect.Empty,
+                        BitmapSizeOptions.FromEmptyOptions()
+                    );
+                imageDesktopScreenshot.Source = bitmapSource;
+
+                // Release resources
+                NativeMethods.DeleteObject(handleBitmap);
+                graphicsDesktop.Dispose();
+                bitmapDesktop.Dispose();
+                graphicsDownscaled.Dispose();
+                bitmapDownscaled.Dispose();
+
+                // Run GC
+                GC.Collect(10, GCCollectionMode.Forced);
+
+
+                // Update last desktop size
+                lastDesktopSize.Width = config.DesktopSize.Width;
+                lastDesktopSize.Height = config.DesktopSize.Height;
+
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+
+        //
+        // Update screen map canvas elements
+        //
+        void UpdateScreenMapCanvas()
+        {
+
+            // Canvas element scaling
+            double scaleX = (canvasScreenMap.ActualWidth - 2) / config.DesktopSize.Width;
+            double scaleY = (canvasScreenMap.ActualHeight - 2) / config.DesktopSize.Height;
+            double scale = scaleX;
+            if (scaleX > scaleY)
+                scale = scaleY;
+
+            // Centered offset
+            double offsetX = canvasScreenMap.ActualWidth / 2.0 - config.DesktopSize.Width * scale / 2.0;
+            double offsetY = canvasScreenMap.ActualHeight / 2.0 - config.DesktopSize.Height * scale / 2.0;
+
+            // Matrices
+            matrixScreenAreaToCanvas.M11 = scale;
+            matrixScreenAreaToCanvas.M22 = scale;
+            matrixScreenAreaToCanvas.OffsetX = offsetX;
+            matrixScreenAreaToCanvas.OffsetY = offsetY;
+
+            matrixCanvasToScreenArea.M11 = 1 / scale;
+            matrixCanvasToScreenArea.M22 = 1 / scale;
+            matrixCanvasToScreenArea.OffsetX = -offsetX / scale;
+            matrixCanvasToScreenArea.OffsetY = -offsetY / scale;
+
+
+            // Full desktop area
+            rectangleDesktop.Width = config.DesktopSize.Width * scale;
+            rectangleDesktop.Height = config.DesktopSize.Height * scale;
+            Canvas.SetLeft(rectangleDesktop, offsetX);
+            Canvas.SetTop(rectangleDesktop, offsetY);
+
+            imageDesktopScreenshot.Width = config.DesktopSize.Width * scale;
+            imageDesktopScreenshot.Height = config.DesktopSize.Height * scale;
+            Canvas.SetLeft(imageDesktopScreenshot, offsetX);
+            Canvas.SetTop(imageDesktopScreenshot, offsetY);
+
+
+            //
+            // Screen map area rectangles
+            //
+            for (int i = 0; i < config.GetAreaCount(); i++)
+            {
+                rectangleScreenAreas[i].Width = config.ScreenAreas[i].Width * scale;
+                rectangleScreenAreas[i].Height = config.ScreenAreas[i].Height * scale;
+                Canvas.SetLeft(rectangleScreenAreas[i], offsetX + (config.ScreenAreas[i].X - config.ScreenAreas[i].Width / 2.0) * scale);
+                Canvas.SetTop(rectangleScreenAreas[i], offsetY + (config.ScreenAreas[i].Y - config.ScreenAreas[i].Height / 2.0) * scale);
+
+                if (mouseArea.IsValid && mouseArea.Index == i)
+                {
+                    rectangleScreenAreas[i].Stroke = brushStrokeSelected;
+                    rectangleScreenAreas[i].StrokeThickness = selectedStrokeThickness;
+                }
+                else
+                {
+                    rectangleScreenAreas[i].Stroke = brushStrokeNormal;
+                    rectangleScreenAreas[i].StrokeThickness = 1.5;
+                }
+
+                if (config.ScreenAreas[i].IsEnabled)
+                {
+                    rectangleScreenAreas[i].Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    rectangleScreenAreas[i].Visibility = Visibility.Collapsed;
+                }
+            }
+
+            // Only primary area enabled -> remove red border
+            if (config.GetEnabledAreaCount() == 1)
+            {
+                rectangleScreenAreas[0].Stroke = brushStrokeNormal;
+                rectangleScreenAreas[0].StrokeThickness = 1.5;
+
+            }
+
+            //
+            // Monitor rectangles
+            //
+            System.Windows.Forms.Screen[] screens = GetAvailableScreens();
+            Vector minimumScreenPosition = GetMinimumScreenPosition(screens);
+
+            // Hide all rectangles
+            for (int i = 0; i < rectangleMonitors.Length; i++)
+                rectangleMonitors[i].Visibility = Visibility.Collapsed;
+
+            int rectangeIndex = 0;
+            foreach (System.Windows.Forms.Screen screen in screens)
+            {
+                double x = screen.Bounds.X - minimumScreenPosition.X;
+                double y = screen.Bounds.Y - minimumScreenPosition.Y;
+
+                rectangleMonitors[rectangeIndex].Visibility = Visibility.Visible;
+                rectangleMonitors[rectangeIndex].Width = screen.Bounds.Width * scale;
+                rectangleMonitors[rectangeIndex].Height = screen.Bounds.Height * scale;
+                Canvas.SetLeft(rectangleMonitors[rectangeIndex], offsetX + x * scale);
+                Canvas.SetTop(rectangleMonitors[rectangeIndex], offsetY + y * scale);
+
+                rectangeIndex++;
+                if (rectangeIndex >= 16) break;
+            }
+
+
+            canvasScreenMap.UpdateLayout();
+
+        }
+
+
+        //
+        // Update tablet area canvas elements
+        //
+        void UpdateTabletAreaCanvas()
+        {
+            double fullWidth = config.TabletFullArea.Width;
+            double fullHeight = config.TabletFullArea.Height;
+
+            // Canvas element scaling
+            double scaleX = (canvasTabletArea.ActualWidth - 2) / fullWidth;
+            double scaleY = (canvasTabletArea.ActualHeight - 2) / fullHeight;
+            double scale = scaleX;
+            if (scaleX > scaleY)
+                scale = scaleY;
+
+            double offsetX = canvasTabletArea.ActualWidth / 2.0 - fullWidth * scale / 2.0;
+            double offsetY = canvasTabletArea.ActualHeight / 2.0 - fullHeight * scale / 2.0;
+
+            // Matrices
+            matrixTabletAreaToCanvas.M11 = scale;
+            matrixTabletAreaToCanvas.M22 = scale;
+            matrixTabletAreaToCanvas.OffsetX = offsetX;
+            matrixTabletAreaToCanvas.OffsetY = offsetY;
+
+            matrixCanvasToTabletArea.M11 = 1 / scale;
+            matrixCanvasToTabletArea.M22 = 1 / scale;
+            matrixCanvasToTabletArea.OffsetX = -offsetX / scale;
+            matrixCanvasToTabletArea.OffsetY = -offsetY / scale;
+
+
+
+            //
+            // Tablet full area
+            //
+            Point[] corners = config.TabletFullArea.Corners;
+            for (int i = 0; i < 4; i++)
+            {
+                Point p = corners[i];
+                p.X *= scale;
+                p.Y *= scale;
+                p.X += config.TabletFullArea.X * scale + offsetX;
+                p.Y += config.TabletFullArea.Y * scale + offsetY;
+                polygonTabletFullArea.Points[i] = p;
+            }
+
+
+            //
+            // Tablet areas
+            //
+            for (int i = 0; i < config.GetAreaCount(); i++)
+            {
+                corners = config.TabletAreas[i].Corners;
+                for (int j = 0; j < 4; j++)
+                {
+                    Point p = corners[j];
+                    p.X *= scale;
+                    p.Y *= scale;
+                    p.X += config.TabletAreas[i].X * scale + offsetX;
+                    p.Y += config.TabletAreas[i].Y * scale + offsetY;
+                    polygonTabletAreas[i].Points[j] = p;
+                }
+
+
+                if (mouseArea.IsValid && mouseArea.Index == i)
+                {
+                    polygonTabletAreas[i].Stroke = brushStrokeSelected;
+                    polygonTabletAreas[i].StrokeThickness = selectedStrokeThickness;
+                }
+                else
+                {
+                    polygonTabletAreas[i].Stroke = brushStrokeNormal;
+                    polygonTabletAreas[i].StrokeThickness = 1.5;
+                }
+
+                if (config.ScreenAreas[i].IsEnabled)
+                {
+                    polygonTabletAreas[i].Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    polygonTabletAreas[i].Visibility = Visibility.Collapsed;
+                }
+            }
+
+            // Only primary area enabled -> remove red border
+            if (config.GetEnabledAreaCount() == 1)
+            {
+                polygonTabletAreas[0].Stroke = brushStrokeNormal;
+                polygonTabletAreas[0].StrokeThickness = 1.5;
+            }
+
+
+
+            //
+            // Tablet area arrow
+            //
+            corners = config.TabletAreas[0].Corners;
+            polygonTabletAreaArrow.Points[0] = new Point(
+                offsetX + config.TabletAreas[0].X * scale,
+                offsetY + config.TabletAreas[0].Y * scale
+            );
+
+            polygonTabletAreaArrow.Points[1] = new Point(
+                offsetX + corners[2].X * scale + config.TabletAreas[0].X * scale,
+                offsetY + corners[2].Y * scale + config.TabletAreas[0].Y * scale
+            );
+
+            polygonTabletAreaArrow.Points[2] = new Point(
+                offsetX + corners[3].X * scale + config.TabletAreas[0].X * scale,
+                offsetY + corners[3].Y * scale + config.TabletAreas[0].Y * scale
+            );
+
+
+            canvasTabletArea.UpdateLayout();
+
+
+
+        }
+
+
+
+        //
+        // Update canvas pen positions
+        // 
+        void UpdateTabletAreaCanvasPenPositions()
+        {
+            Point p = new Point();
+
+            // Inverted
+            if (config.Invert)
+            {
+                // Input position
+                p.X = config.TabletFullArea.Width - driver.tabletState.inputX;
+                p.Y = config.TabletFullArea.Height - driver.tabletState.inputY;
+                matrixTabletAreaToCanvas.Transform(p);
+                Canvas.SetLeft(ellipsePenPosition, p.X);
+                Canvas.SetTop(ellipsePenPosition, p.Y);
+
+                // Output position
+                p.X = config.TabletFullArea.Width - driver.tabletState.outputX;
+                p.Y = config.TabletFullArea.Height - driver.tabletState.outputY;
+                matrixTabletAreaToCanvas.Transform(p);
+                Canvas.SetLeft(ellipsePenPosition2, p.X);
+                Canvas.SetTop(ellipsePenPosition2, p.Y);
+            }
+            else
+            {
+                // Input position
+                p.X = driver.tabletState.inputX;
+                p.Y = driver.tabletState.inputY;
+                matrixTabletAreaToCanvas.Transform(p);
+                Canvas.SetLeft(ellipsePenPosition, p.X);
+                Canvas.SetTop(ellipsePenPosition, p.Y);
+
+                // Output position
+                p.X = driver.tabletState.outputX;
+                p.Y = driver.tabletState.outputY;
+                matrixTabletAreaToCanvas.Transform(p);
+                Canvas.SetLeft(ellipsePenPosition2, p.X);
+                Canvas.SetTop(ellipsePenPosition2, p.Y);
+            }
+
+        }
+
+        //
+        // Get area coordinates from canvas position
+        //
+        Point GetAreaCoordinates(UIElement canvas, Point p)
+        {
+            Point point = new Point(p.X, p.Y);
+
+            if (canvas == canvasScreenMap)
+            {
+                point = matrixCanvasToScreenArea.Transform(point);
+            }
+            else if (canvas == canvasTabletArea)
+            {
+                point = matrixCanvasToTabletArea.Transform(point);
+            }
+
+            return point;
+        }
+
+
+        //
+        // Update last clicked area
+        //
+        void UpdateMouseArea(UIElement sender, Point cursorPosition)
+        {
+            Area area = null;
+            Point areaPoint = new Point(0, 0);
+            int index = -1;
+
+            Point clickPosition = GetAreaCoordinates(sender, cursorPosition);
+
+            //
+            // Screen areas
+            //
+            if (sender == canvasScreenMap)
+            {
+                for (int i = 0; i < config.GetAreaCount(); i++)
+                {
+                    if (
+                        config.ScreenAreas[i].IsEnabled
+                        &&
+                        config.ScreenAreas[i].IsInside(clickPosition)
+                        &&
+
+                        // Area smaller than last found area?
+                        (
+                            area == null
+                            ||
+                            area.Width > config.ScreenAreas[i].Width
+                        )
+                    )
+                    {
+                        area = config.ScreenAreas[i];
+                        config.SelectedScreenArea = config.ScreenAreas[i];
+                        config.SelectedTabletArea = config.TabletAreas[i];
+                        index = i;
+                    }
+                }
+                if (index == -1)
+                {
+                    config.SelectedScreenArea = config.ScreenAreas[0];
+                    config.SelectedTabletArea = config.TabletAreas[0];
+                }
+            }
+
+
+            //
+            // Tablet areas
+            //
+            else if (sender == canvasTabletArea)
+            {
+                for (int i = 0; i < config.GetAreaCount(); i++)
+                {
+                    if (
+                        config.ScreenAreas[i].IsEnabled
+                        &&
+                        config.TabletAreas[i].IsInside(clickPosition)
+                        &&
+
+                        // Area smaller than last found area?
+                        (
+                            area == null
+                            ||
+                            area.Width > config.TabletAreas[i].Width
+                        )
+                    )
+                    {
+                        area = config.TabletAreas[i];
+                        config.SelectedScreenArea = config.ScreenAreas[i];
+                        config.SelectedTabletArea = config.TabletAreas[i];
+                        index = i;
+                    }
+                }
+                if (index == -1)
+                {
+                    config.SelectedScreenArea = config.ScreenAreas[0];
+                    config.SelectedTabletArea = config.TabletAreas[0];
+                }
+            }
+
+            if (area != null)
+            {
+                mouseArea.Area = area;
+                mouseArea.Index = index;
+                mouseArea.IsValid = true;
+            }
+            else
+            {
+                mouseArea.Area = null;
+                mouseArea.Index = index;
+                mouseArea.IsValid = false;
+            }
+            mouseArea.Point.X = clickPosition.X;
+            mouseArea.Point.Y = clickPosition.Y;
+
+
+        }
+
+        //
+        // Update area information
+        //
+        void UpdateAreaInformation()
+        {
+            // Update area information label
+            int areaIndex = mouseArea.Index;
+            if (areaIndex < 0) areaIndex = 0;
+            string areaText = "AREA #" + (areaIndex + 1) + " | ";
+            if (config.GetEnabledAreaCount() == 1) areaText = "";
+
+            // Screen area
+            labelScreenAreaInfo.Content = areaText +
+                "" + Utils.GetNumberString(config.SelectedScreenArea.Width / config.SelectedScreenArea.Height, "0.000") + ":1" +
+                " | " + Utils.GetNumberString(config.SelectedScreenArea.Width * config.SelectedScreenArea.Height, "0") + " pixels";
+
+            // Tablet area
+            labelTabletAreaInfo.Content = areaText +
+                "" + Utils.GetNumberString(config.SelectedTabletArea.Width / config.SelectedTabletArea.Height, "0.000") + ":1" +
+                " | " + Utils.GetNumberString(config.SelectedTabletArea.Width * config.SelectedTabletArea.Height, "0") + " mm²" +
+                " " + Utils.GetNumberString(
+                    config.SelectedTabletArea.Width * config.SelectedTabletArea.Height /
+                    (config.TabletFullArea.Width * config.TabletFullArea.Height) * 100.0
+                    , "0") + "%" +
+                " | " + Utils.GetNumberString(config.SelectedScreenArea.Width / config.SelectedTabletArea.Width, "0.0") + " x " +
+                Utils.GetNumberString(config.SelectedScreenArea.Height / config.SelectedTabletArea.Height, "0.0") + " px/mm";
+
+        }
+
+        //
+        // Canvas mouse events
+        //
+        //
+        // Canvas mouse down
+        private void Canvas_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            bool mouseDown = false;
+
+            // Is the button left mouse button?
+            if (e.LeftButton == MouseButtonState.Pressed)
+                mouseDown = true;
+
+            // Update last clicked area
+            Point cursorPosition = e.GetPosition((UIElement)sender);
+            UpdateMouseArea((UIElement)sender, cursorPosition);
+
+            if (sender != canvasScreenMap && sender != canvasTabletArea) return;
+
+            mouseDrag.Source = (UIElement)sender;
+            mouseDrag.OriginMouse = cursorPosition;
+
+            //
+            // Screen map drag
+            //
+            if (mouseDrag.Source == canvasScreenMap)
+            {
+                if (!mouseArea.IsValid) return;
+                mouseDrag.DragArea = mouseArea.Area;
+
+                // Reset monitor selection
+                comboBoxMonitor.SelectedIndex = -1;
+
+                mouseDrag.IsMouseDown = mouseDown;
+                mouseDrag.OriginDraggable = new Point(mouseDrag.DragArea.X, mouseDrag.DragArea.Y);
+                canvasScreenMap.CaptureMouse();
+            }
+
+            //
+            // Tablet area drag
+            //
+            else if (mouseDrag.Source == canvasTabletArea)
+            {
+                if (!mouseArea.IsValid) return;
+                mouseDrag.DragArea = mouseArea.Area;
+
+                mouseDrag.IsMouseDown = mouseDown;
+                mouseDrag.OriginDraggable = new Point(mouseDrag.DragArea.X, mouseDrag.DragArea.Y);
+                canvasTabletArea.CaptureMouse();
+            }
+
+        }
+
+
+        //
+        // Canvas mouse up
+        //
+        private void Canvas_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            mouseDrag.IsMouseDown = false;
+            LoadSettingsFromConfiguration();
+            //isLoadingSettings = true;
+            textScreenAreaX.Text = Utils.GetNumberString(config.SelectedScreenArea.X - config.SelectedScreenArea.Width / 2.0, "0");
+            textScreenAreaY.Text = Utils.GetNumberString(config.SelectedScreenArea.Y - config.SelectedScreenArea.Height / 2.0, "0");
+            textTabletAreaX.Text = Utils.GetNumberString(config.SelectedTabletArea.X);
+            textTabletAreaY.Text = Utils.GetNumberString(config.SelectedTabletArea.Y);
+            //isLoadingSettings = false;
+            canvasScreenMap.ReleaseMouseCapture();
+            canvasTabletArea.ReleaseMouseCapture();
+        }
+
+
+        //
+        // Canvas mouse move
+        //
+        private void Canvas_MouseMove(object sender, MouseEventArgs e)
+        {
+            Point position;
+            double dx, dy;
+            double scaleX = 0, scaleY = 0, scale = 0;
+            double gridSize = 1;
+
+            // Canvas mouse drag
+            if (mouseDrag.IsMouseDown && mouseDrag.Source == sender)
+            {
+                position = e.GetPosition((UIElement)mouseDrag.Source);
+
+                dx = position.X - mouseDrag.OriginMouse.X;
+                dy = position.Y - mouseDrag.OriginMouse.Y;
+
+                // Shift + Drag -> Only move up/down
+                if (Keyboard.Modifiers.HasFlag(ModifierKeys.Shift))
+                    dx = 0;
+
+                // Control + Drag -> Only move left/right
+                if (Keyboard.Modifiers.HasFlag(ModifierKeys.Control))
+                    dy = 0;
+
+                // Alt + Drag -> Use larger grid size
+                if (sender == canvasScreenMap && Keyboard.Modifiers.HasFlag(ModifierKeys.Alt))
+                    gridSize = 80;
+                if (sender == canvasTabletArea && Keyboard.Modifiers.HasFlag(ModifierKeys.Alt))
+                    gridSize = 5;
+
+
+                // Screen map canvas
+                if (mouseDrag.Source == canvasScreenMap && mouseDrag.DragArea != null)
+                {
+                    scaleX = config.DesktopSize.Width / canvasScreenMap.ActualWidth;
+                    scaleY = config.DesktopSize.Height / canvasScreenMap.ActualHeight;
+                    scale = scaleY;
+                    if (scaleX > scaleY)
+                        scale = scaleX;
+
+                    // Grid
+                    dx = Math.Round(dx * scale / gridSize) * gridSize / scale;
+                    dy = Math.Round(dy * scale / gridSize) * gridSize / scale;
+
+                    // Move area
+                    mouseDrag.DragArea.X = mouseDrag.OriginDraggable.X + dx * scale;
+                    mouseDrag.DragArea.Y = mouseDrag.OriginDraggable.Y + dy * scale;
+
+                    LoadSettingsFromConfiguration();
+                }
+
+                // Tablet area canvas
+                else if (mouseDrag.Source == canvasTabletArea && mouseDrag.DragArea != null)
+                {
+                    scaleX = config.TabletFullArea.Width / canvasTabletArea.ActualWidth;
+                    scaleY = config.TabletFullArea.Height / canvasTabletArea.ActualHeight;
+                    scale = scaleY;
+                    if (scaleX > scaleY)
+                        scale = scaleX;
+
+                    // Grid
+                    dx = Math.Round(dx * scale / gridSize) * gridSize / scale;
+                    dy = Math.Round(dy * scale / gridSize) * gridSize / scale;
+
+                    // Move area
+                    mouseDrag.DragArea.X = mouseDrag.OriginDraggable.X + dx * scale;
+                    mouseDrag.DragArea.Y = mouseDrag.OriginDraggable.Y + dy * scale;
+
+                    LoadSettingsFromConfiguration();
+                }
+            }
+
+        }
+
+
+        //
+        // Screen or tablet area mouse scroll
+        //
+        private void CanvasMouseWheel(object sender, MouseWheelEventArgs e)
+        {
+
+            //
+            // Screen or tablet area scroll
+            //
+            if (sender == canvasScreenMap || sender == canvasTabletArea)
+            {
+                if (!mouseArea.IsValid) return;
+                double delta = e.Delta / 120.0;
+                if (sender == canvasScreenMap)
+                {
+                    delta *= 10;
+                }
+                if (Keyboard.Modifiers == ModifierKeys.Control)
+                {
+                    delta *= 10;
+                }
+
+                double oldWidth = mouseArea.Area.Width;
+                double oldHeight = mouseArea.Area.Height;
+                mouseArea.Area.Width = Math.Round(oldWidth + delta);
+                mouseArea.Area.Height = oldHeight / oldWidth * mouseArea.Area.Width;
+                LoadSettingsFromConfiguration();
+            }
+
+        }
+
+        //
+        // Canvas context menu click
+        //
+        private void Canvas_MenuClick(object sender, RoutedEventArgs e)
+        {
+            if (sender == null) return;
+            if (!(sender is MenuItem)) return;
+            MenuItem menuItem = (MenuItem)sender;
+
+
+            //
+            // Move screen area center of a monitor or set to full monitor
+            //
+            if (sender == menuCanvasMoveToMonitorCenter || sender == menuCanvasSetToFullMonitor)
+            {
+                if (!mouseArea.IsValid) return;
+
+                // Get monitors
+                System.Windows.Forms.Screen[] screens = GetAvailableScreens();
+                Vector minimumScreenPosition = GetMinimumScreenPosition(screens);
+
+                // Loop through monitors
+                foreach (System.Windows.Forms.Screen screen in screens)
+                {
+                    double x = screen.Bounds.X - minimumScreenPosition.X;
+                    double y = screen.Bounds.Y - minimumScreenPosition.Y;
+                    if (
+                        mouseArea.Point.X >= x && mouseArea.Point.X <= x + screen.Bounds.Width
+                        &&
+                        mouseArea.Point.Y >= y && mouseArea.Point.Y <= y + screen.Bounds.Height
+                    )
+                    {
+                        mouseArea.Area.X = x + screen.Bounds.Width / 2.0;
+                        mouseArea.Area.Y = y + screen.Bounds.Height / 2.0;
+                        if (sender == menuCanvasSetToFullMonitor)
+                        {
+                            mouseArea.Area.Width = screen.Bounds.Width;
+                            mouseArea.Area.Height = screen.Bounds.Height;
+                        }
+                        LoadSettingsFromConfiguration();
+                        break;
+                    }
+                }
+
+            }
+
+
+            //
+            // Set to full screen area
+            //
+            else if (sender == menuCanvasSetToFullDesktop)
+            {
+                if (!mouseArea.IsValid) return;
+                mouseArea.Area.X = config.DesktopSize.X;
+                mouseArea.Area.Y = config.DesktopSize.Y;
+                mouseArea.Area.Width = config.DesktopSize.Width;
+                mouseArea.Area.Height = config.DesktopSize.Height;
+
+                LoadSettingsFromConfiguration();
+            }
+
+
+            //
+            // Move tablet area to center
+            //
+            else if (sender == menuCanvasMoveToCenter)
+            {
+                if (!mouseArea.IsValid) return;
+
+                mouseArea.Area.X = config.TabletFullArea.Width / 2.0;
+                mouseArea.Area.Y = config.TabletFullArea.Height / 2.0;
+
+                LoadSettingsFromConfiguration();
+            }
+
+
+            //
+            // Set to full tablet area
+            //
+            else if (sender == menuCanvasSetToFullTabletArea)
+            {
+                if (!mouseArea.IsValid) return;
+                mouseArea.Area.Width = config.TabletFullArea.Width;
+                mouseArea.Area.Height = config.TabletFullArea.Height;
+                mouseArea.Area.X = config.TabletFullArea.X;
+                mouseArea.Area.Y = config.TabletFullArea.Y;
+                FixTabletAreaDimensions(config.SelectedTabletArea, config.SelectedScreenArea);
+                LoadSettingsFromConfiguration();
+            }
+
+            //
+            // Force tablet area proportions
+            //
+            else if(sender == menuCanvasForceProportions)
+            {
+                double screenAspectRatio = config.SelectedScreenArea.Width / config.SelectedScreenArea.Height;
+                double tabletAspectRatio = config.SelectedTabletArea.Width / config.SelectedTabletArea.Height;
+
+                // Tablet aspect ratio higher -> change width
+                if (tabletAspectRatio >= screenAspectRatio)
+                    config.SelectedTabletArea.Width = config.SelectedTabletArea.Height * screenAspectRatio;
+
+                // Tablet aspect ratio lower -> change  height
+                else
+                    config.SelectedTabletArea.Height = config.SelectedTabletArea.Width / screenAspectRatio;
+
+                LoadSettingsFromConfiguration();
+            }
+
+            //
+            // Add secondary area
+            //
+            else if (sender == menuCanvasAddScreenArea || sender == menuCanvasAddTabletArea)
+            {
+                for (int i = 1; i < config.GetAreaCount(); i++)
+                {
+                    // Area is not enabled?
+                    if (!config.ScreenAreas[i].IsEnabled)
+                    {
+                        // Enable area
+                        config.ScreenAreas[i].IsEnabled = true;
+
+                        // Screen area
+                        if (sender == menuCanvasAddScreenArea)
+                        {
+                            config.ScreenAreas[i].X = mouseArea.Point.X;
+                            config.ScreenAreas[i].Y = mouseArea.Point.Y;
+                        }
+                        else
+                        {
+                            config.ScreenAreas[i].X = config.DesktopSize.Width / 2.0;
+                            config.ScreenAreas[i].Y = config.DesktopSize.Height / 2.0;
+                        }
+                        config.ScreenAreas[i].Width = 640;
+                        config.ScreenAreas[i].Height = 640 * config.ScreenAreas[0].Height / config.ScreenAreas[0].Width;
+
+                        // Tablet area
+                        if (sender == menuCanvasAddTabletArea)
+                        {
+                            config.TabletAreas[i].X = mouseArea.Point.X;
+                            config.TabletAreas[i].Y = mouseArea.Point.Y;
+                        }
+                        else
+                        {
+                            config.TabletAreas[i].X = config.TabletFullArea.Width / 2.0;
+                            config.TabletAreas[i].Y = config.TabletFullArea.Height / 2.0;
+                        }
+                        config.TabletAreas[i].Width = 50;
+                        config.TabletAreas[i].Height = 50 * config.ScreenAreas[0].Height / config.ScreenAreas[0].Width;
+
+                        break;
+                    }
+                }
+                LoadSettingsFromConfiguration();
+            }
+
+            //
+            // Remove area
+            //
+            else if (sender == menuCanvasRemoveScreenArea || sender == menuCanvasRemoveTabletArea)
+            {
+                if (!mouseArea.IsValid) return;
+
+                WindowMessageBox messageBox = new WindowMessageBox(
+                    "Are you sure?", "Remove area #" + (mouseArea.Index + 1) + "?",
+                    "Yes", "No");
+                messageBox.ShowDialog();
+                if (messageBox.DialogResult == true)
+                {
+                    bool removed = false;
+                    for (int i = 1; i < config.GetAreaCount(); i++)
+                    {
+                        // Item to be removed found
+                        if (!removed && config.ScreenAreas[i] == mouseArea.Area || config.TabletAreas[i] == mouseArea.Area)
+                        {
+                            removed = true;
+                        }
+
+                        // Shift area arrays
+                        else if (removed)
+                        {
+                            config.ScreenAreas[i - 1].Set(config.ScreenAreas[i]);
+                            config.TabletAreas[i - 1].Set(config.TabletAreas[i]);
+                            config.ScreenAreas[i].IsEnabled = false;
+                            config.TabletAreas[i].IsEnabled = false;
+                        }
+                    }
+
+                    // Select primary area
+                    if (removed)
+                    {
+                        config.SelectedScreenArea = config.ScreenAreas[0];
+                        config.SelectedTabletArea = config.TabletAreas[0];
+                        mouseArea.Area = null;
+                        mouseArea.IsValid = false;
+                        LoadSettingsFromConfiguration();
+                    }
+                }
+            }
+
+
+            //
+            // Edit area
+            //           
+            else if (sender == menuCanvasEditScreenArea || sender == menuCanvasEditTabletArea)
+            {
+                if (!mouseArea.IsValid) return;
+
+                int areaIndex = -1;
+                for (int i = 0; i < config.GetAreaCount(); i++)
+                {
+                    if (config.ScreenAreas[i] == mouseArea.Area || config.TabletAreas[i] == mouseArea.Area)
+                    {
+                        areaIndex = i;
+                    }
+                }
+                if (areaIndex >= 0)
+                {
+                    WindowAreaEditor areaEditor = new WindowAreaEditor(config, config.ScreenAreas[areaIndex], config.TabletAreas[areaIndex])
+                    {
+                        Title = "Area #" + (areaIndex + 1)
+                    };
+                    areaEditor.ShowDialog();
+                    if (areaEditor.DialogResult == true)
+                    {
+                        LoadSettingsFromConfiguration();
+                    }
+                }
+            }
+
+
+            //
+            // Reset screen areas
+            //
+            else if (sender == menuCanvasResetScreenAreas)
+            {
+                WindowMessageBox messageBox = new WindowMessageBox(
+                                           "Are you sure?", "Reset all screen areas?",
+                                           "Yes", "No");
+                messageBox.ShowDialog();
+                if (messageBox.DialogResult == true)
+                {
+                    double offsetY = -(config.GetEnabledAreaCount() * 100.0 / 2.0);
+                    foreach (Area screenArea in config.ScreenAreas)
+                    {
+                        screenArea.X = config.DesktopSize.X;
+                        screenArea.Y = config.DesktopSize.Y + offsetY;
+                        screenArea.Width = config.DesktopSize.Width / 2.0;
+                        screenArea.Height = config.DesktopSize.Height / 2.0;
+                        offsetY += 100;
+                    }
+                    LoadSettingsFromConfiguration();
+                }
+            }
+
+
+            //
+            // Reset tablet areas
+            //
+            else if (sender == menuCanvasResetTabletAreas)
+            {
+                WindowMessageBox messageBox = new WindowMessageBox(
+                              "Are you sure?", "Reset all tablet areas?",
+                              "Yes", "No");
+                messageBox.ShowDialog();
+                if (messageBox.DialogResult == true)
+                {
+                    double offsetY = -(config.GetEnabledAreaCount() * 10.0 / 2.0);
+                    foreach (Area tabletArea in config.TabletAreas)
+                    {
+                        tabletArea.X = config.TabletFullArea.X;
+                        tabletArea.Y = config.TabletFullArea.Y + offsetY;
+                        tabletArea.Width = config.TabletFullArea.Width / 2.0;
+                        tabletArea.Height = config.TabletFullArea.Height / 2.0;
+                        offsetY += 10.0;
+
+                    }
+                    LoadSettingsFromConfiguration();
+                }
+            }
+
+
+        }
+
+
+        //
+        // Canvas context menu opening
+        //
+        private void Canvas_ContextMenuOpening(object sender, ContextMenuEventArgs e)
+        {
+
+            //
+            // Screen area canvas context menu
+            //
+            if (sender == canvasScreenMap)
+            {
+                if (!mouseArea.IsValid)
+                {
+                    foreach (object item in canvasScreenMap.ContextMenu.Items)
+                        ((UIElement)item).Visibility = Visibility.Collapsed;
+                    menuCanvasResetScreenAreas.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    // Find area index
+                    int index = 0;
+                    for (int i = 0; i < config.GetAreaCount(); i++)
+                    {
+                        if (config.ScreenAreas[i] == mouseArea.Area) index = i;
+                    }
+
+                    // Create area information string
+                    string areaInfo = "Area #" + (index + 1) + ": ";
+                    areaInfo += Utils.GetNumberString(mouseArea.Area.Width, "0") + "x" +
+                        Utils.GetNumberString(mouseArea.Area.Height, "0") + ", ";
+                    areaInfo += Utils.GetNumberString(mouseArea.Area.Width / mouseArea.Area.Height, "0.000") + ":1";
+
+                    menuCanvasScreenAreaInfo.Header = areaInfo;
+                    foreach (object item in canvasScreenMap.ContextMenu.Items)
+                        ((UIElement)item).Visibility = Visibility.Visible;
+
+                    if (index == 0)
+                    {
+                        menuCanvasRemoveScreenArea.Visibility = Visibility.Collapsed;
+                    }
+
+
+                }
+
+                // Hide add secondary area menu item
+                int areaCount = 0;
+                foreach (Area area in config.ScreenAreas)
+                {
+                    if (area.IsEnabled) areaCount++;
+                }
+                if (areaCount < config.GetAreaCount())
+                    menuCanvasAddScreenArea.Visibility = Visibility.Visible;
+                else
+                    menuCanvasAddScreenArea.Visibility = Visibility.Collapsed;
+            }
+
+            //
+            // Tablet area canvas context menu
+            //
+            else if (sender == canvasTabletArea)
+            {
+                if (!mouseArea.IsValid)
+                {
+                    foreach (object item in canvasTabletArea.ContextMenu.Items)
+                        ((UIElement)item).Visibility = Visibility.Collapsed;
+                    menuCanvasAddTabletArea.Visibility = Visibility.Visible;
+                    menuCanvasResetTabletAreas.Visibility = Visibility.Visible;
+
+                }
+                else
+                {
+                    // Find area index
+                    int index = 0;
+                    for (int i = 0; i < config.GetAreaCount(); i++)
+                    {
+                        if (config.TabletAreas[i] == mouseArea.Area) index = i;
+                    }
+
+                    // Create area information string
+                    string areaInfo = "Area #" + (index + 1) + ": ";
+                    areaInfo += Utils.GetNumberString(mouseArea.Area.Width) + "mm x " +
+                        Utils.GetNumberString(mouseArea.Area.Height) + "mm, ";
+                    areaInfo += Utils.GetNumberString(mouseArea.Area.Width / mouseArea.Area.Height, "0.000") + ":1";
+
+                    menuCanvasTabletAreaInfo.Header = areaInfo;
+
+                    foreach (object item in canvasTabletArea.ContextMenu.Items)
+                        ((UIElement)item).Visibility = Visibility.Visible;
+
+                    if (index == 0)
+                    {
+                        menuCanvasRemoveTabletArea.Visibility = Visibility.Collapsed;
+                    }
+                }
+
+                // Hide add secondary area menu item
+                int areaCount = 0;
+                foreach (Area area in config.ScreenAreas)
+                {
+                    if (area.IsEnabled) areaCount++;
+                }
+                if (areaCount < config.GetAreaCount())
+                    menuCanvasAddTabletArea.Visibility = Visibility.Visible;
+                else
+                    menuCanvasAddTabletArea.Visibility = Visibility.Collapsed;
+
+            }
+
+        }
+
+
+
+
+        #region Wacom / Draw area
+
+        //
+        // Wacom Area
+        //
+        private void ButtonWacomArea_Click(object sender, RoutedEventArgs e)
+        {
+            WindowWacomArea wacom = new WindowWacomArea(config, config.SelectedTabletArea);
+            wacom.ShowDialog();
+
+            // Set button clicked
+            if (wacom.DialogResult == true)
+            {
+                LoadSettingsFromConfiguration();
+            }
+        }
+
+
+        //
+        // Draw area
+        //
+        private void ButtonDrawArea_Click(object sender, RoutedEventArgs e)
+        {
+            if (!isEnabledMeasurementToArea)
+            {
+                isEnabledMeasurementToArea = true;
+                driver.SendCommand("Measure 2");
+                SetStatus("Click the top left and the bottom right corners of the area with your tablet pen!");
+                buttonDrawArea.IsEnabled = false;
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/TabletDriverGUI/MainWindow.Console.cs b/TabletDriverGUI/MainWindow.Console.cs
index 060659e..a837946 100644
--- a/TabletDriverGUI/MainWindow.Console.cs
+++ b/TabletDriverGUI/MainWindow.Console.cs
@@ -22,6 +22,8 @@ private void ConsoleBufferToText()
         {
             StringBuilder stringBuilder = new StringBuilder();
 
+            if (driver == null) return;
+
             // Lock console
             driver.ConsoleLock();
 
@@ -108,11 +110,12 @@ private void ConsoleSendCommand(string line)
             textConsoleInput.ScrollToEnd();
             try
             {
-                driver.SendCommand(line);
+                driver.SendPipeCommand(line);
+                //driver.SendCommand(line);
             }
             catch (Exception e)
             {
-                driver.ConsoleAddText("Error! " + e.Message);
+                driver.ConsoleAddLine("Error! " + e.Message);
             }
         }
 
@@ -122,7 +125,12 @@ private void ConsoleSendCommand(string line)
         //
         private void TimerConsoleUpdate_Tick(object sender, EventArgs e)
         {
-            ConsoleBufferToText();
+            
+            // Update console text if console tab is active
+            if (tabControl.SelectedItem == tabConsole && WindowState != WindowState.Minimized)
+            {
+                ConsoleBufferToText();
+            }
         }
 
 
@@ -134,7 +142,7 @@ private void TextConsoleInput_KeyDown(object sender, KeyEventArgs e)
             if (e.Key == Key.Enter)
             {
                 string line = textConsoleInput.Text;
-                ConsoleSendCommand(line);
+                ConsoleSendCommand(line.Trim());
             }
         }
 
diff --git a/TabletDriverGUI/MainWindow.Driver.cs b/TabletDriverGUI/MainWindow.Driver.cs
index a8ac04d..f962850 100644
--- a/TabletDriverGUI/MainWindow.Driver.cs
+++ b/TabletDriverGUI/MainWindow.Driver.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -27,11 +28,18 @@ void StartDriver()
                 // Console timer
                 timerConsoleUpdate.Start();
 
+                // Pen position timer
+                //timerUpdatePenPositions.Start();
+
                 driver.Start(config.DriverPath, config.DriverArguments);
                 if (!driver.IsRunning)
                 {
                     SetStatus("Can't start the driver! Check the console!");
-                    driver.ConsoleAddText("ERROR! Can't start the driver!");
+                    driver.ConsoleAddLine("ERROR! Can't start the driver!");
+                }
+                else
+                {
+                    SetStatus("Driver starting...");
                 }
             }
 
@@ -39,7 +47,7 @@ void StartDriver()
             catch (Exception e)
             {
                 SetStatus("Can't start the driver! Check the console!");
-                driver.ConsoleAddText("ERROR! Can't start the driver!\n  " + e.Message);
+                driver.ConsoleAddLine("ERROR! Can't start the driver!\n  " + e.Message);
             }
         }
 
@@ -51,6 +59,9 @@ void StopDriver()
         {
             if (!running) return;
             running = false;
+
+            //timerUpdatePenPositions.Stop();
+
             driver.Stop();
             timerConsoleUpdate.Stop();
         }
@@ -63,69 +74,137 @@ private void SendSettingsToDriver()
         {
             if (!driver.IsRunning) return;
 
+            // Clear setting commands list
             settingCommands.Clear();
 
+            //
             // Desktop size
+            //
             settingCommands.Add("DesktopSize " + textDesktopWidth.Text + " " + textDesktopHeight.Text);
 
-            // Screen area
-            settingCommands.Add("ScreenArea " +
-                Utils.GetNumberString(config.ScreenArea.Width) + " " + Utils.GetNumberString(config.ScreenArea.Height) + " " +
-                Utils.GetNumberString(config.ScreenArea.X) + " " + Utils.GetNumberString(config.ScreenArea.Y)
-            );
-
 
             //
-            // Tablet area
+            // Screen and tablet areas
             //
-            // Inverted
-            if (config.Invert)
+            int areaIndex = 0;
+            for (int i = 0; i < config.GetAreaCount(); i++)
             {
-                settingCommands.Add("TabletArea " +
-                    Utils.GetNumberString(config.TabletArea.Width) + " " +
-                    Utils.GetNumberString(config.TabletArea.Height) + " " +
-                    Utils.GetNumberString(config.TabletFullArea.Width - config.TabletArea.X) + " " +
-                    Utils.GetNumberString(config.TabletFullArea.Height - config.TabletArea.Y)
-                );
-                settingCommands.Add("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation + 180));
-            }
-            // Normal
-            else
-            {
-                settingCommands.Add("TabletArea " +
-                    Utils.GetNumberString(config.TabletArea.Width) + " " +
-                    Utils.GetNumberString(config.TabletArea.Height) + " " +
-                    Utils.GetNumberString(config.TabletArea.X) + " " +
-                    Utils.GetNumberString(config.TabletArea.Y)
-                );
-                settingCommands.Add("Rotate " + Utils.GetNumberString(config.TabletArea.Rotation));
+                if (config.ScreenAreas[i].IsEnabled)
+                {
+                    // Screen area
+                    settingCommands.Add("ScreenArea " +
+                        Utils.GetNumberString(config.ScreenAreas[i].Width) + " " + Utils.GetNumberString(config.ScreenAreas[i].Height) + " " +
+                        Utils.GetNumberString(config.ScreenAreas[i].X) + " " + Utils.GetNumberString(config.ScreenAreas[i].Y) + " " +
+                        areaIndex
+                    );
+
+                    // Inverted tablet area
+                    if (config.Invert)
+                    {
+                        settingCommands.Add("TabletArea " +
+                            Utils.GetNumberString(config.TabletAreas[i].Width) + " " +
+                            Utils.GetNumberString(config.TabletAreas[i].Height) + " " +
+                            Utils.GetNumberString(config.TabletFullArea.Width - config.TabletAreas[i].X) + " " +
+                            Utils.GetNumberString(config.TabletFullArea.Height - config.TabletAreas[i].Y) + " " +
+                            areaIndex
+                        );
+                        settingCommands.Add(
+                            "Rotate " + Utils.GetNumberString(config.TabletAreas[0].Rotation + 180) + " " +
+                            areaIndex
+                        );
+
+                    }
+
+                    // Normal tablet area
+                    else
+                    {
+                        settingCommands.Add("TabletArea " +
+                            Utils.GetNumberString(config.TabletAreas[i].Width) + " " +
+                            Utils.GetNumberString(config.TabletAreas[i].Height) + " " +
+                            Utils.GetNumberString(config.TabletAreas[i].X) + " " +
+                            Utils.GetNumberString(config.TabletAreas[i].Y) + " " +
+                            areaIndex
+                        );
+                        settingCommands.Add(
+                            "Rotate " + Utils.GetNumberString(config.TabletAreas[0].Rotation) + " " +
+                            areaIndex
+                        );
+                    }
+                    areaIndex++;
+                }
+
+
+
             }
+            settingCommands.Add("ScreenMapCount " + areaIndex);
 
 
+            //
             // Output Mode
-            switch (config.OutputMode)
+            //
+            switch (config.Mode)
             {
-                case Configuration.OutputModes.Absolute:
-                    settingCommands.Add("OutputMode Absolute");
-                    break;
-                case Configuration.OutputModes.Relative:
-                    settingCommands.Add("OutputMode Relative");
-                    settingCommands.Add("RelativeSensitivity " +
-                        Utils.GetNumberString(config.ScreenArea.Width / config.TabletArea.Width) +
-                        " " +
-                        Utils.GetNumberString(config.ScreenArea.Height / config.TabletArea.Height)
-                    );
-                    break;
-                case Configuration.OutputModes.Digitizer:
-                    settingCommands.Add("OutputMode Digitizer");
+                case Configuration.OutputModes.Standard:
+
+                    // Windows 8, 8.1, 10
+                    if (VersionHelper.IsWindows8OrGreater())
+                    {
+                        if (config.Positioning == Configuration.OutputPositioning.Absolute)
+                            settingCommands.Add("OutputMode Absolute");
+                        else
+                            settingCommands.Add("OutputMode Relative");
+                    }
+
+                    // Windows 7
+                    else
+                    {
+                        if (config.Positioning == Configuration.OutputPositioning.Absolute)
+                            settingCommands.Add("OutputMode SendInputAbsolute");
+                        else
+                            settingCommands.Add("OutputMode SendInputRelative");
+                    }
                     break;
 
-                case Configuration.OutputModes.SendInput:
-                    settingCommands.Add("OutputMode SendInputAbsolute");
+                case Configuration.OutputModes.WindowsInk:
+                    if (config.Positioning == Configuration.OutputPositioning.Absolute)
+                        settingCommands.Add("OutputMode DigitizerAbsolute");
+                    else
+                        settingCommands.Add("OutputMode DigitizerRelative");
                     break;
+                case Configuration.OutputModes.Compatibility:
 
+                    // Windows 8, 8.1, 10
+                    if (VersionHelper.IsWindows8OrGreater())
+                    {
+                        if (config.Positioning == Configuration.OutputPositioning.Absolute)
+                            settingCommands.Add("OutputMode SendInputAbsolute");
+                        else
+                            settingCommands.Add("OutputMode SendInputRelative");
+                    }
+
+                    // Windows 7
+                    else
+                    {
+                        if (config.Positioning == Configuration.OutputPositioning.Absolute)
+                            settingCommands.Add("OutputMode Absolute");
+                        else
+                            settingCommands.Add("OutputMode Relative");
+                    }
+                    break;
+                default:
+                    break;
             }
 
+            //
+            // Relative positioning sensitivity
+            //
+            settingCommands.Add("RelativeSensitivity " +
+                 Utils.GetNumberString(config.ScreenAreas[0].Width / config.TabletAreas[0].Width) +
+                 " " +
+                 Utils.GetNumberString(config.ScreenAreas[0].Height / config.TabletAreas[0].Height)
+             );
+
+
             //
             // Pen button map
             //
@@ -144,6 +223,7 @@ private void SendSettingsToDriver()
                 }
             }
 
+
             //
             // Tablet button map
             //
@@ -170,7 +250,10 @@ private void SendSettingsToDriver()
             // Pressure
             //
             settingCommands.Add("PressureSensitivity " + Utils.GetNumberString(config.PressureSensitivity));
-            settingCommands.Add("PressureDeadzone " + Utils.GetNumberString(config.PressureDeadzone));
+            settingCommands.Add("PressureDeadzone " +
+                Utils.GetNumberString(config.PressureDeadzoneLow) + " " +
+                Utils.GetNumberString(config.PressureDeadzoneHigh)
+            );
 
 
             //
@@ -179,24 +262,30 @@ private void SendSettingsToDriver()
             settingCommands.Add("ScrollSensitivity " + Utils.GetNumberString(config.ScrollSensitivity));
             settingCommands.Add("ScrollAcceleration " + Utils.GetNumberString(config.ScrollAcceleration));
             settingCommands.Add("ScrollStopCursor " + (config.ScrollStopCursor ? "true" : "false"));
+            settingCommands.Add("ScrollDrag " + (config.ScrollDrag ? "true" : "false"));
 
 
+            //
             // Smoothing filter
+            //
             if (config.SmoothingEnabled)
             {
-                settingCommands.Add("FilterTimerInterval " + Utils.GetNumberString(config.SmoothingInterval));
                 settingCommands.Add(
-                    "Smoothing " + Utils.GetNumberString(config.SmoothingLatency) + " 90 " +
+                    "Smoothing " + Utils.GetNumberString(config.SmoothingLatency) + " " +
                     (config.SmoothingOnlyWhenButtons ? "true" : "false")
                 );
+                settingCommands.Add("FilterTimerInterval " + Utils.GetNumberString(config.SmoothingInterval));
             }
             else
             {
-                settingCommands.Add("FilterTimerInterval 10");
                 settingCommands.Add("Smoothing 0");
+                settingCommands.Add("FilterTimerInterval 10");
             }
 
+
+            //
             // Noise filter
+            //
             if (config.NoiseFilterEnabled)
             {
                 settingCommands.Add("Noise " + Utils.GetNumberString(config.NoiseFilterBuffer) + " " + Utils.GetNumberString(config.NoiseFilterThreshold));
@@ -207,20 +296,49 @@ private void SendSettingsToDriver()
             }
 
 
+            //
             // Anti-smoothing filter
+            //
             if (config.AntiSmoothingEnabled)
             {
-                settingCommands.Add("AntiSmoothing " + Utils.GetNumberString(config.AntiSmoothingShape, "0.000") + " " +
-                    Utils.GetNumberString(config.AntiSmoothingCompensation) + " " +
-                    (config.AntiSmoothingOnlyWhenHover ? "true" : "false"));
+                settingCommands.Add(
+                    "AntiSmoothing " +
+                    (config.AntiSmoothingOnlyWhenHover ? "true" : "false") + " " +
+                    Utils.GetNumberString(config.AntiSmoothingDragMultiplier)
+                );
+
+                Configuration.AntiSmoothingSetting[] settings;
+                settings = (Configuration.AntiSmoothingSetting[])config.AntiSmoothingSettings.Clone();
+
+                // Sort
+                Array.Sort(settings, (a, b) =>
+                {
+                    if (a.Velocity > b.Velocity) return 1;
+                    if (b.Velocity > a.Velocity) return -1;
+                    return 0;
+                });
+                foreach (var setting in settings)
+                {
+                    if (setting.Enabled)
+                    {
+                        settingCommands.Add("AntiSmoothingAdd " +
+                            Utils.GetNumberString(setting.Velocity) + " " +
+                            Utils.GetNumberString(setting.Shape, "0.000") + " " +
+                            Utils.GetNumberString(setting.Compensation)
+                        );
+                    }
+                }
+
             }
             else
             {
-                settingCommands.Add("AntiSmoothing 0");
+                settingCommands.Add("AntiSmoothing off");
             }
 
 
+            //
             // Debugging
+            //
             if (config.DebuggingEnabled)
             {
                 settingCommands.Add("Debug true");
@@ -231,7 +349,9 @@ private void SendSettingsToDriver()
             }
 
 
-            // Commands after settings
+            //
+            // Custom commands
+            //
             if (config.CustomCommands.Length > 0)
             {
                 foreach (string command in config.CustomCommands)
@@ -244,6 +364,7 @@ private void SendSettingsToDriver()
                 }
             }
 
+
             //
             // Send commands to the driver
             //
@@ -255,6 +376,7 @@ private void SendSettingsToDriver()
                 driver.SendCommand(command);
             }
 
+
             //
             // Write settings to usersettings.cfg
             //
@@ -310,6 +432,8 @@ private void ProcessStatusMessage(string variableName, string parameters)
             {
                 string tabletName = parameters;
                 string title = "TabletDriverGUI - " + tabletName;
+                Regex regex = new Regex("\\([^\\)]+\\)");
+                config.TabletName = regex.Replace(tabletName, "");
                 Title = title;
 
                 // Limit notify icon text length
@@ -333,10 +457,15 @@ private void ProcessStatusMessage(string variableName, string parameters)
                 {
                     config.TabletFullArea.Width = val;
                     config.TabletFullArea.X = val / 2.0;
-                    LoadSettingsFromConfiguration();
-                    UpdateSettingsToConfiguration();
                     if (isFirstStart)
+                    {
+                        config.TabletAreas[0].Width = config.TabletFullArea.Width;
+                        config.TabletAreas[0].X = config.TabletFullArea.X;
+                        FixTabletAreaDimensions(config.TabletAreas[0], config.ScreenAreas[0]);
                         SendSettingsToDriver();
+                    }
+                    LoadSettingsFromConfiguration();
+                    UpdateSettingsToConfiguration();
                 }
             }
 
@@ -349,10 +478,15 @@ private void ProcessStatusMessage(string variableName, string parameters)
                 {
                     config.TabletFullArea.Height = val;
                     config.TabletFullArea.Y = val / 2.0;
-                    LoadSettingsFromConfiguration();
-                    UpdateSettingsToConfiguration();
                     if (isFirstStart)
+                    {
+                        config.TabletAreas[0].Height = config.TabletFullArea.Height;
+                        config.TabletAreas[0].Y = config.TabletFullArea.Y;
+                        FixTabletAreaDimensions(config.TabletAreas[0], config.ScreenAreas[0]);
                         SendSettingsToDriver();
+                    }
+                    LoadSettingsFromConfiguration();
+                    UpdateSettingsToConfiguration();
 
                 }
             }
@@ -392,10 +526,10 @@ private void ProcessStatusMessage(string variableName, string parameters)
                     double centerX = minimumX + areaWidth / 2.0;
                     double centerY = minimumY + areaHeight / 2.0;
 
-                    config.TabletArea.Width = areaWidth;
-                    config.TabletArea.Height = areaHeight;
-                    config.TabletArea.X = centerX;
-                    config.TabletArea.Y = centerY;
+                    config.SelectedTabletArea.Width = areaWidth;
+                    config.SelectedTabletArea.Height = areaHeight;
+                    config.SelectedTabletArea.X = centerX;
+                    config.SelectedTabletArea.Y = centerY;
                     LoadSettingsFromConfiguration();
                     UpdateSettingsToConfiguration();
 
@@ -487,7 +621,7 @@ private void OnDriverStopped(object sender, EventArgs e)
                 if (config.AutomaticRestart)
                 {
                     SetStatus("Driver stopped. Restarting! Check console !!!");
-                    driver.ConsoleAddText("Driver stopped. Restarting!");
+                    driver.ConsoleAddLine("Driver stopped. Restarting!");
 
                     // Run in the main application thread
                     Application.Current.Dispatcher.Invoke(() =>
@@ -500,7 +634,7 @@ private void OnDriverStopped(object sender, EventArgs e)
                 else
                 {
                     SetStatus("Driver stopped!");
-                    driver.ConsoleAddText("Driver stopped!");
+                    driver.ConsoleAddLine("Driver stopped!");
                 }
 
                 // Run in the main application thread
diff --git a/TabletDriverGUI/MainWindow.Ink.cs b/TabletDriverGUI/MainWindow.Ink.cs
index dacaf8a..cbc4fcb 100644
--- a/TabletDriverGUI/MainWindow.Ink.cs
+++ b/TabletDriverGUI/MainWindow.Ink.cs
@@ -1,21 +1,26 @@
 using Microsoft.Win32;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace TabletDriverGUI
 {
     public partial class MainWindow : Window
     {
 
+        // Ink canvas undo history
+        StrokeCollection inkCanvasUndoHistory;
+
+        // Ink canvas DrawingAttributes
+        DrawingAttributes inkCanvasDrawingAttributes;
+
+
         //
         // Ink canvas stylys move
         //
@@ -41,8 +46,12 @@ private void InkCanvas_StylusUp(object sender, StylusEventArgs e)
             progressPressure.Value = 0;
 
             Random random = new Random();
-            byte shade = (byte)random.Next(0x33, 0x77);
-            inkCanvasDrawingAttributes.Color = Color.FromRgb(shade, shade, shade);
+            double shade = random.Next(0x33, 0x77);
+            inkCanvasDrawingAttributes.Color = Color.FromRgb(
+                (byte)(shade * (0.95 + random.NextDouble() * 0.1)),
+                (byte)(shade * (0.95 + random.NextDouble() * 0.1)),
+                (byte)(shade * (0.95 + random.NextDouble() * 0.1))
+            );
             if (inkCanvasUndoHistory != null && inkCanvasUndoHistory.Count > 0)
             {
                 inkCanvasUndoHistory.Clear();
@@ -77,16 +86,21 @@ private void InkCanvas_KeyDown(object sender, KeyEventArgs e)
         private void SliderPressure_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             sliderPressureSensitivity.ToolTip = Utils.GetNumberString(-sliderPressureSensitivity.Value);
-            sliderPressureDeadzone.ToolTip = Utils.GetNumberString(sliderPressureDeadzone.Value * 100) + "%";
+            sliderPressureDeadzoneLow.ToolTip = Utils.GetNumberString(sliderPressureDeadzoneLow.Value * 100) + "%";
+            sliderPressureDeadzoneHigh.ToolTip = Utils.GetNumberString(sliderPressureDeadzoneHigh.Value * 100) + "%";
 
             if (isLoadingSettings) return;
 
             config.PressureSensitivity = sliderPressureSensitivity.Value;
-            config.PressureDeadzone = sliderPressureDeadzone.Value;
+            config.PressureDeadzoneLow = sliderPressureDeadzoneLow.Value;
+            config.PressureDeadzoneHigh = sliderPressureDeadzoneHigh.Value;
 
 
             driver.SendCommand("PressureSensitivity " + Utils.GetNumberString(config.PressureSensitivity));
-            driver.SendCommand("PressureDeadzone " + Utils.GetNumberString(config.PressureDeadzone));
+            driver.SendCommand("PressureDeadzone " +
+                Utils.GetNumberString(config.PressureDeadzoneLow) + " " +
+                Utils.GetNumberString(config.PressureDeadzoneHigh)
+            );
         }
 
 
diff --git a/TabletDriverGUI/MainWindow.Settings.cs b/TabletDriverGUI/MainWindow.Settings.cs
index e75e706..b4bea89 100644
--- a/TabletDriverGUI/MainWindow.Settings.cs
+++ b/TabletDriverGUI/MainWindow.Settings.cs
@@ -8,52 +8,384 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Shapes;
+using System.Windows.Threading;
 
 namespace TabletDriverGUI
 {
     public partial class MainWindow : Window
     {
+        private CheckBox[] checkboxAntiSmoothingSettingEnabled;
+        private TextBox[] textAntiSmoothingVelocity;
+        private TextBox[] textAntiSmoothingShape;
+        private TextBox[] textAntiSmoothingCompensation;
 
-        #region Configuration Load / Update
+        List<Configuration.Preset> presetsNoiseReduction;
+        List<Configuration.Preset> presetsAntiSmoothing;
+
+        WindowTabletView tabletView;
+
+
+        //
+        // Create setting UI components
+        //
+        private void CreateSettingElements()
+        {
+
+            //
+            // Create tablet button map WrapPanel items
+            //
+            for (int i = 0; i < 16; i++)
+            {
+                GroupBox groupBox = new GroupBox
+                {
+                    Width = 90,
+                    Header = "Button " + (i + 1).ToString()
+                };
+                Button button = new Button
+                {
+                    Height = 22,
+                    Content = "",
+                    Padding = new Thickness(2, 0, 2, 0),
+                    ToolTip = "Empty",
+                    Background = Brushes.White
+                };
+                button.Click += ButtonMap_Click;
+                button.ToolTipOpening += ButtonMap_ToolTipOpening;
+
+                groupBox.Content = button;
+                wrapPanelTabletButtons.Children.Add(groupBox);
+            }
+            CheckBox checkBox = new CheckBox
+            {
+                Content = "Disable buttons"
+            };
+            checkBox.Checked += CheckboxChanged;
+            checkBox.Unchecked += CheckboxChanged;
+            checkBox.VerticalAlignment = VerticalAlignment.Bottom;
+            checkBox.Margin = new Thickness(5, 5, 5, 10);
+            wrapPanelTabletButtons.Children.Add(checkBox);
+
+
+
+            //
+            // Smoothing rate ComboBox
+            //
+            comboBoxSmoothingRate.Items.Clear();
+            for (int i = 1; i <= 8; i++)
+            {
+                comboBoxSmoothingRate.Items.Add((1000.0 / i).ToString("0") + " Hz");
+            }
+            comboBoxSmoothingRate.SelectedIndex = 3;
+
+
+
+            //
+            // Noise reduction presets
+            //
+
+            presetsNoiseReduction = new List<Configuration.Preset>
+            {
+                new Configuration.Preset("Wacom 470/471", (conf) =>
+                {
+                    conf.NoiseFilterBuffer = 10;
+                    conf.NoiseFilterThreshold = 0.4;
+                }),
+                new Configuration.Preset("Wacom 472", (conf) =>
+                {
+                    conf.NoiseFilterBuffer = 10;
+                    conf.NoiseFilterThreshold = 0.3;
+                }),
+                new Configuration.Preset("Wacom 480", (conf) =>
+                {
+                    conf.NoiseFilterBuffer = 10;
+                    conf.NoiseFilterThreshold = 0.5;
+                }),
+            };
+            comboBoxNoiseReductionPresets.Items.Clear();
+            foreach (var preset in presetsNoiseReduction)
+            {
+                comboBoxNoiseReductionPresets.Items.Add(preset.Name);
+            }
+            comboBoxNoiseReductionPresets.SelectionChanged += (sender, e) =>
+            {
+                int index = comboBoxNoiseReductionPresets.SelectedIndex;
+                if (index >= 0 && index < presetsNoiseReduction.Count)
+                {
+                    Configuration.Preset preset = presetsNoiseReduction[comboBoxNoiseReductionPresets.SelectedIndex];
+                    preset.Action(config);
+                    LoadSettingsFromConfiguration();
+                    SetStatus("Noise reduction filter preset '" + preset.Name + "' loaded!");
+                }
+            };
+
+
+
+
+
+
+
+            //
+            // Anti-smoothing presets
+            //
+            presetsAntiSmoothing = new List<Configuration.Preset>
+            {
+                new Configuration.Preset("Clear", (conf) => { }),
+                new Configuration.Preset("Simple", (conf) =>
+                {
+                    conf.SetAntiSmoothingSetting(0, true, 0, 0.5, 10);
+                }),
+
+                new Configuration.Preset("Gaomon S56K", (conf) =>
+                {
+                    conf.SetAntiSmoothingSetting(0, true, 0, 0.1, 10);
+                }),
+
+                new Configuration.Preset("Huion 420", (conf) =>
+                {
+                    conf.SetAntiSmoothingSetting(0, true, 0, 0.1, 15);
+                }),
+
+                new Configuration.Preset("Huion H420", (conf) =>
+                {
+                    conf.SetAntiSmoothingSetting(0, true, 0, 0.1, 15);
+                }),
+
+                new Configuration.Preset("Huion H430P", (conf) =>
+                {
+                    conf.SetAntiSmoothingSetting(0, true, 0, 0.1, 50);
+                    conf.SetAntiSmoothingSetting(1, true, 70, 0.1, 30);
+                    conf.SetAntiSmoothingSetting(2, true, 150, 0.1, 20);
+                }),
+
+                new Configuration.Preset("Huion H640P", (conf) =>
+                {
+                    conf.SetAntiSmoothingSetting(0, true, 0, 0.1, 50);
+                    conf.SetAntiSmoothingSetting(1, true, 70, 0.1, 30);
+                    conf.SetAntiSmoothingSetting(2, true, 150, 0.1, 20);
+                }),
+
+                new Configuration.Preset("VEIKK A50", (conf) =>
+                {
+                    conf.SetAntiSmoothingSetting(0, true, 0, 0.1, 10);
+                }),
+
+
+                new Configuration.Preset("VEIKK S640", (conf) =>
+                {
+                    conf.SetAntiSmoothingSetting(0, true, 0, 0.1, 0);
+                    conf.SetAntiSmoothingSetting(1, true, 50, 1.5, 5);
+                    conf.SetAntiSmoothingSetting(2, true, 100, 1.5, 10);
+                }),
+
+                new Configuration.Preset("Wacom 490 Hover", (conf) =>
+                {
+                    conf.SetAntiSmoothingSetting(0, true, 0, 0.1, 25);
+                    conf.SetAntiSmoothingSetting(1, true, 100, 0.1, 20);
+                    conf.AntiSmoothingOnlyWhenHover = true;
+                }),
+
+                new Configuration.Preset("XP-Pen G430", (conf) =>
+                {
+                    conf.SetAntiSmoothingSetting(0, true, 0, 0.1, 0);
+                    conf.SetAntiSmoothingSetting(1, true, 50, 1.5, 5);
+                    conf.SetAntiSmoothingSetting(2, true, 200, 1.5, 10);
+                }),
+
+                new Configuration.Preset("XP-Pen G640", (conf) =>
+                {
+                    conf.SetAntiSmoothingSetting(0, true, 0, 0.1, 0);
+                    conf.SetAntiSmoothingSetting(1, true, 50, 1.5, 5);
+                    conf.SetAntiSmoothingSetting(2, true, 200, 1.5, 10);
+                }),
+
+            };
+
+
+            //
+            // Anti-smoothing preset combobox
+            //
+            comboBoxAntiSmoothingPresets.Items.Clear();
+            foreach (var preset in presetsAntiSmoothing)
+            {
+                comboBoxAntiSmoothingPresets.Items.Add(preset.Name);
+            }
+            comboBoxAntiSmoothingPresets.SelectionChanged += (sender, e) =>
+            {
+                int index = comboBoxAntiSmoothingPresets.SelectedIndex;
+                if (index >= 0 && index < presetsAntiSmoothing.Count)
+                {
+                    Configuration.Preset preset = presetsAntiSmoothing[comboBoxAntiSmoothingPresets.SelectedIndex];
+                    config.AntiSmoothingOnlyWhenHover = false;
+                    config.AntiSmoothingDragMultiplier = 1.0;
+                    config.ClearAntiSmoothingSettings();
+                    preset.Action(config);
+                    LoadSettingsFromConfiguration();
+                    SetStatus("Anti-smoothing filter preset '" + preset.Name + "' loaded!");
+                }
+            };
+
+
+            //
+            // Anti-smoothing filter settings
+            //
+            int antiSmoothingSettingCount = 5;
+            checkboxAntiSmoothingSettingEnabled = new CheckBox[antiSmoothingSettingCount];
+            textAntiSmoothingVelocity = new TextBox[antiSmoothingSettingCount];
+            textAntiSmoothingShape = new TextBox[antiSmoothingSettingCount];
+            textAntiSmoothingCompensation = new TextBox[antiSmoothingSettingCount];
+
+            if (config.AntiSmoothingSettings.Length < antiSmoothingSettingCount)
+            {
+                Configuration.AntiSmoothingSetting[] newSettings = new Configuration.AntiSmoothingSetting[antiSmoothingSettingCount];
+                for (int i = 0; i < antiSmoothingSettingCount; i++)
+                {
+                    if (i < config.AntiSmoothingSettings.Length)
+                    {
+                        newSettings[i] = config.AntiSmoothingSettings[i];
+                    }
+                    else
+                    {
+                        newSettings[i] = new Configuration.AntiSmoothingSetting
+                        {
+                            Enabled = false,
+                            Velocity = 0,
+                            Shape = 0.5,
+                            Compensation = 0
+                        };
+                    }
+                }
+                config.AntiSmoothingSettings = newSettings;
+            }
+
+
+            //
+            // Loop through anti-smoothing settings
+            //
+            for (int i = 0; i < antiSmoothingSettingCount; i++)
+            {
+
+                // Enabled
+                checkboxAntiSmoothingSettingEnabled[i] = new CheckBox
+                {
+                    Width = 20,
+                    Height = 25,
+                    Margin = new Thickness(1),
+                    VerticalContentAlignment = VerticalAlignment.Center,
+                    HorizontalAlignment = HorizontalAlignment.Right
+                };
+                checkboxAntiSmoothingSettingEnabled[i].Checked += CheckboxChanged;
+                checkboxAntiSmoothingSettingEnabled[i].Unchecked += CheckboxChanged;
+                stackPanelAntiSmoothingEnabled.Children.Add(checkboxAntiSmoothingSettingEnabled[i]);
+
+
+                // Velocity 
+                Grid grid = new Grid();
+                Label label = new Label { Content = "mm/s", HorizontalAlignment = HorizontalAlignment.Right };
+                textAntiSmoothingVelocity[i] = new TextBox
+                {
+                    Width = 80,
+                    Height = 25,
+                    Padding = new Thickness(2),
+                    Margin = new Thickness(1)
+                };
+                textAntiSmoothingVelocity[i].TextChanged += TextChanged;
+                textAntiSmoothingVelocity[i].DataContext = checkboxAntiSmoothingSettingEnabled[i];
+                textAntiSmoothingVelocity[i].SetBinding(TextBox.IsEnabledProperty, "IsChecked");
+                grid.Children.Add(textAntiSmoothingVelocity[i]);
+                grid.Children.Add(label);
+                stackPanelAntiSmoothingVelocity.Children.Add(grid);
+
+
+                // Shape 
+                textAntiSmoothingShape[i] = new TextBox
+                {
+                    Width = 60,
+                    Height = 25,
+                    Padding = new Thickness(2),
+                    Margin = new Thickness(1)
+                };
+                textAntiSmoothingShape[i].TextChanged += TextChanged;
+                textAntiSmoothingShape[i].DataContext = checkboxAntiSmoothingSettingEnabled[i];
+                textAntiSmoothingShape[i].SetBinding(TextBox.IsEnabledProperty, "IsChecked");
+                stackPanelAntiSmoothingShape.Children.Add(textAntiSmoothingShape[i]);
+
+
+                // Compensation 
+                grid = new Grid();
+                label = new Label { Content = "ms", HorizontalAlignment = HorizontalAlignment.Right };
+                textAntiSmoothingCompensation[i] = new TextBox
+                {
+                    Width = 100,
+                    Height = 25,
+                    Padding = new Thickness(2),
+                    Margin = new Thickness(1)
+                };
+                textAntiSmoothingCompensation[i].TextChanged += TextChanged;
+                textAntiSmoothingCompensation[i].DataContext = checkboxAntiSmoothingSettingEnabled[i];
+                textAntiSmoothingCompensation[i].SetBinding(TextBox.IsEnabledProperty, "IsChecked");
+
+                grid.Children.Add(textAntiSmoothingCompensation[i]);
+                grid.Children.Add(label);
+                stackPanelAntiSmoothingCompensation.Children.Add(grid);
+
+            }
+
+
+            //
+            // Tablet view window
+            //
+            tabletView = null;
+
+        }
+
+
+
+        #region Configuration Load, Update, Init
 
         //
         // Load settings from configuration
         //
         private void LoadSettingsFromConfiguration()
         {
+            if (isLoadingSettings) return;
             isLoadingSettings = true;
 
             //
             // Tablet area
             //
-            textTabletAreaWidth.Text = Utils.GetNumberString(config.TabletArea.Width);
-            textTabletAreaHeight.Text = Utils.GetNumberString(config.TabletArea.Height);
-            textTabletAreaX.Text = Utils.GetNumberString(config.TabletArea.X);
-            textTabletAreaY.Text = Utils.GetNumberString(config.TabletArea.Y);
+            textTabletAreaWidth.Text = Utils.GetNumberString(config.SelectedTabletArea.Width);
+            textTabletAreaHeight.Text = Utils.GetNumberString(config.SelectedTabletArea.Height);
+            textTabletAreaX.Text = Utils.GetNumberString(config.SelectedTabletArea.X);
+            textTabletAreaY.Text = Utils.GetNumberString(config.SelectedTabletArea.Y);
             checkBoxForceAspect.IsChecked = config.ForceAspectRatio;
-            checkBoxForceFullArea.IsChecked = config.ForceFullArea;
-            switch (config.OutputMode)
+
+
+            //
+            // Positioning & Mode
+            //
+            comboBoxOutputPositioning.SelectedIndex = (int)config.Positioning;
+
+            switch (config.Mode)
             {
-                case Configuration.OutputModes.Absolute:
-                    radioModeAbsolute.IsChecked = true;
+                case Configuration.OutputModes.Standard:
+                    radioOutputModeStandard.IsChecked = true;
                     break;
-                case Configuration.OutputModes.Relative:
-                    radioModeRelative.IsChecked = true;
+                case Configuration.OutputModes.WindowsInk:
+                    radioOutputModeWindowsInk.IsChecked = true;
                     break;
-                case Configuration.OutputModes.Digitizer:
-                    radioModeDigitizer.IsChecked = true;
+                case Configuration.OutputModes.Compatibility:
+                    radioOutputModeCombatibility.IsChecked = true;
                     break;
-                case Configuration.OutputModes.SendInput:
-                    radioModeSendInput.IsChecked = true;
+                default:
                     break;
             }
 
 
+
             //
             // Windows Ink pressure
             //
-            if (config.OutputMode == Configuration.OutputModes.Digitizer)
+            if (config.Mode == Configuration.OutputModes.WindowsInk)
                 groupBoxWindowsInkSettings.IsEnabled = true;
             else
                 groupBoxWindowsInkSettings.IsEnabled = false;
@@ -62,38 +394,9 @@ private void LoadSettingsFromConfiguration()
             //
             // Rotation
             //
-            textTabletAreaRotation.Text = Utils.GetNumberString(config.TabletArea.Rotation);
+            textTabletAreaRotation.Text = Utils.GetNumberString(config.TabletAreas[0].Rotation);
             checkBoxInvert.IsChecked = config.Invert;
 
-
-            //
-            // Force full area
-            //
-            if (config.ForceFullArea)
-            {
-                textTabletAreaWidth.IsEnabled = false;
-                textTabletAreaHeight.IsEnabled = false;
-                textTabletAreaX.IsEnabled = false;
-                textTabletAreaY.IsEnabled = false;
-            }
-            else
-            {
-                textTabletAreaWidth.IsEnabled = true;
-                textTabletAreaHeight.IsEnabled = true;
-                textTabletAreaX.IsEnabled = true;
-                textTabletAreaY.IsEnabled = true;
-            }
-
-
-            //
-            // Screen area
-            //
-            textScreenAreaWidth.Text = Utils.GetNumberString(config.ScreenArea.Width, "0");
-            textScreenAreaHeight.Text = Utils.GetNumberString(config.ScreenArea.Height, "0");
-            textScreenAreaX.Text = Utils.GetNumberString(config.ScreenArea.X, "0");
-            textScreenAreaY.Text = Utils.GetNumberString(config.ScreenArea.Y, "0");
-
-
             //
             // Desktop size
             //
@@ -103,6 +406,8 @@ private void LoadSettingsFromConfiguration()
                 textDesktopHeight.Text = Utils.GetNumberString(GetVirtualDesktopSize().Height);
                 config.DesktopSize.Width = GetVirtualDesktopSize().Width;
                 config.DesktopSize.Height = GetVirtualDesktopSize().Height;
+                config.DesktopSize.X = config.DesktopSize.Width / 2.0;
+                config.DesktopSize.Y = config.DesktopSize.Height / 2.0;
                 textDesktopWidth.IsEnabled = false;
                 textDesktopHeight.IsEnabled = false;
             }
@@ -110,27 +415,55 @@ private void LoadSettingsFromConfiguration()
             {
                 textDesktopWidth.Text = Utils.GetNumberString(config.DesktopSize.Width);
                 textDesktopHeight.Text = Utils.GetNumberString(config.DesktopSize.Height);
+                config.DesktopSize.X = config.DesktopSize.Width / 2.0;
+                config.DesktopSize.Y = config.DesktopSize.Height / 2.0;
             }
             checkBoxAutomaticDesktopSize.IsChecked = config.AutomaticDesktopSize;
 
 
+            //
+            // Screen area
+            //
+            textScreenAreaWidth.Text = Utils.GetNumberString(config.SelectedScreenArea.Width, "0");
+            textScreenAreaHeight.Text = Utils.GetNumberString(config.SelectedScreenArea.Height, "0");
+            textScreenAreaX.Text = Utils.GetNumberString(config.SelectedScreenArea.X - config.SelectedScreenArea.Width / 2.0, "0");
+            textScreenAreaY.Text = Utils.GetNumberString(config.SelectedScreenArea.Y - config.SelectedScreenArea.Height / 2.0, "0");
+
+
+            //
+            // Move screen areas to valid positions
+            //
+            for (int i = 0; i < config.GetAreaCount(); i++)
+                config.ScreenAreas[i].MoveInside(config.DesktopSize);
+
+            textScreenAreaX.Text = Utils.GetNumberString(config.SelectedScreenArea.X - config.SelectedScreenArea.Width / 2.0);
+            textScreenAreaY.Text = Utils.GetNumberString(config.SelectedScreenArea.Y - config.SelectedScreenArea.Height / 2.0);
+
+
             //
             // Force aspect ratio
             //
             if (config.ForceAspectRatio)
             {
-                config.TabletArea.Height = config.TabletArea.Width / (config.ScreenArea.Width / config.ScreenArea.Height);
-                textTabletAreaHeight.Text = Utils.GetNumberString(config.TabletArea.Height);
+                for (int i = 0; i < config.GetAreaCount(); i++)
+                {
+                    config.TabletAreas[i].Height = config.TabletAreas[i].Width / (config.ScreenAreas[i].Width / config.ScreenAreas[i].Height);
+                }
+
+                textTabletAreaHeight.Text = Utils.GetNumberString(config.SelectedTabletArea.Height);
                 textTabletAreaHeight.IsEnabled = false;
             }
 
 
             //
-            // Move tablet area to a valid position
+            // Move tablet areas to valid positions
             //
-            config.TabletArea.MoveInside(config.TabletFullArea);
-            textTabletAreaX.Text = Utils.GetNumberString(config.TabletArea.X);
-            textTabletAreaY.Text = Utils.GetNumberString(config.TabletArea.Y);
+            for (int i = 0; i < config.GetAreaCount(); i++)
+                config.TabletAreas[i].MoveInside(config.TabletFullArea);
+
+            textTabletAreaX.Text = Utils.GetNumberString(config.SelectedTabletArea.X);
+            textTabletAreaY.Text = Utils.GetNumberString(config.SelectedTabletArea.Y);
+
 
 
             //
@@ -176,7 +509,8 @@ private void LoadSettingsFromConfiguration()
             // Pressure
             //
             sliderPressureSensitivity.Value = config.PressureSensitivity;
-            sliderPressureDeadzone.Value = config.PressureDeadzone;
+            sliderPressureDeadzoneLow.Value = config.PressureDeadzoneLow;
+            sliderPressureDeadzoneHigh.Value = config.PressureDeadzoneHigh;
 
 
             //
@@ -185,6 +519,7 @@ private void LoadSettingsFromConfiguration()
             textScrollSensitivity.Text = Utils.GetNumberString(config.ScrollSensitivity);
             textScrollAcceleration.Text = Utils.GetNumberString(config.ScrollAcceleration);
             checkBoxScrollStopCursor.IsChecked = config.ScrollStopCursor;
+            checkBoxScrollDrag.IsChecked = config.ScrollDrag;
 
 
             //
@@ -194,18 +529,6 @@ private void LoadSettingsFromConfiguration()
             textSmoothingLatency.Text = Utils.GetNumberString(config.SmoothingLatency);
             comboBoxSmoothingRate.SelectedIndex = config.SmoothingInterval - 1;
             checkBoxSmoothingOnlyWhenButtons.IsChecked = config.SmoothingOnlyWhenButtons;
-            if (config.SmoothingEnabled)
-            {
-                textSmoothingLatency.IsEnabled = true;
-                comboBoxSmoothingRate.IsEnabled = true;
-                checkBoxSmoothingOnlyWhenButtons.IsEnabled = true;
-            }
-            else
-            {
-                textSmoothingLatency.IsEnabled = false;
-                comboBoxSmoothingRate.IsEnabled = false;
-                checkBoxSmoothingOnlyWhenButtons.IsEnabled = false;
-            }
 
 
             //
@@ -214,38 +537,22 @@ private void LoadSettingsFromConfiguration()
             checkBoxNoiseFilter.IsChecked = config.NoiseFilterEnabled;
             textNoiseBuffer.Text = Utils.GetNumberString(config.NoiseFilterBuffer);
             textNoiseThreshold.Text = Utils.GetNumberString(config.NoiseFilterThreshold);
-            if (config.NoiseFilterEnabled)
-            {
-                textNoiseBuffer.IsEnabled = true;
-                textNoiseThreshold.IsEnabled = true;
-            }
-            else
-            {
-                textNoiseBuffer.IsEnabled = false;
-                textNoiseThreshold.IsEnabled = false;
-            }
-
 
             //
             // Anti-smoothing filter
             //
             checkBoxAntiSmoothing.IsChecked = config.AntiSmoothingEnabled;
-            textAntiSmoothingShape.Text = Utils.GetNumberString(config.AntiSmoothingShape, "0.000");
-            textAntiSmoothingCompensation.Text = Utils.GetNumberString(config.AntiSmoothingCompensation);
             checkBoxAntiSmoothingOnlyWhenHover.IsChecked = config.AntiSmoothingOnlyWhenHover;
-            if (config.AntiSmoothingEnabled)
-            {
-                textAntiSmoothingShape.IsEnabled = true;
-                textAntiSmoothingCompensation.IsEnabled = true;
-                checkBoxAntiSmoothingOnlyWhenHover.IsEnabled = true;
-            }
-            else
+            textAntiSmoothingDragMultiplier.Text = Utils.GetNumberString(config.AntiSmoothingDragMultiplier);
+            for (int i = 0; i < config.AntiSmoothingSettings.Length; i++)
             {
-                textAntiSmoothingShape.IsEnabled = false;
-                textAntiSmoothingCompensation.IsEnabled = false;
-                checkBoxAntiSmoothingOnlyWhenHover.IsEnabled = false;
+                checkboxAntiSmoothingSettingEnabled[i].IsChecked = config.AntiSmoothingSettings[i].Enabled;
+                textAntiSmoothingVelocity[i].Text = Utils.GetNumberString(config.AntiSmoothingSettings[i].Velocity);
+                textAntiSmoothingShape[i].Text = Utils.GetNumberString(config.AntiSmoothingSettings[i].Shape, "0.000");
+                textAntiSmoothingCompensation[i].Text = Utils.GetNumberString(config.AntiSmoothingSettings[i].Compensation);
             }
 
+
             //
             // Automatic restart
             //
@@ -272,12 +579,16 @@ private void LoadSettingsFromConfiguration()
             //
             checkBoxDebugging.IsChecked = config.DebuggingEnabled;
 
+            // Settings loaded
+            isLoadingSettings = false;
 
             // Update canvases
             UpdateCanvasElements();
 
+            // Update binding data context
+            DataContext = null;
+            DataContext = config;
 
-            isLoadingSettings = false;
         }
 
 
@@ -295,79 +606,67 @@ private void UpdateSettingsToConfiguration()
             //
             // Tablet area
             //
-            if (Utils.ParseNumber(textTabletAreaWidth.Text, out double val))
-                config.TabletArea.Width = val;
-            if (Utils.ParseNumber(textTabletAreaHeight.Text, out val))
-                config.TabletArea.Height = val;
-            if (Utils.ParseNumber(textTabletAreaX.Text, out val))
-                config.TabletArea.X = val;
-            if (Utils.ParseNumber(textTabletAreaY.Text, out val))
-                config.TabletArea.Y = val;
-            if (Utils.ParseNumber(textTabletAreaRotation.Text, out val))
-                config.TabletArea.Rotation = val;
-
-            config.Invert = (bool)checkBoxInvert.IsChecked;
-            config.ForceAspectRatio = (bool)checkBoxForceAspect.IsChecked;
-            config.ForceFullArea = (bool)checkBoxForceFullArea.IsChecked;
+            if (Utils.ParseNumber(textTabletAreaWidth.Text, out double value))
+                config.SelectedTabletArea.Width = value;
+            if (Utils.ParseNumber(textTabletAreaHeight.Text, out value))
+                config.SelectedTabletArea.Height = value;
+            if (Utils.ParseNumber(textTabletAreaX.Text, out value))
+                config.SelectedTabletArea.X = value;
+            if (Utils.ParseNumber(textTabletAreaY.Text, out value))
+                config.SelectedTabletArea.Y = value;
+            if (Utils.ParseNumber(textTabletAreaRotation.Text, out value))
+                config.TabletAreas[0].Rotation = value;
 
+            // Update secondary area rotations
+            for (int i = 1; i < config.GetAreaCount(); i++)
+            {
+                config.TabletAreas[i].Rotation = config.TabletAreas[0].Rotation;
+            }
 
-            //
-            // Output Mode
-            //
-            if (radioModeAbsolute.IsChecked == true) config.OutputMode = Configuration.OutputModes.Absolute;
-            else if (radioModeRelative.IsChecked == true) config.OutputMode = Configuration.OutputModes.Relative;
-            else if (radioModeDigitizer.IsChecked == true) config.OutputMode = Configuration.OutputModes.Digitizer;
-            else if (radioModeSendInput.IsChecked == true) config.OutputMode = Configuration.OutputModes.SendInput;
 
+            config.Invert = (bool)checkBoxInvert.IsChecked;
+            config.ForceAspectRatio = (bool)checkBoxForceAspect.IsChecked;
 
             //
-            // Force full area
+            // Output positioning and mode
             //
-            if (config.ForceFullArea)
-            {
-                // Set tablet area size to full area
-                config.TabletArea.Width = config.TabletFullArea.Width;
-                config.TabletArea.Height = config.TabletFullArea.Height;
-
-                // Force aspect
-                if (config.ForceAspectRatio)
-                    config.TabletArea.Height = config.TabletArea.Width / (config.ScreenArea.Width / config.ScreenArea.Height);
-
-                // Fit area to full area
-                config.TabletArea.ScaleInside(config.TabletFullArea);
-
-                textTabletAreaWidth.Text = Utils.GetNumberString(config.TabletArea.Width);
-                textTabletAreaHeight.Text = Utils.GetNumberString(config.TabletArea.Height);
-
-            }
+            if (comboBoxOutputPositioning.SelectedIndex >= 0)
+                config.Positioning = (Configuration.OutputPositioning)comboBoxOutputPositioning.SelectedIndex;
+            else
+                config.Positioning = Configuration.OutputPositioning.Absolute;
 
+            if (radioOutputModeStandard.IsChecked == true) config.Mode = Configuration.OutputModes.Standard;
+            else if (radioOutputModeWindowsInk.IsChecked == true) config.Mode = Configuration.OutputModes.WindowsInk;
+            else if (radioOutputModeCombatibility.IsChecked == true) config.Mode = Configuration.OutputModes.Compatibility;
 
             //
-            // Force the tablet area to be inside of the full area
+            // Force the tablet areas to be inside of the full area
             //
-            config.TabletArea.MoveInside(config.TabletFullArea);
+            for (int i = 0; i < config.GetAreaCount(); i++)
+                config.TabletAreas[i].MoveInside(config.TabletFullArea);
 
 
             //
             // Screen area
             //
-            if (Utils.ParseNumber(textScreenAreaWidth.Text, out val))
-                config.ScreenArea.Width = val;
-            if (Utils.ParseNumber(textScreenAreaHeight.Text, out val))
-                config.ScreenArea.Height = val;
-            if (Utils.ParseNumber(textScreenAreaX.Text, out val))
-                config.ScreenArea.X = val;
-            if (Utils.ParseNumber(textScreenAreaY.Text, out val))
-                config.ScreenArea.Y = val;
+            if (Utils.ParseNumber(textScreenAreaWidth.Text, out value))
+                config.SelectedScreenArea.Width = value;
+            if (Utils.ParseNumber(textScreenAreaHeight.Text, out value))
+                config.SelectedScreenArea.Height = value;
+            if (Utils.ParseNumber(textScreenAreaX.Text, out value))
+                config.SelectedScreenArea.X = value + config.SelectedScreenArea.Width / 2.0;
+            if (Utils.ParseNumber(textScreenAreaY.Text, out value))
+                config.SelectedScreenArea.Y = value + config.SelectedScreenArea.Height / 2.0;
+
 
 
             //
             // Desktop size
             //
-            if (Utils.ParseNumber(textDesktopWidth.Text, out val))
-                config.DesktopSize.Width = val;
-            if (Utils.ParseNumber(textDesktopHeight.Text, out val))
-                config.DesktopSize.Height = val;
+            if (Utils.ParseNumber(textDesktopWidth.Text, out value))
+                config.DesktopSize.Width = value;
+            if (Utils.ParseNumber(textDesktopHeight.Text, out value))
+                config.DesktopSize.Height = value;
             config.AutomaticDesktopSize = (bool)checkBoxAutomaticDesktopSize.IsChecked;
             if (config.AutomaticDesktopSize == true)
             {
@@ -383,8 +682,8 @@ private void UpdateSettingsToConfiguration()
             //
             if (config.ForceAspectRatio)
             {
-                config.TabletArea.Height = config.TabletArea.Width / (config.ScreenArea.Width / config.ScreenArea.Height);
-                textTabletAreaHeight.Text = Utils.GetNumberString(config.TabletArea.Height);
+                config.SelectedTabletArea.Height = config.SelectedTabletArea.Width / (config.SelectedScreenArea.Width / config.SelectedScreenArea.Height);
+                textTabletAreaHeight.Text = Utils.GetNumberString(config.SelectedTabletArea.Height);
             }
 
 
@@ -416,17 +715,19 @@ private void UpdateSettingsToConfiguration()
             // Pressure sensitivity
             //
             config.PressureSensitivity = sliderPressureSensitivity.Value;
-            config.PressureDeadzone = sliderPressureDeadzone.Value;
+            config.PressureDeadzoneLow = sliderPressureDeadzoneLow.Value;
+            config.PressureDeadzoneHigh = sliderPressureDeadzoneHigh.Value;
 
 
             //
             // Scroll
             //
-            if (Utils.ParseNumber(textScrollSensitivity.Text, out val))
-                config.ScrollSensitivity = val;
-            if (Utils.ParseNumber(textScrollAcceleration.Text, out val))
-                config.ScrollAcceleration = val;
+            if (Utils.ParseNumber(textScrollSensitivity.Text, out value))
+                config.ScrollSensitivity = value;
+            if (Utils.ParseNumber(textScrollAcceleration.Text, out value))
+                config.ScrollAcceleration = value;
             config.ScrollStopCursor = (bool)checkBoxScrollStopCursor.IsChecked;
+            config.ScrollDrag = (bool)checkBoxScrollDrag.IsChecked;
 
 
             //
@@ -434,64 +735,40 @@ private void UpdateSettingsToConfiguration()
             //
             config.SmoothingEnabled = (bool)checkBoxSmoothing.IsChecked;
             config.SmoothingInterval = comboBoxSmoothingRate.SelectedIndex + 1;
-            if (Utils.ParseNumber(textSmoothingLatency.Text, out val))
-                config.SmoothingLatency = val;
+            if (Utils.ParseNumber(textSmoothingLatency.Text, out value))
+                config.SmoothingLatency = value;
             config.SmoothingOnlyWhenButtons = (bool)checkBoxSmoothingOnlyWhenButtons.IsChecked;
 
-            if (config.SmoothingEnabled)
-            {
-                textSmoothingLatency.IsEnabled = true;
-                comboBoxSmoothingRate.IsEnabled = true;
-                checkBoxSmoothingOnlyWhenButtons.IsEnabled = true;
-            }
-            else
-            {
-                textSmoothingLatency.IsEnabled = false;
-                comboBoxSmoothingRate.IsEnabled = false;
-                checkBoxSmoothingOnlyWhenButtons.IsEnabled = false;
-            }
-
 
             //
             // Noise filter
             //
             config.NoiseFilterEnabled = (bool)checkBoxNoiseFilter.IsChecked;
-            if (Utils.ParseNumber(textNoiseBuffer.Text, out val))
-                config.NoiseFilterBuffer = (int)val;
-            if (Utils.ParseNumber(textNoiseThreshold.Text, out val))
-                config.NoiseFilterThreshold = val;
-            if (config.NoiseFilterEnabled)
-            {
-                textNoiseBuffer.IsEnabled = true;
-                textNoiseThreshold.IsEnabled = true;
-            }
-            else
-            {
-                textNoiseBuffer.IsEnabled = false;
-                textNoiseThreshold.IsEnabled = false;
-            }
+            if (Utils.ParseNumber(textNoiseBuffer.Text, out value))
+                config.NoiseFilterBuffer = (int)value;
+            if (Utils.ParseNumber(textNoiseThreshold.Text, out value))
+                config.NoiseFilterThreshold = value;
 
 
             //
             // Anti-smoothing filter
             //
             config.AntiSmoothingEnabled = (bool)checkBoxAntiSmoothing.IsChecked;
-            if (Utils.ParseNumber(textAntiSmoothingShape.Text, out val))
-                config.AntiSmoothingShape = val;
-            if (Utils.ParseNumber(textAntiSmoothingCompensation.Text, out val))
-                config.AntiSmoothingCompensation = val;
             config.AntiSmoothingOnlyWhenHover = (bool)checkBoxAntiSmoothingOnlyWhenHover.IsChecked;
-            if (config.AntiSmoothingEnabled)
-            {
-                textAntiSmoothingShape.IsEnabled = true;
-                textAntiSmoothingCompensation.IsEnabled = true;
-                checkBoxAntiSmoothingOnlyWhenHover.IsEnabled = true;
-            }
-            else
+            if (Utils.ParseNumber(textAntiSmoothingDragMultiplier.Text, out value))
+                config.AntiSmoothingDragMultiplier = value;
+
+            for (int i = 0; i < config.AntiSmoothingSettings.Length; i++)
             {
-                textAntiSmoothingShape.IsEnabled = false;
-                textAntiSmoothingCompensation.IsEnabled = false;
-                checkBoxAntiSmoothingOnlyWhenHover.IsEnabled = false;
+                config.AntiSmoothingSettings[i].Enabled = (bool)checkboxAntiSmoothingSettingEnabled[i].IsChecked;
+
+                if (Utils.ParseNumber(textAntiSmoothingVelocity[i].Text, out value))
+                    config.AntiSmoothingSettings[i].Velocity = value;
+                if (Utils.ParseNumber(textAntiSmoothingShape[i].Text, out value))
+                    config.AntiSmoothingSettings[i].Shape = value;
+                if (Utils.ParseNumber(textAntiSmoothingCompensation[i].Text, out value))
+                    config.AntiSmoothingSettings[i].Compensation = value;
+
             }
 
 
@@ -532,7 +809,6 @@ private void UpdateSettingsToConfiguration()
         }
 
 
-
         //
         // Initialize configuration
         //
@@ -541,562 +817,196 @@ private void InitializeConfiguration()
             isLoadingSettings = true;
             Width = config.WindowWidth;
             Height = config.WindowHeight;
+            if (isFirstStart)
+            {
+                SizeToContent = SizeToContent.WidthAndHeight;
+                UpdateLayout();
+                SizeToContent = SizeToContent.Manual;
+                Height += 50;
+            }
             isLoadingSettings = false;
 
-            // Invalid config -> Set defaults
-            if (config.ScreenArea.Width == 0 || config.ScreenArea.Height == 0)
+            //
+            // Convert old configuration format area values
+            //
+            if (config.ScreenArea != null)
             {
-                config.DesktopSize.Width = GetVirtualDesktopSize().Width;
-                config.DesktopSize.Height = GetVirtualDesktopSize().Height;
-                config.ScreenArea.Width = config.DesktopSize.Width;
-                config.ScreenArea.Height = config.DesktopSize.Height;
-                config.ScreenArea.X = 0;
-                config.ScreenArea.Y = 0;
+                config.ScreenAreas[0].Width = config.ScreenArea.Width;
+                config.ScreenAreas[0].Height = config.ScreenArea.Height;
+                config.ScreenAreas[0].X = config.ScreenArea.X + config.ScreenArea.Width / 2.0;
+                config.ScreenAreas[0].Y = config.ScreenArea.Y + config.ScreenArea.Height / 2.0;
+                config.ScreenArea = null;
+            }
+            if (config.TabletArea != null)
+            {
+                config.TabletAreas[0].Set(config.TabletArea);
+                config.TabletArea = null;
             }
 
-            // Create canvas elements
-            CreateCanvasElements();
-
-            // Load settings from configuration
-            LoadSettingsFromConfiguration();
-
-            // Update the settings back to the configuration
-            UpdateSettingsToConfiguration();
-
-            // Set run at startup
-            SetRunAtStartup(config.RunAtStartup);
-        }
-
-        #endregion
-
-
-
-        //
-        // Save settings
-        //
-        private void SaveSettings(object sender, RoutedEventArgs e)
-        {
-            try
+            //
+            // Conversion from config format V1
+            //
+            if (config.ConfigVersion <= 1)
             {
-                config.Write(configFilename);
-                SendSettingsToDriver();
 
                 //
-                // Enable/Disable Windows Ink pressure settings
+                // Convert old button map
                 //
-                if (config.OutputMode == Configuration.OutputModes.Digitizer)
-                    groupBoxWindowsInkSettings.IsEnabled = true;
-                else
-                    groupBoxWindowsInkSettings.IsEnabled = false;
-
-                SetStatus("Settings saved!");
-            }
-            catch (Exception)
-            {
-                string dir = Directory.GetCurrentDirectory();
-                MessageBox.Show("Error occured while saving the configuration.\n" +
-                    "Make sure that it is possible to create and edit files in the '" + dir + "' directory.\n",
-                    "ERROR!", MessageBoxButton.OK, MessageBoxImage.Error
-                );
-            }
-        }
-
-
-        //
-        // Set run at startup
-        //
-        private void SetRunAtStartup(bool enabled)
-        {
-            try
-            {
-                string path = System.Reflection.Assembly.GetExecutingAssembly().Location;
-                string entryName = "TabletDriverGUI";
-                RegistryKey rk = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
-                if (enabled)
-                    rk.SetValue(entryName, "\"" + path + "\" --hide");
-                else
-                    rk.DeleteValue(entryName, false);
-
-                rk.Close();
-            }
-            catch (Exception)
-            {
-            }
-        }
-
-
-        //
-        // Get desktop size
-        //
-        System.Drawing.Rectangle GetVirtualDesktopSize()
-        {
-            System.Drawing.Rectangle rect = new System.Drawing.Rectangle();
-
-            // Windows 8 or greater needed for the multiscreen absolute mode
-            if (VersionHelper.IsWindows8OrGreater() || config.OutputMode != Configuration.OutputModes.Absolute)
-            {
-                rect.Width = System.Windows.Forms.SystemInformation.VirtualScreen.Width;
-                rect.Height = System.Windows.Forms.SystemInformation.VirtualScreen.Height;
-            }
-            else
-            {
-                rect.Width = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width;
-                rect.Height = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height;
-
+                bool isOld = true;
+                if (config.ButtonMap.Length == 3)
+                {
+                    for (int i = 0; i < 3; i++)
+                    {
+                        if (config.ButtonMap[i] != "1" && config.ButtonMap[i] != "2" && config.ButtonMap[i] != "3")
+                        {
+                            isOld = false;
+                        }
+                    }
+                    if (isOld)
+                    {
+                        for (int i = 0; i < 3; i++)
+                            config.ButtonMap[i] = "MOUSE" + config.ButtonMap[i].ToString();
+                    }
+                }
             }
-            return rect;
-        }
 
-
-        //
-        // Get available screens
-        //
-        System.Windows.Forms.Screen[] GetAvailableScreens()
-        {
-            System.Windows.Forms.Screen[] screens;
-
-            // Windows 8 or greater needed for the multiscreen absolute mode
-            if (VersionHelper.IsWindows8OrGreater() || config.OutputMode != Configuration.OutputModes.Absolute)
-                screens = System.Windows.Forms.Screen.AllScreens;
-            else
-                screens = new System.Windows.Forms.Screen[] { System.Windows.Forms.Screen.PrimaryScreen };
-            return screens;
-        }
-
-
-
-        #region Canvas stuff
-
-        //
-        // Create canvas elements
-        //
-        void CreateCanvasElements()
-        {
-            //
-            // Screen map canvas
-            //
-            // Clear canvas
-            canvasScreenMap.Children.Clear();
-
-
-            // Monitor rectangles
-            rectangleMonitors = new Rectangle[16];
-            for (int i = 0; i < 16; i++)
+            // Fix screen area array length
+            if (config.ScreenAreas.Length != config.GetMaxAreaCount())
             {
-                rectangleMonitors[i] = new Rectangle
+                Area[] newScreenAreas = new Area[config.GetMaxAreaCount()];
+                for (int i = 0; i < config.GetMaxAreaCount(); i++)
                 {
-                    Width = 10,
-                    Height = 10,
-                    Stroke = Brushes.Black,
-                    StrokeThickness = 1.0,
-                    Fill = Brushes.Transparent,
-                    Visibility = Visibility.Hidden
-                };
-                canvasScreenMap.Children.Add(rectangleMonitors[i]);
+                    if (i < config.ScreenAreas.Length)
+                    {
+                        newScreenAreas[i] = config.ScreenAreas[i];
+                    }
+                    else
+                    {
+                        newScreenAreas[i] = new Area(0, 0, 0, 0);
+                    }
+                }
+                config.ScreenAreas = newScreenAreas;
             }
 
-            //
-            // Desktop area rectangle
-            //
-            rectangleDesktop = new Rectangle
-            {
-                Stroke = Brushes.Black,
-                StrokeThickness = 2.0,
-                Fill = Brushes.Transparent
-            };
-            canvasScreenMap.Children.Add(rectangleDesktop);
-
-
-            //
-            // Screen map area rectangle
-            //
-            Brush brushScreenMap = new SolidColorBrush(Color.FromArgb(50, 20, 20, 20));
-            rectangleScreenMap = new Rectangle
-            {
-                Stroke = Brushes.Black,
-                StrokeThickness = 2.0,
-                Fill = brushScreenMap
-            };
-            canvasScreenMap.Children.Add(rectangleScreenMap);
-
-            //
-            // Screen aspect ratio text
-            //
-            textScreenAspectRatio = new TextBlock
-            {
-                Text = "",
-                Foreground = Brushes.Black,
-                FontSize = 13,
-                FontWeight = FontWeights.Bold
-            };
-            canvasScreenMap.Children.Add(textScreenAspectRatio);
-
-
-
-            //
-            // Tablet area canvas
-            //
-            //
-            // Clear
-            canvasTabletArea.Children.Clear();
-
-            //
-            // Tablet full area polygon
-            //
-            polygonTabletFullArea = new Polygon
+            // Fix tablet area array length
+            if (config.TabletAreas.Length != config.GetMaxAreaCount())
             {
-                Stroke = new SolidColorBrush(Color.FromRgb(100, 100, 100)),
-                StrokeThickness = 2.0,
-                Points = new PointCollection
+                Area[] newTabletAreas = new Area[config.GetMaxAreaCount()];
+                for (int i = 0; i < config.GetMaxAreaCount(); i++)
                 {
-                    new Point(0,0),
-                    new Point(0,0),
-                    new Point(0,0),
-                    new Point(0,0)
-                },
-            };
-            canvasTabletArea.Children.Add(polygonTabletFullArea);
+                    if (i < config.TabletAreas.Length)
+                    {
+                        newTabletAreas[i] = config.TabletAreas[i];
+                    }
+                    else
+                    {
+                        newTabletAreas[i] = new Area(0, 0, 0, 0);
+                    }
+                }
+                config.TabletAreas = newTabletAreas;
 
-            //
-            // Tablet area polygon
-            //
-            polygonTabletArea = new Polygon
-            {
-                Stroke = new SolidColorBrush(Color.FromRgb(0, 0, 0)),
-                Fill = new SolidColorBrush(Color.FromArgb(50, 20, 20, 20)),
-                StrokeThickness = 2.0,
-                Points = new PointCollection
-                {
-                    new Point(0,0),
-                    new Point(0,0),
-                    new Point(0,0),
-                    new Point(0,0)
-                },
-            };
-            canvasTabletArea.Children.Add(polygonTabletArea);
+            }
 
 
-            //
-            // Tablet area arrow polygon
-            //
-            polygonTabletAreaArrow = new Polygon
+            // Invalid screen area -> Set defaults
+            for (int i = 0; i < config.GetAreaCount(); i++)
             {
-                Fill = new SolidColorBrush(Color.FromArgb(50, 20, 20, 20)),
-                Points = new PointCollection
+                if (config.ScreenAreas[i].Width == 0 || config.ScreenAreas[i].Height == 0)
                 {
-                    new Point(0,0),
-                    new Point(0,0),
-                    new Point(0,0)
-                },
-            };
-            canvasTabletArea.Children.Add(polygonTabletAreaArrow);
-
-
-            //
-            // Tablet area aspect ratio text
-            //
-            textTabletAspectRatio = new TextBlock
-            {
-                Text = "",
-                Foreground = Brushes.Black,
-                FontSize = 13,
-                FontWeight = FontWeights.Bold
-            };
-            canvasTabletArea.Children.Add(textTabletAspectRatio);
-
-            //
-            // Canvas mouse drag
-            //
-            mouseDrag = new MouseDrag();
-        }
-
-
-        //
-        // Update canvas elements
-        //
-        void UpdateCanvasElements()
-        {
-            UpdateScreenMapCanvas();
-            UpdateTabletAreaCanvas();
-        }
-
-
-        //
-        // Update screen map canvas elements
-        //
-        void UpdateScreenMapCanvas()
-        {
-            // Canvas element scaling
-            double scaleX = (canvasScreenMap.ActualWidth - 2) / config.DesktopSize.Width;
-            double scaleY = (canvasScreenMap.ActualHeight - 2) / config.DesktopSize.Height;
-            double scale = scaleX;
-            if (scaleX > scaleY)
-                scale = scaleY;
-
-            // Centered offset
-            double offsetX = canvasScreenMap.ActualWidth / 2.0 - config.DesktopSize.Width * scale / 2.0;
-            double offsetY = canvasScreenMap.ActualHeight / 2.0 - config.DesktopSize.Height * scale / 2.0;
-
-
-            // Full desktop area
-            rectangleDesktop.Width = config.DesktopSize.Width * scale;
-            rectangleDesktop.Height = config.DesktopSize.Height * scale;
-            Canvas.SetLeft(rectangleDesktop, offsetX);
-            Canvas.SetTop(rectangleDesktop, offsetY);
-
+                    config.DesktopSize.Width = GetVirtualDesktopSize().Width;
+                    config.DesktopSize.Height = GetVirtualDesktopSize().Height;
+                    config.ScreenAreas[i].Width = config.DesktopSize.Width;
+                    config.ScreenAreas[i].Height = config.DesktopSize.Height;
+                    config.ScreenAreas[i].X = config.DesktopSize.Width / 2.0;
+                    config.ScreenAreas[i].Y = config.DesktopSize.Height / 2.0;
+                }
 
-            // Screen map area
-            rectangleScreenMap.Width = config.ScreenArea.Width * scale;
-            rectangleScreenMap.Height = config.ScreenArea.Height * scale;
-            Canvas.SetLeft(rectangleScreenMap, offsetX + config.ScreenArea.X * scale);
-            Canvas.SetTop(rectangleScreenMap, offsetY + config.ScreenArea.Y * scale);
+                FixTabletAreaDimensions(config.TabletAreas[i], config.ScreenAreas[i]);
+            }
 
-            // Screen aspect ratio text
-            textScreenAspectRatio.Text = Utils.GetNumberString(config.ScreenArea.Width / config.ScreenArea.Height, "0.###") + ":1";
-            Canvas.SetLeft(textScreenAspectRatio, offsetX +
-                (config.ScreenArea.X + config.ScreenArea.Width / 2.0) * scale -
-                textScreenAspectRatio.ActualWidth / 2.0
-            );
-            Canvas.SetTop(textScreenAspectRatio, offsetY +
-                (config.ScreenArea.Y + config.ScreenArea.Height / 2.0) * scale -
-                textScreenAspectRatio.ActualHeight / 2.0
-            );
 
+            // Primary area is always enabled
+            config.ScreenAreas[0].IsEnabled = true;
 
+            // Set selected area to primary area
+            config.SelectedScreenArea = config.ScreenAreas[0];
+            config.SelectedTabletArea = config.TabletAreas[0];
 
+            // Reset tablet name
+            config.TabletName = "";
 
+            // Load settings from configuration
+            LoadSettingsFromConfiguration();
 
-            // Screens
-            System.Windows.Forms.Screen[] screens = GetAvailableScreens();
+            // Update the settings back to the configuration
+            UpdateSettingsToConfiguration();
 
-            // Monitor minimums
-            double minX = 99999;
-            double minY = 99999;
-            foreach (System.Windows.Forms.Screen screen in screens)
-            {
-                if (screen.Bounds.X < minX) minX = screen.Bounds.X;
-                if (screen.Bounds.Y < minY) minY = screen.Bounds.Y;
-            }
+            // Set run at startup
+            SetRunAtStartup(config.RunAtStartup);
 
+            // Set window data context
+            this.DataContext = config;
 
-            // Monitor rectangles
-            int rectangeIndex = 0;
-            foreach (System.Windows.Forms.Screen screen in screens)
-            {
-                double x = screen.Bounds.X - minX;
-                double y = screen.Bounds.Y - minY;
+        }
 
-                rectangleMonitors[rectangeIndex].Visibility = Visibility.Visible;
-                rectangleMonitors[rectangeIndex].Width = screen.Bounds.Width * scale;
-                rectangleMonitors[rectangeIndex].Height = screen.Bounds.Height * scale;
-                Canvas.SetLeft(rectangleMonitors[rectangeIndex], offsetX + x * scale);
-                Canvas.SetTop(rectangleMonitors[rectangeIndex], offsetY + y * scale);
 
-                rectangeIndex++;
-                if (rectangeIndex >= 16) break;
-            }
+        #endregion
 
-        }
 
 
         //
-        // Update tablet area canvas elements
+        // Save settings
         //
-        void UpdateTabletAreaCanvas()
+        private void SaveSettings(object sender, RoutedEventArgs e)
         {
-            double fullWidth = config.TabletFullArea.Width;
-            double fullHeight = config.TabletFullArea.Height;
-
-            // Canvas element scaling
-            double scaleX = (canvasTabletArea.ActualWidth - 2) / fullWidth;
-            double scaleY = (canvasTabletArea.ActualHeight - 2) / fullHeight;
-            double scale = scaleX;
-            if (scaleX > scaleY)
-                scale = scaleY;
-
-
-            double offsetX = canvasTabletArea.ActualWidth / 2.0 - fullWidth * scale / 2.0;
-            double offsetY = canvasTabletArea.ActualHeight / 2.0 - fullHeight * scale / 2.0;
-
-            //
-            // Tablet full area
-            //
-            Point[] corners = config.TabletFullArea.Corners;
-            for (int i = 0; i < 4; i++)
+            try
             {
-                Point p = corners[i];
-                p.X *= scale;
-                p.Y *= scale;
-                p.X += config.TabletFullArea.X * scale + offsetX;
-                p.Y += config.TabletFullArea.Y * scale + offsetY;
-                polygonTabletFullArea.Points[i] = p;
-            }
+                config.Write(configFilename);
+                SendSettingsToDriver();
 
+                //
+                // Enable/Disable Windows Ink pressure settings
+                //
+                if (config.Mode == Configuration.OutputModes.WindowsInk)
+                    groupBoxWindowsInkSettings.IsEnabled = true;
+                else
+                    groupBoxWindowsInkSettings.IsEnabled = false;
 
-            //
-            // Tablet area
-            //
-            corners = config.TabletArea.Corners;
-            for (int i = 0; i < 4; i++)
+                SetStatus("Settings saved!");
+            }
+            catch (Exception)
             {
-                Point p = corners[i];
-                p.X *= scale;
-                p.Y *= scale;
-                p.X += config.TabletArea.X * scale + offsetX;
-                p.Y += config.TabletArea.Y * scale + offsetY;
-                polygonTabletArea.Points[i] = p;
+                string dir = Directory.GetCurrentDirectory();
+                MessageBox.Show("Error occured while saving the configuration.\n" +
+                    "Make sure that it is possible to create and edit files in the '" + dir + "' directory.\n",
+                    "ERROR!", MessageBoxButton.OK, MessageBoxImage.Error
+                );
             }
-
-            //
-            // Tablet area arrow
-            //
-            polygonTabletAreaArrow.Points[0] = new Point(
-                offsetX + config.TabletArea.X * scale,
-                offsetY + config.TabletArea.Y * scale
-            );
-
-            polygonTabletAreaArrow.Points[1] = new Point(
-                offsetX + corners[2].X * scale + config.TabletArea.X * scale,
-                offsetY + corners[2].Y * scale + config.TabletArea.Y * scale
-            );
-
-            polygonTabletAreaArrow.Points[2] = new Point(
-                offsetX + corners[3].X * scale + config.TabletArea.X * scale,
-                offsetY + corners[3].Y * scale + config.TabletArea.Y * scale
-            );
-
-
-            //
-            // Tablet area aspect ratio text
-            //
-            textTabletAspectRatio.Text = Utils.GetNumberString(config.TabletArea.Width / config.TabletArea.Height, "0.###") + ":1";
-            Canvas.SetLeft(textTabletAspectRatio, offsetX + (config.TabletArea.X) * scale - textTabletAspectRatio.ActualWidth / 2.0);
-            Canvas.SetTop(textTabletAspectRatio, offsetY + (config.TabletArea.Y) * scale - textTabletAspectRatio.ActualHeight / 2.0);
-
-
         }
 
 
         //
-        // Canvas mouse events
-        //
+        // Set run at startup
         //
-        // Canvas mouse down
-        private void Canvas_MouseDown(object sender, MouseButtonEventArgs e)
+        private void SetRunAtStartup(bool enabled)
         {
-
-            mouseDrag.IsMouseDown = true;
-            mouseDrag.Source = (UIElement)sender;
-            mouseDrag.OriginMouse = e.GetPosition((UIElement)mouseDrag.Source);
-
-            // Screen Map
-            if (mouseDrag.Source == canvasScreenMap)
+            try
             {
-                // Reset monitor selection
-                comboBoxMonitor.SelectedIndex = -1;
-
-                mouseDrag.OriginDraggable = new Point(config.ScreenArea.X, config.ScreenArea.Y);
-                canvasScreenMap.CaptureMouse();
-            }
+                string path = System.Reflection.Assembly.GetExecutingAssembly().Location;
+                string entryName = "TabletDriverGUI";
+                RegistryKey rk = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
+                if (enabled)
+                    rk.SetValue(entryName, "\"" + path + "\" --hide");
+                else
+                    rk.DeleteValue(entryName, false);
 
-            // Tablet Area
-            else if (mouseDrag.Source == canvasTabletArea)
-            {
-                mouseDrag.OriginDraggable = new Point(config.TabletArea.X, config.TabletArea.Y);
-                canvasTabletArea.CaptureMouse();
+                rk.Close();
             }
-        }
-
-
-        //
-        // Canvas mouse up
-        //
-        private void Canvas_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            mouseDrag.IsMouseDown = false;
-            LoadSettingsFromConfiguration();
-            isLoadingSettings = true;
-            textScreenAreaX.Text = Utils.GetNumberString(config.ScreenArea.X, "0");
-            textScreenAreaY.Text = Utils.GetNumberString(config.ScreenArea.Y, "0");
-            textTabletAreaX.Text = Utils.GetNumberString(config.TabletArea.X);
-            textTabletAreaY.Text = Utils.GetNumberString(config.TabletArea.Y);
-            isLoadingSettings = false;
-            canvasScreenMap.ReleaseMouseCapture();
-            canvasTabletArea.ReleaseMouseCapture();
-        }
-
-
-        //
-        // Canvas mouse move
-        //
-        private void Canvas_MouseMove(object sender, MouseEventArgs e)
-        {
-            Point position;
-            double dx, dy;
-            double scaleX = 0, scaleY = 0, scale = 0;
-
-            // Canvas mouse drag
-            if (mouseDrag.IsMouseDown && mouseDrag.Source == sender)
+            catch (Exception)
             {
-                position = e.GetPosition((UIElement)mouseDrag.Source);
-
-                dx = position.X - mouseDrag.OriginMouse.X;
-                dy = position.Y - mouseDrag.OriginMouse.Y;
-
-                if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift))
-                    dx = 0;
-                if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
-                    dy = 0;
-
-
-                // Screen map canvas
-                if (mouseDrag.Source == canvasScreenMap)
-                {
-                    scaleX = config.DesktopSize.Width / canvasScreenMap.ActualWidth;
-                    scaleY = config.DesktopSize.Height / canvasScreenMap.ActualHeight;
-                    scale = scaleY;
-                    if (scaleX > scaleY)
-                        scale = scaleX;
-
-                    if (Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt))
-                    {
-                        dx = Math.Round(dx * scale / 80.0) * 80.0 / scale;
-                        dy = Math.Round(dy * scale / 80.0) * 80.0 / scale;
-                    }
-
-                    config.ScreenArea.X = mouseDrag.OriginDraggable.X + dx * scale;
-                    config.ScreenArea.Y = mouseDrag.OriginDraggable.Y + dy * scale;
-                    UpdateScreenMapCanvas();
-                }
-
-                // Tablet area canvas
-                else if (mouseDrag.Source == canvasTabletArea)
-                {
-                    scaleX = config.TabletFullArea.Width / canvasTabletArea.ActualWidth;
-                    scaleY = config.TabletFullArea.Height / canvasTabletArea.ActualHeight;
-                    scale = scaleY;
-                    if (scaleX > scaleY)
-                        scale = scaleX;
-
-                    if (Keyboard.IsKeyDown(Key.LeftAlt) || Keyboard.IsKeyDown(Key.RightAlt))
-                    {
-                        dx = Math.Round(dx * scale / 5.0) * 5.0 / scale;
-                        dy = Math.Round(dy * scale / 5.0) * 5.0 / scale;
-                    }
-
-                    config.TabletArea.X = mouseDrag.OriginDraggable.X + dx * scale;
-                    config.TabletArea.Y = mouseDrag.OriginDraggable.Y + dy * scale;
-
-                    UpdateTabletAreaCanvas();
-                }
-
-
             }
         }
 
-        #endregion
-
-
 
         //
         // TextBox setting changed
@@ -1114,28 +1024,12 @@ private void CheckboxChanged(object sender, RoutedEventArgs e)
         {
             if (isLoadingSettings) return;
 
-            // Disable tablet area settings when full area is forced
-            if (checkBoxForceFullArea.IsChecked == true)
-            {
-                textTabletAreaWidth.IsEnabled = false;
+            // Disable tablet area height when aspect ratio is forced
+            if (checkBoxForceAspect.IsChecked == true)
                 textTabletAreaHeight.IsEnabled = false;
-                textTabletAreaX.IsEnabled = false;
-                textTabletAreaY.IsEnabled = false;
-            }
             else
-            {
-                textTabletAreaWidth.IsEnabled = true;
-                textTabletAreaX.IsEnabled = true;
-                textTabletAreaY.IsEnabled = true;
-
-                // Disable tablet area height when aspect ratio is forced
-                if (checkBoxForceAspect.IsChecked == true)
-                    textTabletAreaHeight.IsEnabled = false;
-                else
-                    textTabletAreaHeight.IsEnabled = true;
-
+                textTabletAreaHeight.IsEnabled = true;
 
-            }
 
             // Disable desktop size settings when automatic is checked
             if (checkBoxAutomaticDesktopSize.IsChecked == true)
@@ -1166,11 +1060,6 @@ private void CheckboxChanged(object sender, RoutedEventArgs e)
 
             UpdateSettingsToConfiguration();
 
-            if (sender == checkBoxForceFullArea)
-            {
-                LoadSettingsFromConfiguration();
-                UpdateSettingsToConfiguration();
-            }
         }
 
 
@@ -1223,21 +1112,6 @@ private void ComboBoxMonitor_MouseDown(object sender, MouseButtonEventArgs e)
                 comboBoxMonitor.Items.Add(System.Windows.Forms.Screen.PrimaryScreen.DeviceName);
             }
 
-            // TabletDriverGUI window
-            comboBoxMonitor.Items.Add("This window");
-
-            // osu!.exe processes window
-            try
-            {
-                if (Process.GetProcessesByName("osu!").Length > 0)
-                {
-                    comboBoxMonitor.Items.Add("osu! window");
-                }
-            }
-            catch (Exception)
-            {
-            }
-
         }
 
 
@@ -1246,14 +1120,11 @@ private void ComboBoxMonitor_MouseDown(object sender, MouseButtonEventArgs e)
         //
         private void ComboBoxMonitor_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
+            if (sender != comboBoxMonitor) return;
+            if (e.AddedItems.Count <= 0) return;
+
             System.Windows.Forms.Screen[] screens = GetAvailableScreens();
-            double minX = 99999;
-            double minY = 99999;
-            foreach (System.Windows.Forms.Screen screen in screens)
-            {
-                if (screen.Bounds.X < minX) minX = screen.Bounds.X;
-                if (screen.Bounds.Y < minY) minY = screen.Bounds.Y;
-            }
+            Vector minimumScreenPosition = GetMinimumScreenPosition(screens);
 
             int index = comboBoxMonitor.SelectedIndex;
             if (index == 0)
@@ -1268,48 +1139,17 @@ private void ComboBoxMonitor_SelectionChanged(object sender, SelectionChangedEve
                 index--;
 
                 // Monitors
-                if (index >= 0 && index <= screens.Length && screens.Length > 1)
+                if (index >= 0 && index < screens.Length && screens.Length > 1)
                 {
-                    textScreenAreaX.Text = Utils.GetNumberString(screens[index].Bounds.X - minX);
-                    textScreenAreaY.Text = Utils.GetNumberString(screens[index].Bounds.Y - minY);
+                    textScreenAreaX.Text = Utils.GetNumberString(screens[index].Bounds.X - minimumScreenPosition.X);
+                    textScreenAreaY.Text = Utils.GetNumberString(screens[index].Bounds.Y - minimumScreenPosition.Y);
                     textScreenAreaWidth.Text = Utils.GetNumberString(screens[index].Bounds.Width);
                     textScreenAreaHeight.Text = Utils.GetNumberString(screens[index].Bounds.Height);
                 }
 
-                // TabletDriverGUI window
-                else if (comboBoxMonitor.SelectedValue.ToString() == "This window")
-                {
-                    textScreenAreaX.Text = Utils.GetNumberString(Application.Current.MainWindow.Left - minX);
-                    textScreenAreaY.Text = Utils.GetNumberString(Application.Current.MainWindow.Top - minY);
-                    textScreenAreaWidth.Text = Utils.GetNumberString(Application.Current.MainWindow.Width);
-                    textScreenAreaHeight.Text = Utils.GetNumberString(Application.Current.MainWindow.Height);
-                }
-
-                // osu! window
-                else if (comboBoxMonitor.SelectedValue.ToString() == "osu! window")
-                {
-                    try
-                    {
-                        Process[] processes = Process.GetProcessesByName("osu!");
-
-                        if (processes.Length > 0)
-                        {
-                            IntPtr osuHandle = processes[0].MainWindowHandle;
-                            NativeMethods.GetWindowRect(osuHandle, out NativeMethods.RECT rect);
-
-                            textScreenAreaX.Text = Utils.GetNumberString(rect.X - minX);
-                            textScreenAreaY.Text = Utils.GetNumberString(rect.Y - minY);
-                            textScreenAreaWidth.Text = Utils.GetNumberString(rect.Width);
-                            textScreenAreaHeight.Text = Utils.GetNumberString(rect.Height - 1);
-
-                        }
-                    }
-                    catch (Exception)
-                    {
-
-                    }
-                }
             }
+            comboBoxMonitor.Text = "";
+            comboBoxMonitor.SelectedIndex = -1;
             UpdateSettingsToConfiguration();
         }
 
@@ -1329,11 +1169,11 @@ private void ButtonMap_Click(object sender, RoutedEventArgs e)
             else if (sender == buttonPenButton3) isPenButton = true;
 
 
-            ButtonMapping buttonMapping = new ButtonMapping(button, isPenButton);
-            buttonMapping.ShowDialog();
-            if (buttonMapping.DialogResult == true)
+            WindowButtonMapping windowButtonMapping = new WindowButtonMapping(button, isPenButton);
+            windowButtonMapping.ShowDialog();
+            if (windowButtonMapping.DialogResult == true)
             {
-                button.Content = buttonMapping.Result.ToUpper();
+                button.Content = windowButtonMapping.Result.ToUpper();
                 UpdateSettingsToConfiguration();
             }
 
@@ -1363,15 +1203,24 @@ private void ButtonMap_ToolTipOpening(object sender, ToolTipEventArgs e)
         private void MainMenuClick(object sender, RoutedEventArgs e)
         {
 
+            //
+            // Save settings
+            //
+            if (sender == mainMenuSaveSettings)
+            {
+                SaveSettings(sender, e);
+            }
+
             //
             // Import settings
             //
-            if (sender == mainMenuImport)
+            else if (sender == mainMenuImport)
             {
                 OpenFileDialog dialog = new OpenFileDialog
                 {
                     InitialDirectory = Directory.GetCurrentDirectory(),
-                    Filter = "XML File|*.xml"
+                    Filter = "XML File|*.xml",
+                    Title = "Import settings"
                 };
                 if (dialog.ShowDialog() == true)
                 {
@@ -1379,8 +1228,14 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
                     {
                         Configuration tmpConfig = Configuration.CreateFromFile(dialog.FileName);
                         config = tmpConfig;
-                        LoadSettingsFromConfiguration();
+                        InitializeConfiguration();
+                        Application.Current.Dispatcher.Invoke(() =>
+                        {
+                            LoadSettingsFromConfiguration();
+                            UpdateSettingsToConfiguration();
+                        });
                         SetStatus("Settings imported!");
+
                     }
                     catch (Exception)
                     {
@@ -1400,7 +1255,8 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
                     InitialDirectory = Directory.GetCurrentDirectory(),
                     AddExtension = true,
                     DefaultExt = "xml",
-                    Filter = "XML File|*.xml"
+                    Filter = "XML File|*.xml",
+                    Title = "Export settings"
 
                 };
                 if (dialog.ShowDialog() == true)
@@ -1425,16 +1281,24 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
             //
             else if (sender == mainMenuResetToDefault)
             {
-                config = null;
-                isFirstStart = true;
-                config = new Configuration();
+                WindowMessageBox messageBox = new WindowMessageBox(
+                              "Are you sure?", "Reset to default settings?",
+                              "Yes", "No");
+                messageBox.ShowDialog();
+                if (messageBox.DialogResult == true)
+                {
 
-                // Initialize configuration
-                InitializeConfiguration();
+                    config = null;
+                    isFirstStart = true;
+                    config = new Configuration();
 
-                // Restart driver
-                StopDriver();
-                StartDriver();
+                    // Initialize configuration
+                    InitializeConfiguration();
+
+                    // Restart driver
+                    StopDriver();
+                    StartDriver();
+                }
 
             }
 
@@ -1446,6 +1310,143 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
                 Close();
             }
 
+
+
+            //
+            // Open current directory
+            //
+            else if (sender == mainMenuOpenCurrentDirectory)
+            {
+                try
+                {
+                    Process.Start("explorer.exe", ".");
+                }
+                catch (Exception)
+                {
+                    MessageBox.Show("Couldn't open TabletDriver folder!", "Error!", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+
+
+            //
+            // Open config folder
+            //
+            else if (sender == mainMenuOpenConfig)
+            {
+                try
+                {
+                    Process.Start("explorer.exe", "config");
+                }
+                catch (Exception)
+                {
+                    MessageBox.Show("Couldn't open config folder!", "Error!", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+
+            //
+            // Open tools folder
+            //
+            else if (sender == mainMenuOpenTools)
+            {
+                try
+                {
+                    Process.Start("explorer.exe", "tools");
+                }
+                catch (Exception)
+                {
+                    MessageBox.Show("Couldn't open tools folder!", "Error!", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+
+
+            //
+            // Tablet View
+            //
+            else if (sender == mainMenuTabletView)
+            {
+                if (tabletView != null)
+                    tabletView.Close();
+
+                tabletView = new WindowTabletView(config, driver)
+                {
+                    WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                    Owner = Application.Current.MainWindow,
+                };
+                tabletView.ShowDialog();
+                tabletView.Close();
+                tabletView = null;
+                GC.Collect(10, GCCollectionMode.Forced);
+            }
+
+
+            //
+            // Tablet View Settings
+            //
+            else if (sender == mainMenuTabletViewSettings)
+            {
+
+                WindowTabletViewSettings tabletViewSettings = new WindowTabletViewSettings(config)
+                {
+                    WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                    Owner = Application.Current.MainWindow,
+                };
+                tabletViewSettings.ShowDialog();
+            }
+
+
+            //
+            // Fit window to content
+            //
+            else if (sender == mainMenuFitToContent)
+            {
+                SizeToContent = SizeToContent.WidthAndHeight;
+                UpdateLayout();
+                SizeToContent = SizeToContent.Manual;
+            }
+
+
+            //
+            // Update desktop image
+            //
+            else if (sender == mainMenuUpdateDesktopImage)
+            {
+                DispatcherTimer timer = new DispatcherTimer
+                {
+                    Interval = new TimeSpan(0, 0, 0, 0, 200)
+                };
+                timer.Tick += (s, ev) =>
+                {
+                    imageDesktopScreenshot.Source = null;
+                    GC.Collect(10, GCCollectionMode.Forced);
+                    UpdateDesktopImage();
+                    timer.Stop();
+                };
+                timer.Start();
+            }
+
+
+
+        }
+
+
+        //
+        // Tab selection changed
+        //
+        private void TabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+
+            if (tabControl.SelectedItem == tabArea)
+            {
+                UpdateCanvasElements();
+            }
+
+            //
+            // Console tab is selected
+            //
+            if (tabControl.SelectedItem == tabConsole)
+            {
+                ConsoleBufferToText();
+            }
         }
 
     }
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 9dd10bb..8e790ec 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -1,14 +1,20 @@
 <Window x:Class="TabletDriverGUI.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:TabletDriverGUI"
         mc:Ignorable="d"
         Keyboard.PreviewKeyDown="Window_PreviewKeyDown"
         Title="TabletDriverGUI" Height="703" Width="680"
         >
+
+  <Window.DataContext>
+    <Binding Source="config"/>
+  </Window.DataContext>
+
   <Window.Resources>
+
+    <!-- GroupBox style -->
     <Style TargetType="GroupBox">
       <Setter Property="HeaderTemplate">
         <Setter.Value>
@@ -19,13 +25,38 @@
       </Setter>
     </Style>
 
+    <!-- TextBox style -->
+
+    <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#999" />
+    <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#f9f9f9" />
+
     <Style x:Key="ControlStyleTextBox" TargetType="Control">
       <Setter Property="HorizontalContentAlignment" Value="Left"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
     </Style>
     <Style BasedOn="{StaticResource ControlStyleTextBox}" TargetType="TextBox">
       <Setter Property="Padding" Value="5,0"/>
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="TextBox">
+            <Border Name="Bd" BorderThickness="{TemplateBinding BorderThickness}" 
+                                             BorderBrush="{TemplateBinding BorderBrush}" 
+                                             Background="{TemplateBinding Background}" 
+                                             SnapsToDevicePixels="true">
+              <ScrollViewer Name="PART_ContentHost" Background="{TemplateBinding Background}" 
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+            <ControlTemplate.Triggers>
+              <Trigger Property="IsEnabled" Value="False">
+                <Setter Value="{StaticResource DisabledBackgroundBrush}" Property="Background" />
+                <Setter Value="{StaticResource DisabledForegroundBrush}" Property="Foreground" />
+              </Trigger>
+            </ControlTemplate.Triggers>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
     </Style>
+
   </Window.Resources>
 
   <Grid Background="Transparent" Margin="0,0,0,0">
@@ -39,31 +70,46 @@
     <DockPanel Grid.Row="0" Background="White" Height="18">
       <Menu DockPanel.Dock="Top"  Background="White">
         <MenuItem Header="Fil_e">
-          <MenuItem Name="mainMenuImport" Header="_Import Settings" Click="MainMenuClick" />
-          <MenuItem Name="mainMenuExport" Header="_Export Settings" Click="MainMenuClick" />
+          <MenuItem Name="mainMenuSaveSettings" Header="_Save settings" InputGestureText="Ctrl+S" Click="MainMenuClick" />
+          <Separator/>
+          <MenuItem Name="mainMenuImport" InputGestureText="Ctrl+I" Header="_Import Settings" Click="MainMenuClick" />
+          <MenuItem Name="mainMenuExport" InputGestureText="Ctrl+E" Header="_Export Settings" Click="MainMenuClick" />
           <Separator/>
           <MenuItem Name="mainMenuResetToDefault" Header="_Reset to default" Click="MainMenuClick" />
           <Separator />
           <MenuItem Name="mainMenuExit" Header="E_xit" Click="MainMenuClick" />
         </MenuItem>
+        <MenuItem Header="_Tools">
+          <MenuItem Header="Show folder">
+            <MenuItem Name="mainMenuOpenCurrentDirectory" Header="_TabletDriver" Click="MainMenuClick" />
+            <MenuItem Name="mainMenuOpenConfig" Header="_Config" Click="MainMenuClick" />
+            <MenuItem Name="mainMenuOpenTools" Header="T_ools" Click="MainMenuClick" />
+          </MenuItem>
+          <MenuItem Name="mainMenuTabletView" Header="_Tablet View" Click="MainMenuClick" />
+          <MenuItem Name="mainMenuTabletViewSettings" Header="Tablet View _Settings" Click="MainMenuClick" />
+          <MenuItem Name="mainMenuUpdateDesktopImage" Header="_Update desktop image" Click="MainMenuClick" />
+          <MenuItem Name="mainMenuFitToContent" Header="_Fit window to content" Click="MainMenuClick" />
+        </MenuItem>
       </Menu>
       <TextBox AcceptsReturn="True" />
     </DockPanel>
 
     <TabControl Grid.Row="1" Name="tabControl"
                 Background="White"
-                Selector.IsSelected="True"                
+                Selector.IsSelected="True"
+                SelectionChanged="TabControl_SelectionChanged"
                 >
 
       <!-- Area tab -->
-      <TabItem Margin="10,0,-10,0" Padding="10,5">
+      <TabItem Name="tabArea" Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#006600" FontWeight="Bold">
             <AccessText Text="_Area"/>
           </TextBlock>
         </TabItem.Header>
 
-        <ScrollViewer VerticalScrollBarVisibility="Auto">
+        <ScrollViewer VerticalScrollBarVisibility="Auto"
+                      FocusVisualStyle="{x:Null}">
           <StackPanel Orientation="Vertical"
                       HorizontalAlignment="Left"
                       Margin="5,0">
@@ -87,7 +133,13 @@
                     <LineBreak/>
                     - Alt + Drag = Move area 80 pixels at a time.
                     <LineBreak/>
-                    - Use the "Set Area" to set the screen area to single monitor or full desktop.
+                    - Mouse scroll = Resize area 10 pixels per scroll.
+                    <LineBreak/>
+                    - Control + Mouse scroll = Resize area 100 pixels per scroll.
+                    <LineBreak/>
+                    - Use the "Move Area To" to set move screen area to single monitor or full desktop.
+                    <LineBreak/>
+                    - <TextBlock FontWeight="Bold" Foreground="#000099">Right-clicking the area will show more options</TextBlock>
                   </TextBlock>
                 </StackPanel>
               </GroupBox.ToolTip>
@@ -96,23 +148,46 @@
 
                 <!-- Screen map canvas -->
                 <Canvas Name="canvasScreenMap"
-                        Cursor="Hand"
                         Height="130" Margin="0,0,0,0"
                         Background="Transparent"
                         ClipToBounds="True"
+                        ContextMenuOpening="Canvas_ContextMenuOpening"
+                        MouseWheel="CanvasMouseWheel"
                         MouseMove="Canvas_MouseMove"                        
                         MouseDown="Canvas_MouseDown"
-                        MouseUp="Canvas_MouseUp"
-                      >
+                        MouseUp="Canvas_MouseUp">
+                  <Canvas.ContextMenu>
+                    <ContextMenu>
+                      <MenuItem Header="" Name="menuCanvasScreenAreaInfo" FontWeight="Bold"/>
+                      <MenuItem Header="Move to center of a monitor" Name="menuCanvasMoveToMonitorCenter" Click="Canvas_MenuClick" />
+                      <MenuItem Header="Set to full monitor" Name="menuCanvasSetToFullMonitor" Click="Canvas_MenuClick" />
+                      <MenuItem Header="Set to full desktop" Name="menuCanvasSetToFullDesktop" Click="Canvas_MenuClick" />
+                      <Separator/>
+                      <MenuItem Header="Add area" Name="menuCanvasAddScreenArea" Click="Canvas_MenuClick" />
+                      <MenuItem Header="Edit area" Name="menuCanvasEditScreenArea" Click="Canvas_MenuClick" />
+                      <MenuItem Header="Remove area" Name="menuCanvasRemoveScreenArea" Click="Canvas_MenuClick" />
+                      <Separator/>
+                      <MenuItem Header="Reset all areas" Name="menuCanvasResetScreenAreas" Click="Canvas_MenuClick" />
+                    </ContextMenu>
+                  </Canvas.ContextMenu>
                 </Canvas>
 
+                <!-- Screen area information -->
+                <Label Name="labelScreenAreaInfo"
+                       HorizontalAlignment="Center"
+                       FontSize="11"
+                       FontWeight="Bold"
+                       Padding="0">
+                  RATIO 1.777:1
+                </Label>
+
                 <!-- Screen map controls -->
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
 
                   <!-- Screen Area Width -->
                   <GroupBox Header="Width" Height="50" Width="100">
                     <Grid>
-                      <TextBox Name="textScreenAreaWidth" TextChanged="TextChanged">1920</TextBox>
+                      <TextBox Name="textScreenAreaWidth" TextChanged="TextChanged" />
                       <Label HorizontalAlignment="Right">px</Label>
                     </Grid>
                   </GroupBox>
@@ -120,7 +195,7 @@
                   <!-- Screen Area Height -->
                   <GroupBox Header="Height" Height="50" Width="100" Margin="5,0,0,0">
                     <Grid>
-                      <TextBox Name="textScreenAreaHeight" TextChanged="TextChanged">1080</TextBox>
+                      <TextBox Name="textScreenAreaHeight" TextChanged="TextChanged"/>
                       <Label HorizontalAlignment="Right">px</Label>
                     </Grid>
                   </GroupBox>
@@ -128,7 +203,7 @@
                   <!-- Screen Area Left -->
                   <GroupBox Header="Left Offset" Height="50" Width="100" Margin="5,0,0,0">
                     <Grid>
-                      <TextBox Name="textScreenAreaX" TextChanged="TextChanged">0</TextBox>
+                      <TextBox Name="textScreenAreaX" TextChanged="TextChanged"/>
                       <Label HorizontalAlignment="Right">px</Label>
                     </Grid>
                   </GroupBox>
@@ -136,13 +211,13 @@
                   <!-- Screen Area Top -->
                   <GroupBox Header="Top Offset" Height="50" Width="100" Margin="5,0,0,0">
                     <Grid>
-                      <TextBox Name="textScreenAreaY" TextChanged="TextChanged">0</TextBox>
+                      <TextBox Name="textScreenAreaY" TextChanged="TextChanged"/>
                       <Label HorizontalAlignment="Right">px</Label>
                     </Grid>
                   </GroupBox>
 
-                  <!-- Set monitor -->
-                  <GroupBox Header="Set Area" Height="50" Width="150" Margin="5,0,0,0">
+                  <!-- Move area to -->
+                  <GroupBox Header="Move Area To" Height="50" Width="150" Margin="5,0,0,0">
                     <ComboBox Name="comboBoxMonitor"
                               PreviewMouseDown="ComboBoxMonitor_MouseDown"
                               SelectionChanged="ComboBoxMonitor_SelectionChanged"
@@ -172,10 +247,18 @@
                     - Shift + Drag = Move area Y direction.
                     <LineBreak/>
                     - Alt + Drag = Move area 5 mm at a time.
-                    <LineBreak/>                   
+                    <LineBreak/>
+                    - Mouse scroll = Resize area 1 mm per scroll.
+                    <LineBreak/>
+                    - Control + Mouse scroll = Resize area 10 mm per scroll.
+                    <LineBreak/>                    
                     - For left handed mode, enable the "Left handed (Inverted)" checkbox or use a rotation value of 180 degrees.
                     <LineBreak/>
                     - Click Wacom Area button to type in the Wacom driver area settings.
+                    <LineBreak/>
+                    - Draw Area will allow you to set the tablet area by clicking two points with a pen.
+                    <LineBreak/>
+                    - <TextBlock FontWeight="Bold" Foreground="#000099">Right-clicking the area will show more options.</TextBlock>
                   </TextBlock>
                 </StackPanel>
               </GroupBox.ToolTip>
@@ -184,13 +267,14 @@
 
                 <Grid>
                   <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="21*"/>
+                    <ColumnDefinition Width="192*"/>
+                    <ColumnDefinition Width="212*"/>
+                    <ColumnDefinition Width="213*"/>
                   </Grid.ColumnDefinitions>
 
                   <!-- Rotation + invert + area buttons -->
-                  <StackPanel Grid.Column="0" HorizontalAlignment="Right">
+                  <StackPanel Grid.Column="1" HorizontalAlignment="Right">
 
                     <!-- Rotation + Invert -->
                     <StackPanel Orientation="Horizontal">
@@ -251,49 +335,69 @@
                       </Button>
 
                     </StackPanel>
-
-
-
                   </StackPanel>
 
                   <!-- Tablet area canvas -->
-                  <Canvas Grid.Column="1" Name="canvasTabletArea"
-                          Cursor="Hand"
+                  <Canvas Grid.Column="2" Name="canvasTabletArea"
                           Height="120" Margin="5,0,5,0"
                           Background="Transparent"
                           ClipToBounds="True"
+                          ContextMenuOpening="Canvas_ContextMenuOpening"
+                          MouseWheel="CanvasMouseWheel"
                           MouseMove="Canvas_MouseMove"                          
                           MouseDown="Canvas_MouseDown"
-                          MouseUp="Canvas_MouseUp" />
+                          MouseUp="Canvas_MouseUp">
+                    <Canvas.ContextMenu>
+                      <ContextMenu>
+                        <MenuItem Header="" Name="menuCanvasTabletAreaInfo" FontWeight="Bold"/>
+                        <MenuItem Name="menuCanvasMoveToCenter" Header="Move to center" Click="Canvas_MenuClick" />
+                        <MenuItem Name="menuCanvasSetToFullTabletArea" Header="Set to full area" Click="Canvas_MenuClick" />
+                        <MenuItem Name="menuCanvasForceProportions" Header="Force proportions" Click="Canvas_MenuClick" />                        
+                        <Separator/>
+                        <MenuItem Name="menuCanvasAddTabletArea" Header="Add area" Click="Canvas_MenuClick" />
+                        <MenuItem Name="menuCanvasEditTabletArea" Header="Edit area" Click="Canvas_MenuClick" />
+                        <MenuItem Name="menuCanvasRemoveTabletArea" Header="Remove area" Click="Canvas_MenuClick" />
+                        <Separator/>
+                        <MenuItem Name="menuCanvasResetTabletAreas" Header="Reset all areas" Click="Canvas_MenuClick" />
+                      </ContextMenu>
+                    </Canvas.ContextMenu>
+                  </Canvas>
 
-                  
                   <!-- Output mode selector -->
-                  <StackPanel Grid.Column="2">
-                    
-                    <GroupBox Header="Mode" HorizontalAlignment="Left">
+                  <StackPanel Grid.Column="3">
+
+                    <!-- Positioning -->
+                    <GroupBox Header="Positioning" Width="170" HorizontalAlignment="Left">
+                      <ComboBox Name="comboBoxOutputPositioning"
+                                SelectionChanged="ItemSelectionChanged"
+                                SelectedIndex="0">
+                        <ComboBoxItem>Absolute (Pen)</ComboBoxItem>
+                        <ComboBoxItem>Relative (Mouse)</ComboBoxItem>
+                      </ComboBox>
+                    </GroupBox>
+
+                    <!-- Output mode -->
+                    <GroupBox Header="Mode" HorizontalAlignment="Left" Width="170" Padding="0,3,0,0">
                       <GroupBox.ToolTip>
                         <TextBlock>
                           <TextBlock FontWeight="Bold" FontSize="16">Mode</TextBlock>
                           <LineBreak/>
-                          <TextBlock FontWeight="Bold">Absolute</TextBlock>: Use this with osu!
-                          <LineBreak/>
-                          <TextBlock FontWeight="Bold">Relative</TextBlock>: Mouse mode. Sensitivity is determined by your tablet area size.
+                          <TextBlock FontWeight="Bold">Standard:</TextBlock> Gaming and other programs that don't need pen pressure.
                           <LineBreak/>
-                          <TextBlock FontWeight="Bold">Windows Ink</TextBlock>: Pen pressure is enabled in this mode. Check if your drawing application supports Windows Ink.
+                          <TextBlock FontWeight="Bold">Windows Ink:</TextBlock> Enables pen pressure for applications that support Windows Ink.
                           <LineBreak/>
-                          <TextBlock FontWeight="Bold">SendInput</TextBlock>: This is for debugging and testing purposes. Use this if you have problems with the absolute mode.
+                          <TextBlock FontWeight="Bold">Compatibility:</TextBlock> Use this mode if you have problems with cursor movement in standard mode.
                         </TextBlock>
                       </GroupBox.ToolTip>
                       <StackPanel>
-                        <RadioButton Name="radioModeAbsolute" GroupName="OutputMode" Margin="2" Content="Absolute (osu!)" 
+                        <RadioButton Name="radioOutputModeStandard" GroupName="OutputMode" Margin="2" Content="Standard (Game)"
                                      IsChecked="True"
                                      Checked="CheckboxChanged" />
-                        <RadioButton Name="radioModeRelative" GroupName="OutputMode" Margin="2" Content="Relative (Mouse)" 
+                        <RadioButton Name="radioOutputModeWindowsInk" GroupName="OutputMode" Margin="2" Content="Windows Ink (Draw)"
                                      Checked="CheckboxChanged" />
-                        <RadioButton Name="radioModeDigitizer" GroupName="OutputMode" Margin="2" Content="Windows Ink (Draw)"
-                                     Checked="CheckboxChanged" />
-                        <RadioButton Name="radioModeSendInput" GroupName="OutputMode" Margin="2" Content="SendInput (Debug)"
+                        <RadioButton Name="radioOutputModeCombatibility" GroupName="OutputMode" Margin="2" Content="Compatibility (Debug)"
                                      Checked="CheckboxChanged" />
+
                       </StackPanel>
                     </GroupBox>
 
@@ -301,13 +405,22 @@
 
                 </Grid>
 
+                <!-- Tablet area information -->
+                <Label Name="labelTabletAreaInfo"
+                       HorizontalAlignment="Center"
+                       Padding="0"
+                       FontSize="11"
+                       FontWeight="Bold">
+                  RATIO 1:777:1
+                </Label>
+
                 <!-- Tablet area settings -->
                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
 
                   <!-- Tablet Area Width -->
                   <GroupBox Header="Width" Height="50" Width="90" Margin="0,0,0,0">
                     <Grid>
-                      <TextBox Name="textTabletAreaWidth" TextChanged="TextChanged">80</TextBox>
+                      <TextBox Name="textTabletAreaWidth" TextChanged="TextChanged"/>
                       <Label HorizontalAlignment="Right">mm</Label>
                     </Grid>
                   </GroupBox>
@@ -315,7 +428,7 @@
                   <!-- Tablet Area Height -->
                   <GroupBox Header="Height" Height="50" Width="90" Margin="5,0,0,0">
                     <Grid>
-                      <TextBox Name="textTabletAreaHeight" TextChanged="TextChanged">45</TextBox>
+                      <TextBox Name="textTabletAreaHeight" TextChanged="TextChanged" />
                       <Label HorizontalAlignment="Right">mm</Label>
                     </Grid>
                   </GroupBox>
@@ -323,7 +436,7 @@
                   <!-- Tablet Area Left -->
                   <GroupBox Header="X" Height="50" Width="90" Margin="5,0,0,0">
                     <Grid>
-                      <TextBox Name="textTabletAreaX" TextChanged="TextChanged">0</TextBox>
+                      <TextBox Name="textTabletAreaX" TextChanged="TextChanged"/>
                       <Label HorizontalAlignment="Right">mm</Label>
                     </Grid>
                   </GroupBox>
@@ -331,21 +444,15 @@
                   <!-- Tablet Area Top -->
                   <GroupBox Header="Y" Height="50" Width="90" Margin="5,0,0,0">
                     <Grid>
-                      <TextBox Name="textTabletAreaY" TextChanged="TextChanged">0</TextBox>
+                      <TextBox Name="textTabletAreaY" TextChanged="TextChanged"/>
                       <Label HorizontalAlignment="Right">mm</Label>
                     </Grid>
                   </GroupBox>
 
-                  <!-- Talbet area checkboxes -->
-                  <StackPanel Orientation="Vertical" VerticalAlignment="Bottom">
+                  <!-- Tablet area checkboxes -->
+                  <StackPanel Orientation="Vertical" VerticalAlignment="Center">
 
                     <!-- Full area checkbox -->
-                    <CheckBox Name="checkBoxForceFullArea"
-                              Margin="3"
-                              Checked="CheckboxChanged"
-                              Unchecked="CheckboxChanged">
-                      Full area
-                    </CheckBox>
 
                     <!-- Force Aspect Ratio -->
                     <CheckBox Name="checkBoxForceAspect"
@@ -367,7 +474,7 @@
       </TabItem>
 
       <!-- Buttons tab -->
-      <TabItem Margin="10,0,-10,0" Padding="10,5">
+      <TabItem Name="tabButtons" Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#006699" FontWeight="Bold">
             <AccessText Text="_Buttons"/>
@@ -475,6 +582,10 @@
                       - Use negative number in sensitivity to invert the direction.
                       <LineBreak/>
                       - Acceleration 1.0 = No acceleration. Recommended range is from 1 to 5.
+                      <LineBreak/>
+                      - <TextBlock FontWeight="Bold">Stop cursor</TextBlock>: cursor will be stopped when scrolling.
+                      <LineBreak/>
+                      - <TextBlock FontWeight="Bold">Drag scroll</TextBlock>: scrolls only when the pen tip is pressed down.
                     </TextBlock>
                   </StackPanel>
                 </GroupBox.ToolTip>
@@ -504,6 +615,16 @@
                     <TextBlock>Stop cursor</TextBlock>
                   </CheckBox>
 
+                  <!-- Scroll drag -->
+                  <CheckBox Name="checkBoxScrollDrag"
+                          Margin="7,5,0,0"
+                          HorizontalAlignment="Left"
+                          Checked="CheckboxChanged"
+                          Unchecked="CheckboxChanged">
+                    <TextBlock>Drag scroll</TextBlock>
+                  </CheckBox>
+
+
                 </StackPanel>
               </GroupBox>
 
@@ -541,34 +662,78 @@
                     </Grid>
                   </GroupBox>
 
-                  <!-- Pressure Deadzone -->
-                  <GroupBox Header="Pressure Deadzone">
-                    <Grid>
-                      <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="auto"/>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="auto"/>
-                      </Grid.ColumnDefinitions>
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="*"/>
+                      <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <!-- Pressure Low Deadzone -->
+                    <GroupBox Header="Pressure Low Deadzone" Grid.Column="0">
+                      <Grid>
+                        <Grid.ColumnDefinitions>
+                          <ColumnDefinition Width="auto"/>
+                          <ColumnDefinition Width="*"/>
+                          <ColumnDefinition Width="auto"/>
+                        </Grid.ColumnDefinitions>
 
-                      <Label Grid.Column="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">0%</Label>
+                        <Label Grid.Column="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">0%</Label>
 
-                      <!-- Deadzone slider -->
-                      <Slider Grid.Column="1" Name="sliderPressureDeadzone"
+                        <!-- Deadzone slider -->
+                        <Slider Grid.Column="1" Name="sliderPressureDeadzoneLow"
                             IsSnapToTickEnabled="True"
-                            TickFrequency="0.01"
+                            TickFrequency="0.025"
                             TickPlacement="Both"
-                            SmallChange="0.01"
-                            LargeChange="0.01"
+                            SmallChange="0.025"
+                            LargeChange="0.025"
                             Value="0.0"
                             Minimum="0"
-                            Maximum="0.25"
+                            Maximum="0.5"
                             ToolTip="0%"
                             ValueChanged="SliderPressure_ValueChanged"
                             >
-                      </Slider>
-                      <Label Grid.Column="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">25%</Label>
-                    </Grid>
-                  </GroupBox>
+                        </Slider>
+                        <Label Grid.Column="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">
+                          50%
+                        </Label>
+                      </Grid>
+                    </GroupBox>
+
+
+                    <!-- Pressure High Deadzone -->
+                    <GroupBox Header="Pressure High Deadzone" Grid.Column="1">
+                      <Grid>
+                        <Grid.ColumnDefinitions>
+                          <ColumnDefinition Width="auto"/>
+                          <ColumnDefinition Width="*"/>
+                          <ColumnDefinition Width="auto"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Label Grid.Column="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">
+                          50%
+                        </Label>
+
+                        <!-- Deadzone slider -->
+                        <Slider Grid.Column="1" Name="sliderPressureDeadzoneHigh"
+                            IsSnapToTickEnabled="True"
+                            TickFrequency="0.025"
+                            TickPlacement="Both"
+                            SmallChange="0.025"
+                            LargeChange="0.025"
+                            Value="0.0"
+                            Minimum="0"
+                            Maximum="0.5"
+                            ToolTip="0%"
+                            IsDirectionReversed="True"
+                            ValueChanged="SliderPressure_ValueChanged"
+                            >
+                        </Slider>
+                        <Label Grid.Column="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">0%</Label>
+                      </Grid>
+                    </GroupBox>
+
+
+                  </Grid>
 
 
 
@@ -688,7 +853,7 @@
       </TabItem>
 
       <!-- Filters tab -->
-      <TabItem Margin="10,0,-10,0" Padding="10,5">
+      <TabItem Name="tabFilters" Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#003399" FontWeight="Bold">
             <AccessText Text="_Filters"/>
@@ -738,7 +903,9 @@
 
 
               <!-- Filter Latency -->
-              <GroupBox Header="Latency" Height="50" Width="80" Margin="0,0,0,0">
+              <GroupBox Header="Latency"
+                        IsEnabled="{Binding ElementName=checkBoxSmoothing, Path=IsChecked}"
+                        Height="50" Width="80" Margin="0,0,0,0">
                 <Grid>
                   <TextBox Name="textSmoothingLatency" TextChanged="TextChanged">0</TextBox>
                   <Label HorizontalAlignment="Right">ms</Label>
@@ -746,7 +913,9 @@
               </GroupBox>
 
               <!-- Filter Rate -->
-              <GroupBox Header="Rate" VerticalAlignment="Top" HorizontalAlignment="Left" Width="90" Height="50">
+              <GroupBox Header="Rate"
+                        IsEnabled="{Binding ElementName=checkBoxSmoothing, Path=IsChecked}"
+                        VerticalAlignment="Top" HorizontalAlignment="Left" Width="90" Height="50">
                 <ComboBox Name="comboBoxSmoothingRate" SelectionChanged="ItemSelectionChanged" VerticalContentAlignment="Center">
                   <ComboBoxItem>1000 Hz</ComboBoxItem>
                   <ComboBoxItem>500 Hz</ComboBoxItem>
@@ -759,10 +928,11 @@
 
               <!-- Only when buttons are down -->
               <CheckBox Name="checkBoxSmoothingOnlyWhenButtons"
-                            VerticalAlignment="Center"
-                          VerticalContentAlignment="Center"
-                            Margin="5,10,5,0"
-                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">
+                        IsEnabled="{Binding ElementName=checkBoxSmoothing, Path=IsChecked}"
+                        VerticalAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        Margin="5,10,5,0"
+                        Checked="CheckboxChanged" Unchecked="CheckboxChanged">
                 <TextBlock>
                     Only when buttons down
                 </TextBlock>
@@ -826,9 +996,9 @@
               </StackPanel>
             </GroupBox.ToolTip>
 
-
             <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
 
+
               <!-- Noise filter enabled -->
               <CheckBox Name="checkBoxNoiseFilter"
                             VerticalAlignment="Center"
@@ -836,22 +1006,33 @@
                             Checked="CheckboxChanged" Unchecked="CheckboxChanged">
               </CheckBox>
 
+
               <!-- Noise filter buffer size -->
-              <GroupBox Header="Buffer" Height="50" Margin="0,0,0,0">
+              <GroupBox Header="Buffer"
+                        IsEnabled="{Binding ElementName=checkBoxNoiseFilter, Path=IsChecked}"
+                        Height="50" Margin="0,0,0,0">
                 <TextBox Name="textNoiseBuffer" TextChanged="TextChanged">10</TextBox>
               </GroupBox>
 
               <!-- Noise filter threshold -->
-              <GroupBox Header="Threshold" Height="50" Width="80" Margin="0,0,0,0">
+              <GroupBox Header="Threshold"
+                        IsEnabled="{Binding ElementName=checkBoxNoiseFilter, Path=IsChecked}"
+                        Height="50" Width="80" Margin="0,0,0,0">
                 <Grid>
                   <TextBox Name="textNoiseThreshold" TextChanged="TextChanged">1.0</TextBox>
                   <Label HorizontalAlignment="Right">mm</Label>
                 </Grid>
               </GroupBox>
 
-            </StackPanel>
 
+              <GroupBox Header="Preset" IsEnabled="{Binding ElementName=checkBoxNoiseFilter, Path=IsChecked}">
+                <ComboBox Name="comboBoxNoiseReductionPresets"
+                            Width="150" 
+                            VerticalContentAlignment="Center">
+                </ComboBox>
+              </GroupBox>
 
+            </StackPanel>
           </GroupBox>
 
           <!-- Anti-smoothing filter -->
@@ -877,18 +1058,14 @@
                   Check the checkbox to enable the filter.
                   <LineBreak/>
                   <LineBreak/>
-                  <TextBlock FontWeight="Bold">
-                  Shape
-                  </TextBlock>
+                  <TextBlock FontWeight="Bold">Shape</TextBlock>
                   <LineBreak/>
                   Shape value is the how the filter handles pen acceleration. Start with a neutral 0.5 shape value and try to keep it around that.
                   <LineBreak/>
                   Use a lower value when there are are too much artifacts in sharp corners and increase the value if corners are too smooth.
                   <LineBreak/>
                   <LineBreak/>
-                  <TextBlock FontWeight="Bold">
-                  Compensation
-                  </TextBlock>
+                  <TextBlock FontWeight="Bold">Compensation</TextBlock>
                   <LineBreak/>                    
                   Compensation value is the amount of latency compensation.
                   <LineBreak/>
@@ -901,90 +1078,114 @@
                   Try to find a balance between response time and artifacting.
                   <LineBreak/>
                   <LineBreak/>
-                  <TextBlock FontWeight="Bold">
-                    Only when hovering
-                  </TextBlock>
+                  <TextBlock FontWeight="Bold">Only when hovering</TextBlock>
                   <LineBreak/>
                   This feature is mainly meant for Wacom CTL-490, but might be useful with other tablets too.
                   <LineBreak/>
                   <LineBreak/>
-                  <TextBlock FontWeight="Bold">
-                    Recommended value ranges
-                  </TextBlock>
+                  <TextBlock FontWeight="Bold">Recommended value ranges</TextBlock>
                   <LineBreak/>
-                  Shape: 0.1 - 0.9
+                  Shape: 0.1 - 2.0
                   <LineBreak/>
                   Compensation: 10 - 30 ms
                   <LineBreak/>
-                  <LineBreak/>                    
-                  <TextBlock FontWeight="Bold">
-                  Example values:
-                  </TextBlock>
-                  <LineBreak/>
-                  <TextBlock Margin="5,0,0,0">
-                    <TextBlock FontWeight="Bold">Gaomon S56K:</TextBlock>
-                    Shape 0.7, Compensation = 15 - 20 ms
-                    <LineBreak/>                     
-                    <TextBlock FontWeight="Bold">Huion 420 &amp; H420:</TextBlock>
-                    Shape = 0.5, Compensation = 15 - 20 ms
-                    <LineBreak/>
-                    <TextBlock FontWeight="Bold">Huion H430P &amp; H640P:</TextBlock>
-                    Shape = 0.7, Compensation = 20 - 30 ms
-                    <LineBreak/>
-                    <TextBlock FontWeight="Bold">XP-PEN G430 &amp; G640:</TextBlock>
-                    Shape = 0.5, Compensation = 10 - 20 ms, Invalid low speed data, use noise reduction 10/0.5 mm
-                    <LineBreak/>                   
-                    <TextBlock FontWeight="Bold">Wacom CTL-490 Hover:</TextBlock>
-                    Shape = 0.5, Compensation = 10 - 20 ms, Enable "Only when hovering"
-                    <LineBreak/>
-                    <TextBlock FontWeight="Bold">VEIKK S640:</TextBlock>
-                    <LineBreak/>
-                    <TextBlock Margin="10,0,0,0">
-                      Shape = 0.5, Compensation = 10 - 20 ms, Filter will automatically adjust the compensation level.
-                      <LineBreak/>
-                      The tablet does have a 166 RPS mode with higher smoothing latency.
-                    </TextBlock>
-                  </TextBlock>
                 </TextBlock>
               </StackPanel>
             </GroupBox.ToolTip>
 
-            <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+            <StackPanel Orientation="Vertical">
 
-              <!-- Anti-smoothing filter enabled -->
-              <CheckBox Name="checkBoxAntiSmoothing"
-                            VerticalAlignment="Center"
-                            Margin="5,10,5,0"
-                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">
-              </CheckBox>
+              <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
 
-              <!-- Anti-smoothing power -->
-              <GroupBox Header="Shape" Height="50" Margin="0,0,0,0" Width="60">
-                <TextBox Name="textAntiSmoothingShape" TextChanged="TextChanged">0.3</TextBox>
-              </GroupBox>
+                <!-- Anti-smoothing filter enabled -->
+                <CheckBox Name="checkBoxAntiSmoothing"
+                          VerticalAlignment="Center"
+                          Margin="5,5"
+                          Checked="CheckboxChanged" Unchecked="CheckboxChanged">
+                  Enabled
+                </CheckBox>
 
-              <!-- Anti-smoothing compensation -->
-              <GroupBox Header="Compensation" Height="50" Margin="0,0,0,0">
-                <Grid>
-                  <TextBox Name="textAntiSmoothingCompensation" TextChanged="TextChanged">20</TextBox>
-                  <Label HorizontalAlignment="Right">ms</Label>
-                </Grid>
-              </GroupBox>
 
-              <!-- Anti-smoothing only when hovering -->
-              <CheckBox Name="checkBoxAntiSmoothingOnlyWhenHover"
+                <!-- Anti-smoothing only when hovering -->
+                <CheckBox Name="checkBoxAntiSmoothingOnlyWhenHover"
+                          IsEnabled="{Binding ElementName=checkBoxAntiSmoothing, Path=IsChecked}"
                           VerticalAlignment="Center"
                           VerticalContentAlignment="Center"
-                          Margin="5,10,5,0"
+                          Margin="5,0"
                           Checked="CheckboxChanged" Unchecked="CheckboxChanged">
-                <TextBlock>
+                  <TextBlock>
                     Only when hovering
-                </TextBlock>
-              </CheckBox>
+                  </TextBlock>
+                </CheckBox>
 
-            </StackPanel>
+              </StackPanel>
+
+              <StackPanel Orientation="Horizontal">
+
+                <!-- Anti-smoothing drag multiplier -->
+                <GroupBox Header="Drag Multiplier"
+                        IsEnabled="{Binding ElementName=checkBoxAntiSmoothing, Path=IsChecked}"
+                        Height="50" Margin="0,0,0,0">
+                  <TextBox Name="textAntiSmoothingDragMultiplier" TextChanged="TextChanged">1.0</TextBox>
+                </GroupBox>
+
+                <!-- Anti-smoothing presets -->
+                <GroupBox Header="Preset" IsEnabled="{Binding ElementName=checkBoxAntiSmoothing, Path=IsChecked}">
+                  <ComboBox Name="comboBoxAntiSmoothingPresets"
+                            Width="150"
+                            VerticalContentAlignment="Center">
+                  </ComboBox>
+                </GroupBox>
 
 
+              </StackPanel>
+
+              <StackPanel Orientation="Horizontal" Name="stackPanelAntiSmoothingSettings"
+                          IsEnabled="{Binding ElementName=checkBoxAntiSmoothing, Path=IsChecked}">
+
+                <GroupBox Header="Enabled" Name="groupBoxAntiSmoothingEnabled">
+                  <StackPanel Orientation="Vertical" Name="stackPanelAntiSmoothingEnabled"  Margin="0,0,0,0"/>
+                </GroupBox>
+
+                <GroupBox Header="Velocity" Name="groupBoxAntiSmoothingVelocity">
+                  <StackPanel Orientation="Vertical" Name="stackPanelAntiSmoothingVelocity"/>
+                </GroupBox>
+                <GroupBox Header="Shape" Name="groupBoxAntiSmoothingShape">
+                  <StackPanel Orientation="Vertical" Name="stackPanelAntiSmoothingShape"/>
+                </GroupBox>
+                <GroupBox Header="Compensation" Name="groupBoxAntiSmoothingCompensation">
+                  <StackPanel Orientation="Vertical" Name="stackPanelAntiSmoothingCompensation"/>
+                </GroupBox>
+
+                <!-- Anti-smoothing velocity -->
+                <!--
+                <GroupBox Header="Speed" Height="50" Margin="0,0,0,0" Width="90">
+                  <Grid>
+                    <TextBox Name="textAntiSmoothingVelocity" TextChanged="TextChanged">999</TextBox>
+                    <Label HorizontalAlignment="Right">mm/s</Label>
+                  </Grid>
+                </GroupBox>
+                -->
+
+                <!-- Anti-smoothing power -->
+                <!--
+                <GroupBox Header="Shape" Height="50" Margin="0,0,0,0" Width="60">
+                  <TextBox Name="textAntiSmoothingShape" TextChanged="TextChanged">0.3</TextBox>
+                </GroupBox>
+                -->
+
+                <!-- Anti-smoothing compensation -->
+                <!--
+                <GroupBox Header="Compensation" Height="50" Margin="0,0,0,0">
+                  <Grid>
+                    <TextBox Name="textAntiSmoothingCompensation" TextChanged="TextChanged">20</TextBox>
+                    <Label HorizontalAlignment="Right">ms</Label>
+                  </Grid>
+                </GroupBox>
+                -->
+              </StackPanel>
+
+            </StackPanel>
           </GroupBox>
 
 
@@ -992,7 +1193,7 @@
       </TabItem>
 
       <!-- Misc tab -->
-      <TabItem Margin="10,0,-10,0" Padding="10,5">
+      <TabItem Name="tabMisc" Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#000066" FontWeight="Bold">
             <AccessText Text="_Misc"/>
@@ -1046,7 +1247,7 @@
       </TabItem>
 
       <!-- Commands tab -->
-      <TabItem Margin="10,0,-10,0" Padding="10,5">
+      <TabItem Name="tabCommands" Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#000" FontWeight="Bold">
             <AccessText Text="C_ommands"/>
@@ -1092,7 +1293,7 @@
       </TabItem>
 
       <!-- Console tab -->
-      <TabItem Margin="10,0,-10,0" Padding="10,5">
+      <TabItem Name="tabConsole" Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#000" FontWeight="Bold">
             <AccessText Text="_Console"/>
@@ -1117,25 +1318,24 @@
               <!-- Console Context Menu -->
               <TextBlock.ContextMenu>
                 <ContextMenu>
-                  <MenuItem Name="menuCopyAll" Header="Copy all" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuCopyDebug" Header="Copy [DEBUG] messages" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuCopyErrors" Header="Copy [ERROR] messages" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuCopyAll" Header="Copy all" Click="ConsoleMenuClick" />
+                  <MenuItem Name="menuCopyDebug" Header="Copy [DEBUG] messages" Click="ConsoleMenuClick" />
+                  <MenuItem Name="menuCopyErrors" Header="Copy [ERROR] messages" Click="ConsoleMenuClick" />
                   <Separator/>
-                  <MenuItem Name="menuStartDebug" Header="Start debugging" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuStopDebug" Header="Stop debugging" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuFindLatestDebugLog" Header="Find latest debug log" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuFindStartupLog" Header="Find startuplog.txt" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuSettingsToUserConfig" Header="Write settings to user.cfg" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuStartDebug" Header="Start debugging" Click="ConsoleMenuClick" />
+                  <MenuItem Name="menuStopDebug" Header="Stop debugging" Click="ConsoleMenuClick" />
+                  <MenuItem Name="menuFindLatestDebugLog" Header="Find latest debug log" Click="ConsoleMenuClick" />
+                  <MenuItem Name="menuFindStartupLog" Header="Find startuplog.txt" Click="ConsoleMenuClick" />
                   <Separator/>
-                  <MenuItem Name="menuRunBenchmark" Header="Run benchmark" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuCopyBenchmark" Header="Copy benchmark result" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuMeasure2" Header="Measure 2 points" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuRunBenchmark" Header="Run benchmark" Click="ConsoleMenuClick" />
+                  <MenuItem Name="menuCopyBenchmark" Header="Copy benchmark result" Click="ConsoleMenuClick" />
+                  <MenuItem Name="menuMeasure2" Header="Measure 2 points" Click="ConsoleMenuClick" />
                   <Separator/>
-                  <MenuItem Name="menuOpenGithub" Header="Open GitHub page" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuOpenLatestURL" Header="Open latest URL" Click="ConsoleMenuClick"></MenuItem>
-                  <MenuItem Name="menuReportProblem" Header="Report a problem" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuOpenGithub" Header="Open GitHub page" Click="ConsoleMenuClick" />
+                  <MenuItem Name="menuOpenLatestURL" Header="Open latest URL" Click="ConsoleMenuClick" />
+                  <MenuItem Name="menuReportProblem" Header="Report a problem" Click="ConsoleMenuClick" />
                   <Separator/>
-                  <MenuItem Name="menuOpenFolder" Header="Open TabletDriver folder" Click="ConsoleMenuClick"></MenuItem>
+                  <MenuItem Name="menuOpenFolder" Header="Open TabletDriver folder" Click="ConsoleMenuClick" />
                 </ContextMenu>
               </TextBlock.ContextMenu>
             </TextBlock>
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 4dcc0b8..81d9f51 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -1,11 +1,8 @@
-using Microsoft.Win32;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
@@ -13,7 +10,7 @@
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media;
-using System.Windows.Shapes;
+using System.Windows.Media.Animation;
 using System.Windows.Threading;
 
 namespace TabletDriverGUI
@@ -25,7 +22,7 @@ public partial class MainWindow : Window
     {
 
         // Version
-        public string Version = "0.2.3";
+        public string Version = "0.2.4";
 
         // Console stuff
         private List<string> commandHistory;
@@ -46,6 +43,7 @@ public partial class MainWindow : Window
         private DispatcherTimer timerStatusbar;
         private DispatcherTimer timerRestart;
         private DispatcherTimer timerConsoleUpdate;
+        private DispatcherTimer timerUpdatePenPositions;
 
         // Config
         private Configuration config;
@@ -53,46 +51,9 @@ public partial class MainWindow : Window
         private bool isFirstStart = false;
         private bool isLoadingSettings;
 
-        // Screen map canvas elements
-        private Rectangle[] rectangleMonitors;
-        private Rectangle rectangleDesktop;
-        private Rectangle rectangleScreenMap;
-        private TextBlock textScreenAspectRatio;
-
-        // Tablet area canvas elements
-        private Polygon polygonTabletFullArea;
-        private Polygon polygonTabletArea;
-        private Polygon polygonTabletAreaArrow;
-        private TextBlock textTabletAspectRatio;
-
-        // Mouse drag
-        private class MouseDrag
-        {
-            public bool IsMouseDown;
-            public object Source;
-            public Point OriginMouse;
-            public Point OriginDraggable;
-            public MouseDrag()
-            {
-                IsMouseDown = false;
-                Source = null;
-                OriginMouse = new Point(0, 0);
-                OriginDraggable = new Point(0, 0);
-            }
-        }
-        MouseDrag mouseDrag;
-
         // Measurement to area
         private bool isEnabledMeasurementToArea = false;
 
-        // Ink canvas undo history
-        StrokeCollection inkCanvasUndoHistory;
-
-        // Ink canvas DrawingAttributes
-        DrawingAttributes inkCanvasDrawingAttributes;
-
-
-
         //
         // Constructor
         //
@@ -187,51 +148,6 @@ public MainWindow()
             //
             groupBoxTabletButtons.Visibility = Visibility.Collapsed;
 
-            //
-            // Create tablet button map WrapPanel items
-            //
-            for (int i = 0; i < 16; i++)
-            {
-                GroupBox groupBox = new GroupBox
-                {
-                    Width = 90,
-                    Header = "Button " + (i + 1).ToString()
-                };
-                Button button = new Button
-                {
-                    Height = 22,
-                    Content = "",
-                    Padding = new Thickness(2, 0, 2, 0),
-                    ToolTip = "Empty",
-                    Background = Brushes.White
-                };
-                button.Click += ButtonMap_Click;
-                button.ToolTipOpening += ButtonMap_ToolTipOpening;
-
-                groupBox.Content = button;
-                wrapPanelTabletButtons.Children.Add(groupBox);
-            }
-            CheckBox checkBox = new CheckBox
-            {
-                Content = "Disable buttons"
-            };
-            checkBox.Checked += CheckboxChanged;
-            checkBox.Unchecked += CheckboxChanged;
-            checkBox.VerticalAlignment = VerticalAlignment.Bottom;
-            checkBox.Margin = new Thickness(5, 5, 5, 10);
-            wrapPanelTabletButtons.Children.Add(checkBox);
-
-
-            //
-            // Smoothing rate ComboBox
-            //
-            comboBoxSmoothingRate.Items.Clear();
-            for (int i = 1; i <= 8; i++)
-            {
-                comboBoxSmoothingRate.Items.Add((1000.0 / i).ToString("0") + " Hz");
-            }
-            comboBoxSmoothingRate.SelectedIndex = 3;
-
 
             // Ink canvas undo history
             inkCanvasUndoHistory = new StrokeCollection();
@@ -242,7 +158,8 @@ public MainWindow()
                 Width = 10,
                 Height = 10,
                 Color = Color.FromRgb(0x55, 0x55, 0x55),
-                StylusTip = StylusTip.Ellipse
+                StylusTip = StylusTip.Ellipse,
+                FitToCurve = false
             };
             inkCanvas.DefaultDrawingAttributes = inkCanvasDrawingAttributes;
 
@@ -254,10 +171,6 @@ public MainWindow()
             Loaded += MainWindow_Loaded;
             SizeChanged += MainWindow_SizeChanged;
 
-            //
-            // Allow input field events
-            //
-            isLoadingSettings = false;
         }
 
 
@@ -266,14 +179,18 @@ public MainWindow()
         // Window is closing -> Stop driver
         private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
+            // Close tablet view
+            if (tabletView != null)
+                tabletView.Close();
+
+            // Hide notify icon
             notifyIcon.Visible = false;
-            try
-            {
-                config.Write(configFilename);
-            }
-            catch (Exception)
-            {
-            }
+
+            // Write configuration to XML file
+            try { config.Write(configFilename); }
+            catch (Exception) { }
+
+            // Stop driver
             StopDriver();
         }
 
@@ -291,11 +208,17 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
             }
             catch (Exception)
             {
-                driver.ConsoleAddText("New config created!");
+                driver.ConsoleAddLine("New config created!");
                 isFirstStart = true;
                 config = new Configuration();
             }
 
+            // Create setting elements
+            CreateSettingElements();
+
+            // Create canvas elements
+            CreateCanvasElements();
+
             // Initialize configuration
             InitializeConfiguration();
 
@@ -306,8 +229,14 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
                 Hide();
             }
 
+            //
+            // Allow input field events
+            //
+            isLoadingSettings = false;
+
             // Start the driver
             StartDriver();
+
         }
 
 
@@ -318,12 +247,26 @@ private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
         {
 
             // Control + S -> Save settings
-            if (e.Key == Key.S && e.KeyboardDevice.Modifiers == ModifierKeys.Control)
+            if (e.KeyboardDevice.Modifiers == ModifierKeys.Control && e.Key == Key.S)
             {
                 SaveSettings(sender, null);
                 e.Handled = true;
             }
 
+            // Control + I -> Import settings
+            if (e.KeyboardDevice.Modifiers == ModifierKeys.Control && e.Key == Key.I)
+            {
+                MainMenuClick(mainMenuImport, null);
+                e.Handled = true;
+            }
+
+            // Control + E -> Export settings
+            if (e.KeyboardDevice.Modifiers == ModifierKeys.Control && e.Key == Key.E)
+            {
+                MainMenuClick(mainMenuExport, null);
+                e.Handled = true;
+            }
+
         }
 
 
@@ -479,70 +422,6 @@ private void TimerStatusbar_Tick(object sender, EventArgs e)
 
 
 
-        #region Wacom / Draw area
-
-        //
-        // Wacom Area
-        //
-        private void ButtonWacomArea_Click(object sender, RoutedEventArgs e)
-        {
-            WacomArea wacom = new WacomArea();
-            wacom.textWacomLeft.Text = Utils.GetNumberString((config.TabletArea.X - config.TabletArea.Width / 2) * 100.0, "0");
-            wacom.textWacomRight.Text = Utils.GetNumberString((config.TabletArea.X + config.TabletArea.Width / 2) * 100.0, "0");
-
-            wacom.textWacomTop.Text = Utils.GetNumberString((config.TabletArea.Y - config.TabletArea.Height / 2) * 100.0, "0");
-            wacom.textWacomBottom.Text = Utils.GetNumberString((config.TabletArea.Y + config.TabletArea.Height / 2) * 100.0, "0");
-
-            wacom.ShowDialog();
-
-            // Set button clicked
-            if (wacom.DialogResult == true)
-            {
-                if (
-                    Utils.ParseNumber(wacom.textWacomLeft.Text, out double left) &&
-                    Utils.ParseNumber(wacom.textWacomRight.Text, out double right) &&
-                    Utils.ParseNumber(wacom.textWacomTop.Text, out double top) &&
-                    Utils.ParseNumber(wacom.textWacomBottom.Text, out double bottom)
-                )
-                {
-                    double width, height;
-                    width = right - left;
-                    height = bottom - top;
-                    config.ForceAspectRatio = false;
-                    config.ForceFullArea = false;
-                    config.TabletArea.X = (left + width / 2.0) / 100.0;
-                    config.TabletArea.Y = (top + height / 2.0) / 100.0;
-                    config.TabletArea.Width = width / 100.0;
-                    config.TabletArea.Height = height / 100.0;
-                    LoadSettingsFromConfiguration();
-                }
-                else
-                {
-                    MessageBox.Show("Invalid values!", "Wacom area error!", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            }
-
-            wacom.Close();
-        }
-
-
-        //
-        // Draw area
-        //
-        private void ButtonDrawArea_Click(object sender, RoutedEventArgs e)
-        {
-            if (!isEnabledMeasurementToArea)
-            {
-                isEnabledMeasurementToArea = true;
-                driver.SendCommand("Measure 2");
-                SetStatus("Click the top left and the bottom right corners of the area with your tablet pen!");
-                buttonDrawArea.IsEnabled = false;
-            }
-        }
-
-        #endregion
-
-
 
         #region WndProc
 
@@ -579,12 +458,17 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
         }
 
 
+        #endregion
 
 
+        private void MouseTest(object sender, MouseButtonEventArgs e)
+        {
+            SetStatus("Event: " + e.RoutedEvent.ToString() + ", Mouse at " + ((UIElement)sender).ToString() + "! " + e.ChangedButton.ToString() + " " + e.ButtonState.ToString());
+        }
 
-
-
-        #endregion
-
+        private void CommandBinding_Executed(object sender, ExecutedRoutedEventArgs e)
+        {
+            MessageBox.Show(e.Command.ToString());
+        }
     }
 }
\ No newline at end of file
diff --git a/TabletDriverGUI/MultimediaTimer.cs b/TabletDriverGUI/MultimediaTimer.cs
new file mode 100644
index 0000000..a1af83b
--- /dev/null
+++ b/TabletDriverGUI/MultimediaTimer.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TabletDriverGUI
+{
+
+    public class MultimediaTimer : IDisposable
+    {
+        private bool disposed = false;
+        private int interval, resolution;
+        private UInt32 timerId;
+
+        // Hold the timer callback to prevent garbage collection.
+        private readonly NativeMethods.MultimediaTimerCallback Callback;
+
+        public MultimediaTimer()
+        {
+            Callback = new NativeMethods.MultimediaTimerCallback(TimerCallbackMethod);
+            Resolution = 5;
+            Interval = 10;
+        }
+
+        ~MultimediaTimer()
+        {
+            Dispose(false);
+        }
+
+        public int Interval
+        {
+            get
+            {
+                return interval;
+            }
+            set
+            {
+                CheckDisposed();
+
+                if (value < 0)
+                    throw new ArgumentOutOfRangeException("value");
+
+                interval = value;
+                if (Resolution > Interval)
+                    Resolution = value;
+            }
+        }
+
+        // Note minimum resolution is 0, meaning highest possible resolution.
+        public int Resolution
+        {
+            get
+            {
+                return resolution;
+            }
+            set
+            {
+                CheckDisposed();
+
+                if (value < 0)
+                    throw new ArgumentOutOfRangeException("value");
+
+                resolution = value;
+            }
+        }
+
+        public bool IsRunning
+        {
+            get { return timerId != 0; }
+        }
+
+        public void Start()
+        {
+            CheckDisposed();
+
+            if (IsRunning)
+                throw new InvalidOperationException("Timer is already running");
+
+            // Event type = 0, one off event
+            // Event type = 1, periodic event
+            UInt32 userCtx = 0;
+            timerId = NativeMethods.TimeSetEvent((uint)Interval, (uint)Resolution, Callback, ref userCtx, 1);
+            if (timerId == 0)
+            {
+                int error = Marshal.GetLastWin32Error();
+                throw new Win32Exception(error);
+            }
+        }
+
+        public void Stop()
+        {
+            CheckDisposed();
+
+            if (!IsRunning)
+                throw new InvalidOperationException("Timer has not been started");
+
+            StopInternal();
+        }
+
+        private void StopInternal()
+        {
+            NativeMethods.TimeKillEvent(timerId);
+            timerId = 0;
+        }
+
+        public event EventHandler Tick;
+
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+
+        private void TimerCallbackMethod(uint id, uint msg, ref uint userCtx, uint rsv1, uint rsv2)
+        {
+            Tick?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void CheckDisposed()
+        {
+            if (disposed)
+                throw new ObjectDisposedException("MultimediaTimer");
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (disposed)
+                return;
+
+            disposed = true;
+            if (IsRunning)
+            {
+                StopInternal();
+            }
+
+            if (disposing)
+            {
+                Tick = null;
+                GC.SuppressFinalize(this);
+            }
+        }
+    }
+}
diff --git a/TabletDriverGUI/NativeMethods.cs b/TabletDriverGUI/NativeMethods.cs
index 0223194..5a0ce3b 100644
--- a/TabletDriverGUI/NativeMethods.cs
+++ b/TabletDriverGUI/NativeMethods.cs
@@ -56,5 +56,22 @@ public int Width
         [DllImport("user32.dll", SetLastError = true)]
         public static extern bool GetWindowRect(IntPtr hwnd, out RECT lpRect);
 
+
+        //
+        // Multimedia timer
+        //
+        internal delegate void MultimediaTimerCallback(UInt32 id, UInt32 msg, ref UInt32 userCtx, UInt32 rsv1, UInt32 rsv2);
+
+        [DllImport("winmm.dll", SetLastError = true, EntryPoint = "timeSetEvent")]
+        internal static extern UInt32 TimeSetEvent(UInt32 msDelay, UInt32 msResolution, MultimediaTimerCallback callback, ref UInt32 userCtx, UInt32 eventType);
+
+        [DllImport("winmm.dll", SetLastError = true, EntryPoint = "timeKillEvent")]
+        internal static extern void TimeKillEvent(UInt32 uTimerId);
+
+        //
+        // GDI
+        //
+        [DllImport("gdi32.dll")]
+        public static extern bool DeleteObject(IntPtr hObject);
     }
 }
diff --git a/TabletDriverGUI/TabletDriver.cs b/TabletDriverGUI/TabletDriver.cs
index 2d90888..1eb55ff 100644
--- a/TabletDriverGUI/TabletDriver.cs
+++ b/TabletDriverGUI/TabletDriver.cs
@@ -4,6 +4,10 @@
 using System.Diagnostics;
 using System.IO;
 using System.Timers;
+using System.IO.Pipes;
+using System.Windows;
+using System.Text;
+using System.Runtime.InteropServices;
 
 namespace TabletDriverGUI
 {
@@ -41,8 +45,40 @@ public DriverEventArgs(DriverEventType type, string message, string parameters)
         public bool HasConsoleUpdated;
         private readonly int ConsoleMaxLines;
         private System.Threading.Mutex mutexConsoleUpdate;
-        private Dictionary<String, String> commands;
-        public Dictionary<String, String> Commands { get { return commands; } }
+        private Dictionary<string, string> commands;
+        public Dictionary<string, string> Commands { get { return commands; } }
+
+        // Pipe
+        System.Threading.Thread pipeInputThread = null;
+        System.Threading.Thread pipeStateThread = null;
+
+        NamedPipeClientStream pipeStreamInput;
+        NamedPipeClientStream pipeStreamOutput;
+        NamedPipeClientStream pipeStreamState;
+
+        StreamReader pipeInputReader = null;
+        StreamWriter pipeOutputWriter = null;
+        BinaryReader pipeStateReader = null;
+
+        [StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Unicode)]
+        [Serializable]
+        public struct TabletState
+        {
+            public int index;
+
+            public int inputButtons;
+            public double inputX;
+            public double inputY;
+            public double inputPressure;
+            public double inputVelocity;
+
+            public int outputButtons;
+            public double outputX;
+            public double outputY;
+            public double outputPressure;
+        }
+        public TabletState tabletState;
+
 
         // Other variables
         private readonly string servicePath;
@@ -67,7 +103,7 @@ public TabletDriver(string servicePath)
 
             commands = new Dictionary<string, string>();
 
-         
+
         }
 
         //
@@ -85,14 +121,17 @@ private void TimerWatchdog_Elapsed(object sender, ElapsedEventArgs e)
                 }
 
                 processService.Refresh();
-                switch(processService.PriorityClass)
+                if (processService != null && !processService.HasExited)
                 {
-                    case ProcessPriorityClass.High:
-                    case ProcessPriorityClass.RealTime:
-                        break;
-                    default:
-                        RaiseError("TabletDriverService priority too low! Run the GUI as an administrator or change the priority to high!");
-                        break;
+                    switch (processService.PriorityClass)
+                    {
+                        case ProcessPriorityClass.High:
+                        case ProcessPriorityClass.RealTime:
+                            break;
+                        default:
+                            RaiseError("TabletDriverService priority too low! Run the GUI as an administrator or change the priority to high!");
+                            break;
+                    }
                 }
             }
         }
@@ -103,13 +142,30 @@ private void TimerWatchdog_Elapsed(object sender, ElapsedEventArgs e)
         public void SendCommand(string line)
         {
             if (running)
+            {
                 processService.StandardInput.WriteLine(line);
+            }
+        }
+
+        //
+        // Send command to the driver service through a named pipe
+        //
+        public void SendPipeCommand(string line)
+        {
+            if (running)
+            {
+                if (pipeOutputWriter != null)
+                {
+                    pipeOutputWriter.WriteLine(line);
+                    pipeOutputWriter.Flush();
+                }
+            }
         }
 
         //
         // Add text to console
         //
-        public void ConsoleAddText(string line)
+        public void ConsoleAddLine(string line)
         {
             mutexConsoleUpdate.WaitOne();
             ConsoleBuffer.Add(line);
@@ -152,7 +208,7 @@ public string CompleteCommandName(string inputText, bool showCommands)
                     commandsFound.Add(item.Value);
                 }
             }
-           
+
 
             // Only one command found
             if (commandsFound.Count == 1)
@@ -180,7 +236,7 @@ public string CompleteCommandName(string inputText, bool showCommands)
                 int columns = (int)Math.Ceiling(100.0 / maxWidth);
                 int rows = (int)Math.Ceiling((double)commandsFound.Count / columns);
 
-                string[,] commandMatrix = new string[rows,columns];
+                string[,] commandMatrix = new string[rows, columns];
                 int row = 0;
                 int column = 0;
 
@@ -203,9 +259,10 @@ public string CompleteCommandName(string inputText, bool showCommands)
                     }
                 }
 
-                for(row = 0; row < rows; row++) {
-                    if(row != 0)
-                    commandsString += "\r\n  | ";
+                for (row = 0; row < rows; row++)
+                {
+                    if (row != 0)
+                        commandsString += "\r\n  | ";
                     for (column = 0; column < columns; column++)
                     {
                         string commandString = commandMatrix[row, column];
@@ -219,9 +276,9 @@ public string CompleteCommandName(string inputText, bool showCommands)
                 // Add commands to console output
                 if (showCommands)
                 {
-                    ConsoleAddText("");
-                    ConsoleAddText("Commands: ");
-                    ConsoleAddText(commandsString);
+                    ConsoleAddLine("");
+                    ConsoleAddLine("Commands: ");
+                    ConsoleAddLine(commandsString);
                 }
 
                 // Fill input text
@@ -288,7 +345,7 @@ private void ProcessService_Exited(object sender, EventArgs e)
         //
         private void ProcessService_ErrorDataReceived(object sender, DataReceivedEventArgs e)
         {
-            ConsoleAddText("ERROR! " + e.Data);
+            ConsoleAddLine("ERROR! " + e.Data);
             ErrorReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Error, e.Data, ""));
         }
 
@@ -307,7 +364,8 @@ private void ProcessService_OutputDataReceived(object sender, DataReceivedEventA
                 string line = e.Data;
 
                 // Status line?
-                if (line.Contains("[STATUS]")) {
+                if (line.Contains("[STATUS]"))
+                {
 
                     // Parse status variable and value
                     Match match = Regex.Match(line, "^.+\\[STATUS\\] ([^ ]+) (.*?)$");
@@ -341,11 +399,201 @@ private void ProcessService_OutputDataReceived(object sender, DataReceivedEventA
                 }
 
 
-                ConsoleAddText(e.Data);
+                //ConsoleAddLine(e.Data);
                 MessageReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Message, e.Data, ""));
             }
         }
 
+
+        //
+        // Pipe input thread
+        //
+        private void RunPipeInputThread()
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+            char[] buffer = new char[1024];
+
+
+            while (running)
+            {
+                pipeStreamInput = new NamedPipeClientStream(".", "TabletDriverOutput", PipeDirection.InOut);
+                pipeStreamOutput = new NamedPipeClientStream(".", "TabletDriverInput", PipeDirection.InOut);
+
+                //ConsoleAddLine("Connecting...");
+                try
+                {
+                    pipeStreamInput.Connect();
+                    pipeStreamOutput.Connect();
+                }
+                catch (Exception)
+                {
+                    // ConsoleAddLine("Input pipe connect error! " + ex.Message);
+                    break;
+                }
+                //ConsoleAddLine("Connected!");
+
+                pipeInputReader = new StreamReader(pipeStreamInput);
+                pipeOutputWriter = new StreamWriter(pipeStreamOutput);
+
+
+                while (running && pipeStreamInput.IsConnected)
+                {
+                    //ConsoleAddLine("Read!");
+                    int bytesRead = 0;
+                    try
+                    {
+                        bytesRead = pipeInputReader.Read(buffer, 0, buffer.Length);
+                    }
+                    catch (Exception)
+                    {
+                        // ConsoleAddLine("Can't read input pipe!");
+                        break;
+                    }
+                    if (bytesRead == 0) continue;
+                    //ConsoleAddLine("Read: " + bytesRead);
+
+                    for (int i = 0; i < bytesRead; i++)
+                    {
+                        char c = buffer[i];
+                        if (c == '\n' || c == '\r' || c == 0)
+                        {
+                            if (stringBuilder.Length > 0)
+                            {
+                                ConsoleAddLine(stringBuilder.ToString());
+                            }
+                            stringBuilder.Clear();
+                        }
+                        else
+                        {
+                            stringBuilder.Append(c);
+                        }
+                    }
+
+                }
+
+                ConsoleAddLine("Input pipe disconnected!");
+
+                // Close input reader
+                try
+                {
+                    pipeInputReader.Close();
+                    pipeInputReader.Dispose();
+                    pipeInputReader = null;
+                }
+                catch (Exception) { }
+
+                // Close input stream
+                try
+                {
+                    pipeStreamInput.Close();
+                    pipeStreamInput.Dispose();
+                    pipeStreamInput = null;
+                }
+                catch (Exception) { }
+
+
+
+                // Close output writer
+                try
+                {
+                    pipeOutputWriter.Close();
+                    pipeOutputWriter.Dispose();
+                    pipeOutputWriter = null;
+                }
+                catch (Exception) { }
+
+                // Close output stream
+                try
+                {
+                    pipeStreamOutput.Close();
+                    pipeStreamOutput.Dispose();
+                    pipeStreamOutput = null;
+                }
+                catch (Exception) { }
+
+            }
+
+        }
+
+
+        //
+        // Pipe state thread
+        //
+        private void RunPipeStateThread()
+        {
+            int size = 0;
+            byte[] bytes;
+            GCHandle gcHandle;
+            TabletState readState;
+
+            while (running)
+            {
+                if (!running) break;
+                pipeStreamState = new NamedPipeClientStream(".", "TabletDriverState", PipeDirection.InOut);
+
+                try
+                {
+                    pipeStreamState.Connect();
+                }
+                catch (Exception)
+                {
+                    // ConsoleAddLine("State pipe connection error! " + ex.Message);
+                    break;
+                }
+                pipeStateReader = new BinaryReader(pipeStreamState);
+
+
+                while (running && pipeStreamState.IsConnected)
+                {
+                    try
+                    {
+
+                        size = Marshal.SizeOf(typeof(TabletState));
+                        bytes = pipeStateReader.ReadBytes(size);
+                        gcHandle = GCHandle.Alloc(bytes, GCHandleType.Pinned);
+                        readState = (TabletState)Marshal.PtrToStructure(gcHandle.AddrOfPinnedObject(), typeof(TabletState));
+                        gcHandle.Free();
+                    }
+                    catch (Exception)
+                    {
+                        //ConsoleAddLine("Can't read state pipe! " + ex.Message);
+                        size = 0;
+                        break;
+                    }
+                    if (size > 0)
+                    {
+                        tabletState = readState;
+                        //ConsoleAddLine("State X: " + tabletState.inputX + ", Y: " + tabletState.inputY);
+                    }
+
+
+                }
+
+                ConsoleAddLine("State pipe disconnected!");
+
+                // Close state reader
+                try
+                {
+                    pipeStateReader.Close();
+                    pipeStateReader.Dispose();
+                    pipeStateReader = null;
+                }
+                catch (Exception) { }
+
+
+                // Close state stream
+                try
+                {
+                    pipeStreamState.Close();
+                    pipeStreamState.Dispose();
+                    pipeStreamState = null;
+                }
+                catch (Exception) { }
+
+            }
+        }
+
+
         //
         // Start the driver service
         //
@@ -401,6 +649,15 @@ public void Start(string processPath, string arguments)
                     running = true;
                     timerWatchdog.Start();
 
+                    // Pipe input thread
+                    pipeInputThread = new System.Threading.Thread(new System.Threading.ThreadStart(RunPipeInputThread));
+                    pipeInputThread.Start();
+
+                    // Pipe state thread
+                    pipeStateThread = new System.Threading.Thread(new System.Threading.ThreadStart(RunPipeStateThread));
+                    pipeStateThread.Start();
+
+
                     Started?.Invoke(this, new EventArgs());
                 }
 
@@ -427,16 +684,113 @@ public void Stop()
             if (!running) return;
             running = false;
             timerWatchdog.Stop();
+
+            // Close pipe reader
+            try
+            {
+                if (pipeInputReader != null)
+                {
+                    pipeInputReader.Close();
+                    pipeInputReader.Dispose();
+                }
+            }
+            catch (Exception e) { Debug.WriteLine("Pipe input reader error! " + e.Message); }
+
+            // Close pipe input stream
+            try
+            {
+                if (pipeStreamInput != null)
+                {
+                    pipeStreamInput.Close();
+                    pipeStreamInput.Dispose();
+                }
+            }
+            catch (Exception e) { Debug.WriteLine("Pipe input stream error! " + e.Message); }
+
+            // Close pipe writer
+            try
+            {
+                if (pipeOutputWriter != null)
+                {
+                    pipeOutputWriter.Close();
+                    pipeOutputWriter.Dispose();
+                }
+
+            }
+            catch (Exception e) { Debug.WriteLine("Pipe writer error! " + e.Message); }
+
+
+            // Close pipe output stream
+            try
+            {
+                if (pipeStreamOutput != null)
+                {
+                    pipeStreamOutput.Close();
+                    pipeStreamOutput.Dispose();
+                }
+            }
+            catch (Exception e) { Debug.WriteLine("Pipe output stream error! " + e.Message); }
+
+
+            // Close state reader
+            try
+            {
+                if (pipeStateReader != null)
+                {
+                    pipeStateReader.Close();
+                    pipeStateReader.Dispose();
+                }
+
+            }
+            catch (Exception e) { Debug.WriteLine("Pipe state reader error! " + e.Message); }
+
+            // Close pipe state stream
+            try
+            {
+                if (pipeStreamState != null)
+                {
+                    pipeStreamState.Close();
+                    pipeStreamState.Dispose();
+                }
+            }
+            catch (Exception e) { Debug.WriteLine("Pipe state stream error! " + e.Message); }
+
+            // Close pipe input thread
+            try
+            {
+                if (pipeInputThread != null)
+                {
+                    pipeInputThread.Abort();
+                }
+            }
+            catch (Exception e) { Debug.WriteLine("Pipe input thread error! " + e.Message); }
+
+            // Close pipe state thread
+            try
+            {
+                if (pipeStateThread != null)
+                {
+                    pipeStateThread.Abort();
+                }
+            }
+            catch (Exception e) { Debug.WriteLine("Pipe state thread error! " + e.Message); }
+
+
             try
             {
                 processService.CancelOutputRead();
                 processService.Kill();
                 processService.Dispose();
             }
-            catch (Exception)
+            catch (Exception e)
             {
+                Debug.WriteLine("Service process error! " + e.Message);
             }
             Stopped?.Invoke(this, new EventArgs());
+
+
+            System.Threading.Thread.Sleep(10);
+
         }
 
 
diff --git a/TabletDriverGUI/TabletDriverGUI.csproj b/TabletDriverGUI/TabletDriverGUI.csproj
index b85d398..c28e1b5 100644
--- a/TabletDriverGUI/TabletDriverGUI.csproj
+++ b/TabletDriverGUI/TabletDriverGUI.csproj
@@ -77,8 +77,13 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="ButtonMapping.xaml.cs">
-      <DependentUpon>ButtonMapping.xaml</DependentUpon>
+    <Compile Include="MainWindow.Areas.cs" />
+    <Compile Include="MultimediaTimer.cs" />
+    <Compile Include="WindowTabletViewSettings.xaml.cs">
+      <DependentUpon>WindowTabletViewSettings.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="WindowButtonMapping.xaml.cs">
+      <DependentUpon>WindowButtonMapping.xaml</DependentUpon>
     </Compile>
     <Compile Include="MainWindow.Driver.cs" />
     <Compile Include="MainWindow.Console.cs" />
@@ -88,10 +93,23 @@
     <Compile Include="TabletDriver.cs" />
     <Compile Include="NativeMethods.cs" />
     <Compile Include="VersionHelper.cs" />
-    <Compile Include="WacomArea.xaml.cs">
-      <DependentUpon>WacomArea.xaml</DependentUpon>
+    <Compile Include="WindowMessageBox.xaml.cs">
+      <DependentUpon>WindowMessageBox.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="WindowTabletView.xaml.cs">
+      <DependentUpon>WindowTabletView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="WindowWacomArea.xaml.cs">
+      <DependentUpon>WindowWacomArea.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="WindowAreaEditor.xaml.cs">
+      <DependentUpon>WindowAreaEditor.xaml</DependentUpon>
     </Compile>
-    <Page Include="ButtonMapping.xaml">
+    <Page Include="WindowTabletViewSettings.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="WindowButtonMapping.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -109,7 +127,19 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="WacomArea.xaml">
+    <Page Include="WindowMessageBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="WindowTabletView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="WindowWacomArea.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="WindowAreaEditor.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/TabletDriverGUI/Utils.cs b/TabletDriverGUI/Utils.cs
index 1481209..d8c8862 100644
--- a/TabletDriverGUI/Utils.cs
+++ b/TabletDriverGUI/Utils.cs
@@ -1,4 +1,6 @@
 using System.Globalization;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
 
 namespace TabletDriverGUI
 {
@@ -56,5 +58,25 @@ public static string GetNumberString(double val, string format)
             CheckCultureInfo();
             return val.ToString(format, cultureInfo.NumberFormat);
         }
+
+
+
+
+        //
+        // RGB to hex string
+        //
+        public static string RGBToHex(byte r, byte g, byte b)
+        {
+            return string.Format("{0:X2}{1:X2}{2:X2}", r, g, b); ;
+        }
+
+        //
+        // RGB to color hex string
+        //
+        public static string RGBToHexColor(byte r, byte g, byte b)
+        {
+            return "#" + RGBToHex(r, g, b);
+        }
+
     }
 }
diff --git a/TabletDriverGUI/WindowAreaEditor.xaml b/TabletDriverGUI/WindowAreaEditor.xaml
new file mode 100644
index 0000000..f63366b
--- /dev/null
+++ b/TabletDriverGUI/WindowAreaEditor.xaml
@@ -0,0 +1,120 @@
+<Window x:Class="TabletDriverGUI.WindowAreaEditor"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:TabletDriverGUI"
+        mc:Ignorable="d"
+        Title="Area Editor" Height="270" Width="500">
+  <Window.Resources>
+    <Style TargetType="GroupBox">
+      <Setter Property="HeaderTemplate">
+        <Setter.Value>
+          <DataTemplate>
+            <TextBlock Text="{Binding}" FontWeight="Bold"/>
+          </DataTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+
+    <Style x:Key="ControlStyleTextBox" TargetType="Control">
+      <Setter Property="HorizontalContentAlignment" Value="Left"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="Width" Value="100"/>
+    </Style>
+    <Style BasedOn="{StaticResource ControlStyleTextBox}" TargetType="TextBox">
+      <Setter Property="Padding" Value="5,0"/>
+    </Style>
+  </Window.Resources>
+  <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+    <StackPanel Orientation="Vertical">
+
+      <!-- Screen Area -->
+      <GroupBox Header="Screen Area" Name="groupScreenArea">
+        <StackPanel Orientation="Horizontal">
+
+          <!-- Screen area width -->
+          <GroupBox Header="Width">
+            <Grid>
+              <TextBox Name="textScreenAreaWidth" TextChanged="OnTextBoxChanged" KeyUp="OnTextBoxKeyUp">123</TextBox>
+              <Label HorizontalAlignment="Right">px</Label>
+            </Grid>
+          </GroupBox>
+
+          <!-- Screen area height -->
+          <GroupBox Header="Height">
+            <Grid>
+              <TextBox Name="textScreenAreaHeight" TextChanged="OnTextBoxChanged" KeyUp="OnTextBoxKeyUp">123</TextBox>
+              <Label HorizontalAlignment="Right">px</Label>
+            </Grid>
+          </GroupBox>
+
+          <!-- Screen area X -->
+          <GroupBox Header="Left Offset">
+            <Grid>
+              <TextBox Name="textScreenAreaX" TextChanged="OnTextBoxChanged" KeyUp="OnTextBoxKeyUp">123</TextBox>
+              <Label HorizontalAlignment="Right">px</Label>
+            </Grid>
+          </GroupBox>
+
+          <!-- Screen area Y -->
+          <GroupBox Header="Top Offset">
+            <Grid>
+              <TextBox Name="textScreenAreaY" TextChanged="OnTextBoxChanged" KeyUp="OnTextBoxKeyUp">123</TextBox>
+              <Label HorizontalAlignment="Right">px</Label>
+            </Grid>
+          </GroupBox>
+        </StackPanel>
+      </GroupBox>
+
+      <GroupBox Header="Tablet Area" Name="groupTabletArea">
+        <StackPanel Orientation="Horizontal">
+
+          <!-- Tablet area width -->
+          <GroupBox Header="Width">
+            <Grid>
+              <TextBox Name="textTabletAreaWidth" TextChanged="OnTextBoxChanged" KeyUp="OnTextBoxKeyUp">123</TextBox>
+              <Label HorizontalAlignment="Right">mm</Label>
+            </Grid>
+          </GroupBox>
+
+          <!-- Tablet area height -->
+          <GroupBox Header="Height">
+            <Grid>
+              <TextBox Name="textTabletAreaHeight" TextChanged="OnTextBoxChanged" KeyUp="OnTextBoxKeyUp">123</TextBox>
+              <Label HorizontalAlignment="Right">mm</Label>
+            </Grid>
+          </GroupBox>
+
+          <!-- Tablet area X -->
+          <GroupBox Header="X">
+            <Grid>
+              <TextBox Name="textTabletAreaX" TextChanged="OnTextBoxChanged" KeyUp="OnTextBoxKeyUp">123</TextBox>
+              <Label HorizontalAlignment="Right">mm</Label>
+            </Grid>
+          </GroupBox>
+
+          <!-- Tablet area Y -->
+          <GroupBox Header="Y">
+            <Grid>
+              <TextBox Name="textTabletAreaY" TextChanged="OnTextBoxChanged" KeyUp="OnTextBoxKeyUp">123</TextBox>
+              <Label HorizontalAlignment="Right">mm</Label>
+            </Grid>
+          </GroupBox>
+        </StackPanel>
+      </GroupBox>
+      <Grid Margin="5,5" Height="30">
+        <Button Name="buttonSave"
+                Width="100" HorizontalAlignment="Left"
+                Click="ButtonSave_Click">
+          Save
+        </Button>
+        <Button Name="buttonCancel"
+                Width="100" HorizontalAlignment="Right"
+                Click="ButtonCancel_Click">
+          Cancel
+        </Button>
+      </Grid>
+    </StackPanel>
+  </Grid>
+</Window>
diff --git a/TabletDriverGUI/WindowAreaEditor.xaml.cs b/TabletDriverGUI/WindowAreaEditor.xaml.cs
new file mode 100644
index 0000000..39cf97c
--- /dev/null
+++ b/TabletDriverGUI/WindowAreaEditor.xaml.cs
@@ -0,0 +1,156 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace TabletDriverGUI
+{
+    /// <summary>
+    /// Interaction logic for WindowAreaEditor.xaml
+    /// </summary>
+    public partial class WindowAreaEditor : Window
+    {
+        private Area screenArea, tabletArea;
+        private Configuration config;
+        private bool isLoadingSettings;
+
+        public WindowAreaEditor(Configuration configuration, Area ScreenArea, Area TabletArea)
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            Owner = Application.Current.MainWindow;
+
+            InitializeComponent();
+            screenArea = ScreenArea;
+            tabletArea = TabletArea;
+            config = configuration;
+            isLoadingSettings = false;
+            LoadValues();
+        }
+
+        //
+        // Save click
+        //
+        private void ButtonSave_Click(object sender, RoutedEventArgs e)
+        {
+            StoreValues();
+            DialogResult = true;
+            Close();
+        }
+
+        //
+        // Cancel click
+        //
+        private void ButtonCancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+
+
+        //
+        // Load values from configuration
+        //
+        private void LoadValues()
+        {
+            isLoadingSettings = true;
+
+            // Screen area
+            textScreenAreaWidth.Text = Utils.GetNumberString(screenArea.Width);
+            textScreenAreaHeight.Text = Utils.GetNumberString(screenArea.Height);
+            textScreenAreaX.Text = Utils.GetNumberString(screenArea.X - screenArea.Width / 2.0);
+            textScreenAreaY.Text = Utils.GetNumberString(screenArea.Y - screenArea.Height / 2.0);
+
+            // Tablet area
+            textTabletAreaWidth.Text = Utils.GetNumberString(tabletArea.Width);
+            textTabletAreaHeight.Text = Utils.GetNumberString(tabletArea.Height);
+            textTabletAreaX.Text = Utils.GetNumberString(tabletArea.X);
+            textTabletAreaY.Text = Utils.GetNumberString(tabletArea.Y);
+
+            if(config.ForceAspectRatio)
+            {
+                textTabletAreaHeight.IsEnabled = false;
+            } else
+            {
+                textTabletAreaHeight.IsEnabled = true;
+            }
+
+
+            isLoadingSettings = false;
+
+
+        }
+
+        //
+        // Store values
+        //
+        private void StoreValues()
+        {
+
+            // Screen area
+            if (Utils.ParseNumber(textScreenAreaWidth.Text, out double value))
+                screenArea.Width = value;
+            if (Utils.ParseNumber(textScreenAreaHeight.Text, out value))
+                screenArea.Height = value;
+            if (Utils.ParseNumber(textScreenAreaX.Text, out value))
+                screenArea.X = value + screenArea.Width / 2.0;
+            if (Utils.ParseNumber(textScreenAreaY.Text, out value))
+                screenArea.Y = value + screenArea.Height / 2.0;
+
+            // Tablet area
+            if (Utils.ParseNumber(textTabletAreaWidth.Text, out value))
+                tabletArea.Width = value;
+            if (Utils.ParseNumber(textTabletAreaHeight.Text, out value))
+                tabletArea.Height = value;
+            if (Utils.ParseNumber(textTabletAreaX.Text, out value))
+                tabletArea.X = value;
+            if (Utils.ParseNumber(textTabletAreaY.Text, out value))
+                tabletArea.Y = value;
+
+        }
+
+        //
+        // TextBox key up
+        //
+        private void OnTextBoxKeyUp(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if(e.Key == System.Windows.Input.Key.Enter)
+            {
+                ButtonSave_Click(sender, null);
+            }
+        }
+
+        //
+        // TextBox changed
+        //
+        private void OnTextBoxChanged(object sender, TextChangedEventArgs e)
+        {
+            if (!IsLoaded || isLoadingSettings) return;
+
+            if (config.ForceAspectRatio)
+            {
+                double screenWidth, screenHeight;
+                double tabletWidth, tabletHeight;
+                double aspectRatio;
+
+                screenWidth = screenArea.Width;
+                screenHeight = screenArea.Height;
+                tabletWidth = tabletArea.Width;
+                tabletHeight = tabletArea.Height;
+
+                if (Utils.ParseNumber(textScreenAreaWidth.Text, out double value))
+                    screenWidth = value;
+                if (Utils.ParseNumber(textScreenAreaHeight.Text, out value))
+                    screenHeight = value;
+
+                if (Utils.ParseNumber(textTabletAreaWidth.Text, out value))
+                    tabletWidth = value;
+                if (Utils.ParseNumber(textTabletAreaHeight.Text, out value))
+                    tabletHeight = value;
+
+                aspectRatio = screenWidth / screenHeight;
+                tabletHeight = tabletWidth / aspectRatio;
+                textTabletAreaHeight.Text = Utils.GetNumberString(tabletHeight);
+            }
+        }
+
+
+    }
+}
diff --git a/TabletDriverGUI/ButtonMapping.xaml b/TabletDriverGUI/WindowButtonMapping.xaml
similarity index 91%
rename from TabletDriverGUI/ButtonMapping.xaml
rename to TabletDriverGUI/WindowButtonMapping.xaml
index 5be4473..5ca9fb3 100644
--- a/TabletDriverGUI/ButtonMapping.xaml
+++ b/TabletDriverGUI/WindowButtonMapping.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="TabletDriverGUI.ButtonMapping"
+<Window x:Class="TabletDriverGUI.WindowButtonMapping"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -38,6 +38,10 @@
           <ComboBoxItem>Scroll Up/Down</ComboBoxItem>
           <ComboBoxItem>Scroll Left/Right</ComboBoxItem>
           <ComboBoxItem>Scroll Both</ComboBoxItem>
+          <ComboBoxItem>Scroll One Up</ComboBoxItem>
+          <ComboBoxItem>Scroll One Down</ComboBoxItem>
+          <ComboBoxItem>Scroll One Left</ComboBoxItem>
+          <ComboBoxItem>Scroll One Right</ComboBoxItem>
         </ComboBox>
       </GroupBox>
       <GroupBox Header="Keyboard" Padding="2" Margin="0,5,0,5">
diff --git a/TabletDriverGUI/ButtonMapping.xaml.cs b/TabletDriverGUI/WindowButtonMapping.xaml.cs
similarity index 57%
rename from TabletDriverGUI/ButtonMapping.xaml.cs
rename to TabletDriverGUI/WindowButtonMapping.xaml.cs
index 82dc8cd..7a0ccbe 100644
--- a/TabletDriverGUI/ButtonMapping.xaml.cs
+++ b/TabletDriverGUI/WindowButtonMapping.xaml.cs
@@ -1,85 +1,135 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace TabletDriverGUI
 {
     /// <summary>
     /// Interaction logic for ButtonMapping.xaml
     /// </summary>
-    public partial class ButtonMapping : Window
+    public partial class WindowButtonMapping : Window
     {
         // WPF Button
         Button button;
-
         public string Result;
 
-        public ButtonMapping()
+        public class MouseAction
+        {
+            public string Action;
+            public string Name;
+            public bool Visible;
+
+            public MouseAction(string name) : this("", name)
+            {                
+            }
+            public MouseAction(string action, string name)
+            {
+                Action = action;
+                Name = name;
+                Visible = true;
+            }
+            public override string ToString()
+            {
+                return Name;
+            }
+        }
+
+        public OrderedDictionary mouseActions;
+
+        public WindowButtonMapping()
         {
             WindowStartupLocation = WindowStartupLocation.CenterOwner;
             Owner = Application.Current.MainWindow;
 
             InitializeComponent();
             Result = "";
+
+
+            mouseActions = new OrderedDictionary()
+            {
+                { "", new MouseAction("None") },
+                { "MOUSE1", new MouseAction("Mouse 1 (Left / Tip)") },
+                { "MOUSE2", new MouseAction("Mouse 2 (Right / Barrel)") },
+                { "MOUSE3", new MouseAction("Mouse 3 (Middle / Eraser)") },
+                { "MOUSE4", new MouseAction("Mouse 4 (Back)") },
+                { "MOUSE5", new MouseAction("Mouse 5 (Forward)") },
+                { "MOUSESCROLLV", new MouseAction("Scroll Up/Down") },
+                { "MOUSESCROLLH", new MouseAction("Scroll Left/Right") },
+                { "MOUSESCROLLB", new MouseAction("Scroll Both") },
+                { "SCROLLUP", new MouseAction("Scroll One Up") },
+                { "SCROLLDOWN", new MouseAction("Scroll One Down") },
+                { "SCROLLLEFT", new MouseAction("Scroll One Left") },
+                { "SCROLLRIGHT", new MouseAction("Scroll One Right") }
+            };
+
+            UpdateMouseActions();
+
         }
 
-        public ButtonMapping(Button button, bool isPenButton) : this()
+        public WindowButtonMapping(Button button, bool isPenButton) : this()
         {
             this.button = button;
 
             // Tablet buttons don't need tip, barrel and eraser info
             if (!isPenButton)
             {
-                ((ComboBoxItem)comboBoxMouse.Items[1]).Content = "Mouse 1 (Left)";
-                ((ComboBoxItem)comboBoxMouse.Items[2]).Content = "Mouse 2 (Right)";
-                ((ComboBoxItem)comboBoxMouse.Items[3]).Content = "Mouse 3 (Middle)";
-
-                // Disable scroll
-                ((ComboBoxItem)comboBoxMouse.Items[6]).Visibility = Visibility.Collapsed;
-                ((ComboBoxItem)comboBoxMouse.Items[7]).Visibility = Visibility.Collapsed;
-                ((ComboBoxItem)comboBoxMouse.Items[8]).Visibility = Visibility.Collapsed;
+                ((MouseAction)mouseActions["MOUSE1"]).Name = "Mouse 1 (Left)";
+                ((MouseAction)mouseActions["MOUSE2"]).Name = "Mouse 2 (Right)";
+                ((MouseAction)mouseActions["MOUSE3"]).Name = "Mouse 3 (Middle)";
+
+                // Disable mouse scroll
+                ((MouseAction)mouseActions["MOUSESCROLLV"]).Visible = false;
+                ((MouseAction)mouseActions["MOUSESCROLLH"]).Visible = false;
+                ((MouseAction)mouseActions["MOUSESCROLLB"]).Visible = false;
             }
+            UpdateMouseActions();
 
-            // Enable scroll
-            else
+            CheckKeyValue();
+        }
+
+
+        //
+        // Update mouse actions and combobox
+        //
+        private void UpdateMouseActions()
+        {
+            comboBoxMouse.Items.Clear();
+            foreach (DictionaryEntry entry in mouseActions)
             {
-                ((ComboBoxItem)comboBoxMouse.Items[6]).Visibility = Visibility.Visible;
-                ((ComboBoxItem)comboBoxMouse.Items[7]).Visibility = Visibility.Visible;
-                ((ComboBoxItem)comboBoxMouse.Items[8]).Visibility = Visibility.Visible;
+                MouseAction mouseAction = (MouseAction)entry.Value;
+                mouseAction.Action = (string)entry.Key;
+                if (mouseAction.Visible)
+                {
+                    comboBoxMouse.Items.Add(mouseAction);
+                }
             }
-            CheckButtonValue();
+
         }
 
-        public void CheckButtonValue()
+
+        //
+        // Check key value
+        //
+        public void CheckKeyValue()
         {
             string keys = button.Content.ToString().ToUpper().Trim();
 
-            if (keys.StartsWith("MOUSE"))
+            if (mouseActions.Contains(keys))
             {
-                switch (keys)
+                foreach(var item in comboBoxMouse.Items)
                 {
-                    case "MOUSE1": comboBoxMouse.SelectedIndex = 1; break;
-                    case "MOUSE2": comboBoxMouse.SelectedIndex = 2; break;
-                    case "MOUSE3": comboBoxMouse.SelectedIndex = 3; break;
-                    case "MOUSE4": comboBoxMouse.SelectedIndex = 4; break;
-                    case "MOUSE5": comboBoxMouse.SelectedIndex = 5; break;
-                    case "MOUSESCROLLV": comboBoxMouse.SelectedIndex = 6; break;
-                    case "MOUSESCROLLH": comboBoxMouse.SelectedIndex = 7; break;
-                    case "MOUSESCROLLB": comboBoxMouse.SelectedIndex = 8; break;
-                    default: break;
+                    MouseAction mouseAction = (MouseAction)item;
+                    if(mouseAction.Action == keys)
+                    {
+                        comboBoxMouse.SelectedItem = item;
+                        comboBoxMouse.Focus();
+                    }
                 }
-                comboBoxMouse.Focus();
             }
             else
             {
@@ -99,18 +149,11 @@ private void ComboBoxMouse_SelectionChanged(object sender, SelectionChangedEvent
             if (!IsLoaded) return;
             string key = "";
 
-
-            switch (comboBoxMouse.SelectedIndex)
+            // Combobox item item to MouseAction
+            if(comboBoxMouse.SelectedIndex >= 0 && comboBoxMouse.SelectedItem != null)
             {
-                case 1: key = "MOUSE1"; break;
-                case 2: key = "MOUSE2"; break;
-                case 3: key = "MOUSE3"; break;
-                case 4: key = "MOUSE4"; break;
-                case 5: key = "MOUSE5"; break;
-                case 6: key = "MOUSESCROLLV"; break;
-                case 7: key = "MOUSESCROLLH"; break;
-                case 8: key = "MOUSESCROLLB"; break;
-                default: break;
+                MouseAction mouseAction = (MouseAction)comboBoxMouse.SelectedItem;
+                key = mouseAction.Action;
             }
             textKeyboard.Text = key;
             textCustom.Text = key;
diff --git a/TabletDriverGUI/WindowMessageBox.xaml b/TabletDriverGUI/WindowMessageBox.xaml
new file mode 100644
index 0000000..f208c05
--- /dev/null
+++ b/TabletDriverGUI/WindowMessageBox.xaml
@@ -0,0 +1,39 @@
+<Window x:Class="TabletDriverGUI.WindowMessageBox"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:TabletDriverGUI"
+        mc:Ignorable="d"
+        Title="MessageBox!"
+        Height="200"
+        Width="300"
+        MinWidth="300"
+        SizeToContent="WidthAndHeight">
+  <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+    <StackPanel Orientation="Vertical" Margin="20,5">
+      <Label Name="labelMessage"
+             FontSize="16"
+             HorizontalAlignment="Center">Message!
+      </Label>
+      <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+        <Button Name="buttonTrue"
+                FontSize="16"
+                Width="80"
+                Padding="5"
+                Margin="5,5,10,5"
+                Click="ButtonTrue_Click"
+                HorizontalAlignment="Left">
+          OK
+        </Button>
+        <Button Name="buttonFalse"
+                FontSize="16"
+                Width="80" Padding="5" Margin="10,5,0,5"
+                Click="ButtonFalse_Click"
+                HorizontalAlignment="Right">
+          Cancel
+        </Button>
+      </StackPanel>
+    </StackPanel>
+  </Grid>
+</Window>
diff --git a/TabletDriverGUI/WindowMessageBox.xaml.cs b/TabletDriverGUI/WindowMessageBox.xaml.cs
new file mode 100644
index 0000000..3b4ac41
--- /dev/null
+++ b/TabletDriverGUI/WindowMessageBox.xaml.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace TabletDriverGUI
+{
+    /// <summary>
+    /// Interaction logic for WindowMessageBox.xaml
+    /// </summary>
+    public partial class WindowMessageBox : Window
+    {
+        public WindowMessageBox(string title, string message, string trueName, string falseName)
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            Owner = Application.Current.MainWindow;
+
+            InitializeComponent();
+            Title = title;
+            labelMessage.Content = message;
+            buttonTrue.Content = trueName;
+            buttonFalse.Content = falseName;
+        }
+
+        private void ButtonTrue_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = true;
+            Close();
+        }
+
+        private void ButtonFalse_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+    }
+}
diff --git a/TabletDriverGUI/WindowTabletView.xaml b/TabletDriverGUI/WindowTabletView.xaml
new file mode 100644
index 0000000..10dd1bb
--- /dev/null
+++ b/TabletDriverGUI/WindowTabletView.xaml
@@ -0,0 +1,62 @@
+<Window x:Class="TabletDriverGUI.WindowTabletView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="Tablet View"
+        Width="700"
+        Height="300"
+        Background="Gray"
+        SizeToContent="WidthAndHeight"
+        ResizeMode="NoResize">
+
+  <Canvas Name="canvasTabletView"
+          Width="600"
+          Height="200"
+          Background="White"
+          Margin="0"
+          VerticalAlignment="Top"
+          HorizontalAlignment="Left">
+
+    <!-- Tablet info -->
+    <TextBlock Name="textTabletInfo"
+               Foreground="#000000"
+               Canvas.Left="20"
+               Canvas.Top="20"
+               FontSize="25"
+               FontWeight="ExtraBold">
+      Test Tablet - 100x55mm - 1920x1080
+    </TextBlock>
+
+    <!-- Input text -->
+    <TextBlock Name="textInput"
+               Foreground="#33AA00"
+               Canvas.Left="20"
+               Canvas.Top="50"
+               FontSize="25"
+               FontWeight="ExtraBold">
+      Input
+    </TextBlock>
+
+    <!-- Output text -->
+    <TextBlock Name="textOutput"
+               Foreground="#AA3300"
+               Canvas.Left="20"
+               Canvas.Top="80"
+               FontSize="25"
+               FontWeight="ExtraBold">
+      Output
+    </TextBlock>
+
+    <!-- Latency text -->
+    <TextBlock Name="textLatency"
+               Foreground="#0033AA"
+               Canvas.Left="20"
+               Canvas.Top="110"
+               FontSize="25"
+               FontWeight="ExtraBold">
+      ±100ms
+    </TextBlock>
+  </Canvas>
+</Window>
diff --git a/TabletDriverGUI/WindowTabletView.xaml.cs b/TabletDriverGUI/WindowTabletView.xaml.cs
new file mode 100644
index 0000000..4478c10
--- /dev/null
+++ b/TabletDriverGUI/WindowTabletView.xaml.cs
@@ -0,0 +1,634 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace TabletDriverGUI
+{
+
+    /// <summary>
+    /// Interaction logic for WindowTabletView.xaml
+    /// </summary>
+    public partial class WindowTabletView : Window
+    {
+        Configuration config;
+        TabletDriver driver;
+        TabletRenderer tabletRenderer;
+        MultimediaTimer timer;
+        Vector lastPosition;
+        DateTime lastUpdate;
+        DateTime lastInputStartTime;
+        double lastPressure;
+        bool hadInputLoss;
+        double velocity;
+        double latency;
+
+
+        //
+        // TabletViewElement
+        //
+        public class TabletRenderer : UIElement
+        {
+
+            public Point[] LastPositionsInput;
+            public Point[] LastPositionsOutput;
+            public Point[] DrawPositions;
+            public Point PositionInput;
+            public Point PositionOutput;
+            public double PressureInput;
+            public double PressureOutput;
+            public double ScaleX;
+            public double ScaleY;
+
+            public readonly Brush brushInput;
+            public readonly Brush brushOutput;
+            public readonly Brush brushDraw;
+
+            private readonly Pen penInputLine;
+            private readonly Pen penOutputLine;
+            private readonly Pen penDrawLine;
+            private readonly Pen penInputCircle;
+            private readonly Pen penOutputCircle;
+            private readonly Pen penInputPressure;
+            private readonly Pen penOutputPressure;
+
+            public Rect rectInputPressure;
+            public Rect rectOutputPressure;
+            public readonly Rect rectInputPressureBorder;
+            public readonly Rect rectOutputPressureBorder;
+
+
+            //
+            // Tablet renderer constructor
+            //
+            public TabletRenderer(Configuration config)
+            {
+                //
+                // Last position arrays
+                //
+                LastPositionsInput = new Point[config.TabletView.InputTrailLength];
+                LastPositionsOutput = new Point[config.TabletView.OutputTrailLength];
+                for (int i = 0; i < LastPositionsInput.Length; i++)
+                    LastPositionsInput[i] = new Point(-1, -1);
+                for (int i = 0; i < LastPositionsOutput.Length; i++)
+                    LastPositionsOutput[i] = new Point(-1, -1);
+
+
+                //
+                // Draw position array
+                //
+                DrawPositions = new Point[config.TabletView.DrawLength];
+                for (int i = 0; i < DrawPositions.Length; i++)
+                {
+                    DrawPositions[i] = new Point(-1, -1);
+                }
+
+                // Input/output positions
+                PositionInput = new Point(0, 0);
+                PositionOutput = new Point(0, 0);
+
+                // Colors
+                Color colorInput = Colors.Green;
+                try { colorInput = (Color)ColorConverter.ConvertFromString(config.TabletView.InputColor); } catch (Exception) { }
+                Color colorOutput = Colors.Red;
+                try { colorOutput = (Color)ColorConverter.ConvertFromString(config.TabletView.OutputColor); } catch (Exception) { }
+                Color colorDraw = Colors.White;
+                try { colorDraw = (Color)ColorConverter.ConvertFromString(config.TabletView.DrawColor); } catch (Exception) { }
+
+                // Brushes
+                brushInput = new SolidColorBrush(colorInput);
+                brushInput.Freeze();
+                brushOutput = new SolidColorBrush(colorOutput);
+                brushOutput.Freeze();
+                brushDraw = new SolidColorBrush(colorDraw);
+                brushDraw.Freeze();
+
+                // Line pens
+                penInputLine = new Pen(brushInput, 3)
+                {
+                    StartLineCap = PenLineCap.Round,
+                    EndLineCap = PenLineCap.Round,
+                    LineJoin = PenLineJoin.Round
+                };
+                penInputLine.Freeze();
+                penOutputLine = new Pen(brushOutput, 3)
+                {
+                    StartLineCap = PenLineCap.Round,
+                    EndLineCap = PenLineCap.Round,
+                    LineJoin = PenLineJoin.Round
+                };
+                penOutputLine.Freeze();
+                penDrawLine = new Pen(brushDraw, 3)
+                {
+                    StartLineCap = PenLineCap.Round,
+                    EndLineCap = PenLineCap.Round,
+                    LineJoin = PenLineJoin.Round
+                };
+                penDrawLine.Freeze();
+
+                // Circle pens
+                penInputCircle = new Pen(brushInput, 3);
+                penInputCircle.Freeze();
+                penOutputCircle = new Pen(brushOutput, 3);
+                penOutputCircle.Freeze();
+
+                // Pressure border pens
+                penInputPressure = new Pen(brushInput, 3)
+                {
+                    StartLineCap = PenLineCap.Round,
+                    EndLineCap = PenLineCap.Round
+                };
+                penInputPressure.Freeze();
+                penOutputPressure = new Pen(brushOutput, 3)
+                {
+                    StartLineCap = PenLineCap.Round,
+                    EndLineCap = PenLineCap.Round
+                };
+                penOutputPressure.Freeze();
+
+                // Rects
+                rectInputPressure =
+                    new Rect(135, 54, 200, 20);
+                rectInputPressureBorder =
+                    new Rect(135, 54, 200, 20);
+                rectOutputPressure =
+                    new Rect(135, 84, 200, 20);
+                rectOutputPressureBorder =
+                    new Rect(135, 84, 200, 20);
+
+                // Offset pressure bars
+                rectInputPressure.X += config.TabletView.OffsetPressure.X;
+                rectInputPressure.Y += config.TabletView.OffsetPressure.Y;
+                rectInputPressureBorder.X += config.TabletView.OffsetPressure.X;
+                rectInputPressureBorder.Y += config.TabletView.OffsetPressure.Y;
+                rectOutputPressure.X += config.TabletView.OffsetPressure.X;
+                rectOutputPressure.Y += config.TabletView.OffsetPressure.Y;
+                rectOutputPressureBorder.X += config.TabletView.OffsetPressure.X;
+                rectOutputPressureBorder.Y += config.TabletView.OffsetPressure.Y;
+
+            }
+
+
+            //
+            // Update last position arrays
+            //
+            public void UpdateLastPositions()
+            {
+                if (LastPositionsInput.Length != 0)
+                {
+                    Array.Copy(LastPositionsInput, 1, LastPositionsInput, 0, LastPositionsInput.Length - 1);
+                    LastPositionsInput[LastPositionsInput.Length - 1].X = PositionInput.X;
+                    LastPositionsInput[LastPositionsInput.Length - 1].Y = PositionInput.Y;
+                }
+                if (LastPositionsOutput.Length != 0)
+                {
+                    Array.Copy(LastPositionsOutput, 1, LastPositionsOutput, 0, LastPositionsOutput.Length - 1);
+                    LastPositionsOutput[LastPositionsOutput.Length - 1].X = PositionOutput.X;
+                    LastPositionsOutput[LastPositionsOutput.Length - 1].Y = PositionOutput.Y;
+                }
+            }
+
+
+            //
+            // Update draw position array
+            //
+            public void AddDrawPosition(double x, double y)
+            {
+                if (DrawPositions.Length == 0) return;
+
+                // Shift position array
+                Array.Copy(DrawPositions, 1, DrawPositions, 0, DrawPositions.Length - 1);
+
+                // Set currect position as last item in the array
+                DrawPositions[DrawPositions.Length - 1].X = x;
+                DrawPositions[DrawPositions.Length - 1].Y = y;
+            }
+
+
+            //
+            // Render 
+            //
+            protected override void OnRender(DrawingContext context)
+            {
+                PathFigure path;
+                PathGeometry geometry;
+
+                // Pressure bars
+                rectInputPressure.Width = PressureInput * rectInputPressureBorder.Width;
+                rectOutputPressure.Width = PressureOutput * rectInputPressureBorder.Width;
+                context.DrawRectangle(brushInput, null, rectInputPressure);
+                context.DrawRectangle(brushOutput, null, rectOutputPressure);
+                context.DrawRectangle(null, penInputPressure, rectInputPressureBorder);
+                context.DrawRectangle(null, penOutputPressure, rectOutputPressureBorder);
+
+                //
+                // Drawing line
+                //
+                if (DrawPositions.Length > 0)
+                {
+                    path = new PathFigure
+                    {
+                        StartPoint = DrawPositions[0]
+                    };
+                    for (int i = 1; i < DrawPositions.Length; i++)
+                    {
+                        // Last empty
+                        if (DrawPositions[i].X >= 0 && DrawPositions[i - 1].X <= 0)
+                        {
+                            path.Segments.Add(new LineSegment(DrawPositions[i], false));
+                            path.Segments.Add(new LineSegment(DrawPositions[i], true));
+                        }
+                        // Current and last OK
+                        else if (DrawPositions[i].X >= 0 && DrawPositions[i - 1].X >= 0)
+                            path.Segments.Add(new LineSegment(DrawPositions[i], true));
+
+                        // Current and last empty
+                        else
+                            path.Segments.Add(new LineSegment(DrawPositions[i], false));
+                    }
+                    path.Freeze();
+                    geometry = new PathGeometry();
+                    geometry.Figures.Add(path);
+                    geometry.Freeze();
+                    context.DrawGeometry(null, penDrawLine, geometry);
+                }
+
+                //
+                // Input line
+                //
+                if (LastPositionsInput.Length > 0)
+                {
+                    path = new PathFigure
+                    {
+                        StartPoint = LastPositionsInput[0]
+                    };
+                    for (int i = 1; i < LastPositionsInput.Length; i++)
+                        path.Segments.Add(new LineSegment(LastPositionsInput[i], true));
+                    path.Freeze();
+                    geometry = new PathGeometry();
+                    geometry.Figures.Add(path);
+                    geometry.Freeze();
+                    context.DrawGeometry(null, penInputLine, geometry);
+                }
+
+
+                //
+                // Output line
+                //
+                if (LastPositionsOutput.Length > 0)
+                {
+                    path = new PathFigure
+                    {
+                        IsClosed = false,
+                        IsFilled = false,
+                        StartPoint = LastPositionsOutput[0]
+                    };
+                    for (int i = 1; i < LastPositionsOutput.Length; i++)
+                        path.Segments.Add(new LineSegment(LastPositionsOutput[i], true));
+                    path.Freeze();
+                    geometry = new PathGeometry();
+                    geometry.Figures.Add(path);
+                    geometry.Freeze();
+                    context.DrawGeometry(null, penOutputLine, geometry);
+                }
+
+                // Input circle
+                context.DrawEllipse(null, penInputCircle, PositionInput, 12, 12);
+
+                // Output circle
+                context.DrawEllipse(null, penOutputCircle, PositionOutput, 12, 12);
+
+            }
+
+        }
+
+        //
+        // Tablet View Constructor
+        //
+        public WindowTabletView(Configuration config, TabletDriver driver)
+        {
+            InitializeComponent();
+
+            this.config = config;
+            this.driver = driver;
+
+            // Tablet renderer
+            tabletRenderer = new TabletRenderer(config);
+            canvasTabletView.Children.Add(tabletRenderer);
+
+            // Offset texts
+            Canvas.SetLeft(textTabletInfo, Canvas.GetLeft(textTabletInfo) + config.TabletView.OffsetText.X);
+            Canvas.SetTop(textTabletInfo, Canvas.GetTop(textTabletInfo) + config.TabletView.OffsetText.Y);
+            Canvas.SetLeft(textInput, Canvas.GetLeft(textInput) + config.TabletView.OffsetText.X);
+            Canvas.SetTop(textInput, Canvas.GetTop(textInput) + config.TabletView.OffsetText.Y);
+            Canvas.SetLeft(textOutput, Canvas.GetLeft(textOutput) + config.TabletView.OffsetText.X);
+            Canvas.SetTop(textOutput, Canvas.GetTop(textOutput) + config.TabletView.OffsetText.Y);
+            Canvas.SetLeft(textLatency, Canvas.GetLeft(textLatency) + config.TabletView.OffsetText.X);
+            Canvas.SetTop(textLatency, Canvas.GetTop(textLatency) + config.TabletView.OffsetText.Y);
+
+            // Background color
+            Brush brush;
+            try { brush = new SolidColorBrush((Color)ColorConverter.ConvertFromString(config.TabletView.BackgroundColor)); }
+            catch (Exception) { brush = Brushes.White; }
+            canvasTabletView.Background = brush;
+            Background = brush;
+
+            // Text colors
+            try { brush = new SolidColorBrush((Color)ColorConverter.ConvertFromString(config.TabletView.InfoColor)); }
+            catch (Exception) { brush = Brushes.Black; }
+            textTabletInfo.Foreground = brush;
+            try { brush = new SolidColorBrush((Color)ColorConverter.ConvertFromString(config.TabletView.LatencyColor)); }
+            catch (Exception) { brush = Brushes.Black; }
+            textLatency.Foreground = brush;
+            textInput.Foreground = tabletRenderer.brushInput;
+            textOutput.Foreground = tabletRenderer.brushOutput;
+
+            // Text font
+            try
+            {
+                FontFamilyConverter fontConverter = new FontFamilyConverter();
+                FontFamily fontFamily = (FontFamily)fontConverter.ConvertFromString(config.TabletView.Font);
+                textTabletInfo.FontFamily = fontFamily;
+                textInput.FontFamily = fontFamily;
+                textOutput.FontFamily = fontFamily;
+                textLatency.FontFamily = fontFamily;
+            }
+            catch (Exception) { }
+
+            // Font size
+            textTabletInfo.FontSize = config.TabletView.FontSize;
+            textInput.FontSize = config.TabletView.FontSize;
+            textOutput.FontSize = config.TabletView.FontSize;
+            textLatency.FontSize = config.TabletView.FontSize;
+
+            // Info text
+            textTabletInfo.Text = config.TabletName + " - " +
+                Utils.GetNumberString(config.TabletAreas[0].Width) + " x " +
+                Utils.GetNumberString(config.TabletAreas[0].Height) + " mm → " +
+                Utils.GetNumberString(config.ScreenAreas[0].Width, "0") + " x " +
+                Utils.GetNumberString(config.ScreenAreas[0].Height, "0") + " px";
+
+
+            //
+            // Update/draw timer
+            //
+            timer = new MultimediaTimer { Interval = 2 };
+            timer.Tick += UpdateTimer_Tick;
+
+            // Last values
+            lastPosition = new Vector(0, 0);
+            lastUpdate = DateTime.Now;
+            lastPressure = 0;
+
+            // Average values
+            velocity = 0;
+            latency = 0;
+
+
+            // Input loss
+            hadInputLoss = true;
+            lastInputStartTime = DateTime.Now;
+
+            // Window events
+            Loaded += WindowTabletView_Loaded;
+            Closing += WindowTabletView_Closing;
+            KeyDown += WindowTabletView_KeyDown;
+
+
+            // Set GC mode to low latency
+            GCSettings.LatencyMode = GCLatencyMode.SustainedLowLatency;
+
+        }
+
+
+        //
+        // Update/draw timer tick
+        //
+        private void UpdateTimer_Tick(object sender, EventArgs e)
+        {
+            // Output position haven't changed -> skip
+            if (
+                lastPosition.X == driver.tabletState.outputX
+                &&
+                lastPosition.Y == driver.tabletState.outputY
+            )
+            {
+                double timeDelta = (DateTime.Now - lastUpdate).TotalMilliseconds;
+
+                // Input loss
+                if (timeDelta >= 30)
+                {
+                    hadInputLoss = true;
+                }
+
+                // Hide renderer
+                if (
+                    config.TabletView.FadeInOut
+                    &&
+                    timeDelta >= 200
+                    &&
+                    timeDelta <= 1000
+                )
+                {
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        canvasTabletView.Opacity -= (timeDelta - 200) / 5000.0;
+                        if (canvasTabletView.Opacity < 0)
+                            canvasTabletView.Opacity = 0;
+
+                        //canvasTabletView.Opacity = 1.0 - ((timeDelta - 200.0) / 800.0);
+                        canvasTabletView.InvalidateVisual();
+                    });
+                }
+
+
+                return;
+            }
+            else
+            {
+                if (hadInputLoss)
+                {
+                    lastInputStartTime = DateTime.Now;
+                    hadInputLoss = false;
+                }
+            }
+
+            //
+            // Update renderer positions
+            //
+            // Inverted
+            if (config.Invert)
+            {
+                tabletRenderer.PositionInput.X = config.TabletFullArea.Width - driver.tabletState.inputX - config.TabletAreas[0].X;
+                tabletRenderer.PositionInput.Y = config.TabletFullArea.Height - driver.tabletState.inputY - config.TabletAreas[0].Y;
+                tabletRenderer.PositionOutput.X = config.TabletFullArea.Width - driver.tabletState.outputX - config.TabletAreas[0].X;
+                tabletRenderer.PositionOutput.Y = config.TabletFullArea.Height - driver.tabletState.outputY - config.TabletAreas[0].Y;
+            }
+            // Normal
+            else
+            {
+                tabletRenderer.PositionInput.X = driver.tabletState.inputX - config.TabletAreas[0].X;
+                tabletRenderer.PositionInput.Y = driver.tabletState.inputY - config.TabletAreas[0].Y;
+                tabletRenderer.PositionOutput.X = driver.tabletState.outputX - config.TabletAreas[0].X;
+                tabletRenderer.PositionOutput.Y = driver.tabletState.outputY - config.TabletAreas[0].Y;
+            }
+
+            // Rotate and offset positions
+            Point rotatedPoint = new Point(0, 0);
+            config.TabletAreas[0].GetRotatedPointReverse(ref rotatedPoint, tabletRenderer.PositionInput.X, tabletRenderer.PositionInput.Y);
+            tabletRenderer.PositionInput.X = rotatedPoint.X + config.TabletAreas[0].Width / 2.0;
+            tabletRenderer.PositionInput.Y = rotatedPoint.Y + config.TabletAreas[0].Height / 2.0;
+
+            config.TabletAreas[0].GetRotatedPointReverse(ref rotatedPoint, tabletRenderer.PositionOutput.X, tabletRenderer.PositionOutput.Y);
+            tabletRenderer.PositionOutput.X = rotatedPoint.X + config.TabletAreas[0].Width / 2.0;
+            tabletRenderer.PositionOutput.Y = rotatedPoint.Y + config.TabletAreas[0].Height / 2.0;
+
+
+            // Scale to canvas
+            tabletRenderer.PositionInput.X *= tabletRenderer.ScaleX;
+            tabletRenderer.PositionInput.Y *= tabletRenderer.ScaleY;
+            tabletRenderer.PositionOutput.X *= tabletRenderer.ScaleX;
+            tabletRenderer.PositionOutput.Y *= tabletRenderer.ScaleY;
+
+
+            // Update renderer pressures
+            tabletRenderer.PressureInput = driver.tabletState.inputPressure;
+            tabletRenderer.PressureOutput = driver.tabletState.outputPressure;
+
+            //
+            // Run in the main thread
+            //
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                // Show renderer
+                if (config.TabletView.FadeInOut)
+                {
+                    double timeDelta = (DateTime.Now - lastInputStartTime).TotalMilliseconds;
+                    if (timeDelta >= 0 && timeDelta <= 800 || canvasTabletView.Opacity >= 1)
+                    {
+                        canvasTabletView.Opacity += timeDelta / 5000.0;
+                        if (canvasTabletView.Opacity >= 1)
+                            canvasTabletView.Opacity = 1;
+                    }
+                    else
+                    {
+                        canvasTabletView.Opacity = 1.0;
+                    }
+                }
+
+                // Update pen positions
+                tabletRenderer.UpdateLastPositions();
+
+                // Add draw positions
+                if (driver.tabletState.outputPressure > 0)
+                {
+                    if (lastPressure <= 0)
+                    {
+                        tabletRenderer.AddDrawPosition(-1, -1);
+                    }
+                    tabletRenderer.AddDrawPosition(tabletRenderer.PositionOutput.X, tabletRenderer.PositionOutput.Y);
+                }
+                lastPressure = driver.tabletState.outputPressure;
+
+                // Latency text
+                if (driver.tabletState.inputVelocity > 0)
+                {
+                    double dx = driver.tabletState.inputX - driver.tabletState.outputX;
+                    double dy = driver.tabletState.inputY - driver.tabletState.outputY;
+                    double distance = Math.Sqrt(dx * dx + dy * dy);
+                    double targetLatency = distance / driver.tabletState.inputVelocity * 1000.0;
+                    latency += (targetLatency - latency) / 10.0;
+                    velocity += (driver.tabletState.inputVelocity - velocity) / 20.0;
+                    textLatency.Text = "±" + Utils.GetNumberString(latency, "0") + " ms\n" +
+                    Utils.GetNumberString(Math.Round(velocity / 10.0) * 10, "0") + " mm/s";
+                }
+
+                // Render
+                tabletRenderer.InvalidateVisual();
+
+                // Update last values
+                lastPosition.X = driver.tabletState.outputX;
+                lastPosition.Y = driver.tabletState.outputY;
+                lastUpdate = DateTime.Now;
+            });
+
+        }
+
+
+        //
+        // Window key down
+        //
+        private void WindowTabletView_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                Close();
+            }
+            if (e.Key == Key.B)
+            {
+                if (canvasTabletView.Background == Brushes.White)
+                    canvasTabletView.Background = Brushes.Black;
+                else
+                    canvasTabletView.Background = Brushes.White;
+            }
+        }
+
+
+        //
+        // Window loaded
+        //
+        private void WindowTabletView_Loaded(object sender, RoutedEventArgs e)
+        {
+            double scaleX, scaleY;
+            double aspectScreen, aspectTablet;
+            double newHeight;
+
+            // Canvas default size
+            canvasTabletView.Width = 1280;
+            canvasTabletView.Height = 720;
+
+            // Tablet renderer
+            scaleX = canvasTabletView.Width / config.TabletAreas[0].Width;
+
+            // Set canvas height
+            newHeight = config.TabletAreas[0].Height * scaleX;
+            aspectScreen = config.ScreenAreas[0].Width / config.ScreenAreas[0].Height;
+            aspectTablet = config.TabletAreas[0].Width / config.TabletAreas[0].Height;
+            newHeight *= aspectTablet / aspectScreen;
+            scaleY = newHeight / config.TabletAreas[0].Height;
+            canvasTabletView.Height = newHeight;
+
+            // Set renderer scale
+            tabletRenderer.ScaleX = scaleX;
+            tabletRenderer.ScaleY = scaleY;
+
+            // Timer 
+            timer.Start();
+
+            // Enable state output
+            driver.SendCommand("StateOutput true");
+        }
+
+        //
+        // Window closed
+        //
+        private void WindowTabletView_Closing(object sender, EventArgs e)
+        {
+            if (timer.IsRunning)
+                timer.Stop();
+
+            // Disable state output
+            driver.SendCommand("StateOutput false");
+
+            // Set GC mode back to normal
+            GCSettings.LatencyMode = GCLatencyMode.Interactive;
+            GC.Collect(10, GCCollectionMode.Forced);
+        }
+
+    }
+}
diff --git a/TabletDriverGUI/WindowTabletViewSettings.xaml b/TabletDriverGUI/WindowTabletViewSettings.xaml
new file mode 100644
index 0000000..ce0ff75
--- /dev/null
+++ b/TabletDriverGUI/WindowTabletViewSettings.xaml
@@ -0,0 +1,142 @@
+<Window x:Class="TabletDriverGUI.WindowTabletViewSettings"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="Tablet View Settings"
+        Height="500" Width="300"
+        SizeToContent="Height"
+        ResizeMode="NoResize"
+        >
+
+  <Window.Resources>
+
+    <!-- GroupBox style -->
+    <Style TargetType="GroupBox">
+      <Setter Property="Background">
+        <Setter.Value>White</Setter.Value>
+      </Setter>
+      <Setter Property="HeaderTemplate">
+        <Setter.Value>
+          <DataTemplate>
+            <TextBlock Text="{Binding}" FontWeight="Bold"/>
+          </DataTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+
+    <!-- TextBox style -->
+
+    <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#999" />
+    <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#f9f9f9" />
+
+    <Style x:Key="ControlStyleTextBox" TargetType="Control">
+      <Setter Property="HorizontalContentAlignment" Value="Left"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+    </Style>
+    <Style BasedOn="{StaticResource ControlStyleTextBox}" TargetType="TextBox">
+      <Setter Property="Padding" Value="5,0"/>
+      <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="TextBox">
+            <Border Name="Bd" BorderThickness="{TemplateBinding BorderThickness}" 
+                                             BorderBrush="{TemplateBinding BorderBrush}" 
+                                             Background="{TemplateBinding Background}" 
+                                             SnapsToDevicePixels="true">
+              <ScrollViewer Name="PART_ContentHost" Background="{TemplateBinding Background}" 
+                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+            <ControlTemplate.Triggers>
+              <Trigger Property="IsEnabled" Value="False">
+                <Setter Value="{StaticResource DisabledBackgroundBrush}" Property="Background" />
+                <Setter Value="{StaticResource DisabledForegroundBrush}" Property="Foreground" />
+              </Trigger>
+            </ControlTemplate.Triggers>
+          </ControlTemplate>
+        </Setter.Value>
+      </Setter>
+    </Style>
+
+  </Window.Resources>
+
+  <StackPanel Orientation="Vertical" Margin="10">
+    <GroupBox Header="Presets">
+      <ComboBox Name="comboBoxPresets"
+                SelectionChanged="ComboBoxPresets_SelectionChanged"
+                KeyDown="ComboBoxPresets_KeyDown"
+                />
+    </GroupBox>
+
+    <GroupBox Header="Background Color">
+      <TextBox Name="textBackgroundColor">#FFFFFF</TextBox>
+    </GroupBox>
+    <GroupBox Header="Tablet Information Color">
+      <TextBox Name="textInfoColor">#ffffff</TextBox>
+    </GroupBox>
+    <GroupBox Header="Input Color">
+      <TextBox Name="textInputColor">#ffffff</TextBox>
+    </GroupBox>
+    <GroupBox Header="Output Color">
+      <TextBox Name="textOutputColor">#ffffff</TextBox>
+    </GroupBox>
+
+    <GroupBox Header="Latency Color">
+      <TextBox Name="textLatencyColor">#ffffff</TextBox>
+    </GroupBox>
+
+    <GroupBox Header="Draw Color">
+      <TextBox Name="textDrawColor">#ffffff</TextBox>
+    </GroupBox>
+
+    <GroupBox Header="Input Trail Length">
+      <TextBox Name="textInputTrailLength">30</TextBox>
+    </GroupBox>
+
+    <GroupBox Header="Output Trail Length">
+      <TextBox Name="textOutputTrailLength">30</TextBox>
+    </GroupBox>
+
+    <GroupBox Header="Draw length">
+      <TextBox Name="textDrawLength">30</TextBox>
+    </GroupBox>
+
+    <GroupBox Header="Font">
+      <TextBox Name="textFont">Arial</TextBox>
+    </GroupBox>
+
+    <GroupBox Header="Font Size">
+      <TextBox Name="textFontSize">25</TextBox>
+    </GroupBox>
+
+    <GroupBox Header="Text Offset">
+      <Grid>
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="*"/>
+          <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <TextBox Name="textOffsetTextX" Grid.Column="0" Margin="0,0,2,0">0</TextBox>
+        <TextBox Name="textOffsetTextY" Grid.Column="1" Margin="2,0,0,0">0</TextBox>
+      </Grid>
+    </GroupBox>
+
+    <GroupBox Header="Pressure Offset">
+      <Grid>
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="*"/>
+          <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <TextBox Name="textOffsetPressureX" Grid.Column="0" Margin="0,0,2,0">0</TextBox>
+        <TextBox Name="textOffsetPressureY" Grid.Column="1" Margin="2,0,0,0">0</TextBox>
+      </Grid>
+    </GroupBox>
+
+    <CheckBox Name="checkBoxFadeInOut" Margin="10,5">Fade in/out when input is detected/lost</CheckBox>
+
+    <Grid Margin="0,10,0,0">
+      <Button Name="buttonSave" Click="ButtonSave_Click" Padding="10" HorizontalAlignment="Left">Save</Button>
+      <Button Name="buttonCancel" Click="ButtonCancel_Click" Padding="10" HorizontalAlignment="Right">Cancel</Button>
+    </Grid>
+    
+  </StackPanel>
+</Window>
diff --git a/TabletDriverGUI/WindowTabletViewSettings.xaml.cs b/TabletDriverGUI/WindowTabletViewSettings.xaml.cs
new file mode 100644
index 0000000..354b07b
--- /dev/null
+++ b/TabletDriverGUI/WindowTabletViewSettings.xaml.cs
@@ -0,0 +1,206 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace TabletDriverGUI
+{
+    /// <summary>
+    /// Interaction logic for TabletViewSettings.xaml
+    /// </summary>
+    public partial class WindowTabletViewSettings : Window
+    {
+        Configuration config;
+
+        List<Configuration.Preset> presets;
+
+        public WindowTabletViewSettings(Configuration config)
+        {
+            InitializeComponent();
+            this.config = config;
+
+            presets = new List<Configuration.Preset>
+            {
+                new Configuration.Preset("Default", (c) =>
+                {
+                }),
+
+                new Configuration.Preset("OBS Overlay", (c) =>
+                {
+                    Configuration.TabletViewSettings settings = c.TabletView;
+                    settings.BackgroundColor = "#000000";
+                    settings.InfoColor = "#3333FF";
+                    settings.InputColor = "#33FF33";
+                    settings.OutputColor = "#FF3333";
+                    settings.LatencyColor = "#FFFF33";
+                    settings.DrawColor = "#FFFFFF";
+                }),
+
+                new Configuration.Preset("OBS Overlay 2", (c) =>
+                {
+                    Configuration.TabletViewSettings settings = c.TabletView;
+                    settings.BackgroundColor = "#000000";
+                    settings.InfoColor  = Utils.RGBToHexColor(50,100,255);
+                    settings.InputColor = Utils.RGBToHexColor(190,255,0);
+                    settings.OutputColor = Utils.RGBToHexColor(255,190,0);
+                    settings.LatencyColor = Utils.RGBToHexColor(230,200,0);
+                    settings.DrawColor = "#6666AA";
+                    settings.InputTrailLength = 100;
+                    settings.OutputTrailLength = 100;
+                    settings.DrawLength = 0;
+                    settings.Font = "Exo 2";
+                    settings.FontSize = 25;
+                    settings.OffsetText.X = 0;
+                    settings.OffsetText.Y = 10;
+                    settings.OffsetPressure.X = -15;
+                    settings.OffsetPressure.Y = 12;
+                    settings.FadeInOut = true;
+                }),
+
+                new Configuration.Preset("OBS Input Cursor Only", (c) =>
+                {
+                    Configuration.TabletViewSettings settings = c.TabletView;
+                    settings.BackgroundColor = "#000000";
+                    settings.InputColor = "#33FF33";
+                    settings.OutputColor = "transparent";
+                    settings.InputTrailLength = 100;
+                    settings.OutputTrailLength = 0;
+                    settings.OffsetText = new Point(0, -200);
+                    settings.OffsetPressure = new Point(0, -200);
+                    settings.FadeInOut = true;
+                }),
+
+                new Configuration.Preset("OBS Output Cursor Only", (c) =>
+                {
+                    Configuration.TabletViewSettings settings = c.TabletView;
+                    settings.BackgroundColor = "#000000";
+                    settings.InputColor = "transparent";
+                    settings.OutputColor = "#FF3333";
+                    settings.InputTrailLength = 0;
+                    settings.OutputTrailLength = 100;
+                    settings.OffsetText = new Point(0, -200);
+                    settings.OffsetPressure = new Point(0, -200);
+                    settings.FadeInOut = true;
+                }),
+
+
+            };
+
+            // Fill combobox
+            foreach (var preset in presets)
+            {
+                comboBoxPresets.Items.Add(preset);
+            }
+            comboBoxPresets.Focus();
+
+            LoadValues(config);
+
+            KeyDown += WindowTabletViewSettings_KeyDown;
+        }
+
+        private void WindowTabletViewSettings_KeyDown(object sender, KeyEventArgs e)
+        {
+            // Esc -> Cancel
+            if (e.Key == Key.Escape)
+            {
+                ButtonCancel_Click(sender, null);
+            }
+
+        }
+
+        public void LoadValues(Configuration config)
+        {
+            textBackgroundColor.Text = config.TabletView.BackgroundColor;
+            textInfoColor.Text = config.TabletView.InfoColor;
+            textInputColor.Text = config.TabletView.InputColor;
+            textOutputColor.Text = config.TabletView.OutputColor;
+            textLatencyColor.Text = config.TabletView.LatencyColor;
+            textDrawColor.Text = config.TabletView.DrawColor;
+            textInputTrailLength.Text = Utils.GetNumberString(config.TabletView.InputTrailLength);
+            textOutputTrailLength.Text = Utils.GetNumberString(config.TabletView.OutputTrailLength);
+            textDrawLength.Text = Utils.GetNumberString(config.TabletView.DrawLength);
+            textFont.Text = config.TabletView.Font;
+            textFontSize.Text = Utils.GetNumberString(config.TabletView.FontSize);
+            textOffsetTextX.Text = Utils.GetNumberString(config.TabletView.OffsetText.X);
+            textOffsetTextY.Text = Utils.GetNumberString(config.TabletView.OffsetText.Y);
+            textOffsetPressureX.Text = Utils.GetNumberString(config.TabletView.OffsetPressure.X);
+            textOffsetPressureY.Text = Utils.GetNumberString(config.TabletView.OffsetPressure.Y);
+            checkBoxFadeInOut.IsChecked = config.TabletView.FadeInOut;
+        }
+
+        public void StoreValues()
+        {
+
+            config.TabletView.BackgroundColor = textBackgroundColor.Text;
+            config.TabletView.InfoColor = textInfoColor.Text;
+            config.TabletView.InputColor = textInputColor.Text;
+            config.TabletView.OutputColor = textOutputColor.Text;
+            config.TabletView.LatencyColor = textLatencyColor.Text;
+            config.TabletView.DrawColor = textDrawColor.Text;
+            config.TabletView.Font = textFont.Text;
+
+            if (Utils.ParseNumber(textInputTrailLength.Text, out double value))
+                config.TabletView.InputTrailLength = (int)value;
+            if (config.TabletView.InputTrailLength < 0)
+                config.TabletView.InputTrailLength = 0;
+
+            if (Utils.ParseNumber(textOutputTrailLength.Text, out value))
+                config.TabletView.OutputTrailLength = (int)value;
+            if (config.TabletView.OutputTrailLength < 0)
+                config.TabletView.OutputTrailLength = 0;
+
+            if (Utils.ParseNumber(textDrawLength.Text, out value))
+                config.TabletView.DrawLength = (int)value;
+            if (config.TabletView.DrawLength < 0)
+                config.TabletView.DrawLength = 0;
+
+            if (Utils.ParseNumber(textFontSize.Text, out value))
+                config.TabletView.FontSize = value;
+            if (Utils.ParseNumber(textOffsetTextX.Text, out value))
+                config.TabletView.OffsetText.X = value;
+            if (Utils.ParseNumber(textOffsetTextY.Text, out value))
+                config.TabletView.OffsetText.Y = value;
+            if (Utils.ParseNumber(textOffsetPressureX.Text, out value))
+                config.TabletView.OffsetPressure.X = value;
+            if (Utils.ParseNumber(textOffsetPressureY.Text, out value))
+                config.TabletView.OffsetPressure.Y = value;
+            config.TabletView.FadeInOut = (bool)checkBoxFadeInOut.IsChecked;
+
+        }
+
+        private void ButtonSave_Click(object sender, RoutedEventArgs e)
+        {
+            StoreValues();
+            DialogResult = true;
+            Close();
+        }
+
+        private void ButtonCancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+
+        private void ComboBoxPresets_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (comboBoxPresets.SelectedItem != null)
+            {
+                Configuration tmpConfig = new Configuration();
+                Configuration.Preset preset = (Configuration.Preset)comboBoxPresets.SelectedItem;
+                preset.Action(tmpConfig);
+                LoadValues(tmpConfig);
+            }
+        }
+
+        private void ComboBoxPresets_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                ButtonSave_Click(sender, null);
+            }
+        }
+    }
+}
diff --git a/TabletDriverGUI/WacomArea.xaml b/TabletDriverGUI/WindowWacomArea.xaml
similarity index 83%
rename from TabletDriverGUI/WacomArea.xaml
rename to TabletDriverGUI/WindowWacomArea.xaml
index 7e8b267..67ddd25 100644
--- a/TabletDriverGUI/WacomArea.xaml
+++ b/TabletDriverGUI/WindowWacomArea.xaml
@@ -1,57 +1,60 @@
-<Window x:Class="TabletDriverGUI.WacomArea"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:TabletDriverGUI"
-        mc:Ignorable="d"
-        Title="Wacom Intuos/Bamboo area" Height="250" Width="350">
-  <Grid>
-    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-      <StackPanel Orientation="Horizontal">
-
-        <!-- Wacom Top -->
-        <GroupBox Header="Top" Height="50" Width="100" Margin="5">
-          <Grid>
-            <TextBox Name="textWacomTop" Padding="4,0,0,0" HorizontalContentAlignment="Left" VerticalContentAlignment="Center"/>
-          </Grid>
-        </GroupBox>
-
-        <!-- Wacom Bottom -->
-        <GroupBox Header="Bottom" Height="50" Width="100" Margin="5">
-          <Grid>
-            <TextBox Name="textWacomBottom" Padding="4,0,0,0" HorizontalContentAlignment="Left" VerticalContentAlignment="Center"/>
-          </Grid>
-        </GroupBox>
-      </StackPanel>
-
-      <StackPanel Orientation="Horizontal">
-
-
-        <!-- Wacom Top -->
-        <GroupBox Header="Left" Height="50" Width="100" Margin="5">
-          <Grid>
-            <TextBox Name="textWacomLeft" Padding="4,0,0,0" HorizontalContentAlignment="Left" VerticalContentAlignment="Center"/>
-          </Grid>
-        </GroupBox>
-
-        <!-- Wacom Right -->
-        <GroupBox Header="Right" Height="50" Width="100" Margin="5">
-          <Grid>
-            <TextBox Name="textWacomRight" Padding="4,0,0,0" HorizontalContentAlignment="Left" VerticalContentAlignment="Center"/>
-          </Grid>
-        </GroupBox>
-
-
-
-      </StackPanel>
-      <Button Name="buttonLoad" Content="Load From Backup" Padding="5" Width="120" Margin="5" Click="ButtonLoad_Click" />
-      <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-
-        <Button Name="buttonSet" Content="Set" Padding="5" Margin="5" Width="50" Click="ButtonSet_Click"/>
-        <Button Name="buttonCancel" Content="Cancel" Padding="5" Width="60" Margin="5" Click="ButtonCancel_Click" />
-        
-      </StackPanel>
-    </StackPanel>
-  </Grid>
-</Window>
+<Window x:Class="TabletDriverGUI.WindowWacomArea"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:TabletDriverGUI"
+        mc:Ignorable="d"
+        Title="Wacom Intuos/Bamboo area" Height="350" Width="350"
+        MinWidth="350"
+        SizeToContent="WidthAndHeight">
+  <Grid VerticalAlignment="Center" HorizontalAlignment="Center">
+    <StackPanel Margin="10">
+      <StackPanel Orientation="Horizontal">
+
+        <!-- Wacom Top -->
+        <GroupBox Header="Top" Height="50" Width="100" Margin="5">
+          <Grid>
+            <TextBox Name="textWacomTop" Padding="4,0,0,0" HorizontalContentAlignment="Left" VerticalContentAlignment="Center"/>
+          </Grid>
+        </GroupBox>
+
+        <!-- Wacom Bottom -->
+        <GroupBox Header="Bottom" Height="50" Width="100" Margin="5">
+          <Grid>
+            <TextBox Name="textWacomBottom" Padding="4,0,0,0" HorizontalContentAlignment="Left" VerticalContentAlignment="Center"/>
+          </Grid>
+        </GroupBox>
+      </StackPanel>
+
+      <StackPanel Orientation="Horizontal">
+
+
+        <!-- Wacom Top -->
+        <GroupBox Header="Left" Height="50" Width="100" Margin="5">
+          <Grid>
+            <TextBox Name="textWacomLeft" Padding="4,0,0,0" HorizontalContentAlignment="Left" VerticalContentAlignment="Center"/>
+          </Grid>
+        </GroupBox>
+
+        <!-- Wacom Right -->
+        <GroupBox Header="Right" Height="50" Width="100" Margin="5">
+          <Grid>
+            <TextBox Name="textWacomRight" Padding="4,0,0,0" HorizontalContentAlignment="Left" VerticalContentAlignment="Center"/>
+          </Grid>
+        </GroupBox>
+
+
+
+      </StackPanel>
+      <Button Name="buttonForceProportions" Content="Force proportions" Padding="5" Width="120" Margin="5" Click="ButtonForceProportions_Click" />
+      <Button Name="buttonLoad" Content="Load From Backup" Padding="5" Width="120" Margin="5" Click="ButtonLoad_Click" />
+      <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+
+        <Button Name="buttonSet" Content="Set" Padding="5" Margin="5" Width="50" Click="ButtonSet_Click"/>
+        <Button Name="buttonCancel" Content="Cancel" Padding="5" Width="60" Margin="5" Click="ButtonCancel_Click" />
+        
+      </StackPanel>
+    </StackPanel>
+  </Grid>
+</Window>
diff --git a/TabletDriverGUI/WacomArea.xaml.cs b/TabletDriverGUI/WindowWacomArea.xaml.cs
similarity index 56%
rename from TabletDriverGUI/WacomArea.xaml.cs
rename to TabletDriverGUI/WindowWacomArea.xaml.cs
index ee5be50..e2d5cc3 100644
--- a/TabletDriverGUI/WacomArea.xaml.cs
+++ b/TabletDriverGUI/WindowWacomArea.xaml.cs
@@ -1,138 +1,236 @@
-using Microsoft.Win32;
-using System;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Windows;
-
-namespace TabletDriverGUI
-{
-    /// <summary>
-    /// Interaction logic for WacomArea.xaml
-    /// </summary>
-    public partial class WacomArea : Window
-    {
-        public WacomArea()
-        {
-            WindowStartupLocation = WindowStartupLocation.CenterScreen;
-            InitializeComponent();
-        }
-
-        private void ButtonSet_Click(object sender, RoutedEventArgs e)
-        {
-            DialogResult = true;
-        }
-
-        private void ButtonCancel_Click(object sender, RoutedEventArgs e)
-        {
-            DialogResult = false;
-        }
-
-        private void ButtonLoad_Click(object sender, RoutedEventArgs e)
-        {
-            OpenFileDialog dialog = new OpenFileDialog
-            {
-                InitialDirectory = Directory.GetCurrentDirectory(),
-                Filter = "Wacom Backup(*.wacomprefs;*.tabletprefs)|*.wacomprefs;*.tabletprefs"
-            };
-            if (dialog.ShowDialog() == true)
-            {
-                LoadFromBackup(dialog.FileName);
-            }
-        }
-
-        //
-        // Load setting from Wacom backup
-        //
-        private void LoadFromBackup(string filepath)
-        {
-            try
-            {
-                string data = File.ReadAllText(filepath);
-                data = data.Replace("&lt;", "<");
-                data = data.Replace("&gt;", ">");
-
-                double[] areaValues = new double[4] { 0, 0, 0, 0 };
-                double[] lastAreaValues = new double[4];
-                bool first = true;
-
-                /*
-                <TabletInputArea type="map">
-                    <Extent type="map">
-                        <X type="integer">15200</X>
-                        <Y type="integer">9500</Y>
-                        <Z type="integer">0</Z>
-                    </Extent>
-                    <Origin type="map">
-                        <X type="integer">0</X>
-                        <Y type="integer">0</Y>
-                        <Z type="integer">0</Z>
-                    </Origin>
-                </TabletInputArea>
-                */
-
-                //
-                // Regular expression
-                //
-                MatchCollection matches = Regex.Matches(
-                    data,
-                    "<TabletInputArea[^>]*>.*?" +
-                    "<Extent.*?" +
-                    "<X type=\"integer\">([0-9]+)</X>.*?" +
-                    "<Y type=\"integer\">([0-9]+)</Y>.*?" +
-                    "<Origin.*?" +
-                    "<X type=\"integer\">([0-9]+)</X>.*?" +
-                    "<Y type=\"integer\">([0-9]+)</Y>.*?" +
-                    "</TabletInputArea>",
-                    RegexOptions.Singleline | RegexOptions.IgnoreCase
-                );
-
-                //
-                // Loop through regex matches
-                //
-                foreach (Match match in matches)
-                {
-                    if (
-                        Utils.ParseNumber(match.Groups[1].ToString(), out areaValues[0]) &&
-                        Utils.ParseNumber(match.Groups[2].ToString(), out areaValues[1]) &&
-                        Utils.ParseNumber(match.Groups[3].ToString(), out areaValues[2]) &&
-                        Utils.ParseNumber(match.Groups[4].ToString(), out areaValues[3])
-                    )
-                    {
-                        // Stop at first different area value set
-                        if (!first && !areaValues.SequenceEqual(lastAreaValues))
-                            break;
-
-                        Array.Copy(areaValues, lastAreaValues, 4);
-                        first = false;
-                    }
-                }
-
-                // Set text fields
-                if (areaValues[0] != 0 && areaValues[1] != 0)
-                {
-                    textWacomLeft.Text = Utils.GetNumberString(areaValues[2]);
-                    textWacomRight.Text = Utils.GetNumberString(areaValues[2] + areaValues[0]);
-                    textWacomTop.Text = Utils.GetNumberString(areaValues[3]);
-                    textWacomBottom.Text = Utils.GetNumberString(areaValues[3] + areaValues[1]);
-                }
-
-                // Show error
-                else
-                {
-                    MessageBox.Show("Couldn't read the backup file!", "ERROR!",
-                        MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-
-            }
-
-            // Exception
-            catch (Exception)
-            {
-                MessageBox.Show("Couldn't read the backup file!", "ERROR!",
-                    MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-
-        }
-    }
-}
+using Microsoft.Win32;
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Windows;
+
+namespace TabletDriverGUI
+{
+    /// <summary>
+    /// Interaction logic for WacomArea.xaml
+    /// </summary>
+    public partial class WindowWacomArea : Window
+    {
+        private Configuration config;
+        private Area tabletArea;
+
+        public WindowWacomArea(Configuration configuration, Area TabletArea)
+        {
+            WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            Owner = Application.Current.MainWindow;
+            InitializeComponent();
+
+            config = configuration;
+            tabletArea = TabletArea;
+            LoadValues();
+
+        }
+
+        private void LoadValues()
+        {
+            textWacomLeft.Text = Utils.GetNumberString((tabletArea.X - tabletArea.Width / 2) * 100.0, "0");
+            textWacomRight.Text = Utils.GetNumberString((tabletArea.X + tabletArea.Width / 2) * 100.0, "0");
+
+            textWacomTop.Text = Utils.GetNumberString((tabletArea.Y - tabletArea.Height / 2) * 100.0, "0");
+            textWacomBottom.Text = Utils.GetNumberString((tabletArea.Y + tabletArea.Height / 2) * 100.0, "0");
+        }
+
+        private void StoreValues()
+        {
+            if (
+                Utils.ParseNumber(textWacomLeft.Text, out double left) &&
+                Utils.ParseNumber(textWacomRight.Text, out double right) &&
+                Utils.ParseNumber(textWacomTop.Text, out double top) &&
+                Utils.ParseNumber(textWacomBottom.Text, out double bottom)
+            )
+            {
+                double width, height;
+                width = right - left;
+                height = bottom - top;
+                config.ForceAspectRatio = false;
+                tabletArea.X = (left + width / 2.0) / 100.0;
+                tabletArea.Y = (top + height / 2.0) / 100.0;
+                tabletArea.Width = width / 100.0;
+                tabletArea.Height = height / 100.0;
+            }
+            else
+            {
+                MessageBox.Show("Invalid values!", "Wacom area error!", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        //
+        // Set button
+        //
+        private void ButtonSet_Click(object sender, RoutedEventArgs e)
+        {
+            StoreValues();
+            DialogResult = true;
+        }
+
+        //
+        // Cancel button
+        //
+        private void ButtonCancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+        }
+
+        //
+        // Force proportions
+        //
+        private void ButtonForceProportions_Click(object sender, RoutedEventArgs e)
+        {
+            if (Utils.ParseNumber(textWacomLeft.Text, out double left) &&
+                Utils.ParseNumber(textWacomRight.Text, out double right) &&
+                Utils.ParseNumber(textWacomTop.Text, out double top) &&
+                Utils.ParseNumber(textWacomBottom.Text, out double bottom)
+            )
+            {
+                double width, height;
+                width = right - left;
+                height = bottom - top;
+
+                double screenAspectRatio = config.SelectedScreenArea.Width / config.SelectedScreenArea.Height;
+                double tabletAspectRatio = width / height;
+
+                // Tablet aspect ratio higher -> change width
+                if (tabletAspectRatio >= screenAspectRatio)
+                {
+                    width = height * screenAspectRatio;
+
+                }
+
+                // Tablet aspect ratio lower -> change  height
+                else
+                {
+                    height = width / screenAspectRatio;
+
+                }
+
+                right = left + width;
+                bottom = top + height;
+
+                textWacomRight.Text = Utils.GetNumberString(right, "0");
+                textWacomBottom.Text = Utils.GetNumberString(bottom, "0");
+            }
+            else
+            {
+                MessageBox.Show("Invalid values!", "Wacom area error!", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        //
+        // Load button
+        //
+        private void ButtonLoad_Click(object sender, RoutedEventArgs e)
+        {
+            OpenFileDialog dialog = new OpenFileDialog
+            {
+                InitialDirectory = Directory.GetCurrentDirectory(),
+                Filter = "Wacom Backup(*.wacomprefs;*.tabletprefs)|*.wacomprefs;*.tabletprefs"
+            };
+            if (dialog.ShowDialog() == true)
+            {
+                LoadFromBackup(dialog.FileName);
+            }
+        }
+
+        //
+        // Load setting from Wacom backup
+        //
+        private void LoadFromBackup(string filepath)
+        {
+            try
+            {
+                string data = File.ReadAllText(filepath);
+                data = data.Replace("&lt;", "<");
+                data = data.Replace("&gt;", ">");
+
+                double[] areaValues = new double[4] { 0, 0, 0, 0 };
+                double[] lastAreaValues = new double[4];
+                bool first = true;
+
+                /*
+                <TabletInputArea type="map">
+                    <Extent type="map">
+                        <X type="integer">15200</X>
+                        <Y type="integer">9500</Y>
+                        <Z type="integer">0</Z>
+                    </Extent>
+                    <Origin type="map">
+                        <X type="integer">0</X>
+                        <Y type="integer">0</Y>
+                        <Z type="integer">0</Z>
+                    </Origin>
+                </TabletInputArea>
+                */
+
+                //
+                // Regular expression
+                //
+                MatchCollection matches = Regex.Matches(
+                    data,
+                    "<TabletInputArea[^>]*>.*?" +
+                    "<Extent.*?" +
+                    "<X type=\"integer\">([0-9]+)</X>.*?" +
+                    "<Y type=\"integer\">([0-9]+)</Y>.*?" +
+                    "<Origin.*?" +
+                    "<X type=\"integer\">([0-9]+)</X>.*?" +
+                    "<Y type=\"integer\">([0-9]+)</Y>.*?" +
+                    "</TabletInputArea>",
+                    RegexOptions.Singleline | RegexOptions.IgnoreCase
+                );
+
+                //
+                // Loop through regex matches
+                //
+                foreach (Match match in matches)
+                {
+                    if (
+                        Utils.ParseNumber(match.Groups[1].ToString(), out areaValues[0]) &&
+                        Utils.ParseNumber(match.Groups[2].ToString(), out areaValues[1]) &&
+                        Utils.ParseNumber(match.Groups[3].ToString(), out areaValues[2]) &&
+                        Utils.ParseNumber(match.Groups[4].ToString(), out areaValues[3])
+                    )
+                    {
+                        // Stop at first different area value set
+                        if (!first && !areaValues.SequenceEqual(lastAreaValues))
+                            break;
+
+                        Array.Copy(areaValues, lastAreaValues, 4);
+                        first = false;
+                    }
+                }
+
+                // Set text fields
+                if (areaValues[0] != 0 && areaValues[1] != 0)
+                {
+                    textWacomLeft.Text = Utils.GetNumberString(areaValues[2]);
+                    textWacomRight.Text = Utils.GetNumberString(areaValues[2] + areaValues[0]);
+                    textWacomTop.Text = Utils.GetNumberString(areaValues[3]);
+                    textWacomBottom.Text = Utils.GetNumberString(areaValues[3] + areaValues[1]);
+                }
+
+                // Show error
+                else
+                {
+                    MessageBox.Show("Couldn't read the backup file!", "ERROR!",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+
+            }
+
+            // Exception
+            catch (Exception)
+            {
+                MessageBox.Show("Couldn't read the backup file!", "ERROR!",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+        }
+
+
+    }
+}
diff --git a/TabletDriverService/CommandHandler.Auxiliary.cpp b/TabletDriverService/CommandHandler.Auxiliary.cpp
index 1bfd73f..c4cf372 100644
--- a/TabletDriverService/CommandHandler.Auxiliary.cpp
+++ b/TabletDriverService/CommandHandler.Auxiliary.cpp
@@ -36,14 +36,30 @@ void CommandHandler::CreateAuxCommands() {
 		return false;
 	}));
 
+	//
+	// Command: AuxReport
+	//
+	AddCommand(new Command("AuxReport", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.auxCurrentReportIndex = cmd->GetInt(0, tablet->settings.auxCurrentReportIndex);
+		tablet->settings.auxCurrentReport = &tablet->settings.auxReports[tablet->settings.auxCurrentReportIndex];
+		if(tablet->settings.auxCurrentReportIndex >= tablet->settings.auxReportCount - 1) {
+			tablet->settings.auxReportCount = tablet->settings.auxCurrentReportIndex + 1;
+		}
+		LOG_INFO("Auxiliary report index = %d (%d reports)\n",
+			tablet->settings.auxCurrentReportIndex,
+			tablet->settings.auxReportCount
+		);
+		return true;
+	}));
 
 	//
 	// Command: AuxReportId
 	//
 	AddCommand(new Command("AuxReportId", [&](CommandLine *cmd) {
 		if(tablet == NULL) return false;
-		tablet->settings.auxReportId = cmd->GetInt(0, tablet->settings.auxReportId);
-		LOG_INFO("Tablet aux report id = %d\n", tablet->settings.auxReportId);
+		tablet->settings.auxCurrentReport->reportId = cmd->GetInt(0, tablet->settings.auxCurrentReport->reportId);
+		LOG_INFO("Auxiliary report id = %d\n", tablet->settings.auxCurrentReport->reportId);
 		return true;
 	}));
 
@@ -64,8 +80,8 @@ void CommandHandler::CreateAuxCommands() {
 	//
 	AddCommand(new Command("AuxDetectMask", [&](CommandLine *cmd) {
 		if(tablet == NULL) return false;
-		tablet->settings.auxDetectMask = cmd->GetInt(0, tablet->settings.auxDetectMask);
-		LOG_INFO("Tablet aux detect mask = 0x%02X\n", tablet->settings.auxDetectMask);
+		tablet->settings.auxCurrentReport->detectMask = cmd->GetInt(0, tablet->settings.auxCurrentReport->detectMask);
+		LOG_INFO("Auxiliary detect mask = 0x%02X\n", tablet->settings.auxCurrentReport->detectMask);
 		return true;
 	}));
 
@@ -75,8 +91,8 @@ void CommandHandler::CreateAuxCommands() {
 	//
 	AddCommand(new Command("AuxIgnoreMask", [&](CommandLine *cmd) {
 		if(tablet == NULL) return false;
-		tablet->settings.auxIgnoreMask = cmd->GetInt(0, tablet->settings.auxIgnoreMask);
-		LOG_INFO("Tablet aux ignore mask = 0x%02X\n", tablet->settings.auxIgnoreMask);
+		tablet->settings.auxCurrentReport->ignoreMask = cmd->GetInt(0, tablet->settings.auxCurrentReport->ignoreMask);
+		LOG_INFO("Tablet aux ignore mask = 0x%02X\n", tablet->settings.auxCurrentReport->ignoreMask);
 		return true;
 	}));
 
@@ -99,7 +115,7 @@ void CommandHandler::CreateAuxCommands() {
 	//
 	AddCommand(new Command("ClearAuxCustomData", [&](CommandLine *cmd) {
 		if(tablet == NULL) return false;
-		tablet->auxDataFormatter.instructionCount = 0;
+		tablet->settings.auxCurrentReport->formatter.instructionCount = 0;
 		LOG_INFO("Custom aux data format instructions cleared!\n");
 		return true;
 	}));
diff --git a/TabletDriverService/CommandHandler.Device.cpp b/TabletDriverService/CommandHandler.Device.cpp
index 9a43b92..3b5f230 100644
--- a/TabletDriverService/CommandHandler.Device.cpp
+++ b/TabletDriverService/CommandHandler.Device.cpp
@@ -32,6 +32,9 @@ void CommandHandler::CreateDeviceCommands() {
 					LOG_WARNING("Can't open WinUSB tablet '%s'\n", guid.c_str());
 					delete tablet;
 					tablet = NULL;
+
+					// Slow down to save CPU time on startup
+					Sleep(10);
 				}
 			}
 		}
@@ -90,6 +93,9 @@ void CommandHandler::CreateDeviceCommands() {
 						isExclusive ? "True" : "False");
 					delete tablet;
 					tablet = NULL;
+
+					// Slow down to save CPU time on startup
+					Sleep(10);
 				}
 			}
 		}
@@ -162,13 +168,12 @@ void CommandHandler::CreateDeviceCommands() {
 		if(cmd->valueCount <= 1) return false;
 		if(tablet == NULL) return false;
 		if(tablet->hidDevice == NULL) return false;
-		int length = cmd->GetInt(0, 1);
-		BYTE *buffer = new BYTE[length];
-		for(int i = 0; i < length; i++) {
-			buffer[i] = cmd->GetInt(i + 1, 0);
+		BYTE *buffer = new BYTE[cmd->valueCount];
+		for(int i = 0; i < cmd->valueCount; i++) {
+			buffer[i] = cmd->GetInt(i, 0);
 		}
-		LOG_INFOBUFFER(buffer, length, "Set Feature Report (%d): ", length);
-		tablet->hidDevice->SetFeature(buffer, length);
+		LOG_INFOBUFFER(buffer, cmd->valueCount, "Set Feature Report (%d): ", cmd->valueCount);
+		tablet->hidDevice->SetFeature(buffer, cmd->valueCount);
 		LOG_INFO("HID Feature set!\n");
 		delete buffer;
 		return true;
@@ -207,13 +212,12 @@ void CommandHandler::CreateDeviceCommands() {
 		if(cmd->valueCount <= 1) return false;
 		if(tablet == NULL) return false;
 		if(tablet->hidDevice == NULL) return false;
-		int length = cmd->GetInt(0, 1);
-		BYTE *buffer = new BYTE[length];
-		for(int i = 0; i < length; i++) {
-			buffer[i] = cmd->GetInt(i + 1, 0);
+		BYTE *buffer = new BYTE[cmd->valueCount];
+		for(int i = 0; i < cmd->valueCount; i++) {
+			buffer[i] = cmd->GetInt(i, 0);
 		}
-		LOG_INFOBUFFER(buffer, length, "Sending HID Report: ");
-		tablet->hidDevice->Write(buffer, length);
+		LOG_INFOBUFFER(buffer, cmd->valueCount, "Sending HID Report: ");
+		tablet->hidDevice->Write(buffer, cmd->valueCount);
 		LOG_INFO("Report sent!\n");
 		delete buffer;
 		return true;
diff --git a/TabletDriverService/CommandHandler.Filters.cpp b/TabletDriverService/CommandHandler.Filters.cpp
index bd22a9a..ee7f6c8 100644
--- a/TabletDriverService/CommandHandler.Filters.cpp
+++ b/TabletDriverService/CommandHandler.Filters.cpp
@@ -19,10 +19,7 @@ void CommandHandler::CreateFilterCommands() {
 		if(!ExecuteCommand("TabletValid")) return false;
 
 		double latency = cmd->GetDouble(0, tablet->smoothing.GetLatency());
-		double threshold = cmd->GetDouble(1, tablet->smoothing.threshold * 100);
-		bool onlyWhenButtonsDown = cmd->GetBoolean(2, tablet->smoothing.onlyWhenButtonsDown);
-
-		threshold /= 100;
+		bool onlyWhenButtonsDown = cmd->GetBoolean(1, tablet->smoothing.onlyWhenButtonsDown);
 
 		string stringValue = cmd->GetStringLower(0, "");
 
@@ -34,11 +31,6 @@ void CommandHandler::CreateFilterCommands() {
 		// Limits
 		if(latency < 0) latency = 1;
 		if(latency > 1000) latency = 1000;
-		if(threshold < 0.1) threshold = 0.1;
-		if(threshold > 0.99) threshold = 0.99;
-
-		// Set threshold
-		tablet->smoothing.threshold = threshold;
 
 		// Set smoothing filter latency
 		tablet->smoothing.SetLatency(latency);
@@ -50,7 +42,8 @@ void CommandHandler::CreateFilterCommands() {
 		if(tablet->smoothing.weight < 1.0) {
 			tablet->smoothing.isEnabled = true;
 			LOG_INFO("Smoothing = %0.2f ms to reach %0.0f%% (weight = %f), OnlyWhenButtonDown=%s\n",
-				latency, tablet->smoothing.threshold * 100,
+				latency,
+				tablet->smoothing.threshold * 100,
 				tablet->smoothing.weight,
 				tablet->smoothing.onlyWhenButtonsDown ? "True" : "False"
 
@@ -65,6 +58,49 @@ void CommandHandler::CreateFilterCommands() {
 	}));
 
 
+	//
+	// Command: AdvancedSmoothingFilter, AdvancedSmoothing
+	//
+	// Enables/disables advanced smoothing and clears settings
+	//
+	AddAlias("AdvancedSmoothing", "AdvancedSmoothingFilter");
+	AddCommand(new Command("AdvancedSmoothingFilter", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		tablet->advancedSmoothing.isEnabled = cmd->GetBoolean(0, tablet->advancedSmoothing.isEnabled);
+		tablet->advancedSmoothing.ClearSettings();
+
+		if(tablet->advancedSmoothing.isEnabled) {
+			LOG_INFO("Advanced smoothing = enabled\n");
+		}
+		else {
+			LOG_INFO("Advanced smoothing = disabled\n");
+		}
+		return true;
+	}));
+
+
+	//
+	// Command: AdvancedSmoothingAdd
+	//
+	// Sets advanced smoothing filter parameters
+	//
+	AddCommand(new Command("AdvancedSmoothingAdd", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		if(cmd->valueCount >= 3) {
+			double velocity = cmd->GetDouble(0, 0);
+			bool dragging = cmd->GetBoolean(1, false);
+			double latency = cmd->GetDouble(2, 0);
+			tablet->advancedSmoothing.AddSettings(velocity, dragging, latency);
+			LOG_INFO("Advanced smoothing setting added: %3d mm/s %s %3d ms\n", (int)velocity, dragging ? "drag " : "hover", (int)latency);
+		}
+		else {
+			LOG_INFO("Usage %s <velocity(mm/s)> <dragging? (true/false)> <latency(ms)>\n", cmd->command.c_str());
+		}
+		return true;
+	}));
+
+
 	//
 	// Command: GravityFilter, Gravity
 	//
@@ -129,8 +165,10 @@ void CommandHandler::CreateFilterCommands() {
 			tablet->noiseFilter.isEnabled = false;
 			LOG_INFO("Noise Reduction = off\n");
 
-			// Enable
+
 		}
+
+		// Enable
 		else {
 
 			// Position buffer length
@@ -198,48 +236,47 @@ void CommandHandler::CreateFilterCommands() {
 		string stringValue = cmd->GetStringLower(0, "");
 
 		// Off / False
-		if(stringValue == "off" || stringValue == "false") {
+		if(stringValue == "off") {
 			tablet->antiSmoothing.isEnabled = false;
 			LOG_INFO("Anti-smoothing = off\n");
 
-			// Enable
+
 		}
+
+		// Enable
 		else {
 
-			double shape = cmd->GetDouble(0, tablet->antiSmoothing.shape);
-			double compensation = cmd->GetDouble(1, tablet->antiSmoothing.compensation);
-			bool onlyWhenHover = cmd->GetBoolean(2, tablet->antiSmoothing.onlyWhenHover);
+			bool onlyWhenHover = cmd->GetBoolean(0, tablet->antiSmoothing.onlyWhenHover);
+			double dragMultiplier = cmd->GetDouble(1, tablet->antiSmoothing.dragMultiplier);
 
 			// Workaround for VEIKK S640
 			double defaultTargetReportRate = 0;
 			if(
 				tablet != NULL &&
 				tablet->hidDevice != NULL &&
-				tablet->hidDevice->vendorId == 0x2FEB
+				tablet->hidDevice->vendorId == 0x2FEB &&
+				tablet->hidDevice->vendorId == 0x0001
 			) {
 				defaultTargetReportRate = 250;
 			}
-			double targetReportRate = cmd->GetDouble(3, defaultTargetReportRate);
-			
+			double targetReportRate = cmd->GetDouble(2, defaultTargetReportRate);
+
 
 			if(cmd->valueCount == 0) {
-				LOG_INFO("Usage: %s <shape> <compensation> <only on hover> <target report rate>\n", cmd->command.c_str());
-			}
-			else if(shape <= 0) {
-				tablet->antiSmoothing.isEnabled = false;
-				LOG_INFO("Anti-smoothing = off\n");
+				LOG_INFO("Usage: %s <only on hover> <drag multiplier> <target report rate>\n", cmd->command.c_str());
 			}
 			else {
-				tablet->antiSmoothing.shape = shape;
-				tablet->antiSmoothing.compensation = compensation;
+				tablet->antiSmoothing.ClearSettings();
 				tablet->antiSmoothing.onlyWhenHover = onlyWhenHover;
+				tablet->antiSmoothing.dragMultiplier = dragMultiplier;
 				tablet->antiSmoothing.targetReportRate = targetReportRate;
 
 				tablet->antiSmoothing.isEnabled = true;
-				LOG_INFO("Anti-smoothing = Shape:%0.3f Compensation:%0.2f OnlyOnHover:%s TargetRPS:%0.2f\n",
-					tablet->antiSmoothing.shape,
-					tablet->antiSmoothing.compensation,
+				LOG_INFO("Anti-smoothing = Shape:%0.3f Compensation:%0.2f OnlyOnHover:%s DragMultiplier:%0.2f TargetRPS:%0.2f\n",
+					tablet->antiSmoothing.settings[0].shape,
+					tablet->antiSmoothing.settings[0].compensation,
 					tablet->antiSmoothing.onlyWhenHover ? "true" : "false",
+					tablet->antiSmoothing.dragMultiplier,
 					tablet->antiSmoothing.targetReportRate
 
 				);
@@ -249,6 +286,34 @@ void CommandHandler::CreateFilterCommands() {
 	}));
 
 
+	//
+	// Command: AntiSmoothingAdd, AntiAdd
+	//
+	AddAlias("AntiAdd", "AntiSmoothingAdd");
+	AddCommand(new Command("AntiSmoothingAdd", [&](CommandLine *cmd) {
+
+		double velocity = cmd->GetDouble(0, 0);
+		double shape = cmd->GetDouble(1, 0.5);
+		double compensation = cmd->GetDouble(2, 0);
+
+
+		if(cmd->valueCount < 3) {
+			LOG_INFO("Usage: %s <velocity> <shape> <compensation>\n", cmd->command.c_str());
+		}
+		else {
+			tablet->antiSmoothing.AddSettings(velocity, shape, compensation);
+			LOG_INFO("Anti-smoothing setting: Velocity:%0.2f mm/s Shape:%0.3f Compensation:%0.2f\n",
+				velocity,
+				shape,
+				compensation
+			);
+		}
+
+		return true;
+	}));
+
+
+
 	//
 	// Command: FilterTimerInterval, TimerInterval, Interval
 	//
@@ -297,14 +362,20 @@ void CommandHandler::CreateFilterCommands() {
 		// Anti-smoothing
 		if(tablet->antiSmoothing.isEnabled) {
 			filterAntiSmoothing = new TabletFilterAntiSmoothing();
-			filterAntiSmoothing->shape = tablet->antiSmoothing.shape;
-			filterAntiSmoothing->compensation = tablet->antiSmoothing.compensation;
+			filterAntiSmoothing->settingCount = tablet->antiSmoothing.settingCount;
+			for(int i = 0; i < filterAntiSmoothing->settingCount; i++) {
+				filterAntiSmoothing->settings[i].velocity = tablet->antiSmoothing.settings[i].velocity;
+				filterAntiSmoothing->settings[i].shape = tablet->antiSmoothing.settings[i].shape;
+				filterAntiSmoothing->settings[i].compensation = tablet->antiSmoothing.settings[i].compensation;
+			}
 			filterAntiSmoothing->onlyWhenHover = tablet->antiSmoothing.onlyWhenHover;
+			filterAntiSmoothing->targetReportRate = tablet->antiSmoothing.targetReportRate;
 			settingsStringIndex += sprintf_s((settingsString + settingsStringIndex), settingsStringSize - settingsStringIndex,
-				"settings AntiSmoothing shape=%0.3f compensation=%0.3f dragignore=%s\r\n",
-				tablet->antiSmoothing.shape,
-				tablet->antiSmoothing.compensation,
-				tablet->antiSmoothing.onlyWhenHover ? "true" : "false"
+				"settings AntiSmoothing Shape=%0.3f Compensation=%0.3f OnlyWhenHover=%s TargetRPS=%0.2f\r\n",
+				tablet->antiSmoothing.settings[0].shape,
+				tablet->antiSmoothing.settings[0].compensation,
+				tablet->antiSmoothing.onlyWhenHover ? "true" : "false",
+				tablet->antiSmoothing.targetReportRate
 			);
 		}
 
@@ -316,7 +387,7 @@ void CommandHandler::CreateFilterCommands() {
 			filterNoise->distanceMaximum = tablet->noiseFilter.distanceMaximum;
 			filterNoise->iterations = tablet->noiseFilter.iterations;
 			settingsStringIndex += sprintf_s((settingsString + settingsStringIndex), settingsStringSize - settingsStringIndex,
-				"settings NoiseReduction buffer=%d threshold=%0.3f maximum=%0.3f iterations=%d\r\n",
+				"settings NoiseReduction Buffer=%d Threshold=%0.3f Maximum=%0.3f Iterations=%d\r\n",
 				tablet->noiseFilter.buffer.length,
 				tablet->noiseFilter.distanceThreshold,
 				tablet->noiseFilter.distanceMaximum,
@@ -324,9 +395,6 @@ void CommandHandler::CreateFilterCommands() {
 			);
 		}
 		if(filterAntiSmoothing != NULL || filterNoise != NULL) {
-
-			logger.directPrint = true;
-
 			LOG_INFO("Filter test starting!\n");
 
 			tester = new TabletFilterTester(inputFilepath, outputFilepath);
@@ -344,10 +412,7 @@ void CommandHandler::CreateFilterCommands() {
 			}
 			tester->outputFile << settingsString;
 			tester->Run();
-			LOG_INFO("Filter test ended!\n");
-
-			logger.ProcessMessages();
-			logger.directPrint = false;
+			LOG_INFO("Filter test done!\n");
 
 		}
 		else {
diff --git a/TabletDriverService/CommandHandler.Other.cpp b/TabletDriverService/CommandHandler.Other.cpp
index 97e64f7..87918fd 100644
--- a/TabletDriverService/CommandHandler.Other.cpp
+++ b/TabletDriverService/CommandHandler.Other.cpp
@@ -16,20 +16,49 @@ void CommandHandler::CreateOtherCommands() {
 	//
 	AddCommand(new Command("ScreenArea", [&](CommandLine *cmd) {
 		if(!ExecuteCommand("TabletValid")) return false;
-		mapper->areaScreen.width = cmd->GetDouble(0, mapper->areaScreen.width);
-		mapper->areaScreen.height = cmd->GetDouble(1, mapper->areaScreen.height);
-		mapper->areaScreen.x = cmd->GetDouble(2, mapper->areaScreen.x);
-		mapper->areaScreen.y = cmd->GetDouble(3, mapper->areaScreen.y);
+
+		int index = cmd->GetInt(4, 0);
+
+		// Validate map index
+		if(index >= sizeof(mapper->screenMaps) / sizeof(ScreenMapper::ScreenMap)) {
+			LOG_ERROR("Invalid map index!\n");
+			return false;
+		}
+
+		ScreenMapper::Area *area = &mapper->screenMaps[index].screen;
+
+		area->width = cmd->GetDouble(0, area->width);
+		area->height = cmd->GetDouble(1, area->height);
+		area->x = cmd->GetDouble(2, area->x);
+		area->y = cmd->GetDouble(3, area->y);
 		LOG_INFO("Screen area = (w=%0.2f, h=%0.2f, x=%0.2f, y=%0.2f)\n",
-			mapper->areaScreen.width,
-			mapper->areaScreen.height,
-			mapper->areaScreen.x,
-			mapper->areaScreen.y
+			area->width,
+			area->height,
+			area->x,
+			area->y
 		);
+
+		mapper->UpdateValues();
+
+		return true;
+	}));
+
+	//
+	// Command: ScreenMapCount
+	//
+	// Sets the screen mapper map count
+	//
+	AddCommand(new Command("ScreenMapCount", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+
+		mapper->screenMapCount = cmd->GetInt(0, mapper->screenMapCount);
+		LOG_INFO("Screen map count = %d\n", mapper->screenMapCount);
+
 		return true;
 	}));
 
 
+
 	//
 	// Command: DesktopSize
 	//
@@ -38,11 +67,11 @@ void CommandHandler::CreateOtherCommands() {
 	AddAlias("Desktop", "DesktopSize");
 	AddCommand(new Command("DesktopSize", [&](CommandLine *cmd) {
 		if(!ExecuteCommand("TabletValid")) return false;
-		mapper->areaVirtualScreen.width = cmd->GetDouble(0, mapper->areaVirtualScreen.width);
-		mapper->areaVirtualScreen.height = cmd->GetDouble(1, mapper->areaVirtualScreen.height);
+		mapper->virtualScreen.width = cmd->GetDouble(0, mapper->virtualScreen.width);
+		mapper->virtualScreen.height = cmd->GetDouble(1, mapper->virtualScreen.height);
 		LOG_INFO("Desktop size = (%0.2f px x %0.2f px)\n",
-			mapper->areaVirtualScreen.width,
-			mapper->areaVirtualScreen.height
+			mapper->virtualScreen.width,
+			mapper->virtualScreen.height
 		);
 		return true;
 	}));
@@ -70,19 +99,34 @@ void CommandHandler::CreateOtherCommands() {
 			LOG_INFO("Output Mode = Relative\n");
 		}
 
-		// Digitizer
-		else if(mode.compare(0, 3, "dig") == 0 || mode.compare(0, 3, "pen") == 0) {
+		// Digitizer Absolute
+		else if(mode.compare(0, 12, "digitizerabs") == 0) {
 
 			outputManager->SetOutputMode(OutputManager::ModeVMultiDigitizer);
-			LOG_INFO("Output Mode = Digitizer\n");
+			LOG_INFO("Output Mode = Digitizer Absolute\n");
 		}
 
-		// SendInput
+		// Digitizer Absolute
+		else if(mode.compare(0, 12, "digitizerrel") == 0) {
+
+			outputManager->SetOutputMode(OutputManager::ModeVMultiDigitizerRelative);
+			LOG_INFO("Output Mode = Digitizer Relative\n");
+		}
+
+
+
+		// SendInput Absolute
 		else if(mode.compare(0, 12, "sendinputabs") == 0) {
 			outputManager->SetOutputMode(OutputManager::ModeSendInputAbsolute);
 			LOG_INFO("Output Mode = SendInput Absolute\n");
 		}
 
+		// SendInput Relative
+		else if(mode.compare(0, 12, "sendinputrel") == 0) {
+			outputManager->SetOutputMode(OutputManager::ModeSendInputRelative);
+			LOG_INFO("Output Mode = SendInput Relative\n");
+		}
+
 		// Dummy
 		else if(mode == "dummy") {
 			outputManager->SetOutputMode(OutputManager::ModeDummy);
@@ -138,20 +182,20 @@ void CommandHandler::CreateOtherCommands() {
 				LOG_INFO("Benchmark result (%d positions):\n", tablet->measurement.totalReports);
 				LOG_INFO("  Tablet: %s\n", tablet->name.c_str());
 				LOG_INFO("  Area: %0.2f mm x %0.2f mm (%0.0f px x %0.0f px)\n",
-					mapper->areaTablet.width,
-					mapper->areaTablet.height,
-					mapper->areaScreen.width,
-					mapper->areaScreen.height
+					mapper->primaryTabletArea->width,
+					mapper->primaryTabletArea->height,
+					mapper->primaryTabletArea->width,
+					mapper->primaryTabletArea->height
 				);
 				LOG_INFO("  X range: %0.3f mm <-> %0.3f mm\n", tablet->measurement.minimum.x, tablet->measurement.maximum.x);
 				LOG_INFO("  Y range: %0.3f mm <-> %0.3f mm\n", tablet->measurement.minimum.y, tablet->measurement.maximum.y);
 				LOG_INFO("  Width: %0.3f mm (%0.2f px)\n",
 					width,
-					mapper->areaScreen.width / mapper->areaTablet.width * width
+					mapper->primaryScreenArea->width / mapper->primaryTabletArea->width * width
 				);
 				LOG_INFO("  Height: %0.3f mm (%0.2f px)\n",
 					height,
-					mapper->areaScreen.height / mapper->areaTablet.height* height
+					mapper->primaryScreenArea->height / mapper->primaryTabletArea->height* height
 				);
 				LOG_INFO("  Noise filter threshold: %0.2f mm\n", sqrt(width * width + height * height));
 
@@ -279,18 +323,14 @@ void CommandHandler::CreateOtherCommands() {
 
 
 	//
-	// Command: LogTabletArea
+	// Command: StateOutput
 	//
-	// Prints current tablet area
+	// Enable/disable state output
 	//
-	AddCommand(new Command("LogTabletArea", [&](CommandLine *cmd) {
-		LOG_INFO("%s: (%0.2f mm x %0.2f mm X+%0.2f mm Y+%0.2f mm)\n",
-			cmd->GetParameterString().c_str(),
-			mapper->areaTablet.width,
-			mapper->areaTablet.height,
-			mapper->areaTablet.x,
-			mapper->areaTablet.y
-		);
+	AddCommand(new Command("StateOutput", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		pipeHandler->isStateOutputEnabled = cmd->GetBoolean(0, pipeHandler->isStateOutputEnabled);
+		LOG_INFO("State output = %s\n", pipeHandler->isStateOutputEnabled  ? "Enabled" : "Disabled");
 		return true;
 	}));
 
@@ -390,7 +430,7 @@ void CommandHandler::CreateOtherCommands() {
 
 		if(!ExecuteCommand("TabletValid")) return false;
 
-		char stringBuffer[64];
+		char stringBuffer[1024];
 		int maxLength = sizeof(stringBuffer) - 1;
 		int stringIndex = 0;
 
@@ -421,12 +461,14 @@ void CommandHandler::CreateOtherCommands() {
 		LOG_INFO("  Detect Mask = 0x%02X\n", tablet->settings.detectMask);
 		LOG_INFO("  Ignore Mask = 0x%02X\n", tablet->settings.ignoreMask);
 
+
+		// Pen buttons
 		for(int i = 0; i < tablet->settings.buttonCount; i++) {
 			stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "'%s' ", tablet->settings.buttonMap[i].c_str());
 		}
 		LOG_INFO("  Pen button map = %s\n", stringBuffer);
 
-
+		// Aux buttons
 		if(tablet->settings.auxButtonCount > 0) {
 			stringIndex = 0;
 			for(int i = 0; i < tablet->settings.auxButtonCount; i++) {
@@ -434,15 +476,10 @@ void CommandHandler::CreateOtherCommands() {
 			}
 			LOG_INFO("  Aux button map = %s\n", stringBuffer);
 		}
-
 		LOG_INFO("  Aux button count = %d\n", tablet->settings.auxButtonCount);
 
-		if(tablet->initFeatureLength > 0) {
-			LOG_INFOBUFFER(tablet->initFeature, tablet->initFeatureLength, "  Init feature report: ");
-		}
-		if(tablet->initReportLength > 0) {
-			LOG_INFOBUFFER(tablet->initReport, tablet->initReportLength, "  Init report: ");
-		}
+
+		// Init strings
 		if(tablet->initStrings.size() > 0) {
 			string stringIds = "";
 			for(int stringId : tablet->initStrings) {
@@ -451,6 +488,20 @@ void CommandHandler::CreateOtherCommands() {
 			LOG_INFO("  Init string ids: %s\n", stringIds.c_str());
 		}
 
+		// Init feature reports
+		if(tablet->initFeatureReports.size() > 0) {
+			for(Tablet::InitReport *report : tablet->initFeatureReports) {
+				LOG_INFOBUFFER(report->data, report->length, "  Init feature report: ");
+			}
+		}
+
+		// Init output reports
+		if(tablet->initOutputReports.size() > 0) {
+			for(Tablet::InitReport *report : tablet->initOutputReports) {
+				LOG_INFOBUFFER(report->data, report->length, "  Init output report: ");
+			}
+		}
+
 		LOG_INFO("\n");
 
 		//
@@ -458,22 +509,22 @@ void CommandHandler::CreateOtherCommands() {
 		//
 		LOG_INFO("Area:\n");
 		LOG_INFO("  Desktop = %0.0fpx x %0.0fpx\n",
-			mapper->areaVirtualScreen.width, mapper->areaVirtualScreen.height
+			mapper->virtualScreen.width, mapper->virtualScreen.height
 		);
 		LOG_INFO("  Screen Map = %0.0fpx x %0.0fpx @ X%+0.0fpx, Y%+0.0fpx\n",
-			mapper->areaScreen.width, mapper->areaScreen.height,
-			mapper->areaScreen.x, mapper->areaScreen.y
+			mapper->primaryScreenArea->width, mapper->primaryScreenArea->height,
+			mapper->primaryScreenArea->x, mapper->primaryScreenArea->y
 		);
 		LOG_INFO("  Tablet =  %0.2fmm x %0.2fmm @ Min(%0.2fmm, %0.2fmm) Max(%0.2fmm, %0.2fmm)\n",
-			mapper->areaTablet.width, mapper->areaTablet.height,
-			mapper->areaTablet.x, mapper->areaTablet.y,
-			mapper->areaTablet.width + mapper->areaTablet.x, mapper->areaTablet.height + mapper->areaTablet.y
+			mapper->primaryTabletArea->width, mapper->primaryTabletArea->height,
+			mapper->primaryTabletArea->x, mapper->primaryTabletArea->y,
+			mapper->primaryTabletArea->width + mapper->primaryTabletArea->x, mapper->primaryTabletArea->height + mapper->primaryTabletArea->y
 		);
 		LOG_INFO("  Rotation matrix = [%f,%f,%f,%f]\n",
-			mapper->rotationMatrix[0],
-			mapper->rotationMatrix[1],
-			mapper->rotationMatrix[2],
-			mapper->rotationMatrix[3]
+			mapper->primaryRotationMatrix[0],
+			mapper->primaryRotationMatrix[1],
+			mapper->primaryRotationMatrix[2],
+			mapper->primaryRotationMatrix[3]
 		);
 		LOG_INFO("\n");
 
diff --git a/TabletDriverService/CommandHandler.Tablet.cpp b/TabletDriverService/CommandHandler.Tablet.cpp
index 385c0e8..0001f7e 100644
--- a/TabletDriverService/CommandHandler.Tablet.cpp
+++ b/TabletDriverService/CommandHandler.Tablet.cpp
@@ -184,8 +184,12 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddCommand(new Command("PressureDeadzone", [&](CommandLine *cmd) {
 		if(tablet == NULL) return false;
-		tablet->settings.pressureDeadzone = cmd->GetDouble(0, tablet->settings.pressureDeadzone);
-		LOG_INFO("Tablet pressure deadzone = %0.2f\n", tablet->settings.pressureDeadzone);
+		tablet->settings.pressureDeadzoneLow = cmd->GetDouble(0, tablet->settings.pressureDeadzoneLow);
+		tablet->settings.pressureDeadzoneHigh = cmd->GetDouble(1, tablet->settings.pressureDeadzoneHigh);
+		LOG_INFO("Tablet pressure deadzone = low:%0.2f high:%0.2f\n",
+			tablet->settings.pressureDeadzoneLow,
+			tablet->settings.pressureDeadzoneHigh
+		);
 		return true;
 	}));
 
@@ -214,6 +218,17 @@ void CommandHandler::CreateTabletCommands() {
 	}));
 
 
+	//
+	// Command: ScrollDrag
+	//
+	AddCommand(new Command("ScrollDrag", [&](CommandLine *cmd) {
+		if(tablet == NULL) return false;
+		tablet->settings.scrollDrag = cmd->GetBoolean(0, tablet->settings.scrollDrag);
+		LOG_INFO("Tablet scroll drag = %s\n", tablet->settings.scrollDrag ? "true" : "false");
+		return true;
+	}));
+
+
 	//
 	// Command: ScrollStopCursor
 	//
@@ -318,6 +333,7 @@ void CommandHandler::CreateTabletCommands() {
 				if(targetByteName == "buttonslow") targetByte = 1;
 				if(targetByteName == "buttonshigh") targetByte = 2;
 				if(targetByteName == "detect") targetByte = 3;
+				if(targetByteName == "ispressed") targetByte = 4;
 
 			}
 
@@ -335,24 +351,31 @@ void CommandHandler::CreateTabletCommands() {
 
 
 			instruction.targetByte = targetByte;
+			instruction.writeMode = DataFormatter::DataInstruction::WriteModeOR;
 
 			// Loop through parameters
 			for(int i = 1; i < cmd->valueCount; i += 2) {
 				string parameter = cmd->GetStringLower(i, "");
 				int value = cmd->GetInt(i + 1, -1);
+				string stringValue = cmd->GetStringLower(i + 1, "");
 
 				// Set instruction parameters
 				if(parameter == "targetmask" || parameter == "mask") instruction.targetBitMask = value;
 				if(parameter == "source") instruction.sourceByte = value;
 				if(parameter == "sourcemask") instruction.sourceBitMask = value;
 				if(parameter == "sourceshift" || parameter == "shift") instruction.sourceBitShift = value;
+				if(parameter == "writemode") {
+					if(stringValue == "or") instruction.writeMode = DataFormatter::DataInstruction::WriteModeOR;
+					else if(stringValue == "and") instruction.writeMode = DataFormatter::DataInstruction::WriteModeAND;
+					else if(stringValue == "set") instruction.writeMode = DataFormatter::DataInstruction::WriteModeSet;
+				}
 
 			}
 
 
 			// Add aux data format instruction
 			if(commandName.compare(0, 3, "aux") == 0) {
-				tablet->auxDataFormatter.AddInstruction(&instruction);
+				tablet->settings.auxCurrentReport->formatter.AddInstruction(&instruction);
 			}
 			// Add tablet data format instruction
 			else {
@@ -361,12 +384,13 @@ void CommandHandler::CreateTabletCommands() {
 
 
 			//
-			LOG_INFO("Custom data format: Target=%d, TargetMask=0x%02X, Source=%d, SourceMask=0x%02X, SourceShift=%d\n",
+			LOG_INFO("Custom data format: Target=%d, TargetMask=0x%02X, Source=%d, SourceMask=0x%02X, SourceShift=%d WriteMode=%d\n",
 				instruction.targetByte,
 				instruction.targetBitMask,
 				instruction.sourceByte,
 				instruction.sourceBitMask,
-				instruction.sourceBitShift
+				instruction.sourceBitShift,
+				instruction.writeMode
 			);
 
 		}
@@ -394,36 +418,42 @@ void CommandHandler::CreateTabletCommands() {
 
 
 	//
-	// Command: InitFeature
+	// Command: InitFeatureReport, InitFeature
 	//
-	AddCommand(new Command("InitFeature", [&](CommandLine *cmd) {
+	AddAlias("InitFeature", "InitFeatureReport");
+	AddCommand(new Command("InitFeatureReport", [&](CommandLine *cmd) {
 		if(cmd->valueCount <= 0) return false;
 		if(tablet == NULL) return false;
-		tablet->initFeature = new BYTE[cmd->valueCount];
+
+		Tablet::InitReport *report = new Tablet::InitReport(cmd->valueCount);
 		for(int i = 0; i < (int)cmd->valueCount; i++) {
-			tablet->initFeature[i] = cmd->GetInt(i, 0);
+			report->data[i] = cmd->GetInt(i, 0);
 		}
-		tablet->initFeatureLength = cmd->valueCount;
-		LOG_INFOBUFFER(tablet->initFeature, tablet->initFeatureLength, "Tablet initialization feature report: ");
+		tablet->initFeatureReports.push_back(report);
+
+
+		LOG_INFOBUFFER(report->data, report->length, "Tablet init feature report: ");
 		return true;
 	}));
 
 
 	//
-	// Command: InitReport
+	// Command: InitOutputReport, InitReport
 	//
 	// Initialization HID output report
 	//
-	AddCommand(new Command("InitReport", [&](CommandLine *cmd) {
+	AddAlias("InitReport", "InitOutputReport");
+	AddCommand(new Command("InitOutputReport", [&](CommandLine *cmd) {
 		if(cmd->valueCount <= 0) return false;
-
 		if(tablet == NULL) return false;
-		tablet->initReport = new BYTE[cmd->valueCount];
+
+		Tablet::InitReport *report = new Tablet::InitReport(cmd->valueCount);
 		for(int i = 0; i < (int)cmd->valueCount; i++) {
-			tablet->initReport[i] = cmd->GetInt(i, 0);
+			report->data[i] = cmd->GetInt(i, 0);
 		}
-		tablet->initReportLength = cmd->valueCount;
-		LOG_INFOBUFFER(tablet->initReport, tablet->initReportLength, "Tablet initialization report: ");
+		tablet->initOutputReports.push_back(report);
+
+		LOG_INFOBUFFER(report->data, report->length, "Tablet init output report: ");
 
 		return true;
 	}));
@@ -461,12 +491,31 @@ void CommandHandler::CreateTabletCommands() {
 	AddCommand(new Command("TabletArea", [&](CommandLine *cmd) {
 
 		if(!ExecuteCommand("TabletValid")) return false;
-		mapper->areaTablet.width = cmd->GetDouble(0, mapper->areaTablet.width);
-		mapper->areaTablet.height = cmd->GetDouble(1, mapper->areaTablet.height);
-		mapper->areaTablet.x = cmd->GetDouble(2, mapper->areaTablet.x);
-		mapper->areaTablet.y = cmd->GetDouble(3, mapper->areaTablet.y);
 
-		ExecuteCommand("LogTabletArea", "Tablet area");
+		int index = cmd->GetInt(4, 0);
+
+		// Validate map index
+		if(index >= sizeof(mapper->screenMaps) / sizeof(ScreenMapper::ScreenMap)) {
+			LOG_ERROR("Invalid map index!\n");
+			return false;
+		}
+
+		ScreenMapper::Area *area = &mapper->screenMaps[index].tablet;
+
+		area->width = cmd->GetDouble(0, area->width);
+		area->height = cmd->GetDouble(1, area->height);
+		area->x = cmd->GetDouble(2, area->x);
+		area->y = cmd->GetDouble(3, area->y);
+
+		LOG_INFO("Tablet area = (%0.2f mm x %0.2f mm X+%0.2f mm Y+%0.2f mm)\n",
+			area->width,
+			area->height,
+			area->x,
+			area->y
+		);
+
+		mapper->UpdateValues();
+
 		return true;
 	}));
 
@@ -476,8 +525,8 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddCommand(new Command("ClearButtonMap", [&](CommandLine *cmd) {
 		if(!ExecuteCommand("TabletValid")) return false;
-		for(int i = 0; i < 16; i++) {
-			tablet->settings.buttonMap[i] = "";
+		for(string &str : tablet->settings.buttonMap) {
+			str = "";
 		}
 		LOG_INFO("Pen button map cleared!\n");
 		return true;
@@ -569,23 +618,30 @@ void CommandHandler::CreateTabletCommands() {
 			moved = true;
 
 			if(border == "top") {
-				mapper->areaTablet.y = offset + mapper->areaTablet.height / 2.0;
+				mapper->primaryTabletArea->y = offset + mapper->primaryTabletArea->height / 2.0;
 			}
 			else if(border == "bottom") {
-				mapper->areaTablet.y = tablet->settings.height - mapper->areaTablet.height / 2.0 - offset;
+				mapper->primaryTabletArea->y = tablet->settings.height - mapper->primaryTabletArea->height / 2.0 - offset;
 			}
 			else if(border == "left") {
-				mapper->areaTablet.x = offset + mapper->areaTablet.width / 2.0;;
+				mapper->primaryTabletArea->x = offset + mapper->primaryTabletArea->width / 2.0;;
 			}
 			else if(border == "right") {
-				mapper->areaTablet.x = tablet->settings.width - mapper->areaTablet.width / 2.0 - offset;
+				mapper->primaryTabletArea->x = tablet->settings.width - mapper->primaryTabletArea->width / 2.0 - offset;
 			}
 			else {
 				moved = false;
 			}
 			if(moved) {
 				LOG_INFO("Tablet area moved to %s border with %0.2f mm margin.\n", border.c_str(), offset);
-				ExecuteCommand("LogTabletArea", "  New tablet area");
+
+				ScreenMapper::Area *area = mapper->primaryTabletArea;
+				LOG_INFO("Tablet area = (%0.2f mm x %0.2f mm X+%0.2f mm Y+%0.2f mm)\n",
+					area->width,
+					area->height,
+					area->x,
+					area->y
+				);
 			}
 		}
 		return true;
@@ -600,14 +656,27 @@ void CommandHandler::CreateTabletCommands() {
 	AddCommand(new Command("Rotate", [&](CommandLine *cmd) {
 		if(!ExecuteCommand("TabletValid")) return false;
 
+		int index = cmd->GetInt(1, 0);
+
+		// Validate map index
+		if(index >= sizeof(mapper->screenMaps) / sizeof(ScreenMapper::ScreenMap)) {
+			LOG_ERROR("Invalid map index!\n");
+			return false;
+		}
+
+		ScreenMapper::ScreenMap *screenMap = &mapper->screenMaps[index];
+
 		double value = cmd->GetDouble(0, 0);
-		mapper->SetRotation(value);
+		screenMap->SetRotation(value);
 		LOG_INFO("Rotation matrix = [%f,%f,%f,%f]\n",
-			mapper->rotationMatrix[0],
-			mapper->rotationMatrix[1],
-			mapper->rotationMatrix[2],
-			mapper->rotationMatrix[3]
+			screenMap->rotationMatrix[0],
+			screenMap->rotationMatrix[1],
+			screenMap->rotationMatrix[2],
+			screenMap->rotationMatrix[3]
 		);
+		
+		mapper->UpdateValues();
+
 		return true;
 	}));
 
@@ -634,6 +703,20 @@ void CommandHandler::CreateTabletCommands() {
 		return true;
 	}));
 
+	//
+	// Command: RelativeDragMove
+	//
+	// Sets if relative mouse position only moves when pen tip is pressed down
+	//
+	AddCommand(new Command("RelativeDragMove", [&](CommandLine *cmd) {
+		if(!ExecuteCommand("TabletValid")) return false;
+		outputManager->settings->relativeDragMove = cmd->GetBoolean(0, outputManager->settings->relativeDragMove);
+		LOG_INFO("Relative mode drag move = %s\n",
+			outputManager->settings->relativeDragMove ? "true" : "false"
+		);
+		return true;
+	}));
+
 
 	//
 	// Command: ResetDistance
diff --git a/TabletDriverService/DataFormatter.cpp b/TabletDriverService/DataFormatter.cpp
index ef413bf..dea3837 100644
--- a/TabletDriverService/DataFormatter.cpp
+++ b/TabletDriverService/DataFormatter.cpp
@@ -40,8 +40,13 @@ bool DataFormatter::Format(void * targetBuffer, void * sourceBuffer)
 		// Target bit mask
 		byte &= instruction->targetBitMask;
 
-		// Set target byte
-		target[instruction->targetByte] |= byte & 0xFF;
+		// Write target byte
+		switch(instruction->writeMode) {
+		case DataInstruction::WriteModeOR: target[instruction->targetByte] |= byte & 0xFF;  break;
+		case DataInstruction::WriteModeAND: target[instruction->targetByte] &= byte & 0xFF;  break;
+		case DataInstruction::WriteModeSet: target[instruction->targetByte] = byte & 0xFF;  break;
+		default: break;
+		}
 
 		/*
 		LOG_DEBUG("  INSTR T=%d TM=0x%02X S=%d SM=0x%02X SS=%d\n",
@@ -57,7 +62,7 @@ bool DataFormatter::Format(void * targetBuffer, void * sourceBuffer)
 	return true;
 }
 
-bool DataFormatter::AddInstruction(int targetByte, int targetBitMask, int sourceByte, int sourceBitMask, int sourceBitShift)
+bool DataFormatter::AddInstruction(int targetByte, int targetBitMask, int sourceByte, int sourceBitMask, int sourceBitShift, int writeMode)
 {
 	if(instructionCount >= 128) return false;
 
@@ -70,6 +75,7 @@ bool DataFormatter::AddInstruction(int targetByte, int targetBitMask, int source
 	instructions[instructionCount].sourceByte = sourceByte;
 	instructions[instructionCount].sourceBitMask = sourceBitMask;
 	instructions[instructionCount].sourceBitShift = sourceBitShift;
+	instructions[instructionCount].writeMode = writeMode;
 	instructionCount++;
 	return true;
 }
@@ -81,7 +87,8 @@ bool DataFormatter::AddInstruction(DataInstruction * instruction)
 		instruction->targetBitMask,
 		instruction->sourceByte,
 		instruction->sourceBitMask,
-		instruction->sourceBitShift
+		instruction->sourceBitShift,
+		instruction->writeMode
 	);
 }
 
diff --git a/TabletDriverService/DataFormatter.h b/TabletDriverService/DataFormatter.h
index 53235d1..2a047d8 100644
--- a/TabletDriverService/DataFormatter.h
+++ b/TabletDriverService/DataFormatter.h
@@ -4,6 +4,12 @@ class DataFormatter
 public:
 	class DataInstruction {
 	public:
+		enum WriteMode {
+			WriteModeOR,
+			WriteModeAND,
+			WriteModeSet
+		};
+
 		int targetByte;
 		int targetBitMask;
 
@@ -11,6 +17,8 @@ class DataFormatter
 		int sourceBitShift;
 		int sourceBitMask;
 
+		int writeMode;
+		
 		DataInstruction();
 	};
 
@@ -23,7 +31,7 @@ class DataFormatter
 	~DataFormatter();
 
 	bool Format(void *targetBuffer, void *sourceBuffer);
-	bool AddInstruction(int targetByte, int targetBitMask, int sourceByte, int sourceBitMask, int sourceBitShift);
+	bool AddInstruction(int targetByte, int targetBitMask, int sourceByte, int sourceBitMask, int sourceBitShift, int writeMode);
 	bool AddInstruction(DataInstruction *instruction);
 
 
diff --git a/TabletDriverService/HIDDevice.cpp b/TabletDriverService/HIDDevice.cpp
index 31cdaec..703c231 100644
--- a/TabletDriverService/HIDDevice.cpp
+++ b/TabletDriverService/HIDDevice.cpp
@@ -187,6 +187,18 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 				) {
 					GetHIDStrings(deviceHandle, &_manufacturerName, &_productName, &_serialNumber);
 
+					// Set timeouts
+					COMMTIMEOUTS commTimeOuts;
+					GetCommTimeouts(deviceHandle, &commTimeOuts);
+					commTimeOuts.ReadIntervalTimeout = 1;
+					commTimeOuts.ReadTotalTimeoutConstant = 1;
+					commTimeOuts.ReadTotalTimeoutMultiplier = 1;
+					SetCommTimeouts(deviceHandle, &commTimeOuts);
+
+					_devicePathW = deviceInterfaceDetailData->DevicePath;
+					string str(_devicePathW.begin(), _devicePathW.end());
+					_devicePath = str;
+
 					resultHandle = deviceHandle;
 				}
 
@@ -318,9 +330,21 @@ string HIDDevice::GetSerialNumber()
 void HIDDevice::CloseDevice() {
 	if(isOpen && _deviceHandle != NULL && _deviceHandle != INVALID_HANDLE_VALUE) {
 		try {
+			// Workaround for hanging CloseHandle
+			_deviceHandle = CreateFile(
+					_devicePathW.c_str(),
+					GENERIC_READ | GENERIC_WRITE,
+					FILE_SHARE_READ | FILE_SHARE_WRITE,
+					NULL,
+					OPEN_EXISTING,
+					0,
+					NULL);
+
 			CloseHandle(_deviceHandle);
 			_deviceHandle = NULL;
-		} catch(exception) {}
+		} catch(exception) {
+			_deviceHandle = NULL;
+		}
 	}
 	isOpen = false;
 }
diff --git a/TabletDriverService/HIDDevice.h b/TabletDriverService/HIDDevice.h
index 1ca2001..f005365 100644
--- a/TabletDriverService/HIDDevice.h
+++ b/TabletDriverService/HIDDevice.h
@@ -19,6 +19,8 @@ class HIDDevice {
 	string _manufacturerName;
 	string _productName;
 	string _serialNumber;
+	string _devicePath;
+	wstring _devicePathW;
 public:
 	bool isOpen;
 	bool debugEnabled;
diff --git a/TabletDriverService/InputEmulator.cpp b/TabletDriverService/InputEmulator.cpp
index 98ed757..2063ef6 100644
--- a/TabletDriverService/InputEmulator.cpp
+++ b/TabletDriverService/InputEmulator.cpp
@@ -8,6 +8,9 @@ InputEmulator::InputEmulator()
 {
 	CreateKeyMap();
 	CreateVirtualKeyMap();
+
+	//
+	CoInitializeEx(NULL, COINIT_MULTITHREADED);
 }
 
 
@@ -31,9 +34,16 @@ void InputEmulator::CreateKeyMap()
 	AddKey("MOUSE5", "Mouse 5", 0, 5);
 
 	// Mouse scroll
-	AddKey("MOUSESCROLLV", "Mouse Scroll Vertical", 0, 0x101);
-	AddKey("MOUSESCROLLH", "Mouse Scroll Horizontal", 0, 0x102);
-	AddKey("MOUSESCROLLB", "Mouse Scroll Both", 0, 0x103);
+	AddKey("SCROLLUP", "Mouse Scroll Up", 0, MouseButtons::MouseScrollUp);
+	AddKey("SCROLLDOWN", "Mouse Scroll Down", 0, MouseButtons::MouseScrollDown);
+	AddKey("SCROLLLEFT", "Mouse Scroll Left", 0, MouseButtons::MouseScrollLeft);
+	AddKey("SCROLLRIGHT", "Mouse Scroll Right", 0, MouseButtons::MouseScrollRight);
+
+
+	// Mouse scroll
+	AddKey("MOUSESCROLLV", "Mouse Scroll Vertical", 0, MouseButtons::MouseScrollVertical);
+	AddKey("MOUSESCROLLH", "Mouse Scroll Horizontal", 0, MouseButtons::MouseScrollHorizontal);
+	AddKey("MOUSESCROLLB", "Mouse Scroll Both", 0, MouseButtons::MouseScrollBoth);
 
 	// Shift
 	AddKey("SHIFT", "Shift", VK_SHIFT);
@@ -504,11 +514,49 @@ void InputEmulator::SetInputStates(string inputs, bool down)
 			}
 
 			// Mouse button?
-			else if(keyMapValue->mouseButton > 0) {
+			else if(keyMapValue->mouseButton > 0 && keyMapValue->mouseButton < 5) {
 
 				// Set mouse button state
 				MouseSet(keyMapValue->mouseButton, down);
 			}
+
+			// Mouse scroll
+			else if(keyMapValue->mouseButton >= 0x81 && keyMapValue->mouseButton <= 0x84) {
+
+				switch(keyMapValue->mouseButton)
+				{
+				case MouseButtons::MouseScrollUp: MouseScroll(-1, true); break;
+				case MouseButtons::MouseScrollDown: MouseScroll(1, true); break;
+				case MouseButtons::MouseScrollLeft: MouseScroll(-1, false); break;
+				case MouseButtons::MouseScrollRight: MouseScroll(1, false); break;
+				default:
+					break;
+				}
+			}
+		}
+
+		//
+		// Precise volume control
+		//
+		else if(input.compare(0, 8, "VOLUMEUP") == 0 && input.size() > 8 && down) {
+			float value = 0;
+			try {
+				// Parse number from end of the string
+				value = stof(input.substr(8, input.size() - 8));
+				VolumeChange(value / 100.0f);
+			} catch(exception& e) {
+				LOG_ERROR("Volume control error! %s\n", e.what());
+			}
+		}
+		else if(input.compare(0, 10, "VOLUMEDOWN") == 0 && input.size() > 10 && down) {
+			float value = 0;
+			try {
+				// Parse number from end of the string
+				value = stof(input.substr(10, input.size() - 10));
+				VolumeChange(-value / 100.0f);
+			} catch(exception& e) {
+				LOG_ERROR("Volume control error! %s\n", e.what());
+			}
 		}
 	}
 
@@ -525,6 +573,81 @@ void InputEmulator::KeyPress(string keys, int time) {
 }
 
 
+//
+// Create audio endpoint volume
+//
+bool InputEmulator::CreateEndpointVolume()
+{
+	HRESULT hresult;
+
+	// Device enumerator
+	//LOG_DEBUG("Device enumerator\n");
+	hresult = CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pDeviceEnumerator));
+	CHECK_HRESULT(hresult, pDeviceEnumerator);
+
+	// Default audio endpoint
+	//LOG_DEBUG("Default audio endpoint\n");
+	hresult = pDeviceEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &pDefaultAudioDevice);
+	CHECK_HRESULT(hresult, pDefaultAudioDevice);
+
+	// Endpoint volume
+	//LOG_DEBUG("Audio endpoint volume\n");
+	hresult = pDefaultAudioDevice->Activate(__uuidof(IAudioEndpointVolume), CLSCTX_INPROC_SERVER, NULL, (LPVOID *)&pAudioEndpointVolume);
+	CHECK_HRESULT(hresult, pAudioEndpointVolume);
+
+	return true;
+}
+
+//
+// Release audio endpoint volume
+//
+bool InputEmulator::ReleaseEndpointVolume()
+{
+	SAFE_RELEASE(pAudioEndpointVolume);
+	SAFE_RELEASE(pDefaultAudioDevice);
+	SAFE_RELEASE(pDeviceEnumerator);
+	return true;
+}
+
+//
+// Set main audio device volume
+//
+void InputEmulator::VolumeSet(float volume)
+{
+	// Get endpoint volume
+	if(CreateEndpointVolume()) {
+		pAudioEndpointVolume->SetMasterVolumeLevelScalar(volume, &GUID_NULL);
+	}
+	ReleaseEndpointVolume();
+}
+
+//
+// Get main audio device volume
+//
+float InputEmulator::VolumeGet()
+{
+	float volume = 0;
+	if(CreateEndpointVolume()) {
+		pAudioEndpointVolume->GetMasterVolumeLevelScalar(&volume);
+	}
+	ReleaseEndpointVolume();
+	return volume;
+}
+
+//
+// Change main audio device volume
+//
+void InputEmulator::VolumeChange(float delta)
+{
+	float volume;
+	if(CreateEndpointVolume()) {
+		pAudioEndpointVolume->GetMasterVolumeLevelScalar(&volume);
+		pAudioEndpointVolume->SetMasterVolumeLevelScalar(volume + delta, &GUID_NULL);
+	}
+	ReleaseEndpointVolume();
+}
+
+
 //
 // Key map value constructors
 //
diff --git a/TabletDriverService/InputEmulator.h b/TabletDriverService/InputEmulator.h
index 48e7c55..02f7143 100644
--- a/TabletDriverService/InputEmulator.h
+++ b/TabletDriverService/InputEmulator.h
@@ -2,12 +2,51 @@
 
 #include <map>
 
+#include <psapi.h>
+#include <mmdeviceapi.h>
+#include <audiopolicy.h>
+#include <audioendpoints.h>
+#include <endpointvolume.h>
+
+extern "C" NTSYSAPI NTSTATUS NTAPI NtSetTimerResolution(ULONG DesiredResolution, BOOLEAN SetResolution, PULONG CurrentResolution);
+extern "C" NTSYSAPI NTSTATUS NTAPI NtQueryTimerResolution(OUT PULONG MinimumResolution, OUT PULONG MaximumResolution, OUT PULONG ActualResolution);
+
+
+#define SAFE_RELEASE(resource) \
+	if ((resource) != NULL) { \
+		(resource)->Release(); \
+		(resource) = NULL; \
+	}
+
+#define CHECK_HRESULT(hresult, resource) \
+    if (FAILED(hresult)) { \
+		SAFE_RELEASE(resource); \
+		return false; \
+	}
+
 class InputEmulator
 {
 private:
 	void CreateKeyMap();
 	void CreateVirtualKeyMap();
+	IAudioEndpointVolume *pAudioEndpointVolume = NULL;
+	IMMDeviceEnumerator *pDeviceEnumerator = NULL;
+	IMMDevice *pDefaultAudioDevice = NULL;
 public:
+	enum MouseButtons {
+		Mouse1 = 1,
+		Mouse2 = 2,
+		Mouse3 = 3,
+		Mouse4 = 4,
+		Mouse5 = 5,
+		MouseScrollUp = 0x81,
+		MouseScrollDown = 0x82,
+		MouseScrollLeft = 0x83,
+		MouseScrollRight = 0x84,
+		MouseScrollVertical = 0x101,
+		MouseScrollHorizontal = 0x102,
+		MouseScrollBoth = 0x103,
+	};
 
 	class KeyMapValue {
 	public:
@@ -41,6 +80,12 @@ class InputEmulator
 	void SetInputStates(string inputs, bool down);
 	void KeyPress(string keys, int time);
 
+	bool CreateEndpointVolume();
+	bool ReleaseEndpointVolume();
+	void VolumeSet(float volume);
+	float VolumeGet();
+	void VolumeChange(float delta);
+
 
 };
 
diff --git a/TabletDriverService/Logger.cpp b/TabletDriverService/Logger.cpp
index c057725..90c77cd 100644
--- a/TabletDriverService/Logger.cpp
+++ b/TabletDriverService/Logger.cpp
@@ -9,40 +9,74 @@ Logger::Logger() {
 	newMessage = false;
 	directPrint = false;
 	debugEnabled = false;
+	pipeHandle = NULL;
 }
 
 
 void Logger::OutputMessage(LogItem *message) {
-	char timeBuffer[64];
-	char levelNameBuffer[128];
-	char moduleBuffer[128];
 
+	char buffer[4096];
+	int bufferSize = 4096;
+	int index = 0;
 
-	int index = strftime(timeBuffer, 64, "[%Y-%m-%d %H:%M:%S", &message->time);
-	sprintf_s(timeBuffer + index, 64 - index, ".%03d] ", message->systemTime.wMilliseconds);
+	// Time
+	index += strftime(buffer + index, bufferSize - index, "[%Y-%m-%d %H:%M:%S", &message->time);
 
+	// Milliseconds
+	if(index < bufferSize)
+		index += sprintf_s(buffer + index, bufferSize - index, ".%03d] ", message->systemTime.wMilliseconds);
+
+	// Module
 	if(message->module.length() > 0) {
-		sprintf_s(moduleBuffer, "[%s] ", message->module.c_str());
-	}
-	else {
-		moduleBuffer[0] = 0;
+		if(index < bufferSize)
+			index += sprintf_s(buffer + index, bufferSize - index, "[%s] ", message->module.c_str());
 	}
 
+	// Log level
 	if(message->level != LogLevelInfo) {
-		sprintf_s(levelNameBuffer, "[%s] ", levelNames[message->level].c_str());
-	}
-	else {
-		levelNameBuffer[0] = 0;
+		if(index < bufferSize)
+			index += sprintf_s(buffer + index, bufferSize - index, "[%s] ", levelNames[message->level].c_str());
 	}
 
+	// Message
+	if(index < bufferSize) {
+
+		// Message to large for the buffer
+		if((int)message->text.size() > bufferSize - index) {
+			memcpy(buffer + index, message->text.c_str(), (bufferSize - index) - 1);
+			index = bufferSize;
+		}
+
+		// Copy message to buffer
+		else
+		{
+			memcpy(buffer + index, message->text.c_str(), message->text.size());
+			index += message->text.size();
+		}
+	}
 
+	// Write to standard output
 	try {
-		cout << timeBuffer << levelNameBuffer << moduleBuffer << message->text << flush;
+		cout.write(buffer, index);
+		cout.flush();
 	} catch(exception) {
 		exit(1);
 	}
+
+	// Write to output pipe
+	try {
+		if(pipeHandle != NULL) {
+			DWORD bytesWritten = 0;
+			WriteFile(pipeHandle, buffer, index, &bytesWritten, NULL);
+		}
+	} catch(exception) {
+		logger.pipeHandle = NULL;
+	}
+
+	// Write to log file
 	if(logFile && logFile.is_open()) {
-		logFile << timeBuffer << levelNameBuffer << moduleBuffer << message->text << flush;
+		logFile.write(buffer, index);
+		logFile.flush();
 	}
 }
 
@@ -62,7 +96,7 @@ void Logger::ProcessMessages() {
 	lockMessages.unlock();
 
 	// Loop through messages
-	for(auto message : tmp) {
+	for(LogItem message : tmp) {
 		if(!directPrint) {
 			OutputMessage(&message);
 		}
diff --git a/TabletDriverService/Logger.h b/TabletDriverService/Logger.h
index 2b301ad..57f4590 100644
--- a/TabletDriverService/Logger.h
+++ b/TabletDriverService/Logger.h
@@ -96,6 +96,7 @@ class Logger {
 	bool directPrint;
 	bool debugEnabled;
 	string logFilename = "";
+	HANDLE pipeHandle;
 
 	void OutputMessage(LogItem *message);
 	void ProcessMessages();
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index c582f8c..12e8d52 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -2,11 +2,8 @@
 
 #include <csignal>
 
-#include "HIDDevice.h"
-#include "USBDevice.h"
 #include "VMulti.h"
 #include "Tablet.h"
-#include "ScreenMapper.h"
 #include "CommandLine.h"
 #include "DataFormatter.h"
 
@@ -16,6 +13,8 @@
 #pragma comment(lib, "hid.lib")
 #pragma comment(lib, "setupapi.lib")
 #pragma comment(lib, "winusb.lib")
+#pragma comment(lib, "winmm.lib")
+#pragma comment(lib, "ntdll.lib")
 
 
 // Global variables...
@@ -25,10 +24,12 @@ VMulti *vmulti;
 CommandHandler *commandHandler;
 OutputManager *outputManager;
 ScreenMapper *mapper;
+PipeHandler *pipeHandler;
 
 void InitConsole();
 bool ProcessCommand(CommandLine *cmd);
 
+
 //
 // Main
 //
@@ -54,7 +55,7 @@ int main(int argc, char**argv) {
 
 	// Screen mapper
 	mapper = new ScreenMapper(tablet);
-	mapper->SetRotation(0);
+	mapper->primaryMap->SetRotation(0);
 
 	//
 	// Command: Start
@@ -110,6 +111,16 @@ int main(int argc, char**argv) {
 	// Start logger
 	LOGGER_START();
 
+
+	// Pipe handler
+	if(argc > 2) {
+		pipeHandler = new PipeHandler(argv[2]);
+	}
+	else {
+		pipeHandler = new PipeHandler("TabletDriver");
+	}
+	pipeHandler->Start();
+
 	// VMulti XP-Pen
 	vmulti = new VMulti(VMulti::TypeXPPen);
 
@@ -132,7 +143,6 @@ int main(int argc, char**argv) {
 	// Output manager
 	outputManager = new OutputManager();
 
-
 	// Read init file
 	filename = "init.cfg";
 
@@ -143,6 +153,7 @@ int main(int argc, char**argv) {
 		LOG_ERROR("Can't open '%s'\n", filename.c_str());
 	}
 
+
 	//
 	// Main loop
 	//
@@ -195,21 +206,31 @@ int main(int argc, char**argv) {
 //
 void CleanupAndExit(int code) {
 
+	// PipeHandler
+	printf("Cleanup PipeHandler\n");
+	if(pipeHandler != NULL) {
+		delete pipeHandler;
+	}
+	
 	// TabletHandler
+	printf("Cleanup TabletHandler\n");
 	if(tabletHandler != NULL) {
 		delete tabletHandler;
 	}
 
 	// OutputManager
+	printf("Cleanup OutputManager\n");
 	if(outputManager != NULL) {
 		delete outputManager;
 	}
 
 	// VMulti
+	printf("Cleanup VMulti\n");
 	if(vmulti != NULL)
 		delete vmulti;
 	
 	// Tablet
+	printf("Cleanup Tablet\n");
 	if(tablet != NULL)
 		delete tablet;
 	
diff --git a/TabletDriverService/OutputDummy.cpp b/TabletDriverService/OutputDummy.cpp
index e96d4ca..f6274b4 100644
--- a/TabletDriverService/OutputDummy.cpp
+++ b/TabletDriverService/OutputDummy.cpp
@@ -14,13 +14,15 @@ bool OutputDummy::Set(TabletState *tabletState) {
 
 	double timeDelta = (tabletState->time - timeBegin).count() / 1000000.0;
 
-	LOG_DEBUG("T=%0.3f B=%d X=%0.2f Y=%0.2f P=%0.4f\n",
-		timeDelta,
-		tabletState->buttons,
-		tabletState->position.x,
-		tabletState->position.y,
-		tabletState->pressure
-	);
+	if(logger.debugEnabled) {
+		LOG_DEBUG("T=%0.3f B=%d X=%0.2f Y=%0.2f P=%0.4f\n",
+			timeDelta,
+			tabletState->buttons,
+			tabletState->position.x,
+			tabletState->position.y,
+			tabletState->pressure
+		);
+	}
 
 
 	return true;
diff --git a/TabletDriverService/OutputManager.cpp b/TabletDriverService/OutputManager.cpp
index 3ead118..29258e2 100644
--- a/TabletDriverService/OutputManager.cpp
+++ b/TabletDriverService/OutputManager.cpp
@@ -13,14 +13,15 @@ OutputManager::OutputManager() {
 	outputs[ModeVMultiAbsolute] = &vmultiAbsolute;
 	outputs[ModeVMultiRelative] = &vmultiRelative;
 	outputs[ModeVMultiDigitizer] = &vmultiDigitizer;
+	outputs[ModeVMultiDigitizerRelative] = &vmultiDigitizerRelative;
 	outputs[ModeSendInputAbsolute] = &sendInputAbsolute;
-	outputs[ModeSendInputRelative] = &sendInputAbsolute;
+	outputs[ModeSendInputRelative] = &sendInputRelative;
 	outputs[ModeDummy] = &dummy;
 
 	// Use same settings on all outputs
 	settings = new OutputSettings();
-	for(int i = 0; i < (sizeof(outputs) / sizeof(Output*)); i++) {
-		outputs[i]->settings = settings;
+	for(Output* out : outputs) {
+		out->settings = settings;
 	}
 
 }
@@ -62,3 +63,91 @@ bool OutputManager::Reset() {
 	if(output == NULL) return false;
 	return output->Reset();
 }
+
+//
+// Get relative position
+//
+bool OutputManager::GetRelativePositionDelta(TabletState * tabletState, Vector2D *delta)
+{
+	double dx, dy, distance;
+
+	double x = tabletState->position.x;
+	double y = tabletState->position.y;
+
+	// Map position to virtual screen (values between 0 and 1)
+	mapper->GetRotatedTabletPosition(&x, &y);
+
+	if(settings->relativeState.firstPosition) {
+		settings->relativeState.lastPosition.x = x;
+		settings->relativeState.lastPosition.y = y;
+		settings->relativeState.firstPosition = false;
+	}
+
+	// Mouse move delta
+	dx = x - settings->relativeState.lastPosition.x;
+	dy = y - settings->relativeState.lastPosition.y;
+	distance = sqrt(dx * dx + dy * dy);
+
+	//
+	// Reset relative state depenging on the reset time (milliseconds)
+	//
+	if(settings->relativeResetTime > 0) {
+		double timeDelta = (tabletState->time - settings->relativeState.lastTime).count() / 1000000.0;
+		if(timeDelta > settings->relativeResetTime) {
+			settings->ResetRelativeState(x, y, tabletState->time);
+			dx = 0;
+			dy = 0;
+			distance = 0;
+		}
+	}
+
+	//
+	// Reset relative position when the movement distance is long enough
+	//
+	else if(distance > settings->relativeResetDistance) {
+		settings->ResetRelativeState(x, y, tabletState->time);
+		dx = 0;
+		dy = 0;
+	}
+
+	// Sensitivity
+	dx *= settings->relativeSensitivity.x;
+	dy *= settings->relativeSensitivity.y;
+
+	// Move only when pressure is detected?
+	if(settings->relativeDragMove && tabletState->inputPressure <= 0.01) {
+		dx = 0;
+		dy = 0;
+	}
+
+
+	// Move target position
+	settings->relativeState.targetPosition.Add(dx, dy);
+
+	// Set coordinates between current position and the target position
+	int relativeX = (int)settings->relativeState.targetPosition.x - settings->relativeState.pixelPosition.x;
+	int relativeY = (int)settings->relativeState.targetPosition.y - settings->relativeState.pixelPosition.y;
+
+	// Limit values
+	if(relativeX > 127) relativeX = 127;
+	else if(relativeX < -127) relativeX = -127;
+	if(relativeY > 127) relativeY = 127;
+	else if(relativeY < -127) relativeY = -127;
+
+	// Move current position
+	settings->relativeState.pixelPosition.x += relativeX;
+	settings->relativeState.pixelPosition.y += relativeY;
+
+	// Set last position
+	settings->relativeState.lastPosition.Set(x, y);
+
+	// Set last time if movement distance is long enough
+	if(distance > 0.1) {
+		settings->relativeState.lastTime = tabletState->time;
+	}
+
+	// Set relative mouse report output
+	delta->Set(relativeX, relativeY);
+
+	return true;
+}
diff --git a/TabletDriverService/OutputManager.h b/TabletDriverService/OutputManager.h
index 3aa5fc6..183a316 100644
--- a/TabletDriverService/OutputManager.h
+++ b/TabletDriverService/OutputManager.h
@@ -4,7 +4,9 @@
 #include "OutputVMultiAbsolute.h"
 #include "OutputVMultiRelative.h"
 #include "OutputVMultiDigitizer.h"
+#include "OutputVMultiDigitizerRelative.h"
 #include "OutputSendInputAbsolute.h"
+#include "OutputSendInputRelative.h"
 #include "OutputDummy.h"
 
 class OutputManager : public Output {
@@ -14,18 +16,21 @@ class OutputManager : public Output {
 		ModeVMultiAbsolute,
 		ModeVMultiRelative,
 		ModeVMultiDigitizer,
+		ModeVMultiDigitizerRelative,
 		ModeSendInputAbsolute,
 		ModeSendInputRelative,
 		ModeDummy
 	};
 
 	Output *output;
-	Output *outputs[6];
+	Output *outputs[7];
 
 	OutputVMultiAbsolute vmultiAbsolute;
 	OutputVMultiRelative vmultiRelative;
 	OutputVMultiDigitizer vmultiDigitizer;
+	OutputVMultiDigitizerRelative vmultiDigitizerRelative;
 	OutputSendInputAbsolute sendInputAbsolute;
+	OutputSendInputRelative sendInputRelative;
 	OutputDummy dummy;
 
 	OutputMode mode;
@@ -36,6 +41,9 @@ class OutputManager : public Output {
 	bool Write();
 	bool Reset();
 
+	bool GetRelativePositionDelta(TabletState *tabletState, Vector2D *delta);
+
+
 	OutputManager();
 	~OutputManager();
 
diff --git a/TabletDriverService/OutputSendInputAbsolute.cpp b/TabletDriverService/OutputSendInputAbsolute.cpp
index 28846ed..c5eadf5 100644
--- a/TabletDriverService/OutputSendInputAbsolute.cpp
+++ b/TabletDriverService/OutputSendInputAbsolute.cpp
@@ -50,7 +50,10 @@ bool OutputSendInputAbsolute::Set(TabletState *tabletState) {
 	unsigned char buttons = tabletState->buttons;
 
 	// Map position to virtual screen (values between 0 and 1)
-	mapper->GetScreenPosition(&x, &y);
+	bool mapValid = mapper->GetScreenPosition(&x, &y);
+	if(!mapValid) {
+		return false;
+	}
 
 	input.type = INPUT_MOUSE;
 	input.mi.mouseData = 0;
diff --git a/TabletDriverService/OutputSendInputRelative.cpp b/TabletDriverService/OutputSendInputRelative.cpp
new file mode 100644
index 0000000..e5734e6
--- /dev/null
+++ b/TabletDriverService/OutputSendInputRelative.cpp
@@ -0,0 +1,117 @@
+#include "stdafx.h"
+#include "OutputSendInputRelative.h"
+
+#define LOG_MODULE "SendInputRelative"
+#include "Logger.h"
+
+
+//
+// Constructor
+//
+OutputSendInputRelative::OutputSendInputRelative() {
+	lastButtons = 0;
+}
+
+
+//
+// Destructor
+//
+OutputSendInputRelative::~OutputSendInputRelative() {
+}
+
+
+//
+// Initialize
+//
+void OutputSendInputRelative::Init() {
+}
+
+//
+// Set output
+//
+bool OutputSendInputRelative::Set(TabletState *tabletState) {
+
+	// Get relative position delta
+	Vector2D delta;
+	outputManager->GetRelativePositionDelta(tabletState, &delta);
+
+
+	// Set data
+	input.type = INPUT_MOUSE;
+	input.mi.mouseData = 0;
+	input.mi.dx = (LONG)delta.x;
+	input.mi.dy = (LONG)delta.y;
+	input.mi.dwFlags = MOUSEEVENTF_MOVE;
+
+
+	unsigned char buttons = tabletState->buttons;
+
+	// Mouse 1
+	if((buttons & 0x01) && !(lastButtons & 0x01)) input.mi.dwFlags |= MOUSEEVENTF_LEFTDOWN;
+	else if(!(buttons & 0x01) && (lastButtons & 0x01)) input.mi.dwFlags |= MOUSEEVENTF_LEFTUP;
+
+	// Mouse 2
+	if((buttons & 0x02) && !(lastButtons & 0x02)) input.mi.dwFlags |= MOUSEEVENTF_RIGHTDOWN;
+	else if(!(buttons & 0x02) && (lastButtons & 0x02)) input.mi.dwFlags |= MOUSEEVENTF_RIGHTUP;
+
+	// Mouse 3
+	if((buttons & 0x04) && !(lastButtons & 0x04)) input.mi.dwFlags |= MOUSEEVENTF_MIDDLEDOWN;
+	else if(!(buttons & 0x04) && (lastButtons & 0x04)) input.mi.dwFlags |= MOUSEEVENTF_MIDDLEUP;
+
+	lastButtons = buttons;
+
+	return true;
+}
+
+//
+// Write output
+//
+bool OutputSendInputRelative::Write() {
+
+	// Send input if changed
+	if(memcmp(&lastInput, &input, sizeof(INPUT)) != 0) {
+
+		// SendInput
+		SendInput(1, &input, sizeof(INPUT));
+
+		// Debug message
+		if(logger.debugEnabled) {
+			LOG_DEBUG("X: %d, Y: %d, Flags: %d\n",
+				input.mi.dx, input.mi.dy, input.mi.dwFlags
+			);
+		}
+
+		// Copy last input
+		memcpy(&lastInput, &input, sizeof(INPUT));
+
+		return true;
+	}
+	return false;
+}
+
+
+//
+// Reset output
+//
+bool OutputSendInputRelative::Reset() {
+
+	// Do not reset when buttons are not pressed
+	if(lastButtons == 0) {
+		return true;
+	}
+
+	INPUT input = { 0 };
+	input.type = INPUT_MOUSE;
+	input.mi.mouseData = 0;
+	input.mi.dx = 0;
+	input.mi.dy = 0;
+	input.mi.dwFlags = 0;
+	if(lastButtons & 0x01) input.mi.dwFlags |= MOUSEEVENTF_LEFTUP;
+	if(lastButtons & 0x02) input.mi.dwFlags |= MOUSEEVENTF_RIGHTUP;
+	if(lastButtons & 0x04) input.mi.dwFlags |= MOUSEEVENTF_MIDDLEUP;
+
+	SendInput(1, &input, sizeof(INPUT));
+
+	return true;
+}
+
diff --git a/TabletDriverService/OutputSendInputRelative.h b/TabletDriverService/OutputSendInputRelative.h
new file mode 100644
index 0000000..1a02864
--- /dev/null
+++ b/TabletDriverService/OutputSendInputRelative.h
@@ -0,0 +1,17 @@
+#pragma once
+class OutputSendInputRelative : public Output {
+public:
+
+	INPUT input = { 0 };
+	INPUT lastInput = { 0 };
+	unsigned char lastButtons;
+
+	void Init() override;
+	bool Set(TabletState *tabletState);
+	bool Write();
+	bool Reset();
+
+	OutputSendInputRelative();
+	~OutputSendInputRelative();
+};
+
diff --git a/TabletDriverService/OutputSettings.cpp b/TabletDriverService/OutputSettings.cpp
index e9227d4..3a9dbe7 100644
--- a/TabletDriverService/OutputSettings.cpp
+++ b/TabletDriverService/OutputSettings.cpp
@@ -2,9 +2,11 @@
 #include "OutputSettings.h"
 
 OutputSettings::OutputSettings() {
+	relativeState.firstPosition = true;
 	relativeSensitivity.Set(1,1);
 	relativeResetDistance = 25;
 	relativeResetTime = 100;
+	relativeDragMove = false;
 	ResetRelativeState(0, 0, chrono::high_resolution_clock::now());
 }
 
diff --git a/TabletDriverService/OutputSettings.h b/TabletDriverService/OutputSettings.h
index 355eec5..1dbad66 100644
--- a/TabletDriverService/OutputSettings.h
+++ b/TabletDriverService/OutputSettings.h
@@ -12,6 +12,7 @@ class OutputSettings {
 	} PixelPosition;
 
 	struct {
+		bool firstPosition;
 		PixelPosition pixelPosition;
 		Vector2D targetPosition;
 		Vector2D lastPosition;
@@ -21,6 +22,7 @@ class OutputSettings {
 	Vector2D relativeSensitivity;
 	double relativeResetDistance;
 	double relativeResetTime;
+	bool relativeDragMove;
 
 	void ResetRelativeState(double x, double y, chrono::high_resolution_clock::time_point time);
 
diff --git a/TabletDriverService/OutputVMultiAbsolute.cpp b/TabletDriverService/OutputVMultiAbsolute.cpp
index eccc1db..0d1b827 100644
--- a/TabletDriverService/OutputVMultiAbsolute.cpp
+++ b/TabletDriverService/OutputVMultiAbsolute.cpp
@@ -48,7 +48,10 @@ bool OutputVMultiAbsolute::Set(TabletState *tabletState) {
 	double y = tabletState->position.y;
 
 	// Map position to virtual screen (values between 0 and 1)
-	mapper->GetScreenPosition(&x, &y);
+	bool mapValid = mapper->GetScreenPosition(&x, &y);
+	if(!mapValid) {
+		return false;
+	}
 
 	report.buttons = tabletState->buttons;
 	report.x = (USHORT)round(x * 32767.0);
diff --git a/TabletDriverService/OutputVMultiDigitizer.cpp b/TabletDriverService/OutputVMultiDigitizer.cpp
index a881783..47fcb0d 100644
--- a/TabletDriverService/OutputVMultiDigitizer.cpp
+++ b/TabletDriverService/OutputVMultiDigitizer.cpp
@@ -50,11 +50,14 @@ bool OutputVMultiDigitizer::Set(TabletState *tabletState) {
 	double y = tabletState->position.y;
 
 	// Map position to virtual screen (values between 0 and 1)
-	mapper->GetScreenPosition(&x, &y);
+	bool mapValid = mapper->GetScreenPosition(&x, &y);
+	if(!mapValid) {
+		return false;
+	}
 
 	// Offset coordinates by one pixel
-	double offsetX = -(32767.0 / mapper->areaVirtualScreen.width);
-	double offsetY = -(32767.0 / mapper->areaVirtualScreen.height);
+	double offsetX = -(32767.0 / mapper->virtualScreen.width);
+	double offsetY = -(32767.0 / mapper->virtualScreen.height);
 
 	report.buttons = tabletState->buttons | 0x20;
 	report.x = (USHORT)round(x * 32767.0 + offsetX);
diff --git a/TabletDriverService/OutputVMultiDigitizerRelative.cpp b/TabletDriverService/OutputVMultiDigitizerRelative.cpp
new file mode 100644
index 0000000..b78292d
--- /dev/null
+++ b/TabletDriverService/OutputVMultiDigitizerRelative.cpp
@@ -0,0 +1,140 @@
+#include "stdafx.h"
+#include "OutputVMultiDigitizerRelative.h"
+
+#define LOG_MODULE "DigitizerRelative"
+#include "Logger.h"
+
+
+//
+// Constructor
+//
+OutputVMultiDigitizerRelative::OutputVMultiDigitizerRelative()
+{
+
+	// Digitizer VMulti report
+	report.reportLength = 8;
+	report.buttons = 0;
+	report.x = 0;
+	report.y = 0;
+	report.pressure = 0;
+
+	// XP-Pen
+	if(vmulti->type == VMulti::TypeXPPen) {
+		report.vmultiId = 0x40;
+		report.reportId = 5;
+		maxPressure = 2047.0;
+	}
+
+	// VEIKK
+	else if(vmulti->type == VMulti::TypeVEIKK) {
+		report.vmultiId = 0x09;
+		report.reportId = 2;
+		maxPressure = 8191.0;
+	}
+
+	absolutePosition.Set(0, 0);
+	UpdateMonitorInfo();
+
+	absolutePosition.x = monitorInfo.virtualWidth / 2.0;
+	absolutePosition.y = monitorInfo.virtualHeight / 2.0;
+
+}
+
+//
+// Destructor
+//
+OutputVMultiDigitizerRelative::~OutputVMultiDigitizerRelative()
+{
+}
+
+//
+// Update monitor info
+//
+void OutputVMultiDigitizerRelative::UpdateMonitorInfo()
+{
+	monitorInfo.primaryWidth = GetSystemMetrics(SM_CXSCREEN);
+	monitorInfo.primaryHeight = GetSystemMetrics(SM_CYSCREEN);
+	monitorInfo.virtualWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+	monitorInfo.virtualHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+	monitorInfo.virtualX = GetSystemMetrics(SM_XVIRTUALSCREEN);
+	monitorInfo.virtualY = GetSystemMetrics(SM_YVIRTUALSCREEN);
+}
+
+
+//
+// Initialize output
+//
+void OutputVMultiDigitizerRelative::Init()
+{
+	UpdateMonitorInfo();
+}
+
+
+//
+// Set output
+//
+bool OutputVMultiDigitizerRelative::Set(TabletState *tabletState)
+{
+	// Get relative position delta
+	Vector2D delta;
+	outputManager->GetRelativePositionDelta(tabletState, &delta);
+
+	// Move absolute position
+	absolutePosition.Add(delta);
+
+	if(delta.x == 0 && delta.y == 0) return true;
+
+	// Limits
+	if(absolutePosition.x < 0) absolutePosition.x = 0;
+	else if(absolutePosition.x > monitorInfo.virtualWidth) absolutePosition.x = monitorInfo.virtualWidth;
+	if(absolutePosition.y < 0) absolutePosition.y = 0;
+	else if(absolutePosition.y > monitorInfo.virtualHeight) absolutePosition.y = monitorInfo.virtualHeight;
+
+
+	report.buttons = tabletState->buttons | 0x20;
+	report.x = (USHORT)round(absolutePosition.x / monitorInfo.virtualWidth * 32767.0);
+	report.y = (USHORT)round(absolutePosition.y / monitorInfo.virtualHeight * 32767.0);
+	report.pressure = (USHORT)round(tabletState->pressure * maxPressure);
+	vmulti->SetReport(&report, sizeof(report));
+
+	return true;
+}
+
+
+//
+// Write output
+//
+bool OutputVMultiDigitizerRelative::Write()
+{
+	// Write report to VMulti device if report has changed
+	if(vmulti->HasReportChanged()) {
+
+		// Debug message
+		if(logger.debugEnabled) {
+			LOG_DEBUGBUFFER(&report, 10, "Report: ");
+		}
+
+		vmulti->WriteReport();
+		return true;
+	}
+	return false;
+}
+
+
+//
+// Reset output
+//
+bool OutputVMultiDigitizerRelative::Reset()
+{
+	// Do not reset when buttons are not pressed
+	if(report.buttons == 0) {
+		return true;
+	}
+
+	report.buttons = 0;
+	report.pressure = 0;
+	vmulti->SetReport(&report, sizeof(report));
+	vmulti->WriteReport();
+	return true;
+}
+
diff --git a/TabletDriverService/OutputVMultiDigitizerRelative.h b/TabletDriverService/OutputVMultiDigitizerRelative.h
new file mode 100644
index 0000000..5f2a10d
--- /dev/null
+++ b/TabletDriverService/OutputVMultiDigitizerRelative.h
@@ -0,0 +1,40 @@
+#pragma once
+#include "Output.h"
+class OutputVMultiDigitizerRelative : public Output
+{
+public:
+
+	// Digitizer vmulti report
+	struct {
+		BYTE vmultiId;
+		BYTE reportLength;
+		BYTE reportId;
+		BYTE buttons;
+		USHORT x;
+		USHORT y;
+		USHORT pressure;
+	} report;
+
+	struct {
+		double primaryWidth = GetSystemMetrics(SM_CXSCREEN);
+		double primaryHeight = GetSystemMetrics(SM_CYSCREEN);
+		double virtualWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+		double virtualHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+		double virtualX = GetSystemMetrics(SM_XVIRTUALSCREEN);
+		double virtualY = GetSystemMetrics(SM_YVIRTUALSCREEN);
+	} monitorInfo;
+
+	Vector2D absolutePosition;
+
+	double maxPressure;
+
+	OutputVMultiDigitizerRelative();
+	~OutputVMultiDigitizerRelative();
+
+	void UpdateMonitorInfo();
+	void Init() override;
+	bool Set(TabletState *tabletState);
+	bool Write();
+	bool Reset();
+};
+
diff --git a/TabletDriverService/OutputVMultiRelative.cpp b/TabletDriverService/OutputVMultiRelative.cpp
index 2ce7da5..50d9175 100644
--- a/TabletDriverService/OutputVMultiRelative.cpp
+++ b/TabletDriverService/OutputVMultiRelative.cpp
@@ -46,84 +46,15 @@ OutputVMultiRelative::~OutputVMultiRelative() {
 //
 bool OutputVMultiRelative::Set(TabletState *tabletState) {
 
-	double dx, dy, distance;
-
-	double x = tabletState->position.x;
-	double y = tabletState->position.y;
-
-	// Map position to virtual screen (values between 0 and 1)
-	mapper->GetRotatedTabletPosition(&x, &y);
-
-	if(firstReport) {
-		settings->relativeState.lastPosition.x = x;
-		settings->relativeState.lastPosition.y = y;
-		firstReport = false;
-	}
-
 	// Buttons
 	report.buttons = tabletState->buttons;
 
-	// Mouse move delta
-	dx = x - settings->relativeState.lastPosition.x;
-	dy = y - settings->relativeState.lastPosition.y;
-	distance = sqrt(dx * dx + dy * dy);
-
-
-	//
-	// Reset relative state depenging on the reset time (milliseconds)
-	//
-	if(settings->relativeResetTime > 0) {
-		double timeDelta = (tabletState->time - settings->relativeState.lastTime).count() / 1000000.0;
-		if(timeDelta > settings->relativeResetTime) {
-			settings->ResetRelativeState(x, y, tabletState->time);
-			dx = 0;
-			dy = 0;
-			distance = 0;
-		}
-	}
-
-	//
-	// Reset relative position when the movement distance is long enough
-	//
-	else if(distance > settings->relativeResetDistance) {
-		settings->ResetRelativeState(x, y, tabletState->time);
-		dx = 0;
-		dy = 0;
-	}
-
-	// Sensitivity
-	dx *= settings->relativeSensitivity.x;
-	dy *= settings->relativeSensitivity.y;
-
-	// Move target position
-	settings->relativeState.targetPosition.Add(dx, dy);
-
-	// Set coordinates between current position and the target position
-	int relativeX = (int)settings->relativeState.targetPosition.x - settings->relativeState.pixelPosition.x;
-	int relativeY = (int)settings->relativeState.targetPosition.y - settings->relativeState.pixelPosition.y;
-
-	// Limit values
-	if(relativeX > 127) relativeX = 127;
-	else if(relativeX < -127) relativeX = -127;
-	if(relativeY > 127) relativeY = 127;
-	else if(relativeY < -127) relativeY = -127;
-
-	// Move current position
-	settings->relativeState.pixelPosition.x += relativeX;
-	settings->relativeState.pixelPosition.y += relativeY;
-
-	// Set last position
-	settings->relativeState.lastPosition.Set(x, y);
-
-	// Set last time if movement distance is long enough
-	if(distance > 0.1) {
-		settings->relativeState.lastTime = tabletState->time;
-	}
-
+	Vector2D delta;
+	outputManager->GetRelativePositionDelta(tabletState, &delta);
 
 	// Set relative mouse report output
-	report.x = (char)relativeX;
-	report.y = (char)relativeY;
+	report.x = (char)delta.x;
+	report.y = (char)delta.y;
 
 	vmulti->SetReport(&report, sizeof(report));
 
diff --git a/TabletDriverService/PipeHandler.cpp b/TabletDriverService/PipeHandler.cpp
new file mode 100644
index 0000000..fa9a0e5
--- /dev/null
+++ b/TabletDriverService/PipeHandler.cpp
@@ -0,0 +1,338 @@
+#include "stdafx.h"
+#include "PipeHandler.h"
+
+#define LOG_MODULE "Pipe"
+#include "Logger.h"
+
+
+//
+// Constructor
+//
+PipeHandler::PipeHandler(string pipeName)
+{
+	pipeNameInput = "\\\\.\\PIPE\\" + pipeName + "Input";
+	pipeNameOutput = "\\\\.\\PIPE\\" + pipeName + "Output";
+	pipeNameState = "\\\\.\\PIPE\\" + pipeName + "State";
+
+	handleInput = NULL;
+	handleOutput = NULL;
+	handleState = NULL;
+	connectedInput = false;
+	connectedOutput = false;
+	connectedState = false;
+
+	isRunning = false;
+	isStateOutputEnabled = false;
+
+}
+
+
+//
+// Destructor
+//
+PipeHandler::~PipeHandler()
+{
+	Stop();
+}
+
+
+//
+// Start
+//
+bool PipeHandler::Start()
+{
+	if(!isRunning) {
+		isRunning = true;
+		threadInput = new thread(&PipeHandler::RunInputThread, this);
+		threadOutput = new thread(&PipeHandler::RunOutputThread, this);
+		threadState = new thread(&PipeHandler::RunStateThread, this);
+		return true;
+	}
+	return false;
+}
+
+
+//
+// Stop
+//
+bool PipeHandler::Stop() {
+	if(isRunning) {
+		isRunning = false;
+
+		// Input
+		if(handleInput != NULL) {
+			if(connectedInput) {
+				CloseHandle(handleInput);
+			}
+			TerminateThread(threadInput, 0);
+		}
+
+		// Output
+		if(handleOutput != NULL) {
+			if(connectedOutput) {
+				CloseHandle(handleOutput);
+			}
+			TerminateThread(threadOutput, 0);
+		}
+
+		// State
+		if(handleState != NULL) {
+			if(connectedState) {
+				CloseHandle(handleState);
+			}
+			TerminateThread(threadState, 0);
+		}
+
+		// Logger handle
+		logger.pipeHandle = NULL;
+		return true;
+	}
+	return false;
+}
+
+
+//
+// Input thread
+//
+void PipeHandler::RunInputThread()
+{
+	BOOL result;
+	DWORD bytesWritten = 0;
+	DWORD bytesRead = 0;
+	DWORD bytesAvailable = 0;
+	DWORD bytesLeft = 0;
+	char bufferWrite[1024];
+	char bufferRead[1024];
+
+	while(isRunning) {
+
+		connectedInput = false;
+
+		// Input connection
+		handleInput = CreateNamedPipeA(pipeNameInput.c_str(),
+			PIPE_ACCESS_DUPLEX,
+			PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
+			PIPE_UNLIMITED_INSTANCES,
+			sizeof(bufferWrite),
+			sizeof(bufferRead),
+			500, // Timeout
+			NULL
+		);
+
+
+		// Invalid handle?
+		if(handleInput == INVALID_HANDLE_VALUE) {
+			LOG_ERROR("Couldn't create input pipe!\n");
+			break;
+		}
+
+		// Connect
+		LOG_DEBUG("Connecting to input pipe!\n");
+		result = ConnectNamedPipe(handleInput, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED);
+		LOG_DEBUG("Input pipe connected: %d\n", result);
+
+		if(!result) {
+			if(handleInput != NULL)
+				CloseHandle(handleInput);
+			continue;
+		}
+
+		connectedInput = true;
+
+		// Read loop
+		while(true) {
+			PeekNamedPipe(handleInput, &bufferRead, sizeof(bufferRead), &bytesRead, &bytesAvailable, &bytesLeft);
+			if(bytesAvailable > 0) {
+				result = ReadFile(handleInput, &bufferRead, sizeof(bufferRead), &bytesRead, NULL);
+				if(!result || bytesRead == 0) {
+					if(GetLastError() == ERROR_BROKEN_PIPE) {
+						LOG_DEBUG("Input pipe broken! %d\n", GetLastError());
+						CloseHandle(handleInput);
+						break;
+					}
+				}
+
+				if(bytesRead > 0) {
+					bufferRead[bytesRead] = 0;
+					//LOG_DEBUG("Pipe read: %s\n", bufferRead);
+					CommandLine *cmd = new CommandLine(bufferRead);
+					ProcessCommand(cmd);
+					delete cmd;
+				}
+			}
+			else {
+				Sleep(100);
+			}
+		}
+
+	}
+
+
+
+
+}
+
+
+//
+// Output thread
+//
+void PipeHandler::RunOutputThread()
+{
+	BOOL result;
+	DWORD bytesWritten = 0;
+	DWORD bytesRead = 0;
+	char bufferWrite[1024];
+	char bufferRead[1024];
+
+	// Connect loop
+	while(isRunning) {
+
+		connectedOutput = false;
+
+		// Output connection
+		handleOutput = CreateNamedPipeA(pipeNameOutput.c_str(),
+			PIPE_ACCESS_DUPLEX,
+			PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
+			PIPE_UNLIMITED_INSTANCES,
+			sizeof(bufferWrite),
+			sizeof(bufferRead),
+			500, // Timeout
+			NULL
+		);
+
+		if(handleOutput == INVALID_HANDLE_VALUE) {
+			LOG_ERROR("Couldn't create output pipe!\n");
+			Sleep(1000);
+			continue;
+		}
+
+		LOG_DEBUG("Connecting to output pipe!\n");
+		result = ConnectNamedPipe(handleOutput, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED);
+		LOG_DEBUG("Output pipe connected: %d\n", result);
+
+		if(!result) {
+			if(handleOutput != NULL)
+				CloseHandle(handleOutput);
+			logger.pipeHandle = NULL;
+			continue;
+		}
+
+		// Logger pipe handle
+		logger.pipeHandle = handleOutput;
+
+		connectedOutput = true;
+
+		// Read loop
+		while(true) {
+			if(logger.pipeHandle == NULL) {
+				CloseHandle(handleOutput);
+				break;
+			}
+			Sleep(100);
+			/*
+			result = ReadFile(handleOutput, &bufferRead, sizeof(bufferRead), &bytesRead, NULL);
+			if(!result || bytesRead == 0) {
+				if(GetLastError() == ERROR_BROKEN_PIPE) {
+					LOG_DEBUG("Output pipe broken! %d\n", GetLastError());
+					CloseHandle(handleOutput);
+					break;
+				}
+			}
+			*/
+		}
+
+	}
+
+}
+
+
+//
+// Tablet state thread
+//
+void PipeHandler::RunStateThread()
+{
+	BOOL result;
+	DWORD bytesWritten = 0;
+	DWORD bytesRead = 0;
+	char bufferWrite[1024];
+	char bufferRead[1024];
+	TabletState lastState;
+
+	// Connect loop
+	while(isRunning) {
+
+		connectedState = false;
+
+		// Output connection
+		handleState = CreateNamedPipeA(pipeNameState.c_str(),
+			PIPE_ACCESS_DUPLEX,
+			PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
+			PIPE_UNLIMITED_INSTANCES,
+			sizeof(bufferWrite),
+			sizeof(bufferRead),
+			500, // Timeout
+			NULL
+		);
+
+		if(handleState == INVALID_HANDLE_VALUE) {
+			LOG_ERROR("Couldn't create state pipe!\n");
+			break;
+		}
+
+		LOG_DEBUG("Connecting to state pipe!\n");
+		result = ConnectNamedPipe(handleState, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED);
+		LOG_DEBUG("State pipe connected: %d\n", result);
+
+		if(!result) {
+			if(handleState != NULL)
+				CloseHandle(handleState);
+			logger.pipeHandle = NULL;
+			Sleep(1000);
+			continue;
+		}
+
+		connectedState = true;
+
+		stateMessage.index = 0;
+
+		// Write loop
+		while(true) {
+
+			if(tablet != NULL && tabletHandler != NULL && isStateOutputEnabled) {
+				if(tabletHandler->outputStateWrite.position.Distance(lastState.position) > 0) {
+
+					// Input
+					stateMessage.inputButtons = tablet->state.inputButtons;
+					stateMessage.inputX = tablet->state.inputPosition.x;
+					stateMessage.inputY = tablet->state.inputPosition.y;
+					stateMessage.inputPressure = tablet->state.inputPressure;
+					stateMessage.inputVelocity = tablet->state.inputVelocity;
+
+					// Output
+					stateMessage.outputButtons = tabletHandler->outputStateWrite.buttons;
+					stateMessage.outputX = tabletHandler->outputStateWrite.position.x;
+					stateMessage.outputY = tabletHandler->outputStateWrite.position.y;
+					stateMessage.outputPressure = tabletHandler->outputStateWrite.pressure;
+
+					// Index
+					stateMessage.index++;
+
+					// Write to pipe
+					WriteFile(handleState, &stateMessage, sizeof(stateMessage), &bytesWritten, NULL);
+
+					// Update last state
+					memcpy(&lastState, &tabletHandler->outputStateWrite, sizeof(TabletState));
+				}
+				else {
+					Sleep(2);
+				}
+			}
+			else {
+				Sleep(100);
+			}
+
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/TabletDriverService/PipeHandler.h b/TabletDriverService/PipeHandler.h
new file mode 100644
index 0000000..eec5c7a
--- /dev/null
+++ b/TabletDriverService/PipeHandler.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include <thread>
+#include <mutex>
+
+class PipeHandler
+{
+public:
+
+#pragma pack(1)
+	struct {
+		int index;
+
+		int inputButtons;
+		double inputX;
+		double inputY;
+		double inputPressure;
+		double inputVelocity;
+
+		int outputButtons;
+		double outputX;
+		double outputY;
+		double outputPressure;
+	} stateMessage;
+
+	string pipeNameInput;
+	string pipeNameOutput;
+	string pipeNameState;
+
+	thread *threadInput;
+	thread *threadOutput;
+	thread *threadState;
+
+	HANDLE handleInput;
+	HANDLE handleOutput;
+	HANDLE handleState;
+
+	bool connectedInput;
+	bool connectedOutput;
+	bool connectedState;
+
+	bool isRunning;
+	bool isStateOutputEnabled;
+
+	PipeHandler(string pipeName);
+	~PipeHandler();
+
+	bool Start();
+	bool Stop();
+	void RunInputThread();
+	void RunOutputThread();
+	void RunStateThread();
+
+};
+
diff --git a/TabletDriverService/ScreenMapper.cpp b/TabletDriverService/ScreenMapper.cpp
index 324d90e..9713922 100644
--- a/TabletDriverService/ScreenMapper.cpp
+++ b/TabletDriverService/ScreenMapper.cpp
@@ -13,71 +13,67 @@
 ScreenMapper::ScreenMapper(Tablet *t) {
 	this->tablet = t;
 
+	screenMapCount = 1;
+	primaryMap = &screenMaps[0];
+	primaryTabletArea = &screenMaps[0].tablet;
+	primaryScreenArea = &screenMaps[0].screen;
+	primaryRotationMatrix = screenMaps[0].rotationMatrix;
+
 	// Default Virtual Screen Area
-	areaVirtualScreen.width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
-	areaVirtualScreen.height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-	areaVirtualScreen.x = 0;
-	areaVirtualScreen.y = 0;
-
-	// Default Tablet Area
-	areaTablet.width = 100;
-	areaTablet.height = 50;
-	areaTablet.x = 50;
-	areaTablet.y = 25;
-
-	// Default Screen Area
-	areaScreen.width = areaVirtualScreen.width;
-	areaScreen.height = areaVirtualScreen.height;
-	areaScreen.x = 0;
-	areaScreen.y = 0;
-
-	// Default Rotation Matrix
-	rotationMatrix[0] = 1;
-	rotationMatrix[1] = 0;
-	rotationMatrix[2] = 0;
-	rotationMatrix[3] = 1;
+	virtualScreen.width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+	virtualScreen.height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+	virtualScreen.x = virtualScreen.width / 2.0;
+	virtualScreen.y = virtualScreen.height / 2.0;
 
+	// Reset all screen maps
+	for(ScreenMap &map : screenMaps) {
 
-}
+		// Tablet area
+		map.tablet.width = 80;
+		map.tablet.height = 80 * (virtualScreen.height / virtualScreen.width);
+		map.tablet.x = map.tablet.width / 2.0;
+		map.tablet.y = map.tablet.height / 2.0;
+
+		// Screen area
+		map.screen.width = virtualScreen.width;
+		map.screen.height = virtualScreen.height;
+		map.screen.x = map.screen.width / 2.0;
+		map.screen.y = map.screen.height / 2.0;
+
+		// Rotation
+		map.SetRotation(0);
+	}
+
+	UpdateValues();
 
-//
-// Create rotation matrix
-//
-void ScreenMapper::SetRotation(double angle) {
-	angle *= M_PI / 180;
-	rotationMatrix[0] = cos(angle);
-	rotationMatrix[1] = -sin(angle);
-	rotationMatrix[2] = sin(angle);
-	rotationMatrix[3] = cos(angle);
 }
 
 //
 // Get rotated tablet position
 //
 bool ScreenMapper::GetRotatedTabletPosition(double *x, double *y) {
-	double mapX, mapY;
-	double tmpX, tmpY;
-
-	mapX = (*x);
-	mapY = (*y);
+	Vector2D tmpPosition;
+	Vector2D position(
+		*x,
+		*y
+	);
 
 	// Offset tablet so that the center is at zero
-	mapX -= tablet->settings.width / 2.0;
-	mapY -= tablet->settings.height / 2.0;
+	position.x -= tablet->settings.width / 2.0;
+	position.y -= tablet->settings.height / 2.0;
 
 	// Rotate
-	tmpX = mapX;
-	tmpY = mapY;
-	mapX = tmpX * rotationMatrix[0] + tmpY * rotationMatrix[1];
-	mapY = tmpX * rotationMatrix[2] + tmpY * rotationMatrix[3];
+	tmpPosition.Set(position);
+	position.x = tmpPosition.x * primaryMap->rotationMatrix[0] + tmpPosition.y * primaryMap->rotationMatrix[1];
+	position.y = tmpPosition.x * primaryMap->rotationMatrix[2] + tmpPosition.y * primaryMap->rotationMatrix[3];
 
 	// Offset back to center from zero
-	mapX += tablet->settings.width / 2.0;
-	mapY += tablet->settings.height / 2.0;
+	position.x += tablet->settings.width / 2.0;
+	position.y += tablet->settings.height / 2.0;
 
 	// Set pointer values
-	*x = mapX;
-	*y = mapY;
+	*x = position.x;
+	*y = position.y;
 
 	return true;
 }
@@ -86,57 +82,194 @@ bool ScreenMapper::GetRotatedTabletPosition(double *x, double *y) {
 // Get screen position. Return values between 0 and 1
 //
 bool ScreenMapper::GetScreenPosition(double *x, double *y) {
-	double mapX, mapY;
-	double tmpX, tmpY;
+	Vector2D position;
+	Vector2D tmpPosition;
+	ScreenMap *screenMap;
+	double minimumDistance = 99999;
+	int matchingScreenMapIndex = 0;
+
+	//
+	// Loop through screen maps
+	//
+	for(int index = 0; index < screenMapCount; index++) {
+
+		screenMap = &screenMaps[index];
+
+		position.x = *x;
+		position.y = *y;
+
+		// Offset tablet area position
+		position.x -= screenMap->tablet.x;
+		position.y -= screenMap->tablet.y;
+
+		// Rotate
+		tmpPosition.Set(position);
+		position.x = tmpPosition.x * screenMap->rotationMatrix[0] + tmpPosition.y * screenMap->rotationMatrix[1];
+		position.y = tmpPosition.x * screenMap->rotationMatrix[2] + tmpPosition.y * screenMap->rotationMatrix[3];
+
+		// Offset half of tablet area size
+		position.x += screenMap->tablet.width / 2.0;
+		position.y += screenMap->tablet.height / 2.0;
+
+		// Update last rotated position
+		screenMap->rotatedPosition.Set(position);
+
+
+		//
+		// Is the pen position inside of a tablet area?
+		//
+		if(
+			position.x >= 0 && position.x <= screenMap->tablet.width
+			&&
+			position.y >= 0 && position.y <= screenMap->tablet.height
+		) {
+			matchingScreenMapIndex = index;
+			screenMap->distance = 0;
+			minimumDistance = 0;
+			break;
+		}
+
+		//
+		// Calculate distance from the tablet area
+		//
+		else {
+			double distanceX = 0;
+			double distanceY = 0;
+			double tmp = 0;
+
+			// X axis distance
+			if(position.x < 0) {
+				tmp = -position.x;
+				if(tmp > distanceX)
+					distanceX = tmp;
+			}
+			else if(position.x > screenMap->tablet.width) {
+				tmp = position.x - screenMap->tablet.width;
+				if(tmp > distanceX)
+					distanceX = tmp;
+			}
+
+			// Y axis distance
+			if(position.y < 0) {
+				tmp = -position.y;
+				if(tmp > distanceY)
+					distanceY = tmp;
+			}
+			else if(position.y > screenMap->tablet.height) {
+				tmp = position.y - screenMap->tablet.height;
+				if(tmp > distanceY)
+					distanceY = tmp;
+			}
+
+			// Distance
+			screenMap->distance = sqrt(distanceX * distanceX + distanceY * distanceY);
+		}
+
+		// Update minimum distance
+		if(screenMap->distance < minimumDistance) minimumDistance = screenMap->distance;
+
+	}
+
+
+	//
+	// Pen position is not inside of a tablet area
+	// 
+	if(minimumDistance > 0) {
+
+		// Set primary screen map as default
+		screenMap = &screenMaps[0];
+
+		//
+		// Find the closest screen map
+		//
+		for(int index = 0; index < screenMapCount; index++) {
+			if(screenMaps[index].distance <= minimumDistance) {
+				screenMap = &screenMaps[index];
+				position.Set(screenMaps[index].rotatedPosition);
+				break;
+			}
+		}
+	}
+
+	// Set screen map to one that directly matches with the pen position
+	else {
+		screenMap = &screenMaps[matchingScreenMapIndex];
+	}
 
-	mapX = (*x);
-	mapY = (*y);
+	// Normalize tablet area
+	position.x /= screenMap->tablet.width;
+	position.y /= screenMap->tablet.height;
 
-	// Offset tablet area position
-	mapX -= areaTablet.x;
-	mapY -= areaTablet.y;
+	// Scale to screen area size
+	position.x *= (screenMap->screen.width);
+	position.y *= (screenMap->screen.height);
 
-	// Rotate
-	tmpX = mapX;
-	tmpY = mapY;
-	mapX = tmpX * rotationMatrix[0] + tmpY * rotationMatrix[1];
-	mapY = tmpX * rotationMatrix[2] + tmpY * rotationMatrix[3];
+	// Limit cursor to screen area
+	if(position.x < 1) position.x = 1;
+	else if(position.x > screenMap->screen.width) position.x = screenMap->screen.width;
+	if(position.y < 1) position.y = 1;
+	else if(position.y > screenMap->screen.height) position.y = screenMap->screen.height;
 
-	// Offset half of tablet area size
-	mapX += areaTablet.width / 2.0;
-	mapY += areaTablet.height / 2.0;
+	// Offset screen area
+	position.x += screenMap->screen.minX;
+	position.y += screenMap->screen.minY;
 
-	// Normalize tablet area
-	mapX /= areaTablet.width;
-	mapY /= areaTablet.height;
+	// Normalize virtual screen area
+	position.x /= virtualScreen.width;
+	position.y /= virtualScreen.height;
 
+	// Limit values
+	if(position.x > 1) position.x = 1;
+	if(position.y > 1) position.y = 1;
 
-	// Scale to screen area size
-	mapX *= (areaScreen.width);
-	mapY *= (areaScreen.height);
+	// Set output values
+	*x = position.x;
+	*y = position.y;
 
-	// Offset screen area
-	mapX += areaScreen.x;
-	mapY += areaScreen.y;
+	return true;
+}
 
-	// Limit cursor to screen area
-	if(mapX < areaScreen.x + 1) mapX = areaScreen.x + 1;
-	if(mapY < areaScreen.y + 1) mapY = areaScreen.y + 1;
-	if(mapX > areaScreen.x + areaScreen.width) mapX = areaScreen.x + areaScreen.width;
-	if(mapY > areaScreen.y + areaScreen.height) mapY = areaScreen.y + areaScreen.height;
+//
+// Update precalculated values in screen maps
+//
+void ScreenMapper::UpdateValues()
+{
+	for(ScreenMap &map : screenMaps) {
+		map.UpdateValues();
+	}
+}
 
 
-	// Normalize screen area
-	mapX /= areaVirtualScreen.width;
-	mapY /= areaVirtualScreen.height;
+//
+// Update precalculated area values
+//
+void ScreenMapper::Area::UpdateValues()
+{
+	minX = x - width / 2.0;
+	maxX = x + width / 2.0;
+	minY = y - height / 2.0;
+	maxY = y + height / 2.0;
+}
 
-	// Limit values
-	if(mapX > 1) mapX = 1;
-	if(mapY > 1) mapY = 1;
 
-	// Set pointer values
-	*x = mapX;
-	*y = mapY;
+//
+// Set screen map rotation
+//
+void ScreenMapper::ScreenMap::SetRotation(double angle)
+{
+	angle *= M_PI / 180;
+	rotationMatrix[0] = cos(angle);
+	rotationMatrix[1] = -sin(angle);
+	rotationMatrix[2] = sin(angle);
+	rotationMatrix[3] = cos(angle);
+}
+
+//
+// Update precalculated screen map values
+//
+void ScreenMapper::ScreenMap::UpdateValues()
+{
+	screen.UpdateValues();
+	tablet.UpdateValues();
+}
 
-	return true;
-}
\ No newline at end of file
diff --git a/TabletDriverService/ScreenMapper.h b/TabletDriverService/ScreenMapper.h
index 9caa276..fe025fc 100644
--- a/TabletDriverService/ScreenMapper.h
+++ b/TabletDriverService/ScreenMapper.h
@@ -1,24 +1,48 @@
 #pragma once
 #include "Tablet.h"
+#include "Vector2D.h"
 
-typedef struct {
-	double x;
-	double y;
-	double width;
-	double height;
-} Area;
 
 class ScreenMapper {
 public:
-	Tablet * tablet;
-	Area areaTablet;
-	Area areaScreen;
-	Area areaVirtualScreen;
-	double rotationMatrix[4];
+	class Area {
+	public:
+		double x;
+		double y;
+		double width;
+		double height;
+
+		double minX;
+		double maxX;
+		double minY;
+		double maxY;
+
+		void UpdateValues();
+	};
+
+	class ScreenMap {
+	public:
+		Area tablet;
+		Area screen;
+		Vector2D rotatedPosition;
+		double distance;
+		double rotationMatrix[4];
+		void SetRotation(double angle);
+		void UpdateValues();
+	};
+
+	Tablet *tablet;
+	Area virtualScreen;
+	ScreenMap screenMaps[10];
+	int screenMapCount;
+	ScreenMap *primaryMap;
+	Area *primaryTabletArea;
+	Area *primaryScreenArea;
+	double *primaryRotationMatrix;
 
 	ScreenMapper(Tablet *t);
-	void SetRotation(double angle);
 	bool GetRotatedTabletPosition(double *x, double *y);
 	bool GetScreenPosition(double *x, double *y);
+	void UpdateValues();
 };
 
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 734b6e5..2901d02 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -19,6 +19,7 @@ Tablet::Tablet(string usbGUID) : Tablet() {
 		delete usbDevice;
 		usbDevice = NULL;
 	}
+	hidDevice = NULL;
 }
 
 //
@@ -33,6 +34,7 @@ Tablet::Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage
 		delete hidDevice;
 		hidDevice = NULL;
 	}
+	usbDevice = NULL;
 }
 Tablet::Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage) :
 	Tablet(vendorId, productId, usagePage, usage, false) {
@@ -50,16 +52,11 @@ Tablet::Tablet() {
 
 	usbPipeId = 0;
 
-	// Init reports
-	initFeature = NULL;
-	initFeatureLength = 0;
-	initReport = NULL;
-	initReportLength = 0;
-
 	// Timed filters
 	filterTimed[0] = &smoothing;
-	filterTimed[1] = &gravityFilter;
-	filterTimedCount = 2;
+	filterTimed[1] = &advancedSmoothing;
+	filterTimed[2] = &gravityFilter;
+	filterTimedCount = 3;
 
 	// Report filters
 	filterReport[0] = &antiSmoothing;
@@ -81,20 +78,43 @@ Tablet::Tablet() {
 // Destructor
 //
 Tablet::~Tablet() {
-	//CloseDevice();
-	if(usbDevice != NULL)
-		delete usbDevice;
-	if(hidDevice != NULL)
+
+	isOpen = false;
+	
+	// HID device
+	if(hidDevice != NULL) {
+		printf("  Cleanup HIDDevice\n");
+		hidDevice->CloseDevice();
 		delete hidDevice;
-	/*
-	if(hidDeviceAux != NULL)
+		hidDevice = NULL;
+	}
+
+	// Aux device
+	if(hidDeviceAux != NULL) {
+		printf("  Cleanup Aux HIDDevice\n");
+		hidDeviceAux->CloseDevice();
 		delete hidDeviceAux;
+		hidDeviceAux = NULL;
+	}
+
+	// WinUSB device
+	if(usbDevice != NULL) {
+		printf("  Cleanup USBDevice\n");
+		usbDevice->CloseDevice();
+		delete usbDevice;
+		usbDevice = NULL;
+	}
+
+	// Init feature reports
+	for(InitReport *report : initFeatureReports) {
+		delete report;
+	}
+
+	// Init output reports
+	for(InitReport *report : initOutputReports) {
+		delete report;
+	}
 
-	if(initReport != NULL)
-		delete initReport;
-	if(initFeature != NULL)
-		delete initFeature;
-		*/
 }
 
 
@@ -103,28 +123,32 @@ Tablet::~Tablet() {
 //
 bool Tablet::Init() {
 
-	// Init string requests
+	// String requests
 	if(initStrings.size() > 0) {
 		for(int stringId : initStrings) {
 			GetDeviceString(stringId);
+			Sleep(10);
 		}
 	}
+	Sleep(100);
 
-	// Feature report
-	if(initFeature != NULL) {
-		if(hidDevice->SetFeature(initFeature, initFeatureLength)) {
-			return true;
+	// Feature reports
+	for(InitReport *report : initFeatureReports) {
+		if(!hidDevice->SetFeature(report->data, report->length)) {
+			return false;
 		}
-		return false;
+		Sleep(20);
 	}
+	Sleep(100);
 
-	// Output report
-	if(initReport != NULL) {
-		if(hidDevice->Write(initReport, initReportLength)) {
-			return true;
+	// Output reports
+	for(InitReport *report : initOutputReports) {
+		if(!hidDevice->Write(report->data, report->length)) {
+			return false;
 		}
-		return false;
+		Sleep(20);
 	}
+	Sleep(100);
 
 	return true;
 }
@@ -230,8 +254,10 @@ int Tablet::ReadState() {
 		return -1;
 	}
 
+	if(!isOpen) return Tablet::ReportInvalid;
+
 	// Process auxiliary data
-	if(settings.auxReportId > 0 && hidDeviceAux == NULL) {
+	if(settings.auxReports[0].reportId > 0 && hidDeviceAux == NULL) {
 		ProcessAuxData(buffer, settings.reportLength);
 	}
 
@@ -377,42 +403,48 @@ int Tablet::ReadState() {
 	// Set valid
 	state.isValid = true;
 
+
+	// Time
 	state.time = chrono::high_resolution_clock::now();
 
 
 	// Buttons
 	reportData.buttons = reportData.buttons & 0x0F;
-	state.buttons = reportData.buttons;
+	state.buttons = state.inputButtons = reportData.buttons;
+
 
 	// Convert report data to state
-	state.position.x = ((double)reportData.x / (double)settings.maxX) * settings.width;
-	state.position.y = ((double)reportData.y / (double)settings.maxY) * settings.height;
+	state.position.x = state.inputPosition.x = ((double)reportData.x / (double)settings.maxX) * settings.width;
+	state.position.y = state.inputPosition.y = ((double)reportData.y / (double)settings.maxY) * settings.height;
+
+	state.inputPosition.Set(state.position);
+
 	if(settings.skew != 0) {
 		state.position.x += state.position.y * settings.skew;
 	}
-	state.pressure = ((double)reportData.pressure / (double)settings.maxPressure);
+	state.pressure = state.inputPressure = ((double)reportData.pressure / (double)settings.maxPressure);
 
 
 	//
 	// Pressure deadzone
 	//
-	if(settings.pressureDeadzone > 0.0) {
+	if(settings.pressureDeadzoneLow > 0.0 || settings.pressureDeadzoneHigh > 0.0) {
 
 		// Minimum
-		if(state.pressure < settings.pressureDeadzone) {
+		if(state.pressure < settings.pressureDeadzoneLow) {
 			state.pressure = 0.0;
 		}
 
 		// Maximum
-		else if(state.pressure > 1 - settings.pressureDeadzone) {
+		else if(state.pressure > 1 - settings.pressureDeadzoneHigh) {
 			state.pressure = 1.0;
 		}
 
 		// Between
 		else {
 			double pressure;
-			pressure = state.pressure - settings.pressureDeadzone;
-			pressure /= (1 - settings.pressureDeadzone);
+			pressure = state.pressure - settings.pressureDeadzoneLow;
+			pressure /= (1 - settings.pressureDeadzoneHigh);
 			state.pressure = pressure;
 		}
 
@@ -462,36 +494,50 @@ bool Tablet::Read(void *buffer, int length) {
 //
 // Process auxiliary device data
 //
-int Tablet::ProcessAuxData(void * buffer, int length)
+int Tablet::ProcessAuxData(void *buffer, int length)
 {
+	int status = TabletAuxReportStatus::AuxReportInvalid;
 
-	// Clear report data
-	memset(&auxReportData, 0, sizeof(auxReportData));
+	auxState.buttons = 0;
 
-	// Format data
-	auxDataFormatter.Format(&auxReportData, buffer);
+	for(int i = 0; i < settings.auxReportCount; i++) {
+		TabletSettings::AuxReport *auxReport = &settings.auxReports[i];
 
-	// Report id valid?
-	if(auxReportData.reportId == settings.auxReportId) {
+		// Clear report data
+		memset(&auxReportData, 0, sizeof(auxReportData));
+		auxReportData.isPressed = 0x01;
 
-		// Detect mask
-		if(settings.auxDetectMask > 0 && (auxReportData.detect & settings.auxDetectMask) != settings.auxDetectMask) {
-			return TabletAuxReportStatus::AuxReportInvalid;
-		}
+		// Format data
+		auxReport->formatter.Format(&auxReportData, buffer);
 
-		// Ignore mask
-		if(settings.auxIgnoreMask > 0 && (auxReportData.detect & settings.auxIgnoreMask) == settings.auxIgnoreMask) {
-			return TabletAuxReportStatus::AuxReportIgnore;
-		}
+		// Report id valid?
+		if(auxReportData.reportId == auxReport->reportId) {
+
+			// Detect mask
+			if(auxReport->detectMask > 0 && (auxReportData.detect & auxReport->detectMask) != auxReport->detectMask) {
+				if(status != TabletAuxReportStatus::AuxReportValid)
+					status = TabletAuxReportStatus::AuxReportInvalid;
+				continue;
+			}
+
+			// Ignore mask
+			if(auxReport->ignoreMask > 0 && (auxReportData.detect & auxReport->ignoreMask) == auxReport->ignoreMask) {
+				if(status != TabletAuxReportStatus::AuxReportValid)
+					status = TabletAuxReportStatus::AuxReportIgnore;
+				continue;
+			}
 
-		// Update aux state
-		auxState.buttons = auxReportData.buttons;
-		auxState.isValid = true;
+			// Update aux state
+			if(auxReportData.isPressed > 0) {
+				auxState.buttons |= auxReportData.buttons;
+			}
+			auxState.isValid = true;
 
-		return TabletAuxReportStatus::AuxReportValid;
+			status = TabletAuxReportStatus::AuxReportValid;
+		}
 	}
 
-	return TabletAuxReportStatus::AuxReportInvalid;
+	return status;
 }
 
 //
@@ -515,7 +561,7 @@ int Tablet::ReadAuxReport()
 		return ProcessAuxData(buffer, length);
 
 	}
-	else if(usbDevice != NULL || settings.auxReportId > 0) {
+	else if(usbDevice != NULL || settings.auxReports[0].reportId > 0) {
 		if(auxState.isValid) {
 			Sleep(1);
 			return TabletAuxReportStatus::AuxReportValid;
@@ -556,4 +602,21 @@ void Tablet::CloseDevice() {
 		}
 	}
 	isOpen = false;
-}
\ No newline at end of file
+}
+
+//
+// Init report constructor
+//
+Tablet::InitReport::InitReport(int length)
+{
+	this->data = new BYTE[length];
+	this->length = length;
+}
+
+//
+// Init report destructor
+//
+Tablet::InitReport::~InitReport()
+{
+	delete this->data;
+}
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index 4f5e41a..da8a9e1 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -8,10 +8,11 @@
 #include "TabletSettings.h"
 #include "TabletState.h"
 #include "TabletFilterSmoothing.h"
+#include "TabletFilterAdvancedSmoothing.h"
+#include "TabletFilterGravity.h"
 #include "TabletFilterNoiseReduction.h"
 #include "TabletFilterAntiSmoothing.h"
 #include "TabletFilterPeak.h"
-#include "TabletFilterGravity.h"
 #include "TabletMeasurement.h"
 #include "DataFormatter.h"
 
@@ -69,8 +70,17 @@ class Tablet {
 		BYTE reportId;
 		USHORT buttons;
 		UCHAR detect;
+		UCHAR isPressed;
 	} auxReportData;
 
+	class InitReport {
+	public:
+		BYTE *data = NULL;
+		int length = 0;
+		InitReport(int length);
+		~InitReport();
+	};
+
 	class TabletAuxState {
 	public:
 		bool isValid;
@@ -83,7 +93,6 @@ class Tablet {
 	// Data formatters
 	//
 	DataFormatter dataFormatter;
-	DataFormatter auxDataFormatter;
 
 	//
 	// Tablet State
@@ -96,6 +105,9 @@ class Tablet {
 	// Smoothing filter
 	TabletFilterSmoothing smoothing;
 
+	// Smoothing filter
+	TabletFilterAdvancedSmoothing advancedSmoothing;
+
 	// Noise reduction filter
 	TabletFilterNoiseReduction noiseFilter;
 
@@ -125,10 +137,8 @@ class Tablet {
 	int tipDownCounter;
 
 	// Tablet initialize buffers
-	BYTE *initFeature;
-	int initFeatureLength;
-	BYTE *initReport;
-	int initReportLength;
+	vector<InitReport*> initFeatureReports;
+	vector<InitReport*> initOutputReports;
 	vector<int> initStrings;
 
 
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index ea63d12..bd0951f 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -185,15 +185,19 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     <ClInclude Include="OutputDummy.h" />
     <ClInclude Include="OutputManager.h" />
     <ClInclude Include="OutputSendInputAbsolute.h" />
+    <ClInclude Include="OutputSendInputRelative.h" />
     <ClInclude Include="OutputSettings.h" />
     <ClInclude Include="OutputVMultiAbsolute.h" />
     <ClInclude Include="OutputVMultiDigitizer.h" />
+    <ClInclude Include="OutputVMultiDigitizerRelative.h" />
     <ClInclude Include="OutputVMultiRelative.h" />
+    <ClInclude Include="PipeHandler.h" />
     <ClInclude Include="PositionRingBuffer.h" />
     <ClInclude Include="RelativeMouseState.h" />
     <ClInclude Include="ScreenMapper.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="Tablet.h" />
+    <ClInclude Include="TabletFilterAdvancedSmoothing.h" />
     <ClInclude Include="TabletFilterAntiSmoothing.h" />
     <ClInclude Include="TabletFilterGravity.h" />
     <ClInclude Include="TabletFilterTester.h" />
@@ -227,14 +231,18 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     <ClCompile Include="OutputDummy.cpp" />
     <ClCompile Include="OutputManager.cpp" />
     <ClCompile Include="OutputSendInputAbsolute.cpp" />
+    <ClCompile Include="OutputSendInputRelative.cpp" />
     <ClCompile Include="OutputSettings.cpp" />
     <ClCompile Include="OutputVMultiAbsolute.cpp" />
     <ClCompile Include="OutputVMultiDigitizer.cpp" />
+    <ClCompile Include="OutputVMultiDigitizerRelative.cpp" />
     <ClCompile Include="OutputVMultiRelative.cpp" />
+    <ClCompile Include="PipeHandler.cpp" />
     <ClCompile Include="PositionRingBuffer.cpp" />
     <ClCompile Include="RelativeMouseState.cpp" />
     <ClCompile Include="ScreenMapper.cpp" />
     <ClCompile Include="Tablet.cpp" />
+    <ClCompile Include="TabletFilterAdvancedSmoothing.cpp" />
     <ClCompile Include="TabletFilterAntiSmoothing.cpp" />
     <ClCompile Include="TabletFilterGravity.cpp" />
     <ClCompile Include="TabletFilterTester.cpp" />
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index 4821fc6..f84cfd6 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -120,6 +120,18 @@
     <ClInclude Include="InputEmulator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="PipeHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="TabletFilterAdvancedSmoothing.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputSendInputRelative.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="OutputVMultiDigitizerRelative.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -242,6 +254,18 @@
     <ClCompile Include="CommandHandler.Auxiliary.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="PipeHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="TabletFilterAdvancedSmoothing.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputSendInputRelative.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OutputVMultiDigitizerRelative.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">
diff --git a/TabletDriverService/TabletDriverService.vcxproj.user b/TabletDriverService/TabletDriverService.vcxproj.user
index 90d5734..25f7916 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.user
+++ b/TabletDriverService/TabletDriverService.vcxproj.user
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerCommandArguments>config\init.cfg</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>config\init.cfg TDTestPipe</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>config\init.cfg</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>config\serviceonly.cfg</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/TabletDriverService/TabletFilterAdvancedSmoothing.cpp b/TabletDriverService/TabletFilterAdvancedSmoothing.cpp
new file mode 100644
index 0000000..b131c8f
--- /dev/null
+++ b/TabletDriverService/TabletFilterAdvancedSmoothing.cpp
@@ -0,0 +1,284 @@
+#include "stdafx.h"
+#include "TabletFilterAdvancedSmoothing.h"
+
+#define LOG_MODULE "AdvanceSmoothing"
+#include "Logger.h"
+
+//
+// Constructor
+//
+TabletFilterAdvancedSmoothing::TabletFilterAdvancedSmoothing() {
+
+	isEnabled = false;
+	timerInterval = 1.0;
+	threshold = 0.63;
+	velocity = 0;
+
+	// Default settings
+	ClearSettings();
+	for(int i = 0; i < 4; i++) {
+		AddSettings(
+			i * 100,
+			i >= 2 ? true : false,
+			1.000
+		);
+	}
+
+	lastTargetTime = chrono::high_resolution_clock::now();
+}
+
+
+//
+// Destructor
+//
+TabletFilterAdvancedSmoothing::~TabletFilterAdvancedSmoothing() {
+}
+
+
+//
+// TabletFilter methods
+//
+
+// Set target position
+void TabletFilterAdvancedSmoothing::SetTarget(TabletState *tabletState) {
+
+	// Set target state
+	memcpy(&target, tabletState, sizeof(TabletState));
+
+	Vector2D oldPosition(
+		outputState.position.x,
+		outputState.position.y
+	);
+	double oldPressure = outputState.pressure;
+
+	// Copy current state to output state
+	memcpy(&outputState, tabletState, sizeof(TabletState));
+
+	// Reset output position if last tablet state update is older than 100 milliseconds.
+	double timeDelta = (tabletState->time - lastTargetTime).count() / 1000000.0;
+	if(timeDelta > 100.0) {
+		outputState.position.Set(tabletState->position);
+		outputState.pressure = tabletState->pressure;
+	}
+
+	// Set output state position and pressure
+	else {
+		outputState.position.Set(oldPosition);
+		outputState.pressure = oldPressure;
+	}
+
+	// Last target
+	if(tabletState->time != lastTarget.time) {
+		timeDelta = (tabletState->time - lastTarget.time).count() / 1000000.0;
+		velocity = lastTarget.position.Distance(target.position) * (1000.0 / timeDelta);
+		memcpy(&lastTarget, tabletState, sizeof(TabletState));
+	}
+
+	// 
+	lastTargetTime = tabletState->time;
+
+}
+
+//
+// Filter timer interval changed
+//
+void TabletFilterAdvancedSmoothing::OnTimerIntervalChange(double oldInterval, double newInterval) {
+	timerInterval = newInterval;
+
+	// TODO: Find a better way to calculate this...
+	threshold = 0.63;
+
+	// Update setting values
+	for(int i = 0; i < settingCount; i++) {
+		settings[i].interval = newInterval;
+		settings[i].UpdateValues();
+	}
+}
+
+// Update
+void TabletFilterAdvancedSmoothing::Update() {
+
+	double timeDelta = (chrono::high_resolution_clock::now() - outputState.time).count() / 1000000.0;
+
+	//
+	// Do not run the filter if the last state is older than 100 milliseconds.
+	//
+	if(timeDelta > 100) {
+		return;
+	}
+
+	double weight;
+	double deltaX, deltaY, deltaPressure, distance;
+	bool dragging;
+
+	deltaX = target.position.x - outputState.position.x;
+	deltaY = target.position.y - outputState.position.y;
+	deltaPressure = target.pressure - outputState.pressure;
+	distance = sqrt(deltaX * deltaX + deltaY * deltaY);
+
+	//velocity = lastPosition.Distance(target.position) * (1000.0 / timerInterval);
+
+	dragging = (target.inputPressure > 0) ? true : false;
+	weight = GetWeightByVelocity(velocity, dragging);
+
+	outputState.position.x += deltaX * weight;
+	outputState.position.y += deltaY * weight;
+	outputState.pressure += deltaPressure * weight;
+
+	// Debug message
+	if(logger.debugEnabled) {
+		LOG_DEBUG("TX=%0.2f TY=%0.2f TP=%0.2f OX=%0.2f OY=%0.2f OP=%0.2f DX=%0.2f DY=%0.2f DP=%0.2f D=%0.2f W=%0.3f V=%0.2f mm/s\n",
+			target.position.x,
+			target.position.y,
+			target.pressure,
+			outputState.position.x,
+			outputState.position.y,
+			outputState.pressure,
+			deltaX,
+			deltaY,
+			deltaPressure,
+			distance,
+			weight,
+			velocity
+		);
+	}
+}
+
+//
+// Add smoothing setting
+//
+void TabletFilterAdvancedSmoothing::AddSettings(double velocity, bool dragging, double latency)
+{
+	if(settingCount >= (sizeof(settings) / sizeof(Settings))) return;
+	int index = settingCount;
+
+	settings[index].velocity = velocity;
+	settings[index].dragging = dragging;
+	settings[index].interval = timerInterval;
+	settings[index].threshold = threshold;
+	settings[index].latency = latency;
+	settings[index].UpdateValues();
+
+
+	settingCount++;
+
+}
+
+void TabletFilterAdvancedSmoothing::ClearSettings()
+{
+	settingCount = 0;
+}
+
+//
+// Get interpolated weight by velocity
+//
+double TabletFilterAdvancedSmoothing::GetWeightByVelocity(double velocity, bool dragging)
+{
+	Settings *lastSettings[2];
+	lastSettings[false] = NULL;
+	lastSettings[true] = NULL;
+
+
+	double weight = 1;
+
+	// Loop through settings
+	for(int i = 0; i < settingCount; i++) {
+
+		Settings *currentSettings = &settings[i];
+
+		// Hover or dragging?
+		if(currentSettings->dragging == dragging) {
+
+			// First setting
+			if(lastSettings[dragging] == NULL) {
+				weight = currentSettings->weight;
+			}
+
+			// Velocity larger than current setting
+			if(
+				lastSettings[dragging] != NULL
+				&&
+				velocity >= currentSettings->velocity
+			) {
+				weight = currentSettings->weight;
+			}
+
+			// Velocity between last and current settings
+			if(
+				lastSettings[dragging] != NULL
+				&&
+				velocity >= lastSettings[dragging]->velocity
+				&&
+				velocity <= currentSettings->velocity
+			) {
+				double position =
+					(velocity - lastSettings[dragging]->velocity)
+					/
+					(currentSettings->velocity - lastSettings[dragging]->velocity);
+
+				weight =
+					lastSettings[dragging]->weight * (1 - position)
+					+
+					currentSettings->weight * position;
+			}
+			lastSettings[dragging] = &settings[i];
+		}
+
+	}
+	return weight;
+
+}
+
+
+
+
+//
+// Calculate filter latency
+//
+double TabletFilterAdvancedSmoothing::Settings::GetLatency(double filterWeight, double interval, double threshold) {
+	double target = 1 - threshold;
+	double stepCount = -log(1 / target) / log(1 - filterWeight);
+	return stepCount * interval;
+}
+double TabletFilterAdvancedSmoothing::Settings::GetLatency(double interval, double threshold) {
+	return GetLatency(weight, interval, threshold);
+}
+
+double TabletFilterAdvancedSmoothing::Settings::GetLatency()
+{
+	return GetLatency(interval, threshold);
+}
+
+void TabletFilterAdvancedSmoothing::Settings::SetLatency(double latency)
+{
+	this->latency = latency;
+	this->weight = GetWeight(interval, threshold);
+}
+
+
+//
+// Calculate filter weight
+//
+double TabletFilterAdvancedSmoothing::Settings::GetWeight(double latency, double interval, double threshold) {
+	double stepCount = latency / interval;
+	double target = 1 - threshold;
+	return 1 - 1 / pow(1 / target, 1 / stepCount);
+}
+double TabletFilterAdvancedSmoothing::Settings::GetWeight(double interval, double threshold) {
+	return GetWeight(latency, interval, threshold);
+}
+
+double TabletFilterAdvancedSmoothing::Settings::GetWeight()
+{
+	return GetWeight(interval, threshold);
+}
+
+
+//
+// Update values
+// 
+void TabletFilterAdvancedSmoothing::Settings::UpdateValues()
+{
+	weight = GetWeight();
+}
+
diff --git a/TabletDriverService/TabletFilterAdvancedSmoothing.h b/TabletDriverService/TabletFilterAdvancedSmoothing.h
new file mode 100644
index 0000000..9a0c0ce
--- /dev/null
+++ b/TabletDriverService/TabletFilterAdvancedSmoothing.h
@@ -0,0 +1,52 @@
+#pragma once
+
+#include "Vector2D.h"
+#include "TabletFilter.h"
+
+class TabletFilterAdvancedSmoothing : public TabletFilter {
+public:
+	class Settings {
+	public:
+		double velocity;
+		bool dragging;
+
+		double latency;
+		double weight;
+		double interval;
+		double threshold;
+
+		double GetLatency(double filterWeight, double interval, double threshold);
+		double GetLatency(double interval, double threshold);
+		double GetLatency();
+		void SetLatency(double latency);
+
+		double GetWeight(double latency, double interval, double threshold);
+		double GetWeight(double interval, double threshold);
+		double GetWeight();
+
+		void UpdateValues();
+	};
+
+	Settings settings[32];
+	int settingCount;
+	double threshold;
+	double velocity;
+
+	TabletState target;
+	TabletState lastTarget;
+	chrono::high_resolution_clock::time_point lastTargetTime;
+
+	TabletFilterAdvancedSmoothing();
+	~TabletFilterAdvancedSmoothing();
+
+	void SetTarget(TabletState *tabletState);
+	void OnTimerIntervalChange(double oldInterval, double newInterval) override;
+	void Update();
+
+	void AddSettings(double velocity, bool dragging, double latency);
+	void ClearSettings();
+	double GetWeightByVelocity(double velocity, bool dragging);
+
+
+};
+
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.cpp b/TabletDriverService/TabletFilterAntiSmoothing.cpp
index 9d68ba5..028a2c7 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.cpp
+++ b/TabletDriverService/TabletFilterAntiSmoothing.cpp
@@ -10,20 +10,22 @@
 // Constructor
 //
 TabletFilterAntiSmoothing::TabletFilterAntiSmoothing() {
-	shape = 1.0;
-	compensation = 1;
+
+	// Default settings
+	ClearSettings();
+	AddSettings(0, 1.0, 1);
+
 	onlyWhenHover = false;
 	targetReportRate = 0;
+	dragMultiplier = 1.0;
 
 	reportRate = 100;
 	reportRateAverage = 100;
 	velocity = 0;
 	acceleration = 0;
-	jerk = 0;
 
 	oldVelocity = 0;
 	oldAcceleration = 0;
-	oldJerk = 0;
 
 	ignoreInvalidReports = 0;
 
@@ -59,74 +61,83 @@ void TabletFilterAntiSmoothing::Update() {
 
 	double timeDelta;
 	Vector2D predictedPosition;
+	double shape = 0;
+	double compensation = 0;
 
+	//
 	// Report rate calculation (moving average)
+	//
 	timeDelta = (timeNow - timeLastReport).count() / 1000000.0;
 	if(timeDelta >= 1 && timeDelta <= 10) {
+
+		// Limits
+		if(reportRate < 100) reportRate = 100;
+		else if(reportRate > 1000) reportRate = 1000;
+		if(reportRateAverage < 100) reportRateAverage = 100;
+		else if(reportRateAverage > 1000) reportRateAverage = 1000;
+
 		reportRateAverage += ((1000.0 / timeDelta) - reportRateAverage) * (timeDelta / 1000.0) * 10;
 		if(reportRateAverage > reportRate) {
 			reportRate = reportRateAverage;
 		}
-		else {
-			reportRate -= reportRate * (timeDelta / 1000.0) * 0.2;
-		}
-	}
-	else {
-		//timeLastReport = timeNow;
-		//return;
 	}
 	timeLastReport = timeNow;
 
-	// Velocity, acceleration and jerk calculation
+	// Velocity and acceleration calculation
 	velocity = latestTarget.Distance(oldTarget) * reportRate;
 	acceleration = (velocity - oldVelocity) * reportRate;
-	jerk = (acceleration - oldAcceleration) * reportRate;
+
+	// Low speed -> do not filter
+	if(velocity < 1) {
+		return;
+	}
 
 	//
 	// Invalid position data detection.
 	// Some tablets do send invalid/broken data when buttons are pressed.
 	//
-	// TODO: Improve this...
-	//
-	if(
-		timeDelta > 10
-		//||
-		//(abs(acceleration) > 30000 && abs(jerk) > 10000000)
-	) {
+	if(timeDelta > 10) {
 
 		if(logger.debugEnabled) {
-			LOG_DEBUG("INVALID! V=%0.2f mm/s, A=%0.0f mm/s^2, J=%0.0f mm/s^3 D=%0.2f ms\n",
+			LOG_DEBUG("INVALID! V=%0.2f mm/s, A=%0.0f mm/s^2, D=%0.2f ms\n",
 				velocity,
 				acceleration,
-				jerk,
 				timeDelta
 			);
 		}
 		ignoreInvalidReports = 2;
 	}
 
+	//
+	// Drag multiplier
+	//
+	double compensationMultiplier = 1.0;
+	if(tabletState.inputPressure > 0) {
+		compensationMultiplier = dragMultiplier;
+	}
+
 
 	// Velocity prediction
-	double predictedVelocity = velocity + (acceleration + jerk / reportRate) / reportRate;
+	double predictedVelocity = velocity + acceleration / reportRate;
 
+	//
 	// Skip invalid reports by setting the position as latest target
+	//
 	if(ignoreInvalidReports > 0) {
 		if(logger.debugEnabled) {
-			LOG_DEBUG("IGNORE! V=%0.2f mm/s, A=%0.0f mm/s^2, J=%0.0f mm/s^3 D=%0.2f ms\n",
+			LOG_DEBUG("IGNORE! V=%0.2f mm/s, A=%0.0f mm/s^2, D=%0.2f ms\n",
 				velocity,
 				acceleration,
-				jerk,
 				timeDelta
 			);
 		}
 		outputPosition->Set(latestTarget);
 		ignoreInvalidReports--;
-
-
-
 	}
 
-	// Velocity validation
+	//
+	// Position prediction
+	//
 	else if(
 		velocity > 0.1 && predictedVelocity > 0.1
 		&&
@@ -138,28 +149,40 @@ void TabletFilterAntiSmoothing::Update() {
 		//
 		predictedPosition.Set(oldTarget);
 
+		// Get settings
+		GetSettingsByVelocity(velocity, &shape, &compensation);
+
+		double shapedVelocityFactor = pow(predictedVelocity / velocity, shape) * compensationMultiplier;
+
 		// Workaround for VEIKK S640 and other tablets with variable report rate and smoothing
 		if(targetReportRate > 0) {
-			predictedPosition.LerpAdd(latestTarget,
-				1 + pow(predictedVelocity / velocity, shape)
-				*
-				compensation
-				*
-				(targetReportRate / 1000.0)
-			);
+			predictedPosition.LerpAdd(latestTarget, 1 + shapedVelocityFactor * compensation * (targetReportRate / 1000.0));
 		}
 
 		// Other tablets
 		else {
+			predictedPosition.LerpAdd(latestTarget, 1 + shapedVelocityFactor * compensation * (reportRate / 1000.0));
+		}
 
-			predictedPosition.LerpAdd(latestTarget,
-				1 + pow(predictedVelocity / velocity, shape)
-				*
-				compensation
-				*
-				(reportRate / 1000.0)
+		/*
+		if(latestTarget.Distance(predictedPosition) > 5) {
+			LOG_DEBUG("LONG DELTA: %0.3f,%0.3f -> %0.3f,%0.3f V:%0.3f OV:%0.3f PV:%0.3f PV2:%0.3f R:%0.3f A:%0.3f, T:%lld\n",
+				latestTarget.x,
+				latestTarget.y,
+				predictedPosition.x,
+				predictedPosition.y,
+				velocity,
+				oldVelocity,
+				predictedVelocity,
+				velocity + (acceleration) / reportRate,
+				reportRate,
+				acceleration,
+				tabletState.time
 			);
 		}
+		*/
+
+		// Set output position
 		outputPosition->Set(predictedPosition);
 	}
 
@@ -175,18 +198,18 @@ void TabletFilterAntiSmoothing::Update() {
 	if(onlyWhenHover) {
 
 		// Ignore anti-smoothing pen pressure is detected
-		if(tabletState.pressure > 0) {
+		if(tabletState.inputPressure > 0) {
 			outputPosition->Set(latestTarget);
 		}
 
 		// Switching from drag to hover
-		if(tabletState.pressure == 0 && oldTabletState.pressure > 0) {
+		if(tabletState.inputPressure == 0 && oldTabletState.inputPressure > 0) {
 			ignoreInvalidReports = 1;
 			outputPosition->Set(latestTarget);
 		}
 
 		// Switching from hover to drag
-		if(tabletState.pressure > 0 && oldTabletState.pressure == 0) {
+		if(tabletState.inputPressure > 0 && oldTabletState.inputPressure == 0) {
 			ignoreInvalidReports = 1;
 			outputPosition->Set(latestTarget);
 		}
@@ -196,9 +219,9 @@ void TabletFilterAntiSmoothing::Update() {
 	// Debug message
 	if(logger.debugEnabled) {
 		double delta = outputPosition->Distance(latestTarget);
-		double pixelDensity = (mapper->areaScreen.width / mapper->areaTablet.width);
+		double pixelDensity = (mapper->primaryScreenArea->width / mapper->primaryTabletArea->width);
 		LOG_DEBUG(
-			//"T=%0.2f T=[%0.2f,%0.2f] P=[%0.2f,%0.2f] D1=%0.3f D2=%0.3f R=%0.2f RA=%0.2f V=%0.2f PV=%0.2f A=%0.0f J=%0.0f L=%0.2f\n",
+			//"T=%0.2f T=[%0.2f,%0.2f] P=[%0.2f,%0.2f] D1=%0.3f D2=%0.3f R=%0.2f RA=%0.2f V=%0.2f PV=%0.2f A=%0.0f L=%0.2f\n",
 			"T=%0.2f D=%0.2f R=%0.0f V=%0.0f PV=%0.0f L=%0.2f ms LP=%0.0f pixels\n",
 			(timeNow - timeBegin).count() / 1000000.0,
 			//latestTarget.x, latestTarget.y,
@@ -209,7 +232,6 @@ void TabletFilterAntiSmoothing::Update() {
 			velocity,
 			predictedVelocity,
 			//acceleration,
-			//jerk,
 			(velocity > 0) ? (delta / velocity * 1000) : 0,
 			pixelDensity * delta
 		);
@@ -218,12 +240,97 @@ void TabletFilterAntiSmoothing::Update() {
 	// Update old values
 	oldVelocity = velocity;
 	oldAcceleration = acceleration;
-	oldJerk = jerk;
 	oldTarget.Set(latestTarget);
 	memcpy(&this->oldTabletState, &this->tabletState, sizeof(TabletState));
 
 
 }
 
+//
+// Add settings
+//
+void TabletFilterAntiSmoothing::AddSettings(double velocity, double shape, double compensation)
+{
+	if(settingCount >= (sizeof(settings) / sizeof(Settings))) return;
+	int index = settingCount;
+	settings[index].velocity = velocity;
+	settings[index].shape = shape;
+	settings[index].compensation = compensation;
+	settingCount++;
+}
+
+//
+// Clear settings
+//
+void TabletFilterAntiSmoothing::ClearSettings()
+{
+	settingCount = 0;
+}
+
+//
+// Get settings by velocity
+//
+bool TabletFilterAntiSmoothing::GetSettingsByVelocity(double velocity, double *shape, double *compensation)
+{
+	Settings *lastSettings = NULL;
+	// Loop through settings
+
+	//double shape = 0.5;
+	//double compensation = 0;
+
+	for(int i = 0; i < settingCount; i++) {
+
+		Settings *currentSettings = &settings[i];
+
+
+		// First settings in the list
+		if(lastSettings == NULL) {
+			*shape = currentSettings->shape;
+			*compensation = currentSettings->compensation;
+		}
+
+		// Velocity larger than current setting
+		if(
+			lastSettings != NULL
+			&&
+			velocity >= currentSettings->velocity
+		) {
+			*shape = currentSettings->shape;
+			*compensation = currentSettings->compensation;
+		}
+
+		// Velocity between last and current settings
+		if(
+			lastSettings != NULL
+			&&
+			velocity >= lastSettings->velocity
+			&&
+			velocity <= currentSettings->velocity
+		) {
+			double position =
+				(velocity - lastSettings->velocity)
+				/
+				(currentSettings->velocity - lastSettings->velocity);
+
+			*shape =
+				lastSettings->shape * (1 - position)
+				+
+				currentSettings->shape * position;
+
+			*compensation =
+				lastSettings->compensation * (1 - position)
+				+
+				currentSettings->compensation * position;
+
+		}
+		lastSettings = &settings[i];
+
+	}
+
+
+
+	return true;
+}
+
 
 
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.h b/TabletDriverService/TabletFilterAntiSmoothing.h
index 1e66074..1a86874 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.h
+++ b/TabletDriverService/TabletFilterAntiSmoothing.h
@@ -11,10 +11,8 @@ class TabletFilterAntiSmoothing : public TabletFilter {
 	double reportRateAverage;
 	double velocity;
 	double acceleration;
-	double jerk;
 	double oldVelocity;
 	double oldAcceleration;
-	double oldJerk;
 	int ignoreInvalidReports;
 	chrono::high_resolution_clock::time_point timeBegin;
 	chrono::high_resolution_clock::time_point timeLastReport;
@@ -28,14 +26,27 @@ class TabletFilterAntiSmoothing : public TabletFilter {
 	TabletState tabletState;
 	TabletState oldTabletState;
 
-	double shape;
-	double compensation;
+	class Settings {
+	public:
+		double velocity;
+		double shape;
+		double compensation;
+	};
+	Settings settings[32];
+	int settingCount;
+
 	bool onlyWhenHover;
 	double targetReportRate;
+	double dragMultiplier;
 
 	void SetTarget(TabletState *tabletState);
 	void Update();
 
+
+	void AddSettings(double velocity, double shape, double compensation);
+	void ClearSettings();
+	bool GetSettingsByVelocity(double velocity, double *shape, double *compensation);
+
 	TabletFilterAntiSmoothing();
 	~TabletFilterAntiSmoothing();
 
diff --git a/TabletDriverService/TabletFilterNoiseReduction.cpp b/TabletDriverService/TabletFilterNoiseReduction.cpp
index 090bdf9..91ffe8d 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.cpp
+++ b/TabletDriverService/TabletFilterNoiseReduction.cpp
@@ -52,9 +52,6 @@ void TabletFilterNoiseReduction::Update() {
 	double velocity = latestTarget.Distance(oldTarget) * reportRate;
 	oldTarget.Set(latestTarget);
 
-	
-
-
 	// One position in the buffer?
 	if(buffer.count == 1) {
 		outputPosition->Set(latestTarget);
diff --git a/TabletDriverService/TabletFilterSmoothing.cpp b/TabletDriverService/TabletFilterSmoothing.cpp
index 06db9e4..bacfd40 100644
--- a/TabletDriverService/TabletFilterSmoothing.cpp
+++ b/TabletDriverService/TabletFilterSmoothing.cpp
@@ -10,9 +10,12 @@
 TabletFilterSmoothing::TabletFilterSmoothing() {
 	latency = 2.0;
 	weight = 1.000;
-	threshold = 0.9;
+	threshold = 0.63;
 	onlyWhenButtonsDown = false;
 	lastTargetTime = chrono::high_resolution_clock::now();
+
+	target.position.Set(0, 0);
+	outputState.position.Set(0,0);
 }
 
 
@@ -33,10 +36,14 @@ void TabletFilterSmoothing::SetTarget(TabletState *tabletState) {
 	// Set target state
 	memcpy(&target, tabletState, sizeof(TabletState));
 
-	// Set output state
-	outputState.time = target.time;
-	outputState.isValid = target.isValid;
-	outputState.buttons = target.buttons;
+	Vector2D tmpPosition(
+		outputState.position.x,
+		outputState.position.y
+	);
+	double oldPressure = outputState.pressure;
+
+	// Copy current state to output state
+	memcpy(&outputState, tabletState, sizeof(TabletState));
 
 	// Reset output position if last tablet state update is older than 100 milliseconds.
 	double timeDelta = (tabletState->time - lastTargetTime).count() / 1000000.0;
@@ -45,6 +52,13 @@ void TabletFilterSmoothing::SetTarget(TabletState *tabletState) {
 		outputState.pressure = tabletState->pressure;
 	}
 
+	// Set output state position and pressure
+	else {
+		outputState.position.Set(tmpPosition);
+		outputState.pressure = oldPressure;
+	}
+
+	// 
 	lastTargetTime = tabletState->time;
 }
 
@@ -53,12 +67,18 @@ void TabletFilterSmoothing::SetTarget(TabletState *tabletState) {
 //
 void TabletFilterSmoothing::OnTimerIntervalChange(double oldInterval, double newInterval) {
 	timerInterval = newInterval;
+
+	// TODO: Find a better way to calculate this...
+	threshold = 0.63;
+
 	SetLatency(latency);
 }
 
 // Update
 void TabletFilterSmoothing::Update() {
 
+	if(!target.isValid) return;
+
 	double timeDelta = (chrono::high_resolution_clock::now() - outputState.time).count() / 1000000.0;
 
 	//
@@ -74,12 +94,12 @@ void TabletFilterSmoothing::Update() {
 	deltaY = target.position.y - outputState.position.y;
 	deltaPressure = target.pressure - outputState.pressure;
 	distance = sqrt(deltaX * deltaX + deltaY * deltaY);
-	
+
 	// Move output position only when buttons are down
 	if(onlyWhenButtonsDown) {
 
 		// Move output values
-		if((target.buttons & 0x1F) > 0) {
+		if(target.buttons > 0) {
 			outputState.position.x += deltaX * weight;
 			outputState.position.y += deltaY * weight;
 			outputState.pressure += deltaPressure * weight;
@@ -99,9 +119,13 @@ void TabletFilterSmoothing::Update() {
 		outputState.pressure += deltaPressure * weight;
 	}
 
+	double dx = deltaX * weight;
+	double dy = deltaY * weight;
+	double velocity = sqrt(dx * dx + dy * dy) * (1000.0 / timerInterval);
+
 	// Debug message
 	if(logger.debugEnabled) {
-		LOG_DEBUG("TX=%0.2f TY=%0.2f TP=%0.2f OX=%0.2f OY=%0.2f OP=%0.2f DX=%0.2f DY=%0.2f DP=%0.2f D=%0.2f W=%0.3f\n",
+		LOG_DEBUG("TXY=%0.2f,%0.2f TP=%0.2f OXY=%0.2f,%0.2f OP=%0.2f DXY=%0.2f,%0.2f DP=%0.2f D=%0.2f W=%0.3f V=%0.2f L=%0.2f\n",
 			target.position.x,
 			target.position.y,
 			target.pressure,
@@ -112,7 +136,9 @@ void TabletFilterSmoothing::Update() {
 			deltaY,
 			deltaPressure,
 			distance,
-			weight
+			weight,
+			velocity,
+			(distance / velocity) * 1000.0
 		);
 	}
 
@@ -133,6 +159,12 @@ double TabletFilterSmoothing::GetLatency() {
 	return this->GetLatency(weight, timerInterval, threshold);
 }
 
+// Set Latency
+void TabletFilterSmoothing::SetLatency(double latency) {
+	this->weight = GetWeight(latency);
+	this->latency = latency;
+}
+
 
 //
 // Calculate filter weight
@@ -146,10 +178,5 @@ double TabletFilterSmoothing::GetWeight(double latency) {
 	return this->GetWeight(latency, this->timerInterval, this->threshold);
 }
 
-// Set Latency
-void TabletFilterSmoothing::SetLatency(double latency) {
-	this->weight = GetWeight(latency);
-	this->latency = latency;
-}
 
 
diff --git a/TabletDriverService/TabletFilterSmoothing.h b/TabletDriverService/TabletFilterSmoothing.h
index c6dce67..6623963 100644
--- a/TabletDriverService/TabletFilterSmoothing.h
+++ b/TabletDriverService/TabletFilterSmoothing.h
@@ -22,8 +22,9 @@ class TabletFilterSmoothing : public TabletFilter {
 	double GetLatency(double filterWeight, double interval, double threshold);
 	double GetLatency(double filterWeight);
 	double GetLatency();
+	void SetLatency(double latency);
+
 	double GetWeight(double latency, double interval, double threshold);
 	double GetWeight(double latency);
-	void SetLatency(double latency);
 };
 
diff --git a/TabletDriverService/TabletFilterTester.cpp b/TabletDriverService/TabletFilterTester.cpp
index 05f83d3..de2d0c9 100644
--- a/TabletDriverService/TabletFilterTester.cpp
+++ b/TabletDriverService/TabletFilterTester.cpp
@@ -71,18 +71,27 @@ void TabletFilterTester::Run() {
 			time = cmd.GetDouble(0, 0);
 			position.x = cmd.GetDouble(1, 0);
 			position.y = cmd.GetDouble(2, 0);
-			LOG_DEBUG("IN : %0.3f ms, %0.2f, %0.2f\n",
-				time,
-				position.x,
-				position.y
-			);
+
+			// Debug message
+			if(logger.debugEnabled) {
+				LOG_DEBUG("IN : %0.3f ms, %0.2f, %0.2f\n",
+					time,
+					position.x,
+					position.y
+				);
+			}
 
 			// Init settings on first report
 			if(firstReport) {
 				timeBegin = chrono::high_resolution_clock::now();
 				firstReport = false;
 				outputState.position.Set(position);
-				LOG_DEBUG("First report: %0.3f, %0.2f, %0.2f\n", time, position.x, position.y);
+
+				// Debug message
+				if(logger.debugEnabled) {
+					LOG_DEBUG("First report: %0.3f, %0.2f, %0.2f\n", time, position.x, position.y);
+				}
+
 			}
 			else {
 				tabletState.time = timeNow;
@@ -100,12 +109,27 @@ void TabletFilterTester::Run() {
 			timeNow = timeBegin + chrono::microseconds((int)(time * 1000.0));
 			distance = position.Distance(outputState.position);
 
-			LOG_DEBUG("OUT: %0.3f ms, %0.2f, %0.2f (%0.3f mm)\n",
-				time,
-				position.x,
-				position.y,
-				distance
-			);
+			/*
+			if(distance > 5) {
+				LOG_DEBUG("LONG DELTA: %0.2f ms, %0.3f,%0.3f -> %0.3f,%0.3f\n",
+					time,
+					position.x,
+					position.y,
+					outputState.position.x,
+					outputState.position.y
+				);
+			}
+			*/
+
+			// Debug message
+			if(logger.debugEnabled) {
+				LOG_DEBUG("OUT: %0.3f ms, %0.2f, %0.2f (%0.3f mm)\n",
+					time,
+					position.x,
+					position.y,
+					distance
+				);
+			}
 
 			outputFile << "position " << time << " " << outputState.position.x << " " << outputState.position.y << fixed << setprecision(2) << "\n";
 
diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
index 2c8d69d..428d0ef 100644
--- a/TabletDriverService/TabletHandler.cpp
+++ b/TabletDriverService/TabletHandler.cpp
@@ -1,3 +1,4 @@
+
 #include "stdafx.h"
 #include "TabletHandler.h"
 
@@ -12,7 +13,8 @@ TabletHandler::TabletHandler() {
 	tabletInputThread = NULL;
 	auxInputThread = NULL;
 	isRunning = false;
-	timerInterval = 10;
+	timerInterval = 20;
+	isTimerTickRunning = false;
 }
 
 
@@ -22,18 +24,9 @@ TabletHandler::TabletHandler() {
 TabletHandler::~TabletHandler() {
 	StopTimer();
 	isRunning = false;
-
 	if(tablet != NULL) {
-		if(tablet->hidDevice != NULL)
-			tablet->hidDevice->CloseDevice();
-
-		if(tablet->hidDeviceAux != NULL)
-			tablet->hidDeviceAux->CloseDevice();
-
-		if(tablet->usbDevice != NULL)
-			tablet->usbDevice->CloseDevice();
+		tablet->isOpen = false;
 	}
-
 }
 
 
@@ -97,19 +90,84 @@ void TabletHandler::ChangeTimerInterval(int newInterval) {
 
 	double oldInterval = timerInterval;
 	timerInterval = newInterval;
+	bool filtersEnabled;
+
+	ULONG timerMinimumResolution = 0;
+	ULONG timerMaximumResolution = 0;
+	ULONG timerCurrentResolution = 0;
+	NtQueryTimerResolution(&timerMinimumResolution, &timerMaximumResolution, &timerCurrentResolution);
+
+	// Debug messages
+	if(logger.debugEnabled) {
+		LOG_DEBUG("System timer resolution:\n");
+		LOG_DEBUG("  Minimum: %0.3f ms\n", (double)timerMinimumResolution / 10000.0);
+		LOG_DEBUG("  Maximum: %0.3f ms\n", (double)timerMaximumResolution / 10000.0);
+		LOG_DEBUG("  Current: %0.3f ms\n", (double)timerCurrentResolution / 10000.0);
+	}
+
+	// Check if current resolution is double the timer interval
+	if(timerCurrentResolution > timerInterval * 5000.0)
+	{
+		ULONG timerResolution = (ULONG)(timerInterval * 5000.0);
+		ULONG currentResolution;
+
+		// Limits
+		if(timerResolution > timerMinimumResolution) {
+			timerResolution = timerMinimumResolution;
+		}
+		else if(timerResolution < timerMaximumResolution) {
+			timerResolution = timerMaximumResolution;
+		}
+
+		// Set new timer resolution
+		NtSetTimerResolution(timerResolution, true, &currentResolution);
+
+		// Get current resoltution
+		timerCurrentResolution = 0;
+		NtQueryTimerResolution(&timerMinimumResolution, &timerMaximumResolution, &timerCurrentResolution);
+
+		// Debug messages
+		if(logger.debugEnabled) {
+			LOG_DEBUG("System timer resolution set to %0.3f ms\n", (double)timerResolution / 10000.0);
+			LOG_DEBUG("System timer resolution is now %0.3f ms\n", (double)timerCurrentResolution / 10000.0);
+		}
+	}
 
 	// Tell the new interval to timed filters
+	filtersEnabled = false;
 	if(tablet != NULL) {
 		for(int i = 0; i < tablet->filterTimedCount; i++) {
 			tablet->filterTimed[i]->OnTimerIntervalChange(oldInterval, newInterval);
+
+			// Filter enabled?
+			if(tablet->filterTimed[i]->isEnabled) {
+				filtersEnabled = true;
+			}
 		}
 	}
 
-	if(StopTimer()) {
+	// Stop the timer and restart if a filter is enabled
+	if(StopTimer() && filtersEnabled) {
 		StartTimer();
 	}
 }
 
+
+//
+// Button helper functions
+//
+bool IsButtonDown(UCHAR buttons, int buttonIndex) {
+	return buttons & (1 << buttonIndex);
+}
+bool IsButtonPressed(UCHAR buttons, UCHAR lastButtons, int buttonIndex) {
+	return ((buttons & (1 << buttonIndex)) > 0 && (lastButtons & (1 << buttonIndex)) == 0);
+}
+bool IsButtonReleased(UCHAR buttons, UCHAR lastButtons, int buttonIndex) {
+	return ((buttons & (1 << buttonIndex)) == 0 && (lastButtons & (1 << buttonIndex)) > 0);
+}
+
+
+
 //
 // Tablet input thread
 //
@@ -119,6 +177,7 @@ void TabletHandler::RunTabletInputThread() {
 	bool isResent = false;
 	TabletFilter *filter;
 	TabletState filterState;
+	TabletState oldState;
 	bool filterTimedEnabled;
 	UCHAR buttons = 0;
 	UCHAR outButtons = 0;
@@ -138,6 +197,8 @@ void TabletHandler::RunTabletInputThread() {
 		//
 		status = tablet->ReadState();
 
+		if(!tablet->isOpen) break;
+
 		// Position OK
 		if(status == Tablet::ReportValid) {
 			isResent = false;
@@ -174,27 +235,43 @@ void TabletHandler::RunTabletInputThread() {
 
 
 		//
-		// Don't send the first report
+		// Don't use first report
 		//
 		if(isFirstReport) {
 			isFirstReport = false;
 			continue;
 		}
 
+		//
+		// Velocity calculation
+		//
+		if(oldState.isValid) {
+			double timeDelta = (tablet->state.time - oldState.time).count() / 1000000.0;
+			if(timeDelta >= 1 && timeDelta <= 10) {
+				tablet->state.inputVelocity = oldState.inputPosition.Distance(tablet->state.inputPosition) * (1000.0 / timeDelta);
+			}
+			else {
+				tablet->state.inputVelocity = oldState.inputVelocity;
+			}
+		}
+		else {
+			tablet->state.inputVelocity = oldState.inputVelocity;
+		}
+
 		// Debug messages
 		if(logger.debugEnabled) {
 			double delta = (tablet->state.time - timeBegin).count() / 1000000.0;
-			LOG_DEBUG("InputState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f V=%s\n",
+			LOG_DEBUG("InputState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f V=%0.2f Valid=%s\n",
 				delta,
-				tablet->state.buttons,
-				tablet->state.position.x,
-				tablet->state.position.y,
-				tablet->state.pressure,
+				tablet->state.inputButtons,
+				tablet->state.inputPosition.x,
+				tablet->state.inputPosition.y,
+				tablet->state.inputPressure,
+				tablet->state.inputVelocity,
 				tablet->state.isValid ? "True" : "False"
 			);
 		}
 
-
 		// Set output values
 		if(status == Tablet::ReportPositionInvalid) {
 			tablet->state.buttons = 0;
@@ -217,9 +294,9 @@ void TabletHandler::RunTabletInputThread() {
 				}
 
 				// Button state
-				bool isDown = buttons & (1 << buttonIndex);
-				bool isPressed = ((buttons & (1 << buttonIndex)) > 0 && (lastButtons & (1 << buttonIndex)) == 0);
-				bool isReleased = ((buttons & (1 << buttonIndex)) == 0 && (lastButtons & (1 << buttonIndex)) > 0);
+				bool isDown = IsButtonDown(buttons, buttonIndex);
+				bool isPressed = IsButtonPressed(buttons, lastButtons, buttonIndex);
+				bool isReleased = IsButtonReleased(buttons, lastButtons, buttonIndex);
 
 				// Button is set
 				if(tablet->settings.buttonMap[buttonIndex].size() > 0) {
@@ -242,7 +319,13 @@ void TabletHandler::RunTabletInputThread() {
 						else if((keyMapValue->mouseButton & 0x103) > 0) {
 
 							// Scroll pen button down?
-							if(isDown) {
+							if(
+								isDown
+								&&
+
+								// Scroll when tip is down
+								(!tablet->settings.scrollDrag || IsButtonDown(buttons, 0))
+								) {
 
 								// Get rotated pen position
 								Vector2D scrollPosition;
@@ -250,7 +333,10 @@ void TabletHandler::RunTabletInputThread() {
 								mapper->GetRotatedTabletPosition(&scrollPosition.x, &scrollPosition.y);
 
 								// Reset last scroll position and set the scroll start position
-								if(isPressed) {
+								if(isPressed
+									||
+									(tablet->settings.scrollDrag  && isDown && IsButtonPressed(buttons, lastButtons, 0))
+									) {
 									lastScrollPosition.Set(scrollPosition);
 									scrollStartPosition.Set(tablet->state.position);
 
@@ -266,6 +352,11 @@ void TabletHandler::RunTabletInputThread() {
 
 								}
 
+								// Disable mouse tip button when using drag scroll
+								if(tablet->settings.scrollDrag) {
+									outButtons &= ~1;
+								}
+
 								// Delta from the last scroll position
 								Vector2D delta(
 									(scrollPosition.x - lastScrollPosition.x) * tablet->settings.scrollSensitivity,
@@ -387,13 +478,17 @@ void TabletHandler::RunTabletInputThread() {
 		}
 
 
+		// Set old state
+		memcpy(&oldState, &tablet->state, sizeof(TabletState));
+
 		// Do not write report when timed filter is enabled
 		if(filterTimedEnabled) {
 			continue;
 		}
 
 		// Write output state
-		WriteOutputState(&outputState);
+		memcpy(&outputStateWrite, &outputState, sizeof(TabletState));
+		WriteOutputState(&outputStateWrite);
 	}
 
 	isRunning = false;
@@ -411,7 +506,7 @@ void TabletHandler::RunAuxInputThread()
 	Tablet::TabletAuxState auxState;
 
 	// No aux device or not aux report id set
-	if(tablet->hidDeviceAux == NULL && tablet->usbDevice == NULL && tablet->settings.auxReportId <= 0) {
+	if(tablet->hidDeviceAux == NULL && tablet->usbDevice == NULL && tablet->settings.auxReports[0].reportId <= 0) {
 		return;
 	}
 
@@ -496,15 +591,18 @@ void TabletHandler::OnTimerTick() {
 	TabletState filterState;
 	bool filtersEnabled = false;
 
-	// Copy current input state values
-	lock.lock();
-	memcpy(&filterState, &outputState, sizeof(TabletState));
-	lock.unlock();
 
-	// Set position
-	if(!filterState.isValid) {
+	if(isTimerTickRunning) {
+
+		// Limit error logging rate
+		double timeDelta = (chrono::high_resolution_clock::now() - timeLastTimerProblem).count() / 1000000.0;
+		if(timeDelta > 2000.0) {
+			LOG_ERROR("Filter performance problem detected! Use lower filter rate or disable the smoothing filter.\n");
+			timeLastTimerProblem = chrono::high_resolution_clock::now();
+		}
 		return;
 	}
+	isTimerTickRunning = true;
 
 	// Loop through filters
 	for(int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
@@ -514,6 +612,20 @@ void TabletHandler::OnTimerTick() {
 
 		// Filter enabled?
 		if(filter->isEnabled) {
+
+			// Copy current input state values when a enabled filter is found
+			if(!filtersEnabled) {
+				lock.lock();
+				memcpy(&filterState, &outputState, sizeof(TabletState));
+				lock.unlock();
+
+				// State valid?
+				if(!filterState.isValid) {
+					isTimerTickRunning = false;
+					return;
+				}
+			}
+
 			filtersEnabled = true;
 		}
 		else {
@@ -533,12 +645,15 @@ void TabletHandler::OnTimerTick() {
 
 	// Do not write to output if no filters are enabled
 	if(!filtersEnabled) {
+		isTimerTickRunning = false;
 		return;
 	}
 
 	// Write output state
-	WriteOutputState(&filterState);
+	memcpy(&outputStateWrite, &filterState, sizeof(TabletState));
+	WriteOutputState(&outputStateWrite);
 
+	isTimerTickRunning = false;
 }
 
 //
diff --git a/TabletDriverService/TabletHandler.h b/TabletDriverService/TabletHandler.h
index 4787fe2..c465ab7 100644
--- a/TabletDriverService/TabletHandler.h
+++ b/TabletDriverService/TabletHandler.h
@@ -13,10 +13,13 @@ class TabletHandler {
 	double timerInterval;
 	mutex lock;
 	chrono::high_resolution_clock::time_point timeBegin;
+	chrono::high_resolution_clock::time_point timeLastTimerProblem;
 	TabletState outputState;
+	TabletState outputStateWrite;
 	InputEmulator inputEmulator;
 
 	bool isRunning;
+	bool isTimerTickRunning;
 
 	TabletHandler();
 	~TabletHandler();
diff --git a/TabletDriverService/TabletSettings.cpp b/TabletDriverService/TabletSettings.cpp
index acac997..7bf7884 100644
--- a/TabletDriverService/TabletSettings.cpp
+++ b/TabletDriverService/TabletSettings.cpp
@@ -19,10 +19,12 @@ TabletSettings::TabletSettings() {
 	width = 1;
 	height = 1;
 	pressureSensitivity = 0;
-	pressureDeadzone = 0;
+	pressureDeadzoneLow = 0;
+	pressureDeadzoneHigh = 0;
 	scrollSensitivity = 1;
 	scrollAcceleration = 1;
 	scrollStopCursor = false;
+	scrollDrag = false;
 	skew = 0;
 	dataFormat = TabletFormatNormal;
 	buttonMap[0] = "MOUSE1";
@@ -31,11 +33,12 @@ TabletSettings::TabletSettings() {
 	buttonCount = 3;
 
 	// Aux
-	auxReportId = 0;
-	auxReportLength = 0;
-	auxDetectMask = 0;
-	auxIgnoreMask = 0;
-	auxFormat = AuxFormatCustom;
+	for(AuxReport &auxReport : auxReports) {
+		auxReport.format = AuxFormatCustom;
+	}
+	auxCurrentReport = &auxReports[0];
+	auxCurrentReportIndex = 0;
+	auxReportCount = 1;
 	auxButtonCount = 0;
 }
 
diff --git a/TabletDriverService/TabletSettings.h b/TabletDriverService/TabletSettings.h
index a5c98a4..928be37 100644
--- a/TabletDriverService/TabletSettings.h
+++ b/TabletDriverService/TabletSettings.h
@@ -1,4 +1,7 @@
 #pragma once
+
+#include "DataFormatter.h"
+
 class TabletSettings {
 public:
 
@@ -29,10 +32,12 @@ class TabletSettings {
 	double width;
 	double height;
 	double pressureSensitivity;
-	double pressureDeadzone;
+	double pressureDeadzoneLow;
+	double pressureDeadzoneHigh;
 	double scrollSensitivity;
 	double scrollAcceleration;
 	bool scrollStopCursor;
+	bool scrollDrag;
 	double skew;
 	TabletDataFormat dataFormat;
 	string buttonMap[16];
@@ -40,11 +45,19 @@ class TabletSettings {
 
 
 	// Aux
-	BYTE auxReportId;
+	class AuxReport {
+	public:
+		BYTE reportId;
+		BYTE detectMask;
+		BYTE ignoreMask;
+		TabletAuxFormat format;
+		DataFormatter formatter;
+	};
 	int auxReportLength;
-	BYTE auxDetectMask;
-	BYTE auxIgnoreMask;
-	TabletAuxFormat auxFormat;
+	AuxReport auxReports[10];
+	int auxReportCount;
+	AuxReport *auxCurrentReport;
+	int auxCurrentReportIndex;
 	string auxButtonMap[16];
 	int auxButtonCount;
 
diff --git a/TabletDriverService/TabletState.cpp b/TabletDriverService/TabletState.cpp
index a9bba4a..a4257f3 100644
--- a/TabletDriverService/TabletState.cpp
+++ b/TabletDriverService/TabletState.cpp
@@ -4,10 +4,16 @@
 
 TabletState::TabletState() {
 	time = chrono::high_resolution_clock::now();
+	
+	inputButtons = 0;
+	inputPosition.Set(0,0);
+	inputPressure = 0;
+	inputVelocity = 0;
+
 	buttons = 0;
-	position.x = 0;
-	position.y = 0;
+	position.Set(0,0);
 	pressure = 0;
+
 	isValid = false;
 }
 
diff --git a/TabletDriverService/TabletState.h b/TabletDriverService/TabletState.h
index 8eab124..951fedd 100644
--- a/TabletDriverService/TabletState.h
+++ b/TabletDriverService/TabletState.h
@@ -6,9 +6,16 @@
 class TabletState {
 public:
 	chrono::high_resolution_clock::time_point time;
+	
+	unsigned char inputButtons;
+	Vector2D inputPosition;
+	double inputPressure;
+	double inputVelocity;
+
 	unsigned char buttons;
 	Vector2D position;
 	double pressure;
+
 	bool isValid;
 
 	TabletState();
diff --git a/TabletDriverService/Vector2D.cpp b/TabletDriverService/Vector2D.cpp
index 7b186bd..a01c731 100644
--- a/TabletDriverService/Vector2D.cpp
+++ b/TabletDriverService/Vector2D.cpp
@@ -82,3 +82,9 @@ void Vector2D::LerpAdd(Vector2D target, double t) {
 	y += (target.y - y) * t;
 }
 
+void Vector2D::LerpAdd2D(Vector2D target, double tx, double ty)
+{
+	x += (target.x - x) * tx;
+	y += (target.y - y) * ty;
+}
+
diff --git a/TabletDriverService/Vector2D.h b/TabletDriverService/Vector2D.h
index 98f1365..a056658 100644
--- a/TabletDriverService/Vector2D.h
+++ b/TabletDriverService/Vector2D.h
@@ -19,5 +19,6 @@ class Vector2D {
 	double Distance(Vector2D *target);
 	double Angle(Vector2D target);
 	void LerpAdd(Vector2D target, double t);
+	void LerpAdd2D(Vector2D target, double tx, double ty);
 };
 
diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 24ccae6..6021220 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -260,6 +260,15 @@ MaxPressure 1023
 Width 152.0
 Height 95.0
 InitFeature 0x02 0x02
+AuxHID 0x056a 0x030e 0xFF00 0x0080
+AuxReportId 0x02
+AuxReportLength 64
+AuxDetectMask 0x80
+AuxIgnoreMask 0x81
+AuxCustomData ReportId Source=0
+AuxCustomData ButtonsLow Source=3 SourceMask=0x0F
+AuxCustomData Detect Source=2
+AuxButtonCount 4
 
 
 #
@@ -276,6 +285,15 @@ MaxPressure 1023
 Width 152.0
 Height 95.0
 TabletFormat WacomDrivers
+AuxHID 0x056a 0x0302 0xFF00 0x000B
+AuxReportId 0x01
+AuxReportLength 64
+AuxDetectMask 0x80
+AuxIgnoreMask 0x81
+AuxCustomData ReportId Source=1
+AuxCustomData ButtonsLow Source=3 SourceMask=0x0F
+AuxCustomData Detect Source=2
+AuxButtonCount 4
 
 
 #
@@ -292,6 +310,7 @@ MaxPressure 1023
 Width 152.0
 Height 95.0
 InitFeature 0x02 0x02
+SetFeature 0x03 0x01
 AuxHID 0x056a 0x0302 0xFF00 0x0080
 AuxReportId 0x02
 AuxReportLength 64
@@ -382,6 +401,15 @@ KeepTipDown 2
 Width 152.0
 Height 95.0
 TabletFormat WacomIntuosV2
+AuxHID 0x056a 0x033b 0xFF00 0x000B
+AuxReportId 0x01
+AuxReportLength 64
+AuxDetectMask 0x80
+AuxIgnoreMask 0x81
+AuxCustomData ReportId Source=1
+AuxCustomData ButtonsLow Source=3 SourceMask=0x0F
+AuxCustomData Detect Source=2
+AuxButtonCount 4
 
 
 #
@@ -531,6 +559,11 @@ MaxPressure 4095
 Width 152.0
 Height 95.0
 TabletFormat WacomIntuosV3
+AuxReportId 0x11
+AuxReportLength 193
+AuxCustomData ReportId Source=1
+AuxCustomData ButtonsLow Source=2 SourceMask=0x0F
+AuxButtonCount 4
 
 
 #
@@ -548,8 +581,8 @@ MaxPressure 4095
 Width 152.0
 Height 95.0
 TabletFormat WacomIntuosV3
-AuxHID 0x056a 0x0376 0xFF0D 0x0001
-AuxHID 0x056a 0x0374 0xFF0D 0x0001
+#AuxHID 0x056a 0x0376 0xFF0D 0x0001
+#AuxHID 0x056a 0x0374 0xFF0D 0x0001
 AuxReportId 0x11
 AuxReportLength 192
 AuxCustomData ReportId Source=0
@@ -572,6 +605,50 @@ Width 152.0
 Height 95.0
 
 
+#
+# Wacom CTL-6100 (Wacom drivers installed)
+#
+HIDTablet 0x056a 0x0375 0xFF00 0x000A
+HIDTablet 0x056a 0x0378 0xFF00 0x000A
+Name "Wacom CTL-6100 (Wacom drivers installed)"
+ReportId 0x10
+ReportLength 193
+DetectMask 0x20
+MaxX 21600
+MaxY 13500
+MaxPressure 4095
+Width 216.0
+Height 135.0
+TabletFormat WacomIntuosV3
+AuxReportId 0x11
+AuxReportLength 193
+AuxCustomData ReportId Source=1
+AuxCustomData ButtonsLow Source=2 SourceMask=0x0F
+AuxButtonCount 4
+
+
+#
+# Wacom CTL-6100
+#
+HIDTablet 0x056a 0x0375 0xFF0D 0x0001
+HIDTablet 0x056a 0x0378 0xFF0D 0x0001
+Name "Wacom CTL-6100"
+ReportId 0x10
+ReportLength 192
+DetectMask 0x20
+MaxX 21600
+MaxY 13500
+MaxPressure 4095
+Width 216.0
+Height 135.0
+TabletFormat WacomIntuosV3
+AuxReportId 0x11
+AuxReportLength 192
+AuxCustomData ReportId Source=0
+AuxCustomData ButtonsLow Source=1 SourceMask=0x0F
+AuxButtonCount 4
+
+
 #
 # Wacom PTH-451 ???
 #
@@ -605,12 +682,12 @@ TabletFormat WacomIntuosV2
 
 
 #
-# Wacom PTH-660 (USB)
+# Wacom PTH-660 (USB) (Wacom drivers installed)
 #
-HIDTablet 0x056A 0x0357 0xFF0D 0x0001
-Name "Wacom PTH-660"
+HIDTablet 0x056A 0x0357 0xFF00 0x000A
+Name "Wacom PTH-660 (Wacom drivers installed)"
 ReportId 0x10
-ReportLength 192
+ReportLength 193
 DetectMask 0x40
 MaxX 44800
 MaxY 29600
@@ -621,12 +698,12 @@ TabletFormat WacomIntuosV3
 
 
 #
-# Wacom PTH-660 (USB) (Wacom drivers installed)
+# Wacom PTH-660 (USB)
 #
-HIDTablet 0x056A 0x0357 0xFF00 0x000A
-Name "Wacom PTH-660 (Wacom drivers installed)"
+HIDTablet 0x056A 0x0357 0xFF0D 0x0001
+Name "Wacom PTH-660"
 ReportId 0x10
-ReportLength 193
+ReportLength 192
 DetectMask 0x40
 MaxX 44800
 MaxY 29600
@@ -838,7 +915,12 @@ IgnoreMask 0x60
 MaxX 31999
 MaxY 20000
 MaxPressure 8191
-Width 160.0
+
+# Specs
+#Width 160.0
+# Measured
+Width 155.0
+
 Height 100.0
 InitStrings 100 200
 AuxReportId 0x08
@@ -867,6 +949,15 @@ MaxPressure 8191
 Width 254
 Height 158.75
 InitStrings 100 200
+AuxReportId 0x08
+AuxReportLength 12
+AuxDetectMask 0xE0
+AuxgnoreMask 0x80
+AuxCustomData ReportId Source=0
+AuxCustomData ButtonsLow Source=4
+AuxCustomData ButtonsHigh Source=5
+AuxCustomData Detect Source=1
+AuxButtonCount 12
 
 
 #
@@ -982,6 +1073,46 @@ InitStrings 2 2 2 2 2 20 21
 InitReport 0x09 0x01 0x04 0x00 0x00 0x00 0x00 0x00 0x00
 
 
+#
+# VEIKK A50
+#
+HIDTablet 0x2FEB 0x0003 0xFF0A 0x0001
+Name "VEIKK A50"
+ReportId 0x09
+ReportLength 9
+DetectMask 0x80
+MaxX 50800
+MaxY 30480
+MaxPressure 8191
+Width 254
+Height 152.4
+TabletFormat SkipFirstDataByte
+InitStrings 2 2 2 2 2 20 21
+InitReport 0x09 0x01 0x04 0x00 0x00 0x00 0x00 0x00 0x00
+InitReport 0x09 0x02 0x02 0x00 0x00 0x00 0x00 0x00 0x00
+InitReport 0x09 0x03 0x02 0x00 0x00 0x00 0x00 0x00 0x00
+
+AuxHID 0x2FEB 0x0003 0xFF0A 0x0001
+AuxButtonCount 13
+
+# Buttons (buttons 1 - 8)
+AuxReport 0
+AuxReportId 0x42
+AuxReportLength 9
+AuxCustomData ReportId Source=1
+AuxCustomData ButtonsLow Source=4
+AuxCustomData Detect Source=1
+AuxCustomData IsPressed Source=3 WriteMode=Set
+
+# Touchpad gestures (buttons 9 - 13)
+AuxReport 1
+AuxReportId 0x43
+AuxReportLength 9
+AuxCustomData ReportId Source=1
+AuxCustomData ButtonsHigh Source=3
+AuxCustomData IsPressed Source=2 WriteMode=Set
+
+
 #
 # XP-Pen G640 (Custom Data Example)
 #
diff --git a/TabletDriverService/config/wacom.cfg b/TabletDriverService/config/wacom.cfg
index 09b4e3a..8f1cbd4 100644
--- a/TabletDriverService/config/wacom.cfg
+++ b/TabletDriverService/config/wacom.cfg
@@ -10,10 +10,79 @@
 #
 
 
+# Wacom PTK-1240 (Wacom drivers installed)
+HIDTablet 0x056A 0x00BB 0xFF00 0x000A
+Name "Wacom PTK-1240 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0xE0
+MaxX 97536
+MaxY 60960
+MaxPressure 2047
+Width 487.680
+Height 304.800
+TabletFormat WacomIntuosV2
+
+
+# Wacom PTK-1240
+HIDTablet 0x056A 0x00BB 0xFF0D 0x0001
+HIDTablet 0x056A 0x00BB 0x000D 0x0001
+Name "Wacom PTK-1240 (unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0xE0
+MaxX 97536
+MaxY 60960
+MaxPressure 2047
+Width 487.680
+Height 304.800
+InitFeature 0x02 0x02
+TabletFormat WacomIntuosV2
+
+
+# Wacom PTK-440 (Wacom drivers installed)
+HIDTablet 0x056A 0x00B8 0xFF00 0x000A
+Name "Wacom PTK-440 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0xE0
+MaxX 31496
+MaxY 19685
+MaxPressure 2047
+Width 157.480
+Height 98.425
+TabletFormat WacomIntuosV2
+
+
+# Wacom PTK-440
+HIDTablet 0x056A 0x00B8 0xFF0D 0x0001
+HIDTablet 0x056A 0x00B8 0x000D 0x0001
+Name "Wacom PTK-440 (unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0xE0
+MaxX 31496
+MaxY 19685
+MaxPressure 2047
+Width 157.480
+Height 98.425
+InitFeature 0x02 0x02
+TabletFormat WacomIntuosV2
+
+
+# Wacom PTK-450 (Wacom drivers installed)
+HIDTablet 0x056A 0x0029 0xFF00 0x000A
+Name "Wacom PTK-450 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0xE0
+MaxX 31496
+MaxY 19685
+MaxPressure 2047
+Width 157.480
+Height 98.425
+TabletFormat WacomIntuosV2
+
+
 # Wacom PTK-450
 HIDTablet 0x056A 0x0029 0xFF0D 0x0001
 HIDTablet 0x056A 0x0029 0x000D 0x0001
-Name "Wacom PTK-450"
+Name "Wacom PTK-450 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0xE0
 MaxX 31496
@@ -25,10 +94,79 @@ InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
 
 
+# Wacom PTK-540WL (Wacom drivers installed)
+HIDTablet 0x056A 0x00BC 0xFF00 0x000A
+Name "Wacom PTK-540WL (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0xE0
+MaxX 40640
+MaxY 25400
+MaxPressure 2047
+Width 203.200
+Height 127.000
+TabletFormat WacomIntuosV2
+
+
+# Wacom PTK-540WL
+HIDTablet 0x056A 0x00BC 0xFF0D 0x0001
+HIDTablet 0x056A 0x00BC 0x000D 0x0001
+Name "Wacom PTK-540WL (unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0xE0
+MaxX 40640
+MaxY 25400
+MaxPressure 2047
+Width 203.200
+Height 127.000
+InitFeature 0x02 0x02
+TabletFormat WacomIntuosV2
+
+
+# Wacom PTK-640 (Wacom drivers installed)
+HIDTablet 0x056A 0x00B9 0xFF00 0x000A
+Name "Wacom PTK-640 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0xE0
+MaxX 44704
+MaxY 27940
+MaxPressure 2047
+Width 223.520
+Height 139.700
+TabletFormat WacomIntuosV2
+
+
+# Wacom PTK-640
+HIDTablet 0x056A 0x00B9 0xFF0D 0x0001
+HIDTablet 0x056A 0x00B9 0x000D 0x0001
+Name "Wacom PTK-640 (unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0xE0
+MaxX 44704
+MaxY 27940
+MaxPressure 2047
+Width 223.520
+Height 139.700
+InitFeature 0x02 0x02
+TabletFormat WacomIntuosV2
+
+
+# Wacom PTK-650 (Wacom drivers installed)
+HIDTablet 0x056A 0x002A 0xFF00 0x000A
+Name "Wacom PTK-650 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0xE0
+MaxX 44704
+MaxY 27940
+MaxPressure 2047
+Width 223.520
+Height 139.700
+TabletFormat WacomIntuosV2
+
+
 # Wacom PTK-650
 HIDTablet 0x056A 0x002A 0xFF0D 0x0001
 HIDTablet 0x056A 0x002A 0x000D 0x0001
-Name "Wacom PTK-650"
+Name "Wacom PTK-650 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0xE0
 MaxX 44704
@@ -40,10 +178,51 @@ InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
 
 
+# Wacom PTK-840 (Wacom drivers installed)
+HIDTablet 0x056A 0x00BA 0xFF00 0x000A
+Name "Wacom PTK-840 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0xE0
+MaxX 65024
+MaxY 40640
+MaxPressure 2047
+Width 325.120
+Height 203.200
+TabletFormat WacomIntuosV2
+
+
+# Wacom PTK-840
+HIDTablet 0x056A 0x00BA 0xFF0D 0x0001
+HIDTablet 0x056A 0x00BA 0x000D 0x0001
+Name "Wacom PTK-840 (unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0xE0
+MaxX 65024
+MaxY 40640
+MaxPressure 2047
+Width 325.120
+Height 203.200
+InitFeature 0x02 0x02
+TabletFormat WacomIntuosV2
+
+
+# Wacom PTH-450 (Wacom drivers installed)
+HIDTablet 0x056A 0x0026 0xFF00 0x000A
+Name "Wacom PTH-450 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0xE0
+MaxX 31496
+MaxY 19685
+MaxPressure 2047
+Width 157.480
+Height 98.425
+TabletFormat WacomIntuosV2
+
+
 # Wacom PTH-450
 HIDTablet 0x056A 0x0026 0xFF0D 0x0001
 HIDTablet 0x056A 0x0026 0x000D 0x0001
-Name "Wacom PTH-450"
+Name "Wacom PTH-450 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0xE0
 MaxX 31496
@@ -55,10 +234,23 @@ InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
 
 
+# Wacom PTH-451 (Wacom drivers installed)
+HIDTablet 0x056A 0x0314 0xFF00 0x000A
+Name "Wacom PTH-451 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 31496
+MaxY 19685
+MaxPressure 2047
+Width 157.480
+Height 98.425
+TabletFormat WacomIntuosV2
+
+
 # Wacom PTH-451
 HIDTablet 0x056A 0x0314 0xFF0D 0x0001
 HIDTablet 0x056A 0x0314 0x000D 0x0001
-Name "Wacom PTH-451"
+Name "Wacom PTH-451 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 31496
@@ -70,10 +262,23 @@ InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
 
 
+# Wacom PTH-650 (Wacom drivers installed)
+HIDTablet 0x056A 0x0027 0xFF00 0x000A
+Name "Wacom PTH-650 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0xE0
+MaxX 44704
+MaxY 27940
+MaxPressure 2047
+Width 223.520
+Height 139.700
+TabletFormat WacomIntuosV2
+
+
 # Wacom PTH-650
 HIDTablet 0x056A 0x0027 0xFF0D 0x0001
 HIDTablet 0x056A 0x0027 0x000D 0x0001
-Name "Wacom PTH-650"
+Name "Wacom PTH-650 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0xE0
 MaxX 44704
@@ -85,10 +290,23 @@ InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
 
 
+# Wacom PTH-651 (Wacom drivers installed)
+HIDTablet 0x056A 0x0315 0xFF00 0x000A
+Name "Wacom PTH-651 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 44704
+MaxY 27940
+MaxPressure 2047
+Width 223.520
+Height 139.700
+TabletFormat WacomIntuosV2
+
+
 # Wacom PTH-651
 HIDTablet 0x056A 0x0315 0xFF0D 0x0001
 HIDTablet 0x056A 0x0315 0x000D 0x0001
-Name "Wacom PTH-651"
+Name "Wacom PTH-651 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 44704
@@ -100,10 +318,23 @@ InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
 
 
+# Wacom PTH-850 (Wacom drivers installed)
+HIDTablet 0x056A 0x0028 0xFF00 0x000A
+Name "Wacom PTH-850 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0xE0
+MaxX 65024
+MaxY 40640
+MaxPressure 2047
+Width 325.120
+Height 203.200
+TabletFormat WacomIntuosV2
+
+
 # Wacom PTH-850
 HIDTablet 0x056A 0x0028 0xFF0D 0x0001
 HIDTablet 0x056A 0x0028 0x000D 0x0001
-Name "Wacom PTH-850"
+Name "Wacom PTH-850 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0xE0
 MaxX 65024
@@ -115,10 +346,23 @@ InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
 
 
+# Wacom PTH-851 (Wacom drivers installed)
+HIDTablet 0x056A 0x0317 0xFF00 0x000A
+Name "Wacom PTH-851 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 65024
+MaxY 40640
+MaxPressure 2047
+Width 325.120
+Height 203.200
+TabletFormat WacomIntuosV2
+
+
 # Wacom PTH-851
 HIDTablet 0x056A 0x0317 0xFF0D 0x0001
 HIDTablet 0x056A 0x0317 0x000D 0x0001
-Name "Wacom PTH-851"
+Name "Wacom PTH-851 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 65024
@@ -130,10 +374,23 @@ InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
 
 
+# Wacom MTE-450 (Wacom drivers installed)
+HIDTablet 0x056A 0x0065 0xFF00 0x000A
+Name "Wacom MTE-450 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x00
+MaxX 14760
+MaxY 9225
+MaxPressure 511
+Width 147.600
+Height 92.250
+TabletFormat WacomDrivers
+
+
 # Wacom MTE-450
 HIDTablet 0x056A 0x0065 0xFF0D 0x0001
 HIDTablet 0x056A 0x0065 0x000D 0x0001
-Name "Wacom MTE-450"
+Name "Wacom MTE-450 (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x00
 MaxX 14760
@@ -144,10 +401,158 @@ Height 92.250
 InitFeature 0x02 0x02
 
 
+# Wacom FT-0203 (Wacom drivers installed)
+HIDTablet 0x056A 0x0061 0xFF00 0x000A
+Name "Wacom FT-0203 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 3250
+MaxY 2320
+MaxPressure 255
+Width 65.000
+Height 46.400
+TabletFormat WacomDrivers
+
+
+# Wacom FT-0203
+HIDTablet 0x056A 0x0061 0xFF0D 0x0001
+HIDTablet 0x056A 0x0061 0x000D 0x0001
+Name "Wacom FT-0203 (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 3250
+MaxY 2320
+MaxPressure 255
+Width 65.000
+Height 46.400
+InitFeature 0x02 0x02
+
+
+# Wacom FT-0405 (Wacom drivers installed)
+HIDTablet 0x056A 0x0060 0xFF00 0x000A
+Name "Wacom FT-0405 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 5104
+MaxY 3712
+MaxPressure 511
+Width 102.080
+Height 74.240
+TabletFormat WacomDrivers
+
+
+# Wacom FT-0405
+HIDTablet 0x056A 0x0060 0xFF0D 0x0001
+HIDTablet 0x056A 0x0060 0x000D 0x0001
+Name "Wacom FT-0405 (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 5104
+MaxY 3712
+MaxPressure 511
+Width 102.080
+Height 74.240
+InitFeature 0x02 0x02
+
+
+# Wacom ET-0405 (Wacom drivers installed)
+HIDTablet 0x056A 0x0010 0xFF00 0x000A
+Name "Wacom ET-0405 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 10206
+MaxY 7422
+MaxPressure 511
+Width 127.575
+Height 92.775
+TabletFormat WacomDrivers
+
+
+# Wacom ET-0405
+HIDTablet 0x056A 0x0010 0xFF0D 0x0001
+HIDTablet 0x056A 0x0010 0x000D 0x0001
+Name "Wacom ET-0405 (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 10206
+MaxY 7422
+MaxPressure 511
+Width 127.575
+Height 92.775
+InitFeature 0x02 0x02
+
+
+# Wacom ET-0405A (Wacom drivers installed)
+HIDTablet 0x056A 0x0011 0xFF00 0x000A
+Name "Wacom ET-0405A (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 10206
+MaxY 7422
+MaxPressure 511
+Width 127.575
+Height 92.775
+TabletFormat WacomDrivers
+
+
+# Wacom ET-0405A
+HIDTablet 0x056A 0x0011 0xFF0D 0x0001
+HIDTablet 0x056A 0x0011 0x000D 0x0001
+Name "Wacom ET-0405A (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 10206
+MaxY 7422
+MaxPressure 511
+Width 127.575
+Height 92.775
+InitFeature 0x02 0x02
+
+
+# Wacom ET-0507A (Wacom drivers installed)
+HIDTablet 0x056A 0x0012 0xFF00 0x000A
+Name "Wacom ET-0507A (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 13918
+MaxY 10206
+MaxPressure 511
+Width 173.975
+Height 127.575
+TabletFormat WacomDrivers
+
+
+# Wacom ET-0507A
+HIDTablet 0x056A 0x0012 0xFF0D 0x0001
+HIDTablet 0x056A 0x0012 0x000D 0x0001
+Name "Wacom ET-0507A (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 13918
+MaxY 10206
+MaxPressure 511
+Width 173.975
+Height 127.575
+InitFeature 0x02 0x02
+
+
+# Wacom CTT-460 (Wacom drivers installed)
+HIDTablet 0x056A 0x00D0 0xFF00 0x000A
+Name "Wacom CTT-460 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x40
+MaxX 14720
+MaxY 9200
+MaxPressure 1023
+Width 147.200
+Height 92.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTT-460
 HIDTablet 0x056A 0x00D0 0xFF0D 0x0001
 HIDTablet 0x056A 0x00D0 0x000D 0x0001
-Name "Wacom CTT-460"
+Name "Wacom CTT-460 (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x40
 MaxX 14720
@@ -158,10 +563,23 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTL-460 (Wacom drivers installed)
+HIDTablet 0x056A 0x00D4 0xFF00 0x000A
+Name "Wacom CTL-460 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x40
+MaxX 14720
+MaxY 9200
+MaxPressure 1023
+Width 147.200
+Height 92.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTL-460
 HIDTablet 0x056A 0x00D4 0xFF0D 0x0001
 HIDTablet 0x056A 0x00D4 0x000D 0x0001
-Name "Wacom CTL-460"
+Name "Wacom CTL-460 (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x40
 MaxX 14720
@@ -172,10 +590,23 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTL-470 (Wacom drivers installed)
+HIDTablet 0x056A 0x00DD 0xFF00 0x000A
+Name "Wacom CTL-470 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 14720
+MaxY 9200
+MaxPressure 1023
+Width 147.200
+Height 92.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTL-470
 HIDTablet 0x056A 0x00DD 0xFF0D 0x0001
 HIDTablet 0x056A 0x00DD 0x000D 0x0001
-Name "Wacom CTL-470"
+Name "Wacom CTL-470 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 14720
@@ -186,10 +617,23 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTL-671 (Wacom drivers installed)
+HIDTablet 0x056A 0x0301 0xFF00 0x000A
+Name "Wacom CTL-671 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 21648
+MaxY 13530
+MaxPressure 1023
+Width 216.480
+Height 135.300
+TabletFormat WacomDrivers
+
+
 # Wacom CTL-671
 HIDTablet 0x056A 0x0301 0xFF0D 0x0001
 HIDTablet 0x056A 0x0301 0x000D 0x0001
-Name "Wacom CTL-671"
+Name "Wacom CTL-671 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 21648
@@ -200,25 +644,51 @@ Height 135.300
 InitFeature 0x02 0x02
 
 
-# Wacom CTL-690
-HIDTablet 0x056A 0x033D 0xFF0D 0x0001
-HIDTablet 0x056A 0x033D 0x000D 0x0001
-Name "Wacom CTL-690"
-ReportLength 10
+# Wacom CTL-690 (Wacom drivers installed)
+HIDTablet 0x056A 0x033D 0xFF00 0x000A
+Name "Wacom CTL-690 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
 DetectMask 0x40
 MaxX 21600
 MaxY 13500
 MaxPressure 2047
 Width 216.000
 Height 135.000
-InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
 
 
-# Wacom CTL-471
+# Wacom CTL-690
+HIDTablet 0x056A 0x033D 0xFF0D 0x0001
+HIDTablet 0x056A 0x033D 0x000D 0x0001
+Name "Wacom CTL-690 (unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x40
+MaxX 21600
+MaxY 13500
+MaxPressure 2047
+Width 216.000
+Height 135.000
+InitFeature 0x02 0x02
+TabletFormat WacomIntuosV2
+
+
+# Wacom CTL-471 (Wacom drivers installed)
+HIDTablet 0x056A 0x0300 0xFF00 0x000A
+Name "Wacom CTL-471 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 14720
+MaxY 9225
+MaxPressure 1023
+Width 147.200
+Height 92.250
+TabletFormat WacomDrivers
+
+
+# Wacom CTL-471
 HIDTablet 0x056A 0x0300 0xFF0D 0x0001
 HIDTablet 0x056A 0x0300 0x000D 0x0001
-Name "Wacom CTL-471"
+Name "Wacom CTL-471 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 14720
@@ -229,10 +699,23 @@ Height 92.250
 InitFeature 0x02 0x02
 
 
+# Wacom CTL-472 (Wacom drivers installed)
+HIDTablet 0x056A 0x037A 0xFF00 0x000A
+Name "Wacom CTL-472 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 15200
+MaxY 9500
+MaxPressure 2047
+Width 152.000
+Height 95.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTL-472
 HIDTablet 0x056A 0x037A 0xFF0D 0x0001
 HIDTablet 0x056A 0x037A 0x000D 0x0001
-Name "Wacom CTL-472"
+Name "Wacom CTL-472 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 15200
@@ -243,10 +726,23 @@ Height 95.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTL-480 (Wacom drivers installed)
+HIDTablet 0x056A 0x030E 0xFF00 0x000A
+Name "Wacom CTL-480 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 15200
+MaxY 9500
+MaxPressure 1023
+Width 152.000
+Height 95.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTL-480
 HIDTablet 0x056A 0x030E 0xFF0D 0x0001
 HIDTablet 0x056A 0x030E 0x000D 0x0001
-Name "Wacom CTL-480"
+Name "Wacom CTL-480 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 15200
@@ -257,10 +753,23 @@ Height 95.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTL-490 (Wacom drivers installed)
+HIDTablet 0x056A 0x033B 0xFF00 0x000A
+Name "Wacom CTL-490 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 15200
+MaxY 9500
+MaxPressure 2047
+Width 152.000
+Height 95.000
+TabletFormat WacomIntuosV2
+
+
 # Wacom CTL-490
 HIDTablet 0x056A 0x033B 0xFF0D 0x0001
 HIDTablet 0x056A 0x033B 0x000D 0x0001
-Name "Wacom CTL-490"
+Name "Wacom CTL-490 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 15200
@@ -272,10 +781,23 @@ InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
 
 
+# Wacom CTL-660 (Wacom drivers installed)
+HIDTablet 0x056A 0x00D5 0xFF00 0x000A
+Name "Wacom CTL-660 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x40
+MaxX 21648
+MaxY 13700
+MaxPressure 1023
+Width 216.480
+Height 137.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTL-660
 HIDTablet 0x056A 0x00D5 0xFF0D 0x0001
 HIDTablet 0x056A 0x00D5 0x000D 0x0001
-Name "Wacom CTL-660"
+Name "Wacom CTL-660 (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x40
 MaxX 21648
@@ -286,10 +808,23 @@ Height 137.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTL-672 (Wacom drivers installed)
+HIDTablet 0x056A 0x037B 0xFF00 0x000A
+Name "Wacom CTL-672 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 21600
+MaxY 13500
+MaxPressure 2047
+Width 216.000
+Height 135.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTL-672
 HIDTablet 0x056A 0x037B 0xFF0D 0x0001
 HIDTablet 0x056A 0x037B 0x000D 0x0001
-Name "Wacom CTL-672"
+Name "Wacom CTL-672 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 21600
@@ -300,10 +835,23 @@ Height 135.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTL-680 (Wacom drivers installed)
+HIDTablet 0x056A 0x0323 0xFF00 0x000A
+Name "Wacom CTL-680 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 21600
+MaxY 13500
+MaxPressure 1023
+Width 216.000
+Height 135.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTL-680
 HIDTablet 0x056A 0x0323 0xFF0D 0x0001
 HIDTablet 0x056A 0x0323 0x000D 0x0001
-Name "Wacom CTL-680"
+Name "Wacom CTL-680 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 21600
@@ -314,10 +862,23 @@ Height 135.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-460 (Wacom drivers installed)
+HIDTablet 0x056A 0x00D1 0xFF00 0x000A
+Name "Wacom CTH-460 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x40
+MaxX 14720
+MaxY 9200
+MaxPressure 1023
+Width 147.200
+Height 92.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTH-460
 HIDTablet 0x056A 0x00D1 0xFF0D 0x0001
 HIDTablet 0x056A 0x00D1 0x000D 0x0001
-Name "Wacom CTH-460"
+Name "Wacom CTH-460 (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x40
 MaxX 14720
@@ -328,10 +889,23 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-460(A) (Wacom drivers installed)
+HIDTablet 0x056A 0x00D6 0xFF00 0x000A
+Name "Wacom CTH-460(A) (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x40
+MaxX 14720
+MaxY 9200
+MaxPressure 1023
+Width 147.200
+Height 92.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTH-460(A)
 HIDTablet 0x056A 0x00D6 0xFF0D 0x0001
 HIDTablet 0x056A 0x00D6 0x000D 0x0001
-Name "Wacom CTH-460(A)"
+Name "Wacom CTH-460(A) (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x40
 MaxX 14720
@@ -342,10 +916,23 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-461 (Wacom drivers installed)
+HIDTablet 0x056A 0x00D2 0xFF00 0x000A
+Name "Wacom CTH-461 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x40
+MaxX 14720
+MaxY 9200
+MaxPressure 1023
+Width 147.200
+Height 92.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTH-461
 HIDTablet 0x056A 0x00D2 0xFF0D 0x0001
 HIDTablet 0x056A 0x00D2 0x000D 0x0001
-Name "Wacom CTH-461"
+Name "Wacom CTH-461 (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x40
 MaxX 14720
@@ -356,10 +943,23 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-461(A) (Wacom drivers installed)
+HIDTablet 0x056A 0x00D7 0xFF00 0x000A
+Name "Wacom CTH-461(A) (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x40
+MaxX 14720
+MaxY 9200
+MaxPressure 1023
+Width 147.200
+Height 92.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTH-461(A)
 HIDTablet 0x056A 0x00D7 0xFF0D 0x0001
 HIDTablet 0x056A 0x00D7 0x000D 0x0001
-Name "Wacom CTH-461(A)"
+Name "Wacom CTH-461(A) (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x40
 MaxX 14720
@@ -370,10 +970,23 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-461SE (Wacom drivers installed)
+HIDTablet 0x056A 0x00DA 0xFF00 0x000A
+Name "Wacom CTH-461SE (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x40
+MaxX 14720
+MaxY 9200
+MaxPressure 1023
+Width 147.200
+Height 92.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTH-461SE
 HIDTablet 0x056A 0x00DA 0xFF0D 0x0001
 HIDTablet 0x056A 0x00DA 0x000D 0x0001
-Name "Wacom CTH-461SE"
+Name "Wacom CTH-461SE (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x40
 MaxX 14720
@@ -384,10 +997,23 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-470 (Wacom drivers installed)
+HIDTablet 0x056A 0x00DE 0xFF00 0x000A
+Name "Wacom CTH-470 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 14720
+MaxY 9200
+MaxPressure 1023
+Width 147.200
+Height 92.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTH-470
 HIDTablet 0x056A 0x00DE 0xFF0D 0x0001
 HIDTablet 0x056A 0x00DE 0x000D 0x0001
-Name "Wacom CTH-470"
+Name "Wacom CTH-470 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 14720
@@ -398,10 +1024,23 @@ Height 92.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-480 (Wacom drivers installed)
+HIDTablet 0x056A 0x0302 0xFF00 0x000A
+Name "Wacom CTH-480 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 15200
+MaxY 9500
+MaxPressure 1023
+Width 152.000
+Height 95.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTH-480
 HIDTablet 0x056A 0x0302 0xFF0D 0x0001
 HIDTablet 0x056A 0x0302 0x000D 0x0001
-Name "Wacom CTH-480"
+Name "Wacom CTH-480 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 15200
@@ -412,10 +1051,23 @@ Height 95.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-490 (Wacom drivers installed)
+HIDTablet 0x056A 0x033C 0xFF00 0x000A
+Name "Wacom CTH-490 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 15200
+MaxY 9500
+MaxPressure 2047
+Width 152.000
+Height 95.000
+TabletFormat WacomIntuosV2
+
+
 # Wacom CTH-490
 HIDTablet 0x056A 0x033C 0xFF0D 0x0001
 HIDTablet 0x056A 0x033C 0x000D 0x0001
-Name "Wacom CTH-490"
+Name "Wacom CTH-490 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 15200
@@ -427,10 +1079,23 @@ InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
 
 
+# Wacom CTH-661 (Wacom drivers installed)
+HIDTablet 0x056A 0x00D3 0xFF00 0x000A
+Name "Wacom CTH-661 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x40
+MaxX 21648
+MaxY 13700
+MaxPressure 1023
+Width 216.480
+Height 137.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTH-661
 HIDTablet 0x056A 0x00D3 0xFF0D 0x0001
 HIDTablet 0x056A 0x00D3 0x000D 0x0001
-Name "Wacom CTH-661"
+Name "Wacom CTH-661 (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x40
 MaxX 21648
@@ -441,10 +1106,23 @@ Height 137.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-661(A) (Wacom drivers installed)
+HIDTablet 0x056A 0x00D8 0xFF00 0x000A
+Name "Wacom CTH-661(A) (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x40
+MaxX 21648
+MaxY 13700
+MaxPressure 1023
+Width 216.480
+Height 137.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTH-661(A)
 HIDTablet 0x056A 0x00D8 0xFF0D 0x0001
 HIDTablet 0x056A 0x00D8 0x000D 0x0001
-Name "Wacom CTH-661(A)"
+Name "Wacom CTH-661(A) (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x40
 MaxX 21648
@@ -455,10 +1133,23 @@ Height 137.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-661SE (Wacom drivers installed)
+HIDTablet 0x056A 0x00DB 0xFF00 0x000A
+Name "Wacom CTH-661SE (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x40
+MaxX 21648
+MaxY 13700
+MaxPressure 1023
+Width 216.480
+Height 137.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTH-661SE
 HIDTablet 0x056A 0x00DB 0xFF0D 0x0001
 HIDTablet 0x056A 0x00DB 0x000D 0x0001
-Name "Wacom CTH-661SE"
+Name "Wacom CTH-661SE (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x40
 MaxX 21648
@@ -469,10 +1160,23 @@ Height 137.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-670 (Wacom drivers installed)
+HIDTablet 0x056A 0x00DF 0xFF00 0x000A
+Name "Wacom CTH-670 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 21648
+MaxY 13700
+MaxPressure 1023
+Width 216.480
+Height 137.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTH-670
 HIDTablet 0x056A 0x00DF 0xFF0D 0x0001
 HIDTablet 0x056A 0x00DF 0x000D 0x0001
-Name "Wacom CTH-670"
+Name "Wacom CTH-670 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 21648
@@ -483,10 +1187,23 @@ Height 137.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-680 (Wacom drivers installed)
+HIDTablet 0x056A 0x0303 0xFF00 0x000A
+Name "Wacom CTH-680 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 21600
+MaxY 13500
+MaxPressure 1023
+Width 216.000
+Height 135.000
+TabletFormat WacomDrivers
+
+
 # Wacom CTH-680
 HIDTablet 0x056A 0x0303 0xFF0D 0x0001
 HIDTablet 0x056A 0x0303 0x000D 0x0001
-Name "Wacom CTH-680"
+Name "Wacom CTH-680 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 21600
@@ -497,10 +1214,23 @@ Height 135.000
 InitFeature 0x02 0x02
 
 
+# Wacom CTH-690 (Wacom drivers installed)
+HIDTablet 0x056A 0x033E 0xFF00 0x000A
+Name "Wacom CTH-690 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 11
+DetectMask 0x40
+MaxX 21600
+MaxY 13500
+MaxPressure 2047
+Width 216.000
+Height 135.000
+TabletFormat WacomIntuosV2
+
+
 # Wacom CTH-690
 HIDTablet 0x056A 0x033E 0xFF0D 0x0001
 HIDTablet 0x056A 0x033E 0x000D 0x0001
-Name "Wacom CTH-690"
+Name "Wacom CTH-690 (unsupported configuration, check wacom.cfg)"
 ReportLength 10
 DetectMask 0x40
 MaxX 21600
@@ -512,10 +1242,158 @@ InitFeature 0x02 0x02
 TabletFormat WacomIntuosV2
 
 
+# Wacom CTF-220 (Wacom drivers installed)
+HIDTablet 0x056A 0x0063 0xFF00 0x000A
+Name "Wacom CTF-220 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 3248
+MaxY 2320
+MaxPressure 511
+Width 64.960
+Height 46.400
+TabletFormat WacomDrivers
+
+
+# Wacom CTF-220
+HIDTablet 0x056A 0x0063 0xFF0D 0x0001
+HIDTablet 0x056A 0x0063 0x000D 0x0001
+Name "Wacom CTF-220 (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 3248
+MaxY 2320
+MaxPressure 511
+Width 64.960
+Height 46.400
+InitFeature 0x02 0x02
+
+
+# Wacom CTF-221 (Wacom drivers installed)
+HIDTablet 0x056A 0x0064 0xFF00 0x000A
+Name "Wacom CTF-221 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 3250
+MaxY 2320
+MaxPressure 511
+Width 65.000
+Height 46.400
+TabletFormat WacomDrivers
+
+
+# Wacom CTF-221
+HIDTablet 0x056A 0x0064 0xFF0D 0x0001
+HIDTablet 0x056A 0x0064 0x000D 0x0001
+Name "Wacom CTF-221 (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 3250
+MaxY 2320
+MaxPressure 511
+Width 65.000
+Height 46.400
+InitFeature 0x02 0x02
+
+
+# Wacom CTF-420 (Wacom drivers installed)
+HIDTablet 0x056A 0x0062 0xFF00 0x000A
+Name "Wacom CTF-420 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 5104
+MaxY 3712
+MaxPressure 511
+Width 102.080
+Height 74.240
+TabletFormat WacomDrivers
+
+
+# Wacom CTF-420
+HIDTablet 0x056A 0x0062 0xFF0D 0x0001
+HIDTablet 0x056A 0x0062 0x000D 0x0001
+Name "Wacom CTF-420 (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 5104
+MaxY 3712
+MaxPressure 511
+Width 102.080
+Height 74.240
+InitFeature 0x02 0x02
+
+
+# Wacom CTF-430 (Wacom drivers installed)
+HIDTablet 0x056A 0x0069 0xFF00 0x000A
+Name "Wacom CTF-430 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 5104
+MaxY 3712
+MaxPressure 511
+Width 127.600
+Height 92.800
+TabletFormat WacomDrivers
+
+
+# Wacom CTF-430
+HIDTablet 0x056A 0x0069 0xFF0D 0x0001
+HIDTablet 0x056A 0x0069 0x000D 0x0001
+Name "Wacom CTF-430 (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 5104
+MaxY 3712
+MaxPressure 511
+Width 127.600
+Height 92.800
+InitFeature 0x02 0x02
+
+
+# Wacom CTE-430 (Wacom drivers installed)
+HIDTablet 0x056A 0x0013 0xFF00 0x000A
+Name "Wacom CTE-430 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 10208
+MaxY 7424
+MaxPressure 511
+Width 127.600
+Height 92.800
+TabletFormat WacomDrivers
+
+
+# Wacom CTE-430
+HIDTablet 0x056A 0x0013 0xFF0D 0x0001
+HIDTablet 0x056A 0x0013 0x000D 0x0001
+Name "Wacom CTE-430 (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 10208
+MaxY 7424
+MaxPressure 511
+Width 127.600
+Height 92.800
+InitFeature 0x02 0x02
+
+
+# Wacom CTE-440 (Wacom drivers installed)
+HIDTablet 0x056A 0x0015 0xFF00 0x000A
+Name "Wacom CTE-440 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 10208
+MaxY 7424
+MaxPressure 511
+Width 127.600
+Height 92.800
+TabletFormat WacomDrivers
+
+
 # Wacom CTE-440
 HIDTablet 0x056A 0x0015 0xFF0D 0x0001
 HIDTablet 0x056A 0x0015 0x000D 0x0001
-Name "Wacom CTE-440"
+Name "Wacom CTE-440 (unsupported configuration, check wacom.cfg)"
 ReportLength 8
 DetectMask 0x80
 MaxX 10208
@@ -526,10 +1404,23 @@ Height 92.800
 InitFeature 0x02 0x02
 
 
+# Wacom CTE-450 (Wacom drivers installed)
+HIDTablet 0x056A 0x0017 0xFF00 0x000A
+Name "Wacom CTE-450 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x00
+MaxX 14760
+MaxY 9225
+MaxPressure 511
+Width 147.600
+Height 92.250
+TabletFormat WacomDrivers
+
+
 # Wacom CTE-450
 HIDTablet 0x056A 0x0017 0xFF0D 0x0001
 HIDTablet 0x056A 0x0017 0x000D 0x0001
-Name "Wacom CTE-450"
+Name "Wacom CTE-450 (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x00
 MaxX 14760
@@ -540,10 +1431,104 @@ Height 92.250
 InitFeature 0x02 0x02
 
 
+# Wacom CTE-460 (Wacom drivers installed)
+HIDTablet 0x056A 0x006A 0xFF00 0x000A
+Name "Wacom CTE-460 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 14760
+MaxY 9225
+MaxPressure 1023
+Width 147.600
+Height 92.250
+TabletFormat WacomDrivers
+
+
+# Wacom CTE-460
+HIDTablet 0x056A 0x006A 0xFF0D 0x0001
+HIDTablet 0x056A 0x006A 0x000D 0x0001
+Name "Wacom CTE-460 (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 14760
+MaxY 9225
+MaxPressure 1023
+Width 147.600
+Height 92.250
+InitFeature 0x02 0x02
+
+
+# Wacom CTE-630 (Wacom drivers installed)
+HIDTablet 0x056A 0x0014 0xFF00 0x000A
+Name "Wacom CTE-630 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 16704
+MaxY 12064
+MaxPressure 511
+Width 208.800
+Height 150.800
+TabletFormat WacomDrivers
+
+
+# Wacom CTE-630
+HIDTablet 0x056A 0x0014 0xFF0D 0x0001
+HIDTablet 0x056A 0x0014 0x000D 0x0001
+Name "Wacom CTE-630 (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 16704
+MaxY 12064
+MaxPressure 511
+Width 208.800
+Height 150.800
+InitFeature 0x02 0x02
+
+
+# Wacom CTE-631 (Wacom drivers installed)
+HIDTablet 0x056A 0x0019 0xFF00 0x000A
+Name "Wacom CTE-631 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 16704
+MaxY 12064
+MaxPressure 511
+Width 208.800
+Height 150.800
+TabletFormat WacomDrivers
+
+
+# Wacom CTE-631
+HIDTablet 0x056A 0x0019 0xFF0D 0x0001
+HIDTablet 0x056A 0x0019 0x000D 0x0001
+Name "Wacom CTE-631 (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 16704
+MaxY 12064
+MaxPressure 511
+Width 208.800
+Height 150.800
+InitFeature 0x02 0x02
+
+
+# Wacom CTE-640 (Wacom drivers installed)
+HIDTablet 0x056A 0x0016 0xFF00 0x000A
+Name "Wacom CTE-640 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 16704
+MaxY 12064
+MaxPressure 511
+Width 208.800
+Height 150.800
+TabletFormat WacomDrivers
+
+
 # Wacom CTE-640
 HIDTablet 0x056A 0x0016 0xFF0D 0x0001
 HIDTablet 0x056A 0x0016 0x000D 0x0001
-Name "Wacom CTE-640"
+Name "Wacom CTE-640 (unsupported configuration, check wacom.cfg)"
 ReportLength 8
 DetectMask 0x80
 MaxX 16704
@@ -554,10 +1539,23 @@ Height 150.800
 InitFeature 0x02 0x02
 
 
+# Wacom CTE-650 (Wacom drivers installed)
+HIDTablet 0x056A 0x0018 0xFF00 0x000A
+Name "Wacom CTE-650 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 10
+DetectMask 0x00
+MaxX 21648
+MaxY 13530
+MaxPressure 511
+Width 216.480
+Height 135.300
+TabletFormat WacomDrivers
+
+
 # Wacom CTE-650
 HIDTablet 0x056A 0x0018 0xFF0D 0x0001
 HIDTablet 0x056A 0x0018 0x000D 0x0001
-Name "Wacom CTE-650"
+Name "Wacom CTE-650 (unsupported configuration, check wacom.cfg)"
 ReportLength 9
 DetectMask 0x00
 MaxX 21648
@@ -568,11 +1566,41 @@ Height 135.300
 InitFeature 0x02 0x02
 
 
+# Wacom CTE-660 (Wacom drivers installed)
+HIDTablet 0x056A 0x006B 0xFF00 0x000A
+Name "Wacom CTE-660 (wacom drivers installed, unsupported configuration, check wacom.cfg)"
+ReportLength 9
+DetectMask 0x80
+MaxX 21648
+MaxY 13530
+MaxPressure 1023
+Width 216.480
+Height 135.300
+TabletFormat WacomDrivers
+
+
+# Wacom CTE-660
+HIDTablet 0x056A 0x006B 0xFF0D 0x0001
+HIDTablet 0x056A 0x006B 0x000D 0x0001
+Name "Wacom CTE-660 (unsupported configuration, check wacom.cfg)"
+ReportLength 8
+DetectMask 0x80
+MaxX 21648
+MaxY 13530
+MaxPressure 1023
+Width 216.480
+Height 135.300
+InitFeature 0x02 0x02
+
+
 #
-# Automatically generated Wacom tablet configurations (39):
-#   PTK-450, PTK-650, PTH-450, PTH-451, PTH-650, PTH-651, PTH-850, PTH-851, 
-#   MTE-450, CTT-460, CTL-460, CTL-470, CTL-671, CTL-690, CTL-471, CTL-472, 
-#   CTL-480, CTL-490, CTL-660, CTL-672, CTL-680, CTH-460, CTH-460(A), CTH-461, 
-#   CTH-461(A), CTH-461SE, CTH-470, CTH-480, CTH-490, CTH-661, CTH-661(A), CTH-661SE, 
-#   CTH-670, CTH-680, CTH-690, CTE-440, CTE-450, CTE-640, CTE-650
+# Automatically generated Wacom tablet configurations (58):
+#   PTK-1240, PTK-440, PTK-450, PTK-540WL, PTK-640, PTK-650, PTK-840, PTH-450, 
+#   PTH-451, PTH-650, PTH-651, PTH-850, PTH-851, MTE-450, FT-0203, FT-0405, 
+#   ET-0405, ET-0405A, ET-0507A, CTT-460, CTL-460, CTL-470, CTL-671, CTL-690, 
+#   CTL-471, CTL-472, CTL-480, CTL-490, CTL-660, CTL-672, CTL-680, CTH-460, 
+#   CTH-460(A), CTH-461, CTH-461(A), CTH-461SE, CTH-470, CTH-480, CTH-490, CTH-661, 
+#   CTH-661(A), CTH-661SE, CTH-670, CTH-680, CTH-690, CTF-220, CTF-221, CTF-420, 
+#   CTF-430, CTE-430, CTE-440, CTE-450, CTE-460, CTE-630, CTE-631, CTE-640, 
+#   CTE-650, CTE-660
 #
diff --git a/TabletDriverService/stdafx.h b/TabletDriverService/stdafx.h
index 2fd8c85..3cf5596 100644
--- a/TabletDriverService/stdafx.h
+++ b/TabletDriverService/stdafx.h
@@ -9,12 +9,14 @@
 #include <stdio.h>
 #include <math.h>
 
+
 #include "VMulti.h"
 #include "Tablet.h"
 #include "TabletHandler.h"
 #include "ScreenMapper.h"
 #include "OutputManager.h"
 #include "CommandHandler.h"
+#include "PipeHandler.h"
 
 // IntelliSense "fix"...
 //#define memcpy memcpy
@@ -26,7 +28,8 @@ extern Tablet *tablet;
 extern TabletHandler *tabletHandler;
 extern OutputManager *outputManager;
 extern ScreenMapper *mapper;
+extern PipeHandler *pipeHandler;
 extern void CleanupAndExit(int code);
-
+extern bool ProcessCommand(CommandLine *cmd);
 
 // TODO: reference additional headers your program requires here

From 7a9900ace02200eecd92561e2a7730ea6142d086 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Wed, 2 Jan 2019 21:52:20 +0200
Subject: [PATCH 74/83] First start detection fix

---
 TabletDriverGUI/MainWindow.Driver.cs         | 26 ++++++++++++++++----
 TabletDriverService/CommandHandler.Other.cpp |  5 +++-
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/TabletDriverGUI/MainWindow.Driver.cs b/TabletDriverGUI/MainWindow.Driver.cs
index f962850..561844d 100644
--- a/TabletDriverGUI/MainWindow.Driver.cs
+++ b/TabletDriverGUI/MainWindow.Driver.cs
@@ -437,7 +437,7 @@ private void ProcessStatusMessage(string variableName, string parameters)
                 Title = title;
 
                 // Limit notify icon text length
-                if (title.Length > 63)
+                if (tabletName.Length > 63)
                 {
                     notifyIcon.Text = tabletName.Substring(0, 63);
                 }
@@ -448,10 +448,11 @@ private void ProcessStatusMessage(string variableName, string parameters)
                 SetStatus("Connected to " + tabletName);
             }
 
+
             //
             // Tablet width
             //
-            if (variableName == "width")
+            else if (variableName == "width")
             {
                 if (Utils.ParseNumber(parameters, out double val))
                 {
@@ -469,10 +470,11 @@ private void ProcessStatusMessage(string variableName, string parameters)
                 }
             }
 
+
             //
             // Tablet height
             //
-            if (variableName == "height")
+            else if (variableName == "height")
             {
                 if (Utils.ParseNumber(parameters, out double val))
                 {
@@ -495,7 +497,7 @@ private void ProcessStatusMessage(string variableName, string parameters)
             //
             // Tablet measurement to tablet area
             //
-            if (variableName == "measurement" && isEnabledMeasurementToArea)
+            else if (variableName == "measurement" && isEnabledMeasurementToArea)
             {
                 string[] stringValues = parameters.Split(' ');
                 int valueCount = stringValues.Count();
@@ -541,7 +543,10 @@ private void ProcessStatusMessage(string variableName, string parameters)
             }
 
 
-            if (variableName == "aux_buttons")
+            //
+            // Tablet buttons
+            //
+            else if (variableName == "aux_buttons")
             {
                 if (Utils.ParseNumber(parameters, out double test))
                 {
@@ -568,6 +573,17 @@ private void ProcessStatusMessage(string variableName, string parameters)
                 }
 
             }
+
+            //
+            // Driver started
+            //
+            else if (variableName == "started")
+            {
+                if (parameters.Trim() == "1" || parameters.Trim().ToLower() == "true")
+                {
+                    isFirstStart = false;
+                }
+            }
         }
 
 
diff --git a/TabletDriverService/CommandHandler.Other.cpp b/TabletDriverService/CommandHandler.Other.cpp
index 87918fd..61a21c1 100644
--- a/TabletDriverService/CommandHandler.Other.cpp
+++ b/TabletDriverService/CommandHandler.Other.cpp
@@ -330,7 +330,7 @@ void CommandHandler::CreateOtherCommands() {
 	AddCommand(new Command("StateOutput", [&](CommandLine *cmd) {
 		if(!ExecuteCommand("TabletValid")) return false;
 		pipeHandler->isStateOutputEnabled = cmd->GetBoolean(0, pipeHandler->isStateOutputEnabled);
-		LOG_INFO("State output = %s\n", pipeHandler->isStateOutputEnabled  ? "Enabled" : "Disabled");
+		LOG_INFO("State output = %s\n", pipeHandler->isStateOutputEnabled ? "Enabled" : "Disabled");
 		return true;
 	}));
 
@@ -559,6 +559,9 @@ void CommandHandler::CreateOtherCommands() {
 		LOG_STATUS("MAX_Y %d\n", tablet->settings.maxY);
 		LOG_STATUS("MAX_PRESSURE %d\n", tablet->settings.maxPressure);
 		LOG_STATUS("AUX_BUTTONS %d\n", tablet->settings.auxButtonCount);
+		if(tabletHandler != NULL) {
+			LOG_STATUS("STARTED %d\n", tabletHandler->isRunning);
+		}
 
 		return true;
 	}));

From 91f9e7fce94514bd2febd2f091b051a2ad5d6c3e Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Thu, 3 Jan 2019 18:33:40 +0200
Subject: [PATCH 75/83] Multimedia keys, volume control, GUI scaling, etc.

- Added multimedia keys to button map editor
- Added ability to use pen to control the master volume
- Ability to move screen or tablet area with arrow keys
- GUI screen map size is not fixed anymore
---
 TabletDriverGUI/Configuration.cs            |   4 +-
 TabletDriverGUI/MainWindow.Areas.cs         |  42 +-
 TabletDriverGUI/MainWindow.Settings.cs      |  33 +-
 TabletDriverGUI/MainWindow.xaml             | 108 ++---
 TabletDriverGUI/MainWindow.xaml.cs          |  51 ++-
 TabletDriverGUI/WindowButtonMapping.xaml    |  75 ++--
 TabletDriverGUI/WindowButtonMapping.xaml.cs | 162 +++++---
 TabletDriverService/InputEmulator.cpp       |  23 +-
 TabletDriverService/InputEmulator.h         |   1 +
 TabletDriverService/Main.cpp                |   3 +
 TabletDriverService/Tablet.h                |   1 +
 TabletDriverService/TabletHandler.cpp       | 426 +++++++++++---------
 TabletDriverService/TabletHandler.h         |  11 +
 TabletDriverService/TabletState.h           |   1 +
 14 files changed, 569 insertions(+), 372 deletions(-)

diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index 7976e6e..ff41d47 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -227,8 +227,8 @@ public Configuration()
 
             CustomCommands = new string[] { "" };
 
-            WindowWidth = 680;
-            WindowHeight = 650;
+            WindowWidth = 700;
+            WindowHeight = 700;
 
             TabletView = new TabletViewSettings();
 
diff --git a/TabletDriverGUI/MainWindow.Areas.cs b/TabletDriverGUI/MainWindow.Areas.cs
index 87f8e53..b0d35ae 100644
--- a/TabletDriverGUI/MainWindow.Areas.cs
+++ b/TabletDriverGUI/MainWindow.Areas.cs
@@ -93,7 +93,7 @@ System.Drawing.Rectangle GetVirtualDesktopSize()
                 rect.Width = System.Windows.Forms.SystemInformation.VirtualScreen.Width;
                 rect.Height = System.Windows.Forms.SystemInformation.VirtualScreen.Height;
             }
-            else if(config.Mode != Configuration.OutputModes.Compatibility)
+            else if (config.Mode != Configuration.OutputModes.Compatibility)
             {
                 rect.Width = System.Windows.Forms.SystemInformation.VirtualScreen.Width;
                 rect.Height = System.Windows.Forms.SystemInformation.VirtualScreen.Height;
@@ -246,9 +246,9 @@ void CreateCanvasElements()
                     Width = 10,
                     Height = 10,
                     Stroke = Brushes.Black,
-                    StrokeThickness = 1.0,
+                    StrokeThickness = 0.5,
                     Fill = Brushes.Transparent,
-                    Visibility = Visibility.Hidden
+                    Visibility = Visibility.Collapsed
                 };
                 canvasScreenMap.Children.Add(rectangleMonitors[i]);
             }
@@ -259,7 +259,7 @@ void CreateCanvasElements()
             rectangleDesktop = new Rectangle
             {
                 Stroke = Brushes.Black,
-                StrokeThickness = 2.0,
+                StrokeThickness = 0.5,
                 Fill = Brushes.Transparent
             };
             canvasScreenMap.Children.Add(rectangleDesktop);
@@ -489,8 +489,8 @@ void UpdateDesktopImage()
                 bitmapDownscaled.Dispose();
 
                 // Run GC
-                GC.Collect(10, GCCollectionMode.Forced);
-
+                GC.Collect();
+                GC.WaitForPendingFinalizers();
 
                 // Update last desktop size
                 lastDesktopSize.Width = config.DesktopSize.Width;
@@ -610,7 +610,7 @@ void UpdateScreenMapCanvas()
             }
 
 
-            canvasScreenMap.UpdateLayout();
+            canvasScreenMap.InvalidateVisual();
 
         }
 
@@ -728,9 +728,7 @@ void UpdateTabletAreaCanvas()
             );
 
 
-            canvasTabletArea.UpdateLayout();
-
-
+            canvasTabletArea.InvalidateVisual();
 
         }
 
@@ -931,7 +929,7 @@ void UpdateAreaInformation()
         //
         //
         // Canvas mouse down
-        private void Canvas_MouseDown(object sender, MouseButtonEventArgs e)
+        private void CanvasArea_MouseDown(object sender, MouseButtonEventArgs e)
         {
             bool mouseDown = false;
 
@@ -983,7 +981,7 @@ private void Canvas_MouseDown(object sender, MouseButtonEventArgs e)
         //
         // Canvas mouse up
         //
-        private void Canvas_MouseUp(object sender, MouseButtonEventArgs e)
+        private void CanvasArea_MouseUp(object sender, MouseButtonEventArgs e)
         {
             mouseDrag.IsMouseDown = false;
             LoadSettingsFromConfiguration();
@@ -995,13 +993,21 @@ private void Canvas_MouseUp(object sender, MouseButtonEventArgs e)
             //isLoadingSettings = false;
             canvasScreenMap.ReleaseMouseCapture();
             canvasTabletArea.ReleaseMouseCapture();
+
+            // Focus
+            if(sender == canvasScreenMap)
+                canvasScreenMap.Focus();
+            else if (sender == canvasTabletArea)
+                canvasTabletArea.Focus();
+
+
         }
 
 
         //
         // Canvas mouse move
         //
-        private void Canvas_MouseMove(object sender, MouseEventArgs e)
+        private void CanvasArea_MouseMove(object sender, MouseEventArgs e)
         {
             Point position;
             double dx, dy;
@@ -1078,7 +1084,7 @@ private void Canvas_MouseMove(object sender, MouseEventArgs e)
         //
         // Screen or tablet area mouse scroll
         //
-        private void CanvasMouseWheel(object sender, MouseWheelEventArgs e)
+        private void CanvasArea_MouseWheel(object sender, MouseWheelEventArgs e)
         {
 
             //
@@ -1106,10 +1112,11 @@ private void CanvasMouseWheel(object sender, MouseWheelEventArgs e)
 
         }
 
+
         //
         // Canvas context menu click
         //
-        private void Canvas_MenuClick(object sender, RoutedEventArgs e)
+        private void CanvasArea_MenuClick(object sender, RoutedEventArgs e)
         {
             if (sender == null) return;
             if (!(sender is MenuItem)) return;
@@ -1199,7 +1206,7 @@ private void Canvas_MenuClick(object sender, RoutedEventArgs e)
             //
             // Force tablet area proportions
             //
-            else if(sender == menuCanvasForceProportions)
+            else if (sender == menuCanvasForceProportions)
             {
                 double screenAspectRatio = config.SelectedScreenArea.Width / config.SelectedScreenArea.Height;
                 double tabletAspectRatio = config.SelectedTabletArea.Width / config.SelectedTabletArea.Height;
@@ -1394,7 +1401,7 @@ private void Canvas_MenuClick(object sender, RoutedEventArgs e)
         //
         // Canvas context menu opening
         //
-        private void Canvas_ContextMenuOpening(object sender, ContextMenuEventArgs e)
+        private void CanvasArea_ContextMenuOpening(object sender, ContextMenuEventArgs e)
         {
 
             //
@@ -1503,7 +1510,6 @@ private void Canvas_ContextMenuOpening(object sender, ContextMenuEventArgs e)
 
 
 
-
         #region Wacom / Draw area
 
         //
diff --git a/TabletDriverGUI/MainWindow.Settings.cs b/TabletDriverGUI/MainWindow.Settings.cs
index b4bea89..2e2ae4d 100644
--- a/TabletDriverGUI/MainWindow.Settings.cs
+++ b/TabletDriverGUI/MainWindow.Settings.cs
@@ -817,13 +817,6 @@ private void InitializeConfiguration()
             isLoadingSettings = true;
             Width = config.WindowWidth;
             Height = config.WindowHeight;
-            if (isFirstStart)
-            {
-                SizeToContent = SizeToContent.WidthAndHeight;
-                UpdateLayout();
-                SizeToContent = SizeToContent.Manual;
-                Height += 50;
-            }
             isLoadingSettings = false;
 
             //
@@ -1083,6 +1076,7 @@ private void MainWindow_SizeChanged(object sender, SizeChangedEventArgs e)
                 config.WindowWidth = (int)e.NewSize.Width;
                 config.WindowHeight = (int)e.NewSize.Height;
             }
+            UpdateCanvasElements();
         }
 
 
@@ -1375,7 +1369,9 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
                 tabletView.ShowDialog();
                 tabletView.Close();
                 tabletView = null;
-                GC.Collect(10, GCCollectionMode.Forced);
+                GC.Collect();
+                GC.WaitForPendingFinalizers();
+
             }
 
 
@@ -1417,7 +1413,8 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
                 timer.Tick += (s, ev) =>
                 {
                     imageDesktopScreenshot.Source = null;
-                    GC.Collect(10, GCCollectionMode.Forced);
+                    GC.Collect();
+                    GC.WaitForPendingFinalizers();
                     UpdateDesktopImage();
                     timer.Stop();
                 };
@@ -1434,10 +1431,24 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
         //
         private void TabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-
+            //
+            // Update canvas elements when changed to area tab
+            //
             if (tabControl.SelectedItem == tabArea)
             {
-                UpdateCanvasElements();
+                if (IsLoaded)
+                {
+                    DispatcherTimer timer = new DispatcherTimer
+                    {
+                        Interval = new TimeSpan(0, 0, 0, 0, 100)
+                    };
+                    timer.Tick += (snd, ev) =>
+                    {
+                        UpdateCanvasElements();
+                        timer.Stop();
+                    };
+                    timer.Start();
+                }
             }
 
             //
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 8e790ec..2ad5621 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -101,23 +101,24 @@
                 >
 
       <!-- Area tab -->
-      <TabItem Name="tabArea" Margin="10,0,-10,0" Padding="10,5">
+      <TabItem Name="tabArea"
+               Margin="10,0,-10,0"
+               Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#006600" FontWeight="Bold">
             <AccessText Text="_Area"/>
           </TextBlock>
         </TabItem.Header>
 
-        <ScrollViewer VerticalScrollBarVisibility="Auto"
-                      FocusVisualStyle="{x:Null}">
-          <StackPanel Orientation="Vertical"
-                      HorizontalAlignment="Left"
-                      Margin="5,0">
+        <ScrollViewer VerticalScrollBarVisibility="Auto" FocusVisualStyle="{x:Null}">
+          <Grid>
+            <Grid.RowDefinitions>
+              <RowDefinition Height="*"/>
+              <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
 
             <!-- Screen Mapping -->
-            <GroupBox Header="Screen Map"
-                      HorizontalAlignment="Center"
-                      Width="650">
+            <GroupBox Header="Screen Map" Grid.Row="0">
 
               <GroupBox.ToolTip>
                 <StackPanel>
@@ -144,34 +145,44 @@
                 </StackPanel>
               </GroupBox.ToolTip>
 
-              <StackPanel>
+              <Grid>
+                <Grid.RowDefinitions>
+                  <RowDefinition Height="*"/>
+                  <RowDefinition Height="auto"/>
+                </Grid.RowDefinitions>
 
+                
                 <!-- Screen map canvas -->
                 <Canvas Name="canvasScreenMap"
-                        Height="130" Margin="0,0,0,0"
+                        Grid.Row="0"
+                        MinWidth="500"
+                        MinHeight="130"
+                        Margin="0,0,0,0"
                         Background="Transparent"
                         ClipToBounds="True"
-                        ContextMenuOpening="Canvas_ContextMenuOpening"
-                        MouseWheel="CanvasMouseWheel"
-                        MouseMove="Canvas_MouseMove"                        
-                        MouseDown="Canvas_MouseDown"
-                        MouseUp="Canvas_MouseUp">
+                        Focusable="True"
+                        ContextMenuOpening="CanvasArea_ContextMenuOpening"
+                        MouseWheel="CanvasArea_MouseWheel"
+                        MouseMove="CanvasArea_MouseMove"                        
+                        MouseDown="CanvasArea_MouseDown"
+                        MouseUp="CanvasArea_MouseUp">
                   <Canvas.ContextMenu>
                     <ContextMenu>
                       <MenuItem Header="" Name="menuCanvasScreenAreaInfo" FontWeight="Bold"/>
-                      <MenuItem Header="Move to center of a monitor" Name="menuCanvasMoveToMonitorCenter" Click="Canvas_MenuClick" />
-                      <MenuItem Header="Set to full monitor" Name="menuCanvasSetToFullMonitor" Click="Canvas_MenuClick" />
-                      <MenuItem Header="Set to full desktop" Name="menuCanvasSetToFullDesktop" Click="Canvas_MenuClick" />
+                      <MenuItem Header="Move to center of a monitor" Name="menuCanvasMoveToMonitorCenter" Click="CanvasArea_MenuClick" />
+                      <MenuItem Header="Set to full monitor" Name="menuCanvasSetToFullMonitor" Click="CanvasArea_MenuClick" />
+                      <MenuItem Header="Set to full desktop" Name="menuCanvasSetToFullDesktop" Click="CanvasArea_MenuClick" />
                       <Separator/>
-                      <MenuItem Header="Add area" Name="menuCanvasAddScreenArea" Click="Canvas_MenuClick" />
-                      <MenuItem Header="Edit area" Name="menuCanvasEditScreenArea" Click="Canvas_MenuClick" />
-                      <MenuItem Header="Remove area" Name="menuCanvasRemoveScreenArea" Click="Canvas_MenuClick" />
+                      <MenuItem Header="Add area" Name="menuCanvasAddScreenArea" Click="CanvasArea_MenuClick" />
+                      <MenuItem Header="Edit area" Name="menuCanvasEditScreenArea" Click="CanvasArea_MenuClick" />
+                      <MenuItem Header="Remove area" Name="menuCanvasRemoveScreenArea" Click="CanvasArea_MenuClick" />
                       <Separator/>
-                      <MenuItem Header="Reset all areas" Name="menuCanvasResetScreenAreas" Click="Canvas_MenuClick" />
+                      <MenuItem Header="Reset all areas" Name="menuCanvasResetScreenAreas" Click="CanvasArea_MenuClick" />
                     </ContextMenu>
                   </Canvas.ContextMenu>
                 </Canvas>
 
+                <StackPanel Grid.Row="1" Orientation="Vertical" >
                 <!-- Screen area information -->
                 <Label Name="labelScreenAreaInfo"
                        HorizontalAlignment="Center"
@@ -226,14 +237,15 @@
 
                 </StackPanel>
 
-              </StackPanel>
+                </StackPanel>
+              </Grid>
             </GroupBox>
 
             <!-- Tablet area -->
             <GroupBox Header="Tablet Area"
+                      Grid.Row="1"
                       HorizontalAlignment="Center"
-                      Margin="0,5,0,5"
-                      Width="650">
+                      Margin="0,5,0,5">
               <GroupBox.ToolTip>
                 <StackPanel>
                   <TextBlock FontWeight="Bold" FontSize="16">
@@ -267,14 +279,13 @@
 
                 <Grid>
                   <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="21*"/>
-                    <ColumnDefinition Width="192*"/>
-                    <ColumnDefinition Width="212*"/>
-                    <ColumnDefinition Width="213*"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="auto"/>
+                    <ColumnDefinition Width="*"/>
                   </Grid.ColumnDefinitions>
 
                   <!-- Rotation + invert + area buttons -->
-                  <StackPanel Grid.Column="1" HorizontalAlignment="Right">
+                  <StackPanel Grid.Column="0" HorizontalAlignment="Right">
 
                     <!-- Rotation + Invert -->
                     <StackPanel Orientation="Horizontal">
@@ -338,33 +349,36 @@
                   </StackPanel>
 
                   <!-- Tablet area canvas -->
-                  <Canvas Grid.Column="2" Name="canvasTabletArea"
-                          Height="120" Margin="5,0,5,0"
+                  <Canvas Grid.Column="1" Name="canvasTabletArea"
+                          Width="200"
+                          Height="120"
+                          Margin="5,0,5,0"
                           Background="Transparent"
                           ClipToBounds="True"
-                          ContextMenuOpening="Canvas_ContextMenuOpening"
-                          MouseWheel="CanvasMouseWheel"
-                          MouseMove="Canvas_MouseMove"                          
-                          MouseDown="Canvas_MouseDown"
-                          MouseUp="Canvas_MouseUp">
+                          Focusable="True"
+                          ContextMenuOpening="CanvasArea_ContextMenuOpening"
+                          MouseWheel="CanvasArea_MouseWheel"
+                          MouseMove="CanvasArea_MouseMove"                          
+                          MouseDown="CanvasArea_MouseDown"
+                          MouseUp="CanvasArea_MouseUp">
                     <Canvas.ContextMenu>
                       <ContextMenu>
                         <MenuItem Header="" Name="menuCanvasTabletAreaInfo" FontWeight="Bold"/>
-                        <MenuItem Name="menuCanvasMoveToCenter" Header="Move to center" Click="Canvas_MenuClick" />
-                        <MenuItem Name="menuCanvasSetToFullTabletArea" Header="Set to full area" Click="Canvas_MenuClick" />
-                        <MenuItem Name="menuCanvasForceProportions" Header="Force proportions" Click="Canvas_MenuClick" />                        
+                        <MenuItem Name="menuCanvasMoveToCenter" Header="Move to center" Click="CanvasArea_MenuClick" />
+                        <MenuItem Name="menuCanvasSetToFullTabletArea" Header="Set to full area" Click="CanvasArea_MenuClick" />
+                        <MenuItem Name="menuCanvasForceProportions" Header="Force proportions" Click="CanvasArea_MenuClick" />                        
                         <Separator/>
-                        <MenuItem Name="menuCanvasAddTabletArea" Header="Add area" Click="Canvas_MenuClick" />
-                        <MenuItem Name="menuCanvasEditTabletArea" Header="Edit area" Click="Canvas_MenuClick" />
-                        <MenuItem Name="menuCanvasRemoveTabletArea" Header="Remove area" Click="Canvas_MenuClick" />
+                        <MenuItem Name="menuCanvasAddTabletArea" Header="Add area" Click="CanvasArea_MenuClick" />
+                        <MenuItem Name="menuCanvasEditTabletArea" Header="Edit area" Click="CanvasArea_MenuClick" />
+                        <MenuItem Name="menuCanvasRemoveTabletArea" Header="Remove area" Click="CanvasArea_MenuClick" />
                         <Separator/>
-                        <MenuItem Name="menuCanvasResetTabletAreas" Header="Reset all areas" Click="Canvas_MenuClick" />
+                        <MenuItem Name="menuCanvasResetTabletAreas" Header="Reset all areas" Click="CanvasArea_MenuClick" />
                       </ContextMenu>
                     </Canvas.ContextMenu>
                   </Canvas>
 
                   <!-- Output mode selector -->
-                  <StackPanel Grid.Column="3">
+                  <StackPanel Grid.Column="2" HorizontalAlignment="Left">
 
                     <!-- Positioning -->
                     <GroupBox Header="Positioning" Width="170" HorizontalAlignment="Left">
@@ -469,7 +483,7 @@
               </StackPanel>
             </GroupBox>
 
-          </StackPanel>
+          </Grid>
         </ScrollViewer>
       </TabItem>
 
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 81d9f51..4c1cf91 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -267,6 +267,53 @@ private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
                 e.Handled = true;
             }
 
+            //
+            // Move screen or tablet area with keys
+            //
+            if (canvasScreenMap.IsFocused || canvasTabletArea.IsFocused)
+            {
+                int deltaX = 0;
+                int deltaY = 0;
+
+                // Arrow keys to delta
+                if (e.Key == Key.Left)
+                    deltaX = -1;
+                else if (e.Key == Key.Right)
+                    deltaX = 1;
+                else if (e.Key == Key.Up)
+                    deltaY = -1;
+                else if (e.Key == Key.Down)
+                    deltaY = 1;
+                if (deltaX == 0 && deltaY == 0)
+                    return;
+
+                // Control + arrow -> 10x movement
+                if (Keyboard.Modifiers.HasFlag(ModifierKeys.Control))
+                {
+                    deltaX *= 10;
+                    deltaY *= 10;
+                }
+
+                // Screen map
+                if (canvasScreenMap.IsFocused)
+                {
+                    SetStatus("Sender: " + sender);
+                    config.SelectedScreenArea.X += deltaX;
+                    config.SelectedScreenArea.Y += deltaY;
+                    LoadSettingsFromConfiguration();
+                    e.Handled = true;
+                }
+
+                // Tablet area
+                else if (canvasTabletArea.IsFocused)
+                {
+                    config.SelectedTabletArea.X += deltaX;
+                    config.SelectedTabletArea.Y += deltaY;
+                    LoadSettingsFromConfiguration();
+                    e.Handled = true;
+                }
+            }
+
         }
 
 
@@ -466,9 +513,5 @@ private void MouseTest(object sender, MouseButtonEventArgs e)
             SetStatus("Event: " + e.RoutedEvent.ToString() + ", Mouse at " + ((UIElement)sender).ToString() + "! " + e.ChangedButton.ToString() + " " + e.ButtonState.ToString());
         }
 
-        private void CommandBinding_Executed(object sender, ExecutedRoutedEventArgs e)
-        {
-            MessageBox.Show(e.Command.ToString());
-        }
     }
 }
\ No newline at end of file
diff --git a/TabletDriverGUI/WindowButtonMapping.xaml b/TabletDriverGUI/WindowButtonMapping.xaml
index 5ca9fb3..e99202c 100644
--- a/TabletDriverGUI/WindowButtonMapping.xaml
+++ b/TabletDriverGUI/WindowButtonMapping.xaml
@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:TabletDriverGUI"
         mc:Ignorable="d"
-        Title="Button Mapping" Height="260" Width="300">
+        Title="Button Mapping" Height="350" Width="350"
+        SizeToContent="WidthAndHeight">
   <Window.Resources>
     <Style TargetType="GroupBox">
       <Setter Property="HeaderTemplate">
@@ -17,53 +18,53 @@
       </Setter>
     </Style>
   </Window.Resources>
-  <Grid>
-    <Grid.ColumnDefinitions>
-      <ColumnDefinition Width="47*"/>
-      <ColumnDefinition Width="245*"/>
-    </Grid.ColumnDefinitions>
-    <StackPanel Orientation="Vertical" Margin="5" Grid.ColumnSpan="2">
-      <GroupBox Header="Mouse" Padding="2">
-        <ComboBox Name="comboBoxMouse"
+  <StackPanel Orientation="Vertical" Margin="5">
+    <GroupBox Header="Mouse" Padding="2">
+      <ComboBox Name="comboBoxMouse"
                   Padding="5"
                   KeyUp="OnEnterKeyUp"
                   SelectionChanged="ComboBoxMouse_SelectionChanged"
                   >
-          <ComboBoxItem IsSelected="True">None</ComboBoxItem>
-          <ComboBoxItem>Mouse 1 (Left / Tip)</ComboBoxItem>
-          <ComboBoxItem>Mouse 2 (Right / Barrel)</ComboBoxItem>
-          <ComboBoxItem>Mouse 3 (Middle / Eraser)</ComboBoxItem>
-          <ComboBoxItem>Mouse 4 (Back)</ComboBoxItem>
-          <ComboBoxItem>Mouse 5 (Forward)</ComboBoxItem>
-          <ComboBoxItem>Scroll Up/Down</ComboBoxItem>
-          <ComboBoxItem>Scroll Left/Right</ComboBoxItem>
-          <ComboBoxItem>Scroll Both</ComboBoxItem>
-          <ComboBoxItem>Scroll One Up</ComboBoxItem>
-          <ComboBoxItem>Scroll One Down</ComboBoxItem>
-          <ComboBoxItem>Scroll One Left</ComboBoxItem>
-          <ComboBoxItem>Scroll One Right</ComboBoxItem>
-        </ComboBox>
-      </GroupBox>
-      <GroupBox Header="Keyboard" Padding="2" Margin="0,5,0,5">
-        <TextBox Name="textKeyboard"
+        <ComboBoxItem IsSelected="True">None</ComboBoxItem>
+      </ComboBox>
+    </GroupBox>
+    <GroupBox Header="Keyboard" Padding="2" Margin="0,5,0,5">
+      <TextBox Name="textKeyboard"
                  BorderThickness="3"
                  BorderBrush="Black"
                  Padding="4"
                  FontWeight="Bold"
                  PreviewKeyDown="TextKeyboard_PreviewKeyDown"               
                  >CTRL+SHIFT+Z</TextBox>
-      </GroupBox>
-      <GroupBox Header="Custom" Padding="2">
-        <TextBox Grid.Column="1" Name="textCustom"
+    </GroupBox>
+
+    <GroupBox Header="Multimedia" Padding="2">
+      <ComboBox Name="comboBoxMultimedia"
+                  Padding="5"
+                  KeyUp="OnEnterKeyUp"
+                  SelectionChanged="ComboBoxMultimedia_SelectionChanged"
+                  >
+        <ComboBoxItem IsSelected="True">None</ComboBoxItem>
+      </ComboBox>
+    </GroupBox>
+
+    <GroupBox Header="Custom" Padding="2">
+      <TextBox Grid.Column="1" Name="textCustom"
                  KeyUp="OnEnterKeyUp"
                  Padding="2"
+               MinWidth="300"
                  >CTRL+SHIFT+Z</TextBox>
-      </GroupBox>
-      <Grid>
-        <Button Name="buttonSet" HorizontalAlignment="Left" Padding="3" Width="50" Margin="5" Click="ButtonSet_Click">Set</Button>
-        <Button Name="buttonClear" HorizontalAlignment="Center" Padding="3" Width="50" Margin="5" Click="ButtonClear_Click">Clear</Button>
-        <Button Name="buttonCancel" HorizontalAlignment="Right" Padding="3" Width="50" Margin="5" Click="ButtonCancel_Click">Cancel</Button>
-      </Grid>
-    </StackPanel>
-  </Grid>
+    </GroupBox>
+    <Grid Margin="0,0,0,10">
+      <Button Name="buttonSet" HorizontalAlignment="Left"
+              FontSize="14" FontWeight="Bold" Foreground="#363"
+              Padding="15,3" Margin="5" Click="ButtonSet_Click">Set</Button>
+      <Button Name="buttonClear" HorizontalAlignment="Center"
+              FontSize="14" FontWeight="Bold" Foreground="#336"
+              Padding="15,3" Margin="5" Click="ButtonClear_Click">Clear</Button>
+      <Button Name="buttonCancel" HorizontalAlignment="Right"
+              FontSize="14" FontWeight="Bold" Foreground="#633"
+              Padding="15,3" Margin="5" Click="ButtonCancel_Click">Cancel</Button>
+    </Grid>
+  </StackPanel>
 </Window>
diff --git a/TabletDriverGUI/WindowButtonMapping.xaml.cs b/TabletDriverGUI/WindowButtonMapping.xaml.cs
index 7a0ccbe..15ba082 100644
--- a/TabletDriverGUI/WindowButtonMapping.xaml.cs
+++ b/TabletDriverGUI/WindowButtonMapping.xaml.cs
@@ -18,18 +18,18 @@ public partial class WindowButtonMapping : Window
         Button button;
         public string Result;
 
-        public class MouseAction
+        public class ButtonBinding
         {
-            public string Action;
+            public string Key;
             public string Name;
             public bool Visible;
 
-            public MouseAction(string name) : this("", name)
-            {                
+            public ButtonBinding(string name) : this("", name)
+            {
             }
-            public MouseAction(string action, string name)
+            public ButtonBinding(string key, string name)
             {
-                Action = action;
+                Key = key;
                 Name = name;
                 Visible = true;
             }
@@ -39,7 +39,8 @@ public override string ToString()
             }
         }
 
-        public OrderedDictionary mouseActions;
+        public OrderedDictionary mouseBindings;
+        public OrderedDictionary multimediaBindings;
 
         public WindowButtonMapping()
         {
@@ -50,24 +51,41 @@ public WindowButtonMapping()
             Result = "";
 
 
-            mouseActions = new OrderedDictionary()
+            mouseBindings = new OrderedDictionary()
+            {
+                { "", new ButtonBinding("None") },
+                { "MOUSE1", new ButtonBinding("Mouse 1 (Left / Tip)") },
+                { "MOUSE2", new ButtonBinding("Mouse 2 (Right / Barrel)") },
+                { "MOUSE3", new ButtonBinding("Mouse 3 (Middle / Eraser)") },
+                { "MOUSE4", new ButtonBinding("Mouse 4 (Back)") },
+                { "MOUSE5", new ButtonBinding("Mouse 5 (Forward)") },
+                { "MOUSESCROLLV", new ButtonBinding("Scroll Up/Down") },
+                { "MOUSESCROLLH", new ButtonBinding("Scroll Left/Right") },
+                { "MOUSESCROLLB", new ButtonBinding("Scroll Both") },
+                { "SCROLLUP", new ButtonBinding("Scroll One Up") },
+                { "SCROLLDOWN", new ButtonBinding("Scroll One Down") },
+                { "SCROLLLEFT", new ButtonBinding("Scroll One Left") },
+                { "SCROLLRIGHT", new ButtonBinding("Scroll One Right") },
+            };
+
+            multimediaBindings = new OrderedDictionary()
             {
-                { "", new MouseAction("None") },
-                { "MOUSE1", new MouseAction("Mouse 1 (Left / Tip)") },
-                { "MOUSE2", new MouseAction("Mouse 2 (Right / Barrel)") },
-                { "MOUSE3", new MouseAction("Mouse 3 (Middle / Eraser)") },
-                { "MOUSE4", new MouseAction("Mouse 4 (Back)") },
-                { "MOUSE5", new MouseAction("Mouse 5 (Forward)") },
-                { "MOUSESCROLLV", new MouseAction("Scroll Up/Down") },
-                { "MOUSESCROLLH", new MouseAction("Scroll Left/Right") },
-                { "MOUSESCROLLB", new MouseAction("Scroll Both") },
-                { "SCROLLUP", new MouseAction("Scroll One Up") },
-                { "SCROLLDOWN", new MouseAction("Scroll One Down") },
-                { "SCROLLLEFT", new MouseAction("Scroll One Left") },
-                { "SCROLLRIGHT", new MouseAction("Scroll One Right") }
+                { "", new ButtonBinding("None") },
+                { "VOLUMEUP", new ButtonBinding("Volume Up") },
+                { "VOLUMEUP0.5", new ButtonBinding("Volume Up 0.5%") },
+                { "VOLUMEUP5.0", new ButtonBinding("Volume Up 5.0%") },
+                { "VOLUMEDOWN", new ButtonBinding("Volume Down") },
+                { "VOLUMEDOWN0.5", new ButtonBinding("Volume Down 0.5%") },
+                { "VOLUMEDOWN5.0", new ButtonBinding("Volume Down 5.0%") },
+                { "VOLUMEMUTE", new ButtonBinding("Volume Mute") },
+                { "VOLUMECONTROL", new ButtonBinding("Volume Control Up/Down") },
+                { "MEDIANEXT", new ButtonBinding("Media Next Track") },
+                { "MEDIAPREV", new ButtonBinding("Media Previous Track") },
+                { "MEDIASTOP", new ButtonBinding("Media Stop") },
+                { "MEDIAPLAY", new ButtonBinding("Media Play/Pause") },
             };
 
-            UpdateMouseActions();
+            UpdateBindings();
 
         }
 
@@ -78,34 +96,43 @@ public WindowButtonMapping(Button button, bool isPenButton) : this()
             // Tablet buttons don't need tip, barrel and eraser info
             if (!isPenButton)
             {
-                ((MouseAction)mouseActions["MOUSE1"]).Name = "Mouse 1 (Left)";
-                ((MouseAction)mouseActions["MOUSE2"]).Name = "Mouse 2 (Right)";
-                ((MouseAction)mouseActions["MOUSE3"]).Name = "Mouse 3 (Middle)";
-
-                // Disable mouse scroll
-                ((MouseAction)mouseActions["MOUSESCROLLV"]).Visible = false;
-                ((MouseAction)mouseActions["MOUSESCROLLH"]).Visible = false;
-                ((MouseAction)mouseActions["MOUSESCROLLB"]).Visible = false;
+                ((ButtonBinding)mouseBindings["MOUSE1"]).Name = "Mouse 1 (Left)";
+                ((ButtonBinding)mouseBindings["MOUSE2"]).Name = "Mouse 2 (Right)";
+                ((ButtonBinding)mouseBindings["MOUSE3"]).Name = "Mouse 3 (Middle)";
             }
-            UpdateMouseActions();
+            UpdateBindings();
 
             CheckKeyValue();
         }
 
 
         //
-        // Update mouse actions and combobox
+        // Update bindings and comboboxes
         //
-        private void UpdateMouseActions()
+        private void UpdateBindings()
         {
+
+            // Mouse
             comboBoxMouse.Items.Clear();
-            foreach (DictionaryEntry entry in mouseActions)
+            foreach (DictionaryEntry entry in mouseBindings)
             {
-                MouseAction mouseAction = (MouseAction)entry.Value;
-                mouseAction.Action = (string)entry.Key;
-                if (mouseAction.Visible)
+                ButtonBinding binding = (ButtonBinding)entry.Value;
+                binding.Key = (string)entry.Key;
+                if (binding.Visible)
                 {
-                    comboBoxMouse.Items.Add(mouseAction);
+                    comboBoxMouse.Items.Add(binding);
+                }
+            }
+
+            // Multimedia
+            comboBoxMultimedia.Items.Clear();
+            foreach (DictionaryEntry entry in multimediaBindings)
+            {
+                ButtonBinding binding = (ButtonBinding)entry.Value;
+                binding.Key = (string)entry.Key;
+                if (binding.Visible)
+                {
+                    comboBoxMultimedia.Items.Add(binding);
                 }
             }
 
@@ -118,19 +145,40 @@ private void UpdateMouseActions()
         public void CheckKeyValue()
         {
             string keys = button.Content.ToString().ToUpper().Trim();
+            comboBoxMouse.SelectedIndex = 0;
+            comboBoxMultimedia.SelectedIndex = 0;
 
-            if (mouseActions.Contains(keys))
+            // Mouse
+            if (mouseBindings.Contains(keys))
             {
-                foreach(var item in comboBoxMouse.Items)
+
+                foreach (var item in comboBoxMouse.Items)
                 {
-                    MouseAction mouseAction = (MouseAction)item;
-                    if(mouseAction.Action == keys)
+                    ButtonBinding binding = (ButtonBinding)item;
+                    if (binding.Key == keys)
                     {
                         comboBoxMouse.SelectedItem = item;
                         comboBoxMouse.Focus();
                     }
                 }
             }
+
+            // Multimedia
+            else if (multimediaBindings.Contains(keys))
+            {
+                comboBoxMultimedia.SelectedIndex = 0;
+                foreach (ButtonBinding item in comboBoxMultimedia.Items)
+                {
+                    //ButtonBinding binding = (ButtonBinding)item;
+                    if (item.Key == keys)
+                    {
+                        comboBoxMultimedia.SelectedItem = item;
+                        comboBoxMultimedia.Focus();
+                    }
+                }
+            }
+
+            // Keyboard
             else
             {
                 textKeyboard.Focus();
@@ -147,16 +195,30 @@ public void CheckKeyValue()
         private void ComboBoxMouse_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (!IsLoaded) return;
-            string key = "";
+            if (comboBoxMouse.SelectedIndex >= 0 && comboBoxMouse.SelectedItem != null)
+            {
+                ButtonBinding binding = (ButtonBinding)comboBoxMouse.SelectedItem;
+                if (comboBoxMouse.SelectedIndex > 0)
+                    comboBoxMultimedia.SelectedIndex = 0;
+                textKeyboard.Text = binding.Key;
+                textCustom.Text = binding.Key;
+            }
+        }
 
-            // Combobox item item to MouseAction
-            if(comboBoxMouse.SelectedIndex >= 0 && comboBoxMouse.SelectedItem != null)
+        //
+        // Multimedia key changed
+        //
+        private void ComboBoxMultimedia_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (!IsLoaded) return;
+            if (comboBoxMultimedia.SelectedIndex >= 0 && comboBoxMultimedia.SelectedItem is ButtonBinding)
             {
-                MouseAction mouseAction = (MouseAction)comboBoxMouse.SelectedItem;
-                key = mouseAction.Action;
+                ButtonBinding binding = (ButtonBinding)comboBoxMultimedia.SelectedItem;
+                if (comboBoxMultimedia.SelectedIndex > 0)
+                    comboBoxMouse.SelectedIndex = 0;
+                textKeyboard.Text = binding.Key;
+                textCustom.Text = binding.Key;
             }
-            textKeyboard.Text = key;
-            textCustom.Text = key;
         }
 
 
@@ -275,5 +337,7 @@ private void OnEnterKeyUp(object sender, KeyEventArgs e)
                 ButtonSet_Click(sender, null);
             }
         }
+
+
     }
 }
diff --git a/TabletDriverService/InputEmulator.cpp b/TabletDriverService/InputEmulator.cpp
index 2063ef6..636b5c9 100644
--- a/TabletDriverService/InputEmulator.cpp
+++ b/TabletDriverService/InputEmulator.cpp
@@ -8,9 +8,6 @@ InputEmulator::InputEmulator()
 {
 	CreateKeyMap();
 	CreateVirtualKeyMap();
-
-	//
-	CoInitializeEx(NULL, COINIT_MULTITHREADED);
 }
 
 
@@ -27,11 +24,11 @@ void InputEmulator::CreateKeyMap()
 	AddKey("DISABLED", "Disabled", 0, 0);
 
 	// Mouse buttons
-	AddKey("MOUSE1", "Mouse 1", 0, 1);
-	AddKey("MOUSE2", "Mouse 2", 0, 2);
-	AddKey("MOUSE3", "Mouse 3", 0, 3);
-	AddKey("MOUSE4", "Mouse 4", 0, 4);
-	AddKey("MOUSE5", "Mouse 5", 0, 5);
+	AddKey("MOUSE1", "Mouse 1", 0, MouseButtons::Mouse1);
+	AddKey("MOUSE2", "Mouse 2", 0, MouseButtons::Mouse2);
+	AddKey("MOUSE3", "Mouse 3", 0, MouseButtons::Mouse3);
+	AddKey("MOUSE4", "Mouse 4", 0, MouseButtons::Mouse4);
+	AddKey("MOUSE5", "Mouse 5", 0, MouseButtons::Mouse5);
 
 	// Mouse scroll
 	AddKey("SCROLLUP", "Mouse Scroll Up", 0, MouseButtons::MouseScrollUp);
@@ -45,6 +42,9 @@ void InputEmulator::CreateKeyMap()
 	AddKey("MOUSESCROLLH", "Mouse Scroll Horizontal", 0, MouseButtons::MouseScrollHorizontal);
 	AddKey("MOUSESCROLLB", "Mouse Scroll Both", 0, MouseButtons::MouseScrollBoth);
 
+	// Media volume control
+	AddKey("VOLUMECONTROL", "Media Volume Control", 0, MouseButtons::MediaVolumeControl);
+
 	// Shift
 	AddKey("SHIFT", "Shift", VK_SHIFT);
 	AddKey("LSHIFT", "Left shift", VK_LSHIFT);
@@ -616,6 +616,8 @@ void InputEmulator::VolumeSet(float volume)
 {
 	// Get endpoint volume
 	if(CreateEndpointVolume()) {
+		if(volume < 0) volume = 0.0f;
+		else if(volume > 1) volume = 1.0f;
 		pAudioEndpointVolume->SetMasterVolumeLevelScalar(volume, &GUID_NULL);
 	}
 	ReleaseEndpointVolume();
@@ -642,7 +644,10 @@ void InputEmulator::VolumeChange(float delta)
 	float volume;
 	if(CreateEndpointVolume()) {
 		pAudioEndpointVolume->GetMasterVolumeLevelScalar(&volume);
-		pAudioEndpointVolume->SetMasterVolumeLevelScalar(volume + delta, &GUID_NULL);
+		volume += delta;
+		if(volume < 0) volume = 0.0f;
+		else if(volume > 1) volume = 1.0f;
+		pAudioEndpointVolume->SetMasterVolumeLevelScalar(volume, &GUID_NULL);
 	}
 	ReleaseEndpointVolume();
 }
diff --git a/TabletDriverService/InputEmulator.h b/TabletDriverService/InputEmulator.h
index 02f7143..e0c05fb 100644
--- a/TabletDriverService/InputEmulator.h
+++ b/TabletDriverService/InputEmulator.h
@@ -46,6 +46,7 @@ class InputEmulator
 		MouseScrollVertical = 0x101,
 		MouseScrollHorizontal = 0x102,
 		MouseScrollBoth = 0x103,
+		MediaVolumeControl = 0x110,
 	};
 
 	class KeyMapValue {
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index 12e8d52..39c4b18 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -46,6 +46,9 @@ int main(int argc, char**argv) {
 	// Init console
 	InitConsole();
 
+	// Initialize COM library (Volume control)
+	CoInitializeEx(NULL, COINIT_MULTITHREADED);
+
 	// Tablet handler
 	tabletHandler = new TabletHandler();
 
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index da8a9e1..ddf8819 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -86,6 +86,7 @@ class Tablet {
 		bool isValid;
 		bool isHandled;
 		USHORT buttons;
+		USHORT lastButtons;
 	};
 	TabletAuxState auxState;
 
diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
index 428d0ef..c3c190a 100644
--- a/TabletDriverService/TabletHandler.cpp
+++ b/TabletDriverService/TabletHandler.cpp
@@ -156,18 +156,233 @@ void TabletHandler::ChangeTimerInterval(int newInterval) {
 //
 // Button helper functions
 //
-bool IsButtonDown(UCHAR buttons, int buttonIndex) {
+bool TabletHandler::IsButtonDown(UINT32 buttons, int buttonIndex) {
 	return buttons & (1 << buttonIndex);
 }
-bool IsButtonPressed(UCHAR buttons, UCHAR lastButtons, int buttonIndex) {
+bool TabletHandler::IsButtonPressed(UINT32 buttons, UINT32 lastButtons, int buttonIndex) {
 	return ((buttons & (1 << buttonIndex)) > 0 && (lastButtons & (1 << buttonIndex)) == 0);
 }
-bool IsButtonReleased(UCHAR buttons, UCHAR lastButtons, int buttonIndex) {
+bool TabletHandler::IsButtonReleased(UINT32 buttons, UINT32 lastButtons, int buttonIndex) {
 	return ((buttons & (1 << buttonIndex)) == 0 && (lastButtons & (1 << buttonIndex)) > 0);
 }
 
 
 
+//
+// Process pen and auxiliary buttons
+//
+void TabletHandler::ProcessPenButtons(UINT32 *outButtons) {
+	ProcessButtons(outButtons, true);
+}
+void TabletHandler::ProcessAuxButtons() {
+	UINT32 tmpButtons = 0;
+	ProcessButtons(&tmpButtons, false);
+}
+void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
+{
+	UINT32 buttons;
+	UINT32 lastButtons;
+	int buttonCount;
+	bool isDown;
+	bool isPressed;
+	bool isReleased;
+	bool hasBinding;
+	string key;
+
+	// Pen buttons
+	if(isPen) {
+		buttons = tablet->state.inputButtons;
+		lastButtons = tablet->state.lastButtons;
+		buttonCount = tablet->settings.buttonCount;
+	}
+
+	// Auxiliary buttons
+	else {
+		buttons = tablet->auxState.buttons;
+		lastButtons = tablet->auxState.lastButtons;
+		buttonCount = tablet->settings.auxButtonCount;
+	}
+
+
+	// Button state changed?
+	if(buttons > 0 || lastButtons > 0) {
+
+		// Loop through buttons
+		for(int buttonIndex = 0; buttonIndex < buttonCount; buttonIndex++) {
+
+			// Button is not down, pressed or released?
+			if((buttons & (1 << buttonIndex)) == 0 && (lastButtons & (1 << buttonIndex)) == 0) {
+				continue;
+			}
+
+			// Button state
+			isDown = IsButtonDown(buttons, buttonIndex);
+			isPressed = IsButtonPressed(buttons, lastButtons, buttonIndex);
+			isReleased = IsButtonReleased(buttons, lastButtons, buttonIndex);
+			
+			// Pen button map
+			hasBinding = false;
+			if(isPen && tablet->settings.buttonMap[buttonIndex].size() > 0) {
+				key = tablet->settings.buttonMap[buttonIndex];
+				if(inputEmulator.keyMap.count(key) > 0) {
+					hasBinding = true;
+				}
+			}
+
+			// Auxiliary button map
+			else if(!isPen && tablet->settings.auxButtonMap[buttonIndex].size() > 0) {
+				key = tablet->settings.auxButtonMap[buttonIndex];
+				if(inputEmulator.keyMap.count(key) > 0) {
+					hasBinding = true;
+				}
+			}
+
+			// Button has a binding?
+			if(hasBinding) {
+
+				InputEmulator::KeyMapValue *keyMapValue = inputEmulator.keyMap[key];
+
+				WORD virtualKey = keyMapValue->virtualKey;
+				int mouseButton = keyMapValue->mouseButton;
+
+				//
+				// Mouse buttons
+				//
+				if(mouseButton >= InputEmulator::Mouse1 && mouseButton <= InputEmulator::Mouse5) {
+
+					// Pen button
+					if(isPen && isDown) {
+						*outButtons |= (1 << (mouseButton - 1));
+					}
+
+					// Auxiliary button
+					else if(isPressed || isReleased) {
+						inputEmulator.MouseSet(mouseButton, isDown);
+					}
+				}
+
+				//
+				// Keyboard key
+				//
+				if(virtualKey > 0) {
+					if(isPressed) {
+						inputEmulator.SetKeyState(virtualKey, true);
+					}
+					else if(isReleased) {
+						inputEmulator.SetKeyState(virtualKey, false);
+					}
+				}
+
+				//
+				// Mouse scroll
+				//
+				if(
+					mouseButton == InputEmulator::MouseScrollVertical
+					||
+					mouseButton == InputEmulator::MouseScrollHorizontal
+					||
+					mouseButton == InputEmulator::MouseScrollBoth
+					||
+					mouseButton == InputEmulator::MediaVolumeControl
+				) {
+
+					// Scroll pen button down?
+					if(
+						isDown
+						&&
+						// Scroll when tip is down
+						(!tablet->settings.scrollDrag || IsButtonDown(buttons, 0))
+					) {
+
+						// Get rotated pen position
+						Vector2D scrollPosition;
+						scrollPosition.Set(tablet->state.position);
+						mapper->GetRotatedTabletPosition(&scrollPosition.x, &scrollPosition.y);
+
+						// Reset last scroll position and set the scroll start position
+						if(
+							isPressed
+							||
+							(tablet->settings.scrollDrag && IsButtonPressed(buttons, lastButtons, 0))
+						) {
+							lastScrollPosition.Set(scrollPosition);
+							scrollStartPosition.Set(tablet->state.position);
+
+							//
+							// Move normal mouse to digitizer position
+							//
+							if(outputManager->mode == OutputManager::ModeVMultiDigitizer) {
+								TabletState tmpState;
+								tmpState.position.Set(tablet->state.position);
+								outputManager->sendInputAbsolute.Set(&tmpState);
+								outputManager->sendInputAbsolute.Write();
+							}
+
+						}
+
+						// Disable mouse tip button when using drag scroll
+						if(tablet->settings.scrollDrag) {
+							*outButtons &= ~1;
+						}
+
+						// Delta from the last scroll position
+						Vector2D delta(
+							(scrollPosition.x - lastScrollPosition.x) * tablet->settings.scrollSensitivity,
+							(scrollPosition.y - lastScrollPosition.y) * tablet->settings.scrollSensitivity
+						);
+
+						// X Acceleration
+						if(delta.x > 0)
+							delta.x = round(pow(delta.x, tablet->settings.scrollAcceleration));
+						else
+							delta.x = -round(pow(-delta.x, tablet->settings.scrollAcceleration));
+
+						// Y Acceleration
+						if(delta.y > 0)
+							delta.y = round(pow(delta.y, tablet->settings.scrollAcceleration));
+						else
+							delta.y = -round(pow(-delta.y, tablet->settings.scrollAcceleration));
+
+
+						// Vertical Scroll
+						if(delta.y != 0 && (mouseButton & InputEmulator::MouseScrollVertical) == InputEmulator::MouseScrollVertical) {
+							inputEmulator.MouseScroll((int)delta.y, true);
+							lastScrollPosition.Set(scrollPosition);
+						}
+
+						// Horizontal scroll
+						if(delta.x != 0 && (mouseButton & InputEmulator::MouseScrollHorizontal) == InputEmulator::MouseScrollHorizontal) {
+							inputEmulator.MouseScroll((int)-delta.x, false);
+							lastScrollPosition.Set(scrollPosition);
+						}
+
+						// Media volume control
+						if(delta.y != 0 && mouseButton == InputEmulator::MediaVolumeControl) {
+							inputEmulator.VolumeChange(-(float)delta.y / 100.0f);
+							lastScrollPosition.Set(scrollPosition);
+						}
+
+						// Stop cursor
+						if(tablet->settings.scrollStopCursor) {
+							tablet->state.position.Set(scrollStartPosition);
+						}
+
+					}
+				}
+			}
+		}
+
+		// Set last buttons
+		if(isPen) {
+			tablet->state.lastButtons = buttons;
+		}
+		else {
+			tablet->auxState.lastButtons = buttons;
+		}
+	}
+}
+
+
 //
 // Tablet input thread
 //
@@ -179,11 +394,9 @@ void TabletHandler::RunTabletInputThread() {
 	TabletState filterState;
 	TabletState oldState;
 	bool filterTimedEnabled;
-	UCHAR buttons = 0;
-	UCHAR outButtons = 0;
-	UCHAR lastButtons = 0;
-	Vector2D lastScrollPosition;
-	Vector2D scrollStartPosition;
+	UINT32 buttons = 0;
+	UINT32 lastButtons = 0;
+	UINT32 outButtons = 0;
 
 	timeBegin = chrono::high_resolution_clock::now();
 
@@ -277,155 +490,13 @@ void TabletHandler::RunTabletInputThread() {
 			tablet->state.buttons = 0;
 		}
 
-		//
-		// Button map
-		//
-		buttons = tablet->state.buttons;
+		// Process buttons
 		outButtons = 0;
-
-		if(buttons > 0 || lastButtons > 0) {
-
-			// Loop through buttons
-			for(int buttonIndex = 0; buttonIndex < tablet->settings.buttonCount; buttonIndex++) {
-
-				// Button is not down, pressed or released?
-				if((buttons & (1 << buttonIndex)) == 0 && (lastButtons & (1 << buttonIndex)) == 0) {
-					continue;
-				}
-
-				// Button state
-				bool isDown = IsButtonDown(buttons, buttonIndex);
-				bool isPressed = IsButtonPressed(buttons, lastButtons, buttonIndex);
-				bool isReleased = IsButtonReleased(buttons, lastButtons, buttonIndex);
-
-				// Button is set
-				if(tablet->settings.buttonMap[buttonIndex].size() > 0) {
-
-					string key = tablet->settings.buttonMap[buttonIndex];
-
-					if(inputEmulator.keyMap.count(key) > 0) {
-						InputEmulator::KeyMapValue *keyMapValue = inputEmulator.keyMap[key];
-
-						// Mouse buttons
-						if(keyMapValue->mouseButton > 0 && keyMapValue->mouseButton < 8) {
-							if(isDown) {
-								outButtons |= (1 << (keyMapValue->mouseButton - 1));
-							}
-						}
-
-						//
-						// Mouse scroll
-						//
-						else if((keyMapValue->mouseButton & 0x103) > 0) {
-
-							// Scroll pen button down?
-							if(
-								isDown
-								&&
-
-								// Scroll when tip is down
-								(!tablet->settings.scrollDrag || IsButtonDown(buttons, 0))
-								) {
-
-								// Get rotated pen position
-								Vector2D scrollPosition;
-								scrollPosition.Set(tablet->state.position);
-								mapper->GetRotatedTabletPosition(&scrollPosition.x, &scrollPosition.y);
-
-								// Reset last scroll position and set the scroll start position
-								if(isPressed
-									||
-									(tablet->settings.scrollDrag  && isDown && IsButtonPressed(buttons, lastButtons, 0))
-									) {
-									lastScrollPosition.Set(scrollPosition);
-									scrollStartPosition.Set(tablet->state.position);
-
-									//
-									// Move normal mouse to digitizer position
-									//
-									if(outputManager->mode == OutputManager::ModeVMultiDigitizer) {
-										TabletState tmpState;
-										tmpState.position.Set(tablet->state.position);
-										outputManager->sendInputAbsolute.Set(&tmpState);
-										outputManager->sendInputAbsolute.Write();
-									}
-
-								}
-
-								// Disable mouse tip button when using drag scroll
-								if(tablet->settings.scrollDrag) {
-									outButtons &= ~1;
-								}
-
-								// Delta from the last scroll position
-								Vector2D delta(
-									(scrollPosition.x - lastScrollPosition.x) * tablet->settings.scrollSensitivity,
-									(scrollPosition.y - lastScrollPosition.y) * tablet->settings.scrollSensitivity
-								);
-
-								// X Acceleration
-								if(delta.x > 0)
-									delta.x = round(pow(delta.x, tablet->settings.scrollAcceleration));
-								else
-									delta.x = -round(pow(-delta.x, tablet->settings.scrollAcceleration));
-
-								// Y Acceleration
-								if(delta.y > 0)
-									delta.y = round(pow(delta.y, tablet->settings.scrollAcceleration));
-								else
-									delta.y = -round(pow(-delta.y, tablet->settings.scrollAcceleration));
-
-
-								// Vertical Scroll
-								if(delta.y != 0 && (keyMapValue->mouseButton & 0x101) == 0x101) {
-									inputEmulator.MouseScroll((int)delta.y, true);
-									lastScrollPosition.Set(scrollPosition);
-								}
-
-								// Horizontal scroll
-								if(delta.x != 0 && (keyMapValue->mouseButton & 0x102) == 0x102) {
-									inputEmulator.MouseScroll((int)-delta.x, false);
-									lastScrollPosition.Set(scrollPosition);
-								}
-
-								// Stop cursor
-								if(tablet->settings.scrollStopCursor) {
-									tablet->state.position.Set(scrollStartPosition);
-								}
-
-							}
-						}
-
-						// Keyboard key
-						if(keyMapValue->virtualKey > 0) {
-							if(isPressed) {
-								inputEmulator.SetKeyState(keyMapValue->virtualKey, true);
-							}
-							else if(isReleased) {
-								inputEmulator.SetKeyState(keyMapValue->virtualKey, false);
-							}
-						}
-
-					}
-
-					// Keyboard keys
-					else {
-						if(isPressed) {
-							inputEmulator.SetInputStates(key, true);
-						}
-						else if(isReleased) {
-							inputEmulator.SetInputStates(key, false);
-						}
-					}
-				}
-
-			}
-		}
-
-		// Set button values
+		ProcessPenButtons(&outButtons);
 		tablet->state.buttons = outButtons;
-		lastButtons = buttons;
 
+		// Reprocess auxiliary buttons (for mouse scroll)
+		ProcessAuxButtons();
 
 		//
 		// Report filters
@@ -495,6 +566,7 @@ void TabletHandler::RunTabletInputThread() {
 
 }
 
+
 //
 // Auxiliary input thread (tablet buttons, etc.)
 //
@@ -534,54 +606,17 @@ void TabletHandler::RunAuxInputThread()
 		memcpy(&auxState, &tablet->auxState, sizeof(Tablet::TabletAuxState));
 		tablet->auxState.isValid = false;
 
-		// Buttons
-		buttons = auxState.buttons;
-
+		// Process buttons
 		if(logger.debugEnabled) {
-			LOG_DEBUG("Aux buttons: 0x%04X\n", buttons);
-		}
-
-		// Loop through buttons
-		for(int button = 1; button <= tablet->settings.auxButtonCount; button++) {
-
-			int buttonMask = 1 << (button - 1);
-
-			//
-			// Button pressed
-			//
-			if((buttons & buttonMask) == buttonMask && (lastButtons & buttonMask) != buttonMask) {
-
-				// Button mapped?
-				if(tablet->settings.auxButtonMap[button - 1].size() > 0) {
-
-					// Set key down
-					inputEmulator.SetInputStates(tablet->settings.auxButtonMap[button - 1], true);
-				}
-
-			}
-
-			//
-			// Button released
-			//
-			else if((buttons & buttonMask) != buttonMask && (lastButtons & buttonMask) == buttonMask) {
-
-				// Button mapped?
-				if(tablet->settings.auxButtonMap[button - 1].size() > 0) {
-
-					// Set key up
-					inputEmulator.SetInputStates(tablet->settings.auxButtonMap[button - 1], false);
-				}
-
-			}
-
+			LOG_DEBUG("Aux buttons: 0x%04X\n", auxState.buttons);
 		}
-
-		lastButtons = buttons;
+		ProcessAuxButtons();
 
 	}
 
 }
 
+
 //
 // Timer tick
 //
@@ -656,6 +691,7 @@ void TabletHandler::OnTimerTick() {
 	isTimerTickRunning = false;
 }
 
+
 //
 // Write output state with output manager
 //
diff --git a/TabletDriverService/TabletHandler.h b/TabletDriverService/TabletHandler.h
index c465ab7..8dd339e 100644
--- a/TabletDriverService/TabletHandler.h
+++ b/TabletDriverService/TabletHandler.h
@@ -5,6 +5,16 @@
 #include "InputEmulator.h"
 
 class TabletHandler {
+private:
+	Vector2D lastScrollPosition;
+	Vector2D scrollStartPosition;
+	void ProcessPenButtons(UINT32 *outButtons);
+	void ProcessAuxButtons();
+	void ProcessButtons(UINT32 *outButtons, bool isPen);
+	bool IsButtonDown(UINT32 buttons, int buttonIndex);
+	bool IsButtonPressed(UINT32 buttons, UINT32 lastButtons, int buttonIndex);
+	bool IsButtonReleased(UINT32 buttons, UINT32 lastButtons, int buttonIndex);
+
 public:
 	Tablet *tablet;
 	thread *tabletInputThread;
@@ -33,6 +43,7 @@ class TabletHandler {
 	void RunAuxInputThread();
 	void OnTimerTick();
 	void WriteOutputState(TabletState *outputState);
+	
 
 
 private:
diff --git a/TabletDriverService/TabletState.h b/TabletDriverService/TabletState.h
index 951fedd..f730b67 100644
--- a/TabletDriverService/TabletState.h
+++ b/TabletDriverService/TabletState.h
@@ -13,6 +13,7 @@ class TabletState {
 	double inputVelocity;
 
 	unsigned char buttons;
+	unsigned char lastButtons;
 	Vector2D position;
 	double pressure;
 

From 1318afa9b237c63ae67c1a3159ccb08fe3c4f13e Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Thu, 3 Jan 2019 19:09:44 +0200
Subject: [PATCH 76/83] Drag scroll fix

---
 TabletDriverService/TabletHandler.cpp | 54 ++++++++++++++-------------
 TabletDriverService/TabletHandler.h   |  2 +-
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
index c3c190a..43bd138 100644
--- a/TabletDriverService/TabletHandler.cpp
+++ b/TabletDriverService/TabletHandler.cpp
@@ -174,12 +174,13 @@ bool TabletHandler::IsButtonReleased(UINT32 buttons, UINT32 lastButtons, int but
 void TabletHandler::ProcessPenButtons(UINT32 *outButtons) {
 	ProcessButtons(outButtons, true);
 }
-void TabletHandler::ProcessAuxButtons() {
-	UINT32 tmpButtons = 0;
-	ProcessButtons(&tmpButtons, false);
+void TabletHandler::ProcessAuxButtons(UINT32 *outButtons) {
+	ProcessButtons(outButtons, false);
 }
 void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 {
+	UINT32 penButtons = 0;
+	UINT32 penLastButtons = 0;
 	UINT32 buttons;
 	UINT32 lastButtons;
 	int buttonCount;
@@ -188,11 +189,15 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 	bool isReleased;
 	bool hasBinding;
 	string key;
+	bool scrolled = false;
+	Vector2D scrollPosition;
 
 	// Pen buttons
+	penButtons = tablet->state.inputButtons;
+	penLastButtons = tablet->state.lastButtons;
 	if(isPen) {
-		buttons = tablet->state.inputButtons;
-		lastButtons = tablet->state.lastButtons;
+		buttons = penButtons;
+		lastButtons = penLastButtons;
 		buttonCount = tablet->settings.buttonCount;
 	}
 
@@ -203,7 +208,6 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 		buttonCount = tablet->settings.auxButtonCount;
 	}
 
-
 	// Button state changed?
 	if(buttons > 0 || lastButtons > 0) {
 
@@ -286,16 +290,14 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 					mouseButton == InputEmulator::MediaVolumeControl
 				) {
 
-					// Scroll pen button down?
-					if(
-						isDown
+					// Scroll button down?
+					if(isDown
 						&&
-						// Scroll when tip is down
-						(!tablet->settings.scrollDrag || IsButtonDown(buttons, 0))
+						// Scroll when tip is down?
+						(!tablet->settings.scrollDrag || IsButtonDown(penButtons, 0))
 					) {
 
 						// Get rotated pen position
-						Vector2D scrollPosition;
 						scrollPosition.Set(tablet->state.position);
 						mapper->GetRotatedTabletPosition(&scrollPosition.x, &scrollPosition.y);
 
@@ -303,7 +305,7 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 						if(
 							isPressed
 							||
-							(tablet->settings.scrollDrag && IsButtonPressed(buttons, lastButtons, 0))
+							(tablet->settings.scrollDrag && IsButtonPressed(penButtons, penLastButtons, 0))
 						) {
 							lastScrollPosition.Set(scrollPosition);
 							scrollStartPosition.Set(tablet->state.position);
@@ -347,19 +349,19 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 						// Vertical Scroll
 						if(delta.y != 0 && (mouseButton & InputEmulator::MouseScrollVertical) == InputEmulator::MouseScrollVertical) {
 							inputEmulator.MouseScroll((int)delta.y, true);
-							lastScrollPosition.Set(scrollPosition);
+							scrolled = true;
 						}
 
 						// Horizontal scroll
 						if(delta.x != 0 && (mouseButton & InputEmulator::MouseScrollHorizontal) == InputEmulator::MouseScrollHorizontal) {
 							inputEmulator.MouseScroll((int)-delta.x, false);
-							lastScrollPosition.Set(scrollPosition);
+							scrolled = true;
 						}
 
 						// Media volume control
 						if(delta.y != 0 && mouseButton == InputEmulator::MediaVolumeControl) {
 							inputEmulator.VolumeChange(-(float)delta.y / 100.0f);
-							lastScrollPosition.Set(scrollPosition);
+							scrolled = true;
 						}
 
 						// Stop cursor
@@ -370,15 +372,14 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 					}
 				}
 			}
-		}
 
-		// Set last buttons
-		if(isPen) {
-			tablet->state.lastButtons = buttons;
 		}
-		else {
-			tablet->auxState.lastButtons = buttons;
+
+		// Update last scroll position
+		if(scrolled) {
+			lastScrollPosition.Set(scrollPosition);
 		}
+
 	}
 }
 
@@ -493,11 +494,10 @@ void TabletHandler::RunTabletInputThread() {
 		// Process buttons
 		outButtons = 0;
 		ProcessPenButtons(&outButtons);
+		ProcessAuxButtons(&outButtons);
+		tablet->state.lastButtons = tablet->state.inputButtons;
 		tablet->state.buttons = outButtons;
 
-		// Reprocess auxiliary buttons (for mouse scroll)
-		ProcessAuxButtons();
-
 		//
 		// Report filters
 		//
@@ -610,7 +610,9 @@ void TabletHandler::RunAuxInputThread()
 		if(logger.debugEnabled) {
 			LOG_DEBUG("Aux buttons: 0x%04X\n", auxState.buttons);
 		}
-		ProcessAuxButtons();
+		UINT32 tmpButtons = 0; 
+		ProcessAuxButtons(&tmpButtons);
+		tablet->auxState.lastButtons = tablet->auxState.buttons;
 
 	}
 
diff --git a/TabletDriverService/TabletHandler.h b/TabletDriverService/TabletHandler.h
index 8dd339e..51a4a2b 100644
--- a/TabletDriverService/TabletHandler.h
+++ b/TabletDriverService/TabletHandler.h
@@ -9,7 +9,7 @@ class TabletHandler {
 	Vector2D lastScrollPosition;
 	Vector2D scrollStartPosition;
 	void ProcessPenButtons(UINT32 *outButtons);
-	void ProcessAuxButtons();
+	void ProcessAuxButtons(UINT32 *outButtons);
 	void ProcessButtons(UINT32 *outButtons, bool isPen);
 	bool IsButtonDown(UINT32 buttons, int buttonIndex);
 	bool IsButtonPressed(UINT32 buttons, UINT32 lastButtons, int buttonIndex);

From 3c4faaf2bc859f46646b65ee5e2cce43657ba347 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Thu, 3 Jan 2019 23:40:33 +0200
Subject: [PATCH 77/83] Thread safety, named pipe fixes, audio balance, etc.

- Improved thread safety
- Some fixes for named pipes
- Added  ability to use the pen to control audio left/right balance
- Some minor bug fixes
---
 TabletDriverGUI/TabletDriver.cs               | 287 +++++++++---------
 TabletDriverGUI/WindowButtonMapping.xaml.cs   |   1 +
 TabletDriverService/CommandHandler.Device.cpp |   4 +-
 .../CommandHandler.Filters.cpp                |  24 ++
 TabletDriverService/CommandHandler.Other.cpp  |   7 +-
 TabletDriverService/CommandHandler.Tablet.cpp |   2 +-
 TabletDriverService/HIDDevice.cpp             |   5 +-
 TabletDriverService/InputEmulator.cpp         |  56 ++++
 TabletDriverService/InputEmulator.h           |   2 +
 TabletDriverService/Logger.cpp                |  27 +-
 TabletDriverService/Logger.h                  |   7 +-
 TabletDriverService/Main.cpp                  |  17 +-
 TabletDriverService/OutputDummy.cpp           |   2 +-
 .../OutputSendInputAbsolute.cpp               |   2 +-
 .../OutputSendInputRelative.cpp               |   2 +-
 TabletDriverService/OutputVMultiAbsolute.cpp  |   2 +-
 TabletDriverService/OutputVMultiDigitizer.cpp |   2 +-
 .../OutputVMultiDigitizerRelative.cpp         |   2 +-
 TabletDriverService/OutputVMultiRelative.cpp  |   2 +-
 TabletDriverService/PipeHandler.cpp           |  82 +++--
 TabletDriverService/PipeHandler.h             |   1 +
 TabletDriverService/Tablet.cpp                |   4 +-
 .../TabletDriverService.vcxproj.user          |   2 +-
 .../TabletFilterAdvancedSmoothing.cpp         |   2 +-
 .../TabletFilterAntiSmoothing.cpp             |   6 +-
 TabletDriverService/TabletFilterGravity.cpp   |   2 +-
 .../TabletFilterNoiseReduction.cpp            |   4 +-
 TabletDriverService/TabletFilterSmoothing.cpp |   2 +-
 TabletDriverService/TabletFilterTester.cpp    |   6 +-
 TabletDriverService/TabletHandler.cpp         |  37 ++-
 TabletDriverService/USBDevice.cpp             |   9 +-
 TabletDriverService/VMulti.cpp                |   2 +-
 TabletDriverService/stdafx.h                  |   3 +
 33 files changed, 401 insertions(+), 214 deletions(-)

diff --git a/TabletDriverGUI/TabletDriver.cs b/TabletDriverGUI/TabletDriver.cs
index 1eb55ff..5963936 100644
--- a/TabletDriverGUI/TabletDriver.cs
+++ b/TabletDriverGUI/TabletDriver.cs
@@ -50,15 +50,13 @@ public DriverEventArgs(DriverEventType type, string message, string parameters)
 
         // Pipe
         System.Threading.Thread pipeInputThread = null;
+        System.Threading.Thread pipeOutputThread = null;
         System.Threading.Thread pipeStateThread = null;
 
         NamedPipeClientStream pipeStreamInput;
         NamedPipeClientStream pipeStreamOutput;
         NamedPipeClientStream pipeStreamState;
 
-        StreamReader pipeInputReader = null;
-        StreamWriter pipeOutputWriter = null;
-        BinaryReader pipeStateReader = null;
 
         [StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Unicode)]
         [Serializable]
@@ -85,7 +83,24 @@ public struct TabletState
         private Process processService;
         private Timer timerWatchdog;
         private bool running;
-        public bool IsRunning { get { return running; } }
+        private readonly object locker = new object();
+        public bool IsRunning
+        {
+            get
+            {
+                lock (locker)
+                {
+                    return running;
+                }
+            }
+            set
+            {
+                lock (locker)
+                {
+                    running = value;
+                }
+            }
+        }
 
         //
         // Constructor
@@ -111,7 +126,7 @@ public TabletDriver(string servicePath)
         //
         private void TimerWatchdog_Elapsed(object sender, ElapsedEventArgs e)
         {
-            if (running)
+            if (IsRunning)
             {
                 //Console.WriteLine("ID: " + processDriver.Id);
                 if (processService.HasExited)
@@ -141,7 +156,7 @@ private void TimerWatchdog_Elapsed(object sender, ElapsedEventArgs e)
         //
         public void SendCommand(string line)
         {
-            if (running)
+            if (IsRunning)
             {
                 processService.StandardInput.WriteLine(line);
             }
@@ -152,13 +167,12 @@ public void SendCommand(string line)
         //
         public void SendPipeCommand(string line)
         {
-            if (running)
+            if (IsRunning)
             {
-                if (pipeOutputWriter != null)
-                {
-                    pipeOutputWriter.WriteLine(line);
-                    pipeOutputWriter.Flush();
-                }
+
+                byte[] buffer = Encoding.UTF8.GetBytes(line);
+                pipeStreamOutput.Write(buffer, 0, buffer.Length);
+                pipeStreamOutput.Flush();
             }
         }
 
@@ -167,15 +181,19 @@ public void SendPipeCommand(string line)
         //
         public void ConsoleAddLine(string line)
         {
-            mutexConsoleUpdate.WaitOne();
-            ConsoleBuffer.Add(line);
-            HasConsoleUpdated = true;
+            try
+            {
+                mutexConsoleUpdate.WaitOne();
+                ConsoleBuffer.Add(line);
+                HasConsoleUpdated = true;
 
-            // Limit console buffer size
-            if (ConsoleBuffer.Count >= ConsoleMaxLines)
-                ConsoleBuffer.RemoveRange(0, ConsoleBuffer.Count - ConsoleMaxLines);
+                // Limit console buffer size
+                if (ConsoleBuffer.Count >= ConsoleMaxLines)
+                    ConsoleBuffer.RemoveRange(0, ConsoleBuffer.Count - ConsoleMaxLines);
+            }
+            catch (Exception) { }
 
-            mutexConsoleUpdate.ReleaseMutex();
+            try { mutexConsoleUpdate.ReleaseMutex(); } catch (Exception) { }
         }
 
 
@@ -356,7 +374,7 @@ private void ProcessService_OutputDataReceived(object sender, DataReceivedEventA
         {
             if (e.Data == null)
             {
-                if (running)
+                if (IsRunning)
                     Stop();
             }
             else
@@ -411,50 +429,44 @@ private void ProcessService_OutputDataReceived(object sender, DataReceivedEventA
         private void RunPipeInputThread()
         {
             StringBuilder stringBuilder = new StringBuilder();
-            char[] buffer = new char[1024];
+            byte[] buffer = new byte[1024];
 
 
-            while (running)
+            while (IsRunning)
             {
-                pipeStreamInput = new NamedPipeClientStream(".", "TabletDriverOutput", PipeDirection.InOut);
-                pipeStreamOutput = new NamedPipeClientStream(".", "TabletDriverInput", PipeDirection.InOut);
+                pipeStreamInput = new NamedPipeClientStream(".", "TabletDriverOutput", PipeDirection.InOut, PipeOptions.Asynchronous);
 
-                //ConsoleAddLine("Connecting...");
-                try
+                Console.WriteLine("Input pipe connecting...");
+                try { pipeStreamInput.Connect(); }
+                catch (Exception ex)
                 {
-                    pipeStreamInput.Connect();
-                    pipeStreamOutput.Connect();
-                }
-                catch (Exception)
-                {
-                    // ConsoleAddLine("Input pipe connect error! " + ex.Message);
+                    Console.WriteLine("Input pipe connect error! " + ex.Message);
                     break;
                 }
-                //ConsoleAddLine("Connected!");
-
-                pipeInputReader = new StreamReader(pipeStreamInput);
-                pipeOutputWriter = new StreamWriter(pipeStreamOutput);
+                Console.WriteLine("Input pipe connected!");
 
-
-                while (running && pipeStreamInput.IsConnected)
+                //
+                // Input thread read loop
+                //
+                while (IsRunning && pipeStreamInput.IsConnected)
                 {
-                    //ConsoleAddLine("Read!");
+                    //Console.WriteLine("Input pipe read!");
                     int bytesRead = 0;
                     try
                     {
-                        bytesRead = pipeInputReader.Read(buffer, 0, buffer.Length);
+                        bytesRead = pipeStreamInput.Read(buffer, 0, buffer.Length);
                     }
                     catch (Exception)
                     {
-                        // ConsoleAddLine("Can't read input pipe!");
+                        Console.WriteLine("Can't read input pipe!");
                         break;
                     }
+                    //Console.WriteLine("Input pipe read length: " + bytesRead);
                     if (bytesRead == 0) continue;
-                    //ConsoleAddLine("Read: " + bytesRead);
 
                     for (int i = 0; i < bytesRead; i++)
                     {
-                        char c = buffer[i];
+                        char c = (char)buffer[i];
                         if (c == '\n' || c == '\r' || c == 0)
                         {
                             if (stringBuilder.Length > 0)
@@ -471,17 +483,9 @@ private void RunPipeInputThread()
 
                 }
 
+                Console.WriteLine("Input pipe disconnected!");
                 ConsoleAddLine("Input pipe disconnected!");
 
-                // Close input reader
-                try
-                {
-                    pipeInputReader.Close();
-                    pipeInputReader.Dispose();
-                    pipeInputReader = null;
-                }
-                catch (Exception) { }
-
                 // Close input stream
                 try
                 {
@@ -491,16 +495,40 @@ private void RunPipeInputThread()
                 }
                 catch (Exception) { }
 
+            }
 
+        }
 
-                // Close output writer
-                try
+
+        //
+        // Pipe input thread
+        //
+        private void RunPipeOutputThread()
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+            char[] buffer = new char[1024];
+
+
+            while (IsRunning)
+            {
+                pipeStreamOutput = new NamedPipeClientStream(".", "TabletDriverInput", PipeDirection.InOut, PipeOptions.Asynchronous);
+
+                Console.WriteLine("Output pipe connecting...");
+                try { pipeStreamOutput.Connect(); }
+                catch (Exception ex)
                 {
-                    pipeOutputWriter.Close();
-                    pipeOutputWriter.Dispose();
-                    pipeOutputWriter = null;
+                    Console.WriteLine("Output pipe connect error! " + ex.Message);
+                    break;
                 }
-                catch (Exception) { }
+                Console.WriteLine("Output pipe connected!");
+
+                // Wait for pipe to disconnect
+                while (IsRunning && pipeStreamOutput.IsConnected)
+                {
+                    System.Threading.Thread.Sleep(100);
+                }
+
+                Console.WriteLine("Output pipe disconnected!");
 
                 // Close output stream
                 try
@@ -525,61 +553,58 @@ private void RunPipeStateThread()
             byte[] bytes;
             GCHandle gcHandle;
             TabletState readState;
+            size = Marshal.SizeOf(typeof(TabletState));
+            bytes = new byte[Marshal.SizeOf(typeof(TabletState))];
 
-            while (running)
+
+            while (IsRunning)
             {
-                if (!running) break;
-                pipeStreamState = new NamedPipeClientStream(".", "TabletDriverState", PipeDirection.InOut);
+                pipeStreamState = new NamedPipeClientStream(".", "TabletDriverState", PipeDirection.InOut, PipeOptions.Asynchronous);
 
+                Console.WriteLine("State pipe connecting...");
                 try
                 {
                     pipeStreamState.Connect();
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
-                    // ConsoleAddLine("State pipe connection error! " + ex.Message);
+                    Console.WriteLine("State pipe connection error! " + ex.Message);
                     break;
                 }
-                pipeStateReader = new BinaryReader(pipeStreamState);
+                Console.WriteLine("State pipe connected!");
 
 
-                while (running && pipeStreamState.IsConnected)
+                //
+                // State pipe read loop
+                //
+                while (IsRunning && pipeStreamState.IsConnected)
                 {
+                    //Console.WriteLine("Reading state pipe!");
                     try
                     {
+                        // Read
+                        if (pipeStreamState.Read(bytes, 0, bytes.Length) == size)
+                        {
+
+                            // Convert bytes to TabletState
+                            gcHandle = GCHandle.Alloc(bytes, GCHandleType.Pinned);
+                            readState = (TabletState)Marshal.PtrToStructure(gcHandle.AddrOfPinnedObject(), typeof(TabletState));
+                            gcHandle.Free();
+                            tabletState = readState;
 
-                        size = Marshal.SizeOf(typeof(TabletState));
-                        bytes = pipeStateReader.ReadBytes(size);
-                        gcHandle = GCHandle.Alloc(bytes, GCHandleType.Pinned);
-                        readState = (TabletState)Marshal.PtrToStructure(gcHandle.AddrOfPinnedObject(), typeof(TabletState));
-                        gcHandle.Free();
+                        }
                     }
-                    catch (Exception)
+                    catch (Exception ex)
                     {
-                        //ConsoleAddLine("Can't read state pipe! " + ex.Message);
+                        Console.WriteLine("Can't read state pipe! " + ex.Message);
                         size = 0;
                         break;
                     }
-                    if (size > 0)
-                    {
-                        tabletState = readState;
-                        //ConsoleAddLine("State X: " + tabletState.inputX + ", Y: " + tabletState.inputY);
-                    }
 
 
                 }
 
-                ConsoleAddLine("State pipe disconnected!");
-
-                // Close state reader
-                try
-                {
-                    pipeStateReader.Close();
-                    pipeStateReader.Dispose();
-                    pipeStateReader = null;
-                }
-                catch (Exception) { }
-
+                Console.WriteLine("State pipe disconnected!");
 
                 // Close state stream
                 try
@@ -646,13 +671,17 @@ public void Start(string processPath, string arguments)
                     {
                     }
 
-                    running = true;
+                    IsRunning = true;
                     timerWatchdog.Start();
 
                     // Pipe input thread
                     pipeInputThread = new System.Threading.Thread(new System.Threading.ThreadStart(RunPipeInputThread));
                     pipeInputThread.Start();
 
+                    // Pipe output thread
+                    pipeOutputThread = new System.Threading.Thread(new System.Threading.ThreadStart(RunPipeOutputThread));
+                    pipeOutputThread.Start();
+
                     // Pipe state thread
                     pipeStateThread = new System.Threading.Thread(new System.Threading.ThreadStart(RunPipeStateThread));
                     pipeStateThread.Start();
@@ -681,22 +710,13 @@ public void Start(string processPath, string arguments)
         //
         public void Stop()
         {
-            if (!running) return;
-            running = false;
+            if (!IsRunning) return;
             timerWatchdog.Stop();
+            IsRunning = false;
 
-            // Close pipe reader
-            try
-            {
-                if (pipeInputReader != null)
-                {
-                    pipeInputReader.Close();
-                    pipeInputReader.Dispose();
-                }
-            }
-            catch (Exception e) { Debug.WriteLine("Pipe input reader error! " + e.Message); }
 
             // Close pipe input stream
+            Console.WriteLine("Closing input pipe stream");
             try
             {
                 if (pipeStreamInput != null)
@@ -705,22 +725,11 @@ public void Stop()
                     pipeStreamInput.Dispose();
                 }
             }
-            catch (Exception e) { Debug.WriteLine("Pipe input stream error! " + e.Message); }
-
-            // Close pipe writer
-            try
-            {
-                if (pipeOutputWriter != null)
-                {
-                    pipeOutputWriter.Close();
-                    pipeOutputWriter.Dispose();
-                }
-
-            }
-            catch (Exception e) { Debug.WriteLine("Pipe writer error! " + e.Message); }
+            catch (Exception e) { Console.WriteLine("Pipe input stream error! " + e.Message); }
 
 
             // Close pipe output stream
+            Console.WriteLine("Closing output pipe stream");
             try
             {
                 if (pipeStreamOutput != null)
@@ -729,22 +738,11 @@ public void Stop()
                     pipeStreamOutput.Dispose();
                 }
             }
-            catch (Exception e) { Debug.WriteLine("Pipe output stream error! " + e.Message); }
+            catch (Exception e) { Console.WriteLine("Pipe output stream error! " + e.Message); }
 
 
-            // Close state reader
-            try
-            {
-                if (pipeStateReader != null)
-                {
-                    pipeStateReader.Close();
-                    pipeStateReader.Dispose();
-                }
-
-            }
-            catch (Exception e) { Debug.WriteLine("Pipe state reader error! " + e.Message); }
-
             // Close pipe state stream
+            Console.WriteLine("Closing state pipe stream");
             try
             {
                 if (pipeStreamState != null)
@@ -753,29 +751,39 @@ public void Stop()
                     pipeStreamState.Dispose();
                 }
             }
-            catch (Exception e) { Debug.WriteLine("Pipe state stream error! " + e.Message); }
+            catch (Exception e) { Console.WriteLine("Pipe state stream error! " + e.Message); }
 
-            // Close pipe input thread
+            // Close input pipe thread
+            Console.WriteLine("Closing input pipe thread");
             try
             {
-                if (pipeInputThread != null)
-                {
-                    pipeInputThread.Abort();
-                }
+                pipeInputThread.Abort();
+                pipeInputThread.Join(1000);
             }
-            catch (Exception e) { Debug.WriteLine("Pipe input thread error! " + e.Message); }
+            catch (Exception e) { Console.WriteLine("Pipe input thread error! " + e.Message); }
+
+
+            // Close output pipe thread
+            Console.WriteLine("Closing output pipe thread");
+            try
+            {
+                pipeOutputThread.Abort();
+                pipeOutputThread.Join(1000);
+            }
+            catch (Exception e) { Console.WriteLine("Pipe output thread error! " + e.Message); }
 
             // Close pipe state thread
+            Console.WriteLine("Closing state pipe thread");
             try
             {
-                if (pipeStateThread != null)
-                {
-                    pipeStateThread.Abort();
-                }
+                pipeStateThread.Abort();
+                pipeStateThread.Join(1000);
             }
-            catch (Exception e) { Debug.WriteLine("Pipe state thread error! " + e.Message); }
+            catch (Exception e) { Console.WriteLine("Pipe state thread error! " + e.Message); }
 
 
+            // Kill service process
+            Console.WriteLine("Killing TabletDriverService");
             try
             {
                 processService.CancelOutputRead();
@@ -786,6 +794,7 @@ public void Stop()
             {
                 Debug.WriteLine("Service process error! " + e.Message);
             }
+
             Stopped?.Invoke(this, new EventArgs());
 
 
diff --git a/TabletDriverGUI/WindowButtonMapping.xaml.cs b/TabletDriverGUI/WindowButtonMapping.xaml.cs
index 15ba082..086785e 100644
--- a/TabletDriverGUI/WindowButtonMapping.xaml.cs
+++ b/TabletDriverGUI/WindowButtonMapping.xaml.cs
@@ -79,6 +79,7 @@ public WindowButtonMapping()
                 { "VOLUMEDOWN5.0", new ButtonBinding("Volume Down 5.0%") },
                 { "VOLUMEMUTE", new ButtonBinding("Volume Mute") },
                 { "VOLUMECONTROL", new ButtonBinding("Volume Control Up/Down") },
+                { "BALANCECONTROL", new ButtonBinding("Balance Control Left/Right") },
                 { "MEDIANEXT", new ButtonBinding("Media Next Track") },
                 { "MEDIAPREV", new ButtonBinding("Media Previous Track") },
                 { "MEDIASTOP", new ButtonBinding("Media Stop") },
diff --git a/TabletDriverService/CommandHandler.Device.cpp b/TabletDriverService/CommandHandler.Device.cpp
index 3b5f230..f60c834 100644
--- a/TabletDriverService/CommandHandler.Device.cpp
+++ b/TabletDriverService/CommandHandler.Device.cpp
@@ -149,9 +149,7 @@ void CommandHandler::CreateDeviceCommands() {
 		HIDDevice *hid = new HIDDevice();
 		hid->debugEnabled = true;
 		hid->OpenDevice(&hidHandle, 1, 1, 1, 1);
-		if(hidHandle > 0) {
-			CloseHandle(hidHandle);
-		}
+		SAFE_CLOSE_HANDLE(hidHandle);
 		delete hid;
 
 		return true;
diff --git a/TabletDriverService/CommandHandler.Filters.cpp b/TabletDriverService/CommandHandler.Filters.cpp
index ee7f6c8..720ad3a 100644
--- a/TabletDriverService/CommandHandler.Filters.cpp
+++ b/TabletDriverService/CommandHandler.Filters.cpp
@@ -16,6 +16,8 @@ void CommandHandler::CreateFilterCommands() {
 	//
 	AddAlias("Smoothing", "SmoothingFilter");
 	AddCommand(new Command("SmoothingFilter", [&](CommandLine *cmd) {
+
+		// Tablet valid?
 		if(!ExecuteCommand("TabletValid")) return false;
 
 		double latency = cmd->GetDouble(0, tablet->smoothing.GetLatency());
@@ -65,7 +67,10 @@ void CommandHandler::CreateFilterCommands() {
 	//
 	AddAlias("AdvancedSmoothing", "AdvancedSmoothingFilter");
 	AddCommand(new Command("AdvancedSmoothingFilter", [&](CommandLine *cmd) {
+
+		// Tablet valid?
 		if(!ExecuteCommand("TabletValid")) return false;
+
 		tablet->advancedSmoothing.isEnabled = cmd->GetBoolean(0, tablet->advancedSmoothing.isEnabled);
 		tablet->advancedSmoothing.ClearSettings();
 
@@ -85,6 +90,8 @@ void CommandHandler::CreateFilterCommands() {
 	// Sets advanced smoothing filter parameters
 	//
 	AddCommand(new Command("AdvancedSmoothingAdd", [&](CommandLine *cmd) {
+
+		// Tablet valid?
 		if(!ExecuteCommand("TabletValid")) return false;
 
 		if(cmd->valueCount >= 3) {
@@ -109,7 +116,9 @@ void CommandHandler::CreateFilterCommands() {
 	AddAlias("Gravity", "GravityFilter");
 	AddCommand(new Command("GravityFilter", [&](CommandLine *cmd) {
 
+		// Tablet valid?
 		if(!ExecuteCommand("TabletValid")) return false;
+
 		double gravity = cmd->GetDouble(0, tablet->gravityFilter.gravity);
 		double friction = cmd->GetDouble(1, 0);
 		double pressureGravity = cmd->GetDouble(2, 0);
@@ -157,7 +166,9 @@ void CommandHandler::CreateFilterCommands() {
 	AddAlias("Noise", "NoiseReduction");
 	AddCommand(new Command("NoiseReduction", [&](CommandLine *cmd) {
 
+		// Tablet valid?
 		if(!ExecuteCommand("TabletValid")) return false;
+
 		string stringValue = cmd->GetStringLower(0, "");
 
 		// Off / False
@@ -232,6 +243,9 @@ void CommandHandler::CreateFilterCommands() {
 	AddAlias("AntiSmoothing", "AntiSmoothingFilter");
 	AddAlias("Anti", "AntiSmoothingFilter");
 	AddCommand(new Command("AntiSmoothingFilter", [&](CommandLine *cmd) {
+		
+		// Tablet valid?
+		if(!ExecuteCommand("TabletValid")) return false;
 
 		string stringValue = cmd->GetStringLower(0, "");
 
@@ -292,6 +306,9 @@ void CommandHandler::CreateFilterCommands() {
 	AddAlias("AntiAdd", "AntiSmoothingAdd");
 	AddCommand(new Command("AntiSmoothingAdd", [&](CommandLine *cmd) {
 
+		// Tablet valid?
+		if(!ExecuteCommand("TabletValid")) return false;
+
 		double velocity = cmd->GetDouble(0, 0);
 		double shape = cmd->GetDouble(1, 0.5);
 		double compensation = cmd->GetDouble(2, 0);
@@ -322,6 +339,10 @@ void CommandHandler::CreateFilterCommands() {
 	AddAlias("Interval", "FilterTimerInterval");
 	AddAlias("TimerInterval", "FilterTimerInterval");
 	AddCommand(new Command("FilterTimerInterval", [&](CommandLine *cmd) {
+
+		// Tablet valid?
+		if(!ExecuteCommand("TabletValid")) return false;
+
 		if(tabletHandler == NULL) return true;
 		int oldInterval = (int)round(tabletHandler->timerInterval);
 
@@ -350,6 +371,9 @@ void CommandHandler::CreateFilterCommands() {
 	AddAlias("Tester", "FilterTester");
 	AddCommand(new Command("FilterTester", [&](CommandLine *cmd) {
 
+		// Tablet valid?
+		if(!ExecuteCommand("TabletValid")) return false;
+
 		string inputFilepath = cmd->GetString(0, "tester_input.txt");
 		string outputFilepath = cmd->GetString(1, "tester_output.txt");
 		TabletFilterAntiSmoothing *filterAntiSmoothing = NULL;
diff --git a/TabletDriverService/CommandHandler.Other.cpp b/TabletDriverService/CommandHandler.Other.cpp
index 61a21c1..f08ca92 100644
--- a/TabletDriverService/CommandHandler.Other.cpp
+++ b/TabletDriverService/CommandHandler.Other.cpp
@@ -329,7 +329,9 @@ void CommandHandler::CreateOtherCommands() {
 	//
 	AddCommand(new Command("StateOutput", [&](CommandLine *cmd) {
 		if(!ExecuteCommand("TabletValid")) return false;
+		pipeHandler->lock.lock();
 		pipeHandler->isStateOutputEnabled = cmd->GetBoolean(0, pipeHandler->isStateOutputEnabled);
+		pipeHandler->lock.unlock();
 		LOG_INFO("State output = %s\n", pipeHandler->isStateOutputEnabled ? "Enabled" : "Disabled");
 		return true;
 	}));
@@ -342,8 +344,9 @@ void CommandHandler::CreateOtherCommands() {
 	//
 	AddCommand(new Command("Debug", [&](CommandLine *cmd) {
 		if(!ExecuteCommand("TabletValid")) return false;
-		logger.debugEnabled = cmd->GetBoolean(0, logger.debugEnabled);
-		LOG_INFO("Debug logging = %s\n", logger.debugEnabled ? "True" : "False");
+		bool debugEnabled = cmd->GetBoolean(0, logger.IsDebugOutputEnabled());
+		logger.SetDebugOutput(debugEnabled);
+		LOG_INFO("Debug logging = %s\n", logger.IsDebugOutputEnabled() ? "True" : "False");
 		return true;
 	}));
 
diff --git a/TabletDriverService/CommandHandler.Tablet.cpp b/TabletDriverService/CommandHandler.Tablet.cpp
index 0001f7e..e69f64a 100644
--- a/TabletDriverService/CommandHandler.Tablet.cpp
+++ b/TabletDriverService/CommandHandler.Tablet.cpp
@@ -28,7 +28,7 @@ void CommandHandler::CreateTabletCommands() {
 			LOG_ERROR("Tablet not found!\n");
 			LOG_ERROR("Check the list of supported tablets from the GitHub page.\n");
 			LOG_ERROR("http://github.com/hawku/TabletDriver\n");
-			CleanupAndExit(1);
+			CleanupAndExit(0);
 			return false;
 		}
 		return true;
diff --git a/TabletDriverService/HIDDevice.cpp b/TabletDriverService/HIDDevice.cpp
index 703c231..0f771e8 100644
--- a/TabletDriverService/HIDDevice.cpp
+++ b/TabletDriverService/HIDDevice.cpp
@@ -204,7 +204,7 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 
 				// Close the HID handle if the device is incorrect
 				else {
-					CloseHandle(deviceHandle);
+					SAFE_CLOSE_HANDLE(deviceHandle);
 				}
 
 				// Free HID preparsed data
@@ -340,8 +340,7 @@ void HIDDevice::CloseDevice() {
 					0,
 					NULL);
 
-			CloseHandle(_deviceHandle);
-			_deviceHandle = NULL;
+			SAFE_CLOSE_HANDLE(_deviceHandle);
 		} catch(exception) {
 			_deviceHandle = NULL;
 		}
diff --git a/TabletDriverService/InputEmulator.cpp b/TabletDriverService/InputEmulator.cpp
index 636b5c9..d01ca06 100644
--- a/TabletDriverService/InputEmulator.cpp
+++ b/TabletDriverService/InputEmulator.cpp
@@ -44,6 +44,7 @@ void InputEmulator::CreateKeyMap()
 
 	// Media volume control
 	AddKey("VOLUMECONTROL", "Media Volume Control", 0, MouseButtons::MediaVolumeControl);
+	AddKey("BALANCECONTROL", "Media Balance Control", 0, MouseButtons::MediaBalanceControl);
 
 	// Shift
 	AddKey("SHIFT", "Shift", VK_SHIFT);
@@ -623,6 +624,61 @@ void InputEmulator::VolumeSet(float volume)
 	ReleaseEndpointVolume();
 }
 
+//
+// Set main audio device left/right balance
+//
+void InputEmulator::VolumeBalance(float newBalance)
+{
+	UINT channelCount = 0;
+	float levelLeft = -1;
+	float levelRight = -1;
+
+	// Get endpoint volume
+	if(CreateEndpointVolume()) {
+
+		// Channel count
+		pAudioEndpointVolume->GetChannelCount(&channelCount);
+		if(channelCount >= 2) {
+
+			// Get channel levels
+			pAudioEndpointVolume->GetChannelVolumeLevelScalar(0, &levelLeft);
+			pAudioEndpointVolume->GetChannelVolumeLevelScalar(1, &levelRight);
+
+			// Levels valid?
+			if(levelLeft >= 0 || levelRight >= 0) {
+
+				// Calculate balance
+				float levelSum = levelLeft + levelRight;
+
+				// Limit resolution
+				newBalance = round(newBalance * 100.0f) / 100.0f;
+				if(newBalance < 0.0f) newBalance = 0.0f;
+				else if(newBalance > 1.0f) newBalance = 1.0f;
+
+				// Set channel level values
+				levelLeft = levelSum * newBalance;
+				levelRight = levelSum * (1 - newBalance);
+
+				// Limit levels
+				if(levelLeft < 0) levelLeft = 0;
+				else if(levelLeft > 1) levelLeft = 1;
+				if(levelRight < 0) levelRight = 0;
+				else if(levelRight > 1) levelRight = 1;
+
+				// Debug message
+				if(logger.IsDebugOutputEnabled()) {
+					LOG_DEBUG("Audio balance: Left %0.5f <- %0.3f -> %0.5f Right\n", levelLeft, newBalance, levelRight);
+				}
+
+				// Set endpoint volume channel levels
+				pAudioEndpointVolume->SetChannelVolumeLevelScalar(0, levelLeft, &GUID_NULL);
+				pAudioEndpointVolume->SetChannelVolumeLevelScalar(1, levelRight, &GUID_NULL);
+			}
+		}
+	}
+	ReleaseEndpointVolume();
+}
+
 //
 // Get main audio device volume
 //
diff --git a/TabletDriverService/InputEmulator.h b/TabletDriverService/InputEmulator.h
index e0c05fb..b13e7f2 100644
--- a/TabletDriverService/InputEmulator.h
+++ b/TabletDriverService/InputEmulator.h
@@ -47,6 +47,7 @@ class InputEmulator
 		MouseScrollHorizontal = 0x102,
 		MouseScrollBoth = 0x103,
 		MediaVolumeControl = 0x110,
+		MediaBalanceControl = 0x111,
 	};
 
 	class KeyMapValue {
@@ -84,6 +85,7 @@ class InputEmulator
 	bool CreateEndpointVolume();
 	bool ReleaseEndpointVolume();
 	void VolumeSet(float volume);
+	void VolumeBalance(float leftRight);
 	float VolumeGet();
 	void VolumeChange(float delta);
 
diff --git a/TabletDriverService/Logger.cpp b/TabletDriverService/Logger.cpp
index 90c77cd..7a0fdba 100644
--- a/TabletDriverService/Logger.cpp
+++ b/TabletDriverService/Logger.cpp
@@ -8,7 +8,7 @@ Logger::Logger() {
 	verbosity = LogLevelDebug;
 	newMessage = false;
 	directPrint = false;
-	debugEnabled = false;
+	isDebugOutputEnabled = false;
 	pipeHandle = NULL;
 }
 
@@ -298,6 +298,31 @@ bool Logger::CloseLogFile() {
 }
 
 
+//
+// Enable/disable debug output
+//
+void Logger::SetDebugOutput(bool enabled)
+{
+	lock.lock();
+	isDebugOutputEnabled = enabled;
+	lock.unlock();
+
+}
+
+//
+// Check if the debug output is enabled
+//
+bool Logger::IsDebugOutputEnabled()
+{
+	bool enabled = false;
+	lock.lock();
+	enabled = isDebugOutputEnabled;
+	lock.unlock();
+	return enabled;
+}
+
+
+
 //
 // Start logger thread
 //
diff --git a/TabletDriverService/Logger.h b/TabletDriverService/Logger.h
index 57f4590..b1287fd 100644
--- a/TabletDriverService/Logger.h
+++ b/TabletDriverService/Logger.h
@@ -60,6 +60,7 @@ class Logger {
 	bool newMessage;
 	ofstream logFile;
 	bool logToFile;
+	bool isDebugOutputEnabled;
 
 public:
 	enum LogLevels {
@@ -94,9 +95,9 @@ class Logger {
 	};
 	bool isRunning;
 	bool directPrint;
-	bool debugEnabled;
 	string logFilename = "";
 	HANDLE pipeHandle;
+	mutex lock;
 
 	void OutputMessage(LogItem *message);
 	void ProcessMessages();
@@ -109,6 +110,10 @@ class Logger {
 	void Stop();
 	bool OpenLogFile(string filename);
 	bool CloseLogFile();
+
+	void SetDebugOutput(bool enabled);
+	bool IsDebugOutputEnabled();
+
 };
 extern Logger logger;
 
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index 39c4b18..92d1077 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -75,7 +75,7 @@ int main(int argc, char**argv) {
 		// Unknown tablet
 		if(tablet == NULL) {
 			LOG_ERROR("Tablet not found!\n");
-			CleanupAndExit(1);
+			CleanupAndExit(0);
 		}
 
 		// Tablet init
@@ -84,7 +84,7 @@ int main(int argc, char**argv) {
 			LOG_ERROR("Possible fixes:\n");
 			LOG_ERROR("1) Uninstall other tablet drivers.\n");
 			LOG_ERROR("2) Stop other tablet driver services.\n");
-			CleanupAndExit(1);
+			CleanupAndExit(0);
 		}
 
 		// Set screen mapper tablet
@@ -140,7 +140,7 @@ int main(int argc, char**argv) {
 		LOG_ERROR("1) Install VMulti driver\n");
 		LOG_ERROR("2) Kill PentabletService.exe (XP Pen driver)\n");
 		LOG_ERROR("3) Uninstall other tablet drivers and reinstall VMulti driver\n");
-		CleanupAndExit(1);
+		CleanupAndExit(0);
 	}
 
 	// Output manager
@@ -209,6 +209,10 @@ int main(int argc, char**argv) {
 //
 void CleanupAndExit(int code) {
 
+	// Stop logger
+	LOGGER_STOP();
+
+
 	// PipeHandler
 	printf("Cleanup PipeHandler\n");
 	if(pipeHandler != NULL) {
@@ -237,9 +241,10 @@ void CleanupAndExit(int code) {
 	if(tablet != NULL)
 		delete tablet;
 	
-	// Logger
-	LOGGER_STOP();
-	Sleep(500);
+	// Uninitialize COM
+	CoUninitialize();
+
+	//Sleep(500);
 
 	//printf("Press enter to exit...");
 	//getchar();
diff --git a/TabletDriverService/OutputDummy.cpp b/TabletDriverService/OutputDummy.cpp
index f6274b4..182bb8e 100644
--- a/TabletDriverService/OutputDummy.cpp
+++ b/TabletDriverService/OutputDummy.cpp
@@ -14,7 +14,7 @@ bool OutputDummy::Set(TabletState *tabletState) {
 
 	double timeDelta = (tabletState->time - timeBegin).count() / 1000000.0;
 
-	if(logger.debugEnabled) {
+	if(logger.IsDebugOutputEnabled()) {
 		LOG_DEBUG("T=%0.3f B=%d X=%0.2f Y=%0.2f P=%0.4f\n",
 			timeDelta,
 			tabletState->buttons,
diff --git a/TabletDriverService/OutputSendInputAbsolute.cpp b/TabletDriverService/OutputSendInputAbsolute.cpp
index c5eadf5..5383cc6 100644
--- a/TabletDriverService/OutputSendInputAbsolute.cpp
+++ b/TabletDriverService/OutputSendInputAbsolute.cpp
@@ -96,7 +96,7 @@ bool OutputSendInputAbsolute::Write() {
 		SendInput(1, &input, sizeof(INPUT));
 
 		// Debug message
-		if(logger.debugEnabled) {
+		if(logger.IsDebugOutputEnabled()) {
 			LOG_DEBUG("%0.0f,%0.0f | %0.0f,%0.0f | %0.0f,%0.0f | %ld, %ld -> %0.0f,%0.0f\n",
 				monitorInfo.virtualWidth, monitorInfo.virtualHeight,
 				monitorInfo.virtualX, monitorInfo.virtualY,
diff --git a/TabletDriverService/OutputSendInputRelative.cpp b/TabletDriverService/OutputSendInputRelative.cpp
index e5734e6..cd9293d 100644
--- a/TabletDriverService/OutputSendInputRelative.cpp
+++ b/TabletDriverService/OutputSendInputRelative.cpp
@@ -75,7 +75,7 @@ bool OutputSendInputRelative::Write() {
 		SendInput(1, &input, sizeof(INPUT));
 
 		// Debug message
-		if(logger.debugEnabled) {
+		if(logger.IsDebugOutputEnabled()) {
 			LOG_DEBUG("X: %d, Y: %d, Flags: %d\n",
 				input.mi.dx, input.mi.dy, input.mi.dwFlags
 			);
diff --git a/TabletDriverService/OutputVMultiAbsolute.cpp b/TabletDriverService/OutputVMultiAbsolute.cpp
index 0d1b827..3648621 100644
--- a/TabletDriverService/OutputVMultiAbsolute.cpp
+++ b/TabletDriverService/OutputVMultiAbsolute.cpp
@@ -71,7 +71,7 @@ bool OutputVMultiAbsolute::Write() {
 	if(vmulti->HasReportChanged()) {
 
 		// Debug message
-		if(logger.debugEnabled) {
+		if(logger.IsDebugOutputEnabled()) {
 			LOG_DEBUGBUFFER(&report, 9, "Report: ");
 		}
 
diff --git a/TabletDriverService/OutputVMultiDigitizer.cpp b/TabletDriverService/OutputVMultiDigitizer.cpp
index 47fcb0d..3ce42dd 100644
--- a/TabletDriverService/OutputVMultiDigitizer.cpp
+++ b/TabletDriverService/OutputVMultiDigitizer.cpp
@@ -78,7 +78,7 @@ bool OutputVMultiDigitizer::Write() {
 	if(vmulti->HasReportChanged()) {
 
 		// Debug message
-		if(logger.debugEnabled) {
+		if(logger.IsDebugOutputEnabled()) {
 			LOG_DEBUGBUFFER(&report, 10, "Report: ");
 		}
 
diff --git a/TabletDriverService/OutputVMultiDigitizerRelative.cpp b/TabletDriverService/OutputVMultiDigitizerRelative.cpp
index b78292d..112edae 100644
--- a/TabletDriverService/OutputVMultiDigitizerRelative.cpp
+++ b/TabletDriverService/OutputVMultiDigitizerRelative.cpp
@@ -110,7 +110,7 @@ bool OutputVMultiDigitizerRelative::Write()
 	if(vmulti->HasReportChanged()) {
 
 		// Debug message
-		if(logger.debugEnabled) {
+		if(logger.IsDebugOutputEnabled()) {
 			LOG_DEBUGBUFFER(&report, 10, "Report: ");
 		}
 
diff --git a/TabletDriverService/OutputVMultiRelative.cpp b/TabletDriverService/OutputVMultiRelative.cpp
index 50d9175..c9b07eb 100644
--- a/TabletDriverService/OutputVMultiRelative.cpp
+++ b/TabletDriverService/OutputVMultiRelative.cpp
@@ -68,7 +68,7 @@ bool OutputVMultiRelative::Write() {
 
 	// Write report to VMulti device if report has changed
 	if(vmulti->HasReportChanged() || report.x != 0 || report.y != 0) {
-		if(logger.debugEnabled) {
+		if(logger.IsDebugOutputEnabled()) {
 			LOG_DEBUGBUFFER(&report, 10, "Report: ");
 		}
 		vmulti->WriteReport();
diff --git a/TabletDriverService/PipeHandler.cpp b/TabletDriverService/PipeHandler.cpp
index fa9a0e5..15c3196 100644
--- a/TabletDriverService/PipeHandler.cpp
+++ b/TabletDriverService/PipeHandler.cpp
@@ -23,7 +23,6 @@ PipeHandler::PipeHandler(string pipeName)
 
 	isRunning = false;
 	isStateOutputEnabled = false;
-
 }
 
 
@@ -41,8 +40,14 @@ PipeHandler::~PipeHandler()
 //
 bool PipeHandler::Start()
 {
-	if(!isRunning) {
+	lock.lock();
+	bool running = isRunning;
+	lock.unlock();
+
+	if(!running) {
+		lock.lock();
 		isRunning = true;
+		lock.unlock();
 		threadInput = new thread(&PipeHandler::RunInputThread, this);
 		threadOutput = new thread(&PipeHandler::RunOutputThread, this);
 		threadState = new thread(&PipeHandler::RunStateThread, this);
@@ -56,13 +61,20 @@ bool PipeHandler::Start()
 // Stop
 //
 bool PipeHandler::Stop() {
-	if(isRunning) {
-		isRunning = false;
+
+	lock.lock();
+	bool running = isRunning;
+	lock.unlock();
+
+	if(running) {
+		lock.lock();
+		isRunning = true;
+		lock.unlock();
 
 		// Input
 		if(handleInput != NULL) {
 			if(connectedInput) {
-				CloseHandle(handleInput);
+				SAFE_CLOSE_HANDLE(handleInput);
 			}
 			TerminateThread(threadInput, 0);
 		}
@@ -70,7 +82,7 @@ bool PipeHandler::Stop() {
 		// Output
 		if(handleOutput != NULL) {
 			if(connectedOutput) {
-				CloseHandle(handleOutput);
+				SAFE_CLOSE_HANDLE(handleOutput);
 			}
 			TerminateThread(threadOutput, 0);
 		}
@@ -78,7 +90,7 @@ bool PipeHandler::Stop() {
 		// State
 		if(handleState != NULL) {
 			if(connectedState) {
-				CloseHandle(handleState);
+				SAFE_CLOSE_HANDLE(handleState);
 			}
 			TerminateThread(threadState, 0);
 		}
@@ -104,7 +116,16 @@ void PipeHandler::RunInputThread()
 	char bufferWrite[1024];
 	char bufferRead[1024];
 
-	while(isRunning) {
+	while(true) {
+
+		lock.lock();
+		if(!isRunning) {
+			lock.unlock();
+			break;
+		}
+		else {
+			lock.unlock();
+		}
 
 		connectedInput = false;
 
@@ -132,8 +153,7 @@ void PipeHandler::RunInputThread()
 		LOG_DEBUG("Input pipe connected: %d\n", result);
 
 		if(!result) {
-			if(handleInput != NULL)
-				CloseHandle(handleInput);
+			SAFE_CLOSE_HANDLE(handleInput);
 			continue;
 		}
 
@@ -147,7 +167,7 @@ void PipeHandler::RunInputThread()
 				if(!result || bytesRead == 0) {
 					if(GetLastError() == ERROR_BROKEN_PIPE) {
 						LOG_DEBUG("Input pipe broken! %d\n", GetLastError());
-						CloseHandle(handleInput);
+						SAFE_CLOSE_HANDLE(handleInput);
 						break;
 					}
 				}
@@ -185,7 +205,16 @@ void PipeHandler::RunOutputThread()
 	char bufferRead[1024];
 
 	// Connect loop
-	while(isRunning) {
+	while(true) {
+
+		lock.lock();
+		if(!isRunning) {
+			lock.unlock();
+			break;
+		}
+		else {
+			lock.unlock();
+		}
 
 		connectedOutput = false;
 
@@ -211,8 +240,7 @@ void PipeHandler::RunOutputThread()
 		LOG_DEBUG("Output pipe connected: %d\n", result);
 
 		if(!result) {
-			if(handleOutput != NULL)
-				CloseHandle(handleOutput);
+			SAFE_CLOSE_HANDLE(handleOutput);
 			logger.pipeHandle = NULL;
 			continue;
 		}
@@ -225,7 +253,7 @@ void PipeHandler::RunOutputThread()
 		// Read loop
 		while(true) {
 			if(logger.pipeHandle == NULL) {
-				CloseHandle(handleOutput);
+				SAFE_CLOSE_HANDLE(handleOutput);
 				break;
 			}
 			Sleep(100);
@@ -234,7 +262,7 @@ void PipeHandler::RunOutputThread()
 			if(!result || bytesRead == 0) {
 				if(GetLastError() == ERROR_BROKEN_PIPE) {
 					LOG_DEBUG("Output pipe broken! %d\n", GetLastError());
-					CloseHandle(handleOutput);
+					SAFE_CLOSE_HANDLE(handleOutput);
 					break;
 				}
 			}
@@ -258,8 +286,19 @@ void PipeHandler::RunStateThread()
 	char bufferRead[1024];
 	TabletState lastState;
 
+	bool outputEnabled = false;
+
 	// Connect loop
-	while(isRunning) {
+	while(true) {
+
+		lock.lock();
+		if(!isRunning) {
+			lock.unlock();
+			break;
+		}
+		else {
+			lock.unlock();
+		}
 
 		connectedState = false;
 
@@ -284,8 +323,7 @@ void PipeHandler::RunStateThread()
 		LOG_DEBUG("State pipe connected: %d\n", result);
 
 		if(!result) {
-			if(handleState != NULL)
-				CloseHandle(handleState);
+			SAFE_CLOSE_HANDLE(handleState);
 			logger.pipeHandle = NULL;
 			Sleep(1000);
 			continue;
@@ -298,7 +336,11 @@ void PipeHandler::RunStateThread()
 		// Write loop
 		while(true) {
 
-			if(tablet != NULL && tabletHandler != NULL && isStateOutputEnabled) {
+			lock.lock();
+			outputEnabled = isStateOutputEnabled;
+			lock.unlock();
+
+			if(tablet != NULL && tabletHandler != NULL && outputEnabled) {
 				if(tabletHandler->outputStateWrite.position.Distance(lastState.position) > 0) {
 
 					// Input
diff --git a/TabletDriverService/PipeHandler.h b/TabletDriverService/PipeHandler.h
index eec5c7a..ec127c5 100644
--- a/TabletDriverService/PipeHandler.h
+++ b/TabletDriverService/PipeHandler.h
@@ -39,6 +39,7 @@ class PipeHandler
 	bool connectedOutput;
 	bool connectedState;
 
+	mutex lock;
 	bool isRunning;
 	bool isStateOutputEnabled;
 
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 2901d02..61e2758 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -485,7 +485,7 @@ bool Tablet::Read(void *buffer, int length) {
 	else if(hidDevice != NULL) {
 		status = hidDevice->Read(buffer, length);
 	}
-	if(logger.debugEnabled && status) {
+	if(logger.IsDebugOutputEnabled() && status) {
 		LOG_DEBUGBUFFER(buffer, length, "Read: ");
 	}
 	return status;
@@ -554,7 +554,7 @@ int Tablet::ReadAuxReport()
 		status = hidDeviceAux->Read(buffer, length);
 
 		// Debug message
-		if(logger.debugEnabled) {
+		if(logger.IsDebugOutputEnabled()) {
 			LOG_DEBUGBUFFER(buffer, length, "Aux read: ");
 		}
 
diff --git a/TabletDriverService/TabletDriverService.vcxproj.user b/TabletDriverService/TabletDriverService.vcxproj.user
index 25f7916..7027a21 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.user
+++ b/TabletDriverService/TabletDriverService.vcxproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerCommandArguments>config\init.cfg TDTestPipe</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>config\serviceonly.cfg</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/TabletDriverService/TabletFilterAdvancedSmoothing.cpp b/TabletDriverService/TabletFilterAdvancedSmoothing.cpp
index b131c8f..0987d44 100644
--- a/TabletDriverService/TabletFilterAdvancedSmoothing.cpp
+++ b/TabletDriverService/TabletFilterAdvancedSmoothing.cpp
@@ -126,7 +126,7 @@ void TabletFilterAdvancedSmoothing::Update() {
 	outputState.pressure += deltaPressure * weight;
 
 	// Debug message
-	if(logger.debugEnabled) {
+	if(logger.IsDebugOutputEnabled()) {
 		LOG_DEBUG("TX=%0.2f TY=%0.2f TP=%0.2f OX=%0.2f OY=%0.2f OP=%0.2f DX=%0.2f DY=%0.2f DP=%0.2f D=%0.2f W=%0.3f V=%0.2f mm/s\n",
 			target.position.x,
 			target.position.y,
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.cpp b/TabletDriverService/TabletFilterAntiSmoothing.cpp
index 028a2c7..5a40fe0 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.cpp
+++ b/TabletDriverService/TabletFilterAntiSmoothing.cpp
@@ -98,7 +98,7 @@ void TabletFilterAntiSmoothing::Update() {
 	//
 	if(timeDelta > 10) {
 
-		if(logger.debugEnabled) {
+		if(logger.IsDebugOutputEnabled()) {
 			LOG_DEBUG("INVALID! V=%0.2f mm/s, A=%0.0f mm/s^2, D=%0.2f ms\n",
 				velocity,
 				acceleration,
@@ -124,7 +124,7 @@ void TabletFilterAntiSmoothing::Update() {
 	// Skip invalid reports by setting the position as latest target
 	//
 	if(ignoreInvalidReports > 0) {
-		if(logger.debugEnabled) {
+		if(logger.IsDebugOutputEnabled()) {
 			LOG_DEBUG("IGNORE! V=%0.2f mm/s, A=%0.0f mm/s^2, D=%0.2f ms\n",
 				velocity,
 				acceleration,
@@ -217,7 +217,7 @@ void TabletFilterAntiSmoothing::Update() {
 	}
 
 	// Debug message
-	if(logger.debugEnabled) {
+	if(logger.IsDebugOutputEnabled()) {
 		double delta = outputPosition->Distance(latestTarget);
 		double pixelDensity = (mapper->primaryScreenArea->width / mapper->primaryTabletArea->width);
 		LOG_DEBUG(
diff --git a/TabletDriverService/TabletFilterGravity.cpp b/TabletDriverService/TabletFilterGravity.cpp
index 2c9ce71..f993fcf 100644
--- a/TabletDriverService/TabletFilterGravity.cpp
+++ b/TabletDriverService/TabletFilterGravity.cpp
@@ -99,7 +99,7 @@ void TabletFilterGravity::Update() {
 
 
 	// Debug message
-	if(logger.debugEnabled && distance > 0.0) {
+	if(logger.IsDebugOutputEnabled() && distance > 0.0) {
 		LOG_DEBUG("X=%0.2f Y=%0.2f DX=%0.2f DY=%0.2f VX=%0.2f VY=%0.2f\n",
 			outputPosition.x,
 			outputPosition.y,
diff --git a/TabletDriverService/TabletFilterNoiseReduction.cpp b/TabletDriverService/TabletFilterNoiseReduction.cpp
index 91ffe8d..d1ae589 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.cpp
+++ b/TabletDriverService/TabletFilterNoiseReduction.cpp
@@ -99,7 +99,7 @@ void TabletFilterNoiseReduction::Update() {
 			}
 
 			// Debug message
-			if(logger.debugEnabled) {
+			if(logger.IsDebugOutputEnabled()) {
 				LOG_DEBUG("Threshold! D=%0.2f mm, R=%0.2f, V=%0.2f mm/s, V2=%0.2f mm/s\n",
 					distance,
 					distanceRatio,
@@ -112,7 +112,7 @@ void TabletFilterNoiseReduction::Update() {
 	}
 
 	// Debug message
-	if(logger.debugEnabled) {
+	if(logger.IsDebugOutputEnabled()) {
 		double distance = outputPosition->Distance(latestTarget);
 		double latency;
 		if(velocity <= 0) {
diff --git a/TabletDriverService/TabletFilterSmoothing.cpp b/TabletDriverService/TabletFilterSmoothing.cpp
index bacfd40..ed27d63 100644
--- a/TabletDriverService/TabletFilterSmoothing.cpp
+++ b/TabletDriverService/TabletFilterSmoothing.cpp
@@ -124,7 +124,7 @@ void TabletFilterSmoothing::Update() {
 	double velocity = sqrt(dx * dx + dy * dy) * (1000.0 / timerInterval);
 
 	// Debug message
-	if(logger.debugEnabled) {
+	if(logger.IsDebugOutputEnabled()) {
 		LOG_DEBUG("TXY=%0.2f,%0.2f TP=%0.2f OXY=%0.2f,%0.2f OP=%0.2f DXY=%0.2f,%0.2f DP=%0.2f D=%0.2f W=%0.3f V=%0.2f L=%0.2f\n",
 			target.position.x,
 			target.position.y,
diff --git a/TabletDriverService/TabletFilterTester.cpp b/TabletDriverService/TabletFilterTester.cpp
index de2d0c9..1950337 100644
--- a/TabletDriverService/TabletFilterTester.cpp
+++ b/TabletDriverService/TabletFilterTester.cpp
@@ -73,7 +73,7 @@ void TabletFilterTester::Run() {
 			position.y = cmd.GetDouble(2, 0);
 
 			// Debug message
-			if(logger.debugEnabled) {
+			if(logger.IsDebugOutputEnabled()) {
 				LOG_DEBUG("IN : %0.3f ms, %0.2f, %0.2f\n",
 					time,
 					position.x,
@@ -88,7 +88,7 @@ void TabletFilterTester::Run() {
 				outputState.position.Set(position);
 
 				// Debug message
-				if(logger.debugEnabled) {
+				if(logger.IsDebugOutputEnabled()) {
 					LOG_DEBUG("First report: %0.3f, %0.2f, %0.2f\n", time, position.x, position.y);
 				}
 
@@ -122,7 +122,7 @@ void TabletFilterTester::Run() {
 			*/
 
 			// Debug message
-			if(logger.debugEnabled) {
+			if(logger.IsDebugOutputEnabled()) {
 				LOG_DEBUG("OUT: %0.3f ms, %0.2f, %0.2f (%0.3f mm)\n",
 					time,
 					position.x,
diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
index 43bd138..b1d4dff 100644
--- a/TabletDriverService/TabletHandler.cpp
+++ b/TabletDriverService/TabletHandler.cpp
@@ -98,7 +98,7 @@ void TabletHandler::ChangeTimerInterval(int newInterval) {
 	NtQueryTimerResolution(&timerMinimumResolution, &timerMaximumResolution, &timerCurrentResolution);
 
 	// Debug messages
-	if(logger.debugEnabled) {
+	if(logger.IsDebugOutputEnabled()) {
 		LOG_DEBUG("System timer resolution:\n");
 		LOG_DEBUG("  Minimum: %0.3f ms\n", (double)timerMinimumResolution / 10000.0);
 		LOG_DEBUG("  Maximum: %0.3f ms\n", (double)timerMaximumResolution / 10000.0);
@@ -127,7 +127,7 @@ void TabletHandler::ChangeTimerInterval(int newInterval) {
 		NtQueryTimerResolution(&timerMinimumResolution, &timerMaximumResolution, &timerCurrentResolution);
 
 		// Debug messages
-		if(logger.debugEnabled) {
+		if(logger.IsDebugOutputEnabled()) {
 			LOG_DEBUG("System timer resolution set to %0.3f ms\n", (double)timerResolution / 10000.0);
 			LOG_DEBUG("System timer resolution is now %0.3f ms\n", (double)timerCurrentResolution / 10000.0);
 		}
@@ -223,7 +223,7 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 			isDown = IsButtonDown(buttons, buttonIndex);
 			isPressed = IsButtonPressed(buttons, lastButtons, buttonIndex);
 			isReleased = IsButtonReleased(buttons, lastButtons, buttonIndex);
-			
+
 			// Pen button map
 			hasBinding = false;
 			if(isPen && tablet->settings.buttonMap[buttonIndex].size() > 0) {
@@ -288,6 +288,8 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 					mouseButton == InputEmulator::MouseScrollBoth
 					||
 					mouseButton == InputEmulator::MediaVolumeControl
+					||
+					mouseButton == InputEmulator::MediaBalanceControl
 				) {
 
 					// Scroll button down?
@@ -347,13 +349,21 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 
 
 						// Vertical Scroll
-						if(delta.y != 0 && (mouseButton & InputEmulator::MouseScrollVertical) == InputEmulator::MouseScrollVertical) {
+						if(delta.y != 0 && (
+							mouseButton == InputEmulator::MouseScrollVertical
+							||
+							mouseButton == InputEmulator::MouseScrollBoth
+							)) {
 							inputEmulator.MouseScroll((int)delta.y, true);
 							scrolled = true;
 						}
 
 						// Horizontal scroll
-						if(delta.x != 0 && (mouseButton & InputEmulator::MouseScrollHorizontal) == InputEmulator::MouseScrollHorizontal) {
+						if(delta.x != 0 && (
+							mouseButton == InputEmulator::MouseScrollHorizontal
+							||
+							mouseButton == InputEmulator::MouseScrollBoth
+							)) {
 							inputEmulator.MouseScroll((int)-delta.x, false);
 							scrolled = true;
 						}
@@ -364,6 +374,13 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 							scrolled = true;
 						}
 
+						// Media balance control
+						if((delta.x != 0 || isPressed) && mouseButton == InputEmulator::MediaBalanceControl) {
+							double balance = 0.5 + ((scrollStartPosition.x - scrollPosition.x) * tablet->settings.scrollSensitivity) / 50.0f;
+							inputEmulator.VolumeBalance((float)balance);
+							scrolled = true;
+						}
+
 						// Stop cursor
 						if(tablet->settings.scrollStopCursor) {
 							tablet->state.position.Set(scrollStartPosition);
@@ -444,7 +461,7 @@ void TabletHandler::RunTabletInputThread() {
 		// Reading failed
 		else {
 			LOG_ERROR("Tablet Read Error!\n");
-			CleanupAndExit(1);
+			CleanupAndExit(0);
 		}
 
 
@@ -473,7 +490,7 @@ void TabletHandler::RunTabletInputThread() {
 		}
 
 		// Debug messages
-		if(logger.debugEnabled) {
+		if(logger.IsDebugOutputEnabled()) {
 			double delta = (tablet->state.time - timeBegin).count() / 1000000.0;
 			LOG_DEBUG("InputState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f V=%0.2f Valid=%s\n",
 				delta,
@@ -607,10 +624,10 @@ void TabletHandler::RunAuxInputThread()
 		tablet->auxState.isValid = false;
 
 		// Process buttons
-		if(logger.debugEnabled) {
+		if(logger.IsDebugOutputEnabled()) {
 			LOG_DEBUG("Aux buttons: 0x%04X\n", auxState.buttons);
 		}
-		UINT32 tmpButtons = 0; 
+		UINT32 tmpButtons = 0;
 		ProcessAuxButtons(&tmpButtons);
 		tablet->auxState.lastButtons = tablet->auxState.buttons;
 
@@ -706,7 +723,7 @@ void TabletHandler::WriteOutputState(TabletState * outputState)
 	}
 
 	// Debug message
-	if(result && logger.debugEnabled) {
+	if(result && logger.IsDebugOutputEnabled()) {
 		double delta = (chrono::high_resolution_clock::now() - timeBegin).count() / 1000000.0;
 		LOG_DEBUG("OutputState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f V=%s\n",
 			delta,
diff --git a/TabletDriverService/USBDevice.cpp b/TabletDriverService/USBDevice.cpp
index e4762e4..b95e447 100644
--- a/TabletDriverService/USBDevice.cpp
+++ b/TabletDriverService/USBDevice.cpp
@@ -89,8 +89,7 @@ bool USBDevice::OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *out
 				WinUsb_Initialize(deviceHandle, &usbHandle);
 				if(!usbHandle) {
 					LOG_ERROR("ERROR! Unable to initialize WinUSB!\n");
-					if(deviceHandle != INVALID_HANDLE_VALUE)
-						CloseHandle(deviceHandle);
+					SAFE_CLOSE_HANDLE(deviceHandle);
 					return false;
 				}
 
@@ -136,8 +135,7 @@ bool USBDevice::OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *out
 						WinUsb_Free(usbHandle);
 
 					// Free device file
-					if(deviceHandle && deviceHandle != INVALID_HANDLE_VALUE)
-						CloseHandle(deviceHandle);
+					SAFE_CLOSE_HANDLE(deviceHandle);
 				}
 			}
 		}
@@ -266,8 +264,7 @@ void USBDevice::CloseDevice() {
 	}
 	if(_deviceHandle != NULL && _deviceHandle != INVALID_HANDLE_VALUE) {
 		try {
-			CloseHandle(_deviceHandle);
-			_deviceHandle = NULL;
+			SAFE_CLOSE_HANDLE(_deviceHandle);
 		} catch(exception &e) {
 			LOG_ERROR("WinUSB CloseHandler ERROR! %s\n", e.what());
 		}
diff --git a/TabletDriverService/VMulti.cpp b/TabletDriverService/VMulti.cpp
index 0205df8..886fee5 100644
--- a/TabletDriverService/VMulti.cpp
+++ b/TabletDriverService/VMulti.cpp
@@ -72,7 +72,7 @@ int VMulti::WriteReport() {
 	memcpy(lastReportBuffer, reportBuffer, 65);
 
 	// Debug
-	if(logger.debugEnabled) {
+	if(logger.IsDebugOutputEnabled()) {
 		LOG_DEBUGBUFFER(reportBuffer, 12, "Write: ");
 	}
 
diff --git a/TabletDriverService/stdafx.h b/TabletDriverService/stdafx.h
index 3cf5596..758a55c 100644
--- a/TabletDriverService/stdafx.h
+++ b/TabletDriverService/stdafx.h
@@ -21,6 +21,9 @@
 // IntelliSense "fix"...
 //#define memcpy memcpy
 
+#define SAFE_CLOSE_HANDLE(handle) if(handle != NULL && handle != INVALID_HANDLE_VALUE) { CloseHandle(handle); handle = NULL; }
+
+
 // Global variables...
 extern VMulti *vmulti;
 extern CommandHandler *commandHandler;

From 35077593ce08f275eafe6219575af681f8211c05 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Fri, 4 Jan 2019 22:39:02 +0200
Subject: [PATCH 78/83] Replace commas with dots when parsing numbers

---
 TabletDriverGUI/Utils.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/TabletDriverGUI/Utils.cs b/TabletDriverGUI/Utils.cs
index d8c8862..1d03b79 100644
--- a/TabletDriverGUI/Utils.cs
+++ b/TabletDriverGUI/Utils.cs
@@ -37,6 +37,11 @@ public static bool ParseNumber(string str, out double val)
         {
             CheckCultureInfo();
             val = 0;
+
+            // Replace commas with dots
+            str = str.Replace(',', '.');
+
+            // Parse
             if (double.TryParse(str, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, cultureInfo.NumberFormat, out double tmp))
             {
                 val = tmp;

From 9f7daa5d3faae95369aecd93b3be1f3849402003 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 6 Jan 2019 13:32:41 +0200
Subject: [PATCH 79/83] Rewrote the named pipe code

---
 TabletDriverGUI/MainWindow.Console.cs         |   3 +-
 TabletDriverGUI/MainWindow.Driver.cs          |  24 +-
 TabletDriverGUI/MainWindow.Settings.cs        |  11 +
 TabletDriverGUI/MainWindow.xaml               |   3 +-
 TabletDriverGUI/NamedPipeClient.cs            | 241 ++++++++++
 TabletDriverGUI/TabletDriver.cs               | 439 ++++++------------
 TabletDriverGUI/TabletDriverGUI.csproj        |   1 +
 TabletDriverService/CommandHandler.Other.cpp  |  32 +-
 TabletDriverService/CommandHandler.cpp        |  39 +-
 TabletDriverService/CommandHandler.h          |   7 +
 TabletDriverService/Logger.cpp                |  18 +-
 TabletDriverService/Logger.h                  |   6 +-
 TabletDriverService/Main.cpp                  |  77 ++-
 TabletDriverService/NamedPipeInput.cpp        |  26 ++
 TabletDriverService/NamedPipeInput.h          |  12 +
 TabletDriverService/NamedPipeServer.cpp       | 236 ++++++++++
 TabletDriverService/NamedPipeServer.h         |  46 ++
 TabletDriverService/NamedPipeState.cpp        |  87 ++++
 TabletDriverService/NamedPipeState.h          |  33 ++
 TabletDriverService/PipeHandler.cpp           | 380 ---------------
 TabletDriverService/PipeHandler.h             |  56 ---
 TabletDriverService/Runnable.cpp              |  18 +
 TabletDriverService/Runnable.h                |  14 +
 TabletDriverService/Tablet.cpp                |   2 +-
 .../TabletDriverService.vcxproj               |  10 +-
 .../TabletDriverService.vcxproj.filters       |  30 +-
 TabletDriverService/TabletHandler.cpp         |  15 +-
 TabletDriverService/TabletHandler.h           |   4 +-
 TabletDriverService/TabletMeasurement.cpp     |   8 +-
 TabletDriverService/TabletMeasurement.h       |   4 +-
 TabletDriverService/stdafx.h                  |   8 +-
 TabletDriverService/tools/RunServiceOnly.bat  |   2 +-
 32 files changed, 1078 insertions(+), 814 deletions(-)
 create mode 100644 TabletDriverGUI/NamedPipeClient.cs
 create mode 100644 TabletDriverService/NamedPipeInput.cpp
 create mode 100644 TabletDriverService/NamedPipeInput.h
 create mode 100644 TabletDriverService/NamedPipeServer.cpp
 create mode 100644 TabletDriverService/NamedPipeServer.h
 create mode 100644 TabletDriverService/NamedPipeState.cpp
 create mode 100644 TabletDriverService/NamedPipeState.h
 delete mode 100644 TabletDriverService/PipeHandler.cpp
 delete mode 100644 TabletDriverService/PipeHandler.h
 create mode 100644 TabletDriverService/Runnable.cpp
 create mode 100644 TabletDriverService/Runnable.h

diff --git a/TabletDriverGUI/MainWindow.Console.cs b/TabletDriverGUI/MainWindow.Console.cs
index a837946..b9de986 100644
--- a/TabletDriverGUI/MainWindow.Console.cs
+++ b/TabletDriverGUI/MainWindow.Console.cs
@@ -110,8 +110,7 @@ private void ConsoleSendCommand(string line)
             textConsoleInput.ScrollToEnd();
             try
             {
-                driver.SendPipeCommand(line);
-                //driver.SendCommand(line);
+                driver.SendCommand(line);
             }
             catch (Exception e)
             {
diff --git a/TabletDriverGUI/MainWindow.Driver.cs b/TabletDriverGUI/MainWindow.Driver.cs
index 561844d..f9940dd 100644
--- a/TabletDriverGUI/MainWindow.Driver.cs
+++ b/TabletDriverGUI/MainWindow.Driver.cs
@@ -425,10 +425,27 @@ private void OnDriverStatusReceived(object sender, TabletDriver.DriverEventArgs
         private void ProcessStatusMessage(string variableName, string parameters)
         {
 
+            //
+            // Startup commands request
+            //
+            if(variableName == "startup_request")
+            {
+                SendStartupCommands();
+            }
+
+
+            //
+            // Settings request
+            //
+            else if (variableName == "settings_request")
+            {
+                SendSettingsToDriver();
+            }
+
             //
             // Tablet Name
             //
-            if (variableName == "tablet")
+            else if (variableName == "tablet")
             {
                 string tabletName = parameters;
                 string title = "TabletDriverGUI - " + tabletName;
@@ -591,6 +608,11 @@ private void ProcessStatusMessage(string variableName, string parameters)
         // Driver Started
         //
         private void OnDriverStarted(object sender, EventArgs e)
+        {
+          
+        }
+
+        private void SendStartupCommands()
         {
             // Debugging commands
             if (config.DebuggingEnabled)
diff --git a/TabletDriverGUI/MainWindow.Settings.cs b/TabletDriverGUI/MainWindow.Settings.cs
index 2e2ae4d..4714655 100644
--- a/TabletDriverGUI/MainWindow.Settings.cs
+++ b/TabletDriverGUI/MainWindow.Settings.cs
@@ -1296,6 +1296,17 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
 
             }
 
+            //
+            // Exit GUI only
+            //
+            else if (sender == mainMenuExitGUI)
+            {
+                driver.DoNotKill = true;
+                Close();
+            }
+
+
+
             //
             // Exit
             //
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 2ad5621..0d1573e 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -77,7 +77,8 @@
           <Separator/>
           <MenuItem Name="mainMenuResetToDefault" Header="_Reset to default" Click="MainMenuClick" />
           <Separator />
-          <MenuItem Name="mainMenuExit" Header="E_xit" Click="MainMenuClick" />
+          <MenuItem Name="mainMenuExitGUI" Header="Exit _GUI Only" Click="MainMenuClick" />
+          <MenuItem Name="mainMenuExit" Header="Shutdown and E_xit" Click="MainMenuClick" />          
         </MenuItem>
         <MenuItem Header="_Tools">
           <MenuItem Header="Show folder">
diff --git a/TabletDriverGUI/NamedPipeClient.cs b/TabletDriverGUI/NamedPipeClient.cs
new file mode 100644
index 0000000..c028682
--- /dev/null
+++ b/TabletDriverGUI/NamedPipeClient.cs
@@ -0,0 +1,241 @@
+using System;
+using System.IO.Pipes;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TabletDriverGUI
+{
+    class NamedPipeClient
+    {
+        readonly string pipeName;
+        NamedPipeClientStream pipeStream;
+
+        bool isRunning;
+        readonly object lockObject = new object();
+
+        public bool IsRunning
+        {
+            get
+            {
+                lock (lockObject) { return isRunning; }
+            }
+            set
+            {
+                lock (lockObject) { isRunning = value; }
+            }
+        }
+
+        byte[] bufferRead;
+
+
+        public delegate void NamedPipeEventHandler(object sender, NamedPipeEventArgs e);
+        public event NamedPipeEventHandler MessageReceived;
+        public event EventHandler Connected;
+        public event EventHandler Disconnected;
+        public class NamedPipeEventArgs : EventArgs
+        {
+            public Message Message;
+            public NamedPipeEventArgs(Message message)
+            {
+                Message = message;
+            }
+        }
+
+        public class Message
+        {
+            public byte[] Data;
+            public int Length;
+            public Message()
+            {
+                Length = 0;
+            }
+        }
+
+        public class TaskResult
+        {
+            public bool IsSuccess { get; set; }
+            public string ErrorMessage { get; set; }
+        }
+
+
+        //
+        // Constructor
+        //
+        public NamedPipeClient(string pipeName)
+        {
+            this.pipeName = pipeName;
+            bufferRead = new byte[1024];
+        }
+
+        //
+        // Start
+        //
+        public bool Start()
+        {
+            if (!IsRunning)
+            {
+                IsRunning = true;
+                Console.WriteLine("new NamedPipeClientStream " + pipeName);
+                pipeStream = new NamedPipeClientStream(".", pipeName, PipeDirection.InOut, PipeOptions.Asynchronous);
+                Console.WriteLine("Connecting to " + pipeName + "...");
+                pipeStream.Connect(5000);
+                if (pipeStream.IsConnected)
+                {
+                    Console.WriteLine("Connected to " + pipeName + "!");
+                    OnConnected();
+                    BeginRead(new Message());
+                }
+                else
+                {
+                    Console.WriteLine("Couldn't connect to " + pipeName + "!");
+                    return false;
+                }
+                return true;
+            }
+            return false;
+        }
+
+
+        //
+        // Stop
+        //
+        public bool Stop()
+        {
+            IsRunning = false;
+
+            try
+            {
+                pipeStream.Close();
+                pipeStream.Dispose();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("Pipe stop error: " + ex.Message);
+                throw;
+            }
+
+            OnDisconnected();
+
+            return true;
+        }
+
+
+        //
+        // Begin reading from the pipe
+        //
+        private void BeginRead(Message message)
+        {
+            try
+            {
+                //Console.WriteLine("BeginRead " + pipeName);
+                pipeStream.BeginRead(bufferRead, 0, bufferRead.Length, EndReadCallBack, message);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("BeginRead error: " + ex.Message);
+            }
+        }
+
+        //
+        // End pipe read
+        //
+        private void EndReadCallBack(IAsyncResult result)
+        {
+            int bytesRead = pipeStream.EndRead(result);
+            //Console.WriteLine("EndRead length " + pipeName + ": " + bytesRead);
+
+            if (bytesRead > 0)
+            {
+                var message = (Message)result.AsyncState;
+
+                // Set message values
+                message.Length = bytesRead;
+                message.Data = bufferRead;
+
+                // Process message
+                OnMessageReceived(message);
+
+                // Start a new read
+                BeginRead(new Message());
+            }
+
+            // Client disconnected
+            else
+            {
+                if (IsRunning)
+                {
+                    OnDisconnected();
+                    Stop();
+                }
+            }
+
+        }
+
+        //
+        // End pipe write
+        //
+        private TaskResult EndWriteCallBack(IAsyncResult asyncResult)
+        {
+            pipeStream.EndWrite(asyncResult);
+            pipeStream.Flush();
+
+            return new TaskResult { IsSuccess = true };
+        }
+
+
+        //
+        // Write message
+        //
+        public Task<TaskResult> WriteMessage(string message)
+        {
+            var taskCompletionSource = new TaskCompletionSource<TaskResult>();
+
+            if (pipeStream != null && pipeStream.IsConnected)
+            {
+                var buffer = Encoding.UTF8.GetBytes(message);
+
+                //Console.WriteLine("Writing message to " + pipeName + ": " + message);
+
+                pipeStream.BeginWrite(buffer, 0, buffer.Length, asyncResult =>
+                {
+                    try
+                    {
+                        taskCompletionSource.SetResult(EndWriteCallBack(asyncResult));
+                    }
+                    catch (Exception ex)
+                    {
+                        taskCompletionSource.SetException(ex);
+                    }
+
+                }, null);
+            }
+
+            return taskCompletionSource.Task;
+        }
+
+        //
+        // Pipe connected
+        //
+        void OnConnected()
+        {
+            Console.WriteLine(pipeName + " connected!");
+            Connected?.Invoke(this, new EventArgs());
+        }
+
+        //
+        // Pipe disconnected
+        //
+        void OnDisconnected()
+        {
+            Disconnected?.Invoke(this, new EventArgs());
+        }
+
+        //
+        // Pipe message received
+        //
+        void OnMessageReceived(Message message)
+        {
+            MessageReceived?.Invoke(this, new NamedPipeEventArgs(message));
+        }
+    }
+}
diff --git a/TabletDriverGUI/TabletDriver.cs b/TabletDriverGUI/TabletDriver.cs
index 5963936..18efa37 100644
--- a/TabletDriverGUI/TabletDriver.cs
+++ b/TabletDriverGUI/TabletDriver.cs
@@ -4,8 +4,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Timers;
-using System.IO.Pipes;
-using System.Windows;
 using System.Text;
 using System.Runtime.InteropServices;
 
@@ -48,14 +46,12 @@ public DriverEventArgs(DriverEventType type, string message, string parameters)
         private Dictionary<string, string> commands;
         public Dictionary<string, string> Commands { get { return commands; } }
 
-        // Pipe
-        System.Threading.Thread pipeInputThread = null;
-        System.Threading.Thread pipeOutputThread = null;
-        System.Threading.Thread pipeStateThread = null;
-
-        NamedPipeClientStream pipeStreamInput;
-        NamedPipeClientStream pipeStreamOutput;
-        NamedPipeClientStream pipeStreamState;
+        // Pipe stuff
+        NamedPipeClient pipeInput;
+        NamedPipeClient pipeOutput;
+        NamedPipeClient pipeState;
+        byte[] stateBytes;
+        StringBuilder messageBuilder;
 
 
         [StructLayout(LayoutKind.Sequential, Pack = 4, CharSet = CharSet.Unicode)]
@@ -84,6 +80,9 @@ public struct TabletState
         private Timer timerWatchdog;
         private bool running;
         private readonly object locker = new object();
+
+        public bool DoNotKill;
+
         public bool IsRunning
         {
             get
@@ -108,7 +107,8 @@ public bool IsRunning
         public TabletDriver(string servicePath)
         {
             this.servicePath = servicePath;
-            this.processService = null;
+            processService = null;
+            DoNotKill = false;
             timerWatchdog = new Timer(2000);
             timerWatchdog.Elapsed += TimerWatchdog_Elapsed;
 
@@ -118,9 +118,31 @@ public TabletDriver(string servicePath)
 
             commands = new Dictionary<string, string>();
 
+            messageBuilder = new StringBuilder();
+
+            pipeInput = new NamedPipeClient("TabletDriverOutput");
+            pipeOutput = new NamedPipeClient("TabletDriverInput");
+            pipeState = new NamedPipeClient("TabletDriverState");
+
+            stateBytes = new byte[Marshal.SizeOf(typeof(TabletState))];
+            pipeInput.MessageReceived += PipeInput_MessageReceived;
+            pipeState.MessageReceived += PipeState_MessageReceived;
+
+            pipeInput.Connected += (snd, e) => { pipeInput.WriteMessage("\n"); };
+            pipeOutput.Connected += (snd, e) =>
+            {
+                pipeOutput.WriteMessage("\n");
+            };
+            pipeState.Connected += (snd, e) => { pipeState.WriteMessage("\n"); };
+
+
+            // Invoke driver started event
+            Started?.Invoke(this, new EventArgs());
+
 
         }
 
+
         //
         // Driver watchdog
         //
@@ -154,25 +176,19 @@ private void TimerWatchdog_Elapsed(object sender, ElapsedEventArgs e)
         //
         // Send command to the driver service
         //
-        public void SendCommand(string line)
-        {
-            if (IsRunning)
-            {
-                processService.StandardInput.WriteLine(line);
-            }
-        }
-
-        //
-        // Send command to the driver service through a named pipe
-        //
-        public void SendPipeCommand(string line)
+        public void SendCommand(string command)
         {
             if (IsRunning)
             {
 
-                byte[] buffer = Encoding.UTF8.GetBytes(line);
-                pipeStreamOutput.Write(buffer, 0, buffer.Length);
-                pipeStreamOutput.Flush();
+                if (pipeOutput.IsRunning)
+                {
+                    pipeOutput.WriteMessage(command);
+                }
+                else
+                {
+                    processService.StandardInput.WriteLine(command);
+                }
             }
         }
 
@@ -379,243 +395,129 @@ private void ProcessService_OutputDataReceived(object sender, DataReceivedEventA
             }
             else
             {
-                string line = e.Data;
-
-                // Status line?
-                if (line.Contains("[STATUS]"))
-                {
-
-                    // Parse status variable and value
-                    Match match = Regex.Match(line, "^.+\\[STATUS\\] ([^ ]+) (.*?)$");
-                    if (!match.Success) return;
-
-                    string variableName = match.Groups[1].ToString().ToLower();
-                    string parameters = match.Groups[2].ToString();
-
-                    //
-                    // Commands status message
-                    //
-                    if (variableName == "commands")
-                    {
-                        string[] commandNames = parameters.Split(' ');
-                        string lowerCaseName;
-                        foreach (string name in commandNames)
-                        {
-                            lowerCaseName = name.Trim().ToLower();
-                            if (lowerCaseName.Length > 0)
-                            {
-                                if (!commands.ContainsKey(lowerCaseName))
-                                {
-                                    commands.Add(lowerCaseName, name);
-                                }
-                            }
-                        }
-                    }
-
-                    StatusReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Status, variableName, parameters));
-
-                }
-
-
-                //ConsoleAddLine(e.Data);
-                MessageReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Message, e.Data, ""));
+                //ProcessDriverMessage(e.Data);
             }
         }
 
 
         //
-        // Pipe input thread
+        // Received input pipe message
         //
-        private void RunPipeInputThread()
+        private void PipeInput_MessageReceived(object sender, NamedPipeClient.NamedPipeEventArgs e)
         {
-            StringBuilder stringBuilder = new StringBuilder();
-            byte[] buffer = new byte[1024];
-
-
-            while (IsRunning)
-            {
-                pipeStreamInput = new NamedPipeClientStream(".", "TabletDriverOutput", PipeDirection.InOut, PipeOptions.Asynchronous);
-
-                Console.WriteLine("Input pipe connecting...");
-                try { pipeStreamInput.Connect(); }
-                catch (Exception ex)
-                {
-                    Console.WriteLine("Input pipe connect error! " + ex.Message);
-                    break;
-                }
-                Console.WriteLine("Input pipe connected!");
-
-                //
-                // Input thread read loop
-                //
-                while (IsRunning && pipeStreamInput.IsConnected)
-                {
-                    //Console.WriteLine("Input pipe read!");
-                    int bytesRead = 0;
-                    try
-                    {
-                        bytesRead = pipeStreamInput.Read(buffer, 0, buffer.Length);
-                    }
-                    catch (Exception)
-                    {
-                        Console.WriteLine("Can't read input pipe!");
-                        break;
-                    }
-                    //Console.WriteLine("Input pipe read length: " + bytesRead);
-                    if (bytesRead == 0) continue;
 
-                    for (int i = 0; i < bytesRead; i++)
-                    {
-                        char c = (char)buffer[i];
-                        if (c == '\n' || c == '\r' || c == 0)
-                        {
-                            if (stringBuilder.Length > 0)
-                            {
-                                ConsoleAddLine(stringBuilder.ToString());
-                            }
-                            stringBuilder.Clear();
-                        }
-                        else
-                        {
-                            stringBuilder.Append(c);
-                        }
-                    }
-
-                }
+            string stringMessage = Encoding.UTF8.GetString(e.Message.Data, 0, e.Message.Length);
+            //ConsoleAddLine("Pipe: " + stringMessage);
+            ProcessDriverMessage(stringMessage);
 
-                Console.WriteLine("Input pipe disconnected!");
-                ConsoleAddLine("Input pipe disconnected!");
+        }
 
-                // Close input stream
-                try
-                {
-                    pipeStreamInput.Close();
-                    pipeStreamInput.Dispose();
-                    pipeStreamInput = null;
-                }
-                catch (Exception) { }
+        //
+        // Received state pipe message
+        //
+        private void PipeState_MessageReceived(object sender, NamedPipeClient.NamedPipeEventArgs e)
+        {
+            GCHandle gcHandle;
+            TabletState readState;
 
+            // Convert bytes to TabletState
+            if (e.Message.Length == stateBytes.Length)
+            {
+                gcHandle = GCHandle.Alloc(e.Message.Data, GCHandleType.Pinned);
+                readState = (TabletState)Marshal.PtrToStructure(gcHandle.AddrOfPinnedObject(), typeof(TabletState));
+                gcHandle.Free();
+                tabletState = readState;
             }
-
         }
 
 
         //
-        // Pipe input thread
+        // Process driver message
         //
-        private void RunPipeOutputThread()
+        private void ProcessDriverMessage(string messageData)
         {
-            StringBuilder stringBuilder = new StringBuilder();
-            char[] buffer = new char[1024];
+            //ConsoleAddLine("Message data: '" + messageData + "'");
 
+            // Add message data to stringbuilder
+            messageBuilder.Append(messageData);
 
-            while (IsRunning)
-            {
-                pipeStreamOutput = new NamedPipeClientStream(".", "TabletDriverInput", PipeDirection.InOut, PipeOptions.Asynchronous);
 
-                Console.WriteLine("Output pipe connecting...");
-                try { pipeStreamOutput.Connect(); }
-                catch (Exception ex)
-                {
-                    Console.WriteLine("Output pipe connect error! " + ex.Message);
-                    break;
-                }
-                Console.WriteLine("Output pipe connected!");
-
-                // Wait for pipe to disconnect
-                while (IsRunning && pipeStreamOutput.IsConnected)
-                {
-                    System.Threading.Thread.Sleep(100);
-                }
-
-                Console.WriteLine("Output pipe disconnected!");
-
-                // Close output stream
-                try
+            // Find a line
+            string line = "";
+            int index;
+            int startIndex = 0;
+            for (index = 0; index < messageBuilder.Length; index++)
+            {
+                char c = messageBuilder[index];
+                if (c == '\n')
                 {
-                    pipeStreamOutput.Close();
-                    pipeStreamOutput.Dispose();
-                    pipeStreamOutput = null;
+                    //ConsoleAddLine("New line at " + index);
+                    if (index > 0 && index > startIndex + 1)
+                    {
+                        line = messageBuilder.ToString(startIndex, index - startIndex + 1).Trim();
+                        ProcessDriverMessageLine(line);
+                        startIndex = index;
+                    }
                 }
-                catch (Exception) { }
+            }
 
+            // Remove lines from stringbuilder
+            if (startIndex < messageBuilder.Length)
+            {
+                messageBuilder.Remove(0, startIndex + 1);
+            }
+            else
+            {
+                messageBuilder.Clear();
             }
 
-        }
 
+        }
 
         //
-        // Pipe state thread
+        // Process driver message line
         //
-        private void RunPipeStateThread()
+        private void ProcessDriverMessageLine(string line)
         {
-            int size = 0;
-            byte[] bytes;
-            GCHandle gcHandle;
-            TabletState readState;
-            size = Marshal.SizeOf(typeof(TabletState));
-            bytes = new byte[Marshal.SizeOf(typeof(TabletState))];
-
+            //ConsoleAddLine("Message line: '" + line + "'");
 
-            while (IsRunning)
+            // Status line?
+            if (line.Contains("[STATUS]"))
             {
-                pipeStreamState = new NamedPipeClientStream(".", "TabletDriverState", PipeDirection.InOut, PipeOptions.Asynchronous);
 
-                Console.WriteLine("State pipe connecting...");
-                try
+                // Parse status variable and value
+                Match match = Regex.Match(line, "^.+\\[STATUS\\] ([^ ]+) (.*?)$");
+                if (match.Success)
                 {
-                    pipeStreamState.Connect();
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine("State pipe connection error! " + ex.Message);
-                    break;
-                }
-                Console.WriteLine("State pipe connected!");
-
+                    string variableName = match.Groups[1].ToString().ToLower();
+                    string parameters = match.Groups[2].ToString();
 
-                //
-                // State pipe read loop
-                //
-                while (IsRunning && pipeStreamState.IsConnected)
-                {
-                    //Console.WriteLine("Reading state pipe!");
-                    try
+                    //
+                    // Commands status message
+                    //
+                    if (variableName == "commands")
                     {
-                        // Read
-                        if (pipeStreamState.Read(bytes, 0, bytes.Length) == size)
+                        string[] commandNames = parameters.Split(' ');
+                        string lowerCaseName;
+                        foreach (string name in commandNames)
                         {
-
-                            // Convert bytes to TabletState
-                            gcHandle = GCHandle.Alloc(bytes, GCHandleType.Pinned);
-                            readState = (TabletState)Marshal.PtrToStructure(gcHandle.AddrOfPinnedObject(), typeof(TabletState));
-                            gcHandle.Free();
-                            tabletState = readState;
-
+                            lowerCaseName = name.Trim().ToLower();
+                            if (lowerCaseName.Length > 0)
+                            {
+                                if (!commands.ContainsKey(lowerCaseName))
+                                {
+                                    commands.Add(lowerCaseName, name);
+                                }
+                            }
                         }
                     }
-                    catch (Exception ex)
-                    {
-                        Console.WriteLine("Can't read state pipe! " + ex.Message);
-                        size = 0;
-                        break;
-                    }
-
 
+                    StatusReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Status, variableName, parameters));
                 }
-
-                Console.WriteLine("State pipe disconnected!");
-
-                // Close state stream
-                try
-                {
-                    pipeStreamState.Close();
-                    pipeStreamState.Dispose();
-                    pipeStreamState = null;
-                }
-                catch (Exception) { }
-
             }
+
+            ConsoleAddLine(line);
+            MessageReceived?.Invoke(this, new DriverEventArgs(DriverEventType.Message, line, ""));
         }
 
 
@@ -674,20 +576,11 @@ public void Start(string processPath, string arguments)
                     IsRunning = true;
                     timerWatchdog.Start();
 
-                    // Pipe input thread
-                    pipeInputThread = new System.Threading.Thread(new System.Threading.ThreadStart(RunPipeInputThread));
-                    pipeInputThread.Start();
-
-                    // Pipe output thread
-                    pipeOutputThread = new System.Threading.Thread(new System.Threading.ThreadStart(RunPipeOutputThread));
-                    pipeOutputThread.Start();
-
-                    // Pipe state thread
-                    pipeStateThread = new System.Threading.Thread(new System.Threading.ThreadStart(RunPipeStateThread));
-                    pipeStateThread.Start();
+                    // Named pipes
+                    pipeInput.Start();
+                    pipeOutput.Start();
+                    pipeState.Start();
 
-
-                    Started?.Invoke(this, new EventArgs());
                 }
 
                 // Start failed
@@ -714,81 +607,22 @@ public void Stop()
             timerWatchdog.Stop();
             IsRunning = false;
 
-
-            // Close pipe input stream
-            Console.WriteLine("Closing input pipe stream");
-            try
-            {
-                if (pipeStreamInput != null)
-                {
-                    pipeStreamInput.Close();
-                    pipeStreamInput.Dispose();
-                }
-            }
-            catch (Exception e) { Console.WriteLine("Pipe input stream error! " + e.Message); }
-
-
-            // Close pipe output stream
-            Console.WriteLine("Closing output pipe stream");
-            try
-            {
-                if (pipeStreamOutput != null)
-                {
-                    pipeStreamOutput.Close();
-                    pipeStreamOutput.Dispose();
-                }
-            }
-            catch (Exception e) { Console.WriteLine("Pipe output stream error! " + e.Message); }
-
-
-            // Close pipe state stream
-            Console.WriteLine("Closing state pipe stream");
-            try
-            {
-                if (pipeStreamState != null)
-                {
-                    pipeStreamState.Close();
-                    pipeStreamState.Dispose();
-                }
-            }
-            catch (Exception e) { Console.WriteLine("Pipe state stream error! " + e.Message); }
-
-            // Close input pipe thread
-            Console.WriteLine("Closing input pipe thread");
-            try
-            {
-                pipeInputThread.Abort();
-                pipeInputThread.Join(1000);
-            }
-            catch (Exception e) { Console.WriteLine("Pipe input thread error! " + e.Message); }
-
-
-            // Close output pipe thread
-            Console.WriteLine("Closing output pipe thread");
-            try
-            {
-                pipeOutputThread.Abort();
-                pipeOutputThread.Join(1000);
-            }
-            catch (Exception e) { Console.WriteLine("Pipe output thread error! " + e.Message); }
-
-            // Close pipe state thread
-            Console.WriteLine("Closing state pipe thread");
-            try
-            {
-                pipeStateThread.Abort();
-                pipeStateThread.Join(1000);
-            }
-            catch (Exception e) { Console.WriteLine("Pipe state thread error! " + e.Message); }
+            // Stop named pipe clients
+            pipeInput.Stop();
+            pipeOutput.Stop();
+            pipeState.Stop();
 
 
             // Kill service process
             Console.WriteLine("Killing TabletDriverService");
             try
             {
-                processService.CancelOutputRead();
-                processService.Kill();
-                processService.Dispose();
+                if (!DoNotKill)
+                {
+                    processService.CancelOutputRead();
+                    processService.Kill();
+                    processService.Dispose();
+                }
             }
             catch (Exception e)
             {
@@ -797,7 +631,6 @@ public void Stop()
 
             Stopped?.Invoke(this, new EventArgs());
 
-
             System.Threading.Thread.Sleep(10);
 
         }
diff --git a/TabletDriverGUI/TabletDriverGUI.csproj b/TabletDriverGUI/TabletDriverGUI.csproj
index c28e1b5..43089b5 100644
--- a/TabletDriverGUI/TabletDriverGUI.csproj
+++ b/TabletDriverGUI/TabletDriverGUI.csproj
@@ -79,6 +79,7 @@
     </ApplicationDefinition>
     <Compile Include="MainWindow.Areas.cs" />
     <Compile Include="MultimediaTimer.cs" />
+    <Compile Include="NamedPipeClient.cs" />
     <Compile Include="WindowTabletViewSettings.xaml.cs">
       <DependentUpon>WindowTabletViewSettings.xaml</DependentUpon>
     </Compile>
diff --git a/TabletDriverService/CommandHandler.Other.cpp b/TabletDriverService/CommandHandler.Other.cpp
index f08ca92..424ff5d 100644
--- a/TabletDriverService/CommandHandler.Other.cpp
+++ b/TabletDriverService/CommandHandler.Other.cpp
@@ -329,10 +329,12 @@ void CommandHandler::CreateOtherCommands() {
 	//
 	AddCommand(new Command("StateOutput", [&](CommandLine *cmd) {
 		if(!ExecuteCommand("TabletValid")) return false;
-		pipeHandler->lock.lock();
-		pipeHandler->isStateOutputEnabled = cmd->GetBoolean(0, pipeHandler->isStateOutputEnabled);
-		pipeHandler->lock.unlock();
-		LOG_INFO("State output = %s\n", pipeHandler->isStateOutputEnabled ? "Enabled" : "Disabled");
+		bool isOutputEnabled = false;
+		pipeState->lock.lock();
+		pipeState->isStateOutputEnabled = cmd->GetBoolean(0, pipeState->isStateOutputEnabled);
+		isOutputEnabled = pipeState->isStateOutputEnabled;
+		pipeState->lock.unlock();
+		LOG_INFO("State output = %s\n", pipeState->isStateOutputEnabled ? "Enabled" : "Disabled");
 		return true;
 	}));
 
@@ -535,6 +537,24 @@ void CommandHandler::CreateOtherCommands() {
 	}));
 
 
+	//
+	// Command: RequestSettings
+	//
+	AddCommand(new Command("RequestSettings", [&](CommandLine *cmd) {
+		LOG_STATUS("SETTINGS_REQUEST 1\n");
+		return true;
+	}));
+
+
+	//
+	// Command: RequestStartup
+	//
+	AddCommand(new Command("RequestStartup", [&](CommandLine *cmd) {
+		LOG_STATUS("STARTUP_REQUEST 1\n");
+		return true;
+	}));
+
+
 	//
 	// Command: Status
 	//
@@ -563,7 +583,7 @@ void CommandHandler::CreateOtherCommands() {
 		LOG_STATUS("MAX_PRESSURE %d\n", tablet->settings.maxPressure);
 		LOG_STATUS("AUX_BUTTONS %d\n", tablet->settings.auxButtonCount);
 		if(tabletHandler != NULL) {
-			LOG_STATUS("STARTED %d\n", tabletHandler->isRunning);
+			LOG_STATUS("STARTED %d\n", tabletHandler->IsRunning());
 		}
 
 		return true;
@@ -629,6 +649,8 @@ void CommandHandler::CreateOtherCommands() {
 
 		string commandsString = "";
 
+		LOG_STATUS("COMMANDS_CLEAR 1\n");
+
 		for(pair<string, Command*> cmdPair : commands) {
 			string commandName = cmdPair.second->name;
 			string lowerCaseName = commandName;
diff --git a/TabletDriverService/CommandHandler.cpp b/TabletDriverService/CommandHandler.cpp
index c069971..01cc9e6 100644
--- a/TabletDriverService/CommandHandler.cpp
+++ b/TabletDriverService/CommandHandler.cpp
@@ -99,6 +99,13 @@ bool CommandHandler::IsValidCommand(string command) {
 bool CommandHandler::ExecuteCommand(string command) {
 	return ExecuteCommand(command, NULL);
 }
+bool CommandHandler::ExecuteCommandLock(string command) {
+	lock.lock();
+	bool result = ExecuteCommand(command);
+	lock.unlock();
+	return result;
+}
+
 
 //
 // Execute a command using command line
@@ -106,6 +113,13 @@ bool CommandHandler::ExecuteCommand(string command) {
 bool CommandHandler::ExecuteCommand(CommandLine *cmd) {
 	return ExecuteCommand(cmd->command, cmd);
 }
+bool CommandHandler::ExecuteCommandLock(CommandLine *cmd) {
+	lock.lock();
+	bool result = ExecuteCommand(cmd);
+	lock.unlock();
+	return result;
+}
+
 
 //
 // Execute a command using command and parameter string
@@ -116,6 +130,13 @@ bool CommandHandler::ExecuteCommand(string command, string parameters) {
 	delete cmd;
 	return result;
 }
+bool CommandHandler::ExecuteCommandLock(string command, string parameters) {
+	lock.lock();
+	bool result = ExecuteCommand(command, parameters);
+	lock.unlock();
+	return result;
+}
+
 
 //
 // Execute a command
@@ -130,6 +151,13 @@ bool CommandHandler::ExecuteCommand(string command, CommandLine * cmd) {
 	}
 	return false;
 }
+bool CommandHandler::ExecuteCommandLock(string command, CommandLine * cmd) {
+	lock.lock();
+	bool result = ExecuteCommand(command, cmd);
+	lock.unlock();
+	return result;
+}
+
 
 //
 // Execute commands from a file
@@ -146,7 +174,6 @@ bool CommandHandler::ExecuteFile(string filename) {
 		return false;
 	}
 
-
 	LOG_INFO("\\ Reading '%s'\n", filename.c_str());
 
 	// Loop through lines
@@ -177,7 +204,15 @@ bool CommandHandler::ExecuteFile(string filename) {
 		}
 		LOG_INFO(">> %s\n", cmd->line.c_str());
 
-		ExecuteCommand(cmd);
+		string command = cmd->command;
+		transform(command.begin(), command.end(), command.begin(), ::tolower);
+		if(aliases.count(command) > 0) {
+			command = aliases[command];
+		}
+		if(commands.count(command) > 0) {
+			commands[command]->Execute(cmd);
+		}
+		//ExecuteCommand(cmd);
 
 		delete cmd;
 	}
diff --git a/TabletDriverService/CommandHandler.h b/TabletDriverService/CommandHandler.h
index 17353ce..ec50097 100644
--- a/TabletDriverService/CommandHandler.h
+++ b/TabletDriverService/CommandHandler.h
@@ -2,6 +2,7 @@
 #include "Command.h"
 #include "TabletFilterTester.h"
 
+#include <mutex>
 #include <string>
 #include <map>
 
@@ -13,6 +14,8 @@ class CommandHandler {
 	map<string, string> aliasNames;
 	map<string, string> help;
 
+	mutex lock;
+
 	CommandHandler();
 	~CommandHandler();
 
@@ -28,9 +31,13 @@ class CommandHandler {
 
 	bool IsValidCommand(string command);
 	bool ExecuteCommand(string command);
+	bool ExecuteCommandLock(string command);
 	bool ExecuteCommand(CommandLine *cmd);
+	bool ExecuteCommandLock(CommandLine * cmd);
 	bool ExecuteCommand(string command, string parameters);
+	bool ExecuteCommandLock(string command, string parameters);
 	bool ExecuteCommand(string command, CommandLine *cmd);
+	bool ExecuteCommandLock(string command, CommandLine * cmd);
 
 	bool ExecuteFile(string filename);
 
diff --git a/TabletDriverService/Logger.cpp b/TabletDriverService/Logger.cpp
index 7a0fdba..d874359 100644
--- a/TabletDriverService/Logger.cpp
+++ b/TabletDriverService/Logger.cpp
@@ -9,7 +9,7 @@ Logger::Logger() {
 	newMessage = false;
 	directPrint = false;
 	isDebugOutputEnabled = false;
-	pipeHandle = NULL;
+	namedPipe = NULL;
 }
 
 
@@ -60,17 +60,15 @@ void Logger::OutputMessage(LogItem *message) {
 		cout.write(buffer, index);
 		cout.flush();
 	} catch(exception) {
-		exit(1);
 	}
 
 	// Write to output pipe
 	try {
-		if(pipeHandle != NULL) {
+		if(namedPipe != NULL) {
 			DWORD bytesWritten = 0;
-			WriteFile(pipeHandle, buffer, index, &bytesWritten, NULL);
+			namedPipe->Write(buffer, index);
 		}
 	} catch(exception) {
-		logger.pipeHandle = NULL;
 	}
 
 	// Write to log file
@@ -264,7 +262,7 @@ void Logger::run() {
 		}
 
 		// Shutdown the thread
-		if(!isRunning && !newMessage) break;
+		if(!IsRunning() && !newMessage) break;
 
 		// Sleep 10ms
 		Sleep(10);
@@ -327,8 +325,8 @@ bool Logger::IsDebugOutputEnabled()
 // Start logger thread
 //
 void Logger::Start() {
-	if(!isRunning) {
-		isRunning = true;
+	if(!IsRunning()) {
+		SetRunningState(true);
 		threadLog = thread([this] { this->run(); });
 	}
 }
@@ -337,8 +335,8 @@ void Logger::Start() {
 // Stop logger thread
 //
 void Logger::Stop() {
-	if(isRunning) {
-		isRunning = false;
+	if(IsRunning()) {
+		SetRunningState(false);
 		newMessage = true;
 		threadLog.join();
 		if(logFile && logFile.is_open()) {
diff --git a/TabletDriverService/Logger.h b/TabletDriverService/Logger.h
index b1287fd..4f5d41e 100644
--- a/TabletDriverService/Logger.h
+++ b/TabletDriverService/Logger.h
@@ -17,6 +17,7 @@
 #include <mutex>
 #include <condition_variable>
 
+#include "Runnable.h"
 
 #ifndef LOG_MODULE
 #define LOG_MODULE "Logger"
@@ -52,7 +53,7 @@
 
 using namespace std;
 
-class Logger {
+class Logger : public Runnable {
 private:
 	thread threadLog;
 	void run();
@@ -93,10 +94,9 @@ class Logger {
 		"INFO",
 		"DEBUG"
 	};
-	bool isRunning;
 	bool directPrint;
 	string logFilename = "";
-	HANDLE pipeHandle;
+	NamedPipeServer *namedPipe;
 	mutex lock;
 
 	void OutputMessage(LogItem *message);
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index 92d1077..d8c3b04 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -6,6 +6,7 @@
 #include "Tablet.h"
 #include "CommandLine.h"
 #include "DataFormatter.h"
+#include "NamedPipeInput.h"
 
 #define LOG_MODULE ""
 #include "Logger.h"
@@ -24,7 +25,11 @@ VMulti *vmulti;
 CommandHandler *commandHandler;
 OutputManager *outputManager;
 ScreenMapper *mapper;
-PipeHandler *pipeHandler;
+
+// Named pipes
+NamedPipeInput *pipeInput;
+NamedPipeServer *pipeOutput;
+NamedPipeState *pipeState;
 
 void InitConsole();
 bool ProcessCommand(CommandLine *cmd);
@@ -42,7 +47,7 @@ int main(int argc, char**argv) {
 	vmulti = NULL;
 	tablet = NULL;
 	tabletHandler = NULL;
-	
+
 	// Init console
 	InitConsole();
 
@@ -67,7 +72,7 @@ int main(int argc, char**argv) {
 	//
 	commandHandler->AddCommand(new Command("Start", [&](CommandLine *cmd) {
 
-		if(tabletHandler->isRunning) {
+		if(tabletHandler->IsRunning()) {
 			LOG_INFO("Driver is already started!\n");
 			return true;
 		}
@@ -115,14 +120,23 @@ int main(int argc, char**argv) {
 	LOGGER_START();
 
 
-	// Pipe handler
+	// Named pipes
 	if(argc > 2) {
-		pipeHandler = new PipeHandler(argv[2]);
+		pipeInput = new NamedPipeInput(string(argv[2]) + string("Input"));
+		pipeOutput = new NamedPipeServer(string(argv[2]) + string("Output"));
+		pipeState = new NamedPipeState(string(argv[2]) + string("State"));
 	}
 	else {
-		pipeHandler = new PipeHandler("TabletDriver");
+		pipeInput = new NamedPipeInput("TabletDriverInput");
+		pipeOutput = new NamedPipeServer("TabletDriverOutput");
+		pipeState = new NamedPipeState("TabletDriverState");
 	}
-	pipeHandler->Start();
+	pipeInput->Start();
+	pipeOutput->Start();
+	pipeState->Start();
+
+	// Logger output pipe
+	logger.namedPipe = pipeOutput;
 
 	// VMulti XP-Pen
 	vmulti = new VMulti(VMulti::TypeXPPen);
@@ -156,6 +170,8 @@ int main(int argc, char**argv) {
 		LOG_ERROR("Can't open '%s'\n", filename.c_str());
 	}
 
+	commandHandler->ExecuteCommandLock("RequestStartup");
+
 
 	//
 	// Main loop
@@ -163,13 +179,16 @@ int main(int argc, char**argv) {
 	while(true) {
 
 		// Broken pipe
-		if(!cin) break;
+		if(!cin) {
+			Sleep(100);
+		}
 
 		// Read line from the console
 		try {
 			getline(cin, line);
 		} catch(exception) {
-			break;
+			Sleep(100);
+			//break;
 		}
 
 		// Process valid lines
@@ -178,13 +197,8 @@ int main(int argc, char**argv) {
 			// Line to command line
 			cmd = new CommandLine(line);
 
-			// Process echo command directly
-			if(cmd->is("Echo")) {
-				commandHandler->ExecuteCommand(cmd);
-			}
-
 			// Hide console (for the service only mode)
-			else if(cmd->is("Hide")) {
+			if(cmd->is("Hide")) {
 				::ShowWindow(::GetConsoleWindow(), SW_HIDE);
 			}
 
@@ -213,12 +227,20 @@ void CleanupAndExit(int code) {
 	LOGGER_STOP();
 
 
-	// PipeHandler
-	printf("Cleanup PipeHandler\n");
-	if(pipeHandler != NULL) {
-		delete pipeHandler;
+	// Named pipes
+	printf("Cleanup Input Pipe\n");
+	if(pipeInput != NULL) {
+		delete pipeInput;
+	}
+	printf("Cleanup Output Pipe\n");
+	if(pipeOutput != NULL) {
+		delete pipeOutput;
 	}
-	
+	printf("Cleanup State Pipe\n");
+	if(pipeState != NULL) {
+		delete pipeState;
+	}
+
 	// TabletHandler
 	printf("Cleanup TabletHandler\n");
 	if(tabletHandler != NULL) {
@@ -235,12 +257,12 @@ void CleanupAndExit(int code) {
 	printf("Cleanup VMulti\n");
 	if(vmulti != NULL)
 		delete vmulti;
-	
+
 	// Tablet
 	printf("Cleanup Tablet\n");
 	if(tablet != NULL)
 		delete tablet;
-	
+
 	// Uninitialize COM
 	CoUninitialize();
 
@@ -259,7 +281,14 @@ bool ProcessCommand(CommandLine *cmd) {
 
 	bool logResult = false;
 
-	LOG_INFO(">> %s\n", cmd->line.c_str());
+
+	// Hide echo input
+	if(cmd->is("Echo")) {
+	}
+	else
+	{
+		LOG_INFO(">> %s\n", cmd->line.c_str());
+	}
 
 	//
 	// Execute command handler command
@@ -269,7 +298,7 @@ bool ProcessCommand(CommandLine *cmd) {
 		cmd->command.pop_back();
 	}
 	if(commandHandler->IsValidCommand(cmd->command)) {
-		bool result = commandHandler->ExecuteCommand(cmd->command, cmd);
+		bool result = commandHandler->ExecuteCommandLock(cmd->command, cmd);
 		if(logResult) {
 			LOG_INFO("Result: %s\n", result ? "True" : "False");
 		}
diff --git a/TabletDriverService/NamedPipeInput.cpp b/TabletDriverService/NamedPipeInput.cpp
new file mode 100644
index 0000000..83b63be
--- /dev/null
+++ b/TabletDriverService/NamedPipeInput.cpp
@@ -0,0 +1,26 @@
+#include "stdafx.h"
+#include "NamedPipeInput.h"
+
+#define LOG_MODULE "PipeInput"
+#include "Logger.h"
+
+NamedPipeInput::NamedPipeInput(string pipeName) : NamedPipeServer(pipeName)
+{
+
+}
+
+
+NamedPipeInput::~NamedPipeInput()
+{
+}
+
+int NamedPipeInput::ProcessData(int clientId, char *buffer, int length, char * bufferOutput)
+{
+	buffer[length] = 0;
+	//LOG_DEBUG("PipeInput data: %s\n", buffer);
+	CommandLine *cmd = new CommandLine(buffer);
+	ProcessCommand(cmd);
+	delete cmd;
+
+	return 0;
+}
diff --git a/TabletDriverService/NamedPipeInput.h b/TabletDriverService/NamedPipeInput.h
new file mode 100644
index 0000000..4926bc4
--- /dev/null
+++ b/TabletDriverService/NamedPipeInput.h
@@ -0,0 +1,12 @@
+#pragma once
+#include "NamedPipeServer.h"
+class NamedPipeInput : public NamedPipeServer
+{
+public:
+	NamedPipeInput(string pipeName);
+	~NamedPipeInput();
+
+	int ProcessData(int clientId, char *bufferInput, int length, char *bufferOutput) override;
+
+};
+
diff --git a/TabletDriverService/NamedPipeServer.cpp b/TabletDriverService/NamedPipeServer.cpp
new file mode 100644
index 0000000..4f1ca23
--- /dev/null
+++ b/TabletDriverService/NamedPipeServer.cpp
@@ -0,0 +1,236 @@
+#include "stdafx.h"
+#include "NamedPipeServer.h"
+
+#define LOG_MODULE "NamedPipeServer"
+#include "Logger.h"
+
+
+//
+// Constructor
+//
+NamedPipeServer::NamedPipeServer(string pipeName)
+{
+	this->pipePath = "\\\\.\\PIPE\\" + pipeName;
+	this->pipeName = pipeName;
+	clientCount = 0;
+
+	for(int i = 0; i < 256; i++) {
+		clients[i].id = i;
+		clients[i].pipeName = pipeName;
+	}
+
+}
+
+
+//
+// Destructor
+//
+NamedPipeServer::~NamedPipeServer()
+{
+	Stop();
+}
+
+//
+// Start pipe server
+//
+bool NamedPipeServer::Start()
+{
+	if(!IsRunning()) {
+		SetRunningState(true);
+
+		LOG_DEBUG("Starting %s main thread...\n", pipeName.c_str());
+		threadMain = new thread(&NamedPipeServer::RunMainThread, this);
+		LOG_DEBUG("%s main thread started!\n", pipeName.c_str());
+
+		return true;
+	}
+	return false;
+}
+
+
+//
+// Stop pipe server
+//
+bool NamedPipeServer::Stop()
+{
+	if(IsRunning()) {
+		SetRunningState(false);
+	}
+	return false;
+}
+
+
+//
+// Process data
+//
+int NamedPipeServer::ProcessData(int clientId, char *bufferInput, int length, char *bufferOutput) {
+	int bytesOutput = 0;
+
+	//bufferInput[length] = 0;
+	//LOG_DEBUG("Client #%d input: %s\n", clientId, bufferInput);
+	//bytesOutput = sprintf_s(bufferOutput, BUFFER_SIZE, "Reply: %s", bufferInput);
+
+	return bytesOutput;
+}
+
+
+//
+// Write a message to all clients
+//
+bool NamedPipeServer::Write(void * buffer, int length) {
+
+	DWORD bytesWritten = 0;
+
+	if(!IsRunning()) return false;
+
+	for(int i = 0; i < clientCount; i++) {
+		if(clients[i].isConnected) {
+			Client *client = &clients[i];
+			//printf("Write %d bytes to client #%d!\n", length, i);
+			WriteFile(client->handlePipe, buffer, length, &bytesWritten, NULL);
+			FlushFileBuffers(client->handlePipe);
+			//printf("Written %d bytes to client #%d!\n", bytesWritten, i);
+		}
+	}
+	return true;
+
+}
+
+
+//
+// Main thread
+//
+void NamedPipeServer::RunMainThread()
+{
+	bool connected;
+	int clientId = 0;
+	bool running = true;
+	Client *client;
+
+	while(IsRunning()) {
+
+		LOG_DEBUG("%s: Creating pipe...\n", pipeName.c_str());
+
+		// Find free client id
+		client = &clients[clientId];
+
+		// Create pipe
+		client->handlePipe = CreateNamedPipeA(pipePath.c_str(),
+			PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
+			PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
+			PIPE_UNLIMITED_INSTANCES,
+			BUFFER_SIZE,
+			BUFFER_SIZE,
+			100,
+			NULL
+		);
+		// Pipe invalid?
+		if(client->handlePipe == INVALID_HANDLE_VALUE)
+		{
+			LOG_ERROR("%s: CreateNamedPipeA failed, GLE=%d\n", pipeName.c_str(), GetLastError());
+			Sleep(100);
+			break;
+		}
+
+		LOG_DEBUG("Pipe %s created!\n", pipeName.c_str());
+
+
+		// Connect
+		LOG_DEBUG("%s: Connecting to pipe...\n", pipeName.c_str());
+		connected = ConnectNamedPipe(client->handlePipe, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED);
+
+		// Connected?
+		if(connected) {
+			LOG_DEBUG("%s: Client connected!\n", pipeName.c_str());
+			thread *threadPipe = new thread(&NamedPipeServer::RunClientThread, this, client);
+			client->threadPipe = threadPipe;
+			clientCount++;
+			if(clientCount >= 256) {
+				clientCount = 256;
+			}
+			clientId++;
+			if(clientId >= 256) {
+				clientId = 0;
+			}
+		}
+
+		// No connection
+		else {
+			LOG_DEBUG("%s: Could not connect to a pipe!\n", pipeName.c_str());
+			SAFE_CLOSE_HANDLE(client->handlePipe);
+		}
+
+	}
+
+}
+
+
+//
+// Client thread
+//
+void NamedPipeServer::RunClientThread(Client *client)
+{
+	char bufferRead[BUFFER_SIZE];
+	char bufferWrite[BUFFER_SIZE];
+	DWORD bytesRead = 0;
+	DWORD bytesWritten = 0;
+	int replyBytes;
+	bool result;
+	string pipeName = client->pipeName;
+	HANDLE handlePipe = client->handlePipe;
+	int clientId = client->id;
+	client->isConnected = true;
+
+	while(true) {
+		//LOG_DEBUG("Read %s!\n", pipeName.c_str());
+
+		// Try reading
+		result = ReadFile(handlePipe, bufferRead, BUFFER_SIZE, &bytesRead, NULL);
+		if(!result || bytesRead == 0) {
+			if(GetLastError() == ERROR_BROKEN_PIPE)
+			{
+				LOG_DEBUG("%s: Client #%d disconnected.\n", pipeName.c_str(), clientId);
+				break;
+			}
+			else if(GetLastError() != 0)
+			{
+				LOG_DEBUG("%s: Client #%d ReadFile failed, GLE=%d\n", pipeName.c_str(), clientId, GetLastError());
+				break;
+			}
+			Sleep(10);
+		}
+		else {
+			replyBytes = ProcessData(clientId, bufferRead, bytesRead, bufferWrite);
+
+			if(replyBytes > 0) {
+				result = WriteFile(handlePipe, bufferWrite, replyBytes, &bytesWritten, NULL);
+				if(!result || replyBytes != bytesWritten)
+				{
+					LOG_DEBUG("%s: Client #%d WriteFile failed, GLE=%d\n", pipeName.c_str(), clientId, GetLastError());
+					break;
+				}
+			}
+		}
+
+	}
+
+	DisconnectNamedPipe(handlePipe);
+	SAFE_CLOSE_HANDLE(handlePipe);
+	if(client != nullptr && client != NULL) {
+		client->isConnected = false;
+	}
+	LOG_DEBUG("%s: Client #%d thread exit!\n", pipeName.c_str(), clientId);
+
+}
+
+
+//
+// Client constructor
+//
+NamedPipeServer::Client::Client()
+{
+	id = 0;
+	handlePipe = NULL;
+	threadPipe = NULL;
+	isConnected = false;
+}
diff --git a/TabletDriverService/NamedPipeServer.h b/TabletDriverService/NamedPipeServer.h
new file mode 100644
index 0000000..6d7057d
--- /dev/null
+++ b/TabletDriverService/NamedPipeServer.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <thread>
+#include <mutex>
+#include <string>
+
+#include "Runnable.h"
+
+#define BUFFER_SIZE 1024
+
+class NamedPipeServer : public Runnable
+{
+public:
+	string pipePath;
+	string pipeName;
+	thread *threadMain;
+	mutex lock;
+
+	class Client {
+	public:
+		int id;
+		HANDLE handlePipe;
+		thread* threadPipe;
+		string pipeName;
+		bool isConnected;
+		Client();
+	};
+
+	Client clients[256];
+	int clientCount;
+
+	NamedPipeServer(string pipeName);
+	~NamedPipeServer();
+
+	virtual bool Start();
+	virtual bool Stop();
+	virtual int ProcessData(int clientId, char *bufferInput, int length, char *bufferOutput);
+	bool Write(void * buffer, int length);
+
+	void RunMainThread();
+	void RunClientThread(Client *client);
+
+
+
+};
+
diff --git a/TabletDriverService/NamedPipeState.cpp b/TabletDriverService/NamedPipeState.cpp
new file mode 100644
index 0000000..2545e64
--- /dev/null
+++ b/TabletDriverService/NamedPipeState.cpp
@@ -0,0 +1,87 @@
+#include "stdafx.h"
+#include "NamedPipeState.h"
+
+
+NamedPipeState::NamedPipeState(string pipeName) : NamedPipeServer(pipeName)
+{
+	isStateOutputEnabled = false;
+}
+
+NamedPipeState::~NamedPipeState()
+{
+}
+
+//
+// Start
+//
+bool NamedPipeState::Start()
+{
+	if(!IsRunning()) {
+		bool result = NamedPipeServer::Start();
+		threadStateWriter = new thread(&NamedPipeState::RunStateWriterThread, this);
+		return result;
+	}
+	return false;
+}
+
+
+//
+// Stop
+//
+bool NamedPipeState::Stop()
+{
+	return NamedPipeServer::Stop();
+}
+
+//
+// State writer thread
+//
+void NamedPipeState::RunStateWriterThread()
+{
+	TabletState lastState;
+	bool outputEnabled = false;
+	bool running = true;
+
+	while(IsRunning()) {
+		lock.lock();
+		outputEnabled = isStateOutputEnabled;
+		lock.unlock();
+
+		if(tablet != NULL && tabletHandler != NULL && outputEnabled) {
+			if(tabletHandler->outputStateWrite.position.Distance(lastState.position) > 0) {
+
+				// Input
+				stateMessage.inputButtons = tablet->state.inputButtons;
+				stateMessage.inputX = tablet->state.inputPosition.x;
+				stateMessage.inputY = tablet->state.inputPosition.y;
+				stateMessage.inputPressure = tablet->state.inputPressure;
+				stateMessage.inputVelocity = tablet->state.inputVelocity;
+
+				// Output
+				stateMessage.outputButtons = tabletHandler->outputStateWrite.buttons;
+				stateMessage.outputX = tabletHandler->outputStateWrite.position.x;
+				stateMessage.outputY = tabletHandler->outputStateWrite.position.y;
+				stateMessage.outputPressure = tabletHandler->outputStateWrite.pressure;
+
+				// Index
+				stateMessage.index++;
+
+				// Write to pipe
+				Write(&stateMessage, sizeof(stateMessage));
+
+				// Update last state
+				memcpy(&lastState, &tabletHandler->outputStateWrite, sizeof(TabletState));
+			}
+			else {
+				Sleep(2);
+			}
+		}
+		else {
+			Sleep(100);
+		}
+
+
+	}
+
+
+}
diff --git a/TabletDriverService/NamedPipeState.h b/TabletDriverService/NamedPipeState.h
new file mode 100644
index 0000000..76645ac
--- /dev/null
+++ b/TabletDriverService/NamedPipeState.h
@@ -0,0 +1,33 @@
+#pragma once
+#include "NamedPipeServer.h"
+class NamedPipeState : public NamedPipeServer
+{
+public:
+#pragma pack(1)
+	struct {
+		int index;
+
+		int inputButtons;
+		double inputX;
+		double inputY;
+		double inputPressure;
+		double inputVelocity;
+
+		int outputButtons;
+		double outputX;
+		double outputY;
+		double outputPressure;
+	} stateMessage;
+
+	thread *threadStateWriter;
+	bool isStateOutputEnabled;
+
+	NamedPipeState(string pipeName);
+	~NamedPipeState();
+
+	bool Start() override;
+	bool Stop() override;
+	void RunStateWriterThread();
+
+};
+
diff --git a/TabletDriverService/PipeHandler.cpp b/TabletDriverService/PipeHandler.cpp
deleted file mode 100644
index 15c3196..0000000
--- a/TabletDriverService/PipeHandler.cpp
+++ /dev/null
@@ -1,380 +0,0 @@
-#include "stdafx.h"
-#include "PipeHandler.h"
-
-#define LOG_MODULE "Pipe"
-#include "Logger.h"
-
-
-//
-// Constructor
-//
-PipeHandler::PipeHandler(string pipeName)
-{
-	pipeNameInput = "\\\\.\\PIPE\\" + pipeName + "Input";
-	pipeNameOutput = "\\\\.\\PIPE\\" + pipeName + "Output";
-	pipeNameState = "\\\\.\\PIPE\\" + pipeName + "State";
-
-	handleInput = NULL;
-	handleOutput = NULL;
-	handleState = NULL;
-	connectedInput = false;
-	connectedOutput = false;
-	connectedState = false;
-
-	isRunning = false;
-	isStateOutputEnabled = false;
-}
-
-
-//
-// Destructor
-//
-PipeHandler::~PipeHandler()
-{
-	Stop();
-}
-
-
-//
-// Start
-//
-bool PipeHandler::Start()
-{
-	lock.lock();
-	bool running = isRunning;
-	lock.unlock();
-
-	if(!running) {
-		lock.lock();
-		isRunning = true;
-		lock.unlock();
-		threadInput = new thread(&PipeHandler::RunInputThread, this);
-		threadOutput = new thread(&PipeHandler::RunOutputThread, this);
-		threadState = new thread(&PipeHandler::RunStateThread, this);
-		return true;
-	}
-	return false;
-}
-
-
-//
-// Stop
-//
-bool PipeHandler::Stop() {
-
-	lock.lock();
-	bool running = isRunning;
-	lock.unlock();
-
-	if(running) {
-		lock.lock();
-		isRunning = true;
-		lock.unlock();
-
-		// Input
-		if(handleInput != NULL) {
-			if(connectedInput) {
-				SAFE_CLOSE_HANDLE(handleInput);
-			}
-			TerminateThread(threadInput, 0);
-		}
-
-		// Output
-		if(handleOutput != NULL) {
-			if(connectedOutput) {
-				SAFE_CLOSE_HANDLE(handleOutput);
-			}
-			TerminateThread(threadOutput, 0);
-		}
-
-		// State
-		if(handleState != NULL) {
-			if(connectedState) {
-				SAFE_CLOSE_HANDLE(handleState);
-			}
-			TerminateThread(threadState, 0);
-		}
-
-		// Logger handle
-		logger.pipeHandle = NULL;
-		return true;
-	}
-	return false;
-}
-
-
-//
-// Input thread
-//
-void PipeHandler::RunInputThread()
-{
-	BOOL result;
-	DWORD bytesWritten = 0;
-	DWORD bytesRead = 0;
-	DWORD bytesAvailable = 0;
-	DWORD bytesLeft = 0;
-	char bufferWrite[1024];
-	char bufferRead[1024];
-
-	while(true) {
-
-		lock.lock();
-		if(!isRunning) {
-			lock.unlock();
-			break;
-		}
-		else {
-			lock.unlock();
-		}
-
-		connectedInput = false;
-
-		// Input connection
-		handleInput = CreateNamedPipeA(pipeNameInput.c_str(),
-			PIPE_ACCESS_DUPLEX,
-			PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
-			PIPE_UNLIMITED_INSTANCES,
-			sizeof(bufferWrite),
-			sizeof(bufferRead),
-			500, // Timeout
-			NULL
-		);
-
-
-		// Invalid handle?
-		if(handleInput == INVALID_HANDLE_VALUE) {
-			LOG_ERROR("Couldn't create input pipe!\n");
-			break;
-		}
-
-		// Connect
-		LOG_DEBUG("Connecting to input pipe!\n");
-		result = ConnectNamedPipe(handleInput, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED);
-		LOG_DEBUG("Input pipe connected: %d\n", result);
-
-		if(!result) {
-			SAFE_CLOSE_HANDLE(handleInput);
-			continue;
-		}
-
-		connectedInput = true;
-
-		// Read loop
-		while(true) {
-			PeekNamedPipe(handleInput, &bufferRead, sizeof(bufferRead), &bytesRead, &bytesAvailable, &bytesLeft);
-			if(bytesAvailable > 0) {
-				result = ReadFile(handleInput, &bufferRead, sizeof(bufferRead), &bytesRead, NULL);
-				if(!result || bytesRead == 0) {
-					if(GetLastError() == ERROR_BROKEN_PIPE) {
-						LOG_DEBUG("Input pipe broken! %d\n", GetLastError());
-						SAFE_CLOSE_HANDLE(handleInput);
-						break;
-					}
-				}
-
-				if(bytesRead > 0) {
-					bufferRead[bytesRead] = 0;
-					//LOG_DEBUG("Pipe read: %s\n", bufferRead);
-					CommandLine *cmd = new CommandLine(bufferRead);
-					ProcessCommand(cmd);
-					delete cmd;
-				}
-			}
-			else {
-				Sleep(100);
-			}
-		}
-
-	}
-
-
-
-
-}
-
-
-//
-// Output thread
-//
-void PipeHandler::RunOutputThread()
-{
-	BOOL result;
-	DWORD bytesWritten = 0;
-	DWORD bytesRead = 0;
-	char bufferWrite[1024];
-	char bufferRead[1024];
-
-	// Connect loop
-	while(true) {
-
-		lock.lock();
-		if(!isRunning) {
-			lock.unlock();
-			break;
-		}
-		else {
-			lock.unlock();
-		}
-
-		connectedOutput = false;
-
-		// Output connection
-		handleOutput = CreateNamedPipeA(pipeNameOutput.c_str(),
-			PIPE_ACCESS_DUPLEX,
-			PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
-			PIPE_UNLIMITED_INSTANCES,
-			sizeof(bufferWrite),
-			sizeof(bufferRead),
-			500, // Timeout
-			NULL
-		);
-
-		if(handleOutput == INVALID_HANDLE_VALUE) {
-			LOG_ERROR("Couldn't create output pipe!\n");
-			Sleep(1000);
-			continue;
-		}
-
-		LOG_DEBUG("Connecting to output pipe!\n");
-		result = ConnectNamedPipe(handleOutput, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED);
-		LOG_DEBUG("Output pipe connected: %d\n", result);
-
-		if(!result) {
-			SAFE_CLOSE_HANDLE(handleOutput);
-			logger.pipeHandle = NULL;
-			continue;
-		}
-
-		// Logger pipe handle
-		logger.pipeHandle = handleOutput;
-
-		connectedOutput = true;
-
-		// Read loop
-		while(true) {
-			if(logger.pipeHandle == NULL) {
-				SAFE_CLOSE_HANDLE(handleOutput);
-				break;
-			}
-			Sleep(100);
-			/*
-			result = ReadFile(handleOutput, &bufferRead, sizeof(bufferRead), &bytesRead, NULL);
-			if(!result || bytesRead == 0) {
-				if(GetLastError() == ERROR_BROKEN_PIPE) {
-					LOG_DEBUG("Output pipe broken! %d\n", GetLastError());
-					SAFE_CLOSE_HANDLE(handleOutput);
-					break;
-				}
-			}
-			*/
-		}
-
-	}
-
-}
-
-
-//
-// Tablet state thread
-//
-void PipeHandler::RunStateThread()
-{
-	BOOL result;
-	DWORD bytesWritten = 0;
-	DWORD bytesRead = 0;
-	char bufferWrite[1024];
-	char bufferRead[1024];
-	TabletState lastState;
-
-	bool outputEnabled = false;
-
-	// Connect loop
-	while(true) {
-
-		lock.lock();
-		if(!isRunning) {
-			lock.unlock();
-			break;
-		}
-		else {
-			lock.unlock();
-		}
-
-		connectedState = false;
-
-		// Output connection
-		handleState = CreateNamedPipeA(pipeNameState.c_str(),
-			PIPE_ACCESS_DUPLEX,
-			PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
-			PIPE_UNLIMITED_INSTANCES,
-			sizeof(bufferWrite),
-			sizeof(bufferRead),
-			500, // Timeout
-			NULL
-		);
-
-		if(handleState == INVALID_HANDLE_VALUE) {
-			LOG_ERROR("Couldn't create state pipe!\n");
-			break;
-		}
-
-		LOG_DEBUG("Connecting to state pipe!\n");
-		result = ConnectNamedPipe(handleState, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED);
-		LOG_DEBUG("State pipe connected: %d\n", result);
-
-		if(!result) {
-			SAFE_CLOSE_HANDLE(handleState);
-			logger.pipeHandle = NULL;
-			Sleep(1000);
-			continue;
-		}
-
-		connectedState = true;
-
-		stateMessage.index = 0;
-
-		// Write loop
-		while(true) {
-
-			lock.lock();
-			outputEnabled = isStateOutputEnabled;
-			lock.unlock();
-
-			if(tablet != NULL && tabletHandler != NULL && outputEnabled) {
-				if(tabletHandler->outputStateWrite.position.Distance(lastState.position) > 0) {
-
-					// Input
-					stateMessage.inputButtons = tablet->state.inputButtons;
-					stateMessage.inputX = tablet->state.inputPosition.x;
-					stateMessage.inputY = tablet->state.inputPosition.y;
-					stateMessage.inputPressure = tablet->state.inputPressure;
-					stateMessage.inputVelocity = tablet->state.inputVelocity;
-
-					// Output
-					stateMessage.outputButtons = tabletHandler->outputStateWrite.buttons;
-					stateMessage.outputX = tabletHandler->outputStateWrite.position.x;
-					stateMessage.outputY = tabletHandler->outputStateWrite.position.y;
-					stateMessage.outputPressure = tabletHandler->outputStateWrite.pressure;
-
-					// Index
-					stateMessage.index++;
-
-					// Write to pipe
-					WriteFile(handleState, &stateMessage, sizeof(stateMessage), &bytesWritten, NULL);
-
-					// Update last state
-					memcpy(&lastState, &tabletHandler->outputStateWrite, sizeof(TabletState));
-				}
-				else {
-					Sleep(2);
-				}
-			}
-			else {
-				Sleep(100);
-			}
-
-		}
-
-	}
-
-}
\ No newline at end of file
diff --git a/TabletDriverService/PipeHandler.h b/TabletDriverService/PipeHandler.h
deleted file mode 100644
index ec127c5..0000000
--- a/TabletDriverService/PipeHandler.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#pragma once
-
-#include <thread>
-#include <mutex>
-
-class PipeHandler
-{
-public:
-
-#pragma pack(1)
-	struct {
-		int index;
-
-		int inputButtons;
-		double inputX;
-		double inputY;
-		double inputPressure;
-		double inputVelocity;
-
-		int outputButtons;
-		double outputX;
-		double outputY;
-		double outputPressure;
-	} stateMessage;
-
-	string pipeNameInput;
-	string pipeNameOutput;
-	string pipeNameState;
-
-	thread *threadInput;
-	thread *threadOutput;
-	thread *threadState;
-
-	HANDLE handleInput;
-	HANDLE handleOutput;
-	HANDLE handleState;
-
-	bool connectedInput;
-	bool connectedOutput;
-	bool connectedState;
-
-	mutex lock;
-	bool isRunning;
-	bool isStateOutputEnabled;
-
-	PipeHandler(string pipeName);
-	~PipeHandler();
-
-	bool Start();
-	bool Stop();
-	void RunInputThread();
-	void RunOutputThread();
-	void RunStateThread();
-
-};
-
diff --git a/TabletDriverService/Runnable.cpp b/TabletDriverService/Runnable.cpp
new file mode 100644
index 0000000..ed1b08a
--- /dev/null
+++ b/TabletDriverService/Runnable.cpp
@@ -0,0 +1,18 @@
+#include "stdafx.h"
+#include "Runnable.h"
+
+bool Runnable::IsRunning()
+{
+	bool running = false;
+	isRunningLock.lock();
+	running = _isRunning;
+	isRunningLock.unlock();
+	return running;
+}
+
+void Runnable::SetRunningState(bool running)
+{
+	isRunningLock.lock();
+	_isRunning = running;
+	isRunningLock.unlock();
+}
diff --git a/TabletDriverService/Runnable.h b/TabletDriverService/Runnable.h
new file mode 100644
index 0000000..a11c293
--- /dev/null
+++ b/TabletDriverService/Runnable.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <mutex>
+
+class Runnable
+{
+protected:
+	bool _isRunning = false;
+	mutex isRunningLock;
+public:
+	bool IsRunning();
+	void SetRunningState(bool running);
+};
+
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 61e2758..9af8fab 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -462,7 +462,7 @@ int Tablet::ReadState() {
 
 
 	// Tablet measurement update
-	if(measurement.isRunning) {
+	if(measurement.IsRunning()) {
 		state.buttons = reportData.buttons & 0x0F;
 		measurement.Update(state);
 		return Tablet::ReportInvalid;
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index bd0951f..783188c 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -181,6 +181,9 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     <ClInclude Include="HIDDevice.h" />
     <ClInclude Include="InputEmulator.h" />
     <ClInclude Include="Logger.h" />
+    <ClInclude Include="NamedPipeInput.h" />
+    <ClInclude Include="NamedPipeServer.h" />
+    <ClInclude Include="NamedPipeState.h" />
     <ClInclude Include="Output.h" />
     <ClInclude Include="OutputDummy.h" />
     <ClInclude Include="OutputManager.h" />
@@ -191,9 +194,9 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     <ClInclude Include="OutputVMultiDigitizer.h" />
     <ClInclude Include="OutputVMultiDigitizerRelative.h" />
     <ClInclude Include="OutputVMultiRelative.h" />
-    <ClInclude Include="PipeHandler.h" />
     <ClInclude Include="PositionRingBuffer.h" />
     <ClInclude Include="RelativeMouseState.h" />
+    <ClInclude Include="Runnable.h" />
     <ClInclude Include="ScreenMapper.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="Tablet.h" />
@@ -227,6 +230,9 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     <ClCompile Include="HIDDevice.cpp" />
     <ClCompile Include="InputEmulator.cpp" />
     <ClCompile Include="Logger.cpp" />
+    <ClCompile Include="NamedPipeInput.cpp" />
+    <ClCompile Include="NamedPipeServer.cpp" />
+    <ClCompile Include="NamedPipeState.cpp" />
     <ClCompile Include="Output.cpp" />
     <ClCompile Include="OutputDummy.cpp" />
     <ClCompile Include="OutputManager.cpp" />
@@ -237,9 +243,9 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     <ClCompile Include="OutputVMultiDigitizer.cpp" />
     <ClCompile Include="OutputVMultiDigitizerRelative.cpp" />
     <ClCompile Include="OutputVMultiRelative.cpp" />
-    <ClCompile Include="PipeHandler.cpp" />
     <ClCompile Include="PositionRingBuffer.cpp" />
     <ClCompile Include="RelativeMouseState.cpp" />
+    <ClCompile Include="Runnable.cpp" />
     <ClCompile Include="ScreenMapper.cpp" />
     <ClCompile Include="Tablet.cpp" />
     <ClCompile Include="TabletFilterAdvancedSmoothing.cpp" />
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index f84cfd6..5a55500 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -120,9 +120,6 @@
     <ClInclude Include="InputEmulator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PipeHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="TabletFilterAdvancedSmoothing.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -132,6 +129,18 @@
     <ClInclude Include="OutputVMultiDigitizerRelative.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="NamedPipeServer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="NamedPipeInput.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="NamedPipeState.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Runnable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -254,9 +263,6 @@
     <ClCompile Include="CommandHandler.Auxiliary.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PipeHandler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="TabletFilterAdvancedSmoothing.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -266,6 +272,18 @@
     <ClCompile Include="OutputVMultiDigitizerRelative.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="NamedPipeServer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="NamedPipeInput.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="NamedPipeState.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Runnable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">
diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
index b1d4dff..edab5f3 100644
--- a/TabletDriverService/TabletHandler.cpp
+++ b/TabletDriverService/TabletHandler.cpp
@@ -12,7 +12,7 @@ TabletHandler::TabletHandler() {
 	tablet = NULL;
 	tabletInputThread = NULL;
 	auxInputThread = NULL;
-	isRunning = false;
+	SetRunningState(false);
 	timerInterval = 20;
 	isTimerTickRunning = false;
 }
@@ -23,7 +23,7 @@ TabletHandler::TabletHandler() {
 //
 TabletHandler::~TabletHandler() {
 	StopTimer();
-	isRunning = false;
+	SetRunningState(false);
 	if(tablet != NULL) {
 		tablet->isOpen = false;
 	}
@@ -36,7 +36,7 @@ TabletHandler::~TabletHandler() {
 bool TabletHandler::Start() {
 	if(tablet == NULL) return false;
 	ChangeTimerInterval((int)round(timerInterval));
-	isRunning = true;
+	SetRunningState(true);
 	tabletInputThread = new thread(&TabletHandler::RunTabletInputThread, this);
 	auxInputThread = new thread(&TabletHandler::RunAuxInputThread, this);
 	return true;
@@ -47,7 +47,7 @@ bool TabletHandler::Start() {
 //
 bool TabletHandler::Stop() {
 	if(tablet == NULL) return false;
-	isRunning = false;
+	SetRunningState(false);
 	return true;
 }
 
@@ -83,6 +83,7 @@ bool TabletHandler::StopTimer() {
 	return false;
 }
 
+
 //
 // Change timer interval 
 //
@@ -421,7 +422,7 @@ void TabletHandler::RunTabletInputThread() {
 	//
 	// Tablet input main loop
 	//
-	while(isRunning) {
+	while(IsRunning()) {
 
 		//
 		// Read tablet position
@@ -579,7 +580,7 @@ void TabletHandler::RunTabletInputThread() {
 		WriteOutputState(&outputStateWrite);
 	}
 
-	isRunning = false;
+	SetRunningState(false);
 
 }
 
@@ -602,7 +603,7 @@ void TabletHandler::RunAuxInputThread()
 	//
 	// Auxiliary input main loop
 	//
-	while(isRunning) {
+	while(IsRunning()) {
 
 		// Read
 		reportStatus = tablet->ReadAuxReport();
diff --git a/TabletDriverService/TabletHandler.h b/TabletDriverService/TabletHandler.h
index 51a4a2b..65a686b 100644
--- a/TabletDriverService/TabletHandler.h
+++ b/TabletDriverService/TabletHandler.h
@@ -3,8 +3,9 @@
 #include <mutex>
 #include "Tablet.h"
 #include "InputEmulator.h"
+#include "Runnable.h"
 
-class TabletHandler {
+class TabletHandler : public Runnable {
 private:
 	Vector2D lastScrollPosition;
 	Vector2D scrollStartPosition;
@@ -28,7 +29,6 @@ class TabletHandler {
 	TabletState outputStateWrite;
 	InputEmulator inputEmulator;
 
-	bool isRunning;
 	bool isTimerTickRunning;
 
 	TabletHandler();
diff --git a/TabletDriverService/TabletMeasurement.cpp b/TabletDriverService/TabletMeasurement.cpp
index 4406eaf..89ab974 100644
--- a/TabletDriverService/TabletMeasurement.cpp
+++ b/TabletDriverService/TabletMeasurement.cpp
@@ -50,14 +50,14 @@ void TabletMeasurement::Start(int reportCount) {
 
 	lastPointTime = 0;
 
-	isRunning = true;
+	SetRunningState(true);
 }
 
 //
 // Stop measurement
 //
 void TabletMeasurement::Stop() {
-	isRunning = false;
+	SetRunningState(false);
 }
 
 
@@ -69,7 +69,7 @@ void TabletMeasurement::Update(TabletState state) {
 	DWORD time;
 
 
-	if(isRunning) {
+	if(IsRunning()) {
 		if(reportCounter > 0 || reportCounter <= -1) {
 
 			// X Limits
@@ -98,7 +98,7 @@ void TabletMeasurement::Update(TabletState state) {
 			reportCounter--;
 		}
 		else {
-			isRunning = false;
+			SetRunningState(false);
 		}
 	}
 }
\ No newline at end of file
diff --git a/TabletDriverService/TabletMeasurement.h b/TabletDriverService/TabletMeasurement.h
index 46bafac..65141a2 100644
--- a/TabletDriverService/TabletMeasurement.h
+++ b/TabletDriverService/TabletMeasurement.h
@@ -2,8 +2,9 @@
 
 #include "Vector2D.h"
 #include "TabletState.h"
+#include "Runnable.h"
 
-class TabletMeasurement {
+class TabletMeasurement : public Runnable {
 public:
 	Vector2D minimum;
 	Vector2D maximum;
@@ -12,7 +13,6 @@ class TabletMeasurement {
 
 	int totalReports;
 	int reportCounter;
-	bool isRunning;
 
 	TabletState lastState;
 	DWORD lastPointTime;
diff --git a/TabletDriverService/stdafx.h b/TabletDriverService/stdafx.h
index 758a55c..4103d92 100644
--- a/TabletDriverService/stdafx.h
+++ b/TabletDriverService/stdafx.h
@@ -16,7 +16,9 @@
 #include "ScreenMapper.h"
 #include "OutputManager.h"
 #include "CommandHandler.h"
-#include "PipeHandler.h"
+#include "NamedPipeServer.h"
+#include "NamedPipeInput.h"
+#include "NamedPipeState.h"
 
 // IntelliSense "fix"...
 //#define memcpy memcpy
@@ -31,7 +33,9 @@ extern Tablet *tablet;
 extern TabletHandler *tabletHandler;
 extern OutputManager *outputManager;
 extern ScreenMapper *mapper;
-extern PipeHandler *pipeHandler;
+extern NamedPipeInput *pipeInput;
+extern NamedPipeServer *pipeOutput;
+extern NamedPipeState *pipeState;
 extern void CleanupAndExit(int code);
 extern bool ProcessCommand(CommandLine *cmd);
 
diff --git a/TabletDriverService/tools/RunServiceOnly.bat b/TabletDriverService/tools/RunServiceOnly.bat
index 2344495..996ab13 100644
--- a/TabletDriverService/tools/RunServiceOnly.bat
+++ b/TabletDriverService/tools/RunServiceOnly.bat
@@ -1,2 +1,2 @@
 cd ..
-"bin\TabletDriverService.exe" "config\serviceonly.cfg"
\ No newline at end of file
+"bin\TabletDriverService.exe" "config\serviceonly.cfg" "ServiceOnly"
\ No newline at end of file

From 0d8cc3ef7d25aedb471be832ead11c62daae7b20 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Sun, 13 Jan 2019 21:08:55 +0200
Subject: [PATCH 80/83] Fixed multiple thread safety and stability issues

---
 TabletDriverGUI/Configuration.cs              |   4 +-
 TabletDriverGUI/MainWindow.Areas.cs           |  17 +-
 TabletDriverGUI/MainWindow.Settings.cs        |  20 +-
 TabletDriverGUI/MainWindow.xaml               | 530 ++++++++++--------
 TabletDriverGUI/MainWindow.xaml.cs            |   8 +
 TabletDriverGUI/NamedPipeClient.cs            |  30 +-
 TabletDriverGUI/TabletDriver.cs               |   6 +-
 TabletDriverGUI/WindowTabletView.xaml.cs      |  40 +-
 TabletDriverGUI/WindowTabletViewSettings.xaml |   3 +-
 .../WindowTabletViewSettings.xaml.cs          |   6 +-
 TabletDriverService/BufferQueue.cpp           | 102 ++++
 TabletDriverService/BufferQueue.h             |  27 +
 .../CommandHandler.Auxiliary.cpp              |  24 +-
 TabletDriverService/CommandHandler.Device.cpp | 102 ++--
 .../CommandHandler.Filters.cpp                | 100 ++--
 TabletDriverService/CommandHandler.Other.cpp  | 168 +++---
 TabletDriverService/CommandHandler.Tablet.cpp | 218 +++----
 TabletDriverService/CommandHandler.cpp        |  62 +-
 TabletDriverService/CommandHandler.h          |   1 +
 TabletDriverService/CommandLine.cpp           |  92 +--
 TabletDriverService/DataFormatter.cpp         |  10 +-
 TabletDriverService/HIDDevice.cpp             |  77 ++-
 TabletDriverService/InputEmulator.cpp         | 182 +++---
 TabletDriverService/InputEmulator.h           |   6 +-
 TabletDriverService/Logger.cpp                | 227 ++++----
 TabletDriverService/Logger.h                  |  24 +-
 TabletDriverService/Main.cpp                  | 115 ++--
 TabletDriverService/NamedPipeInput.cpp        |  31 +-
 TabletDriverService/NamedPipeInput.h          |   2 +-
 TabletDriverService/NamedPipeServer.cpp       | 521 ++++++++++++++---
 TabletDriverService/NamedPipeServer.h         |  34 +-
 TabletDriverService/NamedPipeState.cpp        |  31 +-
 TabletDriverService/NamedPipeState.h          |   5 +-
 TabletDriverService/Runnable.cpp              |   8 +-
 TabletDriverService/Runnable.h                |   4 +-
 TabletDriverService/Tablet.cpp                | 209 ++++---
 TabletDriverService/Tablet.h                  |  13 +-
 .../TabletDriverService.vcxproj               |   4 +-
 .../TabletDriverService.vcxproj.filters       |   6 +
 TabletDriverService/TabletFilterSmoothing.cpp |   1 +
 TabletDriverService/TabletHandler.cpp         | 334 +++++++----
 TabletDriverService/TabletHandler.h           |   5 +
 TabletDriverService/TabletSettings.h          |   1 +
 TabletDriverService/TabletState.cpp           |   1 +
 TabletDriverService/TabletState.h             |   2 +
 TabletDriverService/stdafx.h                  |  14 +-
 46 files changed, 2198 insertions(+), 1229 deletions(-)
 create mode 100644 TabletDriverService/BufferQueue.cpp
 create mode 100644 TabletDriverService/BufferQueue.h

diff --git a/TabletDriverGUI/Configuration.cs b/TabletDriverGUI/Configuration.cs
index ff41d47..25bd26b 100644
--- a/TabletDriverGUI/Configuration.cs
+++ b/TabletDriverGUI/Configuration.cs
@@ -122,6 +122,7 @@ public class TabletViewSettings
             public Point OffsetText;
             public Point OffsetPressure;
             public bool FadeInOut;
+            public bool Borderless;
             public TabletViewSettings()
             {
                 BackgroundColor = "#FFFFFF";
@@ -133,11 +134,12 @@ public TabletViewSettings()
                 InputTrailLength = 30;
                 OutputTrailLength = 30;
                 DrawLength = 0;
-                Font = "Arial";
+                Font = "Segoe UI";
                 FontSize = 25;
                 OffsetPressure = new Point(0, 0);
                 OffsetText = new Point(0, 0);
                 FadeInOut = false;
+                Borderless = false;
             }
         };
         public TabletViewSettings TabletView;
diff --git a/TabletDriverGUI/MainWindow.Areas.cs b/TabletDriverGUI/MainWindow.Areas.cs
index b0d35ae..0b5b8d6 100644
--- a/TabletDriverGUI/MainWindow.Areas.cs
+++ b/TabletDriverGUI/MainWindow.Areas.cs
@@ -908,18 +908,19 @@ void UpdateAreaInformation()
 
             // Screen area
             labelScreenAreaInfo.Content = areaText +
-                "" + Utils.GetNumberString(config.SelectedScreenArea.Width / config.SelectedScreenArea.Height, "0.000") + ":1" +
-                " | " + Utils.GetNumberString(config.SelectedScreenArea.Width * config.SelectedScreenArea.Height, "0") + " pixels";
+                Utils.GetNumberString(config.SelectedScreenArea.Width / config.SelectedScreenArea.Height, "0.000") + ":1 | " +
+                Utils.GetNumberString(config.SelectedScreenArea.Width * config.SelectedScreenArea.Height, "0") + " pixels";
 
             // Tablet area
             labelTabletAreaInfo.Content = areaText +
-                "" + Utils.GetNumberString(config.SelectedTabletArea.Width / config.SelectedTabletArea.Height, "0.000") + ":1" +
-                " | " + Utils.GetNumberString(config.SelectedTabletArea.Width * config.SelectedTabletArea.Height, "0") + " mm²" +
-                " " + Utils.GetNumberString(
+                Utils.GetNumberString(config.SelectedTabletArea.Width / config.SelectedTabletArea.Height, "0.000") + ":1 | " +
+                Utils.GetNumberString(config.SelectedTabletArea.Width * config.SelectedTabletArea.Height, "0") + " mm² " +
+                Utils.GetNumberString(
                     config.SelectedTabletArea.Width * config.SelectedTabletArea.Height /
                     (config.TabletFullArea.Width * config.TabletFullArea.Height) * 100.0
-                    , "0") + "%" +
-                " | " + Utils.GetNumberString(config.SelectedScreenArea.Width / config.SelectedTabletArea.Width, "0.0") + " x " +
+                    , "0") + "% of " +
+                Utils.GetNumberString(config.TabletFullArea.Width) + "x" + Utils.GetNumberString(config.TabletFullArea.Height) + " mm | " +
+                Utils.GetNumberString(config.SelectedScreenArea.Width / config.SelectedTabletArea.Width, "0.0") + "x" +
                 Utils.GetNumberString(config.SelectedScreenArea.Height / config.SelectedTabletArea.Height, "0.0") + " px/mm";
 
         }
@@ -995,7 +996,7 @@ private void CanvasArea_MouseUp(object sender, MouseButtonEventArgs e)
             canvasTabletArea.ReleaseMouseCapture();
 
             // Focus
-            if(sender == canvasScreenMap)
+            if (sender == canvasScreenMap)
                 canvasScreenMap.Focus();
             else if (sender == canvasTabletArea)
                 canvasTabletArea.Focus();
diff --git a/TabletDriverGUI/MainWindow.Settings.cs b/TabletDriverGUI/MainWindow.Settings.cs
index 4714655..5ad54af 100644
--- a/TabletDriverGUI/MainWindow.Settings.cs
+++ b/TabletDriverGUI/MainWindow.Settings.cs
@@ -1401,17 +1401,6 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
             }
 
 
-            //
-            // Fit window to content
-            //
-            else if (sender == mainMenuFitToContent)
-            {
-                SizeToContent = SizeToContent.WidthAndHeight;
-                UpdateLayout();
-                SizeToContent = SizeToContent.Manual;
-            }
-
-
             //
             // Update desktop image
             //
@@ -1433,6 +1422,15 @@ private void MainMenuClick(object sender, RoutedEventArgs e)
             }
 
 
+            //
+            // Fit window to content
+            //
+            else if (sender == mainMenuFitToContent)
+            {
+                SizeToContent = SizeToContent.WidthAndHeight;
+                UpdateLayout();
+                SizeToContent = SizeToContent.Manual;
+            }
 
         }
 
diff --git a/TabletDriverGUI/MainWindow.xaml b/TabletDriverGUI/MainWindow.xaml
index 0d1573e..f20350b 100644
--- a/TabletDriverGUI/MainWindow.xaml
+++ b/TabletDriverGUI/MainWindow.xaml
@@ -5,46 +5,92 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         Keyboard.PreviewKeyDown="Window_PreviewKeyDown"
-        Title="TabletDriverGUI" Height="703" Width="680"
-        >
+        Title="TabletDriverGUI" Height="750" Width="770">
+  <Window.Resources>
 
-  <Window.DataContext>
-    <Binding Source="config"/>
-  </Window.DataContext>
+    <!-- Default colors -->
+    <SolidColorBrush x:Key="DefaultBackground" Color="#fff" />
+    <SolidColorBrush x:Key="DefaultControlBackground" Color="#fff" />
+    <SolidColorBrush x:Key="DefaultButtonBackground" Color="#eee" />
+    <SolidColorBrush x:Key="DefaultForeground" Color="#000" />
 
-  <Window.Resources>
+    <Style x:Key="StylePanel" TargetType="Panel">
+      <Setter Property="Background" Value="{StaticResource DefaultBackground}"/>
+    </Style>
+    <Style x:Key="StyleContentControl" TargetType="ContentControl">
+      <Setter Property="Foreground" Value="{StaticResource DefaultForeground}"/>
+      <Setter Property="Background" Value="{StaticResource DefaultBackground}"/>
+    </Style>
+    <Style TargetType="StackPanel" BasedOn="{StaticResource StylePanel}" />
+    <Style TargetType="ScrollViewer" BasedOn="{StaticResource StyleContentControl}" />
+    <Style TargetType="Grid"  BasedOn="{StaticResource StylePanel}"/>
+    <Style TargetType="TabControl">
+      <Setter Property="Foreground" Value="{StaticResource DefaultForeground}"/>
+      <Setter Property="Background" Value="{StaticResource DefaultBackground}"/>
+    </Style>
+
+    <Style TargetType="StatusBar">
+      <Setter Property="Foreground" Value="{StaticResource DefaultForeground}"/>
+      <Setter Property="Background" Value="{StaticResource DefaultButtonBackground}"/>
+    </Style>
 
-    <!-- GroupBox style -->
+
+    <Style TargetType="Button">
+      <Setter Property="Foreground" Value="{StaticResource DefaultForeground}"/>
+      <Setter Property="Background" Value="{StaticResource DefaultButtonBackground}"/>
+    </Style>
+
+    <Style TargetType="CheckBox">
+      <Setter Property="Foreground" Value="{StaticResource DefaultForeground}"/>
+      <Setter Property="Background" Value="{StaticResource DefaultControlBackground}"/>
+    </Style>
+    <Style TargetType="RadioButton">
+      <Setter Property="Foreground" Value="{StaticResource DefaultForeground}"/>
+      <Setter Property="Background" Value="{StaticResource DefaultControlBackground}"/>
+    </Style>
+    <Style TargetType="Label">
+      <Setter Property="Foreground" Value="{StaticResource DefaultForeground}"/>
+    </Style>
+    <Style TargetType="ComboBox">
+      <Setter Property="Foreground" Value="{StaticResource DefaultForeground}"/>
+      <Setter Property="Background" Value="{StaticResource DefaultControlBackground}"/>
+    </Style>
+    <Style TargetType="ComboBoxItem">
+      <Setter Property="Foreground" Value="{StaticResource DefaultForeground}"/>
+      <Setter Property="Background" Value="{StaticResource DefaultControlBackground}"/>
+    </Style>
+
+    <!-- GroupBox  style -->
     <Style TargetType="GroupBox">
       <Setter Property="HeaderTemplate">
         <Setter.Value>
           <DataTemplate>
-            <TextBlock Text="{Binding}" FontWeight="Bold"/>
+            <Label Margin="0,0,0,1" Padding="0" FontWeight="Bold" Content="{Binding}"/>
           </DataTemplate>
         </Setter.Value>
       </Setter>
     </Style>
 
-    <!-- TextBox style -->
 
+    <!-- TextBox style -->
     <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#999" />
     <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#f9f9f9" />
 
-    <Style x:Key="ControlStyleTextBox" TargetType="Control">
+    <Style TargetType="TextBox">
+      <Setter Property="Foreground" Value="{StaticResource DefaultForeground}"/>
+      <Setter Property="Background" Value="{StaticResource DefaultControlBackground}"/>
       <Setter Property="HorizontalContentAlignment" Value="Left"/>
       <Setter Property="VerticalContentAlignment" Value="Center"/>
-    </Style>
-    <Style BasedOn="{StaticResource ControlStyleTextBox}" TargetType="TextBox">
       <Setter Property="Padding" Value="5,0"/>
       <Setter Property="Template">
         <Setter.Value>
           <ControlTemplate TargetType="TextBox">
             <Border Name="Bd" BorderThickness="{TemplateBinding BorderThickness}" 
-                                             BorderBrush="{TemplateBinding BorderBrush}" 
-                                             Background="{TemplateBinding Background}" 
-                                             SnapsToDevicePixels="true">
+                    BorderBrush="{TemplateBinding BorderBrush}" 
+                    Background="{TemplateBinding Background}" 
+                    SnapsToDevicePixels="true">
               <ScrollViewer Name="PART_ContentHost" Background="{TemplateBinding Background}" 
-                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
             </Border>
             <ControlTemplate.Triggers>
               <Trigger Property="IsEnabled" Value="False">
@@ -59,7 +105,7 @@
 
   </Window.Resources>
 
-  <Grid Background="Transparent" Margin="0,0,0,0">
+  <Grid Margin="0,0,0,0">
     <Grid.RowDefinitions>
       <RowDefinition Height="auto"/>
       <RowDefinition Height="*"/>
@@ -70,41 +116,60 @@
     <DockPanel Grid.Row="0" Background="White" Height="18">
       <Menu DockPanel.Dock="Top"  Background="White">
         <MenuItem Header="Fil_e">
-          <MenuItem Name="mainMenuSaveSettings" Header="_Save settings" InputGestureText="Ctrl+S" Click="MainMenuClick" />
+          <MenuItem Name="mainMenuSaveSettings" Header="_Save settings" InputGestureText="Ctrl+S" Click="MainMenuClick"
+                    ToolTip="Save and apply settings."
+                    />
           <Separator/>
-          <MenuItem Name="mainMenuImport" InputGestureText="Ctrl+I" Header="_Import Settings" Click="MainMenuClick" />
-          <MenuItem Name="mainMenuExport" InputGestureText="Ctrl+E" Header="_Export Settings" Click="MainMenuClick" />
+          <MenuItem Name="mainMenuImport" InputGestureText="Ctrl+I" Header="_Import Settings" Click="MainMenuClick"
+                    ToolTip="Import settings from a XML file."
+                    />
+          <MenuItem Name="mainMenuExport" InputGestureText="Ctrl+E" Header="_Export Settings" Click="MainMenuClick"
+                    ToolTip="Export settings to a XML file."
+                    />
           <Separator/>
-          <MenuItem Name="mainMenuResetToDefault" Header="_Reset to default" Click="MainMenuClick" />
+          <MenuItem Name="mainMenuResetToDefault" Header="_Reset to default" Click="MainMenuClick"
+                    ToolTip="Resets all settings to default values."
+                    />
           <Separator />
-          <MenuItem Name="mainMenuExitGUI" Header="Exit _GUI Only" Click="MainMenuClick" />
-          <MenuItem Name="mainMenuExit" Header="Shutdown and E_xit" Click="MainMenuClick" />          
+          <MenuItem Name="mainMenuExitGUI" Header="Close _GUI" Click="MainMenuClick"
+                    ToolTip="Closes the GUI without stopping the driver." />
+          <MenuItem Name="mainMenuExit" Header="E_xit" Click="MainMenuClick"
+                    ToolTip="Stops the driver and closes the GUI"
+                    />
         </MenuItem>
         <MenuItem Header="_Tools">
-          <MenuItem Header="Show folder">
-            <MenuItem Name="mainMenuOpenCurrentDirectory" Header="_TabletDriver" Click="MainMenuClick" />
-            <MenuItem Name="mainMenuOpenConfig" Header="_Config" Click="MainMenuClick" />
-            <MenuItem Name="mainMenuOpenTools" Header="T_ools" Click="MainMenuClick" />
+          <MenuItem Header="Show folder" IsCheckable="False">
+            <MenuItem Name="mainMenuOpenCurrentDirectory" Header="_TabletDriver" Click="MainMenuClick"
+                      ToolTip="Opens the TabletDriver folder."
+                      />
+            <MenuItem Name="mainMenuOpenConfig" Header="_Config" Click="MainMenuClick"
+                      ToolTip="Opens the TabletDriver config folder."
+                      />
+            <MenuItem Name="mainMenuOpenTools" Header="T_ools" Click="MainMenuClick"
+                      ToolTip="Opens the TabletDriver tools folder."
+                      />
           </MenuItem>
           <MenuItem Name="mainMenuTabletView" Header="_Tablet View" Click="MainMenuClick" />
           <MenuItem Name="mainMenuTabletViewSettings" Header="Tablet View _Settings" Click="MainMenuClick" />
-          <MenuItem Name="mainMenuUpdateDesktopImage" Header="_Update desktop image" Click="MainMenuClick" />
-          <MenuItem Name="mainMenuFitToContent" Header="_Fit window to content" Click="MainMenuClick" />
+          <MenuItem Name="mainMenuUpdateDesktopImage" Header="_Update desktop image" Click="MainMenuClick"
+                    ToolTip="Updates the screen map desktop image."
+                    />
+          <MenuItem Name="mainMenuFitToContent" Header="_Fit window" Click="MainMenuClick"
+                    ToolTip="Fits the GUI window to content of active tab."
+                    />
         </MenuItem>
       </Menu>
       <TextBox AcceptsReturn="True" />
     </DockPanel>
 
     <TabControl Grid.Row="1" Name="tabControl"
-                Background="White"
-                Selector.IsSelected="True"
-                SelectionChanged="TabControl_SelectionChanged"
-                >
+                    Selector.IsSelected="True"
+                    SelectionChanged="TabControl_SelectionChanged">
 
       <!-- Area tab -->
       <TabItem Name="tabArea"
                Margin="10,0,-10,0"
-               Padding="10,5">
+               Padding="10,5" BorderThickness="0">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#006600" FontWeight="Bold">
             <AccessText Text="_Area"/>
@@ -152,7 +217,7 @@
                   <RowDefinition Height="auto"/>
                 </Grid.RowDefinitions>
 
-                
+
                 <!-- Screen map canvas -->
                 <Canvas Name="canvasScreenMap"
                         Grid.Row="0"
@@ -184,59 +249,59 @@
                 </Canvas>
 
                 <StackPanel Grid.Row="1" Orientation="Vertical" >
-                <!-- Screen area information -->
-                <Label Name="labelScreenAreaInfo"
+                  <!-- Screen area information -->
+                  <Label Name="labelScreenAreaInfo"
                        HorizontalAlignment="Center"
                        FontSize="11"
                        FontWeight="Bold"
                        Padding="0">
-                  RATIO 1.777:1
-                </Label>
+                    RATIO 1.777:1
+                  </Label>
 
-                <!-- Screen map controls -->
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                  <!-- Screen map controls -->
+                  <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
 
-                  <!-- Screen Area Width -->
-                  <GroupBox Header="Width" Height="50" Width="100">
-                    <Grid>
-                      <TextBox Name="textScreenAreaWidth" TextChanged="TextChanged" />
-                      <Label HorizontalAlignment="Right">px</Label>
-                    </Grid>
-                  </GroupBox>
+                    <!-- Screen Area Width -->
+                    <GroupBox Header="Width" Height="50" Width="100">
+                      <Grid>
+                        <TextBox Name="textScreenAreaWidth" TextChanged="TextChanged" />
+                        <Label HorizontalAlignment="Right">px</Label>
+                      </Grid>
+                    </GroupBox>
 
-                  <!-- Screen Area Height -->
-                  <GroupBox Header="Height" Height="50" Width="100" Margin="5,0,0,0">
-                    <Grid>
-                      <TextBox Name="textScreenAreaHeight" TextChanged="TextChanged"/>
-                      <Label HorizontalAlignment="Right">px</Label>
-                    </Grid>
-                  </GroupBox>
+                    <!-- Screen Area Height -->
+                    <GroupBox Header="Height" Height="50" Width="100" Margin="5,0,0,0">
+                      <Grid>
+                        <TextBox Name="textScreenAreaHeight" TextChanged="TextChanged"/>
+                        <Label HorizontalAlignment="Right">px</Label>
+                      </Grid>
+                    </GroupBox>
 
-                  <!-- Screen Area Left -->
-                  <GroupBox Header="Left Offset" Height="50" Width="100" Margin="5,0,0,0">
-                    <Grid>
-                      <TextBox Name="textScreenAreaX" TextChanged="TextChanged"/>
-                      <Label HorizontalAlignment="Right">px</Label>
-                    </Grid>
-                  </GroupBox>
+                    <!-- Screen Area Left -->
+                    <GroupBox Header="Left Offset" Height="50" Width="100" Margin="5,0,0,0">
+                      <Grid>
+                        <TextBox Name="textScreenAreaX" TextChanged="TextChanged"/>
+                        <Label HorizontalAlignment="Right">px</Label>
+                      </Grid>
+                    </GroupBox>
 
-                  <!-- Screen Area Top -->
-                  <GroupBox Header="Top Offset" Height="50" Width="100" Margin="5,0,0,0">
-                    <Grid>
-                      <TextBox Name="textScreenAreaY" TextChanged="TextChanged"/>
-                      <Label HorizontalAlignment="Right">px</Label>
-                    </Grid>
-                  </GroupBox>
+                    <!-- Screen Area Top -->
+                    <GroupBox Header="Top Offset" Height="50" Width="100" Margin="5,0,0,0">
+                      <Grid>
+                        <TextBox Name="textScreenAreaY" TextChanged="TextChanged"/>
+                        <Label HorizontalAlignment="Right">px</Label>
+                      </Grid>
+                    </GroupBox>
 
-                  <!-- Move area to -->
-                  <GroupBox Header="Move Area To" Height="50" Width="150" Margin="5,0,0,0">
-                    <ComboBox Name="comboBoxMonitor"
-                              PreviewMouseDown="ComboBoxMonitor_MouseDown"
-                              SelectionChanged="ComboBoxMonitor_SelectionChanged"
-                              />
-                  </GroupBox>
+                    <!-- Move area to -->
+                    <GroupBox Header="Move Area To" Height="50" Width="150" Margin="5,0,0,0">
+                      <ComboBox Name="comboBoxMonitor"
+                                PreviewMouseDown="ComboBoxMonitor_MouseDown"
+                                SelectionChanged="ComboBoxMonitor_SelectionChanged"
+                                />
+                    </GroupBox>
 
-                </StackPanel>
+                  </StackPanel>
 
                 </StackPanel>
               </Grid>
@@ -295,8 +360,8 @@
                       <CheckBox Name="checkBoxInvert" Margin="5"
                                 VerticalAlignment="Bottom"
                                 VerticalContentAlignment="Center"
-                            Checked="CheckboxChanged"
-                            Unchecked="CheckboxChanged">
+                                Checked="CheckboxChanged"
+                                Unchecked="CheckboxChanged">
                         <TextBlock>
                           Left handed
                           <LineBreak/>
@@ -340,7 +405,6 @@
                       <!-- Wacom Area -->
                       <Button Name="buttonWacomArea"
                               Padding="5"
-                              Width="80"
                               Margin="0,0,3,0"
                               Click="ButtonWacomArea_Click">
                         Wacom Area
@@ -351,8 +415,8 @@
 
                   <!-- Tablet area canvas -->
                   <Canvas Grid.Column="1" Name="canvasTabletArea"
-                          Width="200"
-                          Height="120"
+                          Width="260"
+                          Height="150"
                           Margin="5,0,5,0"
                           Background="Transparent"
                           ClipToBounds="True"
@@ -367,7 +431,7 @@
                         <MenuItem Header="" Name="menuCanvasTabletAreaInfo" FontWeight="Bold"/>
                         <MenuItem Name="menuCanvasMoveToCenter" Header="Move to center" Click="CanvasArea_MenuClick" />
                         <MenuItem Name="menuCanvasSetToFullTabletArea" Header="Set to full area" Click="CanvasArea_MenuClick" />
-                        <MenuItem Name="menuCanvasForceProportions" Header="Force proportions" Click="CanvasArea_MenuClick" />                        
+                        <MenuItem Name="menuCanvasForceProportions" Header="Force proportions" Click="CanvasArea_MenuClick" />
                         <Separator/>
                         <MenuItem Name="menuCanvasAddTabletArea" Header="Add area" Click="CanvasArea_MenuClick" />
                         <MenuItem Name="menuCanvasEditTabletArea" Header="Edit area" Click="CanvasArea_MenuClick" />
@@ -623,19 +687,19 @@
 
                   <!-- Scroll stop cursor -->
                   <CheckBox Name="checkBoxScrollStopCursor"
-                          Margin="7,5,0,0"
-                          HorizontalAlignment="Left"
-                          Checked="CheckboxChanged"
-                          Unchecked="CheckboxChanged">
+                            Margin="7,5,0,0"
+                            HorizontalAlignment="Left"
+                            Checked="CheckboxChanged"
+                            Unchecked="CheckboxChanged">
                     <TextBlock>Stop cursor</TextBlock>
                   </CheckBox>
 
                   <!-- Scroll drag -->
                   <CheckBox Name="checkBoxScrollDrag"
-                          Margin="7,5,0,0"
-                          HorizontalAlignment="Left"
-                          Checked="CheckboxChanged"
-                          Unchecked="CheckboxChanged">
+                            Margin="7,5,0,0"
+                            HorizontalAlignment="Left"
+                            Checked="CheckboxChanged"
+                            Unchecked="CheckboxChanged">
                     <TextBlock>Drag scroll</TextBlock>
                   </CheckBox>
 
@@ -661,18 +725,17 @@
 
                       <!-- Pressure slider -->
                       <Slider Grid.Column="1" Name="sliderPressureSensitivity"
-                            IsSnapToTickEnabled="True"
-                            TickFrequency="0.2"
-                            TickPlacement="Both"
-                            SmallChange="0.2"
-                            LargeChange="0.2"
-                            Value="0.0"
-                            Minimum="-2"
-                            Maximum="2"
-                            IsDirectionReversed="True"
-                            ValueChanged="SliderPressure_ValueChanged"
-                            >
-                      </Slider>
+                              IsSnapToTickEnabled="True"
+                              TickFrequency="0.2"
+                              TickPlacement="Both"
+                              SmallChange="0.2"
+                              LargeChange="0.2"
+                              Value="0.0"
+                              Minimum="-2"
+                              Maximum="2"
+                              IsDirectionReversed="True"
+                              ValueChanged="SliderPressure_ValueChanged"
+                              />
                       <Label Grid.Column="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">Hard</Label>
                     </Grid>
                   </GroupBox>
@@ -696,18 +759,17 @@
 
                         <!-- Deadzone slider -->
                         <Slider Grid.Column="1" Name="sliderPressureDeadzoneLow"
-                            IsSnapToTickEnabled="True"
-                            TickFrequency="0.025"
-                            TickPlacement="Both"
-                            SmallChange="0.025"
-                            LargeChange="0.025"
-                            Value="0.0"
-                            Minimum="0"
-                            Maximum="0.5"
-                            ToolTip="0%"
-                            ValueChanged="SliderPressure_ValueChanged"
-                            >
-                        </Slider>
+                                IsSnapToTickEnabled="True"
+                                TickFrequency="0.025"
+                                TickPlacement="Both"
+                                SmallChange="0.025"
+                                LargeChange="0.025"
+                                Value="0.0"
+                                Minimum="0"
+                                Maximum="0.5"
+                                ToolTip="0%"
+                                ValueChanged="SliderPressure_ValueChanged"
+                                />
                         <Label Grid.Column="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">
                           50%
                         </Label>
@@ -730,19 +792,18 @@
 
                         <!-- Deadzone slider -->
                         <Slider Grid.Column="1" Name="sliderPressureDeadzoneHigh"
-                            IsSnapToTickEnabled="True"
-                            TickFrequency="0.025"
-                            TickPlacement="Both"
-                            SmallChange="0.025"
-                            LargeChange="0.025"
-                            Value="0.0"
-                            Minimum="0"
-                            Maximum="0.5"
-                            ToolTip="0%"
-                            IsDirectionReversed="True"
-                            ValueChanged="SliderPressure_ValueChanged"
-                            >
-                        </Slider>
+                                IsSnapToTickEnabled="True"
+                                TickFrequency="0.025"
+                                TickPlacement="Both"
+                                SmallChange="0.025"
+                                LargeChange="0.025"
+                                Value="0.0"
+                                Minimum="0"
+                                Maximum="0.5"
+                                ToolTip="0%"
+                                IsDirectionReversed="True"
+                                ValueChanged="SliderPressure_ValueChanged"
+                                />
                         <Label Grid.Column="2" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="40" FontWeight="DemiBold">0%</Label>
                       </Grid>
                     </GroupBox>
@@ -755,31 +816,28 @@
                   <!-- Pressure Tester  -->
                   <GroupBox Header="Test" Padding="2">
                     <StackPanel Orientation="Vertical">
-                      <Border BorderThickness="2"
-                          BorderBrush="#335"
-                          >
+                      <Border BorderThickness="2" BorderBrush="#335">
 
                         <!-- Ink Canvas -->
                         <InkCanvas Width="470"
-                             Height="250"
-                             Name="inkCanvas"
-                             Background="#f6f6f6"
-                             StylusUp="InkCanvas_StylusUp"
-                             StylusMove="InkCanvas_StylusMove"
-                             KeyDown="InkCanvas_KeyDown"
-                             >
-                        </InkCanvas>
+                                   Height="250"
+                                   Name="inkCanvas"
+                                   Background="#f6f6f6"
+                                   StylusUp="InkCanvas_StylusUp"
+                                   StylusMove="InkCanvas_StylusMove"
+                                   KeyDown="InkCanvas_KeyDown"
+                                   />
                       </Border>
 
                       <!-- Pressure Bar -->
                       <ProgressBar Name="progressPressure"
-                             Minimum="0"
-                             Value="0.0"
-                             Maximum="1.0"
-                             Height="10"
-                             Background="#f6f6f6"
-                             Foreground="#555"
-                             />
+                                   Minimum="0"
+                                   Value="0.0"
+                                   Maximum="1.0"
+                                   Height="10"
+                                   Background="#f6f6f6"
+                                   Foreground="#555"
+                                   />
                     </StackPanel>
                   </GroupBox>
 
@@ -794,41 +852,40 @@
 
                     <!-- Clear Ink -->
                     <Button Name="buttonInkClear" Content="Clear"
-                          Grid.Column="0"
-                          HorizontalAlignment="Left"
-                          Padding="5"
-                          Width="100"
-                          FontWeight="Bold"
-                          Click="ButtonInkClear_Click" />
-
+                            Grid.Column="0"
+                            HorizontalAlignment="Left"
+                            Padding="5"
+                            Width="100"
+                            FontWeight="Bold"
+                            Click="ButtonInkClear_Click" />
 
                     <!-- Undo -->
                     <Button Name="buttonInkUndo" Content="Undo"
-                          Grid.Column="1"
-                          Width="80"
-                          Padding="5"
-                          Margin="0,0,3,0"
-                          FontWeight="Bold"
-                          Click="ButtonInkUndo_Click" />
+                            Grid.Column="1"
+                            Width="80"
+                            Padding="5"
+                            Margin="0,0,3,0"
+                            FontWeight="Bold"
+                            Click="ButtonInkUndo_Click" />
 
                     <!-- Redo -->
                     <Button Name="buttonInkRedo" Content="Redo"
-                          Grid.Column="2"
-                          Width="80"
-                          Margin="3,0,0,0"
-                          Padding="5"
-                          FontWeight="Bold"
-                          Click="ButtonInkRedo_Click" />
+                            Grid.Column="2"
+                            Width="80"
+                            Margin="3,0,0,0"
+                            Padding="5"
+                            FontWeight="Bold"
+                            Click="ButtonInkRedo_Click" />
 
 
                     <!-- Save as PNG -->
                     <Button Name="buttonInkSave" Content="Save as PNG"
-                          Grid.Column="3"
-                          HorizontalAlignment="Right"
-                          Width="100"
-                          Padding="5"
-                          FontWeight="Bold"
-                          Click="ButtonInkSave_Click" />
+                            Grid.Column="3"
+                            HorizontalAlignment="Right"
+                            Width="100"
+                            Padding="5"
+                            FontWeight="Bold"
+                            Click="ButtonInkSave_Click" />
 
 
                   </Grid>
@@ -850,9 +907,9 @@
                     Tablet Buttons
                   </TextBlock>
                   <TextBlock>
-                      - You can disable a single button by clicking "Clear" in the mapping dialog.
-                      <LineBreak/>
-                      - The "Disable buttons" checkbox will disable all tablet buttons.
+                    - You can disable a single button by clicking "Clear" in the mapping dialog.
+                    <LineBreak/>
+                    - The "Disable buttons" checkbox will disable all tablet buttons.
                   </TextBlock>
                 </StackPanel>
               </GroupBox.ToolTip>
@@ -871,7 +928,7 @@
       <TabItem Name="tabFilters" Margin="10,0,-10,0" Padding="10,5">
         <TabItem.Header>
           <TextBlock FontSize="14" Foreground="#003399" FontWeight="Bold">
-            <AccessText Text="_Filters"/>
+                        <AccessText Text="_Filters"/>
           </TextBlock>
         </TabItem.Header>
         <StackPanel Orientation="Vertical" Margin="5,0,5,0"  Width="650" HorizontalAlignment="Left">
@@ -895,7 +952,7 @@
                       Recommendations
                     </TextBlock>
                     <LineBreak/>
-                    On Wacom tablets you can use latency value between 15 and 25 to have a similar smoothing as in the Wacom drivers.
+                    On Wacom tablets you can use latency value between 10 and 15 to have a similar smoothing as in the Wacom drivers.
                     <LineBreak/>
                     You can test out different filter values, but recommended maximum for osu! is around 50 milliseconds.
                     <LineBreak/>
@@ -911,9 +968,9 @@
 
               <!-- Filter enabled -->
               <CheckBox Name="checkBoxSmoothing"
-                            VerticalAlignment="Center"
-                            Margin="5,10,5,0"
-                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">
+                        VerticalAlignment="Center"
+                        Margin="5,10,5,0"
+                        Checked="CheckboxChanged" Unchecked="CheckboxChanged">
               </CheckBox>
 
 
@@ -957,8 +1014,8 @@
           </GroupBox>
 
           <!-- Noise filter -->
-          <GroupBox Name="groupNoiseFilter" Header="Noise Reduction Filter"
-                      Margin="0,5,0,0" >
+          <GroupBox Name="groupNoiseFilter" Header="Noise Reduction Filter" Margin="0,5,0,0">
+
             <GroupBox.ToolTip>
               <StackPanel>
                 <TextBlock FontWeight="Bold" FontSize="16">
@@ -1016,9 +1073,9 @@
 
               <!-- Noise filter enabled -->
               <CheckBox Name="checkBoxNoiseFilter"
-                            VerticalAlignment="Center"
-                            Margin="5,10,5,0"
-                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">
+                        VerticalAlignment="Center"
+                        Margin="5,10,5,0"
+                        Checked="CheckboxChanged" Unchecked="CheckboxChanged">
               </CheckBox>
 
 
@@ -1042,8 +1099,8 @@
 
               <GroupBox Header="Preset" IsEnabled="{Binding ElementName=checkBoxNoiseFilter, Path=IsChecked}">
                 <ComboBox Name="comboBoxNoiseReductionPresets"
-                            Width="150" 
-                            VerticalContentAlignment="Center">
+                          Width="150" 
+                          VerticalContentAlignment="Center">
                 </ComboBox>
               </GroupBox>
 
@@ -1051,9 +1108,8 @@
           </GroupBox>
 
           <!-- Anti-smoothing filter -->
-          <GroupBox Name="groupAntiSmoothingFilter" Header="Anti-smoothing Filter"
-                      Margin="0,5,0,0"
-            >
+          <GroupBox Name="groupAntiSmoothingFilter" Header="Anti-smoothing Filter" Margin="0,5,0,0">
+
             <GroupBox.ToolTip>
               <StackPanel>
                 <TextBlock FontWeight="Bold" FontSize="16">
@@ -1139,8 +1195,8 @@
 
                 <!-- Anti-smoothing drag multiplier -->
                 <GroupBox Header="Drag Multiplier"
-                        IsEnabled="{Binding ElementName=checkBoxAntiSmoothing, Path=IsChecked}"
-                        Height="50" Margin="0,0,0,0">
+                          IsEnabled="{Binding ElementName=checkBoxAntiSmoothing, Path=IsChecked}"
+                          Height="50" Margin="0,0,0,0">
                   <TextBox Name="textAntiSmoothingDragMultiplier" TextChanged="TextChanged">1.0</TextBox>
                 </GroupBox>
 
@@ -1165,39 +1221,15 @@
                 <GroupBox Header="Velocity" Name="groupBoxAntiSmoothingVelocity">
                   <StackPanel Orientation="Vertical" Name="stackPanelAntiSmoothingVelocity"/>
                 </GroupBox>
+
                 <GroupBox Header="Shape" Name="groupBoxAntiSmoothingShape">
                   <StackPanel Orientation="Vertical" Name="stackPanelAntiSmoothingShape"/>
                 </GroupBox>
+
                 <GroupBox Header="Compensation" Name="groupBoxAntiSmoothingCompensation">
                   <StackPanel Orientation="Vertical" Name="stackPanelAntiSmoothingCompensation"/>
                 </GroupBox>
 
-                <!-- Anti-smoothing velocity -->
-                <!--
-                <GroupBox Header="Speed" Height="50" Margin="0,0,0,0" Width="90">
-                  <Grid>
-                    <TextBox Name="textAntiSmoothingVelocity" TextChanged="TextChanged">999</TextBox>
-                    <Label HorizontalAlignment="Right">mm/s</Label>
-                  </Grid>
-                </GroupBox>
-                -->
-
-                <!-- Anti-smoothing power -->
-                <!--
-                <GroupBox Header="Shape" Height="50" Margin="0,0,0,0" Width="60">
-                  <TextBox Name="textAntiSmoothingShape" TextChanged="TextChanged">0.3</TextBox>
-                </GroupBox>
-                -->
-
-                <!-- Anti-smoothing compensation -->
-                <!--
-                <GroupBox Header="Compensation" Height="50" Margin="0,0,0,0">
-                  <Grid>
-                    <TextBox Name="textAntiSmoothingCompensation" TextChanged="TextChanged">20</TextBox>
-                    <Label HorizontalAlignment="Right">ms</Label>
-                  </Grid>
-                </GroupBox>
-                -->
               </StackPanel>
 
             </StackPanel>
@@ -1226,9 +1258,9 @@
                     Desktop Size
                 </TextBlock>
                 <TextBlock>
-                      - In some cases you may have to disable the auto size and manually type in the main monitor resolution.
-                      <LineBreak/>
-                      - If you don't have problems with screen mapping, leave the automatic desktop size enabled.
+                  - In some cases you may have to disable the auto size and manually type in the main monitor resolution.
+                  <LineBreak/>
+                  - If you don't have problems with screen mapping, leave the automatic desktop size enabled.
                 </TextBlock>
               </StackPanel>
             </GroupBox.ToolTip>
@@ -1251,10 +1283,10 @@
               </GroupBox>
 
               <CheckBox Name="checkBoxAutomaticDesktopSize"
-                            VerticalAlignment="Center"
-                            VerticalContentAlignment="Center"
-                            Margin="5,10,5,0"
-                            Checked="CheckboxChanged" Unchecked="CheckboxChanged">Auto</CheckBox>
+                        VerticalAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        Margin="5,10,5,0"
+                        Checked="CheckboxChanged" Unchecked="CheckboxChanged">Auto</CheckBox>
             </StackPanel>
           </GroupBox>
 
@@ -1298,7 +1330,6 @@
                   <MenuItem Command="ApplicationCommands.Copy" />
                   <MenuItem Command="ApplicationCommands.Paste" />
                   <MenuItem Command="ApplicationCommands.SelectAll" />
-                  <!-- <MenuItem Name="menuCommandsTest" Header="Test" /> -->
                 </ContextMenu>
               </TextBox.ContextMenu>
             </TextBox>
@@ -1325,10 +1356,9 @@
 
             <!-- Console output -->
             <TextBlock Name="textConsole"  TextWrapping="NoWrap" Text=""
-                     Background="Black"
-                     Foreground="White"
-                     FontFamily="Courier New" FontSize="12"                   
-                     >
+                       Background="Black"
+                       Foreground="White"
+                       FontFamily="Courier New" FontSize="12">
               
               <!-- Console Context Menu -->
               <TextBlock.ContextMenu>
@@ -1366,18 +1396,19 @@
             <TextBox Grid.Column="0" Name="textConsoleInput" Height="20" TextWrapping="Wrap" Text=""
                      VerticalContentAlignment="Center"
                      Padding="0"
-                   FontFamily="Courier New" Background="White" Foreground="Black"
-                   FontSize="12"
-                   TabIndex="2"
-                   PreviewKeyDown="TextConsoleInput_PreviewKeyDown"
-                   KeyDown="TextConsoleInput_KeyDown"
-             />
+                     FontFamily="Courier New"
+                     FontSize="12"
+                     TabIndex="2"
+                     PreviewKeyDown="TextConsoleInput_PreviewKeyDown"
+                     KeyDown="TextConsoleInput_KeyDown"
+                     />
             <CheckBox Grid.Column="1" Name="checkBoxDebugging"
                       Height="16"
                       Margin="5,1,0,0"
                       Checked="CheckboxChanged"
-                      Unchecked="CheckboxChanged"
-            >Debug</CheckBox>
+                      Unchecked="CheckboxChanged">
+              Debug
+            </CheckBox>
           </Grid>
         </Grid>
 
@@ -1385,6 +1416,7 @@
 
     </TabControl>
 
+    <!-- Bottom controls -->
     <Grid Grid.Row="2" Margin="5,0">
 
       <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
@@ -1413,24 +1445,34 @@
 
         <!-- Automatic restart -->
         <CheckBox Name="checkBoxAutomaticRestart" Margin="5,5,5,5" 
-                VerticalAlignment="Center" VerticalContentAlignment="Center"
-                Checked="CheckboxChanged" Unchecked="CheckboxChanged"
-                ToolTip="Automatically restarts the driver when it shuts down.">Auto Restart</CheckBox>
+                  VerticalAlignment="Center" VerticalContentAlignment="Center"
+                  Checked="CheckboxChanged" Unchecked="CheckboxChanged"
+                  ToolTip="Automatically restarts the driver when it shuts down.">
+          Auto Restart
+        </CheckBox>
 
         <!-- Run at Startup -->
         <CheckBox Name="checkBoxRunAtStartup"
-                VerticalAlignment="Center" VerticalContentAlignment="Center"
-                Checked="CheckboxChanged" Unchecked="CheckboxChanged"
-                ToolTip="Starts and hides the TabletDriverGUI at Windows startup">Run at Windows startup</CheckBox>
+                  VerticalAlignment="Center" VerticalContentAlignment="Center"
+                  Checked="CheckboxChanged" Unchecked="CheckboxChanged"
+                  ToolTip="Starts and hides the TabletDriverGUI at Windows startup">
+          Run at Windows startup
+        </CheckBox>
+        
       </StackPanel>
     </Grid>
 
+    <!-- Statusbar -->
     <StatusBar Grid.Row="3" Height="25" VerticalAlignment="Bottom">
+
+      <!-- Status text-->
       <StatusBarItem HorizontalAlignment="Left">
         <TextBlock Name="textStatus"></TextBlock>
       </StatusBarItem>
+
+      <!-- Warning text and version -->
       <StatusBarItem HorizontalAlignment="Right">
-        <StackPanel Orientation="Horizontal">
+        <StackPanel Orientation="Horizontal" Background="Transparent">
           <TextBlock Name="textStatusWarning" Foreground="#F60" Margin="0,0,5,0" MouseDown="StatusWarning_MouseDown"></TextBlock>
           <TextBlock Name="textVersion">0.0.0</TextBlock>
         </StackPanel>
diff --git a/TabletDriverGUI/MainWindow.xaml.cs b/TabletDriverGUI/MainWindow.xaml.cs
index 4c1cf91..4328492 100644
--- a/TabletDriverGUI/MainWindow.xaml.cs
+++ b/TabletDriverGUI/MainWindow.xaml.cs
@@ -253,6 +253,14 @@ private void Window_PreviewKeyDown(object sender, KeyEventArgs e)
                 e.Handled = true;
             }
 
+            // Control + R -> Restart driver
+            if (e.KeyboardDevice.Modifiers == ModifierKeys.Control && e.Key == Key.R)
+            {
+                RestartDriverClick(sender, null);
+                e.Handled = true;
+            }
+
+
             // Control + I -> Import settings
             if (e.KeyboardDevice.Modifiers == ModifierKeys.Control && e.Key == Key.I)
             {
diff --git a/TabletDriverGUI/NamedPipeClient.cs b/TabletDriverGUI/NamedPipeClient.cs
index c028682..f5ca15c 100644
--- a/TabletDriverGUI/NamedPipeClient.cs
+++ b/TabletDriverGUI/NamedPipeClient.cs
@@ -64,7 +64,7 @@ public class TaskResult
         public NamedPipeClient(string pipeName)
         {
             this.pipeName = pipeName;
-            bufferRead = new byte[1024];
+            bufferRead = new byte[10240];
         }
 
         //
@@ -111,7 +111,6 @@ public bool Stop()
             catch (Exception ex)
             {
                 Console.WriteLine("Pipe stop error: " + ex.Message);
-                throw;
             }
 
             OnDisconnected();
@@ -196,18 +195,23 @@ public Task<TaskResult> WriteMessage(string message)
 
                 //Console.WriteLine("Writing message to " + pipeName + ": " + message);
 
-                pipeStream.BeginWrite(buffer, 0, buffer.Length, asyncResult =>
+                try
                 {
-                    try
-                    {
-                        taskCompletionSource.SetResult(EndWriteCallBack(asyncResult));
-                    }
-                    catch (Exception ex)
-                    {
-                        taskCompletionSource.SetException(ex);
-                    }
-
-                }, null);
+                    pipeStream.BeginWrite(buffer, 0, buffer.Length, asyncResult => {
+                        try
+                        {
+                            taskCompletionSource.SetResult(EndWriteCallBack(asyncResult));
+                        }
+                        catch (Exception ex)
+                        {
+                            taskCompletionSource.SetException(ex);
+                        }
+                    }, null);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine("BeginWrite exception: " + e.Message);
+                }
             }
 
             return taskCompletionSource.Task;
diff --git a/TabletDriverGUI/TabletDriver.cs b/TabletDriverGUI/TabletDriver.cs
index 18efa37..8dc8562 100644
--- a/TabletDriverGUI/TabletDriver.cs
+++ b/TabletDriverGUI/TabletDriver.cs
@@ -384,7 +384,7 @@ private void ProcessService_ErrorDataReceived(object sender, DataReceivedEventAr
         }
 
         //
-        // Driver service data received
+        // Driver service standard output data received
         //
         private void ProcessService_OutputDataReceived(object sender, DataReceivedEventArgs e)
         {
@@ -395,7 +395,7 @@ private void ProcessService_OutputDataReceived(object sender, DataReceivedEventA
             }
             else
             {
-                //ProcessDriverMessage(e.Data);
+                //ProcessDriverMessage(e.Data + "\n");
             }
         }
 
@@ -407,7 +407,7 @@ private void PipeInput_MessageReceived(object sender, NamedPipeClient.NamedPipeE
         {
 
             string stringMessage = Encoding.UTF8.GetString(e.Message.Data, 0, e.Message.Length);
-            //ConsoleAddLine("Pipe: " + stringMessage);
+            //ConsoleAddLine("Pipe: '" + stringMessage + "'");
             ProcessDriverMessage(stringMessage);
 
         }
diff --git a/TabletDriverGUI/WindowTabletView.xaml.cs b/TabletDriverGUI/WindowTabletView.xaml.cs
index 4478c10..d0413bf 100644
--- a/TabletDriverGUI/WindowTabletView.xaml.cs
+++ b/TabletDriverGUI/WindowTabletView.xaml.cs
@@ -153,13 +153,13 @@ public TabletRenderer(Configuration config)
 
                 // Rects
                 rectInputPressure =
-                    new Rect(135, 54, 200, 20);
+                    new Rect(120, 60, 200, 20);
                 rectInputPressureBorder =
-                    new Rect(135, 54, 200, 20);
+                    new Rect(120, 60, 200, 20);
                 rectOutputPressure =
-                    new Rect(135, 84, 200, 20);
+                    new Rect(120, 90, 200, 20);
                 rectOutputPressureBorder =
-                    new Rect(135, 84, 200, 20);
+                    new Rect(120, 90, 200, 20);
 
                 // Offset pressure bars
                 rectInputPressure.X += config.TabletView.OffsetPressure.X;
@@ -312,6 +312,10 @@ protected override void OnRender(DrawingContext context)
         //
         public WindowTabletView(Configuration config, TabletDriver driver)
         {
+            if(config.TabletView.Borderless)
+            {
+                WindowStyle = WindowStyle.None;
+            }
             InitializeComponent();
 
             this.config = config;
@@ -399,13 +403,15 @@ public WindowTabletView(Configuration config, TabletDriver driver)
             Closing += WindowTabletView_Closing;
             KeyDown += WindowTabletView_KeyDown;
 
+            MouseDown += WindowTabletView_MouseDown;
+            MouseUp += WindowTabletView_MouseUp;
+
 
             // Set GC mode to low latency
             GCSettings.LatencyMode = GCLatencyMode.SustainedLowLatency;
 
         }
 
-
         //
         // Update/draw timer tick
         //
@@ -630,5 +636,29 @@ private void WindowTabletView_Closing(object sender, EventArgs e)
             GC.Collect(10, GCCollectionMode.Forced);
         }
 
+        //
+        // Window mouse down
+        //
+        private void WindowTabletView_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+
+            // Drag move with left mouse button in borderless mode
+            if (config.TabletView.Borderless && e.LeftButton == MouseButtonState.Pressed)
+            {
+                DragMove();
+            }
+        }
+
+        //
+        // Window mouse up
+        //
+        private void WindowTabletView_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            // Close window with right click in borderless mode
+            if (config.TabletView.Borderless && e.ChangedButton == MouseButton.Right && e.RightButton == MouseButtonState.Released)
+            {
+                Close();
+            }
+        }
     }
 }
diff --git a/TabletDriverGUI/WindowTabletViewSettings.xaml b/TabletDriverGUI/WindowTabletViewSettings.xaml
index ce0ff75..1858696 100644
--- a/TabletDriverGUI/WindowTabletViewSettings.xaml
+++ b/TabletDriverGUI/WindowTabletViewSettings.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         Title="Tablet View Settings"
-        Height="500" Width="300"
+        Height="900" Width="300"
         SizeToContent="Height"
         ResizeMode="NoResize"
         >
@@ -132,6 +132,7 @@
     </GroupBox>
 
     <CheckBox Name="checkBoxFadeInOut" Margin="10,5">Fade in/out when input is detected/lost</CheckBox>
+    <CheckBox Name="checkBoxBorderless" Margin="10,5">Borderless window</CheckBox>
 
     <Grid Margin="0,10,0,0">
       <Button Name="buttonSave" Click="ButtonSave_Click" Padding="10" HorizontalAlignment="Left">Save</Button>
diff --git a/TabletDriverGUI/WindowTabletViewSettings.xaml.cs b/TabletDriverGUI/WindowTabletViewSettings.xaml.cs
index 354b07b..170c590 100644
--- a/TabletDriverGUI/WindowTabletViewSettings.xaml.cs
+++ b/TabletDriverGUI/WindowTabletViewSettings.xaml.cs
@@ -45,8 +45,8 @@ public WindowTabletViewSettings(Configuration config)
                     settings.BackgroundColor = "#000000";
                     settings.InfoColor  = Utils.RGBToHexColor(50,100,255);
                     settings.InputColor = Utils.RGBToHexColor(190,255,0);
-                    settings.OutputColor = Utils.RGBToHexColor(255,190,0);
-                    settings.LatencyColor = Utils.RGBToHexColor(230,200,0);
+                    settings.OutputColor = Utils.RGBToHexColor(255,120,0);
+                    settings.LatencyColor = Utils.RGBToHexColor(230,220,0);
                     settings.DrawColor = "#6666AA";
                     settings.InputTrailLength = 100;
                     settings.OutputTrailLength = 100;
@@ -129,6 +129,7 @@ public void LoadValues(Configuration config)
             textOffsetPressureX.Text = Utils.GetNumberString(config.TabletView.OffsetPressure.X);
             textOffsetPressureY.Text = Utils.GetNumberString(config.TabletView.OffsetPressure.Y);
             checkBoxFadeInOut.IsChecked = config.TabletView.FadeInOut;
+            checkBoxBorderless.IsChecked = config.TabletView.Borderless;
         }
 
         public void StoreValues()
@@ -168,6 +169,7 @@ public void StoreValues()
             if (Utils.ParseNumber(textOffsetPressureY.Text, out value))
                 config.TabletView.OffsetPressure.Y = value;
             config.TabletView.FadeInOut = (bool)checkBoxFadeInOut.IsChecked;
+            config.TabletView.Borderless = (bool)checkBoxBorderless.IsChecked;
 
         }
 
diff --git a/TabletDriverService/BufferQueue.cpp b/TabletDriverService/BufferQueue.cpp
new file mode 100644
index 0000000..cbb2a37
--- /dev/null
+++ b/TabletDriverService/BufferQueue.cpp
@@ -0,0 +1,102 @@
+#include "stdafx.h"
+#include "BufferQueue.h"
+
+
+//
+// Add item to write buffer
+//
+void BufferQueue::Push(void *buffer, int length)
+{
+	std::unique_lock<std::mutex> mlock(lockQueue);
+
+	// Create write buffer item
+	Item *item = new Item();
+	item->buffer = new BYTE[length];
+	item->length = length;
+
+	// Copy data
+	memcpy(item->buffer, buffer, length);
+
+	// Add to buffer
+	queue.push(item);
+
+	// Notify queue change
+	Notify();
+}
+
+//
+// Remove first item from the queue
+//
+void BufferQueue::Pop()
+{
+	delete queue.front();
+	queue.pop();
+}
+
+
+//
+// Remove all items from the queue
+//
+void BufferQueue::Clear()
+{
+	std::unique_lock<std::mutex> mlock(lockQueue);
+	while (!queue.empty()) {
+		delete queue.front();
+		queue.pop();
+	}
+}
+
+
+//
+// Wait for queue items
+//
+void BufferQueue::Wait()
+{
+	std::unique_lock<std::mutex> mlock(lockWait);
+	conditionBuffer.wait(mlock);
+}
+
+//
+// Notify buffer changes
+//
+void BufferQueue::Notify()
+{
+	conditionBuffer.notify_all();
+}
+
+
+//
+// 
+//
+BufferQueue::Item* BufferQueue::Front()
+{
+	return queue.front();
+}
+
+
+//
+// Queue empty?
+//
+int BufferQueue::IsEmpty()
+{
+	std::unique_lock<std::mutex> mlock(lockQueue);
+	return queue.empty();
+}
+
+
+// Queue item constructor
+BufferQueue::Item::Item()
+{
+	buffer = NULL;
+	length = 0;
+}
+
+// Queue item destructor
+BufferQueue::Item::~Item()
+{
+	if (buffer != NULL && length > 0) {
+		delete buffer;
+		buffer = NULL;
+		length = 0;
+	}
+}
diff --git a/TabletDriverService/BufferQueue.h b/TabletDriverService/BufferQueue.h
new file mode 100644
index 0000000..5e9a546
--- /dev/null
+++ b/TabletDriverService/BufferQueue.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <queue>
+
+class BufferQueue {
+public:
+
+	class Item {
+	public:
+		BYTE *buffer;
+		int length;
+		Item();
+		~Item();
+	};
+
+	queue<Item*> queue;
+	mutex lockQueue;
+	mutex lockWait;
+	condition_variable conditionBuffer;
+	void Push(void *buffer, int length);
+	void Pop();
+	void Clear();
+	void Wait();
+	void Notify();
+	BufferQueue::Item* Front();
+	int IsEmpty();
+};
diff --git a/TabletDriverService/CommandHandler.Auxiliary.cpp b/TabletDriverService/CommandHandler.Auxiliary.cpp
index c4cf372..c5eb504 100644
--- a/TabletDriverService/CommandHandler.Auxiliary.cpp
+++ b/TabletDriverService/CommandHandler.Auxiliary.cpp
@@ -13,15 +13,15 @@ void CommandHandler::CreateAuxCommands() {
 	// Command: AuxHID
 	//
 	AddCommand(new Command("AuxHID", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
-		if(cmd->valueCount == 4) {
+		if (tablet == NULL) return false;
+		if (cmd->valueCount == 4) {
 			USHORT vendorID = cmd->GetInt(0, 0);
 			USHORT productID = cmd->GetInt(1, 0);
 			USHORT usagePage = cmd->GetInt(2, 0);
 			USHORT usage = cmd->GetInt(3, 0);
-			if(tablet->hidDeviceAux == NULL) {
+			if (tablet->hidDeviceAux == NULL) {
 				tablet->hidDeviceAux = new HIDDevice(vendorID, productID, usagePage, usage);
-				if(tablet->hidDeviceAux->isOpen) {
+				if (tablet->hidDeviceAux->isOpen) {
 					LOG_INFO("HID auxiliary device found!\n");
 					return true;
 				}
@@ -40,10 +40,10 @@ void CommandHandler::CreateAuxCommands() {
 	// Command: AuxReport
 	//
 	AddCommand(new Command("AuxReport", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.auxCurrentReportIndex = cmd->GetInt(0, tablet->settings.auxCurrentReportIndex);
 		tablet->settings.auxCurrentReport = &tablet->settings.auxReports[tablet->settings.auxCurrentReportIndex];
-		if(tablet->settings.auxCurrentReportIndex >= tablet->settings.auxReportCount - 1) {
+		if (tablet->settings.auxCurrentReportIndex >= tablet->settings.auxReportCount - 1) {
 			tablet->settings.auxReportCount = tablet->settings.auxCurrentReportIndex + 1;
 		}
 		LOG_INFO("Auxiliary report index = %d (%d reports)\n",
@@ -57,7 +57,7 @@ void CommandHandler::CreateAuxCommands() {
 	// Command: AuxReportId
 	//
 	AddCommand(new Command("AuxReportId", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.auxCurrentReport->reportId = cmd->GetInt(0, tablet->settings.auxCurrentReport->reportId);
 		LOG_INFO("Auxiliary report id = %d\n", tablet->settings.auxCurrentReport->reportId);
 		return true;
@@ -68,7 +68,7 @@ void CommandHandler::CreateAuxCommands() {
 	// Command: AuxReportLength
 	//
 	AddCommand(new Command("AuxReportLength", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.auxReportLength = cmd->GetInt(0, tablet->settings.auxReportLength);
 		LOG_INFO("Tablet aux report length = %d\n", tablet->settings.auxReportLength);
 		return true;
@@ -79,7 +79,7 @@ void CommandHandler::CreateAuxCommands() {
 	// Command: AuxDetectMask
 	//
 	AddCommand(new Command("AuxDetectMask", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.auxCurrentReport->detectMask = cmd->GetInt(0, tablet->settings.auxCurrentReport->detectMask);
 		LOG_INFO("Auxiliary detect mask = 0x%02X\n", tablet->settings.auxCurrentReport->detectMask);
 		return true;
@@ -90,7 +90,7 @@ void CommandHandler::CreateAuxCommands() {
 	// Command: AuxIgnoreMask
 	//
 	AddCommand(new Command("AuxIgnoreMask", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.auxCurrentReport->ignoreMask = cmd->GetInt(0, tablet->settings.auxCurrentReport->ignoreMask);
 		LOG_INFO("Tablet aux ignore mask = 0x%02X\n", tablet->settings.auxCurrentReport->ignoreMask);
 		return true;
@@ -101,7 +101,7 @@ void CommandHandler::CreateAuxCommands() {
 	// Command: AuxButtonCount
 	//
 	AddCommand(new Command("AuxButtonCount", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.auxButtonCount = cmd->GetInt(0, tablet->settings.auxButtonCount);
 		LOG_INFO("Tablet aux button count = %d\n", tablet->settings.auxButtonCount);
 		return true;
@@ -114,7 +114,7 @@ void CommandHandler::CreateAuxCommands() {
 	// Clears custom auxiliary data formatter instructions
 	//
 	AddCommand(new Command("ClearAuxCustomData", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.auxCurrentReport->formatter.instructionCount = 0;
 		LOG_INFO("Custom aux data format instructions cleared!\n");
 		return true;
diff --git a/TabletDriverService/CommandHandler.Device.cpp b/TabletDriverService/CommandHandler.Device.cpp
index f60c834..641e71e 100644
--- a/TabletDriverService/CommandHandler.Device.cpp
+++ b/TabletDriverService/CommandHandler.Device.cpp
@@ -17,11 +17,11 @@ void CommandHandler::CreateDeviceCommands() {
 	AddCommand(new Command("USBTablet", [&](CommandLine *cmd) {
 
 		// 
-		if(cmd->valueCount >= 1) {
+		if (cmd->valueCount >= 1) {
 			string guid = cmd->GetString(0, "");
-			if(tablet == NULL) {
+			if (tablet == NULL) {
 				tablet = new Tablet(guid);
-				if(tablet->isOpen) {
+				if (tablet->isOpen) {
 					LOG_INFO("WinUSB tablet found! Manufacturer = '%s', Product = '%s', Serial = '%s'\n",
 						tablet->GetDeviceManufacturerName().c_str(),
 						tablet->GetDeviceProductName().c_str(),
@@ -41,8 +41,8 @@ void CommandHandler::CreateDeviceCommands() {
 
 		// Show USB tablet info
 		else {
-			if(tablet != NULL) {
-				if(tablet->usbDevice != NULL) {
+			if (tablet != NULL) {
+				if (tablet->usbDevice != NULL) {
 					USBDevice *usb = tablet->usbDevice;
 					LOG_INFO("USBTablet = \"%s\"\n",
 						usb->guid.c_str()
@@ -66,21 +66,21 @@ void CommandHandler::CreateDeviceCommands() {
 	AddCommand(new Command("HIDTablet", [&](CommandLine *cmd) {
 
 		//
-		if(cmd->valueCount >= 4) {
+		if (cmd->valueCount >= 4) {
 			USHORT vendorID = cmd->GetInt(0, 0);
 			USHORT productID = cmd->GetInt(1, 0);
 			USHORT usagePage = cmd->GetInt(2, 0);
 			USHORT usage = cmd->GetInt(3, 0);
 			bool isExclusive = false;
-			for(int i = 4; i < cmd->valueCount; i += 2) {
+			for (int i = 4; i < cmd->valueCount; i += 2) {
 				string parameter = cmd->GetStringLower(i, "");
-				if(parameter == "exclusive") {
+				if (parameter == "exclusive") {
 					isExclusive = cmd->GetBoolean(i + 1, false);
 				}
 			}
-			if(tablet == NULL) {
+			if (tablet == NULL) {
 				tablet = new Tablet(vendorID, productID, usagePage, usage, isExclusive);
-				if(tablet->isOpen) {
+				if (tablet->isOpen) {
 					LOG_INFO("Tablet found! Manufacturer='%s', Product='%s', Serial='%s'\n",
 						tablet->GetDeviceManufacturerName().c_str(),
 						tablet->GetDeviceProductName().c_str(),
@@ -102,8 +102,8 @@ void CommandHandler::CreateDeviceCommands() {
 
 		// Show HID tablet info
 		else {
-			if(tablet != NULL) {
-				if(tablet->hidDevice != NULL) {
+			if (tablet != NULL) {
+				if (tablet->hidDevice != NULL) {
 					HIDDevice *hid = tablet->hidDevice;
 					LOG_INFO("HIDTablet = [Vendor=0x%04X, Product=0x%04X, UsagePage=0x%04X, Usage=0x%04X, Exclusive=%s]\n",
 						hid->vendorId,
@@ -127,7 +127,7 @@ void CommandHandler::CreateDeviceCommands() {
 	// Command: CloseTablet
 	//
 	AddCommand(new Command("CloseTablet", [&](CommandLine *cmd) {
-		if(tablet != NULL) {
+		if (tablet != NULL) {
 			delete tablet;
 			tablet = NULL;
 			LOG_INFO("Tablet closed!\n");
@@ -163,11 +163,11 @@ void CommandHandler::CreateDeviceCommands() {
 	//
 	AddAlias("Feature", "SetFeature");
 	AddCommand(new Command("SetFeature", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 1) return false;
-		if(tablet == NULL) return false;
-		if(tablet->hidDevice == NULL) return false;
+		if (cmd->valueCount <= 1) return false;
+		if (tablet == NULL) return false;
+		if (tablet->hidDevice == NULL) return false;
 		BYTE *buffer = new BYTE[cmd->valueCount];
-		for(int i = 0; i < cmd->valueCount; i++) {
+		for (int i = 0; i < cmd->valueCount; i++) {
 			buffer[i] = cmd->GetInt(i, 0);
 		}
 		LOG_INFOBUFFER(buffer, cmd->valueCount, "Set Feature Report (%d): ", cmd->valueCount);
@@ -184,12 +184,12 @@ void CommandHandler::CreateDeviceCommands() {
 	// Requests a HID feature report from the device
 	//
 	AddCommand(new Command("GetFeature", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 1) return false;
-		if(tablet == NULL) return false;
-		if(tablet->hidDevice == NULL) return false;
+		if (cmd->valueCount <= 1) return false;
+		if (tablet == NULL) return false;
+		if (tablet->hidDevice == NULL) return false;
 		int length = cmd->GetInt(0, 1);
 		BYTE *buffer = new BYTE[length];
-		for(int i = 0; i < length; i++) {
+		for (int i = 0; i < length; i++) {
 			buffer[i] = cmd->GetInt(i + 1, 0);
 		}
 		LOG_INFOBUFFER(buffer, length, "Get Feature Report (%d): ", length);
@@ -207,11 +207,11 @@ void CommandHandler::CreateDeviceCommands() {
 	//
 	AddAlias("Report", "OutputReport");
 	AddCommand(new Command("OutputReport", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 1) return false;
-		if(tablet == NULL) return false;
-		if(tablet->hidDevice == NULL) return false;
+		if (cmd->valueCount <= 1) return false;
+		if (tablet == NULL) return false;
+		if (tablet->hidDevice == NULL) return false;
 		BYTE *buffer = new BYTE[cmd->valueCount];
-		for(int i = 0; i < cmd->valueCount; i++) {
+		for (int i = 0; i < cmd->valueCount; i++) {
 			buffer[i] = cmd->GetInt(i, 0);
 		}
 		LOG_INFOBUFFER(buffer, cmd->valueCount, "Sending HID Report: ");
@@ -228,14 +228,14 @@ void CommandHandler::CreateDeviceCommands() {
 	// Writes to WinUSB device
 	//
 	AddCommand(new Command("USBWrite", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 1) return false;
+		if (cmd->valueCount <= 1) return false;
 
-		if(tablet == NULL) return false;
-		if(tablet->usbDevice == NULL) return false;
+		if (tablet == NULL) return false;
+		if (tablet->usbDevice == NULL) return false;
 		int pipeId = cmd->GetInt(0, 0x80);
 		int length = cmd->valueCount - 1;
 		BYTE *buffer = new BYTE[length];
-		for(int i = 0; i < length; i++) {
+		for (int i = 0; i < length; i++) {
 			buffer[i] = cmd->GetInt(i + 1, 0);
 		}
 		LOG_INFOBUFFER(buffer, length, "Write to USB: ");
@@ -254,26 +254,26 @@ void CommandHandler::CreateDeviceCommands() {
 	AddAlias("GetStrings", "GetDeviceStrings");
 	AddAlias("GetString", "GetDeviceStrings");
 	AddCommand(new Command("GetDeviceStrings", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 0) return false;
-		if(tablet == NULL) return false;
+		if (cmd->valueCount <= 0) return false;
+		if (tablet == NULL) return false;
 
 		string stringName = cmd->GetStringLower(0, "");
 		string deviceString;
 
 		// Manufacturer
-		if(stringName.compare(0, 3, "man") == 0) {
+		if (stringName.compare(0, 3, "man") == 0) {
 			LOG_INFO("  Manufacturer string = '%s'\n", tablet->GetDeviceManufacturerName().c_str());
 			return true;
 		}
 
 		// Product name
-		else if(stringName.compare(0, 3, "pro") == 0) {
+		else if (stringName.compare(0, 3, "pro") == 0) {
 			LOG_INFO("  Product string = '%s'\n", tablet->GetDeviceProductName().c_str());
 			return true;
 		}
 
 		// Serial number
-		else if(stringName.compare(0, 3, "ser") == 0) {
+		else if (stringName.compare(0, 3, "ser") == 0) {
 			LOG_INFO("  Serial number string = '%s'\n", tablet->GetDeviceSerialNumber().c_str());
 			return true;
 		}
@@ -282,20 +282,20 @@ void CommandHandler::CreateDeviceCommands() {
 		int stringIdMax = cmd->GetInt(1, stringIdMin);
 
 		// Limits
-		if(stringIdMin < 1) stringIdMin = 1;
-		else if(stringIdMin > 256) stringIdMin = 256;
-		if(stringIdMax < 1) stringIdMax = 1;
-		else if(stringIdMax > 256) stringIdMax = 256;
+		if (stringIdMin < 1) stringIdMin = 1;
+		else if (stringIdMin > 256) stringIdMin = 256;
+		if (stringIdMax < 1) stringIdMax = 1;
+		else if (stringIdMax > 256) stringIdMax = 256;
 
 		// Min > Max
-		if(stringIdMin > stringIdMax) {
+		if (stringIdMin > stringIdMax) {
 			int tmp = stringIdMax;
 			stringIdMax = stringIdMin;
 			stringIdMin = tmp;
 		}
 
 		// Multiple ids
-		if(stringIdMin != stringIdMax) {
+		if (stringIdMin != stringIdMax) {
 			LOG_INFO("Requesting string ids from %d to %d:\n", stringIdMin, stringIdMax);
 		}
 
@@ -305,11 +305,12 @@ void CommandHandler::CreateDeviceCommands() {
 		}
 
 		// Loop through string ids
-		for(int stringId = stringIdMin; stringId <= stringIdMax; stringId++) {
+		for (int stringId = stringIdMin; stringId <= stringIdMax; stringId++) {
 			try {
 				string deviceString = tablet->GetDeviceString(stringId);
 				LOG_INFO("  String (%d) = '%s'\n", stringId, deviceString.c_str());
-			} catch(const exception &e) {
+			}
+			catch (const exception &e) {
 				LOG_ERROR("%s\n", e.what());
 				break;
 			}
@@ -333,11 +334,11 @@ void CommandHandler::CreateDeviceCommands() {
 	AddHelp("CheckDeviceString", "  CheckDeviceString Product \"<match>\"");
 	AddHelp("CheckDeviceString", "  CheckDeviceString SerialNumber \"<match>\"");
 	AddCommand(new Command("CheckDeviceString", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 1) {
+		if (cmd->valueCount <= 1) {
 			ExecuteCommand("Help", "CheckDeviceString");
 			return false;
 		}
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 
 		int stringId = cmd->GetInt(0, 0);
 		string stringName = cmd->GetStringLower(0, "");
@@ -346,19 +347,19 @@ void CommandHandler::CreateDeviceCommands() {
 		string deviceString = "";
 
 		// Manufacturer
-		if(stringName.compare(0, 3, "man") == 0) {
+		if (stringName.compare(0, 3, "man") == 0) {
 			stringName = "Manufacturer";
 			deviceString = tablet->GetDeviceManufacturerName();
 		}
 
 		// Product name
-		else if(stringName.compare(0, 3, "pro") == 0) {
+		else if (stringName.compare(0, 3, "pro") == 0) {
 			stringName = "Product";
 			deviceString = tablet->GetDeviceProductName();
 		}
 
 		// Serial number
-		else if(stringName.compare(0, 3, "ser") == 0) {
+		else if (stringName.compare(0, 3, "ser") == 0) {
 			stringName = "SerialNumber";
 			deviceString = tablet->GetDeviceSerialNumber();
 		}
@@ -366,19 +367,20 @@ void CommandHandler::CreateDeviceCommands() {
 		// Request device string 
 		else {
 			stringName = to_string(stringId);
-			if(stringId == 0) {
+			if (stringId == 0) {
 				LOG_ERROR("Invalid string id!\n");
 				return false;
 			}
 			try {
 				deviceString = tablet->GetDeviceString(stringId);
-			} catch(exception&e) {
+			}
+			catch (exception&e) {
 				LOG_ERROR("%s\n", e.what());
 			}
 		}
 
 		// Does the string match?
-		if(deviceString.size() >= matchString.size() && deviceString.compare(0, matchString.size(), matchString) == 0) {
+		if (deviceString.size() >= matchString.size() && deviceString.compare(0, matchString.size(), matchString) == 0) {
 			LOG_INFO("Device string (%s) '%s' matches with '%s'\n",
 				stringName.c_str(),
 				deviceString.c_str(),
diff --git a/TabletDriverService/CommandHandler.Filters.cpp b/TabletDriverService/CommandHandler.Filters.cpp
index 720ad3a..1175a44 100644
--- a/TabletDriverService/CommandHandler.Filters.cpp
+++ b/TabletDriverService/CommandHandler.Filters.cpp
@@ -18,7 +18,7 @@ void CommandHandler::CreateFilterCommands() {
 	AddCommand(new Command("SmoothingFilter", [&](CommandLine *cmd) {
 
 		// Tablet valid?
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		double latency = cmd->GetDouble(0, tablet->smoothing.GetLatency());
 		bool onlyWhenButtonsDown = cmd->GetBoolean(1, tablet->smoothing.onlyWhenButtonsDown);
@@ -26,13 +26,13 @@ void CommandHandler::CreateFilterCommands() {
 		string stringValue = cmd->GetStringLower(0, "");
 
 		// Off / False
-		if(stringValue == "off" || stringValue == "false") {
+		if (stringValue == "off" || stringValue == "false") {
 			latency = 0;
 		}
 
 		// Limits
-		if(latency < 0) latency = 1;
-		if(latency > 1000) latency = 1000;
+		if (latency < 0) latency = 1;
+		if (latency > 1000) latency = 1000;
 
 		// Set smoothing filter latency
 		tablet->smoothing.SetLatency(latency);
@@ -41,7 +41,7 @@ void CommandHandler::CreateFilterCommands() {
 		tablet->smoothing.onlyWhenButtonsDown = onlyWhenButtonsDown;
 
 		// Print output
-		if(tablet->smoothing.weight < 1.0) {
+		if (tablet->smoothing.weight < 1.0) {
 			tablet->smoothing.isEnabled = true;
 			LOG_INFO("Smoothing = %0.2f ms to reach %0.0f%% (weight = %f), OnlyWhenButtonDown=%s\n",
 				latency,
@@ -69,12 +69,12 @@ void CommandHandler::CreateFilterCommands() {
 	AddCommand(new Command("AdvancedSmoothingFilter", [&](CommandLine *cmd) {
 
 		// Tablet valid?
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		tablet->advancedSmoothing.isEnabled = cmd->GetBoolean(0, tablet->advancedSmoothing.isEnabled);
 		tablet->advancedSmoothing.ClearSettings();
 
-		if(tablet->advancedSmoothing.isEnabled) {
+		if (tablet->advancedSmoothing.isEnabled) {
 			LOG_INFO("Advanced smoothing = enabled\n");
 		}
 		else {
@@ -92,9 +92,9 @@ void CommandHandler::CreateFilterCommands() {
 	AddCommand(new Command("AdvancedSmoothingAdd", [&](CommandLine *cmd) {
 
 		// Tablet valid?
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
-		if(cmd->valueCount >= 3) {
+		if (cmd->valueCount >= 3) {
 			double velocity = cmd->GetDouble(0, 0);
 			bool dragging = cmd->GetBoolean(1, false);
 			double latency = cmd->GetDouble(2, 0);
@@ -117,7 +117,7 @@ void CommandHandler::CreateFilterCommands() {
 	AddCommand(new Command("GravityFilter", [&](CommandLine *cmd) {
 
 		// Tablet valid?
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		double gravity = cmd->GetDouble(0, tablet->gravityFilter.gravity);
 		double friction = cmd->GetDouble(1, 0);
@@ -126,12 +126,12 @@ void CommandHandler::CreateFilterCommands() {
 
 
 		// Limits
-		if(gravity < 0) gravity = 0.0;
-		if(gravity > 100) gravity = 100;
-		if(friction < 0.1) friction = 0.1;
-		if(friction > 1000) friction = 1000;
+		if (gravity < 0) gravity = 0.0;
+		if (gravity > 100) gravity = 100;
+		if (friction < 0.1) friction = 0.1;
+		if (friction > 1000) friction = 1000;
 
-		if(gravity > 0.1) {
+		if (gravity > 0.1) {
 			tablet->gravityFilter.isEnabled = true;
 			tablet->gravityFilter.gravity = gravity;
 			tablet->gravityFilter.friction = friction;
@@ -167,12 +167,12 @@ void CommandHandler::CreateFilterCommands() {
 	AddCommand(new Command("NoiseReduction", [&](CommandLine *cmd) {
 
 		// Tablet valid?
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		string stringValue = cmd->GetStringLower(0, "");
 
 		// Off / False
-		if(stringValue == "off" || stringValue == "false") {
+		if (stringValue == "off" || stringValue == "false") {
 			tablet->noiseFilter.isEnabled = false;
 			LOG_INFO("Noise Reduction = off\n");
 
@@ -195,19 +195,19 @@ void CommandHandler::CreateFilterCommands() {
 			int iterations = cmd->GetInt(3, tablet->noiseFilter.iterations);
 
 			// Limits
-			if(length < 0) length = 0;
-			else if(length > 50) length = 50;
+			if (length < 0) length = 0;
+			else if (length > 50) length = 50;
 
-			if(distanceThreshold < 0.0) distanceThreshold = 0.0;
-			else if(distanceThreshold > 1000) distanceThreshold = 1000;
+			if (distanceThreshold < 0.0) distanceThreshold = 0.0;
+			else if (distanceThreshold > 1000) distanceThreshold = 1000;
 
-			if(distanceMaximum < 0.1) distanceMaximum = 0.1;
-			else if(distanceMaximum > 1000) distanceMaximum = 1000;
+			if (distanceMaximum < 0.1) distanceMaximum = 0.1;
+			else if (distanceMaximum > 1000) distanceMaximum = 1000;
 
-			if(distanceThreshold > distanceMaximum) distanceThreshold = distanceMaximum;
+			if (distanceThreshold > distanceMaximum) distanceThreshold = distanceMaximum;
 
-			if(iterations < 1) iterations = 1;
-			else if(iterations > 100) iterations = 100;
+			if (iterations < 1) iterations = 1;
+			else if (iterations > 100) iterations = 100;
 
 			// Set noise filter values
 			tablet->noiseFilter.buffer.SetLength(length);
@@ -216,7 +216,7 @@ void CommandHandler::CreateFilterCommands() {
 			tablet->noiseFilter.iterations = iterations;
 
 			// Enable filter
-			if(tablet->noiseFilter.buffer.length > 0) {
+			if (tablet->noiseFilter.buffer.length > 0) {
 				tablet->noiseFilter.isEnabled = true;
 				LOG_INFO("Noise Reduction = [\n");
 				LOG_INFO("  %d samples\n", length);
@@ -243,14 +243,14 @@ void CommandHandler::CreateFilterCommands() {
 	AddAlias("AntiSmoothing", "AntiSmoothingFilter");
 	AddAlias("Anti", "AntiSmoothingFilter");
 	AddCommand(new Command("AntiSmoothingFilter", [&](CommandLine *cmd) {
-		
+
 		// Tablet valid?
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		string stringValue = cmd->GetStringLower(0, "");
 
 		// Off / False
-		if(stringValue == "off") {
+		if (stringValue == "off") {
 			tablet->antiSmoothing.isEnabled = false;
 			LOG_INFO("Anti-smoothing = off\n");
 
@@ -265,18 +265,18 @@ void CommandHandler::CreateFilterCommands() {
 
 			// Workaround for VEIKK S640
 			double defaultTargetReportRate = 0;
-			if(
+			if (
 				tablet != NULL &&
 				tablet->hidDevice != NULL &&
 				tablet->hidDevice->vendorId == 0x2FEB &&
 				tablet->hidDevice->vendorId == 0x0001
-			) {
+				) {
 				defaultTargetReportRate = 250;
 			}
 			double targetReportRate = cmd->GetDouble(2, defaultTargetReportRate);
 
 
-			if(cmd->valueCount == 0) {
+			if (cmd->valueCount == 0) {
 				LOG_INFO("Usage: %s <only on hover> <drag multiplier> <target report rate>\n", cmd->command.c_str());
 			}
 			else {
@@ -307,14 +307,14 @@ void CommandHandler::CreateFilterCommands() {
 	AddCommand(new Command("AntiSmoothingAdd", [&](CommandLine *cmd) {
 
 		// Tablet valid?
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		double velocity = cmd->GetDouble(0, 0);
 		double shape = cmd->GetDouble(1, 0.5);
 		double compensation = cmd->GetDouble(2, 0);
 
 
-		if(cmd->valueCount < 3) {
+		if (cmd->valueCount < 3) {
 			LOG_INFO("Usage: %s <velocity> <shape> <compensation>\n", cmd->command.c_str());
 		}
 		else {
@@ -341,18 +341,18 @@ void CommandHandler::CreateFilterCommands() {
 	AddCommand(new Command("FilterTimerInterval", [&](CommandLine *cmd) {
 
 		// Tablet valid?
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
-		if(tabletHandler == NULL) return true;
+		if (tabletHandler == NULL) return true;
 		int oldInterval = (int)round(tabletHandler->timerInterval);
 
 		int interval = cmd->GetInt(0, oldInterval);
 
 		// 10 Hz
-		if(interval > 100) interval = 100;
+		if (interval > 100) interval = 100;
 
 		// 1000 Hz
-		if(interval < 1) interval = 1;
+		if (interval < 1) interval = 1;
 
 		// Change interval
 		tabletHandler->ChangeTimerInterval(interval);
@@ -372,7 +372,7 @@ void CommandHandler::CreateFilterCommands() {
 	AddCommand(new Command("FilterTester", [&](CommandLine *cmd) {
 
 		// Tablet valid?
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		string inputFilepath = cmd->GetString(0, "tester_input.txt");
 		string outputFilepath = cmd->GetString(1, "tester_output.txt");
@@ -384,10 +384,10 @@ void CommandHandler::CreateFilterCommands() {
 		int settingsStringIndex = 0;
 
 		// Anti-smoothing
-		if(tablet->antiSmoothing.isEnabled) {
+		if (tablet->antiSmoothing.isEnabled) {
 			filterAntiSmoothing = new TabletFilterAntiSmoothing();
 			filterAntiSmoothing->settingCount = tablet->antiSmoothing.settingCount;
-			for(int i = 0; i < filterAntiSmoothing->settingCount; i++) {
+			for (int i = 0; i < filterAntiSmoothing->settingCount; i++) {
 				filterAntiSmoothing->settings[i].velocity = tablet->antiSmoothing.settings[i].velocity;
 				filterAntiSmoothing->settings[i].shape = tablet->antiSmoothing.settings[i].shape;
 				filterAntiSmoothing->settings[i].compensation = tablet->antiSmoothing.settings[i].compensation;
@@ -404,7 +404,7 @@ void CommandHandler::CreateFilterCommands() {
 		}
 
 		// Noise reduction
-		if(tablet->noiseFilter.isEnabled) {
+		if (tablet->noiseFilter.isEnabled) {
 			filterNoise = new TabletFilterNoiseReduction();
 			filterNoise->buffer.SetLength(tablet->noiseFilter.buffer.length);
 			filterNoise->distanceThreshold = tablet->noiseFilter.distanceThreshold;
@@ -418,19 +418,19 @@ void CommandHandler::CreateFilterCommands() {
 				tablet->noiseFilter.iterations
 			);
 		}
-		if(filterAntiSmoothing != NULL || filterNoise != NULL) {
+		if (filterAntiSmoothing != NULL || filterNoise != NULL) {
 			LOG_INFO("Filter test starting!\n");
 
 			tester = new TabletFilterTester(inputFilepath, outputFilepath);
 
 			// Add filters
-			if(filterAntiSmoothing != NULL)
+			if (filterAntiSmoothing != NULL)
 				tester->AddFilter(filterAntiSmoothing);
-			if(filterNoise != NULL)
+			if (filterNoise != NULL)
 				tester->AddFilter(filterNoise);
 
 			bool result = tester->Open();
-			if(!result) {
+			if (!result) {
 				LOG_ERROR("Filter tester can't open files!\n");
 				return false;
 			}
@@ -443,15 +443,15 @@ void CommandHandler::CreateFilterCommands() {
 			LOG_INFO("No report filters enabled!\n");
 		}
 
-		if(filterAntiSmoothing != NULL) {
+		if (filterAntiSmoothing != NULL) {
 			delete filterAntiSmoothing;
 		}
 
-		if(filterNoise != NULL) {
+		if (filterNoise != NULL) {
 			delete filterNoise;
 		}
 
-		if(tester != NULL) {
+		if (tester != NULL) {
 			delete tester;
 		}
 
diff --git a/TabletDriverService/CommandHandler.Other.cpp b/TabletDriverService/CommandHandler.Other.cpp
index 424ff5d..6ce3564 100644
--- a/TabletDriverService/CommandHandler.Other.cpp
+++ b/TabletDriverService/CommandHandler.Other.cpp
@@ -15,12 +15,12 @@ void CommandHandler::CreateOtherCommands() {
 	// Sets the monitor mapping
 	//
 	AddCommand(new Command("ScreenArea", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		int index = cmd->GetInt(4, 0);
 
 		// Validate map index
-		if(index >= sizeof(mapper->screenMaps) / sizeof(ScreenMapper::ScreenMap)) {
+		if (index >= sizeof(mapper->screenMaps) / sizeof(ScreenMapper::ScreenMap)) {
 			LOG_ERROR("Invalid map index!\n");
 			return false;
 		}
@@ -49,7 +49,7 @@ void CommandHandler::CreateOtherCommands() {
 	// Sets the screen mapper map count
 	//
 	AddCommand(new Command("ScreenMapCount", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		mapper->screenMapCount = cmd->GetInt(0, mapper->screenMapCount);
 		LOG_INFO("Screen map count = %d\n", mapper->screenMapCount);
@@ -66,7 +66,7 @@ void CommandHandler::CreateOtherCommands() {
 	//
 	AddAlias("Desktop", "DesktopSize");
 	AddCommand(new Command("DesktopSize", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 		mapper->virtualScreen.width = cmd->GetDouble(0, mapper->virtualScreen.width);
 		mapper->virtualScreen.height = cmd->GetDouble(1, mapper->virtualScreen.height);
 		LOG_INFO("Desktop size = (%0.2f px x %0.2f px)\n",
@@ -88,26 +88,26 @@ void CommandHandler::CreateOtherCommands() {
 		string mode = cmd->GetStringLower(0, "");
 
 		// Absolute mouse
-		if(mode.compare(0, 3, "abs") == 0) {
+		if (mode.compare(0, 3, "abs") == 0) {
 			outputManager->SetOutputMode(OutputManager::ModeVMultiAbsolute);
 			LOG_INFO("Output Mode = Absolute\n");
 		}
 
 		// Relative mouse
-		else if(mode.compare(0, 3, "rel") == 0) {
+		else if (mode.compare(0, 3, "rel") == 0) {
 			outputManager->SetOutputMode(OutputManager::ModeVMultiRelative);
 			LOG_INFO("Output Mode = Relative\n");
 		}
 
 		// Digitizer Absolute
-		else if(mode.compare(0, 12, "digitizerabs") == 0) {
+		else if (mode.compare(0, 12, "digitizerabs") == 0) {
 
 			outputManager->SetOutputMode(OutputManager::ModeVMultiDigitizer);
 			LOG_INFO("Output Mode = Digitizer Absolute\n");
 		}
 
 		// Digitizer Absolute
-		else if(mode.compare(0, 12, "digitizerrel") == 0) {
+		else if (mode.compare(0, 12, "digitizerrel") == 0) {
 
 			outputManager->SetOutputMode(OutputManager::ModeVMultiDigitizerRelative);
 			LOG_INFO("Output Mode = Digitizer Relative\n");
@@ -116,19 +116,19 @@ void CommandHandler::CreateOtherCommands() {
 
 
 		// SendInput Absolute
-		else if(mode.compare(0, 12, "sendinputabs") == 0) {
+		else if (mode.compare(0, 12, "sendinputabs") == 0) {
 			outputManager->SetOutputMode(OutputManager::ModeSendInputAbsolute);
 			LOG_INFO("Output Mode = SendInput Absolute\n");
 		}
 
 		// SendInput Relative
-		else if(mode.compare(0, 12, "sendinputrel") == 0) {
+		else if (mode.compare(0, 12, "sendinputrel") == 0) {
 			outputManager->SetOutputMode(OutputManager::ModeSendInputRelative);
 			LOG_INFO("Output Mode = SendInput Relative\n");
 		}
 
 		// Dummy
-		else if(mode == "dummy") {
+		else if (mode == "dummy") {
 			outputManager->SetOutputMode(OutputManager::ModeDummy);
 			LOG_INFO("Output Mode = Dummy\n");
 		}
@@ -147,18 +147,18 @@ void CommandHandler::CreateOtherCommands() {
 	AddAlias("Bench", "Benchmark");
 	AddCommand(new Command("Benchmark", [&](CommandLine *cmd) {
 
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		int timeLimit;
 		int reportCount = cmd->GetInt(0, 200);
 
 		// Limit report count
-		if(reportCount < 10) reportCount = 10;
-		if(reportCount > 1000) reportCount = 1000;
+		if (reportCount < 10) reportCount = 10;
+		if (reportCount > 1000) reportCount = 1000;
 
 		// Time limit
 		timeLimit = reportCount * 10;
-		if(timeLimit < 1000) timeLimit = 1000;
+		if (timeLimit < 1000) timeLimit = 1000;
 
 		// Log
 		LOG_INFO("Tablet benchmark starting in 3 seconds!\n");
@@ -170,11 +170,11 @@ void CommandHandler::CreateOtherCommands() {
 		tablet->measurement.Start(reportCount);
 
 		// Wait for the benchmark to finish
-		for(int i = 0; i < timeLimit / 100; i++) {
+		for (int i = 0; i < timeLimit / 100; i++) {
 			Sleep(100);
 
 			// Benchmark results
-			if(tablet->measurement.reportCounter <= 0) {
+			if (tablet->measurement.reportCounter <= 0) {
 
 				double width = tablet->measurement.maximum.x - tablet->measurement.minimum.x;
 				double height = tablet->measurement.maximum.y - tablet->measurement.minimum.y;
@@ -210,7 +210,7 @@ void CommandHandler::CreateOtherCommands() {
 		tablet->measurement.Stop();
 
 		// Benchmark failed
-		if(tablet->measurement.reportCounter > 0) {
+		if (tablet->measurement.reportCounter > 0) {
 			LOG_ERROR("Benchmark failed!\n");
 			LOG_ERROR("Not enough reports captured in %0.2f seconds!\n",
 				timeLimit / 1000.0
@@ -226,14 +226,14 @@ void CommandHandler::CreateOtherCommands() {
 	//
 	AddCommand(new Command("Measure", [&](CommandLine *cmd) {
 
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		int timeLimit = 30000;
 		int pointCount = cmd->GetInt(0, 1);
 
 		// Limits
-		if(pointCount < 1) pointCount = 1;
-		if(pointCount > 10) pointCount = 10;
+		if (pointCount < 1) pointCount = 1;
+		if (pointCount > 10) pointCount = 10;
 
 		// Log
 		LOG_INFO("Measurement started!\n");
@@ -242,11 +242,11 @@ void CommandHandler::CreateOtherCommands() {
 		tablet->measurement.Start();
 
 		// Wait for the measurement to finish
-		for(int i = 0; i < timeLimit / 100; i++) {
+		for (int i = 0; i < timeLimit / 100; i++) {
 			Sleep(100);
 
 			// Result
-			if(tablet->measurement.pointCount >= pointCount) {
+			if (tablet->measurement.pointCount >= pointCount) {
 				double distance = 0;
 				double lastX = 0;
 				double lastY = 0;
@@ -259,15 +259,15 @@ void CommandHandler::CreateOtherCommands() {
 
 				LOG_INFO("\n");
 				LOG_INFO("Measurement results:\n");
-				for(int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
+				for (int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
 
 					point.Set(tablet->measurement.points[pointIndex]);
 
 					// Limits
-					if(point.x < minimum.x) minimum.x = point.x;
-					if(point.x > maximum.x) maximum.x = point.x;
-					if(point.y < minimum.y) minimum.y = point.y;
-					if(point.y > maximum.y) maximum.y = point.y;
+					if (point.x < minimum.x) minimum.x = point.x;
+					if (point.x > maximum.x) maximum.x = point.x;
+					if (point.y < minimum.y) minimum.y = point.y;
+					if (point.y > maximum.y) maximum.y = point.y;
 
 					LOG_INFO(
 						"  #%d: X = %0.2f mm, Y = %0.2f mm\n",
@@ -277,13 +277,13 @@ void CommandHandler::CreateOtherCommands() {
 					);
 
 					// Distance calculation
-					if(pointIndex > 0) {
+					if (pointIndex > 0) {
 						distance += point.Distance(lastPoint);
 					}
 					lastPoint.Set(point);
 
 				}
-				if(tablet->measurement.pointCount > 1) {
+				if (tablet->measurement.pointCount > 1) {
 					LOG_INFO("  Distance: %0.2f mm\n", distance);
 					LOG_INFO("  Maximum area: %0.2f mm x %0.2f mm\n",
 						maximum.x - minimum.x, maximum.y - minimum.y
@@ -295,7 +295,7 @@ void CommandHandler::CreateOtherCommands() {
 				char pointStringIndex = 0;
 
 				// Build point string
-				for(int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
+				for (int pointIndex = 0; pointIndex < tablet->measurement.pointCount; pointIndex++) {
 					point.Set(tablet->measurement.points[pointIndex]);
 					pointStringIndex += sprintf_s(pointString + pointStringIndex, 1024 - pointStringIndex, "%0.3f %0.3f ", point.x, point.y);
 				}
@@ -313,7 +313,7 @@ void CommandHandler::CreateOtherCommands() {
 		tablet->measurement.Stop();
 
 		// Measurement failed
-		if(tablet->measurement.pointCount < pointCount) {
+		if (tablet->measurement.pointCount < pointCount) {
 			LOG_ERROR("Measurement failed! No enough points detected in %0.0f seconds!\n", timeLimit / 1000.0);
 			LOG_STATUS("MEASUREMENT 0\n");
 		}
@@ -328,12 +328,12 @@ void CommandHandler::CreateOtherCommands() {
 	// Enable/disable state output
 	//
 	AddCommand(new Command("StateOutput", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 		bool isOutputEnabled = false;
-		pipeState->lock.lock();
+		pipeState->lockServer.lock();
 		pipeState->isStateOutputEnabled = cmd->GetBoolean(0, pipeState->isStateOutputEnabled);
 		isOutputEnabled = pipeState->isStateOutputEnabled;
-		pipeState->lock.unlock();
+		pipeState->lockServer.unlock();
 		LOG_INFO("State output = %s\n", pipeState->isStateOutputEnabled ? "Enabled" : "Disabled");
 		return true;
 	}));
@@ -345,7 +345,7 @@ void CommandHandler::CreateOtherCommands() {
 	// Enable/disable debugging output
 	//
 	AddCommand(new Command("Debug", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 		bool debugEnabled = cmd->GetBoolean(0, logger.IsDebugOutputEnabled());
 		logger.SetDebugOutput(debugEnabled);
 		LOG_INFO("Debug logging = %s\n", logger.IsDebugOutputEnabled() ? "True" : "False");
@@ -360,11 +360,11 @@ void CommandHandler::CreateOtherCommands() {
 	//
 	AddCommand(new Command("Log", [&](CommandLine *cmd) {
 		string logPath = cmd->GetString(0, "log.txt");
-		if(!cmd->GetBoolean(0, true)) {
+		if (!cmd->GetBoolean(0, true)) {
 			logger.CloseLogFile();
 			LOG_INFO("Log file '%s' closed.\n", logger.logFilename.c_str());
 		}
-		else if(logger.OpenLogFile(logPath)) {
+		else if (logger.OpenLogFile(logPath)) {
 			LOG_INFO("Log file '%s' opened.\n", logPath.c_str());
 		}
 		else {
@@ -388,7 +388,7 @@ void CommandHandler::CreateOtherCommands() {
 	// Command: Echo
 	//
 	commandHandler->AddCommand(new Command("Echo", [&](CommandLine *cmd) {
-		if(cmd->valueCount > 0) {
+		if (cmd->valueCount > 0) {
 			LOG_INFO("%s\n", cmd->line.c_str() + 5);
 		}
 		else {
@@ -404,9 +404,9 @@ void CommandHandler::CreateOtherCommands() {
 	// Enables/disables direct logging without queuing the messages.
 	//
 	AddCommand(new Command("LogDirect", [&](CommandLine *cmd) {
-		logger.ProcessMessages();
+		logger.ProcessQueue();
 		logger.directPrint = cmd->GetBoolean(0, logger.directPrint);
-		logger.ProcessMessages();
+		logger.ProcessQueue();
 
 		LOG_INFO("Log direct print = %s\n", logger.directPrint ? "True" : "False");
 		return true;
@@ -433,7 +433,7 @@ void CommandHandler::CreateOtherCommands() {
 	AddAlias("Info", "Information");
 	AddCommand(new Command("Information", [&](CommandLine *cmd) {
 
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		char stringBuffer[1024];
 		int maxLength = sizeof(stringBuffer) - 1;
@@ -442,7 +442,7 @@ void CommandHandler::CreateOtherCommands() {
 		LOG_INFO("\n");
 
 		// VMulti type
-		switch(vmulti->type) {
+		switch (vmulti->type) {
 		case VMulti::TypeXPPen: LOG_INFO("VMulti: XP-Pen\n"); break;
 		case VMulti::TypeVEIKK: LOG_INFO("VMulti: VEIKK\n"); break;
 		default: break;
@@ -468,15 +468,15 @@ void CommandHandler::CreateOtherCommands() {
 
 
 		// Pen buttons
-		for(int i = 0; i < tablet->settings.buttonCount; i++) {
+		for (int i = 0; i < tablet->settings.buttonCount; i++) {
 			stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "'%s' ", tablet->settings.buttonMap[i].c_str());
 		}
 		LOG_INFO("  Pen button map = %s\n", stringBuffer);
 
 		// Aux buttons
-		if(tablet->settings.auxButtonCount > 0) {
+		if (tablet->settings.auxButtonCount > 0) {
 			stringIndex = 0;
-			for(int i = 0; i < tablet->settings.auxButtonCount; i++) {
+			for (int i = 0; i < tablet->settings.auxButtonCount; i++) {
 				stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "'%s' ", tablet->settings.auxButtonMap[i].c_str());
 			}
 			LOG_INFO("  Aux button map = %s\n", stringBuffer);
@@ -485,24 +485,24 @@ void CommandHandler::CreateOtherCommands() {
 
 
 		// Init strings
-		if(tablet->initStrings.size() > 0) {
+		if (tablet->initStrings.size() > 0) {
 			string stringIds = "";
-			for(int stringId : tablet->initStrings) {
+			for (int stringId : tablet->initStrings) {
 				stringIds += to_string(stringId) + " ";
 			}
 			LOG_INFO("  Init string ids: %s\n", stringIds.c_str());
 		}
 
 		// Init feature reports
-		if(tablet->initFeatureReports.size() > 0) {
-			for(Tablet::InitReport *report : tablet->initFeatureReports) {
+		if (tablet->initFeatureReports.size() > 0) {
+			for (Tablet::InitReport *report : tablet->initFeatureReports) {
 				LOG_INFOBUFFER(report->data, report->length, "  Init feature report: ");
 			}
 		}
 
 		// Init output reports
-		if(tablet->initOutputReports.size() > 0) {
-			for(Tablet::InitReport *report : tablet->initOutputReports) {
+		if (tablet->initOutputReports.size() > 0) {
+			for (Tablet::InitReport *report : tablet->initOutputReports) {
 				LOG_INFOBUFFER(report->data, report->length, "  Init output report: ");
 			}
 		}
@@ -541,7 +541,19 @@ void CommandHandler::CreateOtherCommands() {
 	// Command: RequestSettings
 	//
 	AddCommand(new Command("RequestSettings", [&](CommandLine *cmd) {
-		LOG_STATUS("SETTINGS_REQUEST 1\n");
+
+		// Wait for a connection
+		for (int i = 0; i < 20; i++) {
+			if (pipeOutput == NULL) return false;
+			if (pipeOutput != NULL && pipeOutput->IsRunning() && pipeOutput->IsClientConnected()) {
+				break;
+			}
+			Sleep(100);
+		}
+		if (pipeOutput != NULL && pipeOutput->IsRunning()) {
+			LOG_STATUS("SETTINGS_REQUEST 1\n");
+		}
+
 		return true;
 	}));
 
@@ -550,7 +562,19 @@ void CommandHandler::CreateOtherCommands() {
 	// Command: RequestStartup
 	//
 	AddCommand(new Command("RequestStartup", [&](CommandLine *cmd) {
-		LOG_STATUS("STARTUP_REQUEST 1\n");
+
+		// Wait for a connection
+		for (int i = 0; i < 20; i++) {
+			if (pipeOutput == NULL) return false;
+			if (pipeOutput != NULL && pipeOutput->IsRunning() && pipeOutput->IsClientConnected()) {
+				break;
+			}
+			Sleep(100);
+		}
+		if (pipeOutput != NULL && pipeOutput->IsRunning()) {
+			LOG_STATUS("STARTUP_REQUEST 1\n");
+		}
+
 		return true;
 	}));
 
@@ -561,11 +585,11 @@ void CommandHandler::CreateOtherCommands() {
 	// Outputs driver infor as status messages
 	//
 	AddCommand(new Command("Status", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		LOG_STATUS("TABLET %s\n", tablet->name.c_str());
 
-		if(tablet->hidDevice != NULL) {
+		if (tablet->hidDevice != NULL) {
 			LOG_STATUS("HID %04X %04X %04X %04X\n",
 				tablet->hidDevice->vendorId,
 				tablet->hidDevice->productId,
@@ -573,7 +597,7 @@ void CommandHandler::CreateOtherCommands() {
 				tablet->hidDevice->usage
 			);
 		}
-		else if(tablet->usbDevice != NULL) {
+		else if (tablet->usbDevice != NULL) {
 			LOG_STATUS("USB %s\n", tablet->usbDevice->guid.c_str());
 		}
 		LOG_STATUS("WIDTH %0.5f\n", tablet->settings.width);
@@ -582,7 +606,7 @@ void CommandHandler::CreateOtherCommands() {
 		LOG_STATUS("MAX_Y %d\n", tablet->settings.maxY);
 		LOG_STATUS("MAX_PRESSURE %d\n", tablet->settings.maxPressure);
 		LOG_STATUS("AUX_BUTTONS %d\n", tablet->settings.auxButtonCount);
-		if(tabletHandler != NULL) {
+		if (tabletHandler != NULL) {
 			LOG_STATUS("STARTED %d\n", tabletHandler->IsRunning());
 		}
 
@@ -597,12 +621,12 @@ void CommandHandler::CreateOtherCommands() {
 	//
 	AddCommand(new Command("Include", [&](CommandLine *cmd) {
 		string filename = cmd->GetString(0, "");
-		if(filename == "") {
+		if (filename == "") {
 			LOG_ERROR("Invalid filename '%s'!\n", filename.c_str());
 			return false;
 		}
 		else {
-			if(ExecuteFile(filename)) {
+			if (ExecuteFile(filename)) {
 			}
 			else {
 				LOG_ERROR("Can't open file '%s'\n", filename.c_str());
@@ -622,14 +646,14 @@ void CommandHandler::CreateOtherCommands() {
 	AddCommand(new Command("ListCommands", [&](CommandLine *cmd) {
 
 		LOG_INFO("Commands: \n");
-		for(pair<string, Command*> cmdPair : commands) {
+		for (pair<string, Command*> cmdPair : commands) {
 			string commandName = cmdPair.second->name;
 			string lowerCaseName = commandName;
 			transform(lowerCaseName.begin(), lowerCaseName.end(), lowerCaseName.begin(), ::tolower);
 
 			string aliasString = "";
-			for(pair<string, string> aliasPair : aliases) {
-				if(aliasPair.second == lowerCaseName) {
+			for (pair<string, string> aliasPair : aliases) {
+				if (aliasPair.second == lowerCaseName) {
 					aliasString += ", " + aliasNames[aliasPair.first];
 				}
 			}
@@ -651,7 +675,7 @@ void CommandHandler::CreateOtherCommands() {
 
 		LOG_STATUS("COMMANDS_CLEAR 1\n");
 
-		for(pair<string, Command*> cmdPair : commands) {
+		for (pair<string, Command*> cmdPair : commands) {
 			string commandName = cmdPair.second->name;
 			string lowerCaseName = commandName;
 			transform(lowerCaseName.begin(), lowerCaseName.end(), lowerCaseName.begin(), ::tolower);
@@ -659,18 +683,18 @@ void CommandHandler::CreateOtherCommands() {
 			commandsString += commandName + " ";
 
 			string aliasString = "";
-			for(pair<string, string> aliasPair : aliases) {
-				if(aliasPair.second == lowerCaseName) {
+			for (pair<string, string> aliasPair : aliases) {
+				if (aliasPair.second == lowerCaseName) {
 					commandsString += aliasNames[aliasPair.first] + " ";
 				}
 			}
 
-			if(commandsString.size() > 80) {
+			if (commandsString.size() > 80) {
 				LOG_STATUS("COMMANDS %s\n", commandsString.c_str());
 				commandsString = "";
 			}
 		}
-		if(commandsString.size() > 0) {
+		if (commandsString.size() > 0) {
 			LOG_STATUS("COMMANDS %s\n", commandsString.c_str());
 		}
 
@@ -685,8 +709,8 @@ void CommandHandler::CreateOtherCommands() {
 	AddCommand(new Command("ListKeys", [&](CommandLine *cmd) {
 
 		LOG_INFO("Keys:\n");
-		for(string key : tabletHandler->inputEmulator.keys) {
-			if(tabletHandler->inputEmulator.keyMap.count(key) > 0) {
+		for (string key : tabletHandler->inputEmulator.keys) {
+			if (tabletHandler->inputEmulator.keyMap.count(key) > 0) {
 				string name = tabletHandler->inputEmulator.keyMap[key]->name;
 				LOG_INFO("  % -20s %s\n", key.c_str(), name.c_str());
 			}
@@ -704,10 +728,10 @@ void CommandHandler::CreateOtherCommands() {
 	AddHelp("Help", "...");
 	AddCommand(new Command("Help", [&](CommandLine *cmd) {
 		string commandName = cmd->GetStringLower(0, "");
-		if(aliases.count(commandName) > 0) {
+		if (aliases.count(commandName) > 0) {
 			commandName = aliases[commandName];
 		}
-		if(help.count(commandName)) {
+		if (help.count(commandName)) {
 			string helpText = help[commandName];
 			LOG_INFO("Help:\n\n%s\n", helpText.c_str());
 		}
diff --git a/TabletDriverService/CommandHandler.Tablet.cpp b/TabletDriverService/CommandHandler.Tablet.cpp
index e69f64a..9032f9d 100644
--- a/TabletDriverService/CommandHandler.Tablet.cpp
+++ b/TabletDriverService/CommandHandler.Tablet.cpp
@@ -13,7 +13,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: TabletIsValid
 	//
 	AddCommand(new Command("TabletValid", [&](CommandLine *cmd) {
-		if(tablet == NULL) {
+		if (tablet == NULL) {
 			return false;
 		}
 		return true;
@@ -24,7 +24,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: CheckTablet
 	//
 	AddCommand(new Command("CheckTablet", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) {
+		if (!ExecuteCommand("TabletValid")) {
 			LOG_ERROR("Tablet not found!\n");
 			LOG_ERROR("Check the list of supported tablets from the GitHub page.\n");
 			LOG_ERROR("http://github.com/hawku/TabletDriver\n");
@@ -40,7 +40,7 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddAlias("Name", "TabletName");
 	AddCommand(new Command("TabletName", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->name = cmd->GetString(0, tablet->name);
 		LOG_INFO("Tablet name = '%s'\n", tablet->name.c_str());
 		return true;
@@ -51,7 +51,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: ReportId
 	//
 	AddCommand(new Command("ReportId", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.reportId = cmd->GetInt(0, tablet->settings.reportId);
 		LOG_INFO("Tablet report id = %d\n", tablet->settings.reportId);
 		return true;
@@ -62,7 +62,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: ReportLength
 	//
 	AddCommand(new Command("ReportLength", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.reportLength = cmd->GetInt(0, tablet->settings.reportLength);
 		LOG_INFO("Tablet report length = %d\n", tablet->settings.reportLength);
 		return true;
@@ -73,7 +73,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: DetectMask
 	//
 	AddCommand(new Command("DetectMask", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.detectMask = cmd->GetInt(0, tablet->settings.detectMask);
 		LOG_INFO("Tablet detect mask = 0x%02X\n", tablet->settings.detectMask);
 		return true;
@@ -84,7 +84,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: IgnoreMask
 	//
 	AddCommand(new Command("IgnoreMask", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.ignoreMask = cmd->GetInt(0, tablet->settings.ignoreMask);
 		LOG_INFO("Tablet ignore mask = 0x%02X\n", tablet->settings.ignoreMask);
 		return true;
@@ -95,7 +95,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: MaxX
 	//
 	AddCommand(new Command("MaxX", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.maxX = cmd->GetInt(0, tablet->settings.maxX);
 		LOG_INFO("Tablet maximum X value = %d\n", tablet->settings.maxX);
 		return true;
@@ -106,7 +106,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: MaxY
 	//
 	AddCommand(new Command("MaxY", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.maxY = cmd->GetInt(0, tablet->settings.maxY);
 		LOG_INFO("Tablet maximum Y value = %d\n", tablet->settings.maxY);
 		return true;
@@ -117,18 +117,29 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: MaxPressure
 	//
 	AddCommand(new Command("MaxPressure", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.maxPressure = cmd->GetInt(0, tablet->settings.maxPressure);
 		LOG_INFO("Tablet maximum pressure value = %d\n", tablet->settings.maxPressure);
 		return true;
 	}));
 
 
+	//
+	// Command: MaxHeight
+	//
+	AddCommand(new Command("MaxHeight", [&](CommandLine *cmd) {
+		if (tablet == NULL) return false;
+		tablet->settings.maxHeight = cmd->GetInt(0, tablet->settings.maxHeight);
+		LOG_INFO("Tablet maximum height value = %d\n", tablet->settings.maxHeight);
+		return true;
+	}));
+
+
 	//
 	// Command: ClickPressure
 	//
 	AddCommand(new Command("ClickPressure", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.clickPressure = cmd->GetInt(0, tablet->settings.clickPressure);
 		LOG_INFO("Tablet click pressure = %d\n", tablet->settings.clickPressure);
 		return true;
@@ -139,7 +150,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: KeepTipDown
 	//
 	AddCommand(new Command("KeepTipDown", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.keepTipDown = cmd->GetInt(0, tablet->settings.keepTipDown);
 		LOG_INFO("Tablet pen tip keep down = %d reports\n", tablet->settings.keepTipDown);
 		return true;
@@ -150,7 +161,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: Width
 	//
 	AddCommand(new Command("Width", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.width = cmd->GetDouble(0, tablet->settings.width);
 		LOG_INFO("Tablet width = %0.2f mm\n", tablet->settings.width);
 		return true;
@@ -161,7 +172,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: Height
 	//
 	AddCommand(new Command("Height", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.height = cmd->GetDouble(0, tablet->settings.height);
 		LOG_INFO("Tablet height = %0.2f mm\n", tablet->settings.height);
 		return true;
@@ -172,7 +183,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: PressureSensitivity
 	//
 	AddCommand(new Command("PressureSensitivity", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.pressureSensitivity = cmd->GetDouble(0, tablet->settings.pressureSensitivity);
 		LOG_INFO("Tablet pressure sensitivity = %0.5f\n", tablet->settings.pressureSensitivity);
 		return true;
@@ -183,7 +194,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: PressureDeadzone
 	//
 	AddCommand(new Command("PressureDeadzone", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.pressureDeadzoneLow = cmd->GetDouble(0, tablet->settings.pressureDeadzoneLow);
 		tablet->settings.pressureDeadzoneHigh = cmd->GetDouble(1, tablet->settings.pressureDeadzoneHigh);
 		LOG_INFO("Tablet pressure deadzone = low:%0.2f high:%0.2f\n",
@@ -198,7 +209,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: ScrollSensitivity
 	//
 	AddCommand(new Command("ScrollSensitivity", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.scrollSensitivity = cmd->GetDouble(0, tablet->settings.scrollSensitivity);
 		LOG_INFO("Tablet scroll sensitivity = %0.2f scrolls per millimeter\n", tablet->settings.scrollSensitivity);
 		return true;
@@ -210,9 +221,9 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddAlias("ScrollAcc", "ScrollAcceleration");
 	AddCommand(new Command("ScrollAcceleration", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.scrollAcceleration = cmd->GetDouble(0, tablet->settings.scrollAcceleration);
-		if(tablet->settings.scrollAcceleration < 0.1) tablet->settings.scrollAcceleration = 0.1;
+		if (tablet->settings.scrollAcceleration < 0.1) tablet->settings.scrollAcceleration = 0.1;
 		LOG_INFO("Tablet scroll acceleration = %0.2f\n", tablet->settings.scrollAcceleration);
 		return true;
 	}));
@@ -222,7 +233,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: ScrollDrag
 	//
 	AddCommand(new Command("ScrollDrag", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.scrollDrag = cmd->GetBoolean(0, tablet->settings.scrollDrag);
 		LOG_INFO("Tablet scroll drag = %s\n", tablet->settings.scrollDrag ? "true" : "false");
 		return true;
@@ -233,7 +244,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: ScrollStopCursor
 	//
 	AddCommand(new Command("ScrollStopCursor", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.scrollStopCursor = cmd->GetBoolean(0, tablet->settings.scrollStopCursor);
 		LOG_INFO("Tablet scroll stop cursor = %s\n", tablet->settings.scrollStopCursor ? "true" : "false");
 		return true;
@@ -245,7 +256,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: Skew
 	//
 	AddCommand(new Command("Skew", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->settings.skew = cmd->GetDouble(0, tablet->settings.skew);
 		LOG_INFO("Tablet skew = Shift X-axis %0.2f mm per Y-axis mm\n", tablet->settings.skew);
 		return true;
@@ -260,31 +271,31 @@ void CommandHandler::CreateTabletCommands() {
 	AddAlias("Format", "TabletDataFormat");
 	AddAlias("TabletFormat", "TabletDataFormat");
 	AddCommand(new Command("TabletDataFormat", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		string format = cmd->GetStringLower(0, "");
 
 		// Wacom Intuos Format V2 (Wacom CTL-490)
-		if(format == "wacomintuosv2") {
+		if (format == "wacomintuosv2") {
 			tablet->settings.dataFormat = TabletSettings::TabletFormatWacomIntuosV2;
 		}
 
 		// Wacom Intuos Format V3 (Wacom CTL-4100)
-		else if(format == "wacomintuosv3" || format == "wacom4100") {
+		else if (format == "wacomintuosv3" || format == "wacom4100") {
 			tablet->settings.dataFormat = TabletSettings::TabletFormatWacomIntuosV3;
 		}
 
 		// Wacom Drivers
-		else if(format == "wacomdrivers") {
+		else if (format == "wacomdrivers") {
 			tablet->settings.dataFormat = TabletSettings::TabletFormatWacomDrivers;
 		}
 
 		// Skip first data byte (VEIKK S640)
-		else if(format == "skipfirstdatabyte") {
+		else if (format == "skipfirstdatabyte") {
 			tablet->settings.dataFormat = TabletSettings::TabletFormatSkipFirstDataByte;
 		}
 
 		// Custom data format
-		else if(format == "custom") {
+		else if (format == "custom") {
 			tablet->settings.dataFormat = TabletSettings::TabletFormatCustom;
 		}
 
@@ -309,11 +320,11 @@ void CommandHandler::CreateTabletCommands() {
 	AddAlias("CustomData", "CustomDataInstruction");
 	AddAlias("AuxCustomData", "CustomDataInstruction");
 	AddCommand(new Command("CustomDataInstruction", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 
 		string commandName = cmd->GetCommandLowerCase();
 
-		if(cmd->valueCount >= 3) {
+		if (cmd->valueCount >= 3) {
 
 			DataFormatter::DataInstruction instruction;
 
@@ -328,25 +339,36 @@ void CommandHandler::CreateTabletCommands() {
 
 
 			// Auxiliary byte names
-			if(commandName.compare(0, 3, "aux") == 0) {
-				if(targetByteName == "reportid") targetByte = 0;
-				if(targetByteName == "buttonslow") targetByte = 1;
-				if(targetByteName == "buttonshigh") targetByte = 2;
-				if(targetByteName == "detect") targetByte = 3;
-				if(targetByteName == "ispressed") targetByte = 4;
+			if (commandName.compare(0, 3, "aux") == 0) {
+				if (targetByteName == "reportid") targetByte = 0;
+				if (targetByteName == "buttonslow") targetByte = 1;
+				if (targetByteName == "buttonshigh") targetByte = 2;
+				if (targetByteName == "detect") targetByte = 3;
+				if (targetByteName == "ispressed") targetByte = 4;
 
 			}
 
 			// Tablet byte names
 			else {
-				if(targetByteName == "reportid") targetByte = 0;
-				if(targetByteName == "buttons") targetByte = 1;
-				if(targetByteName == "xlow") targetByte = 2;
-				if(targetByteName == "xhigh") targetByte = 3;
-				if(targetByteName == "ylow") targetByte = 4;
-				if(targetByteName == "yhigh") targetByte = 5;
-				if(targetByteName == "pressurelow") targetByte = 6;
-				if(targetByteName == "pressurehigh") targetByte = 7;
+				if (targetByteName == "reportid") targetByte = 0;
+				if (targetByteName == "buttons") targetByte = 1;
+				if (targetByteName == "xlow") targetByte = 2;
+				if (targetByteName == "xhigh") targetByte = 3;
+				if (targetByteName == "xbyte1") targetByte = 2;
+				if (targetByteName == "xbyte2") targetByte = 3;
+				if (targetByteName == "xbyte3") targetByte = 4;
+				if (targetByteName == "xbyte4") targetByte = 5;
+				if (targetByteName == "ylow") targetByte = 6;
+				if (targetByteName == "yhigh") targetByte = 7;
+				if (targetByteName == "ybyte1") targetByte = 6;
+				if (targetByteName == "ybyte2") targetByte = 7;
+				if (targetByteName == "ybyte3") targetByte = 8;
+				if (targetByteName == "ybyte4") targetByte = 9;
+				if (targetByteName == "pressurelow") targetByte = 10;
+				if (targetByteName == "pressurehigh") targetByte = 11;
+				if (targetByteName == "heightlow") targetByte = 12;
+				if (targetByteName == "heighthigh") targetByte = 13;
+
 			}
 
 
@@ -354,27 +376,27 @@ void CommandHandler::CreateTabletCommands() {
 			instruction.writeMode = DataFormatter::DataInstruction::WriteModeOR;
 
 			// Loop through parameters
-			for(int i = 1; i < cmd->valueCount; i += 2) {
+			for (int i = 1; i < cmd->valueCount; i += 2) {
 				string parameter = cmd->GetStringLower(i, "");
 				int value = cmd->GetInt(i + 1, -1);
 				string stringValue = cmd->GetStringLower(i + 1, "");
 
 				// Set instruction parameters
-				if(parameter == "targetmask" || parameter == "mask") instruction.targetBitMask = value;
-				if(parameter == "source") instruction.sourceByte = value;
-				if(parameter == "sourcemask") instruction.sourceBitMask = value;
-				if(parameter == "sourceshift" || parameter == "shift") instruction.sourceBitShift = value;
-				if(parameter == "writemode") {
-					if(stringValue == "or") instruction.writeMode = DataFormatter::DataInstruction::WriteModeOR;
-					else if(stringValue == "and") instruction.writeMode = DataFormatter::DataInstruction::WriteModeAND;
-					else if(stringValue == "set") instruction.writeMode = DataFormatter::DataInstruction::WriteModeSet;
+				if (parameter == "targetmask" || parameter == "mask") instruction.targetBitMask = value;
+				if (parameter == "source") instruction.sourceByte = value;
+				if (parameter == "sourcemask") instruction.sourceBitMask = value;
+				if (parameter == "sourceshift" || parameter == "shift") instruction.sourceBitShift = value;
+				if (parameter == "writemode") {
+					if (stringValue == "or") instruction.writeMode = DataFormatter::DataInstruction::WriteModeOR;
+					else if (stringValue == "and") instruction.writeMode = DataFormatter::DataInstruction::WriteModeAND;
+					else if (stringValue == "set") instruction.writeMode = DataFormatter::DataInstruction::WriteModeSet;
 				}
 
 			}
 
 
 			// Add aux data format instruction
-			if(commandName.compare(0, 3, "aux") == 0) {
+			if (commandName.compare(0, 3, "aux") == 0) {
 				tablet->settings.auxCurrentReport->formatter.AddInstruction(&instruction);
 			}
 			// Add tablet data format instruction
@@ -410,7 +432,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Clears custom data formatter instructions
 	//
 	AddCommand(new Command("ClearCustomData", [&](CommandLine *cmd) {
-		if(tablet == NULL) return false;
+		if (tablet == NULL) return false;
 		tablet->dataFormatter.instructionCount = 0;
 		LOG_INFO("Custom data format instructions cleared!\n");
 		return true;
@@ -422,11 +444,11 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddAlias("InitFeature", "InitFeatureReport");
 	AddCommand(new Command("InitFeatureReport", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 0) return false;
-		if(tablet == NULL) return false;
+		if (cmd->valueCount <= 0) return false;
+		if (tablet == NULL) return false;
 
 		Tablet::InitReport *report = new Tablet::InitReport(cmd->valueCount);
-		for(int i = 0; i < (int)cmd->valueCount; i++) {
+		for (int i = 0; i < (int)cmd->valueCount; i++) {
 			report->data[i] = cmd->GetInt(i, 0);
 		}
 		tablet->initFeatureReports.push_back(report);
@@ -444,11 +466,11 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddAlias("InitReport", "InitOutputReport");
 	AddCommand(new Command("InitOutputReport", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 0) return false;
-		if(tablet == NULL) return false;
+		if (cmd->valueCount <= 0) return false;
+		if (tablet == NULL) return false;
 
 		Tablet::InitReport *report = new Tablet::InitReport(cmd->valueCount);
-		for(int i = 0; i < (int)cmd->valueCount; i++) {
+		for (int i = 0; i < (int)cmd->valueCount; i++) {
 			report->data[i] = cmd->GetInt(i, 0);
 		}
 		tablet->initOutputReports.push_back(report);
@@ -464,16 +486,16 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddAlias("InitString", "InitStrings");
 	AddCommand(new Command("InitStrings", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 0) return false;
-		if(tablet == NULL) return false;
-		for(int i = 0; i < (int)cmd->valueCount; i++) {
+		if (cmd->valueCount <= 0) return false;
+		if (tablet == NULL) return false;
+		for (int i = 0; i < (int)cmd->valueCount; i++) {
 			int stringId = cmd->GetInt(i, 0);
-			if(stringId > 0 && stringId <= 256) {
+			if (stringId > 0 && stringId <= 256) {
 				tablet->initStrings.push_back(stringId);
 			}
 		}
 		string stringIdsString = "";
-		for(int stringId : tablet->initStrings) {
+		for (int stringId : tablet->initStrings) {
 			stringIdsString += to_string(stringId) + " ";
 		}
 		LOG_INFO("Tablet initialization string ids = %s\n", stringIdsString.c_str());
@@ -490,12 +512,12 @@ void CommandHandler::CreateTabletCommands() {
 	AddAlias("Area", "TabletArea");
 	AddCommand(new Command("TabletArea", [&](CommandLine *cmd) {
 
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		int index = cmd->GetInt(4, 0);
 
 		// Validate map index
-		if(index >= sizeof(mapper->screenMaps) / sizeof(ScreenMapper::ScreenMap)) {
+		if (index >= sizeof(mapper->screenMaps) / sizeof(ScreenMapper::ScreenMap)) {
 			LOG_ERROR("Invalid map index!\n");
 			return false;
 		}
@@ -524,21 +546,21 @@ void CommandHandler::CreateTabletCommands() {
 	// Command: ClearButtonMap
 	//
 	AddCommand(new Command("ClearButtonMap", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
-		for(string &str : tablet->settings.buttonMap) {
+		if (!ExecuteCommand("TabletValid")) return false;
+		for (string &str : tablet->settings.buttonMap) {
 			str = "";
 		}
 		LOG_INFO("Pen button map cleared!\n");
 		return true;
 	}));
-	
+
 
 	//
 	// Command: ClearAuxButtonMap
 	//
 	AddCommand(new Command("ClearAuxButtonMap", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
-		for(int i = 0; i < 16; i++) {
+		if (!ExecuteCommand("TabletValid")) return false;
+		for (int i = 0; i < 16; i++) {
 			tablet->settings.auxButtonMap[i] = "";
 		}
 		LOG_INFO("Aux button map cleared!\n");
@@ -555,36 +577,36 @@ void CommandHandler::CreateTabletCommands() {
 	AddAlias("AuxButtonMap", "ButtonMap");
 	AddAlias("AuxButtons", "ButtonMap");
 	AddCommand(new Command("ButtonMap", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		string commandName = cmd->GetCommandLowerCase();
 		int button = cmd->GetInt(0, 0);
 		string keys = "";
-		if(cmd->valueCount == 2) {
+		if (cmd->valueCount == 2) {
 			keys = cmd->GetString(1, "");
 			transform(keys.begin(), keys.end(), keys.begin(), ::toupper);
 		}
 		else {
-			for(int i = 1; i < cmd->valueCount; i++) {
+			for (int i = 1; i < cmd->valueCount; i++) {
 				string key = cmd->GetString(i, "");
 				key.erase(remove(key.begin(), key.end(), '+'), key.end());
-				if(key.size() > 0) {
+				if (key.size() > 0) {
 					std::transform(key.begin(), key.end(), key.begin(), ::toupper);
-					if(i != 1) keys += "+";
+					if (i != 1) keys += "+";
 					keys += key;
 				}
 			}
 		}
 
-		if(button >= 1) {
-			if(commandName.compare(0, 3, "aux") == 0) {
-				if(button <= tablet->settings.auxButtonCount) {
+		if (button >= 1) {
+			if (commandName.compare(0, 3, "aux") == 0) {
+				if (button <= tablet->settings.auxButtonCount) {
 					tablet->settings.auxButtonMap[button - 1] = keys;
 					LOG_INFO("Aux button %d mapped to '%s'\n", button, keys.c_str());
 				}
 			}
 			else {
-				if(button <= tablet->settings.buttonCount) {
+				if (button <= tablet->settings.buttonCount) {
 					tablet->settings.buttonMap[button - 1] = keys;
 					LOG_INFO("Pen button %d mapped to '%s'\n", button, keys.c_str());
 				}
@@ -605,34 +627,34 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddAlias("Move", "TabletMove");
 	AddCommand(new Command("TabletMove", [&](CommandLine *cmd) {
-		if(cmd->valueCount <= 0) return false;
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (cmd->valueCount <= 0) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 		string border;
 		double offset;
 		bool moved = true;
 
-		for(int i = 0; i < cmd->valueCount; i += 2) {
+		for (int i = 0; i < cmd->valueCount; i += 2) {
 
 			border = cmd->GetStringLower(i, "");
 			offset = cmd->GetDouble(i + 1, 0.0);
 			moved = true;
 
-			if(border == "top") {
+			if (border == "top") {
 				mapper->primaryTabletArea->y = offset + mapper->primaryTabletArea->height / 2.0;
 			}
-			else if(border == "bottom") {
+			else if (border == "bottom") {
 				mapper->primaryTabletArea->y = tablet->settings.height - mapper->primaryTabletArea->height / 2.0 - offset;
 			}
-			else if(border == "left") {
+			else if (border == "left") {
 				mapper->primaryTabletArea->x = offset + mapper->primaryTabletArea->width / 2.0;;
 			}
-			else if(border == "right") {
+			else if (border == "right") {
 				mapper->primaryTabletArea->x = tablet->settings.width - mapper->primaryTabletArea->width / 2.0 - offset;
 			}
 			else {
 				moved = false;
 			}
-			if(moved) {
+			if (moved) {
 				LOG_INFO("Tablet area moved to %s border with %0.2f mm margin.\n", border.c_str(), offset);
 
 				ScreenMapper::Area *area = mapper->primaryTabletArea;
@@ -654,12 +676,12 @@ void CommandHandler::CreateTabletCommands() {
 	// Sets tablet area rotation
 	//
 	AddCommand(new Command("Rotate", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 
 		int index = cmd->GetInt(1, 0);
 
 		// Validate map index
-		if(index >= sizeof(mapper->screenMaps) / sizeof(ScreenMapper::ScreenMap)) {
+		if (index >= sizeof(mapper->screenMaps) / sizeof(ScreenMapper::ScreenMap)) {
 			LOG_ERROR("Invalid map index!\n");
 			return false;
 		}
@@ -674,7 +696,7 @@ void CommandHandler::CreateTabletCommands() {
 			screenMap->rotationMatrix[2],
 			screenMap->rotationMatrix[3]
 		);
-		
+
 		mapper->UpdateValues();
 
 		return true;
@@ -688,11 +710,11 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddAlias("Sensitivity", "RelativeSensitivity");
 	AddCommand(new Command("RelativeSensitivity", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 		outputManager->settings->relativeSensitivity.x = cmd->GetDouble(0, outputManager->settings->relativeSensitivity.x);
 		outputManager->settings->relativeSensitivity.y = cmd->GetDouble(1, outputManager->settings->relativeSensitivity.y);
 
-		if(cmd->valueCount == 1) {
+		if (cmd->valueCount == 1) {
 			outputManager->settings->relativeSensitivity.y = outputManager->settings->relativeSensitivity.x;
 		}
 
@@ -709,7 +731,7 @@ void CommandHandler::CreateTabletCommands() {
 	// Sets if relative mouse position only moves when pen tip is pressed down
 	//
 	AddCommand(new Command("RelativeDragMove", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 		outputManager->settings->relativeDragMove = cmd->GetBoolean(0, outputManager->settings->relativeDragMove);
 		LOG_INFO("Relative mode drag move = %s\n",
 			outputManager->settings->relativeDragMove ? "true" : "false"
@@ -725,7 +747,7 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddAlias("ResetDistance", "RelativeResetDistance");
 	AddCommand(new Command("RelativeResetDistance", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 		outputManager->settings->relativeResetDistance = cmd->GetDouble(0, outputManager->settings->relativeResetDistance);
 		LOG_INFO("Relative mode reset distance = %0.2f mm\n", outputManager->settings->relativeResetDistance);
 		return true;
@@ -739,7 +761,7 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddAlias("ResetTime", "RelativeResetTime");
 	AddCommand(new Command("RelativeResetTime", [&](CommandLine *cmd) {
-		if(!ExecuteCommand("TabletValid")) return false;
+		if (!ExecuteCommand("TabletValid")) return false;
 		outputManager->settings->relativeResetTime = cmd->GetDouble(0, outputManager->settings->relativeResetTime);
 		LOG_INFO("Relative mode reset time = %0.2f milliseconds\n", outputManager->settings->relativeResetTime);
 		return true;
diff --git a/TabletDriverService/CommandHandler.cpp b/TabletDriverService/CommandHandler.cpp
index 01cc9e6..a64a67c 100644
--- a/TabletDriverService/CommandHandler.cpp
+++ b/TabletDriverService/CommandHandler.cpp
@@ -16,6 +16,10 @@ CommandHandler::CommandHandler() {
 // Destructor
 //
 CommandHandler::~CommandHandler() {
+
+	// Wait locked commands to finish
+	lock.lock();
+	lock.unlock();
 }
 
 
@@ -26,7 +30,7 @@ CommandHandler::~CommandHandler() {
 bool CommandHandler::AddCommand(Command *command) {
 	string name = command->name;
 	transform(name.begin(), name.end(), name.begin(), ::tolower);
-	if(commands.count(name) <= 0) {
+	if (commands.count(name) <= 0) {
 		commands.insert(pair<string, Command*>(name, command));
 		return true;
 	}
@@ -42,7 +46,7 @@ bool CommandHandler::AddAlias(string alias, string commandName) {
 	transform(aliasLowerCase.begin(), aliasLowerCase.end(), aliasLowerCase.begin(), ::tolower);
 	transform(commandName.begin(), commandName.end(), commandName.begin(), ::tolower);
 
-	if(aliases.count(aliasLowerCase) <= 0) {
+	if (aliases.count(aliasLowerCase) <= 0) {
 		aliases.insert(pair<string, string>(aliasLowerCase, commandName));
 		aliasNames.insert(pair<string, string>(aliasLowerCase, alias));
 		return true;
@@ -57,7 +61,7 @@ bool CommandHandler::AddAlias(string alias, string commandName) {
 bool CommandHandler::AddHelp(string commandName, string line) {
 	transform(commandName.begin(), commandName.end(), commandName.begin(), ::tolower);
 	line.append("\n");
-	if(help.count(commandName) < 0) {
+	if (help.count(commandName) < 0) {
 		help.insert(pair<string, string>(commandName, line));
 	}
 	else {
@@ -84,10 +88,10 @@ void CommandHandler::CreateCommands() {
 //
 bool CommandHandler::IsValidCommand(string command) {
 	transform(command.begin(), command.end(), command.begin(), ::tolower);
-	if(aliases.count(command) > 0) {
+	if (aliases.count(command) > 0) {
 		command = aliases[command];
 	}
-	if(commands.count(command) > 0) {
+	if (commands.count(command) > 0) {
 		return true;
 	}
 	return false;
@@ -100,10 +104,8 @@ bool CommandHandler::ExecuteCommand(string command) {
 	return ExecuteCommand(command, NULL);
 }
 bool CommandHandler::ExecuteCommandLock(string command) {
-	lock.lock();
-	bool result = ExecuteCommand(command);
-	lock.unlock();
-	return result;
+	std::unique_lock<std::mutex> mlock(lock);
+	return ExecuteCommand(command);
 }
 
 
@@ -114,10 +116,8 @@ bool CommandHandler::ExecuteCommand(CommandLine *cmd) {
 	return ExecuteCommand(cmd->command, cmd);
 }
 bool CommandHandler::ExecuteCommandLock(CommandLine *cmd) {
-	lock.lock();
-	bool result = ExecuteCommand(cmd);
-	lock.unlock();
-	return result;
+	std::unique_lock<std::mutex> mlock(lock);
+	return ExecuteCommand(cmd);
 }
 
 
@@ -131,10 +131,8 @@ bool CommandHandler::ExecuteCommand(string command, string parameters) {
 	return result;
 }
 bool CommandHandler::ExecuteCommandLock(string command, string parameters) {
-	lock.lock();
-	bool result = ExecuteCommand(command, parameters);
-	lock.unlock();
-	return result;
+	std::unique_lock<std::mutex> mlock(lock);
+	return ExecuteCommand(command, parameters);
 }
 
 
@@ -143,19 +141,17 @@ bool CommandHandler::ExecuteCommandLock(string command, string parameters) {
 //
 bool CommandHandler::ExecuteCommand(string command, CommandLine * cmd) {
 	transform(command.begin(), command.end(), command.begin(), ::tolower);
-	if(aliases.count(command) > 0) {
+	if (aliases.count(command) > 0) {
 		command = aliases[command];
 	}
-	if(commands.count(command) > 0) {
+	if (commands.count(command) > 0) {
 		return commands[command]->Execute(cmd);
 	}
 	return false;
 }
 bool CommandHandler::ExecuteCommandLock(string command, CommandLine * cmd) {
-	lock.lock();
-	bool result = ExecuteCommand(command, cmd);
-	lock.unlock();
-	return result;
+	std::unique_lock<std::mutex> mlock(lock);
+	return ExecuteCommand(command, cmd);
 }
 
 
@@ -170,22 +166,22 @@ bool CommandHandler::ExecuteFile(string filename) {
 
 	// Open file
 	file.open(filename);
-	if(!file.is_open()) {
+	if (!file.is_open()) {
 		return false;
 	}
 
 	LOG_INFO("\\ Reading '%s'\n", filename.c_str());
 
 	// Loop through lines
-	while(!file.eof()) {
+	while (!file.eof()) {
 		getline(file, line);
-		if(line.length() == 0) continue;
+		if (line.length() == 0) continue;
 		cmd = new CommandLine(line);
 
 		//
 		// Do not redefine tablet if one is already open
 		//
-		if(
+		if (
 			(
 				cmd->is("Tablet")
 				||
@@ -196,7 +192,7 @@ bool CommandHandler::ExecuteFile(string filename) {
 			&&
 			tablet != NULL &&
 			tablet->IsConfigured()
-		) {
+			) {
 			LOG_INFO(">> %s\n", cmd->line.c_str());
 			LOG_INFO("Tablet is already defined!\n");
 			delete cmd;
@@ -206,10 +202,10 @@ bool CommandHandler::ExecuteFile(string filename) {
 
 		string command = cmd->command;
 		transform(command.begin(), command.end(), command.begin(), ::tolower);
-		if(aliases.count(command) > 0) {
+		if (aliases.count(command) > 0) {
 			command = aliases[command];
 		}
-		if(commands.count(command) > 0) {
+		if (commands.count(command) > 0) {
 			commands[command]->Execute(cmd);
 		}
 		//ExecuteCommand(cmd);
@@ -222,3 +218,9 @@ bool CommandHandler::ExecuteFile(string filename) {
 
 	return true;
 }
+
+bool CommandHandler::ExecuteFileLock(string filename)
+{
+	std::unique_lock<std::mutex> mlock(lock);
+	return ExecuteFile(filename);
+}
diff --git a/TabletDriverService/CommandHandler.h b/TabletDriverService/CommandHandler.h
index ec50097..87599d8 100644
--- a/TabletDriverService/CommandHandler.h
+++ b/TabletDriverService/CommandHandler.h
@@ -40,6 +40,7 @@ class CommandHandler {
 	bool ExecuteCommandLock(string command, CommandLine * cmd);
 
 	bool ExecuteFile(string filename);
+	bool ExecuteFileLock(string filename);
 
 };
 
diff --git a/TabletDriverService/CommandLine.cpp b/TabletDriverService/CommandLine.cpp
index 6d7b1a0..502fc41 100644
--- a/TabletDriverService/CommandLine.cpp
+++ b/TabletDriverService/CommandLine.cpp
@@ -27,7 +27,7 @@ bool CommandLine::is(string command) {
 	transform(command.begin(), command.end(), command.begin(), ::tolower);
 	transform(match.begin(), match.end(), match.begin(), ::tolower);
 
-	if(command.compare(match) == 0) {
+	if (command.compare(match) == 0) {
 		return true;
 	}
 	return false;
@@ -45,7 +45,7 @@ string CommandLine::GetCommandLowerCase() {
 // Get command parameters as as string
 //
 string CommandLine::GetParameterString() {
-	if(command.size() < line.size())
+	if (command.size() < line.size())
 		return line.substr(command.size() + 1);
 	return "";
 }
@@ -78,12 +78,12 @@ int CommandLine::Parse(string line) {
 	bool isLastChar = false;
 	bool isEnclosed = false;
 
-	for(std::string::iterator it = line.begin(); it != line.end(); ++it) {
+	for (std::string::iterator it = line.begin(); it != line.end(); ++it) {
 		currentChar = *it;
 
 		// Comment char
-		if(!isEnclosed && currentChar == commentChar) {
-			if(itemLength > 0) {
+		if (!isEnclosed && currentChar == commentChar) {
+			if (itemLength > 0) {
 				items.push_back(item);
 			}
 			break;
@@ -91,8 +91,8 @@ int CommandLine::Parse(string line) {
 
 		// Is split char?
 		isSplitChar = false;
-		for(int i = 0; i < (int)sizeof(splitChars); i++) {
-			if(splitChars[i] && currentChar == splitChars[i]) {
+		for (int i = 0; i < (int)sizeof(splitChars); i++) {
+			if (splitChars[i] && currentChar == splitChars[i]) {
 				isSplitChar = true;
 				break;
 			}
@@ -100,8 +100,8 @@ int CommandLine::Parse(string line) {
 
 		// Is end char?
 		isEndChar = false;
-		for(int i = 0; i < (int)sizeof(endChars); i++) {
-			if(currentChar == endChars[i]) {
+		for (int i = 0; i < (int)sizeof(endChars); i++) {
+			if (currentChar == endChars[i]) {
 				isEndChar = true;
 				break;
 			}
@@ -109,20 +109,20 @@ int CommandLine::Parse(string line) {
 
 		// Is last char?
 		isLastChar = false;
-		if(index == lineLength - 1) {
+		if (index == lineLength - 1) {
 			isLastChar = true;
 		}
 
 
 		// Toggle enclosing
 		isEnclosingChar = false;
-		if(currentChar == enclosingChar && previousChar != escapeChar) {
+		if (currentChar == enclosingChar && previousChar != escapeChar) {
 			isEnclosed = !isEnclosed;
 			isEnclosingChar = true;
 		}
 
 		// New item
-		if(
+		if (
 			!isEnclosed &&
 			(
 				isSplitChar ||
@@ -139,15 +139,15 @@ int CommandLine::Parse(string line) {
 			//INFO("itemLength = %d\n", itemLength);
 
 			// Last char
-			if(isLastChar && !isEndChar && !isSplitChar) {
-				if(!isEnclosingChar) {
+			if (isLastChar && !isEndChar && !isSplitChar) {
+				if (!isEnclosingChar) {
 					item.push_back(currentChar);
 					itemLength = 1;
 				}
 			}
 
 			// Create new item
-			if(itemLength > 0) {
+			if (itemLength > 0) {
 				items.push_back(item);
 				item = "";
 				itemLength = 0;
@@ -159,18 +159,18 @@ int CommandLine::Parse(string line) {
 			}
 
 			// Stop parsing at end of the line
-			if(isEndChar) {
+			if (isEndChar) {
 				break;
 			}
 
 			// Add text to item
 		}
-		else if(currentChar >= 32) {
-			if(itemCount == 0 && currentChar == '=') {
+		else if (currentChar >= 32) {
+			if (itemCount == 0 && currentChar == '=') {
 			}
-			else if(isEnclosingChar) {
+			else if (isEnclosingChar) {
 			}
-			else if(currentChar == escapeChar && !isEnclosed) {
+			else if (currentChar == escapeChar && !isEnclosed) {
 			}
 			else {
 				item.push_back(currentChar);
@@ -182,7 +182,7 @@ int CommandLine::Parse(string line) {
 	}
 
 	// Set command
-	if(itemCount > 0) {
+	if (itemCount > 0) {
 		command = items[0];
 		isValid = true;
 	}
@@ -192,7 +192,7 @@ int CommandLine::Parse(string line) {
 
 	// Set values
 	values.clear();
-	for(int i = 1; i < (int)items.size(); i++) {
+	for (int i = 1; i < (int)items.size(); i++) {
 		values.push_back(items[i]);
 	}
 
@@ -205,11 +205,12 @@ int CommandLine::Parse(string line) {
 // Parse hex string
 //
 string CommandLine::ParseHex(string str) {
-	if(str.size() >= 3 && str[0] == '0' && str[1] == 'x') {
+	if (str.size() >= 3 && str[0] == '0' && str[1] == 'x') {
 		try {
 			string tmp = str.substr(2, str.size() - 2);
 			return to_string(stol(tmp, 0, 16));
-		} catch(exception) {
+		}
+		catch (exception) {
 		}
 	}
 	return str;
@@ -219,18 +220,19 @@ string CommandLine::ParseHex(string str) {
 // Parse bit string (e.g. 0b10100101)
 //
 string CommandLine::ParseBits(string str) {
-	if(str.size() >= 3 && str[0] == '0' && str[1] == 'b') {
+	if (str.size() >= 3 && str[0] == '0' && str[1] == 'b') {
 		int length = str.size();
 		unsigned int output = 0;
 		try {
-			for(int i = 2; i < length; i++) {
+			for (int i = 2; i < length; i++) {
 				char c = str.at(i);
-				if(c == '1') {
+				if (c == '1') {
 					output |= 1 << (length - (i + 1));
 				}
 			}
 			return to_string(output);
-		} catch(exception) {
+		}
+		catch (exception) {
 		}
 	}
 	return str;
@@ -249,7 +251,7 @@ string CommandLine::ParseHexBits(string str)
 // Get string value
 //
 string CommandLine::GetString(int index, string defaultValue) {
-	if(index < valueCount) {
+	if (index < valueCount) {
 		return values[index];
 	}
 	return defaultValue;
@@ -270,11 +272,12 @@ string CommandLine::GetStringLower(int index, string defaultValue) {
 // Get integer
 //
 int CommandLine::GetInt(int index, int defaultValue) {
-	if(index < valueCount) {
+	if (index < valueCount) {
 		try {
 			auto value = stoi(ParseHexBits(values[index]));
 			return value;
-		} catch(exception) {}
+		}
+		catch (exception) {}
 	}
 	return defaultValue;
 }
@@ -284,11 +287,12 @@ int CommandLine::GetInt(int index, int defaultValue) {
 // Get long integer
 //
 long CommandLine::GetLong(int index, long defaultValue) {
-	if(index < valueCount) {
+	if (index < valueCount) {
 		try {
 			auto value = stol(ParseHexBits(values[index]));
 			return value;
-		} catch(exception) {}
+		}
+		catch (exception) {}
 	}
 	return defaultValue;
 }
@@ -298,11 +302,12 @@ long CommandLine::GetLong(int index, long defaultValue) {
 // Get double precision floating point number
 //
 double CommandLine::GetDouble(int index, double defaultValue) {
-	if(index < valueCount) {
+	if (index < valueCount) {
 		try {
 			auto value = stod(ParseHexBits(values[index]));
 			return value;
-		} catch(exception) {}
+		}
+		catch (exception) {}
 	}
 	return defaultValue;
 }
@@ -312,11 +317,12 @@ double CommandLine::GetDouble(int index, double defaultValue) {
 // Get floating point number
 //
 float CommandLine::GetFloat(int index, float defaultValue) {
-	if(index < valueCount) {
+	if (index < valueCount) {
 		try {
 			auto value = stof(ParseHexBits(values[index]));
 			return value;
-		} catch(exception) {}
+		}
+		catch (exception) {}
 	}
 	return defaultValue;
 }
@@ -326,12 +332,12 @@ float CommandLine::GetFloat(int index, float defaultValue) {
 // Get boolean
 //
 bool CommandLine::GetBoolean(int index, bool defaultValue) {
-	if(GetInt(index, 0) > 0) return true;
+	if (GetInt(index, 0) > 0) return true;
 	string str = GetStringLower(index, "");
-	if(str == "true") return true;
-	if(str == "on") return true;
-	if(str == "false") return false;
-	if(str == "off") return false;
-	if(str == "0") return false;
+	if (str == "true") return true;
+	if (str == "on") return true;
+	if (str == "false") return false;
+	if (str == "off") return false;
+	if (str == "0") return false;
 	return defaultValue;
 }
diff --git a/TabletDriverService/DataFormatter.cpp b/TabletDriverService/DataFormatter.cpp
index dea3837..e8fffd0 100644
--- a/TabletDriverService/DataFormatter.cpp
+++ b/TabletDriverService/DataFormatter.cpp
@@ -25,7 +25,7 @@ bool DataFormatter::Format(void * targetBuffer, void * sourceBuffer)
 	unsigned int byte;
 
 	// Loop through instructions
-	for(int i = 0; i < instructionCount; i++) {
+	for (int i = 0; i < instructionCount; i++) {
 		instruction = &instructions[i];
 
 		// Get source byte
@@ -41,7 +41,7 @@ bool DataFormatter::Format(void * targetBuffer, void * sourceBuffer)
 		byte &= instruction->targetBitMask;
 
 		// Write target byte
-		switch(instruction->writeMode) {
+		switch (instruction->writeMode) {
 		case DataInstruction::WriteModeOR: target[instruction->targetByte] |= byte & 0xFF;  break;
 		case DataInstruction::WriteModeAND: target[instruction->targetByte] &= byte & 0xFF;  break;
 		case DataInstruction::WriteModeSet: target[instruction->targetByte] = byte & 0xFF;  break;
@@ -64,11 +64,11 @@ bool DataFormatter::Format(void * targetBuffer, void * sourceBuffer)
 
 bool DataFormatter::AddInstruction(int targetByte, int targetBitMask, int sourceByte, int sourceBitMask, int sourceBitShift, int writeMode)
 {
-	if(instructionCount >= 128) return false;
+	if (instructionCount >= 128) return false;
 
 	// Lengths
-	if(targetByte >= targetLength) targetLength = targetByte + 1;
-	if(sourceByte >= sourceLength) sourceLength = sourceByte + 1;
+	if (targetByte >= targetLength) targetLength = targetByte + 1;
+	if (sourceByte >= sourceLength) sourceLength = sourceByte + 1;
 
 	instructions[instructionCount].targetByte = targetByte;
 	instructions[instructionCount].targetBitMask = targetBitMask;
diff --git a/TabletDriverService/HIDDevice.cpp b/TabletDriverService/HIDDevice.cpp
index 0f771e8..7acc554 100644
--- a/TabletDriverService/HIDDevice.cpp
+++ b/TabletDriverService/HIDDevice.cpp
@@ -10,7 +10,7 @@ HIDDevice::HIDDevice(USHORT VendorId, USHORT ProductId, USHORT UsagePage, USHORT
 	this->usagePage = UsagePage;
 	this->usage = Usage;
 	this->isExclusive = IsExclusive;
-	if(this->OpenDevice(&this->_deviceHandle, this->vendorId, this->productId, this->usagePage, this->usage, this->isExclusive)) {
+	if (this->OpenDevice(&this->_deviceHandle, this->vendorId, this->productId, this->usagePage, this->usage, this->isExclusive)) {
 		isOpen = true;
 	}
 	isReading = false;
@@ -38,25 +38,28 @@ bool GetHIDStrings(HANDLE deviceHandle, string *manufacturerName, string *produc
 	int i;
 
 	// HID manufacturer string
-	if(HidD_GetManufacturerString(deviceHandle, &buffer, sizeof(buffer))) {
-		for(i = 0; i < (int)sizeof(buffer); i += 2) {
-			if(buffer[i]) manufacturerName->push_back(buffer[i]);
+	memset(buffer, 0, sizeof(buffer));
+	if (HidD_GetManufacturerString(deviceHandle, &buffer, sizeof(buffer))) {
+		for (i = 0; i < (int)sizeof(buffer); i += 2) {
+			if (buffer[i]) manufacturerName->push_back(buffer[i]);
 			else break;
 		}
 	}
 
 	// HID product string
-	if(HidD_GetProductString(deviceHandle, &buffer, sizeof(buffer))) {
-		for(i = 0; i < (int)sizeof(buffer); i += 2) {
-			if(buffer[i]) productName->push_back(buffer[i]);
+	memset(buffer, 0, sizeof(buffer));
+	if (HidD_GetProductString(deviceHandle, &buffer, sizeof(buffer))) {
+		for (i = 0; i < (int)sizeof(buffer); i += 2) {
+			if (buffer[i]) productName->push_back(buffer[i]);
 			else break;
 		}
 	}
 
 	// HID serial number
-	if(HidD_GetSerialNumberString(deviceHandle, &buffer, sizeof(buffer))) {
-		for(i = 0; i < (int)sizeof(buffer); i += 2) {
-			if(buffer[i]) serialNumber->push_back(buffer[i]);
+	memset(buffer, 0, sizeof(buffer));
+	if (HidD_GetSerialNumberString(deviceHandle, &buffer, sizeof(buffer))) {
+		for (i = 0; i < (int)sizeof(buffer); i += 2) {
+			if (buffer[i]) serialNumber->push_back(buffer[i]);
 			else break;
 		}
 	}
@@ -90,7 +93,7 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 
 	// Setup device info
 	deviceInfo = SetupDiGetClassDevs(&hidGuid, NULL, 0, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT);
-	if(deviceInfo == INVALID_HANDLE_VALUE) {
+	if (deviceInfo == INVALID_HANDLE_VALUE) {
 		LOG_ERROR("Invalid device info!\n");
 		return false;
 	}
@@ -99,7 +102,7 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 	deviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
 	dwMemberIdx = 0;
 	SetupDiEnumDeviceInterfaces(deviceInfo, NULL, &hidGuid, dwMemberIdx, &deviceInterfaceData);
-	while(GetLastError() != ERROR_NO_MORE_ITEMS) {
+	while (GetLastError() != ERROR_NO_MORE_ITEMS) {
 		deviceInfoData.cbSize = sizeof(deviceInfoData);
 
 		// Get the required buffer size for device interface detail data
@@ -110,10 +113,10 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 		deviceInterfaceDetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA);
 
 		// Get interface detail
-		if(SetupDiGetDeviceInterfaceDetail(deviceInfo, &deviceInterfaceData, deviceInterfaceDetailData, dwSize, &dwSize, &deviceInfoData)) {
+		if (SetupDiGetDeviceInterfaceDetail(deviceInfo, &deviceInterfaceData, deviceInterfaceDetailData, dwSize, &dwSize, &deviceInfoData)) {
 
 			// Open HID in exclusive mode
-			if(exclusive) {
+			if (exclusive) {
 				deviceHandle = CreateFile(
 					deviceInterfaceDetailData->DevicePath,
 					GENERIC_READ | GENERIC_WRITE,
@@ -137,7 +140,7 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 			}
 
 			// HID handle valid?
-			if(deviceHandle != INVALID_HANDLE_VALUE) {
+			if (deviceHandle != INVALID_HANDLE_VALUE) {
 
 				// HID Attributes
 				HidD_GetAttributes(deviceHandle, &hidAttributes);
@@ -149,7 +152,7 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 				HidP_GetCaps(hidPreparsedData, &hidCapabilities);
 
 				// Debug logging
-				if(this->debugEnabled) {
+				if (this->debugEnabled) {
 
 					manufacturerName = "";
 					productName = "";
@@ -179,12 +182,12 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 				}
 
 				// Set the result handle if this is the correct device
-				if(!resultHandle &&
+				if (!resultHandle &&
 					hidAttributes.VendorID == vendorId &&
 					hidAttributes.ProductID == productId &&
 					hidCapabilities.UsagePage == usagePage &&
 					hidCapabilities.Usage == usage
-				) {
+					) {
 					GetHIDStrings(deviceHandle, &_manufacturerName, &_productName, &_serialNumber);
 
 					// Set timeouts
@@ -223,7 +226,7 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 	SetupDiDestroyDeviceInfoList(deviceInfo);
 
 	// Copy found handle
-	if(resultHandle && resultHandle != INVALID_HANDLE_VALUE) {
+	if (resultHandle && resultHandle != INVALID_HANDLE_VALUE) {
 		memcpy(handle, &resultHandle, sizeof(HANDLE));
 		return true;
 	}
@@ -244,7 +247,7 @@ int HIDDevice::Read(void *buffer, int length) {
 	//return HidD_GetInputReport(_deviceHandle, buffer, length);
 	DWORD bytesRead;
 	isReading = true;
-	if(ReadFile(_deviceHandle, buffer, length, &bytesRead, 0)) {
+	if (ReadFile(_deviceHandle, buffer, length, &bytesRead, 0)) {
 		return bytesRead;
 	}
 	return 0;
@@ -253,7 +256,7 @@ int HIDDevice::Read(void *buffer, int length) {
 // Write HID report
 int HIDDevice::Write(void *buffer, int length) {
 	DWORD bytesWritten;
-	if(WriteFile(_deviceHandle, buffer, length, &bytesWritten, 0)) {
+	if (WriteFile(_deviceHandle, buffer, length, &bytesWritten, 0)) {
 		return bytesWritten;
 	}
 	return 0;
@@ -272,10 +275,10 @@ bool HIDDevice::GetFeature(void *buffer, int length) {
 // String request
 int HIDDevice::StringRequest(UCHAR stringId, UCHAR * buffer, int length)
 {
-	if(HidD_GetIndexedString(_deviceHandle, stringId, buffer, length)) {
+	if (HidD_GetIndexedString(_deviceHandle, stringId, buffer, length)) {
 		int realLength = length;
-		for(int i = 0; i < length; i += 2) {
-			if(buffer[i] == 0) {
+		for (int i = 0; i < length; i += 2) {
+			if (buffer[i] == 0) {
 				realLength = i;
 				break;
 			}
@@ -291,7 +294,7 @@ string HIDDevice::GetString(UCHAR stringId)
 	UCHAR buffer[256];
 	int bytesRead = 0;
 
-	if(isReading) {
+	if (isReading) {
 		throw runtime_error("HID string request can't be sent when the device is in use!");
 	}
 	else {
@@ -299,8 +302,8 @@ string HIDDevice::GetString(UCHAR stringId)
 	}
 
 	// Reply received?
-	if(bytesRead > 0) {
-		for(int i = 0; i < bytesRead; i += 2) {
+	if (bytesRead > 0) {
+		for (int i = 0; i < bytesRead; i += 2) {
 			resultString.push_back(buffer[i]);
 		}
 	}
@@ -328,10 +331,16 @@ string HIDDevice::GetSerialNumber()
 
 // Close the device
 void HIDDevice::CloseDevice() {
-	if(isOpen && _deviceHandle != NULL && _deviceHandle != INVALID_HANDLE_VALUE) {
+	if (isOpen && _deviceHandle != NULL && _deviceHandle != INVALID_HANDLE_VALUE) {
 		try {
+
+			// Cancel IO
+			CancelIoEx(_deviceHandle, NULL);
+
+			/*
 			// Workaround for hanging CloseHandle
-			_deviceHandle = CreateFile(
+			printf("  HID closing fix\n");
+			HANDLE tmpHandle = CreateFile(
 					_devicePathW.c_str(),
 					GENERIC_READ | GENERIC_WRITE,
 					FILE_SHARE_READ | FILE_SHARE_WRITE,
@@ -340,9 +349,15 @@ void HIDDevice::CloseDevice() {
 					0,
 					NULL);
 
+			SAFE_CLOSE_HANDLE(tmpHandle);
+			printf("HID closing fix done!\n");
+			*/
+
+			SAFE_CLOSE_HANDLE(_deviceHandle);
+
+		}
+		catch (exception) {
 			SAFE_CLOSE_HANDLE(_deviceHandle);
-		} catch(exception) {
-			_deviceHandle = NULL;
 		}
 	}
 	isOpen = false;
diff --git a/TabletDriverService/InputEmulator.cpp b/TabletDriverService/InputEmulator.cpp
index d01ca06..7b1fa10 100644
--- a/TabletDriverService/InputEmulator.cpp
+++ b/TabletDriverService/InputEmulator.cpp
@@ -333,7 +333,7 @@ void InputEmulator::AddKey(string key, string keyName, WORD virtualCode)
 void InputEmulator::AddKey(string key, string keyName, WORD virtualCode, int button)
 {
 	std::transform(key.begin(), key.end(), key.begin(), ::toupper);
-	if(keyMap.count(key) <= 0) {
+	if (keyMap.count(key) <= 0) {
 		keyMap[key] = new KeyMapValue(keyName, virtualCode, button);
 		keys.push_back(key);
 	}
@@ -350,7 +350,7 @@ WORD InputEmulator::GetKeyCode(string key) {
 	// Convert the key string to uppercase
 	std::transform(key.begin(), key.end(), key.begin(), ::toupper);
 
-	if(keyMap.count(key) > 0 && keyMap[key]->virtualKey > 0) {
+	if (keyMap.count(key) > 0 && keyMap[key]->virtualKey > 0) {
 		vkCode = keyMap[key]->virtualKey;
 	}
 
@@ -368,20 +368,20 @@ void InputEmulator::MouseSet(int button, bool down) {
 	input.mi.mouseData = 0;
 	input.mi.dx = 0;
 	input.mi.dy = 0;
-	if(button == 1) {
-		if(down)
+	if (button == 1) {
+		if (down)
 			input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
 		else
 			input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
 	}
-	else if(button == 2) {
-		if(down)
+	else if (button == 2) {
+		if (down)
 			input.mi.dwFlags = MOUSEEVENTF_RIGHTDOWN;
 		else
 			input.mi.dwFlags = MOUSEEVENTF_RIGHTUP;
 	}
-	else if(button == 3) {
-		if(down)
+	else if (button == 3) {
+		if (down)
 			input.mi.dwFlags = MOUSEEVENTF_MIDDLEDOWN;
 		else
 			input.mi.dwFlags = MOUSEEVENTF_MIDDLEUP;
@@ -414,7 +414,7 @@ void InputEmulator::MouseScroll(int delta, bool vertical) {
 	input.mi.dwExtraInfo = 0;
 
 	// Vertical or horizontal?
-	if(vertical) {
+	if (vertical) {
 		input.mi.dwFlags = MOUSEEVENTF_WHEEL;
 	}
 	else {
@@ -476,7 +476,7 @@ void InputEmulator::SetKeyState(string key, bool down) {
 void InputEmulator::SetKeyState(WORD vkCode, bool down)
 {
 	INPUT input = { 0 };
-	if(down) {
+	if (down) {
 		input.type = INPUT_KEYBOARD;
 		input.ki.wVk = vkCode;
 		SendInput(1, &input, sizeof(INPUT));
@@ -500,31 +500,31 @@ void InputEmulator::SetInputStates(string inputs, bool down)
 	stringstream stringStream(inputs);
 	KeyMapValue *keyMapValue;
 
-	while(getline(stringStream, input, '+')) {
+	while (getline(stringStream, input, '+')) {
 
 		// Key in map?
-		if(keyMap.count(input) > 0) {
+		if (keyMap.count(input) > 0) {
 
 			keyMapValue = keyMap[input];
 
 			// Virtual key?
-			if(keyMapValue->virtualKey > 0) {
+			if (keyMapValue->virtualKey > 0) {
 
 				// Set keyboard key state
 				SetKeyState(keyMapValue->virtualKey, down);
 			}
 
 			// Mouse button?
-			else if(keyMapValue->mouseButton > 0 && keyMapValue->mouseButton < 5) {
+			else if (keyMapValue->mouseButton > 0 && keyMapValue->mouseButton < 5) {
 
 				// Set mouse button state
 				MouseSet(keyMapValue->mouseButton, down);
 			}
 
 			// Mouse scroll
-			else if(keyMapValue->mouseButton >= 0x81 && keyMapValue->mouseButton <= 0x84) {
+			else if (keyMapValue->mouseButton >= 0x81 && keyMapValue->mouseButton <= 0x84) {
 
-				switch(keyMapValue->mouseButton)
+				switch (keyMapValue->mouseButton)
 				{
 				case MouseButtons::MouseScrollUp: MouseScroll(-1, true); break;
 				case MouseButtons::MouseScrollDown: MouseScroll(1, true); break;
@@ -539,23 +539,25 @@ void InputEmulator::SetInputStates(string inputs, bool down)
 		//
 		// Precise volume control
 		//
-		else if(input.compare(0, 8, "VOLUMEUP") == 0 && input.size() > 8 && down) {
+		else if (input.compare(0, 8, "VOLUMEUP") == 0 && input.size() > 8 && down) {
 			float value = 0;
 			try {
 				// Parse number from end of the string
 				value = stof(input.substr(8, input.size() - 8));
 				VolumeChange(value / 100.0f);
-			} catch(exception& e) {
+			}
+			catch (exception& e) {
 				LOG_ERROR("Volume control error! %s\n", e.what());
 			}
 		}
-		else if(input.compare(0, 10, "VOLUMEDOWN") == 0 && input.size() > 10 && down) {
+		else if (input.compare(0, 10, "VOLUMEDOWN") == 0 && input.size() > 10 && down) {
 			float value = 0;
 			try {
 				// Parse number from end of the string
 				value = stof(input.substr(10, input.size() - 10));
 				VolumeChange(-value / 100.0f);
-			} catch(exception& e) {
+			}
+			catch (exception& e) {
 				LOG_ERROR("Volume control error! %s\n", e.what());
 			}
 		}
@@ -581,21 +583,26 @@ bool InputEmulator::CreateEndpointVolume()
 {
 	HRESULT hresult;
 
-	// Device enumerator
-	//LOG_DEBUG("Device enumerator\n");
-	hresult = CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pDeviceEnumerator));
-	CHECK_HRESULT(hresult, pDeviceEnumerator);
-
-	// Default audio endpoint
-	//LOG_DEBUG("Default audio endpoint\n");
-	hresult = pDeviceEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &pDefaultAudioDevice);
-	CHECK_HRESULT(hresult, pDefaultAudioDevice);
+	try {
+		// Device enumerator
+		hresult = CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pDeviceEnumerator));
+		CHECK_HRESULT(hresult, pDeviceEnumerator);
 
-	// Endpoint volume
-	//LOG_DEBUG("Audio endpoint volume\n");
-	hresult = pDefaultAudioDevice->Activate(__uuidof(IAudioEndpointVolume), CLSCTX_INPROC_SERVER, NULL, (LPVOID *)&pAudioEndpointVolume);
-	CHECK_HRESULT(hresult, pAudioEndpointVolume);
+		// Default audio endpoint
+		hresult = pDeviceEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &pDefaultAudioDevice);
+		CHECK_HRESULT(hresult, pDefaultAudioDevice);
 
+		// Endpoint volume
+		hresult = pDefaultAudioDevice->Activate(__uuidof(IAudioEndpointVolume), CLSCTX_INPROC_SERVER, NULL, (LPVOID *)&pAudioEndpointVolume);
+		CHECK_HRESULT(hresult, pAudioEndpointVolume);
+	}
+	catch (exception &e) {
+		LOG_ERROR("Audio endpoint exception: %s\n", e.what());
+		SAFE_RELEASE(pDeviceEnumerator);
+		SAFE_RELEASE(pDefaultAudioDevice);
+		SAFE_RELEASE(pAudioEndpointVolume);
+		return false;
+	}
 	return true;
 }
 
@@ -615,10 +622,13 @@ bool InputEmulator::ReleaseEndpointVolume()
 //
 void InputEmulator::VolumeSet(float volume)
 {
+	// Lock audio control
+	std::unique_lock<std::mutex> mlock(lockAudio);
+
 	// Get endpoint volume
-	if(CreateEndpointVolume()) {
-		if(volume < 0) volume = 0.0f;
-		else if(volume > 1) volume = 1.0f;
+	if (CreateEndpointVolume()) {
+		if (volume < 0) volume = 0.0f;
+		else if (volume > 1) volume = 1.0f;
 		pAudioEndpointVolume->SetMasterVolumeLevelScalar(volume, &GUID_NULL);
 	}
 	ReleaseEndpointVolume();
@@ -629,53 +639,67 @@ void InputEmulator::VolumeSet(float volume)
 //
 void InputEmulator::VolumeBalance(float newBalance)
 {
+	// Lock audio control
+	std::unique_lock<std::mutex> mlock(lockAudio);
+
 	UINT channelCount = 0;
 	float levelLeft = -1;
 	float levelRight = -1;
 
 	// Get endpoint volume
-	if(CreateEndpointVolume()) {
+	if (CreateEndpointVolume()) {
 
 		// Channel count
-		pAudioEndpointVolume->GetChannelCount(&channelCount);
-		if(channelCount >= 2) {
-
-			// Get channel levels
-			pAudioEndpointVolume->GetChannelVolumeLevelScalar(0, &levelLeft);
-			pAudioEndpointVolume->GetChannelVolumeLevelScalar(1, &levelRight);
-
-			// Levels valid?
-			if(levelLeft >= 0 || levelRight >= 0) {
-
-				// Calculate balance
-				float levelSum = levelLeft + levelRight;
-
-				// Limit resolution
-				newBalance = round(newBalance * 100.0f) / 100.0f;
-				if(newBalance < 0.0f) newBalance = 0.0f;
-				else if(newBalance > 1.0f) newBalance = 1.0f;
-
-				// Set channel level values
-				levelLeft = levelSum * newBalance;
-				levelRight = levelSum * (1 - newBalance);
-
-				// Limit levels
-				if(levelLeft < 0) levelLeft = 0;
-				else if(levelLeft > 1) levelLeft = 1;
-				if(levelRight < 0) levelRight = 0;
-				else if(levelRight > 1) levelRight = 1;
-
-				// Debug message
-				if(logger.IsDebugOutputEnabled()) {
-					LOG_DEBUG("Audio balance: Left %0.5f <- %0.3f -> %0.5f Right\n", levelLeft, newBalance, levelRight);
+		try {
+			pAudioEndpointVolume->GetChannelCount(&channelCount);
+			if (channelCount >= 2) {
+
+				// Get channel levels
+				pAudioEndpointVolume->GetChannelVolumeLevelScalar(0, &levelLeft);
+				pAudioEndpointVolume->GetChannelVolumeLevelScalar(1, &levelRight);
+
+				// Levels valid?
+				if (levelLeft >= 0 || levelRight >= 0) {
+
+					// Calculate balance
+					float levelSum = levelLeft + levelRight;
+
+					// Limit resolution
+					newBalance = round(newBalance * 100.0f) / 100.0f;
+					if (newBalance < 0.0f) newBalance = 0.0f;
+					else if (newBalance > 1.0f) newBalance = 1.0f;
+
+					// Set channel level values
+					levelLeft = levelSum * newBalance;
+					levelRight = levelSum * (1 - newBalance);
+
+					// Limit levels
+					if (levelLeft < 0) levelLeft = 0;
+					else if (levelLeft > 1) levelLeft = 1;
+					if (levelRight < 0) levelRight = 0;
+					else if (levelRight > 1) levelRight = 1;
+
+					// Debug message
+					if (logger.IsDebugOutputEnabled()) {
+						LOG_DEBUG("Audio balance: Left %0.5f <- %0.3f -> %0.5f Right\n", levelLeft, newBalance, levelRight);
+					}
+
+					// Set endpoint volume channel levels
+					pAudioEndpointVolume->SetChannelVolumeLevelScalar(0, levelLeft, &GUID_NULL);
+					pAudioEndpointVolume->SetChannelVolumeLevelScalar(1, levelRight, &GUID_NULL);
+
+					// Set other channels to an average level between left and right
+					for (int i = 2; i < (int)channelCount; i++) {
+						pAudioEndpointVolume->SetChannelVolumeLevelScalar(i, levelSum / 2.0f, &GUID_NULL);
+					}
 				}
-
-				// Set endpoint volume channel levels
-				pAudioEndpointVolume->SetChannelVolumeLevelScalar(0, levelLeft, &GUID_NULL);
-				pAudioEndpointVolume->SetChannelVolumeLevelScalar(1, levelRight, &GUID_NULL);
 			}
 		}
+		catch (exception &e) {
+			LOG_ERROR("Can't set audio balance! %s\n", e.what());
+		}
 	}
+
 	ReleaseEndpointVolume();
 }
 
@@ -684,8 +708,11 @@ void InputEmulator::VolumeBalance(float newBalance)
 //
 float InputEmulator::VolumeGet()
 {
+	// Lock audio control
+	std::unique_lock<std::mutex> mlock(lockAudio);
+
 	float volume = 0;
-	if(CreateEndpointVolume()) {
+	if (CreateEndpointVolume()) {
 		pAudioEndpointVolume->GetMasterVolumeLevelScalar(&volume);
 	}
 	ReleaseEndpointVolume();
@@ -697,12 +724,15 @@ float InputEmulator::VolumeGet()
 //
 void InputEmulator::VolumeChange(float delta)
 {
+	// Lock audio control
+	std::unique_lock<std::mutex> mlock(lockAudio);
+
 	float volume;
-	if(CreateEndpointVolume()) {
+	if (CreateEndpointVolume()) {
 		pAudioEndpointVolume->GetMasterVolumeLevelScalar(&volume);
 		volume += delta;
-		if(volume < 0) volume = 0.0f;
-		else if(volume > 1) volume = 1.0f;
+		if (volume < 0) volume = 0.0f;
+		else if (volume > 1) volume = 1.0f;
 		pAudioEndpointVolume->SetMasterVolumeLevelScalar(volume, &GUID_NULL);
 	}
 	ReleaseEndpointVolume();
diff --git a/TabletDriverService/InputEmulator.h b/TabletDriverService/InputEmulator.h
index b13e7f2..383bec4 100644
--- a/TabletDriverService/InputEmulator.h
+++ b/TabletDriverService/InputEmulator.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <map>
+#include <mutex>
 
 #include <psapi.h>
 #include <mmdeviceapi.h>
@@ -8,10 +9,6 @@
 #include <audioendpoints.h>
 #include <endpointvolume.h>
 
-extern "C" NTSYSAPI NTSTATUS NTAPI NtSetTimerResolution(ULONG DesiredResolution, BOOLEAN SetResolution, PULONG CurrentResolution);
-extern "C" NTSYSAPI NTSTATUS NTAPI NtQueryTimerResolution(OUT PULONG MinimumResolution, OUT PULONG MaximumResolution, OUT PULONG ActualResolution);
-
-
 #define SAFE_RELEASE(resource) \
 	if ((resource) != NULL) { \
 		(resource)->Release(); \
@@ -32,6 +29,7 @@ class InputEmulator
 	IAudioEndpointVolume *pAudioEndpointVolume = NULL;
 	IMMDeviceEnumerator *pDeviceEnumerator = NULL;
 	IMMDevice *pDefaultAudioDevice = NULL;
+	mutex lockAudio;
 public:
 	enum MouseButtons {
 		Mouse1 = 1,
diff --git a/TabletDriverService/Logger.cpp b/TabletDriverService/Logger.cpp
index d874359..4e20996 100644
--- a/TabletDriverService/Logger.cpp
+++ b/TabletDriverService/Logger.cpp
@@ -6,99 +6,99 @@
 //
 Logger::Logger() {
 	verbosity = LogLevelDebug;
-	newMessage = false;
 	directPrint = false;
 	isDebugOutputEnabled = false;
-	namedPipe = NULL;
+	writeCallback = NULL;
 }
 
 
-void Logger::OutputMessage(LogItem *message) {
+void Logger::OutputItem(LogItem *item) {
 
 	char buffer[4096];
 	int bufferSize = 4096;
 	int index = 0;
 
 	// Time
-	index += strftime(buffer + index, bufferSize - index, "[%Y-%m-%d %H:%M:%S", &message->time);
+	index += strftime(buffer + index, bufferSize - index, "[%Y-%m-%d %H:%M:%S", &item->time);
 
 	// Milliseconds
-	if(index < bufferSize)
-		index += sprintf_s(buffer + index, bufferSize - index, ".%03d] ", message->systemTime.wMilliseconds);
+	if (index < bufferSize)
+		index += sprintf_s(buffer + index, bufferSize - index, ".%03d] ", item->systemTime.wMilliseconds);
 
 	// Module
-	if(message->module.length() > 0) {
-		if(index < bufferSize)
-			index += sprintf_s(buffer + index, bufferSize - index, "[%s] ", message->module.c_str());
+	if (item->module.length() > 0) {
+		if (index < bufferSize)
+			index += sprintf_s(buffer + index, bufferSize - index, "[%s] ", item->module.c_str());
 	}
 
 	// Log level
-	if(message->level != LogLevelInfo) {
-		if(index < bufferSize)
-			index += sprintf_s(buffer + index, bufferSize - index, "[%s] ", levelNames[message->level].c_str());
+	if (item->level != LogLevelInfo) {
+		if (index < bufferSize)
+			index += sprintf_s(buffer + index, bufferSize - index, "[%s] ", levelNames[item->level].c_str());
 	}
 
 	// Message
-	if(index < bufferSize) {
+	if (index < bufferSize) {
 
 		// Message to large for the buffer
-		if((int)message->text.size() > bufferSize - index) {
-			memcpy(buffer + index, message->text.c_str(), (bufferSize - index) - 1);
+		if ((int)item->message.size() > bufferSize - index) {
+			memcpy(buffer + index, item->message.c_str(), (bufferSize - index) - 1);
 			index = bufferSize;
 		}
 
 		// Copy message to buffer
 		else
 		{
-			memcpy(buffer + index, message->text.c_str(), message->text.size());
-			index += message->text.size();
+			memcpy(buffer + index, item->message.c_str(), item->message.size());
+			index += item->message.size();
 		}
 	}
 
+	// Destroy log item
+	delete item;
+
 	// Write to standard output
 	try {
 		cout.write(buffer, index);
 		cout.flush();
-	} catch(exception) {
+	}
+	catch (exception) {
 	}
 
 	// Write to output pipe
 	try {
-		if(namedPipe != NULL) {
-			DWORD bytesWritten = 0;
-			namedPipe->Write(buffer, index);
+		if (writeCallback != NULL) {
+			writeCallback(buffer, index);
 		}
-	} catch(exception) {
+	}
+	catch (exception) {
 	}
 
 	// Write to log file
-	if(logFile && logFile.is_open()) {
+	if (logFile && logFile.is_open()) {
 		logFile.write(buffer, index);
 		logFile.flush();
 	}
 }
 
 //
-// Process messages
+// Process queue
 //
-void Logger::ProcessMessages() {
+void Logger::ProcessQueue() {
 
-	// Lock message list
-	lockMessages.lock();
+	// Lock queue
+	lockQueue.lock();
 
-	// Copy message list to a temporary list
-	vector<LogItem> tmp(messages);
-	messages.clear();
+	// Loop through items
+	while (!logQueue.empty()) {
+		LogItem *item = logQueue.front();
+		OutputItem(item);
+		logQueue.pop();
+	}
 
-	// Unlock message list
-	lockMessages.unlock();
+	// Unlock queue
+	lockQueue.unlock();
 
-	// Loop through messages
-	for(LogItem message : tmp) {
-		if(!directPrint) {
-			OutputMessage(&message);
-		}
-	}
 }
 
 
@@ -113,35 +113,35 @@ void Logger::LogMessage(int level, string module, const char *fmt, ...) {
 	message[0] = 0;
 
 	// Clamp level
-	if(level < 2)
+	if (level < 2)
 		level = 2;
-	else if(level > 8)
+	else if (level > 8)
 		level = 8;
 
-	if(level <= verbosity) {
+	if (level <= verbosity) {
 		index = 0;
 		time(&t);
 
 		// Loop through arguments
 		va_list ap;
 		va_start(ap, fmt);
-		if(index < maxLength) index += vsnprintf(message + index, maxLength - index, fmt, ap);
+		if (index < maxLength) index += vsnprintf(message + index, maxLength - index, fmt, ap);
 		va_end(ap);
 
 		// New line at the end when the message is larger than max length
-		if(index >= maxLength) {
+		if (index >= maxLength) {
 			message[maxLength - 1] = '\n';
 			message[maxLength] = 0;
 		}
 
 		// Add message
-		LogItem logItem;
-		localtime_s(&logItem.time, &t);
-		GetSystemTime(&logItem.systemTime);
-		logItem.level = level;
-		logItem.module = module;
-		logItem.text = message;
-		AddMessage(&logItem);
+		LogItem *logItem = new LogItem();
+		localtime_s(&logItem->time, &t);
+		GetSystemTime(&logItem->systemTime);
+		logItem->level = level;
+		logItem->module = module;
+		logItem->message = message;
+		AddQueue(logItem);
 	}
 }
 
@@ -157,91 +157,113 @@ void Logger::LogBuffer(int level, string module, void *buffer, int length, const
 	message[0] = 0;
 
 	// Clamp level
-	if(level < 2)
+	if (level < 2)
 		level = 2;
-	else if(level > 8)
+	else if (level > 8)
 		level = 8;
 
-	if(level <= verbosity) {
+	if (level <= verbosity) {
 		index = 0;
 		time(&t);
 
 		// Loop through arguments
 		va_list ap;
 		va_start(ap, fmt);
-		if(index < maxLength) index += vsnprintf(message + index, maxLength - index, fmt, ap);
+		if (index < maxLength) index += vsnprintf(message + index, maxLength - index, fmt, ap);
 		va_end(ap);
 
 		// Detect new line
 		newLine = (fmt[strlen(fmt) - 1] == '\n');
-		if(newLine) {
-			if(index < maxLength) index += snprintf(message + index, maxLength - index, "  { ");
+		if (newLine) {
+			if (index < maxLength) index += snprintf(message + index, maxLength - index, "  { ");
 
 		}
 		else {
-			if(index < maxLength) index += snprintf(message + index, maxLength - index, "{ ");
+			if (index < maxLength) index += snprintf(message + index, maxLength - index, "{ ");
 		}
 
 
 		// Loop through buffer bytes
-		for(int i = 0; i < length; i++) {
+		for (int i = 0; i < length; i++) {
 
 			// Last byte
-			if(i == length - 1) {
-				if(index < maxLength) index += snprintf(message + index, maxLength - index, "0x%02x", ((unsigned char*)buffer)[i]);
+			if (i == length - 1) {
+				if (index < maxLength) index += snprintf(message + index, maxLength - index, "0x%02x", ((unsigned char*)buffer)[i]);
 
 				//
 			}
 			else {
-				if(index < maxLength) index += snprintf(message + index, maxLength - index, "0x%02x, ", ((unsigned char*)buffer)[i]);
+				if (index < maxLength) index += snprintf(message + index, maxLength - index, "0x%02x, ", ((unsigned char*)buffer)[i]);
 
 			}
 			// New line after every 12th byte
-			if(newLine && (i + 1) % 12 == 0 && i != length - 1) {
-				if(index < maxLength) index += snprintf(message + index, maxLength - index, "\n    ");
+			if (newLine && (i + 1) % 12 == 0 && i != length - 1) {
+				if (index < maxLength) index += snprintf(message + index, maxLength - index, "\n    ");
 			}
 		}
 
 		// Ending bracket
-		if(index < maxLength) index += snprintf(message + index, maxLength - index, " }\n");
+		if (index < maxLength) index += snprintf(message + index, maxLength - index, " }\n");
 
 		// New line at the end when the message is larger than max length
-		if(index >= maxLength) {
+		if (index >= maxLength) {
 			message[maxLength - 1] = '\n';
 			message[maxLength] = 0;
 		}
 
 		// Add message
-		LogItem logItem;
-		localtime_s(&logItem.time, &t);
-		GetSystemTime(&logItem.systemTime);
-		logItem.level = level;
-		logItem.module = module;
-		logItem.text = message;
-		AddMessage(&logItem);
+		LogItem *logItem = new LogItem();
+		localtime_s(&logItem->time, &t);
+		GetSystemTime(&logItem->systemTime);
+		logItem->level = level;
+		logItem->module = module;
+		logItem->message = message;
+		AddQueue(logItem);
 	}
 }
 
 //
-// Add message to list
+// Add item to queue
 //
-void Logger::AddMessage(LogItem *message) {
+void Logger::AddQueue(LogItem *item) {
+
+	if (!IsRunning()) return;
 
 	// Direct print (skips the message buffer)
-	if(directPrint) {
-		OutputMessage(message);
+	if (directPrint) {
+		OutputItem(item);
+		return;
 	}
 
 	// Lock message list
-	lockMessages.lock();
+	lockQueue.lock();
 
 	// Add message
-	messages.push_back(*message);
+	logQueue.push(item);
 
 	// Unlock message list
-	lockMessages.unlock();
+	lockQueue.unlock();
+
+	// Notify new message
+	NotifyNewItem();
 
-	newMessage = true;
+}
+
+//
+// Notify new item
+//
+void Logger::NotifyNewItem()
+{
+	conditionNewItem.notify_all();
+}
+
+//
+// Wait for a new message
+//
+void Logger::WaitNewItem()
+{
+	std::unique_lock<std::mutex> mlock(lockNewItem);
+	conditionNewItem.wait(mlock);
 }
 
 
@@ -249,35 +271,32 @@ void Logger::AddMessage(LogItem *message) {
 // Logger thread
 //
 void Logger::run() {
-	while(true) {
 
-		// Wait for messages
-		if(newMessage) {
+	while (true) {
 
-			// Set new message flag to false
-			newMessage = false;
+		// Wait for the new item
+		WaitNewItem();
 
-			// Process messages
-			ProcessMessages();
-		}
+		// Process item queue
+		ProcessQueue();
 
 		// Shutdown the thread
-		if(!IsRunning() && !newMessage) break;
+		if (!IsRunning()) break;
 
-		// Sleep 10ms
-		Sleep(10);
 	}
+
+	printf("Logger thread exit!\n");
 }
 
 //
 // Open log file
 //
 bool Logger::OpenLogFile(string filename) {
-	if(logFile && logFile.is_open()) {
+	if (logFile && logFile.is_open()) {
 		logFile.close();
 	}
 	logFile = ofstream(filename, ofstream::out);
-	if(!logFile) {
+	if (!logFile) {
 		return false;
 	}
 	logFilename = filename;
@@ -288,7 +307,7 @@ bool Logger::OpenLogFile(string filename) {
 // Close log file
 //
 bool Logger::CloseLogFile() {
-	if(logFile && logFile.is_open()) {
+	if (logFile && logFile.is_open()) {
 		logFile.close();
 		return true;
 	}
@@ -325,7 +344,7 @@ bool Logger::IsDebugOutputEnabled()
 // Start logger thread
 //
 void Logger::Start() {
-	if(!IsRunning()) {
+	if (!IsRunning()) {
 		SetRunningState(true);
 		threadLog = thread([this] { this->run(); });
 	}
@@ -335,11 +354,21 @@ void Logger::Start() {
 // Stop logger thread
 //
 void Logger::Stop() {
-	if(IsRunning()) {
+	if (IsRunning()) {
 		SetRunningState(false);
-		newMessage = true;
-		threadLog.join();
-		if(logFile && logFile.is_open()) {
+
+		NotifyNewItem();
+
+		printf("Logger thread join\n");
+		try {
+			threadLog.join();
+		}
+		catch (exception &e) {
+			printf("Logger thread join exception: %s\n", e.what());
+		}
+
+		ProcessQueue();
+		if (logFile && logFile.is_open()) {
 			logFile.close();
 		}
 	}
diff --git a/TabletDriverService/Logger.h b/TabletDriverService/Logger.h
index 4f5d41e..f9dd1d4 100644
--- a/TabletDriverService/Logger.h
+++ b/TabletDriverService/Logger.h
@@ -7,12 +7,12 @@
 #include <cstring>
 #include <ctime>
 
-
 #include <iostream>
 #include <iomanip>
 #include <sstream>
 #include <fstream>
 #include <vector>
+#include <queue>
 #include <thread>
 #include <mutex>
 #include <condition_variable>
@@ -26,7 +26,7 @@
 #define LOGGER_FILE(file) logger.OpenLogFile(file)
 #define LOGGER_START(...) logger.Start()
 #define LOGGER_STOP(...) logger.Stop()
-#define LOGGER_PROCESS(...) logger.ProcessMessages()
+#define LOGGER_PROCESS(...) logger.ProcessQueue()
 #define LOGGER_DIRECT logger.directPrint
 
 #define LOG_DIE(...)  (logger.LogMessage(logger.LogLevelCritical, LOG_MODULE,  __VA_ARGS__), LOGGER_PROCESS(); exit(1))
@@ -57,8 +57,9 @@ class Logger : public Runnable {
 private:
 	thread threadLog;
 	void run();
-	mutex lockMessages;
-	bool newMessage;
+	mutex lockQueue;
+	mutex lockNewItem;
+	condition_variable conditionNewItem;
 	ofstream logFile;
 	bool logToFile;
 	bool isDebugOutputEnabled;
@@ -80,9 +81,10 @@ class Logger : public Runnable {
 		SYSTEMTIME systemTime;
 		int level;
 		string module;
-		string text;
+		string message;
 	} LogItem;
-	vector<LogItem> messages;
+	queue<LogItem*> logQueue;
+
 	string levelNames[9] = {
 		"",
 		"",
@@ -96,16 +98,18 @@ class Logger : public Runnable {
 	};
 	bool directPrint;
 	string logFilename = "";
-	NamedPipeServer *namedPipe;
+	function<void(void *buffer, int length)> writeCallback = NULL;
 	mutex lock;
 
-	void OutputMessage(LogItem *message);
-	void ProcessMessages();
+	void OutputItem(LogItem *item);
+	void ProcessQueue();
 	void LogMessage(int level, string module, const char *fmt, ...);
 	void LogBuffer(int level, string module, void *buffer, int length, const char *fmt, ...);
 	int verbosity;
 	Logger();
-	void AddMessage(LogItem *message);
+	void AddQueue(LogItem *item);
+	void NotifyNewItem();
+	void WaitNewItem();
 	void Start();
 	void Stop();
 	bool OpenLogFile(string filename);
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index d8c3b04..5ef8b7a 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -33,6 +33,8 @@ NamedPipeState *pipeState;
 
 void InitConsole();
 bool ProcessCommand(CommandLine *cmd);
+bool cleanupStarted = false;
+void RunCleanupAndExit(int code);
 
 
 //
@@ -72,24 +74,26 @@ int main(int argc, char**argv) {
 	//
 	commandHandler->AddCommand(new Command("Start", [&](CommandLine *cmd) {
 
-		if(tabletHandler->IsRunning()) {
+		if (tabletHandler->IsRunning()) {
 			LOG_INFO("Driver is already started!\n");
 			return true;
 		}
 
 		// Unknown tablet
-		if(tablet == NULL) {
+		if (tablet == NULL) {
 			LOG_ERROR("Tablet not found!\n");
 			CleanupAndExit(0);
+			return false;
 		}
 
 		// Tablet init
-		if(!tablet->Init()) {
+		if (!tablet->Init()) {
 			LOG_ERROR("Tablet init failed!\n");
 			LOG_ERROR("Possible fixes:\n");
 			LOG_ERROR("1) Uninstall other tablet drivers.\n");
 			LOG_ERROR("2) Stop other tablet driver services.\n");
 			CleanupAndExit(0);
+			return false;
 		}
 
 		// Set screen mapper tablet
@@ -121,7 +125,7 @@ int main(int argc, char**argv) {
 
 
 	// Named pipes
-	if(argc > 2) {
+	if (argc > 2) {
 		pipeInput = new NamedPipeInput(string(argv[2]) + string("Input"));
 		pipeOutput = new NamedPipeServer(string(argv[2]) + string("Output"));
 		pipeState = new NamedPipeState(string(argv[2]) + string("State"));
@@ -136,25 +140,31 @@ int main(int argc, char**argv) {
 	pipeState->Start();
 
 	// Logger output pipe
-	logger.namedPipe = pipeOutput;
+	logger.writeCallback = [&](void *buffer, int length) {
+		if (pipeOutput != NULL && pipeOutput->IsRunning()) {
+			pipeOutput->Write(buffer, length);
+		}
+	};
+	//logger.namedPipe = pipeOutput;
 
 	// VMulti XP-Pen
 	vmulti = new VMulti(VMulti::TypeXPPen);
 
 	// VMulti VEIKK
-	if(!vmulti->isOpen) {
+	if (!vmulti->isOpen) {
 		LOG_ERROR("Can't open XP-Pen's VMulti! Trying VEIKK's VMulti!\n");
 		delete vmulti;
 		vmulti = new VMulti(VMulti::TypeVEIKK);
 	}
 
-	if(!vmulti->isOpen) {
+	if (!vmulti->isOpen) {
 		LOG_ERROR("Can't open VMulti device!\n\n");
 		LOG_ERROR("Possible fixes:\n");
 		LOG_ERROR("1) Install VMulti driver\n");
 		LOG_ERROR("2) Kill PentabletService.exe (XP Pen driver)\n");
 		LOG_ERROR("3) Uninstall other tablet drivers and reinstall VMulti driver\n");
-		CleanupAndExit(0);
+		RunCleanupAndExit(0);
+		return 0;
 	}
 
 	// Output manager
@@ -163,42 +173,48 @@ int main(int argc, char**argv) {
 	// Read init file
 	filename = "init.cfg";
 
-	if(argc > 1) {
+	if (argc > 1) {
 		filename = argv[1];
 	}
-	if(!commandHandler->ExecuteFile(filename)) {
+	if (!commandHandler->ExecuteFileLock(filename)) {
 		LOG_ERROR("Can't open '%s'\n", filename.c_str());
 	}
 
-	commandHandler->ExecuteCommandLock("RequestStartup");
+	if (tablet != NULL) {
+		commandHandler->ExecuteCommandLock("RequestStartup");
+	}
+	else {
+		commandHandler->ExecuteCommandLock("CheckTablet");
+	}
 
 
 	//
 	// Main loop
 	//
-	while(true) {
+	while (true) {
 
 		// Broken pipe
-		if(!cin) {
+		if (!cin) {
 			Sleep(100);
 		}
 
 		// Read line from the console
 		try {
 			getline(cin, line);
-		} catch(exception) {
+		}
+		catch (exception) {
 			Sleep(100);
 			//break;
 		}
 
 		// Process valid lines
-		if(line.length() > 0) {
+		if (line.length() > 0) {
 
 			// Line to command line
 			cmd = new CommandLine(line);
 
 			// Hide console (for the service only mode)
-			if(cmd->is("Hide")) {
+			if (cmd->is("Hide")) {
 				::ShowWindow(::GetConsoleWindow(), SW_HIDE);
 			}
 
@@ -209,10 +225,9 @@ int main(int argc, char**argv) {
 
 			delete cmd;
 		}
-
 	}
 
-	CleanupAndExit(0);
+	RunCleanupAndExit(0);
 	return 0;
 }
 
@@ -221,93 +236,111 @@ int main(int argc, char**argv) {
 //
 // Cleanup and exit
 //
-void CleanupAndExit(int code) {
+void RunCleanupAndExit(int code) {
+
+	printf("Cleanup and exit %d\n", code);
+
+	// Wait commands to go through
+	printf("Cleanup CommandHandler\n");
+	if(commandHandler != NULL)
+		delete commandHandler;
+		
+	// Wait for named pipe writes
+	Sleep(100);
 
 	// Stop logger
+	printf("Cleanup Logger\n");
+	logger.writeCallback = NULL;
 	LOGGER_STOP();
 
-
 	// Named pipes
 	printf("Cleanup Input Pipe\n");
-	if(pipeInput != NULL) {
+	if (pipeInput != NULL) {
 		delete pipeInput;
 	}
 	printf("Cleanup Output Pipe\n");
-	if(pipeOutput != NULL) {
+	if (pipeOutput != NULL) {
 		delete pipeOutput;
 	}
 	printf("Cleanup State Pipe\n");
-	if(pipeState != NULL) {
+	if (pipeState != NULL) {
 		delete pipeState;
 	}
 
 	// TabletHandler
 	printf("Cleanup TabletHandler\n");
-	if(tabletHandler != NULL) {
+	if (tabletHandler != NULL) {
 		delete tabletHandler;
 	}
 
 	// OutputManager
 	printf("Cleanup OutputManager\n");
-	if(outputManager != NULL) {
+	if (outputManager != NULL) {
 		delete outputManager;
 	}
 
 	// VMulti
 	printf("Cleanup VMulti\n");
-	if(vmulti != NULL)
+	if (vmulti != NULL)
 		delete vmulti;
 
 	// Tablet
 	printf("Cleanup Tablet\n");
-	if(tablet != NULL)
+	if (tablet != NULL)
 		delete tablet;
 
 	// Uninitialize COM
 	CoUninitialize();
 
-	//Sleep(500);
+	Sleep(500);
 
 	//printf("Press enter to exit...");
 	//getchar();
 	exit(code);
 }
 
+// Cleanup thread
+void CleanupAndExit(int code) {
+	if (cleanupStarted) return;
+	cleanupStarted = true;
+
+	thread *t = new thread(RunCleanupAndExit, code);
+}
+
+
 
 //
 // Process Command
 //
 bool ProcessCommand(CommandLine *cmd) {
 
-	bool logResult = false;
-
+	// Invalid command
+	if (!cmd->isValid) return false;
 
 	// Hide echo input
-	if(cmd->is("Echo")) {
-	}
-	else
-	{
-		LOG_INFO(">> %s\n", cmd->line.c_str());
-	}
+	if (cmd->is("Echo")) {}
+	else { LOG_INFO(">> %s\n", cmd->line.c_str()); }
 
 	//
 	// Execute command handler command
 	//
-	if(cmd->command.back() == '?') {
+	bool logResult = false;
+	if (cmd->command.back() == '?') {
 		logResult = true;
 		cmd->command.pop_back();
 	}
-	if(commandHandler->IsValidCommand(cmd->command)) {
+
+	// Command is valid?
+	if (commandHandler->IsValidCommand(cmd->command)) {
 		bool result = commandHandler->ExecuteCommandLock(cmd->command, cmd);
-		if(logResult) {
+		if (logResult) {
 			LOG_INFO("Result: %s\n", result ? "True" : "False");
 		}
 		return result;
 
 	}
-
 	// Unknown
-	else if(cmd->isValid) {
+	else if (cmd->isValid) {
 		LOG_WARNING("Unknown command: %s\n", cmd->line.c_str());
 	}
 
diff --git a/TabletDriverService/NamedPipeInput.cpp b/TabletDriverService/NamedPipeInput.cpp
index 83b63be..4a89a6e 100644
--- a/TabletDriverService/NamedPipeInput.cpp
+++ b/TabletDriverService/NamedPipeInput.cpp
@@ -14,13 +14,30 @@ NamedPipeInput::~NamedPipeInput()
 {
 }
 
-int NamedPipeInput::ProcessData(int clientId, char *buffer, int length, char * bufferOutput)
+
+void NamedPipeInput::ProcessData(int clientId, BYTE *buffer, int length)
 {
-	buffer[length] = 0;
-	//LOG_DEBUG("PipeInput data: %s\n", buffer);
-	CommandLine *cmd = new CommandLine(buffer);
-	ProcessCommand(cmd);
+	if (!IsRunning()) return;
+	if (_isStopping) return;
+
+	// Copy buffer to char array
+	char *cmdBuffer = new char[length + 1];
+	memcpy(cmdBuffer, buffer, length);
+
+	// Terminate char array
+	cmdBuffer[length] = 0;
+
+	// Create command string
+	string commandText = "";
+	commandText.append(cmdBuffer);
+	delete cmdBuffer;
+
+	// Process command
+	CommandLine *cmd = new CommandLine(commandText);
+	if (cmd->isValid) {
+		ProcessCommand(cmd);
+	}
 	delete cmd;
 
-	return 0;
-}
+
+}
\ No newline at end of file
diff --git a/TabletDriverService/NamedPipeInput.h b/TabletDriverService/NamedPipeInput.h
index 4926bc4..d2e404e 100644
--- a/TabletDriverService/NamedPipeInput.h
+++ b/TabletDriverService/NamedPipeInput.h
@@ -6,7 +6,7 @@ class NamedPipeInput : public NamedPipeServer
 	NamedPipeInput(string pipeName);
 	~NamedPipeInput();
 
-	int ProcessData(int clientId, char *bufferInput, int length, char *bufferOutput) override;
+	void ProcessData(int clientId, BYTE *bufferInput, int length) override;
 
 };
 
diff --git a/TabletDriverService/NamedPipeServer.cpp b/TabletDriverService/NamedPipeServer.cpp
index 4f1ca23..585b32a 100644
--- a/TabletDriverService/NamedPipeServer.cpp
+++ b/TabletDriverService/NamedPipeServer.cpp
@@ -13,11 +13,11 @@ NamedPipeServer::NamedPipeServer(string pipeName)
 	this->pipePath = "\\\\.\\PIPE\\" + pipeName;
 	this->pipeName = pipeName;
 	clientCount = 0;
-
-	for(int i = 0; i < 256; i++) {
+	for (int i = 0; i < MAX_CLIENTS; i++) {
 		clients[i].id = i;
 		clients[i].pipeName = pipeName;
 	}
+	_isStopping = false;
 
 }
 
@@ -35,7 +35,7 @@ NamedPipeServer::~NamedPipeServer()
 //
 bool NamedPipeServer::Start()
 {
-	if(!IsRunning()) {
+	if (!IsRunning()) {
 		SetRunningState(true);
 
 		LOG_DEBUG("Starting %s main thread...\n", pipeName.c_str());
@@ -53,49 +53,168 @@ bool NamedPipeServer::Start()
 //
 bool NamedPipeServer::Stop()
 {
-	if(IsRunning()) {
-		SetRunningState(false);
+	_isStopping = true;
+
+	SetRunningState(false);
+
+	printf("%s: Stopping main thread...\n", pipeName.c_str());
+
+	printf("%s: Creating temporary client...\n", pipeName.c_str());
+	HANDLE tmpHandle = CreateFileA(pipePath.c_str(), GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
+	DWORD lastError = GetLastError();
+	if (tmpHandle != INVALID_HANDLE_VALUE)
+	{
+		DWORD bytesWritten, mode;
+		BYTE buffer[2];
+		mode = PIPE_READMODE_MESSAGE;
+		SetNamedPipeHandleState(tmpHandle, &mode, NULL, NULL);
+		buffer[0] = '\n';
+		buffer[1] = 0;
+		WriteFile(tmpHandle, buffer, 2, &bytesWritten, NULL);
+		FlushFileBuffers(tmpHandle);
+		SAFE_CLOSE_HANDLE(tmpHandle);
+		printf("%s: Temporary created and disconnected!\n", pipeName.c_str());
 	}
-	return false;
+	else if (lastError == ERROR_FILE_NOT_FOUND) {
+		printf("%s: Temporary client creation failed! File not found! GLE=%d\n", pipeName.c_str(), lastError);
+	}
+	else if (lastError == ERROR_SHARING_VIOLATION) {
+		printf("%s: Temporary client creation failed! Sharing violation! GLE=%d\n", pipeName.c_str(), lastError);
+	}
+	else {
+		printf("%s: Temporary client creation failed! GLE=%d\n", pipeName.c_str(), lastError);
+	}
+
+	// Force disconnect every client
+	lockServer.lock();
+	for (int i = 0; i < MAX_CLIENTS; i++) {
+
+		clients[i].SetConnectedState(false);
+	}
+	lockServer.unlock();
+
+
+	// Join main thread
+	printf("%s: Joining main thread...\n", pipeName.c_str());
+	try {
+		threadMain->join();
+	}
+	catch (exception &e) {
+		printf("%s: main thread exception: %s\n", pipeName.c_str(), e.what());
+	}
+	printf("%s: Main thread closed!\n", pipeName.c_str());
+
+	// Join client threads
+	printf("%s: Stopping clients...\n", pipeName.c_str());
+
+	for (int i = 0; i < clientCount; i++) {
+
+		//Sleep(1);
+
+		if (clients[i].handlePipe != NULL) {
+			CancelSynchronousIo(clients[i].handlePipe);
+			CancelIoEx(clients[i].handlePipe, &clients[i].overlapped);
+			DisconnectNamedPipe(clients[i].handlePipe);
+		}
+		//SAFE_CLOSE_HANDLE(clients[i].handlePipe);
+
+
+		// Read thread join
+		printf("  %s: Client #%d read thread join\n", pipeName.c_str(), i);
+		if (clients[i].threadRead != NULL) {
+
+			// Try thread join
+			try {
+				if (clients[i].threadRead != NULL) {
+					clients[i].threadRead->join();
+				}
+			}
+			catch (exception &e) {
+				printf("   %s: read thread #%d exception: %s\n", pipeName.c_str(), i, e.what());
+			}
+
+		}
+
+		// Write thread join
+		printf("  %s: Client #%d write thread join\n", pipeName.c_str(), i);
+		if (clients[i].threadWrite != NULL) {
+
+			// Notify queue change
+			for (int j = 0; j < 10; j++) {
+				clients[i].writeQueue.Notify();
+			}
+
+			// Try thread join
+			try {
+				if (clients[i].threadWrite != NULL) {
+					clients[i].writeQueue.Clear();
+					clients[i].threadWrite->join();
+				}
+			}
+			catch (exception &e) {
+				printf("   %s: write thread #%d exception: %s\n", pipeName.c_str(), i, e.what());
+			}
+
+		}
+		printf("%s: Clients stopped!\n", pipeName.c_str());
+
+	}
+	return true;
 }
 
 
 //
 // Process data
 //
-int NamedPipeServer::ProcessData(int clientId, char *bufferInput, int length, char *bufferOutput) {
-	int bytesOutput = 0;
-
-	//bufferInput[length] = 0;
-	//LOG_DEBUG("Client #%d input: %s\n", clientId, bufferInput);
-	//bytesOutput = sprintf_s(bufferOutput, BUFFER_SIZE, "Reply: %s", bufferInput);
-
-	return bytesOutput;
+void NamedPipeServer::ProcessData(int clientId, BYTE *bufferInput, int length) {
 }
 
 
 //
-// Write a message to all clients
+// Add the data to every client write buffer
 //
-bool NamedPipeServer::Write(void * buffer, int length) {
+bool NamedPipeServer::Write(void *buffer, int length) {
 
-	DWORD bytesWritten = 0;
+	if (_isStopping) return false;
+	if (!IsRunning()) return false;
 
-	if(!IsRunning()) return false;
+	// Validate length
+	if (length <= 0) return false;
+	if (length >= BUFFER_SIZE) {
+		length = BUFFER_SIZE;
+		((char*)buffer)[length - 1] = 0;
+		((char*)buffer)[length - 2] = '\n';
+	}
 
-	for(int i = 0; i < clientCount; i++) {
-		if(clients[i].isConnected) {
+	// Add to queue
+	for (int i = 0; i < clientCount; i++) {
+		if (clients[i].IsConnected()) {
 			Client *client = &clients[i];
-			//printf("Write %d bytes to client #%d!\n", length, i);
-			WriteFile(client->handlePipe, buffer, length, &bytesWritten, NULL);
-			FlushFileBuffers(client->handlePipe);
-			//printf("Written %d bytes to client #%d!\n", bytesWritten, i);
+			client->writeQueue.Push(buffer, length);
 		}
 	}
+
 	return true;
 
 }
 
+//
+// Is client connected?
+//
+bool NamedPipeServer::IsClientConnected()
+{
+	if (_isStopping) return true;
+
+	lockServer.lock();
+	bool connected = false;
+	for (int i = 0; i < clientCount; i++) {
+		if (clients[i].IsConnected())
+			connected = true;
+	}
+	lockServer.unlock();
+	return connected;
+}
+
 
 //
 // Main thread
@@ -103,19 +222,19 @@ bool NamedPipeServer::Write(void * buffer, int length) {
 void NamedPipeServer::RunMainThread()
 {
 	bool connected;
-	int clientId = 0;
 	bool running = true;
-	Client *client;
-
-	while(IsRunning()) {
+	Client *client = NULL;
+	DWORD lastError = 0;
+	int clientIndex = 0;
+	HANDLE tmpHandle;
 
-		LOG_DEBUG("%s: Creating pipe...\n", pipeName.c_str());
+	while (IsRunning()) {
 
-		// Find free client id
-		client = &clients[clientId];
+		if (_isStopping) break;
 
 		// Create pipe
-		client->handlePipe = CreateNamedPipeA(pipePath.c_str(),
+		LOG_DEBUG("%s: Creating pipe...\n", pipeName.c_str());
+		tmpHandle = CreateNamedPipeA(pipePath.c_str(),
 			PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,
 			PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
 			PIPE_UNLIMITED_INSTANCES,
@@ -125,39 +244,120 @@ void NamedPipeServer::RunMainThread()
 			NULL
 		);
 		// Pipe invalid?
-		if(client->handlePipe == INVALID_HANDLE_VALUE)
+		if (tmpHandle == INVALID_HANDLE_VALUE)
 		{
-			LOG_ERROR("%s: CreateNamedPipeA failed, GLE=%d\n", pipeName.c_str(), GetLastError());
-			Sleep(100);
+			lastError = GetLastError();
+			LOG_ERROR("%s: CreateNamedPipeA failed, GLE=%lu\n", pipeName.c_str(), lastError);
+			//Sleep(100);
 			break;
 		}
-
 		LOG_DEBUG("Pipe %s created!\n", pipeName.c_str());
 
 
 		// Connect
 		LOG_DEBUG("%s: Connecting to pipe...\n", pipeName.c_str());
-		connected = ConnectNamedPipe(client->handlePipe, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED);
+		connected = ConnectNamedPipe(tmpHandle, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED);
 
 		// Connected?
-		if(connected) {
-			LOG_DEBUG("%s: Client connected!\n", pipeName.c_str());
-			thread *threadPipe = new thread(&NamedPipeServer::RunClientThread, this, client);
-			client->threadPipe = threadPipe;
-			clientCount++;
-			if(clientCount >= 256) {
-				clientCount = 256;
-			}
-			clientId++;
-			if(clientId >= 256) {
-				clientId = 0;
+		if (connected) {
+
+			/*
+			// Cleanup the temporary client when the server is stopping
+			if (_isStopping) {
+				DisconnectNamedPipe(tmpHandle);
+				SAFE_CLOSE_HANDLE(tmpHandle);
+				break;
+			}
+			*/
+
+			//
+			// Find free client id
+			//
+			client = &clients[clientIndex];
+			if (
+				client->IsConnected()
+				||
+				client->threadRead != NULL
+				||
+				client->threadWrite != NULL
+				) {
+				int index = -1;
+
+				// Find empty slot
+				for (int i = 0; i < MAX_CLIENTS; i++) {
+					if (
+						!clients[i].IsConnected()
+						&&
+						clients[i].threadRead == NULL
+						&&
+						clients[i].threadWrite == NULL
+						) {
+						index = i;
+						break;
+					}
+				}
+
+				if (index >= 0 && index < MAX_CLIENTS) {
+					clientIndex = index;
+					client = &clients[clientIndex];
+				}
+				else {
+					LOG_ERROR("%s: Couldn't find a free client slot!\n", pipeName.c_str());
+					DisconnectNamedPipe(tmpHandle);
+					SAFE_CLOSE_HANDLE(tmpHandle);
+					//Sleep(2000);
+					client = NULL;
+				}
+			}
+			else {
+
+			}
+
+			// Skip when there are no free client slots
+			if (client == NULL) {
+				continue;
+			}
+			else {
+				client->handlePipe = tmpHandle;
+			}
+
+
+			LOG_DEBUG("%s: Client #%d connected!\n", pipeName.c_str(), clientIndex);
+
+			client->writeQueue.Clear();
+			client->SetConnectedState(true);
+
+			// Cleanup the temporary client when the server is stopping
+			if (_isStopping) {
+				DisconnectNamedPipe(tmpHandle);
+				SAFE_CLOSE_HANDLE(tmpHandle);
+				break;
+			}
+
+			client->server = this;
+			client->threadRead = new thread([&] { client->RunReadThread(); });
+			client->threadWrite = new thread([&] { client->RunWriteThread(); });
+			clientIndex++;
+			if (clientIndex >= MAX_CLIENTS) {
+				clientIndex = 0;
+			}
+			if (clientIndex >= clientCount - 1) {
+				clientCount = clientIndex + 1;
+			}
+
+			clientIndex = 0;
+
+
+			if (clientCount >= MAX_CLIENTS) {
+				clientCount = MAX_CLIENTS;
 			}
 		}
 
 		// No connection
 		else {
 			LOG_DEBUG("%s: Could not connect to a pipe!\n", pipeName.c_str());
-			SAFE_CLOSE_HANDLE(client->handlePipe);
+			SAFE_CLOSE_HANDLE(tmpHandle);
+			//Sleep(100);
 		}
 
 	}
@@ -166,64 +366,191 @@ void NamedPipeServer::RunMainThread()
 
 
 //
-// Client thread
+// Client read thread
 //
-void NamedPipeServer::RunClientThread(Client *client)
+void NamedPipeServer::Client::RunReadThread()
 {
-	char bufferRead[BUFFER_SIZE];
-	char bufferWrite[BUFFER_SIZE];
+	BYTE bufferRead[BUFFER_SIZE];
 	DWORD bytesRead = 0;
-	DWORD bytesWritten = 0;
-	int replyBytes;
+	DWORD bytesAvailable = 0;
+	DWORD bytesLeft = 0;
 	bool result;
-	string pipeName = client->pipeName;
-	HANDLE handlePipe = client->handlePipe;
-	int clientId = client->id;
-	client->isConnected = true;
+	DWORD lastError;
+
+	// Loop
+	while (true) {
 
-	while(true) {
-		//LOG_DEBUG("Read %s!\n", pipeName.c_str());
+		if (!server->IsRunning()) {
+			break;
+		}
+
+		if (server->_isStopping) break;
 
-		// Try reading
+		// Is not connected?
+		if (!IsConnected()) {
+			break;
+		}
+
+		// Read data from pipe
+		bytesRead = 0;
 		result = ReadFile(handlePipe, bufferRead, BUFFER_SIZE, &bytesRead, NULL);
-		if(!result || bytesRead == 0) {
-			if(GetLastError() == ERROR_BROKEN_PIPE)
+
+		if (!result || bytesRead == 0) {
+			lastError = GetLastError();
+			if (lastError == ERROR_BROKEN_PIPE)
 			{
-				LOG_DEBUG("%s: Client #%d disconnected.\n", pipeName.c_str(), clientId);
+				LOG_DEBUG("%s: Client #%d read broken pipe!\n", pipeName.c_str(), id);
 				break;
 			}
-			else if(GetLastError() != 0)
+			else if (lastError != 0)
 			{
-				LOG_DEBUG("%s: Client #%d ReadFile failed, GLE=%d\n", pipeName.c_str(), clientId, GetLastError());
-				break;
+				// Skip overlapping error
+				if (lastError == ERROR_INVALID_PARAMETER) {
+				}
+				else {
+					LOG_DEBUG("%s: Client #%d ReadFile failed, GLE=%lu\n", pipeName.c_str(), id, lastError);
+					break;
+				}
 			}
-			Sleep(10);
+			//Sleep(10);
 		}
 		else {
-			replyBytes = ProcessData(clientId, bufferRead, bytesRead, bufferWrite);
+			server->ProcessData(id, bufferRead, bytesRead);
+		}
+
+	}
+
+	// Cleanup
+	if (server != NULL && !server->_isStopping) {
+		printf("%s: Client #%d read thread cleanup!\n", pipeName.c_str(), id);
+		SetConnectedState(false);
+		CancelIoEx(handlePipe, &overlapped);
+		writeQueue.Notify();
+		lockClient.lock();
+		SAFE_CLOSE_HANDLE(handlePipe);
+		this->threadRead = NULL;
+		lockClient.unlock();
+	}
+	printf("%s: Client #%d read thread exit!\n", pipeName.c_str(), id);
+
+}
+
+//
+// Client write thread
+//
+void NamedPipeServer::Client::RunWriteThread()
+{
+	DWORD bytesWritten = 0;
+	bool result;
+	DWORD lastError;
+	bool running = true;
+
+
+	// Loop
+	while (running) {
+
+		if (!server->IsRunning()) {
+			break;
+		}
+
+		if (server->_isStopping) break;
+
+		// Is not connected?
+		if (!IsConnected()) {
+			break;
+		}
+
+		// Wait for a new queue item
+		writeQueue.Wait();
+
+
+		// Items in write queue?
+		while (!writeQueue.IsEmpty()) {
+
+			// Lock queue
+			if (writeQueue.lockQueue.try_lock()) {
+
+				// Get queue item
+				BufferQueue::Item *queueItem = writeQueue.Front();
+
+				// Copy data
+				int length = queueItem->length;
+				BYTE *buffer = new BYTE[length];
+				memcpy(buffer, queueItem->buffer, length);
+
+				// Remove queue item
+				writeQueue.Pop();
+
+				// Unlock queue
+				writeQueue.lockQueue.unlock();
 
-			if(replyBytes > 0) {
-				result = WriteFile(handlePipe, bufferWrite, replyBytes, &bytesWritten, NULL);
-				if(!result || replyBytes != bytesWritten)
+
+				// Write item to pipe
+				result = false;
+				try {
+					result = WriteFile(handlePipe, buffer, length, NULL, &overlapped);
+				}
+				catch (exception &e) {
+					LOG_ERROR("WriteFile exception: %s\n", e.what());
+				}
+
+				// Destroy buffer
+				delete buffer;
+
+				// Write error?
+				if (!result)
 				{
-					LOG_DEBUG("%s: Client #%d WriteFile failed, GLE=%d\n", pipeName.c_str(), clientId, GetLastError());
-					break;
+					lastError = GetLastError();
+
+					// Broken pipe
+					if (lastError == ERROR_BROKEN_PIPE)
+					{
+						LOG_DEBUG("%s: Client #%d write broken pipe!\n", pipeName.c_str(), id);
+						running = false;
+						break;
+					}
+
+					// Skip overlapping error
+					else if (lastError == ERROR_INVALID_PARAMETER) {
+					}
+					else {
+						LOG_DEBUG("%s: Client #%d WriteFile failed, GLE=%lu\n", pipeName.c_str(), id, lastError);
+						running = false;
+						break;
+					}
+				}
+
+				// Flush file buffers
+				else {
+					FlushFileBuffers(handlePipe);
 				}
 			}
+			else {
+				printf("%s: Write queue lock failed !!!\n", pipeName.c_str());
+			}
 		}
 
+
 	}
 
-	DisconnectNamedPipe(handlePipe);
-	SAFE_CLOSE_HANDLE(handlePipe);
-	if(client != nullptr && client != NULL) {
-		client->isConnected = false;
+	// Cleanup
+	if (server != NULL && !server->_isStopping) {
+		printf("%s: Client #%d write thread cleanup!\n", pipeName.c_str(), id);
+		SetConnectedState(false);
+		CancelIoEx(handlePipe, &overlapped);
+		lockClient.lock();
+		writeQueue.Clear();
+		SAFE_CLOSE_HANDLE(handlePipe);
+		this->threadWrite = NULL;
+		lockClient.unlock();
 	}
-	LOG_DEBUG("%s: Client #%d thread exit!\n", pipeName.c_str(), clientId);
+	printf("%s: Client #%d write thread exit!\n", pipeName.c_str(), id);
+
 
 }
 
 
+
 //
 // Client constructor
 //
@@ -231,6 +558,36 @@ NamedPipeServer::Client::Client()
 {
 	id = 0;
 	handlePipe = NULL;
-	threadPipe = NULL;
-	isConnected = false;
+	threadRead = NULL;
+	threadWrite = NULL;
+	_isConnected = false;
+	pipeName = "";
+	memset(&overlapped, 0, sizeof(overlapped));
+	overlapped.Offset = 4096;
+	overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+}
+
+//
+// Client destructor
+//
+NamedPipeServer::Client::~Client()
+{
+}
+
+//
+// Check if client is connected
+//
+bool NamedPipeServer::Client::IsConnected()
+{
+	std::unique_lock<std::mutex> mlock(lockClient);
+	return _isConnected;
+}
+
+//
+// Set client connected state
+//
+void NamedPipeServer::Client::SetConnectedState(bool connected)
+{
+	std::unique_lock<std::mutex> mlock(lockClient);
+	_isConnected = connected;
 }
diff --git a/TabletDriverService/NamedPipeServer.h b/TabletDriverService/NamedPipeServer.h
index 6d7057d..265e021 100644
--- a/TabletDriverService/NamedPipeServer.h
+++ b/TabletDriverService/NamedPipeServer.h
@@ -1,32 +1,52 @@
 #pragma once
 
 #include <thread>
+#include <atomic>
 #include <mutex>
+#include <condition_variable>
 #include <string>
 
 #include "Runnable.h"
+#include "BufferQueue.h"
 
-#define BUFFER_SIZE 1024
+constexpr auto BUFFER_SIZE = 4096;
+constexpr auto MAX_CLIENTS = 16;
 
 class NamedPipeServer : public Runnable
 {
+protected:
+	atomic<bool> _isStopping;
 public:
 	string pipePath;
 	string pipeName;
 	thread *threadMain;
-	mutex lock;
+	mutex lockServer;
 
 	class Client {
+	private:
+		atomic<bool> _isConnected;
 	public:
 		int id;
 		HANDLE handlePipe;
-		thread* threadPipe;
+		OVERLAPPED overlapped;
+		NamedPipeServer *server;
+		thread* threadRead;
+		thread* threadWrite;
 		string pipeName;
-		bool isConnected;
+		mutex lockClient;
+		BufferQueue writeQueue;
+		mutex lockWriteWait;
+		condition_variable conditionWriteQueue;
 		Client();
+		~Client();
+		bool IsConnected();
+		void SetConnectedState(bool connected);
+
+		void RunReadThread();
+		void RunWriteThread();
 	};
 
-	Client clients[256];
+	Client clients[MAX_CLIENTS];
 	int clientCount;
 
 	NamedPipeServer(string pipeName);
@@ -34,11 +54,11 @@ class NamedPipeServer : public Runnable
 
 	virtual bool Start();
 	virtual bool Stop();
-	virtual int ProcessData(int clientId, char *bufferInput, int length, char *bufferOutput);
+	virtual void ProcessData(int clientId, BYTE *bufferInput, int length);
 	bool Write(void * buffer, int length);
+	bool IsClientConnected();
 
 	void RunMainThread();
-	void RunClientThread(Client *client);
 
 
 
diff --git a/TabletDriverService/NamedPipeState.cpp b/TabletDriverService/NamedPipeState.cpp
index 2545e64..18bda92 100644
--- a/TabletDriverService/NamedPipeState.cpp
+++ b/TabletDriverService/NamedPipeState.cpp
@@ -9,6 +9,7 @@ NamedPipeState::NamedPipeState(string pipeName) : NamedPipeServer(pipeName)
 
 NamedPipeState::~NamedPipeState()
 {
+	Stop();
 }
 
 //
@@ -16,7 +17,7 @@ NamedPipeState::~NamedPipeState()
 //
 bool NamedPipeState::Start()
 {
-	if(!IsRunning()) {
+	if (!IsRunning()) {
 		bool result = NamedPipeServer::Start();
 		threadStateWriter = new thread(&NamedPipeState::RunStateWriterThread, this);
 		return result;
@@ -30,7 +31,24 @@ bool NamedPipeState::Start()
 //
 bool NamedPipeState::Stop()
 {
-	return NamedPipeServer::Stop();
+	printf("Stopping state writer...\n");
+
+	SetRunningState(false);
+
+	Sleep(10);
+
+	if (threadStateWriter != NULL) {
+		try {
+			threadStateWriter->join();
+			printf("Stopping state writer stopped!\n");
+		}
+		catch (exception &e) {
+			printf("State writer exception: %s\n", e.what());
+		}
+	}
+
+	return true;
+	//return NamedPipeServer::Stop();
 }
 
 //
@@ -42,13 +60,10 @@ void NamedPipeState::RunStateWriterThread()
 	bool outputEnabled = false;
 	bool running = true;
 
-	while(IsRunning()) {
-		lock.lock();
-		outputEnabled = isStateOutputEnabled;
-		lock.unlock();
+	while (IsRunning()) {
 
-		if(tablet != NULL && tabletHandler != NULL && outputEnabled) {
-			if(tabletHandler->outputStateWrite.position.Distance(lastState.position) > 0) {
+		if (tablet != NULL && tabletHandler != NULL && isStateOutputEnabled) {
+			if (tabletHandler->outputStateWrite.position.Distance(lastState.position) > 0) {
 
 				// Input
 				stateMessage.inputButtons = tablet->state.inputButtons;
diff --git a/TabletDriverService/NamedPipeState.h b/TabletDriverService/NamedPipeState.h
index 76645ac..97081a3 100644
--- a/TabletDriverService/NamedPipeState.h
+++ b/TabletDriverService/NamedPipeState.h
@@ -1,4 +1,7 @@
 #pragma once
+
+#include <atomic>
+
 #include "NamedPipeServer.h"
 class NamedPipeState : public NamedPipeServer
 {
@@ -20,7 +23,7 @@ class NamedPipeState : public NamedPipeServer
 	} stateMessage;
 
 	thread *threadStateWriter;
-	bool isStateOutputEnabled;
+	atomic<bool> isStateOutputEnabled;
 
 	NamedPipeState(string pipeName);
 	~NamedPipeState();
diff --git a/TabletDriverService/Runnable.cpp b/TabletDriverService/Runnable.cpp
index ed1b08a..01b0187 100644
--- a/TabletDriverService/Runnable.cpp
+++ b/TabletDriverService/Runnable.cpp
@@ -3,16 +3,10 @@
 
 bool Runnable::IsRunning()
 {
-	bool running = false;
-	isRunningLock.lock();
-	running = _isRunning;
-	isRunningLock.unlock();
-	return running;
+	return _isRunning;
 }
 
 void Runnable::SetRunningState(bool running)
 {
-	isRunningLock.lock();
 	_isRunning = running;
-	isRunningLock.unlock();
 }
diff --git a/TabletDriverService/Runnable.h b/TabletDriverService/Runnable.h
index a11c293..54874a7 100644
--- a/TabletDriverService/Runnable.h
+++ b/TabletDriverService/Runnable.h
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <atomic>
 #include <mutex>
 
 class Runnable
 {
 protected:
-	bool _isRunning = false;
-	mutex isRunningLock;
+	atomic<bool> _isRunning = false;
 public:
 	bool IsRunning();
 	void SetRunningState(bool running);
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index 9af8fab..b56fc28 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -11,7 +11,7 @@
 //
 Tablet::Tablet(string usbGUID) : Tablet() {
 	usbDevice = new USBDevice(usbGUID);
-	if(usbDevice->isOpen) {
+	if (usbDevice->isOpen) {
 		this->isOpen = true;
 		usbPipeId = 0x81;
 	}
@@ -27,7 +27,7 @@ Tablet::Tablet(string usbGUID) : Tablet() {
 //
 Tablet::Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage, bool isExclusive) : Tablet() {
 	hidDevice = new HIDDevice(vendorId, productId, usagePage, usage, isExclusive);
-	if(hidDevice->isOpen) {
+	if (hidDevice->isOpen) {
 		this->isOpen = true;
 	}
 	else {
@@ -80,9 +80,9 @@ Tablet::Tablet() {
 Tablet::~Tablet() {
 
 	isOpen = false;
-	
+
 	// HID device
-	if(hidDevice != NULL) {
+	if (hidDevice != NULL) {
 		printf("  Cleanup HIDDevice\n");
 		hidDevice->CloseDevice();
 		delete hidDevice;
@@ -90,7 +90,7 @@ Tablet::~Tablet() {
 	}
 
 	// Aux device
-	if(hidDeviceAux != NULL) {
+	if (hidDeviceAux != NULL) {
 		printf("  Cleanup Aux HIDDevice\n");
 		hidDeviceAux->CloseDevice();
 		delete hidDeviceAux;
@@ -98,7 +98,7 @@ Tablet::~Tablet() {
 	}
 
 	// WinUSB device
-	if(usbDevice != NULL) {
+	if (usbDevice != NULL) {
 		printf("  Cleanup USBDevice\n");
 		usbDevice->CloseDevice();
 		delete usbDevice;
@@ -106,12 +106,12 @@ Tablet::~Tablet() {
 	}
 
 	// Init feature reports
-	for(InitReport *report : initFeatureReports) {
+	for (InitReport *report : initFeatureReports) {
 		delete report;
 	}
 
 	// Init output reports
-	for(InitReport *report : initOutputReports) {
+	for (InitReport *report : initOutputReports) {
 		delete report;
 	}
 
@@ -124,8 +124,8 @@ Tablet::~Tablet() {
 bool Tablet::Init() {
 
 	// String requests
-	if(initStrings.size() > 0) {
-		for(int stringId : initStrings) {
+	if (initStrings.size() > 0) {
+		for (int stringId : initStrings) {
 			GetDeviceString(stringId);
 			Sleep(10);
 		}
@@ -133,8 +133,8 @@ bool Tablet::Init() {
 	Sleep(100);
 
 	// Feature reports
-	for(InitReport *report : initFeatureReports) {
-		if(!hidDevice->SetFeature(report->data, report->length)) {
+	for (InitReport *report : initFeatureReports) {
+		if (!hidDevice->SetFeature(report->data, report->length)) {
 			return false;
 		}
 		Sleep(20);
@@ -142,8 +142,8 @@ bool Tablet::Init() {
 	Sleep(100);
 
 	// Output reports
-	for(InitReport *report : initOutputReports) {
-		if(!hidDevice->Write(report->data, report->length)) {
+	for (InitReport *report : initOutputReports) {
+		if (!hidDevice->Write(report->data, report->length)) {
 			return false;
 		}
 		Sleep(20);
@@ -158,13 +158,13 @@ bool Tablet::Init() {
 // Check if the tablet has enough configuration parameters set
 //
 bool Tablet::IsConfigured() {
-	if(
+	if (
 		settings.maxX > 1 &&
 		settings.maxY > 1 &&
 		settings.maxPressure > 1 &&
 		settings.width > 1 &&
 		settings.height > 1
-	) return true;
+		) return true;
 	return false;
 }
 
@@ -175,12 +175,12 @@ bool Tablet::IsConfigured() {
 string Tablet::GetDeviceString(UCHAR stringId)
 {
 	// USB device
-	if(usbDevice != NULL) {
+	if (usbDevice != NULL) {
 		return usbDevice->GetString(stringId);
 	}
 
 	// HID device
-	else if(hidDevice != NULL) {
+	else if (hidDevice != NULL) {
 		return hidDevice->GetString(stringId);
 	}
 
@@ -193,12 +193,12 @@ string Tablet::GetDeviceString(UCHAR stringId)
 string Tablet::GetDeviceManufacturerName()
 {
 	// USB device
-	if(usbDevice != NULL) {
+	if (usbDevice != NULL) {
 		return usbDevice->GetManufacturerName();
 	}
 
 	// HID device
-	else if(hidDevice != NULL) {
+	else if (hidDevice != NULL) {
 		return hidDevice->GetManufacturerName();
 	}
 
@@ -211,12 +211,12 @@ string Tablet::GetDeviceManufacturerName()
 string Tablet::GetDeviceProductName()
 {
 	// USB device
-	if(usbDevice != NULL) {
+	if (usbDevice != NULL) {
 		return usbDevice->GetProductName();
 	}
 
 	// HID device
-	else if(hidDevice != NULL) {
+	else if (hidDevice != NULL) {
 		return hidDevice->GetProductName();
 	}
 
@@ -229,12 +229,12 @@ string Tablet::GetDeviceProductName()
 string Tablet::GetDeviceSerialNumber()
 {
 	// USB device
-	if(usbDevice != NULL) {
+	if (usbDevice != NULL) {
 		return usbDevice->GetSerialNumber();
 	}
 
 	// HID device
-	else if(hidDevice != NULL) {
+	else if (hidDevice != NULL) {
 		return hidDevice->GetSerialNumber();
 	}
 
@@ -250,25 +250,28 @@ int Tablet::ReadState() {
 	UCHAR *data;
 
 	// Read report
-	if(!this->Read(buffer, settings.reportLength)) {
+	if (!this->Read(buffer, settings.reportLength)) {
 		return -1;
 	}
 
-	if(!isOpen) return Tablet::ReportInvalid;
+	if (!isOpen) return Tablet::ReportInvalid;
 
 	// Process auxiliary data
-	if(settings.auxReports[0].reportId > 0 && hidDeviceAux == NULL) {
+	if (settings.auxReports[0].reportId > 0 && hidDeviceAux == NULL) {
 		ProcessAuxData(buffer, settings.reportLength);
+
+		// Notify aux state change
+		conditionAuxState.notify_one();
 	}
 
 	// Skip reports
-	if(skipReports > 0) {
+	if (skipReports > 0) {
 		skipReports--;
 		return Tablet::ReportInvalid;
 	}
 
 	// Set data pointer
-	if(settings.dataFormat == TabletSettings::TabletFormatWacomDrivers) {
+	if (settings.dataFormat == TabletSettings::TabletFormatWacomDrivers) {
 		data = buffer + 1;
 	}
 	else {
@@ -278,10 +281,10 @@ int Tablet::ReadState() {
 	//
 	// Wacom Intuos data format V2
 	//
-	if(settings.dataFormat == TabletSettings::TabletFormatWacomIntuosV2) {
+	if (settings.dataFormat == TabletSettings::TabletFormatWacomIntuosV2) {
 
 		// Wacom driver device
-		if(settings.reportLength == 11) {
+		if (settings.reportLength == 11) {
 			data = buffer + 1;
 		}
 
@@ -290,7 +293,7 @@ int Tablet::ReadState() {
 		reportData.x = ((data[2] * 0x100 + data[3]) << 1) | ((data[9] >> 1) & 1);
 		reportData.y = ((data[4] * 0x100 + data[5]) << 1) | (data[9] & 1);
 		reportData.pressure = (data[6] << 3) | ((data[7] & 0xC0) >> 5) | (data[1] & 1);
-		//distance = buffer[9] >> 2;
+		reportData.height = data[9] >> 2;
 
 
 	}
@@ -298,10 +301,10 @@ int Tablet::ReadState() {
 	//
 	// Wacom Intuos data format V3 (Wacom 4100)
 	//
-	else if(settings.dataFormat == TabletSettings::TabletFormatWacomIntuosV3) {
+	else if (settings.dataFormat == TabletSettings::TabletFormatWacomIntuosV3) {
 
 		// Wacom driver device
-		if(settings.reportLength == 193) {
+		if (settings.reportLength == 193) {
 			data = buffer + 1;
 		}
 
@@ -314,18 +317,17 @@ int Tablet::ReadState() {
 	}
 
 	//
-	// Skip first data byte (VEIKK S640)
+	// Skip first data byte (VEIKK)
 	//
-	else if(settings.dataFormat == TabletSettings::TabletFormatSkipFirstDataByte) {
+	else if (settings.dataFormat == TabletSettings::TabletFormatSkipFirstDataByte) {
 
 		// Validate report length
-		if(settings.reportLength >= 9) {
-
-			// Offset report data
-			memcpy(&reportData, (data + 1), sizeof(reportData));
-
-			// Set report id
+		if (settings.reportLength >= 9) {
 			reportData.reportId = data[0];
+			reportData.buttons = data[2] & ~0x01;
+			reportData.x = data[3] | (data[4] << 8);
+			reportData.y = data[5] | (data[6] << 8);
+			reportData.pressure = data[7] | (data[8] << 8);
 		}
 
 	}
@@ -333,51 +335,57 @@ int Tablet::ReadState() {
 	//
 	// Custom data format
 	//
-	else if(settings.dataFormat == TabletSettings::TabletFormatCustom) {
+	else if (settings.dataFormat == TabletSettings::TabletFormatCustom) {
 
 		// Data formatter target length valid?
-		if(dataFormatter.targetLength <= sizeof(reportData)) {
+		if (dataFormatter.targetLength <= sizeof(reportData)) {
 
 			// Clear report data
 			memset(&reportData, 0, sizeof(reportData));
 
 			// Format data
 			dataFormatter.Format(&reportData, buffer);
-
 		}
-
-
 	}
 
 	//
-	// Copy buffer to struct
+	// Standard tablet data format
 	//
 	else {
-		memcpy(&reportData, data, sizeof(reportData));
+		reportData.reportId = data[0];
+		reportData.buttons = data[1] & ~0x01;
+		reportData.x = data[2] | (data[3] << 8);
+		reportData.y = data[4] | (data[5] << 8);
+		reportData.pressure = data[6] | (data[7] << 8);
+
+		// Wacom height
+		if (settings.reportLength > 8) {
+			reportData.height = data[8];
+		}
 	}
 
 
 	// Validate report id
-	if(settings.reportId > 0 && reportData.reportId != settings.reportId) {
+	if (settings.reportId > 0 && reportData.reportId != settings.reportId) {
 		return Tablet::ReportInvalid;
 	}
 
 	// Detect mask
-	if(settings.detectMask > 0 && (reportData.buttons & settings.detectMask) != settings.detectMask) {
+	if (settings.detectMask > 0 && (reportData.buttons & settings.detectMask) != settings.detectMask) {
 		return Tablet::ReportPositionInvalid;
 	}
 
 	// Ignore mask
-	if(settings.ignoreMask > 0 && (reportData.buttons & settings.ignoreMask) == settings.ignoreMask) {
+	if (settings.ignoreMask > 0 && (reportData.buttons & settings.ignoreMask) == settings.ignoreMask) {
 		return Tablet::ReportIgnore;
 	}
 
 	//
 	// Use pen pressure to detect the pen tip click
 	//
-	if(settings.clickPressure > 0) {
+	if (settings.clickPressure > 0) {
 		reportData.buttons &= ~1;
-		if(reportData.pressure > settings.clickPressure) {
+		if (reportData.pressure > settings.clickPressure) {
 			reportData.buttons |= 1;
 		}
 
@@ -385,16 +393,16 @@ int Tablet::ReadState() {
 	}
 
 	// Force tip button down if pressure is detected
-	else if(reportData.pressure > 10) {
+	else if (reportData.pressure > 10) {
 		reportData.buttons |= 1;
 	}
 
 	// Keep pen tip button down for a few reports
-	if(settings.keepTipDown > 0) {
-		if(reportData.buttons & 0x01) {
+	if (settings.keepTipDown > 0) {
+		if (reportData.buttons & 0x01) {
 			tipDownCounter = settings.keepTipDown;
 		}
-		if(tipDownCounter-- >= 0) {
+		if (tipDownCounter-- >= 0) {
 			reportData.buttons |= 1;
 		}
 	}
@@ -419,7 +427,7 @@ int Tablet::ReadState() {
 
 	state.inputPosition.Set(state.position);
 
-	if(settings.skew != 0) {
+	if (settings.skew != 0) {
 		state.position.x += state.position.y * settings.skew;
 	}
 	state.pressure = state.inputPressure = ((double)reportData.pressure / (double)settings.maxPressure);
@@ -428,15 +436,15 @@ int Tablet::ReadState() {
 	//
 	// Pressure deadzone
 	//
-	if(settings.pressureDeadzoneLow > 0.0 || settings.pressureDeadzoneHigh > 0.0) {
+	if (settings.pressureDeadzoneLow > 0.0 || settings.pressureDeadzoneHigh > 0.0) {
 
 		// Minimum
-		if(state.pressure < settings.pressureDeadzoneLow) {
+		if (state.pressure < settings.pressureDeadzoneLow) {
 			state.pressure = 0.0;
 		}
 
 		// Maximum
-		else if(state.pressure > 1 - settings.pressureDeadzoneHigh) {
+		else if (state.pressure > 1 - settings.pressureDeadzoneHigh) {
 			state.pressure = 1.0;
 		}
 
@@ -447,22 +455,27 @@ int Tablet::ReadState() {
 			pressure /= (1 - settings.pressureDeadzoneHigh);
 			state.pressure = pressure;
 		}
-
 	}
 
 	//
 	// Pressure sensitivity 
 	//
-	if(settings.pressureSensitivity > 0.0) {
+	if (settings.pressureSensitivity > 0.0) {
 		state.pressure = 1 - pow(1 - state.pressure, (1 + settings.pressureSensitivity));
 	}
-	else if(settings.pressureSensitivity < 0.0) {
+	else if (settings.pressureSensitivity < 0.0) {
 		state.pressure = pow(state.pressure, 1 - settings.pressureSensitivity);
 	}
 
 
+	//
+	// Height
+	//
+	state.height = state.inputHeight = reportData.height;
+
+
 	// Tablet measurement update
-	if(measurement.IsRunning()) {
+	if (measurement.IsRunning()) {
 		state.buttons = reportData.buttons & 0x0F;
 		measurement.Update(state);
 		return Tablet::ReportInvalid;
@@ -477,15 +490,15 @@ int Tablet::ReadState() {
 // Read report from tablet
 //
 bool Tablet::Read(void *buffer, int length) {
-	if(!isOpen) return false;
+	if (!isOpen) return false;
 	bool status = false;
-	if(usbDevice != NULL) {
+	if (usbDevice != NULL) {
 		status = usbDevice->Read(usbPipeId, buffer, length) > 0;
 	}
-	else if(hidDevice != NULL) {
+	else if (hidDevice != NULL) {
 		status = hidDevice->Read(buffer, length);
 	}
-	if(logger.IsDebugOutputEnabled() && status) {
+	if (logger.IsDebugOutputEnabled() && status) {
 		LOG_DEBUGBUFFER(buffer, length, "Read: ");
 	}
 	return status;
@@ -497,10 +510,9 @@ bool Tablet::Read(void *buffer, int length) {
 int Tablet::ProcessAuxData(void *buffer, int length)
 {
 	int status = TabletAuxReportStatus::AuxReportInvalid;
+	bool firstReport = true;
 
-	auxState.buttons = 0;
-
-	for(int i = 0; i < settings.auxReportCount; i++) {
+	for (int i = 0; i < settings.auxReportCount; i++) {
 		TabletSettings::AuxReport *auxReport = &settings.auxReports[i];
 
 		// Clear report data
@@ -511,24 +523,30 @@ int Tablet::ProcessAuxData(void *buffer, int length)
 		auxReport->formatter.Format(&auxReportData, buffer);
 
 		// Report id valid?
-		if(auxReportData.reportId == auxReport->reportId) {
+		if (auxReportData.reportId == auxReport->reportId) {
 
 			// Detect mask
-			if(auxReport->detectMask > 0 && (auxReportData.detect & auxReport->detectMask) != auxReport->detectMask) {
-				if(status != TabletAuxReportStatus::AuxReportValid)
+			if (auxReport->detectMask > 0 && (auxReportData.detect & auxReport->detectMask) != auxReport->detectMask) {
+				if (status != TabletAuxReportStatus::AuxReportValid)
 					status = TabletAuxReportStatus::AuxReportInvalid;
 				continue;
 			}
 
 			// Ignore mask
-			if(auxReport->ignoreMask > 0 && (auxReportData.detect & auxReport->ignoreMask) == auxReport->ignoreMask) {
-				if(status != TabletAuxReportStatus::AuxReportValid)
+			if (auxReport->ignoreMask > 0 && (auxReportData.detect & auxReport->ignoreMask) == auxReport->ignoreMask) {
+				if (status != TabletAuxReportStatus::AuxReportValid)
 					status = TabletAuxReportStatus::AuxReportIgnore;
 				continue;
 			}
 
+			// Reset buttons
+			if (firstReport) {
+				auxState.buttons = 0;
+				firstReport = false;
+			}
+
 			// Update aux state
-			if(auxReportData.isPressed > 0) {
+			if (auxReportData.isPressed > 0) {
 				auxState.buttons |= auxReportData.buttons;
 			}
 			auxState.isValid = true;
@@ -550,24 +568,27 @@ int Tablet::ReadAuxReport()
 
 	// Read aux device
 	bool status = false;
-	if(hidDeviceAux != NULL) {
+	if (hidDeviceAux != NULL) {
 		status = hidDeviceAux->Read(buffer, length);
 
 		// Debug message
-		if(logger.IsDebugOutputEnabled()) {
+		if (logger.IsDebugOutputEnabled()) {
 			LOG_DEBUGBUFFER(buffer, length, "Aux read: ");
 		}
 
 		return ProcessAuxData(buffer, length);
 
 	}
-	else if(usbDevice != NULL || settings.auxReports[0].reportId > 0) {
-		if(auxState.isValid) {
-			Sleep(1);
+	else if (usbDevice != NULL || settings.auxReports[0].reportId > 0) {
+
+		// Wait for an auxiliary state change
+		std::unique_lock<std::mutex> mlock(lockAuxState);
+		conditionAuxState.wait(mlock);
+
+		if (auxState.isValid) {
 			return TabletAuxReportStatus::AuxReportValid;
 		}
 		else {
-			Sleep(1);
 			return TabletAuxReportStatus::AuxReportInvalid;
 		}
 	}
@@ -579,11 +600,11 @@ int Tablet::ReadAuxReport()
 // Write report to the tablet
 //
 bool Tablet::Write(void *buffer, int length) {
-	if(!isOpen) return false;
-	if(usbDevice != NULL) {
+	if (!isOpen) return false;
+	if (usbDevice != NULL) {
 		return usbDevice->Write(usbPipeId, buffer, length) > 0;
 	}
-	else if(hidDevice != NULL) {
+	else if (hidDevice != NULL) {
 		return hidDevice->Write(buffer, length);
 	}
 	return false;
@@ -593,13 +614,19 @@ bool Tablet::Write(void *buffer, int length) {
 // Close tablet
 //
 void Tablet::CloseDevice() {
-	if(isOpen) {
-		if(usbDevice != NULL) {
+	if (isOpen) {
+		if (usbDevice != NULL) {
+			printf("  Tablet: Closing WinUSB device\n");
 			usbDevice->CloseDevice();
 		}
-		else if(hidDevice != NULL) {
+		if (hidDevice != NULL) {
+			printf("  Tablet: Closing HID device\n");
 			hidDevice->CloseDevice();
 		}
+		if (hidDeviceAux != NULL) {
+			printf("  Tablet: Closing Aux HID device\n");
+			hidDeviceAux->CloseDevice();
+		}
 	}
 	isOpen = false;
 }
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index ddf8819..d0d53f3 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -2,6 +2,9 @@
 
 #include <string>
 #include <vector>
+#include <atomic>
+#include <mutex>
+#include <condition_variable>
 
 #include "USBDevice.h"
 #include "HIDDevice.h"
@@ -57,9 +60,10 @@ class Tablet {
 	struct {
 		BYTE reportId;
 		BYTE buttons;
-		USHORT x;
-		USHORT y;
+		UINT32 x;
+		UINT32 y;
 		USHORT pressure;
+		USHORT height;
 	} reportData;
 
 	//
@@ -89,6 +93,9 @@ class Tablet {
 		USHORT lastButtons;
 	};
 	TabletAuxState auxState;
+	mutex lockAuxState;
+	condition_variable conditionAuxState;
+
 
 	//
 	// Data formatters
@@ -131,7 +138,7 @@ class Tablet {
 
 	//
 	string name = "Unknown";
-	bool isOpen;
+	atomic<bool> isOpen;
 	int skipReports;
 
 	// Pen tip button keep down
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index 783188c..b3c2673 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{3101CEC2-8F39-45FD-943B-79A488AD05EA}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>TabletDriverService</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -174,6 +174,7 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="BufferQueue.h" />
     <ClInclude Include="Command.h" />
     <ClInclude Include="CommandHandler.h" />
     <ClInclude Include="CommandLine.h" />
@@ -218,6 +219,7 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     <ClInclude Include="VMulti.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="BufferQueue.cpp" />
     <ClCompile Include="Command.cpp" />
     <ClCompile Include="CommandHandler.Auxiliary.cpp" />
     <ClCompile Include="CommandHandler.cpp" />
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index 5a55500..bde474e 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -141,6 +141,9 @@
     <ClInclude Include="Runnable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="BufferQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -284,6 +287,9 @@
     <ClCompile Include="Runnable.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="BufferQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">
diff --git a/TabletDriverService/TabletFilterSmoothing.cpp b/TabletDriverService/TabletFilterSmoothing.cpp
index ed27d63..33acb02 100644
--- a/TabletDriverService/TabletFilterSmoothing.cpp
+++ b/TabletDriverService/TabletFilterSmoothing.cpp
@@ -69,6 +69,7 @@ void TabletFilterSmoothing::OnTimerIntervalChange(double oldInterval, double new
 	timerInterval = newInterval;
 
 	// TODO: Find a better way to calculate this...
+	//threshold = 0.90;
 	threshold = 0.63;
 
 	SetLatency(latency);
diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
index edab5f3..02eed68 100644
--- a/TabletDriverService/TabletHandler.cpp
+++ b/TabletDriverService/TabletHandler.cpp
@@ -5,6 +5,10 @@
 #define LOG_MODULE "TabletHandler"
 #include "Logger.h"
 
+extern "C" NTSYSAPI NTSTATUS NTAPI NtSetTimerResolution(ULONG DesiredResolution, BOOLEAN SetResolution, PULONG CurrentResolution);
+extern "C" NTSYSAPI NTSTATUS NTAPI NtQueryTimerResolution(OUT PULONG MinimumResolution, OUT PULONG MaximumResolution, OUT PULONG ActualResolution);
+
+
 //
 // Constructor
 //
@@ -15,6 +19,7 @@ TabletHandler::TabletHandler() {
 	SetRunningState(false);
 	timerInterval = 20;
 	isTimerTickRunning = false;
+	_isTimerStopping = false;
 }
 
 
@@ -22,11 +27,46 @@ TabletHandler::TabletHandler() {
 // Destructor
 //
 TabletHandler::~TabletHandler() {
-	StopTimer();
+
+	// Set running state
 	SetRunningState(false);
-	if(tablet != NULL) {
-		tablet->isOpen = false;
+
+	// Timer
+	lockTimer.lock();
+	StopTimer();
+	lockTimer.unlock();
+
+	// Close tablet devices
+	if (tablet != NULL) {
+		tablet->CloseDevice();
+	}
+
+	// Wait tablet input thread to exit
+	if (tabletInputThread != NULL) {
+		printf("Join tablet thread\n");
+		try {
+			tabletInputThread->join();
+		}
+		catch (exception &e) {
+			printf("Tablet input thread exception: %s\n", e.what());
+		}
 	}
+
+	// Wait auxiliary input thread to exit
+	if (auxInputThread != NULL) {
+
+		// Notify aux state change
+		tablet->conditionAuxState.notify_all();
+
+		printf("Join aux thread\n");
+		try {
+			auxInputThread->join();
+		}
+		catch (exception &e) {
+			printf("Aux input thread exception: %s\n", e.what());
+		}
+	}
+
 }
 
 
@@ -34,11 +74,17 @@ TabletHandler::~TabletHandler() {
 // Start tablet handler
 //
 bool TabletHandler::Start() {
-	if(tablet == NULL) return false;
-	ChangeTimerInterval((int)round(timerInterval));
+	if (tablet == NULL) return false;
+
 	SetRunningState(true);
+
+	// Timer
+	ChangeTimerInterval((int)round(timerInterval));
+
+	// Threads
 	tabletInputThread = new thread(&TabletHandler::RunTabletInputThread, this);
 	auxInputThread = new thread(&TabletHandler::RunAuxInputThread, this);
+
 	return true;
 }
 
@@ -46,7 +92,7 @@ bool TabletHandler::Start() {
 // Stop tablet handler
 //
 bool TabletHandler::Stop() {
-	if(tablet == NULL) return false;
+	if (tablet == NULL) return false;
 	SetRunningState(false);
 	return true;
 }
@@ -56,31 +102,70 @@ bool TabletHandler::Stop() {
 // Start filter timer
 //
 bool TabletHandler::StartTimer() {
-	BOOL result = CreateTimerQueueTimer(
-		&timer,
-		NULL, TimerCallback,
-		this,
-		0,
-		(int)timerInterval,
-		WT_EXECUTEDEFAULT
-	);
-	if(!result) return false;
+
+	isTimerTickRunning = false;
+	_isTimerStopping = false;
+
+	if (timer == NULL) {
+		BOOL result = CreateTimerQueueTimer(
+			&timer,
+			NULL,
+			TimerCallback,
+			this,
+			0,
+			(int)timerInterval,
+			WT_EXECUTEDEFAULT
+		);
+
+		if (!result) return false;
+	}
+	else {
+		return false;
+	}
 
 	return true;
 }
 
 
+//
+// Change timer interval
+//
+bool TabletHandler::ChangeTimer(int interval) {
+
+	if (timer != NULL) {
+		BOOL result = ChangeTimerQueueTimer(NULL, timer, 0, interval);
+		if (!result) return false;
+		return true;
+	}
+
+	return false;
+}
+
+
 //
 // Stop filter timer
 //
 bool TabletHandler::StopTimer() {
-	if(timer == NULL) return true;
+	if (timer == NULL) return true;
+	if (_isTimerStopping) return false;
+
+	_isTimerStopping = true;
+
+	// Wait timer tick to finish
+	for (int i = 0; i < 100 + timerInterval; i++) {
+		if (!isTimerTickRunning) break;
+		Sleep(1);
+	}
+	if (isTimerTickRunning) {
+		LOG_ERROR("Timer did not stop!\n");
+		return false;
+	}
+
 	bool result = DeleteTimerQueueTimer(NULL, timer, NULL);
-	if(result) {
+	if (result) {
 		timer = NULL;
-		return true;
 	}
-	return false;
+	return true;
 }
 
 
@@ -99,7 +184,7 @@ void TabletHandler::ChangeTimerInterval(int newInterval) {
 	NtQueryTimerResolution(&timerMinimumResolution, &timerMaximumResolution, &timerCurrentResolution);
 
 	// Debug messages
-	if(logger.IsDebugOutputEnabled()) {
+	if (logger.IsDebugOutputEnabled()) {
 		LOG_DEBUG("System timer resolution:\n");
 		LOG_DEBUG("  Minimum: %0.3f ms\n", (double)timerMinimumResolution / 10000.0);
 		LOG_DEBUG("  Maximum: %0.3f ms\n", (double)timerMaximumResolution / 10000.0);
@@ -107,16 +192,16 @@ void TabletHandler::ChangeTimerInterval(int newInterval) {
 	}
 
 	// Check if current resolution is double the timer interval
-	if(timerCurrentResolution > timerInterval * 5000.0)
+	if (timerCurrentResolution > timerInterval * 5000.0)
 	{
 		ULONG timerResolution = (ULONG)(timerInterval * 5000.0);
 		ULONG currentResolution;
 
 		// Limits
-		if(timerResolution > timerMinimumResolution) {
+		if (timerResolution > timerMinimumResolution) {
 			timerResolution = timerMinimumResolution;
 		}
-		else if(timerResolution < timerMaximumResolution) {
+		else if (timerResolution < timerMaximumResolution) {
 			timerResolution = timerMaximumResolution;
 		}
 
@@ -128,7 +213,7 @@ void TabletHandler::ChangeTimerInterval(int newInterval) {
 		NtQueryTimerResolution(&timerMinimumResolution, &timerMaximumResolution, &timerCurrentResolution);
 
 		// Debug messages
-		if(logger.IsDebugOutputEnabled()) {
+		if (logger.IsDebugOutputEnabled()) {
 			LOG_DEBUG("System timer resolution set to %0.3f ms\n", (double)timerResolution / 10000.0);
 			LOG_DEBUG("System timer resolution is now %0.3f ms\n", (double)timerCurrentResolution / 10000.0);
 		}
@@ -136,21 +221,37 @@ void TabletHandler::ChangeTimerInterval(int newInterval) {
 
 	// Tell the new interval to timed filters
 	filtersEnabled = false;
-	if(tablet != NULL) {
-		for(int i = 0; i < tablet->filterTimedCount; i++) {
+	if (tablet != NULL) {
+		for (int i = 0; i < tablet->filterTimedCount; i++) {
 			tablet->filterTimed[i]->OnTimerIntervalChange(oldInterval, newInterval);
 
 			// Filter enabled?
-			if(tablet->filterTimed[i]->isEnabled) {
+			if (tablet->filterTimed[i]->isEnabled) {
 				filtersEnabled = true;
 			}
 		}
 	}
 
-	// Stop the timer and restart if a filter is enabled
-	if(StopTimer() && filtersEnabled) {
+	// Lock timer
+	lockTimer.lock();
+
+	// Stop the timer when filters are disabled and timer is running
+	if (!filtersEnabled && timer != NULL) {
+		StopTimer();
+	}
+
+	// Start the timer when filters are enabled and timer is not running
+	else if (filtersEnabled && timer == NULL) {
 		StartTimer();
 	}
+
+	// Start timer interval when filters are enabled and timer is running
+	else if(filtersEnabled) {
+		ChangeTimer((int)newInterval);
+	}
+
+	// Unlock timer
+	lockTimer.unlock();
 }
 
 
@@ -196,7 +297,7 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 	// Pen buttons
 	penButtons = tablet->state.inputButtons;
 	penLastButtons = tablet->state.lastButtons;
-	if(isPen) {
+	if (isPen) {
 		buttons = penButtons;
 		lastButtons = penLastButtons;
 		buttonCount = tablet->settings.buttonCount;
@@ -210,13 +311,13 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 	}
 
 	// Button state changed?
-	if(buttons > 0 || lastButtons > 0) {
+	if (buttons > 0 || lastButtons > 0) {
 
 		// Loop through buttons
-		for(int buttonIndex = 0; buttonIndex < buttonCount; buttonIndex++) {
+		for (int buttonIndex = 0; buttonIndex < buttonCount; buttonIndex++) {
 
 			// Button is not down, pressed or released?
-			if((buttons & (1 << buttonIndex)) == 0 && (lastButtons & (1 << buttonIndex)) == 0) {
+			if ((buttons & (1 << buttonIndex)) == 0 && (lastButtons & (1 << buttonIndex)) == 0) {
 				continue;
 			}
 
@@ -227,23 +328,23 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 
 			// Pen button map
 			hasBinding = false;
-			if(isPen && tablet->settings.buttonMap[buttonIndex].size() > 0) {
+			if (isPen && tablet->settings.buttonMap[buttonIndex].size() > 0) {
 				key = tablet->settings.buttonMap[buttonIndex];
-				if(inputEmulator.keyMap.count(key) > 0) {
+				if (inputEmulator.keyMap.count(key) > 0) {
 					hasBinding = true;
 				}
 			}
 
 			// Auxiliary button map
-			else if(!isPen && tablet->settings.auxButtonMap[buttonIndex].size() > 0) {
+			else if (!isPen && tablet->settings.auxButtonMap[buttonIndex].size() > 0) {
 				key = tablet->settings.auxButtonMap[buttonIndex];
-				if(inputEmulator.keyMap.count(key) > 0) {
+				if (inputEmulator.keyMap.count(key) > 0) {
 					hasBinding = true;
 				}
 			}
 
 			// Button has a binding?
-			if(hasBinding) {
+			if (hasBinding) {
 
 				InputEmulator::KeyMapValue *keyMapValue = inputEmulator.keyMap[key];
 
@@ -253,35 +354,23 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 				//
 				// Mouse buttons
 				//
-				if(mouseButton >= InputEmulator::Mouse1 && mouseButton <= InputEmulator::Mouse5) {
+				if (mouseButton >= InputEmulator::Mouse1 && mouseButton <= InputEmulator::Mouse5) {
 
 					// Pen button
-					if(isPen && isDown) {
+					if (isPen && isDown) {
 						*outButtons |= (1 << (mouseButton - 1));
 					}
 
 					// Auxiliary button
-					else if(isPressed || isReleased) {
+					else if (isPressed || isReleased) {
 						inputEmulator.MouseSet(mouseButton, isDown);
 					}
 				}
 
-				//
-				// Keyboard key
-				//
-				if(virtualKey > 0) {
-					if(isPressed) {
-						inputEmulator.SetKeyState(virtualKey, true);
-					}
-					else if(isReleased) {
-						inputEmulator.SetKeyState(virtualKey, false);
-					}
-				}
-
 				//
 				// Mouse scroll
 				//
-				if(
+				else if (
 					mouseButton == InputEmulator::MouseScrollVertical
 					||
 					mouseButton == InputEmulator::MouseScrollHorizontal
@@ -291,32 +380,32 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 					mouseButton == InputEmulator::MediaVolumeControl
 					||
 					mouseButton == InputEmulator::MediaBalanceControl
-				) {
+					) {
 
 					// Scroll button down?
-					if(isDown
+					if (isDown
 						&&
 						// Scroll when tip is down?
 						(!tablet->settings.scrollDrag || IsButtonDown(penButtons, 0))
-					) {
+						) {
 
 						// Get rotated pen position
 						scrollPosition.Set(tablet->state.position);
 						mapper->GetRotatedTabletPosition(&scrollPosition.x, &scrollPosition.y);
 
 						// Reset last scroll position and set the scroll start position
-						if(
+						if (
 							isPressed
 							||
 							(tablet->settings.scrollDrag && IsButtonPressed(penButtons, penLastButtons, 0))
-						) {
+							) {
 							lastScrollPosition.Set(scrollPosition);
 							scrollStartPosition.Set(tablet->state.position);
 
 							//
 							// Move normal mouse to digitizer position
 							//
-							if(outputManager->mode == OutputManager::ModeVMultiDigitizer) {
+							if (outputManager->mode == OutputManager::ModeVMultiDigitizer) {
 								TabletState tmpState;
 								tmpState.position.Set(tablet->state.position);
 								outputManager->sendInputAbsolute.Set(&tmpState);
@@ -326,7 +415,7 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 						}
 
 						// Disable mouse tip button when using drag scroll
-						if(tablet->settings.scrollDrag) {
+						if (tablet->settings.scrollDrag) {
 							*outButtons &= ~1;
 						}
 
@@ -337,20 +426,20 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 						);
 
 						// X Acceleration
-						if(delta.x > 0)
+						if (delta.x > 0)
 							delta.x = round(pow(delta.x, tablet->settings.scrollAcceleration));
 						else
 							delta.x = -round(pow(-delta.x, tablet->settings.scrollAcceleration));
 
 						// Y Acceleration
-						if(delta.y > 0)
+						if (delta.y > 0)
 							delta.y = round(pow(delta.y, tablet->settings.scrollAcceleration));
 						else
 							delta.y = -round(pow(-delta.y, tablet->settings.scrollAcceleration));
 
 
 						// Vertical Scroll
-						if(delta.y != 0 && (
+						if (delta.y != 0 && (
 							mouseButton == InputEmulator::MouseScrollVertical
 							||
 							mouseButton == InputEmulator::MouseScrollBoth
@@ -360,7 +449,7 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 						}
 
 						// Horizontal scroll
-						if(delta.x != 0 && (
+						if (delta.x != 0 && (
 							mouseButton == InputEmulator::MouseScrollHorizontal
 							||
 							mouseButton == InputEmulator::MouseScrollBoth
@@ -370,31 +459,58 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 						}
 
 						// Media volume control
-						if(delta.y != 0 && mouseButton == InputEmulator::MediaVolumeControl) {
+						if (delta.y != 0 && mouseButton == InputEmulator::MediaVolumeControl) {
 							inputEmulator.VolumeChange(-(float)delta.y / 100.0f);
 							scrolled = true;
 						}
 
 						// Media balance control
-						if((delta.x != 0 || isPressed) && mouseButton == InputEmulator::MediaBalanceControl) {
+						if ((delta.x != 0 || isPressed) && mouseButton == InputEmulator::MediaBalanceControl) {
 							double balance = 0.5 + ((scrollStartPosition.x - scrollPosition.x) * tablet->settings.scrollSensitivity) / 50.0f;
 							inputEmulator.VolumeBalance((float)balance);
 							scrolled = true;
 						}
 
 						// Stop cursor
-						if(tablet->settings.scrollStopCursor) {
+						if (tablet->settings.scrollStopCursor) {
 							tablet->state.position.Set(scrollStartPosition);
 						}
 
 					}
+
+				}
+
+
+				//
+				// Keyboard key
+				//
+				else if (virtualKey > 0) {
+					if (isPressed) {
+						inputEmulator.SetKeyState(virtualKey, true);
+					}
+					else if (isReleased) {
+						inputEmulator.SetKeyState(virtualKey, false);
+					}
+				}
+
+			}
+
+			//
+			// Multiple inputs
+			//
+			else {
+				if (isPressed) {
+					inputEmulator.SetInputStates(key, true);
+				}
+				else if (isReleased) {
+					inputEmulator.SetInputStates(key, false);
 				}
 			}
 
 		}
 
 		// Update last scroll position
-		if(scrolled) {
+		if (scrolled) {
 			lastScrollPosition.Set(scrollPosition);
 		}
 
@@ -422,29 +538,29 @@ void TabletHandler::RunTabletInputThread() {
 	//
 	// Tablet input main loop
 	//
-	while(IsRunning()) {
+	while (IsRunning()) {
 
 		//
 		// Read tablet position
 		//
 		status = tablet->ReadState();
 
-		if(!tablet->isOpen) break;
+		if (!tablet->isOpen) break;
 
 		// Position OK
-		if(status == Tablet::ReportValid) {
+		if (status == Tablet::ReportValid) {
 			isResent = false;
 		}
 
 		// Invalid report id
-		else if(status == Tablet::ReportInvalid) {
+		else if (status == Tablet::ReportInvalid) {
 			tablet->state.isValid = false;
 			continue;
 		}
 
 		// Valid report but position is not in-range or invalid
-		else if(status == Tablet::ReportPositionInvalid) {
-			if(!isResent && tablet->state.isValid) {
+		else if (status == Tablet::ReportPositionInvalid) {
+			if (!isResent && tablet->state.isValid) {
 				isResent = true;
 				tablet->state.isValid = false;
 				outputState.isValid = false;
@@ -455,7 +571,7 @@ void TabletHandler::RunTabletInputThread() {
 		}
 
 		// Ignore report
-		else if(status == Tablet::ReportIgnore) {
+		else if (status == Tablet::ReportIgnore) {
 			continue;
 		}
 
@@ -463,13 +579,14 @@ void TabletHandler::RunTabletInputThread() {
 		else {
 			LOG_ERROR("Tablet Read Error!\n");
 			CleanupAndExit(0);
+			return;
 		}
 
 
 		//
 		// Don't use first report
 		//
-		if(isFirstReport) {
+		if (isFirstReport) {
 			isFirstReport = false;
 			continue;
 		}
@@ -477,9 +594,9 @@ void TabletHandler::RunTabletInputThread() {
 		//
 		// Velocity calculation
 		//
-		if(oldState.isValid) {
+		if (oldState.isValid) {
 			double timeDelta = (tablet->state.time - oldState.time).count() / 1000000.0;
-			if(timeDelta >= 1 && timeDelta <= 10) {
+			if (timeDelta >= 1 && timeDelta <= 10) {
 				tablet->state.inputVelocity = oldState.inputPosition.Distance(tablet->state.inputPosition) * (1000.0 / timeDelta);
 			}
 			else {
@@ -491,21 +608,22 @@ void TabletHandler::RunTabletInputThread() {
 		}
 
 		// Debug messages
-		if(logger.IsDebugOutputEnabled()) {
+		if (logger.IsDebugOutputEnabled()) {
 			double delta = (tablet->state.time - timeBegin).count() / 1000000.0;
-			LOG_DEBUG("InputState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f V=%0.2f Valid=%s\n",
+			LOG_DEBUG("InputState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f H=%0.2f V=%0.2f Valid=%s\n",
 				delta,
 				tablet->state.inputButtons,
 				tablet->state.inputPosition.x,
 				tablet->state.inputPosition.y,
 				tablet->state.inputPressure,
+				tablet->state.inputHeight,
 				tablet->state.inputVelocity,
 				tablet->state.isValid ? "True" : "False"
 			);
 		}
 
 		// Set output values
-		if(status == Tablet::ReportPositionInvalid) {
+		if (status == Tablet::ReportPositionInvalid) {
 			tablet->state.buttons = 0;
 		}
 
@@ -520,20 +638,20 @@ void TabletHandler::RunTabletInputThread() {
 		// Report filters
 		//
 		// Are there any filters?
-		if(tablet->filterReportCount > 0) {
+		if (tablet->filterReportCount > 0) {
 
 			// Copy input state values to filter state
 			memcpy(&filterState, &tablet->state, sizeof(TabletState));
 
 
 			// Loop through filters
-			for(int filterIndex = 0; filterIndex < tablet->filterReportCount; filterIndex++) {
+			for (int filterIndex = 0; filterIndex < tablet->filterReportCount; filterIndex++) {
 
 				// Filter
 				filter = tablet->filterReport[filterIndex];
 
 				// Enabled?
-				if(filter != NULL && filter->isEnabled) {
+				if (filter != NULL && filter->isEnabled) {
 
 					// Process
 					filter->SetTarget(&filterState);
@@ -561,8 +679,8 @@ void TabletHandler::RunTabletInputThread() {
 
 		// Timed filter enabled?
 		filterTimedEnabled = false;
-		for(int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
-			if(tablet->filterTimed[filterIndex]->isEnabled)
+		for (int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
+			if (tablet->filterTimed[filterIndex]->isEnabled)
 				filterTimedEnabled = true;
 		}
 
@@ -571,7 +689,7 @@ void TabletHandler::RunTabletInputThread() {
 		memcpy(&oldState, &tablet->state, sizeof(TabletState));
 
 		// Do not write report when timed filter is enabled
-		if(filterTimedEnabled) {
+		if (filterTimedEnabled) {
 			continue;
 		}
 
@@ -596,36 +714,36 @@ void TabletHandler::RunAuxInputThread()
 	Tablet::TabletAuxState auxState;
 
 	// No aux device or not aux report id set
-	if(tablet->hidDeviceAux == NULL && tablet->usbDevice == NULL && tablet->settings.auxReports[0].reportId <= 0) {
+	if (tablet->hidDeviceAux == NULL && tablet->usbDevice == NULL && tablet->settings.auxReports[0].reportId <= 0) {
 		return;
 	}
 
 	//
 	// Auxiliary input main loop
 	//
-	while(IsRunning()) {
+	while (IsRunning()) {
 
 		// Read
 		reportStatus = tablet->ReadAuxReport();
 
 		// Read error
-		if(reportStatus == Tablet::AuxReportReadError) {
+		if (reportStatus == Tablet::AuxReportReadError) {
 			LOG_ERROR("Auxiliary device read error!\n");
 			break;
 		}
 
 		// Aux state invalid or ignored
-		if(reportStatus == Tablet::AuxReportInvalid || reportStatus == Tablet::AuxReportIgnore) {
+		if (reportStatus == Tablet::AuxReportInvalid || reportStatus == Tablet::AuxReportIgnore) {
 			continue;
 		}
 
 		// Skip invalid state
-		if(!tablet->auxState.isValid) continue;
+		if (!tablet->auxState.isValid) continue;
 		memcpy(&auxState, &tablet->auxState, sizeof(Tablet::TabletAuxState));
 		tablet->auxState.isValid = false;
 
 		// Process buttons
-		if(logger.IsDebugOutputEnabled()) {
+		if (logger.IsDebugOutputEnabled()) {
 			LOG_DEBUG("Aux buttons: 0x%04X\n", auxState.buttons);
 		}
 		UINT32 tmpButtons = 0;
@@ -641,41 +759,45 @@ void TabletHandler::RunAuxInputThread()
 // Timer tick
 //
 void TabletHandler::OnTimerTick() {
-	if(tablet == NULL) return;
+	if (tablet == NULL) return;
+	if (timer == NULL) return;
+	if (_isTimerStopping) return;
+
 	TabletFilter *filter;
 	TabletState filterState;
 	bool filtersEnabled = false;
 
-
-	if(isTimerTickRunning) {
+	// Detect performance problems
+	if (isTimerTickRunning) {
 
 		// Limit error logging rate
 		double timeDelta = (chrono::high_resolution_clock::now() - timeLastTimerProblem).count() / 1000000.0;
-		if(timeDelta > 2000.0) {
-			LOG_ERROR("Filter performance problem detected! Use lower filter rate or disable the smoothing filter.\n");
+		if (timeDelta > 2000.0) {
+			LOG_WARNING("Filter performance problem detected! Use lower filter rate or disable the smoothing filter.\n");
 			timeLastTimerProblem = chrono::high_resolution_clock::now();
 		}
 		return;
 	}
+
 	isTimerTickRunning = true;
 
 	// Loop through filters
-	for(int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
+	for (int filterIndex = 0; filterIndex < tablet->filterTimedCount; filterIndex++) {
 
 		// Filter
 		filter = tablet->filterTimed[filterIndex];
 
 		// Filter enabled?
-		if(filter->isEnabled) {
+		if (filter->isEnabled) {
 
 			// Copy current input state values when a enabled filter is found
-			if(!filtersEnabled) {
+			if (!filtersEnabled) {
 				lock.lock();
 				memcpy(&filterState, &outputState, sizeof(TabletState));
 				lock.unlock();
 
 				// State valid?
-				if(!filterState.isValid) {
+				if (!filterState.isValid) {
 					isTimerTickRunning = false;
 					return;
 				}
@@ -699,7 +821,7 @@ void TabletHandler::OnTimerTick() {
 	}
 
 	// Do not write to output if no filters are enabled
-	if(!filtersEnabled) {
+	if (!filtersEnabled) {
 		isTimerTickRunning = false;
 		return;
 	}
@@ -719,12 +841,12 @@ void TabletHandler::WriteOutputState(TabletState * outputState)
 {
 	bool result;
 	result = outputManager->Set(outputState);
-	if(result) {
+	if (result) {
 		result = outputManager->Write();
 	}
 
 	// Debug message
-	if(result && logger.IsDebugOutputEnabled()) {
+	if (result && logger.IsDebugOutputEnabled()) {
 		double delta = (chrono::high_resolution_clock::now() - timeBegin).count() / 1000000.0;
 		LOG_DEBUG("OutputState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f V=%s\n",
 			delta,
diff --git a/TabletDriverService/TabletHandler.h b/TabletDriverService/TabletHandler.h
index 65a686b..2e1f5dc 100644
--- a/TabletDriverService/TabletHandler.h
+++ b/TabletDriverService/TabletHandler.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <thread>
 #include <mutex>
+#include <atomic>
 #include "Tablet.h"
 #include "InputEmulator.h"
 #include "Runnable.h"
@@ -22,6 +23,9 @@ class TabletHandler : public Runnable {
 	thread *auxInputThread;
 	HANDLE timer;
 	double timerInterval;
+
+	atomic<bool> _isTimerStopping;
+	mutex lockTimer;
 	mutex lock;
 	chrono::high_resolution_clock::time_point timeBegin;
 	chrono::high_resolution_clock::time_point timeLastTimerProblem;
@@ -37,6 +41,7 @@ class TabletHandler : public Runnable {
 	bool Start();
 	bool Stop();
 	bool StartTimer();
+	bool ChangeTimer(int interval);
 	bool StopTimer();
 	void ChangeTimerInterval(int newInterval);
 	void RunTabletInputThread();
diff --git a/TabletDriverService/TabletSettings.h b/TabletDriverService/TabletSettings.h
index 928be37..4e8efee 100644
--- a/TabletDriverService/TabletSettings.h
+++ b/TabletDriverService/TabletSettings.h
@@ -27,6 +27,7 @@ class TabletSettings {
 	int maxX;
 	int maxY;
 	int maxPressure;
+	int maxHeight;
 	int clickPressure;
 	int keepTipDown;
 	double width;
diff --git a/TabletDriverService/TabletState.cpp b/TabletDriverService/TabletState.cpp
index a4257f3..a4d63c4 100644
--- a/TabletDriverService/TabletState.cpp
+++ b/TabletDriverService/TabletState.cpp
@@ -13,6 +13,7 @@ TabletState::TabletState() {
 	buttons = 0;
 	position.Set(0,0);
 	pressure = 0;
+	height = 0;
 
 	isValid = false;
 }
diff --git a/TabletDriverService/TabletState.h b/TabletDriverService/TabletState.h
index f730b67..37cf02e 100644
--- a/TabletDriverService/TabletState.h
+++ b/TabletDriverService/TabletState.h
@@ -10,12 +10,14 @@ class TabletState {
 	unsigned char inputButtons;
 	Vector2D inputPosition;
 	double inputPressure;
+	double inputHeight;
 	double inputVelocity;
 
 	unsigned char buttons;
 	unsigned char lastButtons;
 	Vector2D position;
 	double pressure;
+	double height;
 
 	bool isValid;
 
diff --git a/TabletDriverService/stdafx.h b/TabletDriverService/stdafx.h
index 4103d92..edb832b 100644
--- a/TabletDriverService/stdafx.h
+++ b/TabletDriverService/stdafx.h
@@ -23,10 +23,14 @@
 // IntelliSense "fix"...
 //#define memcpy memcpy
 
-#define SAFE_CLOSE_HANDLE(handle) if(handle != NULL && handle != INVALID_HANDLE_VALUE) { CloseHandle(handle); handle = NULL; }
+#define SAFE_CLOSE_HANDLE(handle) \
+	if((handle) != NULL && (handle) != (INVALID_HANDLE_VALUE)) { \
+		CloseHandle(handle); \
+		handle = NULL; \
+	};
 
 
-// Global variables...
+// Global variables
 extern VMulti *vmulti;
 extern CommandHandler *commandHandler;
 extern Tablet *tablet;
@@ -36,7 +40,9 @@ extern ScreenMapper *mapper;
 extern NamedPipeInput *pipeInput;
 extern NamedPipeServer *pipeOutput;
 extern NamedPipeState *pipeState;
+
+// Cleanup and exit
 extern void CleanupAndExit(int code);
-extern bool ProcessCommand(CommandLine *cmd);
 
-// TODO: reference additional headers your program requires here
+// Process command
+extern bool ProcessCommand(CommandLine *cmd);

From b6ae971623cb414a1c2ccf6c1146a895542d2df8 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Mon, 21 Jan 2019 18:13:20 +0200
Subject: [PATCH 81/83] Low latency audio, fixed logger block, precompiled
 headers, etc.

- Added `ForceLowLatencyAudio` command to force audio engine to lowest possible latency on Windows 10
- Fixed logger queue handling blocking threads
- Renamed precompiled headers file to precompiled.h
- Optimized button handling so that it doesn't have to parse strings every time a input action is processed.
- Stopped using standard namespace as a default namespace
- Added Dualshock 4 controller custom data example to tablet.cfg
---
 TabletDriverGUI/MainWindow.Areas.cs           |   9 +-
 TabletDriverService/BufferQueue.cpp           |   2 +-
 TabletDriverService/BufferQueue.h             |   8 +-
 TabletDriverService/Command.cpp               |   4 +-
 TabletDriverService/Command.h                 |   6 +-
 .../CommandHandler.Auxiliary.cpp              |   2 +-
 TabletDriverService/CommandHandler.Device.cpp |  25 +-
 .../CommandHandler.Filters.cpp                |  12 +-
 TabletDriverService/CommandHandler.Other.cpp  |  83 ++-
 TabletDriverService/CommandHandler.Tablet.cpp | 121 ++--
 TabletDriverService/CommandHandler.cpp        |  56 +-
 TabletDriverService/CommandHandler.h          |  32 +-
 TabletDriverService/CommandLine.cpp           |  56 +-
 TabletDriverService/CommandLine.h             |  27 +-
 TabletDriverService/DataFormatter.cpp         |  16 +-
 TabletDriverService/HIDDevice.cpp             |  26 +-
 TabletDriverService/HIDDevice.h               |  25 +-
 TabletDriverService/InputEmulator.cpp         | 612 ++++++++++++++----
 TabletDriverService/InputEmulator.h           |  69 +-
 TabletDriverService/Logger.cpp                |  50 +-
 TabletDriverService/Logger.h                  |  34 +-
 TabletDriverService/Main.cpp                  |  20 +-
 TabletDriverService/NamedPipeInput.cpp        |   6 +-
 TabletDriverService/NamedPipeInput.h          |   2 +-
 TabletDriverService/NamedPipeServer.cpp       |  18 +-
 TabletDriverService/NamedPipeServer.h         |  26 +-
 TabletDriverService/NamedPipeState.cpp        |   8 +-
 TabletDriverService/NamedPipeState.h          |   6 +-
 TabletDriverService/Output.cpp                |   2 +-
 TabletDriverService/OutputDummy.cpp           |   4 +-
 TabletDriverService/OutputDummy.h             |   2 +-
 TabletDriverService/OutputManager.cpp         |   2 +-
 .../OutputSendInputAbsolute.cpp               |   2 +-
 .../OutputSendInputRelative.cpp               |   2 +-
 TabletDriverService/OutputSettings.cpp        |   6 +-
 TabletDriverService/OutputSettings.h          |   4 +-
 TabletDriverService/OutputVMultiAbsolute.cpp  |   2 +-
 TabletDriverService/OutputVMultiDigitizer.cpp |   2 +-
 .../OutputVMultiDigitizerRelative.cpp         |   2 +-
 TabletDriverService/OutputVMultiRelative.cpp  |   2 +-
 TabletDriverService/PositionRingBuffer.cpp    |   2 +-
 TabletDriverService/RelativeMouseState.cpp    |   2 +-
 TabletDriverService/Runnable.cpp              |   2 +-
 TabletDriverService/Runnable.h                |   2 +-
 TabletDriverService/ScreenMapper.cpp          |   2 +-
 TabletDriverService/Tablet.cpp                |  15 +-
 TabletDriverService/Tablet.h                  | 122 ++--
 .../TabletDriverService.vcxproj               |   6 +-
 .../TabletDriverService.vcxproj.filters       |  12 +-
 TabletDriverService/TabletFilter.cpp          |   2 +-
 .../TabletFilterAdvancedSmoothing.cpp         |   6 +-
 .../TabletFilterAdvancedSmoothing.h           |   2 +-
 .../TabletFilterAntiSmoothing.cpp             |   4 +-
 .../TabletFilterAntiSmoothing.h               |   6 +-
 TabletDriverService/TabletFilterGravity.cpp   |   2 +-
 .../TabletFilterNoiseReduction.cpp            |   4 +-
 .../TabletFilterNoiseReduction.h              |   6 +-
 TabletDriverService/TabletFilterPeak.cpp      |   2 +-
 TabletDriverService/TabletFilterSmoothing.cpp |   6 +-
 TabletDriverService/TabletFilterSmoothing.h   |   2 +-
 TabletDriverService/TabletFilterTester.cpp    |  22 +-
 TabletDriverService/TabletFilterTester.h      |  12 +-
 TabletDriverService/TabletHandler.cpp         | 127 ++--
 TabletDriverService/TabletHandler.h           |  14 +-
 TabletDriverService/TabletMeasurement.cpp     |   2 +-
 TabletDriverService/TabletSettings.cpp        |  24 +-
 TabletDriverService/TabletSettings.h          |   8 +-
 TabletDriverService/TabletState.cpp           |   4 +-
 TabletDriverService/TabletState.h             |   2 +-
 TabletDriverService/USBDevice.cpp             |  22 +-
 TabletDriverService/USBDevice.h               |  20 +-
 TabletDriverService/VMulti.cpp                |   2 +-
 TabletDriverService/Vector2D.cpp              |   2 +-
 TabletDriverService/config/tablet.cfg         |  45 ++
 TabletDriverService/precompiled.cpp           |   1 +
 .../{stdafx.h => precompiled.h}               |  91 ++-
 TabletDriverService/stdafx.cpp                |   8 -
 77 files changed, 1281 insertions(+), 725 deletions(-)
 create mode 100644 TabletDriverService/precompiled.cpp
 rename TabletDriverService/{stdafx.h => precompiled.h} (80%)
 delete mode 100644 TabletDriverService/stdafx.cpp

diff --git a/TabletDriverGUI/MainWindow.Areas.cs b/TabletDriverGUI/MainWindow.Areas.cs
index 0b5b8d6..a660d7d 100644
--- a/TabletDriverGUI/MainWindow.Areas.cs
+++ b/TabletDriverGUI/MainWindow.Areas.cs
@@ -1106,8 +1106,13 @@ private void CanvasArea_MouseWheel(object sender, MouseWheelEventArgs e)
 
                 double oldWidth = mouseArea.Area.Width;
                 double oldHeight = mouseArea.Area.Height;
-                mouseArea.Area.Width = Math.Round(oldWidth + delta);
-                mouseArea.Area.Height = oldHeight / oldWidth * mouseArea.Area.Width;
+                double newWidth = Math.Round(oldWidth + delta);
+                double newHeight = oldHeight / oldWidth * newWidth;
+                if (delta > 0 || newWidth >= 10 || newHeight >= 10)
+                {
+                    mouseArea.Area.Width = newWidth;
+                    mouseArea.Area.Height = newHeight;
+                }
                 LoadSettingsFromConfiguration();
             }
 
diff --git a/TabletDriverService/BufferQueue.cpp b/TabletDriverService/BufferQueue.cpp
index cbb2a37..145cbdf 100644
--- a/TabletDriverService/BufferQueue.cpp
+++ b/TabletDriverService/BufferQueue.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "BufferQueue.h"
 
 
diff --git a/TabletDriverService/BufferQueue.h b/TabletDriverService/BufferQueue.h
index 5e9a546..9f69b7c 100644
--- a/TabletDriverService/BufferQueue.h
+++ b/TabletDriverService/BufferQueue.h
@@ -13,10 +13,10 @@ class BufferQueue {
 		~Item();
 	};
 
-	queue<Item*> queue;
-	mutex lockQueue;
-	mutex lockWait;
-	condition_variable conditionBuffer;
+	std::queue<Item*> queue;
+	std::mutex lockQueue;
+	std::mutex lockWait;
+	std::condition_variable conditionBuffer;
 	void Push(void *buffer, int length);
 	void Pop();
 	void Clear();
diff --git a/TabletDriverService/Command.cpp b/TabletDriverService/Command.cpp
index dc27941..d4c9cb2 100644
--- a/TabletDriverService/Command.cpp
+++ b/TabletDriverService/Command.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "Command.h"
 
 
@@ -14,7 +14,7 @@ Command::Command() {
 	callback = NULL;
 }
 
-Command::Command(string _name, function<bool(CommandLine*)> _callback) {
+Command::Command(std::string _name, std::function<bool(CommandLine*)> _callback) {
 	this->name = _name;
 	this->callback = _callback;
 }
diff --git a/TabletDriverService/Command.h b/TabletDriverService/Command.h
index 8a57f0a..4114014 100644
--- a/TabletDriverService/Command.h
+++ b/TabletDriverService/Command.h
@@ -7,12 +7,12 @@
 class Command {
 public:
 
-	string name;
-	function<bool(CommandLine*)> callback;
+	std::string name;
+	std::function<bool(CommandLine*)> callback;
 
 	bool Execute(CommandLine *cmd);
 
 	Command();
-	Command(string _name, function<bool(CommandLine*)> _callback);
+	Command(std::string _name, std::function<bool(CommandLine*)> _callback);
 	~Command();
 };
diff --git a/TabletDriverService/CommandHandler.Auxiliary.cpp b/TabletDriverService/CommandHandler.Auxiliary.cpp
index c5eb504..0528cb7 100644
--- a/TabletDriverService/CommandHandler.Auxiliary.cpp
+++ b/TabletDriverService/CommandHandler.Auxiliary.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "CommandHandler.h"
 
 #define LOG_MODULE ""
diff --git a/TabletDriverService/CommandHandler.Device.cpp b/TabletDriverService/CommandHandler.Device.cpp
index 641e71e..3547b99 100644
--- a/TabletDriverService/CommandHandler.Device.cpp
+++ b/TabletDriverService/CommandHandler.Device.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "CommandHandler.h"
 
 #define LOG_MODULE ""
@@ -18,7 +18,7 @@ void CommandHandler::CreateDeviceCommands() {
 
 		// 
 		if (cmd->valueCount >= 1) {
-			string guid = cmd->GetString(0, "");
+			std::string guid = cmd->GetString(0, "");
 			if (tablet == NULL) {
 				tablet = new Tablet(guid);
 				if (tablet->isOpen) {
@@ -73,7 +73,7 @@ void CommandHandler::CreateDeviceCommands() {
 			USHORT usage = cmd->GetInt(3, 0);
 			bool isExclusive = false;
 			for (int i = 4; i < cmd->valueCount; i += 2) {
-				string parameter = cmd->GetStringLower(i, "");
+				std::string parameter = cmd->GetStringLower(i, "");
 				if (parameter == "exclusive") {
 					isExclusive = cmd->GetBoolean(i + 1, false);
 				}
@@ -257,8 +257,8 @@ void CommandHandler::CreateDeviceCommands() {
 		if (cmd->valueCount <= 0) return false;
 		if (tablet == NULL) return false;
 
-		string stringName = cmd->GetStringLower(0, "");
-		string deviceString;
+		std::string stringName = cmd->GetStringLower(0, "");
+		std::string deviceString;
 
 		// Manufacturer
 		if (stringName.compare(0, 3, "man") == 0) {
@@ -307,10 +307,10 @@ void CommandHandler::CreateDeviceCommands() {
 		// Loop through string ids
 		for (int stringId = stringIdMin; stringId <= stringIdMax; stringId++) {
 			try {
-				string deviceString = tablet->GetDeviceString(stringId);
+				std::string deviceString = tablet->GetDeviceString(stringId);
 				LOG_INFO("  String (%d) = '%s'\n", stringId, deviceString.c_str());
 			}
-			catch (const exception &e) {
+			catch (const std::exception &e) {
 				LOG_ERROR("%s\n", e.what());
 				break;
 			}
@@ -341,10 +341,9 @@ void CommandHandler::CreateDeviceCommands() {
 		if (tablet == NULL) return false;
 
 		int stringId = cmd->GetInt(0, 0);
-		string stringName = cmd->GetStringLower(0, "");
-		string matchString = cmd->GetString(1, "");
-
-		string deviceString = "";
+		std::string stringName = cmd->GetStringLower(0, "");
+		std::string matchString = cmd->GetString(1, "");
+		std::string deviceString = "";
 
 		// Manufacturer
 		if (stringName.compare(0, 3, "man") == 0) {
@@ -366,7 +365,7 @@ void CommandHandler::CreateDeviceCommands() {
 
 		// Request device string 
 		else {
-			stringName = to_string(stringId);
+			stringName = std::to_string(stringId);
 			if (stringId == 0) {
 				LOG_ERROR("Invalid string id!\n");
 				return false;
@@ -374,7 +373,7 @@ void CommandHandler::CreateDeviceCommands() {
 			try {
 				deviceString = tablet->GetDeviceString(stringId);
 			}
-			catch (exception&e) {
+			catch (std::exception&e) {
 				LOG_ERROR("%s\n", e.what());
 			}
 		}
diff --git a/TabletDriverService/CommandHandler.Filters.cpp b/TabletDriverService/CommandHandler.Filters.cpp
index 1175a44..1cc755a 100644
--- a/TabletDriverService/CommandHandler.Filters.cpp
+++ b/TabletDriverService/CommandHandler.Filters.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "CommandHandler.h"
 
 #define LOG_MODULE ""
@@ -23,7 +23,7 @@ void CommandHandler::CreateFilterCommands() {
 		double latency = cmd->GetDouble(0, tablet->smoothing.GetLatency());
 		bool onlyWhenButtonsDown = cmd->GetBoolean(1, tablet->smoothing.onlyWhenButtonsDown);
 
-		string stringValue = cmd->GetStringLower(0, "");
+		std::string stringValue = cmd->GetStringLower(0, "");
 
 		// Off / False
 		if (stringValue == "off" || stringValue == "false") {
@@ -169,7 +169,7 @@ void CommandHandler::CreateFilterCommands() {
 		// Tablet valid?
 		if (!ExecuteCommand("TabletValid")) return false;
 
-		string stringValue = cmd->GetStringLower(0, "");
+		std::string stringValue = cmd->GetStringLower(0, "");
 
 		// Off / False
 		if (stringValue == "off" || stringValue == "false") {
@@ -247,7 +247,7 @@ void CommandHandler::CreateFilterCommands() {
 		// Tablet valid?
 		if (!ExecuteCommand("TabletValid")) return false;
 
-		string stringValue = cmd->GetStringLower(0, "");
+		std::string stringValue = cmd->GetStringLower(0, "");
 
 		// Off / False
 		if (stringValue == "off") {
@@ -374,8 +374,8 @@ void CommandHandler::CreateFilterCommands() {
 		// Tablet valid?
 		if (!ExecuteCommand("TabletValid")) return false;
 
-		string inputFilepath = cmd->GetString(0, "tester_input.txt");
-		string outputFilepath = cmd->GetString(1, "tester_output.txt");
+		std::string inputFilepath = cmd->GetString(0, "tester_input.txt");
+		std::string outputFilepath = cmd->GetString(1, "tester_output.txt");
 		TabletFilterAntiSmoothing *filterAntiSmoothing = NULL;
 		TabletFilterNoiseReduction *filterNoise = NULL;
 		TabletFilterTester *tester = NULL;
diff --git a/TabletDriverService/CommandHandler.Other.cpp b/TabletDriverService/CommandHandler.Other.cpp
index 6ce3564..0f94a6a 100644
--- a/TabletDriverService/CommandHandler.Other.cpp
+++ b/TabletDriverService/CommandHandler.Other.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "CommandHandler.h"
 
 #define LOG_MODULE ""
@@ -85,7 +85,7 @@ void CommandHandler::CreateOtherCommands() {
 	AddAlias("Mode", "OutputMode");
 	AddCommand(new Command("OutputMode", [&](CommandLine *cmd) {
 
-		string mode = cmd->GetStringLower(0, "");
+		std::string mode = cmd->GetStringLower(0, "");
 
 		// Absolute mouse
 		if (mode.compare(0, 3, "abs") == 0) {
@@ -339,6 +339,29 @@ void CommandHandler::CreateOtherCommands() {
 	}));
 
 
+	//
+	// Command: ForceLowLatencyAudio
+	//
+	// Forces low latency audio on Windows 10
+	//
+	AddCommand(new Command("ForceLowLatencyAudio", [&](CommandLine *cmd) {
+		if (!ExecuteCommand("TabletValid")) return false;
+
+		int result = tabletHandler->inputEmulator.ForceLowLatencyAudio();
+		if (result > 0) {
+			LOG_INFO("Low latency audio forced!\n");
+		}
+		else if (result == 0) {
+			LOG_INFO("Low latency audio is already forced!\n");
+		}
+		else {
+			LOG_ERROR("Low latency audio error! Maybe you are not running this on Windows 10?\n");
+		}
+
+		return true;
+	}));
+
+
 	//
 	// Command: Debug
 	//
@@ -359,7 +382,7 @@ void CommandHandler::CreateOtherCommands() {
 	// Start/stop logging messages to a log file
 	//
 	AddCommand(new Command("Log", [&](CommandLine *cmd) {
-		string logPath = cmd->GetString(0, "log.txt");
+		std::string logPath = cmd->GetString(0, "log.txt");
 		if (!cmd->GetBoolean(0, true)) {
 			logger.CloseLogFile();
 			LOG_INFO("Log file '%s' closed.\n", logger.logFilename.c_str());
@@ -469,7 +492,7 @@ void CommandHandler::CreateOtherCommands() {
 
 		// Pen buttons
 		for (int i = 0; i < tablet->settings.buttonCount; i++) {
-			stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "'%s' ", tablet->settings.buttonMap[i].c_str());
+			stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "'%s' ", tablet->settings.buttonMap[i].ToString().c_str());
 		}
 		LOG_INFO("  Pen button map = %s\n", stringBuffer);
 
@@ -477,7 +500,7 @@ void CommandHandler::CreateOtherCommands() {
 		if (tablet->settings.auxButtonCount > 0) {
 			stringIndex = 0;
 			for (int i = 0; i < tablet->settings.auxButtonCount; i++) {
-				stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "'%s' ", tablet->settings.auxButtonMap[i].c_str());
+				stringIndex += sprintf_s(stringBuffer + stringIndex, maxLength - stringIndex, "'%s' ", tablet->settings.auxButtonMap[i].ToString().c_str());
 			}
 			LOG_INFO("  Aux button map = %s\n", stringBuffer);
 		}
@@ -486,9 +509,9 @@ void CommandHandler::CreateOtherCommands() {
 
 		// Init strings
 		if (tablet->initStrings.size() > 0) {
-			string stringIds = "";
+			std::string stringIds = "";
 			for (int stringId : tablet->initStrings) {
-				stringIds += to_string(stringId) + " ";
+				stringIds += std::to_string(stringId) + " ";
 			}
 			LOG_INFO("  Init string ids: %s\n", stringIds.c_str());
 		}
@@ -620,7 +643,7 @@ void CommandHandler::CreateOtherCommands() {
 	// Reads commands from a file and stops if tablet is redefined.
 	//
 	AddCommand(new Command("Include", [&](CommandLine *cmd) {
-		string filename = cmd->GetString(0, "");
+		std::string filename = cmd->GetString(0, "");
 		if (filename == "") {
 			LOG_ERROR("Invalid filename '%s'!\n", filename.c_str());
 			return false;
@@ -646,13 +669,13 @@ void CommandHandler::CreateOtherCommands() {
 	AddCommand(new Command("ListCommands", [&](CommandLine *cmd) {
 
 		LOG_INFO("Commands: \n");
-		for (pair<string, Command*> cmdPair : commands) {
-			string commandName = cmdPair.second->name;
-			string lowerCaseName = commandName;
-			transform(lowerCaseName.begin(), lowerCaseName.end(), lowerCaseName.begin(), ::tolower);
+		for (std::pair<std::string, Command*> cmdPair : commands) {
+			std::string commandName = cmdPair.second->name;
+			std::string lowerCaseName = commandName;
+			std::transform(lowerCaseName.begin(), lowerCaseName.end(), lowerCaseName.begin(), ::tolower);
 
-			string aliasString = "";
-			for (pair<string, string> aliasPair : aliases) {
+			std::string aliasString = "";
+			for (std::pair<std::string, std::string> aliasPair : aliases) {
 				if (aliasPair.second == lowerCaseName) {
 					aliasString += ", " + aliasNames[aliasPair.first];
 				}
@@ -671,19 +694,19 @@ void CommandHandler::CreateOtherCommands() {
 	//
 	AddCommand(new Command("GetCommands", [&](CommandLine *cmd) {
 
-		string commandsString = "";
+		std::string commandsString = "";
 
 		LOG_STATUS("COMMANDS_CLEAR 1\n");
 
-		for (pair<string, Command*> cmdPair : commands) {
-			string commandName = cmdPair.second->name;
-			string lowerCaseName = commandName;
-			transform(lowerCaseName.begin(), lowerCaseName.end(), lowerCaseName.begin(), ::tolower);
+		for (std::pair<std::string, Command*> cmdPair : commands) {
+			std::string commandName = cmdPair.second->name;
+			std::string lowerCaseName = commandName;
+			std::transform(lowerCaseName.begin(), lowerCaseName.end(), lowerCaseName.begin(), ::tolower);
 
 			commandsString += commandName + " ";
 
-			string aliasString = "";
-			for (pair<string, string> aliasPair : aliases) {
+			std::string aliasString = "";
+			for (std::pair<std::string, std::string> aliasPair : aliases) {
 				if (aliasPair.second == lowerCaseName) {
 					commandsString += aliasNames[aliasPair.first] + " ";
 				}
@@ -702,16 +725,16 @@ void CommandHandler::CreateOtherCommands() {
 	}));
 
 	//
-	// Command: ListKeys
+	// Command: ListInputs
 	//
-	// List all keys
+	// List all input actions
 	//
-	AddCommand(new Command("ListKeys", [&](CommandLine *cmd) {
+	AddCommand(new Command("ListInputs", [&](CommandLine *cmd) {
 
-		LOG_INFO("Keys:\n");
-		for (string key : tabletHandler->inputEmulator.keys) {
-			if (tabletHandler->inputEmulator.keyMap.count(key) > 0) {
-				string name = tabletHandler->inputEmulator.keyMap[key]->name;
+		LOG_INFO("Input actions:\n");
+		for (std::string key : tabletHandler->inputEmulator.inputs) {
+			if (tabletHandler->inputEmulator.inputMap.count(key) > 0) {
+				std::string name = tabletHandler->inputEmulator.inputMap[key]->description;
 				LOG_INFO("  % -20s %s\n", key.c_str(), name.c_str());
 			}
 		}
@@ -727,12 +750,12 @@ void CommandHandler::CreateOtherCommands() {
 	//
 	AddHelp("Help", "...");
 	AddCommand(new Command("Help", [&](CommandLine *cmd) {
-		string commandName = cmd->GetStringLower(0, "");
+		std::string commandName = cmd->GetStringLower(0, "");
 		if (aliases.count(commandName) > 0) {
 			commandName = aliases[commandName];
 		}
 		if (help.count(commandName)) {
-			string helpText = help[commandName];
+			std::string helpText = help[commandName];
 			LOG_INFO("Help:\n\n%s\n", helpText.c_str());
 		}
 		else {
diff --git a/TabletDriverService/CommandHandler.Tablet.cpp b/TabletDriverService/CommandHandler.Tablet.cpp
index 9032f9d..9b9f7cd 100644
--- a/TabletDriverService/CommandHandler.Tablet.cpp
+++ b/TabletDriverService/CommandHandler.Tablet.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "CommandHandler.h"
 
 #define LOG_MODULE ""
@@ -272,7 +272,7 @@ void CommandHandler::CreateTabletCommands() {
 	AddAlias("TabletFormat", "TabletDataFormat");
 	AddCommand(new Command("TabletDataFormat", [&](CommandLine *cmd) {
 		if (tablet == NULL) return false;
-		string format = cmd->GetStringLower(0, "");
+		std::string format = cmd->GetStringLower(0, "");
 
 		// Wacom Intuos Format V2 (Wacom CTL-490)
 		if (format == "wacomintuosv2") {
@@ -322,14 +322,14 @@ void CommandHandler::CreateTabletCommands() {
 	AddCommand(new Command("CustomDataInstruction", [&](CommandLine *cmd) {
 		if (tablet == NULL) return false;
 
-		string commandName = cmd->GetCommandLowerCase();
+		std::string commandName = cmd->GetCommandLowerCase();
 
 		if (cmd->valueCount >= 3) {
 
 			DataFormatter::DataInstruction instruction;
 
 			int targetByte = cmd->GetInt(0, 0);
-			string targetByteName = cmd->GetStringLower(0, "");
+			std::string targetByteName = cmd->GetStringLower(0, "");
 			/*
 			int targetBitMask = cmd->GetInt(1, 0xFF);
 			int sourceByte = cmd->GetInt(2, 0);
@@ -337,38 +337,18 @@ void CommandHandler::CreateTabletCommands() {
 			int sourceBitShift = cmd->GetInt(4, 0);
 			*/
 
-
 			// Auxiliary byte names
 			if (commandName.compare(0, 3, "aux") == 0) {
-				if (targetByteName == "reportid") targetByte = 0;
-				if (targetByteName == "buttonslow") targetByte = 1;
-				if (targetByteName == "buttonshigh") targetByte = 2;
-				if (targetByteName == "detect") targetByte = 3;
-				if (targetByteName == "ispressed") targetByte = 4;
-
+				if (tablet->auxReportByteNames.count(targetByteName) > 0) {
+					targetByte = tablet->auxReportByteNames.at(targetByteName);
+				}
 			}
 
 			// Tablet byte names
 			else {
-				if (targetByteName == "reportid") targetByte = 0;
-				if (targetByteName == "buttons") targetByte = 1;
-				if (targetByteName == "xlow") targetByte = 2;
-				if (targetByteName == "xhigh") targetByte = 3;
-				if (targetByteName == "xbyte1") targetByte = 2;
-				if (targetByteName == "xbyte2") targetByte = 3;
-				if (targetByteName == "xbyte3") targetByte = 4;
-				if (targetByteName == "xbyte4") targetByte = 5;
-				if (targetByteName == "ylow") targetByte = 6;
-				if (targetByteName == "yhigh") targetByte = 7;
-				if (targetByteName == "ybyte1") targetByte = 6;
-				if (targetByteName == "ybyte2") targetByte = 7;
-				if (targetByteName == "ybyte3") targetByte = 8;
-				if (targetByteName == "ybyte4") targetByte = 9;
-				if (targetByteName == "pressurelow") targetByte = 10;
-				if (targetByteName == "pressurehigh") targetByte = 11;
-				if (targetByteName == "heightlow") targetByte = 12;
-				if (targetByteName == "heighthigh") targetByte = 13;
-
+				if (tablet->reportByteNames.count(targetByteName) > 0) {
+					targetByte = tablet->reportByteNames.at(targetByteName);
+				}
 			}
 
 
@@ -377,9 +357,9 @@ void CommandHandler::CreateTabletCommands() {
 
 			// Loop through parameters
 			for (int i = 1; i < cmd->valueCount; i += 2) {
-				string parameter = cmd->GetStringLower(i, "");
+				std::string parameter = cmd->GetStringLower(i, "");
 				int value = cmd->GetInt(i + 1, -1);
-				string stringValue = cmd->GetStringLower(i + 1, "");
+				std::string stringValue = cmd->GetStringLower(i + 1, "");
 
 				// Set instruction parameters
 				if (parameter == "targetmask" || parameter == "mask") instruction.targetBitMask = value;
@@ -494,9 +474,9 @@ void CommandHandler::CreateTabletCommands() {
 				tablet->initStrings.push_back(stringId);
 			}
 		}
-		string stringIdsString = "";
+		std::string stringIdsString = "";
 		for (int stringId : tablet->initStrings) {
-			stringIdsString += to_string(stringId) + " ";
+			stringIdsString += std::to_string(stringId) + " ";
 		}
 		LOG_INFO("Tablet initialization string ids = %s\n", stringIdsString.c_str());
 
@@ -547,8 +527,12 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddCommand(new Command("ClearButtonMap", [&](CommandLine *cmd) {
 		if (!ExecuteCommand("TabletValid")) return false;
-		for (string &str : tablet->settings.buttonMap) {
-			str = "";
+
+		// Set input emulator
+		tablet->settings.SetInputEmulator(&tabletHandler->inputEmulator);
+
+		for (InputEmulator::InputActionCollection &collection : tablet->settings.buttonMap) {
+			collection.Clear();
 		}
 		LOG_INFO("Pen button map cleared!\n");
 		return true;
@@ -560,8 +544,12 @@ void CommandHandler::CreateTabletCommands() {
 	//
 	AddCommand(new Command("ClearAuxButtonMap", [&](CommandLine *cmd) {
 		if (!ExecuteCommand("TabletValid")) return false;
-		for (int i = 0; i < 16; i++) {
-			tablet->settings.auxButtonMap[i] = "";
+
+		// Set input emulator
+		tablet->settings.SetInputEmulator(&tabletHandler->inputEmulator);
+
+		for (InputEmulator::InputActionCollection &collection : tablet->settings.auxButtonMap) {
+			collection.Clear();
 		}
 		LOG_INFO("Aux button map cleared!\n");
 		return true;
@@ -579,41 +567,50 @@ void CommandHandler::CreateTabletCommands() {
 	AddCommand(new Command("ButtonMap", [&](CommandLine *cmd) {
 		if (!ExecuteCommand("TabletValid")) return false;
 
-		string commandName = cmd->GetCommandLowerCase();
+		std::string commandName = cmd->GetCommandLowerCase();
 		int button = cmd->GetInt(0, 0);
-		string keys = "";
-		if (cmd->valueCount == 2) {
-			keys = cmd->GetString(1, "");
-			transform(keys.begin(), keys.end(), keys.begin(), ::toupper);
-		}
-		else {
-			for (int i = 1; i < cmd->valueCount; i++) {
-				string key = cmd->GetString(i, "");
-				key.erase(remove(key.begin(), key.end(), '+'), key.end());
-				if (key.size() > 0) {
-					std::transform(key.begin(), key.end(), key.begin(), ::toupper);
-					if (i != 1) keys += "+";
-					keys += key;
-				}
-			}
-		}
 
-		if (button >= 1) {
+		// Value count and button valid?
+		if (cmd->valueCount >= 2 && button >= 1) {
+
+			InputEmulator::InputActionCollection *collection;
+
+			// Set input emulator
+			tablet->settings.SetInputEmulator(&tabletHandler->inputEmulator);
+
+			// Aux buttons
 			if (commandName.compare(0, 3, "aux") == 0) {
 				if (button <= tablet->settings.auxButtonCount) {
-					tablet->settings.auxButtonMap[button - 1] = keys;
-					LOG_INFO("Aux button %d mapped to '%s'\n", button, keys.c_str());
+					collection = &tablet->settings.auxButtonMap[button - 1];
+					collection->Clear();
+					for (int i = 1; i < cmd->valueCount; i++) {
+						collection->Add(cmd->GetString(i, ""));
+					}
+					LOG_INFO("Aux button %d mapped to '%s'\n", button, collection->ToString().c_str());
+				}
+				else {
+					LOG_INFO("There are only %d auxiliary buttons!\n", tablet->settings.auxButtonCount);
 				}
 			}
+
+			// Pen buttons
 			else {
 				if (button <= tablet->settings.buttonCount) {
-					tablet->settings.buttonMap[button - 1] = keys;
-					LOG_INFO("Pen button %d mapped to '%s'\n", button, keys.c_str());
+					collection = &tablet->settings.buttonMap[button - 1];
+					collection->Clear();
+					for (int i = 1; i < cmd->valueCount; i++) {
+						collection->Add(cmd->GetString(i, ""));
+					}
+					LOG_INFO("Pen button %d mapped to '%s'\n", button, collection->ToString().c_str());
 				}
+				else {
+					LOG_INFO("There are only %d buttons!\n", tablet->settings.buttonCount);
+				}
+
 			}
 		}
 		else {
-			LOG_INFO("Usage: %s <button> <key>\n", cmd->command.c_str());
+			LOG_INFO("Usage: %s <button> <action> [<action2> ...]\n", cmd->command.c_str());
 		}
 
 		return true;
@@ -629,7 +626,7 @@ void CommandHandler::CreateTabletCommands() {
 	AddCommand(new Command("TabletMove", [&](CommandLine *cmd) {
 		if (cmd->valueCount <= 0) return false;
 		if (!ExecuteCommand("TabletValid")) return false;
-		string border;
+		std::string border;
 		double offset;
 		bool moved = true;
 
diff --git a/TabletDriverService/CommandHandler.cpp b/TabletDriverService/CommandHandler.cpp
index a64a67c..1ab287e 100644
--- a/TabletDriverService/CommandHandler.cpp
+++ b/TabletDriverService/CommandHandler.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "CommandHandler.h"
 
 #define LOG_MODULE ""
@@ -28,10 +28,10 @@ CommandHandler::~CommandHandler() {
 // Add command
 //
 bool CommandHandler::AddCommand(Command *command) {
-	string name = command->name;
-	transform(name.begin(), name.end(), name.begin(), ::tolower);
+	std::string name = command->name;
+	std::transform(name.begin(), name.end(), name.begin(), ::tolower);
 	if (commands.count(name) <= 0) {
-		commands.insert(pair<string, Command*>(name, command));
+		commands.insert(std::pair<std::string, Command*>(name, command));
 		return true;
 	}
 	return false;
@@ -40,15 +40,15 @@ bool CommandHandler::AddCommand(Command *command) {
 //
 // Add command alias
 //
-bool CommandHandler::AddAlias(string alias, string commandName) {
+bool CommandHandler::AddAlias(std::string alias, std::string commandName) {
 
-	string aliasLowerCase = alias;
-	transform(aliasLowerCase.begin(), aliasLowerCase.end(), aliasLowerCase.begin(), ::tolower);
-	transform(commandName.begin(), commandName.end(), commandName.begin(), ::tolower);
+	std::string aliasLowerCase = alias;
+	std::transform(aliasLowerCase.begin(), aliasLowerCase.end(), aliasLowerCase.begin(), ::tolower);
+	std::transform(commandName.begin(), commandName.end(), commandName.begin(), ::tolower);
 
 	if (aliases.count(aliasLowerCase) <= 0) {
-		aliases.insert(pair<string, string>(aliasLowerCase, commandName));
-		aliasNames.insert(pair<string, string>(aliasLowerCase, alias));
+		aliases.insert(std::pair<std::string, std::string>(aliasLowerCase, commandName));
+		aliasNames.insert(std::pair<std::string, std::string>(aliasLowerCase, alias));
 		return true;
 	}
 
@@ -58,11 +58,11 @@ bool CommandHandler::AddAlias(string alias, string commandName) {
 //
 // Add command help text
 //
-bool CommandHandler::AddHelp(string commandName, string line) {
-	transform(commandName.begin(), commandName.end(), commandName.begin(), ::tolower);
+bool CommandHandler::AddHelp(std::string commandName, std::string line) {
+	std::transform(commandName.begin(), commandName.end(), commandName.begin(), ::tolower);
 	line.append("\n");
 	if (help.count(commandName) < 0) {
-		help.insert(pair<string, string>(commandName, line));
+		help.insert(std::pair<std::string, std::string>(commandName, line));
 	}
 	else {
 		help[commandName].append(line);
@@ -86,8 +86,8 @@ void CommandHandler::CreateCommands() {
 //
 // Is valid command?
 //
-bool CommandHandler::IsValidCommand(string command) {
-	transform(command.begin(), command.end(), command.begin(), ::tolower);
+bool CommandHandler::IsValidCommand(std::string command) {
+	std::transform(command.begin(), command.end(), command.begin(), ::tolower);
 	if (aliases.count(command) > 0) {
 		command = aliases[command];
 	}
@@ -100,10 +100,10 @@ bool CommandHandler::IsValidCommand(string command) {
 //
 // Execute a command using command name
 //
-bool CommandHandler::ExecuteCommand(string command) {
+bool CommandHandler::ExecuteCommand(std::string command) {
 	return ExecuteCommand(command, NULL);
 }
-bool CommandHandler::ExecuteCommandLock(string command) {
+bool CommandHandler::ExecuteCommandLock(std::string command) {
 	std::unique_lock<std::mutex> mlock(lock);
 	return ExecuteCommand(command);
 }
@@ -124,13 +124,13 @@ bool CommandHandler::ExecuteCommandLock(CommandLine *cmd) {
 //
 // Execute a command using command and parameter string
 //
-bool CommandHandler::ExecuteCommand(string command, string parameters) {
+bool CommandHandler::ExecuteCommand(std::string command, std::string parameters) {
 	CommandLine *cmd = new CommandLine(command + " " + parameters);
 	bool result = ExecuteCommand(command, cmd);
 	delete cmd;
 	return result;
 }
-bool CommandHandler::ExecuteCommandLock(string command, string parameters) {
+bool CommandHandler::ExecuteCommandLock(std::string command, std::string parameters) {
 	std::unique_lock<std::mutex> mlock(lock);
 	return ExecuteCommand(command, parameters);
 }
@@ -139,8 +139,8 @@ bool CommandHandler::ExecuteCommandLock(string command, string parameters) {
 //
 // Execute a command
 //
-bool CommandHandler::ExecuteCommand(string command, CommandLine * cmd) {
-	transform(command.begin(), command.end(), command.begin(), ::tolower);
+bool CommandHandler::ExecuteCommand(std::string command, CommandLine * cmd) {
+	std::transform(command.begin(), command.end(), command.begin(), ::tolower);
 	if (aliases.count(command) > 0) {
 		command = aliases[command];
 	}
@@ -149,7 +149,7 @@ bool CommandHandler::ExecuteCommand(string command, CommandLine * cmd) {
 	}
 	return false;
 }
-bool CommandHandler::ExecuteCommandLock(string command, CommandLine * cmd) {
+bool CommandHandler::ExecuteCommandLock(std::string command, CommandLine * cmd) {
 	std::unique_lock<std::mutex> mlock(lock);
 	return ExecuteCommand(command, cmd);
 }
@@ -158,11 +158,11 @@ bool CommandHandler::ExecuteCommandLock(string command, CommandLine * cmd) {
 //
 // Execute commands from a file
 //
-bool CommandHandler::ExecuteFile(string filename) {
+bool CommandHandler::ExecuteFile(std::string filename) {
 
 	CommandLine *cmd;
-	ifstream file;
-	string line = "";
+	std::ifstream file;
+	std::string line = "";
 
 	// Open file
 	file.open(filename);
@@ -200,8 +200,8 @@ bool CommandHandler::ExecuteFile(string filename) {
 		}
 		LOG_INFO(">> %s\n", cmd->line.c_str());
 
-		string command = cmd->command;
-		transform(command.begin(), command.end(), command.begin(), ::tolower);
+		std::string command = cmd->command;
+		std::transform(command.begin(), command.end(), command.begin(), ::tolower);
 		if (aliases.count(command) > 0) {
 			command = aliases[command];
 		}
@@ -219,7 +219,7 @@ bool CommandHandler::ExecuteFile(string filename) {
 	return true;
 }
 
-bool CommandHandler::ExecuteFileLock(string filename)
+bool CommandHandler::ExecuteFileLock(std::string filename)
 {
 	std::unique_lock<std::mutex> mlock(lock);
 	return ExecuteFile(filename);
diff --git a/TabletDriverService/CommandHandler.h b/TabletDriverService/CommandHandler.h
index 87599d8..c0820aa 100644
--- a/TabletDriverService/CommandHandler.h
+++ b/TabletDriverService/CommandHandler.h
@@ -9,19 +9,19 @@
 
 class CommandHandler {
 public:
-	map<string, Command*> commands;
-	map<string, string> aliases;
-	map<string, string> aliasNames;
-	map<string, string> help;
+	std::map<std::string, Command*> commands;
+	std::map<std::string, std::string> aliases;
+	std::map<std::string, std::string> aliasNames;
+	std::map<std::string, std::string> help;
 
-	mutex lock;
+	std::mutex lock;
 
 	CommandHandler();
 	~CommandHandler();
 
 	bool AddCommand(Command *command);
-	bool AddAlias(string commandName, string alias);
-	bool AddHelp(string commandName, string line);
+	bool AddAlias(std::string commandName, std::string alias);
+	bool AddHelp(std::string commandName, std::string line);
 	void CreateCommands();
 	void CreateTabletCommands();
 	void CreateFilterCommands();
@@ -29,18 +29,18 @@ class CommandHandler {
 	void CreateAuxCommands();
 	void CreateOtherCommands();
 
-	bool IsValidCommand(string command);
-	bool ExecuteCommand(string command);
-	bool ExecuteCommandLock(string command);
+	bool IsValidCommand(std::string command);
+	bool ExecuteCommand(std::string command);
+	bool ExecuteCommandLock(std::string command);
 	bool ExecuteCommand(CommandLine *cmd);
 	bool ExecuteCommandLock(CommandLine * cmd);
-	bool ExecuteCommand(string command, string parameters);
-	bool ExecuteCommandLock(string command, string parameters);
-	bool ExecuteCommand(string command, CommandLine *cmd);
-	bool ExecuteCommandLock(string command, CommandLine * cmd);
+	bool ExecuteCommand(std::string command, std::string parameters);
+	bool ExecuteCommandLock(std::string command, std::string parameters);
+	bool ExecuteCommand(std::string command, CommandLine *cmd);
+	bool ExecuteCommandLock(std::string command, CommandLine * cmd);
 
-	bool ExecuteFile(string filename);
-	bool ExecuteFileLock(string filename);
+	bool ExecuteFile(std::string filename);
+	bool ExecuteFileLock(std::string filename);
 
 };
 
diff --git a/TabletDriverService/CommandLine.cpp b/TabletDriverService/CommandLine.cpp
index 502fc41..8b05c00 100644
--- a/TabletDriverService/CommandLine.cpp
+++ b/TabletDriverService/CommandLine.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "CommandLine.h"
 
 #define LOG_MODULE "CommandLine"
@@ -7,7 +7,7 @@
 //
 // Constructor
 //
-CommandLine::CommandLine(string text) {
+CommandLine::CommandLine(std::string text) {
 	this->line = text;
 	this->Parse(text);
 }
@@ -21,11 +21,11 @@ CommandLine::~CommandLine() {
 //
 // Command matcher
 //
-bool CommandLine::is(string command) {
+bool CommandLine::is(std::string command) {
 
-	string match = this->command;
-	transform(command.begin(), command.end(), command.begin(), ::tolower);
-	transform(match.begin(), match.end(), match.begin(), ::tolower);
+	std::string match = this->command;
+	std::transform(command.begin(), command.end(), command.begin(), ::tolower);
+	std::transform(match.begin(), match.end(), match.begin(), ::tolower);
 
 	if (command.compare(match) == 0) {
 		return true;
@@ -36,15 +36,15 @@ bool CommandLine::is(string command) {
 //
 // Get command in lower case
 //
-string CommandLine::GetCommandLowerCase() {
-	transform(command.begin(), command.end(), command.begin(), ::tolower);
+std::string CommandLine::GetCommandLowerCase() {
+	std::transform(command.begin(), command.end(), command.begin(), ::tolower);
 	return command;
 }
 
 //
 // Get command parameters as as string
 //
-string CommandLine::GetParameterString() {
+std::string CommandLine::GetParameterString() {
 	if (command.size() < line.size())
 		return line.substr(command.size() + 1);
 	return "";
@@ -54,10 +54,10 @@ string CommandLine::GetParameterString() {
 //
 // Parse
 //
-int CommandLine::Parse(string line) {
+int CommandLine::Parse(std::string line) {
 
-	string item = "";
-	vector<string> items;
+	std::string item = "";
+	std::vector<std::string> items;
 
 	int lineLength = line.size();
 	int itemLength = 0;
@@ -204,13 +204,13 @@ int CommandLine::Parse(string line) {
 //
 // Parse hex string
 //
-string CommandLine::ParseHex(string str) {
+std::string CommandLine::ParseHex(std::string str) {
 	if (str.size() >= 3 && str[0] == '0' && str[1] == 'x') {
 		try {
-			string tmp = str.substr(2, str.size() - 2);
-			return to_string(stol(tmp, 0, 16));
+			std::string tmp = str.substr(2, str.size() - 2);
+			return std::to_string(stol(tmp, 0, 16));
 		}
-		catch (exception) {
+		catch (std::exception) {
 		}
 	}
 	return str;
@@ -219,7 +219,7 @@ string CommandLine::ParseHex(string str) {
 //
 // Parse bit string (e.g. 0b10100101)
 //
-string CommandLine::ParseBits(string str) {
+std::string CommandLine::ParseBits(std::string str) {
 	if (str.size() >= 3 && str[0] == '0' && str[1] == 'b') {
 		int length = str.size();
 		unsigned int output = 0;
@@ -230,9 +230,9 @@ string CommandLine::ParseBits(string str) {
 					output |= 1 << (length - (i + 1));
 				}
 			}
-			return to_string(output);
+			return std::to_string(output);
 		}
-		catch (exception) {
+		catch (std::exception) {
 		}
 	}
 	return str;
@@ -241,7 +241,7 @@ string CommandLine::ParseBits(string str) {
 //
 // Parse hex and bits strings
 //
-string CommandLine::ParseHexBits(string str)
+std::string CommandLine::ParseHexBits(std::string str)
 {
 	return ParseBits(ParseHex(str));
 }
@@ -250,7 +250,7 @@ string CommandLine::ParseHexBits(string str)
 //
 // Get string value
 //
-string CommandLine::GetString(int index, string defaultValue) {
+std::string CommandLine::GetString(int index, std::string defaultValue) {
 	if (index < valueCount) {
 		return values[index];
 	}
@@ -261,8 +261,8 @@ string CommandLine::GetString(int index, string defaultValue) {
 //
 // Get lowercase string value
 //
-string CommandLine::GetStringLower(int index, string defaultValue) {
-	string str = GetString(index, defaultValue);
+std::string CommandLine::GetStringLower(int index, std::string defaultValue) {
+	std::string str = GetString(index, defaultValue);
 	transform(str.begin(), str.end(), str.begin(), ::tolower);
 	return str;
 }
@@ -277,7 +277,7 @@ int CommandLine::GetInt(int index, int defaultValue) {
 			auto value = stoi(ParseHexBits(values[index]));
 			return value;
 		}
-		catch (exception) {}
+		catch (std::exception) {}
 	}
 	return defaultValue;
 }
@@ -292,7 +292,7 @@ long CommandLine::GetLong(int index, long defaultValue) {
 			auto value = stol(ParseHexBits(values[index]));
 			return value;
 		}
-		catch (exception) {}
+		catch (std::exception) {}
 	}
 	return defaultValue;
 }
@@ -307,7 +307,7 @@ double CommandLine::GetDouble(int index, double defaultValue) {
 			auto value = stod(ParseHexBits(values[index]));
 			return value;
 		}
-		catch (exception) {}
+		catch (std::exception) {}
 	}
 	return defaultValue;
 }
@@ -322,7 +322,7 @@ float CommandLine::GetFloat(int index, float defaultValue) {
 			auto value = stof(ParseHexBits(values[index]));
 			return value;
 		}
-		catch (exception) {}
+		catch (std::exception) {}
 	}
 	return defaultValue;
 }
@@ -333,7 +333,7 @@ float CommandLine::GetFloat(int index, float defaultValue) {
 //
 bool CommandLine::GetBoolean(int index, bool defaultValue) {
 	if (GetInt(index, 0) > 0) return true;
-	string str = GetStringLower(index, "");
+	std::string str = GetStringLower(index, "");
 	if (str == "true") return true;
 	if (str == "on") return true;
 	if (str == "false") return false;
diff --git a/TabletDriverService/CommandLine.h b/TabletDriverService/CommandLine.h
index 3d43010..f46268a 100644
--- a/TabletDriverService/CommandLine.h
+++ b/TabletDriverService/CommandLine.h
@@ -7,27 +7,26 @@
 #include <stdlib.h>
 #include <algorithm>
 
-using namespace std;
 
 class CommandLine {
 public:
-	string line;
-	string command;
-	vector<string> values;
+	std::string line;
+	std::string command;
+	std::vector<std::string> values;
 	int valueCount;
 	bool isValid;
 
-	CommandLine(string text);
+	CommandLine(std::string text);
 	~CommandLine();
-	bool is(string command);
-	string GetCommandLowerCase();
-	string GetParameterString();
-	int Parse(string text);
-	string ParseHex(string str);
-	string ParseBits(string str);
-	string ParseHexBits(string str);
-	string GetString(int index, string defaultValue);
-	string GetStringLower(int index, string defaultValue);
+	bool is(std::string command);
+	std::string GetCommandLowerCase();
+	std::string GetParameterString();
+	int Parse(std::string text);
+	std::string ParseHex(std::string str);
+	std::string ParseBits(std::string str);
+	std::string ParseHexBits(std::string str);
+	std::string GetString(int index, std::string defaultValue);
+	std::string GetStringLower(int index, std::string defaultValue);
 	int GetInt(int index, int defaultValue);
 	long GetLong(int index, long defaultValue);
 	double GetDouble(int index, double defaultValue);
diff --git a/TabletDriverService/DataFormatter.cpp b/TabletDriverService/DataFormatter.cpp
index e8fffd0..dbc6aab 100644
--- a/TabletDriverService/DataFormatter.cpp
+++ b/TabletDriverService/DataFormatter.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "DataFormatter.h"
 
 //#define LOG_MODULE "DataFormatter"
@@ -35,7 +35,12 @@ bool DataFormatter::Format(void * targetBuffer, void * sourceBuffer)
 		byte &= instruction->sourceBitMask;
 
 		// Shift
-		byte <<= instruction->sourceBitShift;
+		if (instruction->sourceBitShift < 0) {
+			byte >>= -instruction->sourceBitShift;
+		}
+		else {
+			byte <<= instruction->sourceBitShift;
+		}
 
 		// Target bit mask
 		byte &= instruction->targetBitMask;
@@ -48,15 +53,18 @@ bool DataFormatter::Format(void * targetBuffer, void * sourceBuffer)
 		default: break;
 		}
 
+		
 		/*
-		LOG_DEBUG("  INSTR T=%d TM=0x%02X S=%d SM=0x%02X SS=%d\n",
+		LOG_DEBUG("  INSTR T=%d TM=0x%02X S=%d SM=0x%02X SS=%d R=%d\n",
 			instruction->targetByte,
 			instruction->targetBitMask,
 			instruction->sourceByte,
 			instruction->sourceBitMask,
-			instruction->sourceBitShift
+			instruction->sourceBitShift,
+			byte
 		);
 		*/
+		
 	}
 
 	return true;
diff --git a/TabletDriverService/HIDDevice.cpp b/TabletDriverService/HIDDevice.cpp
index 7acc554..9f7f51c 100644
--- a/TabletDriverService/HIDDevice.cpp
+++ b/TabletDriverService/HIDDevice.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "HIDDevice.h"
 
 #define LOG_MODULE "HIDDevice"
@@ -33,7 +33,7 @@ HIDDevice::~HIDDevice() {
 }
 
 
-bool GetHIDStrings(HANDLE deviceHandle, string *manufacturerName, string *productName, string *serialNumber) {
+bool GetHIDStrings(HANDLE deviceHandle, std::string *manufacturerName, std::string *productName, std::string *serialNumber) {
 	BYTE buffer[1024];
 	int i;
 
@@ -82,9 +82,9 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 	PHIDP_PREPARSED_DATA hidPreparsedData;
 	HIDD_ATTRIBUTES hidAttributes;
 	HIDP_CAPS hidCapabilities;
-	string manufacturerName;
-	string productName;
-	string serialNumber;
+	std::string manufacturerName;
+	std::string productName;
+	std::string serialNumber;
 
 	HANDLE deviceHandle;
 	HANDLE resultHandle = 0;
@@ -199,7 +199,7 @@ bool HIDDevice::OpenDevice(HANDLE *handle, USHORT vendorId, USHORT productId, US
 					SetCommTimeouts(deviceHandle, &commTimeOuts);
 
 					_devicePathW = deviceInterfaceDetailData->DevicePath;
-					string str(_devicePathW.begin(), _devicePathW.end());
+					std::string str(_devicePathW.begin(), _devicePathW.end());
 					_devicePath = str;
 
 					resultHandle = deviceHandle;
@@ -288,14 +288,14 @@ int HIDDevice::StringRequest(UCHAR stringId, UCHAR * buffer, int length)
 	return 0;
 }
 
-string HIDDevice::GetString(UCHAR stringId)
+std::string HIDDevice::GetString(UCHAR stringId)
 {
-	string resultString = "";
+	std::string resultString = "";
 	UCHAR buffer[256];
 	int bytesRead = 0;
 
 	if (isReading) {
-		throw runtime_error("HID string request can't be sent when the device is in use!");
+		throw std::runtime_error("HID string request can't be sent when the device is in use!");
 	}
 	else {
 		bytesRead = StringRequest(stringId, buffer, 256);
@@ -312,19 +312,19 @@ string HIDDevice::GetString(UCHAR stringId)
 }
 
 // Get HID manufacturer name
-string HIDDevice::GetManufacturerName()
+std::string HIDDevice::GetManufacturerName()
 {
 	return _manufacturerName;
 }
 
 // Get HID product name
-string HIDDevice::GetProductName()
+std::string HIDDevice::GetProductName()
 {
 	return _productName;
 }
 
 // Get HID serial number
-string HIDDevice::GetSerialNumber()
+std::string HIDDevice::GetSerialNumber()
 {
 	return _serialNumber;
 }
@@ -356,7 +356,7 @@ void HIDDevice::CloseDevice() {
 			SAFE_CLOSE_HANDLE(_deviceHandle);
 
 		}
-		catch (exception) {
+		catch (std::exception) {
 			SAFE_CLOSE_HANDLE(_deviceHandle);
 		}
 	}
diff --git a/TabletDriverService/HIDDevice.h b/TabletDriverService/HIDDevice.h
index f005365..053fe10 100644
--- a/TabletDriverService/HIDDevice.h
+++ b/TabletDriverService/HIDDevice.h
@@ -1,26 +1,25 @@
 #pragma once
 
-#include <windows.h>
+#include <iostream>
 #include <stdio.h>
 #include <tchar.h>
 #include <strsafe.h>
 #include <math.h>
+
+#include <Windows.h>
 #include <SetupAPI.h>
 #include <hidsdi.h>
 #include <psapi.h>
-#include <iostream>
-
 
-using namespace std;
 
 class HIDDevice {
 private:
 	HANDLE _deviceHandle;
-	string _manufacturerName;
-	string _productName;
-	string _serialNumber;
-	string _devicePath;
-	wstring _devicePathW;
+	std::string _manufacturerName;
+	std::string _productName;
+	std::string _serialNumber;
+	std::string _devicePath;
+	std::wstring _devicePathW;
 public:
 	bool isOpen;
 	bool debugEnabled;
@@ -43,9 +42,9 @@ class HIDDevice {
 	bool SetFeature(void *buffer, int length);
 	bool GetFeature(void *buffer, int length);
 	int StringRequest(UCHAR stringId, UCHAR *buffer, int length);
-	string GetString(UCHAR stringId);
-	string GetManufacturerName();
-	string GetProductName();
-	string GetSerialNumber();
+	std::string GetString(UCHAR stringId);
+	std::string GetManufacturerName();
+	std::string GetProductName();
+	std::string GetSerialNumber();
 	void CloseDevice();
 };
\ No newline at end of file
diff --git a/TabletDriverService/InputEmulator.cpp b/TabletDriverService/InputEmulator.cpp
index 7b1fa10..2d3a206 100644
--- a/TabletDriverService/InputEmulator.cpp
+++ b/TabletDriverService/InputEmulator.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "InputEmulator.h"
 
 #define LOG_MODULE "InputEmulator"
@@ -13,6 +13,18 @@ InputEmulator::InputEmulator()
 
 InputEmulator::~InputEmulator()
 {
+	if (isLowLatencyAudioForced && pAudioClient3 != NULL) {
+		try {
+			pAudioClient3->Stop();
+			SAFE_RELEASE(pAudioClient3);
+			printf("Low latency audio client stopped!\n");
+		}
+		catch (std::exception &e) {
+			printf("ERROR: Couldn't stop low latency audio client! %s\n", e.what());
+			SAFE_RELEASE(pAudioClient3);
+		}
+		isLowLatencyAudioForced = false;
+	}
 }
 
 //
@@ -21,30 +33,30 @@ InputEmulator::~InputEmulator()
 void InputEmulator::CreateKeyMap()
 {
 	// Disabled
-	AddKey("DISABLED", "Disabled", 0, 0);
+	AddKey("DISABLED", "Disabled", 0);
 
 	// Mouse buttons
-	AddKey("MOUSE1", "Mouse 1", 0, MouseButtons::Mouse1);
-	AddKey("MOUSE2", "Mouse 2", 0, MouseButtons::Mouse2);
-	AddKey("MOUSE3", "Mouse 3", 0, MouseButtons::Mouse3);
-	AddKey("MOUSE4", "Mouse 4", 0, MouseButtons::Mouse4);
-	AddKey("MOUSE5", "Mouse 5", 0, MouseButtons::Mouse5);
+	AddMouse("MOUSE1", "Mouse 1", MouseButtons::Mouse1);
+	AddMouse("MOUSE2", "Mouse 2", MouseButtons::Mouse2);
+	AddMouse("MOUSE3", "Mouse 3", MouseButtons::Mouse3);
+	AddMouse("MOUSE4", "Mouse 4", MouseButtons::Mouse4);
+	AddMouse("MOUSE5", "Mouse 5", MouseButtons::Mouse5);
 
 	// Mouse scroll
-	AddKey("SCROLLUP", "Mouse Scroll Up", 0, MouseButtons::MouseScrollUp);
-	AddKey("SCROLLDOWN", "Mouse Scroll Down", 0, MouseButtons::MouseScrollDown);
-	AddKey("SCROLLLEFT", "Mouse Scroll Left", 0, MouseButtons::MouseScrollLeft);
-	AddKey("SCROLLRIGHT", "Mouse Scroll Right", 0, MouseButtons::MouseScrollRight);
+	AddMouse("SCROLLUP", "Mouse Scroll Up", MouseButtons::MouseScrollUp);
+	AddMouse("SCROLLDOWN", "Mouse Scroll Down", MouseButtons::MouseScrollDown);
+	AddMouse("SCROLLLEFT", "Mouse Scroll Left", MouseButtons::MouseScrollLeft);
+	AddMouse("SCROLLRIGHT", "Mouse Scroll Right", MouseButtons::MouseScrollRight);
 
 
 	// Mouse scroll
-	AddKey("MOUSESCROLLV", "Mouse Scroll Vertical", 0, MouseButtons::MouseScrollVertical);
-	AddKey("MOUSESCROLLH", "Mouse Scroll Horizontal", 0, MouseButtons::MouseScrollHorizontal);
-	AddKey("MOUSESCROLLB", "Mouse Scroll Both", 0, MouseButtons::MouseScrollBoth);
+	AddMouse("MOUSESCROLLV", "Mouse Scroll Vertical", MouseButtons::MouseScrollVertical);
+	AddMouse("MOUSESCROLLH", "Mouse Scroll Horizontal", MouseButtons::MouseScrollHorizontal);
+	AddMouse("MOUSESCROLLB", "Mouse Scroll Both", MouseButtons::MouseScrollBoth);
 
 	// Media volume control
-	AddKey("VOLUMECONTROL", "Media Volume Control", 0, MouseButtons::MediaVolumeControl);
-	AddKey("BALANCECONTROL", "Media Balance Control", 0, MouseButtons::MediaBalanceControl);
+	inputMap["VOLUMECONTROL"] = new InputAction(InputActionType::ActionTypeAudioVolumeControl, "Media Volume Control");
+	inputMap["BALANCECONTROL"] = new InputAction(InputActionType::ActionTypeAudioBalanceControl, "Media Balance Control");
 
 	// Shift
 	AddKey("SHIFT", "Shift", VK_SHIFT);
@@ -319,39 +331,46 @@ void InputEmulator::CreateVirtualKeyMap() {
 
 
 //
-// Add key to key map
+// Add key to input map 
 //
-void InputEmulator::AddKey(string key, string keyName, WORD virtualCode)
+void InputEmulator::AddKey(std::string inputName, std::string description, WORD virtualCode)
 {
-	AddKey(key, keyName, virtualCode, 0);
+	std::transform(inputName.begin(), inputName.end(), inputName.begin(), ::toupper);
+	if (inputMap.count(inputName) <= 0) {
+		inputMap[inputName] = new InputAction(InputActionType::ActionTypeKeyboard, description);
+		inputMap[inputName]->virtualKey = virtualCode;
+		inputs.push_back(inputName);
+	}
 }
 
 
 //
-// Add key to key map 
+// Add mouse action to input map 
 //
-void InputEmulator::AddKey(string key, string keyName, WORD virtualCode, int button)
+void InputEmulator::AddMouse(std::string inputName, std::string description, int button)
 {
-	std::transform(key.begin(), key.end(), key.begin(), ::toupper);
-	if (keyMap.count(key) <= 0) {
-		keyMap[key] = new KeyMapValue(keyName, virtualCode, button);
-		keys.push_back(key);
+	std::transform(inputName.begin(), inputName.end(), inputName.begin(), ::toupper);
+	if (inputMap.count(inputName) <= 0) {
+		inputMap[inputName] = new InputAction(InputActionType::ActionTypeMouse, description);
+		inputMap[inputName]->mouseButton = button;
+		inputs.push_back(inputName);
 	}
 }
 
 
+
 //
 // Get keycode
 //
-WORD InputEmulator::GetKeyCode(string key) {
+WORD InputEmulator::GetKeyCode(std::string key) {
 
 	WORD vkCode = 0;
 
 	// Convert the key string to uppercase
 	std::transform(key.begin(), key.end(), key.begin(), ::toupper);
 
-	if (keyMap.count(key) > 0 && keyMap[key]->virtualKey > 0) {
-		vkCode = keyMap[key]->virtualKey;
+	if (inputMap.count(key) > 0 && inputMap[key]->virtualKey > 0) {
+		vkCode = inputMap[key]->virtualKey;
 	}
 
 	return vkCode;
@@ -462,7 +481,7 @@ void InputEmulator::MouseMoveTo(int x, int y) {
 //
 // Set keyboard key state with key name
 //
-void InputEmulator::SetKeyState(string key, bool down) {
+void InputEmulator::SetKeyState(std::string key, bool down) {
 	INPUT input = { 0 };
 	WORD vkCode = 0;
 	vkCode = GetKeyCode(key);
@@ -493,83 +512,19 @@ void InputEmulator::SetKeyState(WORD vkCode, bool down)
 //
 // Set mouse or keyboard input states
 //
-void InputEmulator::SetInputStates(string inputs, bool down)
+void InputEmulator::SetInputStates(std::string inputs, bool down)
 {
-	string input;
-	std::transform(inputs.begin(), inputs.end(), inputs.begin(), ::toupper);
-	stringstream stringStream(inputs);
-	KeyMapValue *keyMapValue;
-
-	while (getline(stringStream, input, '+')) {
-
-		// Key in map?
-		if (keyMap.count(input) > 0) {
-
-			keyMapValue = keyMap[input];
-
-			// Virtual key?
-			if (keyMapValue->virtualKey > 0) {
-
-				// Set keyboard key state
-				SetKeyState(keyMapValue->virtualKey, down);
-			}
-
-			// Mouse button?
-			else if (keyMapValue->mouseButton > 0 && keyMapValue->mouseButton < 5) {
-
-				// Set mouse button state
-				MouseSet(keyMapValue->mouseButton, down);
-			}
-
-			// Mouse scroll
-			else if (keyMapValue->mouseButton >= 0x81 && keyMapValue->mouseButton <= 0x84) {
-
-				switch (keyMapValue->mouseButton)
-				{
-				case MouseButtons::MouseScrollUp: MouseScroll(-1, true); break;
-				case MouseButtons::MouseScrollDown: MouseScroll(1, true); break;
-				case MouseButtons::MouseScrollLeft: MouseScroll(-1, false); break;
-				case MouseButtons::MouseScrollRight: MouseScroll(1, false); break;
-				default:
-					break;
-				}
-			}
-		}
-
-		//
-		// Precise volume control
-		//
-		else if (input.compare(0, 8, "VOLUMEUP") == 0 && input.size() > 8 && down) {
-			float value = 0;
-			try {
-				// Parse number from end of the string
-				value = stof(input.substr(8, input.size() - 8));
-				VolumeChange(value / 100.0f);
-			}
-			catch (exception& e) {
-				LOG_ERROR("Volume control error! %s\n", e.what());
-			}
-		}
-		else if (input.compare(0, 10, "VOLUMEDOWN") == 0 && input.size() > 10 && down) {
-			float value = 0;
-			try {
-				// Parse number from end of the string
-				value = stof(input.substr(10, input.size() - 10));
-				VolumeChange(-value / 100.0f);
-			}
-			catch (exception& e) {
-				LOG_ERROR("Volume control error! %s\n", e.what());
-			}
-		}
-	}
-
+	InputActionCollection collection;
+	collection.emulator = this;
+	collection.Add(inputs);
+	collection.Execute(true, true, down);
 }
 
 
 //
 // Press keyboard key
 //
-void InputEmulator::KeyPress(string keys, int time) {
+void InputEmulator::KeyPress(std::string keys, int time) {
 	SetInputStates(keys, true);
 	Sleep(time);
 	SetInputStates(keys, false);
@@ -586,18 +541,18 @@ bool InputEmulator::CreateEndpointVolume()
 	try {
 		// Device enumerator
 		hresult = CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pDeviceEnumerator));
-		CHECK_HRESULT(hresult, pDeviceEnumerator);
+		CHECK_HRESULT(hresult, "MMDeviceEnumerator");
 
 		// Default audio endpoint
 		hresult = pDeviceEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &pDefaultAudioDevice);
-		CHECK_HRESULT(hresult, pDefaultAudioDevice);
+		CHECK_HRESULT(hresult, "GetDefaultAudioEndpoint");
 
 		// Endpoint volume
 		hresult = pDefaultAudioDevice->Activate(__uuidof(IAudioEndpointVolume), CLSCTX_INPROC_SERVER, NULL, (LPVOID *)&pAudioEndpointVolume);
-		CHECK_HRESULT(hresult, pAudioEndpointVolume);
+		CHECK_HRESULT(hresult, "IAudioEndpointVolume");
 	}
-	catch (exception &e) {
-		LOG_ERROR("Audio endpoint exception: %s\n", e.what());
+	catch (std::exception &e) {
+		LOG_ERROR("Couldn't create audio endpoint volume! Error at %s\n", e.what());
 		SAFE_RELEASE(pDeviceEnumerator);
 		SAFE_RELEASE(pDefaultAudioDevice);
 		SAFE_RELEASE(pAudioEndpointVolume);
@@ -695,7 +650,7 @@ void InputEmulator::VolumeBalance(float newBalance)
 				}
 			}
 		}
-		catch (exception &e) {
+		catch (std::exception &e) {
 			LOG_ERROR("Can't set audio balance! %s\n", e.what());
 		}
 	}
@@ -740,20 +695,447 @@ void InputEmulator::VolumeChange(float delta)
 
 
 //
-// Key map value constructors
+// Force low latency audio (Windows 10)
 //
-InputEmulator::KeyMapValue::KeyMapValue()
+int InputEmulator::ForceLowLatencyAudio()
 {
+	// Lock audio control
+	std::unique_lock<std::mutex> mlock(lockAudio);
+
+	if (isLowLatencyAudioForced) return 0;
+
+	HRESULT hresult;
+	IMMDeviceEnumerator* pEnumerator = NULL;
+	IMMDevice* pDevice = NULL;
+	WAVEFORMATEX* pFormat = NULL;
+
+	UINT32 defaultPeriodInFrames = 0;
+	UINT32 fundamentalPeriodInFrames = 0;
+	UINT32 minPeriodInFrames = 0;
+	UINT32 maxPeriodInFrames = 0;
+	UINT32 beforePeriodInFrames = 0;
+	UINT32 nowPeriodInFrames = 0;
+
+	bool debug = logger.IsDebugOutputEnabled();
+
+	try {
+
+		// Create MMDeviceEnumerator
+		hresult = CoCreateInstance(__uuidof(MMDeviceEnumerator), NULL, CLSCTX_ALL, __uuidof(IMMDeviceEnumerator), reinterpret_cast<void**>(&pEnumerator));
+		CHECK_HRESULT(hresult, "MMDeviceEnumerator");
+
+		// Get default audio endpoint
+		hresult = pEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &pDevice);
+		CHECK_HRESULT(hresult, "GetDefaultAudioEndpoint");
+
+		// Create AudioClient3
+		hresult = pDevice->Activate(__uuidof(IAudioClient3), CLSCTX_ALL, NULL, reinterpret_cast<void**>(&pAudioClient3));
+		CHECK_HRESULT(hresult, "IAudioClient3");
+
+		// Get audio format
+		hresult = pAudioClient3->GetMixFormat(&pFormat);
+		CHECK_HRESULT(hresult, "GetMixFormat");
+
+		if (debug) {
+			LOG_DEBUG("Format.nChannels = %d\n", pFormat->nChannels);
+			LOG_DEBUG("Format.nSamplesPerSec = %d\n", pFormat->nSamplesPerSec);
+			LOG_DEBUG("Format.wBitsPerSample = %d\n", pFormat->wBitsPerSample);
+			LOG_DEBUG("Format.nAvgBytesPerSec = %d\n", pFormat->nAvgBytesPerSec);
+			LOG_DEBUG("Format.nBlockAlign = %d\n", pFormat->nBlockAlign);
+			LOG_DEBUG("Format.wFormatTag = %d\n", pFormat->wFormatTag);
+		}
+
+
+		// Get shared mode period settings
+		hresult = pAudioClient3->GetSharedModeEnginePeriod(
+			pFormat,
+			&defaultPeriodInFrames,
+			&fundamentalPeriodInFrames,
+			&minPeriodInFrames,
+			&maxPeriodInFrames);
+		CHECK_HRESULT(hresult, "GetSharedModeEnginePeriod");
+
+		if (debug) {
+			LOG_DEBUG("DefaultPeriodInFrames = %d\n", defaultPeriodInFrames);
+			LOG_DEBUG("FundamentalPeriodInFrames = %d\n", fundamentalPeriodInFrames);
+			LOG_DEBUG("MinPeriodInFrames = %d\n", minPeriodInFrames);
+			LOG_DEBUG("MaxPeriodInFrames = %d\n", maxPeriodInFrames);
+		}
+
+		beforePeriodInFrames = 0;
+		hresult = pAudioClient3->GetCurrentSharedModeEnginePeriod(&pFormat, &beforePeriodInFrames);
+		CHECK_HRESULT(hresult, "GetCurrentSharedModeEnginePeriod");
+		if (debug) {
+			LOG_DEBUG("BeforePeriodInFrames = %d\n", beforePeriodInFrames);
+		}
+
+		hresult = pAudioClient3->InitializeSharedAudioStream(
+			0,
+			minPeriodInFrames,
+			pFormat,
+			NULL);
+		CHECK_HRESULT(hresult, "InitializeSharedAudioStream");
+
+
+		hresult = pAudioClient3->Start();
+		CHECK_HRESULT(hresult, "AudioClient3 start");
+
+		nowPeriodInFrames = 0;
+		hresult = pAudioClient3->GetCurrentSharedModeEnginePeriod(&pFormat, &nowPeriodInFrames);
+		CHECK_HRESULT(hresult, "GetCurrentSharedModeEnginePeriod");
+
+		if (debug) {
+			LOG_DEBUG("NowPeriodInFrames = %d\n", nowPeriodInFrames);
+			LOG_DEBUG("Latency Min = %0.3f ms\n",
+				(double)minPeriodInFrames / (double)pFormat->nSamplesPerSec * 1000.0
+			);
+			LOG_DEBUG("Latency Max = %0.3f ms\n",
+				(double)maxPeriodInFrames / (double)pFormat->nSamplesPerSec * 1000.0
+			);
+			LOG_DEBUG("Latency Before = %0.3f ms\n",
+				(double)beforePeriodInFrames / (double)pFormat->nSamplesPerSec * 1000.0
+			);
+			LOG_DEBUG("Latency Now = %0.3f ms\n",
+				(double)nowPeriodInFrames / (double)pFormat->nSamplesPerSec * 1000.0
+			);
+		}
+
+		SAFE_RELEASE(pEnumerator);
+		SAFE_RELEASE(pDevice);
+		if (pFormat != NULL) {
+			CoTaskMemFree(pFormat);
+		}
+
+		isLowLatencyAudioForced = true;
+	}
+	catch (std::exception &e) {
+		isLowLatencyAudioForced = false;
+		LOG_ERROR("Couldn't force low latency audio! %s failed!\n", e.what());
+		SAFE_RELEASE(pEnumerator);
+		SAFE_RELEASE(pDevice);
+		SAFE_RELEASE(pAudioClient3);
+		if (pFormat != NULL) {
+			CoTaskMemFree(pFormat);
+		}
+		return -1;
+	}
+
+	return 1;
 }
-InputEmulator::KeyMapValue::KeyMapValue(string name, WORD key, int button)
+
+
+//
+// InputAction constructor
+//
+InputEmulator::InputAction::InputAction()
 {
-	this->name = name;
-	this->virtualKey = key;
-	this->mouseButton = button;
+	this->virtualKey = 0;
+	this->mouseButton = 0;
+	this->numericValue = 0;
+	this->stringValue = "";
 }
-InputEmulator::KeyMapValue::KeyMapValue(string name, WORD key)
+InputEmulator::InputAction::InputAction(InputActionType type, std::string description) : InputAction()
 {
-	this->name = name;
-	this->virtualKey = key;
-	this->mouseButton = 0;
+	this->type = type;
+	this->description = description;
+}
+
+//
+// InputAction execute
+//
+void InputEmulator::InputAction::Execute(bool isPressed, bool isReleased, bool isDown)
+{
+
+	// Do not run if not button is not pressed or released
+	if (!isPressed && !isReleased) {
+		return;
+	}
+
+	// Debug message
+	if (logger.IsDebugOutputEnabled()) {
+		LOG_DEBUG("Execute '%s' P=%s, R=%s, D=%s, T=%d, K=%d, M=%d, N=%0.2f\n",
+			description.c_str(),
+			isPressed ? "True" : "False",
+			isReleased ? "True" : "False",
+			isDown ? "True" : "False",
+			type,
+			virtualKey,
+			mouseButton,
+			numericValue
+		);
+	}
+
+
+	//
+	// Keyboard action
+	//
+	if (type == InputActionType::ActionTypeKeyboard && virtualKey > 0) {
+		emulator->SetKeyState(virtualKey, isDown);
+	}
+
+	//
+	// Mouse button
+	//
+	else if (type == InputActionType::ActionTypeMouse &&
+		mouseButton >= MouseButtons::Mouse1 &&
+		mouseButton <= MouseButtons::Mouse5) {
+		emulator->MouseSet(mouseButton, isDown);
+	}
+
+	//
+	// Mouse scroll
+	//
+	else if (
+		type == InputActionType::ActionTypeMouse &&
+		mouseButton >= MouseButtons::MouseScrollUp &&
+		mouseButton <= MouseButtons::MouseScrollRight &&
+		isPressed) {
+
+		switch (mouseButton)
+		{
+		case MouseButtons::MouseScrollUp: emulator->MouseScroll(1, true); break;
+		case MouseButtons::MouseScrollDown: emulator->MouseScroll(-1, true); break;
+		case MouseButtons::MouseScrollLeft: emulator->MouseScroll(-1, false); break;
+		case MouseButtons::MouseScrollRight: emulator->MouseScroll(1, false); break;
+		default:
+			break;
+		}
+	}
+
+	//
+	// Audio volume change
+	//
+	else if (type == InputActionType::ActionTypeAudioVolumeChange && numericValue != 0 && isPressed) {
+		try {
+			emulator->VolumeChange((float)numericValue);
+		}
+		catch (std::exception& e) {
+			LOG_ERROR("Volume control error! %s\n", e.what());
+		}
+	}
+
+	//
+	// Start application
+	//
+	else if (type == InputActionType::ActionTypeStartApplication && stringValue.size() > 0 && isPressed) {
+
+		try {
+			SHELLEXECUTEINFOA executeInfo;
+			executeInfo.cbSize = sizeof(SHELLEXECUTEINFOA);
+			executeInfo.fMask = NULL;
+			executeInfo.lpParameters = NULL;
+			executeInfo.lpDirectory = NULL;
+			executeInfo.hInstApp = NULL;
+			executeInfo.hwnd = GetDesktopWindow();
+			executeInfo.lpVerb = "open";
+			executeInfo.lpFile = stringValue.c_str();
+			executeInfo.nShow = SW_SHOWDEFAULT;
+
+			bool result = ShellExecuteExA(&executeInfo);
+			DWORD errorCode = GetLastError();
+
+			// Errors
+			if (!result && errorCode > 0) {
+
+				// Get error text
+				LPSTR errorTextBuffer = nullptr;
+				size_t size = FormatMessageA(
+					FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+					NULL,
+					errorCode,
+					MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+					(LPSTR)&errorTextBuffer, 0,
+					NULL
+				);
+				std::string errorText(errorTextBuffer, size);
+				LocalFree(errorTextBuffer);
+
+				// Throw
+				throw std::exception(errorText.c_str());
+			}
+		}
+		catch (std::exception& e) {
+			LOG_ERROR("Can't open \"%s\". Error: %s\n", stringValue.c_str(), e.what());
+		}
+	}
+
+}
+
+
+
+//
+// InputActionCollection constructor
+//
+InputEmulator::InputActionCollection::InputActionCollection()
+{
+}
+InputEmulator::InputActionCollection::InputActionCollection(InputEmulator *emulator)
+{
+	this->emulator = emulator;
+}
+
+//
+// InputActionCollection destructor
+//
+InputEmulator::InputActionCollection::~InputActionCollection()
+{
+	Clear();
+}
+
+//
+// InputActionCollection add action
+//
+void InputEmulator::InputActionCollection::Add(InputAction *action)
+{
+	action->emulator = emulator;
+	actions.push_back(action);
+}
+
+//
+// InputActionCollection add action by using a string
+//
+void InputEmulator::InputActionCollection::Add(std::string actions)
+{
+	std::string originalText = actions;
+	std::transform(actions.begin(), actions.end(), actions.begin(), ::toupper);
+	std::stringstream stringStream(actions);
+	std::string input;
+	InputAction *inputAction = NULL;
+	InputAction *newInputAction = NULL;
+
+	while (getline(stringStream, input, '+')) {
+
+		// Input in the map?
+		if (emulator->inputMap.count(input) > 0) {
+			inputAction = emulator->inputMap[input];
+
+			newInputAction = new InputAction(inputAction->type, inputAction->description);
+			newInputAction->mouseButton = inputAction->mouseButton;
+			newInputAction->virtualKey = inputAction->virtualKey;
+			newInputAction->numericValue = inputAction->numericValue;
+			newInputAction->stringValue = inputAction->stringValue;
+			Add(newInputAction);
+		}
+
+		//
+		// Precise volume control
+		//
+		else if (input.compare(0, 8, "VOLUMEUP") == 0 && input.size() > 8) {
+			double value = 0;
+			try {
+				// Parse number from end of the string
+				value = stod(input.substr(8, input.size() - 8));
+
+				// Create input action
+				newInputAction = new InputAction(InputActionType::ActionTypeAudioVolumeChange, "Volume Up");
+				newInputAction->numericValue = value / 100.0;
+				Add(newInputAction);
+			}
+			catch (std::exception& e) {
+				LOG_ERROR("Volume control error! %s\n", e.what());
+			}
+		}
+		else if (input.compare(0, 10, "VOLUMEDOWN") == 0 && input.size() > 10) {
+			float value = 0;
+			try {
+				// Parse number from end of the string
+				value = stof(input.substr(10, input.size() - 10));
+
+				// Create input action
+				newInputAction = new InputAction(InputActionType::ActionTypeAudioVolumeChange, "Volume Down");
+				newInputAction->numericValue = -value / 100.0;
+				Add(newInputAction);
+			}
+			catch (std::exception& e) {
+				LOG_ERROR("Volume control error! %s\n", e.what());
+			}
+		}
+
+
+		//
+		// Run application or open a file/folder
+		//
+		else if (input.compare(0, 4, "RUN ") == 0) {
+
+			// Get path
+			std::string path = originalText.substr(4, originalText.size() - 4);
+
+			// Create input action
+			newInputAction = new InputAction(InputActionType::ActionTypeStartApplication, "Run: " + path);
+			newInputAction->stringValue = path;
+			Add(newInputAction);
+
+		}
+	}
+
+}
+
+
+//
+// InputActionCollection execute actions
+//
+void InputEmulator::InputActionCollection::Execute(bool isPressed, bool isReleased, bool isDown)
+{
+	// Do not run if not button is not pressed or released
+	if (!isPressed && !isReleased) {
+		return;
+	}
+
+	// Execute in normal order when pressed
+	if (isPressed) {
+		for (InputAction *inputAction : actions) {
+			inputAction->Execute(isPressed, isReleased, isDown);
+		}
+	}
+
+	// Execute in reverse order when released
+	else if (isReleased) {
+		int startIndex = actions.size() - 1;
+		for (int i = startIndex; i >= 0; i--) {
+			actions[i]->Execute(isPressed, isReleased, isDown);
+		}
+	}
+
+}
+
+//
+// InputActionCollection clear
+//
+void InputEmulator::InputActionCollection::Clear()
+{
+	// Destroy actions
+	for (InputAction *action : actions) {
+		if (action != NULL)
+			delete action;
+	}
+	actions.clear();
+}
+
+
+//
+// InputActionCollection count
+//
+int InputEmulator::InputActionCollection::Count()
+{
+	return actions.size();
+}
+
+
+//
+// InputActionCollection to string
+//
+std::string InputEmulator::InputActionCollection::ToString()
+{
+	std::string str = "";
+	bool first = true;
+	for (InputAction *action : actions) {
+		if (first) {
+			first = false;
+		}
+		else {
+			str += " + ";
+		}
+		str += action->description;
+	}
+	return str;
 }
diff --git a/TabletDriverService/InputEmulator.h b/TabletDriverService/InputEmulator.h
index 383bec4..a46afc7 100644
--- a/TabletDriverService/InputEmulator.h
+++ b/TabletDriverService/InputEmulator.h
@@ -15,10 +15,9 @@
 		(resource) = NULL; \
 	}
 
-#define CHECK_HRESULT(hresult, resource) \
+#define CHECK_HRESULT(hresult, errorText) \
     if (FAILED(hresult)) { \
-		SAFE_RELEASE(resource); \
-		return false; \
+		throw std::runtime_error(errorText); \
 	}
 
 class InputEmulator
@@ -29,7 +28,9 @@ class InputEmulator
 	IAudioEndpointVolume *pAudioEndpointVolume = NULL;
 	IMMDeviceEnumerator *pDeviceEnumerator = NULL;
 	IMMDevice *pDefaultAudioDevice = NULL;
-	mutex lockAudio;
+	IAudioClient3* pAudioClient3 = NULL;
+	bool isLowLatencyAudioForced = false;
+	std::mutex lockAudio;
 public:
 	enum MouseButtons {
 		Mouse1 = 1,
@@ -43,42 +44,69 @@ class InputEmulator
 		MouseScrollRight = 0x84,
 		MouseScrollVertical = 0x101,
 		MouseScrollHorizontal = 0x102,
-		MouseScrollBoth = 0x103,
-		MediaVolumeControl = 0x110,
-		MediaBalanceControl = 0x111,
+		MouseScrollBoth = 0x103
 	};
 
-	class KeyMapValue {
+	enum InputActionType {
+		ActionTypeKeyboard,
+		ActionTypeMouse,
+		ActionTypeAudioVolumeControl,
+		ActionTypeAudioBalanceControl,
+		ActionTypeAudioVolumeChange,
+		ActionTypeStartApplication
+	};
+
+	class InputAction {
 	public:
-		string name;
+		InputEmulator *emulator;
+		InputActionType type;
+		std::string description;
 		WORD virtualKey;
 		int mouseButton;
-		KeyMapValue();
-		KeyMapValue(string name, WORD key, int button);
-		KeyMapValue(string name, WORD key);
+		double numericValue;
+		std::string stringValue;
+		InputAction();
+		InputAction(InputActionType type, std::string description);
+		void Execute(bool isPressed, bool isReleased, bool isDown);
+	};
+
+	class InputActionCollection {
+	public:
+		InputEmulator *emulator;
+		std::vector<InputAction *> actions;
+		InputActionCollection();
+		InputActionCollection(InputEmulator *emulator);
+		~InputActionCollection();
+		void Add(InputAction *action);
+		void Add(std::string actions);
+		void Execute(bool isPressed, bool isReleased, bool isDown);
+		void Clear();
+		int Count();
+		std::string ToString();
 	};
 
 
-	map<string, KeyMapValue*> keyMap;
-	vector<string> keys;
+
+	std::map<std::string, InputAction*> inputMap;
+	std::vector<std::string> inputs;
 
 	InputEmulator();
 	~InputEmulator();
 
 
-	void AddKey(string key, string keyName, WORD virtualCode);
-	void AddKey(string key, string keyName, WORD virtualCode, int button);
-	WORD GetKeyCode(string key);
+	void AddKey(std::string key, std::string keyName, WORD virtualCode);
+	void AddMouse(std::string key, std::string keyName, int button);
+	WORD GetKeyCode(std::string key);
 	
 	void MouseSet(int button, bool down);
 	void MousePress(int button, int time);
 	void MouseMove(int x, int y);
 	void MouseMoveTo(int x, int y);
 	void MouseScroll(int delta, bool vertical);
-	void SetKeyState(string key, bool down);
+	void SetKeyState(std::string key, bool down);
 	void SetKeyState(WORD vkCode, bool down);
-	void SetInputStates(string inputs, bool down);
-	void KeyPress(string keys, int time);
+	void SetInputStates(std::string inputs, bool down);
+	void KeyPress(std::string keys, int time);
 
 	bool CreateEndpointVolume();
 	bool ReleaseEndpointVolume();
@@ -86,6 +114,7 @@ class InputEmulator
 	void VolumeBalance(float leftRight);
 	float VolumeGet();
 	void VolumeChange(float delta);
+	int ForceLowLatencyAudio();
 
 
 };
diff --git a/TabletDriverService/Logger.cpp b/TabletDriverService/Logger.cpp
index 4e20996..f0090cc 100644
--- a/TabletDriverService/Logger.cpp
+++ b/TabletDriverService/Logger.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "Logger.h"
 
 //
@@ -54,15 +54,12 @@ void Logger::OutputItem(LogItem *item) {
 		}
 	}
 
-	// Destroy log item
-	delete item;
-
 	// Write to standard output
 	try {
-		cout.write(buffer, index);
-		cout.flush();
+		std::cout.write(buffer, index);
+		std::cout.flush();
 	}
-	catch (exception) {
+	catch (std::exception) {
 	}
 
 	// Write to output pipe
@@ -71,7 +68,7 @@ void Logger::OutputItem(LogItem *item) {
 			writeCallback(buffer, index);
 		}
 	}
-	catch (exception) {
+	catch (std::exception) {
 	}
 
 	// Write to log file
@@ -86,26 +83,41 @@ void Logger::OutputItem(LogItem *item) {
 //
 void Logger::ProcessQueue() {
 
+	std::queue<LogItem*> temporaryQueue;
+
 	// Lock queue
 	lockQueue.lock();
 
-	// Loop through items
+	// Loop through queue items and add to a temporary queue
 	while (!logQueue.empty()) {
 		LogItem *item = logQueue.front();
-		OutputItem(item);
+		temporaryQueue.push(item);
 		logQueue.pop();
 	}
 
 	// Unlock queue
 	lockQueue.unlock();
 
+	// Process the temporary queue
+	while (!temporaryQueue.empty()) {
+		LogItem *item = temporaryQueue.front();
+
+		// Output log item
+		OutputItem(item);
+
+		// Destroy log item
+		delete item;
+
+		temporaryQueue.pop();
+	}
+
 }
 
 
 //
 // Log message
 //
-void Logger::LogMessage(int level, string module, const char *fmt, ...) {
+void Logger::LogMessage(int level, std::string module, const char *fmt, ...) {
 	char message[4096];
 	int maxLength = sizeof(message) - 1;
 	int index;
@@ -148,7 +160,7 @@ void Logger::LogMessage(int level, string module, const char *fmt, ...) {
 //
 // Log buffer data
 //
-void Logger::LogBuffer(int level, string module, void *buffer, int length, const char *fmt, ...) {
+void Logger::LogBuffer(int level, std::string module, void *buffer, int length, const char *fmt, ...) {
 	bool newLine = false;
 	char message[4096];
 	int maxLength = sizeof(message) - 1;
@@ -231,7 +243,13 @@ void Logger::AddQueue(LogItem *item) {
 
 	// Direct print (skips the message buffer)
 	if (directPrint) {
+
+		// Output log item
 		OutputItem(item);
+
+		// Destroy log item
+		delete item;
+
 		return;
 	}
 
@@ -291,11 +309,11 @@ void Logger::run() {
 //
 // Open log file
 //
-bool Logger::OpenLogFile(string filename) {
+bool Logger::OpenLogFile(std::string filename) {
 	if (logFile && logFile.is_open()) {
 		logFile.close();
 	}
-	logFile = ofstream(filename, ofstream::out);
+	logFile = std::ofstream(filename, std::ofstream::out);
 	if (!logFile) {
 		return false;
 	}
@@ -346,7 +364,7 @@ bool Logger::IsDebugOutputEnabled()
 void Logger::Start() {
 	if (!IsRunning()) {
 		SetRunningState(true);
-		threadLog = thread([this] { this->run(); });
+		threadLog = std::thread([this] { this->run(); });
 	}
 }
 
@@ -363,7 +381,7 @@ void Logger::Stop() {
 		try {
 			threadLog.join();
 		}
-		catch (exception &e) {
+		catch (std::exception &e) {
 			printf("Logger thread join exception: %s\n", e.what());
 		}
 
diff --git a/TabletDriverService/Logger.h b/TabletDriverService/Logger.h
index f9dd1d4..accbd0d 100644
--- a/TabletDriverService/Logger.h
+++ b/TabletDriverService/Logger.h
@@ -17,6 +17,8 @@
 #include <mutex>
 #include <condition_variable>
 
+#include <Windows.h>
+
 #include "Runnable.h"
 
 #ifndef LOG_MODULE
@@ -51,16 +53,14 @@
 #define LOG_DEBUGBUFFER(buf, len, ...) logger.LogBuffer(logger.LogLevelDebug, LOG_MODULE, buf, len, __VA_ARGS__)
 
 
-using namespace std;
-
 class Logger : public Runnable {
 private:
-	thread threadLog;
+	std::thread threadLog;
 	void run();
-	mutex lockQueue;
-	mutex lockNewItem;
-	condition_variable conditionNewItem;
-	ofstream logFile;
+	std::mutex lockQueue;
+	std::mutex lockNewItem;
+	std::condition_variable conditionNewItem;
+	std::ofstream logFile;
 	bool logToFile;
 	bool isDebugOutputEnabled;
 
@@ -80,12 +80,12 @@ class Logger : public Runnable {
 		tm time;
 		SYSTEMTIME systemTime;
 		int level;
-		string module;
-		string message;
+		std::string module;
+		std::string message;
 	} LogItem;
-	queue<LogItem*> logQueue;
+	std::queue<LogItem*> logQueue;
 
-	string levelNames[9] = {
+	std::string levelNames[9] = {
 		"",
 		"",
 		"CRITICAL",
@@ -97,14 +97,14 @@ class Logger : public Runnable {
 		"DEBUG"
 	};
 	bool directPrint;
-	string logFilename = "";
-	function<void(void *buffer, int length)> writeCallback = NULL;
-	mutex lock;
+	std::string logFilename = "";
+	std::function<void(void *buffer, int length)> writeCallback = NULL;
+	std::mutex lock;
 
 	void OutputItem(LogItem *item);
 	void ProcessQueue();
-	void LogMessage(int level, string module, const char *fmt, ...);
-	void LogBuffer(int level, string module, void *buffer, int length, const char *fmt, ...);
+	void LogMessage(int level, std::string module, const char *fmt, ...);
+	void LogBuffer(int level, std::string module, void *buffer, int length, const char *fmt, ...);
 	int verbosity;
 	Logger();
 	void AddQueue(LogItem *item);
@@ -112,7 +112,7 @@ class Logger : public Runnable {
 	void WaitNewItem();
 	void Start();
 	void Stop();
-	bool OpenLogFile(string filename);
+	bool OpenLogFile(std::string filename);
 	bool CloseLogFile();
 
 	void SetDebugOutput(bool enabled);
diff --git a/TabletDriverService/Main.cpp b/TabletDriverService/Main.cpp
index 5ef8b7a..af7b232 100644
--- a/TabletDriverService/Main.cpp
+++ b/TabletDriverService/Main.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 
 #include <csignal>
 
@@ -41,8 +41,8 @@ void RunCleanupAndExit(int code);
 // Main
 //
 int main(int argc, char**argv) {
-	string line;
-	string filename;
+	std::string line;
+	std::string filename;
 	CommandLine *cmd;
 
 	// Init global variables
@@ -126,9 +126,9 @@ int main(int argc, char**argv) {
 
 	// Named pipes
 	if (argc > 2) {
-		pipeInput = new NamedPipeInput(string(argv[2]) + string("Input"));
-		pipeOutput = new NamedPipeServer(string(argv[2]) + string("Output"));
-		pipeState = new NamedPipeState(string(argv[2]) + string("State"));
+		pipeInput = new NamedPipeInput(std::string(argv[2]) + std::string("Input"));
+		pipeOutput = new NamedPipeServer(std::string(argv[2]) + std::string("Output"));
+		pipeState = new NamedPipeState(std::string(argv[2]) + std::string("State"));
 	}
 	else {
 		pipeInput = new NamedPipeInput("TabletDriverInput");
@@ -194,15 +194,15 @@ int main(int argc, char**argv) {
 	while (true) {
 
 		// Broken pipe
-		if (!cin) {
+		if (!std::cin) {
 			Sleep(100);
 		}
 
 		// Read line from the console
 		try {
-			getline(cin, line);
+			std::getline(std::cin, line);
 		}
-		catch (exception) {
+		catch (std::exception) {
 			Sleep(100);
 			//break;
 		}
@@ -304,7 +304,7 @@ void CleanupAndExit(int code) {
 	if (cleanupStarted) return;
 	cleanupStarted = true;
 
-	thread *t = new thread(RunCleanupAndExit, code);
+	std::thread *t = new std::thread(RunCleanupAndExit, code);
 }
 
 
diff --git a/TabletDriverService/NamedPipeInput.cpp b/TabletDriverService/NamedPipeInput.cpp
index 4a89a6e..73dd0c2 100644
--- a/TabletDriverService/NamedPipeInput.cpp
+++ b/TabletDriverService/NamedPipeInput.cpp
@@ -1,10 +1,10 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "NamedPipeInput.h"
 
 #define LOG_MODULE "PipeInput"
 #include "Logger.h"
 
-NamedPipeInput::NamedPipeInput(string pipeName) : NamedPipeServer(pipeName)
+NamedPipeInput::NamedPipeInput(std::string pipeName) : NamedPipeServer(pipeName)
 {
 
 }
@@ -28,7 +28,7 @@ void NamedPipeInput::ProcessData(int clientId, BYTE *buffer, int length)
 	cmdBuffer[length] = 0;
 
 	// Create command string
-	string commandText = "";
+	std::string commandText = "";
 	commandText.append(cmdBuffer);
 	delete cmdBuffer;
 
diff --git a/TabletDriverService/NamedPipeInput.h b/TabletDriverService/NamedPipeInput.h
index d2e404e..16a5d86 100644
--- a/TabletDriverService/NamedPipeInput.h
+++ b/TabletDriverService/NamedPipeInput.h
@@ -3,7 +3,7 @@
 class NamedPipeInput : public NamedPipeServer
 {
 public:
-	NamedPipeInput(string pipeName);
+	NamedPipeInput(std::string pipeName);
 	~NamedPipeInput();
 
 	void ProcessData(int clientId, BYTE *bufferInput, int length) override;
diff --git a/TabletDriverService/NamedPipeServer.cpp b/TabletDriverService/NamedPipeServer.cpp
index 585b32a..4b07fd0 100644
--- a/TabletDriverService/NamedPipeServer.cpp
+++ b/TabletDriverService/NamedPipeServer.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "NamedPipeServer.h"
 
 #define LOG_MODULE "NamedPipeServer"
@@ -8,7 +8,7 @@
 //
 // Constructor
 //
-NamedPipeServer::NamedPipeServer(string pipeName)
+NamedPipeServer::NamedPipeServer(std::string pipeName)
 {
 	this->pipePath = "\\\\.\\PIPE\\" + pipeName;
 	this->pipeName = pipeName;
@@ -39,7 +39,7 @@ bool NamedPipeServer::Start()
 		SetRunningState(true);
 
 		LOG_DEBUG("Starting %s main thread...\n", pipeName.c_str());
-		threadMain = new thread(&NamedPipeServer::RunMainThread, this);
+		threadMain = new std::thread(&NamedPipeServer::RunMainThread, this);
 		LOG_DEBUG("%s main thread started!\n", pipeName.c_str());
 
 		return true;
@@ -99,7 +99,7 @@ bool NamedPipeServer::Stop()
 	try {
 		threadMain->join();
 	}
-	catch (exception &e) {
+	catch (std::exception &e) {
 		printf("%s: main thread exception: %s\n", pipeName.c_str(), e.what());
 	}
 	printf("%s: Main thread closed!\n", pipeName.c_str());
@@ -129,7 +129,7 @@ bool NamedPipeServer::Stop()
 					clients[i].threadRead->join();
 				}
 			}
-			catch (exception &e) {
+			catch (std::exception &e) {
 				printf("   %s: read thread #%d exception: %s\n", pipeName.c_str(), i, e.what());
 			}
 
@@ -151,7 +151,7 @@ bool NamedPipeServer::Stop()
 					clients[i].threadWrite->join();
 				}
 			}
-			catch (exception &e) {
+			catch (std::exception &e) {
 				printf("   %s: write thread #%d exception: %s\n", pipeName.c_str(), i, e.what());
 			}
 
@@ -335,8 +335,8 @@ void NamedPipeServer::RunMainThread()
 			}
 
 			client->server = this;
-			client->threadRead = new thread([&] { client->RunReadThread(); });
-			client->threadWrite = new thread([&] { client->RunWriteThread(); });
+			client->threadRead = new std::thread([&] { client->RunReadThread(); });
+			client->threadWrite = new std::thread([&] { client->RunWriteThread(); });
 			clientIndex++;
 			if (clientIndex >= MAX_CLIENTS) {
 				clientIndex = 0;
@@ -490,7 +490,7 @@ void NamedPipeServer::Client::RunWriteThread()
 				try {
 					result = WriteFile(handlePipe, buffer, length, NULL, &overlapped);
 				}
-				catch (exception &e) {
+				catch (std::exception &e) {
 					LOG_ERROR("WriteFile exception: %s\n", e.what());
 				}
 
diff --git a/TabletDriverService/NamedPipeServer.h b/TabletDriverService/NamedPipeServer.h
index 265e021..db89f0e 100644
--- a/TabletDriverService/NamedPipeServer.h
+++ b/TabletDriverService/NamedPipeServer.h
@@ -15,28 +15,28 @@ constexpr auto MAX_CLIENTS = 16;
 class NamedPipeServer : public Runnable
 {
 protected:
-	atomic<bool> _isStopping;
+	std::atomic<bool> _isStopping;
 public:
-	string pipePath;
-	string pipeName;
-	thread *threadMain;
-	mutex lockServer;
+	std::string pipePath;
+	std::string pipeName;
+	std::thread *threadMain;
+	std::mutex lockServer;
 
 	class Client {
 	private:
-		atomic<bool> _isConnected;
+		std::atomic<bool> _isConnected;
 	public:
 		int id;
 		HANDLE handlePipe;
 		OVERLAPPED overlapped;
 		NamedPipeServer *server;
-		thread* threadRead;
-		thread* threadWrite;
-		string pipeName;
-		mutex lockClient;
+		std::thread* threadRead;
+		std::thread* threadWrite;
+		std::string pipeName;
+		std::mutex lockClient;
 		BufferQueue writeQueue;
-		mutex lockWriteWait;
-		condition_variable conditionWriteQueue;
+		std::mutex lockWriteWait;
+		std::condition_variable conditionWriteQueue;
 		Client();
 		~Client();
 		bool IsConnected();
@@ -49,7 +49,7 @@ class NamedPipeServer : public Runnable
 	Client clients[MAX_CLIENTS];
 	int clientCount;
 
-	NamedPipeServer(string pipeName);
+	NamedPipeServer(std::string pipeName);
 	~NamedPipeServer();
 
 	virtual bool Start();
diff --git a/TabletDriverService/NamedPipeState.cpp b/TabletDriverService/NamedPipeState.cpp
index 18bda92..3b74ca1 100644
--- a/TabletDriverService/NamedPipeState.cpp
+++ b/TabletDriverService/NamedPipeState.cpp
@@ -1,8 +1,8 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "NamedPipeState.h"
 
 
-NamedPipeState::NamedPipeState(string pipeName) : NamedPipeServer(pipeName)
+NamedPipeState::NamedPipeState(std::string pipeName) : NamedPipeServer(pipeName)
 {
 	isStateOutputEnabled = false;
 }
@@ -19,7 +19,7 @@ bool NamedPipeState::Start()
 {
 	if (!IsRunning()) {
 		bool result = NamedPipeServer::Start();
-		threadStateWriter = new thread(&NamedPipeState::RunStateWriterThread, this);
+		threadStateWriter = new std::thread(&NamedPipeState::RunStateWriterThread, this);
 		return result;
 	}
 	return false;
@@ -42,7 +42,7 @@ bool NamedPipeState::Stop()
 			threadStateWriter->join();
 			printf("Stopping state writer stopped!\n");
 		}
-		catch (exception &e) {
+		catch (std::exception &e) {
 			printf("State writer exception: %s\n", e.what());
 		}
 	}
diff --git a/TabletDriverService/NamedPipeState.h b/TabletDriverService/NamedPipeState.h
index 97081a3..ac4ec26 100644
--- a/TabletDriverService/NamedPipeState.h
+++ b/TabletDriverService/NamedPipeState.h
@@ -22,10 +22,10 @@ class NamedPipeState : public NamedPipeServer
 		double outputPressure;
 	} stateMessage;
 
-	thread *threadStateWriter;
-	atomic<bool> isStateOutputEnabled;
+	std::thread *threadStateWriter;
+	std::atomic<bool> isStateOutputEnabled;
 
-	NamedPipeState(string pipeName);
+	NamedPipeState(std::string pipeName);
 	~NamedPipeState();
 
 	bool Start() override;
diff --git a/TabletDriverService/Output.cpp b/TabletDriverService/Output.cpp
index 7ddb88c..fde63d0 100644
--- a/TabletDriverService/Output.cpp
+++ b/TabletDriverService/Output.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "Output.h"
 
 void Output::Init() {
diff --git a/TabletDriverService/OutputDummy.cpp b/TabletDriverService/OutputDummy.cpp
index 182bb8e..718f010 100644
--- a/TabletDriverService/OutputDummy.cpp
+++ b/TabletDriverService/OutputDummy.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "OutputDummy.h"
 
 
@@ -7,7 +7,7 @@
 
 
 void OutputDummy::Init() {
-	timeBegin = chrono::high_resolution_clock::now();
+	timeBegin = std::chrono::high_resolution_clock::now();
 }
 
 bool OutputDummy::Set(TabletState *tabletState) {
diff --git a/TabletDriverService/OutputDummy.h b/TabletDriverService/OutputDummy.h
index cd37c75..f9b944b 100644
--- a/TabletDriverService/OutputDummy.h
+++ b/TabletDriverService/OutputDummy.h
@@ -3,7 +3,7 @@
 class OutputDummy : public Output {
 public:
 
-	chrono::high_resolution_clock::time_point timeBegin;
+	std::chrono::high_resolution_clock::time_point timeBegin;
 
 	void Init() override;
 	bool Set(TabletState *tabletState);
diff --git a/TabletDriverService/OutputManager.cpp b/TabletDriverService/OutputManager.cpp
index 29258e2..7776904 100644
--- a/TabletDriverService/OutputManager.cpp
+++ b/TabletDriverService/OutputManager.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "OutputManager.h"
 
 #define LOG_MODULE "OutputManager"
diff --git a/TabletDriverService/OutputSendInputAbsolute.cpp b/TabletDriverService/OutputSendInputAbsolute.cpp
index 5383cc6..d03096f 100644
--- a/TabletDriverService/OutputSendInputAbsolute.cpp
+++ b/TabletDriverService/OutputSendInputAbsolute.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "OutputSendInputAbsolute.h"
 
 #define LOG_MODULE "SendInputAbsolute"
diff --git a/TabletDriverService/OutputSendInputRelative.cpp b/TabletDriverService/OutputSendInputRelative.cpp
index cd9293d..fa8c494 100644
--- a/TabletDriverService/OutputSendInputRelative.cpp
+++ b/TabletDriverService/OutputSendInputRelative.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "OutputSendInputRelative.h"
 
 #define LOG_MODULE "SendInputRelative"
diff --git a/TabletDriverService/OutputSettings.cpp b/TabletDriverService/OutputSettings.cpp
index 3a9dbe7..d3cc6dd 100644
--- a/TabletDriverService/OutputSettings.cpp
+++ b/TabletDriverService/OutputSettings.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "OutputSettings.h"
 
 OutputSettings::OutputSettings() {
@@ -7,7 +7,7 @@ OutputSettings::OutputSettings() {
 	relativeResetDistance = 25;
 	relativeResetTime = 100;
 	relativeDragMove = false;
-	ResetRelativeState(0, 0, chrono::high_resolution_clock::now());
+	ResetRelativeState(0, 0, std::chrono::high_resolution_clock::now());
 }
 
 
@@ -15,7 +15,7 @@ OutputSettings::~OutputSettings() {
 }
 
 
-void OutputSettings::ResetRelativeState(double x, double y, chrono::high_resolution_clock::time_point time) {
+void OutputSettings::ResetRelativeState(double x, double y, std::chrono::high_resolution_clock::time_point time) {
 	relativeState.targetPosition.Set(x, y);
 	relativeState.lastPosition.Set(x, y);
 	relativeState.pixelPosition.x = (int)x;
diff --git a/TabletDriverService/OutputSettings.h b/TabletDriverService/OutputSettings.h
index 1dbad66..1b1d553 100644
--- a/TabletDriverService/OutputSettings.h
+++ b/TabletDriverService/OutputSettings.h
@@ -16,7 +16,7 @@ class OutputSettings {
 		PixelPosition pixelPosition;
 		Vector2D targetPosition;
 		Vector2D lastPosition;
-		chrono::high_resolution_clock::time_point lastTime;
+		std::chrono::high_resolution_clock::time_point lastTime;
 	} relativeState;
 
 	Vector2D relativeSensitivity;
@@ -24,7 +24,7 @@ class OutputSettings {
 	double relativeResetTime;
 	bool relativeDragMove;
 
-	void ResetRelativeState(double x, double y, chrono::high_resolution_clock::time_point time);
+	void ResetRelativeState(double x, double y, std::chrono::high_resolution_clock::time_point time);
 
 	OutputSettings();
 	~OutputSettings();
diff --git a/TabletDriverService/OutputVMultiAbsolute.cpp b/TabletDriverService/OutputVMultiAbsolute.cpp
index 3648621..00c0092 100644
--- a/TabletDriverService/OutputVMultiAbsolute.cpp
+++ b/TabletDriverService/OutputVMultiAbsolute.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "OutputVMultiAbsolute.h"
 
 #define LOG_MODULE "VMultiAbsolute"
diff --git a/TabletDriverService/OutputVMultiDigitizer.cpp b/TabletDriverService/OutputVMultiDigitizer.cpp
index 3ce42dd..329f45d 100644
--- a/TabletDriverService/OutputVMultiDigitizer.cpp
+++ b/TabletDriverService/OutputVMultiDigitizer.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "OutputVMultiDigitizer.h"
 
 #define LOG_MODULE "VMultiDigitizer"
diff --git a/TabletDriverService/OutputVMultiDigitizerRelative.cpp b/TabletDriverService/OutputVMultiDigitizerRelative.cpp
index 112edae..f1fd54a 100644
--- a/TabletDriverService/OutputVMultiDigitizerRelative.cpp
+++ b/TabletDriverService/OutputVMultiDigitizerRelative.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "OutputVMultiDigitizerRelative.h"
 
 #define LOG_MODULE "DigitizerRelative"
diff --git a/TabletDriverService/OutputVMultiRelative.cpp b/TabletDriverService/OutputVMultiRelative.cpp
index c9b07eb..44d003c 100644
--- a/TabletDriverService/OutputVMultiRelative.cpp
+++ b/TabletDriverService/OutputVMultiRelative.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "OutputVMultiRelative.h"
 
 #define LOG_MODULE "VMultiRelative"
diff --git a/TabletDriverService/PositionRingBuffer.cpp b/TabletDriverService/PositionRingBuffer.cpp
index 282148f..4b5b38a 100644
--- a/TabletDriverService/PositionRingBuffer.cpp
+++ b/TabletDriverService/PositionRingBuffer.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "PositionRingBuffer.h"
 
 
diff --git a/TabletDriverService/RelativeMouseState.cpp b/TabletDriverService/RelativeMouseState.cpp
index 87f29b2..d35c529 100644
--- a/TabletDriverService/RelativeMouseState.cpp
+++ b/TabletDriverService/RelativeMouseState.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "RelativeMouseState.h"
 
 
diff --git a/TabletDriverService/Runnable.cpp b/TabletDriverService/Runnable.cpp
index 01b0187..5931cda 100644
--- a/TabletDriverService/Runnable.cpp
+++ b/TabletDriverService/Runnable.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "Runnable.h"
 
 bool Runnable::IsRunning()
diff --git a/TabletDriverService/Runnable.h b/TabletDriverService/Runnable.h
index 54874a7..58eaa4a 100644
--- a/TabletDriverService/Runnable.h
+++ b/TabletDriverService/Runnable.h
@@ -6,7 +6,7 @@
 class Runnable
 {
 protected:
-	atomic<bool> _isRunning = false;
+	std::atomic<bool> _isRunning = false;
 public:
 	bool IsRunning();
 	void SetRunningState(bool running);
diff --git a/TabletDriverService/ScreenMapper.cpp b/TabletDriverService/ScreenMapper.cpp
index 9713922..2194f03 100644
--- a/TabletDriverService/ScreenMapper.cpp
+++ b/TabletDriverService/ScreenMapper.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "ScreenMapper.h"
 
 #define LOG_MODULE "ScreenMapper"
diff --git a/TabletDriverService/Tablet.cpp b/TabletDriverService/Tablet.cpp
index b56fc28..8533b09 100644
--- a/TabletDriverService/Tablet.cpp
+++ b/TabletDriverService/Tablet.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "Tablet.h"
 #include "TabletHandler.h"
 
@@ -9,7 +9,7 @@
 //
 // USB Device Constructor
 //
-Tablet::Tablet(string usbGUID) : Tablet() {
+Tablet::Tablet(std::string usbGUID) : Tablet() {
 	usbDevice = new USBDevice(usbGUID);
 	if (usbDevice->isOpen) {
 		this->isOpen = true;
@@ -71,7 +71,6 @@ Tablet::Tablet() {
 
 	// Keep tip down report counter
 	tipDownCounter = 0;
-
 }
 
 //
@@ -172,7 +171,7 @@ bool Tablet::IsConfigured() {
 //
 // Get a device string from HID or USB device.
 //
-string Tablet::GetDeviceString(UCHAR stringId)
+std::string Tablet::GetDeviceString(UCHAR stringId)
 {
 	// USB device
 	if (usbDevice != NULL) {
@@ -190,7 +189,7 @@ string Tablet::GetDeviceString(UCHAR stringId)
 //
 // Get HID or WinUSB device manufacturer name
 //
-string Tablet::GetDeviceManufacturerName()
+std::string Tablet::GetDeviceManufacturerName()
 {
 	// USB device
 	if (usbDevice != NULL) {
@@ -208,7 +207,7 @@ string Tablet::GetDeviceManufacturerName()
 //
 // Get HID or WinUSB device product name
 //
-string Tablet::GetDeviceProductName()
+std::string Tablet::GetDeviceProductName()
 {
 	// USB device
 	if (usbDevice != NULL) {
@@ -226,7 +225,7 @@ string Tablet::GetDeviceProductName()
 //
 // Get HID or WinUSB device serial number
 //
-string Tablet::GetDeviceSerialNumber()
+std::string Tablet::GetDeviceSerialNumber()
 {
 	// USB device
 	if (usbDevice != NULL) {
@@ -413,7 +412,7 @@ int Tablet::ReadState() {
 
 
 	// Time
-	state.time = chrono::high_resolution_clock::now();
+	state.time = std::chrono::high_resolution_clock::now();
 
 
 	// Buttons
diff --git a/TabletDriverService/Tablet.h b/TabletDriverService/Tablet.h
index d0d53f3..6af8e74 100644
--- a/TabletDriverService/Tablet.h
+++ b/TabletDriverService/Tablet.h
@@ -2,6 +2,7 @@
 
 #include <string>
 #include <vector>
+#include <map>
 #include <atomic>
 #include <mutex>
 #include <condition_variable>
@@ -19,8 +20,6 @@
 #include "TabletMeasurement.h"
 #include "DataFormatter.h"
 
-using namespace std;
-
 class Tablet {
 public:
 	USBDevice *usbDevice;
@@ -28,14 +27,6 @@ class Tablet {
 	HIDDevice *hidDeviceAux;
 	int usbPipeId;
 
-	//
-	// Enums
-	//
-	enum TabletButtons {
-		Button1, Button2, Button3, Button4,
-		Button5, Button6, Button7, Button8
-	};
-
 	// Tablet report status
 	enum TabletReportStatus {
 		ReportPositionInvalid = 0,
@@ -54,29 +45,90 @@ class Tablet {
 
 
 	//
-	// Position report data
+	// Tablet report data
 	//
 #pragma pack(1)
 	struct {
 		BYTE reportId;
-		BYTE buttons;
+		UINT32 buttons;
 		UINT32 x;
 		UINT32 y;
 		USHORT pressure;
 		USHORT height;
 	} reportData;
 
+	// Tablet report byte names
+	const std::map<std::string, int> reportByteNames = {
+
+		// Report id
+		{"reportid", 0},
+
+		// Buttons
+		{"buttons", 1},
+		{"buttonsbyte1", 1},
+		{"buttonsbyte2", 2},
+		{"buttonsbyte3", 3},
+		{"buttonsbyte4", 4},
+
+		// X position
+		{"xlow", 5},
+		{"xhigh", 6},
+		{"xbyte1", 5},
+		{"xbyte2", 6},
+		{"xbyte3", 7},
+		{"xbyte4", 8},
+
+		// Y position
+		{"ylow", 9},
+		{"yhigh", 10},
+		{"ybyte1", 9},
+		{"ybyte2", 10},
+		{"ybyte3", 11},
+		{"ybyte4", 12},
+
+		// Pressure
+		{"pressurelow", 13},
+		{"pressurehigh", 14},
+
+		// Height
+		{"heightlow", 15},
+		{"heighthigh", 16}
+	};
+
+
 	//
 	// Auxiliary report data
 	//
 #pragma pack(1)
 	struct {
 		BYTE reportId;
-		USHORT buttons;
+		UINT32 buttons;
 		UCHAR detect;
 		UCHAR isPressed;
 	} auxReportData;
 
+	// Auxiliary report byte names
+	const std::map<std::string, int> auxReportByteNames = {
+
+		// Report id
+		{ "reportid", 0 },
+
+		// Buttons
+		{ "buttonslow", 1 },
+		{ "buttonshigh", 2 },
+		{ "buttonsbyte1", 1 },
+		{ "buttonsbyte2", 2 },
+		{ "buttonsbyte3", 3 },
+		{ "buttonsbyte4", 4 },
+
+		// Detect byte
+		{ "detect", 5 },
+
+		// Is button pressed byte
+		{ "ispressed", 6 }
+	};
+
+
 	class InitReport {
 	public:
 		BYTE *data = NULL;
@@ -93,36 +145,24 @@ class Tablet {
 		USHORT lastButtons;
 	};
 	TabletAuxState auxState;
-	mutex lockAuxState;
-	condition_variable conditionAuxState;
+	std::mutex lockAuxState;
+	std::condition_variable conditionAuxState;
 
 
-	//
-	// Data formatters
-	//
+	// Data formatter
 	DataFormatter dataFormatter;
 
-	//
 	// Tablet State
-	//
 	TabletState state;
 
 	// Settings
 	TabletSettings settings;
 
-	// Smoothing filter
+	// Filters
 	TabletFilterSmoothing smoothing;
-
-	// Smoothing filter
 	TabletFilterAdvancedSmoothing advancedSmoothing;
-
-	// Noise reduction filter
 	TabletFilterNoiseReduction noiseFilter;
-
-	// Anti-smoothing filter
 	TabletFilterAntiSmoothing antiSmoothing;
-
-	// Gravity filter
 	TabletFilterGravity gravityFilter;
 
 	// Timed filters
@@ -137,21 +177,19 @@ class Tablet {
 	TabletMeasurement measurement;
 
 	//
-	string name = "Unknown";
-	atomic<bool> isOpen;
+	std::string name = "Unknown";
+	std::atomic<bool> isOpen;
 	int skipReports;
 
 	// Pen tip button keep down
 	int tipDownCounter;
 
-	// Tablet initialize buffers
-	vector<InitReport*> initFeatureReports;
-	vector<InitReport*> initOutputReports;
-	vector<int> initStrings;
-
-
+	// Tablet initialization buffers
+	std::vector<InitReport*> initFeatureReports;
+	std::vector<InitReport*> initOutputReports;
+	std::vector<int> initStrings;
 
-	Tablet(string usbGUID);
+	Tablet(std::string usbGUID);
 	Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage, bool isExclusive);
 	Tablet(USHORT vendorId, USHORT productId, USHORT usagePage, USHORT usage);
 	Tablet();
@@ -160,10 +198,10 @@ class Tablet {
 	bool Init();
 	bool IsConfigured();
 
-	string GetDeviceString(UCHAR stringId);
-	string GetDeviceManufacturerName();
-	string GetDeviceProductName();
-	string GetDeviceSerialNumber();
+	std::string GetDeviceString(UCHAR stringId);
+	std::string GetDeviceManufacturerName();
+	std::string GetDeviceProductName();
+	std::string GetDeviceSerialNumber();
 	int ReadState();
 	bool Write(void *buffer, int length);
 	bool Read(void *buffer, int length);
diff --git a/TabletDriverService/TabletDriverService.vcxproj b/TabletDriverService/TabletDriverService.vcxproj
index b3c2673..dec95d3 100644
--- a/TabletDriverService/TabletDriverService.vcxproj
+++ b/TabletDriverService/TabletDriverService.vcxproj
@@ -92,6 +92,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpplatest</LanguageStandard>
+      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -123,6 +124,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpplatest</LanguageStandard>
+      <PrecompiledHeaderFile>precompiled.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -199,7 +201,7 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     <ClInclude Include="RelativeMouseState.h" />
     <ClInclude Include="Runnable.h" />
     <ClInclude Include="ScreenMapper.h" />
-    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="precompiled.h" />
     <ClInclude Include="Tablet.h" />
     <ClInclude Include="TabletFilterAdvancedSmoothing.h" />
     <ClInclude Include="TabletFilterAntiSmoothing.h" />
@@ -263,7 +265,7 @@ xcopy /C /Y "$(ProjectDir)tools\RunServiceOnly.bat" "$(SolutionDir)TabletDriverG
     <ClCompile Include="TabletSettings.cpp" />
     <ClCompile Include="TabletState.cpp" />
     <ClCompile Include="USBDevice.cpp" />
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="precompiled.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
diff --git a/TabletDriverService/TabletDriverService.vcxproj.filters b/TabletDriverService/TabletDriverService.vcxproj.filters
index bde474e..f1aa145 100644
--- a/TabletDriverService/TabletDriverService.vcxproj.filters
+++ b/TabletDriverService/TabletDriverService.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="targetver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -144,11 +141,11 @@
     <ClInclude Include="BufferQueue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="precompiled.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="HIDDevice.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -290,6 +287,9 @@
     <ClCompile Include="BufferQueue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="precompiled.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="config\init.cfg">
diff --git a/TabletDriverService/TabletFilter.cpp b/TabletDriverService/TabletFilter.cpp
index b561253..1ed1d40 100644
--- a/TabletDriverService/TabletFilter.cpp
+++ b/TabletDriverService/TabletFilter.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "TabletFilter.h"
 
 
diff --git a/TabletDriverService/TabletFilterAdvancedSmoothing.cpp b/TabletDriverService/TabletFilterAdvancedSmoothing.cpp
index 0987d44..677d403 100644
--- a/TabletDriverService/TabletFilterAdvancedSmoothing.cpp
+++ b/TabletDriverService/TabletFilterAdvancedSmoothing.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "TabletFilterAdvancedSmoothing.h"
 
 #define LOG_MODULE "AdvanceSmoothing"
@@ -24,7 +24,7 @@ TabletFilterAdvancedSmoothing::TabletFilterAdvancedSmoothing() {
 		);
 	}
 
-	lastTargetTime = chrono::high_resolution_clock::now();
+	lastTargetTime = std::chrono::high_resolution_clock::now();
 }
 
 
@@ -98,7 +98,7 @@ void TabletFilterAdvancedSmoothing::OnTimerIntervalChange(double oldInterval, do
 // Update
 void TabletFilterAdvancedSmoothing::Update() {
 
-	double timeDelta = (chrono::high_resolution_clock::now() - outputState.time).count() / 1000000.0;
+	double timeDelta = (std::chrono::high_resolution_clock::now() - outputState.time).count() / 1000000.0;
 
 	//
 	// Do not run the filter if the last state is older than 100 milliseconds.
diff --git a/TabletDriverService/TabletFilterAdvancedSmoothing.h b/TabletDriverService/TabletFilterAdvancedSmoothing.h
index 9a0c0ce..c226471 100644
--- a/TabletDriverService/TabletFilterAdvancedSmoothing.h
+++ b/TabletDriverService/TabletFilterAdvancedSmoothing.h
@@ -34,7 +34,7 @@ class TabletFilterAdvancedSmoothing : public TabletFilter {
 
 	TabletState target;
 	TabletState lastTarget;
-	chrono::high_resolution_clock::time_point lastTargetTime;
+	std::chrono::high_resolution_clock::time_point lastTargetTime;
 
 	TabletFilterAdvancedSmoothing();
 	~TabletFilterAdvancedSmoothing();
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.cpp b/TabletDriverService/TabletFilterAntiSmoothing.cpp
index 5a40fe0..5734ed8 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.cpp
+++ b/TabletDriverService/TabletFilterAntiSmoothing.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "TabletFilterAntiSmoothing.h"
 
 
@@ -29,7 +29,7 @@ TabletFilterAntiSmoothing::TabletFilterAntiSmoothing() {
 
 	ignoreInvalidReports = 0;
 
-	timeBegin = chrono::high_resolution_clock::now();
+	timeBegin = std::chrono::high_resolution_clock::now();
 	timeLastReport = timeBegin;
 	timeNow = timeBegin;
 
diff --git a/TabletDriverService/TabletFilterAntiSmoothing.h b/TabletDriverService/TabletFilterAntiSmoothing.h
index 1a86874..ce5d8d7 100644
--- a/TabletDriverService/TabletFilterAntiSmoothing.h
+++ b/TabletDriverService/TabletFilterAntiSmoothing.h
@@ -14,9 +14,9 @@ class TabletFilterAntiSmoothing : public TabletFilter {
 	double oldVelocity;
 	double oldAcceleration;
 	int ignoreInvalidReports;
-	chrono::high_resolution_clock::time_point timeBegin;
-	chrono::high_resolution_clock::time_point timeLastReport;
-	chrono::high_resolution_clock::time_point timeNow;
+	std::chrono::high_resolution_clock::time_point timeBegin;
+	std::chrono::high_resolution_clock::time_point timeLastReport;
+	std::chrono::high_resolution_clock::time_point timeNow;
 
 public:
 	Vector2D latestTarget;
diff --git a/TabletDriverService/TabletFilterGravity.cpp b/TabletDriverService/TabletFilterGravity.cpp
index f993fcf..8a5c69c 100644
--- a/TabletDriverService/TabletFilterGravity.cpp
+++ b/TabletDriverService/TabletFilterGravity.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "TabletFilterGravity.h"
 
 #define LOG_MODULE "Gravity"
diff --git a/TabletDriverService/TabletFilterNoiseReduction.cpp b/TabletDriverService/TabletFilterNoiseReduction.cpp
index d1ae589..8029cd1 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.cpp
+++ b/TabletDriverService/TabletFilterNoiseReduction.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "TabletFilterNoiseReduction.h"
 
 
@@ -14,7 +14,7 @@ TabletFilterNoiseReduction::TabletFilterNoiseReduction() {
 	distanceMaximum = 1;
 	iterations = 10;
 	reportRate = 1;
-	timeBegin = chrono::high_resolution_clock::now();
+	timeBegin = std::chrono::high_resolution_clock::now();
 	timeLastReport = timeBegin;
 	timeNow = timeBegin;
 	outputPosition = &outputState.position;
diff --git a/TabletDriverService/TabletFilterNoiseReduction.h b/TabletDriverService/TabletFilterNoiseReduction.h
index de289c3..8410f1e 100644
--- a/TabletDriverService/TabletFilterNoiseReduction.h
+++ b/TabletDriverService/TabletFilterNoiseReduction.h
@@ -17,9 +17,9 @@ class TabletFilterNoiseReduction : public TabletFilter {
 	double distanceThreshold;
 	double distanceMaximum;
 	double reportRate;
-	chrono::high_resolution_clock::time_point timeBegin;
-	chrono::high_resolution_clock::time_point timeLastReport;
-	chrono::high_resolution_clock::time_point timeNow;
+	std::chrono::high_resolution_clock::time_point timeBegin;
+	std::chrono::high_resolution_clock::time_point timeLastReport;
+	std::chrono::high_resolution_clock::time_point timeNow;
 
 
 	void SetTarget(TabletState *tabletState);
diff --git a/TabletDriverService/TabletFilterPeak.cpp b/TabletDriverService/TabletFilterPeak.cpp
index dc2600d..bbddbd0 100644
--- a/TabletDriverService/TabletFilterPeak.cpp
+++ b/TabletDriverService/TabletFilterPeak.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "TabletFilterPeak.h"
 
 #define LOG_MODULE "Peak"
diff --git a/TabletDriverService/TabletFilterSmoothing.cpp b/TabletDriverService/TabletFilterSmoothing.cpp
index 33acb02..8d2d068 100644
--- a/TabletDriverService/TabletFilterSmoothing.cpp
+++ b/TabletDriverService/TabletFilterSmoothing.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "TabletFilterSmoothing.h"
 
 #define LOG_MODULE "Smoothing"
@@ -12,7 +12,7 @@ TabletFilterSmoothing::TabletFilterSmoothing() {
 	weight = 1.000;
 	threshold = 0.63;
 	onlyWhenButtonsDown = false;
-	lastTargetTime = chrono::high_resolution_clock::now();
+	lastTargetTime = std::chrono::high_resolution_clock::now();
 
 	target.position.Set(0, 0);
 	outputState.position.Set(0,0);
@@ -80,7 +80,7 @@ void TabletFilterSmoothing::Update() {
 
 	if(!target.isValid) return;
 
-	double timeDelta = (chrono::high_resolution_clock::now() - outputState.time).count() / 1000000.0;
+	double timeDelta = (std::chrono::high_resolution_clock::now() - outputState.time).count() / 1000000.0;
 
 	//
 	// Do not run the filter if the last state is older than 100 milliseconds.
diff --git a/TabletDriverService/TabletFilterSmoothing.h b/TabletDriverService/TabletFilterSmoothing.h
index 6623963..1d83a58 100644
--- a/TabletDriverService/TabletFilterSmoothing.h
+++ b/TabletDriverService/TabletFilterSmoothing.h
@@ -9,7 +9,7 @@ class TabletFilterSmoothing : public TabletFilter {
 	double weight;
 	double threshold;
 	TabletState target;
-	chrono::high_resolution_clock::time_point lastTargetTime;
+	std::chrono::high_resolution_clock::time_point lastTargetTime;
 	bool onlyWhenButtonsDown;
 
 	TabletFilterSmoothing();
diff --git a/TabletDriverService/TabletFilterTester.cpp b/TabletDriverService/TabletFilterTester.cpp
index 1950337..6bae2ac 100644
--- a/TabletDriverService/TabletFilterTester.cpp
+++ b/TabletDriverService/TabletFilterTester.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "TabletFilterTester.h"
 
 #define LOG_MODULE "Tester"
@@ -6,7 +6,7 @@
 
 
 // Constructor
-TabletFilterTester::TabletFilterTester(string input, string output) {
+TabletFilterTester::TabletFilterTester(std::string input, std::string output) {
 	this->inputFilepath = input;
 	this->outputFilepath = output;
 }
@@ -29,11 +29,11 @@ void TabletFilterTester::AddFilter(TabletFilter *filter)
 //
 bool TabletFilterTester::Open() {
 
-	inputFile = ifstream(inputFilepath, ifstream::in);
+	inputFile = std::ifstream(inputFilepath, std::ifstream::in);
 	if(!inputFile) return false;
 
 
-	outputFile = ofstream(outputFilepath, ofstream::out);
+	outputFile = std::ofstream(outputFilepath, std::ofstream::out);
 	if(!outputFile) return false;
 
 	return true;
@@ -45,10 +45,10 @@ bool TabletFilterTester::Open() {
 void TabletFilterTester::Run() {
 
 	double time;
-	chrono::high_resolution_clock::time_point timeBegin;
-	chrono::high_resolution_clock::time_point timeNow;
+	std::chrono::high_resolution_clock::time_point timeBegin;
+	std::chrono::high_resolution_clock::time_point timeNow;
 	Vector2D position;
-	string line;
+	std::string line;
 	bool firstReport;
 	double distance;
 	TabletState tabletState, outputState;
@@ -61,7 +61,7 @@ void TabletFilterTester::Run() {
 		// Read line from input file
 		try {
 			getline(inputFile, line);
-		} catch(exception) {
+		} catch(std::exception) {
 			break;
 		}
 
@@ -83,7 +83,7 @@ void TabletFilterTester::Run() {
 
 			// Init settings on first report
 			if(firstReport) {
-				timeBegin = chrono::high_resolution_clock::now();
+				timeBegin = std::chrono::high_resolution_clock::now();
 				firstReport = false;
 				outputState.position.Set(position);
 
@@ -106,7 +106,7 @@ void TabletFilterTester::Run() {
 				}
 			}
 
-			timeNow = timeBegin + chrono::microseconds((int)(time * 1000.0));
+			timeNow = timeBegin + std::chrono::microseconds((int)(time * 1000.0));
 			distance = position.Distance(outputState.position);
 
 			/*
@@ -131,7 +131,7 @@ void TabletFilterTester::Run() {
 				);
 			}
 
-			outputFile << "position " << time << " " << outputState.position.x << " " << outputState.position.y << fixed << setprecision(2) << "\n";
+			outputFile << "position " << time << " " << outputState.position.x << " " << outputState.position.y << std::fixed << std::setprecision(2) << "\n";
 
 
 		}
diff --git a/TabletDriverService/TabletFilterTester.h b/TabletDriverService/TabletFilterTester.h
index b1a596f..7492239 100644
--- a/TabletDriverService/TabletFilterTester.h
+++ b/TabletDriverService/TabletFilterTester.h
@@ -17,14 +17,14 @@ class TabletFilterTester {
 	HANDLE timer;
 	WAITORTIMERCALLBACK callback;
 
-	vector<TabletFilter *> filters;
-	string inputFilepath;
-	string outputFilepath;
+	std::vector<TabletFilter *> filters;
+	std::string inputFilepath;
+	std::string outputFilepath;
 
-	ifstream inputFile;
-	ofstream outputFile;
+	std::ifstream inputFile;
+	std::ofstream outputFile;
 
-	TabletFilterTester(string inputFilepath, string outputFilepath);
+	TabletFilterTester(std::string inputFilepath, std::string outputFilepath);
 	~TabletFilterTester();
 
 	void AddFilter(TabletFilter *filter);
diff --git a/TabletDriverService/TabletHandler.cpp b/TabletDriverService/TabletHandler.cpp
index 02eed68..592555c 100644
--- a/TabletDriverService/TabletHandler.cpp
+++ b/TabletDriverService/TabletHandler.cpp
@@ -1,5 +1,5 @@
 
-#include "stdafx.h"
+#include "precompiled.h"
 #include "TabletHandler.h"
 
 #define LOG_MODULE "TabletHandler"
@@ -47,7 +47,7 @@ TabletHandler::~TabletHandler() {
 		try {
 			tabletInputThread->join();
 		}
-		catch (exception &e) {
+		catch (std::exception &e) {
 			printf("Tablet input thread exception: %s\n", e.what());
 		}
 	}
@@ -62,7 +62,7 @@ TabletHandler::~TabletHandler() {
 		try {
 			auxInputThread->join();
 		}
-		catch (exception &e) {
+		catch (std::exception &e) {
 			printf("Aux input thread exception: %s\n", e.what());
 		}
 	}
@@ -76,14 +76,17 @@ TabletHandler::~TabletHandler() {
 bool TabletHandler::Start() {
 	if (tablet == NULL) return false;
 
+	// Set input emulator
+	tablet->settings.SetInputEmulator(&tabletHandler->inputEmulator);
+
 	SetRunningState(true);
 
 	// Timer
 	ChangeTimerInterval((int)round(timerInterval));
 
 	// Threads
-	tabletInputThread = new thread(&TabletHandler::RunTabletInputThread, this);
-	auxInputThread = new thread(&TabletHandler::RunAuxInputThread, this);
+	tabletInputThread = new std::thread(&TabletHandler::RunTabletInputThread, this);
+	auxInputThread = new std::thread(&TabletHandler::RunAuxInputThread, this);
 
 	return true;
 }
@@ -246,7 +249,7 @@ void TabletHandler::ChangeTimerInterval(int newInterval) {
 	}
 
 	// Start timer interval when filters are enabled and timer is running
-	else if(filtersEnabled) {
+	else if (filtersEnabled) {
 		ChangeTimer((int)newInterval);
 	}
 
@@ -290,7 +293,8 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 	bool isPressed;
 	bool isReleased;
 	bool hasBinding;
-	string key;
+	std::string key;
+	InputEmulator::InputActionCollection *inputCollection = NULL;
 	bool scrolled = false;
 	Vector2D scrollPosition;
 
@@ -328,33 +332,49 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 
 			// Pen button map
 			hasBinding = false;
-			if (isPen && tablet->settings.buttonMap[buttonIndex].size() > 0) {
-				key = tablet->settings.buttonMap[buttonIndex];
-				if (inputEmulator.keyMap.count(key) > 0) {
-					hasBinding = true;
-				}
+			inputCollection = NULL;
+			if (isPen && tablet->settings.buttonMap[buttonIndex].Count() > 0) {
+				inputCollection = &tablet->settings.buttonMap[buttonIndex];
+				hasBinding = true;
 			}
 
 			// Auxiliary button map
-			else if (!isPen && tablet->settings.auxButtonMap[buttonIndex].size() > 0) {
-				key = tablet->settings.auxButtonMap[buttonIndex];
-				if (inputEmulator.keyMap.count(key) > 0) {
-					hasBinding = true;
-				}
+			else if (!isPen && tablet->settings.auxButtonMap[buttonIndex].Count() > 0) {
+				inputCollection = &tablet->settings.auxButtonMap[buttonIndex];
+				hasBinding = true;
 			}
 
-			// Button has a binding?
-			if (hasBinding) {
 
-				InputEmulator::KeyMapValue *keyMapValue = inputEmulator.keyMap[key];
+			// No input actions found -> skip
+			if (inputCollection == NULL) {
+				continue;
+			}
+
+			int indexStart = 0;
+			int indexAdd = 1;
+			int length = inputCollection->Count();
 
-				WORD virtualKey = keyMapValue->virtualKey;
-				int mouseButton = keyMapValue->mouseButton;
+			// Execute in reverse order when button is released
+			if (isReleased) {
+				indexStart = inputCollection->Count() - 1;
+				indexAdd = -1;
+			}
+
+			// Loop through input actions
+			int index = indexStart;
+			for(int i = 0; i < length; i++) {
+
+				InputEmulator::InputAction *inputAction = inputCollection->actions[index];
+				index += indexAdd;
+
+				int mouseButton = inputAction->mouseButton;
 
 				//
 				// Mouse buttons
 				//
-				if (mouseButton >= InputEmulator::Mouse1 && mouseButton <= InputEmulator::Mouse5) {
+				if (inputAction->type == InputEmulator::ActionTypeMouse &&
+					mouseButton >= InputEmulator::Mouse1 && mouseButton <= InputEmulator::Mouse5
+					) {
 
 					// Pen button
 					if (isPen && isDown) {
@@ -362,24 +382,29 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 					}
 
 					// Auxiliary button
-					else if (isPressed || isReleased) {
-						inputEmulator.MouseSet(mouseButton, isDown);
+					else if (!isPen) {
+						inputAction->Execute(isPressed, isReleased, isDown);
 					}
 				}
 
 				//
-				// Mouse scroll
+				// Mouse scroll and volume control
 				//
 				else if (
-					mouseButton == InputEmulator::MouseScrollVertical
-					||
-					mouseButton == InputEmulator::MouseScrollHorizontal
-					||
-					mouseButton == InputEmulator::MouseScrollBoth
+					(
+						inputAction->type == InputEmulator::ActionTypeMouse &&
+						(
+							mouseButton == InputEmulator::MouseScrollVertical
+							||
+							mouseButton == InputEmulator::MouseScrollHorizontal
+							||
+							mouseButton == InputEmulator::MouseScrollBoth
+							)
+						)
 					||
-					mouseButton == InputEmulator::MediaVolumeControl
+					inputAction->type == InputEmulator::ActionTypeAudioVolumeControl
 					||
-					mouseButton == InputEmulator::MediaBalanceControl
+					inputAction->type == InputEmulator::ActionTypeAudioBalanceControl
 					) {
 
 					// Scroll button down?
@@ -459,13 +484,13 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 						}
 
 						// Media volume control
-						if (delta.y != 0 && mouseButton == InputEmulator::MediaVolumeControl) {
+						if (delta.y != 0 && inputAction->type == InputEmulator::ActionTypeAudioVolumeControl) {
 							inputEmulator.VolumeChange(-(float)delta.y / 100.0f);
 							scrolled = true;
 						}
 
 						// Media balance control
-						if ((delta.x != 0 || isPressed) && mouseButton == InputEmulator::MediaBalanceControl) {
+						if ((delta.x != 0 || isPressed) && inputAction->type == InputEmulator::ActionTypeAudioBalanceControl) {
 							double balance = 0.5 + ((scrollStartPosition.x - scrollPosition.x) * tablet->settings.scrollSensitivity) / 50.0f;
 							inputEmulator.VolumeBalance((float)balance);
 							scrolled = true;
@@ -480,33 +505,15 @@ void TabletHandler::ProcessButtons(UINT32 *outButtons, bool isPen)
 
 				}
 
-
 				//
-				// Keyboard key
+				// All other actions
 				//
-				else if (virtualKey > 0) {
-					if (isPressed) {
-						inputEmulator.SetKeyState(virtualKey, true);
-					}
-					else if (isReleased) {
-						inputEmulator.SetKeyState(virtualKey, false);
-					}
+				else {
+					inputAction->Execute(isPressed, isReleased, isDown);
 				}
 
 			}
 
-			//
-			// Multiple inputs
-			//
-			else {
-				if (isPressed) {
-					inputEmulator.SetInputStates(key, true);
-				}
-				else if (isReleased) {
-					inputEmulator.SetInputStates(key, false);
-				}
-			}
-
 		}
 
 		// Update last scroll position
@@ -533,7 +540,7 @@ void TabletHandler::RunTabletInputThread() {
 	UINT32 lastButtons = 0;
 	UINT32 outButtons = 0;
 
-	timeBegin = chrono::high_resolution_clock::now();
+	timeBegin = std::chrono::high_resolution_clock::now();
 
 	//
 	// Tablet input main loop
@@ -771,10 +778,10 @@ void TabletHandler::OnTimerTick() {
 	if (isTimerTickRunning) {
 
 		// Limit error logging rate
-		double timeDelta = (chrono::high_resolution_clock::now() - timeLastTimerProblem).count() / 1000000.0;
+		double timeDelta = (std::chrono::high_resolution_clock::now() - timeLastTimerProblem).count() / 1000000.0;
 		if (timeDelta > 2000.0) {
 			LOG_WARNING("Filter performance problem detected! Use lower filter rate or disable the smoothing filter.\n");
-			timeLastTimerProblem = chrono::high_resolution_clock::now();
+			timeLastTimerProblem = std::chrono::high_resolution_clock::now();
 		}
 		return;
 	}
@@ -847,7 +854,7 @@ void TabletHandler::WriteOutputState(TabletState * outputState)
 
 	// Debug message
 	if (result && logger.IsDebugOutputEnabled()) {
-		double delta = (chrono::high_resolution_clock::now() - timeBegin).count() / 1000000.0;
+		double delta = (std::chrono::high_resolution_clock::now() - timeBegin).count() / 1000000.0;
 		LOG_DEBUG("OutputState: T=%0.3f, B=%d, X=%0.3f, Y=%0.3f, P=%0.3f V=%s\n",
 			delta,
 			outputState->buttons,
diff --git a/TabletDriverService/TabletHandler.h b/TabletDriverService/TabletHandler.h
index 2e1f5dc..094e4bb 100644
--- a/TabletDriverService/TabletHandler.h
+++ b/TabletDriverService/TabletHandler.h
@@ -19,16 +19,16 @@ class TabletHandler : public Runnable {
 
 public:
 	Tablet *tablet;
-	thread *tabletInputThread;
-	thread *auxInputThread;
+	std::thread *tabletInputThread;
+	std::thread *auxInputThread;
 	HANDLE timer;
 	double timerInterval;
 
-	atomic<bool> _isTimerStopping;
-	mutex lockTimer;
-	mutex lock;
-	chrono::high_resolution_clock::time_point timeBegin;
-	chrono::high_resolution_clock::time_point timeLastTimerProblem;
+	std::atomic<bool> _isTimerStopping;
+	std::mutex lockTimer;
+	std::mutex lock;
+	std::chrono::high_resolution_clock::time_point timeBegin;
+	std::chrono::high_resolution_clock::time_point timeLastTimerProblem;
 	TabletState outputState;
 	TabletState outputStateWrite;
 	InputEmulator inputEmulator;
diff --git a/TabletDriverService/TabletMeasurement.cpp b/TabletDriverService/TabletMeasurement.cpp
index 89ab974..bd01dca 100644
--- a/TabletDriverService/TabletMeasurement.cpp
+++ b/TabletDriverService/TabletMeasurement.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "TabletMeasurement.h"
 
 #define LOG_MODULE "Measurement"
diff --git a/TabletDriverService/TabletSettings.cpp b/TabletDriverService/TabletSettings.cpp
index 7bf7884..b7745fe 100644
--- a/TabletDriverService/TabletSettings.cpp
+++ b/TabletDriverService/TabletSettings.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "TabletSettings.h"
 
 
@@ -27,9 +27,12 @@ TabletSettings::TabletSettings() {
 	scrollDrag = false;
 	skew = 0;
 	dataFormat = TabletFormatNormal;
-	buttonMap[0] = "MOUSE1";
-	buttonMap[1] = "MOUSE2";
-	buttonMap[2] = "MOUSE3";
+	buttonMap[0].Add(new InputEmulator::InputAction(InputEmulator::ActionTypeMouse, "Mouse 1"));
+	buttonMap[0].actions[0]->mouseButton = 1;
+	buttonMap[1].Add(new InputEmulator::InputAction(InputEmulator::ActionTypeMouse, "Mouse 2"));
+	buttonMap[1].actions[0]->mouseButton = 2;
+	buttonMap[2].Add(new InputEmulator::InputAction(InputEmulator::ActionTypeMouse, "Mouse 3"));
+	buttonMap[2].actions[0]->mouseButton = 3;
 	buttonCount = 3;
 
 	// Aux
@@ -47,3 +50,16 @@ TabletSettings::TabletSettings() {
 //
 TabletSettings::~TabletSettings() {
 }
+
+//
+// Set input emulator
+//
+void TabletSettings::SetInputEmulator(InputEmulator * emulator)
+{
+	for (InputEmulator::InputActionCollection &collection : buttonMap) {
+		collection.emulator = emulator;
+	}
+	for (InputEmulator::InputActionCollection &collection : auxButtonMap) {
+		collection.emulator = emulator;
+	}
+}
diff --git a/TabletDriverService/TabletSettings.h b/TabletDriverService/TabletSettings.h
index 4e8efee..01b5065 100644
--- a/TabletDriverService/TabletSettings.h
+++ b/TabletDriverService/TabletSettings.h
@@ -2,6 +2,8 @@
 
 #include "DataFormatter.h"
 
+#include "InputEmulator.h"
+
 class TabletSettings {
 public:
 
@@ -41,7 +43,7 @@ class TabletSettings {
 	bool scrollDrag;
 	double skew;
 	TabletDataFormat dataFormat;
-	string buttonMap[16];
+	InputEmulator::InputActionCollection buttonMap[32];
 	int buttonCount;
 
 
@@ -59,10 +61,12 @@ class TabletSettings {
 	int auxReportCount;
 	AuxReport *auxCurrentReport;
 	int auxCurrentReportIndex;
-	string auxButtonMap[16];
+	InputEmulator::InputActionCollection auxButtonMap[32];
 	int auxButtonCount;
 
 	TabletSettings();
 	~TabletSettings();
+
+	void SetInputEmulator(InputEmulator *emulator);
 };
 
diff --git a/TabletDriverService/TabletState.cpp b/TabletDriverService/TabletState.cpp
index a4d63c4..7dc285f 100644
--- a/TabletDriverService/TabletState.cpp
+++ b/TabletDriverService/TabletState.cpp
@@ -1,9 +1,9 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "TabletState.h"
 
 
 TabletState::TabletState() {
-	time = chrono::high_resolution_clock::now();
+	time = std::chrono::high_resolution_clock::now();
 	
 	inputButtons = 0;
 	inputPosition.Set(0,0);
diff --git a/TabletDriverService/TabletState.h b/TabletDriverService/TabletState.h
index 37cf02e..0226c62 100644
--- a/TabletDriverService/TabletState.h
+++ b/TabletDriverService/TabletState.h
@@ -5,7 +5,7 @@
 
 class TabletState {
 public:
-	chrono::high_resolution_clock::time_point time;
+	std::chrono::high_resolution_clock::time_point time;
 	
 	unsigned char inputButtons;
 	Vector2D inputPosition;
diff --git a/TabletDriverService/USBDevice.cpp b/TabletDriverService/USBDevice.cpp
index b95e447..4282e61 100644
--- a/TabletDriverService/USBDevice.cpp
+++ b/TabletDriverService/USBDevice.cpp
@@ -1,10 +1,10 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "USBDevice.h"
 
 #define LOG_MODULE "USBDevice"
 #include "Logger.h"
 
-USBDevice::USBDevice(string Guid) {
+USBDevice::USBDevice(std::string Guid) {
 	this->guid = Guid;
 	isOpen = false;
 	if(this->OpenDevice(&_deviceHandle, &_usbHandle, &deviceDescriptor, guid)) {
@@ -16,7 +16,7 @@ USBDevice::~USBDevice() {
 }
 
 
-bool USBDevice::OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *outUSBHandle, USB_DEVICE_DESCRIPTOR *outDeviceDescriptor, string usbDeviceGUIDString) {
+bool USBDevice::OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *outUSBHandle, USB_DEVICE_DESCRIPTOR *outDeviceDescriptor, std::string usbDeviceGUIDString) {
 	GUID usbDeviceGUID;
 
 	HDEVINFO                         deviceInfo;
@@ -160,7 +160,7 @@ int USBDevice::Read(UCHAR pipeId, void *buffer, int length) {
 		if(WinUsb_ReadPipe(_usbHandle, pipeId, (UCHAR *)buffer, length, &bytesRead, 0)) {
 			return (int)bytesRead;
 		}
-	} catch(exception &e) {
+	} catch(std::exception &e) {
 		LOG_ERROR("Exception USB: %s\n", e.what());
 	}
 	return 0;
@@ -213,8 +213,8 @@ int USBDevice::StringRequest(UCHAR stringId, UCHAR *buffer, int length)
 	return bytesRead;
 }
 
-string USBDevice::GetString(UCHAR stringId) {
-	string resultString = "";
+std::string USBDevice::GetString(UCHAR stringId) {
+	std::string resultString = "";
 	UCHAR buffer[256];
 	int bytesRead = 0;
 
@@ -231,20 +231,20 @@ string USBDevice::GetString(UCHAR stringId) {
 }
 
 // Get WinUSB device manufacturer name
-string USBDevice::GetManufacturerName() {
+std::string USBDevice::GetManufacturerName() {
 	if(deviceDescriptor.iManufacturer == 0) return "";
 	return GetString(deviceDescriptor.iManufacturer);
 }
 
 // Get WinUSB device product name
-string USBDevice::GetProductName()
+std::string USBDevice::GetProductName()
 {
 	if(deviceDescriptor.iProduct == 0) return "";
 	return GetString(deviceDescriptor.iProduct);
 }
 
 // Get WinUSB device serial number
-string USBDevice::GetSerialNumber()
+std::string USBDevice::GetSerialNumber()
 {
 	if(deviceDescriptor.iSerialNumber == 0) return "";
 	return GetString(deviceDescriptor.iSerialNumber);
@@ -258,14 +258,14 @@ void USBDevice::CloseDevice() {
 		try {
 			WinUsb_Free(_usbHandle);
 			_usbHandle = NULL;
-		} catch(exception &e) {
+		} catch(std::exception &e) {
 			LOG_ERROR("WinUSB WinUsb_Free ERROR! %s\n", e.what());
 		}
 	}
 	if(_deviceHandle != NULL && _deviceHandle != INVALID_HANDLE_VALUE) {
 		try {
 			SAFE_CLOSE_HANDLE(_deviceHandle);
-		} catch(exception &e) {
+		} catch(std::exception &e) {
 			LOG_ERROR("WinUSB CloseHandler ERROR! %s\n", e.what());
 		}
 	}
diff --git a/TabletDriverService/USBDevice.h b/TabletDriverService/USBDevice.h
index a4f6967..f56d0d9 100644
--- a/TabletDriverService/USBDevice.h
+++ b/TabletDriverService/USBDevice.h
@@ -1,39 +1,37 @@
 #pragma once
 
-#include <windows.h>
 #include <stdio.h>
 #include <tchar.h>
 #include <strsafe.h>
 #include <string>
-
 #include <math.h>
+
+#include <Windows.h>
 #include <winusb.h>
 #include <Usb100.h>
 #include <SetupAPI.h>
 #include <hidsdi.h>
 #include <psapi.h>
 
-using namespace std;
-
 class USBDevice {
 private:
 	HANDLE _deviceHandle;
 	WINUSB_INTERFACE_HANDLE _usbHandle;
-	bool OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *outUSBHandle, USB_DEVICE_DESCRIPTOR *outDeviceDescriptor, string usbDeviceGUIDString);
+	bool OpenDevice(HANDLE *outDeviceHandle, WINUSB_INTERFACE_HANDLE *outUSBHandle, USB_DEVICE_DESCRIPTOR *outDeviceDescriptor, std::string usbDeviceGUIDString);
 public:
-	string guid;
+	std::string guid;
 	USB_DEVICE_DESCRIPTOR deviceDescriptor;
 	bool isOpen;
 
-	USBDevice(string Guid);
+	USBDevice(std::string Guid);
 	~USBDevice();
 	int Read(UCHAR pipeId, void *buffer, int length);
 	int Write(UCHAR pipeId, void *buffer, int length);
 	int ControlTransfer(UCHAR requestType, UCHAR request, USHORT value, USHORT index, void *buffer, USHORT length);
 	int StringRequest(UCHAR stringId, UCHAR *buffer, int length);
-	string GetString(UCHAR stringId);
-	string GetManufacturerName();
-	string GetProductName();
-	string GetSerialNumber();
+	std::string GetString(UCHAR stringId);
+	std::string GetManufacturerName();
+	std::string GetProductName();
+	std::string GetSerialNumber();
 	void CloseDevice();
 };
\ No newline at end of file
diff --git a/TabletDriverService/VMulti.cpp b/TabletDriverService/VMulti.cpp
index 886fee5..82dd6bb 100644
--- a/TabletDriverService/VMulti.cpp
+++ b/TabletDriverService/VMulti.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "VMulti.h"
 
 #define LOG_MODULE "VMulti"
diff --git a/TabletDriverService/Vector2D.cpp b/TabletDriverService/Vector2D.cpp
index a01c731..e756b0c 100644
--- a/TabletDriverService/Vector2D.cpp
+++ b/TabletDriverService/Vector2D.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "precompiled.h"
 #include "Vector2D.h"
 
 //
diff --git a/TabletDriverService/config/tablet.cfg b/TabletDriverService/config/tablet.cfg
index 6021220..abcd91b 100644
--- a/TabletDriverService/config/tablet.cfg
+++ b/TabletDriverService/config/tablet.cfg
@@ -1113,6 +1113,51 @@ AuxCustomData ButtonsHigh Source=3
 AuxCustomData IsPressed Source=2 WriteMode=Set
 
 
+
+#
+# Playstation Dualshock 4 (Slim) (Custom Data Example)
+#
+# Disabled
+HIDTablet 0xF0F0 0xF0F0 0xF0F0 0xF0F0
+#HIDTablet 0x054C 0x09CC 0x0001 0x0005
+
+Name "Dualshock 4 (Custom Data Example)"
+ReportId 0x01
+ReportLength 64
+DetectMask 0x80
+MaxX 1920.0
+MaxY 943.0
+MaxPressure 1023
+Width 38.0
+Height 19.0
+TabletFormat Custom
+
+# Report id
+CustomData ReportId Source=0
+
+# In range (0x80)
+CustomData Buttons Source=34 SourceMask=0x01 SourceShift=7
+
+# Button X -> Tip button
+CustomData Buttons Source=5 SourceMask=0x20 SourceShift=-5 TargetMask=0x01
+# Button Square -> Top button
+CustomData Buttons Source=5 SourceMask=0x10 SourceShift=-2 TargetMask=0x04
+# Button Circle -> Bottom button
+CustomData Buttons Source=5 SourceMask=0x40 SourceShift=-5 TargetMask=0x02
+
+# X low byte
+CustomData XLow Source=36
+# X high byte
+CustomData XHigh Source=37 SourceMask=0x0F
+
+# Y low byte
+CustomData YLow Source=37 SourceMask=0xF0 SourceShift=-4
+CustomData YLow Source=38 SourceMask=0x0F SourceShift=4
+# Y high byte
+CustomData YHigh Source=38 SourceMask=0xFF SourceShift=-4
+
+
+
 #
 # XP-Pen G640 (Custom Data Example)
 #
diff --git a/TabletDriverService/precompiled.cpp b/TabletDriverService/precompiled.cpp
new file mode 100644
index 0000000..5f656a4
--- /dev/null
+++ b/TabletDriverService/precompiled.cpp
@@ -0,0 +1 @@
+#include "precompiled.h"
diff --git a/TabletDriverService/stdafx.h b/TabletDriverService/precompiled.h
similarity index 80%
rename from TabletDriverService/stdafx.h
rename to TabletDriverService/precompiled.h
index edb832b..44796aa 100644
--- a/TabletDriverService/stdafx.h
+++ b/TabletDriverService/precompiled.h
@@ -1,48 +1,43 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-#pragma once
-#include "targetver.h"
-
-#include <windows.h>
-#include <stdio.h>
-#include <math.h>
-
-
-#include "VMulti.h"
-#include "Tablet.h"
-#include "TabletHandler.h"
-#include "ScreenMapper.h"
-#include "OutputManager.h"
-#include "CommandHandler.h"
-#include "NamedPipeServer.h"
-#include "NamedPipeInput.h"
-#include "NamedPipeState.h"
-
-// IntelliSense "fix"...
-//#define memcpy memcpy
-
-#define SAFE_CLOSE_HANDLE(handle) \
-	if((handle) != NULL && (handle) != (INVALID_HANDLE_VALUE)) { \
-		CloseHandle(handle); \
-		handle = NULL; \
-	};
-
-
-// Global variables
-extern VMulti *vmulti;
-extern CommandHandler *commandHandler;
-extern Tablet *tablet;
-extern TabletHandler *tabletHandler;
-extern OutputManager *outputManager;
-extern ScreenMapper *mapper;
-extern NamedPipeInput *pipeInput;
-extern NamedPipeServer *pipeOutput;
-extern NamedPipeState *pipeState;
-
-// Cleanup and exit
-extern void CleanupAndExit(int code);
-
-// Process command
-extern bool ProcessCommand(CommandLine *cmd);
+#pragma once
+
+#include "targetver.h"
+
+#include <stdio.h>
+#include <math.h>
+
+#include "VMulti.h"
+#include "Tablet.h"
+#include "TabletHandler.h"
+#include "ScreenMapper.h"
+#include "OutputManager.h"
+#include "CommandHandler.h"
+#include "NamedPipeServer.h"
+#include "NamedPipeInput.h"
+#include "NamedPipeState.h"
+
+// IntelliSense "fix"...
+//#define memcpy memcpy
+
+#define SAFE_CLOSE_HANDLE(handle) \
+	if((handle) != NULL && (handle) != (INVALID_HANDLE_VALUE)) { \
+		CloseHandle(handle); \
+		handle = NULL; \
+	};
+
+
+// Global variables
+extern VMulti *vmulti;
+extern CommandHandler *commandHandler;
+extern Tablet *tablet;
+extern TabletHandler *tabletHandler;
+extern OutputManager *outputManager;
+extern ScreenMapper *mapper;
+extern NamedPipeInput *pipeInput;
+extern NamedPipeServer *pipeOutput;
+extern NamedPipeState *pipeState;
+
+// Cleanup and exit
+extern void CleanupAndExit(int code);
+
+// Process command
+extern bool ProcessCommand(CommandLine *cmd);
diff --git a/TabletDriverService/stdafx.cpp b/TabletDriverService/stdafx.cpp
deleted file mode 100644
index 6cec2b9..0000000
--- a/TabletDriverService/stdafx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// TabletDriverService.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file

From d53eb54f16930ec76936295579f34043d8416f36 Mon Sep 17 00:00:00 2001
From: hawku <mikko.jaakkola@gmail.com>
Date: Fri, 25 Jan 2019 17:11:26 +0200
Subject: [PATCH 82/83] Check the queue before waiting for new items

---
 TabletDriverService/BufferQueue.cpp | 12 +++++++++++-
 TabletDriverService/Logger.cpp      | 19 ++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/TabletDriverService/BufferQueue.cpp b/TabletDriverService/BufferQueue.cpp
index 145cbdf..2e3322c 100644
--- a/TabletDriverService/BufferQueue.cpp
+++ b/TabletDriverService/BufferQueue.cpp
@@ -53,7 +53,17 @@ void BufferQueue::Clear()
 void BufferQueue::Wait()
 {
 	std::unique_lock<std::mutex> mlock(lockWait);
-	conditionBuffer.wait(mlock);
+
+	// Check if the queue is empty
+	bool isQueueEmpty = false;
+	lockQueue.lock();
+	isQueueEmpty = queue.empty();
+	lockQueue.unlock();
+
+	// Wait for items if queue is empty
+	if (isQueueEmpty) {
+		conditionBuffer.wait(mlock);
+	}
 }
 
 //
diff --git a/TabletDriverService/Logger.cpp b/TabletDriverService/Logger.cpp
index f0090cc..e932fba 100644
--- a/TabletDriverService/Logger.cpp
+++ b/TabletDriverService/Logger.cpp
@@ -281,7 +281,17 @@ void Logger::NotifyNewItem()
 void Logger::WaitNewItem()
 {
 	std::unique_lock<std::mutex> mlock(lockNewItem);
-	conditionNewItem.wait(mlock);
+
+	// Check if the queue is empty
+	bool isQueueEmpty = false;
+	lockQueue.lock();
+	isQueueEmpty = logQueue.empty();
+	lockQueue.unlock();
+
+	// Wait for items if queue is empty
+	if (isQueueEmpty) {
+		conditionNewItem.wait(mlock);
+	}
 }
 
 
@@ -292,15 +302,14 @@ void Logger::run() {
 
 	while (true) {
 
+		// Shutdown the thread
+		if (!IsRunning()) break;
+
 		// Wait for the new item
 		WaitNewItem();
 
 		// Process item queue
 		ProcessQueue();
-
-		// Shutdown the thread
-		if (!IsRunning()) break;
-
 	}
 
 	printf("Logger thread exit!\n");

From fd2185e0778b22839fb6b2f7598f529a8465ebaf Mon Sep 17 00:00:00 2001
From: Mikko Jaakkola <mikko.jaakkola@gmail.com>
Date: Tue, 28 Dec 2021 17:55:14 +0200
Subject: [PATCH 83/83] Update README.md

---
 README.md | 264 +-----------------------------------------------------
 1 file changed, 3 insertions(+), 261 deletions(-)

diff --git a/README.md b/README.md
index da9e4a3..a59d4b4 100644
--- a/README.md
+++ b/README.md
@@ -2,264 +2,6 @@
 
 This is a low latency graphics tablet driver that is meant to be used with rhythm game [osu!](https://osu.ppy.sh/home)
 
-Currently the driver only works when the TabletDriverGUI is running.
-
-The GUI minimizes to system tray / notification area. You can reopen the GUI by double clicking the system tray icon.
-
-**If you have problems with the driver, please read the FAQ:**
-
-**https://github.com/hawku/TabletDriver/wiki/FAQ**
-
-## Download
-
-### http://hwk.fi/TabletDriver/TabletDriverV0.2.3.zip
-
-#
-
-### Supported operating systems:
-  - Windows 10 64-bit
-  - Windows 8.1 64-bit
-  - Windows 8 64-bit
-  - Windows 7 64-bit (Multiple monitors do not work in absolute mode)
-
-#
-
-### Supported tablets:
-  - Wacom CTE-440
-  - Wacom CTL-470
-  - Wacom CTH-470
-  - Wacom CTL-471
-  - Wacom CTL-472
-  - Wacom CTL-480
-  - Wacom CTH-480
-  - Wacom CTL-490
-  - Wacom CTH-490
-  - Wacom CTL-4100 USB
-  - Wacom CTL-4100 Bluetooth
-  - Wacom CTL-671
-  - Wacom CTL-672
-  - Wacom CTL-680
-  - Wacom CTH-680
-  - Wacom CTL-690
-  - Wacom CTH-690
-  - Wacom PTH-660
-  - Wacom PTH-451
-  - Wacom PTH-850
-  - XP-Pen G430 (New 2017+ "Model B". Old G430 is not supported)
-  - XP-Pen G430S
-  - XP-Pen G540 Pro (G540 is not supported)
-  - XP-Pen G640
-  - XP-Pen G640S
-  - XP-Pen Deco 01
-  - XP-Pen Deco 01 v2
-  - Huion 420
-  - Huion H420
-  - Huion H430P
-  - Huion H640P
-  - Huion osu!tablet
-  - Gaomon S56K
-  - VEIKK S640
-  
-### Configured, but not properly tested:
-> - Huion New 1060 Plus
-> - Huion Inspiroy Q11K
-  - Other Wacom tablets that might work: https://github.com/hawku/TabletDriver/blob/master/TabletDriverService/config/wacom.cfg
-
-#
-
-## Installation
-
-1. You might need to install these libraries, but usually these are already installed:
-    * https://www.microsoft.com/net/download/dotnet-framework-runtime
-    * https://aka.ms/vs/15/release/vc_redist.x86.exe
-
-2. Unzip the driver to a folder (Shorter path is recommended, for example `C:\Temp\TabletDriver`)
-3. Uninstall all other tablet drivers. If you have problems with uninstalling the Wacom drivers, check the GitHub issue [#1](https://github.com/hawku/TabletDriver/issues/1)
-4. Run `install_vmulti_driver.bat`. It might need a restart if there is another vmulti driver installed.
-5. If you have Huion or Gaomon tablet, you need to run `install_huion_64.bat`, which is in the `driver_huion` directory.
-6. Start the TabletDriverGUI.exe
-
-## Updating to a new version
-
-1. Unzip the new version
-2. Start the TabletDriverGUI.exe
-
-## Uninstallation
-
-1. Uncheck the "Run at Windows startup" option in the GUI.
-2. Run `remove_vmulti_driver.bat`
-3. Run `remove_huion_64.bat`, which is in the `driver_huion` directory.
-
-#
-
-## VMulti and Huion driver binaries
-
-If you want to compile the code and don't want to install anything from the TabletDriver binary package, you will need extract the missing drivers from these installation packages:
-
-**VMulti driver:**
-- https://www.xp-pen.com/upload/download/20181019/osuWin(20181019).zip
-
-**Huion WinUSB driver:**
-- https://www.huiontablet.com/drivers/WinDriver/HuionTablet_WinDriver_v14.7.60.zip
-
-#
-
-## Changelog
-
->**v0.2.3:**
-> - Fixed "TabletDriverService.exe has stopped working" error when a tablet is not connected.
-> - Relative mouse mode can now have different sensitivity on X and Y axis.
-> - Added SendInput output mode to GUI
-
->**v0.2.2:**
-> - XP-Pen G430S configuration by [frodriguez96](https://github.com/frodriguez96) and [riley-badour](https://github.com/riley-badour)
-> - Huion New 1060 Plus configuration by [riley-badour](https://github.com/riley-badour)
-> - Huion Inspiroy Q11K configuration by [octoberU](https://github.com/octoberU)
-> - Wacom CTL-690 and CTH-690 configurations moved to tablet.cfg and DetectMask fixed.
-> - Few more Wacom tablets can now be used while the official drivers are installed (check tablet.cfg)
-> - Tablet button support for Wacom CTH-480, CTL-490, CTL-4100, Huion H430P and H640P.
-> - Custom tablet data format configuration (check tablet.cfg for examples)
-> - Pen and tablet button mapping to a mouse buttons and keyboard keys.
-> - Pen button mapping to scroll.
-> - Windows Ink pressure settings and test canvas.
-> - Smoothing filter now also smooths out pen pressure.
-> - Smoothing can be set to only smooth out when pen buttons are down.
-> - Anti-smoothing compensation value is now in milliseconds (check tooltip for example values)
-> - Ability start the TabletDriverService.exe without GUI (`tools\RunServiceOnly.bat`)
-
->**v0.2.1:**
-> - XP-Pen G640S and VEIKK S640 configurations by [frodriguez96](https://github.com/frodriguez96)
-> - Original XP-Pen, Huion and VEIKK driver processes will now be killed when the TabletDriverGUI starts.
-> - Fixed cursor jumping to the corner when driver restarts or tablet disconnects.
-> - Removed device list from driver startup. Might help with the problems that the driver restart is causing other USB devices to glitch out.
-> - Relative mode position reset is now decided by when the last tablet movement was received (default 100 ms, `RelativeResetTime` command).
-> - Added ability to disable automatic restart.
-> - Added command name autocomplete to the console input (tab) and commands tab (control + space).
-> - Added gravity filter (`GravityFilter` command). It's just for fun and testing. Works only when pen buttons are pressed.
-> - Added 32-bit VMulti and Huion drivers to the driver zip file.
-
->**v0.2:**
-> - **Improved the noise reduction filter and added the settings to the GUI.**
-> - **Added an anti-smoothing filter which reduces the input latency on tablets that use hardware smoothing.**
-> - Wacom CTE-440 support by [Poliwrath](https://github.com/Poliwrath)
-> - Wacom PTH-660 support by [Implojin](https://github.com/Implojin)
-> - XP-Pen Deco 01 v2 support by [Itsyuka](https://github.com/Itsyuka)
-> - Modified Huion 420 and H420 tablet area size to match with the 2000 LPI resolution.
-> - Updated Huion drivers to the latest version.
-> - Moved the filter settings to filters tab in the GUI.
-> - Added `Measure` command. Measures distances between clicked points.
-> - Added an ability to "draw" tablet area by clicking two points with the pen.
-> - Added "Restart driver" option to the notification icon menu.
-> - Added 1000 Hz smoothing filter rate option to the GUI.
-> - Added few tablets to wacom.cfg
-> - Major code refactoring.
-
->**v0.1.5:**
-> - New tablet configurations: Wacom CTL-4100 (USB only model), XP-Pen G540 Pro, XP-Pen Deco 01 and Huion osu!tablet
->   Thanks to /u/THEqrunt for capturing the XP-Pen Deco 01 USB data.
-> - Added `ResetDistance` command, it controls the relative mode position reset distance.
-> - Code refactoring.
-
->**v0.1.4:**
-> - Modified the Wacom CTL-471 full area size (147.20 x 92.25 mm to 152 x 95 mm)
-> - New tablet configurations: Wacom PTH-850 and Huion H430P
->   The PTH-850 configuration is made by [mojobojo](https://github.com/mojobojo)
-> - Regenerated the wacom.cfg with new parameters, so it now includes PTH-450/650/850 and PTK-450/650
-
->**v0.1.3:**
-> - Added left handed mode / tablet invert option.
-> - Added Wacom driver device support for the CTL-471 and 472
-> - Noise reduction filter improvement (`Noise` command)
-
->**v0.1.2:**
-> - Added experimental support for leaving the Wacom drivers installed on the system.
->   Supported tablets: CTL-470, CTL-480, CTH-480, CTL-4100
-> - Added `disable_wacom_drivers.bat` and `enable_wacom_drivers.bat` to the `tools` folder.
->   These scripts are used to disable and enable Wacom drivers when using the experimental Wacom driver support.
-> - Added driver restart button.
-
->**v0.1.1:**
-> - Added support for Wacom CTL-4100 (USB and Bluetooth)
-> - Added settings import / export to the main menu.
-> - Added Wacom backup reader to the Wacom area tool.
-> - Added tablet benchmark tools to the console output context menu (Right click).
-> - Moved the `config.xml` to the `config` folder.
-> - Added noise reduction filter (`Noise` command, not in the GUI)
-> - Code refactoring
-
->**v0.1.0:**
-> - Added `Bench` / `Benchmark` command.
-> - Added `-hide` GUI command line parameter. GUI will start as minimized when you run `TabletDriverGUI.exe -hide` 
-> - Added an option to run the TabletDriverGUI at Windows startup.
-
->**v0.0.18:**
-> - Added TabletDriverService.exe multi-instance prevention.
-> - Added yet another Wacom 490 tip click fix.
->   `KeepTipDown` command sets how long the pen tip button output should be kept down after the pen tip is released.
-
->**v0.0.17:**
-> - Fixed driver crashing when used with the Huion or Gaomon tablets.
-
->**v0.0.16:**
-> - Added smoothing filter rate selector. Use a lower rate if you have filter performance problems.
-> - Added TabletDriverService.exe process priority warning when the priority isn't set to High.
-> - Desktop size settings are now available to everyone.
->   Previously shown only when the developer mode was enabled.
->   Automatic size should be used, but if you have problems with the screen mapping:
->   https://github.com/hawku/TabletDriver/issues/4
-> - First few tablet position packets are now ignored to prevent the cursor jumping to a wrong position when driver is started.
-
->**v0.0.15:**
-> - Added more debug information to startuplog.txt. It now includes a list of connected input devices.
-> - Added debug tools to the console output context menu (Right click).
-> - Removed ClickPressure workaround from Wacom 490.
->   You can re-enable that by adding `ClickPressure 500` to Commands tab.
-> - Updated the wacom.cfg
-
->**v0.0.14:**
-> - Fix for the console "Copy all" function.
-
->**v0.0.13:**
-> - Added a direction indicator to the tablet area and moved the aspect ratio text to the middle of the area.
-> - TabletDriverService process priority class is now set to "High" (suggestion by /u/Devocub)
-> - TabletDriverService stability and error handling improvements (thanks to https://github.com/freakode)
-> - New tablet configurations: Huion H420 (made by /u/uyghti)
-> - Automatically generated Wacom tablet configurations (config\wacom.cfg)
-
->**v0.0.12:**
-> - Added multi-instance prevention. Old TabletDriverGUI.exe should pop up if you try to open another one.
-> - New tablet configurations: Wacom CTL-680 and CTH-680
-
->**v0.0.11:**
-> - Fix for DPI scaling problems. Screen mapping were wrong when the monitor DPI scaling wasn't 100%
-> - Added a Wacom area tool. It should work with Wacom Intuos and Bamboo tablets (470->490)
-> - Added startup debug log
-
->**v0.0.10:**
-> - New tablet configurations: Wacom CTH-470, CTH-670, PTH-451
-> - Fix for the smoothing filter. The filter didn't turn on when the settings were applied.
-> - Fix for the Huion H640P clicking problem and also added better data validation for Huion 420,
->   Gaomon S56K, XP-Pen G430 and G640.
-> - Modified click detection on CTL-490 and CTH-490 (tablet.cfg ClickPressure).
-
->**v0.0.9:**
-> - Yet another fix for the clicking problem... Maybe this time it will work?
-
->**v0.0.8:**
-> - Another fix for pen tip clicking. Improved the tablet data validation.
-
->**v0.0.7:**
-> - Added aspect ratio text to screen and tablet area.
-> - Workaround for pen tip click detection. Some tablets don't send correct button data, so the pen tip click is now detected from the pressure data
-
->**v0.0.6:**
-> - Improved smoothing filter latency calculation
-
->**v0.0.5:**
-> - Added Windows Ink mode with pressure sensitivity
-> - Added relative mouse mode
-> - Added tablet area rotation
-> - Added optional smoothing filter
-
->**v0.0.4:**
-> - Fixed a number conversion bug in the tablet area detection.
+### This driver has not been updated for latest Windows versions!
+#### Please, use OpenTabletDriver:
+https://github.com/OpenTabletDriver/OpenTabletDriver