diff --git a/src/App.vue b/src/App.vue
index 116fda96..ff4f9d4b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
-	<main :class="`${telemetry.game && telemetry.game.game.id === 2 ? 'ats' : 'ets2'}`">
-		<b-overlay :show="!gameConnected" :variant="'dark'" no-wrap>
+  <main :class="`${telemetry.game && telemetry.game.game.id === 2 ? 'ats' : 'ets2'}`">
+    <b-overlay :show="!gameConnected" :variant="'dark'" no-wrap>
       <template v-slot:overlay>
         <div class="d-flex justify-content-center flex-column align-items-center">
           <transition mode="out-in" name="slide-fade">
@@ -21,7 +21,9 @@
     <div class="wrapper menu h-100" v-if="gameConnected" v-show="menuIsDisplayed">
       <Menu></Menu>
     </div>
-    <component v-bind:is="currentSkinComponent()" v-if="gameConnected" v-show="!menuIsDisplayed"></component>
+    <keep-alive>
+      <component v-bind:is="currentSkinComponent()" v-if="gameConnected" v-show="!menuIsDisplayed"></component>
+    </keep-alive>
     <!--<Events id="events" v-bind="{log}" />-->
     <!--<Controls id="controls" v-bind="{...controls, transmission: truck.transmission}" />-->
   </main>
