From a12518886c800a86ee533f106b77249dddb2198a Mon Sep 17 00:00:00 2001
From: David Khachaturov <d77777k@gmail.com>
Date: Sat, 27 Apr 2019 15:21:06 +0100
Subject: [PATCH] Formatting clean-up and calibration addition cleanup.

---
 BetterJoyForCemu/App.config           |   5 +-
 BetterJoyForCemu/Config.cs            | 156 ++---
 BetterJoyForCemu/Joycon.cs            | 801 +++++++++++++------------
 BetterJoyForCemu/MainForm.Designer.cs |   4 -
 BetterJoyForCemu/MainForm.cs          | 634 ++++++++++----------
 BetterJoyForCemu/Program.cs           | 814 +++++++++++++-------------
 BetterJoyForCemu/UpdServer.cs         |  60 +-
 7 files changed, 1215 insertions(+), 1259 deletions(-)

diff --git a/BetterJoyForCemu/App.config b/BetterJoyForCemu/App.config
index 809f12c..2a5a240 100644
--- a/BetterJoyForCemu/App.config
+++ b/BetterJoyForCemu/App.config
@@ -44,8 +44,9 @@
     <!-- Should prevent any more issues of the controller being unusable after the program (even though this can be fixed if you read the README) -->
     <!-- Default: true -->
     <add key="PurgeAffectedDevices" value="true" />
-    <!-- Determines whether or not the program will use mannually calibrate gyro data for non-original controller. -->
-    <!-- When "true", click "Calibrate" button once to get gyro calibrate data.-->
+    <!-- Determines whether or not to enable (experimental - currently default controller to pro) support for 3rd-party controllers. Adds a "Calibrate" button. -->
+    <!-- When "true", click "Calibrate" button once to get gyro calibrate data .-->
+	<!-- When enabled, can only calibrate one controller at a time. -->
     <!-- Default: false -->
     <add key="NonOriginalController" value="false" />
   </appSettings>
diff --git a/BetterJoyForCemu/Config.cs b/BetterJoyForCemu/Config.cs
index d4db3f5..0281367 100644
--- a/BetterJoyForCemu/Config.cs
+++ b/BetterJoyForCemu/Config.cs
@@ -6,85 +6,89 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace BetterJoyForCemu {
-    public static class Config { // stores dynamic configuration, including
-        const string PATH = "settings";
-        static Dictionary<string, bool> variables = new Dictionary<string, bool>();
+	public static class Config { // stores dynamic configuration, including
+		const string PATH = "settings";
+		static Dictionary<string, bool> variables = new Dictionary<string, bool>();
 
-        public static void Init(List<KeyValuePair<string, float[]>> caliData) {
-            variables["ProgressiveScan"] = true;
-            variables["StartInTray"] = false;
+		const int settingsNum = 2; // currently - ProgressiveScan, StartInTray
 
-            if (File.Exists(PATH)) {
-                using (StreamReader file = new StreamReader(PATH)) {
-                    string line = String.Empty;
-                    int lineNO = 0;
-                    while ((line = file.ReadLine()) != null) {
-                        string[] vs = line.Split();
-                        try {
-                            if (lineNO < 2){
-                                variables[vs[0]] = Boolean.Parse(vs[1]);
-                            } else {
-                                caliData.Clear();
-                                for (int i = 0; i < vs.Length; i++){
-                                    string[] caliArr = vs[i].Split(',');
-                                    float[] newArr = new float[6];
-                                    for (int j = 1; j < caliArr.Length; j++){
-                                        newArr[j-1] =  float.Parse(caliArr[j]);
-                                    }
-                                    caliData.Add(new KeyValuePair<string, float[]>(
-                                        caliArr[0],
-                                        newArr
-                                    ));
-                                }
-                            }
-                        } catch { }
-                        lineNO++;
-                    }
-                }
-            } else {
-                using (StreamWriter file = new StreamWriter(PATH)) {
-                    foreach (string k in variables.Keys)
-                        file.WriteLine(String.Format("{0} {1}", k, variables[k]));
-                    string caliStr = "";
-                    for(int i = 0; i < caliData.Count; i++){
-                        string space = " ";
-                        if (i == 0) space = "";
-                        caliStr += space + caliData[i].Key + "," + String.Join(",", caliData[i].Value);
-                    }
-                    file.WriteLine(caliStr);
-                }
-            }
-        }
+		public static void Init(List<KeyValuePair<string, float[]>> caliData) {
+			variables["ProgressiveScan"] = true;
+			variables["StartInTray"] = false;
 
-        public static bool Value(string key) {
-            if (!variables.ContainsKey("ProgressiveScan") && !variables.ContainsKey("StartInTray")) {
-                return false;
-            }
-            return variables[key];
-        }
+			if (File.Exists(PATH)) {
+				using (StreamReader file = new StreamReader(PATH)) {
+					string line = String.Empty;
+					int lineNO = 0;
+					while ((line = file.ReadLine()) != null) {
+						string[] vs = line.Split();
+						try {
+							if (lineNO < settingsNum) { // load in basic settings
+								variables[vs[0]] = Boolean.Parse(vs[1]);
+							} else { // load in calibration presets
+								caliData.Clear();
+								for (int i = 0; i < vs.Length; i++) {
+									string[] caliArr = vs[i].Split(',');
+									float[] newArr = new float[6];
+									for (int j = 1; j < caliArr.Length; j++) {
+										newArr[j - 1] = float.Parse(caliArr[j]);
+									}
+									caliData.Add(new KeyValuePair<string, float[]>(
+										caliArr[0],
+										newArr
+									));
+								}
+							}
+						} catch { }
+						lineNO++;
+					}
+				}
+			} else {
+				using (StreamWriter file = new StreamWriter(PATH)) {
+					foreach (string k in variables.Keys)
+						file.WriteLine(String.Format("{0} {1}", k, variables[k]));
+					string caliStr = "";
+					for (int i = 0; i < caliData.Count; i++) {
+						string space = " ";
+						if (i == 0) space = "";
+						caliStr += space + caliData[i].Key + "," + String.Join(",", caliData[i].Value);
+					}
+					file.WriteLine(caliStr);
+				}
+			}
+		}
 
-        public static void SaveCaliData(List<KeyValuePair<string, float[]>> caliData){
-            string[] txt = File.ReadAllLines(PATH);
-            string caliStr = "";
-            for (int i = 0; i < caliData.Count; i++){
-                string space = " ";
-                if (i == 0) space = "";
-                caliStr += space + caliData[i].Key + "," + String.Join(",", caliData[i].Value);
-            }
-            txt[2] = caliStr;
-            File.WriteAllLines(PATH, txt);
-        }
+		public static bool Value(string key) {
+			if (!variables.ContainsKey("ProgressiveScan") && !variables.ContainsKey("StartInTray")) {
+				return false;
+			}
+			return variables[key];
+		}
 
-        public static void Save(string key, bool value) {
-            variables[key] = value;
-            string[] txt = File.ReadAllLines(PATH);
-            int NO = 0;
-            foreach (string k in variables.Keys)
-            {
-                txt[NO] = String.Format("{0} {1}", k, variables[k]);
-                NO++;
-            }
-            File.WriteAllLines(PATH, txt);
-        }
-    }
+		public static void SaveCaliData(List<KeyValuePair<string, float[]>> caliData) {
+			string[] txt = File.ReadAllLines(PATH);
+			if (txt.Length < settingsNum + 1) // no custom calibrations yet
+				Array.Resize(ref txt, txt.Length + 1);
+
+			string caliStr = "";
+			for (int i = 0; i < caliData.Count; i++) {
+				string space = " ";
+				if (i == 0) space = "";
+				caliStr += space + caliData[i].Key + "," + String.Join(",", caliData[i].Value);
+			}
+			txt[2] = caliStr;
+			File.WriteAllLines(PATH, txt);
+		}
+
+		public static void Save(string key, bool value) {
+			variables[key] = value;
+			string[] txt = File.ReadAllLines(PATH);
+			int NO = 0;
+			foreach (string k in variables.Keys) {
+				txt[NO] = String.Format("{0} {1}", k, variables[k]);
+				NO++;
+			}
+			File.WriteAllLines(PATH, txt);
+		}
+	}
 }
