diff --git a/.prettierignore b/.prettierignore
index 2ff8622f1..19795ba7f 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1 +1,7 @@
-package.json
\ No newline at end of file
+package.json
+package-lock.json
+.sourcemaps/
+coverage/
+platforms/
+plugins/
+www/
\ No newline at end of file
diff --git a/package.json b/package.json
index 6378ef63b..73b550264 100644
--- a/package.json
+++ b/package.json
@@ -36,10 +36,10 @@
     "test": "test:lint && npm run test:ci && npm run e2e:capture-latest && npm run test:visual",
     "test:coverage": "ng test --code-coverage",
     "test:ci": "ng test --watch=false --code-coverage --no-progress",
-    "test:lint": "tslint --project . src/**/*.ts && prettier --list-different --ignore-path .gitignore '{!(package),**/*}.{js,ts,md,json}'",
+    "test:lint": "tslint --project . --format codeFrame && tslint '{e2e,test,electron,src}/**/*.ts' --format codeFrame && prettier --list-different '{*,**/*}.{js,ts,md,json,scss}'",
     "test:visual": "cd test && reg-cli latest approved diffs --report report.html --json report.json --enableAntialias --thresholdRate 0.005",
-    "fix:tslint": "tslint --fix --project . src/**/*.ts",
-    "fix:prettier": "prettier --write --ignore-path .gitignore '{!(package),**/*}.{js,ts,md,json}'",
+    "fix:tslint": "tslint --fix --project . && tslint --fix '{e2e,test,electron,src}/**/*.ts'",
+    "fix:prettier": "prettier --write '{*,**/*}.{js,ts,md,json,scss}'",
     "e2e": "npm run ionic:build && npm run e2e:test",
     "e2e:test": "protractor",
     "e2e:capture-latest": "npm run apply:copay && npm run e2e && npm run apply:bitpay && npm run e2e",