@@ -57,60 +59,60 @@ export default {
     DashManTGX,
     DashMercedesAtego,
     DashRdInfo,
-			DashScania,
-			DashVolvoFH,
-			Game,
-			Menu,
-			OverlayElement
-		},
-
-		mixins: [ AppDashMixins ],
-
-		data() {
-			return {
-				launching: {
-					icon:    '<i class="fas fa-box"></i>',
-					text:    'App ready !',
-					subText: 'Starting delivering'
-				}
-			};
-		},
-
-		created() {
-			//console.log( this );
-			this.$store.dispatch( 'skins/setFirstActive' );
-			this.$store.dispatch( 'config/load' );
-
-			/*// Game connected
-			 setTimeout(()=> {
-			 this.launching = {
-			 icon: '<i class="fas fa-truck-loading"></i>',
-			 text: 'Game connected',
-			 subText: 'Delivering'
-			 }
-			 }, 6000);
-
-			 // After game connected + 3s
-			 setTimeout(()=> {
-			 this.launching = {
-			 icon: '<i class="fas fa-box-open"></i>',
-			 text: 'Finished',
-			 subText: 'Delivered'
-			 }
-			 }, 9000);*/
-		},
-
-		methods: {
-			currentSkinComponent() {
-        const currentSkin = this.currentSkin; //this.$store.getters[ 'skins/current' ];
-
-        if ( currentSkin === undefined || currentSkin === null )
-          return null;
-
-        return 'Dash' + currentSkin.id;
+    DashScania,
+    DashVolvoFH,
+    Game,
+    Menu,
+    OverlayElement
+  },
+
+  mixins: [ AppDashMixins ],
+
+  data() {
+    return {
+      launching: {
+        icon:    '<i class="fas fa-box"></i>',
+        text:    'App ready !',
+        subText: 'Starting delivering'
       }
-		},
-  computed:  {
+    };
+  },
+
+  created() {
+    //console.log( 'Vue env: ', process.env );
+    this.$store.dispatch( 'skins/setFirstActive' );
+    this.$store.dispatch( 'config/load' );
+
+    /*// Game connected
+     setTimeout(()=> {
+     this.launching = {
+     icon: '<i class="fas fa-truck-loading"></i>',
+     text: 'Game connected',
+     subText: 'Delivering'
+     }
+     }, 6000);
+
+     // After game connected + 3s
+     setTimeout(()=> {
+     this.launching = {
+     icon: '<i class="fas fa-box-open"></i>',
+     text: 'Finished',
+     subText: 'Delivered'
+     }
+     }, 9000);*/
+  },
+
+  methods:  {
+    currentSkinComponent() {
+      const currentSkin = this.currentSkin; //this.$store.getters[ 'skins/current' ];
+
+      if ( currentSkin === undefined || currentSkin === null )
+        return null;
+
+      return 'Dash' + currentSkin.id;
+    }
+  },
+  computed: {
     gameConnected() {
       const gameReady = this.telemetry.game !== null &&
                         (typeof this.telemetry.game
@@ -127,8 +129,8 @@ export default {
       currentSkin:     'skins/current'
     } )
   },
-  sockets:   {
-    connect:   function () {
+  sockets:  {
+    connect: function () {
       console.log( 'connected' );
       this.launching = {
         icon:    '<i class="fas fa-truck"></i>',
@@ -136,43 +138,43 @@ export default {
         subText: 'Ready to delivering'
       };
     },
-    update:    function ( data ) {
-				let srvData = {};
-
-				for ( const key of Object.keys( data ) ) {
-					srvData[ key ] = data[ key ];
-				}
-
-				this.$store.commit( 'telemetry/update', srvData );
-			},
-			log:     function ( log ) {
-				/*log.reverse();
-				 this.log = log;*/
-
-				//console.log( 'Log---', log );
-				/*switch ( log.eventName ) {
-         case 'game.connected':
-         this.launching = {
-         icon:    '<i class="fas fa-truck-loading"></i>',
-         text:    'Game connected',
-         subText: 'Delivering. Waiting you on road !'
-         };
-         break;
-         }*/
-        const event = _event.filterInputEvent( log );
-
-        if ( event !== false ) {
-          //console.log( log );
-          this.$store.dispatch( 'events/emitEvent', {
-            eventName: event.eventName,
-            rawData:   event.rawData
-          } );
-        }
+    update:  function ( data ) {
+      let srvData = {};
+
+      for ( const key of Object.keys( data ) ) {
+        srvData[ key ] = data[ key ];
+      }
+
+      this.$store.commit( 'telemetry/update', srvData );
+    },
+    log:     function ( log ) {
+      /*log.reverse();
+       this.log = log;*/
+
+      //console.log( 'Log---', log );
+      /*switch ( log.eventName ) {
+       case 'game.connected':
+       this.launching = {
+       icon:    '<i class="fas fa-truck-loading"></i>',
+       text:    'Game connected',
+       subText: 'Delivering. Waiting you on road !'
+       };
+       break;
+       }*/
+      const event = _event.filterInputEvent( log );
+
+      if ( event !== false ) {
+        //console.log( log );
+        this.$store.dispatch( 'events/emitEvent', {
+          eventName: event.eventName,
+          rawData:   event.rawData
+        } );
       }
-		}
-	};
+    }
+  }
+};
 </script>
 
 <style lang="scss">
-	@import "assets/scss/app/app";
+@import "assets/scss/app/app";
 </style>
diff --git a/src/components/Menu/tabs/Elements/TabConfigElement.vue b/src/components/Menu/tabs/Elements/TabConfigElement.vue
index a7df8bae..79693c1a 100644
--- a/src/components/Menu/tabs/Elements/TabConfigElement.vue
+++ b/src/components/Menu/tabs/Elements/TabConfigElement.vue
@@ -1,20 +1,22 @@
 <template>
 	<div class="field d-flex justify-content-between align-items-center" v-if="elm.disabled === undefined || ( elm.disabled !== undefined && !elm.disabled )">
-		<div>
-			<h5 class="m-0">{{ elm.label }}</h5>
-			<small class="font-italic text-muted">{{ elm.description }}</small>
-		</div>
-		<div class="switch d-flex justify-content-between align-items-stretch" v-if="elm.values.length <= 2" :class="{ 'processing': appGetProcessing() }">
-			<div :class="{ 'active': current( elm.id ) === value.value }" :key="value.value" @click="set( value.value )" class="value w-100 m-0 text-center d-flex justify-content-center align-items-center" v-for="value in elm.values">
-				<span class="py-1 px-2">{{ value.label }}</span>
-			</div>
-		</div>
-		<div class="select d-flex justify-content-between align-items-stretch" v-else-if="elm.values.length > 2" :class="{ 'processing': appGetProcessing() }">
-			<select :disabled="appGetProcessing()" :multiple="elm.multiple !== undefined && elm.multiple" @change="set( current( elm.id ) )" class="custom-select value w-100 m-0 py-1 px-2">
-				<option :key="value.value" :selected="current( elm.id ) === value.value" :value="value.value" v-for="value in elm.values">{{ value.label }}</option>
-			</select>
-		</div>
-	</div>
+    <div>
+      <h5 class="m-0">{{ elm.label }}</h5>
+      <small class="font-italic text-muted">{{ elm.description }}</small>
+    </div>
+    <div class="switch d-flex justify-content-between align-items-stretch" v-if="elm.values.length <= 2" :class="{ 'processing': appGetProcessing }">
+      <div :class="{ 'active': current( elm.id ) === value.value }" :key="value.value" @click="set( value.value )" class="value w-100 m-0 text-center d-flex justify-content-center align-items-center" v-for="value in elm.values">
+        <span class="py-1 px-2">{{ value.label }}</span>
+      </div>
+    </div>
+    <div class="select d-flex justify-content-between align-items-stretch" v-else-if="elm.values.length > 2" :class="{ 'processing': appGetProcessing }">
+      <select :disabled="appGetProcessing" :multiple="elm.multiple !== undefined && elm.multiple" @change="set( current( elm.id ) )" class="custom-select value w-100 m-0 py-1 px-2">
+        <option :key="value.value" :selected="current( elm.id ) === value.value" :value="value.value" v-for="value in elm.values">
+          {{ value.label }}
+        </option>
+      </select>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -28,19 +30,17 @@
 		},
 		computed: {
 			...mapGetters( {
-				current: 'config/get'
-			} )
+        current:          'config/get',
+        appGetProcessing: 'app/getProcessing'
+      } )
 		},
 		methods:  {
 			set( value ) {
-				this.$store.commit( 'config/setElm', {
-					id:    this.elm.id,
-					value: value
-				} );
-			},
-			...mapGetters( {
-				appGetProcessing: 'app/getProcessing'
-			} )
+        this.$store.commit( 'config/setElm', {
+          id:    this.elm.id,
+          value: value
+        } );
+      }
 		}
 	};
 </script>
