diff --git a/Gruntfile.js b/Gruntfile.js
index 76ec640..9e73fde 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -77,6 +77,14 @@ module.exports = function (grunt) {
                         directory: 'classes/,controllers/,tests/'
                     }
                 }
+            },
+            jsonlint: {
+                manifests: {
+                    src: '*.json',
+                    options: {
+                        format: true
+                    }
+                }
             }
         }
     );
@@ -90,9 +98,10 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-compress');
     grunt.loadNpmTasks('grunt-jslint');
     grunt.loadNpmTasks('grunt-phpdocumentor');
+    grunt.loadNpmTasks('grunt-jsonlint');
 
     grunt.registerTask('default', ['uglify', 'cssmin']);
-    grunt.registerTask('lint', ['phpcs', 'jslint']);
+    grunt.registerTask('lint', ['phpcs', 'jslint', 'jsonlint']);
     grunt.registerTask('test', ['phpunit']);
     grunt.registerTask('doc', ['phpdocumentor']);
     grunt.registerTask('release', ['default', 'githash', 'compress']);
diff --git a/bower.json b/bower.json
index f367807..8c7ffdb 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
-    "name": "alltube",
-    "dependencies": {
-        "opensans-googlefont": "*"
-    }
+  "name": "alltube",
+  "dependencies": {
+    "opensans-googlefont": "*"
+  }
 }
diff --git a/composer.json b/composer.json
index 86d07f7..c2884a9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,76 +1,82 @@
 {
-	"name": "rudloff/alltube",
-	"description": "HTML GUI for youtube-dl",
-	"license": "GPL-3.0",
-	"homepage": "http://alltubedownload.net/",
-	"type": "project",
-	"require": {
-		"smarty/smarty": "~3.1.29",
-		"rg3/youtube-dl": "~2016.08.12",
-		"slim/slim": "~3.5.0",
-		"mathmarques/smarty-view": "~1.1.0",
-		"symfony/yaml": "~3.1.0",
-		"symfony/process": "~3.1.0",
-		"ptachoire/process-builder-chain": "~1.2.0",
-		"ffmpeg/ffmpeg": "dev-release",
-		"rudloff/smarty-plugin-noscheme": "~0.1.0",
-		"rudloff/rtmpdump-bin": "~2.3"
-	},
-	"require-dev": {
-		"symfony/var-dumper": "~3.1.0",
-		"squizlabs/php_codesniffer": "~2.6.2",
-		"phpunit/phpunit": "~5.5.2"
-	},
-	"extra": {
-		"paas": {
-			"nginx-includes": [
-				"nginx.conf"
-			]
-		}
-	},
-	"repositories": [{
-		"type": "package",
-		"package": {
-			"name": "rg3/youtube-dl",
-			"version": "2016.08.12",
-			"source": {
-				"url": "https://github.com/rg3/youtube-dl.git",
-				"type": "git",
-				"reference": "2016.08.12"
-			}
-		}
-	}, {
-		"type": "package",
-		"package": {
-			"name": "ffmpeg/ffmpeg",
-			"version": "dev-release",
-			"dist": {
-				"url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
-				"type": "xz"
-			},
-			"bin": [
-				"ffmpeg"
-			]
-		}
-	}],
-	"authors": [{
-		"name": "Pierre Rudloff",
-		"email": "contact@rudloff.pro",
-		"homepage": "https://rudloff.pro/",
-		"role": "Developer"
-	}, {
-		"name": "Olivier Haquette",
-		"email": "contact@olivierhaquette.fr",
-		"homepage": "http://olivierhaquette.fr/",
-		"role": "Designer"
-	}],
-	"autoload": {
-		"psr-4": {
-			"Alltube\\": "classes/",
-			"Alltube\\Controller\\": "controllers/"
-		}
-	},
-	"config": {
-		"secure-http": false
-	}
+  "name": "rudloff/alltube",
+  "description": "HTML GUI for youtube-dl",
+  "license": "GPL-3.0",
+  "homepage": "http://alltubedownload.net/",
+  "type": "project",
+  "require": {
+    "smarty/smarty": "~3.1.29",
+    "rg3/youtube-dl": "~2016.08.12",
+    "slim/slim": "~3.5.0",
+    "mathmarques/smarty-view": "~1.1.0",
+    "symfony/yaml": "~3.1.0",
+    "symfony/process": "~3.1.0",
+    "ptachoire/process-builder-chain": "~1.2.0",
+    "ffmpeg/ffmpeg": "dev-release",
+    "rudloff/smarty-plugin-noscheme": "~0.1.0",
+    "rudloff/rtmpdump-bin": "~2.3"
+  },
+  "require-dev": {
+    "symfony/var-dumper": "~3.1.0",
+    "squizlabs/php_codesniffer": "~2.6.2",
+    "phpunit/phpunit": "~5.5.2"
+  },
+  "extra": {
+    "paas": {
+      "nginx-includes": [
+        "nginx.conf"
+      ]
+    }
+  },
+  "repositories": [
+    {
+      "type": "package",
+      "package": {
+        "name": "rg3/youtube-dl",
+        "version": "2016.08.12",
+        "source": {
+          "url": "https://github.com/rg3/youtube-dl.git",
+          "type": "git",
+          "reference": "2016.08.12"
+        }
+      }
+    },
+    {
+      "type": "package",
+      "package": {
+        "name": "ffmpeg/ffmpeg",
+        "version": "dev-release",
+        "dist": {
+          "url": "http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz",
+          "type": "xz"
+        },
+        "bin": [
+          "ffmpeg"
+        ]
+      }
+    }
+  ],
+  "authors": [
+    {
+      "name": "Pierre Rudloff",
+      "email": "contact@rudloff.pro",
+      "homepage": "https://rudloff.pro/",
+      "role": "Developer"
+    },
+    {
+      "name": "Olivier Haquette",
+      "email": "contact@olivierhaquette.fr",
+      "homepage": "http://olivierhaquette.fr/",
+      "role": "Designer"
+    }
+  ],
+  "autoload": {
+    "psr-4": {
+      "Alltube\\": "classes/",
+      "Alltube\\Controller\\": "controllers/"
+    }
+  },
+  "config": {
+    "secure-http": false
+  }
 }
