diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index fc10c95..de3af81 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -919,6 +919,8 @@
      <!-- Gaming mode -->
     <string name="gaming_mode_title">Gaming Mode</string>
     <string name="gaming_mode_summary">Customize gaming mode preferences</string>
+    <string name="gaming_mode_enable_title">Enable Gaming Mode</string>
+    <string name="gaming_mode_enable_summary">Master switch for Gaming Mode</string>
     <string name="gaming_mode_app_picker_title">Automatically turn on for these apps</string>
     <string name="add_gaming_mode_package_title">Add apps for Gaming mode</string>
     <string name="add_gaming_mode_package_summary">Gaming mode will turn on automatically when these apps are opened and turn off when they are closed</string>
diff --git a/res/xml/cherish_settings_misc.xml b/res/xml/cherish_settings_misc.xml
index 37ed310..bcffdf2 100644
--- a/res/xml/cherish_settings_misc.xml
+++ b/res/xml/cherish_settings_misc.xml
@@ -34,8 +34,8 @@
         android:summaryOff="@string/summary_dashboard_suggestions_disabled"
         android:defaultValue="true"/>
 
-    <com.cherish.settings.preferences.SystemSettingMasterSwitchPreference
-        android:key="gaming_mode_enabled"
+    <Preference
+        android:key="gaming_mode"
         android:icon="@drawable/ic_gaming_mode"
         android:fragment="com.cherish.settings.fragments.GamingMode"
         android:title="@string/gaming_mode_title"
diff --git a/res/xml/gaming_mode_settings.xml b/res/xml/gaming_mode_settings.xml
index 3956be6..dd45e93 100644
--- a/res/xml/gaming_mode_settings.xml
+++ b/res/xml/gaming_mode_settings.xml
@@ -18,23 +18,32 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
     android:title="@string/gaming_mode_title">
-
+	
+	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="gaming_mode_enabled"
+        android:title="@string/gaming_mode_enable_title"
+        android:summary="@string/gaming_mode_enable_summary"
+        android:defaultValue="false" />
+		
     <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="gaming_mode_headsup_toggle"
         android:title="@string/gaming_mode_headsup_title"
         android:summary="@string/gaming_mode_headsup_summary"
+        android:dependency="gaming_mode_enabled"
         android:defaultValue="true" />
 
     <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="gaming_mode_hw_keys_toggle"
         android:title="@string/gaming_mode_hardware_keys_title"
         android:summary="@string/gaming_mode_hardware_keys_summary"
+        android:dependency="gaming_mode_enabled"
         android:defaultValue="false" />
 
     <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="gaming_mode_manual_brightness_toggle"
         android:title="@string/gaming_mode_brightness_title"
         android:summary="@string/gaming_mode_brightness_summary"
+        android:dependency="gaming_mode_enabled"
         android:defaultValue="true" />
 
     <com.cherish.settings.preferences.SystemSettingListPreference
@@ -43,6 +52,7 @@
         android:entries="@array/gaming_mode_ringer_entries"
         android:entryValues="@array/gaming_mode_ringer_values"
         android:defaultValue="0"
+        android:dependency="gaming_mode_enabled"
         android:summary="%s" />
 
     <com.cherish.settings.preferences.SystemSettingListPreference
@@ -51,15 +61,18 @@
         android:entries="@array/gaming_mode_notifications_entries"
         android:entryValues="@array/gaming_mode_notifications_values"
         android:defaultValue="3"
+        android:dependency="gaming_mode_enabled"
         android:summary="%s" />
 
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+<!--    <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="gaming_mode_dynamic_state"
         android:title="@string/gaming_mode_dynamic_title"
         android:summary="@string/gaming_mode_dynamic_summary"
+        android:dependency="gaming_mode_enabled"
         android:defaultValue="false" />
-
+-->
     <PreferenceCategory
+        android:dependency="gaming_mode_enabled"
         android:title="@string/gaming_mode_app_picker_title"
         android:key="gamingmode_applications">
         <Preference
diff --git a/src/com/cherish/settings/fragments/MiscSettings.java b/src/com/cherish/settings/fragments/MiscSettings.java
index 2522715..230ccd7 100644
--- a/src/com/cherish/settings/fragments/MiscSettings.java
+++ b/src/com/cherish/settings/fragments/MiscSettings.java
@@ -34,10 +34,6 @@ import com.cherish.settings.preferences.SystemSettingListPreference;
 public class MiscSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
 
-    private static final String GAMING_MODE_ENABLED = "gaming_mode_enabled";
-
-    private SystemSettingMasterSwitchPreference mGamingMode;
-
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -45,21 +41,10 @@ public class MiscSettings extends SettingsPreferenceFragment implements
 
         addPreferencesFromResource(R.xml.cherish_settings_misc);
 
-        mGamingMode = (SystemSettingMasterSwitchPreference) findPreference(GAMING_MODE_ENABLED);
-        mGamingMode.setChecked((Settings.System.getInt(getActivity().getContentResolver(),
-                Settings.System.GAMING_MODE_ENABLED, 0) == 1));
-        mGamingMode.setOnPreferenceChangeListener(this);
-
     }
 
     @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (preference == mGamingMode) {
-            boolean value = (Boolean) newValue;
-            Settings.System.putInt(getActivity().getContentResolver(),
-                    Settings.System.GAMING_MODE_ENABLED, value ? 1 : 0);
-            return true;
-        }
+    public boolean onPreferenceChange(Preference preference, Object objValue) {
         return false;
     }
 
diff --git a/src/com/cherish/settings/preferences/fragments/GamingMode.java b/src/com/cherish/settings/preferences/fragments/GamingMode.java
index 683b061..6813754 100644
--- a/src/com/cherish/settings/preferences/fragments/GamingMode.java
+++ b/src/com/cherish/settings/preferences/fragments/GamingMode.java
@@ -86,7 +86,7 @@ public class GamingMode extends SettingsPreferenceFragment
         // Get launch-able applications
         addPreferencesFromResource(R.xml.gaming_mode_settings);
 
-        mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.add_gaming_mode_package_summary);
+    //    mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.add_gaming_mode_package_summary);
 
         final PreferenceScreen prefScreen = getPreferenceScreen();