diff --git a/roles/laptop/files/tlp.conf b/roles/laptop/files/tlp.conf
index 18871a3..6642abb 100644
--- a/roles/laptop/files/tlp.conf
+++ b/roles/laptop/files/tlp.conf
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-# tlp - Parameters for power save
+# tlp - Parameters for power saving
 # See full explanation: http://linrunner.de/en/tlp/docs/tlp-configuration.html
 
 # Hint: some features are disabled by default, remove the leading # to enable
@@ -12,6 +12,10 @@ TLP_ENABLE=1
 # Concerns some desktop and embedded hardware only.
 TLP_DEFAULT_MODE=AC
 
+# Operation mode select: 0=depend on power source, 1=always use TLP_DEFAULT_MODE
+# Hint: use in conjunction with TLP_DEFAULT_MODE=BAT for BAT settings on AC
+TLP_PERSISTENT_DEFAULT=0
+
 # Seconds laptop mode has to wait after the disk goes idle before doing a sync.
 # Non-zero value enables, zero disables laptop mode.
 DISK_IDLE_SECS_ON_AC=0
@@ -28,7 +32,7 @@ MAX_LOST_WORK_SECS_ON_BAT=60
 # Intel Core i processor with intel_pstate driver:
 #   powersave(*), performance
 # Older hardware with acpi-cpufreq driver:
-#   ondemand(*), powersave, performance, conservative
+#   ondemand(*), powersave, performance, conservative, schedutil
 # (*) is recommended.
 # Hint: use tlp-stat -p to show the active driver and available governors.
 # Important:
@@ -46,6 +50,13 @@ MAX_LOST_WORK_SECS_ON_BAT=60
 #CPU_SCALING_MIN_FREQ_ON_BAT=0
 #CPU_SCALING_MAX_FREQ_ON_BAT=0
 
+# Set energy performance hints (HWP) for Intel P-state governor:
+#   default, performance, balance_performance, balance_power, power
+# Values are given in order of increasing power saving.
+# Note: Intel Skylake or newer CPU and Kernel >= 4.10 required.
+CPU_HWP_ON_AC=balance_performance
+CPU_HWP_ON_BAT=balance_power
+
 # Set Intel P-state performance: 0..100 (%)
 # Limit the max/min P-state to control the power dissipation of the CPU.
 # Values are stated as a percentage of the available performance.
@@ -155,18 +166,18 @@ WIFI_PWR_ON_BAT=on
 WOL_DISABLE=Y
 
 # Enable audio power saving for Intel HDA, AC97 devices (timeout in secs).
-# A value of 0 disables, >=1 enables power save.
+# A value of 0 disables, >=1 enables power saving.
 SOUND_POWER_SAVE_ON_AC=0
 SOUND_POWER_SAVE_ON_BAT=1
 
 # Disable controller too (HDA only): Y/N
 SOUND_POWER_SAVE_CONTROLLER=Y
 
-# Set to 1 to power off optical drive in UltraBay/MediaBay when running on
-# battery. A value of 0 disables this feature (Default).
+# Power off optical drive in UltraBay/MediaBay: 0=disable, 1=enable.
 # Drive can be powered on again by releasing (and reinserting) the eject lever
 # or by pressing the disc eject button on newer models.
 # Note: an UltraBay/MediaBay hard disk is never powered off.
+BAY_POWEROFF_ON_AC=0
 BAY_POWEROFF_ON_BAT=0
 # Optical drive device to power off (default sr0).
 BAY_DEVICE="sr0"
@@ -175,33 +186,39 @@ BAY_DEVICE="sr0"
 RUNTIME_PM_ON_AC=on
 RUNTIME_PM_ON_BAT=auto
 
-# Runtime PM for *all* PCI(e) bus devices, except blacklisted ones:
-#   0=disable, 1=enable
-RUNTIME_PM_ALL=1
-
 # Exclude PCI(e) device adresses the following list from Runtime PM
 # (separate with spaces). Use lspci to get the adresses (1st column).
 #RUNTIME_PM_BLACKLIST="bb:dd.f 11:22.3 44:55.6"
 
-# Exclude PCI(e) devices assigned to the listed drivers from Runtime PM
-# (should prevent accidential power on of hybrid graphics' discrete part).
-# Default is "radeon nouveau"; use "" to disable the feature completely.
+# Exclude PCI(e) devices assigned to the listed drivers from Runtime PM.
+# Default when unconfigured is "amdgpu nouveau nvidia radeon" which
+# prevents accidential power-on of dGPU in hybrid graphics setups.
+# Use "" to disable the feature completely.
 # Separate multiple drivers with spaces.
-RUNTIME_PM_DRIVER_BLACKLIST="radeon nouveau"
+#RUNTIME_PM_DRIVER_BLACKLIST="amdgpu nouveau nvidia radeon"
 
 # Set to 0 to disable, 1 to enable USB autosuspend feature.
 USB_AUTOSUSPEND=1
 
 # Exclude listed devices from USB autosuspend (separate with spaces).
 # Use lsusb to get the ids.
-# Note: input devices (usbhid) are excluded automatically (see below)
+# Note: input devices (usbhid) are excluded automatically
 #USB_BLACKLIST="1111:2222 3333:4444"
 
-# WWAN devices are excluded from USB autosuspend: 0=do not exclude / 1=exclude
+# Bluetooth devices are excluded from USB autosuspend:
+#   0=do not exclude, 1=exclude
+USB_BLACKLIST_BTUSB=0
+
+# Phone devices are excluded from USB autosuspend:
+#   0=do not exclude, 1=exclude (enable charging)
+USB_BLACKLIST_PHONE=0
+
+# WWAN devices are excluded from USB autosuspend:
+#   0=do not exclude, 1=exclude
 USB_BLACKLIST_WWAN=1
 
 # Include listed devices into USB autosuspend even if already excluded
-# by the driver or WWAN blacklists above (separate with spaces).
+# by the blacklists above (separate with spaces).
 # Use lsusb to get the ids.
 #USB_WHITELIST="1111:2222 3333:4444"
 
@@ -251,6 +268,9 @@ STOP_CHARGE_THRESH_BAT0=90
 START_CHARGE_THRESH_BAT1=80
 STOP_CHARGE_THRESH_BAT1=90
 
+# Restore charge thresholds when AC is unplugged: 0=disable, 1=enable
+#RESTORE_THRESHOLDS_ON_BAT=1
+
 # ------------------------------------------------------------------------------
 # tlp-rdw - Parameters for the radio device wizard
 # Possible devices: bluetooth, wifi, wwan