diff --git a/src/Kp2aBusinessLogic/Io/CachingFileStorage.cs b/src/Kp2aBusinessLogic/Io/CachingFileStorage.cs
index 4a0ee35b..46d32847 100644
--- a/src/Kp2aBusinessLogic/Io/CachingFileStorage.cs
+++ b/src/Kp2aBusinessLogic/Io/CachingFileStorage.cs
@@ -59,7 +59,7 @@ namespace keepass2android.Io
 	/// Implements the IFileStorage interface as a proxy: A base storage is used as a remote storage. Local files are used to cache the
 	/// files on remote.
 	/// </summary>
-	public class CachingFileStorage : IFileStorage, IOfflineSwitchable
+	public class CachingFileStorage : IFileStorage
 	{
 		
 		protected readonly OfflineSwitchableFileStorage _cachedStorage;
diff --git a/src/keepass2android/ChangeLog.cs b/src/keepass2android/ChangeLog.cs
index ea5ebbe6..f573fa10 100644
--- a/src/keepass2android/ChangeLog.cs
+++ b/src/keepass2android/ChangeLog.cs
@@ -26,7 +26,6 @@ namespace keepass2android
 			AlertDialog.Builder builder = new AlertDialog.Builder(new ContextThemeWrapper(ctx, Android.Resource.Style.ThemeHoloLightDialog));
 			builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
 			List<string> changeLog = new List<string>{
-				ctx.GetString(Resource.String.ChangeLog_1_0_0),
 				ctx.GetString(Resource.String.ChangeLog_0_9_9c),				
 				ctx.GetString(Resource.String.ChangeLog_0_9_9),				
 				ctx.GetString(Resource.String.ChangeLog_0_9_8c),				
diff --git a/src/keepass2android/Properties/AndroidManifest_nonet.xml b/src/keepass2android/Properties/AndroidManifest_nonet.xml
index a263886d..d2ad0856 100644
--- a/src/keepass2android/Properties/AndroidManifest_nonet.xml
+++ b/src/keepass2android/Properties/AndroidManifest_nonet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="59" 
-			android:versionName="0.9.8b" 
+			android:versionCode="67" 
+			android:versionName="0.9.9" 
 			package="keepass2android.keepass2android_nonet"
 			android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
@@ -40,7 +40,7 @@
             </intent-filter>
         </activity>
  
-		<activity android:configChanges="keyboardHidden|orientation" android:label="@string/app_name" android:theme="@style/MyTheme" android:name="keepass2android.PasswordActivity" android:windowSoftInputMode="adjustResize">
+		<activity android:configChanges="orientation" android:label="@string/app_name" android:theme="@style/MyTheme_Blue" android:name="keepass2android.PasswordActivity" android:windowSoftInputMode="adjustResize">
 		  <intent-filter android:label="@string/app_name">
 		  <action android:name="android.intent.action.VIEW" />
 			    <category android:name="android.intent.category.DEFAULT" />
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index 2cefcf1b..a3557776 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -1558,7 +1558,7 @@
     <AndroidResource Include="Resources\drawable-xhdpi\icf48.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\ic_filestorage_kp2a.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_storage_kp2a.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_close.png" />