diff --git a/res/layout/keyguard_appwidget_picker_layout.xml b/res/layout/keyguard_appwidget_picker_layout.xml
index a27800409b5..41d6a873e8c 100644
--- a/res/layout/keyguard_appwidget_picker_layout.xml
+++ b/res/layout/keyguard_appwidget_picker_layout.xml
@@ -30,4 +30,8 @@
             android:layout_gravity="center_horizontal"
             android:listSelector="@android:color/transparent"
             android:id="@+id/widget_list" />
+  <Button android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:id="@+id/widget_showall"
+          android:text="@string/keyguard_picker_all_widgets_title"/>
 </LinearLayout>
diff --git a/res/values/config.xml b/res/values/config.xml
index 5ce3b9a771c..e73a9adafc6 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -42,5 +42,10 @@
 
     <!-- Volume rocker support. Some devices does not have volume rocker. -->
     <bool name="has_volume_rocker">true</bool>
+
+    <!-- Processor menu, freq cap files -->
+    <string name="max_cpu_freq_file" translatable="false">/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq</string>
+    <string name="min_cpu_freq_file" translatable="false">/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq</string>
+
     <!-- **** CYANOGENMOD ADDITIONS END **** -->
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index debd1e75e67..9e093463d13 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5123,6 +5123,7 @@
     <string name="sms_security_check_limit_summary">Apps can send %d messages in 30 minutes before requiring confirmation</string>
     <string name="sms_security_check_limit_default">30 (Default)</string>
 
+
     <!--- Lock clock -->
     <string name="lock_clock_title">Clock widget</string>
     <string name="lock_clock_summary">View or change how the \'cLock\' Home and Lock screen widgets will display</string>
@@ -5213,6 +5214,9 @@
     <string name="navring_action_google_now">Google Now</string>
     <string name="navring_choose_action_title">Choose action</string>
 
+    <!-- Show All Widgets -->
+    <string name="keyguard_picker_all_widgets_title">Show all widgets</string>
+
     <!-- **** CYANOGENMOD ADDITIONS END **** -->
 
     <!-- Hybrid -->
