diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7e3a557..0bed214 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,7 @@ defaults_gradle: &defaults_gradle
         key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
     - run:
         name: Run Tests
-        command: ./gradlew lint test
+        command: ./gradlew lint build connectedCheck -PdisablePreDex --stacktrace
     - store_artifacts:
         path: app/build/reports
         destination: reports
diff --git a/.travis.yml b/.travis.yml
index 4f8e745..81dea86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,8 @@ before_install:
   - chmod +x gradlew
   - echo $GOOGLE_SERVICES | base64 -di > app/google-services.json
 
-after_failure:
-  - cat $TRAVIS_BUILD_DIR/app/build/outputs/lint-results-debug.xml
+# after_failure:
+#   - cat app/build/reports/lint-results.xml
 
 script:
-  - ./gradlew clean build connectedCheck -PdisablePreDex --stacktrace
+  - ./gradlew lint build connectedCheck -PdisablePreDex --stacktrace
diff --git a/app/build.gradle b/app/build.gradle
index 6d07873..b1db2e1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,6 +30,10 @@ android {
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
+
+    lintOptions {
+        baseline file("lint-baseline.xml")
+    }
 }
 
 ext {
@@ -81,7 +85,7 @@ kapt {
 
 kotlinter {
     ignoreFailures = false
-    reporters = ['html']
+    reporters = ['html', 'plain']
     experimentalRules = false
     disabledRules = ['import-ordering']
 }
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
new file mode 100644
index 0000000..ef36214
--- /dev/null
+++ b/app/lint-baseline.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 3.5.0" client="gradle" variant="all" version="3.5.0">
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.activity_horizontal_margin` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;activity_horizontal_margin&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\dimens.xml"
+            line="3"
+            column="12"/>
+        <location
+            file="src\main\res\values-w820dp\dimens.xml"
+            line="5"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.dimen.activity_vertical_margin` appears to be unused"
+        errorLine1="    &lt;dimen name=&quot;activity_vertical_margin&quot;>16dp&lt;/dimen>"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\dimens.xml"
+            line="4"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.plurals.error_prop` appears to be unused"
+        errorLine1="    &lt;plurals name=&quot;error_prop&quot;>"
+        errorLine2="             ~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="6"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.about_contact_us` appears to be unused"
+        errorLine1="    &lt;string name=&quot;about_contact_us&quot;>Contact me&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="11"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.about_github` appears to be unused"
+        errorLine1="    &lt;string name=&quot;about_github&quot;>Documentation on GitHub&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="12"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.about_twitter` appears to be unused"
+        errorLine1="    &lt;string name=&quot;about_twitter&quot;>Follow me on Twitter&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="13"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.about_website` appears to be unused"
+        errorLine1="    &lt;string name=&quot;about_website&quot;>Open Source Licenses&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="14"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.validate_dtmf_nopause` appears to be unused"
+        errorLine1="    &lt;string name=&quot;validate_dtmf_nopause&quot;>Missing pause between steps&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="35"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.validate_invalid_field_prop` appears to be unused"
+        errorLine1="    &lt;string name=&quot;validate_invalid_field_prop&quot;>&amp;lt;p>&amp;lt;b>opts[&lt;xliff:g id=&quot;opts&quot;>%1$d&lt;/xliff:g>]&amp;lt;/b>, &amp;lt;b>fields[&lt;xliff:g id=&quot;field&quot;>%2$d&lt;/xliff:g>]&amp;lt;/b>, invalid &amp;lt;font color=\&quot;red\&quot;>&lt;xliff:g id=&quot;prop&quot;>%3$s&lt;/xliff:g>&amp;lt;/font>:&amp;lt;br>&amp;#160;&amp;#160;&amp;#160;&amp;#160;&amp;lt;font color=\&quot;red\&quot;>&lt;xliff:g id=&quot;attr&quot;>%4$s&lt;/xliff:g>&amp;lt;/font>&amp;lt;/p>&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="36"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.validate_invalid_option` appears to be unused"
+        errorLine1="    &lt;string name=&quot;validate_invalid_option&quot;>&amp;lt;p>&amp;lt;b>opts[&lt;xliff:g id=&quot;opts&quot;>%1$d&lt;/xliff:g>]&amp;lt;/b>: invalid &amp;lt;font color=\&quot;red\&quot;>&lt;xliff:g id=&quot;prop&quot;>%2$s&lt;/xliff:g>&amp;lt;/font>&amp;lt;/p>&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="37"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.validate_invalid_opts_prop` appears to be unused"
+        errorLine1="    &lt;string name=&quot;validate_invalid_opts_prop&quot;>&amp;lt;p>&amp;lt;b>opts[&lt;xliff:g id=&quot;opts&quot;>%1$d&lt;/xliff:g>]&amp;lt;/b>&amp;lt;/b>, invalid &amp;lt;font color=\&quot;red\&quot;>&lt;xliff:g id=&quot;prop&quot;>%2$s&lt;/xliff:g>&amp;lt;/font>:&amp;lt;br>&amp;#160;&amp;#160;&amp;#160;&amp;#160;&amp;lt;font color=\&quot;red\&quot;>&lt;xliff:g id=&quot;val&quot;>%3$s&lt;/xliff:g>&amp;lt;/font>&amp;lt;/p>&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="38"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.validate_missing_opts_prop` appears to be unused"
+        errorLine1="    &lt;string name=&quot;validate_missing_opts_prop&quot;>&amp;lt;p>&amp;lt;b>opts[&lt;xliff:g id=&quot;opts&quot;>%1$d&lt;/xliff:g>]&amp;lt;/b>: missing &amp;lt;font color=\&quot;red\&quot;>&lt;xliff:g id=&quot;prop&quot;>%2$s&lt;/xliff:g>&amp;lt;/font>&amp;lt;/p>&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="41"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.validate_syntax_error` appears to be unused"
+        errorLine1="    &lt;string name=&quot;validate_syntax_error&quot;>&amp;lt;p>&amp;lt;b>Syntax error&amp;lt;/b> after &amp;lt;font color=\&quot;red\&quot;>&lt;xliff:g id=&quot;obj&quot;>%1$s&lt;/xliff:g>&amp;lt;/font>: trailing comma.&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="43"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="UnusedResources"
+        message="The resource `R.string.validate_unused_field` appears to be unused"
+        errorLine1="    &lt;string name=&quot;validate_unused_field&quot;>&amp;lt;p>&amp;lt;b>opts[&lt;xliff:g id=&quot;opts&quot;>%1$d&lt;/xliff:g>]&amp;lt;/b>, &amp;lt;font color=\&quot;red\&quot;>fields[&lt;xliff:g id=&quot;field&quot;>%2$d&lt;/xliff:g>]&amp;lt;/font>: unused&amp;lt;/p>&lt;/string>"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src\main\res\values\strings.xml"
+            line="44"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="IconDensities"
+        message="Missing the following drawables in `drawable-hdpi`: icons8_policy_document.png (found in drawable-mdpi, drawable-xhdpi, drawable-xxxhdpi)">
+        <location
+            file="src\main\res\drawable-hdpi"/>
+    </issue>
+
+    <issue
+        id="IconDensities"
+        message="Missing the following drawables in `drawable-xxhdpi`: icons8_policy_document.png (found in drawable-mdpi, drawable-xhdpi, drawable-xxxhdpi)">
+        <location
+            file="src\main\res\drawable-xxhdpi"/>
+    </issue>
+
+</issues>