diff --git a/res/values/axxion_strings.xml b/res/values/axxion_strings.xml
index e4f4e05af74..d587f60bb2f 100644
--- a/res/values/axxion_strings.xml
+++ b/res/values/axxion_strings.xml
@@ -424,5 +424,4 @@
     <string name="rominfo_settings_list_item_title">AxxionKat Statistics</string>
     <string name="rominfo_settings_list_item_summary">Help make AxxionKat better by opting into anonymous statistics reporting</string>
     <string name="changelog_title_summary">Here you can see the changes of the new version</string>
-
 </resources>
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index e35a6afe1fd..9e88f23337d 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -154,6 +154,17 @@
     <!-- DEVICE -->
     <header android:id="@+id/device_section"
         android:title="@string/header_category_device" />
+        
+    <!-- Kernel Tweaker -->
+    <header
+        android:id="@+id/kernel_tweaker"
+        android:title="@string/performance_settings_title"
+        android:icon="@drawable/ic_settings_performance" >
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetClass="com.dsht.kerneltweaker.MainActivity"
+            android:targetPackage="com.dsht.kerneltweaker" />
+	</header>    
 
     <!-- Sound -->
     <header
@@ -337,13 +348,6 @@
         android:icon="@drawable/ic_action_permission"
         android:title="@string/superuser" />
 
-    <!-- Performance -->
-    <header
-        android:id="@+id/performance_settings"
-        android:fragment="com.android.settings.cyanogenmod.PerformanceSettings"
-        android:icon="@drawable/ic_settings_performance"
-        android:title="@string/performance_settings_title" />
-
     <!-- About Device -->
     <header
         settings:includeXmlForSearch="@xml/device_info_settings"
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index aee74399569..acbc81e961b 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -686,9 +686,7 @@ public void onBuildHeaders(List<Header> headers) {
     }
 
     private void updateHeaderList(List<Header> target) {
-        final boolean showDev = mDevelopmentPreferences.getBoolean(
-                DevelopmentSettings.PREF_SHOW,
-                android.os.Build.TYPE.equals("eng"));
+        final boolean showDev = true;
         int i = 0;
 
         final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
@@ -766,7 +764,6 @@ private void updateHeaderList(List<Header> target) {
                     }
                 }
             } else if (id == R.id.development_settings
-                    || id == R.id.performance_settings) {
                 if (!showDev) {
                     target.remove(i);
                 }
@@ -778,6 +775,16 @@ private void updateHeaderList(List<Header> target) {
                 if (!DevelopmentSettings.isRootForAppsEnabled()) {
                     target.remove(i);
                 }
+            } else if (id == R.id.kernel_tweaker) {
+                // Embedding into Settings only if app exists (user could manually remove it)
+                boolean supported = false;
+                try {
+                    supported = (getPackageManager().getPackageInfo("com.dsht.kerneltweaker", 0).versionCode >= 18);
+                } catch (PackageManager.NameNotFoundException e) {
+                }
+                if (!supported) {
+                    target.remove(i);
+                }                   
             } else if (id == R.id.multi_sim_settings) {
                 if (!MSimTelephonyManager.getDefault().isMultiSimEnabled())
                     target.remove(header);