diff --git a/configs/thermal-engine-bangkk.conf b/configs/thermal-engine-bangkk.conf
new file mode 100644
index 0000000..9c27437
--- /dev/null
+++ b/configs/thermal-engine-bangkk.conf
@@ -0,0 +1,190 @@
+[FRONT_TEMP]
+algo_type        virtual
+trip_sensor      xo_therm
+thresholds       -18000
+thresholds_clr   -20000
+sensors          battery quiet_therm soc_usr
+weights          24 67 9
+offsets          1000 700 0
+sampling         1000
+math             0
+sys_temp
+
+[REPORT-FRONT-TEMP]
+algo_type        monitor
+sampling         300000
+sensor           FRONT_TEMP
+thresholds       45000
+thresholds_clr   43000
+actions          report
+action_info      1
+
+[BACK_TEMP]
+algo_type        virtual
+trip_sensor      xo_therm
+thresholds       -18000
+thresholds_clr   -20000
+sensors          battery msm_therm quiet_therm soc_usr
+weights          63 8 39 -10
+offsets          -1200 -1200 -1200 0
+sampling         1000
+math             0
+sys_temp
+
+[REPORT-BACK-TEMP]
+algo_type        monitor
+sampling         300000
+sensor           BACK_TEMP
+thresholds       45000
+thresholds_clr   43000
+actions          report
+action_info      1
+
+[DETECT-STANDBY]
+algo_type        virtual
+trip_sensor      quiet_therm
+thresholds       -18000
+thersholds_clr   -20000
+sensors          cpu_utilization lcd_brightness_value
+weights 15 50
+sampling 1000
+less_than
+math 7
+
+[OVERRIDE-CHG]
+algo_type        monitor
+sampling         1000
+sensor           DETECT-STANDBY
+thresholds       1
+thresholds_clr   0
+actions          internal_override
+action_info      1
+
+[FREEZE-CHG]
+algo_type        monitor
+sampling         1000
+descending
+sensor           DETECT-STANDBY
+thresholds       0
+thresholds_clr   1
+actions          freeze_rule
+action_info      1
+
+[Virt-MSM]
+algo_type        virtual
+sensors          msm_therm
+weights          100
+trip_sensor      chg_therm
+thresholds       18000
+thresholds_clr   16000
+offsets          0
+sampling         1000
+math             0
+
+[Virt-CHG]
+algo_type        virtual
+sensors          chg_therm
+weights          100
+trip_sensor      msm_therm
+thresholds       18000
+thresholds_clr   16000
+offsets          0
+sampling         1000
+math             0
+
+[MON-PDPOWER2]
+algo_type          monitor
+sampling           1000
+sensor             battery
+thresholds         44500 44600
+thresholds_clr     41000 42600
+actions            mmi_chrg_manager battery
+action_info        1 2
+override_c         15000
+
+[MON-PDPOWER3]
+algo_type          monitor
+sampling           1000
+sensor             quiet_therm
+thresholds         35000 36000 38200 38700 40000 42000 43000 50000
+thresholds_clr     34000 35000 36000 38200 38700 40000 42000 49000
+actions            mmi_chrg_manager mmi_chrg_manager mmi_chrg_manager mmi_chrg_manager mmi_chrg_manager mmi_chrg_manager mmi_chrg_manager mmi_chrg_manager
+action_info        10 9 7 6 5 3 2 2
+freezing
+
+[MON-QCPOWER4]
+algo_type          monitor
+sampling           1000
+sensor             quiet_therm
+thresholds         39000 41000 44000 46000 48000 50000
+thresholds_clr     37000 39000 42000 44000 46000 48000
+actions            battery battery battery battery battery battery
+action_info        7 6 5 4 3 1
+freezing
+
+[MON-PDPOWER5]
+algo_type          monitor
+sampling           1000
+sensor             BACK_TEMP
+thresholds         35000 36000 37000 39000
+thresholds_clr     33000 35000 36000 37000
+actions            mmi_chrg_manager mmi_chrg_manager mmi_chrg_manager mmi_chrg_manager
+action_info        9 3 2 1
+override_c         15000
+
+[MON-PDPOWER6]
+algo_type          monitor
+sampling           1000
+sensor             Virt-MSM
+thresholds         43000 45000 47000
+thresholds_clr     41000 43000 46000
+actions            battery battery battery
+action_info        3 2 1
+override_c         15000
+
+[MON-MSM-CPU0]
+algo_type        monitor
+sampling         1000
+sensor           BACK_TEMP
+thresholds       39000 43000 47000
+thresholds_clr   37000 41000 45000
+actions          cpu0 cpu0 cpu0
+action_info      1708800 1651200 1516800
+override_b       4000
+
+[MON-MSM-CPU6]
+algo_type        monitor
+sampling         1000
+sensor           BACK_TEMP
+thresholds       39000 44000 46500
+thresholds_clr   37000 42000 44500
+actions          cpu6 cpu6 cpu6
+action_info      1900800 1804800 1651200
+override_b       4000
+
+[MONITOR-CAMERA-MSM]
+algo_type        monitor
+sampling         1000
+sensor           quiet_therm
+thresholds       55000 60000
+thresholds_clr   53000 55000
+actions          camera camera
+action_info      1 2
+
+[MON-MODEM]
+algo_type          monitor
+sampling           1000
+sensor             Virt-MSM
+thresholds         80000 85000
+thresholds_clr     78000 80000
+actions            modem_skin modem_skin
+action_info        1 2
+
+[MODEM-PA-FR]
+algo_type          monitor
+sampling           5000
+sensor             xo_therm
+thresholds         65000 70000
+thresholds_clr     60000 65000
+actions            modem_pa_fr1 modem_pa_fr1
+action_info        1 2
diff --git a/device.mk b/device.mk
index 2305a17..a0e122c 100644
--- a/device.mk
+++ b/device.mk
@@ -115,5 +115,9 @@ PRODUCT_COPY_FILES += \
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH)
 
+# Thermal
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/thermal-engine-bangkk.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-bangkk.conf
+
 # Inherit from vendor blobs
 $(call inherit-product, vendor/motorola/bangkk/bangkk-vendor.mk)
diff --git a/proprietary-files.txt b/proprietary-files.txt
index ee169da..6d0fd4c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -602,8 +602,4 @@ vendor/etc/sensors/proto/tcs3708.proto
 vendor/etc/sensors/sns_reg_config
 
 # Thermal configs
-vendor/etc/thermal-engine-bangkk-camera.conf
-vendor/etc/thermal-engine-bangkk-game-normal.conf
-vendor/etc/thermal-engine-bangkk-game-perf.conf
-vendor/etc/thermal-engine-bangkk.conf
 vendor/etc/thermal-engine.conf