diff --git a/.gitignore b/.gitignore
index ea40922..f29f730 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ python-3.10
 .DS_Store
 *.dmg
 python-3.11
+build
diff --git a/python/env/requirements.txt b/python/env/requirements.txt
index fcc9c37..add6095 100644
--- a/python/env/requirements.txt
+++ b/python/env/requirements.txt
@@ -1,8 +1,8 @@
 pypiwin32==223; sys_platform == 'win32'
-PySide6==6.6.0
-cython==3.0.5
-numpy==1.26.2
+PySide6==6.7.0
+cython==3.0.10
+numpy==1.26.4
 scipy==1.11.4
-sqlalchemy==2.0.23
-alembic==1.12.1
+sqlalchemy==2.0.29
+alembic==1.13.1
 pyinstaller==5.13.2
diff --git a/python/libopenimu/importers/AppleWatchImporter.py b/python/libopenimu/importers/AppleWatchImporter.py
index b643f8c..d99fddb 100644
--- a/python/libopenimu/importers/AppleWatchImporter.py
+++ b/python/libopenimu/importers/AppleWatchImporter.py
@@ -5,6 +5,7 @@
     @date 30/05/2018
 
 """
+import logging
 
 from libopenimu.importers.BaseImporter import BaseImporter
 from libopenimu.models.sensor_types import SensorType
@@ -54,6 +55,7 @@ class AppleWatchImporter(BaseImporter):
     HEADINGS_ID = 16
     RAW_MAGNETO_ID = 17
     TREMOR_ID = 18
+    DYSKINETIC_ID = 19
 
     def __init__(self, manager: DBManager, participant: Participant):
         super().__init__(manager, participant)
@@ -549,7 +551,7 @@ def import_sensoria_to_database(self, settings, sample_rate, sensoria: dict):
         sensoria_acc_channels.append(self.add_channel_to_db(sensoria_acc_sensor, Units.GRAVITY_G,
                                                             DataFormat.FLOAT32, 'Accelerometer_Z'))
 
-        sensoria_gyro_sensor = self.add_sensor_to_db(SensorType.GYROMETER, 'Gyrometer', 'Sensoria', 'Foot',
+        sensoria_gyro_sensor = self.add_sensor_to_db(SensorType.GYROMETER, 'Gyroscope', 'Sensoria', 'Foot',
                                                      sample_rate, 1, settings)
         sensoria_gyro_channels = list()
         sensoria_gyro_channels.append(self.add_channel_to_db(sensoria_gyro_sensor, Units.DEG_PER_SEC,
@@ -707,12 +709,12 @@ def import_beacons_to_database(self, settings, sample_rate, beacons: dict):
             count += 1
             self.update_progress.emit(50 + np.floor(count / len(beacons) / 2 * 100))
 
-    def import_motion_to_database(self, settings, sampling_rate, motion: dict):
+    def import_motion_to_database(self, settings, sampling_rate, motion: dict, version: int):
         # DL Oct. 16 2018, New import to database
 
         # Create channels and sensors
         accelerometer_sensor = self.add_sensor_to_db(SensorType.ACCELEROMETER, 'Accelerometer',
-                                                     'AppleWatch','Wrist', sampling_rate, 1, settings)
+                                                     'AppleWatch', 'Wrist', sampling_rate, 1, settings)
 
         accelerometer_channels = list()
 
@@ -727,8 +729,8 @@ def import_motion_to_database(self, settings, sampling_rate, motion: dict):
                                                              DataFormat.FLOAT32, 'Accelerometer_Z'))
 
         # Create sensor
-        gyro_sensor = self.add_sensor_to_db(SensorType.GYROMETER, 'Gyro','AppleWatch','Wrist',
-                                            sampling_rate, 1, settings)
+        gyro_sensor = self.add_sensor_to_db(SensorType.GYROMETER, 'Gyroscope', 'AppleWatch',
+                                            'Wrist', sampling_rate, 1, settings)
 
         gyro_channels = list()
 
@@ -751,6 +753,18 @@ def import_motion_to_database(self, settings, sampling_rate, motion: dict):
         orientation_channels.append(self.add_channel_to_db(orientation_sensor, Units.NONE, DataFormat.FLOAT32, 'q2'))
         orientation_channels.append(self.add_channel_to_db(orientation_sensor, Units.NONE, DataFormat.FLOAT32, 'q3'))
 
+        mag_channels = list()
+        magneto_sensor = None
+        if version >= 3:  # Also includes magnetometer values
+            # Create sensor
+            magneto_sensor = self.add_sensor_to_db(SensorType.MAGNETOMETER, 'Magnetometer', 'AppleWatch',
+                                                   'Wrist', sampling_rate, 1, settings)
+
+            # Create channels
+            mag_channels.append(self.add_channel_to_db(magneto_sensor, Units.UTESLA, DataFormat.FLOAT32, 'Mag_X'))
+            mag_channels.append(self.add_channel_to_db(magneto_sensor, Units.UTESLA, DataFormat.FLOAT32, 'Mag_Y'))
+            mag_channels.append(self.add_channel_to_db(magneto_sensor, Units.UTESLA, DataFormat.FLOAT32, 'Mag_Z'))
+
         # Data is already hour-aligned iterate through hours
         count = 0
         for timestamp in motion:
@@ -794,10 +808,18 @@ def import_motion_to_database(self, settings, sampling_rate, motion: dict):
                 self.add_sensor_data_to_db(recordset, gyro_sensor, gyro_channel,
                                            sensor_timestamps, valuesarray[:, i + 6])
 
+            # Magneto
+            current_offset = 9
+            if magneto_sensor:
+                for i, mag_channel in enumerate(mag_channels):
+                    self.add_sensor_data_to_db(recordset, magneto_sensor, mag_channel, sensor_timestamps,
+                                               valuesarray[:, i + current_offset])
+                current_offset = 12
+
             # Attitude
             for i, channel in enumerate(orientation_channels):
                 self.add_sensor_data_to_db(recordset, orientation_sensor, channel, sensor_timestamps,
-                                           valuesarray[:, i + 9])
+                                           valuesarray[:, i + current_offset])
 
             count += 1
             self.update_progress.emit(50 + np.floor(count / len(motion) / 2 * 100))
@@ -1050,6 +1072,56 @@ def import_tremor_to_database(self, settings, tremor: dict):
             count += 1
             self.update_progress.emit(50 + np.floor(count / len(tremor) / 2 * 100))
 
+    def import_dyskinetic_to_database(self, settings, dysk: dict):
+        # Create channels and sensors
+        dysk_sensor = self.add_sensor_to_db(SensorType.BIOMETRICS, 'Dyskinetic Mvt', 'AppleWatch', 'Wrist', 0, 1,
+                                            settings)
+
+        dysk_channels = list()
+        dysk_channels.append(self.add_channel_to_db(dysk_sensor, Units.MILLISECONDS, DataFormat.UINT64,
+                                                    'Start Timestamp'))
+
+        dysk_channels.append(self.add_channel_to_db(dysk_sensor, Units.MILLISECONDS, DataFormat.UINT64,
+                                                    'End Timestamp'))
+
+        dysk_channels.append(self.add_channel_to_db(dysk_sensor, Units.PERCENTAGE, DataFormat.FLOAT32, 'Likeliness'))
+
+        # Data is already hour-aligned iterate through hours
+        count = 0
+        for timestamp in dysk:
+            # Filter invalid timestamp if needed
+            if timestamp.year < 2000:
+                continue
+
+            # Calculate recordset
+            recordset = self.get_recordset(timestamp.timestamp(), session_name=self.session_name)
+
+            # Add data to database
+
+            # Create time array as float64
+            timesarray = np.asarray(dysk[timestamp]['times'], dtype=np.float64)
+
+            if len(timesarray) == 0:
+                self.last_error = "Aucune données temporelles."
+                return
+
+            valuesarray = np.asarray(dysk[timestamp]['values'], dtype=np.float32)
+
+            # Create sensor timestamps first
+            sensor_timestamps = self.create_sensor_timestamps(timesarray, recordset)
+
+            for i, channel in enumerate(dysk_channels):
+                # Start and end timestamp are larger than float32 - a cast is required (channel 0 and 1)
+                if i <= 1:
+                    current_timestamp = np.uint64(valuesarray[:, i*2:i*2+1])
+                    self.add_sensor_data_to_db(recordset, dysk_sensor, channel, sensor_timestamps, current_timestamp)
+                else:
+                    self.add_sensor_data_to_db(recordset, dysk_sensor, channel, sensor_timestamps,
+                                               valuesarray[:, i + 3])
+
+            count += 1
+            self.update_progress.emit(50 + np.floor(count / len(dysk) / 2 * 100))
+
     def import_question_to_database(self, settings, question: dict):
         # Create base sensor(s)
         questions_sensor = self.add_sensor_to_db(SensorType.QUESTIONS, 'Prompts', 'AppleWatch',
@@ -1136,7 +1208,7 @@ def import_to_database(self, results):
                 sampling_rate = res['motion']['sampling_rate']
                 if res['motion']['timestamps']:
                     self.import_motion_to_database(res['motion']['settings'], sampling_rate,
-                                                   res['motion']['timestamps'])
+                                                   res['motion']['timestamps'], res['motion']['version'])
 
             if res.__contains__('battery'):
                 sampling_rate = res['battery']['sampling_rate']
@@ -1286,7 +1358,7 @@ def read_data_file(self, file, debug=False):
 
         # if version == 1: Nothing more to do
 
-        if version == 2:
+        if version >= 2:
             [json_data_size] = struct.unpack("<I", file.read(4))
             [json_data] = struct.unpack("<{}s".format(json_data_size), file.read(json_data_size))
             settings_json_str = json_data.decode("utf-8")
@@ -1329,16 +1401,31 @@ def read_data_file(self, file, debug=False):
         elif sensor_id == self.COORDINATES_ID:
             read_data_func = self.read_coordinates_data
             dict_name = 'coordinates'
-        # deprecated
         elif sensor_id == self.RAW_MOTION_ID:
+            # deprecated
             read_data_func = self.read_raw_motion_data
             dict_name = 'raw_motion'
         elif sensor_id == self.RAW_ACCELERO_ID:
             read_data_func = self.read_raw_accelerometer_data
             dict_name = 'raw_accelero'
         elif sensor_id == self.RAW_GYRO_ID:
+            # Check if has processed motion (same data) - ignore if it's the case
+            basename = os.path.basename(file.name)
+            motion_file_name = file.name.replace(basename, 'watch_ProcessedMotion.data')
+            if os.path.isfile(motion_file_name):
+                self.last_error = "Ignoring gyro data - using processed motion instead"
+                return None
             read_data_func = self.read_raw_gyro_data
             dict_name = 'raw_gyro'
+        elif sensor_id == self.RAW_MAGNETO_ID:
+            # Check if has processed motion (same data) - ignore if it's the case
+            basename = os.path.basename(file.name)
+            motion_file_name = file.name.replace(basename, 'watch_ProcessedMotion.data')
+            if os.path.isfile(motion_file_name):
+                self.last_error = "Ignoring magneto data - using processed motion instead"
+                return None
+            read_data_func = self.read_raw_magneto_data
+            dict_name = 'raw_magneto'
         elif sensor_id == self.PEDOMETER_ID:
             read_data_func = self.read_pedometer_data
             dict_name = 'pedometer'
@@ -1351,15 +1438,15 @@ def read_data_file(self, file, debug=False):
         elif sensor_id == self.HEALTH_ID:
             read_data_func = self.read_health_data
             dict_name = 'health'
-        elif sensor_id == self.RAW_MAGNETO_ID:
-            read_data_func = self.read_raw_magneto_data
-            dict_name = 'raw_magneto'
         elif sensor_id == self.QUESTION_ID:
             read_data_func = self.read_prompt_data
             dict_name = 'question'
         # elif sensor_id == self.TREMOR_ID:
         #     read_data_func = self.read_tremor_data
         #     dict_name = 'tremor'
+        # elif sensor_id == self.DYSKINETIC_ID:
+        #     read_data_func = self.read_dyskinetic_data
+        #     dict_name = 'dysk'
         else:
             self.last_error = "Unknown sensor ID:" + str(sensor_id)
             return None
@@ -1369,8 +1456,9 @@ def read_data_file(self, file, debug=False):
 
         results[dict_name]['timestamps'] = {}
 
-        # Insert sampling rate information
+        # Insert sampling rate & file version information
         results[dict_name]['sampling_rate'] = self.get_sampling_rate_from_header(sensor_id, settings_json_str)
+        results[dict_name]['version'] = version
         results[dict_name]['settings'] = settings_json_str
 
         # lists of co-dependant timestamp(ms) and data
@@ -1397,7 +1485,7 @@ def read_data_file(self, file, debug=False):
                 # results_ms_ts.append(int(local_ms_ts))
 
                 results_ms_ts.append(int(timestamp_ms))
-                results_ms_data.append(read_data_func(file, debug))
+                results_ms_data.append(read_data_func(file, debug=debug, version=version))
 
                 if file.seekable():
                     new_progress = np.floor((file.tell() / self.current_file_size) * 100 / 2)
@@ -1436,7 +1524,7 @@ def read_data_file(self, file, debug=False):
         return results
 
     @staticmethod
-    def read_battery_data(file, debug=False):
+    def read_battery_data(file, debug=False, version=2):
         """
         • Byte integer for battery level between 0 and 100 (percent)
         ◦ 0 meaning invalid level (eg. where state is .unknown)