diff --git a/src/components/Menu/tabs/TabConfig.vue b/src/components/Menu/tabs/TabConfig.vue
index af624df1..9cdebbda 100644
--- a/src/components/Menu/tabs/TabConfig.vue
+++ b/src/components/Menu/tabs/TabConfig.vue
@@ -1,20 +1,20 @@
 <template>
 	<div class="tab-config">
 		<div class="d-flex justify-content-center align-items-center pb-3">
-			<!--<button :disabled="isOnProcessing()" @click="save" class="btn btn-sm btn-outline-ets mx-1">
-				<b-icon-file-earmark-check></b-icon-file-earmark-check>
-				Save
-			</button>-->
-			<button :disabled="isOnProcessing()" @click="download" class="btn btn-sm btn-outline-ets mx-1">
-				<b-icon-file-earmark-arrow-down></b-icon-file-earmark-arrow-down>
-				Download
-			</button>
-			<!--<button :disabled="isOnProcessing()" @click="reset" class="btn btn-sm btn-outline-ets mx-1">
-				<b-icon-file-earmark-break></b-icon-file-earmark-break>
-				Reset
-			</button>-->
-			<span>
-				<button :disabled="isOnProcessing()" @click="showUpload = !showUpload" class="btn btn-sm btn-outline-ets mx-1">
+      <!--<button :disabled="isOnProcessing" @click="save" class="btn btn-sm btn-outline-ets mx-1">
+        <b-icon-file-earmark-check></b-icon-file-earmark-check>
+        Save
+      </button>-->
+      <button :disabled="isOnProcessing" @click="download" class="btn btn-sm btn-outline-ets mx-1">
+        <b-icon-file-earmark-arrow-down></b-icon-file-earmark-arrow-down>
+        Download
+      </button>
+      <!--<button :disabled="isOnProcessing" @click="reset" class="btn btn-sm btn-outline-ets mx-1">
+        <b-icon-file-earmark-break></b-icon-file-earmark-break>
+        Reset
+      </button>-->
+      <span>
+				<button :disabled="isOnProcessing" @click="showUpload = !showUpload" class="btn btn-sm btn-outline-ets mx-1">
 					<b-icon-file-earmark-arrow-up></b-icon-file-earmark-arrow-up> Upload
 				</button>
 				<input @change="upload" accept="application/json" class="btn btn-sm btn-outline-ets mx-1" type="file" v-show="showUpload" ref="uploadFile" />
