diff --git a/src/KeePass.sln b/src/KeePass.sln
index e5c04757..8828693c 100644
--- a/src/KeePass.sln
+++ b/src/KeePass.sln
@@ -109,6 +109,7 @@ Global
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Release|x64.Build.0 = Release|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Any CPU.Deploy.0 = ReleaseNoNet|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.ReleaseNoNet|Mixed Platforms.Deploy.0 = ReleaseNoNet|Any CPU
@@ -149,8 +150,8 @@ Global
 		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|Win32.ActiveCfg = Release|Any CPU
 		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|x64.ActiveCfg = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
 		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
 		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
@@ -209,8 +210,8 @@ Global
 		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|Win32.ActiveCfg = Release|Any CPU
 		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.Release|x64.ActiveCfg = Release|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
+		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
 		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
 		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{5CF675A5-9BEE-4720-BED9-D5BF14A2EBF9}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
@@ -389,8 +390,8 @@ Global
 		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|Win32.Build.0 = Release|Any CPU
 		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|x64.ActiveCfg = Release|Any CPU
 		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.Release|x64.Build.0 = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Any CPU.ActiveCfg = ReleaseNoNet|Any CPU
+		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Any CPU.Build.0 = ReleaseNoNet|Any CPU
 		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
 		{6C29A7E7-E016-4FC1-B1A0-DEE26AC711BB}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
diff --git a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
index 962b5a25..bc5de5f1 100644
--- a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
+++ b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
@@ -37,7 +37,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU'">
     <OutputPath>bin\ReleaseNoNet\</OutputPath>
-    <DefineConstants>TRACE;NoNet</DefineConstants>
+    <DefineConstants>TRACE;NoNet;EXCLUDE_JAVAFILESTORAGE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -125,10 +125,6 @@
     <Compile Include="Utils\Spr\SprEngine.PickChars.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj">
-      <Project>{48574278-4779-4B3A-A9E4-9CF1BC285D0B}</Project>
-      <Name>JavaFileStorageBindings</Name>
-    </ProjectReference>
     <ProjectReference Include="..\KeePassLib2Android\KeePassLib2Android.csproj">
       <Project>{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}</Project>
       <Name>KeePassLib2Android</Name>
diff --git a/src/ZlibAndroid/ZlibAndroid.csproj b/src/ZlibAndroid/ZlibAndroid.csproj
index 46146295..d2238c67 100644
--- a/src/ZlibAndroid/ZlibAndroid.csproj
+++ b/src/ZlibAndroid/ZlibAndroid.csproj
@@ -35,6 +35,15 @@
     <ConsolePause>false</ConsolePause>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU'">
+    <OutputPath>bin\ReleaseNoNet\</OutputPath>
+    <Optimize>true</Optimize>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
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/FileStorageSelectionActivity.cs b/src/keepass2android/FileStorageSelectionActivity.cs
index aab772d3..2b74e904 100644
--- a/src/keepass2android/FileStorageSelectionActivity.cs
+++ b/src/keepass2android/FileStorageSelectionActivity.cs
@@ -123,9 +123,15 @@ namespace keepass2android
 			    
 			    var protocolId = _protocolIds[position];
                 btn.Tag = protocolId;
+
+
+
                 Drawable drawable = App.Kp2a.GetResourceDrawable("ic_storage_" + protocolId);
-                
-                String title = App.Kp2a.GetResourceString("filestoragename_" + protocolId);
+
+				String title =
+					protocolId == "kp2a" ? App.Kp2a.GetResourceString("get_regular_version")
+						:
+						App.Kp2a.GetResourceString("filestoragename_" + protocolId);
                 var str = new SpannableString(title);
 
 			    btn.TextFormatted = str;
@@ -133,21 +139,6 @@ namespace keepass2android
                 btn.SetCompoundDrawablesWithIntrinsicBounds(null, drawable, null, null);
 
                 return btn;
-#if NoNet
-				TODO: kp2a button
-#endif
-                /*
-				if (_protocolIds[position] == "kp2a")
-				{
-					return new FileStorageViewKp2a(_context);
-				}
-				else
-				{
-					var view = new FileStorageView(_context, _protocolIds[position], position);
-					return view;	
-				}
-				*/
-
 			}
 
 			public override int Count
diff --git a/src/keepass2android/Properties/AndroidManifest_nonet.xml b/src/keepass2android/Properties/AndroidManifest_nonet.xml
index 159c8110..22dabe6a 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="23" />
@@ -46,7 +46,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/Resources/drawable-mdpi/downloadstoragetypes.png b/src/keepass2android/Resources/drawable-mdpi/ic_storage_kp2a
similarity index 100%
rename from src/keepass2android/Resources/drawable-mdpi/downloadstoragetypes.png
rename to src/keepass2android/Resources/drawable-mdpi/ic_storage_kp2a
diff --git a/src/keepass2android/Resources/drawable-xhdpi/downloadstoragetypes.png b/src/keepass2android/Resources/drawable-xhdpi/ic_storage_kp2a.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi/downloadstoragetypes.png
rename to src/keepass2android/Resources/drawable-xhdpi/ic_storage_kp2a.png
diff --git a/src/keepass2android/fileselect/FileSelectActivity.cs b/src/keepass2android/fileselect/FileSelectActivity.cs
index 91448a39..a29b084c 100644
--- a/src/keepass2android/fileselect/FileSelectActivity.cs
+++ b/src/keepass2android/fileselect/FileSelectActivity.cs
@@ -120,11 +120,10 @@ namespace keepass2android
 				FindViewById(Resource.Id.recent_files).Visibility = ViewStates.Invisible;
                 Android.Util.Log.Debug("KP2A", "Recent files invisible");
 #if NoNet
-                TODO
-				ImageView imgView = FindViewById(Resource.Id.imglogo) as ImageView;
+				ImageView imgView = FindViewById(Resource.Id.splashlogo) as ImageView;
 				if (imgView != null)
 				{
-					imgView.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.ic_keepass2android_nonet));
+					imgView.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.splashlogo_offline));
 				}
 #endif
 			}
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index 23961f13..ea2e6d62 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -329,7 +329,7 @@
     <AndroidResource Include="Resources\drawable\search_dropdown_light.xml" />
     <AndroidResource Include="Resources\drawable-mdpi\checkmark.png" />
     <AndroidResource Include="Resources\drawable-mdpi\createnewdb.png" />
-    <AndroidResource Include="Resources\drawable-mdpi\downloadstoragetypes.png" />
+    <AndroidResource Include="Resources\drawable-mdpi\ic_storage_kp2a" />
     <AndroidResource Include="Resources\drawable-mdpi\ic_action_lock.png" />
     <AndroidResource Include="Resources\drawable-mdpi\ic_action_password.png" />
     <AndroidResource Include="Resources\drawable-mdpi\ic_action_search.png" />
@@ -1576,7 +1576,7 @@
     <AndroidResource Include="Resources\drawable-xhdpi\icf48.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\downloadstoragetypes.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_storage_kp2a.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_close.png" />