@@ -1454,7 +1542,7 @@ def read_battery_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_sensoria_data(file, debug=False):
+    def read_sensoria_data(file, debug=False, version=2):
         """
         46 bytes of received frame (will require further processing)
         This assumes that all socks we have use the F20 streaming protocol, as defined in
@@ -1476,7 +1564,7 @@ def read_sensoria_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_heartrate_data(file, debug=False):
+    def read_heartrate_data(file, debug=False, version=2):
         """
         unsigned integer as single Byte for bpm
         ** assumes that bpm cannot go above 255, hence values above are clamped to 255
@@ -1491,22 +1579,27 @@ def read_heartrate_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_motion_data(file, debug=False):
+    def read_motion_data(file, debug=False, version=2):
         """
-         13 Float32 values, hence 52 bytes, with following fields
+         13 to 16 Float32 values, with following fields
         • acceleration (x,y,z)
         • gravity vector (x,y,z)
         • gyroscope (x,y,z)
+        • magneto (x,y,z) [File version 3+ only]
         • attitude quaternion (w,x,y,z)
             """
-        chunk = file.read(52)
-        data = struct.unpack("<13f", chunk)
+        if version == 3:
+            chunk = file.read(64)
+            data = struct.unpack("<16f", chunk)
+        else:  # Version 2
+            chunk = file.read(52)
+            data = struct.unpack("<13f", chunk)
         if debug:
             print('MOTION: ', data)
         return data
 
     @staticmethod
