Add skeleton build variant

310 files changed, 304 insertions, 236 deletions

diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index a9a08bf4..8df4ed79 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -8,18 +8,11 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <!-- <uses-permission android:name="com.android.vending.BILLING" /> -->
-    <uses-feature
-        android:name="android.software.leanback"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
 
     <application
         android:name=".core.ICSOpenVPNApplication"
         android:allowBackup="true"
         android:appCategory="productivity"
-        android:banner="@mipmap/banner_tv"
         android:extractNativeLibs="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app"
@@ -49,20 +42,7 @@
             android:label="@string/openvpn_log"
             android:launchMode="singleTask" />
         <activity android:name=".activities.FileSelect" />
-        <activity
-            android:name=".activities.MainActivity"
-            tools:ignore="ExportedActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
-            </intent-filter>
-        </activity>
 
         <service
             android:name=".core.OpenVPNService"
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index 2ada65af..e096762c 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -18,6 +18,8 @@ OPTION(OPENVPN2MBED "Use mbed TLS for OpenVPN2" OFF)
 OPTION(OPENVPN3OSSL "Use OpenSSL for OpenVPN3" ON)
 SET(OPENVPN3OSSL ON)
 
+# STATIC or SHARED
+SET(SSLLIBTYPE STATIC)
 
 #add_subdirectory(lzo)
 include(tools.cmake)
@@ -25,12 +27,15 @@ include(lzo.cmake)
 include(lz4.cmake)
 include(openssl.cmake)
 
-# Super hacky way to determine flavour
+if(NOT ${OPENVPN3OSSL} OR ${OPENVPN2MBED})
+    add_subdirectory(mbedtls)
+endif()
+
+    # Super hacky way to determine flavour
 #-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/Users/arne/software/icsopenvpn/main/build/intermediates/cmake/normal/debug/obj/arm64-v8a
-if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*noovpn3.*/")
+if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*skeleton.*/")
     FIND_PACKAGE(SWIG 3.0 REQUIRED)
 
-    add_subdirectory(mbedtls)
     add_custom_command(OUTPUT "ovpncli_wrap.cxx"
             COMMAND ${CMAKE_COMMAND} -E make_directory ovpn3
             COMMAND ${SWIG_EXECUTABLE} -outdir ovpn3
@@ -92,12 +97,20 @@ else ()
     message("Not budiling OpenVPN for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 endif ()
 
-add_library(opvpnutil SHARED opvpnutil/jniglue.c opvpnutil/scan_ifs.c opvpnutil/sslspeed.c)
+add_library(opvpnutil SHARED opvpnutil/jniglue.c opvpnutil/scan_ifs.c)
 target_compile_definitions(opvpnutil PRIVATE -DTARGET_ARCH_ABI=\"${ANDROID_ABI}\"
         -DOPENVPN2_GIT_REVISION=\"${OPENVPN2_GIT}\"
         -DOPENVPN3_GIT_REVISION=\"${OPENVPN3_GIT}\"
         )
-target_link_libraries(opvpnutil log crypto ssl)
+target_link_libraries(opvpnutil log)
+
+
+if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*skeleton.*/")
+    add_library(osslspeedtest opvpnutil/sslspeed.c)
+    target_link_libraries(osslspeedtest log crypto ssl)
+else ()
+    message("Not budiling SSLSpeedTest for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+endif ()
 
 # The magic Jellybean keystore signing hack. Beware dragons and dlsyms magic ahead
 add_library(jbcrypto SHARED jbcrypto/jbcrypto.cpp)
diff --git a/main/src/main/cpp/openssl.cmake b/main/src/main/cpp/openssl.cmake
index 5d4ffb47..a473c62d 100644
--- a/main/src/main/cpp/openssl.cmake
+++ b/main/src/main/cpp/openssl.cmake
@@ -669,7 +669,7 @@ elseif(${ANDROID_ABI} STREQUAL "x86_64")
     crypto/sha/asm/sha256-x86_64.S 
     crypto/sha/asm/sha512-x86_64.S
     crypto/sha/asm/keccak1600-x86_64.S
-    crypto/sha/asm/keccak1600-avx2.S
+    #crypto/sha/asm/keccak1600-avx2.S
     #crypto/sha/asm/keccak1600-avx512.S
     #crypto/sha/asm/keccak1600-avx512vl.S
     crypto/ec/asm/x25519-x86_64.S
@@ -689,7 +689,7 @@ else()
 endif()
 
 PREPEND(crypto_srcs_with_path "openssl" ${crypto_srcs})
-add_library(crypto ${crypto_srcs_with_path})
+add_library(crypto ${SSLLIBTYPE} ${crypto_srcs_with_path} )
 
 target_include_directories(crypto PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}/crypto/include
@@ -833,7 +833,7 @@ set (ssl_srcs
 )
 
 PREPEND(ssl_srcs_with_path "openssl" ${ssl_srcs})
-add_library(ssl ${ssl_srcs_with_path})
+add_library(ssl ${SSLLIBTYPE} ${ssl_srcs_with_path})
 
 
 target_link_libraries(ssl crypto)
diff --git a/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java b/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
index 181cca5f..6c5e3f10 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
@@ -13,12 +13,6 @@ import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
 
-/*
-import org.acra.ACRA;
-import org.acra.ReportingInteractionMode;
-import org.acra.annotation.ReportsCrashes;
-*/
-
 import android.os.StrictMode;
 import de.blinkt.openvpn.BuildConfig;
 import de.blinkt.openvpn.R;
diff --git a/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java b/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
index 4e22189a..6be24995 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
@@ -6,6 +6,7 @@
 package de.blinkt.openvpn.core;
 
 import android.os.Build;
+import de.blinkt.openvpn.BuildConfig;
 
 import java.security.InvalidKeyException;
 
@@ -42,6 +43,9 @@ public class NativeUtils {
             if (Build.VERSION.SDK_INT == Build.VERSION_CODES.JELLY_BEAN)
                 System.loadLibrary("jbcrypto");
         }
+        if (!BuildConfig.FLAVOR.equals("skeleton")) {
+            System.loadLibrary("osslspeedtest");
+        }
     }
 
     public static boolean isRoboUnitTest() {
diff --git a/main/src/skeleton/AndroidManifest.xml b/main/src/skeleton/AndroidManifest.xml
new file mode 100644
index 00000000..916da0e2
--- /dev/null
+++ b/main/src/skeleton/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Copyright (c) 2012-2019 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="de.blinkt.openvpn">
+
+    <application tools:ignore="AllowBackup,GoogleAppIndexingWarning">
+        <activity
+            android:name=".activities.MainActivity"
+            tools:ignore="ExportedActivity" />
+    </application>
+
+</manifest>
diff --git a/main/src/skeleton/java/de/blinkt/openvpn/activities/LogWindow.java b/main/src/skeleton/java/de/blinkt/openvpn/activities/LogWindow.java
new file mode 100644
index 00000000..efa1b7be
--- /dev/null
+++ b/main/src/skeleton/java/de/blinkt/openvpn/activities/LogWindow.java
@@ -0,0 +1,15 @@
+package de.blinkt.openvpn.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.widget.Toast;
+
+public class LogWindow extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Toast.makeText(this, "Not implemented", Toast.LENGTH_LONG).show();
+        finish();
+    }
+}
\ No newline at end of file
diff --git a/main/src/skeleton/java/de/blinkt/openvpn/activities/MainActivity.java b/main/src/skeleton/java/de/blinkt/openvpn/activities/MainActivity.java
new file mode 100644
index 00000000..8a46e0e7
--- /dev/null
+++ b/main/src/skeleton/java/de/blinkt/openvpn/activities/MainActivity.java
@@ -0,0 +1,15 @@
+package de.blinkt.openvpn.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.widget.Toast;
+
+public class MainActivity extends Activity {
+    @Override
+    protected void onCreate( Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Toast.makeText(this, "Not implemented", Toast.LENGTH_LONG).show();
+        finish();
+    }
+}
\ No newline at end of file
diff --git a/main/src/ui/AndroidManifest.xml b/main/src/ui/AndroidManifest.xml
new file mode 100644
index 00000000..a4489228
--- /dev/null
+++ b/main/src/ui/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<!--
+  ~ Copyright (c) 2012-2019 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="de.blinkt.openvpn">
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+    <application
+        android:banner="@mipmap/banner_tv"
+        >
+    <activity
+        android:name=".activities.MainActivity"
+        tools:ignore="ExportedActivity">
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+
+            <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+        <intent-filter>
+            <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
+        </intent-filter>
+    </activity>
+    </application>
+</manifest>
diff --git a/main/src/main/java/android/support/v4n/app/FragmentStatePagerAdapter.java b/main/src/ui/java/android/support/v4n/app/FragmentStatePagerAdapter.java
index 4ffec519..4ffec519 100644
--- a/main/src/main/java/android/support/v4n/app/FragmentStatePagerAdapter.java
+++ b/main/src/ui/java/android/support/v4n/app/FragmentStatePagerAdapter.java
diff --git a/main/src/main/java/android/support/v4n/view/PagerAdapter.java b/main/src/ui/java/android/support/v4n/view/PagerAdapter.java
index 70ed75f3..70ed75f3 100644
--- a/main/src/main/java/android/support/v4n/view/PagerAdapter.java
+++ b/main/src/ui/java/android/support/v4n/view/PagerAdapter.java
diff --git a/main/src/main/java/android/support/v4n/view/ViewPager.java b/main/src/ui/java/android/support/v4n/view/ViewPager.java
index 6009af62..6009af62 100644
--- a/main/src/main/java/android/support/v4n/view/ViewPager.java
+++ b/main/src/ui/java/android/support/v4n/view/ViewPager.java
diff --git a/main/src/main/java/de/blinkt/openvpn/OpenVPNTileService.java b/main/src/ui/java/de/blinkt/openvpn/OpenVPNTileService.java
index ce14cc98..ce14cc98 100644
--- a/main/src/main/java/de/blinkt/openvpn/OpenVPNTileService.java
+++ b/main/src/ui/java/de/blinkt/openvpn/OpenVPNTileService.java
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/BaseActivity.java b/main/src/ui/java/de/blinkt/openvpn/activities/BaseActivity.java
index 7258d8d6..7258d8d6 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/BaseActivity.java
+++ b/main/src/ui/java/de/blinkt/openvpn/activities/BaseActivity.java
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java b/main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.java
index 38b47b5a..38b47b5a 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
+++ b/main/src/ui/java/de/blinkt/openvpn/activities/ConfigConverter.java
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java b/main/src/ui/java/de/blinkt/openvpn/activities/CreateShortcuts.java
index e1cb8862..e1cb8862 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java
+++ b/main/src/ui/java/de/blinkt/openvpn/activities/CreateShortcuts.java
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java b/main/src/ui/java/de/blinkt/openvpn/activities/FileSelect.java
index 44538cb4..80a134a9 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java
+++ b/main/src/ui/java/de/blinkt/openvpn/activities/FileSelect.java
@@ -51,11 +51,11 @@ public class FileSelect extends BaseActivity {
 	private boolean mNoInline;
 	private boolean mShowClear;
 	private boolean mBase64Encode;
-	
-		
+
+
 	public void onCreate(Bundle savedInstanceState)
 	{
-		super.onCreate(savedInstanceState); 
+		super.onCreate(savedInstanceState);
 		setContentView(R.layout.file_dialog);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
@@ -64,27 +64,27 @@ public class FileSelect extends BaseActivity {
         mData = getIntent().getStringExtra(START_DATA);
 		if(mData==null)
 			mData=Environment.getExternalStorageDirectory().getPath();
-		
+
 		String title = getIntent().getStringExtra(WINDOW_TITLE);
 		int titleId = getIntent().getIntExtra(WINDOW_TITLE, 0);
-		if(titleId!=0) 
+		if(titleId!=0)
 			title =getString(titleId);
 		if(title!=null)
 			setTitle(title);
-		
+
 		mNoInline = getIntent().getBooleanExtra(NO_INLINE_SELECTION, false);
 		mShowClear = getIntent().getBooleanExtra(SHOW_CLEAR_BUTTON, false);
 		mBase64Encode = getIntent().getBooleanExtra(DO_BASE64_ENCODE, false);
-		
+
 		ActionBar bar = getActionBar();
-		bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); 
+		bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
 		fileExplorerTab = bar.newTab().setText(R.string.file_explorer_tab);
-		inlineFileTab = bar.newTab().setText(R.string.inline_file_tab); 
+		inlineFileTab = bar.newTab().setText(R.string.inline_file_tab);
 
 		mFSFragment = new FileSelectionFragment();
 		fileExplorerTab.setTabListener(new MyTabsListener<FileSelectionFragment>(this, mFSFragment));
 		bar.addTab(fileExplorerTab);
-		
+
 		if(!mNoInline) {
 			mInlineFragment = new InlineFileTab();
 			inlineFileTab.setTabListener(new MyTabsListener<InlineFileTab>(this, mInlineFragment));
@@ -93,7 +93,7 @@ public class FileSelect extends BaseActivity {
 			mFSFragment.setNoInLine();
 		}
 
-		
+
 	}
 
 
@@ -147,7 +147,7 @@ public class FileSelect extends BaseActivity {
 				// If it exists, simply attach it in order to show it
 				ft.attach(mFragment);
 			}
-		}	        
+		}
 
 		@Override
 		public void onTabUnselected(Tab tab, FragmentTransaction ft) {
@@ -159,22 +159,22 @@ public class FileSelect extends BaseActivity {
 
 		}
 	}
-	
+
 	public void importFile(String path) {
 		File ifile = new File(path);
 		Exception fe = null;
 		try {
 
 			String data = "";
-			
+
 			byte[] fileData = readBytesFromFile(ifile) ;
 			if(mBase64Encode)
 				data += Base64.encodeToString(fileData, Base64.DEFAULT);
 			else
 				data += new String(fileData);
-			
+
 			mData =data;
-			
+
 			/*
 			mInlineFragment.setData(data);
 			getActionBar().selectTab(inlineFileTab); */
@@ -212,13 +212,13 @@ public class FileSelect extends BaseActivity {
 		input.close();
 		return bytes;
 	}
-	
-	
+
+
 	public void setFile(String path) {
 		Intent intent = new Intent();
 		intent.putExtra(RESULT_DATA, path);
 		setResult(Activity.RESULT_OK,intent);
-		finish();		
+		finish();
 	}
 
 	public String getSelectPath() {
@@ -234,13 +234,13 @@ public class FileSelect extends BaseActivity {
 		else
 			return "";
 	}
-	
+
 	public void clearData() {
 		Intent intent = new Intent();
 		intent.putExtra(RESULT_DATA, (String)null);
 		setResult(Activity.RESULT_OK,intent);
 		finish();
-		
+
 	}
 
 	public void saveInlineData(String fileName, String string) {
@@ -252,6 +252,6 @@ public class FileSelect extends BaseActivity {
 		    intent.putExtra(RESULT_DATA,VpnProfile.DISPLAYNAME_TAG + fileName + VpnProfile.INLINE_TAG + string);
 		setResult(Activity.RESULT_OK, intent);
 		finish();
-		
+
 	}
 }
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java b/main/src/ui/java/de/blinkt/openvpn/activities/LogWindow.java
index db70eca9..db70eca9 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java
+++ b/main/src/ui/java/de/blinkt/openvpn/activities/LogWindow.java
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java b/main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java
index f7c46d01..f7c46d01 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java
+++ b/main/src/ui/java/de/blinkt/openvpn/activities/MainActivity.java
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/OpenSSLSpeed.java b/main/src/ui/java/de/blinkt/openvpn/activities/OpenSSLSpeed.java
index 4720dd60..4720dd60 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/OpenSSLSpeed.java
+++ b/main/src/ui/java/de/blinkt/openvpn/activities/OpenSSLSpeed.java
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java b/main/src/ui/java/de/blinkt/openvpn/activities/VPNPreferences.java
index 65acdaa6..06f1f7b7 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java
+++ b/main/src/ui/java/de/blinkt/openvpn/activities/VPNPreferences.java
@@ -227,12 +227,12 @@ public class VPNPreferences extends BaseActivity {
 		dialog.setNegativeButton(android.R.string.no,null);
 		dialog.create().show();
 	}
-	
+
 	protected void removeProfile(VpnProfile profile) {
 		ProfileManager.getInstance(this).removeProfile(this,profile);
 		setResult(VPNProfileList.RESULT_VPN_DELETED);
 		finish();
-		
+
 	}
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@@ -242,4 +242,3 @@ public class VPNPreferences extends BaseActivity {
     }
 
 }
-
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java
index 540f4a9a..540f4a9a 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/AboutFragment.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java b/main/src/ui/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java
index 9c4c80de..9c4c80de 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/ConnectionsAdapter.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/FaqFragment.java
index 58937caf..af4c35fe 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/FaqFragment.java
@@ -113,7 +113,7 @@ public class FaqFragment extends Fragment {
             new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, -1, R.string.faq_howto_title, R.string.faq_howto),
 
             new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, -1, R.string.faq_killswitch_title, R.string.faq_killswitch),
-            
+
             new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, -1, R.string.faq_remote_api_title, R.string.faq_remote_api),
 
             new FAQEntry(Build.VERSION_CODES.ICE_CREAM_SANDWICH, -1, R.string.weakmd_title, R.string.weakmd),
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java b/main/src/ui/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java
index 0be9f4a2..0be9f4a2 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/FaqViewAdapter.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
index 9d12b83d..9d12b83d 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java b/main/src/ui/java/de/blinkt/openvpn/fragments/GeneralSettings.java
index 88c46e6e..34d37823 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/GeneralSettings.java
@@ -130,7 +130,7 @@ public class GeneralSettings extends PreferenceFragment implements OnPreferenceC
 		if(mExtapp.getExtAppList().isEmpty()) {
 			clearapi.setEnabled(false);
 			clearapi.setSummary(R.string.no_external_app_allowed);
-		} else { 
+		} else {
 			clearapi.setEnabled(true);
 			clearapi.setSummary(getString(R.string.allowed_apps, getExtAppList(", ")));
 		}
@@ -163,7 +163,7 @@ public class GeneralSettings extends PreferenceFragment implements OnPreferenceC
     }
 
 	@Override
