diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 9e07f26fb..7720b4cbd 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,268 +1,270 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-<PreferenceCategory android:title="@string/pref_general_group">
-<CheckBoxPreference 
-android:defaultValue="true" 
-android:key="pref_start_boot"
-android:title="@string/pref_start_boot_title"
-android:summary="@string/pref_start_boot_summary"
-android:enabled="true"/>
-
-<CheckBoxPreference
-android:defaultValue="true" 
-android:key="pref_persistent_notifications"
-android:summary="@string/pref_use_persistent_notifications"
-android:enabled="true" 
-android:title="@string/pref_use_persistent_notifications_title"/>
-
-<CheckBoxPreference
-android:defaultValue="true" 
-android:key="pref_expanded_notifications"
-android:summary="@string/pref_use_expanded_notifications"
-android:enabled="true" 
-android:title="@string/pref_use_expanded_notifications_title"/>
-
-<CheckBoxPreference
-android:defaultValue="true" 
-android:key="pref_allow_background_starts"
-android:summary="@string/pref_allow_background_starts_summary"
-android:title="@string/pref_allow_background_starts_title"/>
-
-<CheckBoxPreference
-android:defaultValue="false"
-android:key="pref_open_proxy_on_all_interfaces"
-android:summary="@string/pref_open_proxy_on_all_interfaces_summary"
-android:title="@string/pref_open_proxy_on_all_interfaces_title"/>
-
- <ListPreference android:title="@string/set_locale_title"
-   android:key="pref_default_locale"
-   android:summary="@string/set_locale_summary"
-   android:defaultValue="en">
- </ListPreference>
-
-</PreferenceCategory>
-<!--
-<PreferenceCategory android:title="@string/pref_trans_proxy_group">
-
-<CheckBoxPreference 
-android:defaultValue="false" 
-android:key="has_root"
-android:title="@string/pref_has_root"
-android:summary="@string/pref_has_root_summary"
-android:enabled="true"/>
-    
-<CheckBoxPreference 
-android:defaultValue="false" 
-android:key="pref_transparent"
-android:title="@string/pref_trans_proxy_title"
-android:summary="@string/pref_trans_proxy_summary"
-android:enabled="true"/>
-
-<CheckBoxPreference
-android:defaultValue="false" 
-android:key="pref_transparent_all"
-android:summary="@string/pref_transparent_all_summary"
-android:enabled="true" 
-android:title="@string/pref_transparent_all_title"/>
-
-<Preference
-android:defaultValue="" 
-android:key="pref_transparent_app_list"
-android:title="@string/pref_select_apps"
-android:summary="@string/pref_select_apps_summary"
-android:enabled="true"/>
-
-<CheckBoxPreference
-android:defaultValue="false" 
-android:key="pref_transparent_tethering"
-android:summary="@string/pref_transparent_tethering_summary"
-android:enabled="true"
-android:title="@string/pref_transparent_tethering_title"/>
-
-
-</PreferenceCategory>
--->
-<PreferenceCategory android:title="@string/pref_node_configuration"
- android:summary="@string/pref_node_configuration_summary">
- 
-<EditTextPreference android:key="pref_entrance_nodes"
-android:title="@string/pref_entrance_node"
-android:summary="@string/pref_entrance_node_summary"
-android:dialogTitle="@string/pref_entrance_node_dialog"
-/>
-<EditTextPreference android:key="pref_exit_nodes"
-android:title="@string/exit_nodes"
-android:summary="@string/fingerprints_nicks_countries_and_addresses_for_the_last_hop"
-android:dialogTitle="@string/enter_exit_nodes"
-/>
-<EditTextPreference android:key="pref_exclude_nodes"
-android:title="@string/exclude_nodes"
-android:summary="@string/fingerprints_nicks_countries_and_addresses_to_exclude"
-android:dialogTitle="@string/enter_exclude_nodes"
-/>
-
-<CheckBoxPreference android:defaultValue="false" 
-android:title="@string/strict_nodes" android:key="pref_strict_nodes" 
-android:summary="@string/use_only_these_specified_nodes"/>
-
-</PreferenceCategory> 
-<PreferenceCategory android:title="@string/bridges">
-
-<CheckBoxPreference android:defaultValue="false" 
-android:title="@string/use_bridges" android:key="pref_bridges_enabled" 
-android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"/>
-
-<EditTextPreference android:key="pref_bridges_list"
-android:title="@string/bridges"
-android:summary="@string/ip_address_and_port_of_bridges"
-android:dialogTitle="@string/enter_bridge_addresses"
-android:defaultValue=""
-android:inputType="textMultiLine|textNoSuggestions"
-/>
-
-</PreferenceCategory>
-
-<PreferenceCategory android:title="@string/relays">
-<CheckBoxPreference android:key="pref_or"
-android:defaultValue="false"
-android:title="@string/relaying"
-android:summary="@string/enable_your_device_to_be_a_non_exit_relay"
-android:enabled="true"
-/>
-
-<EditTextPreference android:key="pref_or_port"
-android:defaultValue="9001"
-android:title="@string/relay_port"
-android:summary="@string/listening_port_for_your_tor_relay"
-android:dialogTitle="@string/enter_or_port"
-/>
-
-<EditTextPreference android:key="pref_or_nickname"
-android:defaultValue="OrbotRelay"
-android:title="@string/relay_nickname"
-android:summary="@string/the_nickname_for_your_tor_relay"
-android:dialogTitle="@string/enter_a_custom_relay_nickname"
-/>
-
-</PreferenceCategory>
-
-<PreferenceCategory android:title="ReachableAddresses">
-<CheckBoxPreference
-android:key="pref_reachable_addresses"
-android:defaultValue="false"
-android:title="@string/reachable_addresses"
-android:summary="@string/run_as_a_client_behind_a_firewall_with_restrictive_policies"
-android:enabled="true"></CheckBoxPreference>
-
-<EditTextPreference
-android:key="pref_reachable_addresses_ports"
-android:defaultValue="*:80,*:443"
-android:title="@string/reachable_ports"
-android:summary="@string/ports_reachable_behind_a_restrictive_firewall"
-android:dialogTitle="@string/enter_ports"
-/>
-</PreferenceCategory>
-
-<PreferenceCategory android:title="Isolation">
-<CheckBoxPreference
-android:key="pref_isolate_dest"
-android:defaultValue="false"
-android:title="@string/pref_isolate_dest"
-android:summary="@string/pref_isolate_dest_summary"
-android:enabled="true"></CheckBoxPreference>
-</PreferenceCategory>
-
-<PreferenceCategory android:title="ConnectionPadding">
-<CheckBoxPreference
-android:key="pref_connection_padding"
-android:defaultValue="false"
-android:title="@string/pref_connection_padding"
-android:summary="@string/pref_connection_padding_summary"
-android:enabled="true"></CheckBoxPreference>
-<CheckBoxPreference
-android:key="pref_reduced_connection_padding"
-android:defaultValue="true"
-android:title="@string/pref_reduced_connection_padding"
-android:summary="@string/pref_reduced_connection_padding_summary"
-android:enabled="true"></CheckBoxPreference>
-</PreferenceCategory>
-
-
-<PreferenceCategory android:title="@string/pref_proxy_title">
-<EditTextPreference android:key="pref_proxy_type"
-android:title="@string/pref_proxy_type_title"
-android:summary="@string/pref_proxy_type_summary"
-android:dialogTitle="@string/pref_proxy_type_dialog"
-/>
-<EditTextPreference android:key="pref_proxy_host"
-android:title="@string/pref_proxy_host_title"
-android:summary="@string/pref_proxy_host_summary"
-android:dialogTitle="@string/pref_proxy_host_dialog"
-/>
-<EditTextPreference android:key="pref_proxy_port"
-android:title="@string/pref_proxy_port_title"
-android:summary="@string/pref_proxy_port_summary"
-android:dialogTitle="@string/pref_proxy_port_dialog"
-/>
-
-<EditTextPreference android:key="pref_proxy_username"
-android:title="@string/pref_proxy_username_title"
-android:summary="@string/pref_proxy_username_summary"
-android:dialogTitle="@string/pref_proxy_username_dialog"
-/>
-<EditTextPreference android:key="pref_proxy_password"
-android:title="@string/pref_proxy_password_title"
-android:summary="@string/pref_proxy_password_summary"
-android:dialogTitle="@string/pref_proxy_password_dialog"
-/>
-</PreferenceCategory>
-
-<PreferenceCategory android:title="Debug">
-    
-    <EditTextPreference android:key="pref_socks"
-android:title="@string/pref_socks_title"
-android:summary="@string/pref_socks_summary"
-android:dialogTitle="@string/pref_socks_dialog"
-android:defaultValue="9050"
-/>
-    
-      <EditTextPreference android:key="pref_transport"
-android:title="@string/pref_transport_title"
-android:summary="@string/pref_transport_summary"
-android:dialogTitle="@string/pref_transport_dialog"
-android:defaultValue="9040"
-/>
-      
-        <EditTextPreference android:key="pref_dnsport"
-android:title="@string/pref_dnsport_title"
-android:summary="@string/pref_dnsport_summary"
-android:dialogTitle="@string/pref_dnsport_dialog"
-android:defaultValue="5400"
-/>
-    
-  <EditTextPreference android:key="pref_custom_torrc"
-android:title="@string/pref_torrc_title"
-android:summary="@string/pref_torrc_summary"
-android:dialogTitle="@string/pref_torrc_dialog"
-/>
-
-
-<CheckBoxPreference
-android:key="pref_enable_logging"
-android:defaultValue="false"
-android:title="Debug Log"
-android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"
-android:enabled="true"
-/>
-
-
-
-<CheckBoxPreference
-android:defaultValue="true" 
-android:key="pref_disable_network"
-android:summary="@string/pref_disable_network_summary"
-android:enabled="true" 
-android:title="@string/pref_disable_network_title"/>
-
-</PreferenceCategory>
+    <PreferenceCategory android:title="@string/pref_general_group">
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_start_boot"
+            android:summary="@string/pref_start_boot_summary"
+            android:title="@string/pref_start_boot_title" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_persistent_notifications"
+            android:summary="@string/pref_use_persistent_notifications"
+            android:title="@string/pref_use_persistent_notifications_title" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_expanded_notifications"
+            android:summary="@string/pref_use_expanded_notifications"
+            android:title="@string/pref_use_expanded_notifications_title" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="pref_allow_background_starts"
+            android:summary="@string/pref_allow_background_starts_summary"
+            android:title="@string/pref_allow_background_starts_title" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="pref_open_proxy_on_all_interfaces"
+            android:summary="@string/pref_open_proxy_on_all_interfaces_summary"
+            android:title="@string/pref_open_proxy_on_all_interfaces_title" />
+
+        <ListPreference
+            android:defaultValue="en"
+            android:key="pref_default_locale"
+            android:summary="@string/set_locale_summary"
+            android:title="@string/set_locale_title"/>
+
+    </PreferenceCategory>
+    <!--
+    <PreferenceCategory android:title="@string/pref_trans_proxy_group">
+
+    <CheckBoxPreference
+    android:defaultValue="false"
+    android:key="has_root"
+    android:title="@string/pref_has_root"
+    android:summary="@string/pref_has_root_summary"
+    android:enabled="true"/>
+
+    <CheckBoxPreference
+    android:defaultValue="false"
+    android:key="pref_transparent"
+    android:title="@string/pref_trans_proxy_title"
+    android:summary="@string/pref_trans_proxy_summary"
+    android:enabled="true"/>
+
+    <CheckBoxPreference
+    android:defaultValue="false"
+    android:key="pref_transparent_all"
+    android:summary="@string/pref_transparent_all_summary"
+    android:enabled="true"
+    android:title="@string/pref_transparent_all_title"/>
+
+    <Preference
+    android:defaultValue=""
+    android:key="pref_transparent_app_list"
+    android:title="@string/pref_select_apps"
+    android:summary="@string/pref_select_apps_summary"
+    android:enabled="true"/>
+
+    <CheckBoxPreference
+    android:defaultValue="false"
+    android:key="pref_transparent_tethering"
+    android:summary="@string/pref_transparent_tethering_summary"
+    android:enabled="true"
+    android:title="@string/pref_transparent_tethering_title"/>
+
+
+    </PreferenceCategory>
+    -->
+    <PreferenceCategory
+        android:summary="@string/pref_node_configuration_summary"
+        android:title="@string/pref_node_configuration">
+
+        <EditTextPreference
+            android:dialogTitle="@string/pref_entrance_node_dialog"
+            android:key="pref_entrance_nodes"
+            android:summary="@string/pref_entrance_node_summary"
+            android:title="@string/pref_entrance_node" />
+        <EditTextPreference
+            android:dialogTitle="@string/enter_exit_nodes"
+            android:key="pref_exit_nodes"
+            android:summary="@string/fingerprints_nicks_countries_and_addresses_for_the_last_hop"
+            android:title="@string/exit_nodes" />
+        <EditTextPreference
+            android:dialogTitle="@string/enter_exclude_nodes"
+            android:key="pref_exclude_nodes"
+            android:summary="@string/fingerprints_nicks_countries_and_addresses_to_exclude"
+            android:title="@string/exclude_nodes" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="pref_strict_nodes"
+            android:summary="@string/use_only_these_specified_nodes"
+            android:title="@string/strict_nodes" />
+
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/bridges">
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="pref_bridges_enabled"
+            android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"
+            android:title="@string/use_bridges" />
+
+        <EditTextPreference
+            android:defaultValue=""
+            android:dialogTitle="@string/enter_bridge_addresses"
+            android:inputType="textMultiLine|textNoSuggestions"
+            android:key="pref_bridges_list"
+            android:summary="@string/ip_address_and_port_of_bridges"
+            android:title="@string/bridges" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/relays">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="pref_or"
+            android:summary="@string/enable_your_device_to_be_a_non_exit_relay"
+            android:title="@string/relaying" />
+
+        <EditTextPreference
+            android:defaultValue="9001"
+            android:dialogTitle="@string/enter_or_port"
+            android:key="pref_or_port"
+            android:summary="@string/listening_port_for_your_tor_relay"
+            android:title="@string/relay_port" />
+
+        <EditTextPreference
+            android:defaultValue="OrbotRelay"
+            android:dialogTitle="@string/enter_a_custom_relay_nickname"
+            android:key="pref_or_nickname"
+            android:summary="@string/the_nickname_for_your_tor_relay"
+            android:title="@string/relay_nickname" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="ReachableAddresses">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="pref_reachable_addresses"
+            android:summary="@string/run_as_a_client_behind_a_firewall_with_restrictive_policies"
+            android:title="@string/reachable_addresses"/>
+
+        <EditTextPreference
+            android:defaultValue="*:80,*:443"
+            android:dialogTitle="@string/enter_ports"
+            android:key="pref_reachable_addresses_ports"
+            android:summary="@string/ports_reachable_behind_a_restrictive_firewall"
+            android:title="@string/reachable_ports" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="Isolation">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="pref_isolate_dest"
+            android:summary="@string/pref_isolate_dest_summary"
+            android:title="@string/pref_isolate_dest"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="ConnectionPadding">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="pref_connection_padding"
+            android:summary="@string/pref_connection_padding_summary"
+            android:title="@string/pref_connection_padding"/>
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_reduced_connection_padding"
+            android:summary="@string/pref_reduced_connection_padding_summary"
+            android:title="@string/pref_reduced_connection_padding"/>
+    </PreferenceCategory>
+
+
+    <PreferenceCategory android:title="@string/pref_proxy_title">
+        <EditTextPreference
+            android:dialogTitle="@string/pref_proxy_type_dialog"
+            android:key="pref_proxy_type"
+            android:summary="@string/pref_proxy_type_summary"
+            android:title="@string/pref_proxy_type_title" />
+        <EditTextPreference
+            android:dialogTitle="@string/pref_proxy_host_dialog"
+            android:key="pref_proxy_host"
+            android:summary="@string/pref_proxy_host_summary"
+            android:title="@string/pref_proxy_host_title" />
+        <EditTextPreference
+            android:dialogTitle="@string/pref_proxy_port_dialog"
+            android:key="pref_proxy_port"
+            android:summary="@string/pref_proxy_port_summary"
+            android:title="@string/pref_proxy_port_title" />
+
+        <EditTextPreference
+            android:dialogTitle="@string/pref_proxy_username_dialog"
+            android:key="pref_proxy_username"
+            android:summary="@string/pref_proxy_username_summary"
+            android:title="@string/pref_proxy_username_title" />
+        <EditTextPreference
+            android:dialogTitle="@string/pref_proxy_password_dialog"
+            android:key="pref_proxy_password"
+            android:summary="@string/pref_proxy_password_summary"
+            android:title="@string/pref_proxy_password_title" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="Debug">
+
+        <EditTextPreference
+            android:defaultValue="9050"
+            android:dialogTitle="@string/pref_socks_dialog"
+            android:key="pref_socks"
+            android:summary="@string/pref_socks_summary"
+            android:title="@string/pref_socks_title" />
+
+        <EditTextPreference
+            android:defaultValue="9040"
+            android:dialogTitle="@string/pref_transport_dialog"
+            android:key="pref_transport"
+            android:summary="@string/pref_transport_summary"
+            android:title="@string/pref_transport_title" />
+
+        <EditTextPreference
+            android:defaultValue="5400"
+            android:dialogTitle="@string/pref_dnsport_dialog"
+            android:key="pref_dnsport"
+            android:summary="@string/pref_dnsport_summary"
+            android:title="@string/pref_dnsport_title" />
+
+        <EditTextPreference
+            android:dialogTitle="@string/pref_torrc_dialog"
+            android:key="pref_custom_torrc"
+            android:summary="@string/pref_torrc_summary"
+            android:title="@string/pref_torrc_title" />
+
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="pref_enable_logging"
+            android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"
+            android:title="Debug Log" />
+
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_disable_network"
+            android:summary="@string/pref_disable_network_summary"
+            android:title="@string/pref_disable_network_title" />
+
+    </PreferenceCategory>
 </PreferenceScreen>