diff --git a/.env.development b/.env.development
index f2a9600..b6293bf 100644
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.0.55"
+APP_VERSION="0.0.57"
 APP_NAME="FreePlanet"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="1"
diff --git a/package.json b/package.json
index bc0b125..e88fde4 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "test:cover": "jest --coverage",
     "build": "quasar build -m pwa",
     "build:clean": "quasar clean",
-    "serve": "quasar serve ./dist/pwa-mat",
+    "serve": "quasar serve ./dist/pwa",
     "serve:coverage": "quasar serve test/coverage/lcov-report/ --cache 0 --port 8788",
     "deploy": "deploy.sh",
     "deploy_server_test": "NODE_ENV=test quasar build -m pwa",
@@ -129,4 +129,4 @@
     "last 2 versions",
     "not ie <= 10"
   ]
-}
\ No newline at end of file
+}
diff --git a/quasar.conf.js b/quasar.conf.js
index f79b710..d70875c 100644
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -207,6 +207,8 @@ module.exports = function (ctx) {
       // workboxPluginMode: 'GenerateSW',
       workboxPluginMode: 'InjectManifest',
       workboxOptions: {
+        skipWaiting: true,
+        clientsClaim: true
         // swSrc: 'src/sw.js',
       },
       manifest: {
diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js
index b1c5a73..de17839 100644
--- a/src-pwa/custom-service-worker.js
+++ b/src-pwa/custom-service-worker.js
@@ -81,7 +81,7 @@ if (workbox) {
 
   workbox.routing.registerRoute(
     new RegExp(/\.(?:png|gif|jpg|jpeg|svg)$/),
-    workbox.strategies.staleWhileRevalidate({
+    workbox.strategies.CacheFirst({
       cacheName: 'images',
       plugins: [
         new workbox.expiration.Plugin({
@@ -92,6 +92,22 @@ if (workbox) {
     }),
   );
 
+
+  // Per Articoli....
+  const articleHandler = workbox.strategies.networkFirst({
+    cacheName: 'articles-cache',
+    plugins: [
+      new workbox.expiration.Plugin({
+        maxEntries: 50,
+      })
+    ]
+  });
+
+  workbox.routing.registerRoute(/(.*)article(.*)\.html/, args => {
+    return articleHandler.handle(args);
+  });
+
+
   workbox.routing.registerRoute(
     new RegExp(/.*(?:googleapis|gstatic)\.com.*$/),
     workbox.strategies.staleWhileRevalidate({
@@ -218,18 +234,13 @@ if (workbox) {
   );
 
   workbox.routing.registerRoute(
-    new RegExp(/.*\/(?:css|font).*/),
-    workbox.strategies.cacheFirst({
-      cacheName: 'css-fonts',
-      plugins: [
-        new workbox.expiration.Plugin({
-          maxAgeSeconds: 30 * 24 * 60 * 60,
-        }),
-      ]
-    })
+    new RegExp(/\.(?:js|css|font)$/),
+    new workbox.strategies.StaleWhileRevalidate( {
+      cacheName: 'js-css-fonts',
+    }),
   );
 
-
+/*
   workbox.routing.registerRoute(
     new RegExp('https://cdnjs.coudflare.com/ajax/libs/material-design-lite/1.3.0/material.indigo-pink.min.css'),
     workbox.strategies.staleWhileRevalidate({
@@ -241,6 +252,7 @@ if (workbox) {
       ]
     })
   );
+*/
 
 // Storage
   workbox.routing.registerRoute(
@@ -270,6 +282,7 @@ if (workbox) {
     })
   );
 
+/*
   workbox.routing.registerRoute(
     new RegExp(/^http/),
     workbox.strategies.networkFirst({
@@ -282,6 +295,7 @@ if (workbox) {
       ]
     })
   );
+*/
 
 
   workbox.routing.registerRoute(
diff --git a/src/globalroutines/util.ts b/src/globalroutines/util.ts
index 565e4c5..5acca29 100644
--- a/src/globalroutines/util.ts
+++ b/src/globalroutines/util.ts
@@ -1,15 +1,15 @@
-import { UserStore } from "../store/Modules";
-import messages from "../statics/i18n";
+import { UserStore } from '../store/Modules'
+import messages from '../statics/i18n'
 
 function translate(params) {
-  let msg = params.split('.')
-  let lang = UserStore.state.lang
+  const msg = params.split('.')
+  const lang = UserStore.state.lang
 
-  let stringa = messages[lang]
+  const stringa = messages[lang]
 
   let ris = stringa
   if (ris !== undefined) {
-    msg.forEach(param => {
+    msg.forEach((param) => {
       ris = ris[param]
     })
   } else {
diff --git a/src/statics/js/track.js b/src/statics/js/track.js
index 0e7838c..7f5bd2c 100644
--- a/src/statics/js/track.js
+++ b/src/statics/js/track.js
@@ -30,7 +30,7 @@ else
   var owa_cmds = owa_cmds || [];
 owa_cmds.push(['setSiteId', getidtrack()]);
 owa_cmds.push(['trackPageView']);
-owa_cmds.push(['trackClicks']);
+// owa_cmds.push(['trackClicks']);
 
 (function () {
   var _owa = document.createElement('script');
diff --git a/workbox-config.js b/workbox-config.js
index c10c1e4..cc2b68e 100644
--- a/workbox-config.js
+++ b/workbox-config.js
@@ -1,11 +1,11 @@
 module.exports = {
-  "globDirectory": "dist/pwa-mat/",
+  "globDirectory": "dist/pwa/",
   "globPatterns": [
     "**/*.{css,woff2,woff,svg,html,js,json,ico}"
     // "src/images/*.{jpg,png}"
   ],
-  // "swSrc": "dist/pwa-mat/src-sw.js",
-  "swDest": "dist/pwa-mat/service-worker.js",
+  // "swSrc": "dist/pwa/src-sw.js",
+  "swDest": "dist/pwa/service-worker.js",
   "globIgnores": [
     "../workbox-config.js",
     "help/**"