diff --git a/.gitignore b/.gitignore
index 4620058..7f036ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,11 +24,29 @@ gradle.properties
 .directory
 
 # Intellij project files
-*.iml
 *.ipr
 *.iws
 .idea/
 
 # Gradle
 build
-.gradle
\ No newline at end of file
+.gradle
+
+# https://gist.github.com/AltNico/c581f370b3f88715876b
+*.apk
+*.ap_
+*.dex
+*.class
+build.xml
+.DS_Store
+gen/
+.gradle/
+proguard/
+out
+.settings/
+*.swp
+*~
+
+# Source:
+# https://raw.githubusercontent.com/github/gitignore/master/Android.gitignore
+# https://gitlab.com/fdroid/fdroidclient/raw/master/.gitignore
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 96cc43e..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 02069c6..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
-        <option name="gradleJvm" value="1.7" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/external/netcipher/libnetcipher" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 99b1a92..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <option name="myLocal" value="true" />
-    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
-      <option name="processCode" value="true" />
-      <option name="processLiterals" value="true" />
-      <option name="processComments" value="true" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b31283..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 8a1bb8c..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 00ab69e..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Lightning-Browser.iml" filepath="$PROJECT_DIR$/Lightning-Browser.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/external/netcipher/libnetcipher/libnetcipher.iml" filepath="$PROJECT_DIR$/external/netcipher/libnetcipher/libnetcipher.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 00cd10a..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/external/netcipher" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3f34107..7ac449f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -4,8 +4,8 @@
     <string name="app_name">Lightning</string>
     <string name="google">Google</string>
     <string name="settings">Impostazioni del browser</string>
-    <string name="location">Accedere alla tua posizione</string>
-    <string name="password">Salva password</string>
+    <string name="location">Accesso alla posizione</string>
+    <string name="password">Salva Password</string>
     <string name="agent">User Agent</string>
     <string name="history">Cancella cronologia</string>
     <string name="email">Email me</string>
@@ -21,16 +21,16 @@
     <string name="action_share">Condividi</string>
     <string name="action_settings">Impostazioni</string>
     <string name="action_incognito">Nuova scheda in incognito</string>
-    <string name="action_new_tab">Nuova Scheda</string>
+    <string name="action_new_tab">Nuova scheda</string>
     <string name="action_copy">Copia URL</string>
-    <string name="action_add_bookmark">Aggiungi Segnalibro</string>
+    <string name="action_add_bookmark">Aggiungi ai segnalibri</string>
     <string name="action_websearch">Ricerca</string>
     <string name="action_refresh">Ricarica</string>
     <string name="download">Percorso Download</string>
     <string name="version">Versione Applicazione</string>
-    <string name="cache">Pulisci cache alla chiusura</string>
+    <string name="cache">Pulisci la cache alla chiusura</string>
     <string name="reflow">Abilità reflow del testo</string>
-    <string name="window">Consenti ai siti di aprire nuove finestr</string>
+    <string name="window">Consenti l'apertura di nuove finestre</string>
     <string name="cookies">Abilita Cookies</string>
     <string name="importbookmarks">Importa Segnalibri</string>
     <string name="size">Dimensione testo</string>
@@ -43,7 +43,7 @@
     <string name="stock_browser_unavailable">Nessun browser stock trovato</string>
     <string name="stock_browser_available">Browser stock supportato trovato</string>
     <string name="fullScreenOption">Nascondi la barra di stato durante la navigazione</string>
-    <string name="clear_cookies">Cancella cookie del browser</string>
+    <string name="clear_cookies">Cancella i cookies del browser</string>
     <string name="dialog_image">Cosa vorresti fare con questa immagine?</string>
     <string name="action_download">Scarica</string>
     <string name="action_open">Apri</string>
@@ -55,7 +55,7 @@
     <string name="agent_default">Default</string>
     <string name="agent_desktop">Desktop</string>
     <string name="agent_mobile">Mobile</string>
-    <string name="agent_custom">Personale</string>
+    <string name="agent_custom">Personalizzato</string>
     <string name="title_search_engine">Motore di ricerca</string>
     <string name="action_ok">OK</string>
     <string name="dialog_download">Vuoi scaricare questo file?</string>
@@ -64,8 +64,8 @@
     <string name="action_yes">Si</string>
     <string name="action_no">No</string>
     <string name="title_text_size">Dimensione testo</string>
-    <string name="size_largest">Più Largo</string>
-    <string name="size_large">Largo</string>
+    <string name="size_largest">Più Grande</string>
+    <string name="size_large">Grande</string>
     <string name="size_normal">Normale</string>
     <string name="size_small">Piccolo</string>
     <string name="size_smallest">Più Piccolo</string>
@@ -98,12 +98,12 @@
     <string name="export_bookmarks">Esporta segnalibri</string>
     <string name="import_backup">Importa segnalibri da backup</string>
     <string name="bookmark_export_path">Segnalibri esportati</string>
-    <string name="bookmark_settings">Impostazioni Segnalibri</string>
+    <string name="bookmark_settings">Segnalibri</string>
     <string name="title_chooser">Seleziona un file</string>
     <string name="block">Blocca le immagini</string>
     <string name="install_orbot">Installa Orbot per attivare questa funzione.</string>
-    <string name="settings_general">Impostazioni Generali</string>
-    <string name="settings_display">Impostazioni Display</string>
+    <string name="settings_general">Generali</string>
+    <string name="settings_display">Display</string>
     <string name="settings_privacy">Privacy</string>
     <string name="settings_about">Informazioni</string>
     <string name="settings_about_explain">Informazioni sull\'autore, versione e license.</string>
@@ -112,8 +112,8 @@
     <string name="name_grayscale">Scala di grigi</string>
     <string name="name_inverted_grayscale">Scala di grigi inversa</string>
     <string name="name_normal">Normale</string>
-    <string name="clear_cookies_exit">Cancella cookie alla chiusura</string>
-    <string name="clear_history_exit">Cancella cronologia alla chiusura</string>
+    <string name="clear_cookies_exit">Elimina i cookies alla chiusura</string>
+    <string name="clear_history_exit">Elimina la cronologia alla chiusura</string>
     <string name="title_clear_history">Cancella Cronologia</string>
     <string name="title_clear_cookies">Cancella Cookies</string>
     <string name="google_suggestions">Suggerimenti di ricerca</string>
@@ -121,5 +121,20 @@
     <string name="licenses">Licenze Open Source</string>
     <string name="action_webpage">Pagina Web</string>
     <string name="fullscreen">Modalità a schermo intero</string>
+    <string name="settings_advanced">Avanzate</string>
+    <string name="url_contents">Contenuto box URL</string>
+    <string-array name="url_content_array">
+        <item >Dominio (default)</item>
+        <item >URL</item>
+        <item >Titolo</item>
+    <string name="invert_color">Inverti colori</string>
+    <string name="dark_theme">Usa il tema scuro</string>
+    <string name="change_after_restart">Il cambiamento di tema avrà effetto dopo il riavvio del browser.</string>
+    <string name="close_tab">Chiudi la scheda</string>
+    <string name="close_all_tabs">Chiudi tute le schede</string>
+    <string name="third_party">Blocca cookies di terze parti.</string>
+    <string name="available_lollipop">Questa feature è disponibile solo su Android 5.0+</string>
+    <string name="color_mode">Attiva la modalità a colori.</string>
+    <string name="reading_mode">Modalità reader</string>
     
 </resources>
diff --git a/build.xml b/build.xml
deleted file mode 100644
index db1929c..0000000
--- a/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Lightning" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>