diff --git a/composer.lock b/composer.lock
index e3e9f9c..965e802 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "9c4657008fcebce7e45807ae0dc59d30",
+    "hash": "85ec531cf9a73084ab531e5b781f8844",
     "content-hash": "054a8bdbb08cfac744d4b28965fb6f17",
     "packages": [
         {
diff --git a/manifest.json b/manifest.json
index 9f08114..0c4b662 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,31 +1,37 @@
 {
-	"short_name": "AllTube",
-	"name": "AllTube Download",
-	"description": "Easily download videos from Youtube, Dailymotion, Vimeo and other websites",
-	"display": "standalone",
-	"icons": [{
-		"src": "img/favicon.png",
-		"sizes": "32x32",
-		"type": "image/png"
-	}, {
-		"src": "img/logo_60.png",
-		"sizes": "60x60",
-		"type": "image/png"
-	}, {
-		"src": "img/logo_90.png",
-		"sizes": "90x60",
-		"type": "image/png"
-	}, {
-		"src": "img/logo_app.png",
-		"sizes": "243x243",
-		"type": "image/png"
-	}, {
-		"src": "img/logo_250.png",
-		"sizes": "250x250",
-		"type": "image/png"
-	}],
-	"lang": "en",
-	"start_url": "./",
-	"theme_color": "#4F4F4F",
-	"orientation": "portrait"
+  "short_name": "AllTube",
+  "name": "AllTube Download",
+  "description": "Easily download videos from Youtube, Dailymotion, Vimeo and other websites",
+  "display": "standalone",
+  "icons": [
+    {
+      "src": "img/favicon.png",
+      "sizes": "32x32",
+      "type": "image/png"
+    },
+    {
+      "src": "img/logo_60.png",
+      "sizes": "60x60",
+      "type": "image/png"
+    },
+    {
+      "src": "img/logo_90.png",
+      "sizes": "90x60",
+      "type": "image/png"
+    },
+    {
+      "src": "img/logo_app.png",
+      "sizes": "243x243",
+      "type": "image/png"
+    },
+    {
+      "src": "img/logo_250.png",
+      "sizes": "250x250",
+      "type": "image/png"
+    }
+  ],
+  "lang": "en",
+  "start_url": "./",
+  "theme_color": "#4F4F4F",
+  "orientation": "portrait"
 }
diff --git a/package.json b/package.json
index 2443c23..aafe5c1 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "grunt-contrib-watch": "~1.0.0",
     "grunt-githash": "~0.1.3",
     "grunt-jslint": "~1.1.14",
+    "grunt-jsonlint": "~1.1.0",
     "grunt-phpcs": "~0.4.0",
     "grunt-phpdocumentor": "~0.4.1",
     "grunt-phpunit": "~0.3.6"