diff --git a/config.xml b/config.xml
index 1db96201d43bd2b3bd28e612e53627175fd9cefa..30ff00f8cdce50eadea8c4b4e728fb4993bd531a 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.dimago.betskills" version="2.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.Dimago.Betskills" version="2.0.6" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Betskills</name>
     <description>
     Betskills app to see predictions of football and tennis games.
diff --git a/scss/unlock.scss b/scss/unlock.scss
index bbb3fab3a64d6035d2bccdec7b56a54ca06ad4d0..f1b3cd9195bd193a97cee3db1d98cd26d8daa944 100644
--- a/scss/unlock.scss
+++ b/scss/unlock.scss
@@ -28,9 +28,5 @@
     font-family: "OspDin";
     font-size: 20px;
     box-shadow: 0px 2px 1px black;
-
-    span {
-      padding-left: 25px;
-    }
   }
 }
diff --git a/www/js/app.js b/www/js/app.js
index 8f8281624cddd6203020ef3e5e3cc8f4102d8eba..29001af7b25663af07ae007babb003a7d3faeaa7 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -93,7 +93,6 @@
       if (ionic.Platform.isIOS()) {
         window.FirebasePlugin.grantPermission();
       }
-      NotificationService.registerDevice();
       ionic.Platform.ready(function () {
         constantConfig.uuid = window.cordova ? ionic.Platform.device().uuid : '7f4a6a40e5c87157';
       });
diff --git a/www/js/modules/config/config.js b/www/js/modules/config/config.js
index 0b33459e120379f0bd5955887d9b35fce73d51d4..c7b191e82e2d5dd388147eba73e36f2a6e995773 100644
--- a/www/js/modules/config/config.js
+++ b/www/js/modules/config/config.js
@@ -25,7 +25,7 @@
           'sound': true
         },
         'android': {
-          'iconColor': '#343434'
+          'iconColor': '#000000'
         }
       }
     }
diff --git a/www/js/modules/facebook-analytics/service.js b/www/js/modules/facebook-analytics/service.js
new file mode 100644
index 0000000000000000000000000000000000000000..2e28223c7acf495245115befc574330c60c3e2d7
--- /dev/null
+++ b/www/js/modules/facebook-analytics/service.js
@@ -0,0 +1,25 @@
+(function (angular) {
+    "use strict";
+    /**
+     * @ngdoc service
+     * @name starter.FacebookAnalyticsService
+     *
+     * @description
+     *
+     * A service for log events on Facebook Analytics.
+     *
+     * @ngInject
+     */
+    function FacebookAnalyticsService($http, constantConfig) {
+        var service = {
+            
+        };
+
+        return service;
+
+      }
+
+    angular.module('starter')
+        .service('FacebookAnalyticsService', FacebookAnalyticsService)
+    ;
+})(angular);
diff --git a/www/js/modules/notification/service.js b/www/js/modules/notification/service.js
index b590f85f879758f1072768b5b59d18e4e8a6f099..4f05b913bf5ed5005c724293ab2471932a31d1b5 100644
--- a/www/js/modules/notification/service.js
+++ b/www/js/modules/notification/service.js
@@ -30,6 +30,8 @@
                   deviceData = Object.assign(device, {'locale': locale, 'token': token});
                   tokenAlreadyCreated = true;
                 }, function (error) {
+                  console.log(error);
+                  debugger;
                   deviceData = Object.assign(device, {'locale': locale, 'token': 'tokenCannotBeCreated'});
                 });
 
@@ -37,6 +39,8 @@
                   window.FirebasePlugin.onTokenRefresh(function (token) {
                     deviceData = Object.assign(device, {'locale': locale, 'token': token});
                   }, function (error) {
+                    console.log(error);
+                    debugger;
                     deviceData = Object.assign(device, {'locale': locale, 'token': 'tokenCannotBeCreated'});
                   });
                 }
diff --git a/www/js/pages/football/controller.js b/www/js/pages/football/controller.js
index bcaf53135584be944d7f085b256d9ef55eae1700..ad90608d7ffc78d669413f154b0a20493d336662 100644
--- a/www/js/pages/football/controller.js
+++ b/www/js/pages/football/controller.js
@@ -21,6 +21,7 @@
     $q,
     $ionicLoading,
     PurchaseService,
+    NotificationService,
     constantConfig,
     purchaseConfig,
     ToastService
@@ -249,6 +250,8 @@
         showBackdrop: true
       });
 
+      NotificationService.registerDevice();
+
       self.uuid = window.cordova ? ionic.Platform.device().uuid : '7f4a6a40e5c87157';
 
       var freePredictionsPromise = $http.get(constantConfig.apiUrl + 'predictions/football/free');