diff --git a/.config/hypr/config/settings/Input.conf b/.config/hypr/config/settings/Input.conf
index e758b83..7e7facd 100644
--- a/.config/hypr/config/settings/Input.conf
+++ b/.config/hypr/config/settings/Input.conf
@@ -37,7 +37,7 @@ device {
 }
 
 device {
-  name = evremap-virtual-input-for-/dev/input/event30
+  name = evremap-virtual-input-for-/dev/input/event17
   kb_layout = us
   kb_variant = altgr-intl
 }
diff --git a/.config/yadm/bootstrap.v2/applications/30-KDEConnect.sh b/.config/yadm/bootstrap.v2/applications/30-KDEConnect.sh
index cb5e596..4136985 100755
--- a/.config/yadm/bootstrap.v2/applications/30-KDEConnect.sh
+++ b/.config/yadm/bootstrap.v2/applications/30-KDEConnect.sh
@@ -3,7 +3,9 @@
 addApplications kdeconnect
 
 setupKDEConnect() {
-  sudo firewall-cmd --permanent --add-port=1714-1764/{tcp,udp}
+  if [ firewall-cmd --state ]; then
+    sudo firewall-cmd --permanent --add-port=1714-1764/{tcp,udp}
+  fi
 
   echo "-- For some reason, its recommended to reboot your device to make kdeconnect work..."
 }