-    def read_beacons_data(file, debug=False):
+    def read_beacons_data(file, debug=False, version=2):
         """
         10 Bytes Char for namespace
         6 Bytes Char for instance ID
@@ -1521,7 +1614,7 @@ def read_beacons_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_coordinates_data(file, debug=False):
+    def read_coordinates_data(file, debug=False, version=2):
         """
           7 Float32 values, hence 28 bytes
         • latitude
@@ -1541,7 +1634,7 @@ def read_coordinates_data(file, debug=False):
 
     # deprecated, not used anymore, separated into two files
     @staticmethod
-    def read_raw_motion_data(file, debug=False):
+    def read_raw_motion_data(file, debug=False, version=2):
         """
          6 Float32 values, hence 24 bytes, with following fields
             acceleration (x,y,z)
@@ -1554,7 +1647,7 @@ def read_raw_motion_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_raw_accelerometer_data(file, debug=False):
+    def read_raw_accelerometer_data(file, debug=False, version=2):
         """
          3 Float32 values, hence 12 bytes, with following fields
             acceleration (x,y,z)
@@ -1566,7 +1659,7 @@ def read_raw_accelerometer_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_raw_gyro_data(file, debug=False):
+    def read_raw_gyro_data(file, debug=False, version=2):
         """
          3 Float32 values, hence 12 bytes, with following fields
             gyroscope (x,y,z)
@@ -1578,7 +1671,7 @@ def read_raw_gyro_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_pedometer_data(file, debug=False):
+    def read_pedometer_data(file, debug=False, version=2):
         """
          - Number of steps:     uint32
          - Distance:            float32, -1.0 if the value is not available on device
