diff --git a/boot/loader/entries/arch.conf b/boot/loader/entries/arch.conf
index b1301f9..fb18258 100755
--- a/boot/loader/entries/arch.conf
+++ b/boot/loader/entries/arch.conf
@@ -2,4 +2,4 @@ title   Arch Linux - Encrypted
 linux   /vmlinuz-linux
 initrd  /intel-ucode.img
 initrd  /initramfs-linux.img
-options cryptdevice=PARTUUID=379cfbc1-1611-4d61-ba80-dafac35f1c1a:lvm root=/dev/mapper/vg0-root resume=/dev/vg0/swap zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=20 zswap.zpool=z3fold apparmor=1 security=apparmor quiet rw
+options cryptdevice=PARTUUID=379cfbc1-1611-4d61-ba80-dafac35f1c1a:lvm root=/dev/mapper/vg0-root resume=/dev/vg0/swap zswap.enabled=1 zswap.compressor=lz4 zswap.max_pool_percent=20 zswap.zpool=z3fold apparmor=1 security=apparmor intel_pstate=per_cpu_perf_limits quiet rw
diff --git a/etc/default/tlp b/etc/default/tlp
index 4a66a18..4c7c2f6 100644
--- a/etc/default/tlp
+++ b/etc/default/tlp
@@ -19,7 +19,7 @@ TLP_PERSISTENT_DEFAULT=1
 # 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
-DISK_IDLE_SECS_ON_BAT=0
+DISK_IDLE_SECS_ON_BAT=2
 
 # Dirty page values (timeouts in secs).
 MAX_LOST_WORK_SECS_ON_AC=15
@@ -48,33 +48,33 @@ CPU_SCALING_GOVERNOR_ON_BAT=performance
 # Possible values strongly depend on your CPU. For available frequencies see
 # the output of tlp-stat -p.
 #CPU_SCALING_MIN_FREQ_ON_AC=0
-#CPU_SCALING_MAX_FREQ_ON_AC=0
+#CPU_SCALING_MAX_FREQ_ON_AC=3900000
 #CPU_SCALING_MIN_FREQ_ON_BAT=0
-#CPU_SCALING_MAX_FREQ_ON_BAT=0
+#CPU_SCALING_MAX_FREQ_ON_BAT=3900000
 
 # Set energy performance hints (HWP) for Intel P-state governor:
 #   performance, balance_performance, default, 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=performance #balance_performance
+CPU_HWP_ON_AC=performance
 CPU_HWP_ON_BAT=performance
 
 # 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.
 # Requires an Intel Core i processor with intel_pstate driver.
-#CPU_MIN_PERF_ON_AC=0
+#CPU_MIN_PERF_ON_AC=30
 #CPU_MAX_PERF_ON_AC=100
-#CPU_MIN_PERF_ON_BAT=0
-#CPU_MAX_PERF_ON_BAT=30
+#CPU_MIN_PERF_ON_BAT=30
+#CPU_MAX_PERF_ON_BAT=100
 
 # Set the CPU "turbo boost" feature: 0=disable, 1=allow
 # Requires an Intel Core i processor.
 # Important:
 # - This may conflict with your distribution's governor settings
 # - A value of 1 does *not* activate boosting, it just allows it
-CPU_BOOST_ON_AC=0
-CPU_BOOST_ON_BAT=0
+CPU_BOOST_ON_AC=1
+CPU_BOOST_ON_BAT=1
 
 # Minimize number of used CPU cores/hyper-threads under light load conditions:
 #   0=disable, 1=enable.
@@ -107,7 +107,7 @@ DISK_DEVICES="sda sdb"
 # Separate values for multiple disks with spaces. Use the special value 'keep'
 # to keep the hardware default for the particular disk.
 DISK_APM_LEVEL_ON_AC="254 254"
-DISK_APM_LEVEL_ON_BAT="128 128"
+DISK_APM_LEVEL_ON_BAT="254 254"
 
 # Hard disk spin down timeout:
 #   0:        spin down disabled
@@ -129,7 +129,7 @@ DISK_APM_LEVEL_ON_BAT="128 128"
 # (*) Kernel >= 4.15 required, then recommended.
 # Multiple values separated with spaces are tried sequentially until success.
 SATA_LINKPWR_ON_AC="med_power_with_dipm max_performance"
