diff --git a/contrib/thermald/README.md b/contrib/thermald/README.md
index 8a3349313..f3e2b9cc5 100644
--- a/contrib/thermald/README.md
+++ b/contrib/thermald/README.md
@@ -5,9 +5,12 @@ Modify the `65000` value to adapt that to your liking
Tested on a Surface Book 2, other devices may need adapting, see e.g. the [thermald man page](http://manpages.ubuntu.com/manpages/trusty/man5/thermal-conf.xml.5.html).
+More complex and device specific examples can be found in subdirectories
+If any subdirectory does not have both files or any dedicated instructions, use the missing files provided here and/or follow these instructions.
+
## Installation
-Both XML files need to be placed in the `/etc/thermald/` directory.
+Both XML files (`thermal-conf.xml` and `thermal-cpu-cdev-order-xml`) need to be placed in the `/etc/thermald/` directory.
Newer thermald versions attempt to automatically load the configuration from ACPI.
If you want to use a manual configuration with such a version, you may need to remove the `--adaptive` option from the systemd service `ExecStart` line.
diff --git a/contrib/thermald/SurfacePro5/thermal-conf.xml.auto.cool b/contrib/thermald/SurfacePro5/thermal-conf.xml.auto.cool
deleted file mode 100644
index 14be11d35..000000000
--- a/contrib/thermald/SurfacePro5/thermal-conf.xml.auto.cool
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
- Auto generated
- Surface Pro
- QUIET
-
- 0
- 3000
- 25000
- 28000
- 32000
- 500
-
-
-
- auto_zone_0
-
-
- pch_skylake
- 46000
- Passive
-
- B0D4
- 20
- 15000000
-
-
-
- pch_skylake
- 49000
- Passive
-
- B0D4
- 20
- 13000000
-
-
-
- pch_skylake
- 52000
- Passive
-
- B0D4
- 20
- 11000000
-
-
-
- pch_skylake
- 56000
- Passive
-
- B0D4
- 20
- 9000000
-
-
-
- pch_skylake
- 59000
- Passive
-
- B0D4
- 15
- 7000000
-
-
-
- pch_skylake
- 62000
- Passive
-
- B0D4
- 10
- 6000000
-
-
-
-
-
-
-
-
diff --git a/contrib/thermald/SurfacePro5/thermal-conf.xml.auto.mobile b/contrib/thermald/SurfacePro5/thermal-conf.xml.auto.mobile
deleted file mode 100644
index 538d6a585..000000000
--- a/contrib/thermald/SurfacePro5/thermal-conf.xml.auto.mobile
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
- Auto generated
- Surface Pro
- QUIET
-
- 0
- 3000
- 15000
- 28000
- 32000
- 500
-
-
-
- auto_zone_0
-
-
- pch_skylake
- 39000
- Passive
-
- B0D4
- 10
- 15000000
-
-
-
- pch_skylake
- 43000
- Passive
-
- B0D4
- 10
- 10000000
-
-
-
- pch_skylake
- 47000
- Passive
-
- B0D4
- 10
- 8000000
-
-
-
- pch_skylake
- 49000
- Passive
-
- B0D4
- 10
- 6000000
-
-
-
- pch_skylake
- 51000
- Passive
-
- B0D4
- 5
- 5000000
-
-
-
- pch_skylake
- 53000
- Passive
-
- B0D4
- 5
- 4000000
-
-
-
- pch_skylake
- 54000
- Passive
-
- B0D4
- 5
- 3000000
-
-
-
-
-
-
-
-
diff --git a/contrib/thermald/SurfacePro5/thermal-conf.xml.auto.performance b/contrib/thermald/SurfacePro5/thermal-conf.xml.auto.performance
deleted file mode 100644
index fb06d3360..000000000
--- a/contrib/thermald/SurfacePro5/thermal-conf.xml.auto.performance
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
- Auto generated
- Surface Pro
- QUIET
-
- 0
- 3000
- 15000
- 28000
- 32000
- 500
-
-
-
- auto_zone_0
-
-
- pch_skylake
- 54000
- Passive
-
- B0D4
- 10
- 15000000
-
-
-
- pch_skylake
- 58000
- Passive
-
- B0D4
- 10
- 13000000
-
-
-
- pch_skylake
- 60000
- Passive
-
- B0D4
- 5
- 9000000
-
-
-
- pch_skylake
- 62000
- Passive
-
- B0D4
- 5
- 7000000
-
-
-
- pch_skylake
- 63000
- Passive
-
- B0D4
- 5
- 6000000
-
-
-
-
-
-
-
-
diff --git a/contrib/thermald/SurfacePro5/thermal-cpu-cdev-order.xml b/contrib/thermald/SurfacePro5/thermal-cpu-cdev-order.xml
deleted file mode 100644
index e690c5a26..000000000
--- a/contrib/thermald/SurfacePro5/thermal-cpu-cdev-order.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
- rapl_controller
- intel_pstate
- intel_powerclamp
- cpufreq
- Processor
-
-
diff --git a/contrib/thermald/example_config_SL1.xml b/contrib/thermald/surface_laptop_1/thermal-conf.xml
similarity index 93%
rename from contrib/thermald/example_config_SL1.xml
rename to contrib/thermald/surface_laptop_1/thermal-conf.xml
index be53478d6..005b52b55 100644
--- a/contrib/thermald/example_config_SL1.xml
+++ b/contrib/thermald/surface_laptop_1/thermal-conf.xml
@@ -1,9 +1,9 @@
- Override
- *
- QUIET
+ Override
+ *
+ QUIET
test
diff --git a/contrib/thermald/SurfacePro5/40-surface-power.rules b/contrib/thermald/surface_pro_5/40-surface-power.rules
similarity index 99%
rename from contrib/thermald/SurfacePro5/40-surface-power.rules
rename to contrib/thermald/surface_pro_5/40-surface-power.rules
index 6a6c0e835..56dcd2050 100644
--- a/contrib/thermald/SurfacePro5/40-surface-power.rules
+++ b/contrib/thermald/surface_pro_5/40-surface-power.rules
@@ -23,8 +23,6 @@
# E: POWER_SUPPLY_ONLINE=0
# E: SUBSYSTEM=power_supply
-
-
# Plugged
SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="/usr/bin/logger -t surface power supply online"
SUBSYSTEM=="power_supply", ENV{POWER_SUPPLY_ONLINE}=="1", RUN+="/usr/bin/surface profile set performance"
diff --git a/contrib/thermald/SurfacePro5/README.md b/contrib/thermald/surface_pro_5/README.md
similarity index 100%
rename from contrib/thermald/SurfacePro5/README.md
rename to contrib/thermald/surface_pro_5/README.md
diff --git a/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.cool b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.cool
new file mode 100644
index 000000000..a8798adc3
--- /dev/null
+++ b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.cool
@@ -0,0 +1,83 @@
+
+
+
+ Auto generated
+ Surface Pro
+ QUIET
+
+ 0
+ 3000
+ 25000
+ 28000
+ 32000
+ 500
+
+
+
+ auto_zone_0
+
+
+ pch_skylake
+ 46000
+ Passive
+
+ B0D4
+ 20
+ 15000000
+
+
+
+ pch_skylake
+ 49000
+ Passive
+
+ B0D4
+ 20
+ 13000000
+
+
+
+ pch_skylake
+ 52000
+ Passive
+
+ B0D4
+ 20
+ 11000000
+
+
+
+ pch_skylake
+ 56000
+ Passive
+
+ B0D4
+ 20
+ 9000000
+
+
+
+ pch_skylake
+ 59000
+ Passive
+
+ B0D4
+ 15
+ 7000000
+
+
+
+ pch_skylake
+ 62000
+ Passive
+
+ B0D4
+ 10
+ 6000000
+
+
+
+
+
+
+
diff --git a/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.mobile b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.mobile
new file mode 100644
index 000000000..38b4a78ff
--- /dev/null
+++ b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.mobile
@@ -0,0 +1,93 @@
+
+
+
+ Auto generated
+ Surface Pro
+ QUIET
+
+ 0
+ 3000
+ 15000
+ 28000
+ 32000
+ 500
+
+
+
+ auto_zone_0
+
+
+ pch_skylake
+ 39000
+ Passive
+
+ B0D4
+ 10
+ 15000000
+
+
+
+ pch_skylake
+ 43000
+ Passive
+
+ B0D4
+ 10
+ 10000000
+
+
+
+ pch_skylake
+ 47000
+ Passive
+
+ B0D4
+ 10
+ 8000000
+
+
+
+ pch_skylake
+ 49000
+ Passive
+
+ B0D4
+ 10
+ 6000000
+
+
+
+ pch_skylake
+ 51000
+ Passive
+
+ B0D4
+ 5
+ 5000000
+
+
+
+ pch_skylake
+ 53000
+ Passive
+
+ B0D4
+ 5
+ 4000000
+
+
+
+ pch_skylake
+ 54000
+ Passive
+
+ B0D4
+ 5
+ 3000000
+
+
+
+
+
+
+
diff --git a/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.performance b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.performance
new file mode 100644
index 000000000..00c75921a
--- /dev/null
+++ b/contrib/thermald/surface_pro_5/thermal-conf.xml.auto.performance
@@ -0,0 +1,73 @@
+
+
+
+ Auto generated
+ Surface Pro
+ QUIET
+
+ 0
+ 3000
+ 15000
+ 28000
+ 32000
+ 500
+
+
+
+ auto_zone_0
+
+
+ pch_skylake
+ 54000
+ Passive
+
+ B0D4
+ 10
+ 15000000
+
+
+
+ pch_skylake
+ 58000
+ Passive
+
+ B0D4
+ 10
+ 13000000
+
+
+
+ pch_skylake
+ 60000
+ Passive
+
+ B0D4
+ 5
+ 9000000
+
+
+
+ pch_skylake
+ 62000
+ Passive
+
+ B0D4
+ 5
+ 7000000
+
+
+
+ pch_skylake
+ 63000
+ Passive
+
+ B0D4
+ 5
+ 6000000
+
+
+
+
+
+
+
diff --git a/contrib/thermald/surface_pro_5/thermal-cpu-cdev-order.xml b/contrib/thermald/surface_pro_5/thermal-cpu-cdev-order.xml
new file mode 100644
index 000000000..b6cb80a22
--- /dev/null
+++ b/contrib/thermald/surface_pro_5/thermal-cpu-cdev-order.xml
@@ -0,0 +1,8 @@
+
+
+ rapl_controller
+ intel_pstate
+ intel_powerclamp
+ cpufreq
+ Processor
+
diff --git a/contrib/thermald/SurfacePro5/thermald.service b/contrib/thermald/surface_pro_5/thermald.service
similarity index 99%
rename from contrib/thermald/SurfacePro5/thermald.service
rename to contrib/thermald/surface_pro_5/thermald.service
index 9445c2a4d..1353c0653 100644
--- a/contrib/thermald/SurfacePro5/thermald.service
+++ b/contrib/thermald/surface_pro_5/thermald.service
@@ -11,4 +11,3 @@ ExecStart=/usr/sbin/thermald --systemd --dbus-enable
[Install]
WantedBy=multi-user.target
Alias=dbus-org.freedesktop.thermald.service
-
diff --git a/contrib/thermald/thermal-conf.xml b/contrib/thermald/thermal-conf.xml
index b1efeb395..b25821df1 100644
--- a/contrib/thermald/thermal-conf.xml
+++ b/contrib/thermald/thermal-conf.xml
@@ -1,27 +1,27 @@
-
+
-
- Intel Powered Laptop
- *
- QUIET
-
-
- cpu
-
-
- x86_pkg_temp
- 65000
- passive
- SEQUENTIAL
-
- 1
- rapl_controller
- 100
- 5
-
-
-
-
-
-
+
+ Intel Powered Laptop
+ *
+ QUIET
+
+
+ cpu
+
+
+ x86_pkg_temp
+ 65000
+ passive
+ SEQUENTIAL
+
+ 1
+ rapl_controller
+ 100
+ 5
+
+
+
+
+
+
diff --git a/contrib/thermald/thermal-cpu-cdev-order.xml b/contrib/thermald/thermal-cpu-cdev-order.xml
index 5877d4856..b6cb80a22 100644
--- a/contrib/thermald/thermal-cpu-cdev-order.xml
+++ b/contrib/thermald/thermal-cpu-cdev-order.xml
@@ -1,8 +1,8 @@
-
- rapl_controller
- intel_pstate
- intel_powerclamp
- cpufreq
- Processor
+
+ rapl_controller
+ intel_pstate
+ intel_powerclamp
+ cpufreq
+ Processor