diff --git a/README.md b/README.md
index 51e15d2..99be7e8 100644
--- a/README.md
+++ b/README.md
@@ -26,11 +26,11 @@ You can start your new cordova project perfectly with this template.
 
 This template uses:
 * [Framework7 4](https://framework7.io)
-* [Vuejs 2](https://vuejs.org/)
+* [Vue 2](https://vuejs.org/)
 * [Vuex](https://github.com/vuejs/vuex)
 * [Webpack 4](https://webpack.github.io/)
 * [Cordova](https://cordova.apache.org/)
-* [FontAwesome](http://fontawesome.io/)
+* [FontAwesome 5](http://fontawesome.io/)
 * [Babel Loader 7](https://github.com/babel/babel-loader)
 
 
diff --git a/package.json b/package.json
index 58ab27d..44e7e87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-template-framework7-vue-webpack",
-  "version": "2.3.8",
+  "version": "2.3.9",
   "description": "Cordova template with framework7, vue 2 and webpack 2.",
   "main": "index.js",
   "scripts": {
diff --git a/template_src/.jshintrc b/template_src/.jshintrc
new file mode 100644
index 0000000..8ab3485
--- /dev/null
+++ b/template_src/.jshintrc
@@ -0,0 +1,3 @@
+{
+    "esversion": 6
+}
\ No newline at end of file
diff --git a/template_src/package.json b/template_src/package.json
index 083ec2b..5a4ecff 100644
--- a/template_src/package.json
+++ b/template_src/package.json
@@ -15,8 +15,8 @@
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.6.1",
-    "cheerio": "^1.0.0-rc.2",
-    "chokidar": "^2.1.5",
+    "cheerio": "^1.0.0-rc.3",
+    "chokidar": "^3.0.0",
     "clean-webpack-plugin": "^1.0.0",
     "css-loader": "^2.1.1",
     "current-device": "^0.8.0",
@@ -25,33 +25,33 @@
     "file-loader": "^3.0.1",
     "html-loader": "^0.5.1",
     "html-webpack-plugin": "^3.2.0",
-    "node-sass": "^4.5.0",
+    "node-sass": "^4.12.0",
     "path": "^0.12.7",
     "sass-loader": "^7.1.0",
     "style-loader": "^0.23.1",
     "svg-url-loader": "^2.0.2",
-    "uglify-js": "^3.5.3",
-    "uglifyjs-webpack-plugin": "^2.0.1",
+    "uglify-js": "^3.5.13",
+    "uglifyjs-webpack-plugin": "^2.1.3",
     "url-loader": "^1.1.2",
     "vue-hot-reload-api": "^2.0.11",
     "vue-html-loader": "^1.2.4",
     "vue-loader": "^15.4.2",
     "vue-style-loader": "^4.1.2",
     "vue-template-compiler": "^2.6.10",
-    "webpack": "^4.20.2",
-    "webpack-cli": "^3.3.0",
-    "webpack-dev-server": "^3.1.9",
+    "webpack": "^4.31.0",
+    "webpack-cli": "^3.3.2",
+    "webpack-dev-server": "^3.4.1",
     "webpack-merge": "^4.2.1"
   },
   "dependencies": {
-    "font-awesome": "^4.7.0",
-    "framework7": "^4.2.0",
-    "framework7-icons": "^2.3.0",
-    "framework7-vue": "^4.2.0",
+    "@fortawesome/fontawesome-free": "^5.8.2",
+    "framework7": "^4.4.0",
+    "framework7-icons": "^2.3.1",
+    "framework7-vue": "^4.4.0",
     "loglevel": "^1.4.1",
     "material-design-icons": "^3.0.1",
     "vue": "^2.6.10",
-    "vuex": "^3.1.0",
+    "vuex": "^3.1.1",
     "fastclick": "^1.0.6"
   }
 }
diff --git a/template_src/src/assets/vue/pages/home.vue b/template_src/src/assets/vue/pages/home.vue
index 3218052..7c195fc 100644
--- a/template_src/src/assets/vue/pages/home.vue
+++ b/template_src/src/assets/vue/pages/home.vue
@@ -2,17 +2,17 @@
     <f7-page>
         <f7-navbar>
             <f7-nav-left>
-                <f7-link class="panel-open" open-panel="left" icon="fa fa-bars"></f7-link>
+                <f7-link class="panel-open" open-panel="left" icon="fas fa-bars"></f7-link>
             </f7-nav-left>
             <div class="title">Framework7-Vue</div>
             <f7-nav-right>
-                <f7-link class="searchbar-enable" data-searchbar=".searchbar-components" icon="fa fa-search"></f7-link>
+                <f7-link class="searchbar-enable" data-searchbar=".searchbar-components" icon="fas fa-search"></f7-link>
             </f7-nav-right>
             <f7-searchbar class="searchbar-components" search-container=".components-list" search-in="a" expandable></f7-searchbar>
         </f7-navbar>
         <f7-block-title>Introduction</f7-block-title>
         <f7-block inner>
-            <p>This is template for Framework7 v2, Vue and Phonegap.</p>
+            <p>This is template for Framework7 v4, Vue and Phonegap.</p>
         </f7-block>
         <f7-block-title class="searchbar-found">Links</f7-block-title>
         <f7-list class="components-list searchbar-found">
@@ -20,16 +20,16 @@
                 <f7-icon slot="media" ios="f7:info" md="material:info"></f7-icon>
             </f7-list-item>
             <f7-list-item link="/form/" title="Form" panel-close>
-                <f7-icon slot="media" icon="fa fa-vcard-o fa-fw"></f7-icon>
+                <f7-icon slot="media" icon="fas fa-id-card-alt fa-fw"></f7-icon>
             </f7-list-item>
             <f7-list-item link="/dynamic-route/blog/11/post/23/" title="Dynamic Route" panel-close>
-                <f7-icon slot="media" icon="fa fa-rss fa-fw"></f7-icon>
+                <f7-icon slot="media" icon="fas fa-rss fa-fw"></f7-icon>
             </f7-list-item>
             <f7-list-item link="/chat/" title="Chat" panel-close>
-                <f7-icon slot="media" icon="fa fa-user fa-fw"></f7-icon>
+                <f7-icon slot="media" icon="fas fa-user fa-fw"></f7-icon>
             </f7-list-item>
             <f7-list-item link="/vuex/" title="Vuex" panel-close>
-                <f7-icon slot="media" icon="fa fa-battery fa-fw"></f7-icon>
+                <f7-icon slot="media" icon="fas fa-battery-empty fa-fw"></f7-icon>
             </f7-list-item>
         </f7-list>
         <f7-list class="searchbar-not-found">
diff --git a/template_src/src/assets/vue/pages/vuex.vue b/template_src/src/assets/vue/pages/vuex.vue
index a136b3e..f682c1d 100644
--- a/template_src/src/assets/vue/pages/vuex.vue
+++ b/template_src/src/assets/vue/pages/vuex.vue
@@ -14,7 +14,7 @@
   </f7-page>
 </template>
 <script>
-	import { mapState, mapActions } from 'vuex'
+	import { mapState, mapActions } from 'vuex';
 	import { f7Page, f7Navbar, f7BlockTitle, f7List, f7ListGroup, f7ListItem, f7ListButton } from "framework7-vue";
 
   export default {
diff --git a/template_src/src/assets/vuex/storage.js b/template_src/src/assets/vuex/storage.js
index 0a987e6..c700e09 100644
--- a/template_src/src/assets/vuex/storage.js
+++ b/template_src/src/assets/vuex/storage.js
@@ -1,5 +1,5 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
+import Vue from 'vue';
+import Vuex from 'vuex';
 
 Vue.use(Vuex);
 
@@ -10,13 +10,13 @@ export default new Vuex.Store({
 
   actions: {
     userLogged ({commit}, user) {
-      commit('USER_LOGGED', user)
+      commit('USER_LOGGED', user);
     }
   },
 
   mutations: {
     USER_LOGGED (state, user) {
-      state.user = user
+      state.user = user;
     }
   },
 });
\ No newline at end of file
diff --git a/template_src/src/main.js b/template_src/src/main.js
index bb50653..67eaeac 100644
--- a/template_src/src/main.js
+++ b/template_src/src/main.js
@@ -1,5 +1,5 @@
 // Import Vue
-import Vue from 'vue'
+import Vue from 'vue';
 
 // Import Framework7
 import Framework7 from 'framework7/framework7.esm.bundle';
@@ -8,16 +8,16 @@ import Framework7 from 'framework7/framework7.esm.bundle';
 import Framework7Vue from 'framework7-vue';
 
 // Import F7 Style
-import Framework7CSS from 'framework7/css/framework7.bundle.min.css'
+import Framework7CSS from 'framework7/css/framework7.bundle.min.css';
 
 // Import F7 iOS Icons
-import Framework7Icons from 'framework7-icons/css/framework7-icons.css'
+import Framework7Icons from 'framework7-icons/css/framework7-icons.css';
 
 // Import Material Icons
-import MaterialIcons from 'material-design-icons/iconfont/material-icons.css'
+import MaterialIcons from 'material-design-icons/iconfont/material-icons.css';
 
 // Import Fontawesome Theme Styles
-import FontAwesome from 'font-awesome/css/font-awesome.css'
+import FontAwesome from '@fortawesome/fontawesome-free/css/all.min.css';
 
 // Import fastClick
 import FastClick from 'fastclick';
@@ -26,15 +26,15 @@ import FastClick from 'fastclick';
 // import AppStyles from './assets/sass/main.scss'
 
 // Import App Component
-import app from './main.vue'
+import app from './main.vue';
 
 
 // Import Vuex Storage
-import store from './assets/vuex/storage.js'
+import store from './assets/vuex/storage.js';
 
 
 // Different F7-Vue plugin initialization with f7 v3.0
-Framework7.use(Framework7Vue)
+Framework7.use(Framework7Vue);
 
 
 // Init Vue App
@@ -50,6 +50,6 @@ export default new Vue({
     window.addEventListener('load', () => {
         // run after everything is in-place
         FastClick.attach(document.body);
-    })
+    });
   },
 });
\ No newline at end of file
diff --git a/template_src/src/main.vue b/template_src/src/main.vue
index 3e2ae00..7ab3f44 100644
--- a/template_src/src/main.vue
+++ b/template_src/src/main.vue
@@ -11,7 +11,7 @@
 <script>
 // Import Routes...
 import { f7App, f7Panel, f7View, f7Statusbar } from 'framework7-vue';
-import routes from './routes.js'
+import routes from './routes.js';
 
 let theme = 'auto';
 if (document.location.search.indexOf('theme=') >= 0) {
diff --git a/template_src/src/routes.js b/template_src/src/routes.js
index fb84a68..7c2e259 100644
--- a/template_src/src/routes.js
+++ b/template_src/src/routes.js
@@ -41,4 +41,4 @@ export default [
     path: '/vuex/',
     component: Vuex
   },
-]
+];
diff --git a/template_src/webpack.config.js b/template_src/webpack.config.js
index bdd65e6..1140615 100644
--- a/template_src/webpack.config.js
+++ b/template_src/webpack.config.js
@@ -1,9 +1,9 @@
 module.exports = function (env) {
-  if (typeof env === 'undefined' || typeof env.devserver === 'undefined') {
+  if (typeof env === 'undefined') {
     return require('./config/webpack.dev')();
   } else if (typeof env.devserver !== 'undefined' && env.devserver) {
     return require('./config/webpack.server')();
-  } else if (typeof env.release !== 'undefined' && env.release) { 
+  } else if (typeof env.release !== 'undefined' && env.release) {
     return require('./config/webpack.release')();
   }
 };
\ No newline at end of file