-SATA_LINKPWR_ON_BAT="med_power_with_dipm min_power"
+SATA_LINKPWR_ON_BAT="med_power_with_dipm max_performance"
 
 # Exclude host devices from AHCI link power management.
 # Separate multiple hosts with spaces.
@@ -147,16 +147,16 @@ AHCI_RUNTIME_PM_TIMEOUT=15
 # PCI Express Active State Power Management (PCIe ASPM):
 #   default, performance, powersave.
 PCIE_ASPM_ON_AC=performance
-PCIE_ASPM_ON_BAT=powersave
+PCIE_ASPM_ON_BAT=performance
 
 # Radeon graphics clock speed (profile method): low, mid, high, auto, default;
 # auto = mid on BAT, high on AC; default = use hardware defaults.
 RADEON_POWER_PROFILE_ON_AC=high
-RADEON_POWER_PROFILE_ON_BAT=low
+RADEON_POWER_PROFILE_ON_BAT=high
 
 # Radeon dynamic power management method (DPM): battery, performance.
 RADEON_DPM_STATE_ON_AC=performance
-RADEON_DPM_STATE_ON_BAT=battery
+RADEON_DPM_STATE_ON_BAT=performance
 
 # Radeon DPM performance level: auto, low, high; auto is recommended.
 RADEON_DPM_PERF_LEVEL_ON_AC=auto
@@ -172,7 +172,7 @@ WOL_DISABLE=Y
 # Enable audio power saving for Intel HDA, AC97 devices (timeout in secs).
 # A value of 0 disables, >=1 enables power saving (recommended: 1).
 SOUND_POWER_SAVE_ON_AC=0
-SOUND_POWER_SAVE_ON_BAT=1
+SOUND_POWER_SAVE_ON_BAT=0
 
 # Disable controller too (HDA only): Y/N.
 SOUND_POWER_SAVE_CONTROLLER=Y
@@ -188,7 +188,7 @@ BAY_DEVICE="sr0"
 
 # Runtime Power Management for PCI(e) bus devices: on=disable, auto=enable.
 RUNTIME_PM_ON_AC=on
-RUNTIME_PM_ON_BAT=auto
+RUNTIME_PM_ON_BAT=on
 
 # Exclude PCI(e) device adresses the following list from Runtime PM
 # (separate with spaces). Use lspci to get the adresses (1st column).
diff --git a/user-config/bashrc b/user-config/bashrc
index ad5192c..cd06c04 100644
--- a/user-config/bashrc
+++ b/user-config/bashrc
@@ -71,12 +71,12 @@ esac
 if [ -x /usr/bin/dircolors ]; then
     test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
     alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
+    alias dir='dir --color=auto'
+    alias vdir='vdir --color=auto'
 
-    #alias grep='grep --color=auto'
-    #alias fgrep='fgrep --color=auto'
-    #alias egrep='egrep --color=auto'
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
 fi
 
 # colored GCC warnings and errors
@@ -153,10 +153,13 @@ alias gpush='git push'
 # Alias for git pull
 alias gpull='git pull'
 
+# Alias for git commit -m
+alias gcommit='git commit -m'
+
 # Alias to kill Signal Private Messenger when crashed
 alias ksignal='killall -9 signal-desktop'
 
-# Alias to see the actual CPU frequency
+# Alias to get information about CPU
 alias cpufreq='watch -n 0.5 grep \"cpu MHz\" /proc/cpuinfo'
 alias cputemp='watch -n 0.5 sensors'
 
@@ -174,6 +177,9 @@ alias bassh='ssh edu4rdshl@192.168.122.230'
 alias longdirs='du -a ./ | sort -n -r | head -n 20'
 alias longfiles="find ./ -printf '%s %p\n'| sort -nr | head -20"
 
+# Alias to update ArchLinux
+alias uparch='sudo pacman -Syu --noconfirm'
+
 # Avoid pip installing packages as root/sudo, execute the following line in your terminal or just delete the # at the begin
 #install -Dm644 /dev/stdin ~/.config/pip/pip.conf <<< $'[install]\nuser = yes\n'