diff --git a/configs/thermal-engine.conf b/configs/thermal-engine.conf
deleted file mode 100644
index 39878a7..0000000
--- a/configs/thermal-engine.conf
+++ /dev/null
@@ -1,94 +0,0 @@
-[msm_therm.DEFAULT]
-algo_type monitor
-sensor msm_therm
-sampling 1000
-thresholds 43000 45000 45500 47000 49000 50500 51500 52500 53000 53300 54000 54500 55500 56000 60200
-thresholds_clr 41000 43000 43500 45000 47000 49500 50500 51500 52000 52300 53000 53500 54500 55000 56000
-actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam
-action_info 1555200+1958400+0+0+1+1+630000000+209+2+0+100000+0 1555200+1958400+0+0+1+1+630000000+171+3+0+100000+0 1555200+1958400+0+0+1+1+630000000+171+5+0+100000+0 1555200+1248000+0+0+1+1+630000000+141+5+0+100000+0 1478400+864000+0+1+1+1+630000000+141+8+0+001800+0 1344000+384000+1+1+1+1+630000000+115+8+0+001800+0 1248000+384000+1+1+1+1+630000000+95+8+0+001800+0 1248000+384000+1+1+1+1+450000000+78+8+0+001800+0 960000+384000+1+1+1+1+450000000+78+9+1+001800+0 864000+384000+1+1+1+1+390000000+64+11+1+001800+5 768000+384000+1+1+1+1+390000000+64+12+1+001800+5 600000+384000+1+1+1+1+180000000+51+12+1+001800+5 460800+384000+1+1+1+1+180000000+44+12+1+001800+5 384000+384000+1+1+1+1+180000000+44+12+1+001800+6 384000+384000+1+1+1+1+180000000+44+13+1+001800+6
-
-[msm_therm.CAMERA-Step]
-algo_type monitor
-sensor msm_therm
-sampling 1000
-thresholds -100000 45500 47000 49000 52000 53500 56000 60200
-thresholds_clr -110000 40000 45500 47000 49000 52000 53500 56000
-actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam
-action_info 1555200+1958400+0+0+0+0+630000000+141+8+0+100000+0 1555200+1728000+0+0+1+1+630000000+95+9+0+100000+0 1555200+1248000+0+1+1+1+305000000+78+12+0+100000+0 960000+384000+1+1+1+1+305000000+51+12+1+001800+0 960000+384000+1+1+1+1+305000000+51+12+1+001800+1 960000+384000+1+1+1+1+305000000+44+12+1+001800+5 960000+384000+1+1+1+1+305000000+44+12+1+001800+6 384000+384000+1+1+1+1+180000000+44+13+1+001800+6
-disable
-
-[msm_therm.CAMERA-Low]
-algo_type monitor
-sensor msm_therm
-sampling 1000
-thresholds -100000 45500 47000 49000 53500 57000 60200
-thresholds_clr -110000 40000 45500 47000 49000 53500 57000
-actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam
-action_info 672000+384000+1+1+1+1+180000000+141+8+0+100000+0 672000+384000+1+1+1+1+180000000+95+9+0+100000+0 672000+384000+1+1+1+1+180000000+78+12+0+100000+0 672000+384000+1+1+1+1+180000000+51+12+1+001800+0 672000+384000+1+1+1+1+180000000+44+12+1+001800+5 672000+384000+1+1+1+1+180000000+44+12+1+001800+6 384000+384000+1+1+1+1+180000000+44+13+1+001800+6
-disable
-
-[msm_therm.CAMERA-Mid]
-algo_type monitor
-sensor msm_therm
-sampling 1000
-thresholds -100000 45500 47000 49000 53500 57000 60200
-thresholds_clr -110000 40000 45500 47000 49000 53500 57000
-actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam
-action_info 960000+384000+1+1+1+1+180000000+141+8+0+100000+0 960000+384000+1+1+1+1+180000000+95+9+0+100000+0 960000+384000+1+1+1+1+180000000+78+12+0+100000+0 960000+384000+1+1+1+1+180000000+51+12+1+001800+0 960000+384000+1+1+1+1+180000000+44+12+1+001800+5 960000+384000+1+1+1+1+180000000+44+12+1+001800+6 384000+384000+1+1+1+1+180000000+44+13+1+001800+6
-disable
-
-[msm_therm.CAMERA-Hi]
-algo_type monitor
-sensor msm_therm
-sampling 1000
-thresholds -100000 45500 47000 49000 53500 57000 60200
-thresholds_clr -110000 40000 45500 47000 49000 53500 57000
-actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem+s_cam_ltb_tim+s_cam
-action_info 1344000+384000+1+1+1+1+305000000+141+8+0+100000+0 1344000+384000+1+1+1+1+305000000+95+9+0+100000+0 1344000+384000+1+1+1+1+305000000+78+12+0+100000+0 1344000+384000+1+1+1+1+305000000+51+12+1+001800+0 1344000+384000+1+1+1+1+305000000+44+12+1+001800+5 1344000+384000+1+1+1+1+305000000+44+12+1+001800+6 384000+384000+1+1+1+1+180000000+44+13+1+001800+6
-disable
-
-[msm_therm.CAMERA-All]
-algo_type monitor
-sensor msm_therm
-sampling 1000
-thresholds -100000 45500 47000 49000
-thresholds_clr -110000 40000 45500 47000
-actions cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem cluster0+cluster1+hotplug_4+hotplug_5+hotplug_6+hotplug_7+gpu+s_backlight+battery+modem
-action_info 1555200+1958400+0+0+0+0+630000000+141+8+0 1555200+1728000+0+0+1+1+630000000+95+9+0 1555200+1248000+0+1+1+1+305000000+78+12+0 1344000+384000+1+1+1+1+305000000+51+12+1
-disable
-
-[batt_therm]
-algo_type monitor
-sensor bms
-sampling 1000
-thresholds -100000 43000 44000 67000
-thresholds_clr -110000 41000 42000 0
-actions battery battery battery battery+s_shutdown
-action_info 1 2 3 13+5
-
-[msm_therm]
-algo_type monitor
-sensor msm_therm
-sampling 1000
-thresholds 54000 60200 62000 74000
-thresholds_clr 50000 59000 60200 0
-actions s_tether+s_tel+s_bg s_tether+s_tel+s_bg s_tether+s_tel+s_bg s_tether+s_tel+s_bg+s_shutdown
-action_info 0+0+1 1+1+1 1+1+1 1+1+1+5
-
-[bl_therm]
-algo_type monitor
-sensor quiet_therm
-sampling 1000
-thresholds 39000 39500 40000 41000 41500 42000
-thresholds_clr 38000 38500 39000 40000 40500 41000
-actions s_backlight s_backlight s_backlight s_backlight s_backlight s_backlight
-action_info 209 171 141 115 78 44
-
-[sony_camera]
-algo_type monitor
-sensor sony_camera_0
-sampling 1000
-thresholds 55000 59000 60000 62000 67000
-thresholds_clr 49000 53000 57000 60000 61000
-actions s_cam_ltb_tim+s_cam s_cam_ltb_tim+s_cam s_cam_ltb_tim+s_cam s_cam_ltb_tim+s_cam s_cam_ltb_tim+s_cam+s_shutdown
-action_info 001800+0 001800+1 001800+5 001800+6 001800+6+5
diff --git a/configs/thermanager.xml b/configs/thermanager.xml
new file mode 100644
index 0000000..168de44
--- /dev/null
+++ b/configs/thermanager.xml
@@ -0,0 +1,361 @@
+<thermanager>
+	<resources>
+		<!-- thermal zones -->
+		<resource name="bms"  type="tz">/sys/class/thermal/thermal_zone0</resource>
+		<resource name="flash_therm"  type="tz">/sys/class/thermal/thermal_zone1</resource>
+
+		<resource name="tsens_tz_sensor0"  type="tz">/sys/class/thermal/thermal_zone2</resource>
+		<resource name="tsens_tz_sensor1"  type="tz">/sys/class/thermal/thermal_zone3</resource>
+		<resource name="tsens_tz_sensor2"  type="tz">/sys/class/thermal/thermal_zone4</resource>
+		<resource name="tsens_tz_sensor3"  type="tz">/sys/class/thermal/thermal_zone5</resource>
+		<resource name="tsens_tz_sensor4"  type="tz">/sys/class/thermal/thermal_zone6</resource>
+		<resource name="tsens_tz_sensor5"  type="tz">/sys/class/thermal/thermal_zone7</resource>
+
+		<resource name="tsens_tz_sensor6"  type="tz">/sys/class/thermal/thermal_zone8</resource>  <!-- cpu7 -->
+		<resource name="tsens_tz_sensor7"  type="tz">/sys/class/thermal/thermal_zone9</resource> <!-- cpu0 -->
+		<resource name="tsens_tz_sensor8"  type="tz">/sys/class/thermal/thermal_zone10</resource> <!-- cpu1 -->
+		<resource name="tsens_tz_sensor9"  type="tz">/sys/class/thermal/thermal_zone11</resource> <!-- cpu2 -->
+		<resource name="tsens_tz_sensor10" type="tz">/sys/class/thermal/thermal_zone12</resource> <!-- cpu3 -->
+		<resource name="tsens_tz_sensor11" type="tz">/sys/class/thermal/thermal_zone13</resource> <!-- gpu0 -->
+		<resource name="tsens_tz_sensor12" type="tz">/sys/class/thermal/thermal_zone14</resource> <!-- gpu1 -->
+		<resource name="tsens_tz_sensor13" type="tz">/sys/class/thermal/thermal_zone15</resource> <!-- cpu4 -->
+		<resource name="tsens_tz_sensor14" type="tz">/sys/class/thermal/thermal_zone16</resource> <!-- cpu5 -->
+		<resource name="tsens_tz_sensor15" type="tz">/sys/class/thermal/thermal_zone17</resource> <!-- cpu6 -->
+
+		<resource name="pm8994_tz" type="tz">/sys/class/thermal/thermal_zone18</resource>
+		<resource name="msm_therm" type="tz">/sys/class/thermal/thermal_zone19</resource>
+		<resource name="emmc_therm" type="tz">/sys/class/thermal/thermal_zone20</resource>
+		<resource name="pa_therm0" type="tz">/sys/class/thermal/thermal_zone21</resource>
+		<resource name="pa_therm1" type="tz">/sys/class/thermal/thermal_zone22</resource>
+		<resource name="quiet_therm" type="tz">/sys/class/thermal/thermal_zone23</resource>
+		<resource name="xo_therm" type="tz">/sys/class/thermal/thermal_zone24</resource>
+		<resource name="battery" type="tz">/sys/class/thermal/thermal_zone25</resource> <!-- same values as zone0, bms -->
+
+		<resource name="temp-core" type="union">
+<!--			<resource name="msm_therm" /> -->
+<!--			<resource name="emmc_therm" /> -->
+			<resource name="pa_therm0" />
+			<resource name="pa_therm1" />
+<!--			<resource name="quiet_therm" /> -->
+			<resource name="xo_therm" />
+		</resource>
+
+		<resource name="temp-cluster-a53" type="union">
+			<resource name="tsens_tz_sensor7"  />
+			<resource name="tsens_tz_sensor8"  />
+			<resource name="tsens_tz_sensor9"  />
+			<resource name="tsens_tz_sensor10" />
+		</resource>
+
+		<resource name="temp-cluster-a57" type="union">
+			<resource name="tsens_tz_sensor6"  />
+			<resource name="tsens_tz_sensor13" />
+			<resource name="tsens_tz_sensor14" />
+			<resource name="tsens_tz_sensor15" />
+		</resource>
+
+		<resource name="temp-adreno-430" type="union">
+			<resource name="tsens_tz_sensor11" />
+			<resource name="tsens_tz_sensor12" />
+		</resource>
+
+		<!-- generic cpufreq -->
+		<resource name="cluster-a53" type="sysfs">/sys/module/msm_performance/parameters/cpu_max_freq</resource>
+		<resource name="cluster-a57" type="sysfs">/sys/module/msm_performance/parameters/cpu_max_freq</resource>
+
+		<!-- hotplugging -->
+		<resource name="thermal-max-cpus" type="sysfs">/sys/devices/system/cpu/cpuquiet/nr_thermal_max_cpus</resource>
+
+		<!-- device-specific -->
+		<resource name="kgsl-3d0" type="sysfs">/sys/class/kgsl/kgsl-3d0/max_gpuclk</resource>
+		<resource name="usb" type="sysfs">/sys/class/power_supply/usb/current_max</resource>
+		<resource name="charge_speed" type="sysfs">/sys/class/power_supply/battery/system_temp_level</resource>
+		<resource name="charging_enabled" type="sysfs">/sys/class/power_supply/battery/charging_enabled</resource>
+
+		<!-- TODO: -->
+		<resource name="camera" type="echo" />
+		<resource name="modem" type="echo" />
+
+		<resource name="shutdown" type="halt" delay="5" />
+	</resources>
+
+	<control name="usb">
+		<mitigation level="off"><value resource="usb">1500000</value></mitigation>
+		<mitigation level="1"><value resource="usb">1100000</value></mitigation>
+		<mitigation level="2"><value resource="usb">900000</value></mitigation>
+		<mitigation level="3"><value resource="usb">700000</value></mitigation>
+		<mitigation level="4"><value resource="usb">500000</value></mitigation>
+		<mitigation level="5"><value resource="usb">300000</value></mitigation>
+		<mitigation level="6"><value resource="usb">150000</value></mitigation>
+	</control>
+
+	<control name="battery_protect">
+		<mitigation level="off"><value resource="charging_enabled">1</value></mitigation>
+		<mitigation level="1"><value resource="charging_enabled">0</value></mitigation>
+		<mitigation level="2"><value resource="shutdown" /></mitigation>
+	</control>
+
+	<control name="charging">
+		<mitigation level="off"><value resource="charge_speed">0</value></mitigation>
+		<mitigation level="1"><value resource="charge_speed">1</value></mitigation>
+		<mitigation level="2"><value resource="charge_speed">2</value></mitigation>
+		<mitigation level="3"><value resource="charge_speed">3</value></mitigation>
+		<mitigation level="4"><value resource="charge_speed">4</value></mitigation>
+		<mitigation level="5"><value resource="charge_speed">5</value></mitigation>
+		<mitigation level="6"><value resource="charge_speed">6</value></mitigation>
+		<mitigation level="7"><value resource="charge_speed">7</value></mitigation>
+		<mitigation level="8"><value resource="charge_speed">8</value></mitigation>
+		<mitigation level="9"><value resource="charge_speed">9</value></mitigation>
+		<mitigation level="10"><value resource="charge_speed">10</value></mitigation>
+		<mitigation level="11"><value resource="charge_speed">11</value></mitigation>
+		<mitigation level="12"><value resource="charge_speed">12</value></mitigation>
+	</control>
+
+	<control name="modem">
+		<mitigation level="off"><value resource="modem">0</value></mitigation>
+		<mitigation level="1"><value resource="modem">1</value></mitigation>
+	</control>
+
+	<control name="camera">
+		<mitigation level="off"><value resource="camera">NORMAL</value></mitigation>
+		<mitigation level="1"><value resource="camera">WARNING</value></mitigation>
+		<mitigation level="2"><value resource="camera">CRITICAL</value></mitigation>
+	</control>
+
+	<control name="shutdown">
+		<mitigation level="off" />
+		<mitigation level="1"><value resource="shutdown"/></mitigation>
+	</control>
+
+	<control name="gpu">
+		<mitigation level="off"><value resource="kgsl-3d0">600000000</value></mitigation>
+		<mitigation level="1"><value resource="kgsl-3d0">510000000</value></mitigation>
+		<mitigation level="2"><value resource="kgsl-3d0">450000000</value></mitigation>
+		<mitigation level="3"><value resource="kgsl-3d0">390000000</value></mitigation>
+		<mitigation level="4"><value resource="kgsl-3d0">305000000</value></mitigation>
+		<mitigation level="5"><value resource="kgsl-3d0">180000000</value></mitigation>
+		<mitigation level="6"><value resource="shutdown" /></mitigation>
+	</control>
+
+	<control name="cpu-a53">
+		<mitigation level="off"><value resource="cluster-a53">0:4294967295</value></mitigation>
+		<mitigation level="1"><value resource="cluster-a53">0:1478400</value></mitigation>
+		<mitigation level="2"><value resource="cluster-a53">0:1344000</value></mitigation>
+		<mitigation level="3"><value resource="cluster-a53">0:1248000</value></mitigation>
+		<mitigation level="4"><value resource="cluster-a53">0:960000</value></mitigation>
+		<mitigation level="5"><value resource="cluster-a53">0:864000</value></mitigation>
+		<mitigation level="6"><value resource="cluster-a53">0:768000</value></mitigation>
+		<mitigation level="7"><value resource="cluster-a53">0:672000</value></mitigation>
+		<mitigation level="8"><value resource="cluster-a53">0:600000</value></mitigation>
+		<mitigation level="9"><value resource="cluster-a53">0:460800</value></mitigation>
+		<mitigation level="10"><value resource="cluster-a53">0:384000</value></mitigation>
+		<mitigation level="11"><value resource="shutdown" /></mitigation>
+	</control>
+
+	<control name="cpu-a57">
+		<mitigation level="off"><value resource="cluster-a57">4:4294967295</value></mitigation>
+		<mitigation level="1"><value resource="cluster-a57">4:1824000</value></mitigation>
+		<mitigation level="2"><value resource="cluster-a57">4:1728000</value></mitigation>
+		<mitigation level="3"><value resource="cluster-a57">4:1632000</value></mitigation>
+		<mitigation level="4"><value resource="cluster-a57">4:1536000</value></mitigation>
+		<mitigation level="5"><value resource="cluster-a57">4:1440000</value></mitigation>
+		<mitigation level="6"><value resource="cluster-a57">4:1344000</value></mitigation>
+		<mitigation level="7"><value resource="cluster-a57">4:1248000</value></mitigation>
+		<mitigation level="8"><value resource="cluster-a57">4:960000</value></mitigation>
+		<mitigation level="9"><value resource="cluster-a57">4:864000</value></mitigation>
+		<mitigation level="10"><value resource="cluster-a57">4:768000</value></mitigation>
+		<mitigation level="11"><value resource="cluster-a57">4:633600</value></mitigation>
+		<mitigation level="12"><value resource="cluster-a57">4:480000</value></mitigation>
+		<mitigation level="13"><value resource="cluster-a57">4:384000</value></mitigation>
+		<mitigation level="14"><value resource="shutdown" /></mitigation>
+	</control>
+
+	<control name="hotplug-a57">
+		<mitigation level="off"><value resource="thermal-max-cpus">8</value></mitigation>
+		<mitigation level="1"><value resource="thermal-max-cpus">7</value></mitigation>
+		<mitigation level="2"><value resource="thermal-max-cpus">6</value></mitigation>
+		<mitigation level="3"><value resource="thermal-max-cpus">5</value></mitigation>
+		<mitigation level="4"><value resource="thermal-max-cpus">4</value></mitigation>
+	</control>
+
+	<!-- burn-out protection -->
+	<configuration sensor="temp-core">
+		<threshold>
+			<mitigation name="shutdown" level="off" />
+		</threshold>
+		<threshold trigger="120" clear="100">
+			<mitigation name="shutdown" level="1" />
+		</threshold>
+	</configuration>
+
+	<!-- USB and DC -->
+	<configuration sensor="pm8994_tz">
+		<threshold>
+			<mitigation name="usb" level="off" />
+		</threshold>
+		<threshold trigger="50500" clear="49500">
+			<mitigation name="usb" level="1" />
+		</threshold>
+		<threshold trigger="51500" clear="50500">
+			<mitigation name="usb" level="2" />
+		</threshold>
+		<threshold trigger="52500" clear="51500">
+			<mitigation name="usb" level="4" />
+		</threshold>
+		<threshold trigger="53300" clear="52300">
+			<mitigation name="usb" level="6" />
+		</threshold>
+	</configuration>
+
+	<!-- charging -->
+	<configuration sensor="pm8994_tz">
+		<threshold>
+			<mitigation name="charging" level="off" />
+		</threshold>
+		<threshold trigger="50500" clear="49500">
+			<mitigation name="charging" level="5" />
+		</threshold>
+		<threshold trigger="51500" clear="50500">
+			<mitigation name="charging" level="8" />
+		</threshold>
+		<threshold trigger="52500" clear="51500">
+			<mitigation name="charging" level="9" />
+		</threshold>
+		<threshold trigger="53300" clear="52300">
+			<mitigation name="charging" level="12" />
+		</threshold>
+	</configuration>
+
+	<configuration sensor="battery">
+		<threshold>
+			<mitigation name="battery_protect" level="off" />
+		</threshold>
+		<threshold trigger="43000" clear="41000">
+			<mitigation name="battery_protect" level="1" />
+		</threshold>
+		<threshold trigger="67000" clear="63000">
+			<mitigation name="battery_protect" level="2" />
+		</threshold>
+	</configuration>
+
+	<!-- GPU -->
+	<configuration sensor="pm8994_tz">
+		<threshold>
+			<mitigation name="gpu" level="off" />
+		</threshold>
+		<threshold trigger="52500" clear="51500">
+			<mitigation name="gpu" level="2" />
+		</threshold>
+		<threshold trigger="53300" clear="52300">
+			<mitigation name="gpu" level="3" />
+		</threshold>
+		<threshold trigger="54500" clear="53500">
+			<mitigation name="gpu" level="5" />
+		</threshold>
+	</configuration>
+
+	<!-- modem -->
+	<configuration sensor="pm8994_tz">
+		<threshold>
+			<mitigation name="modem" level="off" />
+		</threshold>
+		<threshold trigger="53500" clear="52000">
+			<mitigation name="modem" level="1" />
+		</threshold>
+	</configuration>
+
+	<!-- CPU A53 -->
+	<configuration sensor="pm8994_tz">
+		<threshold>
+			<mitigation name="cpu-a53" level="off" />
+		</threshold>
+		<threshold trigger="49000" clear="47000">
+			<mitigation name="cpu-a53" level="1" />
+		</threshold>
+		<threshold trigger="50500" clear="49500">
+			<mitigation name="cpu-a53" level="2" />
+		</threshold>
+		<threshold trigger="51500" clear="50500">
+			<mitigation name="cpu-a53" level="3" />
+		</threshold>
+		<threshold trigger="53000" clear="52000">
+			<mitigation name="cpu-a53" level="4" />
+		</threshold>
+		<threshold trigger="53300" clear="52300">
+			<mitigation name="cpu-a53" level="5" />
+		</threshold>
+		<threshold trigger="54000" clear="53000">
+			<mitigation name="cpu-a53" level="6" />
+		</threshold>
+		<threshold trigger="54500" clear="53500">
+			<mitigation name="cpu-a53" level="8" />
+		</threshold>
+		<threshold trigger="55500" clear="54500">
+			<mitigation name="cpu-a53" level="9" />
+		</threshold>
+		<threshold trigger="56000" clear="55500">
+			<mitigation name="cpu-a53" level="10" />
+		</threshold>
+	</configuration>
+
+	<configuration sensor="temp-cluster-a53">
+		<threshold>
+			<mitigation name="cpu-a53" level="off" />
+		</threshold>
+		<threshold trigger="75" clear="68">
+			<mitigation name="cpu-a53" level="2" />
+		</threshold>
+		<threshold trigger="78" clear="73">
+			<mitigation name="cpu-a53" level="4" />
+		</threshold>
+		<threshold trigger="120" clear="100">
+			<mitigation name="cpu-a53" level="11" />
+		</threshold>
+	</configuration>
+
+	<!-- CPU A57 -->
+	<configuration sensor="pm8994_tz">
+		<threshold>
+			<mitigation name="cpu-a57" level="off" />
+		</threshold>
+		<threshold trigger="47000" clear="45000">
+			<mitigation name="cpu-a57" level="7" />
+		</threshold>
+		<threshold trigger="49000" clear="47000">
+			<mitigation name="cpu-a57" level="9" />
+		</threshold>
+		<threshold trigger="50500" clear="49500">
+			<mitigation name="cpu-a57" level="13" />
+		</threshold>
+	</configuration>
+
+	<configuration sensor="pm8994_tz">
+		<threshold>
+			<mitigation name="hotplug-a57" level="off" />
+		</threshold>
+		<threshold trigger="44000" clear="41000">
+			<mitigation name="hotplug-a57" level="2" />
+		</threshold>
+		<threshold trigger="49000" clear="47000">
+			<mitigation name="hotplug-a57" level="3" />
+		</threshold>
+		<threshold trigger="50500" clear="49500">
+			<mitigation name="hotplug-a57" level="4" />
+		</threshold>
+	</configuration>
+
+	<configuration sensor="temp-cluster-a57">
+		<threshold>
+			<mitigation name="cpu-a57" level="off" />
+		</threshold>
+		<threshold trigger="75" clear="68">
+			<mitigation name="cpu-a57" level="9" />
+		</threshold>
+		<threshold trigger="78" clear="73">
+			<mitigation name="cpu-a57" level="11" />
+		</threshold>
+		<threshold trigger="120" clear="100">
+			<mitigation name="cpu-a57" level="14" />
+		</threshold>
+	</configuration>
+</thermanager>
diff --git a/device.mk b/device.mk
index 465868d..0555aca 100644
--- a/device.mk
+++ b/device.mk
@@ -62,7 +62,7 @@ PRODUCT_COPY_FILES += \
 
 # Thermal
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/thermal-engine.conf:system/etc/thermal-engine.conf
+    $(LOCAL_PATH)/configs/thermanager.xml:$(TARGET_COPY_OUT_VENDOR)/etc/thermanager.xml
 
 # WLAN
 PRODUCT_COPY_FILES += \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 33613c8..1658aab 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -551,10 +551,8 @@ vendor/lib64/libsensor_reg.so
 vendor/lib64/sensors.ssc.so
 
 # Thermal
-vendor/bin/thermal-engine
 vendor/lib/libthermalclient.so
 vendor/lib64/libthermalclient.so
-vendor/lib64/libthermalioctl.so
 lib64/liblights-core.so
 lib/liblights-core.so
 lib64/libidd.so