Renaming APG to OpenPGP Keychain

752 files changed, 1198 insertions, 1253 deletions

diff --git a/APG-API-Demo/.gitignore b/OpenPGP-Keychain-API-Demo/.gitignore
index 2e423e1a3..2e423e1a3 100644
--- a/APG-API-Demo/.gitignore
+++ b/OpenPGP-Keychain-API-Demo/.gitignore
diff --git a/APG-API-Demo/AndroidManifest.xml b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
index 812b5d45e..9d735860c 100644
--- a/APG-API-Demo/AndroidManifest.xml
+++ b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.thialfihar.android.apg.demo"
+    package="org.sufficientlysecure.keychain.demo"
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-permission android:name="org.thialfihar.android.apg.permission.ACCESS_API" />
-    <uses-permission android:name="org.thialfihar.android.apg.permission.ACCESS_KEYS" />
+    <uses-permission android:name="org.sufficientlysecure.keychain.permission.ACCESS_API" />
+    <uses-permission android:name="org.sufficientlysecure.keychain.permission.ACCESS_KEYS" />
 
     <uses-sdk
         android:minSdkVersion="7"
diff --git a/APG-API-Demo/build.xml b/OpenPGP-Keychain-API-Demo/build.xml
index e72865c84..e72865c84 100644
--- a/APG-API-Demo/build.xml
+++ b/OpenPGP-Keychain-API-Demo/build.xml
diff --git a/APG-API-Demo/proguard-project.txt b/OpenPGP-Keychain-API-Demo/proguard-project.txt
index f2fe1559a..f2fe1559a 100644
--- a/APG-API-Demo/proguard-project.txt
+++ b/OpenPGP-Keychain-API-Demo/proguard-project.txt
diff --git a/APG-API-Demo/project.properties b/OpenPGP-Keychain-API-Demo/project.properties
index ea95f1b11..85ec9915d 100644
--- a/APG-API-Demo/project.properties
+++ b/OpenPGP-Keychain-API-Demo/project.properties
@@ -9,4 +9,4 @@
 
 # Project target.
 target=android-15
-android.library.reference.1=../APG-API-Lib
+android.library.reference.1=../OpenPGP-Keychain-API-Lib
diff --git a/APG-API-Demo/res/drawable-hdpi/icon.png b/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/icon.png
index 6b8cc3d73..6b8cc3d73 100644
--- a/APG-API-Demo/res/drawable-hdpi/icon.png
+++ b/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/icon.png
diff --git a/APG-API-Demo/res/drawable-ldpi/icon.png b/OpenPGP-Keychain-API-Demo/res/drawable-ldpi/icon.png
index a1adf6bcb..a1adf6bcb 100644
--- a/APG-API-Demo/res/drawable-ldpi/icon.png
+++ b/OpenPGP-Keychain-API-Demo/res/drawable-ldpi/icon.png
diff --git a/APG-API-Demo/res/drawable-mdpi/icon.png b/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/icon.png
index 6b10a2ad3..6b10a2ad3 100644
--- a/APG-API-Demo/res/drawable-mdpi/icon.png
+++ b/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/icon.png
diff --git a/APG-API-Demo/res/drawable-xhdpi/icon.png b/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/icon.png
index 03ee31bbd..03ee31bbd 100644
--- a/APG-API-Demo/res/drawable-xhdpi/icon.png
+++ b/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/icon.png
diff --git a/APG-API-Demo/res/layout/aidl_demo.xml b/OpenPGP-Keychain-API-Demo/res/layout/aidl_demo.xml
index 59977869d..59977869d 100644
--- a/APG-API-Demo/res/layout/aidl_demo.xml
+++ b/OpenPGP-Keychain-API-Demo/res/layout/aidl_demo.xml
diff --git a/APG-API-Demo/res/layout/aidl_demo2.xml b/OpenPGP-Keychain-API-Demo/res/layout/aidl_demo2.xml
index 73abd9b5c..73abd9b5c 100644
--- a/APG-API-Demo/res/layout/aidl_demo2.xml
+++ b/OpenPGP-Keychain-API-Demo/res/layout/aidl_demo2.xml
diff --git a/APG-API-Demo/res/layout/content_provider_demo.xml b/OpenPGP-Keychain-API-Demo/res/layout/content_provider_demo.xml
index 279324cda..279324cda 100644
--- a/APG-API-Demo/res/layout/content_provider_demo.xml
+++ b/OpenPGP-Keychain-API-Demo/res/layout/content_provider_demo.xml
diff --git a/APG-API-Demo/res/layout/intent_demo.xml b/OpenPGP-Keychain-API-Demo/res/layout/intent_demo.xml
index a765343f9..a765343f9 100644
--- a/APG-API-Demo/res/layout/intent_demo.xml
+++ b/OpenPGP-Keychain-API-Demo/res/layout/intent_demo.xml
diff --git a/APG-API-Demo/res/xml/base_preference.xml b/OpenPGP-Keychain-API-Demo/res/xml/base_preference.xml
index c9a34efd1..c9a34efd1 100644
--- a/APG-API-Demo/res/xml/base_preference.xml
+++ b/OpenPGP-Keychain-API-Demo/res/xml/base_preference.xml
diff --git a/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/AidlDemoActivity.java
index 2174b6e09..1d6ddff6b 100644
--- a/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/AidlDemoActivity.java
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.demo;
+package org.sufficientlysecure.keychain.demo;
 
-import org.thialfihar.android.apg.integration.ApgData;
-import org.thialfihar.android.apg.integration.ApgIntentHelper;
-import org.thialfihar.android.apg.service.IApgApiService;
-import org.thialfihar.android.apg.service.IApgKeyService;
-import org.thialfihar.android.apg.service.handler.IApgDecryptHandler;
-import org.thialfihar.android.apg.service.handler.IApgEncryptHandler;
-import org.thialfihar.android.apg.service.handler.IApgGetDecryptionKeyIdHandler;
+import org.sufficientlysecure.keychain.demo.R;
+import org.sufficientlysecure.keychain.integration.KeychainData;
+import org.sufficientlysecure.keychain.integration.KeychainIntentHelper;
+import org.sufficientlysecure.keychain.service.IKeychainApiService;
+import org.sufficientlysecure.keychain.service.IKeychainKeyService;
+import org.sufficientlysecure.keychain.service.handler.IKeychainDecryptHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainEncryptHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainGetDecryptionKeyIdHandler;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -43,13 +44,13 @@ public class AidlDemoActivity extends Activity {
     TextView mCiphertextTextView;
     TextView mDataTextView;
 
-    ApgIntentHelper mApgIntentHelper;
-    ApgData mApgData;
+    KeychainIntentHelper mKeychainIntentHelper;
+    KeychainData mKeychainData;
 
-    private IApgApiService service = null;
+    private IKeychainApiService service = null;
     private ServiceConnection svcConn = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, IBinder binder) {
-            service = IApgApiService.Stub.asInterface(binder);
+            service = IKeychainApiService.Stub.asInterface(binder);
         }
 
         public void onServiceDisconnected(ComponentName className) {
@@ -68,17 +69,18 @@ public class AidlDemoActivity extends Activity {
         mCiphertextTextView = (TextView) findViewById(R.id.aidl_demo_ciphertext);
         mDataTextView = (TextView) findViewById(R.id.aidl_demo_data);
 
-        mApgIntentHelper = new ApgIntentHelper(mActivity);
-        mApgData = new ApgData();
+        mKeychainIntentHelper = new KeychainIntentHelper(mActivity);
+        mKeychainData = new KeychainData();
 
-        bindService(new Intent(IApgApiService.class.getName()), svcConn, Context.BIND_AUTO_CREATE);
+        bindService(new Intent(IKeychainApiService.class.getName()), svcConn,
+                Context.BIND_AUTO_CREATE);
     }
 
     public void encryptOnClick(View view) {
         byte[] inputBytes = mMessageTextView.getText().toString().getBytes();
 
         try {
-            service.encryptAsymmetric(inputBytes, null, true, 0, mApgData.getPublicKeys(), 7,
+            service.encryptAsymmetric(inputBytes, null, true, 0, mKeychainData.getPublicKeys(), 7,
                     encryptHandler);
         } catch (RemoteException e) {
             exceptionImplementation(-1, e.toString());
@@ -96,13 +98,13 @@ public class AidlDemoActivity extends Activity {
     }
 
     private void updateView() {
-        if (mApgData.getDecryptedData() != null) {
-            mMessageTextView.setText(mApgData.getDecryptedData());
+        if (mKeychainData.getDecryptedData() != null) {
+            mMessageTextView.setText(mKeychainData.getDecryptedData());
         }
-        if (mApgData.getEncryptedData() != null) {
-            mCiphertextTextView.setText(mApgData.getEncryptedData());
+        if (mKeychainData.getEncryptedData() != null) {
+            mCiphertextTextView.setText(mKeychainData.getEncryptedData());
         }
-        mDataTextView.setText(mApgData.toString());
+        mDataTextView.setText(mKeychainData.toString());
     }
 
     @Override
@@ -117,7 +119,7 @@ public class AidlDemoActivity extends Activity {
         builder.setTitle("Exception!").setMessage(error).setPositiveButton("OK", null).show();
     }
 
-    private final IApgEncryptHandler.Stub encryptHandler = new IApgEncryptHandler.Stub() {
+    private final IKeychainEncryptHandler.Stub encryptHandler = new IKeychainEncryptHandler.Stub() {
 
         @Override
         public void onException(final int exceptionId, final String message) throws RemoteException {
@@ -132,7 +134,7 @@ public class AidlDemoActivity extends Activity {
         public void onSuccess(final byte[] outputBytes, String outputUri) throws RemoteException {
             runOnUiThread(new Runnable() {
                 public void run() {
-                    mApgData.setEncryptedData(new String(outputBytes));
+                    mKeychainData.setEncryptedData(new String(outputBytes));
                     updateView();
                 }
             });
@@ -140,7 +142,7 @@ public class AidlDemoActivity extends Activity {
 
     };
 
-    private final IApgDecryptHandler.Stub decryptHandler = new IApgDecryptHandler.Stub() {
+    private final IKeychainDecryptHandler.Stub decryptHandler = new IKeychainDecryptHandler.Stub() {
 
         @Override
         public void onException(final int exceptionId, final String message) throws RemoteException {
@@ -157,7 +159,7 @@ public class AidlDemoActivity extends Activity {
                 boolean signatureUnknown) throws RemoteException {
             runOnUiThread(new Runnable() {
                 public void run() {
-                    mApgData.setDecryptedData(new String(outputBytes));
+                    mKeychainData.setDecryptedData(new String(outputBytes));
                     updateView();
                 }
             });
@@ -166,7 +168,7 @@ public class AidlDemoActivity extends Activity {
 
     };
 
-    private final IApgGetDecryptionKeyIdHandler.Stub helperHandler = new IApgGetDecryptionKeyIdHandler.Stub() {
+    private final IKeychainGetDecryptionKeyIdHandler.Stub helperHandler = new IKeychainGetDecryptionKeyIdHandler.Stub() {
 
         @Override
         public void onException(final int exceptionId, final String message) throws RemoteException {
@@ -191,18 +193,19 @@ public class AidlDemoActivity extends Activity {
      * @param view
      */
     public void selectSecretKeyOnClick(View view) {
-        mApgIntentHelper.selectSecretKey();
+        mKeychainIntentHelper.selectSecretKey();
     }
 
     public void selectEncryptionKeysOnClick(View view) {
-        mApgIntentHelper.selectPublicKeys("user@example.com");
+        mKeychainIntentHelper.selectPublicKeys("user@example.com");
 
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // this updates the mApgData object to the result of the methods
-        boolean result = mApgIntentHelper.onActivityResult(requestCode, resultCode, data, mApgData);
+        // this updates the mKeychainData object to the result of the methods
+        boolean result = mKeychainIntentHelper.onActivityResult(requestCode, resultCode, data,
+                mKeychainData);
         if (result) {
             updateView();
         }
diff --git a/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity2.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/AidlDemoActivity2.java
index 4a862e8ae..53ee24288 100644
--- a/APG-API-Demo/src/org/thialfihar/android/apg/demo/AidlDemoActivity2.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/AidlDemoActivity2.java
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.demo;
+package org.sufficientlysecure.keychain.demo;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.thialfihar.android.apg.integration.ApgData;
-import org.thialfihar.android.apg.integration.ApgIntentHelper;
-import org.thialfihar.android.apg.service.IApgKeyService;
-import org.thialfihar.android.apg.service.handler.IApgGetKeyringsHandler;
+import org.sufficientlysecure.keychain.demo.R;
+import org.sufficientlysecure.keychain.integration.KeychainData;
+import org.sufficientlysecure.keychain.integration.KeychainIntentHelper;
+import org.sufficientlysecure.keychain.service.IKeychainKeyService;
+import org.sufficientlysecure.keychain.service.handler.IKeychainGetKeyringsHandler;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -43,16 +44,16 @@ public class AidlDemoActivity2 extends Activity {
 
     TextView mKeyringsTextView;
 
-    ApgIntentHelper mApgIntentHelper;
-    ApgData mApgData;
+    KeychainIntentHelper mKeychainIntentHelper;
+    KeychainData mKeychainData;
 
     byte[] keysBytes;
     ArrayList<String> keysStrings;
 
-    private IApgKeyService service = null;
+    private IKeychainKeyService service = null;
     private ServiceConnection svcConn = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, IBinder binder) {
-            service = IApgKeyService.Stub.asInterface(binder);
+            service = IKeychainKeyService.Stub.asInterface(binder);
         }
 
         public void onServiceDisconnected(ComponentName className) {
@@ -69,15 +70,16 @@ public class AidlDemoActivity2 extends Activity {
 
         mKeyringsTextView = (TextView) findViewById(R.id.aidl_demo_keyrings);
 
-        mApgIntentHelper = new ApgIntentHelper(mActivity);
-        mApgData = new ApgData();
+        mKeychainIntentHelper = new KeychainIntentHelper(mActivity);
+        mKeychainData = new KeychainData();
 
-        bindService(new Intent(IApgKeyService.class.getName()), svcConn, Context.BIND_AUTO_CREATE);
+        bindService(new Intent(IKeychainKeyService.class.getName()), svcConn,
+                Context.BIND_AUTO_CREATE);
     }
 
     public void getKeyringsStringsOnClick(View view) {
         try {
-            service.getPublicKeyRings(mApgData.getPublicKeys(), true, getKeyringsHandler);
+            service.getPublicKeyRings(mKeychainData.getPublicKeys(), true, getKeyringsHandler);
         } catch (RemoteException e) {
             exceptionImplementation(-1, e.toString());
         }
@@ -85,7 +87,7 @@ public class AidlDemoActivity2 extends Activity {
 
     public void getKeyringsBytesOnClick(View view) {
         try {
-            service.getPublicKeyRings(mApgData.getPublicKeys(), false, getKeyringsHandler);
+            service.getPublicKeyRings(mKeychainData.getPublicKeys(), false, getKeyringsHandler);
         } catch (RemoteException e) {
             exceptionImplementation(-1, e.toString());
         }
@@ -115,7 +117,7 @@ public class AidlDemoActivity2 extends Activity {
         builder.setTitle("Exception!").setMessage(error).setPositiveButton("OK", null).show();
     }
 
-    private final IApgGetKeyringsHandler.Stub getKeyringsHandler = new IApgGetKeyringsHandler.Stub() {
+    private final IKeychainGetKeyringsHandler.Stub getKeyringsHandler = new IKeychainGetKeyringsHandler.Stub() {
 
         @Override
         public void onException(final int exceptionId, final String message) throws RemoteException {
@@ -147,13 +149,14 @@ public class AidlDemoActivity2 extends Activity {
     };
 
     public void selectEncryptionKeysOnClick(View view) {
-        mApgIntentHelper.selectPublicKeys("user@example.com");
+        mKeychainIntentHelper.selectPublicKeys("user@example.com");
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // this updates the mApgData object to the result of the methods
-        boolean result = mApgIntentHelper.onActivityResult(requestCode, resultCode, data, mApgData);
+        // this updates the mKeychainData object to the result of the methods
+        boolean result = mKeychainIntentHelper.onActivityResult(requestCode, resultCode, data,
+                mKeychainData);
         if (result) {
             updateView();
         }
diff --git a/APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java
index 5e2108c50..322a446b5 100644
--- a/APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.demo;
+package org.sufficientlysecure.keychain.demo;
 
-import org.thialfihar.android.apg.demo.R;
+import org.sufficientlysecure.keychain.demo.R;
 
 import android.app.Activity;
 import android.content.Intent;
diff --git a/APG-API-Demo/src/org/thialfihar/android/apg/demo/ContentProviderDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/ContentProviderDemoActivity.java
index 892b41429..c69f839d1 100644
--- a/APG-API-Demo/src/org/thialfihar/android/apg/demo/ContentProviderDemoActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/ContentProviderDemoActivity.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.demo;
+package org.sufficientlysecure.keychain.demo;
 
 import java.util.Arrays;
 
-import org.thialfihar.android.apg.demo.R;
-import org.thialfihar.android.apg.integration.ApgContentProviderHelper;
+import org.sufficientlysecure.keychain.demo.R;
+import org.sufficientlysecure.keychain.integration.KeychainContentProviderHelper;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -33,7 +33,7 @@ public class ContentProviderDemoActivity extends Activity {
     TextView mCiphertextTextView;
     TextView mDataTextView;
 
-    ApgContentProviderHelper mApgContentProviderHelper;
+    KeychainContentProviderHelper mKeychainContentProviderHelper;
 
     /**
      * Instantiate View for this Activity
@@ -48,16 +48,16 @@ public class ContentProviderDemoActivity extends Activity {
 
         mOutputTextView = (TextView) findViewById(R.id.content_provider_output);
 
-        mApgContentProviderHelper = new ApgContentProviderHelper(mActivity);
+        mKeychainContentProviderHelper = new KeychainContentProviderHelper(mActivity);
     }
 
     public void test1OnClick(View view) {
-        long[] test = mApgContentProviderHelper.getPublicKeyringIdsByEmail("user@example.com");
+        long[] test = mKeychainContentProviderHelper.getPublicKeyringIdsByEmail("user@example.com");
         mOutputTextView.setText(Arrays.toString(test));
     }
 
     public void test2OnClick(View view) {
-        boolean test = mApgContentProviderHelper.hasPublicKeyringByEmail("user@example.com");
+        boolean test = mKeychainContentProviderHelper.hasPublicKeyringByEmail("user@example.com");
         if (test) {
             mOutputTextView.setText("true");
         } else {
diff --git a/APG-API-Demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/IntentDemoActivity.java
index b789dccb1..0fe3821b6 100644
--- a/APG-API-Demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java
+++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/IntentDemoActivity.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.demo;
+package org.sufficientlysecure.keychain.demo;
 
-import org.thialfihar.android.apg.demo.R;
-import org.thialfihar.android.apg.integration.ApgData;
-import org.thialfihar.android.apg.integration.ApgIntentHelper;
+import org.sufficientlysecure.keychain.demo.R;
+import org.sufficientlysecure.keychain.integration.KeychainData;
+import org.sufficientlysecure.keychain.integration.KeychainIntentHelper;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -33,8 +33,8 @@ public class IntentDemoActivity extends Activity {
     TextView mCiphertextTextView;
     TextView mDataTextView;
 
-    ApgIntentHelper mApgIntentHelper;
-    ApgData mApgData;
+    KeychainIntentHelper mKeychainIntentHelper;
+    KeychainData mKeychainData;
 
     /**
      * Instantiate View for this Activity
@@ -51,45 +51,46 @@ public class IntentDemoActivity extends Activity {
         mCiphertextTextView = (TextView) findViewById(R.id.intent_demo_ciphertext);
         mDataTextView = (TextView) findViewById(R.id.intent_demo_data);
 
-        mApgIntentHelper = new ApgIntentHelper(mActivity);
-        mApgData = new ApgData();
+        mKeychainIntentHelper = new KeychainIntentHelper(mActivity);
+        mKeychainData = new KeychainData();
     }
 
     public void createNewKeyOnClick(View view) {
-        // mApgIntentHelper.createNewKey();
-        mApgIntentHelper.createNewKey("test <user@example.com>", true, true);
+        // mKeychainIntentHelper.createNewKey();
+        mKeychainIntentHelper.createNewKey("test <user@example.com>", true, true);
     }
 
     public void selectSecretKeyOnClick(View view) {
-        mApgIntentHelper.selectSecretKey();
+        mKeychainIntentHelper.selectSecretKey();
     }
 
     public void selectEncryptionKeysOnClick(View view) {
-        mApgIntentHelper.selectPublicKeys("user@example.com");
+        mKeychainIntentHelper.selectPublicKeys("user@example.com");
     }
 
     public void encryptOnClick(View view) {
-        mApgIntentHelper.encrypt(mMessageTextView.getText().toString(), mApgData.getPublicKeys(),
-                mApgData.getSecretKeyId(), false);
+        mKeychainIntentHelper.encrypt(mMessageTextView.getText().toString(),
+                mKeychainData.getPublicKeys(), mKeychainData.getSecretKeyId(), false);
     }
 
     public void encryptAndReturnOnClick(View view) {
-        mApgIntentHelper.encrypt(mMessageTextView.getText().toString(), mApgData.getPublicKeys(),
-                mApgData.getSecretKeyId(), true);
+        mKeychainIntentHelper.encrypt(mMessageTextView.getText().toString(),
+                mKeychainData.getPublicKeys(), mKeychainData.getSecretKeyId(), true);
     }
 
     public void decryptOnClick(View view) {
-        mApgIntentHelper.decrypt(mCiphertextTextView.getText().toString(), false);
+        mKeychainIntentHelper.decrypt(mCiphertextTextView.getText().toString(), false);
     }
 
     public void decryptAndReturnOnClick(View view) {
-        mApgIntentHelper.decrypt(mCiphertextTextView.getText().toString(), true);
+        mKeychainIntentHelper.decrypt(mCiphertextTextView.getText().toString(), true);
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        // this updates the mApgData object to the result of the methods
-        boolean result = mApgIntentHelper.onActivityResult(requestCode, resultCode, data, mApgData);
+        // this updates the mKeychainData object to the result of the methods
+        boolean result = mKeychainIntentHelper.onActivityResult(requestCode, resultCode, data,
+                mKeychainData);
         if (result) {
             updateView();
         }
@@ -99,12 +100,12 @@ public class IntentDemoActivity extends Activity {
     }
 
     private void updateView() {
-        if (mApgData.getDecryptedData() != null) {
-            mMessageTextView.setText(mApgData.getDecryptedData());
+        if (mKeychainData.getDecryptedData() != null) {
+            mMessageTextView.setText(mKeychainData.getDecryptedData());
         }
-        if (mApgData.getEncryptedData() != null) {
-            mCiphertextTextView.setText(mApgData.getEncryptedData());
+        if (mKeychainData.getEncryptedData() != null) {
+            mCiphertextTextView.setText(mKeychainData.getEncryptedData());
         }
-        mDataTextView.setText(mApgData.toString());
+        mDataTextView.setText(mKeychainData.toString());
     }
 }
diff --git a/APG-API-Lib/.gitignore b/OpenPGP-Keychain-API-Lib/.gitignore
index 2e423e1a3..2e423e1a3 100644
--- a/APG-API-Lib/.gitignore
+++ b/OpenPGP-Keychain-API-Lib/.gitignore
diff --git a/APG-API-Lib/AndroidManifest.xml b/OpenPGP-Keychain-API-Lib/AndroidManifest.xml
index 3d99ae603..afdcaaedf 100644
--- a/APG-API-Lib/AndroidManifest.xml
+++ b/OpenPGP-Keychain-API-Lib/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.thialfihar.android.apg.integration"
+    package="org.sufficientlysecure.keychain.integration"
     android:versionCode="1"
     android:versionName="1.0" >
 
diff --git a/APG-API-Lib/build.xml b/OpenPGP-Keychain-API-Lib/build.xml
index 895594080..895594080 100644
--- a/APG-API-Lib/build.xml
+++ b/OpenPGP-Keychain-API-Lib/build.xml
diff --git a/APG-API-Lib/libs/android-support-v4.jar b/OpenPGP-Keychain-API-Lib/libs/android-support-v4.jar
index 99e063b33..99e063b33 100644
--- a/APG-API-Lib/libs/android-support-v4.jar
+++ b/OpenPGP-Keychain-API-Lib/libs/android-support-v4.jar
diff --git a/APG-API-Lib/proguard-project.txt b/OpenPGP-Keychain-API-Lib/proguard-project.txt
index f2fe1559a..f2fe1559a 100644
--- a/APG-API-Lib/proguard-project.txt
+++ b/OpenPGP-Keychain-API-Lib/proguard-project.txt
diff --git a/APG-API-Lib/project.properties b/OpenPGP-Keychain-API-Lib/project.properties
index 36f15941e..36f15941e 100644
--- a/APG-API-Lib/project.properties
+++ b/OpenPGP-Keychain-API-Lib/project.properties
diff --git a/APG-API-Lib/res/.readme b/OpenPGP-Keychain-API-Lib/res/.readme
index 97473e05c..97473e05c 100644
--- a/APG-API-Lib/res/.readme
+++ b/OpenPGP-Keychain-API-Lib/res/.readme
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/Constants.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/Constants.java
index 7745f92d3..51998a33e 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/Constants.java
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/Constants.java
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.integration;
+package org.sufficientlysecure.keychain.integration;
 
 public class Constants {
-    public static final String NAME = "apg";
+    public static final String TAG = "Keychain Integration Lib";
 
-    public static final String TAG = "APG Integration Lib";
-
-    public static final String APG_PACKAGE_NAME = "org.thialfihar.android.apg";
+    public static final String KEYCHAIN_PACKAGE_NAME = "org.sufficientlysecure.keychain";
     public static final int MIN_REQUIRED_VERSION = 50;
 
 }
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgContentProviderHelper.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainContentProviderHelper.java
index 39d79d494..bc2a4ad7a 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgContentProviderHelper.java
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainContentProviderHelper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.integration;
+package org.sufficientlysecure.keychain.integration;
 
 import android.content.ContentUris;
 import android.content.Context;
@@ -23,8 +23,8 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.widget.Toast;
 
-public class ApgContentProviderHelper {
-    public static final String AUTHORITY = Constants.APG_PACKAGE_NAME;
+public class KeychainContentProviderHelper {
+    public static final String AUTHORITY = Constants.KEYCHAIN_PACKAGE_NAME;
 
     public static final Uri CONTENT_URI_PUBLIC_KEY_RING_BY_KEY_ID = Uri.parse("content://"
             + AUTHORITY + "/key_rings/public/key_id/");
@@ -42,7 +42,7 @@ public class ApgContentProviderHelper {
 
     private Context mContext;
 
-    public ApgContentProviderHelper(Context context) {
+    public KeychainContentProviderHelper(Context context) {
         this.mContext = context;
     }
 
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgData.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainData.java
index 317f2c1c4..619909c65 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgData.java
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainData.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.integration;
+package org.sufficientlysecure.keychain.integration;
 
 import java.io.Serializable;
 import java.util.Arrays;
 
-public class ApgData implements Serializable {
+public class KeychainData implements Serializable {
     private static final long serialVersionUID = 6314045536270848410L;
     protected long[] mPublicKeyIds = null;
     protected String[] mPublicUserIds = null;
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java
index d6cdc60ab..756dd974b 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.integration;
+package org.sufficientlysecure.keychain.integration;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.widget.Toast;
 
-public class ApgIntentHelper {
+public class KeychainIntentHelper {
 
     public static final String APG_INTENT_PREFIX = "org.thialfihar.android.apg.intent.";
 
@@ -128,7 +128,7 @@ public class ApgIntentHelper {
 
     private Activity activity;
 
-    public ApgIntentHelper(Activity activity) {
+    public KeychainIntentHelper(Activity activity) {
         this.activity = activity;
     }
 
@@ -343,7 +343,7 @@ public class ApgIntentHelper {
      * @param data
      * @return handled or not
      */
-    public boolean onActivityResult(int requestCode, int resultCode, Intent data, ApgData apgData) {
+    public boolean onActivityResult(int requestCode, int resultCode, Intent data, KeychainData apgData) {
 
         switch (requestCode) {
         case CREATE_KEY:
@@ -421,13 +421,13 @@ public class ApgIntentHelper {
      *            ApgData with encryption keys and signature keys preselected
      * @return true when activity was found and executed successfully
      */
-    public boolean selectPublicKeys(String emails, ApgData apgData) {
+    public boolean selectPublicKeys(String emails, KeychainData apgData) {
         Intent intent = new Intent(ACTION_SELECT_PUBLIC_KEYS);
         intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION);
 
         long[] initialKeyIds = null;
         if (apgData == null || !apgData.hasPublicKeys()) {
-            ApgContentProviderHelper cPHelper = new ApgContentProviderHelper(activity);
+            KeychainContentProviderHelper cPHelper = new KeychainContentProviderHelper(activity);
 
             initialKeyIds = cPHelper.getPublicKeyringIdsByEmail(emails);
         } else {
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelperSupportV4.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelperSupportV4.java
index 8a64a925a..c8891287b 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelperSupportV4.java
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelperSupportV4.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.integration;
+package org.sufficientlysecure.keychain.integration;
 
 import android.content.Intent;
 import android.support.v4.app.Fragment;
@@ -22,7 +22,7 @@ import android.support.v4.app.Fragment;
 /**
  * ApgIntentHelper for the V4 Android compatibility package.
  */
-public final class ApgIntentHelperSupportV4 extends ApgIntentHelper {
+public final class KeychainIntentHelperSupportV4 extends KeychainIntentHelper {
 
     private final Fragment fragment;
 
@@ -30,7 +30,7 @@ public final class ApgIntentHelperSupportV4 extends ApgIntentHelper {
      * @param fragment
      *            Fragment to handle activity response.
      */
-    public ApgIntentHelperSupportV4(Fragment fragment) {
+    public KeychainIntentHelperSupportV4(Fragment fragment) {
         super(fragment.getActivity());
         this.fragment = fragment;
     }
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelperV30.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelperV30.java
index 4c1fbea40..5ecf0e4f7 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelperV30.java
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelperV30.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.integration;
+package org.sufficientlysecure.keychain.integration;
 
 import android.annotation.TargetApi;
 import android.app.Fragment;
@@ -25,7 +25,7 @@ import android.os.Build;
  * ApgIntentHelper for Android version 3.0 and beyond.
  */
 @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-public final class ApgIntentHelperV30 extends ApgIntentHelper {
+public final class KeychainIntentHelperV30 extends KeychainIntentHelper {
 
     private final Fragment fragment;
 
@@ -33,7 +33,7 @@ public final class ApgIntentHelperV30 extends ApgIntentHelper {
      * @param fragment
      *            Fragment to handle activity response.
      */
-    public ApgIntentHelperV30(Fragment fragment) {
+    public KeychainIntentHelperV30(Fragment fragment) {
         super(fragment.getActivity());
         this.fragment = fragment;
     }
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainServiceHelper.java
index 3f71f9647..54e1f517a 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainServiceHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.integration;
+package org.sufficientlysecure.keychain.integration;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -25,16 +25,16 @@ import android.content.Context;
 import android.net.Uri;
 import android.util.Log;
 
-public class ApgServiceHelper {
+public class KeychainServiceHelper {
 
-    private final static String BLOB_URI = "content://org.thialfihar.android.apg.provider.apgserviceblobprovider";
+    private final static String BLOB_URI = "content://org.sufficientlysecure.keychain.provider.apgserviceblobprovider";
 
     private Context context;
 
-    public ApgServiceHelper(Context context) {
+    public KeychainServiceHelper(Context context) {
         this.context = context;
     }
-    
+
     /**
      * Set up binary data to en/decrypt
      * 
@@ -67,7 +67,7 @@ public class ApgServiceHelper {
             Log.e(Constants.TAG, "... error on writing buffer", e);
         }
 
-//        mArgs.putString("BLOB", contentUri.toString());
+        // mArgs.putString("BLOB", contentUri.toString());
     }
 
     /**
@@ -90,7 +90,7 @@ public class ApgServiceHelper {
         ContentResolver cr = context.getContentResolver();
         InputStream in = null;
         try {
-//            in = cr.openInputStream(Uri.parse(mArgs.getString("BLOB")));
+            // in = cr.openInputStream(Uri.parse(mArgs.getString("BLOB")));
         } catch (Exception e) {
             Log.e(Constants.TAG, "Could not return blob in result", e);
         }
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgUtil.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainUtil.java
index a8a01f913..19d3850d7 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgUtil.java
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainUtil.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.integration;
+package org.sufficientlysecure.keychain.integration;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
@@ -23,23 +23,24 @@ import android.content.pm.PackageManager.NameNotFoundException;
 
 import android.widget.Toast;
 
-public class ApgUtil {
+public class KeychainUtil {
 
     /**
-     * Check whether APG is installed and at a high enough version.
+     * Check whether OpenPGP Keychain is installed and at a high enough version.
      * 
      * @param context
      * @return whether a suitable version of APG was found
      */
     public boolean isApgAvailable(Context context) {
         try {
-            PackageInfo pi = context.getPackageManager().getPackageInfo(Constants.APG_PACKAGE_NAME,
-                    0);
+            PackageInfo pi = context.getPackageManager().getPackageInfo(
+                    Constants.KEYCHAIN_PACKAGE_NAME, 0);
             if (pi.versionCode >= Constants.MIN_REQUIRED_VERSION) {
                 return true;
             } else {
-                Toast.makeText(context,
-                        "This APG version is not supported! Please update to a newer one!",
+                Toast.makeText(
+                        context,
+                        "This OpenPGP Keychain version is not supported! Please update to a newer one!",
                         Toast.LENGTH_LONG).show();
             }
         } catch (NameNotFoundException e) {
diff --git a/APG/src/org/thialfihar/android/apg/service/IApgApiService.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl
index 277ce6722..ac8327b8e 100644
--- a/APG/src/org/thialfihar/android/apg/service/IApgApiService.aidl
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service;
+package org.sufficientlysecure.keychain.service;
 
-import org.thialfihar.android.apg.service.handler.IApgEncryptHandler;
-import org.thialfihar.android.apg.service.handler.IApgDecryptHandler;
-import org.thialfihar.android.apg.service.handler.IApgGetDecryptionKeyIdHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainEncryptHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainDecryptHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainGetDecryptionKeyIdHandler;
 
 /**
  * All methods are oneway, which means they are asynchronous and non-blocking.
  * Results are returned into given Handler, which has to be implemented on client side.
  */
-interface IApgApiService {
+interface IKeychainApiService {
        
     /**
      * Encrypt
@@ -45,12 +45,12 @@ interface IApgApiService {
      *            7: AES-128, 8: AES-192, 9: AES-256, 4: Blowfish, 10: Twofish, 3: CAST5,
      *            6: DES, 2: Triple DES, 1: IDEA
      * @param handler
-     *            Results are returned to this IApgEncryptDecryptHandler Handler
+     *            Results are returned to this IKeychainEncryptDecryptHandler Handler
      *            to onSuccessEncrypt(in byte[] output), after successful encryption
      */
     oneway void encryptAsymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor,
             in int compression, in long[] encryptionKeyIds, in int symmetricEncryptionAlgorithm,
-            in IApgEncryptHandler handler);
+            in IKeychainEncryptHandler handler);
     
     /**
      * Same as encryptAsymmetric but using a passphrase for symmetric encryption
@@ -60,7 +60,7 @@ interface IApgApiService {
      */
     oneway void encryptSymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor,
             in int compression, in String encryptionPassphrase, in int symmetricEncryptionAlgorithm,
-            in IApgEncryptHandler handler);
+            in IKeychainEncryptHandler handler);
     
     /**
      * Encrypt and sign
@@ -90,14 +90,14 @@ interface IApgApiService {
      * @param signaturePassphrase
      *            Passphrase to unlock signature key
      * @param handler
-     *            Results are returned to this IApgEncryptDecryptHandler Handler
+     *            Results are returned to this IKeychainEncryptDecryptHandler Handler
      *            to onSuccessEncrypt(in byte[] output), after successful encryption and signing
      */
     oneway void encryptAndSignAsymmetric(in byte[] inputBytes, in String inputUri,
             in boolean useAsciiArmor, in int compression, in long[] encryptionKeyIds,
             in int symmetricEncryptionAlgorithm, in long signatureKeyId, in int signatureHashAlgorithm,
             in boolean signatureForceV3, in String signaturePassphrase,
-            in IApgEncryptHandler handler);
+            in IKeychainEncryptHandler handler);
     
     /**
      * Same as encryptAndSignAsymmetric but using a passphrase for symmetric encryption
@@ -109,7 +109,7 @@ interface IApgApiService {
             in boolean useAsciiArmor, in int compression, in String encryptionPassphrase,
             in int symmetricEncryptionAlgorithm, in long signatureKeyId, in int signatureHashAlgorithm,
             in boolean signatureForceV3, in String signaturePassphrase,
-            in IApgEncryptHandler handler);
+            in IKeychainEncryptHandler handler);
     
     /**
      * Decrypts and verifies given input bytes. If no signature is present this method
@@ -125,7 +125,7 @@ interface IApgApiService {
      *            Handler where to return results to after successful encryption
      */
     oneway void decryptAndVerifyAsymmetric(in byte[] inputBytes, in String inputUri,
-            in String keyPassphrase, in IApgDecryptHandler handler);
+            in String keyPassphrase, in IKeychainDecryptHandler handler);
     
     /**
      * Same as decryptAndVerifyAsymmetric but for symmetric decryption.
@@ -134,13 +134,13 @@ interface IApgApiService {
      *            Passphrase to decrypt
      */
     oneway void decryptAndVerifySymmetric(in byte[] inputBytes, in String inputUri,
-            in String encryptionPassphrase, in IApgDecryptHandler handler);
+            in String encryptionPassphrase, in IKeychainDecryptHandler handler);
     
     /**
      *
      */
     oneway void getDecryptionKeyId(in byte[] inputBytes, in String inputUri,
-            in IApgGetDecryptionKeyIdHandler handler);
+            in IKeychainGetDecryptionKeyIdHandler handler);
     
     
 }
\ No newline at end of file
diff --git a/APG/src/org/thialfihar/android/apg/service/IApgKeyService.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/IKeychainKeyService.aidl
index 12ecddc17..ecea2b8ff 100644
--- a/APG/src/org/thialfihar/android/apg/service/IApgKeyService.aidl
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/IKeychainKeyService.aidl
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service;
+package org.sufficientlysecure.keychain.service;
 
-import org.thialfihar.android.apg.service.handler.IApgGetKeyringsHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainGetKeyringsHandler;
 
 /**
  * All methods are oneway, which means they are asynchronous and non-blocking.
  * Results are returned into given Handler, which has to be implemented on client side.
  */
-interface IApgKeyService {
+interface IKeychainKeyService {
 
     oneway void getPublicKeyRings(in long[] masterKeyIds, in boolean asAsciiArmoredStringArray,
-            in IApgGetKeyringsHandler handler);
+            in IKeychainGetKeyringsHandler handler);
 
     oneway void getSecretKeyRings(in long[] masterKeyIds, in boolean asAsciiArmoredStringArray,
-            in IApgGetKeyringsHandler handler);
+            in IKeychainGetKeyringsHandler handler);
 }
\ No newline at end of file
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgDecryptHandler.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainDecryptHandler.aidl
index feb56bce6..31ead701d 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgDecryptHandler.aidl
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainDecryptHandler.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service.handler;
+package org.sufficientlysecure.keychain.service.handler;
 
-interface IApgDecryptHandler {
+interface IKeychainDecryptHandler {
 
     oneway void onSuccess(in byte[] outputBytes, in String outputUri, in boolean signature,
             in long signatureKeyId, in String signatureUserId, in boolean signatureSuccess,
diff --git a/APG/src/org/thialfihar/android/apg/service/handler/IApgEncryptHandler.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainEncryptHandler.aidl
index be0317715..5b21a0613 100644
--- a/APG/src/org/thialfihar/android/apg/service/handler/IApgEncryptHandler.aidl
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainEncryptHandler.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service.handler;
+package org.sufficientlysecure.keychain.service.handler;
 
-interface IApgEncryptHandler {
+interface IKeychainEncryptHandler {
     /**
      * Either output or streamUri is given. One of them is null
      *
diff --git a/APG/src/org/thialfihar/android/apg/service/handler/IApgGetDecryptionKeyIdHandler.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetDecryptionKeyIdHandler.aidl
index 020a80b99..2fff74a92 100644
--- a/APG/src/org/thialfihar/android/apg/service/handler/IApgGetDecryptionKeyIdHandler.aidl
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetDecryptionKeyIdHandler.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service.handler;
+package org.sufficientlysecure.keychain.service.handler;
 
-interface IApgGetDecryptionKeyIdHandler {
+interface IKeychainGetDecryptionKeyIdHandler {
 
     oneway void onSuccess(in long secretKeyId, in boolean symmetric);
 
diff --git a/APG/src/org/thialfihar/android/apg/service/handler/IApgGetKeyringsHandler.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetKeyringsHandler.aidl
index ffa9d0d2d..c3a7d1faf 100644
--- a/APG/src/org/thialfihar/android/apg/service/handler/IApgGetKeyringsHandler.aidl
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetKeyringsHandler.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service.handler;
+package org.sufficientlysecure.keychain.service.handler;
 
-interface IApgGetKeyringsHandler {
+interface IKeychainGetKeyringsHandler {
     /**
      * Either outputBytes or outputString is given. One of them is null
      *
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgEncryptHandler.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainSignHandler.aidl
index be0317715..69badab4c 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgEncryptHandler.aidl
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainSignHandler.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service.handler;
+package org.sufficientlysecure.keychain.service.handler;
 
-interface IApgEncryptHandler {
+interface IKeychainSignHandler {
     /**
      * Either output or streamUri is given. One of them is null
      *
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgVerifyHandler.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainVerifyHandler.aidl
index 6baaec758..aaa9a7f6a 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgVerifyHandler.aidl
+++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainVerifyHandler.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service.handler;
+package org.sufficientlysecure.keychain.service.handler;
 
-interface IApgVerifyHandler {
+interface IKeychainVerifyHandler {
 
     oneway void onSuccess(in boolean signature, in long signatureKeyId,
             in String signatureUserId, in boolean signatureSuccess, in boolean signatureUnknown);
diff --git a/APG/.gitignore b/OpenPGP-Keychain/.gitignore
index 1eb5cbeae..1eb5cbeae 100644
--- a/APG/.gitignore
+++ b/OpenPGP-Keychain/.gitignore
diff --git a/APG/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml
index 68e310423..68598df23 100644
--- a/APG/AndroidManifest.xml
+++ b/OpenPGP-Keychain/AndroidManifest.xml
@@ -16,7 +16,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.thialfihar.android.apg"
+    package="org.sufficientlysecure.keychain"
     android:installLocation="auto"
     android:versionCode="20000"
     android:versionName="2.0" >
@@ -68,26 +68,26 @@
     <uses-permission android:name="com.fsck.k9.permission.READ_ATTACHMENT" />
 
     <permission-group
-        android:name="org.thialfihar.android.apg.permission-group.APG"
+        android:name="org.sufficientlysecure.keychain.permission-group.keychain"
         android:description="@string/permission_group_description"
         android:icon="@drawable/icon"
         android:label="@string/permission_group_label" />
 
     <permission
-        android:name="org.thialfihar.android.apg.permission.ACCESS_KEYS"
+        android:name="org.sufficientlysecure.keychain.permission.ACCESS_KEYS"
         android:description="@string/permission_access_keys_description"
         android:label="@string/permission_access_keys_label"
-        android:permissionGroup="org.thialfihar.android.apg.permission-group.APG"
+        android:permissionGroup="org.sufficientlysecure.keychain.permission-group.keychain"
         android:protectionLevel="dangerous" />
     <permission
-        android:name="org.thialfihar.android.apg.permission.ACCESS_API"
+        android:name="org.sufficientlysecure.keychain.permission.ACCESS_API"
         android:description="@string/permission_access_api_description"
         android:label="@string/permission_access_api_label"
-        android:permissionGroup="org.thialfihar.android.apg.permission-group.APG"
+        android:permissionGroup="org.sufficientlysecure.keychain.permission-group.keychain"
         android:protectionLevel="dangerous" />
 
     <application
-        android:name=".ApgApplication"
+        android:name=".KeychainApplication"
         android:hardwareAccelerated="true"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
@@ -137,8 +137,8 @@
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="stateHidden" >
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.CREATE_KEY" />
-                <action android:name="org.thialfihar.android.apg.intent.EDIT_KEY" />
+                <action android:name="org.sufficientlysecure.keychain.action.CREATE_KEY" />
+                <action android:name="org.sufficientlysecure.keychain.action.EDIT_KEY" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -150,7 +150,7 @@
             android:launchMode="singleTop"
             android:uiOptions="splitActionBarWhenNarrow" >
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.SELECT_PUBLIC_KEYS" />
+                <action android:name="org.sufficientlysecure.keychain.action.SELECT_PUBLIC_KEYS" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -168,7 +168,7 @@
             android:label="@string/title_selectSignature"
             android:launchMode="singleTop" >
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.SELECT_SECRET_KEY" />
+                <action android:name="org.sufficientlysecure.keychain.action.SELECT_SECRET_KEY" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -189,10 +189,10 @@
 
             <!-- APG's own Actions -->
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT" />
-                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT_FILE" />
-                <action android:name="org.thialfihar.android.apg.intent.ENCRYPT_AND_RETURN" />
-                <action android:name="org.thialfihar.android.apg.intent.GENERATE_SIGNATURE" />
+                <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT" />
+                <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_FILE" />
+                <action android:name="org.sufficientlysecure.keychain.action.ENCRYPT_AND_RETURN" />
+                <action android:name="org.sufficientlysecure.keychain.action.GENERATE_SIGNATURE" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
@@ -216,9 +216,9 @@
 
             <!-- APG's own Actions -->
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.DECRYPT" />
-                <action android:name="org.thialfihar.android.apg.intent.DECRYPT_FILE" />
-                <action android:name="org.thialfihar.android.apg.intent.DECRYPT_AND_RETURN" />
+                <action android:name="org.sufficientlysecure.keychain.action.DECRYPT" />
+                <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_FILE" />
+                <action android:name="org.sufficientlysecure.keychain.action.DECRYPT_AND_RETURN" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
@@ -299,14 +299,14 @@
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_signKey" />
         <activity
-            android:name="org.thialfihar.android.apg.ui.ImportKeysActivity"
+            android:name=".ui.ImportKeysActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
             android:label="@string/title_importKeys"
             android:uiOptions="splitActionBarWhenNarrow" >
 
             <!-- APG's own Actions -->
             <intent-filter android:label="@string/intent_import_key" >
-                <action android:name="org.thialfihar.android.apg.intent.IMPORT" />
+                <action android:name="org.sufficientlysecure.keychain.action.IMPORT" />
 
                 <category android:name="android.intent.category.DEFAULT" />
 
@@ -314,9 +314,9 @@
             </intent-filter>
             <!-- IMPORT again without mimeType to also allow data only without filename -->
             <intent-filter android:label="@string/intent_import_key" >
-                <action android:name="org.thialfihar.android.apg.intent.IMPORT" />
-                <action android:name="org.thialfihar.android.apg.intent.IMPORT_FROM_QR_CODE" />
-                <action android:name="org.thialfihar.android.apg.intent.IMPORT_FROM_NFC" />
+                <action android:name="org.sufficientlysecure.keychain.action.IMPORT" />
+                <action android:name="org.sufficientlysecure.keychain.action.IMPORT_FROM_QR_CODE" />
+                <action android:name="org.sufficientlysecure.keychain.action.IMPORT_FROM_NFC" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -365,12 +365,12 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="org.thialfihar.android.apg.ui.ShareNfcBeamActivity"
+            android:name=".ui.ShareNfcBeamActivity"
             android:label="@string/title_shareByNfc"
             android:launchMode="singleTop"
             android:uiOptions="splitActionBarWhenNarrow" >
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.SHARE_KEYRING_WITH_NFC" />
+                <action android:name="org.sufficientlysecure.keychain.action.SHARE_KEYRING_WITH_NFC" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -381,13 +381,13 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
 
-                <data android:mimeType="application/org.thialfihar.android.apg" />
+                <data android:mimeType="application/org.sufficientlysecure.keychain" />
             </intent-filter>
         </activity>
-        <activity android:name="org.thialfihar.android.apg.ui.ShareActivity" >
+        <activity android:name=".ui.ShareActivity" >
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.intent.SHARE_KEYRING" />
-                <action android:name="org.thialfihar.android.apg.intent.SHARE_KEYRING_WITH_QR_CODE" />
+                <action android:name="org.sufficientlysecure.keychain.action.SHARE_KEYRING" />
+                <action android:name="org.sufficientlysecure.keychain.action.SHARE_KEYRING_WITH_QR_CODE" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -397,15 +397,15 @@
             android:label="@string/title_help" />
 
         <service android:name=".service.PassphraseCacheService" />
-        <service android:name=".service.ApgIntentService" />
+        <service android:name="org.sufficientlysecure.keychain.service.KeychainIntentService" />
         <service
-            android:name="org.thialfihar.android.apg.service.ApgApiService"
+            android:name="org.sufficientlysecure.keychain.service.KeychainApiService"
             android:enabled="true"
             android:exported="true"
-            android:permission="org.thialfihar.android.apg.permission.ACCESS_API"
+            android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API"
             android:process=":remoteapi" >
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.service.IApgApiService" />
+                <action android:name="org.sufficientlysecure.keychain.service.IApgApiService" />
             </intent-filter>
 
             <meta-data
@@ -413,13 +413,13 @@
                 android:value="3" />
         </service>
         <service
-            android:name="org.thialfihar.android.apg.service.ApgKeyService"
+            android:name="org.sufficientlysecure.keychain.service.KeychainKeyService"
             android:enabled="true"
             android:exported="true"
-            android:permission="org.thialfihar.android.apg.permission.ACCESS_KEYS"
+            android:permission="org.sufficientlysecure.keychain.permission.ACCESS_KEYS"
             android:process=":remotekeys" >
             <intent-filter>
-                <action android:name="org.thialfihar.android.apg.service.IApgKeyService" />
+                <action android:name="org.sufficientlysecure.keychain.service.IApgKeyService" />
             </intent-filter>
 
             <meta-data
@@ -428,20 +428,20 @@
         </service>
 
         <provider
-            android:name=".provider.ApgProviderInternal"
-            android:authorities="org.thialfihar.android.apg.internal"
+            android:name="org.sufficientlysecure.keychain.provider.KeychainProviderInternal"
+            android:authorities="org.sufficientlysecure.keychain.internal"
             android:exported="false" />
         <provider
-            android:name=".provider.ApgProviderExternal"
-            android:authorities="org.thialfihar.android.apg"
+            android:name="org.sufficientlysecure.keychain.provider.KeychainProviderExternal"
+            android:authorities="org.sufficientlysecure.keychain"
             android:exported="true"
-            android:readPermission="org.thialfihar.android.apg.permission.ACCESS_API" />
+            android:readPermission="org.sufficientlysecure.keychain.permission.ACCESS_API" />
 
         <!-- TODO: authority! -->
         <provider
-            android:name=".provider.ApgServiceBlobProvider"
-            android:authorities="org.thialfihar.android.apg.provider.apgserviceblobprovider"
-            android:permission="org.thialfihar.android.apg.permission.ACCESS_API" />
+            android:name="org.sufficientlysecure.keychain.provider.KeychainServiceBlobProvider"
+            android:authorities="org.sufficientlysecure.keychain.provider.apgserviceblobprovider"
+            android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/APG/android-libs/ActionBarSherlock/.gitignore b/OpenPGP-Keychain/android-libs/ActionBarSherlock/.gitignore
index 2e423e1a3..2e423e1a3 100644
--- a/APG/android-libs/ActionBarSherlock/.gitignore
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/.gitignore
diff --git a/APG/android-libs/ActionBarSherlock/AndroidManifest.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/AndroidManifest.xml
index 7b8a84824..7b8a84824 100644
--- a/APG/android-libs/ActionBarSherlock/AndroidManifest.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/AndroidManifest.xml
diff --git a/APG/android-libs/ActionBarSherlock/README.md b/OpenPGP-Keychain/android-libs/ActionBarSherlock/README.md
index e8a2c080e..e8a2c080e 100644
--- a/APG/android-libs/ActionBarSherlock/README.md
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/README.md
diff --git a/APG/android-libs/ActionBarSherlock/build.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/build.xml
index a10a91491..a10a91491 100644
--- a/APG/android-libs/ActionBarSherlock/build.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/build.xml
diff --git a/APG/android-libs/ActionBarSherlock/libs/android-support-v4.jar b/OpenPGP-Keychain/android-libs/ActionBarSherlock/libs/android-support-v4.jar
index 99e063b33..99e063b33 100644
--- a/APG/android-libs/ActionBarSherlock/libs/android-support-v4.jar
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/libs/android-support-v4.jar
diff --git a/APG/android-libs/ActionBarSherlock/pom.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/pom.xml
index 3b6ce40ce..3b6ce40ce 100644
--- a/APG/android-libs/ActionBarSherlock/pom.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/pom.xml
diff --git a/APG/android-libs/ActionBarSherlock/proguard-project.txt b/OpenPGP-Keychain/android-libs/ActionBarSherlock/proguard-project.txt
index f2fe1559a..f2fe1559a 100644
--- a/APG/android-libs/ActionBarSherlock/proguard-project.txt
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/proguard-project.txt
diff --git a/APG/android-libs/ActionBarSherlock/project.properties b/OpenPGP-Keychain/android-libs/ActionBarSherlock/project.properties
index 5ca7d6247..5ca7d6247 100644
--- a/APG/android-libs/ActionBarSherlock/project.properties
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/project.properties
diff --git a/APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
index ea7459aaf..ea7459aaf 100644
--- a/APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml
index 0edb33b4b..0edb33b4b 100644
--- a/APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml
index 2bcfd0b63..2bcfd0b63 100644
--- a/APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml
index 198384fed..198384fed 100644
--- a/APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
index 769463b36..769463b36 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
index 88f11dcb9..88f11dcb9 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
index 73050476e..73050476e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
index 712a551ec..712a551ec 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
index bf3b9438b..bf3b9438b 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
index 81b87b86c..81b87b86c 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
index 8fc83e22e..8fc83e22e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
index cbbaec588..cbbaec588 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
index af917e5b6..af917e5b6 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
index 2d59f354e..2d59f354e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
index 0520e5a2f..0520e5a2f 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
index e3e3f93b9..e3e3f93b9 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
index 1e3957222..1e3957222 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
index a16db853e..a16db853e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
index 0eff695d8..0eff695d8 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
index 219b170fa..219b170fa 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
index b0dc31fb3..b0dc31fb3 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
index 4bc2683b1..4bc2683b1 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
index 4af38fb70..4af38fb70 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
index d32f74cf4..d32f74cf4 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
index 66adffed6..66adffed6 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
index caeff9c33..caeff9c33 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
index 1d836f65a..1d836f65a 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
index 5818666d4..5818666d4 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
index 564fb34b4..564fb34b4 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
index ae21b760f..ae21b760f 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
index 79e56f522..79e56f522 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
index e029f210b..e029f210b 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
index 897a1c11a..897a1c11a 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
index 0c89f7140..0c89f7140 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
index d8662e3f0..d8662e3f0 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
index ed03f620f..ed03f620f 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png
index d97c342d5..d97c342d5 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png
index 33ad8d4b8..33ad8d4b8 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png
index 3edbd7408..3edbd7408 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png
index 90db01b5b..90db01b5b 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png
index 97b825e83..97b825e83 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png
index 7e1ba2adc..7e1ba2adc 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
index 2abc45809..2abc45809 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
index bb6aef1d0..bb6aef1d0 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
index 6f747c8f0..6f747c8f0 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
index 682b2fdec..682b2fdec 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png
index 4be72f108..4be72f108 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png
index 72e207bc5..72e207bc5 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png
index 66d14aec0..66d14aec0 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png
index 3481c9828..3481c9828 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
index 4ea7afa00..4ea7afa00 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
index 986ab0b97..986ab0b97 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
index 0279e17a1..0279e17a1 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
index 516f5c739..516f5c739 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
index 4ea7afa00..4ea7afa00 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
index 5654cd694..5654cd694 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
index 5654cd694..5654cd694 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
index f6fd30dcd..f6fd30dcd 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
index ca8e9a277..ca8e9a277 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
index 4d3d20857..4d3d20857 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
index 924a99d17..924a99d17 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
index 310c368e7..310c368e7 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
index 70cb7fc7e..70cb7fc7e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
index 1c269205e..1c269205e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
index 1c269205e..1c269205e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
index 40d0d1645..40d0d1645 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
index 40d0d1645..40d0d1645 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
index c8358e9ce..c8358e9ce 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
index f62f74bb3..f62f74bb3 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
index eb28ff9a5..eb28ff9a5 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
index d281adb55..d281adb55 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
index b29858609..b29858609 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
index 4215396dd..4215396dd 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
index a280eabf5..a280eabf5 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
index f8d619b4d..f8d619b4d 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
index 955a2f340..955a2f340 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
index 6c22e223a..6c22e223a 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
index 673e3bf10..673e3bf10 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
index d57df98b5..d57df98b5 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
index 6278eef47..6278eef47 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
index aadc6f87b..aadc6f87b 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png
index 70c0e7396..70c0e7396 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png
index 36e71d85d..36e71d85d 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png
index 4be4af5fa..4be4af5fa 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png
index e72193f59..e72193f59 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png
index 8f20b9d26..8f20b9d26 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png
index 04f657e1d..04f657e1d 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png
index 99309ef6d..99309ef6d 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png
index 9bde7fbdc..9bde7fbdc 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
index b2293670b..b2293670b 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
index c65f443e3..c65f443e3 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
index 0706c8af6..0706c8af6 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
index d814d02d3..d814d02d3 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
index b139c8e49..b139c8e49 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
index 738cb38d0..738cb38d0 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
index 2ed75a767..2ed75a767 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
index 743d00b6c..743d00b6c 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
index 17c1fb921..17c1fb921 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
index ddfc8e3d5..ddfc8e3d5 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
index 007a4b239..007a4b239 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
index ad6e1a4d9..ad6e1a4d9 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
index 0ad6c888b..0ad6c888b 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
index 19b50abcb..19b50abcb 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
index ad980b13f..ad980b13f 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
index 60e6c5278..60e6c5278 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
index 5461b9c00..5461b9c00 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
index 5dc6f804a..5dc6f804a 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
index a70b53c59..a70b53c59 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
index c7a9896b0..c7a9896b0 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
index 85d7aadd4..85d7aadd4 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
index f7b01e012..f7b01e012 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
index d8f1c8bd5..d8f1c8bd5 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
index 31e49894a..31e49894a 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
index 7c2cbe535..7c2cbe535 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
index 30cbdc174..30cbdc174 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
index fb3660eab..fb3660eab 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
index f18050ea5..f18050ea5 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
index df2d3d158..df2d3d158 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
index b2aa9c265..b2aa9c265 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
index a17b6a789..a17b6a789 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
index b28b3b54f..b28b3b54f 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png
index 79228baed..79228baed 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png
index 86944a879..86944a879 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png
index c0bdf0641..c0bdf0641 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png
index 15b86cbb2..15b86cbb2 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png
index bf19833f2..bf19833f2 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png
index 8518498eb..8518498eb 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
index ba704b67e..ba704b67e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
index 01d681697..01d681697 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
index 6bf21e307..6bf21e307 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
index 70fe31aa2..70fe31aa2 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png
index 4be72f108..4be72f108 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png
index f2e26f883..f2e26f883 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png
index 73c6be654..73c6be654 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png
index 71d838e73..71d838e73 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
index 3bf8e0362..3bf8e0362 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
index 986ab0b97..986ab0b97 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
index 0279e17a1..0279e17a1 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
index 7c0599e3a..7c0599e3a 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
index 3bf8e0362..3bf8e0362 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
index 6e77525d2..6e77525d2 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
index 6e77525d2..6e77525d2 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
index 92da2f0dd..92da2f0dd 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
index 42cb6463e..42cb6463e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
index 460ec46eb..460ec46eb 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
index e84adf2d4..e84adf2d4 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
index 3d946e545..3d946e545 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
index 4bb22f0e1..4bb22f0e1 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
index ab8ec6984..ab8ec6984 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
index ab8ec6984..ab8ec6984 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
index 7274274b1..7274274b1 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
index 7274274b1..7274274b1 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
index 9458668f0..9458668f0 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
index 4ce73edce..4ce73edce 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
index 29aff4d43..29aff4d43 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
index 4055f7053..4055f7053 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
index ea4ee042e..ea4ee042e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
index f74c02b9e..f74c02b9e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
index 09a2992cc..09a2992cc 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
index 6536ee633..6536ee633 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
index 202b5b72e..202b5b72e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
index 6de0ba884..6de0ba884 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
index c9972e74b..c9972e74b 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
index 587337caf..587337caf 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
index 155c4fc75..155c4fc75 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
index b1223fe3c..b1223fe3c 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png
index 081657ee7..081657ee7 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png
index 3f312b465..3f312b465 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png
index b086fae87..b086fae87 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png
index 73c336a77..73c336a77 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png
index 726e0ff42..726e0ff42 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png
index 726e0ff42..726e0ff42 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png
index 1767c169e..1767c169e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png
index 1767c169e..1767c169e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml
index 6bcbdb83f..6bcbdb83f 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
index 575334699..575334699 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
index 7e6c047d6..7e6c047d6 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
index 8155fe840..8155fe840 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
index 6cee9a128..6cee9a128 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
index fa4d76af9..fa4d76af9 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
index 9a70a5d1e..9a70a5d1e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
index 14fbee101..14fbee101 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
index 6622cbad3..6622cbad3 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
index c42729783..c42729783 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
index d0df29d8b..d0df29d8b 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
index a0d9c1b95..a0d9c1b95 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
index d36f99fec..d36f99fec 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
index 5ad475dc3..5ad475dc3 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
index 6ade5eeb3..6ade5eeb3 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
index 719b9234d..719b9234d 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
index 6da264db2..6da264db2 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
index 7ef2db75e..7ef2db75e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
index 2283b4c01..2283b4c01 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
index 6d2039e28..6d2039e28 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
index 3c909b513..3c909b513 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
index 131d1030c..131d1030c 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
index 3e7dcdfdb..3e7dcdfdb 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
index 0bd09806f..0bd09806f 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
index 43ed26d47..43ed26d47 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
index 6b3157985..6b3157985 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
index df0121bb3..df0121bb3 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
index f4970ad1c..f4970ad1c 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
index 172fc3b5e..172fc3b5e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
index 8ded62fb7..8ded62fb7 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
index 517e9f72d..517e9f72d 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
index 2e06dd01b..2e06dd01b 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
index bb19810bc..bb19810bc 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png
index e35c5f05e..e35c5f05e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png
index 7fd7aeb2a..7fd7aeb2a 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png
index 53cfbd311..53cfbd311 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png
index 1e2dcfa02..1e2dcfa02 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png
index f12eafcdc..f12eafcdc 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
index a92fb1d4a..a92fb1d4a 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
index 930ca8d95..930ca8d95 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
index 45a0f1da0..45a0f1da0 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
index 528e554ab..528e554ab 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png
index 998f91be9..998f91be9 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png
index a4cdf1c79..a4cdf1c79 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png
index c625a3602..c625a3602 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png
index c332ba08c..c332ba08c 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
index eda10e612..eda10e612 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
index e62f011d4..e62f011d4 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
index 65061c0f4..65061c0f4 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
index 690cb1eb6..690cb1eb6 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
index eda10e612..eda10e612 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
index e4b33935a..e4b33935a 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
index e4b33935a..e4b33935a 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
index 88726b691..88726b691 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
index c6a7d4d87..c6a7d4d87 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
index e2aff72f4..e2aff72f4 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
index 93066c840..93066c840 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
index 345f5d306..345f5d306 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
index c843ef3af..c843ef3af 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
index c6c3f1ec2..c6c3f1ec2 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
index c6c3f1ec2..c6c3f1ec2 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
index 205b66e2c..205b66e2c 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
index 205b66e2c..205b66e2c 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
index 19517c4b0..19517c4b0 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
index 14143c51c..14143c51c 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
index d8929fcd1..d8929fcd1 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
index 9174c4e4b..9174c4e4b 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
index 3015d3070..3015d3070 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
index 126637d11..126637d11 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
index d45c7a864..d45c7a864 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
index 29036b907..29036b907 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
index 2cb34d7f6..2cb34d7f6 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
index 82f752fdc..82f752fdc 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
index 03cfb0945..03cfb0945 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
index e4229f26b..e4229f26b 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
index e862cb121..e862cb121 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
index f1eb67323..f1eb67323 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png
index 8fdbbf3ad..8fdbbf3ad 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png
index 4e9ae43c2..4e9ae43c2 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png
index 98f4871bb..98f4871bb 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png
index 733373ed3..733373ed3 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png
index 0c6bb036d..0c6bb036d 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png
index 0c6bb036d..0c6bb036d 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png
index e5bfd8ad3..e5bfd8ad3 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png
index 1743da6b4..1743da6b4 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml
index 85c2c0212..85c2c0212 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml
index 85c2c0212..85c2c0212 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
index cab896283..cab896283 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml
index 42ba8a0df..42ba8a0df 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear.xml
index a16f4b22e..a16f4b22e 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml
index 256de80fb..256de80fb 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
index 2588a492d..2588a492d 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
index e2078c967..e2078c967 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml
index d99b7a426..d99b7a426 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml
index da5fb2e86..da5fb2e86 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
index b2ce4f0f7..b2ce4f0f7 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
index d7e31b1d1..d7e31b1d1 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml
index 08b8b12f3..08b8b12f3 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml
index ada490bf9..ada490bf9 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
index bd19140ab..bd19140ab 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml
index 321f07c8b..321f07c8b 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml
index 6d4814f86..6d4814f86 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml
index 26284187a..26284187a 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml
index 0d00c5878..0d00c5878 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml
index 4af5e22a9..4af5e22a9 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml
index b78508478..b78508478 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml
index d34e20811..d34e20811 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml
index b6d58c040..b6d58c040 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml
index 3d6acf808..3d6acf808 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml
index 05ff4eda5..05ff4eda5 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml
index f6d61e57a..f6d61e57a 100644
--- a/APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml
index 8811dad8d..8811dad8d 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
index 6c183c059..6c183c059 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml
index 61dc02527..61dc02527 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml
index 040df44ab..040df44ab 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
index c64ef141b..c64ef141b 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_home.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_home.xml
index 5c1e9ec4b..5c1e9ec4b 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_home.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_home.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab.xml
index f46f7a044..f46f7a044 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml
index 0d51220c9..0d51220c9 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml
index dd69acada..dd69acada 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml
index 13149fd63..13149fd63 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_menu_layout.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_layout.xml
index a6f8e53f8..a6f8e53f8 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_menu_layout.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_layout.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_mode_bar.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_bar.xml
index 7168dc77f..7168dc77f 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_mode_bar.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_bar.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml
index 875ec3e1b..875ec3e1b 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml
index 6a0ac9ece..6a0ac9ece 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml
index b430032a1..b430032a1 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml
index ab2b0ee6c..ab2b0ee6c 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml
index 39aca3a8d..39aca3a8d 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml
index 55ab28a24..55ab28a24 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml
index 147f36fe8..147f36fe8 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml
index ff54bbecd..ff54bbecd 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml
index d42425ad3..d42425ad3 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar.xml
index 1fb82fe9a..1fb82fe9a 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml
index 0961ef561..0961ef561 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__screen_simple.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple.xml
index 33e2dea0d..33e2dea0d 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__screen_simple.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
index f8b9fb185..f8b9fb185 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml
index e1d3dc49c..e1d3dc49c 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml
index 6ba319121..6ba319121 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml
index 8fc0eb12c..8fc0eb12c 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml
index a6c6252d2..a6c6252d2 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_item.xml
index bea740178..bea740178 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_item.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_item.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-land/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-land/abs__dimens.xml
index 502cc16a3..502cc16a3 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-land/abs__dimens.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-land/abs__dimens.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
index 3312cfa7f..3312cfa7f 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
index 502cc16a3..502cc16a3 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
index 3312cfa7f..3312cfa7f 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
index 35910333b..35910333b 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-large/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large/abs__dimens.xml
index 63b12f7f3..63b12f7f3 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-large/abs__dimens.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large/abs__dimens.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-sw600dp/abs__bools.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__bools.xml
index 7a48e1542..7a48e1542 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-sw600dp/abs__bools.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__bools.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml
index f67853817..f67853817 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-v11/abs__themes.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v11/abs__themes.xml
index 03473572c..03473572c 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-v11/abs__themes.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v11/abs__themes.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-v14/abs__styles.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__styles.xml
index 88a60dd92..88a60dd92 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-v14/abs__styles.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__styles.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-v14/abs__themes.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__themes.xml
index 5fac1ab58..5fac1ab58 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-v14/abs__themes.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__themes.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-w360dp/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w360dp/abs__dimens.xml
index 6f49d7e47..6f49d7e47 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-w360dp/abs__dimens.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w360dp/abs__dimens.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-w480dp/abs__bools.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__bools.xml
index 3eaf4aee9..3eaf4aee9 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-w480dp/abs__bools.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__bools.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-w480dp/abs__config.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__config.xml
index 88357b0a7..88357b0a7 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-w480dp/abs__config.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__config.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-w500dp/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w500dp/abs__dimens.xml
index 2fd4deea2..2fd4deea2 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-w500dp/abs__dimens.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w500dp/abs__dimens.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-w600dp/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w600dp/abs__dimens.xml
index b085952d3..b085952d3 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-w600dp/abs__dimens.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w600dp/abs__dimens.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values-xlarge/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-xlarge/abs__dimens.xml
index bfc535de1..bfc535de1 100644
--- a/APG/android-libs/ActionBarSherlock/res/values-xlarge/abs__dimens.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-xlarge/abs__dimens.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__attrs.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__attrs.xml
index 32631ca8d..32631ca8d 100644
--- a/APG/android-libs/ActionBarSherlock/res/values/abs__attrs.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__attrs.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__bools.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__bools.xml
index 0b432448d..0b432448d 100644
--- a/APG/android-libs/ActionBarSherlock/res/values/abs__bools.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__bools.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__colors.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__colors.xml
index 625c632ff..625c632ff 100644
--- a/APG/android-libs/ActionBarSherlock/res/values/abs__colors.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__colors.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__config.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__config.xml
index 4c7b5d459..4c7b5d459 100644
--- a/APG/android-libs/ActionBarSherlock/res/values/abs__config.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__config.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__dimens.xml
index 831289e07..831289e07 100644
--- a/APG/android-libs/ActionBarSherlock/res/values/abs__dimens.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__dimens.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__ids.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__ids.xml
index f9f56045b..f9f56045b 100644
--- a/APG/android-libs/ActionBarSherlock/res/values/abs__ids.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__ids.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__strings.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__strings.xml
index 06a2a2af4..06a2a2af4 100644
--- a/APG/android-libs/ActionBarSherlock/res/values/abs__strings.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__strings.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__styles.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__styles.xml
index 45a18c183..45a18c183 100644
--- a/APG/android-libs/ActionBarSherlock/res/values/abs__styles.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__styles.xml
diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__themes.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__themes.xml
index 634fa798b..634fa798b 100644
--- a/APG/android-libs/ActionBarSherlock/res/values/abs__themes.xml
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__themes.xml
diff --git a/APG/android-libs/ActionBarSherlock/src/android/support/v4/app/Watson.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/android/support/v4/app/Watson.java
index d93de4c6a..d93de4c6a 100644
--- a/APG/android-libs/ActionBarSherlock/src/android/support/v4/app/Watson.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/android/support/v4/app/Watson.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java
index ab160f836..ab160f836 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java
index 03755be2b..03755be2b 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java
index 7b4543640..7b4543640 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
index a7c856bf0..a7c856bf0 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
index 078f9b0ca..078f9b0ca 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java
index 0f24e9c85..0f24e9c85 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
index 3d092f033..3d092f033 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
index aba6d85e8..aba6d85e8 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
index 13ca3c49f..13ca3c49f 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
index bee72cb25..bee72cb25 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
index 5e69275c7..5e69275c7 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
index 0824d3848..0824d3848 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
index 8e1efe8c5..8e1efe8c5 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
index d022a2465..d022a2465 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
index 840cb3d27..840cb3d27 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
index 2caf5b4a9..2caf5b4a9 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
index 02ddff48d..02ddff48d 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
index 3231080c4..3231080c4 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
index e41019364..e41019364 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
index 6d9dafa7a..6d9dafa7a 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
index ed5e79ec6..ed5e79ec6 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
index e9215e7f8..e9215e7f8 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
index ab76fa7f6..ab76fa7f6 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
index a71e1ad3c..a71e1ad3c 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
index 21d15c02a..21d15c02a 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
index 84f7504ab..84f7504ab 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
index 0ea319244..0ea319244 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
index d8a12c688..d8a12c688 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
index 7b830b9c0..7b830b9c0 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
index 067d0494e..067d0494e 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
index 953e3e844..953e3e844 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
index 129b5aaaa..129b5aaaa 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
index 1f381013a..1f381013a 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
index b136d50f0..b136d50f0 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
index 0a87bd3f7..0a87bd3f7 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
index 7d45e81be..7d45e81be 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
index 3869d3290..3869d3290 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
index 0354ad1ad..0354ad1ad 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
index 510b97488..510b97488 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
index dcb50f362..dcb50f362 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
index 876a22c58..876a22c58 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
index 0e3b1ae0d..0e3b1ae0d 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
index 6da26f2ae..6da26f2ae 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
index ac25c3736..ac25c3736 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
index 179b8f037..179b8f037 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
index f5359fb40..f5359fb40 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
index aaf2997b7..aaf2997b7 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
index f030de310..f030de310 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
index c3f35472c..c3f35472c 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
index 323ba2d88..323ba2d88 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
index 3d4dd42fd..3d4dd42fd 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
index 6679cf386..6679cf386 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
index 7d307acb1..7d307acb1 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
index 3a4a44675..3a4a44675 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
index 1d9c68b37..1d9c68b37 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
index 9ec250f38..9ec250f38 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
index 4636de17f..4636de17f 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
index fa3698f3b..fa3698f3b 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
index cae8b8aed..cae8b8aed 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java
index 14f092c81..14f092c81 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
index ad1b4f0a8..ad1b4f0a8 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
index ce0cb3bca..ce0cb3bca 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
index c786dc5c1..c786dc5c1 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java
index a78b3f71b..a78b3f71b 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
index 4947c41df..4947c41df 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
index d13c6cea9..d13c6cea9 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
index 1c02d4aca..1c02d4aca 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
index 038d1e031..038d1e031 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
index a7185d082..a7185d082 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
index 48fb5d8b4..48fb5d8b4 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java
index 81b4cd4d2..81b4cd4d2 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java
index ae7cb1fe0..ae7cb1fe0 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
index 43281b013..43281b013 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java
index 951f4ccef..951f4ccef 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java
index 5a0f40859..5a0f40859 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java
index 7fc3aa430..7fc3aa430 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java
index 397fd1c2d..397fd1c2d 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java
index a340a4291..a340a4291 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
index d7f110fc6..d7f110fc6 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
index e19ea9e9e..e19ea9e9e 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java
index c9e7897d4..c9e7897d4 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
index 83e9f0ca9..83e9f0ca9 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java
index bd5cbd718..bd5cbd718 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java
diff --git a/APG/android-libs/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java
index 47475c574..47475c574 100644
--- a/APG/android-libs/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java
+++ b/OpenPGP-Keychain/android-libs/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java
diff --git a/APG/build.xml b/OpenPGP-Keychain/build.xml
index a10a91491..a10a91491 100644
--- a/APG/build.xml
+++ b/OpenPGP-Keychain/build.xml
diff --git a/APG/libs/barcodescanner-android-integration-supportv4.jar b/OpenPGP-Keychain/libs/barcodescanner-android-integration-supportv4.jar
index 4a7f1a39c..4a7f1a39c 100644
--- a/APG/libs/barcodescanner-android-integration-supportv4.jar
+++ b/OpenPGP-Keychain/libs/barcodescanner-android-integration-supportv4.jar
diff --git a/APG/libs/htmlcleaner-2.2.jar b/OpenPGP-Keychain/libs/htmlcleaner-2.2.jar
index cc922d06b..cc922d06b 100644
--- a/APG/libs/htmlcleaner-2.2.jar
+++ b/OpenPGP-Keychain/libs/htmlcleaner-2.2.jar
diff --git a/APG/libs/htmlspanner-0.2-fork.jar b/OpenPGP-Keychain/libs/htmlspanner-0.2-fork.jar
index 76223ccc6..76223ccc6 100644
--- a/APG/libs/htmlspanner-0.2-fork.jar
+++ b/OpenPGP-Keychain/libs/htmlspanner-0.2-fork.jar
diff --git a/APG/libs/sc-bzip2-1.47.0.2.jar b/OpenPGP-Keychain/libs/sc-bzip2-1.47.0.2.jar
index 3bc42f30e..3bc42f30e 100644
--- a/APG/libs/sc-bzip2-1.47.0.2.jar
+++ b/OpenPGP-Keychain/libs/sc-bzip2-1.47.0.2.jar
diff --git a/APG/libs/sc-light-jdk15on-1.47.0.2.jar b/OpenPGP-Keychain/libs/sc-light-jdk15on-1.47.0.2.jar
index 7cdbf856e..7cdbf856e 100644
--- a/APG/libs/sc-light-jdk15on-1.47.0.2.jar
+++ b/OpenPGP-Keychain/libs/sc-light-jdk15on-1.47.0.2.jar
diff --git a/APG/libs/scpg-jdk15on-1.47.0.2.jar b/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.2.jar
index f290334d8..f290334d8 100644
--- a/APG/libs/scpg-jdk15on-1.47.0.2.jar
+++ b/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.2.jar
diff --git a/APG/libs/scprov-jdk15on-1.47.0.2.jar b/OpenPGP-Keychain/libs/scprov-jdk15on-1.47.0.2.jar
index 221a36b29..221a36b29 100644
--- a/APG/libs/scprov-jdk15on-1.47.0.2.jar
+++ b/OpenPGP-Keychain/libs/scprov-jdk15on-1.47.0.2.jar
diff --git a/APG/pom.xml b/OpenPGP-Keychain/pom.xml
index cadb2a38d..cadb2a38d 100644
--- a/APG/pom.xml
+++ b/OpenPGP-Keychain/pom.xml
diff --git a/APG/proguard-project.txt b/OpenPGP-Keychain/proguard-project.txt
index f2fe1559a..f2fe1559a 100644
--- a/APG/proguard-project.txt
+++ b/OpenPGP-Keychain/proguard-project.txt
diff --git a/APG/project.properties b/OpenPGP-Keychain/project.properties
index 2267fbaf8..2267fbaf8 100644
--- a/APG/project.properties
+++ b/OpenPGP-Keychain/project.properties
diff --git a/APG/res/anim/push_left_in.xml b/OpenPGP-Keychain/res/anim/push_left_in.xml
index 45fb4875a..45fb4875a 100644
--- a/APG/res/anim/push_left_in.xml
+++ b/OpenPGP-Keychain/res/anim/push_left_in.xml
diff --git a/APG/res/anim/push_left_out.xml b/OpenPGP-Keychain/res/anim/push_left_out.xml
index 845679f16..845679f16 100644
--- a/APG/res/anim/push_left_out.xml
+++ b/OpenPGP-Keychain/res/anim/push_left_out.xml
diff --git a/APG/res/anim/push_right_in.xml b/OpenPGP-Keychain/res/anim/push_right_in.xml
index 09a244406..09a244406 100644
--- a/APG/res/anim/push_right_in.xml
+++ b/OpenPGP-Keychain/res/anim/push_right_in.xml
diff --git a/APG/res/anim/push_right_out.xml b/OpenPGP-Keychain/res/anim/push_right_out.xml
index e8893a69a..e8893a69a 100644
--- a/APG/res/anim/push_right_out.xml
+++ b/OpenPGP-Keychain/res/anim/push_right_out.xml
diff --git a/APG/res/drawable-finger/btn_circle.xml b/OpenPGP-Keychain/res/drawable-finger/btn_circle.xml
index 6c3c7fc1a..6c3c7fc1a 100644
--- a/APG/res/drawable-finger/btn_circle.xml
+++ b/OpenPGP-Keychain/res/drawable-finger/btn_circle.xml
diff --git a/APG/res/drawable-hdpi-finger/btn_circle_disable.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable.png
index ae063b545..ae063b545 100644
--- a/APG/res/drawable-hdpi-finger/btn_circle_disable.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable.png
diff --git a/APG/res/drawable-hdpi-finger/btn_circle_disable_focused.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable_focused.png
index 7a5d4fe4e..7a5d4fe4e 100644
--- a/APG/res/drawable-hdpi-finger/btn_circle_disable_focused.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable_focused.png
diff --git a/APG/res/drawable-hdpi-finger/btn_circle_normal.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_normal.png
index 5eda66883..5eda66883 100644
--- a/APG/res/drawable-hdpi-finger/btn_circle_normal.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_normal.png
diff --git a/APG/res/drawable-hdpi-finger/btn_circle_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_pressed.png
index 88848bac2..88848bac2 100644
--- a/APG/res/drawable-hdpi-finger/btn_circle_pressed.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_pressed.png
diff --git a/APG/res/drawable-hdpi-finger/btn_circle_selected.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_selected.png
index 74690705f..74690705f 100644
--- a/APG/res/drawable-hdpi-finger/btn_circle_selected.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_selected.png
diff --git a/APG/res/drawable-hdpi-finger/ic_btn_round_minus.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_minus.png
index 27af3faf4..27af3faf4 100644
--- a/APG/res/drawable-hdpi-finger/ic_btn_round_minus.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_minus.png
diff --git a/APG/res/drawable-hdpi-finger/ic_btn_round_plus.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_plus.png
index b24168c32..b24168c32 100644
--- a/APG/res/drawable-hdpi-finger/ic_btn_round_plus.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_plus.png
diff --git a/APG/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
index 73050476e..73050476e 100644
--- a/APG/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/APG/res/drawable-hdpi/dashboard_decrypt_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_default.png
index 0d51bcb68..0d51bcb68 100644
--- a/APG/res/drawable-hdpi/dashboard_decrypt_default.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_default.png
diff --git a/APG/res/drawable-hdpi/dashboard_decrypt_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_pressed.png
index d4cc0f8ea..d4cc0f8ea 100644
--- a/APG/res/drawable-hdpi/dashboard_decrypt_pressed.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_pressed.png
diff --git a/APG/res/drawable-hdpi/dashboard_encrypt_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_default.png
index 07617bb9d..07617bb9d 100644
--- a/APG/res/drawable-hdpi/dashboard_encrypt_default.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_default.png
diff --git a/APG/res/drawable-hdpi/dashboard_encrypt_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_pressed.png
index b8fe6e1d6..b8fe6e1d6 100644
--- a/APG/res/drawable-hdpi/dashboard_encrypt_pressed.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_pressed.png
diff --git a/APG/res/drawable-hdpi/dashboard_help_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_default.png
index 233fddffc..233fddffc 100644
--- a/APG/res/drawable-hdpi/dashboard_help_default.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_default.png
diff --git a/APG/res/drawable-hdpi/dashboard_help_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_pressed.png
index dad8694f8..dad8694f8 100644
--- a/APG/res/drawable-hdpi/dashboard_help_pressed.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_pressed.png
diff --git a/APG/res/drawable-hdpi/dashboard_manage_keys_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_default.png
index de83398c2..de83398c2 100644
--- a/APG/res/drawable-hdpi/dashboard_manage_keys_default.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_default.png
diff --git a/APG/res/drawable-hdpi/dashboard_manage_keys_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_pressed.png
index a86bc1bf9..a86bc1bf9 100644
--- a/APG/res/drawable-hdpi/dashboard_manage_keys_pressed.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_pressed.png
diff --git a/APG/res/drawable-hdpi/dashboard_my_keys_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_default.png
index f8b54961e..f8b54961e 100644
--- a/APG/res/drawable-hdpi/dashboard_my_keys_default.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_default.png
diff --git a/APG/res/drawable-hdpi/dashboard_my_keys_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_pressed.png
index 6a5c92138..6a5c92138 100644
--- a/APG/res/drawable-hdpi/dashboard_my_keys_pressed.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_pressed.png
diff --git a/APG/res/drawable-hdpi/dashboard_scan_qrcode_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_default.png
index 632a8ce62..632a8ce62 100644
--- a/APG/res/drawable-hdpi/dashboard_scan_qrcode_default.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_default.png
diff --git a/APG/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png
index 62a7a05ab..62a7a05ab 100644
--- a/APG/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png
diff --git a/APG/res/drawable-hdpi/encrypted.png b/OpenPGP-Keychain/res/drawable-hdpi/encrypted.png
index 541781cd1..541781cd1 100644
--- a/APG/res/drawable-hdpi/encrypted.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/encrypted.png
diff --git a/APG/res/drawable-hdpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png
index 209278377..209278377 100644
--- a/APG/res/drawable-hdpi/encrypted_large.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png
diff --git a/APG/res/drawable-hdpi/encrypted_small.png b/OpenPGP-Keychain/res/drawable-hdpi/encrypted_small.png
index 3ff8e9b97..3ff8e9b97 100644
--- a/APG/res/drawable-hdpi/encrypted_small.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/encrypted_small.png
diff --git a/APG/res/drawable-hdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png
index 8f39c428a..8f39c428a 100644
--- a/APG/res/drawable-hdpi/ic_menu_about.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png
diff --git a/APG/res/drawable-hdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png
index 6b98ad50c..6b98ad50c 100644
--- a/APG/res/drawable-hdpi/ic_menu_decrypt.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png
diff --git a/APG/res/drawable-hdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png
index 58689b43a..58689b43a 100644
--- a/APG/res/drawable-hdpi/ic_menu_encrypt.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png
diff --git a/APG/res/drawable-hdpi/ic_menu_filebrowser.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_filebrowser.png
index 3db304fa8..3db304fa8 100644
--- a/APG/res/drawable-hdpi/ic_menu_filebrowser.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_filebrowser.png
diff --git a/APG/res/drawable-hdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png
index b119b1999..b119b1999 100644
--- a/APG/res/drawable-hdpi/ic_menu_scan_qrcode.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png
diff --git a/APG/res/drawable-hdpi/ic_menu_search.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search.png
index 1cb61faf4..1cb61faf4 100644
--- a/APG/res/drawable-hdpi/ic_menu_search.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search.png
diff --git a/APG/res/drawable-hdpi/ic_menu_search_list.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search_list.png
index efee6dfd2..efee6dfd2 100644
--- a/APG/res/drawable-hdpi/ic_menu_search_list.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search_list.png
diff --git a/APG/res/drawable-hdpi/ic_menu_settings.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_settings.png
index 577e05587..577e05587 100644
--- a/APG/res/drawable-hdpi/ic_menu_settings.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_settings.png
diff --git a/APG/res/drawable-hdpi/ic_next.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_next.png
index d71058055..d71058055 100644
--- a/APG/res/drawable-hdpi/ic_next.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_next.png
diff --git a/APG/res/drawable-hdpi/ic_previous.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_previous.png
index d610e4667..d610e4667 100644
--- a/APG/res/drawable-hdpi/ic_previous.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/ic_previous.png
diff --git a/APG/res/drawable-hdpi/icon.png b/OpenPGP-Keychain/res/drawable-hdpi/icon.png
index 6b8cc3d73..6b8cc3d73 100644
--- a/APG/res/drawable-hdpi/icon.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/icon.png
diff --git a/APG/res/drawable-hdpi/key.png b/OpenPGP-Keychain/res/drawable-hdpi/key.png
index af4742ec0..af4742ec0 100644
--- a/APG/res/drawable-hdpi/key.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/key.png
diff --git a/APG/res/drawable-hdpi/key_large.png b/OpenPGP-Keychain/res/drawable-hdpi/key_large.png
index 590f7d5a4..590f7d5a4 100644
--- a/APG/res/drawable-hdpi/key_large.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/key_large.png
diff --git a/APG/res/drawable-hdpi/key_small.png b/OpenPGP-Keychain/res/drawable-hdpi/key_small.png
index 6966048a1..6966048a1 100644
--- a/APG/res/drawable-hdpi/key_small.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/key_small.png
diff --git a/APG/res/drawable-hdpi/overlay_error.png b/OpenPGP-Keychain/res/drawable-hdpi/overlay_error.png
index e6d7e60ba..e6d7e60ba 100644
--- a/APG/res/drawable-hdpi/overlay_error.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/overlay_error.png
diff --git a/APG/res/drawable-hdpi/overlay_ok.png b/OpenPGP-Keychain/res/drawable-hdpi/overlay_ok.png
index 0672f869d..0672f869d 100644
--- a/APG/res/drawable-hdpi/overlay_ok.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/overlay_ok.png
diff --git a/APG/res/drawable-hdpi/signed.png b/OpenPGP-Keychain/res/drawable-hdpi/signed.png
index ab9495e7b..ab9495e7b 100644
--- a/APG/res/drawable-hdpi/signed.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/signed.png
diff --git a/APG/res/drawable-hdpi/signed_large.png b/OpenPGP-Keychain/res/drawable-hdpi/signed_large.png
index c209f4167..c209f4167 100644
--- a/APG/res/drawable-hdpi/signed_large.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/signed_large.png
diff --git a/APG/res/drawable-hdpi/signed_small.png b/OpenPGP-Keychain/res/drawable-hdpi/signed_small.png
index 54c4906e8..54c4906e8 100644
--- a/APG/res/drawable-hdpi/signed_small.png
+++ b/OpenPGP-Keychain/res/drawable-hdpi/signed_small.png
diff --git a/APG/res/drawable-ldpi/encrypted.png b/OpenPGP-Keychain/res/drawable-ldpi/encrypted.png
index bcd8cfc8e..bcd8cfc8e 100644
--- a/APG/res/drawable-ldpi/encrypted.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/encrypted.png
diff --git a/APG/res/drawable-ldpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png
index 34c3d3f97..34c3d3f97 100644
--- a/APG/res/drawable-ldpi/encrypted_large.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png
diff --git a/APG/res/drawable-ldpi/encrypted_small.png b/OpenPGP-Keychain/res/drawable-ldpi/encrypted_small.png
index 5e7294a4b..5e7294a4b 100644
--- a/APG/res/drawable-ldpi/encrypted_small.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/encrypted_small.png
diff --git a/APG/res/drawable-ldpi/ic_next.png b/OpenPGP-Keychain/res/drawable-ldpi/ic_next.png
index 474ed8faa..474ed8faa 100644
--- a/APG/res/drawable-ldpi/ic_next.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/ic_next.png
diff --git a/APG/res/drawable-ldpi/ic_previous.png b/OpenPGP-Keychain/res/drawable-ldpi/ic_previous.png
index 6fd885e6b..6fd885e6b 100644
--- a/APG/res/drawable-ldpi/ic_previous.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/ic_previous.png
diff --git a/APG/res/drawable-ldpi/icon.png b/OpenPGP-Keychain/res/drawable-ldpi/icon.png
index a1adf6bcb..a1adf6bcb 100644
--- a/APG/res/drawable-ldpi/icon.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/icon.png
diff --git a/APG/res/drawable-ldpi/key.png b/OpenPGP-Keychain/res/drawable-ldpi/key.png
index c806b6041..c806b6041 100644
--- a/APG/res/drawable-ldpi/key.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/key.png
diff --git a/APG/res/drawable-ldpi/key_large.png b/OpenPGP-Keychain/res/drawable-ldpi/key_large.png
index aa499a5e1..aa499a5e1 100644
--- a/APG/res/drawable-ldpi/key_large.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/key_large.png
diff --git a/APG/res/drawable-ldpi/key_small.png b/OpenPGP-Keychain/res/drawable-ldpi/key_small.png
index 073b95029..073b95029 100644
--- a/APG/res/drawable-ldpi/key_small.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/key_small.png
diff --git a/APG/res/drawable-ldpi/overlay_error.png b/OpenPGP-Keychain/res/drawable-ldpi/overlay_error.png
index e5a88e18f..e5a88e18f 100644
--- a/APG/res/drawable-ldpi/overlay_error.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/overlay_error.png
diff --git a/APG/res/drawable-ldpi/overlay_ok.png b/OpenPGP-Keychain/res/drawable-ldpi/overlay_ok.png
index 63374d47f..63374d47f 100644
--- a/APG/res/drawable-ldpi/overlay_ok.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/overlay_ok.png
diff --git a/APG/res/drawable-ldpi/signed.png b/OpenPGP-Keychain/res/drawable-ldpi/signed.png
index 4202c3f97..4202c3f97 100644
--- a/APG/res/drawable-ldpi/signed.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/signed.png
diff --git a/APG/res/drawable-ldpi/signed_large.png b/OpenPGP-Keychain/res/drawable-ldpi/signed_large.png
index d2917644c..d2917644c 100644
--- a/APG/res/drawable-ldpi/signed_large.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/signed_large.png
diff --git a/APG/res/drawable-ldpi/signed_small.png b/OpenPGP-Keychain/res/drawable-ldpi/signed_small.png
index 19d45f8da..19d45f8da 100644
--- a/APG/res/drawable-ldpi/signed_small.png
+++ b/OpenPGP-Keychain/res/drawable-ldpi/signed_small.png
diff --git a/APG/res/drawable-mdpi-finger/btn_circle_disable.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable.png
index 33b74a66c..33b74a66c 100644
--- a/APG/res/drawable-mdpi-finger/btn_circle_disable.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable.png
diff --git a/APG/res/drawable-mdpi-finger/btn_circle_disable_focused.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable_focused.png
index 005ad8dca..005ad8dca 100644
--- a/APG/res/drawable-mdpi-finger/btn_circle_disable_focused.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable_focused.png
diff --git a/APG/res/drawable-mdpi-finger/btn_circle_normal.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_normal.png
index fc5af1c9f..fc5af1c9f 100644
--- a/APG/res/drawable-mdpi-finger/btn_circle_normal.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_normal.png
diff --git a/APG/res/drawable-mdpi-finger/btn_circle_pressed.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_pressed.png
index 8f40afdfc..8f40afdfc 100644
--- a/APG/res/drawable-mdpi-finger/btn_circle_pressed.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_pressed.png
diff --git a/APG/res/drawable-mdpi-finger/btn_circle_selected.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_selected.png
index c74fac227..c74fac227 100644
--- a/APG/res/drawable-mdpi-finger/btn_circle_selected.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_selected.png
diff --git a/APG/res/drawable-mdpi-finger/ic_btn_round_minus.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_minus.png
index 96dbb17d2..96dbb17d2 100644
--- a/APG/res/drawable-mdpi-finger/ic_btn_round_minus.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_minus.png
diff --git a/APG/res/drawable-mdpi-finger/ic_btn_round_plus.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_plus.png
index 1ec8a956a..1ec8a956a 100644
--- a/APG/res/drawable-mdpi-finger/ic_btn_round_plus.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_plus.png
diff --git a/APG/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
index 0706c8af6..0706c8af6 100644
--- a/APG/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/APG/res/drawable-mdpi/encrypted.png b/OpenPGP-Keychain/res/drawable-mdpi/encrypted.png
index 34c3d3f97..34c3d3f97 100644
--- a/APG/res/drawable-mdpi/encrypted.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/encrypted.png
diff --git a/APG/res/drawable-mdpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png
index 541781cd1..541781cd1 100644
--- a/APG/res/drawable-mdpi/encrypted_large.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png
diff --git a/APG/res/drawable-mdpi/encrypted_small.png b/OpenPGP-Keychain/res/drawable-mdpi/encrypted_small.png
index bcd8cfc8e..bcd8cfc8e 100644
--- a/APG/res/drawable-mdpi/encrypted_small.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/encrypted_small.png
diff --git a/APG/res/drawable-mdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png
index 7c57436fc..7c57436fc 100644
--- a/APG/res/drawable-mdpi/ic_menu_about.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png
diff --git a/APG/res/drawable-mdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png
index 84557bbee..84557bbee 100644
--- a/APG/res/drawable-mdpi/ic_menu_decrypt.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png
diff --git a/APG/res/drawable-mdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png
index 4ee0de4af..4ee0de4af 100644
--- a/APG/res/drawable-mdpi/ic_menu_encrypt.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png
diff --git a/APG/res/drawable-mdpi/ic_menu_filebrowser.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_filebrowser.png
index fda13f1be..fda13f1be 100644
--- a/APG/res/drawable-mdpi/ic_menu_filebrowser.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_filebrowser.png
diff --git a/APG/res/drawable-mdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png
index 08fb51400..08fb51400 100644
--- a/APG/res/drawable-mdpi/ic_menu_scan_qrcode.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png
diff --git a/APG/res/drawable-mdpi/ic_menu_search.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search.png
index 2369d03f3..2369d03f3 100644
--- a/APG/res/drawable-mdpi/ic_menu_search.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search.png
diff --git a/APG/res/drawable-mdpi/ic_menu_search_list.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search_list.png
index 9033f1ec2..9033f1ec2 100644
--- a/APG/res/drawable-mdpi/ic_menu_search_list.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search_list.png
diff --git a/APG/res/drawable-mdpi/ic_menu_settings.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_settings.png
index f32a37e44..f32a37e44 100644
--- a/APG/res/drawable-mdpi/ic_menu_settings.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_settings.png
diff --git a/APG/res/drawable-mdpi/ic_next.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_next.png
index 8271c1380..8271c1380 100644
--- a/APG/res/drawable-mdpi/ic_next.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_next.png
diff --git a/APG/res/drawable-mdpi/ic_previous.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_previous.png
index ef90db972..ef90db972 100644
--- a/APG/res/drawable-mdpi/ic_previous.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/ic_previous.png
diff --git a/APG/res/drawable-mdpi/icon.png b/OpenPGP-Keychain/res/drawable-mdpi/icon.png
index 6b10a2ad3..6b10a2ad3 100644
--- a/APG/res/drawable-mdpi/icon.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/icon.png
diff --git a/APG/res/drawable-mdpi/key.png b/OpenPGP-Keychain/res/drawable-mdpi/key.png
index aa499a5e1..aa499a5e1 100644
--- a/APG/res/drawable-mdpi/key.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/key.png
diff --git a/APG/res/drawable-mdpi/key_large.png b/OpenPGP-Keychain/res/drawable-mdpi/key_large.png
index af4742ec0..af4742ec0 100644
--- a/APG/res/drawable-mdpi/key_large.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/key_large.png
diff --git a/APG/res/drawable-mdpi/key_small.png b/OpenPGP-Keychain/res/drawable-mdpi/key_small.png
index c806b6041..c806b6041 100644
--- a/APG/res/drawable-mdpi/key_small.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/key_small.png
diff --git a/APG/res/drawable-mdpi/overlay_error.png b/OpenPGP-Keychain/res/drawable-mdpi/overlay_error.png
index 5fe017433..5fe017433 100644
--- a/APG/res/drawable-mdpi/overlay_error.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/overlay_error.png
diff --git a/APG/res/drawable-mdpi/overlay_ok.png b/OpenPGP-Keychain/res/drawable-mdpi/overlay_ok.png
index b4f332260..b4f332260 100644
--- a/APG/res/drawable-mdpi/overlay_ok.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/overlay_ok.png
diff --git a/APG/res/drawable-mdpi/signed.png b/OpenPGP-Keychain/res/drawable-mdpi/signed.png
index d2917644c..d2917644c 100644
--- a/APG/res/drawable-mdpi/signed.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/signed.png
diff --git a/APG/res/drawable-mdpi/signed_large.png b/OpenPGP-Keychain/res/drawable-mdpi/signed_large.png
index ab9495e7b..ab9495e7b 100644
--- a/APG/res/drawable-mdpi/signed_large.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/signed_large.png
diff --git a/APG/res/drawable-mdpi/signed_small.png b/OpenPGP-Keychain/res/drawable-mdpi/signed_small.png
index 4202c3f97..4202c3f97 100644
--- a/APG/res/drawable-mdpi/signed_small.png
+++ b/OpenPGP-Keychain/res/drawable-mdpi/signed_small.png
diff --git a/APG/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
index 8155fe840..8155fe840 100644
--- a/APG/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/APG/res/drawable-xhdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png
index 2641f142a..2641f142a 100644
--- a/APG/res/drawable-xhdpi/ic_menu_about.png
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png
diff --git a/APG/res/drawable-xhdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png
index 23ee08bee..23ee08bee 100644
--- a/APG/res/drawable-xhdpi/ic_menu_decrypt.png
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png
diff --git a/APG/res/drawable-xhdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png
index 04562f33a..04562f33a 100644
--- a/APG/res/drawable-xhdpi/ic_menu_encrypt.png
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png
diff --git a/APG/res/drawable-xhdpi/ic_menu_filebrowser.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_filebrowser.png
index d1324014d..d1324014d 100644
--- a/APG/res/drawable-xhdpi/ic_menu_filebrowser.png
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_filebrowser.png
diff --git a/APG/res/drawable-xhdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png
index 015e6c6a1..015e6c6a1 100644
--- a/APG/res/drawable-xhdpi/ic_menu_scan_qrcode.png
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png
diff --git a/APG/res/drawable-xhdpi/ic_menu_search.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search.png
index 578cb24eb..578cb24eb 100644
--- a/APG/res/drawable-xhdpi/ic_menu_search.png
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search.png
diff --git a/APG/res/drawable-xhdpi/ic_menu_search_list.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search_list.png
index de20fa0e7..de20fa0e7 100644
--- a/APG/res/drawable-xhdpi/ic_menu_search_list.png
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search_list.png
diff --git a/APG/res/drawable-xhdpi/ic_menu_settings.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_settings.png
index aa33c3880..aa33c3880 100644
--- a/APG/res/drawable-xhdpi/ic_menu_settings.png
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_settings.png
diff --git a/APG/res/drawable-xhdpi/icon.png b/OpenPGP-Keychain/res/drawable-xhdpi/icon.png
index 03ee31bbd..03ee31bbd 100644
--- a/APG/res/drawable-xhdpi/icon.png
+++ b/OpenPGP-Keychain/res/drawable-xhdpi/icon.png
diff --git a/APG/res/drawable/btn_circle_disable.png b/OpenPGP-Keychain/res/drawable/btn_circle_disable.png
index 33b74a66c..33b74a66c 100644
--- a/APG/res/drawable/btn_circle_disable.png
+++ b/OpenPGP-Keychain/res/drawable/btn_circle_disable.png
diff --git a/APG/res/drawable/btn_circle_disable_focused.png b/OpenPGP-Keychain/res/drawable/btn_circle_disable_focused.png
index 005ad8dca..005ad8dca 100644
--- a/APG/res/drawable/btn_circle_disable_focused.png
+++ b/OpenPGP-Keychain/res/drawable/btn_circle_disable_focused.png
diff --git a/APG/res/drawable/btn_circle_normal.png b/OpenPGP-Keychain/res/drawable/btn_circle_normal.png
index fc5af1c9f..fc5af1c9f 100644
--- a/APG/res/drawable/btn_circle_normal.png
+++ b/OpenPGP-Keychain/res/drawable/btn_circle_normal.png
diff --git a/APG/res/drawable/btn_circle_pressed.png b/OpenPGP-Keychain/res/drawable/btn_circle_pressed.png
index 8f40afdfc..8f40afdfc 100644
--- a/APG/res/drawable/btn_circle_pressed.png
+++ b/OpenPGP-Keychain/res/drawable/btn_circle_pressed.png
diff --git a/APG/res/drawable/btn_circle_selected.png b/OpenPGP-Keychain/res/drawable/btn_circle_selected.png
index c74fac227..c74fac227 100644
--- a/APG/res/drawable/btn_circle_selected.png
+++ b/OpenPGP-Keychain/res/drawable/btn_circle_selected.png
diff --git a/APG/res/drawable/dashboard_decrypt.xml b/OpenPGP-Keychain/res/drawable/dashboard_decrypt.xml
index 981e38a0b..981e38a0b 100644
--- a/APG/res/drawable/dashboard_decrypt.xml
+++ b/OpenPGP-Keychain/res/drawable/dashboard_decrypt.xml
diff --git a/APG/res/drawable/dashboard_encrypt.xml b/OpenPGP-Keychain/res/drawable/dashboard_encrypt.xml
index af812dc51..af812dc51 100644
--- a/APG/res/drawable/dashboard_encrypt.xml
+++ b/OpenPGP-Keychain/res/drawable/dashboard_encrypt.xml
diff --git a/APG/res/drawable/dashboard_help.xml b/OpenPGP-Keychain/res/drawable/dashboard_help.xml
index e121ea0d1..e121ea0d1 100644
--- a/APG/res/drawable/dashboard_help.xml
+++ b/OpenPGP-Keychain/res/drawable/dashboard_help.xml
diff --git a/APG/res/drawable/dashboard_manage_keys.xml b/OpenPGP-Keychain/res/drawable/dashboard_manage_keys.xml
index ebc519253..ebc519253 100644
--- a/APG/res/drawable/dashboard_manage_keys.xml
+++ b/OpenPGP-Keychain/res/drawable/dashboard_manage_keys.xml
diff --git a/APG/res/drawable/dashboard_my_keys.xml b/OpenPGP-Keychain/res/drawable/dashboard_my_keys.xml
index d4045db45..d4045db45 100644
--- a/APG/res/drawable/dashboard_my_keys.xml
+++ b/OpenPGP-Keychain/res/drawable/dashboard_my_keys.xml
diff --git a/APG/res/drawable/dashboard_scan_qrcode.xml b/OpenPGP-Keychain/res/drawable/dashboard_scan_qrcode.xml
index 400994820..400994820 100644
--- a/APG/res/drawable/dashboard_scan_qrcode.xml
+++ b/OpenPGP-Keychain/res/drawable/dashboard_scan_qrcode.xml
diff --git a/APG/res/drawable/encrypted.png b/OpenPGP-Keychain/res/drawable/encrypted.png
index 2783804bc..2783804bc 100644
--- a/APG/res/drawable/encrypted.png
+++ b/OpenPGP-Keychain/res/drawable/encrypted.png
diff --git a/APG/res/drawable/encrypted_large.png b/OpenPGP-Keychain/res/drawable/encrypted_large.png
index 6d7c616a4..6d7c616a4 100644
--- a/APG/res/drawable/encrypted_large.png
+++ b/OpenPGP-Keychain/res/drawable/encrypted_large.png
diff --git a/APG/res/drawable/encrypted_small.png b/OpenPGP-Keychain/res/drawable/encrypted_small.png
index 7f4ab803f..7f4ab803f 100644
--- a/APG/res/drawable/encrypted_small.png
+++ b/OpenPGP-Keychain/res/drawable/encrypted_small.png
diff --git a/APG/res/drawable/ic_btn_round_minus.png b/OpenPGP-Keychain/res/drawable/ic_btn_round_minus.png
index 96dbb17d2..96dbb17d2 100644
--- a/APG/res/drawable/ic_btn_round_minus.png
+++ b/OpenPGP-Keychain/res/drawable/ic_btn_round_minus.png
diff --git a/APG/res/drawable/ic_btn_round_plus.png b/OpenPGP-Keychain/res/drawable/ic_btn_round_plus.png
index 1ec8a956a..1ec8a956a 100644
--- a/APG/res/drawable/ic_btn_round_plus.png
+++ b/OpenPGP-Keychain/res/drawable/ic_btn_round_plus.png
diff --git a/APG/res/drawable/ic_launcher_folder.png b/OpenPGP-Keychain/res/drawable/ic_launcher_folder.png
index ed31ba580..ed31ba580 100644
--- a/APG/res/drawable/ic_launcher_folder.png
+++ b/OpenPGP-Keychain/res/drawable/ic_launcher_folder.png
diff --git a/APG/res/drawable/ic_launcher_folder_small.png b/OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png
index 5df8d60f0..5df8d60f0 100644
--- a/APG/res/drawable/ic_launcher_folder_small.png
+++ b/OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png
diff --git a/APG/res/drawable/ic_next.png b/OpenPGP-Keychain/res/drawable/ic_next.png
index 8271c1380..8271c1380 100644
--- a/APG/res/drawable/ic_next.png
+++ b/OpenPGP-Keychain/res/drawable/ic_next.png
diff --git a/APG/res/drawable/ic_previous.png b/OpenPGP-Keychain/res/drawable/ic_previous.png
index ef90db972..ef90db972 100644
--- a/APG/res/drawable/ic_previous.png
+++ b/OpenPGP-Keychain/res/drawable/ic_previous.png
diff --git a/APG/res/drawable/key.png b/OpenPGP-Keychain/res/drawable/key.png
index de7e72524..de7e72524 100644
--- a/APG/res/drawable/key.png
+++ b/OpenPGP-Keychain/res/drawable/key.png
diff --git a/APG/res/drawable/key_large.png b/OpenPGP-Keychain/res/drawable/key_large.png
index 6f18c0240..6f18c0240 100644
--- a/APG/res/drawable/key_large.png
+++ b/OpenPGP-Keychain/res/drawable/key_large.png
diff --git a/APG/res/drawable/key_small.png b/OpenPGP-Keychain/res/drawable/key_small.png
index 121803508..121803508 100644
--- a/APG/res/drawable/key_small.png
+++ b/OpenPGP-Keychain/res/drawable/key_small.png
diff --git a/APG/res/drawable/overlay_error.png b/OpenPGP-Keychain/res/drawable/overlay_error.png
index 2372de59e..2372de59e 100644
--- a/APG/res/drawable/overlay_error.png
+++ b/OpenPGP-Keychain/res/drawable/overlay_error.png
diff --git a/APG/res/drawable/overlay_ok.png b/OpenPGP-Keychain/res/drawable/overlay_ok.png
index 2f0005898..2f0005898 100644
--- a/APG/res/drawable/overlay_ok.png
+++ b/OpenPGP-Keychain/res/drawable/overlay_ok.png
diff --git a/APG/res/drawable/section_header.xml b/OpenPGP-Keychain/res/drawable/section_header.xml
index a4468484e..a4468484e 100644
--- a/APG/res/drawable/section_header.xml
+++ b/OpenPGP-Keychain/res/drawable/section_header.xml
diff --git a/APG/res/drawable/signed.png b/OpenPGP-Keychain/res/drawable/signed.png
index 490e94fbd..490e94fbd 100644
--- a/APG/res/drawable/signed.png
+++ b/OpenPGP-Keychain/res/drawable/signed.png
diff --git a/APG/res/drawable/signed_large.png b/OpenPGP-Keychain/res/drawable/signed_large.png
index 92e64dc51..92e64dc51 100644
--- a/APG/res/drawable/signed_large.png
+++ b/OpenPGP-Keychain/res/drawable/signed_large.png
diff --git a/APG/res/drawable/signed_small.png b/OpenPGP-Keychain/res/drawable/signed_small.png
index 590220281..590220281 100644
--- a/APG/res/drawable/signed_small.png
+++ b/OpenPGP-Keychain/res/drawable/signed_small.png
diff --git a/APG/res/layout/account_item.xml b/OpenPGP-Keychain/res/layout/account_item.xml
index 0aa76719a..0aa76719a 100644
--- a/APG/res/layout/account_item.xml
+++ b/OpenPGP-Keychain/res/layout/account_item.xml
diff --git a/APG/res/layout/create_key.xml b/OpenPGP-Keychain/res/layout/create_key.xml
index 235d33f88..d5bf6cf9f 100644
--- a/APG/res/layout/create_key.xml
+++ b/OpenPGP-Keychain/res/layout/create_key.xml
@@ -68,6 +68,5 @@
                 android:text="1024" />
         </TableRow>
     </TableLayout>
-    <!-- </LinearLayout> -->
 
 </ScrollView>
\ No newline at end of file
diff --git a/APG/res/layout/decrypt.xml b/OpenPGP-Keychain/res/layout/decrypt.xml
index 4901536ae..4901536ae 100644
--- a/APG/res/layout/decrypt.xml
+++ b/OpenPGP-Keychain/res/layout/decrypt.xml
diff --git a/APG/res/layout/edit_key.xml b/OpenPGP-Keychain/res/layout/edit_key.xml
index 3ab5f1c52..3ab5f1c52 100644
--- a/APG/res/layout/edit_key.xml
+++ b/OpenPGP-Keychain/res/layout/edit_key.xml
diff --git a/APG/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml
index 5556ec22e..0cb312583 100644
--- a/APG/res/layout/edit_key_key_item.xml
+++ b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<org.thialfihar.android.apg.ui.widget.KeyEditor xmlns:android="http://schemas.android.com/apk/res/android"
+<org.sufficientlysecure.keychain.ui.widget.KeyEditor xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
@@ -131,4 +131,4 @@
         android:layout_height="1dip"
         android:background="?android:attr/listDivider" />
 
-</org.thialfihar.android.apg.ui.widget.KeyEditor>
\ No newline at end of file
+</org.sufficientlysecure.keychain.ui.widget.KeyEditor>
\ No newline at end of file
diff --git a/APG/res/layout/edit_key_section.xml b/OpenPGP-Keychain/res/layout/edit_key_section.xml
index e8f788f6d..870e1b063 100644
--- a/APG/res/layout/edit_key_section.xml
+++ b/OpenPGP-Keychain/res/layout/edit_key_section.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<org.thialfihar.android.apg.ui.widget.SectionView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.sufficientlysecure.keychain.ui.widget.SectionView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
@@ -54,4 +54,4 @@
         android:orientation="vertical"
         android:paddingBottom="6dip" />
 
-</org.thialfihar.android.apg.ui.widget.SectionView>
\ No newline at end of file
+</org.sufficientlysecure.keychain.ui.widget.SectionView>
\ No newline at end of file
diff --git a/APG/res/layout/edit_key_user_id_item.xml b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml
index 26a7304e0..b2597cf31 100644
--- a/APG/res/layout/edit_key_user_id_item.xml
+++ b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<org.thialfihar.android.apg.ui.widget.UserIdEditor xmlns:android="http://schemas.android.com/apk/res/android"
+<org.sufficientlysecure.keychain.ui.widget.UserIdEditor xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical" >
@@ -104,4 +104,4 @@
         android:layout_height="1dip"
         android:background="?android:attr/listDivider" />
 
-</org.thialfihar.android.apg.ui.widget.UserIdEditor>
\ No newline at end of file
+</org.sufficientlysecure.keychain.ui.widget.UserIdEditor>
\ No newline at end of file
diff --git a/APG/res/layout/encrypt.xml b/OpenPGP-Keychain/res/layout/encrypt.xml
index 4ed9f6aff..4ed9f6aff 100644
--- a/APG/res/layout/encrypt.xml
+++ b/OpenPGP-Keychain/res/layout/encrypt.xml
diff --git a/APG/res/layout/file_dialog.xml b/OpenPGP-Keychain/res/layout/file_dialog.xml
index c95f874a5..c95f874a5 100644
--- a/APG/res/layout/file_dialog.xml
+++ b/OpenPGP-Keychain/res/layout/file_dialog.xml
diff --git a/APG/res/layout/filter_info.xml b/OpenPGP-Keychain/res/layout/filter_info.xml
index 9fef6548e..9fef6548e 100644
--- a/APG/res/layout/filter_info.xml
+++ b/OpenPGP-Keychain/res/layout/filter_info.xml
diff --git a/APG/res/layout/general.xml b/OpenPGP-Keychain/res/layout/general.xml
index c6702efac..c6702efac 100644
--- a/APG/res/layout/general.xml
+++ b/OpenPGP-Keychain/res/layout/general.xml
diff --git a/APG/res/layout/help_activity.xml b/OpenPGP-Keychain/res/layout/help_activity.xml
index fa233ac2c..fa233ac2c 100644
--- a/APG/res/layout/help_activity.xml
+++ b/OpenPGP-Keychain/res/layout/help_activity.xml
diff --git a/APG/res/layout/help_fragment_about.xml b/OpenPGP-Keychain/res/layout/help_fragment_about.xml
index 82cb0a89f..82cb0a89f 100644
--- a/APG/res/layout/help_fragment_about.xml
+++ b/OpenPGP-Keychain/res/layout/help_fragment_about.xml
diff --git a/APG/res/layout/import_keys.xml b/OpenPGP-Keychain/res/layout/import_keys.xml
index 1c2dbd0c7..1c2dbd0c7 100644
--- a/APG/res/layout/import_keys.xml
+++ b/OpenPGP-Keychain/res/layout/import_keys.xml
diff --git a/APG/res/layout/key_list_child_item.xml b/OpenPGP-Keychain/res/layout/key_list_child_item.xml
index 868989cf6..868989cf6 100644
--- a/APG/res/layout/key_list_child_item.xml
+++ b/OpenPGP-Keychain/res/layout/key_list_child_item.xml
diff --git a/APG/res/layout/key_list_group_item.xml b/OpenPGP-Keychain/res/layout/key_list_group_item.xml
index 240be54b0..240be54b0 100644
--- a/APG/res/layout/key_list_group_item.xml
+++ b/OpenPGP-Keychain/res/layout/key_list_group_item.xml
diff --git a/APG/res/layout/key_list_public_activity.xml b/OpenPGP-Keychain/res/layout/key_list_public_activity.xml
index 9872c3e1b..43aabc9af 100644
--- a/APG/res/layout/key_list_public_activity.xml
+++ b/OpenPGP-Keychain/res/layout/key_list_public_activity.xml
@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/key_list_public_fragment"
-        android:name="org.thialfihar.android.apg.ui.KeyListPublicFragment"
+        android:name="org.sufficientlysecure.keychain.ui.KeyListPublicFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1" />
diff --git a/APG/res/layout/key_list_secret_activity.xml b/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml
index c813a5d7d..d41d5ace5 100644
--- a/APG/res/layout/key_list_secret_activity.xml
+++ b/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml
@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/key_list_secret_fragment"
-        android:name="org.thialfihar.android.apg.ui.KeyListSecretFragment"
+        android:name="org.sufficientlysecure.keychain.ui.KeyListSecretFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1" />
diff --git a/APG/res/layout/key_server_editor.xml b/OpenPGP-Keychain/res/layout/key_server_editor.xml
index e4c25b316..e4c25b316 100644
--- a/APG/res/layout/key_server_editor.xml
+++ b/OpenPGP-Keychain/res/layout/key_server_editor.xml
diff --git a/APG/res/layout/key_server_export_layout.xml b/OpenPGP-Keychain/res/layout/key_server_export_layout.xml
index 257f087ee..257f087ee 100644
--- a/APG/res/layout/key_server_export_layout.xml
+++ b/OpenPGP-Keychain/res/layout/key_server_export_layout.xml
diff --git a/APG/res/layout/key_server_preference.xml b/OpenPGP-Keychain/res/layout/key_server_preference.xml
index e9b1d5a95..e9b1d5a95 100644
--- a/APG/res/layout/key_server_preference.xml
+++ b/OpenPGP-Keychain/res/layout/key_server_preference.xml
diff --git a/APG/res/layout/key_server_query_layout.xml b/OpenPGP-Keychain/res/layout/key_server_query_layout.xml
index 6af4f3644..6af4f3644 100644
--- a/APG/res/layout/key_server_query_layout.xml
+++ b/OpenPGP-Keychain/res/layout/key_server_query_layout.xml
diff --git a/APG/res/layout/key_server_query_result_item.xml b/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml
index 29c8b88f4..29c8b88f4 100644
--- a/APG/res/layout/key_server_query_result_item.xml
+++ b/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml
diff --git a/APG/res/layout/key_server_query_result_user_id.xml b/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml
index 9d3a4a1ab..9d3a4a1ab 100644
--- a/APG/res/layout/key_server_query_result_user_id.xml
+++ b/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml
diff --git a/APG/res/layout/main.xml b/OpenPGP-Keychain/res/layout/main.xml
index 66a334462..e5a76e5b5 100644
--- a/APG/res/layout/main.xml
+++ b/OpenPGP-Keychain/res/layout/main.xml
@@ -20,7 +20,7 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <org.thialfihar.android.apg.ui.widget.DashboardLayout
+    <org.sufficientlysecure.keychain.ui.widget.DashboardLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" >
 
@@ -51,8 +51,7 @@
             android:drawableTop="@drawable/dashboard_decrypt"
             android:onClick="decryptOnClick"
             android:text="@string/dashboard_decrypt" />
-        
-        
+
         <Button
             android:id="@+id/dashboard_scan_qrcode"
             style="@style/DashboardButton"
@@ -66,59 +65,6 @@
             android:drawableTop="@drawable/dashboard_help"
             android:onClick="helpOnClick"
             android:text="@string/dashboard_help" />
-    </org.thialfihar.android.apg.ui.widget.DashboardLayout>
-
-    <!-- <LinearLayout -->
-    <!-- style="@android:style/ButtonBar" -->
-    <!-- android:layout_width="fill_parent" -->
-    <!-- android:layout_height="wrap_content" -->
-    <!-- android:orientation="vertical" > -->
-
-
-    <!-- <LinearLayout -->
-    <!-- android:layout_width="fill_parent" -->
-    <!-- android:layout_height="wrap_content" -->
-    <!-- android:orientation="horizontal" > -->
-
-
-    <!-- <Button -->
-    <!-- android:id="@+id/btn_encryptFile" -->
-    <!-- android:layout_width="0dip" -->
-    <!-- android:layout_height="fill_parent" -->
-    <!-- android:layout_weight="1" -->
-    <!-- android:text="@string/btn_encryptFile" /> -->
-
-
-    <!-- <Button -->
-    <!-- android:id="@+id/btn_decryptFile" -->
-    <!-- android:layout_width="0dip" -->
-    <!-- android:layout_height="fill_parent" -->
-    <!-- android:layout_weight="1" -->
-    <!-- android:text="@string/btn_decryptFile" /> -->
-    <!-- </LinearLayout> -->
-
-
-    <!-- <LinearLayout -->
-    <!-- android:layout_width="fill_parent" -->
-    <!-- android:layout_height="wrap_content" -->
-    <!-- android:orientation="horizontal" > -->
-
-
-    <!-- <Button -->
-    <!-- android:id="@+id/btn_encryptMessage" -->
-    <!-- android:layout_width="0dip" -->
-    <!-- android:layout_height="fill_parent" -->
-    <!-- android:layout_weight="1" -->
-    <!-- android:text="@string/btn_encryptMessage" /> -->
-
-
-    <!-- <Button -->
-    <!-- android:id="@+id/btn_decryptMessage" -->
-    <!-- android:layout_width="0dip" -->
-    <!-- android:layout_height="fill_parent" -->
-    <!-- android:layout_weight="1" -->
-    <!-- android:text="@string/btn_decryptMessage" /> -->
-    <!-- </LinearLayout> -->
-    <!-- </LinearLayout> -->
+    </org.sufficientlysecure.keychain.ui.widget.DashboardLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/APG/res/layout/passphrase.xml b/OpenPGP-Keychain/res/layout/passphrase.xml
index fc9cb1710..fc9cb1710 100644
--- a/APG/res/layout/passphrase.xml
+++ b/OpenPGP-Keychain/res/layout/passphrase.xml
diff --git a/APG/res/layout/passphrase_repeat.xml b/OpenPGP-Keychain/res/layout/passphrase_repeat.xml
index 8f1d42aac..8f1d42aac 100644
--- a/APG/res/layout/passphrase_repeat.xml
+++ b/OpenPGP-Keychain/res/layout/passphrase_repeat.xml
diff --git a/APG/res/layout/select_key_item.xml b/OpenPGP-Keychain/res/layout/select_key_item.xml
index 5eed7c268..5eed7c268 100644
--- a/APG/res/layout/select_key_item.xml
+++ b/OpenPGP-Keychain/res/layout/select_key_item.xml
diff --git a/APG/res/layout/select_public_key_activity.xml b/OpenPGP-Keychain/res/layout/select_public_key_activity.xml
index 7e70d26a2..2525f2ec5 100644
--- a/APG/res/layout/select_public_key_activity.xml
+++ b/OpenPGP-Keychain/res/layout/select_public_key_activity.xml
@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/select_public_key_fragment"
-        android:name="org.thialfihar.android.apg.ui.SelectPublicKeyFragment"
+        android:name="org.sufficientlysecure.keychain.ui.SelectPublicKeyFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/APG/res/layout/select_secret_key_activity.xml b/OpenPGP-Keychain/res/layout/select_secret_key_activity.xml
index 2a645ce19..1df924775 100644
--- a/APG/res/layout/select_secret_key_activity.xml
+++ b/OpenPGP-Keychain/res/layout/select_secret_key_activity.xml
@@ -6,7 +6,7 @@
 
     <fragment
         android:id="@+id/select_secret_key_fragment"
-        android:name="org.thialfihar.android.apg.ui.SelectSecretKeyFragment"
+        android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/APG/res/layout/share_nfc_beam.xml b/OpenPGP-Keychain/res/layout/share_nfc_beam.xml
index 59e8e0844..59e8e0844 100644
--- a/APG/res/layout/share_nfc_beam.xml
+++ b/OpenPGP-Keychain/res/layout/share_nfc_beam.xml
diff --git a/APG/res/layout/sign_key_layout.xml b/OpenPGP-Keychain/res/layout/sign_key_layout.xml
index 17be03b21..17be03b21 100644
--- a/APG/res/layout/sign_key_layout.xml
+++ b/OpenPGP-Keychain/res/layout/sign_key_layout.xml
diff --git a/APG/res/menu/nfc_beam.xml b/OpenPGP-Keychain/res/menu/nfc_beam.xml
index 9cb86892d..9cb86892d 100644
--- a/APG/res/menu/nfc_beam.xml
+++ b/OpenPGP-Keychain/res/menu/nfc_beam.xml
diff --git a/APG/res/raw/help_about.html b/OpenPGP-Keychain/res/raw/help_about.html
index 1b1f0b52e..fd3a5f0e1 100644
--- a/APG/res/raw/help_about.html
+++ b/OpenPGP-Keychain/res/raw/help_about.html
@@ -5,17 +5,18 @@ And don't add newlines before or after p tags because of transifex -->
 <head>
 </head>
 <body>
-<p><a href="https://github.com/dschuermann/apg">https://github.com/dschuermann/apg</a></p>
-<p>Android Privacy Guard (APG) is an OpenPGP implementation for Android.</p>
+<p><a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p>
+<p><a href="https://github.com/dschuermann/openpgp-keychain">OpenPGP Keychain</a> is an OpenPGP implementation.
+The development began as a fork of <a href="http://code.google.com/p/android-privacy-guard">Android Privacy Guard (APG)</a></p>
 <p>License: Apache License v2</p>
 
 <h2>Developer</h2>
 <ul>
-<li>Dominik Schürmann (Developer v2.x)</li>
+<li>Dominik Schürmann (Developer OpenPGP Keychain)</li>
 <li>Oliver Runge</li>
 <li>Markus Doits</li>
 <li>Senecaso (QRCode, sign key, upload key)</li>
-<li>Thialfihar (Main developer v1.x)</li>
+<li>Thialfihar (Main developer APG v1.x)</li>
 </ul>
 
 <h2>Libraries</h2>
diff --git a/APG/res/raw/help_changelog.html b/OpenPGP-Keychain/res/raw/help_changelog.html
index fa1201cc1..fa1201cc1 100644
--- a/APG/res/raw/help_changelog.html
+++ b/OpenPGP-Keychain/res/raw/help_changelog.html
diff --git a/APG/res/raw/help_nfc_beam.html b/OpenPGP-Keychain/res/raw/help_nfc_beam.html
index aa510008c..aa510008c 100644
--- a/APG/res/raw/help_nfc_beam.html
+++ b/OpenPGP-Keychain/res/raw/help_nfc_beam.html
diff --git a/APG/res/raw/help_start.html b/OpenPGP-Keychain/res/raw/help_start.html
index db7559632..1d72eb135 100644
--- a/APG/res/raw/help_start.html
+++ b/OpenPGP-Keychain/res/raw/help_start.html
@@ -5,23 +5,23 @@ And don't add newlines before or after p tags because of transifex -->
 <head>
 </head>
 <body>
-<h2>Beta software</h2>
-<p>This is beta software. It contains many remaining bugs!</p>
+<h2>EXPERIMENTAL software</h2>
+<p>This is EXPERIMENTAL beta software. It contains many remaining bugs!</p>
 
-<h2>APG</h2>
-<p>Android Privacy Guard (APG) is a OpenPGP implementation for Android.
-<br />This is a fork based on the original APG to introduce more features and a new user interface.</p>
-
-<h2>WARNING</h2>
-<p>Be careful editing your existing keys, as they WILL be stripped of certificates right now.
-<br/><br/>Also: key cross-certification is NOT supported, so signing with those keys will get a warning when the signature is checked.</p>
+<h2>NOT working right now</h2>
+<ul>
+<li>Importing existing keys will be stripped of certificates right now</li>
+<li>Key cross-certification is NOT supported, so signing with those keys will get a warning when the signature is checked.</li>
+<li>K9 Mail integration not implemented</li>
+</ul>
+<p>If you want to contribute, fork it and do a pull request on Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p>
 
 <h2>Getting started</h2>
 <p>Install K-9 Mail for the best integration, it supports APG for PGP/INLINE and lets you directly encrypt/decrypt emails.
 <br/>It is recommended that you install OI File Manager to be able to use the browse button for file selection in APG.
-<br/>First you need some keys. Either import them via the option menus in "Manage Keys" and "My Keys" or create them in "My Keys".<p>
+<br/>First you need some keys. Either import them via the option menus in "Manage Keys" and "My Keys" or create them in "My Keys".</p>
 
-<h2>I found a bug in APG!</h2>
-<p>Please report it in the <a href="https://github.com/dschuermann/apg/issues">issue tracker of APG</a>.</p>
+<h2>I found a bug in OpenPGP Keychain!</h2>
+<p>Please report it in the <a href="https://github.com/dschuermann/apg/issues">issue tracker of OpenPGP Keychain</a>.</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/APG/res/raw/nfc_beam_share.html b/OpenPGP-Keychain/res/raw/nfc_beam_share.html
index 734e69fc5..734e69fc5 100644
--- a/APG/res/raw/nfc_beam_share.html
+++ b/OpenPGP-Keychain/res/raw/nfc_beam_share.html
diff --git a/APG/res/values/arrays.xml b/OpenPGP-Keychain/res/values/arrays.xml
index 05320c609..05320c609 100644
--- a/APG/res/values/arrays.xml
+++ b/OpenPGP-Keychain/res/values/arrays.xml
diff --git a/APG/res/values/colors.xml b/OpenPGP-Keychain/res/values/colors.xml
index d1dc6c1f4..d1dc6c1f4 100644
--- a/APG/res/values/colors.xml
+++ b/OpenPGP-Keychain/res/values/colors.xml
diff --git a/APG/res/values/static_strings.xml b/OpenPGP-Keychain/res/values/static_strings.xml
index c69cf8adf..6fe68affc 100644
--- a/APG/res/values/static_strings.xml
+++ b/OpenPGP-Keychain/res/values/static_strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name" translate="false">APG</string>
+    <string name="app_name" translate="false">OpenPGP Keychain</string>
     <string name="about_url" translate="false">https://github.com/dschuermann/apg</string>
 
 </resources>
\ No newline at end of file
diff --git a/APG/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index c7d25ad44..5e3807a3a 100644
--- a/APG/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -307,12 +307,12 @@
     <string name="progress_queryingServer">querying %s…</string>
 
     <!-- permission strings -->
-    <string name="permission_group_label">APG</string>
-    <string name="permission_group_description">Permissions to use APG</string>
+    <string name="permission_group_label">OpenPGP Keychain</string>
+    <string name="permission_group_description">Permissions to use OpenPGP</string>
     <string name="permission_access_api_label">Encrypt/Sign/Decrypt/Create keys without user interaction, Read key details of public and secret keys (The keys themselves can NOT be read.)</string>
-    <string name="permission_access_api_description">Encrypt/Sign/Decrypt/Create keys (by using Intents or Remote Service) without user interaction. Read key details of public and secret keys stored in APG, such as key ID and user IDs. The keys themselves can NOT be read.</string>
+    <string name="permission_access_api_description">Encrypt/Sign/Decrypt/Create keys (by using Intents or Remote Service) without user interaction. Read key details of public and secret keys stored in OpenPGP, such as key ID and user IDs. The keys themselves can NOT be read.</string>
     <string name="permission_access_keys_label">Import/Export actual public and secret keys</string>
-    <string name="permission_access_keys_description">Import and export actual private and public keys directly without user uinteraction.</string>
+    <string name="permission_access_keys_description">Import and export actual private and public keys directly without user interaction.</string>
 
     <!-- action strings -->
     <string name="action_encrypt">Encrypt</string>
@@ -353,9 +353,9 @@
     <string name="import_from_qr_code_finish">Finish</string>
 
     <!-- Intent labels -->
-    <string name="intent_decrypt_file">APG: Decrypt File</string>
-    <string name="intent_import_key">APG: Import Keyring</string>
-    <string name="intent_send_encrypt">APG: Encrypt</string>
-    <string name="intent_send_decrypt">APG: Decrypt</string>
+    <string name="intent_decrypt_file">OpenPGP: Decrypt File</string>
+    <string name="intent_import_key">OpenPGP: Import Keyring</string>
+    <string name="intent_send_encrypt">OpenPGP: Encrypt</string>
+    <string name="intent_send_decrypt">OpenPGP: Decrypt</string>
 
 </resources>
\ No newline at end of file
diff --git a/APG/res/values/styles.xml b/OpenPGP-Keychain/res/values/styles.xml
index ef3ff63f6..ef3ff63f6 100644
--- a/APG/res/values/styles.xml
+++ b/OpenPGP-Keychain/res/values/styles.xml
diff --git a/APG/res/xml/apg_preferences.xml b/OpenPGP-Keychain/res/xml/preferences.xml
index 778f51375..6b040f8a7 100644
--- a/APG/res/xml/apg_preferences.xml
+++ b/OpenPGP-Keychain/res/xml/preferences.xml
@@ -18,7 +18,7 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <PreferenceCategory android:title="@string/section_general" >
-        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
+        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
             android:entries="@array/pass_phrase_cache_ttl_entries"
             android:entryValues="@array/pass_phrase_cache_ttl_values"
             android:key="passPhraseCacheTtl"
@@ -31,19 +31,19 @@
             android:title="@string/label_keyServers" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/section_defaults" >
-        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
+        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
             android:key="defaultEncryptionAlgorithm"
             android:persistent="false"
             android:title="@string/label_encryptionAlgorithm" />
-        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
+        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
             android:key="defaultHashAlgorithm"
             android:persistent="false"
             android:title="@string/label_hashAlgorithm" />
-        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
+        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
             android:key="defaultMessageCompression"
             android:persistent="false"
             android:title="@string/label_messageCompression" />
-        <org.thialfihar.android.apg.ui.widget.IntegerListPreference
+        <org.sufficientlysecure.keychain.ui.widget.IntegerListPreference
             android:key="defaultFileCompression"
             android:persistent="false"
             android:title="@string/label_fileCompression" />
diff --git a/APG/res/xml/searchable_public_keys.xml b/OpenPGP-Keychain/res/xml/searchable_public_keys.xml
index e9602b121..e9602b121 100644
--- a/APG/res/xml/searchable_public_keys.xml
+++ b/OpenPGP-Keychain/res/xml/searchable_public_keys.xml
diff --git a/APG/res/xml/searchable_secret_keys.xml b/OpenPGP-Keychain/res/xml/searchable_secret_keys.xml
index a7e8873d6..a7e8873d6 100644
--- a/APG/res/xml/searchable_secret_keys.xml
+++ b/OpenPGP-Keychain/res/xml/searchable_secret_keys.xml
diff --git a/APG/src/org/thialfihar/android/apg/Constants.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java
index 8a52523d7..10e431d4b 100644
--- a/APG/src/org/thialfihar/android/apg/Constants.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Constants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg;
+package org.sufficientlysecure.keychain;
 
 import android.os.Environment;
 
@@ -24,27 +24,15 @@ public final class Constants {
 
     public static final String TAG = "APG";
 
-    public static final String PACKAGE_NAME = "org.thialfihar.android.apg";
-    
-    public static final String NFC_MIME = "application/org.thialfihar.android.apg";
+    public static final String PACKAGE_NAME = "org.sufficientlysecure.keychain";
 
+    public static final String NFC_MIME = "application/org.sufficientlysecure.keychain";
 
     public static final String PERMISSION_ACCESS_KEY_DATABASE = PACKAGE_NAME
             + ".permission.ACCESS_KEY_DATABASE";
     public static final String PERMISSION_ACCESS_API = PACKAGE_NAME + ".permission.ACCESS_API";
 
-    /*
-     * TODO:
-     * 
-     * this would require patching K9Mail
-     * 
-     * better naming scheme would be:
-     * 
-     * - x.action.DECRYPT (with action as preferred in Android)
-     * 
-     * - even better and shorter (without .android.): org.apg.action.DECRYPT
-     */
-    public static final String INTENT_PREFIX = PACKAGE_NAME + ".intent.";
+    public static final String INTENT_PREFIX = PACKAGE_NAME + ".action.";
 
     public static final class path {
         public static final String APP_DIR = Environment.getExternalStorageDirectory() + "/APG";
diff --git a/APG/src/org/thialfihar/android/apg/Id.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Id.java
index db283da37..382f144d7 100644
--- a/APG/src/org/thialfihar/android/apg/Id.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/Id.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg;
+package org.sufficientlysecure.keychain;
 
 import org.spongycastle.bcpg.CompressionAlgorithmTags;
 
diff --git a/APG/src/org/thialfihar/android/apg/ApgApplication.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/KeychainApplication.java
index f89375079..dbe9f6394 100644
--- a/APG/src/org/thialfihar/android/apg/ApgApplication.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg;
+package org.sufficientlysecure.keychain;
 
 import java.io.File;
 import java.security.Security;
@@ -24,7 +24,7 @@ import org.spongycastle.jce.provider.BouncyCastleProvider;
 import android.app.Application;
 import android.os.Environment;
 
-public class ApgApplication extends Application {
+public class KeychainApplication extends Application {
 
     static {
         // Define Java Security Provider to be Bouncy Castle
diff --git a/APG/src/org/thialfihar/android/apg/compatibility/ClipboardReflection.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
index 7894d48ab..5ea5bd09a 100644
--- a/APG/src/org/thialfihar/android/apg/compatibility/ClipboardReflection.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.compatibility;
+package org.sufficientlysecure.keychain.compatibility;
 
 import java.lang.reflect.Method;
 
 import android.content.Context;
-import org.thialfihar.android.apg.util.Log;
+
+import org.sufficientlysecure.keychain.util.Log;
 
 public class ClipboardReflection {
 
diff --git a/APG/src/org/thialfihar/android/apg/compatibility/DialogFragmentWorkaround.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java
index 6f03ad30a..8c0a26a28 100644
--- a/APG/src/org/thialfihar/android/apg/compatibility/DialogFragmentWorkaround.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.compatibility;
+package org.sufficientlysecure.keychain.compatibility;
 
 import android.os.Build;
 import android.os.Handler;
diff --git a/APG/src/org/thialfihar/android/apg/compatibility/ListFragmentWorkaround.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
index b295aa3ba..a1f27ca20 100644
--- a/APG/src/org/thialfihar/android/apg/compatibility/ListFragmentWorkaround.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.compatibility;
+package org.sufficientlysecure.keychain.compatibility;
 
 import android.view.View;
 import android.widget.ListView;
diff --git a/APG/src/org/thialfihar/android/apg/helper/FileHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/FileHelper.java
index c5fb2a139..f16fd874b 100644
--- a/APG/src/org/thialfihar/android/apg/helper/FileHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/FileHelper.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.helper;
+package org.sufficientlysecure.keychain.helper;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.util.Log;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
diff --git a/APG/src/org/thialfihar/android/apg/helper/OtherHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java
index 005f7cf29..6a71ca0ba 100644
--- a/APG/src/org/thialfihar/android/apg/helper/OtherHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/OtherHelper.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.helper;
+package org.sufficientlysecure.keychain.helper;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
diff --git a/APG/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpConversionHelper.java
index 35bbac08e..3be4c595c 100644
--- a/APG/src/org/thialfihar/android/apg/helper/PGPConversionHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpConversionHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.helper;
+package org.sufficientlysecure.keychain.helper;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -27,11 +27,11 @@ import org.spongycastle.openpgp.PGPObjectFactory;
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.spongycastle.openpgp.PGPUtil;
-import org.thialfihar.android.apg.Constants;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.util.Log;
 
-import org.thialfihar.android.apg.util.Log;
 
-public class PGPConversionHelper {
+public class PgpConversionHelper {
 
     /**
      * Convert from byte[] to PGPKeyRing
diff --git a/APG/src/org/thialfihar/android/apg/helper/PGPHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java
index f7bc62d4f..f59bd58de 100644
--- a/APG/src/org/thialfihar/android/apg/helper/PGPHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpHelper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.helper;
+package org.sufficientlysecure.keychain.helper;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -30,15 +30,15 @@ import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.spongycastle.openpgp.PGPSignature;
 import org.spongycastle.openpgp.PGPSignatureSubpacketVector;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.util.IterableIterator;
-import org.thialfihar.android.apg.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.util.IterableIterator;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import android.content.Context;
 
-public class PGPHelper {
+public class PgpHelper {
 
     public static Date getCreationDate(PGPPublicKey key) {
         return key.getCreationTime();
diff --git a/APG/src/org/thialfihar/android/apg/helper/PGPMain.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java
index 5afc935ec..26842e4dc 100644
--- a/APG/src/org/thialfihar/android/apg/helper/PGPMain.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.helper;
+package org.sufficientlysecure.keychain.helper;
 
 import org.spongycastle.bcpg.ArmoredInputStream;
 import org.spongycastle.bcpg.ArmoredOutputStream;
@@ -73,24 +73,24 @@ import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder;
 import org.spongycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder;
 import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder;
 import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator;
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.service.ApgIntentService;
-import org.thialfihar.android.apg.util.HkpKeyServer;
-import org.thialfihar.android.apg.util.InputData;
-import org.thialfihar.android.apg.util.PositionAwareInputStream;
-import org.thialfihar.android.apg.util.Primes;
-import org.thialfihar.android.apg.util.ProgressDialogUpdater;
-import org.thialfihar.android.apg.util.KeyServer.AddKeyException;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.util.HkpKeyServer;
+import org.sufficientlysecure.keychain.util.InputData;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.util.PositionAwareInputStream;
+import org.sufficientlysecure.keychain.util.Primes;
+import org.sufficientlysecure.keychain.util.ProgressDialogUpdater;
+import org.sufficientlysecure.keychain.util.KeyServer.AddKeyException;
+import org.sufficientlysecure.keychain.R;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 import android.os.Environment;
-import org.thialfihar.android.apg.util.Log;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
@@ -123,7 +123,7 @@ import java.util.regex.Pattern;
  * - Separate this file into different helpers
  * 
  */
-public class PGPMain {
+public class PgpMain {
 
     static {
         // register spongy castle provider
@@ -157,10 +157,10 @@ public class PGPMain {
 
     private static String mEditPassPhrase = null;
 
-    public static class ApgGeneralException extends Exception {
+    public static class PgpGeneralException extends Exception {
         static final long serialVersionUID = 0xf812773342L;
 
-        public ApgGeneralException(String message) {
+        public PgpGeneralException(String message) {
             super(message);
         }
     }
@@ -209,16 +209,16 @@ public class PGPMain {
      * @throws NoSuchAlgorithmException
      * @throws PGPException
      * @throws NoSuchProviderException
-     * @throws ApgGeneralException
+     * @throws PgpGeneralException
      * @throws InvalidAlgorithmParameterException
      */
     public static PGPSecretKeyRing createKey(Context context, int algorithmChoice, int keySize,
             String passPhrase, PGPSecretKey masterSecretKey) throws NoSuchAlgorithmException,
-            PGPException, NoSuchProviderException, ApgGeneralException,
+            PGPException, NoSuchProviderException, PgpGeneralException,
             InvalidAlgorithmParameterException {
 
         if (keySize < 512) {
-            throw new ApgGeneralException(context.getString(R.string.error_keySizeMinimum512bit));
+            throw new PgpGeneralException(context.getString(R.string.error_keySizeMinimum512bit));
         }
 
         if (passPhrase == null) {
@@ -238,7 +238,7 @@ public class PGPMain {
 
         case Id.choice.algorithm.elgamal: {
             if (masterSecretKey == null) {
-                throw new ApgGeneralException(
+                throw new PgpGeneralException(
                         context.getString(R.string.error_masterKeyMustNotBeElGamal));
             }
             keyGen = KeyPairGenerator.getInstance("ElGamal", BOUNCY_CASTLE_PROVIDER_NAME);
@@ -261,7 +261,7 @@ public class PGPMain {
         }
 
         default: {
-            throw new ApgGeneralException(context.getString(R.string.error_unknownAlgorithmChoice));
+            throw new PgpGeneralException(context.getString(R.string.error_unknownAlgorithmChoice));
         }
         }
 
@@ -311,7 +311,7 @@ public class PGPMain {
     public static void buildSecretKey(Context context, ArrayList<String> userIds,
             ArrayList<PGPSecretKey> keys, ArrayList<Integer> keysUsages, long masterKeyId,
             String oldPassPhrase, String newPassPhrase, ProgressDialogUpdater progress)
-            throws ApgGeneralException, NoSuchProviderException, PGPException,
+            throws PgpGeneralException, NoSuchProviderException, PGPException,
             NoSuchAlgorithmException, SignatureException, IOException {
 
         Log.d(Constants.TAG, "userIds: " + userIds.toString());
@@ -547,14 +547,14 @@ public class PGPMain {
     }
 
     public static Bundle importKeyRings(Context context, InputData data,
-            ProgressDialogUpdater progress) throws ApgGeneralException, FileNotFoundException,
+            ProgressDialogUpdater progress) throws PgpGeneralException, FileNotFoundException,
             PGPException, IOException {
         Bundle returnData = new Bundle();
 
         updateProgress(progress, R.string.progress_importingSecretKeys, 0, 100);
 
         if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-            throw new ApgGeneralException(context.getString(R.string.error_externalStorageNotReady));
+            throw new PgpGeneralException(context.getString(R.string.error_externalStorageNotReady));
         }
 
         PositionAwareInputStream progressIn = new PositionAwareInputStream(data.getInputStream());
@@ -586,7 +586,7 @@ public class PGPMain {
                         status = storeKeyRingInCache(context, keyring);
 
                         if (status == Id.return_value.error) {
-                            throw new ApgGeneralException(
+                            throw new PgpGeneralException(
                                     context.getString(R.string.error_savingKeys));
                         }
 
@@ -610,9 +610,9 @@ public class PGPMain {
             Log.e(Constants.TAG, "Exception on parsing key file!", e);
         }
 
-        returnData.putInt(ApgIntentService.RESULT_IMPORT_ADDED, newKeys);
-        returnData.putInt(ApgIntentService.RESULT_IMPORT_UPDATED, oldKeys);
-        returnData.putInt(ApgIntentService.RESULT_IMPORT_BAD, badKeys);
+        returnData.putInt(KeychainIntentService.RESULT_IMPORT_ADDED, newKeys);
+        returnData.putInt(KeychainIntentService.RESULT_IMPORT_UPDATED, oldKeys);
+        returnData.putInt(KeychainIntentService.RESULT_IMPORT_BAD, badKeys);
 
         updateProgress(progress, R.string.progress_done, 100, 100);
 
@@ -621,7 +621,7 @@ public class PGPMain {
 
     public static Bundle exportKeyRings(Context context, ArrayList<Long> keyRingMasterKeyIds,
             int keyType, OutputStream outStream, ProgressDialogUpdater progress)
-            throws ApgGeneralException, FileNotFoundException, PGPException, IOException {
+            throws PgpGeneralException, FileNotFoundException, PGPException, IOException {
         Bundle returnData = new Bundle();
 
         if (keyRingMasterKeyIds.size() == 1) {
@@ -631,7 +631,7 @@ public class PGPMain {
         }
 
         if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-            throw new ApgGeneralException(context.getString(R.string.error_externalStorageNotReady));
+            throw new PgpGeneralException(context.getString(R.string.error_externalStorageNotReady));
         }
 
         // export public keyrings...
@@ -675,7 +675,7 @@ public class PGPMain {
             outSec.close();
         }
 
-        returnData.putInt(ApgIntentService.RESULT_EXPORT, numKeys);
+        returnData.putInt(KeychainIntentService.RESULT_EXPORT, numKeys);
 
         updateProgress(progress, R.string.progress_done, 100, 100);
 
@@ -699,7 +699,7 @@ public class PGPMain {
      * @param signatureForceV3
      * @param signaturePassphrase
      * @throws IOException
-     * @throws ApgGeneralException
+     * @throws PgpGeneralException
      * @throws PGPException
      * @throws NoSuchProviderException
      * @throws NoSuchAlgorithmException
@@ -709,7 +709,7 @@ public class PGPMain {
             InputData data, OutputStream outStream, boolean useAsciiArmor, int compression,
             long encryptionKeyIds[], String encryptionPassphrase, int symmetricEncryptionAlgorithm,
             long signatureKeyId, int signatureHashAlgorithm, boolean signatureForceV3,
-            String signaturePassphrase) throws IOException, ApgGeneralException, PGPException,
+            String signaturePassphrase) throws IOException, PgpGeneralException, PGPException,
             NoSuchProviderException, NoSuchAlgorithmException, SignatureException {
 
         if (encryptionKeyIds == null) {
@@ -731,19 +731,19 @@ public class PGPMain {
         PGPPrivateKey signaturePrivateKey = null;
 
         if (encryptionKeyIds.length == 0 && encryptionPassphrase == null) {
-            throw new ApgGeneralException(
+            throw new PgpGeneralException(
                     context.getString(R.string.error_noEncryptionKeysOrPassPhrase));
         }
 
         if (signatureKeyId != Id.key.none) {
             signingKeyRing = ProviderHelper.getPGPSecretKeyRingByKeyId(context, signatureKeyId);
-            signingKey = PGPHelper.getSigningKey(context, signatureKeyId);
+            signingKey = PgpHelper.getSigningKey(context, signatureKeyId);
             if (signingKey == null) {
-                throw new ApgGeneralException(context.getString(R.string.error_signatureFailed));
+                throw new PgpGeneralException(context.getString(R.string.error_signatureFailed));
             }
 
             if (signaturePassphrase == null) {
-                throw new ApgGeneralException(
+                throw new PgpGeneralException(
                         context.getString(R.string.error_noSignaturePassPhrase));
             }
 
@@ -753,7 +753,7 @@ public class PGPMain {
                     BOUNCY_CASTLE_PROVIDER_NAME).build(signaturePassphrase.toCharArray());
             signaturePrivateKey = signingKey.extractPrivateKey(keyDecryptor);
             if (signaturePrivateKey == null) {
-                throw new ApgGeneralException(
+                throw new PgpGeneralException(
                         context.getString(R.string.error_couldNotExtractPrivateKey));
             }
         }
@@ -776,7 +776,7 @@ public class PGPMain {
         } else {
             // Asymmetric encryption
             for (int i = 0; i < encryptionKeyIds.length; ++i) {
-                PGPPublicKey key = PGPHelper.getEncryptPublicKey(context, encryptionKeyIds[i]);
+                PGPPublicKey key = PgpHelper.getEncryptPublicKey(context, encryptionKeyIds[i]);
                 if (key != null) {
 
                     JcePublicKeyKeyEncryptionMethodGenerator pubKeyEncryptionGenerator = new JcePublicKeyKeyEncryptionMethodGenerator(
@@ -805,7 +805,7 @@ public class PGPMain {
                 signatureGenerator = new PGPSignatureGenerator(contentSignerBuilder);
                 signatureGenerator.init(PGPSignature.BINARY_DOCUMENT, signaturePrivateKey);
 
-                String userId = PGPHelper.getMainUserId(PGPHelper.getMasterKey(signingKeyRing));
+                String userId = PgpHelper.getMainUserId(PgpHelper.getMasterKey(signingKeyRing));
                 PGPSignatureSubpacketGenerator spGen = new PGPSignatureSubpacketGenerator();
                 spGen.setSignerUserID(false, userId);
                 signatureGenerator.setHashedSubpackets(spGen.generate());
@@ -876,7 +876,7 @@ public class PGPMain {
 
     public static void signText(Context context, ProgressDialogUpdater progress, InputData data,
             OutputStream outStream, long signatureKeyId, String signaturePassphrase,
-            int signatureHashAlgorithm, boolean forceV3Signature) throws ApgGeneralException,
+            int signatureHashAlgorithm, boolean forceV3Signature) throws PgpGeneralException,
             PGPException, IOException, NoSuchAlgorithmException, SignatureException {
 
         ArmoredOutputStream armorOut = new ArmoredOutputStream(outStream);
@@ -888,26 +888,26 @@ public class PGPMain {
 
         if (signatureKeyId == 0) {
             armorOut.close();
-            throw new ApgGeneralException(context.getString(R.string.error_noSignatureKey));
+            throw new PgpGeneralException(context.getString(R.string.error_noSignatureKey));
         }
 
         signingKeyRing = ProviderHelper.getPGPSecretKeyRingByKeyId(context, signatureKeyId);
-        signingKey = PGPHelper.getSigningKey(context, signatureKeyId);
+        signingKey = PgpHelper.getSigningKey(context, signatureKeyId);
         if (signingKey == null) {
             armorOut.close();
-            throw new ApgGeneralException(context.getString(R.string.error_signatureFailed));
+            throw new PgpGeneralException(context.getString(R.string.error_signatureFailed));
         }
 
         if (signaturePassphrase == null) {
             armorOut.close();
-            throw new ApgGeneralException(context.getString(R.string.error_noSignaturePassPhrase));
+            throw new PgpGeneralException(context.getString(R.string.error_noSignaturePassPhrase));
         }
         PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider(
                 BOUNCY_CASTLE_PROVIDER_NAME).build(signaturePassphrase.toCharArray());
         signaturePrivateKey = signingKey.extractPrivateKey(keyDecryptor);
         if (signaturePrivateKey == null) {
             armorOut.close();
-            throw new ApgGeneralException(
+            throw new PgpGeneralException(
                     context.getString(R.string.error_couldNotExtractPrivateKey));
         }
         updateProgress(progress, R.string.progress_preparingStreams, 0, 100);
@@ -930,7 +930,7 @@ public class PGPMain {
             signatureGenerator.init(PGPSignature.CANONICAL_TEXT_DOCUMENT, signaturePrivateKey);
 
             PGPSignatureSubpacketGenerator spGen = new PGPSignatureSubpacketGenerator();
-            String userId = PGPHelper.getMainUserId(PGPHelper.getMasterKey(signingKeyRing));
+            String userId = PgpHelper.getMainUserId(PgpHelper.getMasterKey(signingKeyRing));
             spGen.setSignerUserID(false, userId);
             signatureGenerator.setHashedSubpackets(spGen.generate());
         }
@@ -984,7 +984,7 @@ public class PGPMain {
     public static void generateSignature(Context context, ProgressDialogUpdater progress,
             InputData data, OutputStream outStream, boolean armored, boolean binary,
             long signatureKeyId, String signaturePassPhrase, int hashAlgorithm,
-            boolean forceV3Signature) throws ApgGeneralException, PGPException, IOException,
+            boolean forceV3Signature) throws PgpGeneralException, PGPException, IOException,
             NoSuchAlgorithmException, SignatureException {
 
         OutputStream out = null;
@@ -1004,24 +1004,24 @@ public class PGPMain {
         PGPPrivateKey signaturePrivateKey = null;
 
         if (signatureKeyId == 0) {
-            throw new ApgGeneralException(context.getString(R.string.error_noSignatureKey));
+            throw new PgpGeneralException(context.getString(R.string.error_noSignatureKey));
         }
 
         signingKeyRing = ProviderHelper.getPGPSecretKeyRingByKeyId(context, signatureKeyId);
-        signingKey = PGPHelper.getSigningKey(context, signatureKeyId);
+        signingKey = PgpHelper.getSigningKey(context, signatureKeyId);
         if (signingKey == null) {
-            throw new ApgGeneralException(context.getString(R.string.error_signatureFailed));
+            throw new PgpGeneralException(context.getString(R.string.error_signatureFailed));
         }
 
         if (signaturePassPhrase == null) {
-            throw new ApgGeneralException(context.getString(R.string.error_noSignaturePassPhrase));
+            throw new PgpGeneralException(context.getString(R.string.error_noSignaturePassPhrase));
         }
 
         PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider(
                 BOUNCY_CASTLE_PROVIDER_NAME).build(signaturePassPhrase.toCharArray());
         signaturePrivateKey = signingKey.extractPrivateKey(keyDecryptor);
         if (signaturePrivateKey == null) {
-            throw new ApgGeneralException(
+            throw new PgpGeneralException(
                     context.getString(R.string.error_couldNotExtractPrivateKey));
         }
         updateProgress(progress, R.string.progress_preparingStreams, 0, 100);
@@ -1049,7 +1049,7 @@ public class PGPMain {
             signatureGenerator.init(type, signaturePrivateKey);
 
             PGPSignatureSubpacketGenerator spGen = new PGPSignatureSubpacketGenerator();
-            String userId = PGPHelper.getMainUserId(PGPHelper.getMasterKey(signingKeyRing));
+            String userId = PgpHelper.getMainUserId(PgpHelper.getMasterKey(signingKeyRing));
             spGen.setSignerUserID(false, userId);
             signatureGenerator.setHashedSubpackets(spGen.generate());
         }
@@ -1102,23 +1102,23 @@ public class PGPMain {
     }
 
     public static PGPPublicKeyRing signKey(Context context, long masterKeyId, long pubKeyId,
-            String passphrase) throws ApgGeneralException, NoSuchAlgorithmException,
+            String passphrase) throws PgpGeneralException, NoSuchAlgorithmException,
             NoSuchProviderException, PGPException, SignatureException {
         if (passphrase == null || passphrase.length() <= 0) {
-            throw new ApgGeneralException("Unable to obtain passphrase");
+            throw new PgpGeneralException("Unable to obtain passphrase");
         } else {
             PGPPublicKeyRing pubring = ProviderHelper.getPGPPublicKeyRingByKeyId(context, pubKeyId);
 
-            PGPSecretKey signingKey = PGPHelper.getSigningKey(context, masterKeyId);
+            PGPSecretKey signingKey = PgpHelper.getSigningKey(context, masterKeyId);
             if (signingKey == null) {
-                throw new ApgGeneralException(context.getString(R.string.error_signatureFailed));
+                throw new PgpGeneralException(context.getString(R.string.error_signatureFailed));
             }
 
             PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder().setProvider(
                     BOUNCY_CASTLE_PROVIDER_NAME).build(passphrase.toCharArray());
             PGPPrivateKey signaturePrivateKey = signingKey.extractPrivateKey(keyDecryptor);
             if (signaturePrivateKey == null) {
-                throw new ApgGeneralException(
+                throw new PgpGeneralException(
                         context.getString(R.string.error_couldNotExtractPrivateKey));
             }
 
@@ -1146,7 +1146,7 @@ public class PGPMain {
     }
 
     public static long getDecryptionKeyId(Context context, InputStream inputStream)
-            throws ApgGeneralException, NoAsymmetricEncryptionException, IOException {
+            throws PgpGeneralException, NoAsymmetricEncryptionException, IOException {
         InputStream in = PGPUtil.getDecoderStream(inputStream);
         PGPObjectFactory pgpF = new PGPObjectFactory(in);
         PGPEncryptedDataList enc;
@@ -1160,7 +1160,7 @@ public class PGPMain {
         }
 
         if (enc == null) {
-            throw new ApgGeneralException(context.getString(R.string.error_invalidData));
+            throw new PgpGeneralException(context.getString(R.string.error_invalidData));
         }
 
         // TODO: currently we always only look at the first known key
@@ -1192,7 +1192,7 @@ public class PGPMain {
     }
 
     public static boolean hasSymmetricEncryption(Context context, InputStream inputStream)
-            throws ApgGeneralException, IOException {
+            throws PgpGeneralException, IOException {
         InputStream in = PGPUtil.getDecoderStream(inputStream);
         PGPObjectFactory pgpF = new PGPObjectFactory(in);
         PGPEncryptedDataList enc;
@@ -1206,7 +1206,7 @@ public class PGPMain {
         }
 
         if (enc == null) {
-            throw new ApgGeneralException(context.getString(R.string.error_invalidData));
+            throw new PgpGeneralException(context.getString(R.string.error_invalidData));
         }
 
         Iterator<?> it = enc.getEncryptedDataObjects();
@@ -1222,7 +1222,7 @@ public class PGPMain {
 
     public static Bundle decryptAndVerify(Context context, ProgressDialogUpdater progress,
             InputData data, OutputStream outStream, String passphrase, boolean assumeSymmetric)
-            throws IOException, ApgGeneralException, PGPException, SignatureException {
+            throws IOException, PgpGeneralException, PGPException, SignatureException {
         if (passphrase == null) {
             passphrase = "";
         }
@@ -1245,7 +1245,7 @@ public class PGPMain {
         }
 
         if (enc == null) {
-            throw new ApgGeneralException(context.getString(R.string.error_invalidData));
+            throw new PgpGeneralException(context.getString(R.string.error_invalidData));
         }
 
         InputStream clear = null;
@@ -1268,7 +1268,7 @@ public class PGPMain {
             }
 
             if (pbe == null) {
-                throw new ApgGeneralException(
+                throw new PgpGeneralException(
                         context.getString(R.string.error_noSymmetricEncryptionPacket));
             }
 
@@ -1304,7 +1304,7 @@ public class PGPMain {
             }
 
             if (secretKey == null) {
-                throw new ApgGeneralException(context.getString(R.string.error_noSecretKeyFound));
+                throw new PgpGeneralException(context.getString(R.string.error_noSecretKeyFound));
             }
 
             currentProgress += 5;
@@ -1318,7 +1318,7 @@ public class PGPMain {
                 throw new PGPException(context.getString(R.string.error_wrongPassPhrase));
             }
             if (privateKey == null) {
-                throw new ApgGeneralException(
+                throw new PgpGeneralException(
                         context.getString(R.string.error_couldNotExtractPrivateKey));
             }
             currentProgress += 5;
@@ -1352,7 +1352,7 @@ public class PGPMain {
         if (dataChunk instanceof PGPOnePassSignatureList) {
             if (progress != null)
                 progress.setProgress(R.string.progress_processingSignature, currentProgress, 100);
-            returnData.putBoolean(ApgIntentService.RESULT_SIGNATURE, true);
+            returnData.putBoolean(KeychainIntentService.RESULT_SIGNATURE, true);
             PGPOnePassSignatureList sigList = (PGPOnePassSignatureList) dataChunk;
             for (int i = 0; i < sigList.size(); ++i) {
                 signature = sigList.get(i);
@@ -1369,14 +1369,14 @@ public class PGPMain {
                     PGPPublicKeyRing signKeyRing = ProviderHelper.getPGPPublicKeyRingByKeyId(
                             context, signatureKeyId);
                     if (signKeyRing != null) {
-                        userId = PGPHelper.getMainUserId(PGPHelper.getMasterKey(signKeyRing));
+                        userId = PgpHelper.getMainUserId(PgpHelper.getMasterKey(signKeyRing));
                     }
-                    returnData.putString(ApgIntentService.RESULT_SIGNATURE_USER_ID, userId);
+                    returnData.putString(KeychainIntentService.RESULT_SIGNATURE_USER_ID, userId);
                     break;
                 }
             }
 
-            returnData.putLong(ApgIntentService.RESULT_SIGNATURE_KEY_ID, signatureKeyId);
+            returnData.putLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID, signatureKeyId);
 
             if (signature != null) {
                 JcaPGPContentVerifierBuilderProvider contentVerifierBuilderProvider = new JcaPGPContentVerifierBuilderProvider()
@@ -1384,7 +1384,7 @@ public class PGPMain {
 
                 signature.init(contentVerifierBuilderProvider, signatureKey);
             } else {
-                returnData.putBoolean(ApgIntentService.RESULT_SIGNATURE_UNKNOWN, true);
+                returnData.putBoolean(KeychainIntentService.RESULT_SIGNATURE_UNKNOWN, true);
             }
 
             dataChunk = plainFact.nextObject();
@@ -1421,7 +1421,8 @@ public class PGPMain {
                     try {
                         signature.update(buffer, 0, n);
                     } catch (SignatureException e) {
-                        returnData.putBoolean(ApgIntentService.RESULT_SIGNATURE_SUCCESS, false);
+                        returnData
+                                .putBoolean(KeychainIntentService.RESULT_SIGNATURE_SUCCESS, false);
                         signature = null;
                     }
                 }
@@ -1443,9 +1444,9 @@ public class PGPMain {
                 PGPSignatureList signatureList = (PGPSignatureList) plainFact.nextObject();
                 PGPSignature messageSignature = signatureList.get(signatureIndex);
                 if (signature.verify(messageSignature)) {
-                    returnData.putBoolean(ApgIntentService.RESULT_SIGNATURE_SUCCESS, true);
+                    returnData.putBoolean(KeychainIntentService.RESULT_SIGNATURE_SUCCESS, true);
                 } else {
-                    returnData.putBoolean(ApgIntentService.RESULT_SIGNATURE_SUCCESS, false);
+                    returnData.putBoolean(KeychainIntentService.RESULT_SIGNATURE_SUCCESS, false);
                 }
             }
         }
@@ -1469,7 +1470,7 @@ public class PGPMain {
 
     public static Bundle verifyText(Context context, ProgressDialogUpdater progress,
             InputData data, OutputStream outStream, boolean lookupUnknownKey) throws IOException,
-            ApgGeneralException, PGPException, SignatureException {
+            PgpGeneralException, PGPException, SignatureException {
         Bundle returnData = new Bundle();
 
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -1498,14 +1499,14 @@ public class PGPMain {
         byte[] clearText = out.toByteArray();
         outStream.write(clearText);
 
-        returnData.putBoolean(ApgIntentService.RESULT_SIGNATURE, true);
+        returnData.putBoolean(KeychainIntentService.RESULT_SIGNATURE, true);
 
         updateProgress(progress, R.string.progress_processingSignature, 60, 100);
         PGPObjectFactory pgpFact = new PGPObjectFactory(aIn);
 
         PGPSignatureList sigList = (PGPSignatureList) pgpFact.nextObject();
         if (sigList == null) {
-            throw new ApgGeneralException(context.getString(R.string.error_corruptData));
+            throw new PgpGeneralException(context.getString(R.string.error_corruptData));
         }
         PGPSignature signature = null;
         long signatureKeyId = 0;
@@ -1520,8 +1521,8 @@ public class PGPMain {
             if (signatureKey == null && lookupUnknownKey) {
 
                 returnData = new Bundle();
-                returnData.putLong(ApgIntentService.RESULT_SIGNATURE_KEY_ID, signatureKeyId);
-                returnData.putBoolean(ApgIntentService.RESULT_SIGNATURE_LOOKUP_KEY, true);
+                returnData.putLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID, signatureKeyId);
+                returnData.putBoolean(KeychainIntentService.RESULT_SIGNATURE_LOOKUP_KEY, true);
 
                 // return directly now, decrypt will be done again after importing unknown key
                 return returnData;
@@ -1535,17 +1536,17 @@ public class PGPMain {
                 PGPPublicKeyRing signKeyRing = ProviderHelper.getPGPPublicKeyRingByKeyId(context,
                         signatureKeyId);
                 if (signKeyRing != null) {
-                    userId = PGPHelper.getMainUserId(PGPHelper.getMasterKey(signKeyRing));
+                    userId = PgpHelper.getMainUserId(PgpHelper.getMasterKey(signKeyRing));
                 }
-                returnData.putString(ApgIntentService.RESULT_SIGNATURE_USER_ID, userId);
+                returnData.putString(KeychainIntentService.RESULT_SIGNATURE_USER_ID, userId);
                 break;
             }
         }
 
-        returnData.putLong(ApgIntentService.RESULT_SIGNATURE_KEY_ID, signatureKeyId);
+        returnData.putLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID, signatureKeyId);
 
         if (signature == null) {
-            returnData.putBoolean(ApgIntentService.RESULT_SIGNATURE_UNKNOWN, true);
+            returnData.putBoolean(KeychainIntentService.RESULT_SIGNATURE_UNKNOWN, true);
             if (progress != null)
                 progress.setProgress(R.string.progress_done, 100, 100);
             return returnData;
@@ -1573,7 +1574,7 @@ public class PGPMain {
             } while (lookAhead != -1);
         }
 
-        returnData.putBoolean(ApgIntentService.RESULT_SIGNATURE_SUCCESS, signature.verify());
+        returnData.putBoolean(KeychainIntentService.RESULT_SIGNATURE_SUCCESS, signature.verify());
 
         updateProgress(progress, R.string.progress_done, 100, 100);
         return returnData;
diff --git a/APG/src/org/thialfihar/android/apg/helper/Preferences.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/Preferences.java
index 14adf357a..121bae6ef 100644
--- a/APG/src/org/thialfihar/android/apg/helper/Preferences.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/Preferences.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.helper;
+package org.sufficientlysecure.keychain.helper;
 
 import org.spongycastle.bcpg.HashAlgorithmTags;
 import org.spongycastle.openpgp.PGPEncryptedData;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/APG/src/org/thialfihar/android/apg/provider/ApgContract.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
index 3f01f4093..3d4dddea5 100644
--- a/APG/src/org/thialfihar/android/apg/provider/ApgContract.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.provider;
+package org.sufficientlysecure.keychain.provider;
 
-import org.thialfihar.android.apg.Constants;
+import org.sufficientlysecure.keychain.Constants;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
 
-public class ApgContract {
+public class KeychainContract {
 
     interface KeyRingsColumns {
         String MASTER_KEY_ID = "master_key_id"; // not a database id
@@ -215,6 +215,6 @@ public class ApgContract {
         }
     }
 
-    private ApgContract() {
+    private KeychainContract() {
     }
 }
diff --git a/APG/src/org/thialfihar/android/apg/provider/ApgDatabase.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index e25fce3f0..4a2aeeb80 100644
--- a/APG/src/org/thialfihar/android/apg/provider/ApgDatabase.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -15,21 +15,21 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.provider;
+package org.sufficientlysecure.keychain.provider;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.provider.ApgContract.KeyRingsColumns;
-import org.thialfihar.android.apg.provider.ApgContract.KeysColumns;
-import org.thialfihar.android.apg.provider.ApgContract.UserIdsColumns;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingsColumns;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeysColumns;
+import org.sufficientlysecure.keychain.provider.KeychainContract.UserIdsColumns;
+import org.sufficientlysecure.keychain.util.Log;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.provider.BaseColumns;
 
-import org.thialfihar.android.apg.util.Log;
 
-public class ApgDatabase extends SQLiteOpenHelper {
+public class KeychainDatabase extends SQLiteOpenHelper {
     private static final String DATABASE_NAME = "apg.db";
     private static final int DATABASE_VERSION = 3;
 
@@ -62,7 +62,7 @@ public class ApgDatabase extends SQLiteOpenHelper {
             + UserIdsColumns.KEY_RING_ROW_ID + ") REFERENCES " + Tables.KEY_RINGS + "("
             + BaseColumns._ID + ") ON DELETE CASCADE)";
 
-    ApgDatabase(Context context) {
+    KeychainDatabase(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
 
diff --git a/APG/src/org/thialfihar/android/apg/provider/ApgProvider.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index 88cb3df21..9d531dceb 100644
--- a/APG/src/org/thialfihar/android/apg/provider/ApgProvider.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -15,23 +15,23 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.provider;
+package org.sufficientlysecure.keychain.provider;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Arrays;
 import java.util.HashMap;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.provider.ApgContract.KeyRings;
-import org.thialfihar.android.apg.provider.ApgContract.KeyRingsColumns;
-import org.thialfihar.android.apg.provider.ApgContract.KeyTypes;
-import org.thialfihar.android.apg.provider.ApgContract.KeysColumns;
-import org.thialfihar.android.apg.provider.ApgContract.UserIds;
-import org.thialfihar.android.apg.provider.ApgContract.Keys;
-import org.thialfihar.android.apg.provider.ApgContract.UserIdsColumns;
-import org.thialfihar.android.apg.provider.ApgDatabase.Tables;
-import org.thialfihar.android.apg.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingsColumns;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyTypes;
+import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeysColumns;
+import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
+import org.sufficientlysecure.keychain.provider.KeychainContract.UserIdsColumns;
+import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
+import org.sufficientlysecure.keychain.util.Log;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -46,7 +46,7 @@ import android.os.ParcelFileDescriptor;
 import android.provider.BaseColumns;
 import android.text.TextUtils;
 
-public class ApgProvider extends ContentProvider {
+public class KeychainProvider extends ContentProvider {
     private static final int PUBLIC_KEY_RING = 101;
     private static final int PUBLIC_KEY_RING_BY_ROW_ID = 102;
     private static final int PUBLIC_KEY_RING_BY_MASTER_KEY_ID = 103;
@@ -87,9 +87,9 @@ public class ApgProvider extends ContentProvider {
 
         String authority;
         if (internalProvider) {
-            authority = ApgContract.CONTENT_AUTHORITY_INTERNAL;
+            authority = KeychainContract.CONTENT_AUTHORITY_INTERNAL;
         } else {
-            authority = ApgContract.CONTENT_AUTHORITY_EXTERNAL;
+            authority = KeychainContract.CONTENT_AUTHORITY_EXTERNAL;
         }
 
         /**
@@ -104,22 +104,22 @@ public class ApgProvider extends ContentProvider {
          * key_rings/public/like_email/_
          * </pre>
          */
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_PUBLIC,
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_PUBLIC,
                 PUBLIC_KEY_RING);
         matcher.addURI(authority,
-                ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_PUBLIC + "/#",
+                KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_PUBLIC + "/#",
                 PUBLIC_KEY_RING_BY_ROW_ID);
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_PUBLIC + "/"
-                + ApgContract.PATH_BY_MASTER_KEY_ID + "/*", PUBLIC_KEY_RING_BY_MASTER_KEY_ID);
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_PUBLIC + "/"
-                + ApgContract.PATH_BY_KEY_ID + "/*", PUBLIC_KEY_RING_BY_KEY_ID);
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_PUBLIC + "/"
-                + ApgContract.PATH_BY_EMAILS + "/*", PUBLIC_KEY_RING_BY_EMAILS);
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_PUBLIC + "/"
-                + ApgContract.PATH_BY_EMAILS, PUBLIC_KEY_RING_BY_EMAILS); // without emails
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_PUBLIC + "/"
+                + KeychainContract.PATH_BY_MASTER_KEY_ID + "/*", PUBLIC_KEY_RING_BY_MASTER_KEY_ID);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_PUBLIC + "/"
+                + KeychainContract.PATH_BY_KEY_ID + "/*", PUBLIC_KEY_RING_BY_KEY_ID);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_PUBLIC + "/"
+                + KeychainContract.PATH_BY_EMAILS + "/*", PUBLIC_KEY_RING_BY_EMAILS);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_PUBLIC + "/"
+                + KeychainContract.PATH_BY_EMAILS, PUBLIC_KEY_RING_BY_EMAILS); // without emails
                                                                           // specified
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_PUBLIC + "/"
-                + ApgContract.PATH_BY_LIKE_EMAIL + "/*", PUBLIC_KEY_RING_BY_LIKE_EMAIL);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_PUBLIC + "/"
+                + KeychainContract.PATH_BY_LIKE_EMAIL + "/*", PUBLIC_KEY_RING_BY_LIKE_EMAIL);
 
         /**
          * public keys
@@ -129,10 +129,10 @@ public class ApgProvider extends ContentProvider {
          * key_rings/public/#/keys/#
          * </pre>
          */
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_PUBLIC
-                + "/#/" + ApgContract.PATH_KEYS, PUBLIC_KEY_RING_KEY);
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_PUBLIC
-                + "/#/" + ApgContract.PATH_KEYS + "/#", PUBLIC_KEY_RING_KEY_BY_ROW_ID);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_PUBLIC
+                + "/#/" + KeychainContract.PATH_KEYS, PUBLIC_KEY_RING_KEY);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_PUBLIC
+                + "/#/" + KeychainContract.PATH_KEYS + "/#", PUBLIC_KEY_RING_KEY_BY_ROW_ID);
 
         /**
          * public user ids
@@ -142,10 +142,10 @@ public class ApgProvider extends ContentProvider {
          * key_rings/public/#/user_ids/#
          * </pre>
          */
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_PUBLIC
-                + "/#/" + ApgContract.PATH_USER_IDS, PUBLIC_KEY_RING_USER_ID);
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_PUBLIC
-                + "/#/" + ApgContract.PATH_USER_IDS + "/#", PUBLIC_KEY_RING_USER_ID_BY_ROW_ID);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_PUBLIC
+                + "/#/" + KeychainContract.PATH_USER_IDS, PUBLIC_KEY_RING_USER_ID);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_PUBLIC
+                + "/#/" + KeychainContract.PATH_USER_IDS + "/#", PUBLIC_KEY_RING_USER_ID_BY_ROW_ID);
 
         /**
          * secret key rings
@@ -159,22 +159,22 @@ public class ApgProvider extends ContentProvider {
          * key_rings/secret/like_email/_
          * </pre>
          */
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_SECRET,
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_SECRET,
                 SECRET_KEY_RING);
         matcher.addURI(authority,
-                ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_SECRET + "/#",
+                KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_SECRET + "/#",
                 SECRET_KEY_RING_BY_ROW_ID);
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_SECRET + "/"
-                + ApgContract.PATH_BY_MASTER_KEY_ID + "/*", SECRET_KEY_RING_BY_MASTER_KEY_ID);
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_SECRET + "/"
-                + ApgContract.PATH_BY_KEY_ID + "/*", SECRET_KEY_RING_BY_KEY_ID);
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_SECRET + "/"
-                + ApgContract.PATH_BY_EMAILS + "/*", SECRET_KEY_RING_BY_EMAILS);
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_SECRET + "/"
-                + ApgContract.PATH_BY_EMAILS, SECRET_KEY_RING_BY_EMAILS); // without emails
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_SECRET + "/"
+                + KeychainContract.PATH_BY_MASTER_KEY_ID + "/*", SECRET_KEY_RING_BY_MASTER_KEY_ID);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_SECRET + "/"
+                + KeychainContract.PATH_BY_KEY_ID + "/*", SECRET_KEY_RING_BY_KEY_ID);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_SECRET + "/"
+                + KeychainContract.PATH_BY_EMAILS + "/*", SECRET_KEY_RING_BY_EMAILS);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_SECRET + "/"
+                + KeychainContract.PATH_BY_EMAILS, SECRET_KEY_RING_BY_EMAILS); // without emails
                                                                           // specified
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_SECRET + "/"
-                + ApgContract.PATH_BY_LIKE_EMAIL + "/*", SECRET_KEY_RING_BY_LIKE_EMAIL);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_SECRET + "/"
+                + KeychainContract.PATH_BY_LIKE_EMAIL + "/*", SECRET_KEY_RING_BY_LIKE_EMAIL);
 
         /**
          * secret keys
@@ -184,10 +184,10 @@ public class ApgProvider extends ContentProvider {
          * key_rings/secret/#/keys/#
          * </pre>
          */
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_SECRET
-                + "/#/" + ApgContract.PATH_KEYS, SECRET_KEY_RING_KEY);
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_SECRET
-                + "/#/" + ApgContract.PATH_KEYS + "/#", SECRET_KEY_RING_KEY_BY_ROW_ID);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_SECRET
+                + "/#/" + KeychainContract.PATH_KEYS, SECRET_KEY_RING_KEY);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_SECRET
+                + "/#/" + KeychainContract.PATH_KEYS + "/#", SECRET_KEY_RING_KEY_BY_ROW_ID);
 
         /**
          * secret user ids
@@ -197,10 +197,10 @@ public class ApgProvider extends ContentProvider {
          * key_rings/secret/#/user_ids/#
          * </pre>
          */
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_SECRET
-                + "/#/" + ApgContract.PATH_USER_IDS, SECRET_KEY_RING_USER_ID);
-        matcher.addURI(authority, ApgContract.BASE_KEY_RINGS + "/" + ApgContract.PATH_SECRET
-                + "/#/" + ApgContract.PATH_USER_IDS + "/#", SECRET_KEY_RING_USER_ID_BY_ROW_ID);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_SECRET
+                + "/#/" + KeychainContract.PATH_USER_IDS, SECRET_KEY_RING_USER_ID);
+        matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" + KeychainContract.PATH_SECRET
+                + "/#/" + KeychainContract.PATH_USER_IDS + "/#", SECRET_KEY_RING_USER_ID_BY_ROW_ID);
 
         /**
          * data stream
@@ -209,18 +209,18 @@ public class ApgProvider extends ContentProvider {
          * data / _
          * </pre>
          */
-        matcher.addURI(authority, ApgContract.BASE_DATA + "/*", DATA_STREAM);
+        matcher.addURI(authority, KeychainContract.BASE_DATA + "/*", DATA_STREAM);
 
         return matcher;
     }
 
-    private ApgDatabase mApgDatabase;
+    private KeychainDatabase mApgDatabase;
 
     /** {@inheritDoc} */
     @Override
     public boolean onCreate() {
         mUriMatcher = buildUriMatcher(mInternalProvider);
-        mApgDatabase = new ApgDatabase(getContext());
+        mApgDatabase = new KeychainDatabase(getContext());
         return true;
     }
 
diff --git a/APG/src/org/thialfihar/android/apg/provider/ApgProviderExternal.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProviderExternal.java
index 18a78e440..a62b85621 100644
--- a/APG/src/org/thialfihar/android/apg/provider/ApgProviderExternal.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProviderExternal.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.provider;
+package org.sufficientlysecure.keychain.provider;
 
 /**
  * The same content provider as ApgProviderInternal except that it does not give out keyRing and key
@@ -22,9 +22,9 @@ package org.thialfihar.android.apg.provider;
  * 
  * This provider is exported with a readPermission in AndroidManifest.xml
  */
-public class ApgProviderExternal extends ApgProvider {
+public class KeychainProviderExternal extends KeychainProvider {
 
-    public ApgProviderExternal() {
+    public KeychainProviderExternal() {
         mInternalProvider = false;
     }
 
diff --git a/APG/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProviderInternal.java
index b8b98f2c7..ffac2f7cc 100644
--- a/APG/src/org/thialfihar/android/apg/provider/ApgProviderInternal.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProviderInternal.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.provider;
+package org.sufficientlysecure.keychain.provider;
 
 /**
  * This provider is NOT exported in AndroidManifest.xml as it also return the actual secret keys
  * from the database
  */
-public class ApgProviderInternal extends ApgProvider {
+public class KeychainProviderInternal extends KeychainProvider {
 
-    public ApgProviderInternal() {
+    public KeychainProviderInternal() {
         mInternalProvider = true;
     }
 
diff --git a/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobContract.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java
index 5bf1dd329..340d3c788 100644
--- a/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobContract.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.provider;
+package org.sufficientlysecure.keychain.provider;
 
-import org.thialfihar.android.apg.Constants;
+import org.sufficientlysecure.keychain.Constants;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
 
-public class ApgServiceBlobContract {
+public class KeychainServiceBlobContract {
 
     interface BlobsColumns {
         String KEY = "key";
@@ -35,6 +35,6 @@ public class ApgServiceBlobContract {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI;
     }
 
-    private ApgServiceBlobContract() {
+    private KeychainServiceBlobContract() {
     }
 }
diff --git a/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java
index 417486e33..386349c0e 100644
--- a/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobDatabase.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java
@@ -15,22 +15,22 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.provider;
+package org.sufficientlysecure.keychain.provider;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.provider.BaseColumns;
 
-import org.thialfihar.android.apg.provider.ApgServiceBlobContract.BlobsColumns;
+import org.sufficientlysecure.keychain.provider.KeychainServiceBlobContract.BlobsColumns;
 
-public class ApgServiceBlobDatabase extends SQLiteOpenHelper {
+public class KeychainServiceBlobDatabase extends SQLiteOpenHelper {
     private static final String DATABASE_NAME = "apg_blob.db";
     private static final int DATABASE_VERSION = 2;
 
     public static final String TABLE = "data";
 
-    public ApgServiceBlobDatabase(Context context) {
+    public KeychainServiceBlobDatabase(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
 
diff --git a/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
index 8053aecbf..761bfb2fe 100644
--- a/APG/src/org/thialfihar/android/apg/provider/ApgServiceBlobProvider.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java
@@ -15,9 +15,12 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.provider;
+package org.sufficientlysecure.keychain.provider;
 
-import org.thialfihar.android.apg.Constants;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.provider.KeychainServiceBlobContract.Blobs;
+import org.sufficientlysecure.keychain.provider.KeychainServiceBlobContract.BlobsColumns;
+import org.sufficientlysecure.keychain.util.Log;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -28,9 +31,6 @@ import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.provider.BaseColumns;
 
-import org.thialfihar.android.apg.provider.ApgServiceBlobContract.Blobs;
-import org.thialfihar.android.apg.provider.ApgServiceBlobContract.BlobsColumns;
-import org.thialfihar.android.apg.util.Log;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -38,19 +38,19 @@ import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
 
-public class ApgServiceBlobProvider extends ContentProvider {
+public class KeychainServiceBlobProvider extends ContentProvider {
     private static final String STORE_PATH = Constants.path.APP_DIR + "/ApgBlobs";
 
-    private ApgServiceBlobDatabase mBlobDatabase = null;
+    private KeychainServiceBlobDatabase mBlobDatabase = null;
 
-    public ApgServiceBlobProvider() {
+    public KeychainServiceBlobProvider() {
         File dir = new File(STORE_PATH);
         dir.mkdirs();
     }
 
     @Override
     public boolean onCreate() {
-        mBlobDatabase = new ApgServiceBlobDatabase(getContext());
+        mBlobDatabase = new KeychainServiceBlobDatabase(getContext());
         return true;
     }
 
@@ -67,7 +67,7 @@ public class ApgServiceBlobProvider extends ContentProvider {
         vals.put(BlobsColumns.KEY, password);
 
         SQLiteDatabase db = mBlobDatabase.getWritableDatabase();
-        long newRowId = db.insert(ApgServiceBlobDatabase.TABLE, null, vals);
+        long newRowId = db.insert(KeychainServiceBlobDatabase.TABLE, null, vals);
         Uri insertedUri = ContentUris.withAppendedId(Blobs.CONTENT_URI, newRowId);
 
         return Uri.withAppendedPath(insertedUri, password);
@@ -90,7 +90,7 @@ public class ApgServiceBlobProvider extends ContentProvider {
 
         // get the data
         SQLiteDatabase db = mBlobDatabase.getReadableDatabase();
-        Cursor result = db.query(ApgServiceBlobDatabase.TABLE, new String[] { BaseColumns._ID },
+        Cursor result = db.query(KeychainServiceBlobDatabase.TABLE, new String[] { BaseColumns._ID },
                 BaseColumns._ID + " = ? and " + BlobsColumns.KEY + " = ?",
                 new String[] { id, key }, null, null, null);
 
diff --git a/APG/src/org/thialfihar/android/apg/provider/ProviderHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 2a7ed2d19..36049a64c 100644
--- a/APG/src/org/thialfihar/android/apg/provider/ProviderHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.provider;
+package org.sufficientlysecure.keychain.provider;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -27,15 +27,15 @@ import org.spongycastle.openpgp.PGPPublicKey;
 import org.spongycastle.openpgp.PGPPublicKeyRing;
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.helper.PGPConversionHelper;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.helper.PGPMain;
-import org.thialfihar.android.apg.provider.ApgContract.KeyRings;
-import org.thialfihar.android.apg.provider.ApgContract.UserIds;
-import org.thialfihar.android.apg.provider.ApgContract.Keys;
-import org.thialfihar.android.apg.util.IterableIterator;
-import org.thialfihar.android.apg.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.helper.PgpConversionHelper;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
+import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
+import org.sufficientlysecure.keychain.util.IterableIterator;
+import org.sufficientlysecure.keychain.util.Log;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
@@ -66,7 +66,7 @@ public class ProviderHelper {
 
             byte[] data = cursor.getBlob(keyRingDataCol);
             if (data != null) {
-                keyRing = PGPConversionHelper.BytesToPGPKeyRing(data);
+                keyRing = PgpConversionHelper.BytesToPGPKeyRing(data);
             }
         }
 
@@ -235,7 +235,7 @@ public class ProviderHelper {
         }
 
         try {
-            context.getContentResolver().applyBatch(ApgContract.CONTENT_AUTHORITY_INTERNAL,
+            context.getContentResolver().applyBatch(KeychainContract.CONTENT_AUTHORITY_INTERNAL,
                     operations);
         } catch (RemoteException e) {
             Log.e(Constants.TAG, "applyBatch failed!", e);
@@ -292,7 +292,7 @@ public class ProviderHelper {
         }
 
         try {
-            context.getContentResolver().applyBatch(ApgContract.CONTENT_AUTHORITY_INTERNAL,
+            context.getContentResolver().applyBatch(KeychainContract.CONTENT_AUTHORITY_INTERNAL,
                     operations);
         } catch (RemoteException e) {
             Log.e(Constants.TAG, "applyBatch failed!", e);
@@ -318,11 +318,11 @@ public class ProviderHelper {
         values.put(Keys.IS_MASTER_KEY, key.isMasterKey());
         values.put(Keys.ALGORITHM, key.getAlgorithm());
         values.put(Keys.KEY_SIZE, key.getBitStrength());
-        values.put(Keys.CAN_SIGN, PGPHelper.isSigningKey(key));
-        values.put(Keys.CAN_ENCRYPT, PGPHelper.isEncryptionKey(key));
+        values.put(Keys.CAN_SIGN, PgpHelper.isSigningKey(key));
+        values.put(Keys.CAN_ENCRYPT, PgpHelper.isEncryptionKey(key));
         values.put(Keys.IS_REVOKED, key.isRevoked());
-        values.put(Keys.CREATION, PGPHelper.getCreationDate(key).getTime() / 1000);
-        Date expiryDate = PGPHelper.getExpiryDate(key);
+        values.put(Keys.CREATION, PgpHelper.getCreationDate(key).getTime() / 1000);
+        Date expiryDate = PgpHelper.getExpiryDate(key);
         if (expiryDate != null) {
             values.put(Keys.EXPIRY, expiryDate.getTime() / 1000);
         }
@@ -374,11 +374,11 @@ public class ProviderHelper {
         values.put(Keys.IS_MASTER_KEY, key.isMasterKey());
         values.put(Keys.ALGORITHM, key.getPublicKey().getAlgorithm());
         values.put(Keys.KEY_SIZE, key.getPublicKey().getBitStrength());
-        values.put(Keys.CAN_SIGN, PGPHelper.isSigningKey(key));
-        values.put(Keys.CAN_ENCRYPT, PGPHelper.isEncryptionKey(key));
+        values.put(Keys.CAN_SIGN, PgpHelper.isSigningKey(key));
+        values.put(Keys.CAN_ENCRYPT, PgpHelper.isEncryptionKey(key));
         values.put(Keys.IS_REVOKED, key.getPublicKey().isRevoked());
-        values.put(Keys.CREATION, PGPHelper.getCreationDate(key).getTime() / 1000);
-        Date expiryDate = PGPHelper.getExpiryDate(key);
+        values.put(Keys.CREATION, PgpHelper.getCreationDate(key).getTime() / 1000);
+        Date expiryDate = PgpHelper.getExpiryDate(key);
         if (expiryDate != null) {
             values.put(Keys.EXPIRY, expiryDate.getTime() / 1000);
         }
@@ -555,12 +555,12 @@ public class ProviderHelper {
                             Object keyRing = null;
                             byte[] data = cursor.getBlob(dataCol);
                             if (data != null) {
-                                keyRing = PGPConversionHelper.BytesToPGPKeyRing(data);
+                                keyRing = PgpConversionHelper.BytesToPGPKeyRing(data);
                             }
 
                             ByteArrayOutputStream bos = new ByteArrayOutputStream();
                             ArmoredOutputStream aos = new ArmoredOutputStream(bos);
-                            aos.setHeader("Version", PGPMain.getFullVersion(context));
+                            aos.setHeader("Version", PgpMain.getFullVersion(context));
 
                             if (keyRing instanceof PGPSecretKeyRing) {
                                 aos.write(((PGPSecretKeyRing) keyRing).getEncoded());
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgApiService.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl
index 277ce6722..ac8327b8e 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgApiService.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service;
+package org.sufficientlysecure.keychain.service;
 
-import org.thialfihar.android.apg.service.handler.IApgEncryptHandler;
-import org.thialfihar.android.apg.service.handler.IApgDecryptHandler;
-import org.thialfihar.android.apg.service.handler.IApgGetDecryptionKeyIdHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainEncryptHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainDecryptHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainGetDecryptionKeyIdHandler;
 
 /**
  * All methods are oneway, which means they are asynchronous and non-blocking.
  * Results are returned into given Handler, which has to be implemented on client side.
  */
-interface IApgApiService {
+interface IKeychainApiService {
        
     /**
      * Encrypt
@@ -45,12 +45,12 @@ interface IApgApiService {
      *            7: AES-128, 8: AES-192, 9: AES-256, 4: Blowfish, 10: Twofish, 3: CAST5,
      *            6: DES, 2: Triple DES, 1: IDEA
      * @param handler
-     *            Results are returned to this IApgEncryptDecryptHandler Handler
+     *            Results are returned to this IKeychainEncryptDecryptHandler Handler
      *            to onSuccessEncrypt(in byte[] output), after successful encryption
      */
     oneway void encryptAsymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor,
             in int compression, in long[] encryptionKeyIds, in int symmetricEncryptionAlgorithm,
-            in IApgEncryptHandler handler);
+            in IKeychainEncryptHandler handler);
     
     /**
      * Same as encryptAsymmetric but using a passphrase for symmetric encryption
@@ -60,7 +60,7 @@ interface IApgApiService {
      */
     oneway void encryptSymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor,
             in int compression, in String encryptionPassphrase, in int symmetricEncryptionAlgorithm,
-            in IApgEncryptHandler handler);
+            in IKeychainEncryptHandler handler);
     
     /**
      * Encrypt and sign
@@ -90,14 +90,14 @@ interface IApgApiService {
      * @param signaturePassphrase
      *            Passphrase to unlock signature key
      * @param handler
-     *            Results are returned to this IApgEncryptDecryptHandler Handler
+     *            Results are returned to this IKeychainEncryptDecryptHandler Handler
      *            to onSuccessEncrypt(in byte[] output), after successful encryption and signing
      */
     oneway void encryptAndSignAsymmetric(in byte[] inputBytes, in String inputUri,
             in boolean useAsciiArmor, in int compression, in long[] encryptionKeyIds,
             in int symmetricEncryptionAlgorithm, in long signatureKeyId, in int signatureHashAlgorithm,
             in boolean signatureForceV3, in String signaturePassphrase,
-            in IApgEncryptHandler handler);
+            in IKeychainEncryptHandler handler);
     
     /**
      * Same as encryptAndSignAsymmetric but using a passphrase for symmetric encryption
@@ -109,7 +109,7 @@ interface IApgApiService {
             in boolean useAsciiArmor, in int compression, in String encryptionPassphrase,
             in int symmetricEncryptionAlgorithm, in long signatureKeyId, in int signatureHashAlgorithm,
             in boolean signatureForceV3, in String signaturePassphrase,
-            in IApgEncryptHandler handler);
+            in IKeychainEncryptHandler handler);
     
     /**
      * Decrypts and verifies given input bytes. If no signature is present this method
@@ -125,7 +125,7 @@ interface IApgApiService {
      *            Handler where to return results to after successful encryption
      */
     oneway void decryptAndVerifyAsymmetric(in byte[] inputBytes, in String inputUri,
-            in String keyPassphrase, in IApgDecryptHandler handler);
+            in String keyPassphrase, in IKeychainDecryptHandler handler);
     
     /**
      * Same as decryptAndVerifyAsymmetric but for symmetric decryption.
@@ -134,13 +134,13 @@ interface IApgApiService {
      *            Passphrase to decrypt
      */
     oneway void decryptAndVerifySymmetric(in byte[] inputBytes, in String inputUri,
-            in String encryptionPassphrase, in IApgDecryptHandler handler);
+            in String encryptionPassphrase, in IKeychainDecryptHandler handler);
     
     /**
      *
      */
     oneway void getDecryptionKeyId(in byte[] inputBytes, in String inputUri,
-            in IApgGetDecryptionKeyIdHandler handler);
+            in IKeychainGetDecryptionKeyIdHandler handler);
     
     
 }
\ No newline at end of file
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgKeyService.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/IKeychainKeyService.aidl
index 12ecddc17..ecea2b8ff 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgKeyService.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/IKeychainKeyService.aidl
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service;
+package org.sufficientlysecure.keychain.service;
 
-import org.thialfihar.android.apg.service.handler.IApgGetKeyringsHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainGetKeyringsHandler;
 
 /**
  * All methods are oneway, which means they are asynchronous and non-blocking.
  * Results are returned into given Handler, which has to be implemented on client side.
  */
-interface IApgKeyService {
+interface IKeychainKeyService {
 
     oneway void getPublicKeyRings(in long[] masterKeyIds, in boolean asAsciiArmoredStringArray,
-            in IApgGetKeyringsHandler handler);
+            in IKeychainGetKeyringsHandler handler);
 
     oneway void getSecretKeyRings(in long[] masterKeyIds, in boolean asAsciiArmoredStringArray,
-            in IApgGetKeyringsHandler handler);
+            in IKeychainGetKeyringsHandler handler);
 }
\ No newline at end of file
diff --git a/APG/src/org/thialfihar/android/apg/service/ApgApiService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainApiService.java
index 88f062b87..7c70c3c68 100644
--- a/APG/src/org/thialfihar/android/apg/service/ApgApiService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainApiService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.service;
+package org.sufficientlysecure.keychain.service;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -26,16 +26,17 @@ import java.security.NoSuchProviderException;
 import java.security.SignatureException;
 
 import org.spongycastle.openpgp.PGPException;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.PGPMain;
-import org.thialfihar.android.apg.helper.PGPMain.ApgGeneralException;
-import org.thialfihar.android.apg.service.handler.IApgDecryptHandler;
-import org.thialfihar.android.apg.service.handler.IApgEncryptHandler;
-import org.thialfihar.android.apg.service.handler.IApgGetDecryptionKeyIdHandler;
-import org.thialfihar.android.apg.util.InputData;
-import org.thialfihar.android.apg.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.helper.PgpMain.PgpGeneralException;
+import org.sufficientlysecure.keychain.util.InputData;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.service.IKeychainApiService;
+import org.sufficientlysecure.keychain.service.handler.IKeychainDecryptHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainEncryptHandler;
+import org.sufficientlysecure.keychain.service.handler.IKeychainGetDecryptionKeyIdHandler;
 
 import android.app.Service;
 import android.content.Context;
@@ -44,20 +45,20 @@ import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
 
-public class ApgApiService extends Service {
+public class KeychainApiService extends Service {
     Context mContext;
 
     @Override
     public void onCreate() {
         super.onCreate();
         mContext = this;
-        Log.d(Constants.TAG, "ApgApiService, onCreate()");
+        Log.d(Constants.TAG, "KeychainApiService, onCreate()");
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
-        Log.d(Constants.TAG, "ApgApiService, onDestroy()");
+        Log.d(Constants.TAG, "KeychainApiService, onDestroy()");
     }
 
     @Override
@@ -77,7 +78,7 @@ public class ApgApiService extends Service {
             boolean useAsciiArmor, int compression, long[] encryptionKeyIds,
             String encryptionPassphrase, int symmetricEncryptionAlgorithm, long signatureKeyId,
             int signatureHashAlgorithm, boolean signatureForceV3, String signaturePassphrase,
-            IApgEncryptHandler handler) throws RemoteException {
+            IKeychainEncryptHandler handler) throws RemoteException {
 
         try {
             // TODO use inputUri
@@ -102,7 +103,7 @@ public class ApgApiService extends Service {
 
             OutputStream output = new ByteArrayOutputStream();
 
-            PGPMain.encryptAndSign(mContext, null, input, output, useAsciiArmor, compression,
+            PgpMain.encryptAndSign(mContext, null, input, output, useAsciiArmor, compression,
                     encryptionKeyIds, encryptionPassphrase, symmetricEncryptionAlgorithm,
                     signatureKeyId, signatureHashAlgorithm, signatureForceV3, signaturePassphrase);
 
@@ -127,7 +128,7 @@ public class ApgApiService extends Service {
             // return over handler on client side
             handler.onSuccess(outputBytes, null);
         } catch (Exception e) {
-            Log.e(Constants.TAG, "ApgService, Exception!", e);
+            Log.e(Constants.TAG, "KeychainService, Exception!", e);
 
             try {
                 handler.onException(getExceptionId(e), e.getMessage());
@@ -138,7 +139,7 @@ public class ApgApiService extends Service {
     }
 
     private synchronized void decryptAndVerifySafe(byte[] inputBytes, String inputUri,
-            String passphrase, boolean assumeSymmetric, IApgDecryptHandler handler)
+            String passphrase, boolean assumeSymmetric, IKeychainDecryptHandler handler)
             throws RemoteException {
 
         try {
@@ -149,7 +150,7 @@ public class ApgApiService extends Service {
 
             OutputStream outputStream = new ByteArrayOutputStream();
 
-            Bundle outputBundle = PGPMain.decryptAndVerify(mContext, null, inputData, outputStream,
+            Bundle outputBundle = PgpMain.decryptAndVerify(mContext, null, inputData, outputStream,
                     passphrase, assumeSymmetric);
 
             outputStream.close();
@@ -157,20 +158,21 @@ public class ApgApiService extends Service {
             byte[] outputBytes = ((ByteArrayOutputStream) outputStream).toByteArray();
 
             // get signature informations from bundle
-            boolean signature = outputBundle.getBoolean(ApgIntentService.RESULT_SIGNATURE);
-            long signatureKeyId = outputBundle.getLong(ApgIntentService.RESULT_SIGNATURE_KEY_ID);
+            boolean signature = outputBundle.getBoolean(KeychainIntentService.RESULT_SIGNATURE);
+            long signatureKeyId = outputBundle
+                    .getLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID);
             String signatureUserId = outputBundle
-                    .getString(ApgIntentService.RESULT_SIGNATURE_USER_ID);
+                    .getString(KeychainIntentService.RESULT_SIGNATURE_USER_ID);
             boolean signatureSuccess = outputBundle
-                    .getBoolean(ApgIntentService.RESULT_SIGNATURE_SUCCESS);
+                    .getBoolean(KeychainIntentService.RESULT_SIGNATURE_SUCCESS);
             boolean signatureUnknown = outputBundle
-                    .getBoolean(ApgIntentService.RESULT_SIGNATURE_UNKNOWN);
+                    .getBoolean(KeychainIntentService.RESULT_SIGNATURE_UNKNOWN);
 
             // return over handler on client side
             handler.onSuccess(outputBytes, null, signature, signatureKeyId, signatureUserId,
                     signatureSuccess, signatureUnknown);
         } catch (Exception e) {
-            Log.e(Constants.TAG, "ApgService, Exception!", e);
+            Log.e(Constants.TAG, "KeychainService, Exception!", e);
 
             try {
                 handler.onException(getExceptionId(e), e.getMessage());
@@ -181,7 +183,7 @@ public class ApgApiService extends Service {
     }
 
     private synchronized void getDecryptionKeySafe(byte[] inputBytes, String inputUri,
-            IApgGetDecryptionKeyIdHandler handler) {
+            IKeychainGetDecryptionKeyIdHandler handler) {
 
         // TODO: implement inputUri
 
@@ -192,15 +194,15 @@ public class ApgApiService extends Service {
             boolean symmetric;
 
             try {
-                secretKeyId = PGPMain.getDecryptionKeyId(ApgApiService.this, inputStream);
+                secretKeyId = PgpMain.getDecryptionKeyId(KeychainApiService.this, inputStream);
                 if (secretKeyId == Id.key.none) {
-                    throw new ApgGeneralException(getString(R.string.error_noSecretKeyFound));
+                    throw new PgpGeneralException(getString(R.string.error_noSecretKeyFound));
                 }
                 symmetric = false;
-            } catch (PGPMain.NoAsymmetricEncryptionException e) {
+            } catch (PgpMain.NoAsymmetricEncryptionException e) {
                 secretKeyId = Id.key.symmetric;
-                if (!PGPMain.hasSymmetricEncryption(ApgApiService.this, inputStream)) {
-                    throw new ApgGeneralException(getString(R.string.error_noKnownEncryptionFound));
+                if (!PgpMain.hasSymmetricEncryption(KeychainApiService.this, inputStream)) {
+                    throw new PgpGeneralException(getString(R.string.error_noKnownEncryptionFound));
                 }
                 symmetric = true;
             }
@@ -208,7 +210,7 @@ public class ApgApiService extends Service {
             handler.onSuccess(secretKeyId, symmetric);
 
         } catch (Exception e) {
-            Log.e(Constants.TAG, "ApgService, Exception!", e);
+            Log.e(Constants.TAG, "KeychainService, Exception!", e);
 
             try {
                 handler.onException(getExceptionId(e), e.getMessage());
@@ -219,17 +221,17 @@ public class ApgApiService extends Service {
     }
 
     /**
-     * This is the implementation of the interface IApgService. All methods are oneway, meaning
-     * asynchronous and return to the client using IApgHandler.
+     * This is the implementation of the interface IKeychainService. All methods are oneway, meaning
+     * asynchronous and return to the client using IKeychainHandler.
      * 
      * The real PGP code is located in PGPMain.
      */
-    private final IApgApiService.Stub mBinder = new IApgApiService.Stub() {
+    private final IKeychainApiService.Stub mBinder = new IKeychainApiService.Stub() {
 
         @Override
         public void encryptAsymmetric(byte[] inputBytes, String inputUri, boolean useAsciiArmor,
                 int compression, long[] encryptionKeyIds, int symmetricEncryptionAlgorithm,
-                IApgEncryptHandler handler) throws RemoteException {
+                IKeychainEncryptHandler handler) throws RemoteException {
 
             encryptAndSignSafe(inputBytes, inputUri, useAsciiArmor, compression, encryptionKeyIds,
                     null, symmetricEncryptionAlgorithm, Id.key.none, 0, false, null, handler);
@@ -238,7 +240,7 @@ public class ApgApiService extends Service {
         @Override
         public void encryptSymmetric(byte[] inputBytes, String inputUri, boolean useAsciiArmor,
                 int compression, String encryptionPassphrase, int symmetricEncryptionAlgorithm,
-                IApgEncryptHandler handler) throws RemoteException {
+                IKeychainEncryptHandler handler) throws RemoteException {
 
             encryptAndSignSafe(inputBytes, inputUri, useAsciiArmor, compression, null,
                     encryptionPassphrase, symmetricEncryptionAlgorithm, Id.key.none, 0, false,
@@ -249,8 +251,8 @@ public class ApgApiService extends Service {
         public void encryptAndSignAsymmetric(byte[] inputBytes, String inputUri,
                 boolean useAsciiArmor, int compression, long[] encryptionKeyIds,
                 int symmetricEncryptionAlgorithm, long signatureKeyId, int signatureHashAlgorithm,
-                boolean signatureForceV3, String signaturePassphrase, IApgEncryptHandler handler)
-                throws RemoteException {
+                boolean signatureForceV3, String signaturePassphrase,
+                IKeychainEncryptHandler handler) throws RemoteException {
 
             encryptAndSignSafe(inputBytes, inputUri, useAsciiArmor, compression, encryptionKeyIds,
                     null, symmetricEncryptionAlgorithm, signatureKeyId, signatureHashAlgorithm,
@@ -261,8 +263,8 @@ public class ApgApiService extends Service {
         public void encryptAndSignSymmetric(byte[] inputBytes, String inputUri,
                 boolean useAsciiArmor, int compression, String encryptionPassphrase,
                 int symmetricEncryptionAlgorithm, long signatureKeyId, int signatureHashAlgorithm,
-                boolean signatureForceV3, String signaturePassphrase, IApgEncryptHandler handler)
-                throws RemoteException {
+                boolean signatureForceV3, String signaturePassphrase,
+                IKeychainEncryptHandler handler) throws RemoteException {
 
             encryptAndSignSafe(inputBytes, inputUri, useAsciiArmor, compression, null,
                     encryptionPassphrase, symmetricEncryptionAlgorithm, signatureKeyId,
@@ -271,21 +273,22 @@ public class ApgApiService extends Service {
 
         @Override
         public void decryptAndVerifyAsymmetric(byte[] inputBytes, String inputUri,
-                String keyPassphrase, IApgDecryptHandler handler) throws RemoteException {
+                String keyPassphrase, IKeychainDecryptHandler handler) throws RemoteException {
 
             decryptAndVerifySafe(inputBytes, inputUri, keyPassphrase, false, handler);
         }
 
         @Override
         public void decryptAndVerifySymmetric(byte[] inputBytes, String inputUri,
-                String encryptionPassphrase, IApgDecryptHandler handler) throws RemoteException {
+                String encryptionPassphrase, IKeychainDecryptHandler handler)
+                throws RemoteException {
 
             decryptAndVerifySafe(inputBytes, inputUri, encryptionPassphrase, true, handler);
         }
 
         @Override
         public void getDecryptionKeyId(byte[] inputBytes, String inputUri,
-                IApgGetDecryptionKeyIdHandler handler) throws RemoteException {
+                IKeychainGetDecryptionKeyIdHandler handler) throws RemoteException {
 
             getDecryptionKeySafe(inputBytes, inputUri, handler);
         }
@@ -308,7 +311,7 @@ public class ApgApiService extends Service {
             return 2;
         } else if (e instanceof IOException) {
             return 3;
-        } else if (e instanceof ApgGeneralException) {
+        } else if (e instanceof PgpGeneralException) {
             return 4;
         } else if (e instanceof PGPException) {
             return 5;
diff --git a/APG/src/org/thialfihar/android/apg/service/ApgIntentService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index 11460c7d8..e525fe96e 100644
--- a/APG/src/org/thialfihar/android/apg/service/ApgIntentService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.service;
+package org.sufficientlysecure.keychain.service;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -30,21 +30,22 @@ import java.util.ArrayList;
 import org.spongycastle.openpgp.PGPPublicKeyRing;
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.FileHelper;
-import org.thialfihar.android.apg.helper.OtherHelper;
-import org.thialfihar.android.apg.helper.PGPMain;
-import org.thialfihar.android.apg.helper.Preferences;
-import org.thialfihar.android.apg.helper.PGPMain.ApgGeneralException;
-import org.thialfihar.android.apg.helper.PGPConversionHelper;
-import org.thialfihar.android.apg.provider.ApgContract.DataStream;
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.util.HkpKeyServer;
-import org.thialfihar.android.apg.util.InputData;
-import org.thialfihar.android.apg.util.KeyServer.KeyInfo;
-import org.thialfihar.android.apg.util.ProgressDialogUpdater;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.FileHelper;
+import org.sufficientlysecure.keychain.helper.OtherHelper;
+import org.sufficientlysecure.keychain.helper.PgpConversionHelper;
+import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.helper.Preferences;
+import org.sufficientlysecure.keychain.helper.PgpMain.PgpGeneralException;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.provider.KeychainContract.DataStream;
+import org.sufficientlysecure.keychain.util.HkpKeyServer;
+import org.sufficientlysecure.keychain.util.InputData;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.util.ProgressDialogUpdater;
+import org.sufficientlysecure.keychain.util.KeyServer.KeyInfo;
+import org.sufficientlysecure.keychain.R;
 
 import android.app.IntentService;
 import android.content.Context;
@@ -55,14 +56,13 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
 
-import org.thialfihar.android.apg.util.Log;
 
 /**
  * This Service contains all important long lasting operations for APG. It receives Intents with
  * data from the activities or other apps, queues these intents, executes them, and stops itself
  * after doing them.
  */
-public class ApgIntentService extends IntentService implements ProgressDialogUpdater {
+public class KeychainIntentService extends IntentService implements ProgressDialogUpdater {
 
     /* extras that can be given by intent */
     public static final String EXTRA_MESSENGER = "messenger";
@@ -199,7 +199,7 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
 
     Messenger mMessenger;
 
-    public ApgIntentService() {
+    public KeychainIntentService() {
         super("ApgService");
     }
 
@@ -270,7 +270,7 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                     // check if storage is ready
                     if (!FileHelper.isStorageMounted(inputFile)
                             || !FileHelper.isStorageMounted(outputFile)) {
-                        throw new ApgGeneralException(
+                        throw new PgpGeneralException(
                                 getString(R.string.error_externalStorageNotReady));
                     }
 
@@ -288,15 +288,15 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
 
                     // InputStream
                     InputStream in = getContentResolver().openInputStream(providerUri);
-                    inLength = PGPMain.getLengthOfStream(in);
+                    inLength = PgpMain.getLengthOfStream(in);
                     inputData = new InputData(in, inLength);
 
                     // OutputStream
                     try {
                         while (true) {
-                            streamFilename = PGPMain.generateRandomFilename(32);
+                            streamFilename = PgpMain.generateRandomFilename(32);
                             if (streamFilename == null) {
-                                throw new PGPMain.ApgGeneralException(
+                                throw new PgpMain.PgpGeneralException(
                                         "couldn't generate random file name");
                             }
                             openFileInput(streamFilename).close();
@@ -309,7 +309,7 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                     break;
 
                 default:
-                    throw new PGPMain.ApgGeneralException("No target choosen!");
+                    throw new PgpMain.PgpGeneralException("No target choosen!");
 
                 }
 
@@ -317,20 +317,20 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
 
                 if (generateSignature) {
                     Log.d(Constants.TAG, "generating signature...");
-                    PGPMain.generateSignature(this, this, inputData, outStream, useAsciiArmor,
+                    PgpMain.generateSignature(this, this, inputData, outStream, useAsciiArmor,
                             false, secretKeyId, PassphraseCacheService.getCachedPassphrase(this,
                                     secretKeyId), Preferences.getPreferences(this)
                                     .getDefaultHashAlgorithm(), Preferences.getPreferences(this)
                                     .getForceV3Signatures());
                 } else if (signOnly) {
                     Log.d(Constants.TAG, "sign only...");
-                    PGPMain.signText(this, this, inputData, outStream, secretKeyId,
+                    PgpMain.signText(this, this, inputData, outStream, secretKeyId,
                             PassphraseCacheService.getCachedPassphrase(this, secretKeyId),
                             Preferences.getPreferences(this).getDefaultHashAlgorithm(), Preferences
                                     .getPreferences(this).getForceV3Signatures());
                 } else {
                     Log.d(Constants.TAG, "encrypt...");
-                    PGPMain.encryptAndSign(this, this, inputData, outStream, useAsciiArmor,
+                    PgpMain.encryptAndSign(this, this, inputData, outStream, useAsciiArmor,
                             compressionId, encryptionKeyIds, encryptionPassphrase, Preferences
                                     .getPreferences(this).getDefaultEncryptionAlgorithm(),
                             secretKeyId,
@@ -378,7 +378,7 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
 
                 OtherHelper.logDebugBundle(resultData, "resultData");
 
-                sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_OKAY, resultData);
+                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, resultData);
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
@@ -420,7 +420,7 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                     // check if storage is ready
                     if (!FileHelper.isStorageMounted(inputFile)
                             || !FileHelper.isStorageMounted(outputFile)) {
-                        throw new ApgGeneralException(
+                        throw new PgpGeneralException(
                                 getString(R.string.error_externalStorageNotReady));
                     }
 
@@ -441,15 +441,15 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
 
                     // InputStream
                     InputStream in = getContentResolver().openInputStream(providerUri);
-                    inLength = PGPMain.getLengthOfStream(in);
+                    inLength = PgpMain.getLengthOfStream(in);
                     inputData = new InputData(in, inLength);
 
                     // OutputStream
                     try {
                         while (true) {
-                            streamFilename = PGPMain.generateRandomFilename(32);
+                            streamFilename = PgpMain.generateRandomFilename(32);
                             if (streamFilename == null) {
-                                throw new PGPMain.ApgGeneralException(
+                                throw new PgpMain.PgpGeneralException(
                                         "couldn't generate random file name");
                             }
                             openFileInput(streamFilename).close();
@@ -462,7 +462,7 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                     break;
 
                 default:
-                    throw new PGPMain.ApgGeneralException("No target choosen!");
+                    throw new PgpMain.PgpGeneralException("No target choosen!");
 
                 }
 
@@ -473,10 +473,10 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                 // verifyText and decrypt returning additional resultData values for the
                 // verification of signatures
                 if (signedOnly) {
-                    resultData = PGPMain.verifyText(this, this, inputData, outStream,
+                    resultData = PgpMain.verifyText(this, this, inputData, outStream,
                             lookupUnknownKey);
                 } else {
-                    resultData = PGPMain.decryptAndVerify(this, this, inputData, outStream,
+                    resultData = PgpMain.decryptAndVerify(this, this, inputData, outStream,
                             PassphraseCacheService.getCachedPassphrase(this, secretKeyId),
                             assumeSymmetricEncryption);
                 }
@@ -510,7 +510,7 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
 
                 OtherHelper.logDebugBundle(resultData, "resultData");
 
-                sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_OKAY, resultData);
+                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, resultData);
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
@@ -527,18 +527,18 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                     newPassPhrase = oldPassPhrase;
                 }
                 ArrayList<String> userIds = data.getStringArrayList(SAVE_KEYRING_USER_IDS);
-                ArrayList<PGPSecretKey> keys = PGPConversionHelper.BytesToPGPSecretKeyList(data
+                ArrayList<PGPSecretKey> keys = PgpConversionHelper.BytesToPGPSecretKeyList(data
                         .getByteArray(SAVE_KEYRING_KEYS));
                 ArrayList<Integer> keysUsages = data.getIntegerArrayList(SAVE_KEYRING_KEYS_USAGES);
                 long masterKeyId = data.getLong(SAVE_KEYRING_MASTER_KEY_ID);
 
                 /* Operation */
-                PGPMain.buildSecretKey(this, userIds, keys, keysUsages, masterKeyId, oldPassPhrase,
+                PgpMain.buildSecretKey(this, userIds, keys, keysUsages, masterKeyId, oldPassPhrase,
                         newPassPhrase, this);
                 PassphraseCacheService.addCachedPassphrase(this, masterKeyId, newPassPhrase);
 
                 /* Output */
-                sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_OKAY);
+                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY);
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
@@ -554,22 +554,22 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                 int keysize = data.getInt(GENERATE_KEY_KEY_SIZE);
                 PGPSecretKey masterKey = null;
                 if (data.containsKey(GENERATE_KEY_MASTER_KEY)) {
-                    masterKey = PGPConversionHelper.BytesToPGPSecretKey(data
+                    masterKey = PgpConversionHelper.BytesToPGPSecretKey(data
                             .getByteArray(GENERATE_KEY_MASTER_KEY));
                 }
 
                 /* Operation */
-                PGPSecretKeyRing newKeyRing = PGPMain.createKey(this, algorithm, keysize,
+                PGPSecretKeyRing newKeyRing = PgpMain.createKey(this, algorithm, keysize,
                         passphrase, masterKey);
 
                 /* Output */
                 Bundle resultData = new Bundle();
                 resultData.putByteArray(RESULT_NEW_KEY,
-                        PGPConversionHelper.PGPSecretKeyRingToBytes(newKeyRing));
+                        PgpConversionHelper.PGPSecretKeyRingToBytes(newKeyRing));
 
                 OtherHelper.logDebugBundle(resultData, "resultData");
 
-                sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_OKAY, resultData);
+                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, resultData);
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
@@ -583,22 +583,22 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                 String passphrase = data.getString(GENERATE_KEY_SYMMETRIC_PASSPHRASE);
 
                 /* Operation */
-                PGPSecretKeyRing masterKeyRing = PGPMain.createKey(this, Id.choice.algorithm.rsa,
+                PGPSecretKeyRing masterKeyRing = PgpMain.createKey(this, Id.choice.algorithm.rsa,
                         2048, passphrase, null);
 
-                PGPSecretKeyRing subKeyRing = PGPMain.createKey(this, Id.choice.algorithm.rsa,
+                PGPSecretKeyRing subKeyRing = PgpMain.createKey(this, Id.choice.algorithm.rsa,
                         2048, passphrase, masterKeyRing.getSecretKey());
 
                 /* Output */
                 Bundle resultData = new Bundle();
                 resultData.putByteArray(RESULT_NEW_KEY,
-                        PGPConversionHelper.PGPSecretKeyRingToBytes(masterKeyRing));
+                        PgpConversionHelper.PGPSecretKeyRingToBytes(masterKeyRing));
                 resultData.putByteArray(RESULT_NEW_KEY2,
-                        PGPConversionHelper.PGPSecretKeyRingToBytes(subKeyRing));
+                        PgpConversionHelper.PGPSecretKeyRingToBytes(subKeyRing));
 
                 OtherHelper.logDebugBundle(resultData, "resultData");
 
-                sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_OKAY, resultData);
+                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, resultData);
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
@@ -612,17 +612,17 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
 
                 /* Operation */
                 try {
-                    PGPMain.deleteFileSecurely(this, this, new File(deleteFile));
+                    PgpMain.deleteFileSecurely(this, this, new File(deleteFile));
                 } catch (FileNotFoundException e) {
-                    throw new PGPMain.ApgGeneralException(getString(R.string.error_fileNotFound,
+                    throw new PgpMain.PgpGeneralException(getString(R.string.error_fileNotFound,
                             deleteFile));
                 } catch (IOException e) {
-                    throw new PGPMain.ApgGeneralException(getString(
+                    throw new PgpMain.PgpGeneralException(getString(
                             R.string.error_fileDeleteFailed, deleteFile));
                 }
 
                 /* Output */
-                sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_OKAY);
+                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY);
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
@@ -670,9 +670,9 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                 }
 
                 Bundle resultData = new Bundle();
-                resultData = PGPMain.importKeyRings(this, inputData, this);
+                resultData = PgpMain.importKeyRings(this, inputData, this);
 
-                sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_OKAY, resultData);
+                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, resultData);
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
@@ -700,7 +700,7 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
 
                 // check if storage is ready
                 if (!FileHelper.isStorageMounted(outputFile)) {
-                    throw new ApgGeneralException(getString(R.string.error_externalStorageNotReady));
+                    throw new PgpGeneralException(getString(R.string.error_externalStorageNotReady));
                 }
 
                 // OutputStream
@@ -720,10 +720,10 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                 }
 
                 Bundle resultData = new Bundle();
-                resultData = PGPMain.exportKeyRings(this, keyRingMasterKeyIds, keyType, outStream,
+                resultData = PgpMain.exportKeyRings(this, keyRingMasterKeyIds, keyType, outStream,
                         this);
 
-                sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_OKAY, resultData);
+                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, resultData);
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
@@ -743,14 +743,14 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                 PGPPublicKeyRing keyring = ProviderHelper.getPGPPublicKeyRingByRowId(this,
                         keyRingRowId);
                 if (keyring != null) {
-                    boolean uploaded = PGPMain.uploadKeyRingToServer(server,
+                    boolean uploaded = PgpMain.uploadKeyRingToServer(server,
                             (PGPPublicKeyRing) keyring);
                     if (!uploaded) {
-                        throw new ApgGeneralException("Unable to export key to selected server");
+                        throw new PgpGeneralException("Unable to export key to selected server");
                     }
                 }
 
-                sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_OKAY);
+                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY);
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
@@ -781,7 +781,7 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                     resultData.putString(RESULT_QUERY_KEY_KEY_DATA, keyData);
                 }
 
-                sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_OKAY, resultData);
+                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY, resultData);
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
@@ -799,16 +799,16 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
                 String signaturePassPhrase = PassphraseCacheService.getCachedPassphrase(this,
                         masterKeyId);
 
-                PGPPublicKeyRing signedPubKeyRing = PGPMain.signKey(this, masterKeyId, pubKeyId,
+                PGPPublicKeyRing signedPubKeyRing = PgpMain.signKey(this, masterKeyId, pubKeyId,
                         signaturePassPhrase);
 
                 // store the signed key in our local cache
-                int retval = PGPMain.storeKeyRingInCache(this, signedPubKeyRing);
+                int retval = PgpMain.storeKeyRingInCache(this, signedPubKeyRing);
                 if (retval != Id.return_value.ok && retval != Id.return_value.updated) {
-                    throw new ApgGeneralException("Failed to store signed key in local cache");
+                    throw new PgpGeneralException("Failed to store signed key in local cache");
                 }
 
-                sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_OKAY);
+                sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_OKAY);
             } catch (Exception e) {
                 sendErrorToHandler(e);
             }
@@ -826,8 +826,8 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
         e.printStackTrace();
 
         Bundle data = new Bundle();
-        data.putString(ApgIntentServiceHandler.DATA_ERROR, e.getMessage());
-        sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_EXCEPTION, null, data);
+        data.putString(KeychainIntentServiceHandler.DATA_ERROR, e.getMessage());
+        sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_EXCEPTION, null, data);
     }
 
     private void sendMessageToHandler(Integer arg1, Integer arg2, Bundle data) {
@@ -866,12 +866,12 @@ public class ApgIntentService extends IntentService implements ProgressDialogUpd
 
         Bundle data = new Bundle();
         if (message != null) {
-            data.putString(ApgIntentServiceHandler.DATA_MESSAGE, message);
+            data.putString(KeychainIntentServiceHandler.DATA_MESSAGE, message);
         }
-        data.putInt(ApgIntentServiceHandler.DATA_PROGRESS, progress);
-        data.putInt(ApgIntentServiceHandler.DATA_PROGRESS_MAX, max);
+        data.putInt(KeychainIntentServiceHandler.DATA_PROGRESS, progress);
+        data.putInt(KeychainIntentServiceHandler.DATA_PROGRESS_MAX, max);
 
-        sendMessageToHandler(ApgIntentServiceHandler.MESSAGE_UPDATE_PROGRESS, null, data);
+        sendMessageToHandler(KeychainIntentServiceHandler.MESSAGE_UPDATE_PROGRESS, null, data);
     }
 
     public void setProgress(int resourceId, int progress, int max) {
diff --git a/APG/src/org/thialfihar/android/apg/service/ApgIntentServiceHandler.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
index 8494cf035..4e43f2b3e 100644
--- a/APG/src/org/thialfihar/android/apg/service/ApgIntentServiceHandler.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.service;
+package org.sufficientlysecure.keychain.service;
 
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.ui.dialog.ProgressDialogFragment;
+import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
+import org.sufficientlysecure.keychain.R;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -26,7 +26,7 @@ import android.os.Message;
 import android.support.v4.app.FragmentActivity;
 import android.widget.Toast;
 
-public class ApgIntentServiceHandler extends Handler {
+public class KeychainIntentServiceHandler extends Handler {
 
     // possible messages send from this service to handler on ui
     public static final int MESSAGE_OKAY = 1;
@@ -43,16 +43,16 @@ public class ApgIntentServiceHandler extends Handler {
     Activity mActivity;
     ProgressDialogFragment mProgressDialogFragment;
 
-    public ApgIntentServiceHandler(Activity activity) {
+    public KeychainIntentServiceHandler(Activity activity) {
         this.mActivity = activity;
     }
 
-    public ApgIntentServiceHandler(Activity activity, ProgressDialogFragment progressDialogFragment) {
+    public KeychainIntentServiceHandler(Activity activity, ProgressDialogFragment progressDialogFragment) {
         this.mActivity = activity;
         this.mProgressDialogFragment = progressDialogFragment;
     }
 
-    public ApgIntentServiceHandler(Activity activity, int progressDialogMessageId, int progressDialogStyle) {
+    public KeychainIntentServiceHandler(Activity activity, int progressDialogMessageId, int progressDialogStyle) {
         this.mActivity = activity;
         this.mProgressDialogFragment = ProgressDialogFragment.newInstance(progressDialogMessageId,
                 progressDialogStyle);
diff --git a/APG/src/org/thialfihar/android/apg/service/ApgKeyService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainKeyService.java
index 4a7d517c9..c0be8040f 100644
--- a/APG/src/org/thialfihar/android/apg/service/ApgKeyService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/KeychainKeyService.java
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.service;
+package org.sufficientlysecure.keychain.service;
 
 import java.util.ArrayList;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.service.handler.IApgGetKeyringsHandler;
-import org.thialfihar.android.apg.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.service.IKeychainKeyService;
+import org.sufficientlysecure.keychain.service.handler.IKeychainGetKeyringsHandler;
 
 import android.app.Service;
 import android.content.Context;
@@ -29,7 +30,7 @@ import android.content.Intent;
 import android.os.IBinder;
 import android.os.RemoteException;
 
-public class ApgKeyService extends Service {
+public class KeychainKeyService extends Service {
     Context mContext;
 
     @Override
@@ -54,7 +55,7 @@ public class ApgKeyService extends Service {
      * Synchronized implementation of getPublicKeyRings
      */
     private synchronized void getPublicKeyRingsSafe(long[] masterKeyIds,
-            boolean asAsciiArmoredStringArray, IApgGetKeyringsHandler handler)
+            boolean asAsciiArmoredStringArray, IKeychainGetKeyringsHandler handler)
             throws RemoteException {
         if (asAsciiArmoredStringArray) {
             ArrayList<String> output = ProviderHelper.getPublicKeyRingsAsArmoredString(mContext,
@@ -72,7 +73,7 @@ public class ApgKeyService extends Service {
      * Synchronized implementation of getSecretKeyRings
      */
     private synchronized void getSecretKeyRingsSafe(long[] masterKeyIds,
-            boolean asAsciiArmoredStringArray, IApgGetKeyringsHandler handler)
+            boolean asAsciiArmoredStringArray, IKeychainGetKeyringsHandler handler)
             throws RemoteException {
         if (asAsciiArmoredStringArray) {
             ArrayList<String> output = ProviderHelper.getSecretKeyRingsAsArmoredString(mContext,
@@ -93,17 +94,17 @@ public class ApgKeyService extends Service {
      * 
      * The real PGP code is located in PGPMain.
      */
-    private final IApgKeyService.Stub mBinder = new IApgKeyService.Stub() {
+    private final IKeychainKeyService.Stub mBinder = new IKeychainKeyService.Stub() {
 
         @Override
         public void getPublicKeyRings(long[] masterKeyIds, boolean asAsciiArmoredStringArray,
-                IApgGetKeyringsHandler handler) throws RemoteException {
+                IKeychainGetKeyringsHandler handler) throws RemoteException {
             getPublicKeyRingsSafe(masterKeyIds, asAsciiArmoredStringArray, handler);
         }
 
         @Override
         public void getSecretKeyRings(long[] masterKeyIds, boolean asAsciiArmoredStringArray,
-                IApgGetKeyringsHandler handler) throws RemoteException {
+                IKeychainGetKeyringsHandler handler) throws RemoteException {
             getSecretKeyRingsSafe(masterKeyIds, asAsciiArmoredStringArray, handler);
         }
 
diff --git a/APG/src/org/thialfihar/android/apg/service/PassphraseCacheService.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index c2bc48aa7..eb1232769 100644
--- a/APG/src/org/thialfihar/android/apg/service/PassphraseCacheService.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.service;
+package org.sufficientlysecure.keychain.service;
 
 import java.util.Date;
 import java.util.HashMap;
 
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.helper.Preferences;
-import org.thialfihar.android.apg.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.helper.Preferences;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -92,7 +92,7 @@ public class PassphraseCacheService extends Service {
             if (keyRing == null) {
                 return null;
             }
-            PGPSecretKey masterKey = PGPHelper.getMasterKey(keyRing);
+            PGPSecretKey masterKey = PgpHelper.getMasterKey(keyRing);
             if (masterKey == null) {
                 return null;
             }
diff --git a/APG/src/org/thialfihar/android/apg/service/handler/IApgDecryptHandler.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/handler/IKeychainDecryptHandler.aidl
index feb56bce6..31ead701d 100644
--- a/APG/src/org/thialfihar/android/apg/service/handler/IApgDecryptHandler.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/handler/IKeychainDecryptHandler.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service.handler;
+package org.sufficientlysecure.keychain.service.handler;
 
-interface IApgDecryptHandler {
+interface IKeychainDecryptHandler {
 
     oneway void onSuccess(in byte[] outputBytes, in String outputUri, in boolean signature,
             in long signatureKeyId, in String signatureUserId, in boolean signatureSuccess,
diff --git a/APG/src/org/thialfihar/android/apg/service/handler/IApgSignHandler.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/handler/IKeychainEncryptHandler.aidl
index cf91e8bc4..5b21a0613 100644
--- a/APG/src/org/thialfihar/android/apg/service/handler/IApgSignHandler.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/handler/IKeychainEncryptHandler.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service.handler;
+package org.sufficientlysecure.keychain.service.handler;
 
-interface IApgSignHandler {
+interface IKeychainEncryptHandler {
     /**
      * Either output or streamUri is given. One of them is null
      *
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgGetDecryptionKeyIdHandler.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetDecryptionKeyIdHandler.aidl
index 020a80b99..2fff74a92 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgGetDecryptionKeyIdHandler.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetDecryptionKeyIdHandler.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service.handler;
+package org.sufficientlysecure.keychain.service.handler;
 
-interface IApgGetDecryptionKeyIdHandler {
+interface IKeychainGetDecryptionKeyIdHandler {
 
     oneway void onSuccess(in long secretKeyId, in boolean symmetric);
 
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgGetKeyringsHandler.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetKeyringsHandler.aidl
index ffa9d0d2d..c3a7d1faf 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgGetKeyringsHandler.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetKeyringsHandler.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service.handler;
+package org.sufficientlysecure.keychain.service.handler;
 
-interface IApgGetKeyringsHandler {
+interface IKeychainGetKeyringsHandler {
     /**
      * Either outputBytes or outputString is given. One of them is null
      *
diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgSignHandler.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/handler/IKeychainSignHandler.aidl
index cf91e8bc4..69badab4c 100644
--- a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgSignHandler.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/handler/IKeychainSignHandler.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service.handler;
+package org.sufficientlysecure.keychain.service.handler;
 
-interface IApgSignHandler {
+interface IKeychainSignHandler {
     /**
      * Either output or streamUri is given. One of them is null
      *
diff --git a/APG/src/org/thialfihar/android/apg/service/handler/IApgVerifyHandler.aidl b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/handler/IKeychainVerifyHandler.aidl
index 6baaec758..aaa9a7f6a 100644
--- a/APG/src/org/thialfihar/android/apg/service/handler/IApgVerifyHandler.aidl
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/service/handler/IKeychainVerifyHandler.aidl
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
  
-package org.thialfihar.android.apg.service.handler;
+package org.sufficientlysecure.keychain.service.handler;
 
-interface IApgVerifyHandler {
+interface IKeychainVerifyHandler {
 
     oneway void onSuccess(in boolean signature, in long signatureKeyId,
             in String signatureUserId, in boolean signatureSuccess, in boolean signatureUnknown);
diff --git a/APG/src/org/thialfihar/android/apg/ui/DecryptActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java
index 671b2b48e..87b1204a4 100644
--- a/APG/src/org/thialfihar/android/apg/ui/DecryptActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/DecryptActivity.java
@@ -15,25 +15,26 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import org.spongycastle.openpgp.PGPPublicKeyRing;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.compatibility.ClipboardReflection;
-import org.thialfihar.android.apg.helper.FileHelper;
-import org.thialfihar.android.apg.helper.OtherHelper;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.helper.PGPMain;
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.service.ApgIntentServiceHandler;
-import org.thialfihar.android.apg.service.ApgIntentService;
-import org.thialfihar.android.apg.service.PassphraseCacheService;
-import org.thialfihar.android.apg.ui.dialog.DeleteFileDialogFragment;
-import org.thialfihar.android.apg.ui.dialog.FileDialogFragment;
-import org.thialfihar.android.apg.ui.dialog.LookupUnknownKeyDialogFragment;
-import org.thialfihar.android.apg.ui.dialog.PassphraseDialogFragment;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.compatibility.ClipboardReflection;
+import org.sufficientlysecure.keychain.helper.FileHelper;
+import org.sufficientlysecure.keychain.helper.OtherHelper;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.service.PassphraseCacheService;
+import org.sufficientlysecure.keychain.ui.dialog.DeleteFileDialogFragment;
+import org.sufficientlysecure.keychain.ui.dialog.FileDialogFragment;
+import org.sufficientlysecure.keychain.ui.dialog.LookupUnknownKeyDialogFragment;
+import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
@@ -46,7 +47,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
-import org.thialfihar.android.apg.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.animation.AnimationUtils;
@@ -268,9 +268,9 @@ public class DecryptActivity extends SherlockFragmentActivity {
 
             String data = "";
             if (clipboardText != null) {
-                Matcher matcher = PGPMain.PGP_MESSAGE.matcher(clipboardText);
+                Matcher matcher = PgpMain.PGP_MESSAGE.matcher(clipboardText);
                 if (!matcher.matches()) {
-                    matcher = PGPMain.PGP_SIGNED_MESSAGE.matcher(clipboardText);
+                    matcher = PgpMain.PGP_SIGNED_MESSAGE.matcher(clipboardText);
                 }
                 if (matcher.matches()) {
                     data = matcher.group(1);
@@ -407,7 +407,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
             }
             if (textData != null) {
                 Log.d(Constants.TAG, "textData null, matching text ...");
-                Matcher matcher = PGPMain.PGP_MESSAGE.matcher(textData);
+                Matcher matcher = PgpMain.PGP_MESSAGE.matcher(textData);
                 if (matcher.matches()) {
                     Log.d(Constants.TAG, "PGP_MESSAGE matched");
                     textData = matcher.group(1);
@@ -415,7 +415,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
                     textData = textData.replaceAll("\\xa0", " ");
                     mMessage.setText(textData);
                 } else {
-                    matcher = PGPMain.PGP_SIGNED_MESSAGE.matcher(textData);
+                    matcher = PgpMain.PGP_SIGNED_MESSAGE.matcher(textData);
                     if (matcher.matches()) {
                         Log.d(Constants.TAG, "PGP_SIGNED_MESSAGE matched");
                         textData = matcher.group(1);
@@ -461,14 +461,14 @@ public class DecryptActivity extends SherlockFragmentActivity {
                 mDataBytes = extras.getByteArray(EXTRA_DATA);
                 String data = extras.getString(EXTRA_TEXT);
                 if (data != null) {
-                    Matcher matcher = PGPMain.PGP_MESSAGE.matcher(data);
+                    Matcher matcher = PgpMain.PGP_MESSAGE.matcher(data);
                     if (matcher.matches()) {
                         data = matcher.group(1);
                         // replace non breakable spaces
                         data = data.replaceAll("\\xa0", " ");
                         mMessage.setText(data);
                     } else {
-                        matcher = PGPMain.PGP_SIGNED_MESSAGE.matcher(data);
+                        matcher = PgpMain.PGP_SIGNED_MESSAGE.matcher(data);
                         if (matcher.matches()) {
                             data = matcher.group(1);
                             // replace non breakable spaces
@@ -559,7 +559,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
 
         if (mDecryptTarget == Id.target.message) {
             String messageData = mMessage.getText().toString();
-            Matcher matcher = PGPMain.PGP_SIGNED_MESSAGE.matcher(messageData);
+            Matcher matcher = PgpMain.PGP_SIGNED_MESSAGE.matcher(messageData);
             if (matcher.matches()) {
                 mSignedOnly = true;
                 decryptStart();
@@ -613,7 +613,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
                     messenger, mSecretKeyId);
 
             passphraseDialog.show(getSupportFragmentManager(), "passphraseDialog");
-        } catch (PGPMain.ApgGeneralException e) {
+        } catch (PgpMain.PgpGeneralException e) {
             Log.d(Constants.TAG, "No passphrase for this secret key, encrypt directly!");
             // send message to handler to start encryption directly
             returnHandler.sendEmptyMessage(PassphraseDialogFragment.MESSAGE_OKAY);
@@ -659,16 +659,16 @@ public class DecryptActivity extends SherlockFragmentActivity {
         // get decryption key for this inStream
         try {
             try {
-                mSecretKeyId = PGPMain.getDecryptionKeyId(this, inStream);
+                mSecretKeyId = PgpMain.getDecryptionKeyId(this, inStream);
                 if (mSecretKeyId == Id.key.none) {
-                    throw new PGPMain.ApgGeneralException(
+                    throw new PgpMain.PgpGeneralException(
                             getString(R.string.error_noSecretKeyFound));
                 }
                 mAssumeSymmetricEncryption = false;
-            } catch (PGPMain.NoAsymmetricEncryptionException e) {
+            } catch (PgpMain.NoAsymmetricEncryptionException e) {
                 mSecretKeyId = Id.key.symmetric;
-                if (!PGPMain.hasSymmetricEncryption(this, inStream)) {
-                    throw new PGPMain.ApgGeneralException(
+                if (!PgpMain.hasSymmetricEncryption(this, inStream)) {
+                    throw new PgpMain.PgpGeneralException(
                             getString(R.string.error_noKnownEncryptionFound));
                 }
                 mAssumeSymmetricEncryption = true;
@@ -746,62 +746,62 @@ public class DecryptActivity extends SherlockFragmentActivity {
         Log.d(Constants.TAG, "decryptStart");
 
         // Send all information needed to service to decrypt in other thread
-        Intent intent = new Intent(this, ApgIntentService.class);
+        Intent intent = new Intent(this, KeychainIntentService.class);
 
         // fill values for this action
         Bundle data = new Bundle();
 
-        intent.putExtra(ApgIntentService.EXTRA_ACTION, ApgIntentService.ACTION_DECRYPT_VERIFY);
+        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_DECRYPT_VERIFY);
 
         // choose action based on input: decrypt stream, file or bytes
         if (mContentUri != null) {
-            data.putInt(ApgIntentService.TARGET, ApgIntentService.TARGET_STREAM);
+            data.putInt(KeychainIntentService.TARGET, KeychainIntentService.TARGET_STREAM);
 
-            data.putParcelable(ApgIntentService.ENCRYPT_PROVIDER_URI, mContentUri);
+            data.putParcelable(KeychainIntentService.ENCRYPT_PROVIDER_URI, mContentUri);
         } else if (mDecryptTarget == Id.target.file) {
-            data.putInt(ApgIntentService.TARGET, ApgIntentService.TARGET_FILE);
+            data.putInt(KeychainIntentService.TARGET, KeychainIntentService.TARGET_FILE);
 
             Log.d(Constants.TAG, "mInputFilename=" + mInputFilename + ", mOutputFilename="
                     + mOutputFilename);
 
-            data.putString(ApgIntentService.ENCRYPT_INPUT_FILE, mInputFilename);
-            data.putString(ApgIntentService.ENCRYPT_OUTPUT_FILE, mOutputFilename);
+            data.putString(KeychainIntentService.ENCRYPT_INPUT_FILE, mInputFilename);
+            data.putString(KeychainIntentService.ENCRYPT_OUTPUT_FILE, mOutputFilename);
         } else {
-            data.putInt(ApgIntentService.TARGET, ApgIntentService.TARGET_BYTES);
+            data.putInt(KeychainIntentService.TARGET, KeychainIntentService.TARGET_BYTES);
 
             if (mDataBytes != null) {
-                data.putByteArray(ApgIntentService.DECRYPT_CIPHERTEXT_BYTES, mDataBytes);
+                data.putByteArray(KeychainIntentService.DECRYPT_CIPHERTEXT_BYTES, mDataBytes);
             } else {
                 String message = mMessage.getText().toString();
-                data.putByteArray(ApgIntentService.DECRYPT_CIPHERTEXT_BYTES, message.getBytes());
+                data.putByteArray(KeychainIntentService.DECRYPT_CIPHERTEXT_BYTES, message.getBytes());
             }
         }
 
-        data.putLong(ApgIntentService.ENCRYPT_SECRET_KEY_ID, mSecretKeyId);
+        data.putLong(KeychainIntentService.ENCRYPT_SECRET_KEY_ID, mSecretKeyId);
 
-        data.putBoolean(ApgIntentService.DECRYPT_SIGNED_ONLY, mSignedOnly);
-        data.putBoolean(ApgIntentService.DECRYPT_LOOKUP_UNKNOWN_KEY, mLookupUnknownKey);
-        data.putBoolean(ApgIntentService.DECRYPT_RETURN_BYTES, mReturnBinary);
-        data.putBoolean(ApgIntentService.DECRYPT_ASSUME_SYMMETRIC, mAssumeSymmetricEncryption);
+        data.putBoolean(KeychainIntentService.DECRYPT_SIGNED_ONLY, mSignedOnly);
+        data.putBoolean(KeychainIntentService.DECRYPT_LOOKUP_UNKNOWN_KEY, mLookupUnknownKey);
+        data.putBoolean(KeychainIntentService.DECRYPT_RETURN_BYTES, mReturnBinary);
+        data.putBoolean(KeychainIntentService.DECRYPT_ASSUME_SYMMETRIC, mAssumeSymmetricEncryption);
 
-        intent.putExtra(ApgIntentService.EXTRA_DATA, data);
+        intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
         // Message is received after encrypting is done in ApgService
-        ApgIntentServiceHandler saveHandler = new ApgIntentServiceHandler(this,
+        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                 R.string.progress_decrypting, ProgressDialog.STYLE_HORIZONTAL) {
             public void handleMessage(Message message) {
                 // handle messages by standard ApgHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == ApgIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
                     // get returned data bundle
                     Bundle returnData = message.getData();
 
                     // if key is unknown show lookup dialog
-                    if (returnData.getBoolean(ApgIntentService.RESULT_SIGNATURE_LOOKUP_KEY)
+                    if (returnData.getBoolean(KeychainIntentService.RESULT_SIGNATURE_LOOKUP_KEY)
                             && mLookupUnknownKey) {
                         mUnknownSignatureKeyId = returnData
-                                .getLong(ApgIntentService.RESULT_SIGNATURE_KEY_ID);
+                                .getLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID);
                         lookupUnknownKey(mUnknownSignatureKeyId);
                         return;
                     }
@@ -826,7 +826,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
                     switch (mDecryptTarget) {
                     case Id.target.message:
                         String decryptedMessage = returnData
-                                .getString(ApgIntentService.RESULT_DECRYPTED_STRING);
+                                .getString(KeychainIntentService.RESULT_DECRYPTED_STRING);
                         mMessage.setText(decryptedMessage);
                         mMessage.setHorizontallyScrolling(false);
                         mReplyEnabled = false;
@@ -850,13 +850,13 @@ public class DecryptActivity extends SherlockFragmentActivity {
 
                     }
 
-                    if (returnData.getBoolean(ApgIntentService.RESULT_SIGNATURE)) {
+                    if (returnData.getBoolean(KeychainIntentService.RESULT_SIGNATURE)) {
                         String userId = returnData
-                                .getString(ApgIntentService.RESULT_SIGNATURE_USER_ID);
+                                .getString(KeychainIntentService.RESULT_SIGNATURE_USER_ID);
                         mSignatureKeyId = returnData
-                                .getLong(ApgIntentService.RESULT_SIGNATURE_KEY_ID);
+                                .getLong(KeychainIntentService.RESULT_SIGNATURE_KEY_ID);
                         mUserIdRest
-                                .setText("id: " + PGPHelper.getSmallFingerPrint(mSignatureKeyId));
+                                .setText("id: " + PgpHelper.getSmallFingerPrint(mSignatureKeyId));
                         if (userId == null) {
                             userId = getResources().getString(R.string.unknownUserId);
                         }
@@ -867,9 +867,9 @@ public class DecryptActivity extends SherlockFragmentActivity {
                         }
                         mUserId.setText(userId);
 
-                        if (returnData.getBoolean(ApgIntentService.RESULT_SIGNATURE_SUCCESS)) {
+                        if (returnData.getBoolean(KeychainIntentService.RESULT_SIGNATURE_SUCCESS)) {
                             mSignatureStatusImage.setImageResource(R.drawable.overlay_ok);
-                        } else if (returnData.getBoolean(ApgIntentService.RESULT_SIGNATURE_UNKNOWN)) {
+                        } else if (returnData.getBoolean(KeychainIntentService.RESULT_SIGNATURE_UNKNOWN)) {
                             mSignatureStatusImage.setImageResource(R.drawable.overlay_error);
                             Toast.makeText(DecryptActivity.this,
                                     R.string.unknownSignatureKeyTouchToLookUp, Toast.LENGTH_LONG)
@@ -885,7 +885,7 @@ public class DecryptActivity extends SherlockFragmentActivity {
 
         // Create a new Messenger for the communication back
         Messenger messenger = new Messenger(saveHandler);
-        intent.putExtra(ApgIntentService.EXTRA_MESSENGER, messenger);
+        intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
         // show progress dialog
         saveHandler.showProgressDialog(this);
diff --git a/APG/src/org/thialfihar/android/apg/ui/EditKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index 39074bcea..73a1234c4 100644
--- a/APG/src/org/thialfihar/android/apg/ui/EditKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -15,26 +15,27 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.helper.OtherHelper;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.helper.PGPMain;
-import org.thialfihar.android.apg.helper.PGPConversionHelper;
-import org.thialfihar.android.apg.helper.PGPMain.ApgGeneralException;
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.service.ApgIntentServiceHandler;
-import org.thialfihar.android.apg.service.ApgIntentService;
-import org.thialfihar.android.apg.ui.dialog.SetPassphraseDialogFragment;
-import org.thialfihar.android.apg.ui.widget.KeyEditor;
-import org.thialfihar.android.apg.ui.widget.SectionView;
-import org.thialfihar.android.apg.ui.widget.UserIdEditor;
-import org.thialfihar.android.apg.util.IterableIterator;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.OtherHelper;
+import org.sufficientlysecure.keychain.helper.PgpConversionHelper;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.helper.PgpMain.PgpGeneralException;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.ui.dialog.SetPassphraseDialogFragment;
+import org.sufficientlysecure.keychain.ui.widget.KeyEditor;
+import org.sufficientlysecure.keychain.ui.widget.SectionView;
+import org.sufficientlysecure.keychain.ui.widget.UserIdEditor;
+import org.sufficientlysecure.keychain.util.IterableIterator;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
@@ -48,7 +49,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
-import org.thialfihar.android.apg.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -235,33 +235,33 @@ public class EditKeyActivity extends SherlockFragmentActivity {
                     mBuildLayout = false;
 
                     // Send all information needed to service generate keys in other thread
-                    Intent serviceIntent = new Intent(this, ApgIntentService.class);
-                    serviceIntent.putExtra(ApgIntentService.EXTRA_ACTION,
-                            ApgIntentService.ACTION_GENERATE_DEFAULT_RSA_KEYS);
+                    Intent serviceIntent = new Intent(this, KeychainIntentService.class);
+                    serviceIntent.putExtra(KeychainIntentService.EXTRA_ACTION,
+                            KeychainIntentService.ACTION_GENERATE_DEFAULT_RSA_KEYS);
 
                     // fill values for this action
                     Bundle data = new Bundle();
-                    data.putString(ApgIntentService.GENERATE_KEY_SYMMETRIC_PASSPHRASE,
+                    data.putString(KeychainIntentService.GENERATE_KEY_SYMMETRIC_PASSPHRASE,
                             mCurrentPassPhrase);
 
-                    serviceIntent.putExtra(ApgIntentService.EXTRA_DATA, data);
+                    serviceIntent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
                     // Message is received after generating is done in ApgService
-                    ApgIntentServiceHandler saveHandler = new ApgIntentServiceHandler(this,
+                    KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                             R.string.progress_generating, ProgressDialog.STYLE_SPINNER) {
                         public void handleMessage(Message message) {
                             // handle messages by standard ApgHandler first
                             super.handleMessage(message);
 
-                            if (message.arg1 == ApgIntentServiceHandler.MESSAGE_OKAY) {
+                            if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
                                 // get new key from data bundle returned from service
                                 Bundle data = message.getData();
-                                PGPSecretKeyRing masterKeyRing = (PGPSecretKeyRing) PGPConversionHelper
+                                PGPSecretKeyRing masterKeyRing = (PGPSecretKeyRing) PgpConversionHelper
                                         .BytesToPGPKeyRing(data
-                                                .getByteArray(ApgIntentService.RESULT_NEW_KEY));
-                                PGPSecretKeyRing subKeyRing = (PGPSecretKeyRing) PGPConversionHelper
+                                                .getByteArray(KeychainIntentService.RESULT_NEW_KEY));
+                                PGPSecretKeyRing subKeyRing = (PGPSecretKeyRing) PgpConversionHelper
                                         .BytesToPGPKeyRing(data
-                                                .getByteArray(ApgIntentService.RESULT_NEW_KEY2));
+                                                .getByteArray(KeychainIntentService.RESULT_NEW_KEY2));
 
                                 // add master key
                                 @SuppressWarnings("unchecked")
@@ -283,7 +283,7 @@ public class EditKeyActivity extends SherlockFragmentActivity {
 
                     // Create a new Messenger for the communication back
                     Messenger messenger = new Messenger(saveHandler);
-                    serviceIntent.putExtra(ApgIntentService.EXTRA_MESSENGER, messenger);
+                    serviceIntent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
                     saveHandler.showProgressDialog(this);
 
@@ -305,7 +305,7 @@ public class EditKeyActivity extends SherlockFragmentActivity {
 
         mActionBar.setTitle(R.string.title_editKey);
 
-        mCurrentPassPhrase = PGPMain.getEditPassPhrase();
+        mCurrentPassPhrase = PgpMain.getEditPassPhrase();
         if (mCurrentPassPhrase == null) {
             mCurrentPassPhrase = "";
         }
@@ -324,7 +324,7 @@ public class EditKeyActivity extends SherlockFragmentActivity {
                     PGPSecretKey masterKey = null;
                     mKeyRing = ProviderHelper.getPGPSecretKeyRingByMasterKeyId(this, keyId);
                     if (mKeyRing != null) {
-                        masterKey = PGPHelper.getMasterKey(mKeyRing);
+                        masterKey = PgpHelper.getMasterKey(mKeyRing);
                         for (PGPSecretKey key : new IterableIterator<PGPSecretKey>(
                                 mKeyRing.getSecretKeys())) {
                             mKeys.add(key);
@@ -421,43 +421,43 @@ public class EditKeyActivity extends SherlockFragmentActivity {
     private void saveClicked() {
         try {
             if (!isPassphraseSet()) {
-                throw new PGPMain.ApgGeneralException(this.getString(R.string.setAPassPhrase));
+                throw new PgpMain.PgpGeneralException(this.getString(R.string.setAPassPhrase));
             }
 
             // Send all information needed to service to edit key in other thread
-            Intent intent = new Intent(this, ApgIntentService.class);
+            Intent intent = new Intent(this, KeychainIntentService.class);
 
-            intent.putExtra(ApgIntentService.EXTRA_ACTION, ApgIntentService.ACTION_SAVE_KEYRING);
+            intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_SAVE_KEYRING);
 
             // fill values for this action
             Bundle data = new Bundle();
-            data.putString(ApgIntentService.SAVE_KEYRING_CURRENT_PASSPHRASE, mCurrentPassPhrase);
-            data.putString(ApgIntentService.SAVE_KEYRING_NEW_PASSPHRASE, mNewPassPhrase);
-            data.putStringArrayList(ApgIntentService.SAVE_KEYRING_USER_IDS,
+            data.putString(KeychainIntentService.SAVE_KEYRING_CURRENT_PASSPHRASE, mCurrentPassPhrase);
+            data.putString(KeychainIntentService.SAVE_KEYRING_NEW_PASSPHRASE, mNewPassPhrase);
+            data.putStringArrayList(KeychainIntentService.SAVE_KEYRING_USER_IDS,
                     getUserIds(mUserIdsView));
             ArrayList<PGPSecretKey> keys = getKeys(mKeysView);
-            data.putByteArray(ApgIntentService.SAVE_KEYRING_KEYS,
-                    PGPConversionHelper.PGPSecretKeyArrayListToBytes(keys));
-            data.putIntegerArrayList(ApgIntentService.SAVE_KEYRING_KEYS_USAGES,
+            data.putByteArray(KeychainIntentService.SAVE_KEYRING_KEYS,
+                    PgpConversionHelper.PGPSecretKeyArrayListToBytes(keys));
+            data.putIntegerArrayList(KeychainIntentService.SAVE_KEYRING_KEYS_USAGES,
                     getKeysUsages(mKeysView));
-            data.putLong(ApgIntentService.SAVE_KEYRING_MASTER_KEY_ID, getMasterKeyId());
+            data.putLong(KeychainIntentService.SAVE_KEYRING_MASTER_KEY_ID, getMasterKeyId());
 
-            intent.putExtra(ApgIntentService.EXTRA_DATA, data);
+            intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
             // Message is received after saving is done in ApgService
-            ApgIntentServiceHandler saveHandler = new ApgIntentServiceHandler(this,
+            KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                     R.string.progress_saving, ProgressDialog.STYLE_HORIZONTAL) {
                 public void handleMessage(Message message) {
                     // handle messages by standard ApgHandler first
                     super.handleMessage(message);
 
-                    if (message.arg1 == ApgIntentServiceHandler.MESSAGE_OKAY) {
+                    if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
                         Intent data = new Intent();
                         data.putExtra(RESULT_EXTRA_MASTER_KEY_ID, getMasterKeyId());
                         ArrayList<String> userIds = null;
                         try {
                             userIds = getUserIds(mUserIdsView);
-                        } catch (ApgGeneralException e) {
+                        } catch (PgpGeneralException e) {
                             Log.e(Constants.TAG, "exception while getting user ids", e);
                         }
                         data.putExtra(RESULT_EXTRA_USER_ID, userIds.get(0));
@@ -469,13 +469,13 @@ public class EditKeyActivity extends SherlockFragmentActivity {
 
             // Create a new Messenger for the communication back
             Messenger messenger = new Messenger(saveHandler);
-            intent.putExtra(ApgIntentService.EXTRA_MESSENGER, messenger);
+            intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
             saveHandler.showProgressDialog(this);
 
             // start service with intent
             startService(intent);
-        } catch (PGPMain.ApgGeneralException e) {
+        } catch (PgpMain.PgpGeneralException e) {
             Toast.makeText(this, getString(R.string.errorMessage, e.getMessage()),
                     Toast.LENGTH_SHORT).show();
         }
@@ -493,7 +493,7 @@ public class EditKeyActivity extends SherlockFragmentActivity {
      * @return
      */
     private ArrayList<String> getUserIds(SectionView userIdsView)
-            throws PGPMain.ApgGeneralException {
+            throws PgpMain.PgpGeneralException {
         ArrayList<String> userIds = new ArrayList<String>();
 
         ViewGroup userIdEditors = userIdsView.getEditors();
@@ -505,13 +505,13 @@ public class EditKeyActivity extends SherlockFragmentActivity {
             try {
                 userId = editor.getValue();
             } catch (UserIdEditor.NoNameException e) {
-                throw new PGPMain.ApgGeneralException(
+                throw new PgpMain.PgpGeneralException(
                         this.getString(R.string.error_userIdNeedsAName));
             } catch (UserIdEditor.NoEmailException e) {
-                throw new PGPMain.ApgGeneralException(
+                throw new PgpMain.PgpGeneralException(
                         this.getString(R.string.error_userIdNeedsAnEmailAddress));
             } catch (UserIdEditor.InvalidEmailException e) {
-                throw new PGPMain.ApgGeneralException(e.getMessage());
+                throw new PgpMain.PgpGeneralException(e.getMessage());
             }
 
             if (userId.equals("")) {
@@ -527,11 +527,11 @@ public class EditKeyActivity extends SherlockFragmentActivity {
         }
 
         if (userIds.size() == 0) {
-            throw new PGPMain.ApgGeneralException(getString(R.string.error_keyNeedsAUserId));
+            throw new PgpMain.PgpGeneralException(getString(R.string.error_keyNeedsAUserId));
         }
 
         if (!gotMainUserId) {
-            throw new PGPMain.ApgGeneralException(
+            throw new PgpMain.PgpGeneralException(
                     getString(R.string.error_mainUserIdMustNotBeEmpty));
         }
 
@@ -545,13 +545,13 @@ public class EditKeyActivity extends SherlockFragmentActivity {
      * @return
      */
     private ArrayList<PGPSecretKey> getKeys(SectionView keysView)
-            throws PGPMain.ApgGeneralException {
+            throws PgpMain.PgpGeneralException {
         ArrayList<PGPSecretKey> keys = new ArrayList<PGPSecretKey>();
 
         ViewGroup keyEditors = keysView.getEditors();
 
         if (keyEditors.getChildCount() == 0) {
-            throw new PGPMain.ApgGeneralException(getString(R.string.error_keyNeedsMasterKey));
+            throw new PgpMain.PgpGeneralException(getString(R.string.error_keyNeedsMasterKey));
         }
 
         for (int i = 0; i < keyEditors.getChildCount(); ++i) {
@@ -569,13 +569,13 @@ public class EditKeyActivity extends SherlockFragmentActivity {
      * @return
      */
     private ArrayList<Integer> getKeysUsages(SectionView keysView)
-            throws PGPMain.ApgGeneralException {
+            throws PgpMain.PgpGeneralException {
         ArrayList<Integer> getKeysUsages = new ArrayList<Integer>();
 
         ViewGroup keyEditors = keysView.getEditors();
 
         if (keyEditors.getChildCount() == 0) {
-            throw new PGPMain.ApgGeneralException(getString(R.string.error_keyNeedsMasterKey));
+            throw new PgpMain.PgpGeneralException(getString(R.string.error_keyNeedsMasterKey));
         }
 
         for (int i = 0; i < keyEditors.getChildCount(); ++i) {
diff --git a/APG/src/org/thialfihar/android/apg/ui/EncryptActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index b0c6aa957..bb61fb890 100644
--- a/APG/src/org/thialfihar/android/apg/ui/EncryptActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -15,29 +15,30 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import org.spongycastle.openpgp.PGPPublicKey;
 import org.spongycastle.openpgp.PGPPublicKeyRing;
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.compatibility.ClipboardReflection;
-import org.thialfihar.android.apg.helper.FileHelper;
-import org.thialfihar.android.apg.helper.OtherHelper;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.helper.PGPMain;
-import org.thialfihar.android.apg.helper.Preferences;
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.service.ApgIntentServiceHandler;
-import org.thialfihar.android.apg.service.ApgIntentService;
-import org.thialfihar.android.apg.service.PassphraseCacheService;
-import org.thialfihar.android.apg.ui.dialog.DeleteFileDialogFragment;
-import org.thialfihar.android.apg.ui.dialog.FileDialogFragment;
-import org.thialfihar.android.apg.ui.dialog.PassphraseDialogFragment;
-import org.thialfihar.android.apg.util.Choice;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.compatibility.ClipboardReflection;
+import org.sufficientlysecure.keychain.helper.FileHelper;
+import org.sufficientlysecure.keychain.helper.OtherHelper;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.helper.Preferences;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.service.PassphraseCacheService;
+import org.sufficientlysecure.keychain.ui.dialog.DeleteFileDialogFragment;
+import org.sufficientlysecure.keychain.ui.dialog.FileDialogFragment;
+import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
+import org.sufficientlysecure.keychain.util.Choice;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
@@ -50,7 +51,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
-import org.thialfihar.android.apg.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.animation.AnimationUtils;
@@ -357,9 +357,9 @@ public class EncryptActivity extends SherlockFragmentActivity {
                     preselectedSignatureKeyId);
             PGPSecretKey masterKey = null;
             if (keyRing != null) {
-                masterKey = PGPHelper.getMasterKey(keyRing);
+                masterKey = PgpHelper.getMasterKey(keyRing);
                 if (masterKey != null) {
-                    Vector<PGPSecretKey> signKeys = PGPHelper.getUsableSigningKeys(keyRing);
+                    Vector<PGPSecretKey> signKeys = PgpHelper.getUsableSigningKeys(keyRing);
                     if (signKeys.size() > 0) {
                         mSecretKeyId = masterKey.getKeyID();
                     }
@@ -376,11 +376,11 @@ public class EncryptActivity extends SherlockFragmentActivity {
                 if (keyRing == null) {
                     continue;
                 }
-                masterKey = PGPHelper.getMasterKey(keyRing);
+                masterKey = PgpHelper.getMasterKey(keyRing);
                 if (masterKey == null) {
                     continue;
                 }
-                Vector<PGPPublicKey> encryptKeys = PGPHelper.getUsableEncryptKeys(keyRing);
+                Vector<PGPPublicKey> encryptKeys = PgpHelper.getUsableEncryptKeys(keyRing);
                 if (encryptKeys.size() == 0) {
                     continue;
                 }
@@ -636,7 +636,7 @@ public class EncryptActivity extends SherlockFragmentActivity {
                     EncryptActivity.this, messenger, mSecretKeyId);
 
             passphraseDialog.show(getSupportFragmentManager(), "passphraseDialog");
-        } catch (PGPMain.ApgGeneralException e) {
+        } catch (PgpMain.PgpGeneralException e) {
             Log.d(Constants.TAG, "No passphrase for this secret key, encrypt directly!");
             // send message to handler to start encryption directly
             returnHandler.sendEmptyMessage(PassphraseDialogFragment.MESSAGE_OKAY);
@@ -669,7 +669,7 @@ public class EncryptActivity extends SherlockFragmentActivity {
 
     private void encryptStart() {
         // Send all information needed to service to edit key in other thread
-        Intent intent = new Intent(this, ApgIntentService.class);
+        Intent intent = new Intent(this, KeychainIntentService.class);
 
         // fill values for this action
         Bundle data = new Bundle();
@@ -686,46 +686,46 @@ public class EncryptActivity extends SherlockFragmentActivity {
                 passPhrase = null;
             }
 
-            data.putString(ApgIntentService.GENERATE_KEY_SYMMETRIC_PASSPHRASE, passPhrase);
+            data.putString(KeychainIntentService.GENERATE_KEY_SYMMETRIC_PASSPHRASE, passPhrase);
         } else {
             encryptionKeyIds = mEncryptionKeyIds;
             signOnly = (mEncryptionKeyIds == null || mEncryptionKeyIds.length == 0);
         }
 
-        intent.putExtra(ApgIntentService.EXTRA_ACTION, ApgIntentService.ACTION_ENCRYPT_SIGN);
+        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_ENCRYPT_SIGN);
 
         // choose default settings, target and data bundle by target
         if (mStreamAndReturnUri != null) {
             // mIntentDataUri is only defined when ACTION_ENCRYPT_STREAM_AND_RETURN is used
-            data.putInt(ApgIntentService.TARGET, ApgIntentService.TARGET_STREAM);
-            data.putParcelable(ApgIntentService.ENCRYPT_PROVIDER_URI, mStreamAndReturnUri);
+            data.putInt(KeychainIntentService.TARGET, KeychainIntentService.TARGET_STREAM);
+            data.putParcelable(KeychainIntentService.ENCRYPT_PROVIDER_URI, mStreamAndReturnUri);
 
         } else if (mEncryptTarget == Id.target.file) {
             useAsciiArmor = mAsciiArmour.isChecked();
             compressionId = ((Choice) mFileCompression.getSelectedItem()).getId();
 
-            data.putInt(ApgIntentService.TARGET, ApgIntentService.TARGET_FILE);
+            data.putInt(KeychainIntentService.TARGET, KeychainIntentService.TARGET_FILE);
 
             Log.d(Constants.TAG, "mInputFilename=" + mInputFilename + ", mOutputFilename="
                     + mOutputFilename);
 
-            data.putString(ApgIntentService.ENCRYPT_INPUT_FILE, mInputFilename);
-            data.putString(ApgIntentService.ENCRYPT_OUTPUT_FILE, mOutputFilename);
+            data.putString(KeychainIntentService.ENCRYPT_INPUT_FILE, mInputFilename);
+            data.putString(KeychainIntentService.ENCRYPT_OUTPUT_FILE, mOutputFilename);
 
         } else {
             useAsciiArmor = true;
             compressionId = Preferences.getPreferences(this).getDefaultMessageCompression();
 
-            data.putInt(ApgIntentService.TARGET, ApgIntentService.TARGET_BYTES);
+            data.putInt(KeychainIntentService.TARGET, KeychainIntentService.TARGET_BYTES);
 
             if (mData != null) {
-                data.putByteArray(ApgIntentService.ENCRYPT_MESSAGE_BYTES, mData);
+                data.putByteArray(KeychainIntentService.ENCRYPT_MESSAGE_BYTES, mData);
             } else {
                 String message = mMessage.getText().toString();
                 if (signOnly && !mEncryptImmediately) {
                     fixBadCharactersForGmail(message);
                 }
-                data.putByteArray(ApgIntentService.ENCRYPT_MESSAGE_BYTES, message.getBytes());
+                data.putByteArray(KeychainIntentService.ENCRYPT_MESSAGE_BYTES, message.getBytes());
             }
         }
 
@@ -733,30 +733,30 @@ public class EncryptActivity extends SherlockFragmentActivity {
             useAsciiArmor = mAsciiArmorDemand;
         }
 
-        data.putLong(ApgIntentService.ENCRYPT_SECRET_KEY_ID, mSecretKeyId);
-        data.putBoolean(ApgIntentService.ENCRYPT_USE_ASCII_AMOR, useAsciiArmor);
-        data.putLongArray(ApgIntentService.ENCRYPT_ENCRYPTION_KEYS_IDS, encryptionKeyIds);
-        data.putInt(ApgIntentService.ENCRYPT_COMPRESSION_ID, compressionId);
-        data.putBoolean(ApgIntentService.ENCRYPT_GENERATE_SIGNATURE, mGenerateSignature);
-        data.putBoolean(ApgIntentService.ENCRYPT_SIGN_ONLY, signOnly);
+        data.putLong(KeychainIntentService.ENCRYPT_SECRET_KEY_ID, mSecretKeyId);
+        data.putBoolean(KeychainIntentService.ENCRYPT_USE_ASCII_AMOR, useAsciiArmor);
+        data.putLongArray(KeychainIntentService.ENCRYPT_ENCRYPTION_KEYS_IDS, encryptionKeyIds);
+        data.putInt(KeychainIntentService.ENCRYPT_COMPRESSION_ID, compressionId);
+        data.putBoolean(KeychainIntentService.ENCRYPT_GENERATE_SIGNATURE, mGenerateSignature);
+        data.putBoolean(KeychainIntentService.ENCRYPT_SIGN_ONLY, signOnly);
 
-        intent.putExtra(ApgIntentService.EXTRA_DATA, data);
+        intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
         // Message is received after encrypting is done in ApgService
-        ApgIntentServiceHandler saveHandler = new ApgIntentServiceHandler(this,
+        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                 R.string.progress_encrypting, ProgressDialog.STYLE_HORIZONTAL) {
             public void handleMessage(Message message) {
                 // handle messages by standard ApgHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == ApgIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
                     // get returned data bundle
                     Bundle data = message.getData();
 
                     String output;
                     switch (mEncryptTarget) {
                     case Id.target.clipboard:
-                        output = data.getString(ApgIntentService.RESULT_ENCRYPTED_STRING);
+                        output = data.getString(KeychainIntentService.RESULT_ENCRYPTED_STRING);
                         Log.d(Constants.TAG, "output: " + output);
                         ClipboardReflection.copyToClipboard(EncryptActivity.this, output);
                         Toast.makeText(EncryptActivity.this,
@@ -773,7 +773,7 @@ public class EncryptActivity extends SherlockFragmentActivity {
                             return;
                         }
 
-                        output = data.getString(ApgIntentService.RESULT_ENCRYPTED_STRING);
+                        output = data.getString(KeychainIntentService.RESULT_ENCRYPTED_STRING);
                         Log.d(Constants.TAG, "output: " + output);
 
                         Intent emailIntent = new Intent(Intent.ACTION_SEND);
@@ -812,7 +812,7 @@ public class EncryptActivity extends SherlockFragmentActivity {
 
         // Create a new Messenger for the communication back
         Messenger messenger = new Messenger(saveHandler);
-        intent.putExtra(ApgIntentService.EXTRA_MESSENGER, messenger);
+        intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
         // show progress dialog
         saveHandler.showProgressDialog(this);
@@ -997,9 +997,9 @@ public class EncryptActivity extends SherlockFragmentActivity {
             PGPSecretKeyRing keyRing = ProviderHelper.getPGPSecretKeyRingByMasterKeyId(this,
                     mSecretKeyId);
             if (keyRing != null) {
-                PGPSecretKey key = PGPHelper.getMasterKey(keyRing);
+                PGPSecretKey key = PgpHelper.getMasterKey(keyRing);
                 if (key != null) {
-                    String userId = PGPHelper.getMainUserIdSafe(this, key);
+                    String userId = PgpHelper.getMainUserIdSafe(this, key);
                     String chunks[] = userId.split(" <", 2);
                     uid = chunks[0];
                     if (chunks.length > 1) {
diff --git a/APG/src/org/thialfihar/android/apg/ui/HelpActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpActivity.java
index f426b42bd..5b2750742 100644
--- a/APG/src/org/thialfihar/android/apg/ui/HelpActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpActivity.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.R;
 
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/APG/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java
index f1cc8407c..05891b053 100644
--- a/APG/src/org/thialfihar/android/apg/ui/HelpFragmentAbout.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpFragmentAbout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,16 +22,16 @@ import java.io.InputStream;
 import net.nightwhistler.htmlspanner.HtmlSpanner;
 import net.nightwhistler.htmlspanner.JellyBeanSpanFixTextView;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.OtherHelper;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.helper.OtherHelper;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
-import org.thialfihar.android.apg.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/APG/src/org/thialfihar/android/apg/ui/HelpFragmentHtml.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java
index eeea56a00..9c0bb6ded 100644
--- a/APG/src/org/thialfihar/android/apg/ui/HelpFragmentHtml.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/HelpFragmentHtml.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,10 +22,10 @@ import java.io.InputStream;
 import net.nightwhistler.htmlspanner.HtmlSpanner;
 import net.nightwhistler.htmlspanner.JellyBeanSpanFixTextView;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.OtherHelper;
-import org.thialfihar.android.apg.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.helper.OtherHelper;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/APG/src/org/thialfihar/android/apg/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 990f1d161..cd5a12df0 100644
--- a/APG/src/org/thialfihar/android/apg/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -15,15 +15,18 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
-
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.compatibility.DialogFragmentWorkaround;
-import org.thialfihar.android.apg.helper.OtherHelper;
-import org.thialfihar.android.apg.service.ApgIntentServiceHandler;
-import org.thialfihar.android.apg.service.ApgIntentService;
-import org.thialfihar.android.apg.R;
+package org.sufficientlysecure.keychain.ui;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround;
+import org.sufficientlysecure.keychain.helper.OtherHelper;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.ui.dialog.DeleteFileDialogFragment;
+import org.sufficientlysecure.keychain.ui.dialog.FileDialogFragment;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -34,9 +37,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 
-import org.thialfihar.android.apg.ui.dialog.DeleteFileDialogFragment;
-import org.thialfihar.android.apg.ui.dialog.FileDialogFragment;
-import org.thialfihar.android.apg.util.Log;
 
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
@@ -319,9 +319,9 @@ public class ImportKeysActivity extends SherlockFragmentActivity {
             Log.d(Constants.TAG, "importKeys started");
 
             // Send all information needed to service to import key in other thread
-            Intent intent = new Intent(this, ApgIntentService.class);
+            Intent intent = new Intent(this, KeychainIntentService.class);
 
-            intent.putExtra(ApgIntentService.EXTRA_ACTION, ApgIntentService.ACTION_IMPORT_KEYRING);
+            intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_IMPORT_KEYRING);
 
             // fill values for this action
             Bundle data = new Bundle();
@@ -330,29 +330,29 @@ public class ImportKeysActivity extends SherlockFragmentActivity {
             // data.putInt(ApgIntentService.IMPORT_KEY_TYPE, Id.type.secret_key);
 
             if (mImportData != null) {
-                data.putInt(ApgIntentService.TARGET, ApgIntentService.TARGET_BYTES);
-                data.putByteArray(ApgIntentService.IMPORT_BYTES, mImportData);
+                data.putInt(KeychainIntentService.TARGET, KeychainIntentService.TARGET_BYTES);
+                data.putByteArray(KeychainIntentService.IMPORT_BYTES, mImportData);
             } else {
-                data.putInt(ApgIntentService.TARGET, ApgIntentService.TARGET_FILE);
-                data.putString(ApgIntentService.IMPORT_FILENAME, mImportFilename);
+                data.putInt(KeychainIntentService.TARGET, KeychainIntentService.TARGET_FILE);
+                data.putString(KeychainIntentService.IMPORT_FILENAME, mImportFilename);
             }
 
-            intent.putExtra(ApgIntentService.EXTRA_DATA, data);
+            intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
             // Message is received after importing is done in ApgService
-            ApgIntentServiceHandler saveHandler = new ApgIntentServiceHandler(this,
+            KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                     R.string.progress_importing, ProgressDialog.STYLE_HORIZONTAL) {
                 public void handleMessage(Message message) {
                     // handle messages by standard ApgHandler first
                     super.handleMessage(message);
 
-                    if (message.arg1 == ApgIntentServiceHandler.MESSAGE_OKAY) {
+                    if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
                         // get returned data bundle
                         Bundle returnData = message.getData();
 
-                        int added = returnData.getInt(ApgIntentService.RESULT_IMPORT_ADDED);
-                        int updated = returnData.getInt(ApgIntentService.RESULT_IMPORT_UPDATED);
-                        int bad = returnData.getInt(ApgIntentService.RESULT_IMPORT_BAD);
+                        int added = returnData.getInt(KeychainIntentService.RESULT_IMPORT_ADDED);
+                        int updated = returnData.getInt(KeychainIntentService.RESULT_IMPORT_UPDATED);
+                        int bad = returnData.getInt(KeychainIntentService.RESULT_IMPORT_BAD);
                         String toastMessage;
                         if (added > 0 && updated > 0) {
                             toastMessage = getString(R.string.keysAddedAndUpdated, added, updated);
@@ -394,7 +394,7 @@ public class ImportKeysActivity extends SherlockFragmentActivity {
 
             // Create a new Messenger for the communication back
             Messenger messenger = new Messenger(saveHandler);
-            intent.putExtra(ApgIntentService.EXTRA_MESSENGER, messenger);
+            intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
             // show progress dialog
             saveHandler.showProgressDialog(this);
diff --git a/APG/src/org/thialfihar/android/apg/ui/ImportKeysListFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index 157f34c28..170b459be 100644
--- a/APG/src/org/thialfihar/android/apg/ui/ImportKeysListFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.ui.widget.ImportKeysListLoader;
-import org.thialfihar.android.apg.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.ui.widget.ImportKeysListLoader;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.SherlockListFragment;
 
diff --git a/APG/src/org/thialfihar/android/apg/ui/KeyListActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListActivity.java
index 4b4a5daac..a128263c1 100644
--- a/APG/src/org/thialfihar/android/apg/ui/KeyListActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListActivity.java
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
-
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.compatibility.DialogFragmentWorkaround;
-import org.thialfihar.android.apg.service.ApgIntentService;
-import org.thialfihar.android.apg.service.ApgIntentServiceHandler;
-import org.thialfihar.android.apg.ui.dialog.DeleteKeyDialogFragment;
-import org.thialfihar.android.apg.ui.dialog.FileDialogFragment;
-import org.thialfihar.android.apg.util.Log;
+package org.sufficientlysecure.keychain.ui;
+
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.compatibility.DialogFragmentWorkaround;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.ui.dialog.DeleteKeyDialogFragment;
+import org.sufficientlysecure.keychain.ui.dialog.FileDialogFragment;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import android.app.ProgressDialog;
 import android.app.SearchManager;
@@ -257,36 +257,36 @@ public class KeyListActivity extends SherlockFragmentActivity {
         Log.d(Constants.TAG, "exportKeys started");
 
         // Send all information needed to service to export key in other thread
-        Intent intent = new Intent(this, ApgIntentService.class);
+        Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.putExtra(ApgIntentService.EXTRA_ACTION, ApgIntentService.ACTION_EXPORT_KEYRING);
+        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_EXPORT_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
 
-        data.putString(ApgIntentService.EXPORT_FILENAME, mExportFilename);
-        data.putInt(ApgIntentService.EXPORT_KEY_TYPE, mKeyType);
+        data.putString(KeychainIntentService.EXPORT_FILENAME, mExportFilename);
+        data.putInt(KeychainIntentService.EXPORT_KEY_TYPE, mKeyType);
 
         if (keyRingMasterKeyId == -1) {
-            data.putBoolean(ApgIntentService.EXPORT_ALL, true);
+            data.putBoolean(KeychainIntentService.EXPORT_ALL, true);
         } else {
-            data.putLong(ApgIntentService.EXPORT_KEY_RING_MASTER_KEY_ID, keyRingMasterKeyId);
+            data.putLong(KeychainIntentService.EXPORT_KEY_RING_MASTER_KEY_ID, keyRingMasterKeyId);
         }
 
-        intent.putExtra(ApgIntentService.EXTRA_DATA, data);
+        intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
         // Message is received after exporting is done in ApgService
-        ApgIntentServiceHandler exportHandler = new ApgIntentServiceHandler(this,
+        KeychainIntentServiceHandler exportHandler = new KeychainIntentServiceHandler(this,
                 R.string.progress_exporting, ProgressDialog.STYLE_HORIZONTAL) {
             public void handleMessage(Message message) {
                 // handle messages by standard ApgHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == ApgIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
                     // get returned data bundle
                     Bundle returnData = message.getData();
 
-                    int exported = returnData.getInt(ApgIntentService.RESULT_EXPORT);
+                    int exported = returnData.getInt(KeychainIntentService.RESULT_EXPORT);
                     String toastMessage;
                     if (exported == 1) {
                         toastMessage = getString(R.string.keyExported);
@@ -303,7 +303,7 @@ public class KeyListActivity extends SherlockFragmentActivity {
 
         // Create a new Messenger for the communication back
         Messenger messenger = new Messenger(exportHandler);
-        intent.putExtra(ApgIntentService.EXTRA_MESSENGER, messenger);
+        intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
         // show progress dialog
         exportHandler.showProgressDialog(this);
diff --git a/APG/src/org/thialfihar/android/apg/ui/KeyListFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index dc50c2dd6..9e90e254c 100644
--- a/APG/src/org/thialfihar/android/apg/ui/KeyListFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.ui.widget.ExpandableListFragment;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.ui.widget.ExpandableListFragment;
+import org.sufficientlysecure.keychain.R;
 
 import android.os.Bundle;
 import android.view.ContextMenu;
diff --git a/APG/src/org/thialfihar/android/apg/ui/KeyListPublicActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java
index 50fb64da2..adc8656d0 100644
--- a/APG/src/org/thialfihar/android/apg/ui/KeyListPublicActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicActivity.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
diff --git a/APG/src/org/thialfihar/android/apg/ui/KeyListPublicFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
index 7c23e6217..648b09ef7 100644
--- a/APG/src/org/thialfihar/android/apg/ui/KeyListPublicFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import org.spongycastle.openpgp.PGPPublicKeyRing;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.provider.ApgContract.KeyRings;
-import org.thialfihar.android.apg.provider.ApgContract.UserIds;
-import org.thialfihar.android.apg.ui.widget.KeyListAdapter;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
+import org.sufficientlysecure.keychain.ui.widget.KeyListAdapter;
+import org.sufficientlysecure.keychain.R;
 
 import android.content.Intent;
 import android.database.Cursor;
@@ -97,7 +97,7 @@ public class KeyListPublicFragment extends KeyListFragment implements
             PGPPublicKeyRing updateKeyRing = ProviderHelper.getPGPPublicKeyRingByRowId(
                     mKeyListActivity, keyRingRowId);
             if (updateKeyRing != null) {
-                updateKeyId = PGPHelper.getMasterKey(updateKeyRing).getKeyID();
+                updateKeyId = PgpHelper.getMasterKey(updateKeyRing).getKeyID();
             }
             if (updateKeyId == 0) {
                 // this shouldn't happen
@@ -126,7 +126,7 @@ public class KeyListPublicFragment extends KeyListFragment implements
             PGPPublicKeyRing signKeyRing = ProviderHelper.getPGPPublicKeyRingByRowId(
                     mKeyListActivity, keyRingRowId);
             if (signKeyRing != null) {
-                keyId = PGPHelper.getMasterKey(signKeyRing).getKeyID();
+                keyId = PgpHelper.getMasterKey(signKeyRing).getKeyID();
             }
             if (keyId == 0) {
                 // this shouldn't happen
diff --git a/APG/src/org/thialfihar/android/apg/ui/KeyListSecretActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
index 97abd2296..63d06edaf 100644
--- a/APG/src/org/thialfihar/android/apg/ui/KeyListSecretActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.PGPMain;
-import org.thialfihar.android.apg.service.PassphraseCacheService;
-import org.thialfihar.android.apg.ui.dialog.PassphraseDialogFragment;
-import org.thialfihar.android.apg.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.service.PassphraseCacheService;
+import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
@@ -75,7 +75,7 @@ public class KeyListSecretActivity extends KeyListActivity {
         if (passPhrase == null) {
             showPassphraseDialog(keyId);
         } else {
-            PGPMain.setEditPassPhrase(passPhrase);
+            PgpMain.setEditPassPhrase(passPhrase);
             editKey(keyId);
         }
     }
@@ -88,7 +88,7 @@ public class KeyListSecretActivity extends KeyListActivity {
                 if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) {
                     String passPhrase = PassphraseCacheService.getCachedPassphrase(
                             KeyListSecretActivity.this, secretKeyId);
-                    PGPMain.setEditPassPhrase(passPhrase);
+                    PgpMain.setEditPassPhrase(passPhrase);
                     editKey(secretKeyId);
                 }
             }
@@ -102,7 +102,7 @@ public class KeyListSecretActivity extends KeyListActivity {
                     KeyListSecretActivity.this, messenger, secretKeyId);
 
             passphraseDialog.show(getSupportFragmentManager(), "passphraseDialog");
-        } catch (PGPMain.ApgGeneralException e) {
+        } catch (PgpMain.PgpGeneralException e) {
             Log.d(Constants.TAG, "No passphrase for this secret key, encrypt directly!");
             // send message to handler to start encryption directly
             returnHandler.sendEmptyMessage(PassphraseDialogFragment.MESSAGE_OKAY);
@@ -110,7 +110,7 @@ public class KeyListSecretActivity extends KeyListActivity {
     }
 
     private void createKey() {
-        PGPMain.setEditPassPhrase("");
+        PgpMain.setEditPassPhrase("");
         Intent intent = new Intent(EditKeyActivity.ACTION_CREATE_KEY);
         startActivityForResult(intent, 0);
     }
diff --git a/APG/src/org/thialfihar/android/apg/ui/KeyListSecretFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
index 1e852fd54..f4ba2b4d9 100644
--- a/APG/src/org/thialfihar/android/apg/ui/KeyListSecretFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import java.util.ArrayList;
 
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.provider.ApgContract.KeyRings;
-import org.thialfihar.android.apg.provider.ApgContract.UserIds;
-import org.thialfihar.android.apg.ui.widget.KeyListAdapter;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
+import org.sufficientlysecure.keychain.ui.widget.KeyListAdapter;
+import org.sufficientlysecure.keychain.R;
 
 import com.google.zxing.integration.android.IntentIntegrator;
 
diff --git a/APG/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
index 45375712f..df8b7b374 100644
--- a/APG/src/org/thialfihar/android/apg/ui/KeyServerQueryActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.helper.Preferences;
-import org.thialfihar.android.apg.service.ApgIntentServiceHandler;
-import org.thialfihar.android.apg.service.ApgIntentService;
-import org.thialfihar.android.apg.util.Log;
-import org.thialfihar.android.apg.util.KeyServer.KeyInfo;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.helper.Preferences;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.util.KeyServer.KeyInfo;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
@@ -140,7 +140,7 @@ public class KeyServerQueryActivity extends SherlockFragmentActivity {
         if (ACTION_LOOK_UP_KEY_ID.equals(action) || ACTION_LOOK_UP_KEY_ID_AND_RETURN.equals(action)) {
             long keyId = intent.getLongExtra(EXTRA_KEY_ID, 0);
             if (keyId != 0) {
-                String query = "0x" + PGPHelper.keyToHex(keyId);
+                String query = "0x" + PgpHelper.keyToHex(keyId);
                 mQuery.setText(query);
                 search(query);
             }
@@ -166,42 +166,42 @@ public class KeyServerQueryActivity extends SherlockFragmentActivity {
         Log.d(Constants.TAG, "start search with service");
 
         // Send all information needed to service to query keys in other thread
-        Intent intent = new Intent(this, ApgIntentService.class);
+        Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.putExtra(ApgIntentService.EXTRA_ACTION, ApgIntentService.ACTION_QUERY_KEYRING);
+        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_QUERY_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
 
         String server = (String) mKeyServer.getSelectedItem();
-        data.putString(ApgIntentService.QUERY_KEY_SERVER, server);
+        data.putString(KeychainIntentService.QUERY_KEY_SERVER, server);
 
-        data.putInt(ApgIntentService.QUERY_KEY_TYPE, mQueryType);
+        data.putInt(KeychainIntentService.QUERY_KEY_TYPE, mQueryType);
 
         if (mQueryType == Id.keyserver.search) {
-            data.putString(ApgIntentService.QUERY_KEY_STRING, mQueryString);
+            data.putString(KeychainIntentService.QUERY_KEY_STRING, mQueryString);
         } else if (mQueryType == Id.keyserver.get) {
-            data.putLong(ApgIntentService.QUERY_KEY_ID, mQueryId);
+            data.putLong(KeychainIntentService.QUERY_KEY_ID, mQueryId);
         }
 
-        intent.putExtra(ApgIntentService.EXTRA_DATA, data);
+        intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
         // Message is received after querying is done in ApgService
-        ApgIntentServiceHandler saveHandler = new ApgIntentServiceHandler(this,
+        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this,
                 R.string.progress_querying, ProgressDialog.STYLE_SPINNER) {
             public void handleMessage(Message message) {
                 // handle messages by standard ApgHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == ApgIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
                     // get returned data bundle
                     Bundle returnData = message.getData();
 
                     if (mQueryType == Id.keyserver.search) {
                         mSearchResult = returnData
-                                .getParcelableArrayList(ApgIntentService.RESULT_QUERY_KEY_SEARCH_RESULT);
+                                .getParcelableArrayList(KeychainIntentService.RESULT_QUERY_KEY_SEARCH_RESULT);
                     } else if (mQueryType == Id.keyserver.get) {
-                        mKeyData = returnData.getString(ApgIntentService.RESULT_QUERY_KEY_KEY_DATA);
+                        mKeyData = returnData.getString(KeychainIntentService.RESULT_QUERY_KEY_KEY_DATA);
                     }
 
                     // TODO: IMPROVE CODE!!! some global variables can be avoided!!!
@@ -240,7 +240,7 @@ public class KeyServerQueryActivity extends SherlockFragmentActivity {
 
         // Create a new Messenger for the communication back
         Messenger messenger = new Messenger(saveHandler);
-        intent.putExtra(ApgIntentService.EXTRA_MESSENGER, messenger);
+        intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
         // show progress dialog
         saveHandler.showProgressDialog(this);
@@ -308,7 +308,7 @@ public class KeyServerQueryActivity extends SherlockFragmentActivity {
                 mainUserId.setText(userId);
             }
 
-            keyId.setText(PGPHelper.getSmallFingerPrint(keyInfo.keyId));
+            keyId.setText(PgpHelper.getSmallFingerPrint(keyInfo.keyId));
 
             if (mainUserIdRest.getText().length() == 0) {
                 mainUserIdRest.setVisibility(View.GONE);
diff --git a/APG/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
index f1ac05735..657044f2b 100644
--- a/APG/src/org/thialfihar/android/apg/ui/KeyServerUploadActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerUploadActivity.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.Preferences;
-import org.thialfihar.android.apg.service.ApgIntentServiceHandler;
-import org.thialfihar.android.apg.service.ApgIntentService;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.helper.Preferences;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
@@ -102,29 +102,29 @@ public class KeyServerUploadActivity extends SherlockFragmentActivity {
 
     private void uploadKey() {
         // Send all information needed to service to upload key in other thread
-        Intent intent = new Intent(this, ApgIntentService.class);
+        Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.putExtra(ApgIntentService.EXTRA_ACTION, ApgIntentService.ACTION_UPLOAD_KEYRING);
+        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_UPLOAD_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
 
         int keyRingId = getIntent().getIntExtra(EXTRA_KEYRING_ROW_ID, -1);
-        data.putInt(ApgIntentService.UPLOAD_KEY_KEYRING_ROW_ID, keyRingId);
+        data.putInt(KeychainIntentService.UPLOAD_KEY_KEYRING_ROW_ID, keyRingId);
 
         String server = (String) keyServer.getSelectedItem();
-        data.putString(ApgIntentService.UPLOAD_KEY_SERVER, server);
+        data.putString(KeychainIntentService.UPLOAD_KEY_SERVER, server);
 
-        intent.putExtra(ApgIntentService.EXTRA_DATA, data);
+        intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
         // Message is received after uploading is done in ApgService
-        ApgIntentServiceHandler saveHandler = new ApgIntentServiceHandler(this, R.string.progress_exporting,
+        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this, R.string.progress_exporting,
                 ProgressDialog.STYLE_HORIZONTAL) {
             public void handleMessage(Message message) {
                 // handle messages by standard ApgHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == ApgIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
 
                     Toast.makeText(KeyServerUploadActivity.this, R.string.keySendSuccess,
                             Toast.LENGTH_SHORT).show();
@@ -135,7 +135,7 @@ public class KeyServerUploadActivity extends SherlockFragmentActivity {
 
         // Create a new Messenger for the communication back
         Messenger messenger = new Messenger(saveHandler);
-        intent.putExtra(ApgIntentService.EXTRA_MESSENGER, messenger);
+        intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
         // show progress dialog
         saveHandler.showProgressDialog(this);
diff --git a/APG/src/org/thialfihar/android/apg/ui/MainActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
index b647299d1..447801e55 100644
--- a/APG/src/org/thialfihar/android/apg/ui/MainActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockActivity;
diff --git a/APG/src/org/thialfihar/android/apg/ui/PreferencesActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
index e28b385f2..3c070c6db 100644
--- a/APG/src/org/thialfihar/android/apg/ui/PreferencesActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import org.spongycastle.bcpg.HashAlgorithmTags;
 import org.spongycastle.openpgp.PGPEncryptedData;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.helper.Preferences;
-import org.thialfihar.android.apg.ui.widget.IntegerListPreference;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.Preferences;
+import org.sufficientlysecure.keychain.ui.widget.IntegerListPreference;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
@@ -55,7 +55,7 @@ public class PreferencesActivity extends SherlockPreferenceActivity {
         actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setHomeButtonEnabled(true);
 
-        addPreferencesFromResource(R.xml.apg_preferences);
+        addPreferencesFromResource(R.xml.preferences);
 
         mPassPhraseCacheTtl = (IntegerListPreference) findPreference(Constants.pref.PASS_PHRASE_CACHE_TTL);
         mPassPhraseCacheTtl.setValue("" + mPreferences.getPassPhraseCacheTtl());
diff --git a/APG/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
index b54cbde71..b86fe0a2e 100644
--- a/APG/src/org/thialfihar/android/apg/ui/PreferencesKeyServerActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import java.util.Vector;
 
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.ui.widget.Editor;
-import org.thialfihar.android.apg.ui.widget.KeyServerEditor;
-import org.thialfihar.android.apg.ui.widget.Editor.EditorListener;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.ui.widget.Editor;
+import org.sufficientlysecure.keychain.ui.widget.KeyServerEditor;
+import org.sufficientlysecure.keychain.ui.widget.Editor.EditorListener;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockActivity;
diff --git a/APG/src/org/thialfihar/android/apg/ui/SelectPublicKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
index caef712ee..fc1cfba17 100644
--- a/APG/src/org/thialfihar/android/apg/ui/SelectPublicKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
diff --git a/APG/src/org/thialfihar/android/apg/ui/SelectPublicKeyFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
index a316fbdd3..8b3e75d05 100644
--- a/APG/src/org/thialfihar/android/apg/ui/SelectPublicKeyFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java
@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import java.util.Date;
 import java.util.Vector;
 
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.compatibility.ListFragmentWorkaround;
-import org.thialfihar.android.apg.provider.ApgDatabase;
-import org.thialfihar.android.apg.provider.ApgContract.KeyRings;
-import org.thialfihar.android.apg.provider.ApgContract.Keys;
-import org.thialfihar.android.apg.provider.ApgContract.UserIds;
-import org.thialfihar.android.apg.provider.ApgDatabase.Tables;
-import org.thialfihar.android.apg.ui.widget.SelectKeyCursorAdapter;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.compatibility.ListFragmentWorkaround;
+import org.sufficientlysecure.keychain.provider.KeychainDatabase;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
+import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
+import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
+import org.sufficientlysecure.keychain.ui.widget.SelectKeyCursorAdapter;
+import org.sufficientlysecure.keychain.R;
 
 import android.database.Cursor;
 import android.database.DatabaseUtils;
@@ -154,13 +154,13 @@ public class SelectPublicKeyFragment extends ListFragmentWorkaround implements
                 UserIds.USER_ID,
                 "(SELECT COUNT(available_keys." + Keys._ID + ") FROM " + Tables.KEYS
                         + " AS available_keys WHERE available_keys." + Keys.KEY_RING_ROW_ID + " = "
-                        + ApgDatabase.Tables.KEY_RINGS + "." + KeyRings._ID
+                        + KeychainDatabase.Tables.KEY_RINGS + "." + KeyRings._ID
                         + " AND available_keys." + Keys.IS_REVOKED + " = '0' AND  available_keys."
                         + Keys.CAN_ENCRYPT + " = '1') AS "
                         + SelectKeyCursorAdapter.PROJECTION_ROW_AVAILABLE,
                 "(SELECT COUNT(valid_keys." + Keys._ID + ") FROM " + Tables.KEYS
                         + " AS valid_keys WHERE valid_keys." + Keys.KEY_RING_ROW_ID + " = "
-                        + ApgDatabase.Tables.KEY_RINGS + "." + KeyRings._ID + " AND valid_keys."
+                        + KeychainDatabase.Tables.KEY_RINGS + "." + KeyRings._ID + " AND valid_keys."
                         + Keys.IS_REVOKED + " = '0' AND valid_keys." + Keys.CAN_ENCRYPT
                         + " = '1' AND valid_keys." + Keys.CREATION + " <= '" + now + "' AND "
                         + "(valid_keys." + Keys.EXPIRY + " IS NULL OR valid_keys." + Keys.EXPIRY
diff --git a/APG/src/org/thialfihar/android/apg/ui/SelectSecretKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
index cc763d4a1..6f43cbabc 100644
--- a/APG/src/org/thialfihar/android/apg/ui/SelectSecretKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
diff --git a/APG/src/org/thialfihar/android/apg/ui/SelectSecretKeyFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
index 1f3fcb816..d7d9fb0af 100644
--- a/APG/src/org/thialfihar/android/apg/ui/SelectSecretKeyFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import java.util.Date;
 
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.provider.ApgDatabase;
-import org.thialfihar.android.apg.provider.ApgContract.KeyRings;
-import org.thialfihar.android.apg.provider.ApgContract.Keys;
-import org.thialfihar.android.apg.provider.ApgContract.UserIds;
-import org.thialfihar.android.apg.provider.ApgDatabase.Tables;
-import org.thialfihar.android.apg.ui.widget.SelectKeyCursorAdapter;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.provider.KeychainDatabase;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
+import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
+import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
+import org.sufficientlysecure.keychain.ui.widget.SelectKeyCursorAdapter;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.SherlockListFragment;
 
@@ -99,13 +99,13 @@ public class SelectSecretKeyFragment extends SherlockListFragment implements
                 UserIds.USER_ID,
                 "(SELECT COUNT(available_keys." + Keys._ID + ") FROM " + Tables.KEYS
                         + " AS available_keys WHERE available_keys." + Keys.KEY_RING_ROW_ID + " = "
-                        + ApgDatabase.Tables.KEY_RINGS + "." + KeyRings._ID
+                        + KeychainDatabase.Tables.KEY_RINGS + "." + KeyRings._ID
                         + " AND available_keys." + Keys.IS_REVOKED + " = '0' AND  available_keys."
                         + Keys.CAN_SIGN + " = '1') AS "
                         + SelectKeyCursorAdapter.PROJECTION_ROW_AVAILABLE,
                 "(SELECT COUNT(valid_keys." + Keys._ID + ") FROM " + Tables.KEYS
                         + " AS valid_keys WHERE valid_keys." + Keys.KEY_RING_ROW_ID + " = "
-                        + ApgDatabase.Tables.KEY_RINGS + "." + KeyRings._ID + " AND valid_keys."
+                        + KeychainDatabase.Tables.KEY_RINGS + "." + KeyRings._ID + " AND valid_keys."
                         + Keys.IS_REVOKED + " = '0' AND valid_keys." + Keys.CAN_SIGN
                         + " = '1' AND valid_keys." + Keys.CREATION + " <= '" + now + "' AND "
                         + "(valid_keys." + Keys.EXPIRY + " IS NULL OR valid_keys." + Keys.EXPIRY
diff --git a/APG/src/org/thialfihar/android/apg/ui/ShareActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareActivity.java
index 7fec42e47..29960748b 100644
--- a/APG/src/org/thialfihar/android/apg/ui/ShareActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareActivity.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import java.util.ArrayList;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.google.zxing.integration.android.IntentIntegrator;
diff --git a/APG/src/org/thialfihar/android/apg/ui/ShareNfcBeamActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareNfcBeamActivity.java
index abb2d6b82..c106614d3 100644
--- a/APG/src/org/thialfihar/android/apg/ui/ShareNfcBeamActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareNfcBeamActivity.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,10 +23,10 @@ import java.io.InputStream;
 import net.nightwhistler.htmlspanner.HtmlSpanner;
 import net.nightwhistler.htmlspanner.JellyBeanSpanFixTextView;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.OtherHelper;
-import org.thialfihar.android.apg.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.helper.OtherHelper;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
diff --git a/APG/src/org/thialfihar/android/apg/ui/SignKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
index f8d47688c..21d55aca0 100644
--- a/APG/src/org/thialfihar/android/apg/ui/SignKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/SignKeyActivity.java
@@ -14,22 +14,23 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui;
+package org.sufficientlysecure.keychain.ui;
 
 import java.util.Iterator;
 
 import org.spongycastle.openpgp.PGPPublicKeyRing;
 import org.spongycastle.openpgp.PGPSignature;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.PGPMain;
-import org.thialfihar.android.apg.helper.Preferences;
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.service.ApgIntentService;
-import org.thialfihar.android.apg.service.ApgIntentServiceHandler;
-import org.thialfihar.android.apg.service.PassphraseCacheService;
-import org.thialfihar.android.apg.ui.dialog.PassphraseDialogFragment;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.helper.Preferences;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.service.PassphraseCacheService;
+import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
@@ -41,7 +42,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 
-import org.thialfihar.android.apg.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
@@ -144,7 +144,7 @@ public class SignKeyActivity extends SherlockFragmentActivity {
                     messenger, secretKeyId);
 
             passphraseDialog.show(getSupportFragmentManager(), "passphraseDialog");
-        } catch (PGPMain.ApgGeneralException e) {
+        } catch (PgpMain.PgpGeneralException e) {
             Log.d(Constants.TAG, "No passphrase for this secret key, encrypt directly!");
             // send message to handler to start encryption directly
             returnHandler.sendEmptyMessage(PassphraseDialogFragment.MESSAGE_OKAY);
@@ -196,26 +196,26 @@ public class SignKeyActivity extends SherlockFragmentActivity {
      */
     private void startSigning() {
         // Send all information needed to service to sign key in other thread
-        Intent intent = new Intent(this, ApgIntentService.class);
+        Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.putExtra(ApgIntentService.EXTRA_ACTION, ApgIntentService.ACTION_SIGN_KEYRING);
+        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_SIGN_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
 
-        data.putLong(ApgIntentService.SIGN_KEY_MASTER_KEY_ID, mMasterKeyId);
-        data.putLong(ApgIntentService.SIGN_KEY_PUB_KEY_ID, mPubKeyId);
+        data.putLong(KeychainIntentService.SIGN_KEY_MASTER_KEY_ID, mMasterKeyId);
+        data.putLong(KeychainIntentService.SIGN_KEY_PUB_KEY_ID, mPubKeyId);
 
-        intent.putExtra(ApgIntentService.EXTRA_DATA, data);
+        intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
         // Message is received after signing is done in ApgService
-        ApgIntentServiceHandler saveHandler = new ApgIntentServiceHandler(this, R.string.progress_signing,
+        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this, R.string.progress_signing,
                 ProgressDialog.STYLE_SPINNER) {
             public void handleMessage(Message message) {
                 // handle messages by standard ApgHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == ApgIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
 
                     Toast.makeText(SignKeyActivity.this, R.string.keySignSuccess,
                             Toast.LENGTH_SHORT).show();
@@ -236,7 +236,7 @@ public class SignKeyActivity extends SherlockFragmentActivity {
 
         // Create a new Messenger for the communication back
         Messenger messenger = new Messenger(saveHandler);
-        intent.putExtra(ApgIntentService.EXTRA_MESSENGER, messenger);
+        intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
         // show progress dialog
         saveHandler.showProgressDialog(this);
@@ -247,29 +247,29 @@ public class SignKeyActivity extends SherlockFragmentActivity {
 
     private void uploadKey() {
         // Send all information needed to service to upload key in other thread
-        Intent intent = new Intent(this, ApgIntentService.class);
+        Intent intent = new Intent(this, KeychainIntentService.class);
 
-        intent.putExtra(ApgIntentService.EXTRA_ACTION, ApgIntentService.ACTION_UPLOAD_KEYRING);
+        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_UPLOAD_KEYRING);
 
         // fill values for this action
         Bundle data = new Bundle();
 
-        data.putLong(ApgIntentService.UPLOAD_KEY_KEYRING_ROW_ID, mPubKeyId);
+        data.putLong(KeychainIntentService.UPLOAD_KEY_KEYRING_ROW_ID, mPubKeyId);
 
         Spinner keyServer = (Spinner) findViewById(R.id.keyServer);
         String server = (String) keyServer.getSelectedItem();
-        data.putString(ApgIntentService.UPLOAD_KEY_SERVER, server);
+        data.putString(KeychainIntentService.UPLOAD_KEY_SERVER, server);
 
-        intent.putExtra(ApgIntentService.EXTRA_DATA, data);
+        intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
         // Message is received after uploading is done in ApgService
-        ApgIntentServiceHandler saveHandler = new ApgIntentServiceHandler(this, R.string.progress_exporting,
+        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(this, R.string.progress_exporting,
                 ProgressDialog.STYLE_HORIZONTAL) {
             public void handleMessage(Message message) {
                 // handle messages by standard ApgHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == ApgIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
 
                     Toast.makeText(SignKeyActivity.this, R.string.keySendSuccess,
                             Toast.LENGTH_SHORT).show();
@@ -281,7 +281,7 @@ public class SignKeyActivity extends SherlockFragmentActivity {
 
         // Create a new Messenger for the communication back
         Messenger messenger = new Messenger(saveHandler);
-        intent.putExtra(ApgIntentService.EXTRA_MESSENGER, messenger);
+        intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
         // show progress dialog
         saveHandler.showProgressDialog(this);
diff --git a/APG/src/org/thialfihar/android/apg/ui/dialog/DeleteFileDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
index 342cd41d0..defc3bc6c 100644
--- a/APG/src/org/thialfihar/android/apg/ui/dialog/DeleteFileDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.dialog;
+package org.sufficientlysecure.keychain.ui.dialog;
 
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.service.ApgIntentServiceHandler;
-import org.thialfihar.android.apg.service.ApgIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.R;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -71,25 +71,25 @@ public class DeleteFileDialogFragment extends DialogFragment {
                 dismiss();
 
                 // Send all information needed to service to edit key in other thread
-                Intent intent = new Intent(activity, ApgIntentService.class);
+                Intent intent = new Intent(activity, KeychainIntentService.class);
 
                 // fill values for this action
                 Bundle data = new Bundle();
 
-                intent.putExtra(ApgIntentService.EXTRA_ACTION, ApgIntentService.ACTION_DELETE_FILE_SECURELY);
-                data.putString(ApgIntentService.DELETE_FILE, deleteFile);
-                intent.putExtra(ApgIntentService.EXTRA_DATA, data);
+                intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_DELETE_FILE_SECURELY);
+                data.putString(KeychainIntentService.DELETE_FILE, deleteFile);
+                intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
                 ProgressDialogFragment deletingDialog = ProgressDialogFragment.newInstance(
                         R.string.progress_deletingSecurely, ProgressDialog.STYLE_HORIZONTAL);
 
                 // Message is received after deleting is done in ApgService
-                ApgIntentServiceHandler saveHandler = new ApgIntentServiceHandler(activity, deletingDialog) {
+                KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(activity, deletingDialog) {
                     public void handleMessage(Message message) {
                         // handle messages by standard ApgHandler first
                         super.handleMessage(message);
 
-                        if (message.arg1 == ApgIntentServiceHandler.MESSAGE_OKAY) {
+                        if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
                             Toast.makeText(activity, R.string.fileDeleteSuccessful,
                                     Toast.LENGTH_SHORT).show();
                         }
@@ -98,7 +98,7 @@ public class DeleteFileDialogFragment extends DialogFragment {
 
                 // Create a new Messenger for the communication back
                 Messenger messenger = new Messenger(saveHandler);
-                intent.putExtra(ApgIntentService.EXTRA_MESSENGER, messenger);
+                intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
                 // show progress dialog
                 deletingDialog.show(activity.getSupportFragmentManager(), "deletingDialog");
diff --git a/APG/src/org/thialfihar/android/apg/ui/dialog/DeleteKeyDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
index 97477ee17..e61003a9b 100644
--- a/APG/src/org/thialfihar/android/apg/ui/dialog/DeleteKeyDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.dialog;
+package org.sufficientlysecure.keychain.ui.dialog;
 
 import org.spongycastle.openpgp.PGPPublicKeyRing;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -78,11 +78,11 @@ public class DeleteKeyDialogFragment extends DialogFragment {
         if (keyType == Id.type.public_key) {
             PGPPublicKeyRing keyRing = ProviderHelper.getPGPPublicKeyRingByRowId(activity,
                     deleteKeyRingRowId);
-            userId = PGPHelper.getMainUserIdSafe(activity, PGPHelper.getMasterKey(keyRing));
+            userId = PgpHelper.getMainUserIdSafe(activity, PgpHelper.getMasterKey(keyRing));
         } else {
             PGPSecretKeyRing keyRing = ProviderHelper.getPGPSecretKeyRingByRowId(activity,
                     deleteKeyRingRowId);
-            userId = PGPHelper.getMainUserIdSafe(activity, PGPHelper.getMasterKey(keyRing));
+            userId = PgpHelper.getMainUserIdSafe(activity, PgpHelper.getMasterKey(keyRing));
         }
 
         AlertDialog.Builder builder = new AlertDialog.Builder(activity);
diff --git a/APG/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
index 4a9596743..2f9cdb3b1 100644
--- a/APG/src/org/thialfihar/android/apg/ui/dialog/FileDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.dialog;
+package org.sufficientlysecure.keychain.ui.dialog;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.FileHelper;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.helper.FileHelper;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -30,7 +31,6 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
 import android.support.v4.app.DialogFragment;
-import org.thialfihar.android.apg.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CheckBox;
diff --git a/APG/src/org/thialfihar/android/apg/ui/dialog/LookupUnknownKeyDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
index 359c94ee9..17f900552 100644
--- a/APG/src/org/thialfihar/android/apg/ui/dialog/LookupUnknownKeyDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/LookupUnknownKeyDialogFragment.java
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.dialog;
+package org.sufficientlysecure.keychain.ui.dialog;
 
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.ui.KeyServerQueryActivity;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -33,8 +35,6 @@ import android.os.Messenger;
 import android.os.RemoteException;
 import android.support.v4.app.DialogFragment;
 
-import org.thialfihar.android.apg.ui.KeyServerQueryActivity;
-import org.thialfihar.android.apg.util.Log;
 
 public class LookupUnknownKeyDialogFragment extends DialogFragment {
     private static final String ARG_MESSENGER = "messenger";
@@ -78,7 +78,7 @@ public class LookupUnknownKeyDialogFragment extends DialogFragment {
         alert.setIcon(android.R.drawable.ic_dialog_alert);
         alert.setTitle(R.string.title_unknownSignatureKey);
         alert.setMessage(getString(R.string.lookupUnknownKey,
-                PGPHelper.getSmallFingerPrint(unknownKeyId)));
+                PgpHelper.getSmallFingerPrint(unknownKeyId)));
 
         alert.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
 
diff --git a/APG/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
index 236386efe..504de9d69 100644
--- a/APG/src/org/thialfihar/android/apg/ui/dialog/PassphraseDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java
@@ -14,19 +14,22 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.dialog;
+package org.sufficientlysecure.keychain.ui.dialog;
 
 import org.spongycastle.openpgp.PGPException;
 import org.spongycastle.openpgp.PGPPrivateKey;
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.helper.PGPMain;
-import org.thialfihar.android.apg.helper.PGPMain.ApgGeneralException;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.helper.PgpMain;
+import org.sufficientlysecure.keychain.helper.PgpMain.PgpGeneralException;
+import org.sufficientlysecure.keychain.provider.ProviderHelper;
+import org.sufficientlysecure.keychain.service.PassphraseCacheService;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -40,9 +43,6 @@ import android.os.Messenger;
 import android.os.RemoteException;
 import android.support.v4.app.DialogFragment;
 
-import org.thialfihar.android.apg.provider.ProviderHelper;
-import org.thialfihar.android.apg.service.PassphraseCacheService;
-import org.thialfihar.android.apg.util.Log;
 
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -72,14 +72,14 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
      * @param messenger
      *            to communicate back after caching the passphrase
      * @return
-     * @throws ApgGeneralException
+     * @throws PgpGeneralException
      */
     public static PassphraseDialogFragment newInstance(Context context, Messenger messenger,
-            long secretKeyId) throws ApgGeneralException {
+            long secretKeyId) throws PgpGeneralException {
         // check if secret key has a passphrase
         if (!(secretKeyId == Id.key.symmetric || secretKeyId == Id.key.none)) {
             if (!hasPassphrase(context, secretKeyId)) {
-                throw new PGPMain.ApgGeneralException("No passphrase! No passphrase dialog needed!");
+                throw new PgpMain.PgpGeneralException("No passphrase! No passphrase dialog needed!");
             }
         }
 
@@ -102,7 +102,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
     private static boolean hasPassphrase(Context context, long secretKeyId) {
         // check if the key has no passphrase
         try {
-            PGPSecretKey secretKey = PGPHelper.getMasterKey(ProviderHelper
+            PGPSecretKey secretKey = PgpHelper.getMasterKey(ProviderHelper
                     .getPGPSecretKeyRingByKeyId(context, secretKeyId));
             // PGPSecretKey secretKey =
             // PGPHelper.getMasterKey(PGPMain.getSecretKeyRing(secretKeyId));
@@ -152,7 +152,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
             alert.setMessage(R.string.passPhraseForSymmetricEncryption);
         } else {
             // TODO: by master key id???
-            secretKey = PGPHelper.getMasterKey(ProviderHelper.getPGPSecretKeyRingByMasterKeyId(
+            secretKey = PgpHelper.getMasterKey(ProviderHelper.getPGPSecretKeyRingByMasterKeyId(
                     activity, secretKeyId));
             // secretKey = PGPHelper.getMasterKey(PGPMain.getSecretKeyRing(secretKeyId));
 
@@ -167,7 +167,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
                 alert.setCancelable(false);
                 return alert.create();
             }
-            String userId = PGPHelper.getMainUserIdSafe(activity, secretKey);
+            String userId = PgpHelper.getMainUserIdSafe(activity, secretKey);
 
             Log.d(Constants.TAG, "User id: '" + userId + "'");
             alert.setMessage(getString(R.string.passPhraseFor, userId));
@@ -190,7 +190,7 @@ public class PassphraseDialogFragment extends DialogFragment implements OnEditor
                 if (secretKey != null) {
                     try {
                         PBESecretKeyDecryptor keyDecryptor = new JcePBESecretKeyDecryptorBuilder()
-                                .setProvider(PGPMain.BOUNCY_CASTLE_PROVIDER_NAME).build(
+                                .setProvider(PgpMain.BOUNCY_CASTLE_PROVIDER_NAME).build(
                                         passPhrase.toCharArray());
                         PGPPrivateKey testKey = secretKey.extractPrivateKey(keyDecryptor);
                         if (testKey == null) {
diff --git a/APG/src/org/thialfihar/android/apg/ui/dialog/ProgressDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
index 2c007e8e3..69b31419e 100644
--- a/APG/src/org/thialfihar/android/apg/ui/dialog/ProgressDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.dialog;
+package org.sufficientlysecure.keychain.ui.dialog;
 
 import android.app.Activity;
 import android.app.Dialog;
diff --git a/APG/src/org/thialfihar/android/apg/ui/dialog/SetPassphraseDialogFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
index c1bbd886a..f001e7a7d 100644
--- a/APG/src/org/thialfihar/android/apg/ui/dialog/SetPassphraseDialogFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.dialog;
+package org.sufficientlysecure.keychain.ui.dialog;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -28,7 +29,6 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
 import android.support.v4.app.DialogFragment;
-import org.thialfihar.android.apg.util.Log;
 
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
diff --git a/APG/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/DashboardLayout.java
index 8a516ad41..158a271bc 100644
--- a/APG/src/org/thialfihar/android/apg/ui/widget/DashboardLayout.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/DashboardLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.widget;
+package org.sufficientlysecure.keychain.ui.widget;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/APG/src/org/thialfihar/android/apg/ui/widget/Editor.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/Editor.java
index a7200fad0..1cf510d3a 100644
--- a/APG/src/org/thialfihar/android/apg/ui/widget/Editor.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/Editor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.widget;
+package org.sufficientlysecure.keychain.ui.widget;
 
 public interface Editor {
     public interface EditorListener {
diff --git a/APG/src/org/thialfihar/android/apg/ui/widget/ExpandableListFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ExpandableListFragment.java
index 01488909f..54022342f 100644
--- a/APG/src/org/thialfihar/android/apg/ui/widget/ExpandableListFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ExpandableListFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.widget;
+package org.sufficientlysecure.keychain.ui.widget;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/APG/src/org/thialfihar/android/apg/ui/widget/ImportKeysListLoader.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ImportKeysListLoader.java
index 6a2947f94..198140e0c 100644
--- a/APG/src/org/thialfihar/android/apg/ui/widget/ImportKeysListLoader.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/ImportKeysListLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.widget;
+package org.sufficientlysecure.keychain.ui.widget;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -34,13 +34,13 @@ import org.spongycastle.openpgp.PGPPublicKeyRingCollection;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.spongycastle.openpgp.PGPSecretKeyRingCollection;
 import org.spongycastle.openpgp.PGPUtil;
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.PGPConversionHelper;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.util.InputData;
-import org.thialfihar.android.apg.util.Log;
-import org.thialfihar.android.apg.util.PositionAwareInputStream;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.helper.PgpConversionHelper;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.util.InputData;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.util.PositionAwareInputStream;
+import org.sufficientlysecure.keychain.R;
 
 import android.content.Context;
 import android.support.v4.content.AsyncTaskLoader;
@@ -151,13 +151,13 @@ public class ImportKeysListLoader extends AsyncTaskLoader<List<Map<String, Strin
     }
 
     private void addToData(PGPKeyRing keyring) {
-        String userId = PGPHelper.getMainUserId(keyring.getPublicKey());
+        String userId = PgpHelper.getMainUserId(keyring.getPublicKey());
 
         if (keyring instanceof PGPSecretKeyRing) {
             userId = mContext.getString(R.string.secretKeyring) + " " + userId;
         }
 
-        String fingerprint = PGPHelper.convertFingerprintToHex(keyring.getPublicKey()
+        String fingerprint = PgpHelper.convertFingerprintToHex(keyring.getPublicKey()
                 .getFingerprint());
 
         Map<String, String> attrs = new HashMap<String, String>();
diff --git a/APG/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java
index 1d5f9e3d7..15b4ddc6a 100644
--- a/APG/src/org/thialfihar/android/apg/ui/widget/IntegerListPreference.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.thialfihar.android.apg.ui.widget;
+package org.sufficientlysecure.keychain.ui.widget;
 
 import android.content.Context;
 import android.preference.ListPreference;
diff --git a/APG/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
index f8adc3b72..1122fc522 100644
--- a/APG/src/org/thialfihar/android/apg/ui/widget/KeyEditor.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.widget;
+package org.sufficientlysecure.keychain.ui.widget;
 
 import org.spongycastle.openpgp.PGPPublicKey;
 import org.spongycastle.openpgp.PGPSecretKey;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.util.Choice;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.util.Choice;
+import org.sufficientlysecure.keychain.R;
 
 import android.app.DatePickerDialog;
 import android.app.Dialog;
@@ -133,9 +133,9 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
             mDeleteButton.setVisibility(View.INVISIBLE);
         }
 
-        mAlgorithm.setText(PGPHelper.getAlgorithmInfo(key));
-        String keyId1Str = PGPHelper.getSmallFingerPrint(key.getKeyID());
-        String keyId2Str = PGPHelper.getSmallFingerPrint(key.getKeyID() >> 32);
+        mAlgorithm.setText(PgpHelper.getAlgorithmInfo(key));
+        String keyId1Str = PgpHelper.getSmallFingerPrint(key.getKeyID());
+        String keyId2Str = PgpHelper.getSmallFingerPrint(key.getKeyID() >> 32);
         mKeyId.setText(keyId1Str + " " + keyId2Str);
 
         Vector<Choice> choices = new Vector<Choice>();
@@ -161,8 +161,8 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
 
         // Set value in choice dropdown to key
         int selectId = 0;
-        if (PGPHelper.isEncryptionKey(key)) {
-            if (PGPHelper.isSigningKey(key)) {
+        if (PgpHelper.isEncryptionKey(key)) {
+            if (PgpHelper.isSigningKey(key)) {
                 selectId = Id.choice.usage.sign_and_encrypt;
             } else {
                 selectId = Id.choice.usage.encrypt_only;
@@ -185,14 +185,14 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
         }
 
         GregorianCalendar cal = new GregorianCalendar();
-        cal.setTime(PGPHelper.getCreationDate(key));
+        cal.setTime(PgpHelper.getCreationDate(key));
         mCreationDate.setText(DateFormat.getDateInstance().format(cal.getTime()));
         cal = new GregorianCalendar();
-        Date date = PGPHelper.getExpiryDate(key);
+        Date date = PgpHelper.getExpiryDate(key);
         if (date == null) {
             setExpiryDate(null);
         } else {
-            cal.setTime(PGPHelper.getExpiryDate(key));
+            cal.setTime(PgpHelper.getExpiryDate(key));
             setExpiryDate(cal);
         }
 
diff --git a/APG/src/org/thialfihar/android/apg/ui/widget/KeyListAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyListAdapter.java
index 194142b28..8e8d33886 100644
--- a/APG/src/org/thialfihar/android/apg/ui/widget/KeyListAdapter.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyListAdapter.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.widget;
+package org.sufficientlysecure.keychain.ui.widget;
 
-import org.thialfihar.android.apg.Constants;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.OtherHelper;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.provider.ApgContract.Keys;
-import org.thialfihar.android.apg.provider.ApgContract.UserIds;
-import org.thialfihar.android.apg.util.Log;
+import org.sufficientlysecure.keychain.Constants;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.OtherHelper;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
+import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
+import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.R;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -117,7 +117,7 @@ public class KeyListAdapter extends CursorTreeAdapter {
             keyLayout.setVisibility(View.GONE);
             userIdLayout.setVisibility(View.VISIBLE);
 
-            String fingerprint = PGPHelper.getFingerPrint(context,
+            String fingerprint = PgpHelper.getFingerPrint(context,
                     cursor.getLong(cursor.getColumnIndex(Keys.KEY_ID)));
             fingerprint = fingerprint.replace("  ", "\n");
 
@@ -132,9 +132,9 @@ public class KeyListAdapter extends CursorTreeAdapter {
                 keyLayout.setVisibility(View.VISIBLE);
                 userIdLayout.setVisibility(View.GONE);
 
-                String keyIdStr = PGPHelper.getSmallFingerPrint(cursor.getLong(cursor
+                String keyIdStr = PgpHelper.getSmallFingerPrint(cursor.getLong(cursor
                         .getColumnIndex(Keys.KEY_ID)));
-                String algorithmStr = PGPHelper.getAlgorithmInfo(
+                String algorithmStr = PgpHelper.getAlgorithmInfo(
                         cursor.getInt(cursor.getColumnIndex(Keys.ALGORITHM)),
                         cursor.getInt(cursor.getColumnIndex(Keys.KEY_SIZE)));
 
diff --git a/APG/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
index cbea7f031..7c9ba5fe6 100644
--- a/APG/src/org/thialfihar/android/apg/ui/widget/KeyServerEditor.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.widget;
+package org.sufficientlysecure.keychain.ui.widget;
 
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.R;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/APG/src/org/thialfihar/android/apg/ui/widget/SectionView.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index c7e8087cb..7142e4426 100644
--- a/APG/src/org/thialfihar/android/apg/ui/widget/SectionView.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SectionView.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.widget;
+package org.sufficientlysecure.keychain.ui.widget;
 
 import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.helper.PGPConversionHelper;
-import org.thialfihar.android.apg.service.ApgIntentServiceHandler;
-import org.thialfihar.android.apg.service.ApgIntentService;
-import org.thialfihar.android.apg.service.PassphraseCacheService;
-import org.thialfihar.android.apg.ui.dialog.ProgressDialogFragment;
-import org.thialfihar.android.apg.ui.widget.Editor.EditorListener;
-import org.thialfihar.android.apg.util.Choice;
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.PgpConversionHelper;
+import org.sufficientlysecure.keychain.service.KeychainIntentService;
+import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
+import org.sufficientlysecure.keychain.service.PassphraseCacheService;
+import org.sufficientlysecure.keychain.ui.dialog.ProgressDialogFragment;
+import org.sufficientlysecure.keychain.ui.widget.Editor.EditorListener;
+import org.sufficientlysecure.keychain.util.Choice;
+import org.sufficientlysecure.keychain.R;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
@@ -249,9 +249,9 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
 
     private void createKey() {
         // Send all information needed to service to edit key in other thread
-        Intent intent = new Intent(mActivity, ApgIntentService.class);
+        Intent intent = new Intent(mActivity, KeychainIntentService.class);
 
-        intent.putExtra(ApgIntentService.EXTRA_ACTION, ApgIntentService.ACTION_GENERATE_KEY);
+        intent.putExtra(KeychainIntentService.EXTRA_ACTION, KeychainIntentService.ACTION_GENERATE_KEY);
 
         // fill values for this action
         Bundle data = new Bundle();
@@ -262,32 +262,32 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
             passPhrase = PassphraseCacheService
                     .getCachedPassphrase(mActivity, masterKey.getKeyID());
 
-            data.putByteArray(ApgIntentService.GENERATE_KEY_MASTER_KEY,
-                    PGPConversionHelper.PGPSecretKeyToBytes(masterKey));
+            data.putByteArray(KeychainIntentService.GENERATE_KEY_MASTER_KEY,
+                    PgpConversionHelper.PGPSecretKeyToBytes(masterKey));
         } else {
             passPhrase = "";
         }
-        data.putString(ApgIntentService.GENERATE_KEY_SYMMETRIC_PASSPHRASE, passPhrase);
-        data.putInt(ApgIntentService.GENERATE_KEY_ALGORITHM, mNewKeyAlgorithmChoice.getId());
-        data.putInt(ApgIntentService.GENERATE_KEY_KEY_SIZE, mNewKeySize);
+        data.putString(KeychainIntentService.GENERATE_KEY_SYMMETRIC_PASSPHRASE, passPhrase);
+        data.putInt(KeychainIntentService.GENERATE_KEY_ALGORITHM, mNewKeyAlgorithmChoice.getId());
+        data.putInt(KeychainIntentService.GENERATE_KEY_KEY_SIZE, mNewKeySize);
 
-        intent.putExtra(ApgIntentService.EXTRA_DATA, data);
+        intent.putExtra(KeychainIntentService.EXTRA_DATA, data);
 
         // show progress dialog
         mGeneratingDialog = ProgressDialogFragment.newInstance(R.string.progress_generating,
                 ProgressDialog.STYLE_SPINNER);
 
         // Message is received after generating is done in ApgService
-        ApgIntentServiceHandler saveHandler = new ApgIntentServiceHandler(mActivity, mGeneratingDialog) {
+        KeychainIntentServiceHandler saveHandler = new KeychainIntentServiceHandler(mActivity, mGeneratingDialog) {
             public void handleMessage(Message message) {
                 // handle messages by standard ApgHandler first
                 super.handleMessage(message);
 
-                if (message.arg1 == ApgIntentServiceHandler.MESSAGE_OKAY) {
+                if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
                     // get new key from data bundle returned from service
                     Bundle data = message.getData();
-                    PGPSecretKeyRing newKeyRing = (PGPSecretKeyRing) PGPConversionHelper
-                            .BytesToPGPKeyRing(data.getByteArray(ApgIntentService.RESULT_NEW_KEY));
+                    PGPSecretKeyRing newKeyRing = (PGPSecretKeyRing) PgpConversionHelper
+                            .BytesToPGPKeyRing(data.getByteArray(KeychainIntentService.RESULT_NEW_KEY));
 
                     boolean isMasterKey = (mEditors.getChildCount() == 0);
 
@@ -317,7 +317,7 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
 
         // Create a new Messenger for the communication back
         Messenger messenger = new Messenger(saveHandler);
-        intent.putExtra(ApgIntentService.EXTRA_MESSENGER, messenger);
+        intent.putExtra(KeychainIntentService.EXTRA_MESSENGER, messenger);
 
         mGeneratingDialog.show(mActivity.getSupportFragmentManager(), "dialog");
 
diff --git a/APG/src/org/thialfihar/android/apg/ui/widget/SelectKeyCursorAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SelectKeyCursorAdapter.java
index 0f6bd5f11..da8ac94ee 100644
--- a/APG/src/org/thialfihar/android/apg/ui/widget/SelectKeyCursorAdapter.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/SelectKeyCursorAdapter.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.widget;
+package org.sufficientlysecure.keychain.ui.widget;
 
-import org.thialfihar.android.apg.Id;
-import org.thialfihar.android.apg.R;
-import org.thialfihar.android.apg.helper.OtherHelper;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.provider.ApgContract.KeyRings;
-import org.thialfihar.android.apg.provider.ApgContract.UserIds;
+import org.sufficientlysecure.keychain.Id;
+import org.sufficientlysecure.keychain.helper.OtherHelper;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
+import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
+import org.sufficientlysecure.keychain.R;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -88,7 +88,7 @@ public class SelectKeyCursorAdapter extends CursorAdapter {
         }
 
         long masterKeyId = cursor.getLong(cursor.getColumnIndex(KeyRings.MASTER_KEY_ID));
-        keyId.setText(PGPHelper.getSmallFingerPrint(masterKeyId));
+        keyId.setText(PgpHelper.getSmallFingerPrint(masterKeyId));
 
         if (mainUserIdRest.getText().length() == 0) {
             mainUserIdRest.setVisibility(View.GONE);
diff --git a/APG/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
index 2495a4f9d..2215d29e7 100644
--- a/APG/src/org/thialfihar/android/apg/ui/widget/UserIdEditor.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.ui.widget;
+package org.sufficientlysecure.keychain.ui.widget;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.thialfihar.android.apg.R;
+import org.sufficientlysecure.keychain.R;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/APG/src/org/thialfihar/android/apg/util/Choice.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Choice.java
index 94cc58f55..9e0042c00 100644
--- a/APG/src/org/thialfihar/android/apg/util/Choice.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Choice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.util;
+package org.sufficientlysecure.keychain.util;
 
 public class Choice {
     private String mName;
diff --git a/APG/src/org/thialfihar/android/apg/util/HkpKeyServer.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/HkpKeyServer.java
index 492e2e3d0..586a03498 100644
--- a/APG/src/org/thialfihar/android/apg/util/HkpKeyServer.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/HkpKeyServer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.util;
+package org.sufficientlysecure.keychain.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -43,8 +43,8 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
-import org.thialfihar.android.apg.helper.PGPHelper;
-import org.thialfihar.android.apg.helper.PGPMain;
+import org.sufficientlysecure.keychain.helper.PgpHelper;
+import org.sufficientlysecure.keychain.helper.PgpMain;
 
 import android.text.Html;
 
@@ -179,8 +179,8 @@ public class HkpKeyServer extends KeyServer {
             KeyInfo info = new KeyInfo();
             info.size = Integer.parseInt(matcher.group(1));
             info.algorithm = matcher.group(2);
-            info.keyId = PGPHelper.keyFromHex(matcher.group(3));
-            info.fingerPrint = PGPHelper.getSmallFingerPrint(info.keyId);
+            info.keyId = PgpHelper.keyFromHex(matcher.group(3));
+            info.fingerPrint = PgpHelper.getSmallFingerPrint(info.keyId);
             String chunks[] = matcher.group(4).split("-");
             info.date = new GregorianCalendar(Integer.parseInt(chunks[0]),
                     Integer.parseInt(chunks[1]), Integer.parseInt(chunks[2])).getTime();
@@ -211,7 +211,7 @@ public class HkpKeyServer extends KeyServer {
         HttpClient client = new DefaultHttpClient();
         try {
             HttpGet get = new HttpGet("http://" + mHost + ":" + mPort
-                    + "/pks/lookup?op=get&search=0x" + PGPHelper.keyToHex(keyId));
+                    + "/pks/lookup?op=get&search=0x" + PgpHelper.keyToHex(keyId));
 
             HttpResponse response = client.execute(get);
             if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
@@ -221,7 +221,7 @@ public class HkpKeyServer extends KeyServer {
             HttpEntity entity = response.getEntity();
             InputStream is = entity.getContent();
             String data = readAll(is, EntityUtils.getContentCharSet(entity));
-            Matcher matcher = PGPMain.PGP_PUBLIC_KEY.matcher(data);
+            Matcher matcher = PgpMain.PGP_PUBLIC_KEY.matcher(data);
             if (matcher.find()) {
                 return matcher.group(1);
             }
diff --git a/APG/src/org/thialfihar/android/apg/util/InputData.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/InputData.java
index 6b357e6de..f5bcbf88a 100644
--- a/APG/src/org/thialfihar/android/apg/util/InputData.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/InputData.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.util;
+package org.sufficientlysecure.keychain.util;
 
 import java.io.InputStream;
 
diff --git a/APG/src/org/thialfihar/android/apg/util/IterableIterator.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/IterableIterator.java
index 1071cc81c..caaa07524 100644
--- a/APG/src/org/thialfihar/android/apg/util/IterableIterator.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/IterableIterator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.util;
+package org.sufficientlysecure.keychain.util;
 
 import java.util.Iterator;
 
diff --git a/APG/src/org/thialfihar/android/apg/util/KeyServer.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/KeyServer.java
index 97c6c7636..cdc188887 100644
--- a/APG/src/org/thialfihar/android/apg/util/KeyServer.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/KeyServer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.util;
+package org.sufficientlysecure.keychain.util;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/APG/src/org/thialfihar/android/apg/util/Log.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Log.java
index c2e3cc7a5..cad01d708 100644
--- a/APG/src/org/thialfihar/android/apg/util/Log.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Log.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.util;
+package org.sufficientlysecure.keychain.util;
 
-import org.thialfihar.android.apg.Constants;
+import org.sufficientlysecure.keychain.Constants;
 
 /**
  * Wraps Android Logging to enable or disable debug output using Constants
diff --git a/APG/src/org/thialfihar/android/apg/util/PositionAwareInputStream.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java
index 7850e2513..a783d7820 100644
--- a/APG/src/org/thialfihar/android/apg/util/PositionAwareInputStream.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.util;
+package org.sufficientlysecure.keychain.util;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/APG/src/org/thialfihar/android/apg/util/Primes.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Primes.java
index bc52927e8..f503227a3 100644
--- a/APG/src/org/thialfihar/android/apg/util/Primes.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/Primes.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.util;
+package org.sufficientlysecure.keychain.util;
 
 import java.math.BigInteger;
 
diff --git a/APG/src/org/thialfihar/android/apg/util/ProgressDialogUpdater.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java
index 1f76cb071..26c05ad0a 100644
--- a/APG/src/org/thialfihar/android/apg/util/ProgressDialogUpdater.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thialfihar.android.apg.util;
+package org.sufficientlysecure.keychain.util;
 
 public interface ProgressDialogUpdater {
     void setProgress(String message, int current, int total);