@@ -1595,7 +1688,7 @@ def read_pedometer_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_activity_data(file, debug=False):
+    def read_activity_data(file, debug=False, version=2):
         """
         Detected Activities: UInt8 -- 1 byte: Detected activities and confidence level:
             Bits 0-1: Confidence level:
@@ -1616,7 +1709,7 @@ def read_activity_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_headings_data(file, debug=False):
+    def read_headings_data(file, debug=False, version=2):
         """
         True Heading: Float32 -- 4 bytes: Heading in degrees relative to true north (0 = North, 180 = South). Only valid if "True Heading Accuracy" is positive.
         True Heading Accuracy: Float32 -- 4 bytes: Accuracy in degrees of "True Heading", with negative values representing unreliable or uncalibrated sensor.
@@ -1632,7 +1725,7 @@ def read_headings_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_health_data(file, debug=False):
+    def read_health_data(file, debug=False, version=2):
         """
         Start Timestamp: UInt64 -- 8 bytes: Sample start timestamp (Unix format) with milliseconds precision
         End Timestamp: UInt64 -- 8 bytes: Sample end timestamp (Unix format) with milliseconds precision
@@ -1646,7 +1739,7 @@ def read_health_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_raw_magneto_data(file, debug=False):
+    def read_raw_magneto_data(file, debug=False, version=2):
         """
         Magnetometer x-data: Float32 -- 4 bytes: Magnetometer data for x-axis (microTeslas)
         Magnetometer y-data: Float32 -- 4 bytes: Magnetometer data for y-axis (microTeslas)
