diff --git a/.editorconfig b/.editorconfig
index c0dc5f9..951742a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -23,8 +23,3 @@ trim_trailing_whitespace = false
 [{package,bower}.json]
 indent_style = space
 indent_size = 2
-
-[gulpfile.js]
-indent_style = space
-indent_size = 2
-
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..886fcf0
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,31 @@
+{
+    "env": {
+        "browser": true,
+        "node": true
+    },
+    "extends": [
+        "angular",
+        "eslint:recommended"
+    ],
+    "parserOptions": {
+        "sourceType": "module"
+    },
+    "rules": {
+        "indent": [
+            "error",
+            4
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ]
+    }
+}
diff --git a/gulpfile.js b/gulpfile.js
index 1baec86..8661682 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,144 +7,143 @@ var $ = gulpLoadPlugins();
 var reload = browserSync.reload;
 
 gulp.task('styles', function () {
-  return gulp.src([
-    'src/styles/**/*.css'
-  ]).pipe($.autoprefixer({browsers: ['> 1%', 'last 2 versions', 'Firefox ESR']}))
-    .pipe(gulp.dest('.tmp/styles'))
-    .pipe(reload({stream: true}));
+    return gulp.src([
+        'src/styles/**/*.css'
+    ]).pipe($.autoprefixer({browsers: ['> 1%', 'last 2 versions', 'Firefox ESR']}))
+        .pipe(gulp.dest('.tmp/styles'))
+        .pipe(reload({stream: true}));
 });
 
 gulp.task('scripts', function () {
-  return gulp.src([
-    'src/scripts/**/*.js'
-  ]).pipe($.plumber())
-    .pipe(gulp.dest('.tmp/scripts'))
-    .pipe(reload({stream: true}));
+    return gulp.src([
+        'src/scripts/**/*.js'
+    ]).pipe($.plumber())
+        .pipe(gulp.dest('.tmp/scripts'))
+        .pipe(reload({stream: true}));
 });
 
 gulp.task('views', function () {
-  return gulp.src([
-    'src/views/**/*.html'
-  ]).pipe($.htmlmin({collapseWhitespace: true}))
-    .pipe($.angularTemplatecache({module: 'ariaNg', filename: 'views/templates.js', root: 'views/'}))
-    .pipe(gulp.dest('.tmp/scripts'));
+    return gulp.src([
+        'src/views/**/*.html'
+    ]).pipe($.htmlmin({collapseWhitespace: true}))
+        .pipe($.angularTemplatecache({module: 'ariaNg', filename: 'views/templates.js', root: 'views/'}))
+        .pipe(gulp.dest('.tmp/scripts'));
 });
 
 gulp.task('lint', function () {
-  return gulp.src([
-    'src/scripts/**/*.js'
-  ]).pipe(reload({stream: true, once: true}))
-    .pipe($.eslint({fix: true}))
-    .pipe($.eslint.format())
-    .pipe($.if(!browserSync.active, $.eslint.failAfterError()))
-    .pipe(gulp.dest('src/scripts'));
+    return gulp.src([
+        'src/scripts/**/*.js'
+    ]).pipe(reload({stream: true, once: true}))
+        .pipe($.eslint.format())
+        .pipe($.if(!browserSync.active, $.eslint.failAfterError()))
+        .pipe(gulp.dest('src/scripts'));
 });
 
 gulp.task('html', ['styles', 'scripts', 'views'], function () {
-  return gulp.src([
-    'src/*.html'
-  ]).pipe($.useref({searchPath: ['.tmp', 'src', '.']}))
-    .pipe($.injectVersion())
-    .pipe($.if('js/*.js', $.replace(/\/\/# sourceMappingURL=.*/g, '')))
-    .pipe($.if('css/*.css', $.replace(/\/\*# sourceMappingURL=.* \*\/$/g, '')))
-    .pipe($.if(['js/moment-with-locales-*.min.js', 'js/plugins.min.js', 'js/aria-ng.min.js'], $.uglify({preserveComments: 'license'})))
-    .pipe($.if(['css/plugins.min.css', 'css/aria-ng.min.css'], $.cssnano({safe: true, autoprefixer: false})))
-    .pipe($.if(['js/plugins.min.js', 'js/aria-ng.min.js', 'css/plugins.min.css', 'css/aria-ng.min.css'], $.rev()))
-    .pipe($.if('*.html', $.htmlmin({collapseWhitespace: true})))
-    .pipe($.revReplace())
-    .pipe(gulp.dest('dist'));
+    return gulp.src([
+        'src/*.html'
+    ]).pipe($.useref({searchPath: ['.tmp', 'src', '.']}))
+        .pipe($.injectVersion())
+        .pipe($.if('js/*.js', $.replace(/\/\/# sourceMappingURL=.*/g, '')))
+        .pipe($.if('css/*.css', $.replace(/\/\*# sourceMappingURL=.* \*\/$/g, '')))
+        .pipe($.if(['js/moment-with-locales-*.min.js', 'js/plugins.min.js', 'js/aria-ng.min.js'], $.uglify({preserveComments: 'license'})))
+        .pipe($.if(['css/plugins.min.css', 'css/aria-ng.min.css'], $.cssnano({safe: true, autoprefixer: false})))
+        .pipe($.if(['js/plugins.min.js', 'js/aria-ng.min.js', 'css/plugins.min.css', 'css/aria-ng.min.css'], $.rev()))
+        .pipe($.if('*.html', $.htmlmin({collapseWhitespace: true})))
+        .pipe($.revReplace())
+        .pipe(gulp.dest('dist'));
 });
 
 gulp.task('langs', function () {
-  return gulp.src([
-    'src/langs/**/*'
-  ]).pipe(gulp.dest('dist/langs'));
+    return gulp.src([
+        'src/langs/**/*'
+    ]).pipe(gulp.dest('dist/langs'));
 });
 
 gulp.task('images', function () {
-  return gulp.src([
-    'src/imgs/**/*'
-  ]).pipe(gulp.dest('dist/imgs'));
+    return gulp.src([
+        'src/imgs/**/*'
+    ]).pipe(gulp.dest('dist/imgs'));
 });
 
 gulp.task('fonts', function () {
-  return gulp.src([
-    'bower_components/font-awesome/fonts/fontawesome-webfont.*'
-  ]).pipe(gulp.dest('.tmp/fonts'))
-    .pipe(gulp.dest('dist/fonts'));
+    return gulp.src([
+        'bower_components/font-awesome/fonts/fontawesome-webfont.*'
+    ]).pipe(gulp.dest('.tmp/fonts'))
+        .pipe(gulp.dest('dist/fonts'));
 });
 
 gulp.task('manifest', function () {
-  return gulp.src([
-    'dist/css/**',
-    'dist/js/**',
-    'dist/fonts/fontawesome-webfont.woff2',
-    'dist/*.html'
-  ], {base: 'dist/'})
-    .pipe($.manifest({
-      hash: true,
-      preferOnline: true,
-      network: ['*'],
-      filename: 'index.manifest',
-      exclude: 'index.manifest'
-    }))
-    .pipe(gulp.dest('dist'));
+    return gulp.src([
+        'dist/css/**',
+        'dist/js/**',
+        'dist/fonts/fontawesome-webfont.woff2',
+        'dist/*.html'
+    ], {base: 'dist/'})
+        .pipe($.manifest({
+            hash: true,
+            preferOnline: true,
+            network: ['*'],
+            filename: 'index.manifest',
+            exclude: 'index.manifest'
+        }))
+        .pipe(gulp.dest('dist'));
 });
 
 gulp.task('extras', function () {
-  return gulp.src([
-    'src/*.*',
-    '!src/*.html'
-  ], {
-    dot: true
-  }).pipe(gulp.dest('dist'));
+    return gulp.src([
+        'src/*.*',
+        '!src/*.html'
+    ], {
+        dot: true
+    }).pipe(gulp.dest('dist'));
 });
 
 gulp.task('clean', del.bind(null, ['.tmp', 'dist']));
 
 gulp.task('serve', ['styles', 'scripts', 'fonts'], function () {
-  browserSync({
-    notify: false,
-    port: 9000,
-    server: {
-      baseDir: ['.tmp', 'src'],
-      routes: {
-        '/bower_components': 'bower_components'
-      }
-    }
-  });
+    browserSync({
+        notify: false,
+        port: 9000,
+        server: {
+            baseDir: ['.tmp', 'src'],
+            routes: {
+                '/bower_components': 'bower_components'
+            }
+        }
+    });
 
-  gulp.watch([
-    'src/*.html',
-    'src/langs/*.txt',
-    'src/views/*.html',
-    'src/imgs/**/*',
-    '.tmp/fonts/**/*'
-  ]).on('change', reload);
+    gulp.watch([
+        'src/*.html',
+        'src/langs/*.txt',
+        'src/views/*.html',
+        'src/imgs/**/*',
+        '.tmp/fonts/**/*'
+    ]).on('change', reload);
 
-  gulp.watch('src/styles/**/*.css', ['styles']);
-  gulp.watch('src/scripts/**/*.js', ['scripts']);
-  gulp.watch('src/fonts/**/*', ['fonts']);
+    gulp.watch('src/styles/**/*.css', ['styles']);
+    gulp.watch('src/scripts/**/*.js', ['scripts']);
+    gulp.watch('src/fonts/**/*', ['fonts']);
 });
 
 gulp.task('serve:dist', function () {
-  browserSync({
-    notify: false,
-    port: 9000,
-    server: {
-      baseDir: ['dist']
-    }
-  });
+    browserSync({
+        notify: false,
+        port: 9000,
+        server: {
+            baseDir: ['dist']
+        }
+    });
 });
 
 gulp.task('info', function () {
-  return gulp.src([
-    'dist/**/*'
-  ]).pipe($.size({title: 'build', gzip: true}));
+    return gulp.src([
+        'dist/**/*'
+    ]).pipe($.size({title: 'build', gzip: true}));
 });
 
 gulp.task('build', $.sequence('lint', 'html', 'langs', 'images', 'fonts', 'manifest', 'extras', 'info'));
 
 gulp.task('default', ['clean'], function () {
-  gulp.start('build');
+    gulp.start('build');
 });
diff --git a/package.json b/package.json
index 260d2ba..ea2bdcc 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,8 @@
   "devDependencies": {
     "browser-sync": "^2.18.2",
     "del": "^2.2.2",
+    "eslint-config-angular": "^0.5.0",
+    "eslint-plugin-angular": "^1.4.1",
     "gulp": "^3.9.1",
     "gulp-angular-templatecache": "^2.0.0",
     "gulp-autoprefixer": "^3.1.1",