@@ -85,8 +85,9 @@
 		},
 		computed:   {
 			...mapGetters( {
-				configAll: 'config/all'
-			} )
+        configAll:      'config/all',
+        isOnProcessing: 'app/isOnProcessing'
+      } )
 		},
 		methods:    {
 			skinsConfigTemplate( skinTarget ) {
@@ -117,20 +118,17 @@
 								title:   'Upload failed',
 								message: e
 							},
-							details: {
-								message: e,
-								code:    '#CONFIG_UPLOAD_FAILED'
-							}
-						} );
-					} )
-					.finally( () => {
-						this.$refs.uploadFile.value = null;
-						this.showUpload             = false;
-					} );
-			},
-			...mapGetters( {
-				isOnProcessing: 'app/isOnProcessing'
-			} )
+              details: {
+                message: e,
+                code:    '#CONFIG_UPLOAD_FAILED'
+              }
+            } );
+          } )
+          .finally( () => {
+            this.$refs.uploadFile.value = null;
+            this.showUpload             = false;
+          } );
+      }
 		}
 	};
 </script>
diff --git a/src/components/Zone/Game/Game.vue b/src/components/Zone/Game/Game.vue
index efb49311..e323a5cc 100644
--- a/src/components/Zone/Game/Game.vue
+++ b/src/components/Zone/Game/Game.vue
@@ -9,21 +9,21 @@
 			<span>{{ $gameTime() | $dateTimeLocalized( DATE_FORMAT_LONG, TIME_FORMAT_FULL ) }}</span>
 		</div>
 		<ul>
-			<li @click="onClickGear()">
+      <li @click="onClickGear()">
         <span v-show="!menuIsDisplayed">Menu <i class="fas fa-bars"></i>️</span>
         <span v-show="menuIsDisplayed">Close <i class="fas fa-times"></i>️</span>
       </li>
-			<li v-if="isOnDevEnvironment()">JAGFx - {{ getVersion() }}<span>&copy;</span></li>
-			<li v-else>
-				<select @change="onEventChange" v-model="event">
-					<option disabled selected value="">Select one</option>
-					<optgroup label="Game">
-						<!--						<option value="game.connected">Connected</option>-->
-						<!--						<option value="game.disconnected">Disconnected</option>-->
-						<option value="game.pause">Pause / Unpause</option>
-						<option value="game.fine">Fine</option>
-						<option value="game.tollgate">Toll gate</option>
-						<option value="game.ferry">Ferry</option>
+      <li v-if="!isOnDevEnvironment()">JAGFx - {{ getVersion() }}<span>&copy;</span></li>
+      <li v-else>
+        <select @change="onEventChange" v-model="event">
+          <option disabled selected value="">Select one</option>
+          <optgroup label="Game">
+            <!--						<option value="game.connected">Connected</option>-->
+            <!--						<option value="game.disconnected">Disconnected</option>-->
+            <option value="game.pause">Pause / Unpause</option>
+            <option value="game.fine">Fine</option>
+            <option value="game.tollgate">Toll gate</option>
+            <option value="game.ferry">Ferry</option>
 						<option value="game.train">Train</option>
 						<option value="game.refuel-payed">Refuel played</option>
 					</optgroup>