-	public boolean onPreferenceClick(Preference preference) { 
+	public boolean onPreferenceClick(Preference preference) {
 		if(preference.getKey().equals("clearapi")){
 			Builder builder = new AlertDialog.Builder(getActivity());
 			builder.setPositiveButton(R.string.clear, this);
@@ -173,7 +173,7 @@ public class GeneralSettings extends PreferenceFragment implements OnPreferenceC
 		} else if (preference.getKey().equals("osslspeed")) {
 			startActivity(new Intent(getActivity(), OpenSSLSpeed.class));
 		}
-			
+
 		return true;
 	}
 
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/GraphFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/GraphFragment.java
index 10c09461..10c09461 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/GraphFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/GraphFragment.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java b/main/src/ui/java/de/blinkt/openvpn/fragments/InlineFileTab.java
index 41206a54..41206a54 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/InlineFileTab.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt b/main/src/ui/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt
index 323b3a4d..323b3a4d 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/KeyChainSettingsFragment.kt
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/LogFragment.java
index e64ce2cd..e64ce2cd 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/LogFragment.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
index ee51c776..9ac8bebb 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
@@ -1,53 +1,53 @@
-/*

- * Copyright (c) 2012-2016 Arne Schwabe

- * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt

- */

-

-package de.blinkt.openvpn.fragments;

-

-import android.os.Bundle;

-import android.preference.PreferenceFragment;

-import de.blinkt.openvpn.R;

-import de.blinkt.openvpn.VpnProfile;

-import de.blinkt.openvpn.core.ProfileManager;

-

-public abstract class OpenVpnPreferencesFragment extends PreferenceFragment {

-	

-	protected VpnProfile mProfile;

-

-	protected abstract void loadSettings();

-	protected abstract void saveSettings();

-	

-	@Override

-	public void onCreate(Bundle savedInstanceState) {

-		super.onCreate(savedInstanceState);

-

-		String profileUUID = getArguments().getString(getActivity().getPackageName() + ".profileUUID");

-		mProfile = ProfileManager.get(getActivity(),profileUUID);

-		getActivity().setTitle(getString(R.string.edit_profile_title, mProfile.getName()));

-

-	}

-	

-	@Override

-	public void onPause() {

-		super.onPause();

-		saveSettings();

-	}

-	

-	@Override

-	public void onActivityCreated(Bundle savedInstanceState) {

-		super.onActivityCreated(savedInstanceState);

-		if(savedInstanceState!=null) {

-			String profileUUID=savedInstanceState.getString(VpnProfile.EXTRA_PROFILEUUID);

-			mProfile = ProfileManager.get(getActivity(),profileUUID);

-			loadSettings();

-		}

-	}

-

-    @Override

-	public void onSaveInstanceState (Bundle outState) {

-		super.onSaveInstanceState(outState);

-		saveSettings();

-		outState.putString(VpnProfile.EXTRA_PROFILEUUID, mProfile.getUUIDString());

-	}

-}

+/*
+ * Copyright (c) 2012-2016 Arne Schwabe
+ * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+ */
+
+package de.blinkt.openvpn.fragments;
+
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+import de.blinkt.openvpn.R;
+import de.blinkt.openvpn.VpnProfile;
+import de.blinkt.openvpn.core.ProfileManager;
+
+public abstract class OpenVpnPreferencesFragment extends PreferenceFragment {
+
+	protected VpnProfile mProfile;
+
+	protected abstract void loadSettings();
+	protected abstract void saveSettings();
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		String profileUUID = getArguments().getString(getActivity().getPackageName() + ".profileUUID");
+		mProfile = ProfileManager.get(getActivity(),profileUUID);
+		getActivity().setTitle(getString(R.string.edit_profile_title, mProfile.getName()));
+
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		saveSettings();
+	}
+
+	@Override
+	public void onActivityCreated(Bundle savedInstanceState) {
+		super.onActivityCreated(savedInstanceState);
+		if(savedInstanceState!=null) {
+			String profileUUID=savedInstanceState.getString(VpnProfile.EXTRA_PROFILEUUID);
+			mProfile = ProfileManager.get(getActivity(),profileUUID);
+			loadSettings();
+		}
+	}
+
+    @Override
+	public void onSaveInstanceState (Bundle outState) {
+		super.onSaveInstanceState(outState);
+		saveSettings();
+		outState.putString(VpnProfile.EXTRA_PROFILEUUID, mProfile.getUUIDString());
+	}
+}
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
index e138197a..0fe40905 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
@@ -70,7 +70,7 @@ public class SendDumpFragment extends Fragment  {
 		//need to "send multiple" to get more than one attachment
 		final Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND_MULTIPLE);
 		emailIntent.setType("*/*");
