diff --git a/LineageActions/AndroidManifest.xml b/LineageActions/AndroidManifest.xml
index b8b4799..ab44f01 100644
--- a/LineageActions/AndroidManifest.xml
+++ b/LineageActions/AndroidManifest.xml
@@ -20,7 +20,7 @@
 
     <application
         android:allowBackup="true"
-        android:label="@string/moto_actions_title"
+        android:label="@string/screen_gestures_panel_title"
         android:icon="@drawable/ic_gesture"
         android:persistent="true">
 
@@ -61,21 +61,9 @@
 
         <activity
             android:name=".ActionsPreferenceActivity"
-            android:label="@string/moto_actions_title"
+            android:label="@string/screen_gestures_panel_title"
             android:summary="@string/device_gestures_summary"
             android:theme="@style/LineageActions">
-            <intent-filter>
-                <action android:name="com.android.settings.action.IA_SETTINGS" />
-            </intent-filter>
-            <meta-data
-                android:name="com.android.settings.category"
-                android:value="com.android.settings.category.ia.homepage" />
-            <meta-data
-                android:name="com.android.settings.icon"
-                android:resource="@drawable/ic_settings_gestures" />
-            <meta-data
-                android:name="com.android.settings.summary"
-                android:resource="@string/device_gestures_summary" />
         </activity>
 
         <activity
diff --git a/LineageActions/res/values/strings.xml b/LineageActions/res/values/strings.xml
index 82da8f5..4d1f28d 100644
--- a/LineageActions/res/values/strings.xml
+++ b/LineageActions/res/values/strings.xml
@@ -92,4 +92,15 @@
    
    <!-- Pip -->
    <string name="app_does_not_support_pip">App does not support picture-in-picture mode.</string>
+
+   <!-- Proximity sensor -->
+   <string name="allow_proximity_sensor_title">Allow proximity sensor</string>
+   <string name="allow_proximity_sensor_summary">Check the proximity sensor before performing the action</string>
+
+   <!-- Title text for double tap power for camera [CHAR LIMIT=60]-->
+   <string name="double_tap_power_for_camera_title">Jump to camera</string>
+
+   <!-- Summary text for double tap power for camera [CHAR LIMIT=160]-->
+   <string name="double_tap_power_for_camera_summary">To quickly open camera, press the power button twice. Works from any screen.</string>
+
 </resources>
diff --git a/LineageActions/res/xml/actions_panel.xml b/LineageActions/res/xml/actions_panel.xml
index cf725f8..4a24445 100644
--- a/LineageActions/res/xml/actions_panel.xml
+++ b/LineageActions/res/xml/actions_panel.xml
@@ -18,6 +18,11 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
+    <SwitchPreference
+        android:key="gesture_double_tap_power"
+        android:title="@string/double_tap_power_for_camera_title"
+        android:summary="@string/double_tap_power_for_camera_summary"/>
+
     <SwitchPreference
         android:key="gesture_camera_action"
         android:defaultValue="true"
diff --git a/LineageActions/src/org/lineageos/settings/device/GestureSettingsFragment.java b/LineageActions/src/org/lineageos/settings/device/GestureSettingsFragment.java
index 9a9bb14..e1f3e92 100644
--- a/LineageActions/src/org/lineageos/settings/device/GestureSettingsFragment.java
+++ b/LineageActions/src/org/lineageos/settings/device/GestureSettingsFragment.java
@@ -17,10 +17,18 @@
 package org.lineageos.settings.device;
 
 import android.os.Bundle;
+import android.support.v7.preference.Preference;
 import android.support.v14.preference.PreferenceFragment;
+import android.support.v14.preference.SwitchPreference;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.content.Context;
+import android.content.res.Resources;
 
 public class GestureSettingsFragment extends PreferenceFragment {
 
+    private SwitchPreference mGestureDoubleTapPower;
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -30,6 +38,43 @@ public class GestureSettingsFragment extends PreferenceFragment {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.actions_panel);
+        mGestureDoubleTapPower = (SwitchPreference) findPreference("gesture_double_tap_power");
+        if (isCameraDoubleTapPowerAllowed()){
+            mGestureDoubleTapPower.setChecked(isCameraDoubleTapPowerEnabled());
+            mGestureDoubleTapPower.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object objValue) {
+                    boolean value = (Boolean) objValue;
+                    setCameraDoubleTapPowerEnabled(value);
+                    return true;
+                }
+            });
+            try {
+                Resources settingsRes = getActivity().createPackageContext("com.android.settings", 0).getResources();
+                mGestureDoubleTapPower.setTitle(settingsRes.getString(
+                        settingsRes.getIdentifier("double_tap_power_for_camera_title", "string", "com.android.settings")));
+                mGestureDoubleTapPower.setSummary(settingsRes.getString(
+                        settingsRes.getIdentifier("double_tap_power_for_camera_summary", "string", "com.android.settings")));
+            } catch (Exception e) {
+            }
+        }else{
+            getPreferenceScreen().removePreference(mGestureDoubleTapPower);
+        }
+    }
+
+    private boolean isCameraDoubleTapPowerAllowed() {
+        return getActivity().getResources().getBoolean(
+                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
+    }
+
+    private boolean isCameraDoubleTapPowerEnabled(){
+        return Settings.Secure.getIntForUser(getActivity().getContentResolver(),
+                        Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 1, UserHandle.USER_CURRENT) == 1;
+    }
+
+    private void setCameraDoubleTapPowerEnabled(boolean enabled){
+        Settings.Secure.putInt(getActivity().getContentResolver(),
+                Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, enabled ? 0 : 1);
     }
 
 }
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
index d3ed607..67bc0d9 100644
--- a/overlay/packages/apps/Settings/res/values/config.xml
+++ b/overlay/packages/apps/Settings/res/values/config.xml
@@ -24,4 +24,10 @@
     -->
     <integer name="config_fingerprintSensorLocation">1</integer>
 
+    <!-- Device specific doze package -->
+    <string name="config_customDozePackage">org.lineageos.settings.device/org.lineageos.settings.device.DozeSettingsActivity</string>
+
+    <!-- Device specific gesture package -->
+    <string name="config_customGesturePackage">org.lineageos.settings.device/org.lineageos.settings.device.ActionsPreferenceActivity</string>
+
 </resources>