@@ -86,22 +86,24 @@
 				return utils.app.isOnDevEnvironment;
 			},
 			onEventChange() {
-				const spitedEvent = this.event.split( '.' );
-				let rawData       = scsSDKData.events[ spitedEvent[ 0 ] ][ spitedEvent[ 1 ] ];
-				
-				this.$store.dispatch( 'events/emitEvent', {
-					eventName: this.event,
-					rawData:   rawData
-				} );
-			},
-			onClickGear() {
-				this.$store.dispatch( 'menu/toggle' );
-			},
-			...mapGetters( {
-				menuIsDisplayed: 'menu/isDisplayed'
-			} )
-		}
-	};
+        const spitedEvent = this.event.split( '.' );
+        let rawData       = scsSDKData.events[ spitedEvent[ 0 ] ][ spitedEvent[ 1 ] ];
+
+        this.$store.dispatch( 'events/emitEvent', {
+          eventName: this.event,
+          rawData:   rawData
+        } );
+      },
+      onClickGear() {
+        this.$store.dispatch( 'menu/toggle' );
+      }
+    },
+    computed: {
+      ...mapGetters( {
+        menuIsDisplayed: 'menu/isDisplayed'
+      } )
+    }
+  };
 </script>
 
 <style scoped lang="scss">
diff --git a/src/main.js b/src/main.js
index c7f8abb3..953b4a52 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,19 +1,19 @@
 import { BootstrapVue, IconsPlugin } from 'bootstrap-vue';
 import Vue                           from 'vue';
-import VueSocketIO                   from 'vue-socket.io';
 import VueClipboard                  from 'vue-clipboard2';
+import VueSocketIO                   from 'vue-socket.io';
 import App                           from './App.vue';
 import store                         from './store';
 
+import '@fortawesome/fontawesome-free/css/all.min.css';
+import 'animate.css';
+import 'bootstrap-vue/dist/bootstrap-vue.css';
+import 'bootstrap/dist/js/bootstrap.bundle';
+
 window.$       = require( 'jquery' );
 window.JQuery  = require( 'jquery' );
 window.NoSleep = require( 'nosleep.js' );
 
-import 'bootstrap/dist/js/bootstrap.bundle';
-import 'animate.css';
-import '@fortawesome/fontawesome-free/css/all.min.css';
-import 'bootstrap-vue/dist/bootstrap-vue.css';
-
 Vue.use( BootstrapVue );
 Vue.use( IconsPlugin );
 Vue.use( VueClipboard );
diff --git a/src/store.plugin.js b/src/store.plugin.js
new file mode 100644
index 00000000..de8a95d2
--- /dev/null
+++ b/src/store.plugin.js
@@ -0,0 +1,16 @@
+/**
+ * @author:	Emmanuel SMITH <emmanuel.smith@live-session.fr>
+ * project:	customDefault
+ * file: 	index.plugin.js
+ * Date: 	07-Oct-20
+ * Time: 	19:10
+ */
+
+import store from './store';
+
+export default {
+	store,
+	install( Vue, options ) {
+		Vue.prototype.$storePlug = store;
+	}
+};
diff --git a/src/store/modules/_telemetry.js b/src/store/modules/_telemetry.js
index b61d56cb..a6204e60 100644
--- a/src/store/modules/_telemetry.js
+++ b/src/store/modules/_telemetry.js
@@ -6,7 +6,7 @@
  * Time: 	09:49
  */
 
-import _        from 'lodash';
+//import _        from 'lodash';
 import Vue      from 'vue';
 import testData from '../../data/scs_sdk_plugin_parsed_data.json';
 
@@ -55,7 +55,7 @@ const getters = {
 		
 		//console.log( elms, elmList, state.data );
 		
-		return _.pick( state.data, elmList );
+		//return _.pick( state.data, elmList );
 	}
 };