diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b0ea673..6bd7566 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,120 +1,116 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="it.reyboz.bustorino"
-          android:versionCode="27"
-          android:versionName="1.11">
+          package="it.reyboz.bustorino">
+
 
-    <uses-sdk
-            android:minSdkVersion="9"
-            android:targetSdkVersion="25"/>
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
 
     <application
             android:allowBackup="true"
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
             android:theme="@style/AppTheme">
         <activity
                 android:name=".ActivityMain"
                 android:label="@string/app_name"
                 android:screenOrientation="portrait"
                 android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                         android:host="www.gtt.to.it"
                         android:pathPrefix="/cms/percorari/arrivi"
                         android:scheme="http"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                         android:host="gtt.to.it"
                         android:pathPrefix="/cms/percorari/arrivi"
                         android:scheme="http"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                         android:host="m.gtt.to.it"
                         android:pathPrefix="/m/it/arrivi.jsp"
                         android:scheme="http"/>
             </intent-filter>
         </activity>
         <activity
                 android:name=".ActivityAbout"
                 android:label="@string/about"
                 android:parentActivityName=".ActivityMain"
                 android:theme="@style/AboutTheme">
 
             <!-- API < 16: -->
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value=".ActivityMain"/>
         </activity>
         <activity
                 android:name=".ActivityFavorites"
                 android:label="@string/title_activity_favorites"
                 android:parentActivityName=".ActivityMain"
                 android:theme="@style/FavTheme">
 
             <!-- API < 16: -->
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value=".ActivityMain"/>
         </activity>
 
         <provider
                 android:name=".middleware.AppDataProvider"
                 android:authorities="it.reyboz.bustorino.provider"
                 android:enabled="true"
                 android:exported="false">
         </provider>
 
         <service
                 android:name=".middleware.DatabaseUpdateService"
                 android:exported="false">
         </service>
         <!-- Don't show the additional frame on samsung phones -->
         <meta-data
                 android:name="com.samsung.android.icon_container.has_icon_container"
                 android:value="true"/>
 
         <activity
                 android:name=".ActivitySettings"
                 android:label="@string/title_activity_settings"
                 android:parentActivityName=".ActivityMain"
                 android:theme="@style/AppTheme">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="it.reyboz.bustorino.ActivityMain"/>
         </activity>
     </application>
 
 </manifest>
diff --git a/build.gradle b/build.gradle
index e59d073..874e06b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,78 +1,86 @@
 buildscript {
     repositories {
         mavenCentral()
         maven { url 'https://maven.google.com' }
         google()
         jcenter()
 
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.0'
     }
     ext {
         support_ver = "25.4.0"
     }
 }
 allprojects {
     repositories {
         mavenCentral()
         maven { url 'https://maven.google.com' }
         google()
         jcenter()
 
     }
 }
 
 apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
     buildToolsVersion '27.0.3'
 
+    defaultConfig {
+        applicationId "it.reyboz.bustorino"
+        minSdkVersion 9
+        targetSdkVersion 25
+        versionCode 27
+        versionName "1.11"
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
             resources.srcDirs = ['src']
             aidl.srcDirs = ['src']
             renderscript.srcDirs = ['src']
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
         }
     }
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
             versionNameSuffix "-dev"
         }
     }
 
     lintOptions {
         abortOnError false
     }
 
     repositories {
         mavenCentral()
         mavenLocal()
     }
 
     dependencies {
         implementation "com.android.support:support-v4:$support_ver"
         implementation "com.android.support:appcompat-v7:$support_ver"
         implementation "com.android.support:design:$support_ver"
         implementation "com.android.support:recyclerview-v7:$support_ver"
         implementation "com.android.support:preference-v7:$support_ver"
         implementation "com.android.support:cardview-v7:$support_ver"
 
 
         implementation 'org.jsoup:jsoup:1.11.3'
         implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1'
         implementation 'com.android.volley:volley:1.1.1'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2d80b69..558870d 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists