diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee
index bb8c42d12..d676a7549 100644
--- a/build/Gruntfile.coffee
+++ b/build/Gruntfile.coffee
@@ -208,6 +208,7 @@ module.exports = (grunt) ->
         'dot-nylas/**/*.coffee'
         'exports/**/*.coffee'
         'src/**/*.coffee'
+        'src/**/*.cjsx'
       ]
       build: [
         'build/tasks/**/*.coffee'
@@ -248,6 +249,8 @@ module.exports = (grunt) ->
 
     lesslint:
       src: [
+        'internal_packages/**/*.less'
+        'dot-nylas/**/*.less'
         'static/**/*.less'
       ]
       options:
diff --git a/internal_packages/composer/stylesheets/composer.less b/internal_packages/composer/stylesheets/composer.less
index c3f4a90ff..f483e177d 100644
--- a/internal_packages/composer/stylesheets/composer.less
+++ b/internal_packages/composer/stylesheets/composer.less
@@ -164,7 +164,7 @@
 
   // TODO FIXME DRY From stylesheets/message-list.less
   .attachments-area {
-    padding: 0px 15px 0px 15px;
+    padding: 0 15px 0 15px;
     .attachment-file-wrap {
       padding-top: 5px;
       &.pending, &.started, &.progress {
@@ -304,7 +304,7 @@ body.is-blurred .composer-inner-wrap .tokenizing-field .token {
   position: absolute;
 
   background: #fff;
-  box-shadow: 0px 10px 20px rgba(0,0,0,0.19), inset 0px 0px 1px rgba(0,0,0,0.5);
+  box-shadow: 0 10px 20px rgba(0,0,0,0.19), inset 0 0 1px rgba(0,0,0,0.5);
   border-radius: @border-radius-base;
   color: @text-color;
 
@@ -317,7 +317,7 @@ body.is-blurred .composer-inner-wrap .tokenizing-field .token {
   &.toolbar-visible {
     opacity: 1;
     visibility: visible;
-    margin-top: 0px;
+    margin-top: 0;
   }
 
   .toolbar-pointer {
diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less
index 8f5308730..56e062125 100644
--- a/internal_packages/message-list/stylesheets/message-list.less
+++ b/internal_packages/message-list/stylesheets/message-list.less
@@ -151,7 +151,7 @@
     margin: 0;
 
     &.collapsed {
-      height:0px;
+      height: 0;
       border-bottom: 0;
     }
   }
diff --git a/internal_packages/message-templates/stylesheets/message-templates.less b/internal_packages/message-templates/stylesheets/message-templates.less
index 6f00580ff..4a4091bcf 100755
--- a/internal_packages/message-templates/stylesheets/message-templates.less
+++ b/internal_packages/message-templates/stylesheets/message-templates.less
@@ -4,39 +4,35 @@
 @code-bg-color: #fcf4db;
 
 .template-picker {
-    .menu {
-        .content-container {
-            height:150px;
-            overflow-y:scroll;
-        }
+  .menu {
+    .content-container {
+      height:150px;
+      overflow-y:scroll;
     }
+  }
 }
 
 .template-status-bar {
-    background-color: @code-bg-color;
-    color:darken(@code-bg-color, 70%);
-    border: 1.5px solid darken(@code-bg-color, 10%);
-    border-radius: @border-radius-small;
-    padding-top: @padding-small-vertical;
-    padding-bottom: @padding-small-vertical;
-    padding-left: @padding-small-horizontal;
-    padding-right: @padding-small-horizontal;
-    font-size: @font-size-small;
+  background-color: @code-bg-color;
+  color: darken(@code-bg-color, 70%);
+  border: 1.5px solid darken(@code-bg-color, 10%);
+  border-radius: @border-radius-small;
+  padding-top: @padding-small-vertical @padding-small-horizontal @padding-small-vertical @padding-small-horizontal;
+  font-size: @font-size-small;
 }
 
 .compose-body #contenteditable {
-    code.var {
-        font: inherit;
-        padding:0;
-        padding-left:2px;
-        padding-right:2px;
-        background-color: transparent;
-        border-bottom: 1.5px solid darken(@code-bg-color, 10%);
-        background-color: fade(@code-bg-color, 10%);
-        &.empty {
-            color:darken(@code-bg-color, 70%);
-            border-bottom: 1px solid darken(@code-bg-color, 14%);
-            background-color: @code-bg-color;
-        }
+  code.var {
+    font: inherit;
+    padding:0;
+    padding-left:2px;
+    padding-right:2px;
+    border-bottom: 1.5px solid darken(@code-bg-color, 10%);
+    background-color: fade(@code-bg-color, 10%);
+    &.empty {
+      color:darken(@code-bg-color, 70%);
+      border-bottom: 1px solid darken(@code-bg-color, 14%);
+      background-color: @code-bg-color;
     }
+  }
 }
diff --git a/internal_packages/onboarding/stylesheets/onboarding.less b/internal_packages/onboarding/stylesheets/onboarding.less
index 2a1b280a8..251b06b10 100644
--- a/internal_packages/onboarding/stylesheets/onboarding.less
+++ b/internal_packages/onboarding/stylesheets/onboarding.less
@@ -123,7 +123,7 @@
     top: 50%;
     left: 50%;
     transform: translateX(-50%) translateY(-50%);
-    box-shadow: 0px -4px 4px 0px rgba(255, 255, 255, 0.75), inset 0px 4px 4px 0px rgba(0, 0, 0, 0.08);
+    box-shadow: 0 -4px 4px 0 rgba(255, 255, 255, 0.75), inset 0 4px 4px 0 rgba(0, 0, 0, 0.08);
 
     &:before {
       content: "";
@@ -133,7 +133,7 @@
       left: 9%;
       right: 9%;
       bottom: 9%;
-      box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.08);
+      box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.08);
     }
     
     &:after {
diff --git a/internal_packages/sidebar-fullcontact/stylesheets/sidebar-fullcontact.less b/internal_packages/sidebar-fullcontact/stylesheets/sidebar-fullcontact.less
index 835784d3b..2624cd162 100644
--- a/internal_packages/sidebar-fullcontact/stylesheets/sidebar-fullcontact.less
+++ b/internal_packages/sidebar-fullcontact/stylesheets/sidebar-fullcontact.less
@@ -1,3 +1,5 @@
+@import "ui-variables";
+
 .full-contact-sidebar {
   padding: @spacing-standard;
   padding-bottom: 0;
diff --git a/internal_packages/sidebar-inbox-internal/stylesheets/sidebar-internal.less b/internal_packages/sidebar-inbox-internal/stylesheets/sidebar-internal.less
index 50b0fc196..4b70e0217 100644
--- a/internal_packages/sidebar-inbox-internal/stylesheets/sidebar-internal.less
+++ b/internal_packages/sidebar-inbox-internal/stylesheets/sidebar-internal.less
@@ -1,3 +1,5 @@
+@import "ui-variables";
+
 .internal-sidebar {
   padding: @spacing-standard;
   padding-bottom: 0;
diff --git a/internal_packages/tooltip/stylesheets/tooltip.less b/internal_packages/tooltip/stylesheets/tooltip.less
index faf9d56a8..9c3ccc9e1 100644
--- a/internal_packages/tooltip/stylesheets/tooltip.less
+++ b/internal_packages/tooltip/stylesheets/tooltip.less
@@ -1,3 +1,5 @@
+@import "ui-variables";
+
 #tooltip-container {
   position: absolute;
   z-index: 999;
@@ -14,7 +16,7 @@
   // Position and display are set by React
 
   background: #fff;
-  box-shadow: 0px 10px 20px rgba(0,0,0,0.19), inset 0px 0px 1px rgba(0,0,0,0.5);
+  box-shadow: 0 10px 20px rgba(0,0,0,0.19), inset 0 0 1px rgba(0,0,0,0.5);
   border-radius: @border-radius-base;
   color: @text-color;
 
diff --git a/script/lint.sh b/script/lint.sh
index 97c2f64a7..6590facf9 100755
--- a/script/lint.sh
+++ b/script/lint.sh
@@ -4,4 +4,4 @@ GO=0
 if [ ${1##*.} == "coffee" ]; then GO=1; fi
 if [ ${1##*.} == "cjsx" ]; then GO=1; fi
 if [ $GO != "1" ]; then exit 0; fi
-script/grunt coffeelint:target --target "$*" || true
+script/grunt lint:target --target "$*" || true