@@ -1659,7 +1752,7 @@ def read_raw_magneto_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_tremor_data(file, debug=False):
+    def read_tremor_data(file, debug=False, version=2):
         """
         Start Timestamp: Uint64 -- 8 bytes: Timestamp (Unix format) with milliseconds precision on which the measurement started
         End Timestamp: Uint64 -- 8 bytes: Timestamp (Unix format) with milliseconds precision on which the measurement ended
@@ -1676,7 +1769,20 @@ def read_tremor_data(file, debug=False):
         return data
 
     @staticmethod
-    def read_prompt_data(file, debug=False):
+    def read_dyskinetic_data(file, debug=False, version=2):
+        """
+        Start Timestamp: Uint64 -- 8 bytes: Timestamp (Unix format) with milliseconds precision on which the measurement started
+        End Timestamp: Uint64 -- 8 bytes: Timestamp (Unix format) with milliseconds precision on which the measurement ended
+        Percent likely: Float32 -- 4 bytes: Percent likely that there is dyskinetic movements
+        """
+        chunk = file.read(20)
+        data = struct.unpack("<2Q<1f", chunk)
+        if debug:
+            print('DYSKINETIC: ', data)
+        return data
+
+    @staticmethod
+    def read_prompt_data(file, debug=False, version=2):
         """
         Prompt ID size: UInt16 -- 2 bytes: Size of prompt ID string (N)
         Prompt ID: String -- N bytes: Prompt identifier
diff --git a/python/resources/ui/StartDialog.ui b/python/resources/ui/StartDialog.ui
index 780be27..e57e457 100644
--- a/python/resources/ui/StartDialog.ui
+++ b/python/resources/ui/StartDialog.ui
@@ -385,7 +385,7 @@ in database</string>
         </font>
        </property>
        <property name="text">
-        <string notr="true">1.1.0</string>
+        <string notr="true">1.1.1</string>
        </property>
       </widget>
      </item>
diff --git a/python/resources/ui/StreamWindow.ui b/python/resources/ui/StreamWindow.ui
index 5ebe434..b8fc295 100644
--- a/python/resources/ui/StreamWindow.ui
+++ b/python/resources/ui/StreamWindow.ui
@@ -535,6 +535,9 @@
                <attribute name="horizontalHeaderStretchLastSection">
                 <bool>true</bool>
                </attribute>
+               <attribute name="verticalHeaderVisible">
+                <bool>false</bool>
+               </attribute>
                <column>
                 <property name="text">
                  <string>Progress</string>
diff --git a/setup/create_dmg.sh b/setup/create_dmg.sh
index bff7947..7b1db48 100755
--- a/setup/create_dmg.sh
+++ b/setup/create_dmg.sh
@@ -9,7 +9,7 @@ rm -r ${SCRIPT_PATH}/../python/dist/dmg/*
 cp -R "${SCRIPT_PATH}/../python/dist/OpenIMU.app" "${SCRIPT_PATH}/../python/dist/dmg"
 # If the DMG already exists, delete it.
 test -f "${SCRIPT_PATH}/../python/dist/OpenIMU.dmg" && rm "${SCRIPT_PATH}/../python/dist/OpenIMU.dmg"
-/usr/local/bin/create-dmg \
+create-dmg \
   --volname "OpenIMU" \
   --volicon "${SCRIPT_PATH}/../python/resources/icons/OpenIMU.icns" \
   --window-pos 200 120 \
diff --git a/setup/setup_windows.iss b/setup/setup_windows.iss
index 486d770..8112078 100644
--- a/setup/setup_windows.iss
+++ b/setup/setup_windows.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "OpenIMU"
-#define MyAppVersion "1.1.0"
+#define MyAppVersion "1.1.1"
 #define MyAppPublisher "INTER - CdRV - 3IT - USherbrooke"
 #define MyAppURL "https://github.com/introlab/OpenIMU"
 #define MyAppExeName "OpenIMU.exe"