diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline
index 32a058f8..f0b51c8f 100644
--- a/root/etc/kernel/cmdline
+++ b/root/etc/kernel/cmdline
@@ -3,5 +3,5 @@ cryptdevice=UUID=19fa8fab-c5fe-454a-9a17-b7185ce975ea:cryptroot:allow-discards r
 {%@@ elif profile == "Moria" @@%}
 cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root ip=:::::eth0:dhcp netconf_timeout=60 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3
 {%@@ elif profile == "Shire" @@%}
-cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot resume_offset=1908736 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3
+cryptdevice=UUID=370d6c2a-86ab-4e7d-9442-d15ad173f3e3:cryptroot root=/dev/mapper/cryptroot resume_offset=1908736 intel_idle.max_cstate=1 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3
 {%@@ endif @@%}
diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf
index 5944a930..cce0fe98 100644
--- a/root/etc/mkinitcpio.conf
+++ b/root/etc/mkinitcpio.conf
@@ -2,20 +2,19 @@ COMPRESSION="zstd"
 {%@@ if profile == "Mirkwood" or profile == "Moria" @@%}
 MODULES=(amdgpu)
 {%@@ elif profile == "Shire" @@%}
-MODULES=(i915)
+MODULES=(i915 hid-multitouch i2c-hid i2c-hid-acpi hid_generic)
 {%@@ endif @@%}
 {%@@ if profile == "Mirkwood" or profile == "Moria" @@%}
 BINARIES=("/usr/bin/btrfs")
 {%@@ else @@%}
-BINARIED=()
+BINARIES=()
 {%@@ endif @@%}
 FILES=()
 
 {%@@ if profile == "Mirkwood" @@%}
 HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems btrfs encrypt fsck)
 {%@@ elif profile == 'Moria' @@%}
-#HOOKS=(base udev kms plymouth keyboard autodetect modconf block filesystems btrfs encrypt fsck)
 HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck)
 {%@@ elif profile == 'Shire' @@%}
-HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems encrypt fsck)
+HOOKS=(base udev kms keyboard keymap autodetect microcode modconf block unl0kr encrypt plymouth filesystems fsck)
 {%@@ endif @@%}