diff --git a/package-lock.json b/package-lock.json
index 3e1fbc793..5a1f76167 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4141,8 +4141,7 @@
       "version": "file:packages/one-dark-ui"
     },
     "one-light-syntax": {
-      "version": "https://www.atom.io/api/packages/one-light-syntax/versions/1.8.4/tarball",
-      "integrity": "sha512-fXUzR34G+uepHq9vzmZZyKK6bGehOt2shX91iNqdecPvoHxR3lwWmAHoUMux7O0rXvClz5z0efVmnxgiDml6hQ=="
+      "version": "file:packages/one-light-syntax"
     },
     "one-light-ui": {
       "version": "file:packages/one-light-ui"
diff --git a/package.json b/package.json
index e8ddcfa51..e9e8c637e 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
     "nslog": "^3",
     "one-dark-syntax": "file:packages/one-dark-syntax",
     "one-dark-ui": "file:packages/one-dark-ui",
-    "one-light-syntax": "https://www.atom.io/api/packages/one-light-syntax/versions/1.8.4/tarball",
+    "one-light-syntax": "file:packages/one-light-syntax",
     "one-light-ui": "file:packages/one-light-ui",
     "oniguruma": "6.2.1",
     "open-on-github": "https://www.atom.io/api/packages/open-on-github/versions/1.3.1/tarball",
@@ -180,7 +180,7 @@
     "one-dark-ui": "file:./packages/one-dark-ui",
     "one-light-ui": "file:./packages/one-light-ui",
     "one-dark-syntax": "file:./packages/one-dark-syntax",
-    "one-light-syntax": "1.8.4",
+    "one-light-syntax": "file:./packages/one-light-syntax",
     "solarized-dark-syntax": "1.2.0",
     "solarized-light-syntax": "1.2.0",
     "about": "file:./packages/about",
diff --git a/packages/README.md b/packages/README.md
index f35fd04ea..17b0a8696 100644
--- a/packages/README.md
+++ b/packages/README.md
@@ -80,7 +80,7 @@ See [RFC 003](https://github.com/atom/atom/blob/master/docs/rfcs/003-consolidate
 | **notifications** | [`atom/notifications`][notifications] |  |
 | **one-dark-syntax** | [`./packages/one-dark-syntax`](./one-dark-syntax) | [#17853](https://github.com/atom/atom/issues/17853) |
 | **one-dark-ui** | [`./packages/one-dark-ui`](./one-dark-ui) | [#17854](https://github.com/atom/atom/issues/17854) |
-| **one-light-syntax** | [`atom/one-light-syntax`][one-light-syntax] | [#17855](https://github.com/atom/atom/issues/17855) |
+| **one-light-syntax** | [`./packages/one-light-syntax`](./one-light-syntax) | [#17855](https://github.com/atom/atom/issues/17855) |
 | **one-light-ui** | [`./packages/one-light-ui`](./one-light-ui) | [#17856](https://github.com/atom/atom/issues/17856) |
 | **open-on-github** | [`atom/open-on-github`][open-on-github] |  |
 | **package-generator** | [`atom/package-generator`][package-generator] |  |
diff --git a/packages/one-light-syntax/LICENSE.md b/packages/one-light-syntax/LICENSE.md
new file mode 100644
index 000000000..4e47b02a2
--- /dev/null
+++ b/packages/one-light-syntax/LICENSE.md
@@ -0,0 +1,20 @@
+Copyright (c) 2016 GitHub Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/packages/one-light-syntax/README.md b/packages/one-light-syntax/README.md
new file mode 100644
index 000000000..f55f69f4f
--- /dev/null
+++ b/packages/one-light-syntax/README.md
@@ -0,0 +1,11 @@
+## One Light Syntax theme
+
+![one-syntax-light](https://cloud.githubusercontent.com/assets/378023/7783214/c146b4e6-0174-11e5-8377-a57cf0274d5d.png)
+
+> The font used in the screenshot is [Fira Mono](https://github.com/mozilla/Fira).
+
+There is also a matching [UI theme](../one-light-ui).
+
+### Install
+
+This theme is installed by default with Atom and can be activated by going to the __Settings > Themes__ section and selecting it from the __Syntax Themes__ drop-down menu.
diff --git a/packages/one-light-syntax/index.less b/packages/one-light-syntax/index.less
new file mode 100644
index 000000000..c2d307b31
--- /dev/null
+++ b/packages/one-light-syntax/index.less
@@ -0,0 +1,23 @@
+
+// Atom Syntax Theme: One
+
+@import "styles/syntax-variables.less";
+
+@import "styles/editor.less";
+
+@import "styles/syntax/_base.less";
+@import "styles/syntax/c.less";
+@import "styles/syntax/cpp.less";
+@import "styles/syntax/cs.less";
+@import "styles/syntax/css.less";
+@import "styles/syntax/elixir.less";
+@import "styles/syntax/gfm.less";
+@import "styles/syntax/go.less";
+@import "styles/syntax/ini.less";
+@import "styles/syntax/java.less";
+@import "styles/syntax/javascript.less";
+@import "styles/syntax/json.less";
+@import "styles/syntax/ng.less";
+@import "styles/syntax/ruby.less";
+@import "styles/syntax/php.less";
+@import "styles/syntax/python.less";
diff --git a/packages/one-light-syntax/package.json b/packages/one-light-syntax/package.json
new file mode 100644
index 000000000..45093872c
--- /dev/null
+++ b/packages/one-light-syntax/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "one-light-syntax",
+  "theme": "syntax",
+  "version": "1.8.4",
+  "description": "Atom One light syntax theme",
+  "keywords": [
+    "light",
+    "syntax"
+  ],
+  "repository": "https://github.com/atom/one-light-syntax",
+  "license": "MIT",
+  "engines": {
+    "atom": ">0.40.0"
+  }
+}
diff --git a/packages/one-light-syntax/styles/colors.less b/packages/one-light-syntax/styles/colors.less
new file mode 100644
index 000000000..ca513b9dc
--- /dev/null
+++ b/packages/one-light-syntax/styles/colors.less
@@ -0,0 +1,31 @@
+
+// Config -----------------------------------
+@syntax-hue:          230;
+@syntax-saturation:    1%;
+@syntax-brightness:   98%;
+
+
+// Monochrome -----------------------------------
+@mono-1: hsl(@syntax-hue, 8%, 24%);
+@mono-2: hsl(@syntax-hue, 6%, 44%);
+@mono-3: hsl(@syntax-hue, 4%, 64%);
+
+// Colors -----------------------------------
+@hue-1:   hsl(198, 99%, 37%); // <-cyan
+@hue-2:   hsl(221, 87%, 60%); // <-blue
+@hue-3:   hsl(301, 63%, 40%); // <-purple
+@hue-4:   hsl(119, 34%, 47%); // <-green
+
+@hue-5:   hsl(  5, 74%, 59%); // <-red 1
+@hue-5-2: hsl(344, 84%, 43%); // <-red 2
+
+@hue-6:   hsl(41, 99%, 30%); // <-orange 1
+@hue-6-2: hsl(41, 99%, 38%); // <-orange 2
+
+
+// Base colors -----------------------------------
+@syntax-fg:     @mono-1;
+@syntax-bg:     hsl(@syntax-hue, @syntax-saturation, @syntax-brightness);
+@syntax-gutter: darken(@syntax-bg, 36%);
+@syntax-guide:  fade(@syntax-fg, 20%);
+@syntax-accent: hsl(@syntax-hue, 100%, 66% );
diff --git a/packages/one-light-syntax/styles/editor.less b/packages/one-light-syntax/styles/editor.less
new file mode 100644
index 000000000..6c674c0e5
--- /dev/null
+++ b/packages/one-light-syntax/styles/editor.less
@@ -0,0 +1,94 @@
+// Editor styles (background, gutter, guides)
+
+atom-text-editor {
+  background-color: @syntax-background-color;
+  color: @syntax-text-color;
+
+  .line.cursor-line {
+    background-color: @syntax-cursor-line;
+  }
+
+  .invisible {
+    color: @syntax-text-color;
+  }
+
+  .cursor {
+    border-left: 2px solid @syntax-cursor-color;
+  }
+
+  .selection .region {
+    background-color: @syntax-selection-color;
+  }
+
+  .bracket-matcher .region {
+    border-bottom: 1px solid @syntax-cursor-color;
+    box-sizing: border-box;
+  }
+
+  .invisible-character {
+    color: @syntax-invisible-character-color;
+  }
+
+  .indent-guide {
+    color: @syntax-indent-guide-color;
+  }
+
+  .wrap-guide {
+    background-color: @syntax-wrap-guide-color;
+  }
+
+  // find + replace
+  .find-result .region.region.region,
+  .current-result .region.region.region {
+    border-radius: 2px;
+    background-color: @syntax-result-marker-color;
+    transition: border-color .4s;
+  }
+  .find-result .region.region.region {
+    border: 2px solid transparent;
+  }
+  .current-result .region.region.region {
+    border: 2px solid @syntax-result-marker-color-selected;
+    transition-duration: .1s;
+  }
+
+  .gutter {
+    .line-number {
+      color: @syntax-gutter-text-color;
+      -webkit-font-smoothing: antialiased;
+
+      &.cursor-line {
+        color: @syntax-gutter-text-color-selected;
+        background-color: @syntax-gutter-background-color-selected;
+      }
+      &.cursor-line-no-selection {
+        background-color: transparent;
+      }
+
+      .icon-right {
+        color: @syntax-text-color;
+      }
+    }
+
+    &:not(.git-diff-icon) .line-number.git-line-removed {
+      &.git-line-removed::before {
+        bottom: -3px;
+      }
+      &::after {
+        content: "";
+        position: absolute;
+        left: 0px;
+        bottom: 0px;
+        width: 25px;
+        border-bottom: 1px dotted fade(@syntax-color-removed, 50%);
+        pointer-events: none;
+      }
+    }
+  }
+
+  .gutter .line-number.folded,
+  .gutter .line-number:after,
+  .fold-marker:after {
+    color: @syntax-gutter-text-color-selected;
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax-variables.less b/packages/one-light-syntax/styles/syntax-variables.less
new file mode 100644
index 000000000..a495029e3
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax-variables.less
@@ -0,0 +1,56 @@
+@import "colors.less";
+
+// Official Syntax Variables -----------------------------------
+
+// General colors
+@syntax-text-color:            @syntax-fg;
+@syntax-cursor-color:          @syntax-accent;
+@syntax-selection-color:       darken(@syntax-bg, 8%);
+@syntax-selection-flash-color: @syntax-accent;
+@syntax-background-color:      @syntax-bg;
+
+// Guide colors
+@syntax-wrap-guide-color:          @syntax-guide;
+@syntax-indent-guide-color:        @syntax-guide;
+@syntax-invisible-character-color: @syntax-guide;
+
+// For find and replace markers
+@syntax-result-marker-color:          fade(@syntax-accent, 20%);
+@syntax-result-marker-color-selected: @syntax-accent;
+
+// Gutter colors -----------------------------------
+@syntax-gutter-text-color:                @syntax-gutter;
+@syntax-gutter-text-color-selected:       @syntax-fg;
+@syntax-gutter-background-color:          @syntax-bg; // unused
+@syntax-gutter-background-color-selected: darken(@syntax-bg, 8%);
+
+// Git colors - For git diff info. i.e. in the gutter
+@syntax-color-renamed:  hsl(208, 100%, 66%);
+@syntax-color-added:    hsl(132,  60%, 44%);
+@syntax-color-modified: hsl( 40,  90%, 50%);
+@syntax-color-removed:  hsl(  0, 100%, 54%);
+
+// For language entity colors
+@syntax-color-variable:   @hue-5;
+@syntax-color-constant:   @hue-6;
+@syntax-color-property:   @syntax-fg;
+@syntax-color-value:      @syntax-fg;
+@syntax-color-function:   @hue-2;
+@syntax-color-method:     @hue-2;
+@syntax-color-class:      @hue-6-2;
+@syntax-color-keyword:    @hue-3;
+@syntax-color-tag:        @hue-5;
+@syntax-color-attribute:  @hue-6;
+@syntax-color-import:     @hue-3;
+@syntax-color-snippet:    @hue-4;
+
+
+// Custom Syntax Variables -----------------------------------
+// Don't use in packages
+
+@syntax-cursor-line: fade(@syntax-fg, 5%); // needs to be semi-transparent to show search results
+
+@syntax-deprecated-fg: darken(@syntax-color-modified, 50%);
+@syntax-deprecated-bg: @syntax-color-modified;
+@syntax-illegal-fg:    white;
+@syntax-illegal-bg:    @syntax-color-removed;
diff --git a/packages/one-light-syntax/styles/syntax/_base.less b/packages/one-light-syntax/styles/syntax/_base.less
new file mode 100644
index 000000000..df706b084
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/_base.less
@@ -0,0 +1,310 @@
+// Language syntax highlighting
+
+.syntax--comment {
+  color: @mono-3;
+  font-style: italic;
+
+  .syntax--markup.syntax--link {
+    color: @mono-3;
+  }
+}
+
+.syntax--entity {
+
+  &.syntax--name.syntax--type {
+    color: @hue-6-2;
+  }
+
+  &.syntax--other.syntax--inherited-class {
+    color: @hue-4;
+  }
+}
+
+.syntax--keyword {
+  color: @hue-3;
+
+  &.syntax--control {
+    color: @hue-3;
+  }
+
+  &.syntax--operator {
+    color: @mono-1;
+  }
+
+  &.syntax--other.syntax--special-method {
+    color: @hue-2;
+  }
+
+  &.syntax--other.syntax--unit {
+    color: @hue-6;
+  }
+}
+
+.syntax--storage {
+  color: @hue-3;
+
+  &.syntax--type {
+    &.syntax--annotation,
+    &.syntax--primitive {
+      color: @hue-3;
+    }
+  }
+
+  &.syntax--modifier {
+    &.syntax--package,
+    &.syntax--import {
+      color: @mono-1;
+    }
+  }
+}
+
+.syntax--constant {
+  color: @hue-6;
+
+  &.syntax--variable {
+    color: @hue-6;
+  }
+
+  &.syntax--character.syntax--escape {
+    color: @hue-1;
+  }
+
+  &.syntax--numeric {
+    color: @hue-6;
+  }
+
+  &.syntax--other.syntax--color {
+    color: @hue-1;
+  }
+
+  &.syntax--other.syntax--symbol {
+    color: @hue-1;
+  }
+}
+
+.syntax--variable {
+  color: @hue-5;
+
+  &.syntax--interpolation {
+    color: @hue-5-2;
+  }
+
+  &.syntax--parameter {
+    color: @mono-1;
+  }
+}
+
+.syntax--string {
+  color: @hue-4;
+
+  > .syntax--source, .syntax--embedded {
+    color: @mono-1;
+  }
+
+  &.syntax--regexp {
+    color: @hue-1;
+
+    .syntax--source.syntax--ruby.syntax--embedded {
+      color: @hue-6-2;
+    }
+  }
+
+  &.syntax--other.syntax--link {
+    color: @hue-5;
+  }
+}
+
+.syntax--punctuation {
+  &.syntax--definition {
+    &.syntax--comment {
+      color: @mono-3;
+    }
+
+    &.syntax--method-parameters,
+    &.syntax--function-parameters,
+    &.syntax--parameters,
+    &.syntax--separator,
+    &.syntax--seperator,
+    &.syntax--array {
+      color: @mono-1;
+    }
+
+    &.syntax--heading,
+    &.syntax--identity {
+      color: @hue-2;
+    }
+
+    &.syntax--bold {
+      color: @hue-6-2;
+      font-weight: bold;
+    }
+
+    &.syntax--italic {
+      color: @hue-3;
+      font-style: italic;
+    }
+  }
+
+  &.syntax--section {
+    &.syntax--embedded {
+      color: @hue-5-2;
+    }
+
+    &.syntax--method,
+    &.syntax--class,
+    &.syntax--inner-class {
+      color: @mono-1;
+    }
+  }
+}
+
+.syntax--support {
+  &.syntax--class {
+    color: @hue-6-2;
+  }
+
+  &.syntax--type {
+    color: @hue-1;
+  }
+
+  &.syntax--function  {
+    color: @hue-1;
+
+    &.syntax--any-method {
+      color: @hue-2;
+    }
+  }
+}
+
+.syntax--entity {
+  &.syntax--name.syntax--function {
+    color: @hue-2;
+  }
+
+  &.syntax--name.syntax--class,
+  &.syntax--name.syntax--type.syntax--class {
+    color: @hue-6-2;
+  }
+
+  &.syntax--name.syntax--section {
+    color: @hue-2;
+  }
+
+  &.syntax--name.syntax--tag {
+    color: @hue-5;
+  }
+
+  &.syntax--other.syntax--attribute-name {
+    color: @hue-6;
+
+    &.syntax--id {
+      color: @hue-2;
+    }
+  }
+}
+
+.syntax--meta {
+  &.syntax--class {
+    color: @hue-6-2;
+
+    &.syntax--body {
+      color: @mono-1;
+    }
+  }
+
+  &.syntax--method-call,
+  &.syntax--method {
+    color: @mono-1;
+  }
+
+  &.syntax--definition {
+    &.syntax--variable {
+      color: @hue-5;
+    }
+  }
+
+  &.syntax--link {
+    color: @hue-6;
+  }
+
+  &.syntax--require {
+    color: @hue-2;
+  }
+
+  &.syntax--selector {
+    color: @hue-3;
+  }
+
+  &.syntax--separator {
+    color: @mono-1;
+  }
+
+  &.syntax--tag {
+    color: @mono-1;
+  }
+}
+
+.syntax--underline {
+  text-decoration: underline;
+}
+
+.syntax--none {
+  color: @mono-1;
+}
+
+.syntax--invalid {
+  &.syntax--deprecated {
+    color: @syntax-deprecated-fg !important;
+    background-color: @syntax-deprecated-bg !important;
+  }
+  &.syntax--illegal {
+    color: @syntax-illegal-fg !important;
+    background-color: @syntax-illegal-bg !important;
+  }
+}
+
+// Languages -------------------------------------------------
+
+.syntax--markup {
+  &.syntax--bold {
+    color: @hue-6;
+    font-weight: bold;
+  }
+
+  &.syntax--changed {
+    color: @hue-3;
+  }
+
+  &.syntax--deleted {
+    color: @hue-5;
+  }
+
+  &.syntax--italic {
+    color: @hue-3;
+    font-style: italic;
+  }
+
+  &.syntax--heading {
+    color: @hue-5;
+
+    .syntax--punctuation.syntax--definition.syntax--heading {
+      color: @hue-2;
+    }
+  }
+
+  &.syntax--link {
+    color: @hue-1;
+  }
+
+  &.syntax--inserted {
+    color: @hue-4;
+  }
+
+  &.syntax--quote {
+    color: @hue-6;
+  }
+
+  &.syntax--raw {
+    color: @hue-4;
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/c.less b/packages/one-light-syntax/styles/syntax/c.less
new file mode 100644
index 000000000..00d3eafdb
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/c.less
@@ -0,0 +1,5 @@
+.syntax--source.syntax--c {
+  .syntax--keyword.syntax--operator {
+    color: @hue-3;
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/cpp.less b/packages/one-light-syntax/styles/syntax/cpp.less
new file mode 100644
index 000000000..e618ac243
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/cpp.less
@@ -0,0 +1,5 @@
+.syntax--source.syntax--cpp {
+  .syntax--keyword.syntax--operator {
+    color: @hue-3;
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/cs.less b/packages/one-light-syntax/styles/syntax/cs.less
new file mode 100644
index 000000000..64ff9060f
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/cs.less
@@ -0,0 +1,5 @@
+.syntax--source.syntax--cs {
+  .syntax--keyword.syntax--operator {
+    color: @hue-3;
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/css.less b/packages/one-light-syntax/styles/syntax/css.less
new file mode 100644
index 000000000..75eeb56ae
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/css.less
@@ -0,0 +1,12 @@
+.syntax--source.syntax--css {
+
+  // highlight properties/values if they are supported
+  .syntax--property-name,
+  .syntax--property-value {
+    color: @mono-2;
+    &.syntax--support {
+      color: @mono-1;
+    }
+  }
+
+}
diff --git a/packages/one-light-syntax/styles/syntax/elixir.less b/packages/one-light-syntax/styles/syntax/elixir.less
new file mode 100644
index 000000000..e5595af33
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/elixir.less
@@ -0,0 +1,47 @@
+.syntax--source.syntax--elixir {
+  .syntax--source.syntax--embedded.syntax--source {
+    color: @mono-1;
+  }
+  .syntax--constant.syntax--language,
+  .syntax--constant.syntax--numeric,
+  .syntax--constant.syntax--definition  {
+    color: @hue-2;
+  }
+  .syntax--variable.syntax--definition,
+  .syntax--variable.syntax--anonymous{
+    color: @hue-3;
+  }
+  .syntax--parameter.syntax--variable.syntax--function {
+    color: @hue-6;
+    font-style: italic;
+  }
+  .syntax--quoted{
+    color: @hue-4;
+  }
+  .syntax--keyword.syntax--special-method,
+  .syntax--embedded.syntax--section,
+  .syntax--embedded.syntax--source.syntax--empty,  {
+    color: @hue-5;
+  }
+  .syntax--readwrite.syntax--module {
+    .syntax--punctuation {
+      color: @hue-5;
+    }
+  }
+  .syntax--regexp.syntax--section,
+  .syntax--regexp.syntax--string {
+    color: @hue-5-2;
+  }
+  .syntax--separator,
+  .syntax--keyword.syntax--operator  {
+    color: @hue-6;
+  }
+  .syntax--variable.syntax--constant {
+    color: @hue-6-2;
+  }
+  .syntax--array,
+  .syntax--scope,
+  .syntax--section {
+    color: @mono-2;
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/gfm.less b/packages/one-light-syntax/styles/syntax/gfm.less
new file mode 100644
index 000000000..7bef77bc0
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/gfm.less
@@ -0,0 +1,9 @@
+.syntax--source.syntax--gfm {
+  .syntax--markup {
+    -webkit-font-smoothing: auto;
+  }
+
+  .syntax--link .syntax--entity {
+    color: @hue-2;
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/go.less b/packages/one-light-syntax/styles/syntax/go.less
new file mode 100644
index 000000000..0d767c3ae
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/go.less
@@ -0,0 +1,5 @@
+.syntax--source.syntax--go {
+  .syntax--storage.syntax--type.syntax--string {
+      color: @hue-3;
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/ini.less b/packages/one-light-syntax/styles/syntax/ini.less
new file mode 100644
index 000000000..621e128d2
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/ini.less
@@ -0,0 +1,5 @@
+.syntax--source.syntax--ini {
+  .syntax--keyword.syntax--other.syntax--definition.syntax--ini {
+    color: @hue-5;
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/java.less b/packages/one-light-syntax/styles/syntax/java.less
new file mode 100644
index 000000000..c863d7ce0
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/java.less
@@ -0,0 +1,24 @@
+.syntax--source.syntax--java {
+  .syntax--storage {
+    &.syntax--modifier.syntax--import {
+      color: @hue-6-2;
+    }
+
+    &.syntax--type {
+      color: @hue-6-2;
+    }
+  }
+  .syntax--keyword.syntax--operator.syntax--instanceof {
+    color: @hue-3;
+  }
+}
+
+.syntax--source.syntax--java-properties {
+  .syntax--meta.syntax--key-pair {
+    color: @hue-5;
+
+    & > .syntax--punctuation {
+      color: @mono-1;
+    }
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/javascript.less b/packages/one-light-syntax/styles/syntax/javascript.less
new file mode 100644
index 000000000..0ff547386
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/javascript.less
@@ -0,0 +1,17 @@
+.syntax--source.syntax--js {
+  .syntax--keyword.syntax--operator {
+    color: @hue-1;
+
+    // keywords are definded in https://github.com/atom/language-javascript/blob/master/grammars/javascript.cson
+    // search "instanceof" for location
+    &.syntax--delete,
+    &.syntax--in,
+    &.syntax--of,
+    &.syntax--instanceof,
+    &.syntax--new,
+    &.syntax--typeof,
+    &.syntax--void {
+      color: @hue-3;
+    }
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/json.less b/packages/one-light-syntax/styles/syntax/json.less
new file mode 100644
index 000000000..6bbce0639
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/json.less
@@ -0,0 +1,22 @@
+.syntax--source.syntax--json {
+  .syntax--meta.syntax--structure.syntax--dictionary.syntax--json {
+    & > .syntax--string.syntax--quoted.syntax--json {
+      & > .syntax--punctuation.syntax--string {
+        color: @hue-5;
+      }
+      color: @hue-5;
+    }
+  }
+
+  .syntax--meta.syntax--structure.syntax--dictionary.syntax--json,
+  .syntax--meta.syntax--structure.syntax--array.syntax--json {
+    & > .syntax--value.syntax--json > .syntax--string.syntax--quoted.syntax--json,
+    & > .syntax--value.syntax--json > .syntax--string.syntax--quoted.syntax--json > .syntax--punctuation {
+      color: @hue-4;
+    }
+
+    & > .syntax--constant.syntax--language.syntax--json {
+      color: @hue-1;
+    }
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/ng.less b/packages/one-light-syntax/styles/syntax/ng.less
new file mode 100644
index 000000000..35575508f
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/ng.less
@@ -0,0 +1,47 @@
+.syntax--ng {
+  &.syntax--interpolation {
+    color: @hue-5;
+
+    &.syntax--begin, &.syntax--end {
+      color: @hue-2;
+    }
+
+    .syntax--function {
+      color: @hue-5;
+
+      &.syntax--begin, &.syntax--end {
+        color: @hue-2;
+      }
+    }
+
+    .syntax--bool {
+      color: @hue-6;
+    }
+
+    .syntax--bracket {
+      color: @mono-1;
+    }
+  }
+
+  &.syntax--pipe, &.syntax--operator {
+    color: @mono-1;
+  }
+
+  &.syntax--tag {
+    color: @hue-1;
+  }
+
+  &.syntax--attribute-with-value {
+    .syntax--attribute-name {
+      color: @hue-6-2;
+    }
+
+    .syntax--string {
+      color: @hue-3;
+
+      &.syntax--begin, &.syntax--end {
+        color: @mono-1;
+      }
+    }
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/php.less b/packages/one-light-syntax/styles/syntax/php.less
new file mode 100644
index 000000000..6a39ac448
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/php.less
@@ -0,0 +1,5 @@
+.syntax--source.syntax--php {
+  .syntax--class.syntax--bracket {
+    color: @mono-1;
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/python.less b/packages/one-light-syntax/styles/syntax/python.less
new file mode 100644
index 000000000..ad14c7f26
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/python.less
@@ -0,0 +1,9 @@
+.syntax--source.syntax--python {
+  .syntax--keyword.syntax--operator.syntax--logical.syntax--python {
+    color: @hue-3;
+  }
+
+  .syntax--variable.syntax--parameter {
+    color: @hue-6;
+  }
+}
diff --git a/packages/one-light-syntax/styles/syntax/ruby.less b/packages/one-light-syntax/styles/syntax/ruby.less
new file mode 100644
index 000000000..594b4cd4f
--- /dev/null
+++ b/packages/one-light-syntax/styles/syntax/ruby.less
@@ -0,0 +1,5 @@
+.syntax--source.syntax--ruby {
+  .syntax--constant.syntax--other.syntax--symbol > .syntax--punctuation {
+    color: inherit;
+  }
+}