diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8b067bd..a4b12dc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.pilot51.voicenotify"
-	android:versionCode="7"
-	android:versionName="1.0.6"
+	android:versionCode="8"
+	android:versionName="1.0.7"
 	android:installLocation="auto">
 	<uses-sdk
 		android:minSdkVersion="4"
diff --git a/src/com/pilot51/voicenotify/AppList.java b/src/com/pilot51/voicenotify/AppList.java
index f14b6bf..ce2aac4 100644
--- a/src/com/pilot51/voicenotify/AppList.java
+++ b/src/com/pilot51/voicenotify/AppList.java
@@ -6,7 +6,6 @@
 import java.util.List;
 
 import android.app.ListActivity;
-import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -25,7 +24,6 @@ public class AppList extends ListActivity {
 	private AppListAdapter adapter;
 	private static ArrayList<App> apps;
 	private List<ApplicationInfo> installedApps;
-	private SharedPreferences prefs;
 	private static boolean defEnable;
 	private static final int IGNORE_TOGGLE = 0, IGNORE_ALL = 1, IGNORE_NONE = 2;
 
@@ -33,8 +31,7 @@ public class AppList extends ListActivity {
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-		prefs = getSharedPreferences("defValues", MODE_WORLD_READABLE);
-		defEnable = prefs.getBoolean("enable", true);
+		defEnable = Common.prefs.getBoolean("defEnable", true);
 		new Thread(new Runnable() {
 			public void run() {
 				apps = Database.getApps();
@@ -158,11 +155,14 @@ private void setIgnore(int position, int ignoreType) {
 	/** Set the default enabled value for new apps. */
 	private void setDefaultEnable(boolean enable) {
 		defEnable = enable;
-		prefs.edit().putBoolean("enable", defEnable).commit();
+		Common.prefs.edit().putBoolean("defEnable", defEnable).commit();
 	}
 	
 	protected static boolean getIsEnabled(String pkg) {
-		if (apps == null) apps = Database.getApps();
+		if (apps == null) {
+			defEnable = Common.prefs.getBoolean("defEnable", true);
+			apps = Database.getApps();
+		}
 		App app;
 		for (int n = 0; n < apps.size(); n++) {
 			app = apps.get(n);