diff --git a/src/com/android/settings/AppWidgetLoader.java b/src/com/android/settings/AppWidgetLoader.java
index 985ef8bf0c5..2807d015925 100644
--- a/src/com/android/settings/AppWidgetLoader.java
+++ b/src/com/android/settings/AppWidgetLoader.java
@@ -141,7 +141,7 @@ public interface ItemConstructor<Item> {
      * installed {@link AppWidgetProviderInfo} and those provided through
      * {@link AppWidgetManager#EXTRA_CUSTOM_INFO}, sorting them alphabetically.
      */
-    protected List<Item> getItems(Intent intent) {
+    protected List<Item> getItems(Intent intent, boolean showall) {
         boolean sortCustomAppWidgets =
                 intent.getBooleanExtra(AppWidgetManager.EXTRA_CUSTOM_SORT, true);
 
@@ -151,7 +151,7 @@ protected List<Item> getItems(Intent intent) {
         int categoryFilter = intent.getIntExtra(AppWidgetManager.EXTRA_CATEGORY_FILTER,
                 AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN);
 
-        putInstalledAppWidgets(items, categoryFilter);
+        putInstalledAppWidgets(items, categoryFilter, showall);
 
         // Sort all items together by label
         if (sortCustomAppWidgets) {
@@ -175,9 +175,15 @@ public int compare(Item lhs, Item rhs) {
     /**
      * Create list entries for installed {@link AppWidgetProviderInfo} widgets.
      */
+
     void putInstalledAppWidgets(List<Item> items, int categoryFilter) {
         List<AppWidgetProviderInfo> installed =
                 mAppWidgetManager.getInstalledProviders(categoryFilter);
         putAppWidgetItems(installed, null, items, categoryFilter, false);
+
+    void putInstalledAppWidgets(List<Item> items, int categoryFilter, boolean showall) {
+        List<AppWidgetProviderInfo> installed = mAppWidgetManager.getInstalledProviders();
+        putAppWidgetItems(installed, null, items, categoryFilter, showall);
+
     }
 }
diff --git a/src/com/android/settings/AppWidgetPickActivity.java b/src/com/android/settings/AppWidgetPickActivity.java
index 2bd62c0a1cc..28d77c6741d 100644
--- a/src/com/android/settings/AppWidgetPickActivity.java
+++ b/src/com/android/settings/AppWidgetPickActivity.java
@@ -88,7 +88,7 @@ public void onCreate(Bundle icicle) {
      */
     @Override
     protected List<PickAdapter.Item> getItems() {
-        mItems = mAppWidgetLoader.getItems(getIntent());
+        mItems = mAppWidgetLoader.getItems(getIntent(), false);
         return mItems;
     }
 
diff --git a/src/com/android/settings/KeyguardAppWidgetPickActivity.java b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
index 80dbc0c7070..eab96f044a8 100644
--- a/src/com/android/settings/KeyguardAppWidgetPickActivity.java
+++ b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
@@ -47,6 +47,7 @@
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.Button;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -115,12 +116,22 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         mAppWidgetManager = AppWidgetManager.getInstance(this);
         mAppWidgetLoader = new AppWidgetLoader<Item>(this, mAppWidgetManager, this);
-        mItems = mAppWidgetLoader.getItems(getIntent());
+        mItems = mAppWidgetLoader.getItems(getIntent(), false);
         mAppWidgetAdapter = new AppWidgetAdapter(this, mItems);
         mGridView.setAdapter(mAppWidgetAdapter);
         mGridView.setOnItemClickListener(this);
 
         mLockPatternUtils = new LockPatternUtils(this); // TEMP-- we want to delete this
+        final Button showAll = (Button) findViewById(R.id.widget_showall);
+        showAll.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mItems = mAppWidgetLoader.getItems(getIntent(), true);
+                mAppWidgetAdapter = new AppWidgetAdapter(getBaseContext(), mItems);
+                mGridView.setAdapter(mAppWidgetAdapter);
+                showAll.setEnabled(false);
+            }
+        });
     }
 
     /**
diff --git a/src/com/android/settings/cyanogenmod/BootReceiver.java b/src/com/android/settings/cyanogenmod/BootReceiver.java
index 6916b9dc996..4311168b3ee 100644
--- a/src/com/android/settings/cyanogenmod/BootReceiver.java
+++ b/src/com/android/settings/cyanogenmod/BootReceiver.java
@@ -24,6 +24,7 @@
 import android.preference.PreferenceManager;
 import android.util.Log;
 
+import com.android.settings.R;
 import com.android.settings.Utils;
 
 import java.util.Arrays;
@@ -66,6 +67,14 @@ public void onReceive(Context ctx, Intent intent) {
         }
     }
 
+    private void initFreqCapFiles(Context ctx)
+    {
+        if (Processor.freqCapFilesInitialized) return;
+        Processor.FREQ_MAX_FILE = ctx.getResources().getString(R.string.max_cpu_freq_file);
+        Processor.FREQ_MIN_FILE = ctx.getResources().getString(R.string.min_cpu_freq_file);
+        Processor.freqCapFilesInitialized = true;
+    }
+
     private void configureCPU(Context ctx) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
 
@@ -87,6 +96,7 @@ private void configureCPU(Context ctx) {
         if (noSettings) {
             Log.d(TAG, "No CPU settings saved. Nothing to restore.");
         } else {
+            initFreqCapFiles(ctx);
             if (availableGovernorsLine != null){
                 governors = Arrays.asList(availableGovernorsLine.split(" "));
             }
diff --git a/src/com/android/settings/cyanogenmod/Processor.java b/src/com/android/settings/cyanogenmod/Processor.java
index ce2c404a662..6f21e30a806 100644
--- a/src/com/android/settings/cyanogenmod/Processor.java
+++ b/src/com/android/settings/cyanogenmod/Processor.java
@@ -43,10 +43,12 @@ public class Processor extends SettingsPreferenceFragment implements
     public static final String FREQ_MIN_PREF = "pref_cpu_freq_min";
     public static final String FREQ_MAX_PREF = "pref_cpu_freq_max";
     public static final String FREQ_LIST_FILE = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies";
-    public static final String FREQ_MAX_FILE = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq";
-    public static final String FREQ_MIN_FILE = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq";
+    public static String FREQ_MAX_FILE = null;
+    public static String FREQ_MIN_FILE = null;
     public static final String SOB_PREF = "pref_cpu_set_on_boot";
 
+    protected static boolean freqCapFilesInitialized = false;
+
     private static final String TAG = "CPUSettings";
 
     private String mGovernorFormat;
@@ -87,10 +89,20 @@ public void handleMessage(Message msg) {
         }
     };
 
+    private void initFreqCapFiles()
+    {
+        if (freqCapFilesInitialized) return;
+        FREQ_MAX_FILE = getString(R.string.max_cpu_freq_file);
+        FREQ_MIN_FILE = getString(R.string.min_cpu_freq_file);
+        freqCapFilesInitialized = true;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        initFreqCapFiles();
+
         mGovernorFormat = getString(R.string.cpu_governors_summary);
         mMinFrequencyFormat = getString(R.string.cpu_min_freq_summary);
         mMaxFrequencyFormat = getString(R.string.cpu_max_freq_summary);
@@ -185,6 +197,8 @@ public void onResume() {
 
         super.onResume();
 
+        initFreqCapFiles();
+
         if (Utils.fileExists(FREQ_MIN_FILE) && (temp = Utils.fileReadOneLine(FREQ_MIN_FILE)) != null) {
             mMinFrequencyPref.setValue(temp);
             mMinFrequencyPref.setSummary(String.format(mMinFrequencyFormat, toMHz(temp)));
@@ -211,6 +225,8 @@ public void onDestroy() {
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
+        initFreqCapFiles();
+
         String fname = "";
 
         if (newValue != null) {