diff --git a/proguard.flags b/proguard.flags
index fb42f1e..6724bc5 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -3,10 +3,11 @@
 -keep class org.lineageos.lineageparts.*Picker
 -keep class org.lineageos.lineageparts.*Settings
 
--keep class org.lineageos.lineageparts.lineagestats.*
 -keep class org.lineageos.lineageparts.contributors.*
+-keep class org.lineageos.lineageparts.gestures.*
 -keep class org.lineageos.lineageparts.hardware.*
 -keep class org.lineageos.lineageparts.input.*
+-keep class org.lineageos.lineageparts.lineagestats.*
 -keep class org.lineageos.lineageparts.livedisplay.*
 -keep class org.lineageos.lineageparts.notificationlight.*
 -keep class org.lineageos.lineageparts.power.*
@@ -14,6 +15,11 @@
 -keep class org.lineageos.lineageparts.profiles.*
 -keep class org.lineageos.lineageparts.sounds.*
 
+# Keep keyhandler constructor
+-keep public class * implements com.android.internal.os.DeviceKeyHandler {
+   public <init>(android.content.Context);
+}
+
 # Keep click responders
 -keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {
   *** onClick*(...);