-		emailIntent.putExtra(android.content.Intent.EXTRA_EMAIL, 
+		emailIntent.putExtra(android.content.Intent.EXTRA_EMAIL,
 				new String[]{"Arne Schwabe <arne@rfc2549.org>"});
 
 		String version;
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.kt b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.kt
index dd2aa3b7..dd2aa3b7 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.kt
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Allowed_Apps.kt
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
index 1fc7337c..8fd6aa98 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
@@ -61,7 +61,7 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
 		mTLSAuthDirection = (ListPreference) findPreference("tls_direction");
 
 
-		mTLSAuthFile.setOnPreferenceClickListener(this);		
+		mTLSAuthFile.setOnPreferenceClickListener(this);
 
 		mCipher =(EditTextPreference) findPreference("cipher");
 		mCipher.setOnPreferenceChangeListener(this);
@@ -139,7 +139,7 @@ public class Settings_Authentication extends OpenVpnPreferencesFragment implemen
 	@Override
 	public boolean onPreferenceChange(Preference preference, Object newValue) {
 		if(preference==mRemoteCN) {
-			@SuppressWarnings("unchecked") 
+			@SuppressWarnings("unchecked")
 			int authtype = ((Pair<Integer, String>) newValue).first;
 			@SuppressWarnings("unchecked")
 			String dn = ((Pair<Integer, String>) newValue).second;
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Basic.java
index 81da76fe..81da76fe 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Basic.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Connections.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Connections.java
index e41e6cb9..e41e6cb9 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Connections.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Connections.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Fragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Fragment.java
index 738bd0e9..738bd0e9 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Fragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Fragment.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.java
index fec849ca..daf407b8 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_IP.java
@@ -27,14 +27,14 @@ public class Settings_IP extends OpenVpnPreferencesFragment implements OnPrefere
 		@Override
 		public void onCreate(Bundle savedInstanceState) {
 			super.onCreate(savedInstanceState);
-			
-		
+
+
 			// Make sure default values are applied.  In a real app, you would
 			// want this in a shared function that is used to retrieve the
 			// SharedPreferences wherever they are needed.
 			PreferenceManager.setDefaultValues(getActivity(),
 					R.xml.vpn_ipsettings, false);
-			
+
 			// Load the preferences from an XML resource
 			addPreferencesFromResource(R.xml.vpn_ipsettings);
 			mIPv4 = (EditTextPreference) findPreference("ipv4_address");
@@ -53,7 +53,7 @@ public class Settings_IP extends OpenVpnPreferencesFragment implements OnPrefere
 			mUsePull.setOnPreferenceChangeListener(this);
 			mOverrideDNS.setOnPreferenceChangeListener(this);
 			mSearchdomain.setOnPreferenceChangeListener(this);
-						
+
 			loadSettings();
 		}
 
@@ -82,8 +82,8 @@ public class Settings_IP extends OpenVpnPreferencesFragment implements OnPrefere
 
 			setDNSState();
 		}
-		
-		
+
+
 		@Override
 		protected void saveSettings() {
 			mProfile.mUsePull = mUsePull.isChecked();
@@ -94,26 +94,26 @@ public class Settings_IP extends OpenVpnPreferencesFragment implements OnPrefere
 			mProfile.mOverrideDNS = mOverrideDNS.isChecked();
 			mProfile.mSearchDomain = mSearchdomain.getText();
 			mProfile.mNobind = mNobind.isChecked();
-			
+
 		}
-		
+
 		@Override
 		public boolean onPreferenceChange(Preference preference,
 				Object newValue) {
-			if(preference==mIPv4 || preference == mIPv6 
+			if(preference==mIPv4 || preference == mIPv6
 					 || preference==mDNS1 || preference == mDNS2
-					 || preference == mSearchdomain 
+					 || preference == mSearchdomain
 					)
-			
+
 				preference.setSummary((String)newValue);
 
 			if(preference== mUsePull || preference == mOverrideDNS)
-				if(preference==mOverrideDNS) { 
+				if(preference==mOverrideDNS) {
 					// Set so the function gets the right value
 					mOverrideDNS.setChecked((Boolean) newValue);
 				}
 				setDNSState();
-			
+
 			saveSettings();
 			return true;
 		}
@@ -129,7 +129,7 @@ public class Settings_IP extends OpenVpnPreferencesFragment implements OnPrefere
 			mDNS1.setEnabled(enabled);
 			mDNS2.setEnabled(enabled);
 			mSearchdomain.setEnabled(enabled);
-			
+
 
 		}
 
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
index 5c70564e..6674599d 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
@@ -110,7 +110,7 @@ public class Settings_Obscure extends OpenVpnPreferencesFragment implements OnPr
 		super.onCreate(savedInstanceState);
 		// Load the preferences from an XML resource
 		addPreferencesFromResource(R.xml.vpn_obscure);
-		
+
 		mUseRandomHostName = (CheckBoxPreference) findPreference("useRandomHostname");
 		mUseFloat = (CheckBoxPreference) findPreference("useFloat");
 		mUseCustomConfig = (CheckBoxPreference) findPreference("enableCustomOptions");
@@ -180,7 +180,7 @@ public class Settings_Obscure extends OpenVpnPreferencesFragment implements OnPr
         saveSettingsBehaviour();
 	}
 
-	
+
 	@Override
 	public boolean onPreferenceChange(Preference preference, Object newValue) {
 		if (preference.getKey().equals("mssFixValue"))
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Routing.java
index 53f88bbf..53f88bbf 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_Routing.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_UserEditable.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_UserEditable.java
index 98ebb55b..98ebb55b 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Settings_UserEditable.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Settings_UserEditable.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java b/main/src/ui/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
index e578aeeb..f5c1750a 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
@@ -31,7 +31,7 @@ public class ShowConfigFragment extends Fragment {
 	{
 		View v=inflater.inflate(R.layout.viewconfig, container,false);
 		mConfigView = (TextView) v.findViewById(R.id.configview);
-		
+
 
 		mfabButton = (ImageButton) v.findViewById(R.id.share_config);
         if (mfabButton!=null) {
@@ -47,7 +47,7 @@ public class ShowConfigFragment extends Fragment {
 	}
 
 	private void startGenConfig(final VpnProfile vp, final TextView cv) {
-		
+
 		new Thread() {
 			public void run() {
 				/* Add a few newlines to make the textview scrollable past the FAB */
@@ -63,8 +63,8 @@ public class ShowConfigFragment extends Fragment {
 					if (mfabButton!=null)
                         mfabButton.setVisibility(View.VISIBLE);
                 });
-				
-				
+
+
 			}
 		}.start();
 	}
@@ -74,13 +74,13 @@ public class ShowConfigFragment extends Fragment {
 		super.onCreate(savedInstanceState);
 		setHasOptionsMenu(true);
 	}
-	
+
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
 		    inflater.inflate(R.menu.configmenu, menu);
 	}
-	
+
 	private void shareConfig() {
 		Intent shareIntent = new Intent(Intent.ACTION_SEND);
 		shareIntent.putExtra(Intent.EXTRA_TEXT, configtext);
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java b/main/src/ui/java/de/blinkt/openvpn/fragments/Utils.java
index abdc45f5..abdc45f5 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/Utils.java
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java b/main/src/ui/java/de/blinkt/openvpn/fragments/VPNProfileList.java
index 7ad13aaf..7ad13aaf 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
+++ b/main/src/ui/java/de/blinkt/openvpn/fragments/VPNProfileList.java
diff --git a/main/src/main/java/de/blinkt/openvpn/views/DefaultVPNListPreference.java b/main/src/ui/java/de/blinkt/openvpn/views/DefaultVPNListPreference.java
index e8328f5c..e8328f5c 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/DefaultVPNListPreference.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/DefaultVPNListPreference.java
diff --git a/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java b/main/src/ui/java/de/blinkt/openvpn/views/FileSelectLayout.java
index bc3bd5cd..bc3bd5cd 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/FileSelectLayout.java
diff --git a/main/src/main/java/de/blinkt/openvpn/views/MultiLineRadioGroup.java b/main/src/ui/java/de/blinkt/openvpn/views/MultiLineRadioGroup.java
index 8296a644..8296a644 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/MultiLineRadioGroup.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/MultiLineRadioGroup.java
diff --git a/main/src/main/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java b/main/src/ui/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java
index ab8598c6..ab8598c6 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/PagerSlidingTabStrip.java
diff --git a/main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java b/main/src/ui/java/de/blinkt/openvpn/views/RemoteCNPreference.java
index bcc0dc52..4b477f9c 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/RemoteCNPreference.java
@@ -85,7 +85,7 @@ public class RemoteCNPreference extends DialogPreference {
 			}
 		}
 	}
-	
+
 	private void populateSpinner() {
 		ArrayAdapter<String> authtypes = new ArrayAdapter<String>(getContext(), android.R.layout.simple_spinner_item);
 		authtypes.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
@@ -103,7 +103,7 @@ public class RemoteCNPreference extends DialogPreference {
 		mSpinner.setAdapter(authtypes);
 		mSpinner.setSelection(getSpinnerPositionFromAuthTYPE());
 	}
-	
+
 	private int getSpinnerPositionFromAuthTYPE() {
 		switch (mDNType) {
 		case VpnProfile.X509_VERIFY_TLSREMOTE_DN:
@@ -124,7 +124,7 @@ public class RemoteCNPreference extends DialogPreference {
 			return 0;
 		}
 	}
-	
+
 	private int getAuthTypeFromSpinner() {
 		int pos = mSpinner.getSelectedItemPosition();
 		switch (pos) {
diff --git a/main/src/main/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java b/main/src/ui/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java
index 38bb54b5..38bb54b5 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/ScreenSlidePagerAdapter.java
diff --git a/main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java b/main/src/ui/java/de/blinkt/openvpn/views/SeekBarTicks.java
index 347ce708..347ce708 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/SeekBarTicks.java
diff --git a/main/src/main/java/de/blinkt/openvpn/views/SlidingTabLayout.java b/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabLayout.java
index ea3b1c26..ea3b1c26 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/SlidingTabLayout.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabLayout.java
diff --git a/main/src/main/java/de/blinkt/openvpn/views/SlidingTabStrip.java b/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabStrip.java
index 88bfb9a3..88bfb9a3 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/SlidingTabStrip.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/SlidingTabStrip.java
diff --git a/main/src/main/java/de/blinkt/openvpn/views/TabBarView.java b/main/src/ui/java/de/blinkt/openvpn/views/TabBarView.java
index 71f03c03..71f03c03 100644
--- a/main/src/main/java/de/blinkt/openvpn/views/TabBarView.java
+++ b/main/src/ui/java/de/blinkt/openvpn/views/TabBarView.java
diff --git a/main/src/main/res/anim/fab_anim.xml b/main/src/ui/res/anim/fab_anim.xml
index 498533e0..498533e0 100644
--- a/main/src/main/res/anim/fab_anim.xml
+++ b/main/src/ui/res/anim/fab_anim.xml
diff --git a/main/src/main/res/drawable-hdpi/ic_add_circle_outline_grey600_24dp.png b/main/src/ui/res/drawable-hdpi/ic_add_circle_outline_grey600_24dp.png
index 7e0a71cd..7e0a71cd 100644
--- a/main/src/main/res/drawable-hdpi/ic_add_circle_outline_grey600_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_add_circle_outline_grey600_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_add_circle_outline_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_add_circle_outline_white_24dp.png
index d86d598e..d86d598e 100644
--- a/main/src/main/res/drawable-hdpi/ic_add_circle_outline_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_add_circle_outline_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_archive_grey600_24dp.png b/main/src/ui/res/drawable-hdpi/ic_archive_grey600_24dp.png
index 2948d5fc..2948d5fc 100644
--- a/main/src/main/res/drawable-hdpi/ic_archive_grey600_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_archive_grey600_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_archive_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_archive_white_24dp.png
index a9b0b240..a9b0b240 100644
--- a/main/src/main/res/drawable-hdpi/ic_archive_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_archive_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_check_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_check_white_24dp.png
index f42a0e2d..f42a0e2d 100644
--- a/main/src/main/res/drawable-hdpi/ic_check_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_check_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_close_white_24dp.png
index ceb1a1ee..ceb1a1ee 100644
--- a/main/src/main/res/drawable-hdpi/ic_close_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_close_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_content_copy_white_24dp.png
index 03b1aac4..03b1aac4 100644
--- a/main/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_content_copy_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png b/main/src/ui/res/drawable-hdpi/ic_delete_grey600_24dp.png
index b72a9f3c..b72a9f3c 100644
--- a/main/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_delete_grey600_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_delete_white_24dp.png
index a9eac0ca..a9eac0ca 100644
--- a/main/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_delete_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_doc_generic_am.png b/main/src/ui/res/drawable-hdpi/ic_doc_generic_am.png
index 55b9b7d3..55b9b7d3 100644
--- a/main/src/main/res/drawable-hdpi/ic_doc_generic_am.png
+++ b/main/src/ui/res/drawable-hdpi/ic_doc_generic_am.png
diff --git a/main/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png b/main/src/ui/res/drawable-hdpi/ic_edit_grey600_24dp.png
index b5f88c80..b5f88c80 100644
--- a/main/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_edit_grey600_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_edit_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_edit_white_24dp.png
index 730416c9..730416c9 100644
--- a/main/src/main/res/drawable-hdpi/ic_edit_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_edit_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_filter_list_white_24dp.png
index 30122adf..30122adf 100644
--- a/main/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_filter_list_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_menu_copy_holo_dark.png b/main/src/ui/res/drawable-hdpi/ic_menu_copy_holo_dark.png
index d37d0a31..d37d0a31 100644
--- a/main/src/main/res/drawable-hdpi/ic_menu_copy_holo_dark.png
+++ b/main/src/ui/res/drawable-hdpi/ic_menu_copy_holo_dark.png
diff --git a/main/src/main/res/drawable-hdpi/ic_pause_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_pause_white_24dp.png
index 4d2ea05c..4d2ea05c 100644
--- a/main/src/main/res/drawable-hdpi/ic_pause_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_pause_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_play_arrow_white_24dp.png
index 57c9fa54..57c9fa54 100644
--- a/main/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_play_arrow_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_receipt_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_receipt_white_24dp.png
index bf781280..bf781280 100644
--- a/main/src/main/res/drawable-hdpi/ic_receipt_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_receipt_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_root_folder_am.png b/main/src/ui/res/drawable-hdpi/ic_root_folder_am.png
index 915e1182..915e1182 100644
--- a/main/src/main/res/drawable-hdpi/ic_root_folder_am.png
+++ b/main/src/ui/res/drawable-hdpi/ic_root_folder_am.png
diff --git a/main/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_search_white_24dp.png
index bbfbc96c..bbfbc96c 100755
--- a/main/src/main/res/drawable-hdpi/ic_search_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_search_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_share_white_24dp.png
index 93b3c219..93b3c219 100644
--- a/main/src/main/res/drawable-hdpi/ic_share_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_share_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_sort_white_24dp.png b/main/src/ui/res/drawable-hdpi/ic_sort_white_24dp.png
index 55a429b6..55a429b6 100644
--- a/main/src/main/res/drawable-hdpi/ic_sort_white_24dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_sort_white_24dp.png
diff --git a/main/src/main/res/drawable-hdpi/ic_warning_black_36dp.png b/main/src/ui/res/drawable-hdpi/ic_warning_black_36dp.png
index d1cef177..d1cef177 100644
--- a/main/src/main/res/drawable-hdpi/ic_warning_black_36dp.png
+++ b/main/src/ui/res/drawable-hdpi/ic_warning_black_36dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_add_circle_outline_grey600_24dp.png b/main/src/ui/res/drawable-mdpi/ic_add_circle_outline_grey600_24dp.png
index b5017d2a..b5017d2a 100644
--- a/main/src/main/res/drawable-mdpi/ic_add_circle_outline_grey600_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_add_circle_outline_grey600_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_add_circle_outline_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_add_circle_outline_white_24dp.png
index 6a1c32aa..6a1c32aa 100644
--- a/main/src/main/res/drawable-mdpi/ic_add_circle_outline_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_add_circle_outline_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_archive_grey600_24dp.png b/main/src/ui/res/drawable-mdpi/ic_archive_grey600_24dp.png
index a42d774c..a42d774c 100644
--- a/main/src/main/res/drawable-mdpi/ic_archive_grey600_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_archive_grey600_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_archive_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_archive_white_24dp.png
index 8e4a0426..8e4a0426 100644
--- a/main/src/main/res/drawable-mdpi/ic_archive_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_archive_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_check_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_check_white_24dp.png
index e91f9048..e91f9048 100644
--- a/main/src/main/res/drawable-mdpi/ic_check_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_check_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_close_white_24dp.png
index af7f8288..af7f8288 100644
--- a/main/src/main/res/drawable-mdpi/ic_close_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_close_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_content_copy_white_24dp.png
index 6aa238c5..6aa238c5 100644
--- a/main/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_content_copy_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png b/main/src/ui/res/drawable-mdpi/ic_delete_grey600_24dp.png
index e757fdb0..e757fdb0 100644
--- a/main/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_delete_grey600_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_delete_white_24dp.png
index e4ea52ef..e4ea52ef 100644
--- a/main/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_delete_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_doc_generic_am.png b/main/src/ui/res/drawable-mdpi/ic_doc_generic_am.png
index a1bd14ea..a1bd14ea 100644
--- a/main/src/main/res/drawable-mdpi/ic_doc_generic_am.png
+++ b/main/src/ui/res/drawable-mdpi/ic_doc_generic_am.png
diff --git a/main/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png b/main/src/ui/res/drawable-mdpi/ic_edit_grey600_24dp.png
index bae3480c..bae3480c 100644
--- a/main/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_edit_grey600_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_edit_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_edit_white_24dp.png
index 85cff0b9..85cff0b9 100644
--- a/main/src/main/res/drawable-mdpi/ic_edit_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_edit_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_filter_list_white_24dp.png
index 49cec669..49cec669 100644
--- a/main/src/main/res/drawable-mdpi/ic_filter_list_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_filter_list_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_menu_copy_holo_dark.png b/main/src/ui/res/drawable-mdpi/ic_menu_copy_holo_dark.png
index 97e8ac1b..97e8ac1b 100644
--- a/main/src/main/res/drawable-mdpi/ic_menu_copy_holo_dark.png
+++ b/main/src/ui/res/drawable-mdpi/ic_menu_copy_holo_dark.png
diff --git a/main/src/main/res/drawable-mdpi/ic_pause_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_pause_white_24dp.png
index 2272d478..2272d478 100644
--- a/main/src/main/res/drawable-mdpi/ic_pause_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_pause_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_play_arrow_white_24dp.png
index c61e948b..c61e948b 100644
--- a/main/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_play_arrow_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_receipt_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_receipt_white_24dp.png
index 565c67ff..565c67ff 100644
--- a/main/src/main/res/drawable-mdpi/ic_receipt_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_receipt_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_root_folder_am.png b/main/src/ui/res/drawable-mdpi/ic_root_folder_am.png
index 4352d08d..4352d08d 100644
--- a/main/src/main/res/drawable-mdpi/ic_root_folder_am.png
+++ b/main/src/ui/res/drawable-mdpi/ic_root_folder_am.png
diff --git a/main/src/main/res/drawable-mdpi/ic_search_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_search_white_24dp.png
index faefc59c..faefc59c 100755
--- a/main/src/main/res/drawable-mdpi/ic_search_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_search_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_share_white_24dp.png
index 4d019722..4d019722 100644
--- a/main/src/main/res/drawable-mdpi/ic_share_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_share_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_sort_white_24dp.png b/main/src/ui/res/drawable-mdpi/ic_sort_white_24dp.png
index 3d84a444..3d84a444 100644
--- a/main/src/main/res/drawable-mdpi/ic_sort_white_24dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_sort_white_24dp.png
diff --git a/main/src/main/res/drawable-mdpi/ic_warning_black_36dp.png b/main/src/ui/res/drawable-mdpi/ic_warning_black_36dp.png
index 52273c3e..52273c3e 100644
--- a/main/src/main/res/drawable-mdpi/ic_warning_black_36dp.png
+++ b/main/src/ui/res/drawable-mdpi/ic_warning_black_36dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_add_circle_outline_grey600_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_add_circle_outline_grey600_24dp.png
index b9a106fd..b9a106fd 100644
--- a/main/src/main/res/drawable-xhdpi/ic_add_circle_outline_grey600_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_add_circle_outline_grey600_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_add_circle_outline_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_add_circle_outline_white_24dp.png
index 0399d60a..0399d60a 100644
--- a/main/src/main/res/drawable-xhdpi/ic_add_circle_outline_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_add_circle_outline_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_archive_grey600_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_archive_grey600_24dp.png
index 6725175d..6725175d 100644
--- a/main/src/main/res/drawable-xhdpi/ic_archive_grey600_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_archive_grey600_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_archive_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_archive_white_24dp.png
index 08228d1f..08228d1f 100644
--- a/main/src/main/res/drawable-xhdpi/ic_archive_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_archive_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_check_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_check_white_24dp.png
index e5024472..e5024472 100644
--- a/main/src/main/res/drawable-xhdpi/ic_check_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_check_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_close_white_24dp.png
index b7c7ffd0..b7c7ffd0 100644
--- a/main/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_close_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_content_copy_white_24dp.png
index 04a0cc94..04a0cc94 100644
--- a/main/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_content_copy_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_delete_grey600_24dp.png
index c6bb43e8..c6bb43e8 100644
--- a/main/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_delete_grey600_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_delete_white_24dp.png
index cdb230c2..cdb230c2 100644
--- a/main/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_delete_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_doc_generic_am.png b/main/src/ui/res/drawable-xhdpi/ic_doc_generic_am.png
index e05c4b48..e05c4b48 100644
--- a/main/src/main/res/drawable-xhdpi/ic_doc_generic_am.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_doc_generic_am.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_edit_grey600_24dp.png
index 4c95bd57..4c95bd57 100644
--- a/main/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_edit_grey600_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_edit_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_edit_white_24dp.png
index 7f0ea51b..7f0ea51b 100644
--- a/main/src/main/res/drawable-xhdpi/ic_edit_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_edit_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_filter_list_white_24dp.png
index d4ca77bf..d4ca77bf 100644
--- a/main/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_filter_list_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_menu_copy_holo_dark.png b/main/src/ui/res/drawable-xhdpi/ic_menu_copy_holo_dark.png
index ba883aec..ba883aec 100644
--- a/main/src/main/res/drawable-xhdpi/ic_menu_copy_holo_dark.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_menu_copy_holo_dark.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_pause_white_24dp.png
index f49aed75..f49aed75 100644
--- a/main/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_pause_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
index a3c80e73..a3c80e73 100644
--- a/main/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_receipt_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_receipt_white_24dp.png
index 66dafa4f..66dafa4f 100644
--- a/main/src/main/res/drawable-xhdpi/ic_receipt_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_receipt_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_root_folder_am.png b/main/src/ui/res/drawable-xhdpi/ic_root_folder_am.png
index c916e0be..c916e0be 100644
--- a/main/src/main/res/drawable-xhdpi/ic_root_folder_am.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_root_folder_am.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_search_white_24dp.png
index bfc3e393..bfc3e393 100755
--- a/main/src/main/res/drawable-xhdpi/ic_search_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_search_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_share_white_24dp.png
index dd536bca..dd536bca 100644
--- a/main/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_share_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png b/main/src/ui/res/drawable-xhdpi/ic_sort_white_24dp.png
index 6d4af1bc..6d4af1bc 100644
--- a/main/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_sort_white_24dp.png
diff --git a/main/src/main/res/drawable-xhdpi/ic_warning_black_36dp.png b/main/src/ui/res/drawable-xhdpi/ic_warning_black_36dp.png
index e1d6f7ac..e1d6f7ac 100644
--- a/main/src/main/res/drawable-xhdpi/ic_warning_black_36dp.png
+++ b/main/src/ui/res/drawable-xhdpi/ic_warning_black_36dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_add_circle_outline_grey600_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_add_circle_outline_grey600_24dp.png
index d13b5195..d13b5195 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_add_circle_outline_grey600_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_add_circle_outline_grey600_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_add_circle_outline_white_24dp.png
index 7ae1b4a1..7ae1b4a1 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_add_circle_outline_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_archive_grey600_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_archive_grey600_24dp.png
index 25cfc91a..25cfc91a 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_archive_grey600_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_archive_grey600_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_archive_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_archive_white_24dp.png
index aa186ce5..aa186ce5 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_archive_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_archive_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_check_white_24dp.png
index 6e03d54c..6e03d54c 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_check_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_check_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_close_white_24dp.png
index 6b717e0d..6b717e0d 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_close_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
index 5fc17a4d..5fc17a4d 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
index 4886ab1e..4886ab1e 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_delete_white_24dp.png
index 0e95e9b1..0e95e9b1 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_delete_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_doc_generic_am.png b/main/src/ui/res/drawable-xxhdpi/ic_doc_generic_am.png
index c0988663..c0988663 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_doc_generic_am.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_doc_generic_am.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_edit_grey600_24dp.png
index 6ed4351c..6ed4351c 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_edit_grey600_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_edit_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_edit_white_24dp.png
index 34ec7092..34ec7092 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_edit_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_edit_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_filter_list_white_24dp.png
index 802b3cd5..802b3cd5 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_filter_list_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_menu_copy_holo_dark.png b/main/src/ui/res/drawable-xxhdpi/ic_menu_copy_holo_dark.png
index 9dd56eff..9dd56eff 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_menu_copy_holo_dark.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_menu_copy_holo_dark.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_pause_white_24dp.png
index 7192ad48..7192ad48 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_pause_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
index 547ef30a..547ef30a 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_receipt_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_receipt_white_24dp.png
index 2161c9a5..2161c9a5 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_receipt_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_receipt_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_root_folder_am.png b/main/src/ui/res/drawable-xxhdpi/ic_root_folder_am.png
index 077c851c..077c851c 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_root_folder_am.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_root_folder_am.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_search_white_24dp.png
index abbb9895..abbb9895 100755
--- a/main/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_search_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_share_white_24dp.png
index 9963c6a0..9963c6a0 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_share_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png b/main/src/ui/res/drawable-xxhdpi/ic_sort_white_24dp.png
index b8ef1050..b8ef1050 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_sort_white_24dp.png
diff --git a/main/src/main/res/drawable-xxhdpi/ic_warning_black_36dp.png b/main/src/ui/res/drawable-xxhdpi/ic_warning_black_36dp.png
index 2aab2278..2aab2278 100644
--- a/main/src/main/res/drawable-xxhdpi/ic_warning_black_36dp.png
+++ b/main/src/ui/res/drawable-xxhdpi/ic_warning_black_36dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_grey600_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_add_circle_outline_grey600_24dp.png
index ae11fb25..ae11fb25 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_grey600_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_add_circle_outline_grey600_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_add_circle_outline_white_24dp.png
index 1d436703..1d436703 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_add_circle_outline_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_archive_grey600_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_archive_grey600_24dp.png
index 58d38997..58d38997 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_archive_grey600_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_archive_grey600_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_archive_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_archive_white_24dp.png
index 9d538ff4..9d538ff4 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_archive_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_archive_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_check_white_24dp.png
index 87892840..87892840 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_check_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_check_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_close_white_24dp.png
index 39641921..39641921 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_close_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
index 557c64f7..557c64f7 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png
index e4e21812..e4e21812 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_delete_white_24dp.png
index ccf8c716..ccf8c716 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_delete_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png
index 0c0fd76f..0c0fd76f 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_edit_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_edit_white_24dp.png
index 9380370f..9380370f 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_edit_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_edit_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png
index 511008ce..511008ce 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_filter_list_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_pause_white_24dp.png
index 660ac658..660ac658 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_pause_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_pause_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
index be5c062b..be5c062b 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_play_arrow_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_receipt_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_receipt_white_24dp.png
index 8cac119c..8cac119c 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_receipt_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_receipt_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_search_white_24dp.png
index dd5adfc7..dd5adfc7 100755
--- a/main/src/main/res/drawable-xxxhdpi/ic_search_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_search_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_share_white_24dp.png
index bb521c14..bb521c14 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_share_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_sort_white_24dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_sort_white_24dp.png
index 4796c33b..4796c33b 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_sort_white_24dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_sort_white_24dp.png
diff --git a/main/src/main/res/drawable-xxxhdpi/ic_warning_black_36dp.png b/main/src/ui/res/drawable-xxxhdpi/ic_warning_black_36dp.png
index 58999574..58999574 100644
--- a/main/src/main/res/drawable-xxxhdpi/ic_warning_black_36dp.png
+++ b/main/src/ui/res/drawable-xxxhdpi/ic_warning_black_36dp.png
diff --git a/main/src/main/res/drawable/bg_rect_round.xml b/main/src/ui/res/drawable/bg_rect_round.xml
index 2c24c090..2c24c090 100644
--- a/main/src/main/res/drawable/bg_rect_round.xml
+++ b/main/src/ui/res/drawable/bg_rect_round.xml
diff --git a/main/src/main/res/drawable/bg_switchbar.xml b/main/src/ui/res/drawable/bg_switchbar.xml
index 7af57ad3..7af57ad3 100644
--- a/main/src/main/res/drawable/bg_switchbar.xml
+++ b/main/src/ui/res/drawable/bg_switchbar.xml
diff --git a/main/src/main/res/drawable/bg_tabs.xml b/main/src/ui/res/drawable/bg_tabs.xml
index 8b859535..8b859535 100644
--- a/main/src/main/res/drawable/bg_tabs.xml
+++ b/main/src/ui/res/drawable/bg_tabs.xml
diff --git a/main/src/main/res/drawable/ic_shortcut_cancel.xml b/main/src/ui/res/drawable/ic_shortcut_cancel.xml
index 7fd187ae..7fd187ae 100644
--- a/main/src/main/res/drawable/ic_shortcut_cancel.xml
+++ b/main/src/ui/res/drawable/ic_shortcut_cancel.xml
diff --git a/main/src/main/res/drawable/ic_shortcut_vpn_key.xml b/main/src/ui/res/drawable/ic_shortcut_vpn_key.xml
index 6d1c010a..6d1c010a 100644
--- a/main/src/main/res/drawable/ic_shortcut_vpn_key.xml
+++ b/main/src/ui/res/drawable/ic_shortcut_vpn_key.xml
diff --git a/main/src/main/res/drawable/oval_ripple.xml b/main/src/ui/res/drawable/oval_ripple.xml
index 7d01f62d..7d01f62d 100644
--- a/main/src/main/res/drawable/oval_ripple.xml
+++ b/main/src/ui/res/drawable/oval_ripple.xml
diff --git a/main/src/main/res/drawable/slidingtab_background.xml b/main/src/ui/res/drawable/slidingtab_background.xml
index e923489e..e923489e 100644
--- a/main/src/main/res/drawable/slidingtab_background.xml
+++ b/main/src/ui/res/drawable/slidingtab_background.xml
diff --git a/main/src/main/res/drawable/white_rect.xml b/main/src/ui/res/drawable/white_rect.xml
index 36df6913..36df6913 100644
--- a/main/src/main/res/drawable/white_rect.xml
+++ b/main/src/ui/res/drawable/white_rect.xml
diff --git a/main/src/main/res/layout-sw600dp-port/log_fragment.xml b/main/src/ui/res/layout-sw600dp-port/log_fragment.xml
index 7a4b60fe..7a4b60fe 100644
--- a/main/src/main/res/layout-sw600dp-port/log_fragment.xml
+++ b/main/src/ui/res/layout-sw600dp-port/log_fragment.xml
diff --git a/main/src/main/res/layout-sw600dp/log_fragment.xml b/main/src/ui/res/layout-sw600dp/log_fragment.xml
index 089bfb9d..089bfb9d 100644
--- a/main/src/main/res/layout-sw600dp/log_fragment.xml
+++ b/main/src/ui/res/layout-sw600dp/log_fragment.xml
diff --git a/main/src/main/res/layout-v21/connection_fab.xml b/main/src/ui/res/layout-v21/connection_fab.xml
index e3e620d6..e3e620d6 100644
--- a/main/src/main/res/layout-v21/connection_fab.xml
+++ b/main/src/ui/res/layout-v21/connection_fab.xml
diff --git a/main/src/main/res/layout-v21/profile_list_fabs.xml b/main/src/ui/res/layout-v21/profile_list_fabs.xml
index 4fe403b6..4fe403b6 100644
--- a/main/src/main/res/layout-v21/profile_list_fabs.xml
+++ b/main/src/ui/res/layout-v21/profile_list_fabs.xml
diff --git a/main/src/main/res/layout-v21/save_fab.xml b/main/src/ui/res/layout-v21/save_fab.xml
index af7847e8..af7847e8 100644
--- a/main/src/main/res/layout-v21/save_fab.xml
+++ b/main/src/ui/res/layout-v21/save_fab.xml
diff --git a/main/src/main/res/layout-v21/share_fab.xml b/main/src/ui/res/layout-v21/share_fab.xml
index fb0d432f..fb0d432f 100644
--- a/main/src/main/res/layout-v21/share_fab.xml
+++ b/main/src/ui/res/layout-v21/share_fab.xml
diff --git a/main/src/main/res/layout-v21/tabs.xml b/main/src/ui/res/layout-v21/tabs.xml
index af349a4f..af349a4f 100644
--- a/main/src/main/res/layout-v21/tabs.xml
+++ b/main/src/ui/res/layout-v21/tabs.xml
diff --git a/main/src/main/res/layout/about.xml b/main/src/ui/res/layout/about.xml
index 8b40520b..8b40520b 100644
--- a/main/src/main/res/layout/about.xml
+++ b/main/src/ui/res/layout/about.xml
diff --git a/main/src/main/res/layout/allowed_application_layout.xml b/main/src/ui/res/layout/allowed_application_layout.xml
index d8d846f9..d8d846f9 100644
--- a/main/src/main/res/layout/allowed_application_layout.xml
+++ b/main/src/ui/res/layout/allowed_application_layout.xml
diff --git a/main/src/main/res/layout/allowed_application_settings.xml b/main/src/ui/res/layout/allowed_application_settings.xml
index 96170965..96170965 100644
--- a/main/src/main/res/layout/allowed_application_settings.xml
+++ b/main/src/ui/res/layout/allowed_application_settings.xml
diff --git a/main/src/main/res/layout/allowed_vpn_apps.xml b/main/src/ui/res/layout/allowed_vpn_apps.xml
index 7f5e7b8b..7f5e7b8b 100644
--- a/main/src/main/res/layout/allowed_vpn_apps.xml
+++ b/main/src/ui/res/layout/allowed_vpn_apps.xml
diff --git a/main/src/main/res/layout/basic_settings.xml b/main/src/ui/res/layout/basic_settings.xml
index eda20ddd..66f8b1fa 100644
--- a/main/src/main/res/layout/basic_settings.xml
+++ b/main/src/ui/res/layout/basic_settings.xml
@@ -20,7 +20,7 @@
         <TextView
             style="@style/item"
             android:text="@string/profilename"
-            android:textAppearance="?android:attr/textAppearanceSmall" 
+            android:textAppearance="?android:attr/textAppearanceSmall"
             />
 
         <EditText
diff --git a/main/src/main/res/layout/config_converter.xml b/main/src/ui/res/layout/config_converter.xml
index 4070ff7c..4070ff7c 100644
--- a/main/src/main/res/layout/config_converter.xml
+++ b/main/src/ui/res/layout/config_converter.xml
diff --git a/main/src/main/res/layout/connection_fab.xml b/main/src/ui/res/layout/connection_fab.xml
index 681348e5..681348e5 100644
--- a/main/src/main/res/layout/connection_fab.xml
+++ b/main/src/ui/res/layout/connection_fab.xml
diff --git a/main/src/main/res/layout/connections.xml b/main/src/ui/res/layout/connections.xml
index 598ddd92..598ddd92 100644
--- a/main/src/main/res/layout/connections.xml
+++ b/main/src/ui/res/layout/connections.xml
diff --git a/main/src/main/res/layout/extauth_provider.xml b/main/src/ui/res/layout/extauth_provider.xml
index 69d1f3d8..69d1f3d8 100644
--- a/main/src/main/res/layout/extauth_provider.xml
+++ b/main/src/ui/res/layout/extauth_provider.xml
diff --git a/main/src/main/res/layout/faq.xml b/main/src/ui/res/layout/faq.xml
index aa3febd0..aa3febd0 100644
--- a/main/src/main/res/layout/faq.xml
+++ b/main/src/ui/res/layout/faq.xml
diff --git a/main/src/main/res/layout/faqcard.xml b/main/src/ui/res/layout/faqcard.xml
index 360f3752..360f3752 100644
--- a/main/src/main/res/layout/faqcard.xml
+++ b/main/src/ui/res/layout/faqcard.xml
diff --git a/main/src/main/res/layout/file_dialog.xml b/main/src/ui/res/layout/file_dialog.xml
index b068015e..b068015e 100644
--- a/main/src/main/res/layout/file_dialog.xml
+++ b/main/src/ui/res/layout/file_dialog.xml
diff --git a/main/src/main/res/layout/file_dialog_inline.xml b/main/src/ui/res/layout/file_dialog_inline.xml
index 6448733e..6525da7f 100644
--- a/main/src/main/res/layout/file_dialog_inline.xml
+++ b/main/src/ui/res/layout/file_dialog_inline.xml
@@ -22,6 +22,6 @@
         android:layout_height="wrap_content"
         android:inputType="textMultiLine|textNoSuggestions"
         android:textAppearance="?android:attr/textAppearanceSmall" />
-        
-    
+
+
 </LinearLayout>
\ No newline at end of file
diff --git a/main/src/main/res/layout/file_dialog_main.xml b/main/src/ui/res/layout/file_dialog_main.xml
index 8df879f0..8df879f0 100644
--- a/main/src/main/res/layout/file_dialog_main.xml
+++ b/main/src/ui/res/layout/file_dialog_main.xml
diff --git a/main/src/main/res/layout/file_dialog_row.xml b/main/src/ui/res/layout/file_dialog_row.xml
index e2c1e0de..e2c1e0de 100644
--- a/main/src/main/res/layout/file_dialog_row.xml
+++ b/main/src/ui/res/layout/file_dialog_row.xml
diff --git a/main/src/main/res/layout/file_select.xml b/main/src/ui/res/layout/file_select.xml
index b6b2091a..b6b2091a 100644
--- a/main/src/main/res/layout/file_select.xml
+++ b/main/src/ui/res/layout/file_select.xml
diff --git a/main/src/main/res/layout/fragment_senddump.xml b/main/src/ui/res/layout/fragment_senddump.xml
index 02ebed33..02ebed33 100644
--- a/main/src/main/res/layout/fragment_senddump.xml
+++ b/main/src/ui/res/layout/fragment_senddump.xml
diff --git a/main/src/main/res/layout/graph.xml b/main/src/ui/res/layout/graph.xml
index d734623e..d734623e 100644
--- a/main/src/main/res/layout/graph.xml
+++ b/main/src/ui/res/layout/graph.xml
diff --git a/main/src/main/res/layout/graph_item.xml b/main/src/ui/res/layout/graph_item.xml
index da90342b..da90342b 100644
--- a/main/src/main/res/layout/graph_item.xml
+++ b/main/src/ui/res/layout/graph_item.xml
diff --git a/main/src/main/res/layout/keystore_selector.xml b/main/src/ui/res/layout/keystore_selector.xml
index d0b24892..d0b24892 100644
--- a/main/src/main/res/layout/keystore_selector.xml
+++ b/main/src/ui/res/layout/keystore_selector.xml
diff --git a/main/src/main/res/layout/log_fragment.xml b/main/src/ui/res/layout/log_fragment.xml
index ab070117..ab070117 100644
--- a/main/src/main/res/layout/log_fragment.xml
+++ b/main/src/ui/res/layout/log_fragment.xml
diff --git a/main/src/main/res/layout/log_silders.xml b/main/src/ui/res/layout/log_silders.xml
index 4196e243..4196e243 100644
--- a/main/src/main/res/layout/log_silders.xml
+++ b/main/src/ui/res/layout/log_silders.xml
diff --git a/main/src/main/res/layout/log_window.xml b/main/src/ui/res/layout/log_window.xml
index 7c25dcfa..7c25dcfa 100644
--- a/main/src/main/res/layout/log_window.xml
+++ b/main/src/ui/res/layout/log_window.xml
diff --git a/main/src/main/res/layout/main_activity.xml b/main/src/ui/res/layout/main_activity.xml
index 456205e2..7b6caf00 100644
--- a/main/src/main/res/layout/main_activity.xml
+++ b/main/src/ui/res/layout/main_activity.xml
@@ -16,4 +16,3 @@
         android:layout_height="match_parent" />
 
 </LinearLayout>
-
diff --git a/main/src/main/res/layout/openssl_speed.xml b/main/src/ui/res/layout/openssl_speed.xml
index c23d3567..c23d3567 100644
--- a/main/src/main/res/layout/openssl_speed.xml
+++ b/main/src/ui/res/layout/openssl_speed.xml
diff --git a/main/src/main/res/layout/padersliding_tab.xml b/main/src/ui/res/layout/padersliding_tab.xml
index 07c8daa9..07c8daa9 100644
--- a/main/src/main/res/layout/padersliding_tab.xml
+++ b/main/src/ui/res/layout/padersliding_tab.xml
diff --git a/main/src/main/res/layout/profile_list_fabs.xml b/main/src/ui/res/layout/profile_list_fabs.xml
index 34beb58a..34beb58a 100644
--- a/main/src/main/res/layout/profile_list_fabs.xml
+++ b/main/src/ui/res/layout/profile_list_fabs.xml
diff --git a/main/src/main/res/layout/save_fab.xml b/main/src/ui/res/layout/save_fab.xml
index 681348e5..681348e5 100644
--- a/main/src/main/res/layout/save_fab.xml
+++ b/main/src/ui/res/layout/save_fab.xml
diff --git a/main/src/main/res/layout/server_card.xml b/main/src/ui/res/layout/server_card.xml
index 3b214bbb..3b214bbb 100644
--- a/main/src/main/res/layout/server_card.xml
+++ b/main/src/ui/res/layout/server_card.xml
diff --git a/main/src/main/res/layout/server_footer.xml b/main/src/ui/res/layout/server_footer.xml
index 623e4459..623e4459 100644
--- a/main/src/main/res/layout/server_footer.xml
+++ b/main/src/ui/res/layout/server_footer.xml
diff --git a/main/src/main/res/layout/settings_usereditable.xml b/main/src/ui/res/layout/settings_usereditable.xml
index 6e954116..6e954116 100644
--- a/main/src/main/res/layout/settings_usereditable.xml
+++ b/main/src/ui/res/layout/settings_usereditable.xml
diff --git a/main/src/main/res/layout/share_fab.xml b/main/src/ui/res/layout/share_fab.xml
index ad5f1b96..ad5f1b96 100644
--- a/main/src/main/res/layout/share_fab.xml
+++ b/main/src/ui/res/layout/share_fab.xml
diff --git a/main/src/main/res/layout/speedviewitem.xml b/main/src/ui/res/layout/speedviewitem.xml
index 06a760ec..06a760ec 100644
--- a/main/src/main/res/layout/speedviewitem.xml
+++ b/main/src/ui/res/layout/speedviewitem.xml
diff --git a/main/src/main/res/layout/tabs.xml b/main/src/ui/res/layout/tabs.xml
index a68c4e42..a68c4e42 100644
--- a/main/src/main/res/layout/tabs.xml
+++ b/main/src/ui/res/layout/tabs.xml
diff --git a/main/src/main/res/layout/tlsremote.xml b/main/src/ui/res/layout/tlsremote.xml
index 5ebeb051..5ebeb051 100644
--- a/main/src/main/res/layout/tlsremote.xml
+++ b/main/src/ui/res/layout/tlsremote.xml
diff --git a/main/src/main/res/layout/viewconfig.xml b/main/src/ui/res/layout/viewconfig.xml
index 4855b06d..4855b06d 100644
--- a/main/src/main/res/layout/viewconfig.xml
+++ b/main/src/ui/res/layout/viewconfig.xml
diff --git a/main/src/main/res/layout/vpn_list_item.xml b/main/src/ui/res/layout/vpn_list_item.xml
index 5f2e8d0b..5f2e8d0b 100644
--- a/main/src/main/res/layout/vpn_list_item.xml
+++ b/main/src/ui/res/layout/vpn_list_item.xml
diff --git a/main/src/main/res/layout/vpn_profile_list.xml b/main/src/ui/res/layout/vpn_profile_list.xml
index f85222b6..f85222b6 100644
--- a/main/src/main/res/layout/vpn_profile_list.xml
+++ b/main/src/ui/res/layout/vpn_profile_list.xml
diff --git a/main/src/main/res/layout/vpnstatus.xml b/main/src/ui/res/layout/vpnstatus.xml
index 3b464b62..3b464b62 100644
--- a/main/src/main/res/layout/vpnstatus.xml
+++ b/main/src/ui/res/layout/vpnstatus.xml
diff --git a/main/src/main/res/menu/allowed_apps.xml b/main/src/ui/res/menu/allowed_apps.xml
index d4f2a02a..d4f2a02a 100644
--- a/main/src/main/res/menu/allowed_apps.xml
+++ b/main/src/ui/res/menu/allowed_apps.xml
diff --git a/main/src/main/res/menu/configmenu.xml b/main/src/ui/res/menu/configmenu.xml
index fc73503b..96515c24 100644
--- a/main/src/main/res/menu/configmenu.xml
+++ b/main/src/ui/res/menu/configmenu.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-  ~ Copyright (c) 2012-2016 Arne Schwabe

-  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt

-  -->

-

-<menu xmlns:android="http://schemas.android.com/apk/res/android" >

-

-    <item

-        android:id="@+id/sendConfig"

-        android:icon="@drawable/ic_menu_share"

-        android:showAsAction="ifRoom"

-        android:title="@string/send_config"

-        android:titleCondensed="@string/send"/>

-

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/sendConfig"
+        android:icon="@drawable/ic_menu_share"
+        android:showAsAction="ifRoom"
+        android:title="@string/send_config"
+        android:titleCondensed="@string/send"/>
+
 </menu>
\ No newline at end of file
diff --git a/main/src/main/res/menu/connections.xml b/main/src/ui/res/menu/connections.xml
index 64ca4a2c..64ca4a2c 100644
--- a/main/src/main/res/menu/connections.xml
+++ b/main/src/ui/res/menu/connections.xml
diff --git a/main/src/main/res/menu/import_menu.xml b/main/src/ui/res/menu/import_menu.xml
index b552f0e5..52c96516 100644
--- a/main/src/main/res/menu/import_menu.xml
+++ b/main/src/ui/res/menu/import_menu.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-  ~ Copyright (c) 2012-2016 Arne Schwabe

-  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt

-  -->

-

-<menu xmlns:android="http://schemas.android.com/apk/res/android" >

-    <item

-        android:id="@+id/cancel"

-        android:icon="@drawable/ic_menu_close_clear_cancel"

-        android:showAsAction="ifRoom"

-        android:title="@android:string/cancel"

-        android:titleCondensed="@string/cancel"/>

-    

-    <item

-        android:id="@+id/ok"

-        android:icon="@drawable/ic_menu_save"

-        android:showAsAction="ifRoom"

-        android:title="@string/add_profile"

-        android:titleCondensed="@string/import_vpn"/>

-

-

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/cancel"
+        android:icon="@drawable/ic_menu_close_clear_cancel"
+        android:showAsAction="ifRoom"
+        android:title="@android:string/cancel"
+        android:titleCondensed="@string/cancel"/>
+
+    <item
+        android:id="@+id/ok"
+        android:icon="@drawable/ic_menu_save"
+        android:showAsAction="ifRoom"
+        android:title="@string/add_profile"
+        android:titleCondensed="@string/import_vpn"/>
+
+
 </menu>
\ No newline at end of file
diff --git a/main/src/main/res/menu/logmenu.xml b/main/src/ui/res/menu/logmenu.xml
index 90eba679..cb9a86f0 100644
--- a/main/src/main/res/menu/logmenu.xml
+++ b/main/src/ui/res/menu/logmenu.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--

-  ~ Copyright (c) 2012-2016 Arne Schwabe

-  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt

-  -->

-

-<menu xmlns:android="http://schemas.android.com/apk/res/android">

-

-

-    <item

-            android:id="@+id/toggle_time"

-            android:alphabeticShortcut="t"

-            android:icon="@drawable/ic_menu_view"

-            android:showAsAction="ifRoom"

-            android:title="@string/logview_options" />

-

-    <item

-            android:id="@+id/clearlog"

-            android:icon="@drawable/ic_menu_delete"

-            android:showAsAction="ifRoom"

-            android:title="@string/clear_log"

-            android:titleCondensed="@string/clear"/>

-    <item

-            android:id="@+id/send"

-            android:icon="@drawable/ic_menu_share"

-            android:showAsAction="ifRoom"

-            android:title="@string/send_logfile"

-            android:titleCondensed="@string/send"/>

-

-    <item

-            android:id="@+id/cancel"

-            android:icon="@drawable/ic_menu_close_clear_cancel"

-            android:showAsAction="ifRoom"

-            android:title="@string/cancel_connection_long"

-            android:titleCondensed="@string/cancel_connection"/>

-    <item

-            android:id="@+id/edit_vpn"

-            android:alphabeticShortcut="e"

-            android:icon="@drawable/ic_menu_edit"

-            android:showAsAction="ifRoom"

-            android:title="@string/edit_vpn"/>

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2012-2016 Arne Schwabe
+  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
+  -->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <item
+            android:id="@+id/toggle_time"
+            android:alphabeticShortcut="t"
+            android:icon="@drawable/ic_menu_view"
+            android:showAsAction="ifRoom"
+            android:title="@string/logview_options" />
+
+    <item
+            android:id="@+id/clearlog"
+            android:icon="@drawable/ic_menu_delete"
+            android:showAsAction="ifRoom"
+            android:title="@string/clear_log"
+            android:titleCondensed="@string/clear"/>
+    <item
+            android:id="@+id/send"
+            android:icon="@drawable/ic_menu_share"
+            android:showAsAction="ifRoom"
+            android:title="@string/send_logfile"
+            android:titleCondensed="@string/send"/>
+
+    <item
+            android:id="@+id/cancel"
+            android:icon="@drawable/ic_menu_close_clear_cancel"
+            android:showAsAction="ifRoom"
+            android:title="@string/cancel_connection_long"
+            android:titleCondensed="@string/cancel_connection"/>
+    <item
+            android:id="@+id/edit_vpn"
+            android:alphabeticShortcut="e"
+            android:icon="@drawable/ic_menu_edit"
+            android:showAsAction="ifRoom"
+            android:title="@string/edit_vpn"/>
 </menu>
\ No newline at end of file
diff --git a/main/src/main/res/menu/main_menu.xml b/main/src/ui/res/menu/main_menu.xml
index f5e0bf08..f5e0bf08 100644
--- a/main/src/main/res/menu/main_menu.xml
+++ b/main/src/ui/res/menu/main_menu.xml
diff --git a/main/src/main/res/menu/vpnpreferences_menu.xml b/main/src/ui/res/menu/vpnpreferences_menu.xml
index e31d6ddf..e31d6ddf 100644
--- a/main/src/main/res/menu/vpnpreferences_menu.xml
+++ b/main/src/ui/res/menu/vpnpreferences_menu.xml
diff --git a/main/src/main/res/values-be/arrays.xml b/main/src/ui/res/values-be/arrays.xml
index 1bdc1ad1..1bdc1ad1 100755
--- a/main/src/main/res/values-be/arrays.xml
+++ b/main/src/ui/res/values-be/arrays.xml
diff --git a/main/src/main/res/values-be/plurals.xml b/main/src/ui/res/values-be/plurals.xml
index 72852053..72852053 100755
--- a/main/src/main/res/values-be/plurals.xml
+++ b/main/src/ui/res/values-be/plurals.xml
diff --git a/main/src/main/res/values-be/strings.xml b/main/src/ui/res/values-be/strings.xml
index 233ca2e6..1898fffd 100755
--- a/main/src/main/res/values-be/strings.xml
+++ b/main/src/ui/res/values-be/strings.xml
@@ -441,7 +441,7 @@
     <string name="kbits_per_second">%.1f Кбіт/с</string>
     <string name="mbits_per_second">%.1f Мбіт/с</string>
     <string name="gbits_per_second">%.1f Гбіт/c</string>
-    <string name="weakmd">&lt;p&gt;Пачынаючы з OpenSSL версіі 1.1, OpenSSL адхіляе слабыя сертыфікаты, такія як сертыфікаты MD5.        
+    <string name="weakmd">&lt;p&gt;Пачынаючы з OpenSSL версіі 1.1, OpenSSL адхіляе слабыя сертыфікаты, такія як сертыфікаты MD5.
         &lt;/p&gt;&lt;p&gt;&lt;b&gt;Подпісы MD5 цалкам небяспечныя і іх нельга больш выкарыстоўваць.&lt;/b&gt; Калізіі MD5
         могуць быць створаныя ў &lt;a
         href=\"https://natmchugh.blogspot.de/2015/02/create-your-own-md5-collisions.html\"&gt;за некалькі гадзін з мінімальнымі выдаткамі.&lt;/a&gt;.
diff --git a/main/src/main/res/values-ca/arrays.xml b/main/src/ui/res/values-ca/arrays.xml
index 0783a3c1..0783a3c1 100755
--- a/main/src/main/res/values-ca/arrays.xml
+++ b/main/src/ui/res/values-ca/arrays.xml
diff --git a/main/src/main/res/values-ca/plurals.xml b/main/src/ui/res/values-ca/plurals.xml
index 70489fbc..70489fbc 100755
--- a/main/src/main/res/values-ca/plurals.xml
+++ b/main/src/ui/res/values-ca/plurals.xml
diff --git a/main/src/main/res/values-ca/strings.xml b/main/src/ui/res/values-ca/strings.xml
index d2b9745f..2ca9d37b 100755
--- a/main/src/main/res/values-ca/strings.xml
+++ b/main/src/ui/res/values-ca/strings.xml
@@ -98,7 +98,7 @@
     <string name="netstatus">Estat de la xarxa %s</string>
     <string name="select_file">Selecciona</string>
     <string name="show_log_window">Mostra la finestra de registre</string>
-    <string name="translationby">Traducció al catala per Sergi Almacellas 
+    <string name="translationby">Traducció al catala per Sergi Almacellas
 &lt;sergi@koolpi.com&gt;</string>
     <string name="ipdns">IP i DNS</string>
     <string name="basic">Bàsic</string>
diff --git a/main/src/main/res/values-cs/arrays.xml b/main/src/ui/res/values-cs/arrays.xml
index 2d12a5df..2d12a5df 100755
--- a/main/src/main/res/values-cs/arrays.xml
+++ b/main/src/ui/res/values-cs/arrays.xml
diff --git a/main/src/main/res/values-cs/plurals.xml b/main/src/ui/res/values-cs/plurals.xml
index 70489fbc..70489fbc 100755
--- a/main/src/main/res/values-cs/plurals.xml
+++ b/main/src/ui/res/values-cs/plurals.xml
diff --git a/main/src/main/res/values-cs/strings.xml b/main/src/ui/res/values-cs/strings.xml
index 6b9aa27f..6b9aa27f 100755
--- a/main/src/main/res/values-cs/strings.xml
+++ b/main/src/ui/res/values-cs/strings.xml
diff --git a/main/src/main/res/values-da/arrays.xml b/main/src/ui/res/values-da/arrays.xml
index b9d9319f..b9d9319f 100755
--- a/main/src/main/res/values-da/arrays.xml
+++ b/main/src/ui/res/values-da/arrays.xml
diff --git a/main/src/main/res/values-da/plurals.xml b/main/src/ui/res/values-da/plurals.xml
index 65c63167..65c63167 100755
--- a/main/src/main/res/values-da/plurals.xml
+++ b/main/src/ui/res/values-da/plurals.xml
diff --git a/main/src/main/res/values-da/strings.xml b/main/src/ui/res/values-da/strings.xml
index 0f50ffc1..0f50ffc1 100755
--- a/main/src/main/res/values-da/strings.xml
+++ b/main/src/ui/res/values-da/strings.xml
diff --git a/main/src/main/res/values-de/arrays.xml b/main/src/ui/res/values-de/arrays.xml
index 051d19b1..051d19b1 100755
--- a/main/src/main/res/values-de/arrays.xml
+++ b/main/src/ui/res/values-de/arrays.xml
diff --git a/main/src/main/res/values-de/plurals.xml b/main/src/ui/res/values-de/plurals.xml
index 9c208165..9c208165 100755
--- a/main/src/main/res/values-de/plurals.xml
+++ b/main/src/ui/res/values-de/plurals.xml
diff --git a/main/src/main/res/values-de/strings.xml b/main/src/ui/res/values-de/strings.xml
index bf4064b7..bf4064b7 100755
--- a/main/src/main/res/values-de/strings.xml
+++ b/main/src/ui/res/values-de/strings.xml
diff --git a/main/src/main/res/values-es/arrays.xml b/main/src/ui/res/values-es/arrays.xml
index 3ced4e79..3ced4e79 100755
--- a/main/src/main/res/values-es/arrays.xml
+++ b/main/src/ui/res/values-es/arrays.xml
diff --git a/main/src/main/res/values-es/plurals.xml b/main/src/ui/res/values-es/plurals.xml
index 010374d0..010374d0 100755
--- a/main/src/main/res/values-es/plurals.xml
+++ b/main/src/ui/res/values-es/plurals.xml
diff --git a/main/src/main/res/values-es/strings.xml b/main/src/ui/res/values-es/strings.xml
index 62254ca8..62254ca8 100755
--- a/main/src/main/res/values-es/strings.xml
+++ b/main/src/ui/res/values-es/strings.xml
diff --git a/main/src/main/res/values-et/arrays.xml b/main/src/ui/res/values-et/arrays.xml
index 4b4a3b03..4b4a3b03 100755
--- a/main/src/main/res/values-et/arrays.xml
+++ b/main/src/ui/res/values-et/arrays.xml
diff --git a/main/src/main/res/values-et/plurals.xml b/main/src/ui/res/values-et/plurals.xml
index 829589b6..829589b6 100755
--- a/main/src/main/res/values-et/plurals.xml
+++ b/main/src/ui/res/values-et/plurals.xml
diff --git a/main/src/main/res/values-et/strings.xml b/main/src/ui/res/values-et/strings.xml
index 463ffff0..463ffff0 100755
--- a/main/src/main/res/values-et/strings.xml
+++ b/main/src/ui/res/values-et/strings.xml
diff --git a/main/src/main/res/values-fr/arrays.xml b/main/src/ui/res/values-fr/arrays.xml
index c08456d3..c08456d3 100755
--- a/main/src/main/res/values-fr/arrays.xml
+++ b/main/src/ui/res/values-fr/arrays.xml
diff --git a/main/src/main/res/values-fr/plurals.xml b/main/src/ui/res/values-fr/plurals.xml
index 53f72eea..53f72eea 100755
--- a/main/src/main/res/values-fr/plurals.xml
+++ b/main/src/ui/res/values-fr/plurals.xml
diff --git a/main/src/main/res/values-fr/strings.xml b/main/src/ui/res/values-fr/strings.xml
index 8787206e..8787206e 100755
--- a/main/src/main/res/values-fr/strings.xml
+++ b/main/src/ui/res/values-fr/strings.xml
diff --git a/main/src/main/res/values-hu/arrays.xml b/main/src/ui/res/values-hu/arrays.xml
index fb3d9856..fb3d9856 100755
--- a/main/src/main/res/values-hu/arrays.xml
+++ b/main/src/ui/res/values-hu/arrays.xml
diff --git a/main/src/main/res/values-hu/plurals.xml b/main/src/ui/res/values-hu/plurals.xml
index a8ffc2ee..a8ffc2ee 100755
--- a/main/src/main/res/values-hu/plurals.xml
+++ b/main/src/ui/res/values-hu/plurals.xml
diff --git a/main/src/main/res/values-hu/strings.xml b/main/src/ui/res/values-hu/strings.xml
index 10bb3931..10bb3931 100755
--- a/main/src/main/res/values-hu/strings.xml
+++ b/main/src/ui/res/values-hu/strings.xml
diff --git a/main/src/main/res/values-in/arrays.xml b/main/src/ui/res/values-in/arrays.xml
index 8f6ebdb4..8f6ebdb4 100755
--- a/main/src/main/res/values-in/arrays.xml
+++ b/main/src/ui/res/values-in/arrays.xml
diff --git a/main/src/main/res/values-in/plurals.xml b/main/src/ui/res/values-in/plurals.xml
index 4ec8c686..4ec8c686 100755
--- a/main/src/main/res/values-in/plurals.xml
+++ b/main/src/ui/res/values-in/plurals.xml
diff --git a/main/src/main/res/values-in/strings.xml b/main/src/ui/res/values-in/strings.xml
index 103e1d8e..103e1d8e 100755
--- a/main/src/main/res/values-in/strings.xml
+++ b/main/src/ui/res/values-in/strings.xml
diff --git a/main/src/main/res/values-it/arrays.xml b/main/src/ui/res/values-it/arrays.xml
index 96e87076..96e87076 100755
--- a/main/src/main/res/values-it/arrays.xml
+++ b/main/src/ui/res/values-it/arrays.xml
diff --git a/main/src/main/res/values-it/plurals.xml b/main/src/ui/res/values-it/plurals.xml
index c71ea870..c71ea870 100755
--- a/main/src/main/res/values-it/plurals.xml
+++ b/main/src/ui/res/values-it/plurals.xml
diff --git a/main/src/main/res/values-it/strings.xml b/main/src/ui/res/values-it/strings.xml
index 3ac534bf..3ac534bf 100755
--- a/main/src/main/res/values-it/strings.xml
+++ b/main/src/ui/res/values-it/strings.xml
diff --git a/main/src/main/res/values-ja/arrays.xml b/main/src/ui/res/values-ja/arrays.xml
index 2fd6e72f..2fd6e72f 100755
--- a/main/src/main/res/values-ja/arrays.xml
+++ b/main/src/ui/res/values-ja/arrays.xml
diff --git a/main/src/main/res/values-ja/plurals.xml b/main/src/ui/res/values-ja/plurals.xml
index a6233e55..a6233e55 100755
--- a/main/src/main/res/values-ja/plurals.xml
+++ b/main/src/ui/res/values-ja/plurals.xml
diff --git a/main/src/main/res/values-ja/strings.xml b/main/src/ui/res/values-ja/strings.xml
index 60553655..4b10759b 100755
--- a/main/src/main/res/values-ja/strings.xml
+++ b/main/src/ui/res/values-ja/strings.xml
@@ -259,7 +259,7 @@ Android 4.4以上はポリシールーティングを使用します。route/ifc
     <string name="openvpn_log">OpenVPNログ</string>
     <string name="import_config">OpenVPN の設定のインポート</string>
     <string name="battery_consumption_title">バッテリー消費量</string>
-    <string name="baterry_consumption">個人的な検証では、OpenVPNがバッテリを多く消費する主な原因はkeepaliveパケットです。 
+    <string name="baterry_consumption">個人的な検証では、OpenVPNがバッテリを多く消費する主な原因はkeepaliveパケットです。
 大部分のOpenVPNサーバは\'keepalive 10 60\'のような設定を持っており、これは10秒ごとにサーバとクライアントで相互にkeepaliveパケットを送信しあうことを意味します。 &lt;p&gt;これらのパケットは小さく多くの帯域は使用しませんが、モバイル回線機能を常に稼動させ続け電力消費を増大させます。 &lt;p&gt;
 (参考 &lt;a href=\"http://developer.android.com/training/efficient-downloads/efficient-network-access.html#RadioStateMachine\"&gt;The Radio State Machine | Android Developers&lt;/a&gt;)&lt;p&gt;このkeepalive設定はクライアント側からは変更できません。OpenVPNのシステム管理者のみが変更可能です。 &lt;p&gt; 残念なことに、60秒より大きな間隔のUDP keepaliveはいくつかのNATゲートウェイにおいては接続状態が維持できず、それより短い時間でタイムアウトします(検証では60秒)。 TCP keepaliveと長いタイムアウト時間の使用は、動作はしますがTCP over TCP問題を引き起こします。(詳細は&lt;a href=\"http://sites.inka.de/bigred/devel/tcp-tcp.html\"&gt;なぜTCP over TCPは悪いアイディアなのか&lt;/a&gt;を参照)</string>
     <string name="faq_tethering">Androidのテザリング機能(WiFi, USB, Bluetooth経由)とVPNService API(このプログラムから使用する機能)は同時に利用できません。詳細については&lt;a href=\"http://code.google.com/p/ics-openvpn/issues/detail?id=34\"&gt;issue #34&lt;/a&gt;を参照</string>
diff --git a/main/src/main/res/values-ko/arrays.xml b/main/src/ui/res/values-ko/arrays.xml
index f2f5176e..f2f5176e 100755
--- a/main/src/main/res/values-ko/arrays.xml
+++ b/main/src/ui/res/values-ko/arrays.xml
diff --git a/main/src/main/res/values-ko/plurals.xml b/main/src/ui/res/values-ko/plurals.xml
index 2f557b76..2f557b76 100755
--- a/main/src/main/res/values-ko/plurals.xml
+++ b/main/src/ui/res/values-ko/plurals.xml
diff --git a/main/src/main/res/values-ko/strings.xml b/main/src/ui/res/values-ko/strings.xml
index abf80e1c..abf80e1c 100755
--- a/main/src/main/res/values-ko/strings.xml
+++ b/main/src/ui/res/values-ko/strings.xml
diff --git a/main/src/main/res/values-nl/arrays.xml b/main/src/ui/res/values-nl/arrays.xml
index 1a5b0944..1a5b0944 100755
--- a/main/src/main/res/values-nl/arrays.xml
+++ b/main/src/ui/res/values-nl/arrays.xml
diff --git a/main/src/main/res/values-nl/plurals.xml b/main/src/ui/res/values-nl/plurals.xml
index 5dd855b4..5dd855b4 100755
--- a/main/src/main/res/values-nl/plurals.xml
+++ b/main/src/ui/res/values-nl/plurals.xml
diff --git a/main/src/main/res/values-nl/strings.xml b/main/src/ui/res/values-nl/strings.xml
index eee88df2..eee88df2 100755
--- a/main/src/main/res/values-nl/strings.xml
+++ b/main/src/ui/res/values-nl/strings.xml
diff --git a/main/src/main/res/values-no/arrays.xml b/main/src/ui/res/values-no/arrays.xml
index 7928d7aa..7928d7aa 100755
--- a/main/src/main/res/values-no/arrays.xml
+++ b/main/src/ui/res/values-no/arrays.xml
diff --git a/main/src/main/res/values-no/plurals.xml b/main/src/ui/res/values-no/plurals.xml
index 733482ae..733482ae 100755
--- a/main/src/main/res/values-no/plurals.xml
+++ b/main/src/ui/res/values-no/plurals.xml
diff --git a/main/src/main/res/values-no/strings.xml b/main/src/ui/res/values-no/strings.xml
index 41a1cdc4..41a1cdc4 100755
--- a/main/src/main/res/values-no/strings.xml
+++ b/main/src/ui/res/values-no/strings.xml
diff --git a/main/src/main/res/values-pl/arrays.xml b/main/src/ui/res/values-pl/arrays.xml
index 6e279359..6e279359 100755
--- a/main/src/main/res/values-pl/arrays.xml
+++ b/main/src/ui/res/values-pl/arrays.xml
diff --git a/main/src/main/res/values-pl/plurals.xml b/main/src/ui/res/values-pl/plurals.xml
index 76251070..76251070 100755
--- a/main/src/main/res/values-pl/plurals.xml
+++ b/main/src/ui/res/values-pl/plurals.xml
diff --git a/main/src/main/res/values-pl/strings.xml b/main/src/ui/res/values-pl/strings.xml
index 264bf05d..264bf05d 100755
--- a/main/src/main/res/values-pl/strings.xml
+++ b/main/src/ui/res/values-pl/strings.xml
diff --git a/main/src/main/res/values-pt/arrays.xml b/main/src/ui/res/values-pt/arrays.xml
index b0a72b07..b0a72b07 100755
--- a/main/src/main/res/values-pt/arrays.xml
+++ b/main/src/ui/res/values-pt/arrays.xml
diff --git a/main/src/main/res/values-pt/plurals.xml b/main/src/ui/res/values-pt/plurals.xml
index 2bbba6f7..2bbba6f7 100755
--- a/main/src/main/res/values-pt/plurals.xml
+++ b/main/src/ui/res/values-pt/plurals.xml
diff --git a/main/src/main/res/values-pt/strings.xml b/main/src/ui/res/values-pt/strings.xml
index 31d9edac..31d9edac 100755
--- a/main/src/main/res/values-pt/strings.xml
+++ b/main/src/ui/res/values-pt/strings.xml
diff --git a/main/src/main/res/values-ro/arrays.xml b/main/src/ui/res/values-ro/arrays.xml
index 29a34caa..29a34caa 100755
--- a/main/src/main/res/values-ro/arrays.xml
+++ b/main/src/ui/res/values-ro/arrays.xml
diff --git a/main/src/main/res/values-ro/plurals.xml b/main/src/ui/res/values-ro/plurals.xml
index 8ca7bf07..8ca7bf07 100755
--- a/main/src/main/res/values-ro/plurals.xml
+++ b/main/src/ui/res/values-ro/plurals.xml
diff --git a/main/src/main/res/values-ro/strings.xml b/main/src/ui/res/values-ro/strings.xml
index 247753b8..247753b8 100755
--- a/main/src/main/res/values-ro/strings.xml
+++ b/main/src/ui/res/values-ro/strings.xml
diff --git a/main/src/main/res/values-ru/arrays.xml b/main/src/ui/res/values-ru/arrays.xml
index 7c6fa1d9..7c6fa1d9 100755
--- a/main/src/main/res/values-ru/arrays.xml
+++ b/main/src/ui/res/values-ru/arrays.xml
diff --git a/main/src/main/res/values-ru/plurals.xml b/main/src/ui/res/values-ru/plurals.xml
index cd04dd9a..cd04dd9a 100755
--- a/main/src/main/res/values-ru/plurals.xml
+++ b/main/src/ui/res/values-ru/plurals.xml
diff --git a/main/src/main/res/values-ru/strings.xml b/main/src/ui/res/values-ru/strings.xml
index 0917c7c2..0917c7c2 100755
--- a/main/src/main/res/values-ru/strings.xml
+++ b/main/src/ui/res/values-ru/strings.xml
diff --git a/main/src/main/res/values-sl/arrays.xml b/main/src/ui/res/values-sl/arrays.xml
index 2f9ee85a..2f9ee85a 100755
--- a/main/src/main/res/values-sl/arrays.xml
+++ b/main/src/ui/res/values-sl/arrays.xml
diff --git a/main/src/main/res/values-sl/plurals.xml b/main/src/ui/res/values-sl/plurals.xml
index a5975083..a5975083 100755
--- a/main/src/main/res/values-sl/plurals.xml
+++ b/main/src/ui/res/values-sl/plurals.xml
diff --git a/main/src/main/res/values-sl/strings.xml b/main/src/ui/res/values-sl/strings.xml
index 98afd9a6..98afd9a6 100755
--- a/main/src/main/res/values-sl/strings.xml
+++ b/main/src/ui/res/values-sl/strings.xml
diff --git a/main/src/main/res/values-sv/arrays.xml b/main/src/ui/res/values-sv/arrays.xml
index 940fd6af..940fd6af 100755
--- a/main/src/main/res/values-sv/arrays.xml
+++ b/main/src/ui/res/values-sv/arrays.xml
diff --git a/main/src/main/res/values-sv/plurals.xml b/main/src/ui/res/values-sv/plurals.xml
index f4e09164..f4e09164 100755
--- a/main/src/main/res/values-sv/plurals.xml
+++ b/main/src/ui/res/values-sv/plurals.xml
diff --git a/main/src/main/res/values-sv/strings.xml b/main/src/ui/res/values-sv/strings.xml
index 600dbe3d..600dbe3d 100755
--- a/main/src/main/res/values-sv/strings.xml
+++ b/main/src/ui/res/values-sv/strings.xml
diff --git a/main/src/main/res/values-tr/arrays.xml b/main/src/ui/res/values-tr/arrays.xml
index 4fd23d56..4fd23d56 100755
--- a/main/src/main/res/values-tr/arrays.xml
+++ b/main/src/ui/res/values-tr/arrays.xml
diff --git a/main/src/main/res/values-tr/plurals.xml b/main/src/ui/res/values-tr/plurals.xml
index d8316729..d8316729 100755
--- a/main/src/main/res/values-tr/plurals.xml
+++ b/main/src/ui/res/values-tr/plurals.xml
diff --git a/main/src/main/res/values-tr/strings.xml b/main/src/ui/res/values-tr/strings.xml
index b907eb51..b30715f5 100755
--- a/main/src/main/res/values-tr/strings.xml
+++ b/main/src/ui/res/values-tr/strings.xml
@@ -449,13 +449,13 @@
         eski easy-rsa dağıtımları \"default_md md5\" seçeneğini içeriyordu. Eğer  easy-rsa\'nın eski bir versiyonunu kullanıyorsanız, bu versiyona yükseltin
         &lt;a href=\"https://github.com/OpenVPN/easy-rsa/releases\"&gt; en son versiyon&lt;/a&gt;) yada md5\'i sha256 ile değiştirin ve
         sertifikalarınızı yeniden yaratın.&lt;/p&gt;&lt;p&gt; eğer gerçekten eski ve bozuk sertifikaları kullanmak istiyorsanız.
-        Gelişmiş yapılandırma altındaki özel yapılandırma seçeneği ya da senin aktarılmış yapılandırmanda ekstra bir satır olarak 
+        Gelişmiş yapılandırma altındaki özel yapılandırma seçeneği ya da senin aktarılmış yapılandırmanda ekstra bir satır olarak
          tls-cipher \"DEFAULT:@SECLEVEL=0\" \'ı kullanın&lt;/p&gt;
-  
-    
-    
-        
-        
+
+
+
+
+
     </string>
     <string name="volume_byte">%.0f B</string>
     <string name="volume_kbyte">%.1f kB</string>
@@ -475,7 +475,7 @@
     <string name="running_test">Test çalışıyor&#8230;</string>
     <string name="test_algoirhtms">Seçilen algoritmaları test edin</string>
     <string name="all_app_prompt">Harici bir uygulama, %s denetlemeyi deniyor. Erişim isteyen uygulama belirlenemedi. Uygulamaya TÜM uygulamalara erişim izni veriliyor.</string>
-    <string name="openvpn3_nostatickeys">OpenVPN 3 C++ uygulaması statik anahtarları desteklemez. Lütfen genel ayarlar altında 
+    <string name="openvpn3_nostatickeys">OpenVPN 3 C++ uygulaması statik anahtarları desteklemez. Lütfen genel ayarlar altında
         OpenVPN 2.x\'e geçin.
     </string>
     <string name="openvpn3_pkcs12">PKCS12 dosyalarını doğrudan OpenVPN 3 C++ uygulamasıyla kullanmak desteklenmiyor.
diff --git a/main/src/main/res/values-uk/arrays.xml b/main/src/ui/res/values-uk/arrays.xml
index a4833f95..a4833f95 100755
--- a/main/src/main/res/values-uk/arrays.xml
+++ b/main/src/ui/res/values-uk/arrays.xml
diff --git a/main/src/main/res/values-uk/plurals.xml b/main/src/ui/res/values-uk/plurals.xml
index b223a15a..b223a15a 100755
--- a/main/src/main/res/values-uk/plurals.xml
+++ b/main/src/ui/res/values-uk/plurals.xml
diff --git a/main/src/main/res/values-uk/strings.xml b/main/src/ui/res/values-uk/strings.xml
index b656a3d9..b656a3d9 100755
--- a/main/src/main/res/values-uk/strings.xml
+++ b/main/src/ui/res/values-uk/strings.xml
diff --git a/main/src/main/res/values-v21/colours.xml b/main/src/ui/res/values-v21/colours.xml
index 024e47eb..024e47eb 100644
--- a/main/src/main/res/values-v21/colours.xml
+++ b/main/src/ui/res/values-v21/colours.xml
diff --git a/main/src/main/res/values-v21/refs.xml b/main/src/ui/res/values-v21/refs.xml
index ae9be13f..ae9be13f 100644
--- a/main/src/main/res/values-v21/refs.xml
+++ b/main/src/ui/res/values-v21/refs.xml
diff --git a/main/src/main/res/values-v21/styles.xml b/main/src/ui/res/values-v21/styles.xml
index fa27ebe8..fa27ebe8 100644
--- a/main/src/main/res/values-v21/styles.xml
+++ b/main/src/ui/res/values-v21/styles.xml
diff --git a/main/src/main/res/values-vi/arrays.xml b/main/src/ui/res/values-vi/arrays.xml
index c2d9bd14..c2d9bd14 100755
--- a/main/src/main/res/values-vi/arrays.xml
+++ b/main/src/ui/res/values-vi/arrays.xml
diff --git a/main/src/main/res/values-vi/plurals.xml b/main/src/ui/res/values-vi/plurals.xml
index 6e4eef42..6e4eef42 100755
--- a/main/src/main/res/values-vi/plurals.xml
+++ b/main/src/ui/res/values-vi/plurals.xml
diff --git a/main/src/main/res/values-vi/strings.xml b/main/src/ui/res/values-vi/strings.xml
index c96ed3e7..c96ed3e7 100755
--- a/main/src/main/res/values-vi/strings.xml
+++ b/main/src/ui/res/values-vi/strings.xml
diff --git a/main/src/main/res/values-zh-rCN/arrays.xml b/main/src/ui/res/values-zh-rCN/arrays.xml
index 78318e55..78318e55 100755
--- a/main/src/main/res/values-zh-rCN/arrays.xml
+++ b/main/src/ui/res/values-zh-rCN/arrays.xml
diff --git a/main/src/main/res/values-zh-rCN/plurals.xml b/main/src/ui/res/values-zh-rCN/plurals.xml
index 5824343f..5824343f 100755
--- a/main/src/main/res/values-zh-rCN/plurals.xml
+++ b/main/src/ui/res/values-zh-rCN/plurals.xml
diff --git a/main/src/main/res/values-zh-rCN/strings.xml b/main/src/ui/res/values-zh-rCN/strings.xml
index 3571e957..3571e957 100755
--- a/main/src/main/res/values-zh-rCN/strings.xml
+++ b/main/src/ui/res/values-zh-rCN/strings.xml
diff --git a/main/src/main/res/values-zh-rTW/arrays.xml b/main/src/ui/res/values-zh-rTW/arrays.xml
index 63af2a3a..63af2a3a 100755
--- a/main/src/main/res/values-zh-rTW/arrays.xml
+++ b/main/src/ui/res/values-zh-rTW/arrays.xml
diff --git a/main/src/main/res/values-zh-rTW/plurals.xml b/main/src/ui/res/values-zh-rTW/plurals.xml
index ba0d8399..ba0d8399 100755
--- a/main/src/main/res/values-zh-rTW/plurals.xml
+++ b/main/src/ui/res/values-zh-rTW/plurals.xml
diff --git a/main/src/main/res/values-zh-rTW/strings.xml b/main/src/ui/res/values-zh-rTW/strings.xml
index 501c3edf..501c3edf 100755
--- a/main/src/main/res/values-zh-rTW/strings.xml
+++ b/main/src/ui/res/values-zh-rTW/strings.xml
diff --git a/main/src/main/res/xml/general_settings.xml b/main/src/ui/res/xml/general_settings.xml
index 5c2ff8aa..5c2ff8aa 100644
--- a/main/src/main/res/xml/general_settings.xml
+++ b/main/src/ui/res/xml/general_settings.xml
diff --git a/main/src/main/res/xml/vpn_authentification.xml b/main/src/ui/res/xml/vpn_authentification.xml
index 458378b7..458378b7 100644
--- a/main/src/main/res/xml/vpn_authentification.xml
+++ b/main/src/ui/res/xml/vpn_authentification.xml
diff --git a/main/src/main/res/xml/vpn_ipsettings.xml b/main/src/ui/res/xml/vpn_ipsettings.xml
index 5df7ffa8..5df7ffa8 100644
--- a/main/src/main/res/xml/vpn_ipsettings.xml
+++ b/main/src/ui/res/xml/vpn_ipsettings.xml
diff --git a/main/src/main/res/xml/vpn_obscure.xml b/main/src/ui/res/xml/vpn_obscure.xml
index aa78050e..aa78050e 100644
--- a/main/src/main/res/xml/vpn_obscure.xml
+++ b/main/src/ui/res/xml/vpn_obscure.xml
diff --git a/main/src/main/res/xml/vpn_routing.xml b/main/src/ui/res/xml/vpn_routing.xml
index 4b662b25..4b662b25 100644
--- a/main/src/main/res/xml/vpn_routing.xml
+++ b/main/src/ui/res/xml/vpn_routing.xml