\ No newline at end of file
diff --git a/BetterJoyForCemu/Joycon.cs b/BetterJoyForCemu/Joycon.cs
index 4735aa9..a6618b4 100644
--- a/BetterJoyForCemu/Joycon.cs
+++ b/BetterJoyForCemu/Joycon.cs
@@ -13,228 +13,228 @@ using Nefarius.ViGEm.Client.Targets;
 using Nefarius.ViGEm.Client.Targets.Xbox360;
 
 namespace BetterJoyForCemu {
-    public class Joycon {
-        float timing = 120.0f;
+	public class Joycon {
+		float timing = 120.0f;
 
-        public string path = String.Empty;
-        public bool isPro = false;
-        bool isUSB = false;
-        public Joycon other;
+		public string path = String.Empty;
+		public bool isPro = false;
+		bool isUSB = false;
+		public Joycon other;
 
-        public bool send = true;
+		public bool send = true;
 
-        public enum DebugType : int {
-            NONE,
-            ALL,
-            COMMS,
-            THREADING,
-            IMU,
-            RUMBLE,
-        };
-        public DebugType debug_type = DebugType.NONE;
-        public bool isLeft;
-        public enum state_ : uint {
-            NOT_ATTACHED,
-            DROPPED,
-            NO_JOYCONS,
-            ATTACHED,
-            INPUT_MODE_0x30,
-            IMU_DATA_OK,
-        };
-        public state_ state;
-        public enum Button : int {
-            DPAD_DOWN = 0,
-            DPAD_RIGHT = 1,
-            DPAD_LEFT = 2,
-            DPAD_UP = 3,
-            SL = 4,
-            SR = 5,
-            MINUS = 6,
-            HOME = 7,
-            PLUS = 8,
-            CAPTURE = 9,
-            STICK = 10,
-            SHOULDER_1 = 11,
-            SHOULDER_2 = 12,
+		public enum DebugType : int {
+			NONE,
+			ALL,
+			COMMS,
+			THREADING,
+			IMU,
+			RUMBLE,
+		};
+		public DebugType debug_type = DebugType.NONE;
+		public bool isLeft;
+		public enum state_ : uint {
+			NOT_ATTACHED,
+			DROPPED,
+			NO_JOYCONS,
+			ATTACHED,
+			INPUT_MODE_0x30,
+			IMU_DATA_OK,
+		};
+		public state_ state;
+		public enum Button : int {
+			DPAD_DOWN = 0,
+			DPAD_RIGHT = 1,
+			DPAD_LEFT = 2,
+			DPAD_UP = 3,
+			SL = 4,
+			SR = 5,
+			MINUS = 6,
+			HOME = 7,
+			PLUS = 8,
+			CAPTURE = 9,
+			STICK = 10,
+			SHOULDER_1 = 11,
+			SHOULDER_2 = 12,
 
-            // For pro controller
-            B = 13,
-            A = 14,
-            Y = 15,
-            X = 16,
-            STICK2 = 17,
-            SHOULDER2_1 = 18,
-            SHOULDER2_2 = 19,
-        };
-        private bool[] buttons_down = new bool[20];
-        private bool[] buttons_up = new bool[20];
-        private bool[] buttons = new bool[20];
-        private bool[] down_ = new bool[20];
+			// For pro controller
+			B = 13,
+			A = 14,
+			Y = 15,
+			X = 16,
+			STICK2 = 17,
+			SHOULDER2_1 = 18,
+			SHOULDER2_2 = 19,
+		};
+		private bool[] buttons_down = new bool[20];
+		private bool[] buttons_up = new bool[20];
+		private bool[] buttons = new bool[20];
+		private bool[] down_ = new bool[20];
 
-        private float[] stick = { 0, 0 };
-        private float[] stick2 = { 0, 0 };
+		private float[] stick = { 0, 0 };
+		private float[] stick2 = { 0, 0 };
 
-        private IntPtr handle;
+		private IntPtr handle;
 
-        byte[] default_buf = { 0x0, 0x1, 0x40, 0x40, 0x0, 0x1, 0x40, 0x40 };
+		byte[] default_buf = { 0x0, 0x1, 0x40, 0x40, 0x0, 0x1, 0x40, 0x40 };
 
-        private byte[] stick_raw = { 0, 0, 0 };
-        private UInt16[] stick_cal = { 0, 0, 0, 0, 0, 0 };
-        private UInt16 deadzone;
-        private UInt16[] stick_precal = { 0, 0 };
+		private byte[] stick_raw = { 0, 0, 0 };
+		private UInt16[] stick_cal = { 0, 0, 0, 0, 0, 0 };
+		private UInt16 deadzone;
+		private UInt16[] stick_precal = { 0, 0 };
 
-        private byte[] stick2_raw = { 0, 0, 0 };
-        private UInt16[] stick2_cal = { 0, 0, 0, 0, 0, 0 };
-        private UInt16 deadzone2;
-        private UInt16[] stick2_precal = { 0, 0 };
+		private byte[] stick2_raw = { 0, 0, 0 };
+		private UInt16[] stick2_cal = { 0, 0, 0, 0, 0, 0 };
+		private UInt16 deadzone2;
+		private UInt16[] stick2_precal = { 0, 0 };
 
-        private bool stop_polling = false;
-        private int timestamp;
-        private bool first_imu_packet = true;
-        private bool imu_enabled = false;
-        private Int16[] acc_r = { 0, 0, 0 };
-        private Int16[] acc_neutral = { 0, 0, 0 };
-        private Int16[] acc_sensiti = { 0, 0, 0 };
-        private Vector3 acc_g;
+		private bool stop_polling = false;
+		private int timestamp;
+		private bool first_imu_packet = true;
+		private bool imu_enabled = false;
+		private Int16[] acc_r = { 0, 0, 0 };
+		private Int16[] acc_neutral = { 0, 0, 0 };
+		private Int16[] acc_sensiti = { 0, 0, 0 };
+		private Vector3 acc_g;
 
-        private Int16[] gyr_r = { 0, 0, 0 };
-        private Int16[] gyr_neutral = { 0, 0, 0 };
-        private Int16[] gyr_sensiti = { 0, 0, 0 };
-        private Vector3 gyr_g;
+		private Int16[] gyr_r = { 0, 0, 0 };
+		private Int16[] gyr_neutral = { 0, 0, 0 };
+		private Int16[] gyr_sensiti = { 0, 0, 0 };
+		private Vector3 gyr_g;
 
 		private short[] acc_sen = new short[3]{
-            16384,
-            16384,
-            16384
-        };
-        private short[] gyr_sen = new short[3]{
-            18642,
-            18642,
-            18642
-        };
+			16384,
+			16384,
+			16384
+		};
+		private short[] gyr_sen = new short[3]{
+			18642,
+			18642,
+			18642
+		};
 
-        private Int16[] pro_hor_offset = { -710, 0, 0 };
-        private Int16[] left_hor_offset = { 0, 0, 0 };
-        private Int16[] right_hor_offset = { 0, 0, 0 };
+		private Int16[] pro_hor_offset = { -710, 0, 0 };
+		private Int16[] left_hor_offset = { 0, 0, 0 };
+		private Int16[] right_hor_offset = { 0, 0, 0 };
 
-        private bool do_localize;
-        private float filterweight;
-        private const uint report_len = 49;
+		private bool do_localize;
+		private float filterweight;
+		private const uint report_len = 49;
 
-        private struct Rumble {
-            private float h_f, l_f;
-            public float t, amp, fullamp;
-            public bool timed_rumble;
+		private struct Rumble {
+			private float h_f, l_f;
+			public float t, amp, fullamp;
+			public bool timed_rumble;
 
-            public void set_vals(float low_freq, float high_freq, float amplitude, int time = 0) {
-                h_f = high_freq;
-                amp = amplitude;
-                fullamp = amplitude;
-                l_f = low_freq;
-                timed_rumble = false;
-                t = 0;
-                if (time != 0) {
-                    t = time / 1000f;
-                    timed_rumble = true;
-                }
-            }
-            public Rumble(float low_freq, float high_freq, float amplitude, int time = 0) {
-                h_f = high_freq;
-                amp = amplitude;
-                fullamp = amplitude;
-                l_f = low_freq;
-                timed_rumble = false;
-                t = 0;
-                if (time != 0) {
-                    t = time / 1000f;
-                    timed_rumble = true;
-                }
-            }
-            private float clamp(float x, float min, float max) {
-                if (x < min) return min;
-                if (x > max) return max;
-                return x;
-            }
-            public byte[] GetData() {
-                byte[] rumble_data = new byte[8];
-                if (amp == 0.0f) {
-                    rumble_data[0] = 0x0;
-                    rumble_data[1] = 0x1;
-                    rumble_data[2] = 0x40;
-                    rumble_data[3] = 0x40;
-                } else {
-                    l_f = clamp(l_f, 40.875885f, 626.286133f);
-                    amp = clamp(amp, 0.0f, 1.0f);
-                    h_f = clamp(h_f, 81.75177f, 1252.572266f);
-                    UInt16 hf = (UInt16)((Math.Round(32f * Math.Log(h_f * 0.1f, 2)) - 0x60) * 4);
-                    byte lf = (byte)(Math.Round(32f * Math.Log(l_f * 0.1f, 2)) - 0x40);
-                    byte hf_amp;
-                    if (amp == 0) hf_amp = 0;
-                    else if (amp < 0.117) hf_amp = (byte)(((Math.Log(amp * 1000, 2) * 32) - 0x60) / (5 - Math.Pow(amp, 2)) - 1);
-                    else if (amp < 0.23) hf_amp = (byte)(((Math.Log(amp * 1000, 2) * 32) - 0x60) - 0x5c);
-                    else hf_amp = (byte)((((Math.Log(amp * 1000, 2) * 32) - 0x60) * 2) - 0xf6);
+			public void set_vals(float low_freq, float high_freq, float amplitude, int time = 0) {
+				h_f = high_freq;
+				amp = amplitude;
+				fullamp = amplitude;
+				l_f = low_freq;
+				timed_rumble = false;
+				t = 0;
+				if (time != 0) {
+					t = time / 1000f;
+					timed_rumble = true;
+				}
+			}
+			public Rumble(float low_freq, float high_freq, float amplitude, int time = 0) {
+				h_f = high_freq;
+				amp = amplitude;
+				fullamp = amplitude;
+				l_f = low_freq;
+				timed_rumble = false;
+				t = 0;
+				if (time != 0) {
+					t = time / 1000f;
+					timed_rumble = true;
+				}
+			}
+			private float clamp(float x, float min, float max) {
+				if (x < min) return min;
+				if (x > max) return max;
+				return x;
+			}
+			public byte[] GetData() {
+				byte[] rumble_data = new byte[8];
+				if (amp == 0.0f) {
+					rumble_data[0] = 0x0;
+					rumble_data[1] = 0x1;
+					rumble_data[2] = 0x40;
+					rumble_data[3] = 0x40;
+				} else {
+					l_f = clamp(l_f, 40.875885f, 626.286133f);
+					amp = clamp(amp, 0.0f, 1.0f);
+					h_f = clamp(h_f, 81.75177f, 1252.572266f);
+					UInt16 hf = (UInt16)((Math.Round(32f * Math.Log(h_f * 0.1f, 2)) - 0x60) * 4);
+					byte lf = (byte)(Math.Round(32f * Math.Log(l_f * 0.1f, 2)) - 0x40);
+					byte hf_amp;
+					if (amp == 0) hf_amp = 0;
+					else if (amp < 0.117) hf_amp = (byte)(((Math.Log(amp * 1000, 2) * 32) - 0x60) / (5 - Math.Pow(amp, 2)) - 1);
+					else if (amp < 0.23) hf_amp = (byte)(((Math.Log(amp * 1000, 2) * 32) - 0x60) - 0x5c);
+					else hf_amp = (byte)((((Math.Log(amp * 1000, 2) * 32) - 0x60) * 2) - 0xf6);
 
-                    UInt16 lf_amp = (UInt16)(Math.Round((double)hf_amp) * .5);
-                    byte parity = (byte)(lf_amp % 2);
-                    if (parity > 0) {
-                        --lf_amp;
-                    }
+					UInt16 lf_amp = (UInt16)(Math.Round((double)hf_amp) * .5);
+					byte parity = (byte)(lf_amp % 2);
+					if (parity > 0) {
+						--lf_amp;
+					}
 
-                    lf_amp = (UInt16)(lf_amp >> 1);
-                    lf_amp += 0x40;
-                    if (parity > 0) lf_amp |= 0x8000;
-                    rumble_data = new byte[8];
-                    rumble_data[0] = (byte)(hf & 0xff);
-                    rumble_data[1] = (byte)((hf >> 8) & 0xff);
-                    rumble_data[2] = lf;
-                    rumble_data[1] += hf_amp;
-                    rumble_data[2] += (byte)((lf_amp >> 8) & 0xff);
-                    rumble_data[3] += (byte)(lf_amp & 0xff);
-                }
-                for (int i = 0; i < 4; ++i) {
-                    rumble_data[4 + i] = rumble_data[i];
-                }
+					lf_amp = (UInt16)(lf_amp >> 1);
+					lf_amp += 0x40;
+					if (parity > 0) lf_amp |= 0x8000;
+					rumble_data = new byte[8];
+					rumble_data[0] = (byte)(hf & 0xff);
+					rumble_data[1] = (byte)((hf >> 8) & 0xff);
+					rumble_data[2] = lf;
+					rumble_data[1] += hf_amp;
+					rumble_data[2] += (byte)((lf_amp >> 8) & 0xff);
+					rumble_data[3] += (byte)(lf_amp & 0xff);
+				}
+				for (int i = 0; i < 4; ++i) {
+					rumble_data[4 + i] = rumble_data[i];
+				}
 
-                return rumble_data;
-            }
-        }
+				return rumble_data;
+			}
+		}
 
-        private Rumble rumble_obj;
+		private Rumble rumble_obj;
 
-        private byte global_count = 0;
-        private string debug_str;
+		private byte global_count = 0;
+		private string debug_str;
 
-        // For UdpServer
-        public int PadId = 0;
-        public int battery = -1;
-        public int model = 2;
-        public int constate = 2;
-        public int connection = 3;
+		// For UdpServer
+		public int PadId = 0;
+		public int battery = -1;
+		public int model = 2;
+		public int constate = 2;
+		public int connection = 3;
 
-        public PhysicalAddress PadMacAddress = new PhysicalAddress(new byte[] { 01, 02, 03, 04, 05, 06 });
-        public ulong Timestamp = 0;
-        public int packetCounter = 0;
+		public PhysicalAddress PadMacAddress = new PhysicalAddress(new byte[] { 01, 02, 03, 04, 05, 06 });
+		public ulong Timestamp = 0;
+		public int packetCounter = 0;
 
-        public Xbox360Controller xin;
-        public Xbox360Report report;
+		public Xbox360Controller xin;
+		public Xbox360Report report;
 
-        int rumblePeriod = Int32.Parse(ConfigurationManager.AppSettings["RumblePeriod"]);
-        int lowFreq = Int32.Parse(ConfigurationManager.AppSettings["LowFreqRumble"]);
-        int highFreq = Int32.Parse(ConfigurationManager.AppSettings["HighFreqRumble"]);
+		int rumblePeriod = Int32.Parse(ConfigurationManager.AppSettings["RumblePeriod"]);
+		int lowFreq = Int32.Parse(ConfigurationManager.AppSettings["LowFreqRumble"]);
+		int highFreq = Int32.Parse(ConfigurationManager.AppSettings["HighFreqRumble"]);
 
-        bool toRumble = Boolean.Parse(ConfigurationManager.AppSettings["EnableRumble"]);
+		bool toRumble = Boolean.Parse(ConfigurationManager.AppSettings["EnableRumble"]);
 
-        bool showAsXInput = Boolean.Parse(ConfigurationManager.AppSettings["ShowAsXInput"]);
+		bool showAsXInput = Boolean.Parse(ConfigurationManager.AppSettings["ShowAsXInput"]);
 
-        public MainForm form;
+		public MainForm form;
 
-        public byte LED = 0x0;
+		public byte LED = 0x0;
 
 		public string serial_number;
 
-        private float[] activeData;
+		private float[] activeData;
 
-		public Joycon(IntPtr handle_, bool imu, bool localize, float alpha, bool left, string path, string serialNum, int id = 0, bool isPro=false) {
+		public Joycon(IntPtr handle_, bool imu, bool localize, float alpha, bool left, string path, string serialNum, int id = 0, bool isPro = false) {
 			serial_number = serialNum;
 			activeData = new float[6];
 			handle = handle_;
@@ -245,30 +245,29 @@ namespace BetterJoyForCemu {
 			isLeft = left;
 
 			PadId = id;
-            LED = (byte)(0x1 << PadId);
-            this.isPro = isPro;
+			LED = (byte)(0x1 << PadId);
+			this.isPro = isPro;
 			isUSB = serialNum == "000000000001";
 
-            this.path = path;
+			this.path = path;
 
 			connection = isUSB ? 0x01 : 0x02;
 
-            if (showAsXInput) {
-                xin = new Xbox360Controller(Program.emClient);
+			if (showAsXInput) {
+				xin = new Xbox360Controller(Program.emClient);
 
-                if (toRumble)
-                    xin.FeedbackReceived += ReceiveRumble;
-                report = new Xbox360Report();
-            }
+				if (toRumble)
+					xin.FeedbackReceived += ReceiveRumble;
+				report = new Xbox360Report();
+			}
 		}
 
-		public void getActiveData()
-        {
-            this.activeData = form.activeCaliData(serial_number);
-        }
+		public void getActiveData() {
+			this.activeData = form.activeCaliData(serial_number);
+		}
 
 		public void ReceiveRumble(object sender, Nefarius.ViGEm.Client.Targets.Xbox360.Xbox360FeedbackReceivedEventArgs e) {
-			SetRumble(lowFreq, highFreq, (float) e.LargeMotor / (float) 255, rumblePeriod);
+			SetRumble(lowFreq, highFreq, (float)e.LargeMotor / (float)255, rumblePeriod);
 
 			if (other != null)
 				other.SetRumble(lowFreq, highFreq, (float)e.LargeMotor / (float)255, rumblePeriod);
@@ -313,10 +312,10 @@ namespace BetterJoyForCemu {
 			if (!isUSB) {
 				// Input report mode
 				Subcommand(0x03, new byte[] { 0x30 }, 1, false);
-                
+
 				a[0] = 0x1;
 				dump_calibration_data();
-            } else {
+			} else {
 				Subcommand(0x03, new byte[] { 0x3f }, 1, false);
 
 				a = Enumerable.Repeat((byte)0, 64).ToArray();
@@ -348,14 +347,14 @@ namespace BetterJoyForCemu {
 				dump_calibration_data();
 			}
 
-            BlinkLED();
+			BlinkLED();
 
-            a[0] = leds_;
+			a[0] = leds_;
 			Subcommand(0x30, a, 1);
 			Subcommand(0x40, new byte[] { (imu_enabled ? (byte)0x1 : (byte)0x0) }, 1, true);
 			Subcommand(0x3, new byte[] { 0x30 }, 1, true);
 			Subcommand(0x48, new byte[] { 0x01 }, 1, true);
-			
+
 			Subcommand(0x41, new byte[] { 0x03, 0x00, 0x00, 0x01 }, 4, false); // higher gyro performance rate
 
 			DebugPrint("Done with init.", DebugType.COMMS);
@@ -365,40 +364,40 @@ namespace BetterJoyForCemu {
 			return 0;
 		}
 
-        public void SetLED(byte leds_ = 0x0) {
-            Subcommand(0x30, new byte[] { leds_ }, 1);
-        }
+		public void SetLED(byte leds_ = 0x0) {
+			Subcommand(0x30, new byte[] { leds_ }, 1);
+		}
 
-        public void BlinkLED() { // do not call after initial setup
-            byte[] a = Enumerable.Repeat((byte)0xFF, 25).ToArray(); // LED ring
-            a[0] = 0x18;
-            a[1] = 0x01;
-            Subcommand(0x38, a, 25, false);
-        }
+		public void BlinkLED() { // do not call after initial setup
+			byte[] a = Enumerable.Repeat((byte)0xFF, 25).ToArray(); // LED ring
+			a[0] = 0x18;
+			a[1] = 0x01;
+			Subcommand(0x38, a, 25, false);
+		}
 
-        private void BatteryChanged() { // battery changed level
-            foreach (var v in form.con) {
-                if (v.Tag == this) {
-                    switch (battery) {
-                        case 4:
-                            v.BackColor = System.Drawing.Color.FromArgb(0xAA, System.Drawing.Color.Green);
-                            break;
-                        case 3:
-                            v.BackColor = System.Drawing.Color.FromArgb(0xAA, System.Drawing.Color.Green);
-                            break;
-                        case 2:
-                            v.BackColor = System.Drawing.Color.FromArgb(0xAA, System.Drawing.Color.GreenYellow);
-                            break;
-                        case 1:
-                            v.BackColor = System.Drawing.Color.FromArgb(0xAA, System.Drawing.Color.Orange);
-                            break;
-                        default:
-                            v.BackColor = System.Drawing.Color.FromArgb(0xAA, System.Drawing.Color.Red);
-                            break;
-                    }
-                }
-            }
-        }
+		private void BatteryChanged() { // battery changed level
+			foreach (var v in form.con) {
+				if (v.Tag == this) {
+					switch (battery) {
+						case 4:
+							v.BackColor = System.Drawing.Color.FromArgb(0xAA, System.Drawing.Color.Green);
+							break;
+						case 3:
+							v.BackColor = System.Drawing.Color.FromArgb(0xAA, System.Drawing.Color.Green);
+							break;
+						case 2:
+							v.BackColor = System.Drawing.Color.FromArgb(0xAA, System.Drawing.Color.GreenYellow);
+							break;
+						case 1:
+							v.BackColor = System.Drawing.Color.FromArgb(0xAA, System.Drawing.Color.Orange);
+							break;
+						default:
+							v.BackColor = System.Drawing.Color.FromArgb(0xAA, System.Drawing.Color.Red);
+							break;
+					}
+				}
+			}
+		}
 
 		public void SetFilterCoeff(float a) {
 			filterweight = a;
@@ -407,23 +406,23 @@ namespace BetterJoyForCemu {
 		public void Detach() {
 			stop_polling = true;
 
-            if (xin != null) {
-                xin.Disconnect(); xin.Dispose();
-            }
+			if (xin != null) {
+				xin.Disconnect(); xin.Dispose();
+			}
 
 			if (state > state_.NO_JOYCONS) {
-                HIDapi.hid_set_nonblocking(handle, 0);
+				HIDapi.hid_set_nonblocking(handle, 0);
 
-                Subcommand(0x40, new byte[] { 0x0 }, 1);
+				Subcommand(0x40, new byte[] { 0x0 }, 1);
 				//Subcommand(0x48, new byte[] { 0x0 }, 1); // Would turn off rumble?
 
 				if (isUSB) {
 					byte[] a = Enumerable.Repeat((byte)0, 64).ToArray();
 					a[0] = 0x80; a[1] = 0x05; // Allow device to talk to BT again
 					HIDapi.hid_write(handle, a, new UIntPtr(2));
-                    a[0] = 0x80; a[1] = 0x06; // Allow device to talk to BT again
-                    HIDapi.hid_write(handle, a, new UIntPtr(2));
-                }
+					a[0] = 0x80; a[1] = 0x06; // Allow device to talk to BT again
+					HIDapi.hid_write(handle, a, new UIntPtr(2));
+				}
 			}
 			if (state > state_.DROPPED) {
 				HIDapi.hid_close(handle);
@@ -433,24 +432,24 @@ namespace BetterJoyForCemu {
 
 		private byte ts_en;
 		private int ReceiveRaw() {
-            if (handle == IntPtr.Zero) return -2;
-            HIDapi.hid_set_nonblocking(handle, 1);
+			if (handle == IntPtr.Zero) return -2;
+			HIDapi.hid_set_nonblocking(handle, 1);
 			byte[] raw_buf = new byte[report_len];
 			int ret = HIDapi.hid_read_timeout(handle, raw_buf, new UIntPtr(report_len), 5000);
 			if (ret > 0) {
-                // Process packets as soon as they come
-                for (int n = 0; n < 3; n++) {
+				// Process packets as soon as they come
+				for (int n = 0; n < 3; n++) {
 					ExtractIMUValues(raw_buf, n);
 
-					byte lag = (byte) Math.Max(0, raw_buf[1] - ts_en - 3);
+					byte lag = (byte)Math.Max(0, raw_buf[1] - ts_en - 3);
 					if (n == 0) {
 						Timestamp += (ulong)lag * 5000; // add lag once
 						ProcessButtonsAndStick(raw_buf);
 
-                        int newbat = battery;
-                        battery = (raw_buf[2] >> 4) / 2;
-                        if (newbat != battery)
-                            BatteryChanged();
+						int newbat = battery;
+						battery = (raw_buf[2] >> 4) / 2;
+						if (newbat != battery)
+							BatteryChanged();
 					}
 					Timestamp += 5000; // 5ms difference
 
@@ -478,25 +477,25 @@ namespace BetterJoyForCemu {
 			Stopwatch watch = new Stopwatch();
 			watch.Start();
 			while (!stop_polling & state > state_.NO_JOYCONS) {
-                if (isUSB || rumble_obj.t > 0)
-                    SendRumble(rumble_obj.GetData());
-                else if (watch.ElapsedMilliseconds >= 1000) {
+				if (isUSB || rumble_obj.t > 0)
+					SendRumble(rumble_obj.GetData());
+				else if (watch.ElapsedMilliseconds >= 1000) {
 					// Send a no-op operation as heartbeat to keep connection alive.
 					// Do not send this too frequently, otherwise I/O would be too heavy and cause lag.
 					// Needed for both BLUETOOTH and USB to not time out. Never remove pls
 					SendRumble(rumble_obj.GetData());
 					watch.Restart();
 				}
-                int a = ReceiveRaw();
+				int a = ReceiveRaw();
 
-                if (a > 0) {
-                    state = state_.IMU_DATA_OK;
+				if (a > 0) {
+					state = state_.IMU_DATA_OK;
 					attempts = 0;
 				} else if (attempts > 240) {
 					state = state_.DROPPED;
-                    form.AppendTextBox("Dropped.\r\n");
+					form.AppendTextBox("Dropped.\r\n");
 
-                    DebugPrint("Connection lost. Is the Joy-Con connected?", DebugType.ALL);
+					DebugPrint("Connection lost. Is the Joy-Con connected?", DebugType.ALL);
 					break;
 				} else if (a < 0) {
 					// An error on read.
@@ -507,17 +506,17 @@ namespace BetterJoyForCemu {
 					// The non-blocking read timed out. No need to sleep.
 					// No need to increase attempts because it's not an error.
 				}
-            }
+			}
 		}
 
 		public void Update() {
-            if (state > state_.NO_JOYCONS) {	
+			if (state > state_.NO_JOYCONS) {
 				if (rumble_obj.timed_rumble) {
 					if (rumble_obj.t < 0) {
 						rumble_obj.set_vals(lowFreq, highFreq, 0, 0);
 					} else {
 						rumble_obj.t -= (1 / timing);
-                        //rumble_obj.amp = (float) Math.Sin(((timing - rumble_obj.t * 1000f) / timing) * Math.PI) * rumble_obj.fullamp;
+						//rumble_obj.amp = (float) Math.Sin(((timing - rumble_obj.t * 1000f) / timing) * Math.PI) * rumble_obj.fullamp;
 					}
 				}
 			}
@@ -526,8 +525,8 @@ namespace BetterJoyForCemu {
 		public float[] otherStick = { 0, 0 };
 
 		bool swapAB = Boolean.Parse(ConfigurationManager.AppSettings["SwapAB"]);
-        bool swapXY = Boolean.Parse(ConfigurationManager.AppSettings["SwapXY"]);
-        private int ProcessButtonsAndStick(byte[] report_buf) {
+		bool swapXY = Boolean.Parse(ConfigurationManager.AppSettings["SwapXY"]);
+		private int ProcessButtonsAndStick(byte[] report_buf) {
 			if (report_buf[0] == 0x00) return -1;
 
 			stick_raw[0] = report_buf[6 + (isLeft ? 0 : 3)];
@@ -542,15 +541,8 @@ namespace BetterJoyForCemu {
 
 			stick_precal[0] = (UInt16)(stick_raw[0] | ((stick_raw[1] & 0xf) << 8));
 			stick_precal[1] = (UInt16)((stick_raw[1] >> 4) | (stick_raw[2] << 4));
-			ushort[] cal = form.nonOriginal ? new ushort[6]{
-                2048,
-                2048,
-                2048,
-                2048,
-                2048,
-                2048
-            }: stick_cal;
-            ushort dz = form.nonOriginal ? (ushort)200 : deadzone;
+			ushort[] cal = form.nonOriginal ? new ushort[6] { 2048, 2048, 2048, 2048, 2048, 2048 } : stick_cal;
+			ushort dz = form.nonOriginal ? (ushort)200 : deadzone;
 			stick = CenterSticks(stick_precal, cal, dz);
 
 			if (isPro) {
@@ -572,7 +564,7 @@ namespace BetterJoyForCemu {
 			}
 			//
 
-            // Set button states both for server and ViGEm
+			// Set button states both for server and ViGEm
 			lock (buttons) {
 				lock (down_) {
 					for (int i = 0; i < buttons.Length; ++i) {
@@ -584,7 +576,7 @@ namespace BetterJoyForCemu {
 				buttons[(int)Button.DPAD_UP] = (report_buf[3 + (isLeft ? 2 : 0)] & (isLeft ? 0x02 : 0x02)) != 0;
 				buttons[(int)Button.DPAD_LEFT] = (report_buf[3 + (isLeft ? 2 : 0)] & (isLeft ? 0x08 : 0x01)) != 0;
 				buttons[(int)Button.HOME] = ((report_buf[4] & 0x10) != 0);
-                buttons[(int)Button.CAPTURE] = ((report_buf[4] & 0x20) != 0);
+				buttons[(int)Button.CAPTURE] = ((report_buf[4] & 0x20) != 0);
 				buttons[(int)Button.MINUS] = ((report_buf[4] & 0x01) != 0);
 				buttons[(int)Button.PLUS] = ((report_buf[4] & 0x02) != 0);
 				buttons[(int)Button.STICK] = ((report_buf[4] & (isLeft ? 0x08 : 0x04)) != 0);
@@ -641,35 +633,35 @@ namespace BetterJoyForCemu {
 				}
 
 				if (!isPro && xin != null) {
-                    if (other != null) {
-                        report.SetButtonState(!swapAB ? Xbox360Buttons.A : Xbox360Buttons.B, buttons[(int)(isLeft ? Button.B : Button.DPAD_DOWN)]);
-                        report.SetButtonState(!swapAB ? Xbox360Buttons.B : Xbox360Buttons.A, buttons[(int)(isLeft ? Button.A : Button.DPAD_RIGHT)]);
-                        report.SetButtonState(!swapXY ? Xbox360Buttons.Y : Xbox360Buttons.X, buttons[(int)(isLeft ? Button.X : Button.DPAD_UP)]);
-                        report.SetButtonState(!swapXY ? Xbox360Buttons.X : Xbox360Buttons.Y, buttons[(int)(isLeft ? Button.Y : Button.DPAD_LEFT)]);
-                        report.SetButtonState(Xbox360Buttons.Up, buttons[(int)(isLeft ? Button.DPAD_UP : Button.X)]);
-                        report.SetButtonState(Xbox360Buttons.Down, buttons[(int)(isLeft ? Button.DPAD_DOWN : Button.B)]);
-                        report.SetButtonState(Xbox360Buttons.Left, buttons[(int)(isLeft ? Button.DPAD_LEFT : Button.Y)]);
-                        report.SetButtonState(Xbox360Buttons.Right, buttons[(int)(isLeft ? Button.DPAD_RIGHT : Button.A)]);
-                        report.SetButtonState(Xbox360Buttons.Back, buttons[(int)Button.MINUS]);
-                        report.SetButtonState(Xbox360Buttons.Start, buttons[(int)Button.PLUS]);
-                        report.SetButtonState(Xbox360Buttons.Guide, buttons[(int)Button.HOME]);
-                        report.SetButtonState(Xbox360Buttons.LeftShoulder, buttons[(int)(isLeft ? Button.SHOULDER_1 : Button.SHOULDER2_1)]);
-                        report.SetButtonState(Xbox360Buttons.RightShoulder, buttons[(int)(isLeft ? Button.SHOULDER2_1 : Button.SHOULDER_1)]);
-                        report.SetButtonState(Xbox360Buttons.LeftThumb, buttons[(int)(isLeft ? Button.STICK : Button.STICK2)]);
-                        report.SetButtonState(Xbox360Buttons.RightThumb, buttons[(int)(isLeft ? Button.STICK2 : Button.STICK)]);
-                    } else { // single joycon mode
-                        report.SetButtonState(!swapAB ? Xbox360Buttons.A : Xbox360Buttons.B, buttons[(int)(isLeft ? Button.DPAD_LEFT : Button.DPAD_RIGHT)]);
-                        report.SetButtonState(!swapAB ? Xbox360Buttons.B : Xbox360Buttons.A, buttons[(int)(isLeft ? Button.DPAD_DOWN : Button.DPAD_UP)]);
-                        report.SetButtonState(!swapXY ? Xbox360Buttons.Y : Xbox360Buttons.X, buttons[(int)(isLeft ? Button.DPAD_RIGHT : Button.DPAD_LEFT)]);
-                        report.SetButtonState(!swapXY ? Xbox360Buttons.X : Xbox360Buttons.Y, buttons[(int)(isLeft ? Button.DPAD_UP : Button.DPAD_DOWN)]);
-                        report.SetButtonState(Xbox360Buttons.Back, buttons[(int)Button.MINUS] | buttons[(int)Button.HOME]);
-                        report.SetButtonState(Xbox360Buttons.Start, buttons[(int)Button.PLUS] | buttons[(int)Button.CAPTURE]);
+					if (other != null) {
+						report.SetButtonState(!swapAB ? Xbox360Buttons.A : Xbox360Buttons.B, buttons[(int)(isLeft ? Button.B : Button.DPAD_DOWN)]);
+						report.SetButtonState(!swapAB ? Xbox360Buttons.B : Xbox360Buttons.A, buttons[(int)(isLeft ? Button.A : Button.DPAD_RIGHT)]);
+						report.SetButtonState(!swapXY ? Xbox360Buttons.Y : Xbox360Buttons.X, buttons[(int)(isLeft ? Button.X : Button.DPAD_UP)]);
+						report.SetButtonState(!swapXY ? Xbox360Buttons.X : Xbox360Buttons.Y, buttons[(int)(isLeft ? Button.Y : Button.DPAD_LEFT)]);
+						report.SetButtonState(Xbox360Buttons.Up, buttons[(int)(isLeft ? Button.DPAD_UP : Button.X)]);
+						report.SetButtonState(Xbox360Buttons.Down, buttons[(int)(isLeft ? Button.DPAD_DOWN : Button.B)]);
+						report.SetButtonState(Xbox360Buttons.Left, buttons[(int)(isLeft ? Button.DPAD_LEFT : Button.Y)]);
+						report.SetButtonState(Xbox360Buttons.Right, buttons[(int)(isLeft ? Button.DPAD_RIGHT : Button.A)]);
+						report.SetButtonState(Xbox360Buttons.Back, buttons[(int)Button.MINUS]);
+						report.SetButtonState(Xbox360Buttons.Start, buttons[(int)Button.PLUS]);
+						report.SetButtonState(Xbox360Buttons.Guide, buttons[(int)Button.HOME]);
+						report.SetButtonState(Xbox360Buttons.LeftShoulder, buttons[(int)(isLeft ? Button.SHOULDER_1 : Button.SHOULDER2_1)]);
+						report.SetButtonState(Xbox360Buttons.RightShoulder, buttons[(int)(isLeft ? Button.SHOULDER2_1 : Button.SHOULDER_1)]);
+						report.SetButtonState(Xbox360Buttons.LeftThumb, buttons[(int)(isLeft ? Button.STICK : Button.STICK2)]);
+						report.SetButtonState(Xbox360Buttons.RightThumb, buttons[(int)(isLeft ? Button.STICK2 : Button.STICK)]);
+					} else { // single joycon mode
+						report.SetButtonState(!swapAB ? Xbox360Buttons.A : Xbox360Buttons.B, buttons[(int)(isLeft ? Button.DPAD_LEFT : Button.DPAD_RIGHT)]);
+						report.SetButtonState(!swapAB ? Xbox360Buttons.B : Xbox360Buttons.A, buttons[(int)(isLeft ? Button.DPAD_DOWN : Button.DPAD_UP)]);
+						report.SetButtonState(!swapXY ? Xbox360Buttons.Y : Xbox360Buttons.X, buttons[(int)(isLeft ? Button.DPAD_RIGHT : Button.DPAD_LEFT)]);
+						report.SetButtonState(!swapXY ? Xbox360Buttons.X : Xbox360Buttons.Y, buttons[(int)(isLeft ? Button.DPAD_UP : Button.DPAD_DOWN)]);
+						report.SetButtonState(Xbox360Buttons.Back, buttons[(int)Button.MINUS] | buttons[(int)Button.HOME]);
+						report.SetButtonState(Xbox360Buttons.Start, buttons[(int)Button.PLUS] | buttons[(int)Button.CAPTURE]);
 
-                        report.SetButtonState(Xbox360Buttons.LeftShoulder, buttons[(int)Button.SL]);
-                        report.SetButtonState(Xbox360Buttons.RightShoulder, buttons[(int)Button.SR]);
+						report.SetButtonState(Xbox360Buttons.LeftShoulder, buttons[(int)Button.SL]);
+						report.SetButtonState(Xbox360Buttons.RightShoulder, buttons[(int)Button.SR]);
 
-                        report.SetButtonState(Xbox360Buttons.LeftThumb, buttons[(int)Button.STICK]);
-                    }
+						report.SetButtonState(Xbox360Buttons.LeftThumb, buttons[(int)Button.STICK]);
+					}
 				}
 
 				lock (buttons_up) {
@@ -683,16 +675,16 @@ namespace BetterJoyForCemu {
 			}
 
 			if (xin != null) {
-                if (other != null || isPro) {
-                    report.SetAxis(Xbox360Axes.LeftThumbX, CastStickValue(stick[0]));
-                    report.SetAxis(Xbox360Axes.LeftThumbY, CastStickValue(stick[1]));
-                    report.SetAxis(Xbox360Axes.RightThumbX, CastStickValue(stick2[0]));
-                    report.SetAxis(Xbox360Axes.RightThumbY, CastStickValue(stick2[1]));
-                } else { // single joycon mode
-                    report.SetAxis(Xbox360Axes.LeftThumbY, CastStickValue((isLeft ? 1 : -1) * stick[0]));
-                    report.SetAxis(Xbox360Axes.LeftThumbX, CastStickValue((isLeft ? -1 : 1) * stick[1]));
-                }
-                report.SetAxis(Xbox360Axes.LeftTrigger, (short)(buttons[(int)(isLeft ? Button.SHOULDER_2 : Button.SHOULDER2_2)] ? Int16.MaxValue : 0));
+				if (other != null || isPro) {
+					report.SetAxis(Xbox360Axes.LeftThumbX, CastStickValue(stick[0]));
+					report.SetAxis(Xbox360Axes.LeftThumbY, CastStickValue(stick[1]));
+					report.SetAxis(Xbox360Axes.RightThumbX, CastStickValue(stick2[0]));
+					report.SetAxis(Xbox360Axes.RightThumbY, CastStickValue(stick2[1]));
+				} else { // single joycon mode
+					report.SetAxis(Xbox360Axes.LeftThumbY, CastStickValue((isLeft ? 1 : -1) * stick[0]));
+					report.SetAxis(Xbox360Axes.LeftThumbX, CastStickValue((isLeft ? -1 : 1) * stick[1]));
+				}
+				report.SetAxis(Xbox360Axes.LeftTrigger, (short)(buttons[(int)(isLeft ? Button.SHOULDER_2 : Button.SHOULDER2_2)] ? Int16.MaxValue : 0));
 				report.SetAxis(Xbox360Axes.RightTrigger, (short)(buttons[(int)(isLeft ? Button.SHOULDER2_2 : Button.SHOULDER_2)] ? Int16.MaxValue : 0));
 			}
 
@@ -708,128 +700,117 @@ namespace BetterJoyForCemu {
 			acc_r[2] = (Int16)(report_buf[17 + n * 12] | ((report_buf[18 + n * 12] << 8) & 0xff00));
 
 
-            if (form.nonOriginal)
-            {
-                for (int i = 0; i < 3; ++i)
-                {
-                    switch (i)
-                    {
-                        case 0:
-                            acc_g.X = (acc_r[i] - activeData[3]) * (1.0f / acc_sen[i]) * 4.0f;
-                            gyr_g.X = (gyr_r[i] - activeData[0]) * (816.0f / gyr_sen[i]);
-                            if (form.calibrate)
-                            {
-                                form.xA.Add(acc_r[i]);
-                                form.xG.Add(gyr_r[i]);
-                            }
-                            break;
-                        case 1:
-                            acc_g.Y = (!isLeft ? -1 : 1) * (acc_r[i] - activeData[4]) * (1.0f / acc_sen[i]) * 4.0f;
-                            gyr_g.Y = -(!isLeft ? -1 : 1) * (gyr_r[i] - activeData[1]) * (816.0f / gyr_sen[i]);
-                            if (form.calibrate)
-                            {
-                                form.yA.Add(acc_r[i]);
-                                form.yG.Add(gyr_r[i]);
-                            }
-                            break;
-                        case 2:
-                            acc_g.Z = (!isLeft ? -1 : 1) * (acc_r[i] - activeData[5]) * (1.0f / acc_sen[i]) * 4.0f;
-                            gyr_g.Z = -(!isLeft ? -1 : 1) * (gyr_r[i] - activeData[2]) * (816.0f / gyr_sen[i]);
-                            if (form.calibrate)
-                            {
-                                form.zA.Add(acc_r[i]);
-                                form.zG.Add(gyr_r[i]);
-                            }
-                            break;
-                    }
-                }
-            }
-            else
-            {
-                Int16[] offset;
-                if (isPro)
-                    offset = pro_hor_offset;
-                else if (isLeft)
-                    offset = left_hor_offset;
-                else
-                    offset = right_hor_offset;
+			if (form.nonOriginal) {
+				for (int i = 0; i < 3; ++i) {
+					switch (i) {
+						case 0:
+							acc_g.X = (acc_r[i] - activeData[3]) * (1.0f / acc_sen[i]) * 4.0f;
+							gyr_g.X = (gyr_r[i] - activeData[0]) * (816.0f / gyr_sen[i]);
+							if (form.calibrate) {
+								form.xA.Add(acc_r[i]);
+								form.xG.Add(gyr_r[i]);
+							}
+							break;
+						case 1:
+							acc_g.Y = (!isLeft ? -1 : 1) * (acc_r[i] - activeData[4]) * (1.0f / acc_sen[i]) * 4.0f;
+							gyr_g.Y = -(!isLeft ? -1 : 1) * (gyr_r[i] - activeData[1]) * (816.0f / gyr_sen[i]);
+							if (form.calibrate) {
+								form.yA.Add(acc_r[i]);
+								form.yG.Add(gyr_r[i]);
+							}
+							break;
+						case 2:
+							acc_g.Z = (!isLeft ? -1 : 1) * (acc_r[i] - activeData[5]) * (1.0f / acc_sen[i]) * 4.0f;
+							gyr_g.Z = -(!isLeft ? -1 : 1) * (gyr_r[i] - activeData[2]) * (816.0f / gyr_sen[i]);
+							if (form.calibrate) {
+								form.zA.Add(acc_r[i]);
+								form.zG.Add(gyr_r[i]);
+							}
+							break;
+					}
+				}
+			} else {
+				Int16[] offset;
+				if (isPro)
+					offset = pro_hor_offset;
+				else if (isLeft)
+					offset = left_hor_offset;
+				else
+					offset = right_hor_offset;
 
-                for (int i = 0; i < 3; ++i)
-                {
-                    switch (i)
-                    {
-                        case 0:
-                            acc_g.X = (acc_r[i] - offset[i]) * (1.0f / (acc_sensiti[i] - acc_neutral[i])) * 4.0f;
-                            gyr_g.X = (gyr_r[i] - gyr_neutral[i]) * (816.0f / (gyr_sensiti[i] - gyr_neutral[i]));
+				for (int i = 0; i < 3; ++i) {
+					switch (i) {
+						case 0:
+							acc_g.X = (acc_r[i] - offset[i]) * (1.0f / (acc_sensiti[i] - acc_neutral[i])) * 4.0f;
+							gyr_g.X = (gyr_r[i] - gyr_neutral[i]) * (816.0f / (gyr_sensiti[i] - gyr_neutral[i]));
 
-                            break;
-                        case 1:
-                            acc_g.Y = (!isLeft ? -1 : 1) * (acc_r[i] - offset[i]) * (1.0f / (acc_sensiti[i] - acc_neutral[i])) * 4.0f;
-                            gyr_g.Y = -(!isLeft ? -1 : 1) * (gyr_r[i] - gyr_neutral[i]) * (816.0f / (gyr_sensiti[i] - gyr_neutral[i]));
-                            break;
-                        case 2:
-                            acc_g.Z = (!isLeft ? -1 : 1) * (acc_r[i] - offset[i]) * (1.0f / (acc_sensiti[i] - acc_neutral[i])) * 4.0f;
-                            gyr_g.Z = -(!isLeft ? -1 : 1) * (gyr_r[i] - gyr_neutral[i]) * (816.0f / (gyr_sensiti[i] - gyr_neutral[i]));
-                            break;
-                    }
-                }
-            }
-            
+							break;
+						case 1:
+							acc_g.Y = (!isLeft ? -1 : 1) * (acc_r[i] - offset[i]) * (1.0f / (acc_sensiti[i] - acc_neutral[i])) * 4.0f;
+							gyr_g.Y = -(!isLeft ? -1 : 1) * (gyr_r[i] - gyr_neutral[i]) * (816.0f / (gyr_sensiti[i] - gyr_neutral[i]));
+							break;
+						case 2:
+							acc_g.Z = (!isLeft ? -1 : 1) * (acc_r[i] - offset[i]) * (1.0f / (acc_sensiti[i] - acc_neutral[i])) * 4.0f;
+							gyr_g.Z = -(!isLeft ? -1 : 1) * (gyr_r[i] - gyr_neutral[i]) * (816.0f / (gyr_sensiti[i] - gyr_neutral[i]));
+							break;
+					}
+				}
+			}
 
-            if (other == null && !isPro) { // single joycon mode; Z do not swap, rest do
-                if (isLeft) {
-                    acc_g.X = -acc_g.X;
-                    gyr_g.X = -gyr_g.X;
-                } else {
-                    gyr_g.Y = -gyr_g.Y;
-                }
-                
-                float temp = acc_g.X; acc_g.X = acc_g.Y; acc_g.Y = temp;
-                temp = gyr_g.X; gyr_g.X = gyr_g.Y; gyr_g.Y = temp;
-            }
+
+			if (other == null && !isPro) { // single joycon mode; Z do not swap, rest do
+				if (isLeft) {
+					acc_g.X = -acc_g.X;
+					gyr_g.X = -gyr_g.X;
+				} else {
+					gyr_g.Y = -gyr_g.Y;
+				}
+
+				float temp = acc_g.X; acc_g.X = acc_g.Y; acc_g.Y = temp;
+				temp = gyr_g.X; gyr_g.X = gyr_g.Y; gyr_g.Y = temp;
+			}
 		}
 
 		public void Begin() {
 			if (PollThreadObj == null) {
 				PollThreadObj = new Thread(new ThreadStart(Poll));
-                PollThreadObj.IsBackground = true;
+				PollThreadObj.IsBackground = true;
 				PollThreadObj.Start();
 
 				form.AppendTextBox("Starting poll thread.\r\n");
 			} else {
-                form.AppendTextBox("Poll cannot start.\r\n");
-            }
+				form.AppendTextBox("Poll cannot start.\r\n");
+			}
 		}
 
 		public void Recenter() {
 			first_imu_packet = true;
 		}
 
-        // Should really be called calculating stick data
+		// Should really be called calculating stick data
 		private float[] CenterSticks(UInt16[] vals, ushort[] cal, ushort dz) {
 			ushort[] t = cal;
 
 			float[] s = { 0, 0 };
-            float dx = vals[0] - t[2], dy = vals[1] - t[3];
-            if (Math.Abs(dx * dx + dy * dy) < dz * dz)
-                return s;
+			float dx = vals[0] - t[2], dy = vals[1] - t[3];
+			if (Math.Abs(dx * dx + dy * dy) < dz * dz)
+				return s;
 
-            s[0] = dx / (dx > 0 ? t[0] : t[4]);
-            s[1] = dy / (dy > 0 ? t[1] : t[5]);
+			s[0] = dx / (dx > 0 ? t[0] : t[4]);
+			s[1] = dy / (dy > 0 ? t[1] : t[5]);
 			return s;
 		}
 
-        private short CastStickValue(float stick_value)
-        {
-            return (short)Math.Max(Int16.MinValue, Math.Min(Int16.MaxValue, stick_value * (stick_value > 0 ? Int16.MaxValue : -Int16.MinValue)));
-        }
+		private short CastStickValue(float stick_value) {
+			return (short)Math.Max(Int16.MinValue, Math.Min(Int16.MaxValue, stick_value * (stick_value > 0 ? Int16.MaxValue : -Int16.MinValue)));
+		}
 
 		public void SetRumble(float low_freq, float high_freq, float amp, int time = 0) {
 			if (state <= Joycon.state_.ATTACHED) return;
 			//if (rumble_obj.timed_rumble == false || rumble_obj.t < 0) {
-				rumble_obj = new Rumble(low_freq, high_freq, amp, time);
-            //}
-        }
+			rumble_obj = new Rumble(low_freq, high_freq, amp, time);
+			//}
+		}
 
 		private void SendRumble(byte[] buf) {
 			byte[] buf_ = new byte[report_len];
@@ -987,4 +968,4 @@ namespace BetterJoyForCemu {
 			DebugPrint(string.Format(format, tostr), d);
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/BetterJoyForCemu/MainForm.Designer.cs b/BetterJoyForCemu/MainForm.Designer.cs
index bbd8c2b..730e095 100644
--- a/BetterJoyForCemu/MainForm.Designer.cs
+++ b/BetterJoyForCemu/MainForm.Designer.cs
@@ -331,10 +331,6 @@
             this.AutoCalibrate.Text = "Calibrate";
             this.AutoCalibrate.UseVisualStyleBackColor = true;
             this.AutoCalibrate.Click += new System.EventHandler(this.StartCalibrate);
-            if (!this.nonOriginal)
-            {
-                this.AutoCalibrate.Hide();
-            }
             // 
             // MainForm
             // 
diff --git a/BetterJoyForCemu/MainForm.cs b/BetterJoyForCemu/MainForm.cs
index 22473e7..0bb36ca 100644
--- a/BetterJoyForCemu/MainForm.cs
+++ b/BetterJoyForCemu/MainForm.cs
@@ -15,391 +15,367 @@ using System.Xml.Linq;
 
 namespace BetterJoyForCemu {
 	public partial class MainForm : Form {
-        public bool nonOriginal = Boolean.Parse(ConfigurationManager.AppSettings["NonOriginalController"]);
-        public List<Button> con, loc;
-        public bool calibrate;
-        public List<KeyValuePair<string,float[]>> caliData;
-        private Timer countDown;
-        private int count;
-        public List<int> xG;
-        public List<int> yG;
-        public List<int> zG;
-        public List<int> xA;
-        public List<int> yA;
-        public List<int> zA;
+		public bool nonOriginal = Boolean.Parse(ConfigurationManager.AppSettings["NonOriginalController"]);
+		public List<Button> con, loc;
+		public bool calibrate;
+		public List<KeyValuePair<string, float[]>> caliData;
+		private Timer countDown;
+		private int count;
+		public List<int> xG, yG, zG, xA, yA, zA;
 
 		public MainForm() {
-            xG = new List<int>();
-            yG = new List<int>();
-            zG = new List<int>();
-            xA = new List<int>();
-            yA = new List<int>();
-            zA = new List<int>();
-            caliData = new List<KeyValuePair<string, float[]>> {
-                new KeyValuePair<string, float[]>("0", new float[6] {0,0,0,-710,0,0})
-            };
+			xG = new List<int>(); yG = new List<int>(); zG = new List<int>();
+			xA = new List<int>(); yA = new List<int>(); zA = new List<int>();
+			caliData = new List<KeyValuePair<string, float[]>> {
+				new KeyValuePair<string, float[]>("0", new float[6] {0,0,0,-710,0,0})
+			};
+
 			InitializeComponent();
 
-            con = new List<Button> { con1, con2, con3, con4 };
-            loc = new List<Button> { loc1, loc2, loc3, loc4 };
+			if (!nonOriginal)
+				AutoCalibrate.Hide();
 
-            //list all options
-            string[] myConfigs = ConfigurationManager.AppSettings.AllKeys;
-            Size childSize = new Size(87, 20);
-            for (int i = 0; i != myConfigs.Length; i++)
-            {
-                tableLayoutPanel1.RowCount++;
-                tableLayoutPanel1.Controls.Add(new Label() { Text = myConfigs[i], TextAlign=ContentAlignment.BottomLeft, AutoEllipsis=true, Size = childSize }, 0, i);
+			con = new List<Button> { con1, con2, con3, con4 };
+			loc = new List<Button> { loc1, loc2, loc3, loc4 };
 
-                var value = ConfigurationManager.AppSettings[myConfigs[i]];
-                Control childControl;
-                if (value == "true" || value == "false")
-                {
-                    childControl = new CheckBox() { Checked = Boolean.Parse(value), Size= childSize };
-                }
-                else
-                {
-                    childControl = new TextBox() { Text = value, Size = childSize };
-                }
+			//list all options
+			string[] myConfigs = ConfigurationManager.AppSettings.AllKeys;
+			Size childSize = new Size(87, 20);
+			for (int i = 0; i != myConfigs.Length; i++) {
+				tableLayoutPanel1.RowCount++;
+				tableLayoutPanel1.Controls.Add(new Label() { Text = myConfigs[i], TextAlign = ContentAlignment.BottomLeft, AutoEllipsis = true, Size = childSize }, 0, i);
 
-                tableLayoutPanel1.Controls.Add(childControl, 1, i);
-                childControl.MouseClick += cbBox_Changed;
-            }
-        }
+				var value = ConfigurationManager.AppSettings[myConfigs[i]];
+				Control childControl;
+				if (value == "true" || value == "false") {
+					childControl = new CheckBox() { Checked = Boolean.Parse(value), Size = childSize };
+				} else {
+					childControl = new TextBox() { Text = value, Size = childSize };
+				}
 
-        private void HideToTray() {
-            this.WindowState = FormWindowState.Minimized;
-            notifyIcon.Visible = true;
-            notifyIcon.ShowBalloonTip(1);
-            this.ShowInTaskbar = false;
-            this.Hide();
-        }
+				tableLayoutPanel1.Controls.Add(childControl, 1, i);
+				childControl.MouseClick += cbBox_Changed;
+			}
+		}
 
-        private void ShowFromTray() {
-            this.Show();
-            this.WindowState = FormWindowState.Normal;
-            this.ShowInTaskbar = true;
-            this.FormBorderStyle = FormBorderStyle.FixedSingle;
-            this.Icon = Properties.Resources.betterjoyforcemu_icon;
-            notifyIcon.Visible = false;
-        }
+		private void HideToTray() {
+			this.WindowState = FormWindowState.Minimized;
+			notifyIcon.Visible = true;
+			notifyIcon.ShowBalloonTip(1);
+			this.ShowInTaskbar = false;
+			this.Hide();
+		}
+
+		private void ShowFromTray() {
+			this.Show();
+			this.WindowState = FormWindowState.Normal;
+			this.ShowInTaskbar = true;
+			this.FormBorderStyle = FormBorderStyle.FixedSingle;
+			this.Icon = Properties.Resources.betterjoyforcemu_icon;
+			notifyIcon.Visible = false;
+		}
 
 		private void MainForm_Resize(object sender, EventArgs e) {
 			if (this.WindowState == FormWindowState.Minimized) {
-                HideToTray();
+				HideToTray();
 			}
 		}
 
 		private void notifyIcon_MouseDoubleClick(object sender, MouseEventArgs e) {
-            ShowFromTray();
+			ShowFromTray();
 		}
 
 		private void MainForm_Load(object sender, EventArgs e) {
-            Config.Init(caliData);
+			Config.Init(caliData);
 
-            Program.Start();
+			Program.Start();
 
-            passiveScanBox.Checked = Config.Value("ProgressiveScan");
-            startInTrayBox.Checked = Config.Value("StartInTray");
+			passiveScanBox.Checked = Config.Value("ProgressiveScan");
+			startInTrayBox.Checked = Config.Value("StartInTray");
 
-            if (Config.Value("StartInTray")) {
-                HideToTray();
-            }
-            else {
-                ShowFromTray();
-            }
-        }
-
-		private void MainForm_FormClosing(object sender, FormClosingEventArgs e) {
-            try {
-                Program.Stop();
-                Environment.Exit(0);
-            } catch { }
-        }
-
-		private void exitToolStripMenuItem_Click(object sender, EventArgs e) { // this does not work, for some reason. Fix before release
-            try {
-                Program.Stop();
-                Close();
-                Environment.Exit(0);
-            } catch { }
+			if (Config.Value("StartInTray")) {
+				HideToTray();
+			} else {
+				ShowFromTray();
+			}
 		}
 
-        private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
-            linkLabel1.LinkVisited = true;
-            System.Diagnostics.Process.Start("http://paypal.me/DavidKhachaturov/5");
-        }
+		private void MainForm_FormClosing(object sender, FormClosingEventArgs e) {
+			try {
+				Program.Stop();
+				Environment.Exit(0);
+			} catch { }
+		}
 
-        private void passiveScanBox_CheckedChanged(object sender, EventArgs e) {
-            Config.Save("ProgressiveScan", passiveScanBox.Checked);
-        }
+		private void exitToolStripMenuItem_Click(object sender, EventArgs e) { // this does not work, for some reason. Fix before release
+			try {
+				Program.Stop();
+				Close();
+				Environment.Exit(0);
+			} catch { }
+		}
 
-        public void AppendTextBox(string value) { // https://stackoverflow.com/questions/519233/writing-to-a-textbox-from-another-thread
-            if (InvokeRequired) {
-                this.Invoke(new Action<string>(AppendTextBox), new object[] { value });
-                return;
-            }
-            console.AppendText(value);
-        }
+		private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
+			linkLabel1.LinkVisited = true;
+			System.Diagnostics.Process.Start("http://paypal.me/DavidKhachaturov/5");
+		}
 
-        bool toRumble = Boolean.Parse(ConfigurationManager.AppSettings["EnableRumble"]);
-        bool showAsXInput = Boolean.Parse(ConfigurationManager.AppSettings["ShowAsXInput"]);
+		private void passiveScanBox_CheckedChanged(object sender, EventArgs e) {
+			Config.Save("ProgressiveScan", passiveScanBox.Checked);
+		}
 
-        public void locBtnClick(object sender, EventArgs e) {
-            Button bb = sender as Button;
+		public void AppendTextBox(string value) { // https://stackoverflow.com/questions/519233/writing-to-a-textbox-from-another-thread
+			if (InvokeRequired) {
+				this.Invoke(new Action<string>(AppendTextBox), new object[] { value });
+				return;
+			}
+			console.AppendText(value);
+		}
 
-            if (bb.Tag.GetType() == typeof(Button)) {
-                Button button = bb.Tag as Button;
+		bool toRumble = Boolean.Parse(ConfigurationManager.AppSettings["EnableRumble"]);
+		bool showAsXInput = Boolean.Parse(ConfigurationManager.AppSettings["ShowAsXInput"]);
 
-                if (button.Tag.GetType() == typeof(Joycon)) {
-                    Joycon v = (Joycon) button.Tag;
-                    v.SetRumble(20.0f, 400.0f, 1.0f, 300);
-                }
-            }
-        }
+		public void locBtnClick(object sender, EventArgs e) {
+			Button bb = sender as Button;
 
-        public void conBtnClick(object sender, EventArgs e) {
-            Button button = sender as Button;
+			if (bb.Tag.GetType() == typeof(Button)) {
+				Button button = bb.Tag as Button;
 
-            if (button.Tag.GetType() == typeof(Joycon)) {
-                Joycon v = (Joycon)button.Tag;
+				if (button.Tag.GetType() == typeof(Joycon)) {
+					Joycon v = (Joycon)button.Tag;
+					v.SetRumble(20.0f, 400.0f, 1.0f, 300);
+				}
+			}
+		}
 
-                if (v.other == null && !v.isPro) { // needs connecting to other joycon (so messy omg)
-                    bool succ = false;
-                    foreach (Joycon jc in Program.mgr.j) {
-                        if (!jc.isPro && jc.isLeft != v.isLeft && jc != v && jc.other == null) {
-                            v.other = jc;
-                            jc.other = v;
+		public void conBtnClick(object sender, EventArgs e) {
+			Button button = sender as Button;
 
-                            //Set both Joycon LEDs to the one with the lowest ID
-                            byte led = jc.LED <= v.LED ? jc.LED : v.LED;
-                            jc.LED = led;
-                            v.LED = led;
-                            jc.SetLED(led);
-                            v.SetLED(led);
+			if (button.Tag.GetType() == typeof(Joycon)) {
+				Joycon v = (Joycon)button.Tag;
 
-                            v.xin.Dispose();
-                            v.xin = null;
+				if (v.other == null && !v.isPro) { // needs connecting to other joycon (so messy omg)
+					bool succ = false;
+					foreach (Joycon jc in Program.mgr.j) {
+						if (!jc.isPro && jc.isLeft != v.isLeft && jc != v && jc.other == null) {
+							v.other = jc;
+							jc.other = v;
 
-                            foreach (Button b in con)
-                                if (b.Tag == jc)
-                                        b.BackgroundImage = jc.isLeft ? Properties.Resources.jc_left : Properties.Resources.jc_right;
+							//Set both Joycon LEDs to the one with the lowest ID
+							byte led = jc.LED <= v.LED ? jc.LED : v.LED;
+							jc.LED = led;
+							v.LED = led;
+							jc.SetLED(led);
+							v.SetLED(led);
 
-                            succ = true;
-                            break;
-                        }
-                    }
+							v.xin.Dispose();
+							v.xin = null;
 
-                    if (succ)
-                        foreach (Button b in con)
-                            if (b.Tag == v)
-                                b.BackgroundImage = v.isLeft ? Properties.Resources.jc_left : Properties.Resources.jc_right;
-                } else if (v.other != null && !v.isPro) { // needs disconnecting from other joycon
-                    if (v.xin == null) {
-                        ReenableXinput(v);
-                        v.xin.Connect();
-                    }
+							foreach (Button b in con)
+								if (b.Tag == jc)
+									b.BackgroundImage = jc.isLeft ? Properties.Resources.jc_left : Properties.Resources.jc_right;
 
-                    if (v.other.xin == null) {
-                        ReenableXinput(v.other);
-                        v.other.xin.Connect();
-                    }
+							succ = true;
+							break;
+						}
+					}
 
-                    button.BackgroundImage = v.isLeft ? Properties.Resources.jc_left_s : Properties.Resources.jc_right_s;
+					if (succ)
+						foreach (Button b in con)
+							if (b.Tag == v)
+								b.BackgroundImage = v.isLeft ? Properties.Resources.jc_left : Properties.Resources.jc_right;
+				} else if (v.other != null && !v.isPro) { // needs disconnecting from other joycon
+					if (v.xin == null) {
+						ReenableXinput(v);
+						v.xin.Connect();
+					}
 
-                    foreach (Button b in con)
-                        if (b.Tag == v.other)
-                                b.BackgroundImage = v.other.isLeft ? Properties.Resources.jc_left_s : Properties.Resources.jc_right_s;
+					if (v.other.xin == null) {
+						ReenableXinput(v.other);
+						v.other.xin.Connect();
+					}
 
-                    //Set original Joycon LEDs
-                    v.other.LED = (byte)(0x1 << v.other.PadId);
-                    v.LED = (byte)(0x1 << v.PadId);
-                    v.other.SetLED(v.other.LED);
-                    v.SetLED(v.LED);
+					button.BackgroundImage = v.isLeft ? Properties.Resources.jc_left_s : Properties.Resources.jc_right_s;
 
-                    v.other.other = null;
-                    v.other = null;
-                }
-            }
-        }
+					foreach (Button b in con)
+						if (b.Tag == v.other)
+							b.BackgroundImage = v.other.isLeft ? Properties.Resources.jc_left_s : Properties.Resources.jc_right_s;
 
-        private void startInTrayBox_CheckedChanged(object sender, EventArgs e)
-        {
-            Config.Save("StartInTray", startInTrayBox.Checked);
-        }
+					//Set original Joycon LEDs
+					v.other.LED = (byte)(0x1 << v.other.PadId);
+					v.LED = (byte)(0x1 << v.PadId);
+					v.other.SetLED(v.other.LED);
+					v.SetLED(v.LED);
 
-        private void btn_open3rdP_Click(object sender, EventArgs e) {
-            _3rdPartyControllers partyForm = new _3rdPartyControllers();
-            partyForm.ShowDialog();
-        }
+					v.other.other = null;
+					v.other = null;
+				}
+			}
+		}
 
-        private void button1_Click(object sender, EventArgs e)
-        {
-            Application.Restart();
-            Environment.Exit(0);
-        }
+		private void startInTrayBox_CheckedChanged(object sender, EventArgs e) {
+			Config.Save("StartInTray", startInTrayBox.Checked);
+		}
 
-        void ReenableXinput(Joycon v) {
-            if (showAsXInput) {
-                v.xin = new Xbox360Controller(Program.emClient);
+		private void btn_open3rdP_Click(object sender, EventArgs e) {
+			_3rdPartyControllers partyForm = new _3rdPartyControllers();
+			partyForm.ShowDialog();
+		}
 
-                if (toRumble)
-                    v.xin.FeedbackReceived += v.ReceiveRumble;
-                v.report = new Xbox360Report();
-            }
-        }
+		private void button1_Click(object sender, EventArgs e) {
+			Application.Restart();
+			Environment.Exit(0);
+		}
 
-        private void label2_Click(object sender, EventArgs e)
-        {
-            rightPanel.Visible = !rightPanel.Visible;
-            foldLbl.Text = rightPanel.Visible ? "<" : ">";
-        }
+		void ReenableXinput(Joycon v) {
+			if (showAsXInput) {
+				v.xin = new Xbox360Controller(Program.emClient);
 
-        private void cbBox_Changed(object sender, EventArgs e)
-        {
-            var coord = tableLayoutPanel1.GetPositionFromControl(sender as Control);
+				if (toRumble)
+					v.xin.FeedbackReceived += v.ReceiveRumble;
+				v.report = new Xbox360Report();
+			}
+		}
 
-            var valCtl = tableLayoutPanel1.GetControlFromPosition(coord.Column, coord.Row);
-            var KeyCtl = tableLayoutPanel1.GetControlFromPosition(coord.Column - 1, coord.Row).Text;
+		private void label2_Click(object sender, EventArgs e) {
+			rightPanel.Visible = !rightPanel.Visible;
+			foldLbl.Text = rightPanel.Visible ? "<" : ">";
+		}
 
-            try
-            {
-                var configFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
-                var settings = configFile.AppSettings.Settings;
-                if (sender.GetType() == typeof(CheckBox) && settings[KeyCtl] != null)
-                {
-                    settings[KeyCtl].Value = ((CheckBox)valCtl).Checked.ToString().ToLower();
-                }
-                else if (sender.GetType() == typeof(TextBox) && settings[KeyCtl] != null)
-                {
-                    settings[KeyCtl].Value = ((TextBox)valCtl).Text.ToLower();
-                }
-                configFile.Save(ConfigurationSaveMode.Modified);
-                ConfigurationManager.RefreshSection(configFile.AppSettings.SectionInformation.Name);
-            }
-            catch (ConfigurationErrorsException)
-            {
-                Console.WriteLine("Error writing app settings");
-                Trace.WriteLine(String.Format("rw {0}, column {1}, {2}, {3}", coord.Row, coord.Column, sender.GetType(), KeyCtl));
-            }
-        }
-        private void StartCalibrate(object sender, EventArgs e){
-            if(Program.mgr.j.Count == 0){
-                this.console.Text = "Please connect to a controller.";
-                return;
-            }
-            if (Program.mgr.j.Count > 1){
-                this.console.Text = "Please only use one controller.";
-                return;
-            }
-            this.AutoCalibrate.Enabled = false;
-            countDown = new Timer();
-            this.count = 4;
-            this.CountDown(null, null);
-            countDown.Tick += new EventHandler(CountDown);
-            countDown.Interval = 1000;
-            countDown.Enabled = true;
-        }
+		private void cbBox_Changed(object sender, EventArgs e) {
+			var coord = tableLayoutPanel1.GetPositionFromControl(sender as Control);
 
-        private void StartGetData(){
-            this.xG.Clear();
-            this.yG.Clear();
-            this.zG.Clear();
-            this.xA.Clear();
-            this.yA.Clear();
-            this.zA.Clear();
-            countDown = new Timer();
-            this.count = 3;
-            this.calibrate = true;
-            countDown.Tick += new EventHandler(CalcData);
-            countDown.Interval = 1000;
-            countDown.Enabled = true;
-        }
+			var valCtl = tableLayoutPanel1.GetControlFromPosition(coord.Column, coord.Row);
+			var KeyCtl = tableLayoutPanel1.GetControlFromPosition(coord.Column - 1, coord.Row).Text;
 
-        private void CountDown(object sender, EventArgs e){
-            if(this.count == 0){
-                this.console.Text = "Calibrating...";
-                countDown.Stop();
-                this.StartGetData();
-            } else {
-                this.console.Text = "Plese keep controller flat." + "\r\n";
-                this.console.Text += "Calibrate will start in " + this.count + " seconds.";
-                this.count--;
-            }
-        }
-        private void CalcData(object sender, EventArgs e){
-            if (this.count == 0){
-                countDown.Stop();
-                this.calibrate = false;
-                string serNum = Program.mgr.j.First().serial_number;
-                int serIndex = this.findSer(serNum);
-                float[] Arr = new float[6] { 0,0,0,0,0,0};
-                if(serIndex == -1){
-                    this.caliData.Add(new KeyValuePair<string, float[]>(
-                         serNum,
-                         Arr
-                    ));
-                } else {
-                    Arr = this.caliData[serIndex].Value;
-                }
-                Random rnd = new Random();
-                Arr[0] = (float)quickselect_median(this.xG, rnd.Next);
-                Arr[1] = (float)quickselect_median(this.yG, rnd.Next);
-                Arr[2] = (float)quickselect_median(this.zG, rnd.Next);
-                Arr[3] = (float)quickselect_median(this.xA, rnd.Next);
-                Arr[4] = (float)quickselect_median(this.yA, rnd.Next);
-                Arr[5] = (float)quickselect_median(this.zA, rnd.Next) - 4010; //Joycon.cs acc_sen 16384
-                this.console.Text = "Calibrate completed!!!" + "\r\n";
-                Config.SaveCaliData(this.caliData);
-                Program.mgr.j.First().getActiveData();
-                this.AutoCalibrate.Enabled = true;
-            } else {
-                this.count--;
-            }
+			try {
+				var configFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+				var settings = configFile.AppSettings.Settings;
+				if (sender.GetType() == typeof(CheckBox) && settings[KeyCtl] != null) {
+					settings[KeyCtl].Value = ((CheckBox)valCtl).Checked.ToString().ToLower();
+				} else if (sender.GetType() == typeof(TextBox) && settings[KeyCtl] != null) {
+					settings[KeyCtl].Value = ((TextBox)valCtl).Text.ToLower();
+				}
+				configFile.Save(ConfigurationSaveMode.Modified);
+				ConfigurationManager.RefreshSection(configFile.AppSettings.SectionInformation.Name);
+			} catch (ConfigurationErrorsException) {
+				Console.WriteLine("Error writing app settings");
+				Trace.WriteLine(String.Format("rw {0}, column {1}, {2}, {3}", coord.Row, coord.Column, sender.GetType(), KeyCtl));
+			}
+		}
+		private void StartCalibrate(object sender, EventArgs e) {
+			if (Program.mgr.j.Count == 0) {
+				this.console.Text = "Please connect a single pro controller.";
+				return;
+			}
+			if (Program.mgr.j.Count > 1) {
+				this.console.Text = "Please calibrate one controller at a time (disconnect others).";
+				return;
+			}
+			this.AutoCalibrate.Enabled = false;
+			countDown = new Timer();
+			this.count = 4;
+			this.CountDown(null, null);
+			countDown.Tick += new EventHandler(CountDown);
+			countDown.Interval = 1000;
+			countDown.Enabled = true;
+		}
 
-        }
-        private double quickselect_median(List<int> l, Func<int,int> pivot_fn){
-            int ll = l.Count;
-            if (ll % 2 == 1){
-                return this.quickselect(l, ll / 2, pivot_fn);
-            } else {
-                return 0.5 * (quickselect(l, ll / 2 - 1, pivot_fn) + quickselect(l, ll / 2, pivot_fn));
-            }
-        }
+		private void StartGetData() {
+			this.xG.Clear(); this.yG.Clear(); this.zG.Clear();
+			this.xA.Clear(); this.yA.Clear(); this.zA.Clear();
+			countDown = new Timer();
+			this.count = 3;
+			this.calibrate = true;
+			countDown.Tick += new EventHandler(CalcData);
+			countDown.Interval = 1000;
+			countDown.Enabled = true;
+		}
 
-        private int quickselect(List<int> l, int k, Func<int,int> pivot_fn){
-            if (l.Count == 1 && k == 0){
-                return l[0];
-            }
-            int pivot = l[pivot_fn(l.Count)];
-            List<int> lows = l.Where(x => x < pivot).ToList();
-            List<int> highs = l.Where(x => x > pivot).ToList();
-            List<int> pivots = l.Where(x => x == pivot).ToList();
-            if (k < lows.Count){
-                return quickselect(lows, k, pivot_fn);
-            } else if(k < (lows.Count + pivots.Count)){
-                return pivots[0];
-            } else {
-                return quickselect(highs, k - lows.Count - pivots.Count, pivot_fn);
-            }
-        }
+		private void CountDown(object sender, EventArgs e) {
+			if (this.count == 0) {
+				this.console.Text = "Calibrating...";
+				countDown.Stop();
+				this.StartGetData();
+			} else {
+				this.console.Text = "Plese keep the controller flat." + "\r\n";
+				this.console.Text += "Calibration will start in " + this.count + " seconds.";
+				this.count--;
+			}
+		}
+		private void CalcData(object sender, EventArgs e) {
+			if (this.count == 0) {
+				countDown.Stop();
+				this.calibrate = false;
+				string serNum = Program.mgr.j.First().serial_number;
+				int serIndex = this.findSer(serNum);
+				float[] Arr = new float[6] { 0, 0, 0, 0, 0, 0 };
+				if (serIndex == -1) {
+					this.caliData.Add(new KeyValuePair<string, float[]>(
+						 serNum,
+						 Arr
+					));
+				} else {
+					Arr = this.caliData[serIndex].Value;
+				}
+				Random rnd = new Random();
+				Arr[0] = (float)quickselect_median(this.xG, rnd.Next);
+				Arr[1] = (float)quickselect_median(this.yG, rnd.Next);
+				Arr[2] = (float)quickselect_median(this.zG, rnd.Next);
+				Arr[3] = (float)quickselect_median(this.xA, rnd.Next);
+				Arr[4] = (float)quickselect_median(this.yA, rnd.Next);
+				Arr[5] = (float)quickselect_median(this.zA, rnd.Next) - 4010; //Joycon.cs acc_sen 16384
+				this.console.Text += "Calibration completed!!!" + "\r\n";
+				Config.SaveCaliData(this.caliData);
+				Program.mgr.j.First().getActiveData();
+				this.AutoCalibrate.Enabled = true;
+			} else {
+				this.count--;
+			}
 
-        public float[] activeCaliData(string serNum){
-            for (int i = 0; i < this.caliData.Count; i++){
-                if (this.caliData[i].Key == serNum){
-                    return this.caliData[i].Value;
-                }
-            }
-            return this.caliData[0].Value;
-        }
+		}
+		private double quickselect_median(List<int> l, Func<int, int> pivot_fn) {
+			int ll = l.Count;
+			if (ll % 2 == 1) {
+				return this.quickselect(l, ll / 2, pivot_fn);
+			} else {
+				return 0.5 * (quickselect(l, ll / 2 - 1, pivot_fn) + quickselect(l, ll / 2, pivot_fn));
+			}
+		}
 
-        private int findSer(string serNum){
-            for(int i = 0; i < this.caliData.Count; i++){
-                if(this.caliData[i].Key== serNum){
-                    return i;
-                }
-            }
-            return -1;
-        }
-    }
+		private int quickselect(List<int> l, int k, Func<int, int> pivot_fn) {
+			if (l.Count == 1 && k == 0) {
+				return l[0];
+			}
+			int pivot = l[pivot_fn(l.Count)];
+			List<int> lows = l.Where(x => x < pivot).ToList();
+			List<int> highs = l.Where(x => x > pivot).ToList();
+			List<int> pivots = l.Where(x => x == pivot).ToList();
+			if (k < lows.Count) {
+				return quickselect(lows, k, pivot_fn);
+			} else if (k < (lows.Count + pivots.Count)) {
+				return pivots[0];
+			} else {
+				return quickselect(highs, k - lows.Count - pivots.Count, pivot_fn);
+			}
+		}
+
+		public float[] activeCaliData(string serNum) {
+			for (int i = 0; i < this.caliData.Count; i++) {
+				if (this.caliData[i].Key == serNum) {
+					return this.caliData[i].Value;
+				}
+			}
+			return this.caliData[0].Value;
+		}
+
+		private int findSer(string serNum) {
+			for (int i = 0; i < this.caliData.Count; i++) {
+				if (this.caliData[i].Key == serNum) {
+					return i;
+				}
+			}
+			return -1;
+		}
+	}
 }
diff --git a/BetterJoyForCemu/Program.cs b/BetterJoyForCemu/Program.cs
index ad68ea3..254a842 100644
--- a/BetterJoyForCemu/Program.cs
+++ b/BetterJoyForCemu/Program.cs
@@ -24,412 +24,410 @@ using System.Windows.Forms;
 using System.ServiceProcess;
 
 namespace BetterJoyForCemu {
-    public class JoyconManager {
-        public bool EnableIMU = true;
-        public bool EnableLocalize = false;
-
-        private const ushort vendor_id = 0x57e;
-        private const ushort vendor_id_ = 0x057e;
-        private const ushort product_l = 0x2006;
-        private const ushort product_r = 0x2007;
-        private const ushort product_pro = 0x2009;
-
-        public List<Joycon> j; // Array of all connected Joy-Cons
-        static JoyconManager instance;
-
-        public MainForm form;
-
-        System.Timers.Timer controllerCheck;
-
-        bool useHIDG = Boolean.Parse(ConfigurationManager.AppSettings["UseHIDG"]);
-
-        public static JoyconManager Instance {
-            get { return instance; }
-        }
-
-        public void Awake() {
-            instance = this;
-            j = new List<Joycon>();
-            HIDapi.hid_init();
-        }
-
-        public void Start() {
-            controllerCheck = new System.Timers.Timer(2000); // check every 2 seconds
-            controllerCheck.Elapsed += CheckForNewControllersTime;
-            controllerCheck.Start();
-        }
-
-        bool ControllerAlreadyAdded(string path) {
-            foreach (Joycon v in j)
-                if (v.path == path)
-                    return true;
-            return false;
-        }
-
-        void CleanUp() { // removes dropped controllers from list
-            List<Joycon> rem = new List<Joycon>();
-            for (int i = 0; i < j.Count; i++) {
-                Joycon v = j[i];
-                if (v.state == Joycon.state_.DROPPED) {
-                    if (v.other != null)
-                        v.other.other = null; // The other of the other is the joycon itself
-
-                    v.Detach(); rem.Add(v);
-
-                    foreach (Button b in form.con) {
-                        if (b.Enabled & b.Tag == v) {
-                            b.Invoke(new MethodInvoker(delegate {
-                                b.BackColor = System.Drawing.Color.FromArgb(0x00, System.Drawing.SystemColors.Control);
-                                b.Enabled = false;
-                                b.BackgroundImage = Properties.Resources.cross;
-                            }));
-                            break;
-                        }
-                    }
-
-                    form.AppendTextBox("Removed dropped controller to list. Can be reconnected.\r\n");
-                }
-            }
-
-            foreach (Joycon v in rem)
-                j.Remove(v);
-        }
-
-        void CheckForNewControllersTime(Object source, ElapsedEventArgs e) {
-            if (Config.Value("ProgressiveScan")) {
-                CheckForNewControllers();
-            }
-        }
-
-        public void CheckForNewControllers() {
-            CleanUp();
-
-            // move all code for initializing devices here and well as the initial code from Start()
-            bool isLeft = false;
-            IntPtr ptr = HIDapi.hid_enumerate(vendor_id, 0x0);
-            IntPtr top_ptr = ptr;
-
-            hid_device_info enumerate; // Add device to list
-            bool foundNew = false;
-            while (ptr != IntPtr.Zero) {
-                enumerate = (hid_device_info)Marshal.PtrToStructure(ptr, typeof(hid_device_info));
-                if (form.nonOriginal)
-                {
-                    enumerate.product_id = product_pro;
-                }
-
-                if ((enumerate.product_id == product_l || enumerate.product_id == product_r || enumerate.product_id == product_pro) && !ControllerAlreadyAdded(enumerate.path)) {
-                    switch (enumerate.product_id) {
-                        case product_l:
-                            isLeft = true;
-                            form.AppendTextBox("Left Joy-Con connected.\r\n"); break;
-                        case product_r:
-                            isLeft = false;
-                            form.AppendTextBox("Right Joy-Con connected.\r\n"); break;
-                        case product_pro:
-                            isLeft = true;
-                            form.AppendTextBox("Pro controller connected.\r\n"); break;
-                        default:
-                            form.AppendTextBox("Non Joy-Con Nintendo input device skipped.\r\n"); break;
-                    }
-
-                    // Add controller to block-list for HidGuardian
-                    if (useHIDG) {
-                        HttpWebRequest request = (HttpWebRequest)WebRequest.Create(@"http://localhost:26762/api/v1/hidguardian/affected/add/");
-                        string postData = @"hwids=HID\" + enumerate.path.Split('#')[1].ToUpper();
-                        var data = Encoding.UTF8.GetBytes(postData);
-
-                        request.Method = "POST";
-                        request.ContentType = "application/x-www-form-urlencoded; charset=UTF-8";
-                        request.ContentLength = data.Length;
-
-                        using (var stream = request.GetRequestStream())
-                            stream.Write(data, 0, data.Length);
-
-                        try {
-                            var response = (HttpWebResponse)request.GetResponse();
-                            var responseString = new StreamReader(response.GetResponseStream()).ReadToEnd();
-                        } catch {
-                            form.AppendTextBox("Unable to add controller to block-list.\r\n");
-                        }
-                    } else { // Remove affected devices from list
-                        try {
-                            HttpWebResponse r1 = (HttpWebResponse)WebRequest.Create(@"http://localhost:26762/api/v1/hidguardian/affected/purge/").GetResponse();
-                        } catch { }
-                    }
-                    // -------------------- //
-
-                    IntPtr handle = HIDapi.hid_open_path(enumerate.path);
-                    try {
-                        HIDapi.hid_set_nonblocking(handle, 1);
-                    } catch {
-                        form.AppendTextBox("Unable to open path to device - are you using the correct (64 vs 32-bit) version for your PC?\r\n");
-                        break;
-                    }
-
-                    j.Add(new Joycon(handle, EnableIMU, EnableLocalize & EnableIMU, 0.05f, isLeft, enumerate.path, enumerate.serial_number, j.Count, enumerate.product_id == product_pro));
-
-                    foundNew = true;
-                    j.Last().form = form;
-
-                    if (j.Count < 5) {
-                        int ii = -1;
-                        foreach (Button v in form.con) {
-                            ii++;
-                            if (!v.Enabled) {
-                                System.Drawing.Bitmap temp;
-                                switch (enumerate.product_id) {
-                                    case (product_l):
-                                        temp = Properties.Resources.jc_left_s; break;
-                                    case (product_r):
-                                        temp = Properties.Resources.jc_right_s; break;
-                                    case (product_pro):
-                                        temp = Properties.Resources.pro; break;
-                                    default:
-                                        temp = Properties.Resources.cross; break;
-                                }
-
-                                v.Invoke(new MethodInvoker(delegate {
-                                    v.Tag = j.Last(); // assign controller to button
-                                    v.Enabled = true;
-                                    v.Click += new EventHandler(form.conBtnClick);
-                                    v.BackgroundImage = temp;
-                                }));
-
-                                form.loc[ii].Invoke(new MethodInvoker(delegate {
-                                    form.loc[ii].Tag = v;
-                                    form.loc[ii].Click += new EventHandler(form.locBtnClick);
-                                }));
-
-                                break;
-                            }
-                        }
-                    }
-
-                    byte[] mac = new byte[6];
-                    for (int n = 0; n < 6; n++)
-                        mac[n] = byte.Parse(enumerate.serial_number.Substring(n * 2, 2), System.Globalization.NumberStyles.HexNumber);
-                    j[j.Count - 1].PadMacAddress = new PhysicalAddress(mac);
-                }
-
-                ptr = enumerate.next;
-            }
-
-            if (foundNew) { // attempt to auto join-up joycons on connection
-                Joycon temp = null;
-                foreach (Joycon v in j) {
-                    if (!v.isPro) {
-                        if (temp == null)
-                            temp = v;
-                        else if (temp.isLeft != v.isLeft && v.other == null) {
-                            temp.other = v;
-                            v.other = temp;
-
-                            //Set both Joycon LEDs to the one with the lowest ID
-                            byte led = temp.LED <= v.LED ? temp.LED : v.LED;
-                            temp.LED = led;
-                            v.LED = led;
-                            temp.SetLED(led);
-                            v.SetLED(led);
-
-                            temp.xin.Dispose();
-                            temp.xin = null;
-
-                            foreach (Button b in form.con)
-                                if (b.Tag == v || b.Tag == temp) {
-                                    Joycon tt = (b.Tag == v) ? v : (b.Tag == temp) ? temp : v;
-                                    b.BackgroundImage = tt.isLeft ? Properties.Resources.jc_left : Properties.Resources.jc_right;
-                                }
-
-                            temp = null;    // repeat
-                        }       
-                    }
-                }
-            }
-
-            HIDapi.hid_free_enumeration(top_ptr);
-
-            foreach (Joycon jc in j) { // Connect device straight away
-                if (jc.state == Joycon.state_.NOT_ATTACHED) {
-                    if (jc.xin != null)
-                        jc.xin.Connect();
-
-                    jc.Attach(leds_: jc.LED);
-                    jc.Begin();
-                    if (form.nonOriginal)
-                    {
-                        jc.getActiveData();
-                    }
-                    
-                }
-            }
-        }
-
-        public void Update() {
-            for (int i = 0; i < j.Count; ++i)
-                j[i].Update();
-        }
-
-        public void OnApplicationQuit() {
-            foreach (Joycon v in j) {
-                v.Detach();
-
-                if (v.xin != null) {
-                    v.xin.Disconnect();
-                    v.xin.Dispose();
-                }
-            }
-
-            controllerCheck.Stop();
-            HIDapi.hid_exit();
-        }
-    }
-
-    // Custom timer class because system timers have a limit of 15.6ms
-    class HighResTimer {
-        double interval = 0;
-        double frequency = 0;
-
-        Thread thread;
-
-        public delegate void ActionDelegate();
-        ActionDelegate func;
-
-        bool run = false;
-
-        public HighResTimer(double f, ActionDelegate a) {
-            frequency = f;
-            interval = 1.0 / f;
-
-            func = a;
-        }
-
-        public void Start() {
-            run = true;
-            thread = new Thread(new ThreadStart(Run));
-            thread.IsBackground = true;
-            thread.Start();
-        }
-
-        void Run() {
-            while (run) {
-                func();
-                int timeToSleep = (int)(interval * 1000);
-                Thread.Sleep(timeToSleep);
-            }
-        }
-
-        public void Stop() {
-            run = false;
-        }
-    }
-
-    class Program {
-        public static PhysicalAddress btMAC = new PhysicalAddress(new byte[] { 0, 0, 0, 0, 0, 0 });
-        public static UdpServer server;
-        static double pollsPerSecond = 120.0;
-
-        public static ViGEmClient emClient;
-
-        private static readonly HttpClient client = new HttpClient();
-
-        public static JoyconManager mgr;
-        static HighResTimer timer;
-        static string pid;
-
-        static MainForm form;
-
-        static bool useHIDG = Boolean.Parse(ConfigurationManager.AppSettings["UseHIDG"]);
-
-        public static void Start() {
-            pid = Process.GetCurrentProcess().Id.ToString(); // get current process id for HidCerberus.Srv
-
-            if (useHIDG) {
-                try {
-                    var HidCerberusService = new ServiceController("HidCerberus Service");
-                    if (HidCerberusService.Status == ServiceControllerStatus.Stopped) {
-                        form.console.Text += "HidGuardian was stopped. Starting...\r\n";
-
-                        try {
-                            HidCerberusService.Start();
-                        } catch (Exception e) {
-                            form.console.Text += "Unable to start HidGuardian - everything should work fine without it, but if you need it, run the app again as an admin.\r\n";
-                        }
-                    }
-                } catch (Exception e) {
-                    form.console.Text += "Unable to start HidGuardian - everything should work fine without it, but if you need it, install it properly as admin.\r\n";
-                }
-
-                HttpWebResponse response;
-                if (Boolean.Parse(ConfigurationManager.AppSettings["PurgeWhitelist"])) {
-                    try {
-                        response = (HttpWebResponse)WebRequest.Create(@"http://localhost:26762/api/v1/hidguardian/whitelist/purge/").GetResponse(); // remove all programs allowed to see controller
-                    } catch (Exception e) {
-                        form.console.Text += "Unable to purge whitelist.\r\n";
-                    }
-                }
-
-                try {
-                    response = (HttpWebResponse)WebRequest.Create(@"http://localhost:26762/api/v1/hidguardian/whitelist/add/" + pid).GetResponse(); // add BetterJoyForCemu to allowed processes 
-                } catch (Exception e) {
-                    form.console.Text += "Unable to add program to whitelist.\r\n";
-                }
-            } else {
-                form.console.Text += "HidGuardian is disabled.\r\n";
-            }
-
-            emClient = new ViGEmClient(); // Manages emulated XInput
-
-            foreach (NetworkInterface nic in NetworkInterface.GetAllNetworkInterfaces()) {
-                // Get local BT host MAC
-                if (nic.NetworkInterfaceType != NetworkInterfaceType.FastEthernetFx && nic.NetworkInterfaceType != NetworkInterfaceType.Wireless80211) {
-                    if (nic.Name.Split()[0] == "Bluetooth") {
-                        btMAC = nic.GetPhysicalAddress();
-                    }
-                }
-            }
-
-            mgr = new JoyconManager();
-            mgr.form = form;
-            mgr.Awake();
-            mgr.CheckForNewControllers();
-            mgr.Start();
-
-            server = new UdpServer(mgr.j);
-            server.form = form;
-
-            server.Start(IPAddress.Parse(ConfigurationManager.AppSettings["IP"]), Int32.Parse(ConfigurationManager.AppSettings["Port"]));
-            timer = new HighResTimer(pollsPerSecond, new HighResTimer.ActionDelegate(mgr.Update));
-            timer.Start();
-
-            form.console.Text += "All systems go\r\n";
-        }
-
-        public static void Stop() {
-            try {
-                HttpWebResponse response = (HttpWebResponse)WebRequest.Create(@"http://localhost:26762/api/v1/hidguardian/whitelist/remove/" + pid).GetResponse();
-            } catch (Exception e) {
-                form.console.Text += "Unable to remove program from whitelist.\r\n";
-            }
-
-            if (Boolean.Parse(ConfigurationManager.AppSettings["PurgeAffectedDevices"])) {
-                try {
-                    HttpWebResponse r1 = (HttpWebResponse)WebRequest.Create(@"http://localhost:26762/api/v1/hidguardian/affected/purge/").GetResponse();
-                } catch { }
-            }
-
-            server.Stop();
-            timer.Stop();
-            mgr.OnApplicationQuit();
-
-            form.console.Text += "";
-        }
-
-        static void Main(string[] args) {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            form = new MainForm();
-            Application.Run(form);
-        }
-    }
+	public class JoyconManager {
+		public bool EnableIMU = true;
+		public bool EnableLocalize = false;
+
+		private const ushort vendor_id = 0x57e;
+		private const ushort vendor_id_ = 0x057e;
+		private const ushort product_l = 0x2006;
+		private const ushort product_r = 0x2007;
+		private const ushort product_pro = 0x2009;
+
+		public List<Joycon> j; // Array of all connected Joy-Cons
+		static JoyconManager instance;
+
+		public MainForm form;
+
+		System.Timers.Timer controllerCheck;
+
+		bool useHIDG = Boolean.Parse(ConfigurationManager.AppSettings["UseHIDG"]);
+
+		public static JoyconManager Instance {
+			get { return instance; }
+		}
+
+		public void Awake() {
+			instance = this;
+			j = new List<Joycon>();
+			HIDapi.hid_init();
+		}
+
+		public void Start() {
+			controllerCheck = new System.Timers.Timer(2000); // check every 2 seconds
+			controllerCheck.Elapsed += CheckForNewControllersTime;
+			controllerCheck.Start();
+		}
+
+		bool ControllerAlreadyAdded(string path) {
+			foreach (Joycon v in j)
+				if (v.path == path)
+					return true;
+			return false;
+		}
+
+		void CleanUp() { // removes dropped controllers from list
+			List<Joycon> rem = new List<Joycon>();
+			for (int i = 0; i < j.Count; i++) {
+				Joycon v = j[i];
+				if (v.state == Joycon.state_.DROPPED) {
+					if (v.other != null)
+						v.other.other = null; // The other of the other is the joycon itself
+
+					v.Detach(); rem.Add(v);
+
+					foreach (Button b in form.con) {
+						if (b.Enabled & b.Tag == v) {
+							b.Invoke(new MethodInvoker(delegate {
+								b.BackColor = System.Drawing.Color.FromArgb(0x00, System.Drawing.SystemColors.Control);
+								b.Enabled = false;
+								b.BackgroundImage = Properties.Resources.cross;
+							}));
+							break;
+						}
+					}
+
+					form.AppendTextBox("Removed dropped controller to list. Can be reconnected.\r\n");
+				}
+			}
+
+			foreach (Joycon v in rem)
+				j.Remove(v);
+		}
+
+		void CheckForNewControllersTime(Object source, ElapsedEventArgs e) {
+			if (Config.Value("ProgressiveScan")) {
+				CheckForNewControllers();
+			}
+		}
+
+		public void CheckForNewControllers() {
+			CleanUp();
+
+			// move all code for initializing devices here and well as the initial code from Start()
+			bool isLeft = false;
+			IntPtr ptr = HIDapi.hid_enumerate(vendor_id, 0x0);
+			IntPtr top_ptr = ptr;
+
+			hid_device_info enumerate; // Add device to list
+			bool foundNew = false;
+			while (ptr != IntPtr.Zero) {
+				enumerate = (hid_device_info)Marshal.PtrToStructure(ptr, typeof(hid_device_info));
+				if (form.nonOriginal) {
+					enumerate.product_id = product_pro;
+				}
+
+				if ((enumerate.product_id == product_l || enumerate.product_id == product_r || enumerate.product_id == product_pro) && !ControllerAlreadyAdded(enumerate.path)) {
+					switch (enumerate.product_id) {
+						case product_l:
+							isLeft = true;
+							form.AppendTextBox("Left Joy-Con connected.\r\n"); break;
+						case product_r:
+							isLeft = false;
+							form.AppendTextBox("Right Joy-Con connected.\r\n"); break;
+						case product_pro:
+							isLeft = true;
+							form.AppendTextBox("Pro controller connected.\r\n"); break;
+						default:
+							form.AppendTextBox("Non Joy-Con Nintendo input device skipped.\r\n"); break;
+					}
+
+					// Add controller to block-list for HidGuardian
+					if (useHIDG) {
+						HttpWebRequest request = (HttpWebRequest)WebRequest.Create(@"http://localhost:26762/api/v1/hidguardian/affected/add/");
+						string postData = @"hwids=HID\" + enumerate.path.Split('#')[1].ToUpper();
+						var data = Encoding.UTF8.GetBytes(postData);
+
+						request.Method = "POST";
+						request.ContentType = "application/x-www-form-urlencoded; charset=UTF-8";
+						request.ContentLength = data.Length;
+
+						using (var stream = request.GetRequestStream())
+							stream.Write(data, 0, data.Length);
+
+						try {
+							var response = (HttpWebResponse)request.GetResponse();
+							var responseString = new StreamReader(response.GetResponseStream()).ReadToEnd();
+						} catch {
+							form.AppendTextBox("Unable to add controller to block-list.\r\n");
+						}
+					} else { // Remove affected devices from list
+						try {
+							HttpWebResponse r1 = (HttpWebResponse)WebRequest.Create(@"http://localhost:26762/api/v1/hidguardian/affected/purge/").GetResponse();
+						} catch { }
+					}
+					// -------------------- //
+
+					IntPtr handle = HIDapi.hid_open_path(enumerate.path);
+					try {
+						HIDapi.hid_set_nonblocking(handle, 1);
+					} catch {
+						form.AppendTextBox("Unable to open path to device - are you using the correct (64 vs 32-bit) version for your PC?\r\n");
+						break;
+					}
+
+					j.Add(new Joycon(handle, EnableIMU, EnableLocalize & EnableIMU, 0.05f, isLeft, enumerate.path, enumerate.serial_number, j.Count, enumerate.product_id == product_pro));
+
+					foundNew = true;
+					j.Last().form = form;
+
+					if (j.Count < 5) {
+						int ii = -1;
+						foreach (Button v in form.con) {
+							ii++;
+							if (!v.Enabled) {
+								System.Drawing.Bitmap temp;
+								switch (enumerate.product_id) {
+									case (product_l):
+										temp = Properties.Resources.jc_left_s; break;
+									case (product_r):
+										temp = Properties.Resources.jc_right_s; break;
+									case (product_pro):
+										temp = Properties.Resources.pro; break;
+									default:
+										temp = Properties.Resources.cross; break;
+								}
+
+								v.Invoke(new MethodInvoker(delegate {
+									v.Tag = j.Last(); // assign controller to button
+									v.Enabled = true;
+									v.Click += new EventHandler(form.conBtnClick);
+									v.BackgroundImage = temp;
+								}));
+
+								form.loc[ii].Invoke(new MethodInvoker(delegate {
+									form.loc[ii].Tag = v;
+									form.loc[ii].Click += new EventHandler(form.locBtnClick);
+								}));
+
+								break;
+							}
+						}
+					}
+
+					byte[] mac = new byte[6];
+					for (int n = 0; n < 6; n++)
+						mac[n] = byte.Parse(enumerate.serial_number.Substring(n * 2, 2), System.Globalization.NumberStyles.HexNumber);
+					j[j.Count - 1].PadMacAddress = new PhysicalAddress(mac);
+				}
+
+				ptr = enumerate.next;
+			}
+
+			if (foundNew) { // attempt to auto join-up joycons on connection
+				Joycon temp = null;
+				foreach (Joycon v in j) {
+					if (!v.isPro) {
+						if (temp == null)
+							temp = v;
+						else if (temp.isLeft != v.isLeft && v.other == null) {
+							temp.other = v;
+							v.other = temp;
+
+							//Set both Joycon LEDs to the one with the lowest ID
+							byte led = temp.LED <= v.LED ? temp.LED : v.LED;
+							temp.LED = led;
+							v.LED = led;
+							temp.SetLED(led);
+							v.SetLED(led);
+
+							temp.xin.Dispose();
+							temp.xin = null;
+
+							foreach (Button b in form.con)
+								if (b.Tag == v || b.Tag == temp) {
+									Joycon tt = (b.Tag == v) ? v : (b.Tag == temp) ? temp : v;
+									b.BackgroundImage = tt.isLeft ? Properties.Resources.jc_left : Properties.Resources.jc_right;
+								}
+
+							temp = null;    // repeat
+						}
+					}
+				}
+			}
+
+			HIDapi.hid_free_enumeration(top_ptr);
+
+			foreach (Joycon jc in j) { // Connect device straight away
+				if (jc.state == Joycon.state_.NOT_ATTACHED) {
+					if (jc.xin != null)
+						jc.xin.Connect();
+
+					jc.Attach(leds_: jc.LED);
+					jc.Begin();
+					if (form.nonOriginal) {
+						jc.getActiveData();
+					}
+
+				}
+			}
+		}
+
+		public void Update() {
+			for (int i = 0; i < j.Count; ++i)
+				j[i].Update();
+		}
+
+		public void OnApplicationQuit() {
+			foreach (Joycon v in j) {
+				v.Detach();
+
+				if (v.xin != null) {
+					v.xin.Disconnect();
+					v.xin.Dispose();
+				}
+			}
+
+			controllerCheck.Stop();
+			HIDapi.hid_exit();
+		}
+	}
+
+	// Custom timer class because system timers have a limit of 15.6ms
+	class HighResTimer {
+		double interval = 0;
+		double frequency = 0;
+
+		Thread thread;
+
+		public delegate void ActionDelegate();
+		ActionDelegate func;
+
+		bool run = false;
+
+		public HighResTimer(double f, ActionDelegate a) {
+			frequency = f;
+			interval = 1.0 / f;
+
+			func = a;
+		}
+
+		public void Start() {
+			run = true;
+			thread = new Thread(new ThreadStart(Run));
+			thread.IsBackground = true;
+			thread.Start();
+		}
+
+		void Run() {
+			while (run) {
+				func();
+				int timeToSleep = (int)(interval * 1000);
+				Thread.Sleep(timeToSleep);
+			}
+		}
+
+		public void Stop() {
+			run = false;
+		}
+	}
+
+	class Program {
+		public static PhysicalAddress btMAC = new PhysicalAddress(new byte[] { 0, 0, 0, 0, 0, 0 });
+		public static UdpServer server;
+		static double pollsPerSecond = 120.0;
+
+		public static ViGEmClient emClient;
+
+		private static readonly HttpClient client = new HttpClient();
+
+		public static JoyconManager mgr;
+		static HighResTimer timer;
+		static string pid;
+
+		static MainForm form;
+
+		static bool useHIDG = Boolean.Parse(ConfigurationManager.AppSettings["UseHIDG"]);
+
+		public static void Start() {
+			pid = Process.GetCurrentProcess().Id.ToString(); // get current process id for HidCerberus.Srv
+
+			if (useHIDG) {
+				try {
+					var HidCerberusService = new ServiceController("HidCerberus Service");
+					if (HidCerberusService.Status == ServiceControllerStatus.Stopped) {
+						form.console.Text += "HidGuardian was stopped. Starting...\r\n";
+
+						try {
+							HidCerberusService.Start();
+						} catch (Exception e) {
+							form.console.Text += "Unable to start HidGuardian - everything should work fine without it, but if you need it, run the app again as an admin.\r\n";
+						}
+					}
+				} catch (Exception e) {
+					form.console.Text += "Unable to start HidGuardian - everything should work fine without it, but if you need it, install it properly as admin.\r\n";
+				}
+
+				HttpWebResponse response;
+				if (Boolean.Parse(ConfigurationManager.AppSettings["PurgeWhitelist"])) {
+					try {
+						response = (HttpWebResponse)WebRequest.Create(@"http://localhost:26762/api/v1/hidguardian/whitelist/purge/").GetResponse(); // remove all programs allowed to see controller
+					} catch (Exception e) {
+						form.console.Text += "Unable to purge whitelist.\r\n";
+					}
+				}
+
+				try {
+					response = (HttpWebResponse)WebRequest.Create(@"http://localhost:26762/api/v1/hidguardian/whitelist/add/" + pid).GetResponse(); // add BetterJoyForCemu to allowed processes 
+				} catch (Exception e) {
+					form.console.Text += "Unable to add program to whitelist.\r\n";
+				}
+			} else {
+				form.console.Text += "HidGuardian is disabled.\r\n";
+			}
+
+			emClient = new ViGEmClient(); // Manages emulated XInput
+
+			foreach (NetworkInterface nic in NetworkInterface.GetAllNetworkInterfaces()) {
+				// Get local BT host MAC
+				if (nic.NetworkInterfaceType != NetworkInterfaceType.FastEthernetFx && nic.NetworkInterfaceType != NetworkInterfaceType.Wireless80211) {
+					if (nic.Name.Split()[0] == "Bluetooth") {
+						btMAC = nic.GetPhysicalAddress();
+					}
+				}
+			}
+
+			mgr = new JoyconManager();
+			mgr.form = form;
+			mgr.Awake();
+			mgr.CheckForNewControllers();
+			mgr.Start();
+
+			server = new UdpServer(mgr.j);
+			server.form = form;
+
+			server.Start(IPAddress.Parse(ConfigurationManager.AppSettings["IP"]), Int32.Parse(ConfigurationManager.AppSettings["Port"]));
+			timer = new HighResTimer(pollsPerSecond, new HighResTimer.ActionDelegate(mgr.Update));
+			timer.Start();
+
+			form.console.Text += "All systems go\r\n";
+		}
+
+		public static void Stop() {
+			try {
+				HttpWebResponse response = (HttpWebResponse)WebRequest.Create(@"http://localhost:26762/api/v1/hidguardian/whitelist/remove/" + pid).GetResponse();
+			} catch (Exception e) {
+				form.console.Text += "Unable to remove program from whitelist.\r\n";
+			}
+
+			if (Boolean.Parse(ConfigurationManager.AppSettings["PurgeAffectedDevices"])) {
+				try {
+					HttpWebResponse r1 = (HttpWebResponse)WebRequest.Create(@"http://localhost:26762/api/v1/hidguardian/affected/purge/").GetResponse();
+				} catch { }
+			}
+
+			server.Stop();
+			timer.Stop();
+			mgr.OnApplicationQuit();
+
+			form.console.Text += "";
+		}
+
+		static void Main(string[] args) {
+			Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
+			form = new MainForm();
+			Application.Run(form);
+		}
+	}
 }
\ No newline at end of file
diff --git a/BetterJoyForCemu/UpdServer.cs b/BetterJoyForCemu/UpdServer.cs
index c4b8344..7a66c20 100644
--- a/BetterJoyForCemu/UpdServer.cs
+++ b/BetterJoyForCemu/UpdServer.cs
@@ -281,7 +281,7 @@ namespace BetterJoyForCemu {
 			}
 		}
 
-		public void Start(IPAddress ip, int port=26760) {
+		public void Start(IPAddress ip, int port = 26760) {
 			if (running) {
 				if (udpSock != null) {
 					udpSock.Close();
@@ -316,56 +316,56 @@ namespace BetterJoyForCemu {
 			}
 		}
 
-        bool swapAB = Boolean.Parse(ConfigurationManager.AppSettings["SwapAB"]);
-        bool swapXY = Boolean.Parse(ConfigurationManager.AppSettings["SwapXY"]);
-        private bool ReportToBuffer(Joycon hidReport, byte[] outputData, ref int outIdx) {
+		bool swapAB = Boolean.Parse(ConfigurationManager.AppSettings["SwapAB"]);
+		bool swapXY = Boolean.Parse(ConfigurationManager.AppSettings["SwapXY"]);
+		private bool ReportToBuffer(Joycon hidReport, byte[] outputData, ref int outIdx) {
 			outputData[outIdx] = 0;
 
 			bool isLeft = hidReport.isLeft;
 
-			if (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_LEFT : Joycon.Button.Y))	outputData[outIdx] |= 0x80;
-			if (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_DOWN : Joycon.Button.B))	outputData[outIdx] |= 0x40;
-			if (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_RIGHT : Joycon.Button.A))	outputData[outIdx] |= 0x20;
-			if (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_UP : Joycon.Button.X))		outputData[outIdx] |= 0x10;
+			if (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_LEFT : Joycon.Button.Y)) outputData[outIdx] |= 0x80;
+			if (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_DOWN : Joycon.Button.B)) outputData[outIdx] |= 0x40;
+			if (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_RIGHT : Joycon.Button.A)) outputData[outIdx] |= 0x20;
+			if (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_UP : Joycon.Button.X)) outputData[outIdx] |= 0x10;
 
-			if (hidReport.GetButton(Joycon.Button.PLUS))									outputData[outIdx] |= 0x08;
-			if (hidReport.GetButton(isLeft ? Joycon.Button.STICK2 : Joycon.Button.STICK))	outputData[outIdx] |= 0x04;
-			if (hidReport.GetButton(isLeft ? Joycon.Button.STICK : Joycon.Button.STICK2))	outputData[outIdx] |= 0x02;
-			if (hidReport.GetButton(Joycon.Button.MINUS))									outputData[outIdx] |= 0x01;
+			if (hidReport.GetButton(Joycon.Button.PLUS)) outputData[outIdx] |= 0x08;
+			if (hidReport.GetButton(isLeft ? Joycon.Button.STICK2 : Joycon.Button.STICK)) outputData[outIdx] |= 0x04;
+			if (hidReport.GetButton(isLeft ? Joycon.Button.STICK : Joycon.Button.STICK2)) outputData[outIdx] |= 0x02;
+			if (hidReport.GetButton(Joycon.Button.MINUS)) outputData[outIdx] |= 0x01;
 
 			outputData[++outIdx] = 0;
 
-			if (hidReport.GetButton(!swapXY ? (isLeft ? Joycon.Button.Y : Joycon.Button.DPAD_LEFT) : (isLeft ? Joycon.Button.X : Joycon.Button.DPAD_UP)))		outputData[outIdx] |= 0x80;
-			if (hidReport.GetButton(!swapAB ? (isLeft ? Joycon.Button.B : Joycon.Button.DPAD_DOWN) : (isLeft ? Joycon.Button.A : Joycon.Button.DPAD_RIGHT)))	outputData[outIdx] |= 0x40;
-			if (hidReport.GetButton(!swapAB ? (isLeft ? Joycon.Button.A : Joycon.Button.DPAD_RIGHT) : (isLeft ? Joycon.Button.B : Joycon.Button.DPAD_DOWN)))	outputData[outIdx] |= 0x20;
-			if (hidReport.GetButton(!swapXY ? (isLeft ? Joycon.Button.X : Joycon.Button.DPAD_UP) : (isLeft ? Joycon.Button.Y : Joycon.Button.DPAD_LEFT)))		outputData[outIdx] |= 0x10;
+			if (hidReport.GetButton(!swapXY ? (isLeft ? Joycon.Button.Y : Joycon.Button.DPAD_LEFT) : (isLeft ? Joycon.Button.X : Joycon.Button.DPAD_UP))) outputData[outIdx] |= 0x80;
+			if (hidReport.GetButton(!swapAB ? (isLeft ? Joycon.Button.B : Joycon.Button.DPAD_DOWN) : (isLeft ? Joycon.Button.A : Joycon.Button.DPAD_RIGHT))) outputData[outIdx] |= 0x40;
+			if (hidReport.GetButton(!swapAB ? (isLeft ? Joycon.Button.A : Joycon.Button.DPAD_RIGHT) : (isLeft ? Joycon.Button.B : Joycon.Button.DPAD_DOWN))) outputData[outIdx] |= 0x20;
+			if (hidReport.GetButton(!swapXY ? (isLeft ? Joycon.Button.X : Joycon.Button.DPAD_UP) : (isLeft ? Joycon.Button.Y : Joycon.Button.DPAD_LEFT))) outputData[outIdx] |= 0x10;
 
-			if (hidReport.GetButton(isLeft ? Joycon.Button.SHOULDER2_1 : Joycon.Button.SHOULDER_1))	outputData[outIdx] |= 0x08;
-			if (hidReport.GetButton(isLeft ? Joycon.Button.SHOULDER_1 : Joycon.Button.SHOULDER2_1))	outputData[outIdx] |= 0x04;
-			if (hidReport.GetButton(isLeft ? Joycon.Button.SHOULDER2_2 : Joycon.Button.SHOULDER_2))	outputData[outIdx] |= 0x02;
-			if (hidReport.GetButton(isLeft ? Joycon.Button.SHOULDER_2 : Joycon.Button.SHOULDER2_2))	outputData[outIdx] |= 0x01;
+			if (hidReport.GetButton(isLeft ? Joycon.Button.SHOULDER2_1 : Joycon.Button.SHOULDER_1)) outputData[outIdx] |= 0x08;
+			if (hidReport.GetButton(isLeft ? Joycon.Button.SHOULDER_1 : Joycon.Button.SHOULDER2_1)) outputData[outIdx] |= 0x04;
+			if (hidReport.GetButton(isLeft ? Joycon.Button.SHOULDER2_2 : Joycon.Button.SHOULDER_2)) outputData[outIdx] |= 0x02;
+			if (hidReport.GetButton(isLeft ? Joycon.Button.SHOULDER_2 : Joycon.Button.SHOULDER2_2)) outputData[outIdx] |= 0x01;
 
 			outputData[++outIdx] = (hidReport.GetButton(Joycon.Button.HOME)) ? (byte)1 : (byte)0;
 			outputData[++outIdx] = 0; // no touch pad
 
 			float[] leftStick = hidReport.GetStick(); // 127 is 0
-			outputData[++outIdx] = (byte) (Math.Max(0, Math.Min(255, 127 + leftStick[0] * 127)));
-			outputData[++outIdx] = (byte) (Math.Max(0, Math.Min(255, 127 + leftStick[1] * 127)));
+			outputData[++outIdx] = (byte)(Math.Max(0, Math.Min(255, 127 + leftStick[0] * 127)));
+			outputData[++outIdx] = (byte)(Math.Max(0, Math.Min(255, 127 + leftStick[1] * 127)));
 
 			float[] rightStick = hidReport.GetStick2(); // 127 is 0
 			outputData[++outIdx] = (byte)(Math.Max(0, Math.Min(255, 127 + rightStick[0] * 127)));
 			outputData[++outIdx] = (byte)(Math.Max(0, Math.Min(255, 127 + rightStick[1] * 127)));
 
 			//we don't have analog buttons so just use the Button enums (which give either 0 or 0xFF)
-			outputData[++outIdx] = (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_LEFT : Joycon.Button.Y))	? (byte)0xFF : (byte)0;
-			outputData[++outIdx] = (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_DOWN : Joycon.Button.B))	? (byte)0xFF : (byte)0;
-			outputData[++outIdx] = (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_RIGHT : Joycon.Button.A))	? (byte)0xFF : (byte)0;
-			outputData[++outIdx] = (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_UP : Joycon.Button.X))		? (byte)0xFF : (byte)0;
+			outputData[++outIdx] = (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_LEFT : Joycon.Button.Y)) ? (byte)0xFF : (byte)0;
+			outputData[++outIdx] = (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_DOWN : Joycon.Button.B)) ? (byte)0xFF : (byte)0;
+			outputData[++outIdx] = (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_RIGHT : Joycon.Button.A)) ? (byte)0xFF : (byte)0;
+			outputData[++outIdx] = (hidReport.GetButton(isLeft ? Joycon.Button.DPAD_UP : Joycon.Button.X)) ? (byte)0xFF : (byte)0;
 
-			outputData[++outIdx] = (hidReport.GetButton(!swapXY ? (isLeft ? Joycon.Button.Y : Joycon.Button.DPAD_LEFT) : (isLeft ? Joycon.Button.X : Joycon.Button.DPAD_UP)))		? (byte)0xFF : (byte)0;
-			outputData[++outIdx] = (hidReport.GetButton(!swapAB ? (isLeft ? Joycon.Button.B : Joycon.Button.DPAD_DOWN) : (isLeft ? Joycon.Button.A : Joycon.Button.DPAD_RIGHT)))	? (byte)0xFF : (byte)0;
-			outputData[++outIdx] = (hidReport.GetButton(!swapAB ? (isLeft ? Joycon.Button.A : Joycon.Button.DPAD_RIGHT) : (isLeft ? Joycon.Button.B : Joycon.Button.DPAD_DOWN)))	? (byte)0xFF : (byte)0;
-			outputData[++outIdx] = (hidReport.GetButton(!swapXY ? (isLeft ? Joycon.Button.X : Joycon.Button.DPAD_UP) : (isLeft ? Joycon.Button.Y : Joycon.Button.DPAD_LEFT)))		? (byte)0xFF : (byte)0;
+			outputData[++outIdx] = (hidReport.GetButton(!swapXY ? (isLeft ? Joycon.Button.Y : Joycon.Button.DPAD_LEFT) : (isLeft ? Joycon.Button.X : Joycon.Button.DPAD_UP))) ? (byte)0xFF : (byte)0;
+			outputData[++outIdx] = (hidReport.GetButton(!swapAB ? (isLeft ? Joycon.Button.B : Joycon.Button.DPAD_DOWN) : (isLeft ? Joycon.Button.A : Joycon.Button.DPAD_RIGHT))) ? (byte)0xFF : (byte)0;
+			outputData[++outIdx] = (hidReport.GetButton(!swapAB ? (isLeft ? Joycon.Button.A : Joycon.Button.DPAD_RIGHT) : (isLeft ? Joycon.Button.B : Joycon.Button.DPAD_DOWN))) ? (byte)0xFF : (byte)0;
+			outputData[++outIdx] = (hidReport.GetButton(!swapXY ? (isLeft ? Joycon.Button.X : Joycon.Button.DPAD_UP) : (isLeft ? Joycon.Button.Y : Joycon.Button.DPAD_LEFT))) ? (byte)0xFF : (byte)0;
 
 			outputData[++outIdx] = (hidReport.GetButton(isLeft ? Joycon.Button.SHOULDER2_1 : Joycon.Button.SHOULDER_1)) ? (byte)0xFF : (byte)0;
 			outputData[++outIdx] = (hidReport.GetButton(isLeft ? Joycon.Button.SHOULDER_1 : Joycon.Button.SHOULDER2_1)) ? (byte)0xFF : (byte)0;