diff --git a/grub b/grub
new file mode 100644
index 0000000..0524083
--- /dev/null
+++ b/grub
@@ -0,0 +1,9 @@
+# run 'update-grub' afterwards to update /boot/grub/grub.cfg.
+#   info -f grub -n 'Simple configuration'
+
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR=`( . /etc/os-release && echo ${NAME} )`
+GRUB_CMDLINE_LINUX_DEFAULT="quiet amd_pstate=active amd_prefcore=enable pcie_aspm.policy=powersupersave pcie_aspm=force"
+GRUB_CMDLINE_LINUX=""
+
diff --git a/powersave_ctl.txt b/powersave_ctl.txt
new file mode 100644
index 0000000..5712684
--- /dev/null
+++ b/powersave_ctl.txt
@@ -0,0 +1,11 @@
+sudo systemctl disable --now bluetooth.service       # if you don't use BT daily
+sudo systemctl disable --now cups.service            # if you don't print
+sudo systemctl disable --now cups-browsed.service
+sudo systemctl disable --now ModemManager.service    # if no WWAN/cellular
+sudo systemctl disable --now avahi-daemon.service    # mDNS, rarely needed
+sudo systemctl disable --now colord.service          # color profile mgmt
+
+# User services (in DE):
+systemctl --user disable --now gvfs-gphoto2-volume-monitor.service  # cameras
+systemctl --user disable --now gvfs-mtp-volume-monitor.service      # MTP/phones
+systemctl --user disable --now obex.service  						# BT file transfer
diff --git a/tlp.conf b/tlp.conf
index 943b067..c1b6df0 100644
--- a/tlp.conf
+++ b/tlp.conf
@@ -1,10 +1,8 @@
-
-
 CPU_SCALING_GOVERNER_ON_AC=performance
 CPU_SCALING_GOVERNER_ON_BAT=powersave
 
 CPU_BOOST_ON_AC=1
-CPU_BOOTS_ON_BAT=0
+CPU_BOOST_ON_BAT=0
 
 CPU_HWP_DYN_BOOST_ON_AC=1
 CPU_HWP_DYN_BOOST_ON_BAT=0
@@ -12,37 +10,60 @@ CPU_HWP_DYN_BOOST_ON_BAT=0
 ENERGY_PREF_POLICY_ON_AC=balance_performance
 ENERGY_PREF_POLICY_ON_BAT=power
 
-
-# Caps CPU at 40% max when using battery
-CPU_MAX_PERF_ON_AC=0
 CPU_MAX_PERF_ON_AC=100
-CPU_MAX_PERF_ON_BAT=0
-CPU_MAX_PERF_ON_BAT=40
+CPU_MAX_PERF_ON_BAT=30
 
-# Standard light boost when plugged in but no boost when on battery
 CPU_BOOST_HWP_ON_AC=40
 CPU_BOOST_HWP_ON_BAT=1
 
-# I'm 90% sure becaues I have an AMD CPU and no GPU it's using radeon drivers, so this is to modify that. I could be totally wrong.
 RADEON_DPM_PERF_LEVEL_ON_AC=auto
 RADEON_DPM_PERF_LEVEL_ON_BAT=low
 RADEON_DPM_STATE_ON_AC=performance
 RADEON_DPM_STATE_ON_BAT=battery
 
-# Disables bluetooth if not in use, I had wifi and wwan in therefor both before, but it was causing issues.
-DEVICES_TO_DISABLE_ON_BAT_NOT_IN_USE="bluetooth"
+DEVICES_TO_DISABLE_ON_BAT_NOT_IN_USE="bluetooth wwan"
 
-# Reduces a power consumption a little bit for a lot of things, very useful overall. CPU power, USB devices, and I think even internal connections like PCIE devices.
 ENABLE_LAPTOP_MODE_ON_AC=0
-ENABLE_LAPTOP_MODE_ON_=1
+ENABLE_LAPTOP_MODE_ON_BAT=1
 
-# Machine state save interval
 MAX_LOST_WORK_SECS_ON_BAT=120
 MAX_LOST_WORK_SECS_ON_AC=15
 
-# Dirty memory is basically memory that doesn't have to be in memory any more and can be written back to disk.
 VM_WRITEBACK_ON_BAT=1
-VM_DIRTY_RATION_ON_BAT=40
+VM_DIRTY_RATIO_ON_BAT=40
 
 SCHED_POWERSAVE_ON_AC=0
 SCHED_POWERSAVE_ON_BAT=1
+
+PLATFORM_PROFILE_ON_AC=balanced
+PLATFORM_PROFILE_ON_BAT=low-power
+
+RUNTIME_PM_ON_BAT=auto
+RUNTIME_PM_ALL=1
+
+USB_AUTOSUSPEND=1
+USB_AUTOSUSPEND_DISABLE_ON_SHUTDOWN=1
+
+SOUND_POWER_SAVE_ON_AC=0
+SOUND_POWER_SAVE_ON_BAT=1
+SOUND_POWER_SAVE_CONTROLLER=Y
+
+WIFI_PWR_ON_AC=off
+WIFI_PWR_ON_BAT=on
+
+PCIE_ASPM_ON_BAT=powersupersave
+
+DISK_DEVICES="nvme0n1"
+DISK_IOSCHED="mq-deadline"
+DISK_SPINDOWN_TIMEOUT_ON_BAT="0"
+
+
+MEM_SLEEP_ON_AC=s2idle
+MEM_SLEEP_ON_BAT=s2idle
+
+DEVICES_TO_DISABLE_ON_BAT_NOT_IN_USE="bluetooth wwan wifi"
+
+DEVICES_TO_DISABLE_ON_STARTUP="bluetooth wwan"
+
+RESTORE_DEVICE_STATE_ON_STARTUP=1
+