diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..ed8d3c3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+# editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
index 76add87..0973bc0 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
-dist
\ No newline at end of file
+dist
+*.log
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index b2d2383..b8085a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,4 @@ node_js:
 install:
 - npm install
 script:
-- npm test
\ No newline at end of file
+- npm test
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 987f484..c39f327 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing Code
 
-External contributors will be required to sign a Contributor's License Agreement. You can find this file [here](https://github.com/salesforce-ux/design-system/blob/winter-16/Salesforce_CLA.pdf). Please sign, scan, and send to [osscore@salesforce.com](mailto:osscore@salesforce.com). We look forward to collaborating with you!
+External contributors will be required to sign a Contributor's License Agreement. You can find this file [here](https://github.com/salesforce-ux/design-system/blob/master/Salesforce_CLA.pdf). Please sign, scan, and send to [osscore@salesforce.com](mailto:osscore@salesforce.com). We look forward to collaborating with you!
 
 1. Create a new issue before starting your project so that we can keep track of what you are trying to add/fix. That way, we can also offer suggestions or let you know if there is already an effort in progress.
 2. Fork off this repository.
diff --git a/README.md b/README.md
index 55ee21c..bab3083 100755
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 [![NPM version][npm-image]][npm-url]
 
 Theo is a set of [Gulp](http://gulpjs.com) plugins for
-transforming and formatting [Design Properties](#overview)
+transforming and formatting [Design Tokens](#overview)
 
 ## Example
 
@@ -18,9 +18,9 @@ gulp.src('design/props.json')
   .pipe(gulp.dest('dist'));
 ```
 
-## Design Properties <a name="overview"></a>
+## Design Tokens <a name="overview"></a>
 
-Theo consumes **Design Property** files which are a central location to store
+Theo consumes **Design Token** files which are a central location to store
 design related information such as colors, fonts, widths, animations, etc. These raw
 values can then be transformed and formatted to meet the needs of any platform.
 
@@ -35,12 +35,12 @@ iOS might like **rgba** values formatted as **.json**.
 Finally, Android might like **8 Digit Hex** values formatted as **.xml**.
 
 Instead of hard coding this information in each platform/format, Theo
-can consume the centralized **Design Properties** and output files for
+can consume the centralized **Design Tokens** and output files for
 each platform.
 
 ### Spec
 
-A *Design Properties* file is written in either
+A *Design Token* file is written in either
 `json` or `yml` and should conform to the following spec:
 
 ```json5
@@ -96,7 +96,7 @@ A *Design Properties* file is written in either
   },
 
   // Optional
-  // Array of design property files to be imported
+  // Array of design token files to be imported
   // "aliases" will be imported as well
   // "aliases" will already be resolved
   // "global" will already be merged into into each prop
@@ -114,13 +114,13 @@ Theo is divided into two primary plugins:
 
 This plugin is responsible for transforming raw values into platform specific values.
 
-For example, the Design Properties might specify a color value as an
+For example, the Design Tokens might specify a color value as an
 rgba (`rgba(255, 0, 0, 1)`), but an Android app
 might prefer to consume colors as an 8 digit hex (`#ffff0000`)
 
 ### [format](#plugins.format)
 
-This plugin is responsible for taking transformed properties and outputting them
+This plugin is responsible for taking transformed tokens and outputting them
 into a new file format.
 
 An Android app might prefer to consume the final values as XML:
@@ -134,9 +134,9 @@ An Android app might prefer to consume the final values as XML:
 
 ## API
 
-####`theo.plugins.transform(type, [options])` <a name="plugins.transform"></a>
+#### `theo.plugins.transform(type, [options])` <a name="plugins.transform"></a>
 
-Transform the values for each *Design Property* file according to
+Transform the values for each *Design Token* file according to
 the specified type.
 
 A transform is list of [valueTransforms](#registerValueTransform) that should be applied
@@ -146,7 +146,7 @@ to each property.
 The name of the registered transform
 
 **@param {object} [options]**  
-Addtional options  
+Additional options
 
 **@param {boolean} [options.includeMeta]**  
 Don't remove ".meta" key from a prop 
@@ -160,7 +160,7 @@ gulp.src('./design/props.json')
 
 ***
 
-####`theo.registerTransform(type, valueTransforms)`
+#### `theo.registerTransform(type, valueTransforms)`
 
 Register a new transform. Existing transforms with the same name
 will be overwritten.
@@ -185,7 +185,7 @@ Below is a list of pre-defined transforms and the corresponding
 [valueTransforms](registerValueTransform) that will be applied.
 
 *Note*: Generally speaking, the pre-defined transforms assume the original
-*Design Properties* are formatted for the web.
+*Design Tokens* are formatted for the web.
 
 **raw**:  
 No valueTransforms will be applied
@@ -204,7 +204,7 @@ No valueTransforms will be applied
 
 ***
 
-####`theo.registerValueTransform(name, matcher, transformer)` <a name="registerValueTransform"></a>
+#### `theo.registerValueTransform(name, matcher, transformer)` <a name="registerValueTransform"></a>
 
 Register a new valueTransform. Existing valueTransforms with the same name
 will be overwritten.
@@ -245,7 +245,7 @@ Parse the value as a color and return an 6 digit hex string
 Parse the value as a color and return an 8 digit hex string
 
 **percentage/float**  
-Parse a string percentage value and return a float represention
+Parse a string percentage value and return a float representation
 
 **relative/pixel**  
 Parse a relative size value (em/rem) and return a pixel representation.
@@ -258,9 +258,9 @@ Same as *relative/pixel*, but removes the `px` extension
 
 ***
 
-####`theo.plugins.format(type, [options])`  <a name="plugins.format"></a>
+#### `theo.plugins.format(type, [options])` <a name="plugins.format"></a>
 
-Format the output for each *Design Property* file according to
+Format the output for each *Design Token* file according to
 the specified type.
 
 *Note*: This plugin will almost always run after a `transform` call.
@@ -304,7 +304,7 @@ gulp.src('design/props.json')
 
 ***
 
-####`theo.registerFormat(name, formatter)`
+#### `theo.registerFormat(name, formatter)`
 
 Register a new format. Existing formats with the same name
 will be overwritten.
@@ -314,7 +314,7 @@ The name of the format
 
 **@param {function} formatter**  
 An function that should return a string representation
-of the reformatted *Design Properties*.
+of the reformatted *Design Tokens*.
 
 The formatter will be called with two arguments:
 
@@ -340,7 +340,7 @@ theo.registerFormat('scss', (json, options) => {
 Here is the layout of the `json` argument
 ```json5
 {
-  // An object containing the transformed properties
+  // An object containing the transformed tokens
   "props": {},
   // An array of the keys for easy iteration
   "propKeys": []
@@ -400,7 +400,7 @@ Here is the layout of the `json` argument
 
 ###### scss
 
-```sass
+```scss
 $prop-name: PROP_VALUE;
 ```
 
@@ -466,14 +466,14 @@ define(function() {
 });
 ```
 
-###### styleguide
+###### Styleguide
 
-See [salesforce-ux.github.io/design-properties]()
+See <https://salesforce-ux.github.io/design-properties>.
 
 
 ***
 
-####`theo.plugins.getResult([callback])`
+#### `theo.plugins.getResult([callback])`
 
 Get the result of a transform/format
 
@@ -483,7 +483,7 @@ The function to call for each result in the stream
 #### Example:
 
 ```js
-// Get the transformed Design Properties
+// Get the transformed Design Tokens
 gulp.src('design/props.json')
   .pipe(theo.plugins.transform('web'))
   .pipe(theo.plugins.getResult(result => {
@@ -492,7 +492,7 @@ gulp.src('design/props.json')
 ```
 
 ```js
-// Get the formatted Design Properties
+// Get the formatted Design Tokens
 gulp.src('design/props.json')
   .pipe(theo.plugins.transform('web'))
   .pipe(theo.plugins.format('android.xml'))
diff --git a/package.json b/package.json
index 19f1e48..f57e6c1 100755
--- a/package.json
+++ b/package.json
@@ -1,11 +1,13 @@
 {
   "name": "theo",
   "version": "4.2.0",
-  "description": "A set of Gulp plugins for transforming and formatting Design Properties",
+  "license": "SEE LICENSE IN README.md",
+  "description": "A set of Gulp plugins for transforming and formatting Design Tokens",
   "keywords": [
     "css",
     "design",
     "properties",
+    "tokens",
     "sass",
     "scss",
     "stylus",
diff --git a/src/props/formats/html.jsx b/src/props/formats/html.jsx
index dac6d8e..b028cd8 100644
--- a/src/props/formats/html.jsx
+++ b/src/props/formats/html.jsx
@@ -240,7 +240,7 @@ let Styleguide = React.createClass({
         <head>
           <meta charSet="utf-8" />
           <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
-          <title>Design Property Guide</title>
+          <title>Design Tokens</title>
           <meta name="viewport" content="width=device-width, initial-scale=1" />
           <Style />
         </head>
@@ -250,9 +250,10 @@ let Styleguide = React.createClass({
               <h1>Design Attribute Guide</h1>
             </div>
           </header>
-            <div className="container">
-              <main role="main">
-                <table>
+          <div className="container">
+            <main role="main">
+              <table>
+                <tbody>
                   {this.renderSection('text-color', 'Text Colors')}
                   {this.renderSection('background-color', 'Background Colors')}
                   {this.renderSection('gradient', 'Gradients')}
@@ -269,9 +270,10 @@ let Styleguide = React.createClass({
                   {this.renderSection('radius', 'Radius')}
                   {this.renderSection('time', 'Time')}
                   {this.renderSection('media-query', 'Media Queries')}
-                </table>
-              </main>
-            </div>
+                </tbody>
+              </table>
+            </main>
+          </div>
         </body>
       </html>
     )
@@ -280,7 +282,7 @@ let Styleguide = React.createClass({
 
 module.exports = function(json) {
   return `
-    <!doctype html>
+    <!DOCTYPE html>
     ${React.renderToStaticMarkup(<Styleguide json={json} />)}
   `;
-};
\ No newline at end of file
+};
diff --git a/src/props/index.js b/src/props/index.js
index 5c7989d..d56fd52 100755
--- a/src/props/index.js
+++ b/src/props/index.js
@@ -235,7 +235,7 @@ registerFormat('list.scss', (json, options) => {
 
 registerFormat('map.scss', (json, options) => {
   options = _.defaults({}, options, {
-    nameSuffix: '-map' 
+    nameSuffix: '-map'
   });
   let items = _.map(json.props, prop => {
     let name = kebabCase(prop.name);
@@ -261,7 +261,7 @@ registerFormat('map.scss', (json, options) => {
 
 registerFormat('map.variables.scss', (json, options) => {
   options = _.defaults({}, options, {
-    nameSuffix: '-map-variables' 
+    nameSuffix: '-map-variables'
   });
   _.transform(json.props, (result, value, name, props) => {
     props[name].value = `$${kebabCase(name)}`;
@@ -429,7 +429,7 @@ module.exports = {
      *
      * @param {function} [callback]
      * @return {stream}
-     */    
+     */
     getResult(callback) {
       return through.obj((file, enc, next) => {
         if (typeof callback === 'function' && file.isBuffer()) {
@@ -516,7 +516,7 @@ module.exports = {
             let json = util.parsePropsFile(file);
             propSets.push(json);
           } catch(e) {
-            let err = TheoError('diff() encountered an invalid Design Properties file', file.path);
+            let err = TheoError('diff() encountered an invalid Design Token file', file.path);
             return next(err);
           }
         }
diff --git a/src/props/prop-set.js b/src/props/prop-set.js
index e859fcc..9319532 100644
--- a/src/props/prop-set.js
+++ b/src/props/prop-set.js
@@ -18,7 +18,7 @@ let util        = require('./util');
 let TheoError   = require('./util/error');
 
 class PropSet {
-  
+
   constructor(file, valueTransforms, options={}) {
     if (typeof file.isBuffer !== 'function' || typeof file.isBuffer === 'undefined') {
       throw TheoError('transform() must use vinyl files');
@@ -51,7 +51,7 @@ class PropSet {
       def = _.merge(def, json);
     }
     catch (e) {
-      throw TheoError(`transform() encountered an invalid Design Properties file: ${this.file.path}`);
+      throw TheoError(`transform() encountered an invalid Design Token file: ${this.file.path}`);
     }
     // Raw
     if (options.includeRawValue === true) {
@@ -111,10 +111,10 @@ class PropSet {
 
   _validate(def) {
     if (_.isArray(def.props)) {
-      throw TheoError(`Design Properties "props" key must be an object`);
+      throw TheoError(`Design Token "props" key must be an object`);
     }
     if (!_.has(def, 'props') || !_.isObject(def.props)) {
-      //console.warn('Design Properties contained no "props" object')
+      //console.warn('Design Token contained no "props" object')
       def.props = {};
     }
     // Make sure properties have all required keys
@@ -173,7 +173,7 @@ class PropSet {
       // Extract the meta data
       let meta = prop['.meta'];
       if (this.options.includeMeta !== true) {
-        delete prop['.meta'];        
+        delete prop['.meta'];
       }
       // Transform the value
       this._transformValue(prop, meta);
diff --git a/test/props/index.js b/test/props/index.js
index d6a61a4..c134bbb 100644
--- a/test/props/index.js
+++ b/test/props/index.js
@@ -29,7 +29,7 @@ function isError(error) {
 }
 
 describe('$props', function() {
-  
+
   describe('#getValueTransform()', function() {
     it('throws an error if the valueTransform is not registered', function() {
       assert.throws(function() {
@@ -201,7 +201,7 @@ describe('$props', function() {
 describe('$props.plugins', function() {
 
   describe('#transform', function() {
-    it('transforms Design Properties as JSON', function(done) {
+    it('transforms Design Tokens as JSON', function(done) {
       var error;
       gulp.src(path.resolve(__dirname, 'mock', 'sample.json'))
         .on('error', function(err) {
@@ -213,7 +213,7 @@ describe('$props.plugins', function() {
         })
         .pipe($props.plugins.transform('web'))
     });
-    it('transforms Design Properties as YML', function(done) {
+    it('transforms Design Tokens as YML', function(done) {
       var error;
       gulp.src(path.resolve(__dirname, 'mock', 'sample.yml'))
         .on('error', function(err) {
@@ -253,7 +253,7 @@ describe('$props.plugins', function() {
     });
     it('formats props', function(done) {
       var error, result;
-      var samplePath = path.resolve(__dirname, 'mock', 'sample.json'); 
+      var samplePath = path.resolve(__dirname, 'mock', 'sample.json');
       var postResult;
       gulp.src(samplePath)
         .on('error', function(err) {
@@ -274,7 +274,7 @@ describe('$props.plugins', function() {
     });
     it('filters props before formatting', function(done) {
       var error, result;
-      var samplePath = path.resolve(__dirname, 'mock', 'sample.json'); 
+      var samplePath = path.resolve(__dirname, 'mock', 'sample.json');
       //var preResult = JSON.parse(fs.readFileSync(samplePath));
       var postResult;
       gulp.src(samplePath)
@@ -291,7 +291,7 @@ describe('$props.plugins', function() {
     });
     it('maps props before formatting', function(done) {
       var error, result;
-      var samplePath = path.resolve(__dirname, 'mock', 'sample.json'); 
+      var samplePath = path.resolve(__dirname, 'mock', 'sample.json');
       //var preResult = JSON.parse(fs.readFileSync(samplePath));
       var postResult;
       gulp.src(samplePath)
@@ -314,7 +314,7 @@ describe('$props.plugins', function() {
     });
     it('renames the file correctly', function(done) {
       var resultFile;
-      var samplePath = path.resolve(__dirname, 'mock', 'sample.json'); 
+      var samplePath = path.resolve(__dirname, 'mock', 'sample.json');
       gulp.src(samplePath)
         .on('finish', function() {
           assert(resultFile.relative === 'sample.scss');
@@ -434,7 +434,7 @@ describe('$props.plugins', function() {
 });
 
 describe('$props:valueTransforms', function() {
-  
+
   describe('color/rgb', function() {
     var t = $props.getValueTransform('color/rgb').transformer;
     it('converts hex to rgb', function() {
@@ -835,7 +835,7 @@ describe('$props:formats', function() {
   describe('html', function() {
     before($format('raw', 'html', paths.sink));
     it('outputs html', function() {
-      var re = new RegExp(_.escapeRegExp('<!doctype html>'));
+      var re = new RegExp(_.escapeRegExp('<!DOCTYPE html>'));
       assert(re.test(result));
     });
     it('has example rows', function() {
diff --git a/test/props/prop-set.js b/test/props/prop-set.js
index 7c17ec8..16013f6 100644
--- a/test/props/prop-set.js
+++ b/test/props/prop-set.js
@@ -29,7 +29,7 @@ function isError(error) {
 describe('PropSet', function() {
 
   var def, file, t1, t2, set;
-  
+
   beforeEach(function() {
     var p = path.resolve(__dirname, 'mock', 'c.json');
     var f = fs.readFileSync(p);
@@ -320,7 +320,7 @@ describe('PropSet', function() {
       assert(!t1.transformer.called);
     });
   });
-  
+
   describe('#transform', function() {
     it('transforms the props', transformProps);
     it('returns the PropSet', function() {
diff --git a/test/stream-util/index.js b/test/stream-util/index.js
index 5155d4e..e7a0657 100644
--- a/test/stream-util/index.js
+++ b/test/stream-util/index.js
@@ -41,7 +41,7 @@ describe('$stream', function() {
   beforeEach(function() {
     files = [];
   });
-  
+
   describe('#filter()', function() {
     it('throws an error if a non functional argument is passed', function() {
       assert.throws(function() {