Merge pull request #64 from pebble/release/v0.1.5

Bump Version to v0.1.5
2026-08-30 13:56:58 -04:00 · 2016-03-21 11:28:57 -07:00 · 2016-03-21 09:26:59 -07:00 · 2016-03-21 09:25:52 -07:00 · 2016-03-20 11:16:03 -07:00 · 2016-03-16 12:09:29 +11:00
60 changed files with 2344 additions and 538 deletions
@@ -9,7 +9,7 @@
  },
  "rules": {
    "new-cap": [0],
-    "max-params": [2, 4],
+    "max-params": [2, 5],
    "require-jsdoc": [2, {
      "require": {
        "FunctionDeclaration": true,
@@ -27,3 +27,5 @@ build/Release
 node_modules

 tmp
+
+dist
@@ -1,7 +1,7 @@
 # Clay
 Clay is a JavaScript library that makes it easy to add offline configuration pages to your Pebble apps. All you need to get started is a couple lines of JavaScript and a JSON file; no servers or HTML required. 

-Clay will by default automatically handle the 'showConfiguration' and 'webviewclosed' events traditionally implemented by developers to relay configuration settings to the watch side of the app. This step is not required when using Clay, since each config item is given the same `appKey` as defined in `appinfo.json` (or PebbleKit JS Message Keys on CloudPebble), and is automatically transmitted once the configuration page is submitted by the user. Developers can override this behavior by implementing a [custom function](#custom-function).
+Clay will by default automatically handle the 'showConfiguration' and 'webviewclosed' events traditionally implemented by developers to relay configuration settings to the watch side of the app. This step is not required when using Clay, since each config item is given the same `appKey` as defined in `appinfo.json` (or PebbleKit JS Message Keys on CloudPebble), and is automatically transmitted once the configuration page is submitted by the user. Developers can override this behavior by [handling the events manually](#handling-the-showconfiguration-and-webviewclosed-events-manually).

 **Clay is still in early development and may be missing some features. We would love your feedback! Pease submit any ideas or features via GitHub Issues.**

@@ -9,7 +9,7 @@ Clay will by default automatically handle the 'showConfiguration' and 'webviewcl

 Clay will eventually be built into the Pebble SDK. However, while it is still in beta you will need to follow the steps shown below:

-1. Download the Clay distribution file from: [dist/clay.js](dist/clay.js).
+1. Download the **clay.js** distribution file from the [latest release](https://github.com/pebble/clay/releases/latest).
 2. Drop `clay.js` in your project's `src/js` directory. 
 3. Create a JSON file called `config.json` and place it in your `src/js` directory. 
 4. In order for JSON files to work you may need to change a line in your `wscript` from `ctx.pbl_bundle(binaries=binaries, js=ctx.path.ant_glob('src/js/**/*.js'))` to `ctx.pbl_bundle(binaries=binaries, js=ctx.path.ant_glob(['src/js/**/*.js', 'src/js/**/*.json']))`.
@@ -24,10 +24,11 @@ Clay will eventually be built into the Pebble SDK. However, while it is still in

 # Getting Started (CloudPebble)

-Clay will eventually be built into CloudPebble. However while it is still in beta, you will need to follow some steps
+Clay will eventually be built into CloudPebble. However while it is still in beta, you will need to follow some steps.
+NOTE these are similar to using the SDK but instead of a data file called config.json, a javascript file config.js is required.

 1. Create a new JavaScript file called `clay.js`.
-2. Copy the contents of the Clay distribution file from [dist/clay.js](dist/clay.js) into your newly created `clay.js` file.
+2. Copy the contents from the **clay.js** distribution file found in the [latest release](https://github.com/pebble/clay/releases/latest) into your newly created `clay.js` file.
 3. Create another JavaScript file called `config.js` with the following content. This will act as your config's root array element, from which the rest of the page is built up:

  ```javascript
@@ -52,6 +53,8 @@ Your root element **must** be an array. This represents the entire page. Inside

 #### Example

+NOTE for config.js (rather than config.json) a leading `module.exports =` is required.
+
 ```javascript
 [
  { 
@@ -67,7 +70,7 @@ Your root element **must** be an array. This represents the entire page. Inside

 ## Components

-![Example](src/images/example.png)
+<img src="src/images/example.png" width="360" title="Example">

 ### Section

@@ -108,7 +111,7 @@ Sections help divide up the page into logical groups of items. It is recommended

 ### Heading

-**Manipulator:** `html`
+**Manipulator:** [`html`](#html)

 Headings can be used in anywhere and can have their size adjusted to suit the context. If you place a heading item at the first position of a section's `items` array then it will automatically be styled as the header for that section. 

@@ -138,7 +141,7 @@ Headings can be used in anywhere and can have their size adjusted to suit the co

 ### Text

-**Manipulator:** `html`
+**Manipulator:** [`html`](#html)

 Text is used to provide descriptions of sections or to explain complex parts of your page. Feel free to add any extra HTML you require to the `defaultValue` 

@@ -165,7 +168,7 @@ Text is used to provide descriptions of sections or to explain complex parts of

 ### Input

-**Manipulator:** `val`
+**Manipulator:** [`val`](#val)

 Standard text input field. 

@@ -178,6 +181,7 @@ Standard text input field.
 | appKey | string (unique) | The AppMessage key matching the `appKey` item defined in your `appinfo.json`.  Set this to a unique string to allow this item to be looked up using `Clay.getItemsByAppKey()` in your custom function. You must set this if you wish for the value of this item to be persisted after the user closes the config page. |
 | label | string | The label that should appear next to this item. |
 | defaultValue | string | The default value of the input field. |
+| description | string | Optional sub-text to include below the component |
 | attributes | object | An object containing HTML attributes to set on the input field. You can add basic HTML5 validation this way by setting attributes such as `required` or `type`. |


@@ -202,7 +206,7 @@ Standard text input field.

 #### Toggle

-**Manipulator:** `checked`
+**Manipulator:** [`checked`](#checked)

 Switch for a single item. 

@@ -215,6 +219,7 @@ Switch for a single item.
 | appKey | string (unique) | The AppMessage key matching the `appKey` item defined in your `appinfo.json`.  Set this to a unique string to allow this item to be looked up using `Clay.getItemsByAppKey()` in your custom function. You must set this if you wish for the value of this item to be persisted after the user closes the config page. |
 | label | string | The label that should appear next to this item. |
 | defaultValue | int\|boolean | The default value of the toggle. Defaults to `false` if not specified. |
+| description | string | Optional sub-text to include below the component |
 | attributes | object | An object containing HTML attributes to set on the input field. You can add basic HTML5 validation this way by setting attribute such as `required`. |


@@ -236,7 +241,7 @@ Switch for a single item.

 #### Select

-**Manipulator:** `val`
+**Manipulator:** [`val`](#val)

 A dropdown menu containing multiple options.

@@ -249,6 +254,7 @@ A dropdown menu containing multiple options.
 | appKey | string (unique) | The AppMessage key matching the `appKey` item defined in your `appinfo.json`.  Set this to a unique string to allow this item to be looked up using `Clay.getItemsByAppKey()` in your custom function. You must set this if you wish for the value of this item to be persisted after the user closes the config page. |
 | label | string | The label that should appear next to this item. |
 | defaultValue | string | The default value of the dropdown menu. Must match a value in the `options` array. |
+| description | string | Optional sub-text to include below the component |
 | attributes | object | An object containing HTML attributes to set on the input field. You can add basic HTML5 validation this way by setting attribute such as `required`. |
 | options | array of objects | The options you want to appear in the dropdown menu. Each option is an object with a `label` and `value` property. |

@@ -286,11 +292,16 @@ A dropdown menu containing multiple options.

 ---

-#### Color
+#### Color Picker

-**Manipulator:** `color`
+**Manipulator:** [`color`](#color)

-A color picker containing the 64 supported colors on Basalt and Chalk.
+A color picker that allows users to choose a color from the ones that are compatible with their Pebble smartwatch. 
+The color picker will automatically show a different layout depending on the watch connected: 
+
+ - Aplite (Firmware 2.x) - Black and white
+ - Aplite (Firmware 3.x) - Black and white. Will also include gray (`#AAAAAA`) if `allowGray` is set to `true`
+ - Basalt/chalk - The 64 colors compatible with color Pebble smartwatches. 

 ##### Properties

@@ -300,8 +311,11 @@ A color picker containing the 64 supported colors on Basalt and Chalk.
 | id | string (unique) | Set this to a unique string to allow this item to be looked up using `Clay.getItemsById()` in your [custom function](#custom-function). |
 | appKey | string (unique) | The AppMessage key matching the `appKey` item defined in your `appinfo.json`.  Set this to a unique string to allow this item to be looked up using `Clay.getItemsByAppKey()` in your custom function. You must set this if you wish for the value of this item to be persisted after the user closes the config page. |
 | label | string | The label that should appear next to this item. |
-| defaultValue | string OR int | The default color. Always use the uncorrected value even if `sunlight` is true. The component will do the conversion internally. |
+| defaultValue | string OR int | The default color. One of the [64 colors](https://developer.pebble.com/guides/tools-and-resources/color-picker/) compatible with Pebble smartwatches. Always use the uncorrected value even if `sunlight` is true. The component will do the conversion internally. |
+| description | string | Optional sub-text to include below the component |
 | sunlight | boolean | Use the color-corrected sunlight color palette if `true`, else the uncorrected version. Defaults to `true` if not specified. |
+| layout | string OR array | Optional. Use a custom layout for the color picker. Defaults to automatically choosing the most appropriate layout for the connected watch. The layout is represented by a two dimensional array. Use `false` to insert blank spaces. You may also use one of the preset layouts by setting `layout` to: `"COLOR"`, `"GRAY"` or `"BLACK_WHITE"` |
+| allowGray | boolean | Optional. Set this to `true` to include gray (`#AAAAAA`) in the color picker for aplite running on firmware 3 and above. This is optional because only a subset of the drawing operations support gray on aplite. Defaults to `false` |

 ##### Example

@@ -309,17 +323,48 @@ A color picker containing the 64 supported colors on Basalt and Chalk.
 {
  "type": "color",
  "appKey": "background",
-  "defaultValue": "FF0000",
+  "defaultValue": "ff0000",
  "label": "Background Color",
-  "sunlight": true
+  "sunlight": true,
+  "layout": [
+    [false, "00aaff", false],
+    ["0055ff", "0000ff", "0000aa"],
+    [false, "5555ff", false]
+  ]
+}
+```
+
+##### Example
+
+```javascript
+{
+  "type": "color",
+  "appKey": "background",
+  "defaultValue": "ffffff",
+  "label": "Background Color",
+  "sunlight": false,
+  "layout": "BLACK_WHITE"
+}
+```
+
+##### Example
+
+```javascript
+{
+  "type": "color",
+  "appKey": "background",
+  "defaultValue": "aaaaaa",
+  "label": "Background Color",
+  "sunlight": false,
+  "allowGray": true
 }
 ```

 ---

-#### RadioGroup
+#### Radio Group

-**Manipulator:** `radiogroup`
+**Manipulator:** [`radiogroup`](#radiogroup)

 A list of options allowing the user can only choose one option to submit.

@@ -332,6 +377,7 @@ A list of options allowing the user can only choose one option to submit.
 | appKey | string (unique) | The AppMessage key matching the `appKey` item defined in your `appinfo.json`.  Set this to a unique string to allow this item to be looked up using `Clay.getItemsByAppKey()` in your custom function. You must set this if you wish for the value of this item to be persisted after the user closes the config page. |
 | label | string | The label that should appear next to this item. |
 | defaultValue | string | The default selected item. Must match a value in the `options` array. |
+| description | string | Optional sub-text to include below the component |
 | attributes | object | An object containing HTML attributes to set on the input field. You can add basic HTML5 validation this way by setting attribute such as `required`. |
 | options | array of objects | The options you want to appear in the radio group. Each option is an object with a `label` and `value` property. |

@@ -361,9 +407,9 @@ A list of options allowing the user can only choose one option to submit.

 ---

-#### CheckboxGroup
+#### Checkbox Group

-**Manipulator:** `checkboxgroup`
+**Manipulator:** [`checkboxgroup`](#checkboxgroup)

 A list of options where a user may choose more than one option to submit.

@@ -376,6 +422,7 @@ A list of options where a user may choose more than one option to submit.
 | appKey | string (unique) | The AppMessage key matching the `appKey` item defined in your `appinfo.json`.  Set this to a unique string to allow this item to be looked up using `Clay.getItemsByAppKey()` in your custom function. You must set this if you wish for the value of this item to be persisted after the user closes the config page. |
 | label | string | The label that should appear next to this item. |
 | defaultValue | array of strings | The default selected items. Each value must match one in the `options` array. |
+| description | string | Optional sub-text to include below the component |
 | attributes | object | An object containing HTML attributes to set on the input field. You can add basic HTML5 validation this way by setting attribute such as `required`. |
 | options | array of objects | The options you want to appear in the checkbox group. Each option is an object with a `label` and `value` property. |

@@ -406,9 +453,78 @@ A list of options where a user may choose more than one option to submit.

 ---

+### Generic Button
+
+**Manipulator:** [`button`](#button)
+
+##### Properties
+
+| Property | Type | Description |
+|----------|------|-------------|
+| type | string | Set to `button`. |
+| defaultValue | string | The text displayed on the button. |
+| primary | boolean | If `true` the button will be orange, if `false`, the button will be gray (defaults to `false`)|
+| attributes | object | An object containing HTML attributes to set on the input field. |
+| description | string | Optional sub-text to include below the component |
+
+##### Example
+
+```javascript
+{
+  "type": "button",
+  "primary": true,
+  "defaultValue": "Send"
+}
+```
+
+---
+
+### Range Slider
+
+**Manipulator:** [`slider`](#slider)
+
+The range slider is used to allow users to select numbers between two values. 
+
+**NOTE** If you set the `step` property to anything less than `1`, 
+it will multiply the final value sent to the watch by 10 to the power of the number of decimal places in the value of `step`.
+Eg: If you set the `step` to `0.25` and the slider has value of `34.5`, the watch will receive `3450`. 
+The reason why this is necessary, is because you can not send floats to the watch via `Pebble.sendAppMessage()`. 
+This allows your users to still be able to input values that have decimals, 
+you must just remember to divide the received value on the watch accordingly. 
+
+##### Properties
+
+| Property | Type | Description |
+|----------|------|-------------|
+| type | string | Set to `slider`. |
+| defaultValue | number | The value of the slider. |
+| label | string | The label that should appear next to this item. |
+| min | number | The minimum allowed value of the slider. Defaults to `100` |
+| max | number | The maximum allowed value of the slider. Defaults to `0` |
+| step | number | The multiple of the values allowed to be set on the slider. The slider will snap to these values. This value also determines the precision used when the value is sent to the watch. Defaults to 1 |
+| attributes | object | An object containing HTML attributes to set on the input field. |
+| description | string | Optional sub-text to include below the component |
+
+##### Example
+
+```javascript
+{
+  "type": "slider",
+  "appKey": "slider",
+  "defaultValue": 15,
+  "label": "Slider",
+  "description": "This is the description for the slider",
+  "min": 10,
+  "max": 20,
+  "step": 0.25
+},
+```
+
+---
+
 ### Submit

-**Manipulator:** `html`
+**Manipulator:** [`button`](#button)

 The submit button for the page. You **MUST** include this component somewhere in the config page (traditionally at the bottom) or users will not be able to save the form. 

@@ -433,8 +549,6 @@ The submit button for the page. You **MUST** include this component somewhere in

 ### Coming Soon

- Range Slider
- Generic Button
 - Tabs
 - Footer
 - Dynamic + draggable list
@@ -443,60 +557,101 @@ The submit button for the page. You **MUST** include this component somewhere in

 ## Manipulators 

-Each component has a **manipulator**. This is a set of methods used to talk to the item on the page. At a minimum, manipulators must have a `.get()` and `.set(value)` method. When the config page is closed, the `.get()` method is run on all components registered with an `appKey` to construct the object sent to the C app. Many of these methods fire an event when the method is called. You can listen for these events with `ClayItem.on()`.
+Each component has a **manipulator**. This is a set of methods used to talk to the item on the page. 
+At a minimum, manipulators must have a `.get()` and `.set(value)` method however there are also methods to assist in interactivity such as `.hide()` and `.disable()`. 
+**NOTE:** There is currently no way to disable or hide an entire section. You must disable/hide each item in the section to achieve this effect. 
+
+When the config page is closed, the `.get()` method is run on all components registered with an `appKey` to construct the object sent to the C app. 
+
+Many of these methods fire an event when the method is called. You can listen for these events with `ClayItem.on()`. 
+**NOTE** These events will only be fired if the state actually changes. 
+Eg: If you run the `.show()` manipulator on an item that is already visible, the `show` event will not be triggered.

 #### html

 | Method | Returns | Event Fired | Description | 
 |--------|---------|-------------| ------------|
 | `.set( [string\|HTML] value)` | `ClayItem` | `change` | Sets the content of this item. |
-| `.get()` | `string` | Gets the content of this item. |
+| `.get()` | `string` | | Gets the content of this item. |
+| `.hide()` | `ClayItem` | `hide` | Hides the item |
+| `.show()` | `ClayItem` | `show` | Shows the item |
+
+#### button
+
+| Method | Returns | Event Fired | Description | 
+|--------|---------|-------------| ------------|
+| `.set( [string\|HTML] value)` | `ClayItem` | `change` | Sets the content of this item. |
+| `.get()` | `string` | | Gets the content of this item. |
+| `.disable()` |  `ClayItem` | `disabled` | Prevents this item from being clicked by the user. |
+| `.enable()` |  `ClayItem` | `enabled` | Allows this item to be clicked by the user. |
+| `.hide()` | `ClayItem` | `hide` | Hides the item |
+| `.show()` | `ClayItem` | `show` | Shows the item |

 #### val

 | Method | Returns | Event Fired | Description | 
 |--------|---------|-------------| ------------|
 | `.set( [string] value)` | `ClayItem` | `change` | Sets the value of this item. |
-| `.get()` |  `string` | Gets the content of this item. |
+| `.get()` |  `string` | | Gets the content of this item. |
 | `.disable()` |  `ClayItem` | `disabled` | Prevents this item from being edited by the user. |
 | `.enable()` |  `ClayItem` | `enabled` | Allows this item to be edited by the user. |
+| `.hide()` | `ClayItem` | `hide` | Hides the item |
+| `.show()` | `ClayItem` | `show` | Shows the item |

 #### checked

 | Method | Returns | Event Fired | Description | 
 |--------|---------|-------------| ------------|
 | `.set( [boolean\|int] value)` | `ClayItem` | `change` | Check/uncheck the state of this item. |
-| `.get()` | `int` | 1 if checked, 0 if not checked |
+| `.get()` | `boolean` | | `true` if checked, `false` if not. **NOTE** this will be converted to a `1` or `0` when sent to the watch. See [`Clay.getSettings()`](#methods) |
 | `.disable()` | `ClayItem` | `disabled` | Prevents this item from being edited by the user. |
 | `.enable()` | `ClayItem` | `enabled` | Allows this item to be edited by the user. |
+| `.hide()` | `ClayItem` | `hide` | Hides the item |
+| `.show()` | `ClayItem` | `show` | Shows the item |

 #### color

 | Method | Returns | Event Fired | Description | 
 |--------|---------|-------------| ------------|
 | `.set( [string\|int] value)` | `ClayItem` | `change` | Sets the color picker to the provided color. If the value is a string, it must be provided in hex notation eg `'FF0000'`. |
-| `.get()` | `int` | Get the chosen color. This is returned as a number in order to make it easy to use on the watch side using `GColorFromHEX()`. |
+| `.get()` | `int` | | Get the chosen color. This is returned as a number in order to make it easy to use on the watch side using `GColorFromHEX()`. |
 | `.disable()` | `ClayItem` | `disabled` | Prevents this item from being edited by the user. |
 | `.enable()` | `ClayItem` | `enabled` | Allows this item to be edited by the user. |
+| `.hide()` | `ClayItem` | `hide` | Hides the item |
+| `.show()` | `ClayItem` | `show` | Shows the item |

 #### radiogroup

 | Method | Returns | Event Fired | Description | 
 |--------|---------|-------------| ------------|
 | `.set( [string] value)` | `ClayItem` | `change` | Checks the radio button that corresponds to the provided value. |
-| `.get()` |  `string` | Gets the value of the checked radio button in the list. |
+| `.get()` |  `string` | | Gets the value of the checked radio button in the list. |
 | `.disable()` | `ClayItem` | `disabled` | Prevents this item from being edited by the user. |
 | `.enable()` | `ClayItem` | `enabled` | Allows this item to be edited by the user. |
+| `.hide()` | `ClayItem` | `hide` | Hides the item |
+| `.show()` | `ClayItem` | `show` | Shows the item |

 #### checkboxgroup

 | Method | Returns | Event Fired | Description | 
 |--------|---------|-------------| ------------|
 | `.set( [array] value)` | `ClayItem` | `change` | Checks the checkboxes that corresponds to the provided list of values. |
-| `.get()` |  `Array.<string>` | Gets an array of strings representing the list of the values of the checked items |
+| `.get()` |  `Array.<string>` | | Gets an array of strings representing the list of the values of the checked items. **NOTE:** each item in the array will be separated by a zero when sent to the watch. See [`Clay.getSettings()`](#methods) |
 | `.disable()` | `ClayItem` | `disabled` | Prevents this item from being edited by the user. |
 | `.enable()` | `ClayItem` | `enabled` | Allows this item to be edited by the user. |
+| `.hide()` | `ClayItem` | `hide` | Hides the item |
+| `.show()` | `ClayItem` | `show` | Shows the item |

+#### slider
+
+| Method | Returns | Event Fired | Description | 
+|--------|---------|-------------| ------------|
+| `.set( [number] value)` | `ClayItem` | `change` | Sets the value of this item. |
+| `.get()` |  `number` | | Gets the value of this item. |
+| `.disable()` |  `ClayItem` | `disabled` | Prevents this item from being edited by the user. |
+| `.enable()` |  `ClayItem` | `enabled` | Allows this item to be edited by the user. |
+| `.hide()` | `ClayItem` | `hide` | Hides the item |
+| `.show()` | `ClayItem` | `show` | Shows the item |

 # Extending Clay

@@ -511,15 +666,23 @@ Example:
 ```javascript
 var Clay = require('./clay');
 var clayConfig = require('./config');
+var clayConfigAplite = require('./config-aplite');
 var clay = new Clay(clayConfig, null, { autoHandleEvents: false });

 Pebble.addEventListener('showConfiguration', function(e) {
+  
+  // This is an example of how you might load a different config based on platform.
+  var platform = clay.meta.activeWatchInfo.platform || 'aplite';
+  if (platform === 'aplite') {
+    clay.config = clayConfigAplite;
+  }
+  
  Pebble.openURL(clay.generateUrl());
 });

 Pebble.addEventListener('webviewclosed', function(e) {
-  if (e && !e.response) { 
-    return; 
+  if (e && !e.response) {
+    return;
  }

  // Get the keys and values from each config item
@@ -535,8 +698,75 @@ Pebble.addEventListener('webviewclosed', function(e) {
 });
 ```

+## Clay and Pebble.js
+
+If you are using [Pebble.js](https://developer.pebble.com/docs/pebblejs/) and would like to use Clay, There are some extra steps to follow:
+
+1. Remove all your `Settings.config` calls. Clay will handle the settings from now on. 
+2. Use the example below to modify your `app.js`. Notice that `autoHandleEvents` is set to `false` in the Clay constructor.: 
+
+```javascript
+var Settings = require('settings');
+var Clay = require('./clay');
+var clayConfig = require('./config');
+var clay = new Clay(clayConfig, null, {autoHandleEvents: false});
+
+Pebble.addEventListener('showConfiguration', function(e) {
+  Pebble.openURL(clay.generateUrl());
+});
+
+Pebble.addEventListener('webviewclosed', function(e) {
+  if (e && !e.response) {
+    return;
+  }
+  var dict = clay.getSettings(e.response);
+  
+  // Save the Clay settings to the Settings module. 
+  Settings.option(dict);
+});
+```
+
+### Caveats
+
+Clay treats colors as numbers. You will need to convert these numbers to CSS colors before they can be used by Pebble.js. Use the function below to convert the colors.
+
+```javascript
+function cssColor(color) {
+  color = color.toString(16);
+  while (color.length < 6) {
+    color = '0' + color;
+  }
+  return '#' + color;
+}
+
+// Example usage with default: 
+cssColor(Settings.option('BACKGROUND_COLOR') || 0xff0000);
+```
+
 ### `Clay([Array] config, [function] customFn, [object] options)`

+#### Constructor Parameters
+
+| Parameter | Type | Description |
+|----------|-------|-------------|
+| `config` | Array | The config that will be used to generate the configuration page |
+| `customFn` | Function\|null | (Optional) The [custom function](#custom-function) to be injected into the generated configuration page.  |
+| `options` | Object | (Optional) See below for properties |
+| `options.autoHandleEvents` | Boolean | (Optional) Defaults to `true`. If set to `false`, Clay will not [auto handle the `showConfiguration` and `webviewclosed` events](#handling-the-showconfiguration-and-webviewclosed-events-manually) |
+| `options.userData` | Any | (Optional) Any arbitrary data you want to pass to your config page. It will be available in your custom function as `this.meta.userData` |
+
+#### Properties
+
+| Property | Type | Description |
+|----------|------|-------------|
+| `.config` | Array | Copy of the config passed to the constructor and used for generating the page. |
+| `.customFn` | Function | Reference to the custom function passed to the constructor. **WARNING** this is a direct reference, not a copy of the custom function so any modification you make to it, will be reflected on the original as well |
+| `.meta` | Object | Contains information about the current user and watch. **WARNING** This will only be populated in the `showConfiguration` event handler. (See example above) |
+| `.meta.activeWatchInfo` | watchinfo\|null | An object containing information on the currently connected Pebble smartwatch or null if unavailable. Read more [here](https://developer.pebble.com/docs/js/Pebble/#getActiveWatchInfo). |
+| `.meta.accountToken` | String | A unique account token that is associated with the Pebble account of the current user. Read more [here](https://developer.pebble.com/docs/js/Pebble/#getAccountToken). |
+| `.meta.watchToken` | String | A unique token that can be used to identify a Pebble device. Read more [here](https://developer.pebble.com/docs/js/Pebble/#getWatchToken). |
+| `.meta.userData` | Any | A deep copy of the arbitrary data provided in the `options.userData`. Defaults to an empty object |
+
 #### Methods

 | Method | Returns |
@@ -544,7 +774,7 @@ Pebble.addEventListener('webviewclosed', function(e) {
 | `Clay( [array] config, [function] customFn=null, [object] options={autoHandleEvents: true})` <br> `config` - an Array representing your config <br> `customFn` - function to be run in the context of the generated page <br> `options.autoHandleEvents` - set to `false` to prevent Clay from automatically handling the "showConfiguration" and "webviewclosed" events | `Clay` - a new instance of Clay. |
 | `.registerComponent( [ClayComponent] component )` <br> Registers a custom component. | `void`. |  
 | `.generateUrl()` | `string` - The URL to open with `Pebble.openURL()` to use the Clay-generated config page. |
-| `.getSettings(response)` <br> `response` - the response object provided to the "webviewclosed" event | `Object` - object of keys and values for each config page item with an `appKey`, where the key is the `appKey` and the value is the chosen value of that item. |
+| `.getSettings( [object] response, [boolean] convert=true)` <br> `response` - the response object provided to the "webviewclosed" event <br> `convert` - Pass `false` to not convert the settings to be compatible with `Pebble.sendAppMessage()` | `Object` - object of keys and values for each config page item with an `appKey`, where the key is the `appKey` and the value is the chosen value of that item.  This method will do some conversions depending on the type of the setting. Arrays containing strings will have zeros inserted before each item. eg `['one', 'two']` becomes `['one', 0, 'two', 0]`. Booleans will be converted to numbers. eg `true` becomes `1` and `false` becomes `0`. Pass `false` as the second parameter to disable this behavior |

 ---

@@ -567,31 +797,47 @@ Make sure to always wait for the config page to be built before manipulating ite
 var Clay = require('./clay');
 var clayConfig = require('./config');
 var customClay = require('./custom-clay');
-var clay = new Clay(clayConfig, customClay);
+var userData = {token: 'abc123'}
+var clay = new Clay(clayConfig, customClay, {userData: userData});
 ```

 ##### custom-clay.js

 ```javascript
 module.exports = function(minified) {
-  var Clay = this;
+  var clayConfig = this;
  var _ = minified._;
  var $ = minified.$;
  var HTML = minified.HTML;

  function toggleBackground() {
    if (this.get()) {
-      Clay.getItemByAppKey('background').enable();
+      clayConfig.getItemByAppKey('background').enable();
    } else {
-      Clay.getItemByAppKey('background').disable();
+      clayConfig.getItemByAppKey('background').disable();
    }
  }

-  Clay.on(Clay.EVENTS.AFTER_BUILD, function() {
-    var coolStuffToggle = Clay.getItemByAppKey('cool_stuff');
+  clayConfig.on(clayConfig.EVENTS.AFTER_BUILD, function() {
+    var coolStuffToggle = clayConfig.getItemByAppKey('cool_stuff');
    toggleBackground.call(coolStuffToggle);
    coolStuffToggle.on('change', toggleBackground);
+    
+    // Hide the color picker for aplite
+    if (!clayConfig.meta.activeWatchInfo || clayConfig.meta.activeWatchInfo.platform === 'aplite') {
+      clayConfig.getItemByAppKey('background').hide();
+    }
+    
+    // Set the value of an item based on the userData
+    $.request('get', 'https://some.cool/api', {token: clayConfig.meta.userData.token})
+      .then(function(result) {
+        // Do something interesting with the data from the server
+      })
+      .error(function(status, statusText, responseText) {
+        // Handle the error
+      });
  });
+  
 };
 ```

@@ -599,7 +845,7 @@ module.exports = function(minified) {

 ### `ClayConfig([Object] settings, [Array] config, [$Minified] $rootContainer)`

-This is the main way of talking to your generated config page.
+This is the main way of talking to your generated config page. An instance of this class will be passed as the context of your custom function when it runs on the generated config page. 

 #### Properties

@@ -607,7 +853,12 @@ This is the main way of talking to your generated config page.
 |----------|------|-------------|
 | `.EVENTS.BEFORE_BUILD` | String | Dispatched prior to building the page. |
 | `.EVENTS.AFTER_BUILD` | String | Dispatched after building the page. |
-| `.config` | Array | Reference to the config passed to the constructer and used for generating the page. |
+| `.config` | Array | Reference to the config passed to the constructor and used for generating the page. |
+| `.meta` | Object | Contains information about the current user and watch |
+| `.meta.activeWatchInfo` | watchinfo\|null | An object containing information on the currently connected Pebble smartwatch or null if unavailable. Read more [here](https://developer.pebble.com/docs/js/Pebble/#getActiveWatchInfo). |
+| `.meta.accountToken` | String | A unique account token that is associated with the Pebble account of the current user. Read more [here](https://developer.pebble.com/docs/js/Pebble/#getAccountToken). |
+| `.meta.watchToken` | String | A unique token that can be used to identify a Pebble device. Read more [here](https://developer.pebble.com/docs/js/Pebble/#getWatchToken). |
+| `.meta.userData` | Any | The data passed in the `options.userData` of the [Clay constructor.](#clayarray-config-function-customfn-object-options) |


 #### Methods
@@ -618,7 +869,7 @@ This is the main way of talking to your generated config page.
 | `.getItemByAppKey( [string] appKey )` | `ConfigItem\|undefined` - a single `ConfigItem` that has the provided `appKey`, otherwise `undefined`. |
 | `.getItemById( [string] id )` | `ConfigItem\|undefined` - a single `ConfigItem` that has the provided `id`, otherwise `undefined`. |
 | `.getItemsByType( [string] type )` | `Array.<ConfigItem>` - an array of config items that match the provided `type`. |
-| `.getSettings()` | `Object` - an object representing all items with an `appKey` where the key is the `appKey` and the value is the result of running `.get()` on the Clay item. |
+| `.serialize()` | `Object` - an object representing all items with an `appKey` where the key is the `appKey` and the value is an object with the `value` property set to the result of running `.get()` on the Clay item. If the Clay item has a `precision` property set, it is included in the object |
 | `.build()` <br> Builds the config page. Will dispatch the `BEFORE_BUILD` event prior to building the page, then the `AFTER_BUILD` event once it is complete. | `ClayConfig` |
 | `.on( [string] events, [function] handler )` <br> Register an event to the provided handler. The handler will be called with this instance of `ClayConfig` as the context. If you wish to register multiple events to the same handler, then separate the events with a space | `ClayConfig` |
 | `.off( [function] handler )` <br> Remove the given event handler. **NOTE:** This will remove the handler from all registered events. | `ClayConfig` |
@@ -637,7 +888,7 @@ This is the main way of talking to your generated config page.
 | `.appKey` | String | The ID of the item if provided in the config. |
 | `.config` | Object | Reference to the config passed to the constructer. |
 | `$element` | $Minified | A Minified list representing the root HTML element of the config item. |
-| `$manipulatorTarget` | A Minified list representing the HTML element with **data-manipulator-target** set. This is generally pointing to the main `<input>` element and will be used for binding events. |
+| `$manipulatorTarget` | $Minified | A Minified list representing the HTML element with **data-manipulator-target** set. This is generally pointing to the main `<input>` element and will be used for binding events. |


 #### Methods
@@ -670,7 +921,7 @@ Components are simple objects with the following properties.
 | `style` | string | no | Any extra CSS styles you want to inject into the page. Make sure to namespace your CSS with a class that is unique to your component in order to avoid conflicts with other components. |
 | `manipulator` | string / manipulator | yes | Provide a string here to use one of the built-in manipulators, such as `val`. If an object is provided, it must have both a `.set(value)` and `.get()` method. |
 | `defaults` | object | Only if your template requires it. | An object of all the defaults your template requires. |
-| `initialize` | function | no | Method which will be called after the item has been added to the page. It will be called with the `ClayItem` as the context (`this`) and with `minified` as the first parameter. |
+| `initialize` | function | no | Method which will be called after the item has been added to the page. It will be called with the `ClayItem` as the context (`this`) and with [`minified`](#minified) as the first parameter and [`clayConfig`](#clayconfigobject-settings-array-config-minified-rootcontainer) as the second paramater |

 ### Registering a custom component. 

@@ -24,33 +24,50 @@ module.exports = [
        "type": "input",
        "appKey": "email",
        "defaultValue": "",
-        "label": "Email",
+        "label": "Input Field",
+        "description": "This is a description for the input component. " +
+                       "You can add <strong>html</strong> in here too.",
        "attributes": {
-          "placeholder": "eg: name@domain.com",
-          "limit": 10,
-          "required": "required",
-          type: "email"
+          "placeholder": "Placeholder set with attributes"
        }
      },
+      {
+        "type": "slider",
+        "appKey": "slider",
+        "defaultValue": 15,
+        "label": "Slider",
+        "description": "This is the description for the slider",
+        "min": 10,
+        "max": 20,
+        "step": 0.25
+      },
      {
        "type": "toggle",
        "appKey": "cool_stuff",
-        "label": "Enable Cool Stuff",
+        "label": "This is a Toggle",
        "defaultValue": false
      },
      {
        "type": "color",
        "appKey": "colorTest",
        "defaultValue": "FF0000",
-        "label": "Background Color",
+        "label": "Standard Color Picker",
        "sunlight": false
      },
      {
        "type": "color",
        "appKey": "sunnyColorTest",
        "defaultValue": "00FF00",
-        "label": "Sunny Color",
+        "label": "Sunny Color Picker",
        "sunlight": true
+      },
+      {
+        type: 'button',
+        id: 'testButton',
+        primary: false,
+        defaultValue: 'Generic Button',
+        description: 'This is a generic button. ' +
+                     'You can listen for standard events like "click"'
      }
    ]
  },
@@ -64,46 +81,33 @@ module.exports = [
      {
        "type": "radiogroup",
        "appKey": "radiogroup-test",
-        "label": "Radio test",
+        "label": "Radio Group",
        "options": [
-          { "label": "Test thing one", "value": "one" },
+          { "label": "Test thing", "value": "one" },
          { "label": "Another thing", "value": "two" },
-          { "label": "One really long thing that would not fit", "value": "three" },
-          { "label": "Small", "value": "quote' \"test" },
-          { "label": "Final thing", "value": "three" }
+          { "label": "Final thing with <em>html</em>", "value": "three" }
        ]
      },
      {
        "type": "checkboxgroup",
        "appKey": "checkboxgroup-test",
        "defaultValue": ["quote' \"test", "two"],
-        "label": "Checkbox test",
+        "label": "Checkbox Group",
        "options": [
-          { "label": "Test <strong>thing</strong> one", "value": "one" },
+          { "label": "First thing", "value": "three" },
          { "label": "Another thing", "value": "two" },
-          { "label": "One really long thing that would not fit", "value": "three" },
-          { "label": "Small", "value": "quote' \"test" },
          { "label": "Final thing", "value": "three" }
        ]
      },
-      {
-        "type": "input",
-        "appKey": "date",
-        "defaultValue": "",
-        "label": "Range",
-        "attributes": {
-          type: "range"
-        }
-      },
      {
        "type": "select",
        "appKey": "flavor",
        "defaultValue": "grape",
-        "label": "Favorite Flavor",
+        "label": "Select Menu",
        "options": [
          { "label": "", "value": "" },
          { "label": "Berry", "value": "berry" },
-          { "label": "Grape", "value": "grape" },
+          { "label": "This Option is Selected", "value": "grape" },
          { "label": "Banana", "value": "banana" }
        ],
        "attributes": {
@@ -10,9 +10,9 @@ module.exports = function() {
   */
  function toggleBackground() {
    if (this.get()) {
-      Clay.getItemByAppKey('background').enable();
+      Clay.getItemByAppKey('colorTest').enable();
    } else {
-      Clay.getItemByAppKey('background').disable();
+      Clay.getItemByAppKey('colorTest').disable();
    }
  }

@@ -21,4 +21,6 @@ module.exports = function() {
    toggleBackground.call(coolStuffToggle);
    coolStuffToggle.on('change', toggleBackground);
  });
+
+  console.log('userData: ', Clay.meta.userData);
 };
@@ -5,6 +5,9 @@ window.clayConfig = require('./config.js');
 window.claySettings = {};
 window.customFn = require('./custom-fn.js');
 window.clayComponents = require('../src/scripts/components');
+window.clayMeta = require('../test/fixture').meta({
+  userData: {foo: 'bar'}
+});

 var platform = window.navigator.userAgent.match(/Android/) ? 'android' : 'ios';
 document.documentElement.classList.add('platform-' + platform);
@@ -20,9 +20,14 @@

    var returnTo = getQueryParam('return_to');
    var data = decodeURIComponent(location.hash.substring(1));
-    if (data) {
+
+    // Check if we dealing with a base64 encoded URI
+    if (data && data.charAt(0) !== '<') {
      data = window.atob(data).replace('$$RETURN_TO$$', returnTo);
      window.location.href = 'data:text/html;base64,' + encodeURIComponent(window.btoa(data));
+    } else if (data) {
+      data = data.replace('$$RETURN_TO$$', returnTo);
+      window.location.href = 'data:text/html;charset=utf-8,' + encodeURIComponent(data);
    }
  </script>
  <body>
@@ -86,6 +86,7 @@ gulp.task('clay', ['inlineHtml'], function() {
    debug: false,
    standalone: 'clay'
  })
+    .transform('deamdify')
    .transform(stringify(stringifyOptions))
    .transform(sassify, sassifyOptions)
    .transform(autoprefixify, autoprefixerOptions)
@@ -93,7 +94,9 @@ gulp.task('clay', ['inlineHtml'], function() {
    .bundle()
    .pipe(source('clay.js'))
    .pipe(buffer())
-    .pipe(uglify())
+    .pipe(uglify({
+      preserveComments: 'license'
+    }))
    .pipe(insert.prepend(versionMessage))
    .pipe(gulp.dest('./dist/'));
 });
@@ -103,6 +106,7 @@ gulp.task('dev-js', ['js', 'sass'], function() {
    .transform(stringify(stringifyOptions))
    .transform('deamdify')
    .transform(sassify, sassifyOptions)
+    .transform(autoprefixify, autoprefixerOptions)
    .bundle()
    .pipe(source('dev.js'))
    .pipe(gulp.dest('./tmp/'));
@@ -3,14 +3,17 @@
 var configPageHtml = require('./tmp/config-page.html');
 var toSource = require('tosource');
 var standardComponents = require('./src/scripts/components');
+var deepcopy = require('deepcopy/build/deepcopy.min');

 /**
 * @param {Array} config - the Clay config
 * @param {function} [customFn] - Custom code to run from the config page. Will run
 *   with the ClayConfig instance as context
 * @param {Object} [options] - Additional options to pass to Clay
- * @param {boolean} [options.autoHandleEvents] - If false, Clay will not
+ * @param {boolean} [options.autoHandleEvents=true] - If false, Clay will not
 *   automatically handle the 'showConfiguration' and 'webviewclosed' events
+ * @param {*} [options.userData={}] - Arbitrary data to pass to the config page. Will
+ *   be available as `clayConfig.meta.userData`
 * @constructor
 */
 function Clay(config, customFn, options) {
@@ -26,14 +29,35 @@ function Clay(config, customFn, options) {

  options = options || {};

-  self.config = config;
+  self.config = deepcopy(config);
  self.customFn = customFn || function() {};
  self.components = {};
+  self.meta = {
+    activeWatchInfo: null,
+    accountToken: '',
+    watchToken: '',
+    userData: {}
+  };
+
+  /**
+   * Populate the meta with data from the Pebble object. Make sure to run this inside
+   * either the "showConfiguration" or "ready" event handler
+   * @return {void}
+   */
+  function _populateMeta() {
+    self.meta = {
+      activeWatchInfo: Pebble.getActiveWatchInfo && Pebble.getActiveWatchInfo(),
+      accountToken: Pebble.getAccountToken(),
+      watchToken: Pebble.getWatchToken(),
+      userData: deepcopy(options.userData || {})
+    };
+  }

  // Let Clay handle all the magic
  if (options.autoHandleEvents !== false && typeof Pebble !== 'undefined') {

    Pebble.addEventListener('showConfiguration', function() {
+      _populateMeta();
      Pebble.openURL(self.generateUrl());
    });

@@ -49,6 +73,10 @@ function Clay(config, customFn, options) {
        console.log(JSON.stringify(error));
      });
    });
+  } else if (typeof Pebble !== 'undefined') {
+    Pebble.addEventListener('ready', function() {
+      _populateMeta();
+    });
  }

  /**
@@ -107,7 +135,8 @@ Clay.prototype.generateUrl = function() {
    .replace('$$CUSTOM_FN$$', toSource(this.customFn))
    .replace('$$CONFIG$$', toSource(this.config))
    .replace('$$SETTINGS$$', toSource(settings))
-    .replace('$$COMPONENTS$$', toSource(this.components));
+    .replace('$$COMPONENTS$$', toSource(this.components))
+    .replace('$$META$$', toSource(this.meta));

  // if we are in the emulator then we need to proxy the data via a webpage to
  // obtain the return_to.
@@ -125,9 +154,10 @@ Clay.prototype.generateUrl = function() {
 /**
 * Parse the response from the webviewclosed event data
 * @param {string} response
+ * @param {boolean} [convert=true]
 * @returns {Object}
 */
-Clay.prototype.getSettings = function(response) {
+Clay.prototype.getSettings = function(response, convert) {
  // Decode and parse config data as JSON
  var settings = {};

@@ -137,64 +167,113 @@ Clay.prototype.getSettings = function(response) {
    throw new Error('The provided response was not valid JSON');
  }

-  localStorage.setItem('clay-settings', JSON.stringify(settings));
-  return settings;
+  // flatten the settings for localStorage
+  var settingsStorage = {};
+  Object.keys(settings).forEach(function(key) {
+    if (typeof settings[key] === 'object' && settings[key]) {
+      settingsStorage[key] = settings[key].value;
+    } else {
+      settingsStorage[key] = settings[key];
+    }
+  });
+
+  localStorage.setItem('clay-settings', JSON.stringify(settingsStorage));
+
+  return convert === false ? settings : Clay.prepareSettingsForAppMessage(settings);
 };

 /**
 * @param {string} input
- * @param {string} [prefix]
+ * @param {string} [prefix='data:text/html;charset=utf-8,']
 * @returns {string}
 */
 Clay.encodeDataUri = function(input, prefix) {
-  prefix = typeof prefix !== 'undefined' ? prefix : 'data:text/html;base64,';
+  prefix = typeof prefix !== 'undefined' ? prefix : 'data:text/html;charset=utf-8,';
+  return prefix + encodeURIComponent(input);
+};

-  if (window.btoa) {
-    return prefix + encodeURIComponent(window.btoa(input));
+/**
+ * Converts the val into a type compatible with Pebble.sendAppMessage().
+ *  - Strings will be returned without modification
+ *  - Numbers will be returned without modification
+ *  - Booleans will be converted to a 0 or 1
+ *  - Arrays that contain strings will be split with a zero.
+ *    eg: ['one', 'two'] becomes ['one', 0, 'two', 0]
+ *  - Arrays that contain numbers will be returned without modification
+ *    eg: [1, 2] becomes [1, 2]
+ *  - Arrays that contain booleans will be converted to a 0 or 1
+ *    eg: [true, false] becomes [1, 0]
+ *  - Arrays must be single dimensional
+ *  - Objects that have a "value" property will apply the above rules to the type of
+ *    value. If the value is a number or an array of numbers and the optional
+ *    property: "precision" is provided, then the number will be multipled by 10 to
+ *    the power of precision (value * 10 ^ precision) and then floored.
+ *    Eg: 1.4567 with a precision set to 3 will become 1456
+ * @param {number|string|boolean|Array|Object} val
+ * @param {number|string|boolean|Array} val.value
+ * @param {number} [val.precision=0]
+ * @returns {number|string|Array}
+ */
+Clay.prepareForAppMessage = function(val) {
+
+  /**
+   * moves the decimal place of a number by precision then drop any remaining decimal
+   * places.
+   * @param {number} number
+   * @param {number} precision - number of decimal places to move
+   * @returns {number}
+   * @private
+   */
+  function _normalizeToPrecision(number, precision) {
+    return Math.floor(number * Math.pow(10, precision || 0));
  }

-  // iOS doesn't have a window so we need to polyfil window.btoa
-  // extracted from https://github.com/inexorabletash/polyfill
-  var B64_ALPHABET =
-    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-  input = String(input);
-  var position = 0;
-  var out = [];
-  var o1;
-  var o2;
-  var o3;
-  var e1;
-  var e2;
-  var e3;
-  var e4;
+  var result;

-  if (/[^\x00-\xFF]/.test(input)) { throw Error('InvalidCharacterError'); }
-
-  while (position < input.length) {
-    o1 = input.charCodeAt(position++);
-    o2 = input.charCodeAt(position++);
-    o3 = input.charCodeAt(position++);
-
-    // 111111 112222 222233 333333
-    e1 = o1 >> 2;
-    e2 = ((o1 & 0x3) << 4) | (o2 >> 4);
-    e3 = ((o2 & 0xf) << 2) | (o3 >> 6);
-    e4 = o3 & 0x3f;
-
-    if (position === input.length + 2) {
-      e3 = 64;
-      e4 = 64;
-    } else if (position === input.length + 1) {
-      e4 = 64;
+  if (Array.isArray(val)) {
+    result = [];
+    val.forEach(function(item) {
+      var itemConverted = Clay.prepareForAppMessage(item);
+      result.push(itemConverted);
+      if (typeof itemConverted === 'string') {
+        result.push(0);
+      }
+    });
+  } else if (typeof val === 'object' && val) {
+    if (typeof val.value === 'number') {
+      result = _normalizeToPrecision(val.value, val.precision);
+    } else if (Array.isArray(val.value)) {
+      result = val.value.map(function(item) {
+        if (typeof item === 'number') {
+          return _normalizeToPrecision(item, val.precision);
+        }
+        return item;
+      });
+    } else {
+      result = Clay.prepareForAppMessage(val.value);
    }
-
-    out.push(B64_ALPHABET.charAt(e1),
-      B64_ALPHABET.charAt(e2),
-      B64_ALPHABET.charAt(e3),
-      B64_ALPHABET.charAt(e4));
+  } else if (typeof val === 'boolean') {
+    result = val ? 1 : 0;
+  } else {
+    result = val;
  }

-  return prefix + encodeURIComponent(out.join(''));
+  return result;
+};
+
+/**
+ * Converts a Clay settings dict into one that is compatible with
+ * Pebble.sendAppMessage();
+ * @see {prepareForAppMessage}
+ * @param {Object} settings
+ * @returns {{}}
+ */
+Clay.prepareSettingsForAppMessage = function(settings) {
+  var result = {};
+  Object.keys(settings).forEach(function(key) {
+    result[key] = Clay.prepareForAppMessage(settings[key]);
+  });
+  return result;
 };

 module.exports = Clay;
@@ -1,6 +1,6 @@
 {
  "name": "pebble-clay",
-  "version": "0.1.0",
+  "version": "0.1.5",
  "description": "Pebble Config Framework",
  "main": "dist/clay.js",
  "directories": {
@@ -35,6 +35,7 @@
    "browserify-istanbul": "^0.2.1",
    "chai": "^3.4.1",
    "deamdify": "^0.2.0",
+    "deepcopy": "^0.6.1",
    "del": "^2.0.2",
    "eslint": "^1.5.1",
    "eslint-config-pebble": "^1.2.0",
@@ -10,6 +10,7 @@
      window.claySettings = $$SETTINGS$$;
      window.customFn = $$CUSTOM_FN$$;
      window.clayComponents = $$COMPONENTS$$;
+      window.clayMeta = $$META$$;
    </script>
  </head>
  <body>
@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  name: 'button',
+  template: require('../../templates/components/button.tpl'),
+  style: require('../../styles/clay/components/button.scss'),
+  manipulator: 'button',
+  defaults: {
+    primary: false,
+    attributes: {},
+    description: ''
+  }
+};
@@ -8,6 +8,7 @@ module.exports = {
  defaults: {
    label: '',
    options: [],
+    description: '',
    attributes: {}
  }
 };
@@ -6,119 +6,228 @@ module.exports = {
  style: require('../../styles/clay/components/color.scss'),
  manipulator: 'color',
  defaults: {
-    label: ''
+    label: '',
+    description: ''
  },
-  initialize: function(minified) {
+  initialize: function(minified, clay) {
    var HTML = minified.HTML;
    var self = this;
-    var useSunlight = self.config.sunlight !== false;
-    var sunlightColorMap = {
-      '000000': '000000',
-      '000055': '001e41',
-      '0000aa': '004387',
-      '0000ff': '0068ca',
-      '005500': '2b4a2c',
-      '005555': '27514f',
-      '0055aa': '16638d',
-      '0055ff': '007dce',
-      '00aa00': '5e9860',
-      '00aa55': '5c9b72',
-      '00aaaa': '57a5a2',
-      '00aaff': '4cb4db',
-      '00ff00': '8ee391',
-      '00ff55': '8ee69e',
-      '00ffaa': '8aebc0',
-      '00ffff': '84f5f1',
-      '550000': '4a161b',
-      '550055': '482748',
-      '5500aa': '40488a',
-      '5500ff': '2f6bcc',
-      '555500': '564e36',
-      '555555': '545454',
-      '5555aa': '4f6790',
-      '5555ff': '4180d0',
-      '55aa00': '759a64',
-      '55aa55': '759d76',
-      '55aaaa': '71a6a4',
-      '55aaff': '69b5dd',
-      '55ff00': '9ee594',
-      '55ff55': '9de7a0',
-      '55ffaa': '9becc2',
-      '55ffff': '95f6f2',
-      'aa0000': '99353f',
-      'aa0055': '983e5a',
-      'aa00aa': '955694',
-      'aa00ff': '8f74d2',
-      'aa5500': '9d5b4d',
-      'aa5555': '9d6064',
-      'aa55aa': '9a7099',
-      'aa55ff': '9587d5',
-      'aaaa00': 'afa072',
-      'aaaa55': 'aea382',
-      'aaaaaa': 'ababab',
-      'ffffff': 'ffffff',
-      'aaaaff': 'a7bae2',
-      'aaff00': 'c9e89d',
-      'aaff55': 'c9eaa7',
-      'aaffaa': 'c7f0c8',
-      'aaffff': 'c3f9f7',
-      'ff0000': 'e35462',
-      'ff0055': 'e25874',
-      'ff00aa': 'e16aa3',
-      'ff00ff': 'de83dc',
-      'ff5500': 'e66e6b',
-      'ff5555': 'e6727c',
-      'ff55aa': 'e37fa7',
-      'ff55ff': 'e194df',
-      'ffaa00': 'f1aa86',
-      'ffaa55': 'f1ad93',
-      'ffaaaa': 'efb5b8',
-      'ffaaff': 'ecc3eb',
-      'ffff00': 'ffeeab',
-      'ffff55': 'fff1b5',
-      'ffffaa': 'fff6d3'
-    };

    /**
     * @param {string|boolean|number} color
     * @returns {string}
     */
    function cssColor(color) {
-      if (color === false) { return 'transparent'; }
      if (typeof color === 'number') {
        color = color.toString(16);
+      } else if (!color) {
+        return 'transparent';
      }
-      while (color.length < 6) {
-        color = '0' + color;
-      }
+
+      color = padColorString(color);

      return '#' + (useSunlight ? sunlightColorMap[color] : color);
    }

+    /**
+     * @param {string} color
+     * @return {string}
+     */
+    function padColorString(color) {
+      color = color.toLowerCase();
+
+      while (color.length < 6) {
+        color = '0' + color;
+      }
+
+      return color;
+    }
+
+    /**
+     * @param {number|string} value
+     * @returns {string|*}
+     */
+    function normalizeColor(value) {
+      switch (typeof value) {
+        case 'number': return padColorString(value.toString(16));
+        case 'string': return value.replace(/^#|^0x/, '');
+        default: return value;
+      }
+    }
+
+    /**
+     * @param {Array.<Array>} layout
+     * @returns {Array}
+     */
+    function flattenLayout(layout) {
+      return layout.reduce(function(a, b) {
+        return a.concat(b);
+      }, []);
+    }
+
+    /**
+     * Convert HEX color to LAB.
+     * Adapted from: https://github.com/antimatter15/rgb-lab
+     * @param {string} hex
+     * @returns {Array} - [l, a, b]
+     */
+    function hex2lab(hex) {
+      hex = hex.replace(/^#|^0x/, '');
+
+      var r = parseInt(hex.slice(0, 2), 16) / 255;
+      var g = parseInt(hex.slice(2, 4), 16) / 255;
+      var b = parseInt(hex.slice(4), 16) / 255;
+
+      r = (r > 0.04045) ? Math.pow((r + 0.055) / 1.055, 2.4) : r / 12.92;
+      g = (g > 0.04045) ? Math.pow((g + 0.055) / 1.055, 2.4) : g / 12.92;
+      b = (b > 0.04045) ? Math.pow((b + 0.055) / 1.055, 2.4) : b / 12.92;
+
+      var x = (r * 0.4124 + g * 0.3576 + b * 0.1805) / 0.95047;
+      var y = (r * 0.2126 + g * 0.7152 + b * 0.0722) / 1.00000;
+      var z = (r * 0.0193 + g * 0.1192 + b * 0.9505) / 1.08883;
+
+      x = (x > 0.008856) ? Math.pow(x, 1 / 3) : (7.787 * x) + 16 / 116;
+      y = (y > 0.008856) ? Math.pow(y, 1 / 3) : (7.787 * y) + 16 / 116;
+      z = (z > 0.008856) ? Math.pow(z, 1 / 3) : (7.787 * z) + 16 / 116;
+
+      return [(116 * y) - 16, 500 * (x - y), 200 * (y - z)];
+    }
+
+    /**
+     * Find the perceptual color distance between two LAB colors
+     * @param {Array} labA
+     * @param {Array} labB
+     * @returns {number}
+     */
+    function deltaE(labA, labB) {
+      var deltaL = labA[0] - labB[0];
+      var deltaA = labA[1] - labB[1];
+      var deltaB = labA[2] - labB[2];
+
+      return Math.sqrt(Math.pow(deltaL, 2) +
+                       Math.pow(deltaA, 2) +
+                       Math.pow(deltaB, 2));
+    }
+
+    /**
+     * Returns the layout based on the connected watch
+     * @returns {Array}
+     */
+    function autoLayout() {
+      if (!clay.meta.activeWatchInfo ||
+          clay.meta.activeWatchInfo.firmware.major === 2 ||
+          clay.meta.activeWatchInfo.platform === 'aplite' &&
+          !self.config.allowGray) {
+        return standardLayouts.BLACK_WHITE;
+      }
+
+      if (clay.meta.activeWatchInfo.platform === 'aplite' && self.config.allowGray) {
+        return standardLayouts.GRAY;
+      }
+
+      return standardLayouts.COLOR;
+    }
+
+    /**
+     * @param {number|string} color
+     * @return {number}
+     */
+    self.roundColorToLayout = function(color) {
+      var itemValue = normalizeColor(color);
+
+      // if the color is not in the layout we will need find the closest match
+      if (colorList.indexOf(itemValue) === -1) {
+        var itemValueLAB = hex2lab(itemValue);
+        var differenceArr = colorList.map(function(color) {
+          var colorLAB = hex2lab(normalizeColor(color));
+          return deltaE(itemValueLAB, colorLAB);
+        });
+
+        // Get the lowest number from the differenceArray
+        var lowest = Math.min.apply(Math, differenceArr);
+
+        // Get the index for that lowest number
+        var index = differenceArr.indexOf(lowest);
+        itemValue = colorList[index];
+      }
+
+      return parseInt(itemValue, 16);
+    };
+
+    var useSunlight = self.config.sunlight !== false;
+    var sunlightColorMap = {
+      '000000': '000000', '000055': '001e41', '0000aa': '004387', '0000ff': '0068ca',
+      '005500': '2b4a2c', '005555': '27514f', '0055aa': '16638d', '0055ff': '007dce',
+      '00aa00': '5e9860', '00aa55': '5c9b72', '00aaaa': '57a5a2', '00aaff': '4cb4db',
+      '00ff00': '8ee391', '00ff55': '8ee69e', '00ffaa': '8aebc0', '00ffff': '84f5f1',
+      '550000': '4a161b', '550055': '482748', '5500aa': '40488a', '5500ff': '2f6bcc',
+      '555500': '564e36', '555555': '545454', '5555aa': '4f6790', '5555ff': '4180d0',
+      '55aa00': '759a64', '55aa55': '759d76', '55aaaa': '71a6a4', '55aaff': '69b5dd',
+      '55ff00': '9ee594', '55ff55': '9de7a0', '55ffaa': '9becc2', '55ffff': '95f6f2',
+      'aa0000': '99353f', 'aa0055': '983e5a', 'aa00aa': '955694', 'aa00ff': '8f74d2',
+      'aa5500': '9d5b4d', 'aa5555': '9d6064', 'aa55aa': '9a7099', 'aa55ff': '9587d5',
+      'aaaa00': 'afa072', 'aaaa55': 'aea382', 'aaaaaa': 'ababab', 'ffffff': 'ffffff',
+      'aaaaff': 'a7bae2', 'aaff00': 'c9e89d', 'aaff55': 'c9eaa7', 'aaffaa': 'c7f0c8',
+      'aaffff': 'c3f9f7', 'ff0000': 'e35462', 'ff0055': 'e25874', 'ff00aa': 'e16aa3',
+      'ff00ff': 'de83dc', 'ff5500': 'e66e6b', 'ff5555': 'e6727c', 'ff55aa': 'e37fa7',
+      'ff55ff': 'e194df', 'ffaa00': 'f1aa86', 'ffaa55': 'f1ad93', 'ffaaaa': 'efb5b8',
+      'ffaaff': 'ecc3eb', 'ffff00': 'ffeeab', 'ffff55': 'fff1b5', 'ffffaa': 'fff6d3'
+    };
+
    /* eslint-disable  comma-spacing, no-multi-spaces, max-len,
-        standard/array-bracket-even-spacing */
-    var layout = self.config.layout || [
-      [false   , false   , '55ff00', 'aaff55', false   , 'ffff55', 'ffffaa', false   , false   ],
-      [false   , 'aaffaa', '55ff55', '00ff00', 'aaff00', 'ffff00', 'ffaa55', 'ffaaaa', false   ],
-      ['55ffaa', '00ff55', '00aa00', '55aa00', 'aaaa55', 'aaaa00', 'ffaa00', 'ff5500', 'ff5555'],
-      ['aaffff', '00ffaa', '00aa55', '55aa55', '005500', '555500', 'aa5500', 'ff0000', 'ff0055'],
-      [false   , '55aaaa', '00aaaa', '005555', 'ffffff', '000000', 'aa5555', 'aa0000', false   ],
-      ['55ffff', '00ffff', '00aaff', '0055aa', 'aaaaaa', '555555', '550000', 'aa0055', 'ff55aa'],
-      ['55aaff', '0055ff', '0000ff', '0000aa', '000055', '550055', 'aa00aa', 'ff00aa', 'ffaaff'],
-      [false   , '5555aa', '5555ff', '5500ff', '5500aa', 'aa00ff', 'ff00ff', 'ff55ff', false   ],
-      [false   , false   , false   , 'aaaaff', 'aa55ff', 'aa55aa', false   , false   , false   ]
-    ];
+     standard/array-bracket-even-spacing */
+    var standardLayouts = {
+      COLOR: [
+        [false   , false   , '55ff00', 'aaff55', false   , 'ffff55', 'ffffaa', false   , false   ],
+        [false   , 'aaffaa', '55ff55', '00ff00', 'aaff00', 'ffff00', 'ffaa55', 'ffaaaa', false   ],
+        ['55ffaa', '00ff55', '00aa00', '55aa00', 'aaaa55', 'aaaa00', 'ffaa00', 'ff5500', 'ff5555'],
+        ['aaffff', '00ffaa', '00aa55', '55aa55', '005500', '555500', 'aa5500', 'ff0000', 'ff0055'],
+        [false   , '55aaaa', '00aaaa', '005555', 'ffffff', '000000', 'aa5555', 'aa0000', false   ],
+        ['55ffff', '00ffff', '00aaff', '0055aa', 'aaaaaa', '555555', '550000', 'aa0055', 'ff55aa'],
+        ['55aaff', '0055ff', '0000ff', '0000aa', '000055', '550055', 'aa00aa', 'ff00aa', 'ffaaff'],
+        [false   , '5555aa', '5555ff', '5500ff', '5500aa', 'aa00ff', 'ff00ff', 'ff55ff', false   ],
+        [false   , false   , false   , 'aaaaff', 'aa55ff', 'aa55aa', false   , false   , false   ]
+      ],
+      GRAY: [
+        ['000000', 'aaaaaa', 'ffffff']
+      ],
+      BLACK_WHITE: [
+        ['000000', 'ffffff']
+      ]
+    };
    /* eslint-enable */

+    var layout = self.config.layout || autoLayout();
+
+    if (typeof layout === 'string') {
+      layout = standardLayouts[layout];
+    }
+
+    // make sure layout is a 2D array
+    if (!Array.isArray(layout[0])) {
+      layout = [layout];
+    }
+
+    var colorList = flattenLayout(layout).map(function(item) {
+      return normalizeColor(item);
+    }).filter(function(item) {
+      return item;
+    });
+
    var grid = '';
-    var itemWidth = 100 / layout[0].length;
-    var itemHeight = 100 / layout.length;
+    var rows = layout.length;
+    var cols = 0;
+    layout.forEach(function(row) {
+      cols = row.length > cols ? row.length : cols;
+    });
+    var itemWidth = 100 / cols;
+    var itemHeight = 100 / rows;
    var $elem = self.$element;

-    for (var i = 0; i < layout.length; i++) {
-      for (var j = 0; j < layout[i].length; j++) {
+    for (var i = 0; i < rows; i++) {
+      for (var j = 0; j < cols; j++) {

-        var color = layout[i][j];
+        var color = normalizeColor(layout[i][j]);
        var selectable = (color ? ' selectable' : '');

        var roundedTL = (i === 0 && j === 0) || i === 0 && !layout[i][j - 1] ||
@@ -145,7 +254,7 @@ module.exports = {
        grid += '<i ' +
          'class="color-box ' + selectable + roundedTL + roundedTR + roundedBL +
              roundedBR + '" ' +
-          'data-value="' + parseInt(color, 16) + '" ' +
+          (color ? 'data-value="' + parseInt(color, 16) + '" ' : '') +
          'style="' +
            'width:' + itemWidth + '%; ' +
            'height:' + itemHeight + '%; ' +
@@ -154,13 +263,34 @@ module.exports = {
      }
    }

-    $elem.select('.color-box-container').add(HTML(grid));
+    // on very small layouts the boxes end up huge. The following adds extra padding
+    // to prevent them from being so big.
+    var extraPadding = 0;
+    if (cols === 3) {
+      extraPadding = 5;
+    }
+    if (cols === 2) {
+      extraPadding = 8;
+    }
+    var vPadding = (extraPadding * itemWidth / itemHeight) + '%';
+    var hPadding = extraPadding + '%';
+    $elem.select('.color-box-container')
+      .add(HTML(grid))
+      .set('$paddingTop', vPadding)
+      .set('$paddingRight', hPadding)
+      .set('$paddingBottom', vPadding)
+      .set('$paddingLeft', hPadding);
+
+    $elem.select('.color-box-wrap').set(
+      '$paddingBottom',
+      (itemWidth / itemHeight * 100) + '%'
+    );

    var $valueDisplay = $elem.select('.value');
    var $picker = $elem.select('.picker-wrap');
    var disabled = self.$manipulatorTarget.get('disabled');

-    $elem.select('label').on('click', function(ev) {
+    $elem.select('label').on('click', function() {
      if (!disabled) {
        $picker.set('show'); // toggle visibility
      }
@@ -190,5 +320,7 @@ module.exports = {
      disabled = false;
    });

+    // expose layout for testing
+    self._layout = layout;
  }
 };
@@ -10,5 +10,7 @@ module.exports = {
  text: require('./text'),
  toggle: require('./toggle'),
  radiogroup: require('./radiogroup'),
-  checkboxgroup: require('./checkboxgroup')
+  checkboxgroup: require('./checkboxgroup'),
+  button: require('./button'),
+  slider: require('./slider')
 };
@@ -7,6 +7,7 @@ module.exports = {
  manipulator: 'val',
  defaults: {
    label: '',
+    description: '',
    attributes: {}
  }
 };
@@ -8,6 +8,7 @@ module.exports = {
  defaults: {
    label: '',
    options: [],
+    description: '',
    attributes: {}
  }
 };
@@ -8,6 +8,7 @@ module.exports = {
  defaults: {
    label: '',
    options: [],
+    description: '',
    attributes: {}
  },
  initialize: function() {
@@ -15,9 +16,18 @@ module.exports = {

    var $value = self.$element.select('.value');

-    self.on('change', function(ev) {
-      var value = self.$manipulatorTarget.select('option:checked').get('innerHTML');
+    /**
+     * Updates the HTML value of the component to match the slected option's label
+     * @return {void}
+     */
+    function setValueDisplay() {
+      var selectedIndex = self.$manipulatorTarget.get('selectedIndex');
+      var $options = self.$manipulatorTarget.select('option');
+      var value = $options[selectedIndex] && $options[selectedIndex].innerHTML;
      $value.set('innerHTML', value);
-    });
+    }
+
+    setValueDisplay();
+    self.on('change', setValueDisplay);
  }
 };
@@ -0,0 +1,50 @@
+'use strict';
+
+module.exports = {
+  name: 'slider',
+  template: require('../../templates/components/slider.tpl'),
+  style: require('../../styles/clay/components/slider.scss'),
+  manipulator: 'slider',
+  defaults: {
+    label: '',
+    description: '',
+    min: 0,
+    max: 100,
+    step: 1,
+    attributes: {}
+  },
+  initialize: function() {
+    var self = this;
+
+    var $value = self.$element.select('.value');
+    var $valuePad = self.$element.select('.value-pad');
+    var $slider = self.$manipulatorTarget;
+
+    /**
+     * Sets the value display
+     * @return {void}
+     */
+    function setValueDisplay() {
+      var value = self.get();
+      $value.set('value', value);
+      $valuePad.set('innerHTML', value);
+    }
+
+    var step = $slider.get('step');
+    step = step.toString(10).split('.')[1];
+    self.precision = step ? step.length : 0;
+
+    self.on('change', setValueDisplay);
+    $slider.on('|input', setValueDisplay);
+    setValueDisplay();
+
+    $value.on('|input', function() {
+      $valuePad.set('innerHTML', this.get('value'));
+    });
+
+    $value.on('|change', function() {
+      self.set(this.get('value'));
+      setValueDisplay();
+    });
+  }
+};
@@ -3,7 +3,8 @@
 module.exports = {
  name: 'submit',
  template: require('../../templates/components/submit.tpl'),
-  manipulator: 'html',
+  style: require('../../styles/clay/components/submit.scss'),
+  manipulator: 'button',
  defaults: {
    attributes: {}
  }
@@ -7,6 +7,7 @@ module.exports = {
  manipulator: 'checked',
  defaults: {
    label: '',
+    description: '',
    attributes: {}
  }
 };
@@ -11,6 +11,7 @@ var settings = _.extend({}, window.claySettings || {});
 var returnTo = window.returnTo || 'pebblejs://close#';
 var customFn = window.customFn || function() {};
 var clayComponents = window.clayComponents || {};
+var clayMeta = window.clayMeta || {};

 var platform = window.navigator.userAgent.match(/android/i) ? 'android' : 'ios';
 document.documentElement.classList.add('platform-' + platform);
@@ -21,13 +22,13 @@ _.eachObj(clayComponents, function(key, component) {
 });

 var $mainForm = $('#main-form');
-var clayConfig = new ClayConfig(settings, config, $mainForm);
+var clayConfig = new ClayConfig(settings, config, $mainForm, clayMeta);

 // add listeners here
 $mainForm.on('submit', function() {
  // Set the return URL depending on the runtime environment
  location.href = returnTo +
-                  encodeURIComponent(JSON.stringify(clayConfig.getSettings()));
+                  encodeURIComponent(JSON.stringify(clayConfig.serialize()));
 });

 // Run the custom function in the context of the ClayConfig
@@ -26,9 +26,10 @@ var manipulators = require('./manipulators');
 * @param {Object} settings - setting that were set from a previous session
 * @param {Array|Object} config
 * @param {M} $rootContainer
+ * @param {Object} meta
 * @constructor
 */
-function ClayConfig(settings, config, $rootContainer) {
+function ClayConfig(settings, config, $rootContainer, meta) {
  var self = this;

  var _settings = _.copyObj(settings);
@@ -95,6 +96,8 @@ function ClayConfig(settings, config, $rootContainer) {
    return true;
  }

+  self.meta = meta;
+
  self.EVENTS = {
    /**
     * Called before framework has initialized. This is when you would attach your
@@ -152,10 +155,16 @@ function ClayConfig(settings, config, $rootContainer) {
  /**
   * @returns {Object}
   */
-  self.getSettings = function() {
-    _checkBuilt('getSettings');
+  self.serialize = function() {
+    _checkBuilt('serialize');
    _.eachObj(_itemsByAppKey, function(appKey, item) {
-      _settings[appKey] = item.get();
+      _settings[appKey] = {
+        value: item.get()
+      };
+
+      if (item.precision) {
+        _settings[appKey].precision = item.precision;
+      }
    });
    return _settings;
  };
@@ -183,7 +192,6 @@ function ClayConfig(settings, config, $rootContainer) {

  // expose the config to allow developers to update it before the build is run
  self.config = config;
-
 }

 /**
@@ -59,7 +59,7 @@ function ClayItem(config) {
  };

  // attach event methods
-  ClayEvents.call(self, self.$element);
+  ClayEvents.call(self, self.$manipulatorTarget);

  // attach the manipulator methods to the clayItem
  _.eachObj(_component.manipulator, function(methodName, method) {
@@ -1,67 +1,134 @@
 'use strict';

+var _ = require('../vendor/minified')._;
+
 /**
- * @returns {ClayEvents}
+ * @returns {ClayItem|ClayEvents}
+ * @extends {ClayItem}
 */
 function disable() {
+  if (this.$manipulatorTarget.get('disabled')) { return this; }
  this.$element.set('+disabled');
  this.$manipulatorTarget.set('disabled', true);
  return this.trigger('disabled');
 }

 /**
- * @returns {ClayEvents}
+ * @returns {ClayItem|ClayEvents}
+ * @extends {ClayItem}
 */
 function enable() {
+  if (!this.$manipulatorTarget.get('disabled')) { return this; }
  this.$element.set('-disabled');
  this.$manipulatorTarget.set('disabled', false);
  return this.trigger('enabled');
 }

+/**
+ * @returns {ClayItem|ClayEvents}
+ * @extends {ClayItem}
+ */
+function hide() {
+  if (this.$element[0].classList.contains('hide')) { return this; }
+  this.$element.set('+hide');
+  return this.trigger('hide');
+}
+
+/**
+ * @returns {ClayItem|ClayEvents}
+ * @extends {ClayItem}
+ */
+function show() {
+  if (!this.$element[0].classList.contains('hide')) { return this; }
+  this.$element.set('-hide');
+  return this.trigger('show');
+}
+
 module.exports = {
  html: {
    get: function() {
      return this.$manipulatorTarget.get('innerHTML');
    },
    set: function(value) {
+      if (this.get() === value.toString(10)) { return this; }
      this.$manipulatorTarget.set('innerHTML', value);
      return this.trigger('change');
-    }
+    },
+    hide: hide,
+    show: show
+  },
+  button: {
+    get: function() {
+      return this.$manipulatorTarget.get('innerHTML');
+    },
+    set: function(value) {
+      if (this.get() === value.toString(10)) { return this; }
+      this.$manipulatorTarget.set('innerHTML', value);
+      return this.trigger('change');
+    },
+    disable: disable,
+    enable: enable,
+    hide: hide,
+    show: show
  },
  val: {
    get: function() {
      return this.$manipulatorTarget.get('value');
    },
    set: function(value) {
+      if (this.get() === value.toString(10)) { return this; }
      this.$manipulatorTarget.set('value', value);
      return this.trigger('change');
    },
    disable: disable,
-    enable: enable
+    enable: enable,
+    hide: hide,
+    show: show
+  },
+  slider: {
+    get: function() {
+      return parseFloat(this.$manipulatorTarget.get('value'));
+    },
+    set: function(value) {
+      var initVal = this.get();
+      this.$manipulatorTarget.set('value', value);
+      if (this.get() === initVal) { return this; }
+      return this.trigger('change');
+    },
+    disable: disable,
+    enable: enable,
+    hide: hide,
+    show: show
  },
  checked: {
    get: function() {
-      return this.$manipulatorTarget.get('checked') ? 1 : 0;
+      return this.$manipulatorTarget.get('checked');
    },
    set: function(value) {
+      if (!this.get() === !value) { return this; }
      this.$manipulatorTarget.set('checked', !!value);
      return this.trigger('change');
    },
    disable: disable,
-    enable: enable
+    enable: enable,
+    hide: hide,
+    show: show
  },
  radiogroup: {
    get: function() {
      return this.$element.select('input:checked').get('value');
    },
    set: function(value) {
+      if (this.get() === value.toString(10)) { return this; }
      this.$element
        .select('input[value="' + value.replace('"', '\\"') + '"]')
        .set('checked', true);
      return this.trigger('change');
    },
    disable: disable,
-    enable: enable
+    enable: enable,
+    hide: hide,
+    show: show
  },
  checkboxgroup: {
    get: function() {
@@ -73,32 +140,38 @@ module.exports = {
    },
    set: function(values) {
      var self = this;
-      self.$element.select('input').set('checked', false);
      values = values || [];
+
+      if (_.equals(this.get(), values)) { return this; }
+
+      self.$element.select('input').set('checked', false);
+
      values.map(function(value) {
        self.$element
-          .select('input[value="' + value.replace('"', '\\"') + '"]')
+          .select('input[value="' + value.toString(10).replace('"', '\\"') + '"]')
          .set('checked', true);
      });
      return self.trigger('change');
    },
    disable: disable,
-    enable: enable
+    enable: enable,
+    hide: hide,
+    show: show
  },
  color: {
    get: function() {
-      return parseInt(this.$manipulatorTarget.get('value'), 16);
+      return parseInt(this.$manipulatorTarget.get('value'), 10) || 0;
    },
    set: function(value) {
-      switch (typeof value) {
-        case 'number': value = value.toString(16); break;
-        case 'string': value = value.replace(/^#|^0x/, ''); break;
-      }
+      value = this.roundColorToLayout(value || 0);

-      this.$manipulatorTarget.set('value', value || '000000');
+      if (this.get() === value) { return this; }
+      this.$manipulatorTarget.set('value', value);
      return this.trigger('change');
    },
    disable: disable,
-    enable: enable
+    enable: enable,
+    hide: hide,
+    show: show
  }
 };
@@ -1,8 +1,8 @@
 // minified.js config start -- use this comment to re-create a configuration in the Builder
 // - Only sections add, always, amdsupport, copyobj, dollardollar,
-// - each, eachobj, error, extend, find, format, formathtml, get, ht, html,
-// - isobject, off, on, ready, request, select, set, template, trigger, underscore,
-// - wait.
+// - each, eachobj, equals, error, extend, find, format, formathtml, get, ht,
+// - html, isobject, off, on, ready, request, select, set, template, trigger,
+// - underscore, wait.


 // WARNING! This file is autogenerated from minified-master.js and others.
@@ -1550,6 +1550,53 @@ define('minified', function() {
     */
    'each': listBind(each),

+    /*$
+     * @id equals
+     * @group LIST
+     * @requires
+     * @configurable default
+     * @name .equals()
+     * @altname _.equals()
+     * @syntax list.equals(otherObject)
+     * @syntax _.equals(thisObject, otherObject)
+     * @module UTIL
+     * Checks whether two values, lists or objects are equal in a deep comparison.
+     *
+     * First <var>equals()</var> checks whether it got a function as parameter.
+     * If yes, it will be invoked without arguments and <var>equals()</var> calls itself recursively with the function's result.
+     *
+     * Once both values are no functions anymore, the values will be evaluated, If the first value is...
+     * <ul><li>...<var>null</var> or <var>undefined</var>, they are only equal if the other one is also either <var>null</var> or <var>undefined</var>.</li>
+     * <li>...a value as defined by ##_.isValue(), but not a Date, they are equal if the other value is the same type and is equal according to the '==' operator.</li>
+     * <li>...a Date, they are equal if the other value is a Date representing the same time.</li>
+     * <li>...a list or array, they are equal if the other value is also either a list or an array, has the same number of items and all items equal the items of the other
+     *         list at the same position. The equality of list items is determined recursively using the same rules, so you can also nest lists.</li>
+     * <li>...a function, it will be invoked without arguments and its return value is evaluated using these rules as if the value has been passed. </li>
+     * <li>...any other object, they are equal if they contain exactly the same keys (as defined by ##_.eachObj()) and all values are equal as determined using these rules
+     *      recursively.</li>
+     * </ul>
+     *
+     * Please note that, according to the rules, a ##list#Minified list## is equal to an array, as long as their content is equal. <var>equals</var> does not
+     * differentiate between <var>null</var> and <var>undefined</var>.
+     *
+     * <var>equals</var> is commutative. If you swap the parameters, the result is the same as long as no functions are involved.
+     *
+     * @example Compare a list and an array:
+     *  <pre>
+     *  _.equals([1, 2, 3], _(1, 2, 3));  // returns true
+     * </pre>
+     *
+     * @example Same result, but with a list method:
+     *  <pre>
+     *  _(1, 2, 3).equals([1, 2, 3]);  // returns true
+     * </pre>
+     *
+     * @param thisObject The first reference to evaluate.
+     * @param otherObject The second reference to evaluate.
+     * @return true if both references are equal. False otherwise.
+     */
+    'equals': listBind(equals),
+
    /*$
     * @id find
     * @group LIST
@@ -2626,6 +2673,9 @@ define('minified', function() {
    // @condblock find
    'find': find,
    // @condend
+    // @condblock equals
+    'equals': equals,
+    // @condend

    /*$
     * @id copyobj
@@ -17,7 +17,24 @@ html, body {

 body {
  background-color: $color-gray-2;
-  padding: $item-spacing-v $item-spacing-h;
+  padding: 0 $item-spacing-h $item-spacing-v;
+}
+
+em {
+  font-style: italic;
+}
+
+strong {
+  @include font-pfdin(medium);
+  color: $color-orange;
+}
+
+a {
+  color: $color-gray-8;
+
+  &:hover {
+    color: inherit;
+  }
 }

 h1, h2, h3, h4 {
@@ -50,10 +67,17 @@ h6 {
  @include font-size(0.8);
 }

+input {
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
 label {
  display: flex;
  justify-content: space-between;
  align-items: center;
+  padding: $item-spacing-v $item-spacing-h;

  .input {
    white-space: nowrap;
@@ -83,35 +107,44 @@ label {
  }
 }

-.component {
-  padding-bottom: $item-spacing-v;
+.hide {
+  display: none !important;
+}
+
+.tap-highlight {
  @include tap-highlight();
+  border-radius: $border-radius;
+}
+
+.component {
+  padding-top: $item-spacing-v;

  &.disabled {
-    opacity: 0.25;
    pointer-events: none;
+    > * {
+      opacity: 0.25;
+    }
  }
 }

 .section {
  background: $color-gray-4;
  border-radius: 0.25rem;
-  margin-bottom: 1rem;
  box-shadow: $color-gray-1 0 0.15rem 0.25rem;

-  .component {
-    padding-top: $item-spacing-v;
+  > .component {
+    padding-bottom: $item-spacing-v;
    padding-right: $item-spacing-h;
    padding-left: $item-spacing-h;
    position: relative;
+    margin-top: 1rem;

-    &:last-child,
-    &:first-child {
-      padding-bottom: $item-spacing-v;
-      
-      &:after {
-        display: none;
-      }
+    &:not(.hide) ~ .component {
+      margin-top: 0;
+    }
+
+    &:first-child:after {
+      display: none;
    }

    &:after {
@@ -119,7 +152,7 @@ label {
      background: $color-gray-6;
      display: block;
      position: absolute;
-      bottom: 0;
+      top: 0;
      left: $item-spacing-h / 2;
      right: $item-spacing-h / 2;
      height: 1px;
@@ -127,72 +160,42 @@ label {
    }
  }

-  .component-heading:first-child {
+  // don't show the separator for the first non-hidden item
+  > .component:not(.hide):after {
+    display: none;
+  }
+
+  > .component:not(.hide) ~ .component:not(.hide):after {
+    display: block;
+  }
+
+  > .component-heading:first-child {
    background: $color-gray-3;
    border-radius: $border-radius $border-radius 0 0;
+
+    // don't show the separator for the first non-hidden item after the heading
+    &:after,
+    ~ .component:not(.hide):after {
+      display: none;
+    }
+
+    ~ .component:not(.hide) ~ .component:not(.hide):after {
+      display: block;
+    }
  }

 }

-strong {
-  @include font-pfdin(medium);
-  color: $color-orange;
-}
-
-a {
-  color: $color-gray-8;
-
-  &:hover {
-    color: inherit;
-  }
+.description {
+  padding: 0 $item-spacing-h $item-spacing-v ;
+  @include font-size(0.9);
+  color: $color-gray-9;
+  text-align: left;
 }

 .inputs {
  display: block;
  width:100%;
  border-collapse: collapse;
-
-  .section & .component {
-    display: table;
-    width:100%;
-
-    .label,
-    .input {
-      display: table-cell;
-    }
-    
-    .input {
-      text-align: right;
-    }
-
-    &.invalid {
-      .input:after {
-        content: "!";
-        display: inline-block;
-        color: $color-white;
-        background: $color-orange;
-        border-radius: $border-radius;
-        width: 1.2em;
-        text-align: center;
-        height: 1.2em;
-        font-size: 1em;
-        vertical-align: middle;
-        line-height: 1.3em;
-        margin-left: -0.7em;
-        position:absolute;
-        @include font-pfdin(regular);
-      }
-
-      .input input {
-        color: $color-orange;
-        padding-right: 1em;
-
-        @include placeholder {
-          color: $color-orange;
-        }
-
-      }
-    }
-
-  }
 }
+
@@ -11,8 +11,6 @@ $item-spacing-v: $base-height / 2;
 $item-spacing-h: 0.75rem;
 $small-component-width: $base-height * $golden;

-
-
 // ---- Colors ------
 $color-orange: #ff4700;
 $color-orange-dark: #993d19;
@@ -34,14 +32,8 @@ $color-gray-9: #a4a4a4 ;
 $color-gray-10: #ececec;
 $color-gray-11: #f2f2f2;

+$button-padding: 0.6rem;
+$button-padding-ios: 0.5rem;

-
-
-$global-margin: 55px;
-$form-margin: 25px;
-$button-padding: 0.7rem;
-$button-padding-ios: 0.6rem;
-$button-line-height: 13px;
-$footer-height-large: 90px;
-
-$box-shadow-small-components: $color-gray-1 0 0.1rem 0.1rem;
+$box-shadow-small-components: 0 0.1rem 0.1rem $color-gray-1;
+$box-shadow-large-components: 0 rem(3px) rem(15px) rgba(0,0,0,0.4);
@@ -0,0 +1,12 @@
+.component-button {
+  text-align: center;
+
+  .section & {
+    padding-bottom: 0;
+  }
+
+  .description {
+    padding-left: 0;
+    padding-right: 0;
+  }
+}
@@ -3,9 +3,11 @@

 .component-checkbox {

-  @include tap-highlight(rgba(0,0,0,0));
  display: block;

+  .section & {
+    padding-right: $item-spacing-h / 2;
+  }

  > .label {
    display: block;
@@ -14,14 +16,14 @@

  .checkbox-group {

+    padding-bottom: $item-spacing-v / 2;
+
    label {
-      padding: $item-spacing-v / 2 0;
-      @include tap-highlight();
+      padding: $item-spacing-v / 2 $item-spacing-h / 2;
    }

    .label {
      font-size: 0.9em;
-      padding: 0 $item-spacing-h / 2;
    }

    input {
@@ -39,7 +41,7 @@
      flex-shrink: 0;
    }

-    input:checked ~ i {
+    input:checked + i {
      border-color: $color-orange;
      background: $color-orange;
      
@@ -59,6 +61,10 @@

      }
    }
+  }

+  .description {
+    padding-left: 0;
+    padding-right: 0;
  }
 }
@@ -2,11 +2,17 @@

 .component-color {

+  .section & {
+    padding: 0;
+  }
+
  .value {
    width: $small-component-width;
    height: $base-height;
    border-radius: $base-height / 2;
    box-shadow: $box-shadow-small-components;
+    display: block;
+    background: #000;
  }

  .picker-wrap {
@@ -15,17 +21,25 @@
    right: 0;
    bottom: 0;
    position: fixed;
-    padding: 1rem;
-    background: rgba(0,0,0,0.7);
+    padding: $item-spacing-v $item-spacing-h /2;
+    background: rgba(0, 0, 0, 0.65);
    opacity: 0;
-    transition: opacity 70ms ease-in 175ms;
+    transition: opacity 100ms ease-in 175ms;
    pointer-events: none;
    z-index: 100;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;

    .picker {
-      padding: 1rem;
-      background: $color-gray-11;
+      padding: $item-spacing-v $item-spacing-h;
+      background: $color-gray-4;
+      box-shadow: $box-shadow-large-components;
      border-radius: $border-radius;
+      width: 100%;
+      max-width: 26rem;
+      overflow: auto;
    }

    &.show {
@@ -41,7 +55,6 @@
    height: 0;
    width: 100%;
    padding: 0 0 100% 0; // overridden with inline style
-    margin: 0.6em 0 0;

    .color-box-container {
      position: absolute;
@@ -72,7 +85,7 @@
        }

        &.selected {
-          transform: scale(1.15);
+          transform: scale(1.1);
          border-radius: $border-radius;
          box-shadow: #111 0 0 0.24rem;
          position: relative;
@@ -2,7 +2,13 @@

 .component-input {

-  display: block;
+  .section & {
+    padding: 0;
+  }
+
+  label {
+    display: block;
+  }

  .label {
    padding-bottom: $item-spacing-v;
@@ -3,9 +3,11 @@

 .component-radio {

-  @include tap-highlight(rgba(0,0,0,0));
  display: block;

+  .section & {
+    padding-right: $item-spacing-h / 2;
+  }

  > .label {
    display: block;
@@ -14,14 +16,14 @@

  .radio-group {

+    padding-bottom: $item-spacing-v / 2;
+
    label {
-      padding: $item-spacing-v / 2 0;
-      @include tap-highlight();
+      padding: $item-spacing-v / 2 $item-spacing-h / 2;
    }

    .label {
      font-size: 0.9em;
-      padding: 0 $item-spacing-h / 2;
    }

    input {
@@ -39,7 +41,7 @@
      flex-shrink: 0;
    }

-    input:checked ~ i {
+    input:checked + i {
      border-color: $color-orange;
      
      &:after {
@@ -58,4 +60,9 @@
    }

  }
+
+  .description {
+    padding-left: 0;
+    padding-right: 0;
+  }
 }
@@ -2,12 +2,20 @@
@import "clay";

 .component-select {
-  position: relative;
+
+  .section & {
+    padding: 0;
+  }
+
+  label {
+    position: relative;
+  }

  .value {
    $triangle-size: 0.85rem;
    position: relative;
    padding-right: $triangle-size + 0.25rem;
+    display: block;

    &:after {
      content: "";
@@ -15,7 +23,7 @@
      right: 0;
      top: 50%;
      margin-top: -0.1rem;
-      @include triangle($triangle-size, $color-gray-10, down);
+      @include triangle($triangle-size, $color-orange, down);
    }
  }

@@ -0,0 +1,127 @@
+@import "clay";
+
+.component-slider {
+
+  .section & {
+    padding: 0;
+  }
+
+  label {
+    display: block;
+  }
+
+  .label-container {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    padding-bottom: $item-spacing-v;
+  }
+
+  .label {
+    flex: 1;
+    min-width: 1rem;
+    display: block;
+    padding-right: $item-spacing-h;
+  }
+
+  .value-wrap {
+    display: block;
+    position: relative;
+  }
+
+  .value,
+  .value-pad {
+    display: block;
+    background: $color-gray-2;
+    border-radius: $border-radius;
+    padding: $item-spacing-v / 2 $item-spacing-h / 2;
+    border: none;
+    vertical-align: baseline;
+    color: $color-white;
+    text-align: right;
+    margin: 0;
+    min-width: 1rem;
+  }
+
+  .value-pad {
+    visibility: hidden;
+
+    &:before {
+      content: ' ';
+      display: inline-block;
+    }
+  }
+
+  .value {
+    max-width: 100%;
+    position: absolute;
+    left:0;
+    top:0
+  }
+
+  .input-wrap {
+    padding: 0 $item-spacing-h $item-spacing-v;
+  }
+
+  .input {
+    $track-height: rem(3px);
+
+    display: block;
+    position: relative;
+    min-width: 100%;
+    height: $base-height;
+    overflow: hidden;
+    margin-left: 0;
+
+    &:before {
+      content: '';
+      display: block;
+      position: absolute;
+      height: $track-height;
+      background: $color-gray-6;
+      width: 100%;
+      top: $base-height / 2 - $track-height / 2;
+    }
+
+    .slider {
+      display: block;
+      width: 100%;
+      appearance: none;
+      position: relative;
+      height: $base-height;
+      margin: 0;
+      background-color: transparent;
+
+      &:focus {
+        outline: none;
+      }
+
+      &::-webkit-slider-runnable-track {
+        border: none;
+        height: $base-height;
+        width: 100%;
+        background-color: transparent;
+      }
+
+      &::-webkit-slider-thumb {
+        appearance: none;
+        position: relative;
+        height: $base-height;
+        width: $base-height;
+        background-color: $color-orange;
+        border-radius: 50%;
+
+        &:before {
+          content: "";
+          position: absolute;
+          left: -1000px;
+          top: $base-height / 2 - $track-height / 2;
+          height: $track-height;
+          width: 1001px;
+          background: $color-orange;
+        }
+      }
+    }
+  }
+
+}
@@ -0,0 +1,3 @@
+.component-submit {
+  text-align: center;
+}
@@ -6,6 +6,10 @@
  $slide-width: $small-component-width;
  $marker-diameter: $base-height;

+  .section & {
+    padding: 0;
+  }
+
  input {
    display: none; // @todo make sure this doesn't mess up interactivity on iOS
  }
@@ -3,52 +3,30 @@
 button,
 .button {
  @include font-pfdin(medium);
+  @include font-size(1);
  text-transform: uppercase;
-  background-color: $color-gray-4;
+  background-color: $color-gray-7;
  border-radius: $border-radius;
-  font-size: 1rem;
-  line-height: 1;
  border: none;
-  display: block;
+  display: inline-block;

  color: $color-white;
  min-width: 12rem;
  text-align: center;
-  margin: 0 auto;
-  -webkit-tap-highlight-color: rgba(0,0,0,0);
-
+  margin: 0 auto $item-spacing-v;
  padding: $button-padding;

+  @include tap-highlight($color-gray-8);
+
  .platform-ios & {
    padding: $button-padding-ios;
  }

-  &:disabled {
-    background-color: $color-gray-3;
-    color: $color-gray-8;
-  }
-
-  &:not(:disabled):active {
-    background-color: $color-gray-8;
-  }
-
-  &.orange, &[type="submit"] {
+  &.primary, &[type="submit"] {
    background-color: $color-orange;

-    &:disabled {
-      background-color: $color-orange-dark;
-      color: $color-gray-3;
-    }
-
-    &:not(:disabled):active {
-      background-color: $color-red;
-    }
+    @include tap-highlight($color-red);
  }
-
-  &.light-grey {
-    background-color: $color-gray-5;
-  }
-
 }

 a.button {
@@ -0,0 +1,11 @@
+<div class="component component-button">
+  <button
+    type="button"
+    data-manipulator-target
+    class="{{primary ? 'primary' : ''}}"
+    {{each key: attributes}}{{key}}="{{this}}"{{/each}}
+  ></button>
+  {{if description}}
+    <div class="description">{{{description}}}</div>
+  {{/if}}
+</div>
@@ -2,17 +2,19 @@
  <span class="label">{{{label}}}</span>
  <div class="checkbox-group">
    {{each options}}
-      <label>
+      <label class="tap-highlight">
        <span class="label">{{{this.label}}}</span>
        <input
          type="checkbox"
          value="{{this.value}}"
          name="clay-{{clayId}}"
-          data-manipulator-target
          {{each key: attributes}}{{key}}="{{this}}"{{/each}}
        />
        <i></i>
      </label>
    {{/each}}
  </div>
+  {{if description}}
+    <div class="description">{{{description}}}</div>
+  {{/if}}
 </div>
@@ -1,5 +1,5 @@
 <div class="component component-color">
-  <label>
+  <label class="tap-highlight">
    <input
      data-manipulator-target
      type="hidden"
@@ -7,6 +7,9 @@
    <span class="label">{{{label}}}</span>
    <span class="value"></span>
  </label>
+  {{if description}}
+    <div class="description">{{{description}}}</div>
+  {{/if}}
  <div class="picker-wrap">
    <div class="picker">
      <div class="color-box-wrap">
@@ -1,9 +1,15 @@
-<label class="component component-input">
-  <span class="label">{{{label}}}</span>
-  <span class="input">
-    <input
+<div class="component component-input">
+  <label class="tap-highlight">
+    <span class="label">{{{label}}}</span>
+    <span class="input">
+      <input
      data-manipulator-target
-      {{each key: attributes}}{{key}}="{{this}}"{{/each}}
+        {{each key: attributes}}{{key}}="{{this}}"{{/each}}
    />
-  </span>
-</label>
+    </span>
+  </label>
+
+  {{if description}}
+    <div class="description">{{{description}}}</div>
+  {{/if}}
+</div>
@@ -2,17 +2,19 @@
  <span class="label">{{{label}}}</span>
  <div class="radio-group">
    {{each options}}
-      <label>
+      <label class="tap-highlight">
        <span class="label">{{{this.label}}}</span>
        <input
          type="radio"
          value="{{this.value}}"
          name="clay-{{clayId}}"
-          data-manipulator-target
          {{each key: attributes}}{{key}}="{{this}}"{{/each}}
        />
        <i></i>
      </label>
    {{/each}}
  </div>
+  {{if description}}
+    <div class="description">{{{description}}}</div>
+  {{/if}}
 </div>
@@ -1,9 +1,14 @@
-<label class="component component-select">
-  <span class="label">{{{label}}}</span>
-  <span class="value"></span>
-  <select data-manipulator-target {{each key: attributes}}{{key}}="{{this}}"{{/each}}>
-    {{each options}}
-      <option value="{{this.value}}" class="item-select-option">{{this.label}}</option>
-    {{/each}}
-  </select>
-</label>
+<div class="component component-select">
+  <label class="tap-highlight">
+    <span class="label">{{{label}}}</span>
+    <span class="value"></span>
+    <select data-manipulator-target {{each key: attributes}}{{key}}="{{this}}"{{/each}}>
+      {{each options}}
+        <option value="{{this.value}}" class="item-select-option">{{this.label}}</option>
+      {{/each}}
+    </select>
+  </label>
+  {{if description}}
+    <div class="description">{{{description}}}</div>
+  {{/if}}
+</div>
@@ -0,0 +1,25 @@
+<div class="component component-slider">
+  <label class="tap-highlight">
+    <span class="label-container">
+      <span class="label">{{{label}}}</span>
+      <span class="value-wrap">
+        <span class="value-pad"></span>
+        <input type="text" class="value" />
+      </span>
+    </span>
+    <span class="input">
+      <input
+        data-manipulator-target
+        class="slider"
+        type="range"
+        min="{{min}}"
+        max="{{max}}"
+        step="{{step}}"
+        {{each key: attributes}}{{key}}="{{this}}"{{/each}}
+      />
+    </span>
+</label>
+  {{if description}}
+    <div class="description">{{{description}}}</div>
+  {{/if}}
+</div>
@@ -1,4 +1,4 @@
-<div class="component component-button">
+<div class="component component-submit">
  <button
    data-manipulator-target
    type="submit"
@@ -1,14 +1,19 @@
-<label class="component component-toggle">
-  <span class="label">{{{label}}}</span>
-  <span class="input">
-    <input
-      data-manipulator-target
-      type="checkbox"
-      {{each key: attributes}}{{key}}="{{this}}"{{/each}}
-    />
-    <span class="graphic">
-      <span class="slide"></span>
-      <span class="marker"></span>
+<div class="component component-toggle">
+  <label class="tap-highlight">
+    <span class="label">{{{label}}}</span>
+    <span class="input">
+      <input
+        data-manipulator-target
+        type="checkbox"
+        {{each key: attributes}}{{key}}="{{this}}"{{/each}}
+      />
+      <span class="graphic">
+        <span class="slide"></span>
+        <span class="marker"></span>
+      </span>
    </span>
-  </span>
-</label>
+  </label>
+  {{if description}}
+    <div class="description">{{{description}}}</div>
+  {{/if}}
+</div>
@@ -10,6 +10,37 @@ var components = require('../src/scripts/components');
 var componentRegistry = require('../src/scripts/lib/component-registry');
 var idCounter = 0;

+/**
+ * @param {Object} [extra] - add/replace keys in the meta
+ * @returns {{accountToken: string, watchToken: string, activeWatchInfo: {platform:
+ *   string, model: string, language: string, firmware: {major: number, minor:
+ *   number, patch: number, suffix: string}}, userData: {}}}
+ */
+module.exports.meta = function(extra) {
+  var result = {
+    accountToken: '0123456789abcdef0123456789abcdef',
+    watchToken: '0123456789abcdef0123456789abcdef',
+    activeWatchInfo: {
+      platform: 'chalk',
+      model: 'qemu_platform_chalk',
+      language: 'en_US',
+      firmware: {
+        major: 3,
+        minor: 3,
+        patch: 2,
+        suffix: ''
+      }
+    },
+    userData: {}
+  };
+
+  _.eachObj(extra || {}, function(key, val) {
+    result[key] = val;
+  });
+
+  return result;
+};
+
 /**
 * @param {string|Object} config
 * @param {boolean} [autoRegister=true]
@@ -64,13 +95,15 @@ module.exports.config = function(types, autoRegister) {
 * @param {boolean} [build=true] - run the build method on the result
 * @param {boolean} [autoRegister=true]
 * @param {Object} [settings] - settings to pass to constructor
+ * @param {Object} [meta] - override the meta
 * @returns {ClayConfig}
 */
-module.exports.clayConfig = function(types, build, autoRegister, settings) {
+module.exports.clayConfig = function(types, build, autoRegister, settings, meta) {
  var clayConfig = new ClayConfig(
    settings || {},
    module.exports.config(types, autoRegister),
-    $(HTML('<div>'))
+    $(HTML('<div>')),
+    module.exports.meta(meta)
  );
  return build === false ? clayConfig : clayConfig.build();
 };
@@ -82,6 +115,8 @@ module.exports.clayConfig = function(types, build, autoRegister, settings) {
 * @param {Object} [options] - Additional options to pass to Clay
 * @param {boolean} [options.autoHandleEvents] - If false, Clay will not
 *   automatically handle the 'showConfiguration' and 'webviewclosed' events
+ * @param {*} [options.userData={}] - Arbitrary data to pass to the config page. Will
+ *   be available as `clayConfig.meta.userData`
 * @param {boolean} [destroyLocalStorage=true]
 * @return {Clay}
 */
@@ -12,6 +12,12 @@ module.exports = function(config) {
    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
    frameworks: ['browserify', 'source-map-support', 'mocha'],

+    client: {
+      mocha: {
+        timeout: 10000 // 10 sec because Travis struggles sometimes.
+      }
+    },
+
    browserify: {
      debug: true,
      transform: [
@@ -3,6 +3,48 @@
 var assert = require('chai').assert;
 var fixture = require('../../fixture');

+var sunlightColorMap = {
+  '000000': '000000', '000055': '001e41', '0000aa': '004387', '0000ff': '0068ca',
+  '005500': '2b4a2c', '005555': '27514f', '0055aa': '16638d', '0055ff': '007dce',
+  '00aa00': '5e9860', '00aa55': '5c9b72', '00aaaa': '57a5a2', '00aaff': '4cb4db',
+  '00ff00': '8ee391', '00ff55': '8ee69e', '00ffaa': '8aebc0', '00ffff': '84f5f1',
+  '550000': '4a161b', '550055': '482748', '5500aa': '40488a', '5500ff': '2f6bcc',
+  '555500': '564e36', '555555': '545454', '5555aa': '4f6790', '5555ff': '4180d0',
+  '55aa00': '759a64', '55aa55': '759d76', '55aaaa': '71a6a4', '55aaff': '69b5dd',
+  '55ff00': '9ee594', '55ff55': '9de7a0', '55ffaa': '9becc2', '55ffff': '95f6f2',
+  'aa0000': '99353f', 'aa0055': '983e5a', 'aa00aa': '955694', 'aa00ff': '8f74d2',
+  'aa5500': '9d5b4d', 'aa5555': '9d6064', 'aa55aa': '9a7099', 'aa55ff': '9587d5',
+  'aaaa00': 'afa072', 'aaaa55': 'aea382', 'aaaaaa': 'ababab', 'ffffff': 'ffffff',
+  'aaaaff': 'a7bae2', 'aaff00': 'c9e89d', 'aaff55': 'c9eaa7', 'aaffaa': 'c7f0c8',
+  'aaffff': 'c3f9f7', 'ff0000': 'e35462', 'ff0055': 'e25874', 'ff00aa': 'e16aa3',
+  'ff00ff': 'de83dc', 'ff5500': 'e66e6b', 'ff5555': 'e6727c', 'ff55aa': 'e37fa7',
+  'ff55ff': 'e194df', 'ffaa00': 'f1aa86', 'ffaa55': 'f1ad93', 'ffaaaa': 'efb5b8',
+  'ffaaff': 'ecc3eb', 'ffff00': 'ffeeab', 'ffff55': 'fff1b5', 'ffffaa': 'fff6d3'
+};
+
+/* eslint-disable  comma-spacing, no-multi-spaces, max-len,
+ standard/array-bracket-even-spacing */
+var standardLayouts = {
+  COLOR: [
+    [false   , false   , '55ff00', 'aaff55', false   , 'ffff55', 'ffffaa', false   , false   ],
+    [false   , 'aaffaa', '55ff55', '00ff00', 'aaff00', 'ffff00', 'ffaa55', 'ffaaaa', false   ],
+    ['55ffaa', '00ff55', '00aa00', '55aa00', 'aaaa55', 'aaaa00', 'ffaa00', 'ff5500', 'ff5555'],
+    ['aaffff', '00ffaa', '00aa55', '55aa55', '005500', '555500', 'aa5500', 'ff0000', 'ff0055'],
+    [false   , '55aaaa', '00aaaa', '005555', 'ffffff', '000000', 'aa5555', 'aa0000', false   ],
+    ['55ffff', '00ffff', '00aaff', '0055aa', 'aaaaaa', '555555', '550000', 'aa0055', 'ff55aa'],
+    ['55aaff', '0055ff', '0000ff', '0000aa', '000055', '550055', 'aa00aa', 'ff00aa', 'ffaaff'],
+    [false   , '5555aa', '5555ff', '5500ff', '5500aa', 'aa00ff', 'ff00ff', 'ff55ff', false   ],
+    [false   , false   , false   , 'aaaaff', 'aa55ff', 'aa55aa', false   , false   , false   ]
+  ],
+  GRAY: [
+    ['000000', 'aaaaaa', 'ffffff']
+  ],
+  BLACK_WHITE: [
+    ['000000', 'ffffff']
+  ]
+};
+/* eslint-enable */
+
 /**
 * @param {ClayItem} colorItem
 * @returns {void}
@@ -11,6 +53,182 @@ function openPicker(colorItem) {
  colorItem.$element.select('label')[0].click();
 }

+/**
+ * @param {string} hex
+ * @returns {string} - eg: "rgb(1, 2, 3)"
+ */
+function hexToRgb(hex) {
+  var result = /^(?:#|0x)?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  return result ?
+    'rgb(' +
+      parseInt(result[1], 16) + ', ' +
+      parseInt(result[2], 16) + ', ' +
+      parseInt(result[3], 16) + ')' :
+    hex;
+}
+
+/**
+ * @param {number|string} value
+ * @returns {string}
+ */
+function normalizeColor(value) {
+  switch (typeof value) {
+    case 'number': value = value.toString(16); break;
+    case 'string': value = value.replace(/^#|^0x/, ''); break;
+  }
+  return value || '000000';
+}
+
+/**
+ * @param {Array.<Array>} layout
+ * @returns {Array}
+ */
+function flattenLayout(layout) {
+  return layout.reduce(function(a, b) {
+    return a.concat(b);
+  }, []);
+}
+
+/**
+ * @param {Array|string} [layout=color]
+ * @param {Array} [expectedColors]
+ * @return {void}
+ */
+function testCustomLayout(layout, expectedColors) {
+
+  describe('layout: ' + JSON.stringify(layout || 'default'), function() {
+
+    describe('Normal', function() {
+      testColors(false, layout, expectedColors);
+    });
+
+    describe('Sunlight', function() {
+      testColors(true, layout, expectedColors);
+    });
+  });
+}
+
+/**
+ * @param {string} platform
+ * @param {Array} layout
+ * @param {boolean} allowGray
+ * @param {string} desc
+ * @param {Object} activeWatchInfo
+ * @return {void}
+ */
+function testAutoLayout(platform, layout, allowGray, desc, activeWatchInfo) {
+  it('chooses the best layout for the ' + (desc || platform) +
+     ' platform when allowGray is ' + allowGray,
+  function() {
+    var clayConfig = fixture.clayConfig(
+      [{type: 'color', allowGray: allowGray}],
+      true,
+      true,
+      {},
+      {
+        activeWatchInfo: activeWatchInfo
+      }
+    );
+    var colorItem = clayConfig.getItemsByType('color')[0];
+    assert.deepEqual(colorItem._layout, layout);
+  });
+}
+
+/**
+ * @param {number|string} input
+ * @param {number} expected
+ * @param {array|string} layout
+ * @return {void}
+ */
+function testClosestToLayout(input, expected, layout) {
+  it('rounds ' + input + ' to ' + expected.toString(16) +
+     ' in layout: ' + JSON.stringify(layout),
+  function() {
+    var clayConfig;
+    var colorItem;
+
+    clayConfig = fixture.clayConfig([{
+      type: 'color',
+      sunlight: false,
+      layout: layout
+    }]);
+    colorItem = clayConfig.getItemsByType('color')[0];
+    colorItem.set(input);
+    assert.strictEqual(colorItem.get(), expected);
+
+    clayConfig = fixture.clayConfig([{
+      type: 'color',
+      sunlight: false,
+      layout: layout
+    }]);
+    colorItem = clayConfig.getItemsByType('color')[0];
+    colorItem.set(input);
+    assert.strictEqual(colorItem.get(), expected);
+  });
+}
+
+/**
+ * @param {boolean} sunlight
+ * @param {Array|string} [layout=color]
+ * @param {Array} [expectedColors]
+ * @return {void}
+ */
+function testColors(sunlight, layout, expectedColors) {
+  var clayConfig;
+  var colorItem;
+  var $colorBoxes;
+  var colors;
+
+  beforeEach(function() {
+    clayConfig = fixture.clayConfig([
+      {
+        type: 'color',
+        layout: layout,
+        sunlight: sunlight
+      }
+    ]);
+    colorItem = clayConfig.getItemsByType('color')[0];
+
+    layout = layout || 'COLOR';
+    if (typeof layout === 'string') {
+      layout = standardLayouts[layout];
+    }
+
+    colors = expectedColors || flattenLayout(layout);
+    $colorBoxes = colorItem.$element.select('.color-box');
+  });
+
+  it('Has the correct items in the layout', function() {
+    colors.forEach(function(color, index) {
+      if (color === false) {
+        assert.strictEqual($colorBoxes[index].dataset.value, undefined);
+      } else {
+        assert.strictEqual(
+          parseInt($colorBoxes[index].dataset.value, 10),
+          parseInt(color || 0, 16)
+        );
+      }
+    });
+  });
+
+  it('sets the color correctly', function() {
+    colors.forEach(function(color, index) {
+      if (color === false) {
+        assert.strictEqual(
+          $colorBoxes[index].style.backgroundColor,
+          'transparent'
+        );
+      } else {
+        var normalizedColor = normalizeColor(color);
+        assert.strictEqual(
+          $colorBoxes[index].style.backgroundColor,
+          hexToRgb(sunlight ? sunlightColorMap[normalizedColor] : normalizedColor)
+        );
+      }
+    });
+  });
+}
+
 describe('component - color', function() {
  it('shows the sunlit colors in the value display', function() {
    var clayConfig = fixture.clayConfig([
@@ -105,4 +323,158 @@ describe('component - color', function() {
    $picker[0].click();
    assert.strictEqual($picker.get('classList').contains('show'), false);
  });
+
+  describe('color rounding', function() {
+    var layout = 'GRAY';
+    testClosestToLayout('000000', 0x000000, layout);
+    testClosestToLayout('005500', 0x000000, layout);
+    testClosestToLayout('55aa55', 0xaaaaaa, layout);
+    testClosestToLayout('ffaaff', 0xaaaaaa, layout);
+    testClosestToLayout('ffffaa', 0xffffff, layout);
+    testClosestToLayout('ffffff', 0xffffff, layout);
+
+    layout = 'BLACK_WHITE';
+    testClosestToLayout('000000', 0x000000, layout);
+    testClosestToLayout('005500', 0x000000, layout);
+    testClosestToLayout('55aa55', 0xffffff, layout);
+    testClosestToLayout('ffaaff', 0xffffff, layout);
+    testClosestToLayout('ffffaa', 0xffffff, layout);
+    testClosestToLayout('ffffff', 0xffffff, layout);
+
+    layout = 'COLOR';
+    testClosestToLayout('000000', 0x000000, layout);
+    testClosestToLayout('005500', 0x005500, layout);
+    testClosestToLayout('55bb55', 0x55aa55, layout);
+    testClosestToLayout('ff99ff', 0xffaaff, layout);
+    testClosestToLayout('ffffee', 0xffffff, layout);
+    testClosestToLayout('ffffff', 0xffffff, layout);
+
+    layout = ['ff0000', 'ff5500', 'ff00ff', '00ff00', '555555'];
+    testClosestToLayout('000000', 0x555555, layout);
+    testClosestToLayout('ff0000', 0xff0000, layout);
+    testClosestToLayout('ff1111', 0xff0000, layout);
+    testClosestToLayout('00aa00', 0x00ff00, layout);
+    testClosestToLayout('ff55ff', 0xff00ff, layout);
+    testClosestToLayout('aaaaaa', 0x555555, layout);
+    testClosestToLayout('ffffff', 0x555555, layout);
+  });
+
+  describe('layouts', function() {
+
+    // allow gray does nothing for 2.x
+    testAutoLayout('aplite', standardLayouts.BLACK_WHITE, true, 'aplite (2.x)',
+      null
+    );
+    testAutoLayout('aplite', standardLayouts.BLACK_WHITE, true, 'aplite (2.x)', {
+      platform: 'aplite',
+      model: 'qemu_platform_aplite',
+      language: 'en_US',
+      firmware: {
+        major: 2,
+        minor: 10,
+        patch: 0,
+        suffix: ''
+      }
+    });
+    testAutoLayout('aplite', standardLayouts.BLACK_WHITE, false, 'aplite (2.x)',
+      null
+    );
+    testAutoLayout('aplite', standardLayouts.BLACK_WHITE, false, 'aplite (2.x)', {
+      platform: 'aplite',
+      model: 'qemu_platform_aplite',
+      language: 'en_US',
+      firmware: {
+        major: 2,
+        minor: 10,
+        patch: 0,
+        suffix: ''
+      }
+    });
+    testAutoLayout('aplite', standardLayouts.BLACK_WHITE, false, 'aplite (3.x)', {
+      platform: 'aplite',
+      model: 'qemu_platform_aplite',
+      language: 'en_US',
+      firmware: {
+        major: 3,
+        minor: 10,
+        patch: 0,
+        suffix: ''
+      }
+    });
+    testAutoLayout('aplite', standardLayouts.GRAY, true, 'aplite (3.x)', {
+      platform: 'aplite',
+      model: 'qemu_platform_aplite',
+      language: 'en_US',
+      firmware: {
+        major: 3,
+        minor: 10,
+        patch: 0,
+        suffix: ''
+      }
+    });
+    testAutoLayout('basalt', standardLayouts.COLOR, true, '', {
+      platform: 'basalt',
+      model: 'qemu_platform_basalt',
+      language: 'en_US',
+      firmware: {
+        major: 3,
+        minor: 10,
+        patch: 0,
+        suffix: ''
+      }
+    });
+    testAutoLayout('chalk', standardLayouts.COLOR, true, '', {
+      platform: 'chalk',
+      model: 'qemu_platform_chalk',
+      language: 'en_US',
+      firmware: {
+        major: 3,
+        minor: 10,
+        patch: 0,
+        suffix: ''
+      }
+    });
+
+    testCustomLayout();
+    testCustomLayout('COLOR');
+    testCustomLayout('GRAY');
+    testCustomLayout('BLACK_WHITE');
+    testCustomLayout(['aaffaa', '55ff55', '00ff00']);
+    testCustomLayout([false, '55ff55', '00ff00']);
+    testCustomLayout([['aaffaa', '55ff55', '00ff00']]);
+    testCustomLayout(
+      [['AAFFAA', '#55ff55', '0x00ff00', 0xff5500, null]],
+      ['aaffaa', '55ff55', '00ff00', 'ff5500', false]
+    );
+    testCustomLayout([
+      ['aaffaa', '55ff55', '00ff00'],
+      ['005555', 'ffffff', '000000']]
+    );
+    testCustomLayout([
+      ['aaffaa', '55ff55', '00ff00'],
+      [false, 'ffffff', false]]
+    );
+    testCustomLayout(
+      [
+        ['aaffaa', '55ff55', '00ff00'],
+        [false, 'ffffff']
+      ],
+      ['aaffaa', '55ff55', '00ff00', false, 'ffffff', false]
+    );
+    testCustomLayout(
+      [
+        ['aaffaa', '55ff55', false],
+        [false, 'ffffff']
+      ],
+      ['aaffaa', '55ff55', false, false, 'ffffff', false]
+    );
+    testCustomLayout(
+      [
+        ['aaffaa', '55ff55'],
+        [false, 'ffffff', '000000']
+      ],
+      ['aaffaa', '55ff55', false, false, 'ffffff', '000000']
+    );
+
+  });
 });
@@ -7,6 +7,7 @@ var HTML = require('../../../src/scripts/vendor/minified').HTML;
 var components = require('../../../src/scripts/components');
 var manipulators = require('../../../src/scripts/lib/manipulators');
 var fixture = require('../../fixture');
+var sinon = require('sinon');

 var componentSchema = Joi.object().keys({
  name: Joi.string().required(),
@@ -39,6 +40,20 @@ describe('components', function() {
      it('is able to be passed to ClayConfig', function() {
        fixture.clayConfig([component.name]);
      });
+
+      it('only has one $manipulatorTarget', function() {
+        var configItem = fixture.clayConfig([component.name]).getAllItems()[0];
+        assert.strictEqual(configItem.$manipulatorTarget.length, 1);
+      });
+
+      it('only dispatches change events once', function() {
+        var configItem = fixture.clayConfig([component.name]).getAllItems()[0];
+        var handler = sinon.spy();
+        configItem.on('change', handler);
+        configItem.trigger('change');
+        assert.strictEqual(handler.callCount, 1);
+      });
+
    });
  });
 });
@@ -3,7 +3,7 @@
 var assert = require('chai').assert;
 var fixture = require('../../fixture');

-describe('component - color', function() {
+describe('component - select', function() {
  it('sets the value display to the correct value on change', function() {
    var clayConfig = fixture.clayConfig([
      {
@@ -0,0 +1,68 @@
+'use strict';
+
+var assert = require('chai').assert;
+var fixture = require('../../fixture');
+
+describe('component - slider', function() {
+  it('sets the value display to the correct value on set', function() {
+    var clayConfig = fixture.clayConfig(['slider']);
+    var sliderItem = clayConfig.getItemsByType('slider')[0];
+    var $valueDisplay = sliderItem.$element.select('.value');
+    var $valueDisplayPad = sliderItem.$element.select('.value-pad');
+
+    assert.strictEqual($valueDisplay.get('value'), '50');
+    assert.strictEqual($valueDisplayPad.get('innerHTML'), '50');
+    sliderItem.set(75);
+    assert.strictEqual($valueDisplay.get('value'), '75');
+    assert.strictEqual($valueDisplayPad.get('innerHTML'), '75');
+  });
+
+  it('sets the value display to the correct value on slider change', function() {
+    var clayConfig = fixture.clayConfig(['slider']);
+    var sliderItem = clayConfig.getItemsByType('slider')[0];
+    var $valueDisplay = sliderItem.$element.select('.value');
+    var $valueDisplayPad = sliderItem.$element.select('.value-pad');
+    var $slider = sliderItem.$element.select('.slider');
+
+    assert.strictEqual($valueDisplay.get('value'), '50');
+    assert.strictEqual($valueDisplayPad.get('innerHTML'), '50');
+    $slider.set('value', 75).trigger('change');
+    assert.strictEqual($valueDisplay.get('value'), '75');
+    assert.strictEqual($valueDisplayPad.get('innerHTML'), '75');
+  });
+
+  it('sets the value-pad to the same value as what the user is typing', function() {
+    var clayConfig = fixture.clayConfig(['slider']);
+    var sliderItem = clayConfig.getItemsByType('slider')[0];
+    var $valueDisplay = sliderItem.$element.select('.value');
+    var $valueDisplayPad = sliderItem.$element.select('.value-pad');
+
+    assert.strictEqual($valueDisplay.get('value'), '50');
+    assert.strictEqual($valueDisplayPad.get('innerHTML'), '50');
+    $valueDisplay.set('value', 75).trigger('input');
+    assert.strictEqual($valueDisplay.get('value'), '75');
+    assert.strictEqual($valueDisplayPad.get('innerHTML'), '75');
+  });
+
+  it('sets the slider to the correct value on user input', function() {
+    var clayConfig = fixture.clayConfig(['slider']);
+    var sliderItem = clayConfig.getItemsByType('slider')[0];
+    var $valueDisplay = sliderItem.$element.select('.value');
+    var $slider = sliderItem.$element.select('.slider');
+
+    assert.strictEqual($valueDisplay.get('value'), '50');
+    assert.strictEqual($slider.get('value'), '50');
+    $valueDisplay.set('value', 75).trigger('change');
+    assert.strictEqual($slider.get('value'), '75');
+  });
+
+  it('sets the precision correctly', function() {
+    var clayConfig = fixture.clayConfig([{
+      type: 'slider',
+      step: 0.25
+    }]);
+    var sliderItem = clayConfig.getItemsByType('slider')[0];
+
+    assert.strictEqual(sliderItem.precision, 2);
+  });
+});
@@ -5,15 +5,21 @@ var Clay = require('../../index');
 var assert = require('chai').assert;
 var standardComponents = require('../../src/scripts/components');
 var sinon = require('sinon');
+var toSource = require('tosource');

 /**
 * @return {void}
 */
 function stubPebble() {
+  var meta = fixture.meta();
+
  global.Pebble = {
    addEventListener: sinon.stub(),
    openURL: sinon.stub(),
-    sendAppMessage: sinon.stub()
+    sendAppMessage: sinon.stub(),
+    getActiveWatchInfo: sinon.stub().returns(meta.activeWatchInfo),
+    getAccountToken: sinon.stub().returns(meta.accountToken),
+    getWatchToken: sinon.stub().returns(meta.watchToken)
  };
 }

@@ -58,10 +64,15 @@ describe('Clay', function() {
    function() {
      stubPebble();
      var clay = fixture.clay([]);
+
+      // we stub the generateUrl method to avoid very large string comparisons.
+      var generateUrlStub = sinon.stub(clay, 'generateUrl');
+      generateUrlStub.returns('data:text/html;base64,PGh0bWw%2BVEVTVDwvaHRtbD4%3D');
      Pebble.addEventListener.withArgs('showConfiguration').callArg(1);

      assert(Pebble.addEventListener.calledWith('showConfiguration'));
      assert(Pebble.openURL.calledWith(clay.generateUrl()));
+      generateUrlStub.restore();
    });

    it('handles the "webviewclosed" event if autoHandleEvents is not false',
@@ -99,7 +110,23 @@ describe('Clay', function() {
       'if autoHandleEvents is false', function() {
      stubPebble();
      fixture.clay([], null, { autoHandleEvents: false });
-      assert.strictEqual(Pebble.addEventListener.called, false);
+      assert.strictEqual(
+        Pebble.addEventListener.withArgs('webviewclosed').called,
+        false
+      );
+      assert.strictEqual(
+        Pebble.addEventListener.withArgs('showConfiguration').called,
+        false
+      );
+    });
+  });
+
+  describe('.config', function() {
+    it('is a copy not a reference', function() {
+      var config = fixture.config(['input', 'text', 'color']);
+      var clay = fixture.clay(config);
+      assert.notStrictEqual(clay.config, config);
+      assert.deepEqual(clay.config, config);
    });
  });

@@ -117,13 +144,67 @@ describe('Clay', function() {
  });

  describe('.generateUrl()', function() {
+
+    /**
+     * Decode the generated data URI into just the HTML portion
+     * @param {string} url
+     * @returns {string}
+     */
+    function decodeUrl(url) {
+      return decodeURIComponent(url.replace(/^.*?[#,]/, ''));
+    }
+
+    describe('string substitutions', function() {
+      var customFn = function() { this.getAllItems(); };
+      var config = fixture.config(['input', 'color']);
+      var settings = { appKey: 'value' };
+      var clay;
+      var html;
+
+      before(function() {
+        stubPebble();
+        clay = fixture.clay(config, customFn);
+        Pebble.addEventListener.withArgs('showConfiguration').callArg(1);
+        localStorage.setItem('clay-settings', JSON.stringify(settings));
+        html = decodeUrl(clay.generateUrl());
+      });
+
+      it('Substitutes $$RETURN_TO$$ with the pebblejs://close#', function() {
+        assert.notInclude(html, '$$RETURN_TO$$');
+        assert.include(html, 'window.returnTo="pebblejs://close#"');
+      });
+
+      it('Substitutes $$CUSTOM_FN$$ with the customFn', function() {
+        assert.notInclude(html, '$$CUSTOM_FN$$');
+        assert.include(html, 'window.customFn=' + toSource(customFn));
+      });
+
+      it('Substitutes $$CONFIG$$ with the config', function() {
+        assert.notInclude(html, '$$CONFIG$$');
+        assert.include(html, 'window.clayConfig=' + toSource(config));
+      });
+
+      it('Substitutes $$SETTINGS$$ with the config', function() {
+        assert.notInclude(html, '$$SETTINGS$$');
+        assert.include(html, 'window.claySettings=' + toSource(settings));
+      });
+
+      it('Substitutes $$COMPONENTS$$ with the config', function() {
+        assert.notInclude(html, '$$COMPONENTS$$');
+        assert.include(html, 'window.clayComponents=' + toSource(clay.components));
+      });
+
+      it('Substitutes $$META$$ with the config', function() {
+        assert.notInclude(html, '$$META$$');
+        assert.include(html, 'window.clayMeta=' + toSource(clay.meta));
+      });
+    });
+
    it('does not replace $$RETURN_TO$$ if in the emulator', function() {
      var clay = fixture.clay([]);
      stubPebble();
      Pebble.platform = 'pypkjs';
-      var decodedUrl =
-        atob(decodeURIComponent(clay.generateUrl().replace(/^.*?#/, '')));
-      assert.match(decodedUrl, /\$\$RETURN_TO\$\$/);
+      assert.match(decodeUrl(clay.generateUrl()), /\$\$RETURN_TO\$\$/);
    });

    it('returns the emulator URL if inside emulator', function() {
@@ -149,13 +230,21 @@ describe('Clay', function() {
    });
  });

-  describe('.getSettings()', function() {
+  describe('.getSettings', function() {
    it('stores the response to localStorage and returns the decoded data',
    function() {
      var clay = fixture.clay([]);
-      var result = clay.getSettings('%7B%22appKey%22%3A%22value%22%7D');
-      assert.equal(localStorage.getItem('clay-settings'), '{"appKey":"value"}');
-      assert.deepEqual(result, {appKey: 'value'});
+      var settings = encodeURIComponent(JSON.stringify({
+        key1: 'value1',
+        key2: {value: 'value2'}
+      }));
+      var expected = {
+        key1: 'value1',
+        key2: 'value2'
+      };
+      var result = clay.getSettings(settings);
+      assert.equal(localStorage.getItem('clay-settings'), JSON.stringify(expected));
+      assert.deepEqual(result, expected);
    });

    it('does not store the response if it is invalid JSON and logs an error',
@@ -168,52 +257,219 @@ describe('Clay', function() {
      }, /Not Valid JSON/i);
      assert.equal(localStorage.getItem('clay-settings'), '{"appKey":"value"}');
    });
+
+    it('Prepares the settings for sendAppMessage', function() {
+      var clay = fixture.clay([]);
+      var response = encodeURIComponent(JSON.stringify({
+        test1: false,
+        test2: 'val-2',
+        test3: true,
+        test4: ['cb-1', 'cb-3'],
+        test5: 12345,
+        test6: [1, 2, 3, 4],
+        test7: [true, false, true],
+        test8: {
+          precision: 2,
+          value: 12.34
+        },
+        test9: {
+          precision: 1,
+          value: [1, 2, 3, 4]
+        }
+      }));
+      var expected = {
+        test1: 0,
+        test2: 'val-2',
+        test3: 1,
+        test4: ['cb-1', 0, 'cb-3', 0],
+        test5: 12345,
+        test6: [1, 2, 3, 4],
+        test7: [1, 0, 1],
+        test8: 1234,
+        test9: [10, 20, 30, 40]
+      };
+
+      assert.deepEqual(clay.getSettings(response), expected);
+    });
+
+    it('does not prepare the settings for sendAppMessage if convert is false',
+    function() {
+      var clay = fixture.clay([]);
+      var settings = {
+        test1: false,
+        test2: 'val-2',
+        test3: true,
+        test4: ['cb-1', 'cb-3'],
+        test5: 12345,
+        test6: [1, 2, 3, 4],
+        test7: [true, false, true],
+        test8: {
+          precision: 2,
+          value: 12.34
+        }
+      };
+      var response = encodeURIComponent(JSON.stringify(settings));
+
+      assert.deepEqual(clay.getSettings(response, false), settings);
+    });
+  });
+
+  describe('.meta', function() {
+    var emptyMeta = {
+      activeWatchInfo: null,
+      accountToken: '',
+      watchToken: '',
+      userData: {}
+    };
+
+    it('populates the meta in the showConfiguration handler', function() {
+      stubPebble();
+      var userData = {foo: 'bar'};
+      var clay = fixture.clay([], null, {userData: userData});
+
+      // meta only gets populated after showConfiguration happens
+      assert.deepEqual(clay.meta, emptyMeta);
+      Pebble.addEventListener.withArgs('showConfiguration').callArg(1);
+      assert.deepEqual(clay.meta, fixture.meta({userData: userData}));
+    });
+
+    it('populates the meta in the ready handler', function() {
+      stubPebble();
+      var userData = {foo: 'bar'};
+      var clay = fixture.clay([], null, {
+        autoHandleEvents: false,
+        userData: userData
+      });
+
+      // meta only gets populated after ready happens
+      assert.deepEqual(clay.meta, emptyMeta);
+      Pebble.addEventListener.withArgs('ready').callArg(1);
+
+      assert.deepEqual(clay.meta, fixture.meta({userData: userData}));
+    });
+
+    it('populates the meta with with empty values when there is no Pebble global',
+    function() {
+      delete global.Pebble;
+      var clay = fixture.clay([], null, {autoHandleEvents: false});
+
+      assert.deepEqual(clay.meta, emptyMeta);
+    });
  });

  describe('Clay.encodeDataUri()', function() {
-
-    /**
-     * @return {void}
-     */
-    function testEncodeDataUri() {
-      it('adds the correct prefix', function() {
-        assert.equal(Clay.encodeDataUri('test', 'prefix:'), 'prefix:dGVzdA%3D%3D');
-        assert.equal(
-          Clay.encodeDataUri('test'),
-          'data:text/html;base64,dGVzdA%3D%3D'
-        );
-      });
-
-      it('encodes the data correctly', function() {
-        assert.equal(Clay.encodeDataUri('test', ''), 'dGVzdA%3D%3D');
-        assert.equal(Clay.encodeDataUri('test{2}', ''), 'dGVzdHsyfQ%3D%3D');
-        assert.equal(Clay.encodeDataUri('test{10}', ''), 'dGVzdHsxMH0%3D');
-      });
-
-      it('throws if the input is invalid', function() {
-        assert.throws(function() {
-          Clay.encodeDataUri('♥');
-        });
-      });
-    }
-
-    describe('native', function() {
-      testEncodeDataUri();
+    it('adds the correct prefix', function() {
+      assert.equal(Clay.encodeDataUri('<test>', 'prefix:'), 'prefix:%3Ctest%3E');
+      assert.equal(
+        Clay.encodeDataUri('<test>'),
+        'data:text/html;charset=utf-8,%3Ctest%3E'
+      );
    });

-    describe('polyfill', function() {
-      var btoaOriginal = window.btoa;
-
-      before(function() {
-        window.btoa = undefined;
-      });
-
-      testEncodeDataUri();
-
-      after(function() {
-        window.btoa = btoaOriginal;
-      });
+    it('encodes the data correctly', function() {
+      assert.equal(Clay.encodeDataUri('test', ''), 'test');
+      assert.equal(Clay.encodeDataUri('test{2}', ''), 'test%7B2%7D');
+      assert.equal(Clay.encodeDataUri('test{10}', ''), 'test%7B10%7D');
    });

+    it('does not throw if unicode character is provided', function() {
+      assert.doesNotThrow(function() {
+        Clay.encodeDataUri('♥');
+      });
+    });
+  });
+
+  describe('.prepareForAppMessage', function() {
+    it('converts an array correctly when array contains numbers', function() {
+      assert.deepEqual(Clay.prepareForAppMessage([1, 2, 3]), [1, 2, 3]);
+      assert.deepEqual(Clay.prepareForAppMessage(
+        {value: [1.5, 2.34, 3], precision: 2}),
+        [150, 234, 300]
+      );
+    });
+
+    it('converts an array correctly when array contains booleans', function() {
+      assert.deepEqual(Clay.prepareForAppMessage([true, false, true]), [1, 0, 1]);
+      assert.deepEqual(
+        Clay.prepareForAppMessage([{value: true}, false, true]),
+        [1, 0, 1]);
+    });
+
+    it('converts booleans to ints', function() {
+      assert.strictEqual(Clay.prepareForAppMessage(false), 0);
+      assert.strictEqual(Clay.prepareForAppMessage(true), 1);
+      assert.strictEqual(Clay.prepareForAppMessage({value: false}), 0);
+      assert.strictEqual(Clay.prepareForAppMessage({value: true}), 1);
+    });
+
+    it('leaves strings alone', function() {
+      assert.strictEqual(Clay.prepareForAppMessage('test'), 'test');
+      assert.strictEqual(Clay.prepareForAppMessage({value: 'test'}), 'test');
+    });
+
+    it('Multiples the number by the precision', function() {
+      assert.strictEqual(Clay.prepareForAppMessage(123), 123);
+      assert.strictEqual(Clay.prepareForAppMessage({
+        value: 1.23,
+        precision: 3
+      }), 1230);
+      assert.strictEqual(Clay.prepareForAppMessage({
+        value: 123,
+        precision: 2
+      }), 12300);
+      assert.strictEqual(Clay.prepareForAppMessage({
+        value: 1.23456,
+        precision: 4
+      }), 12345);
+    });
+
+    it('ignores precision for anything but numbers', function() {
+      assert.strictEqual(Clay.prepareForAppMessage({
+        value: 'not a number',
+        precision: 3
+      }), 'not a number');
+
+      assert.deepEqual(Clay.prepareForAppMessage({
+        value: ['not', 'a', 'number'],
+        precision: 3
+      }), ['not', 'a', 'number']);
+    });
+
+    it('treats an undefined precision as 0', function() {
+      assert.strictEqual(Clay.prepareForAppMessage({
+        value: 12.45,
+        precision: undefined
+      }), 12);
+    });
+  });
+
+  describe('.prepareSettingsForAppMessage', function() {
+    it('converts the settings correctly', function() {
+      var settings = {
+        test1: false,
+        test2: 'val-2',
+        test3: true,
+        test4: ['cb-1', 'cb-3'],
+        test5: 12345,
+        test6: [1, 2, 3, 4],
+        test7: [true, false, true],
+        test8: {
+          precision: 2,
+          value: 12.34
+        }
+      };
+      var expected = {
+        test1: 0,
+        test2: 'val-2',
+        test3: 1,
+        test4: ['cb-1', 0, 'cb-3', 0],
+        test5: 12345,
+        test6: [1, 2, 3, 4],
+        test7: [1, 0, 1],
+        test8: 1234
+      };
+
+      assert.deepEqual(Clay.prepareSettingsForAppMessage(settings), expected);
+    });
  });
 });
@@ -15,23 +15,31 @@ describe('ClayConfig', function() {
      'getItemByAppKey',
      'getItemById',
      'getItemsByType',
-      'getSettings',
+      'serialize',
      'registerComponent',
      'build',
      'on',
      'off',
-      'trigger'
+      'trigger',
+      'meta'
    ];
    var clayConfig = fixtures.clayConfig(['input']);
    checkReadOnly(clayConfig, properties);
  });

+  describe('.meta', function() {
+    it('populates meta', function() {
+      var clayConfig = fixtures.clayConfig(['input']);
+      assert.deepEqual(clayConfig.meta, fixtures.meta());
+    });
+  });
+
  describe('throws when trying to run methods before being built', function() {
    [
      'getItemByAppKey',
      'getItemById',
      'getItemsByType',
-      'getSettings'
+      'serialize'
    ].forEach(function(method) {
      it('.' + method + '()', function() {
        var clayConfig = fixtures.clayConfig(['input', 'text'], false);
@@ -91,37 +99,64 @@ describe('ClayConfig', function() {
    });
  });

-  describe('.getSettings()', function() {
+  describe('.serialize()', function() {
    it('returns the correct settings', function() {
-      var clayConfig = fixtures.clayConfig(
-        [
-          {type: 'input', appKey: 'test1', defaultValue: 'default val'},
-          {type: 'select', appKey: 'test2', options: [
-            {label: 'label-1', value: 'val-1'},
-            {label: 'label-2', value: 'val-2'}
-          ]},
-          {type: 'toggle', appKey: 'test3'}
-        ],
-        true,
-        true,
-        {
-          test2: 'val-2' // set one of the values via settings
-        }
-      );
+      var config = [
+        {type: 'input', appKey: 'test1', defaultValue: 'default val'},
+        {type: 'select', appKey: 'test2', options: [
+          {label: 'label-1', value: 'val-1'},
+          {label: 'label-2', value: 'val-2'}
+        ]},
+        {type: 'toggle', appKey: 'test3'},
+        {type: 'checkboxgroup', appKey: 'test4', options: [
+          {label: 'label-1', value: 'cb-1'},
+          {label: 'label-2', value: 'cb-2'},
+          {label: 'label-2', value: 'cb-3'}
+        ]},
+        {type: 'slider', appKey: 'test5', step: 0.05, defaultValue: 12.5}
+      ];
+      var settings = {
+        test2: 'val-2'
+      };

-      assert.deepEqual(clayConfig.getSettings(), {
-        test1: 'default val',
-        test2: 'val-2',
-        test3: 0
+      var clayConfig = fixtures.clayConfig(config, true, true, settings);
+
+      assert.deepEqual(clayConfig.serialize(), {
+        test1: {value: 'default val'},
+        test2: {value: 'val-2'},
+        test3: {value: false},
+        test4: {value: []},
+        test5: {value: 12.5, precision: 2}
      });

      clayConfig.getItemByAppKey('test1').set('val-1');
      clayConfig.getItemByAppKey('test3').set(true);
+      clayConfig.getItemByAppKey('test4').set(['cb-1', 'cb-3']);

-      assert.deepEqual(clayConfig.getSettings(), {
+      assert.deepEqual(clayConfig.serialize(), {
+        test1: {value: 'val-1'},
+        test2: {value: 'val-2'},
+        test3: {value: true},
+        test4: {value: ['cb-1', 'cb-3']},
+        test5: {value: 12.5, precision: 2}
+      });
+
+      // make sure the result of serialize() can actually be fed back in to
+      // a new instance of ClayConfig
+      var clay = fixtures.clay(config);
+      var response = encodeURIComponent(JSON.stringify(clayConfig.serialize()));
+      clay.getSettings(response);
+      var loadedSettings = JSON.parse(localStorage.getItem('clay-settings'));
+
+      assert.deepEqual(loadedSettings, {
        test1: 'val-1',
        test2: 'val-2',
-        test3: 1
+        test3: true,
+        test4: ['cb-1', 'cb-3'],
+        test5: 12.5
+      });
+      assert.doesNotThrow(function() {
+        fixtures.clayConfig(config, true, true, loadedSettings);
      });
    });
  });
@@ -77,7 +77,7 @@ describe('ClayItem', function() {
  describe('.$element', function() {
    it('sets $element correctly', function() {
      var clayItem = fixture.clayItem('input');
-      assert.strictEqual(clayItem.$element[0].tagName, 'LABEL');
+      assert.strictEqual(clayItem.$element[0].classList.contains('component'), true);
    });
  });

@@ -7,7 +7,7 @@ var fixture = require('../../fixture');
 describe('manipulators', function() {

  /**
-   * @param {string|Clay~ConfigItem} itemType
+   * @param {string|Object} itemType
   * @param {*} value
   * @param {*} [expected]
   * @return {void}
@@ -19,9 +19,10 @@ describe('manipulators', function() {
      it('sets: "' + value + '" and gets: "' + expected + '" then triggers "change"',
      function() {
        var handlerSpy = sinon.spy();
-        var clayItem = fixture.clayItem(itemType);
+        var clayItem = fixture.clayConfig([itemType]).getAllItems()[0];
        clayItem.on('change', handlerSpy);

+        clayItem.set(value);
        clayItem.set(value);
        assert.deepEqual(clayItem.get(), expected);
        assert.strictEqual(handlerSpy.callCount, 1, 'handler not called once');
@@ -31,7 +32,7 @@ describe('manipulators', function() {
  }

  /**
-   * @param {string|Clay~ConfigItem} itemType
+   * @param {string|Object} itemType
   * @return {void}
   */
  function testDisable(itemType) {
@@ -45,6 +46,7 @@ describe('manipulators', function() {
          false
        );
        clayItem.disable();
+        clayItem.disable();
        assert.strictEqual(
          clayItem.$element[0].classList.contains('disabled'),
          true
@@ -57,7 +59,7 @@ describe('manipulators', function() {
  }

  /**
-   * @param {string} itemType
+   * @param {string|Object} itemType
   * @return {void}
   */
  function testEnable(itemType) {
@@ -73,6 +75,7 @@ describe('manipulators', function() {
          true
        );
        clayItem.enable();
+        clayItem.enable();
        assert.strictEqual(
          clayItem.$element[0].classList.contains('disabled'),
          false
@@ -84,27 +87,123 @@ describe('manipulators', function() {
    });
  }

+  /**
+   * @param {string|Object} itemType
+   * @return {void}
+   */
+  function testHide(itemType) {
+    describe('.hide()', function() {
+      it('hides the field then triggers a "hide" event', function() {
+        var handlerSpy = sinon.spy();
+        var clayItem = fixture.clayItem(itemType);
+        clayItem.on('hide', handlerSpy);
+
+        assert.strictEqual(
+          clayItem.$element[0].classList.contains('hide'),
+          false
+        );
+        clayItem.hide();
+        clayItem.hide();
+        assert.strictEqual(
+          clayItem.$element[0].classList.contains('hide'),
+          true
+        );
+        assert.strictEqual(handlerSpy.callCount, 1, 'handler not called once');
+        assert(handlerSpy.calledOn(clayItem), 'handler not called on clayItem');
+      });
+    });
+  }
+
+  /**
+   * @param {string|Object} itemType
+   * @return {void}
+   */
+  function testShow(itemType) {
+    describe('.show()', function() {
+      it('shows the field then triggers a "show" event', function() {
+        var handlerSpy = sinon.spy();
+        var clayItem = fixture.clayItem(itemType);
+        clayItem.on('show', handlerSpy);
+
+        clayItem.hide();
+        assert.strictEqual(
+          clayItem.$element[0].classList.contains('hide'),
+          true
+        );
+        clayItem.show();
+        clayItem.show();
+        assert.strictEqual(
+          clayItem.$element[0].classList.contains('hide'),
+          false
+        );
+        assert.strictEqual(handlerSpy.callCount, 1, 'handler not called once');
+        assert(handlerSpy.calledOn(clayItem), 'handler not called on clayItem');
+      });
+    });
+  }
+
  describe('html', function() {
-    testSetGet('footer', 'test123');
+    var type = 'text';
+    testSetGet(type, 'test123');
+    testSetGet(type, '<span>some HTML</span>');
+    testShow(type);
+    testHide(type);
+  });
+
+  describe('button', function() {
+    var type = 'button';
+    testSetGet(type, 'test123');
+    testSetGet(type, '<span>some HTML</span>');
+    testDisable(type);
+    testEnable(type);
+    testShow(type);
+    testHide(type);
  });

  describe('val', function() {
-    testSetGet('input', 'test321');
-    testDisable('input');
-    testEnable('input');
+    var type = 'input';
+    testSetGet(type, 'test321');
+    testSetGet(type, 1234, '1234');
+    testDisable(type);
+    testEnable(type);
+    testShow(type);
+    testHide(type);
+  });
+
+  describe('slider', function() {
+    var type = {
+      type: 'slider',
+      min: 0,
+      max: 100,
+      step: 0.1
+    };
+
+    testSetGet(type, '12', 12);
+    testSetGet(type, 12);
+    testSetGet(type, '12.3', 12.3);
+    testSetGet(type, 12.3);
+    testSetGet(type, 12.34, 12.3);
+    testSetGet(type, '12.34', 12.3);
+    testDisable(type);
+    testEnable(type);
+    testShow(type);
+    testHide(type);
  });

  describe('checked', function() {
-    testSetGet('toggle', true, 1);
-    testSetGet('toggle', 1);
-    testSetGet('toggle', false, 0);
-    testSetGet('toggle', 0);
-    testDisable('toggle');
-    testEnable('toggle');
+    var type = 'toggle';
+    testSetGet({type: type, defaultValue: false}, 1, true);
+    testSetGet({type: type, defaultValue: false}, true);
+    testSetGet({type: type, defaultValue: true}, 0, false);
+    testSetGet({type: type, defaultValue: true}, false);
+    testDisable(type);
+    testEnable(type);
+    testShow(type);
+    testHide(type);
  });

  describe('radiogroup', function() {
-    var item = {
+    var type = {
      type: 'radiogroup',
      clayId: 1,
      options: [
@@ -113,41 +212,49 @@ describe('manipulators', function() {
        { label: '3', value: 'three "quote' }
      ]
    };
-    testSetGet(item, 'one');
-    testSetGet(item, 'two');
-    testSetGet(item, 'three "quote');
-    testDisable(item);
-    testEnable(item);
+    testSetGet(type, 'one');
+    testSetGet(type, 'two');
+    testSetGet(type, 'three "quote');
+    testDisable(type);
+    testEnable(type);
+    testShow(type);
+    testHide(type);
  });

  describe('checkboxgroup', function() {
-    var item = {
+    var type = {
      type: 'checkboxgroup',
      clayId: 1,
+      defaultValue: ['two'],
      options: [
        { label: '1', value: 'one' },
        { label: '2', value: 'two' },
        { label: '3', value: 'three "quote' }
      ]
    };
-    testSetGet(item, ['one', 'two']);
-    testSetGet(item, ['three "quote']);
-    testSetGet(item, []);
-    testSetGet(item, false, []);
-    testDisable(item);
-    testEnable(item);
+    testSetGet(type, ['one', 'two']);
+    testSetGet(type, ['three "quote']);
+    testSetGet(type, []);
+    testSetGet(type, false, []);
+    testDisable(type);
+    testEnable(type);
+    testShow(type);
+    testHide(type);
  });

  describe('color', function() {
-    testSetGet('color', 'FF0000', 0xff0000);
-    testSetGet('color', '#FF0000', 0xff0000);
-    testSetGet('color', '0xFF0000', 0xff0000);
-    testSetGet('color', '#ff0000', 0xff0000);
-    testSetGet('color', 0xff0000, 0xff0000);
-    testSetGet('color', '', 0x000000);
-    testSetGet('color', false, 0x000000);
-    testSetGet('color', undefined, 0x000000);
-    testDisable('color');
-    testEnable('color');
+    var type = 'color';
+    testSetGet(type, 'FF0000', 0xff0000);
+    testSetGet(type, '#FF0000', 0xff0000);
+    testSetGet(type, '0xFF0000', 0xff0000);
+    testSetGet(type, '#ff0000', 0xff0000);
+    testSetGet(type, 0xff0000, 0xff0000);
+    testSetGet({type: type, defaultValue: 0x00ff00}, '', 0x000000);
+    testSetGet({type: type, defaultValue: 0x00ff00}, false, 0x000000);
+    testSetGet({type: type, defaultValue: 0x00ff00}, undefined, 0x000000);
+    testDisable(type);
+    testEnable(type);
+    testShow(type);
+    testHide(type);
  });
 });
@@ -27,3 +27,4 @@ describe('Utils', function() {
    });
  });
 });
+
Author	SHA1	Message	Date
keegan-lillo	b553094742	Merge pull request #64 from pebble/release/v0.1.5 Bump Version to v0.1.5	2016-03-21 11:28:57 -07:00
keegan-lillo	f31ffed558	Bump Version to v0.1.5	2016-03-21 09:26:59 -07:00
keegan-lillo	3f71f97b8b	Merge pull request #62 from pebble/#61/fix-color-picker-default add default background color to value display in color picker	2016-03-21 09:25:52 -07:00
Keegan	1a6308f621	add default background color to value display in color picker	2016-03-20 11:16:03 -07:00
keegan-lillo	7045c59a72	Merge pull request #60 from pebble/release/v0.1.4 Bump version to v0.1.4	2016-03-16 12:09:29 +11:00
keegan-lillo	4ffb1018f7	Bump version to v0.1.4	2016-03-16 12:04:19 +11:00
keegan-lillo	e78c09f5be	Merge pull request #54 from pebble/#52/custom-color-picker-layout #52/custom color picker layout	2016-03-16 12:03:13 +11:00
keegan-lillo	d8e73f2674	Merge branch 'master' into #52/custom-color-picker-layout	2016-03-16 11:54:18 +11:00
keegan-lillo	0358e820e6	Merge pull request #59 from pebble/document-pebblejs Document Pebble.js usage	2016-03-16 11:54:04 +11:00
keegan-lillo	1d821f61c3	Change Settings.data to Settings.option	2016-03-16 11:44:50 +11:00
keegan-lillo	e2ffa42595	Document Pebble.js usage	2016-03-16 11:42:39 +11:00
keegan-lillo	3a2dcb187e	Merge branch 'master' into #52/custom-color-picker-layout	2016-03-16 09:12:39 +11:00
keegan-lillo	08e3a21429	Merge pull request #56 from pebble/#55/unicode-support Allow unicode characters in config	2016-03-16 09:12:30 +11:00
keegan-lillo	42a613caf4	Merge branch 'master' into #52/custom-color-picker-layout	2016-03-16 08:25:59 +11:00
keegan-lillo	4ff38eb0ba	Merge branch 'master' into #55/unicode-support	2016-03-16 08:25:44 +11:00
keegan-lillo	b466c48487	Merge pull request #48 from pebble/#47/range-slider-component #47/range slider component	2016-03-16 08:25:06 +11:00
keegan-lillo	517d4f84ff	Add quotes to slider description	2016-03-16 08:12:13 +11:00
keegan-lillo	e04a6c9f87	Merge branch 'master' into #47/range-slider-component	2016-03-15 13:11:32 +11:00
keegan-lillo	1f0867985d	Merge branch 'master' into #52/custom-color-picker-layout	2016-03-15 13:11:24 +11:00
keegan-lillo	d0e5988024	Merge branch 'master' into #55/unicode-support	2016-03-15 13:11:16 +11:00
keegan-lillo	d007d48afc	Merge pull request #57 from pebble/document-clayconfig-param-in-component-initialize Document the clayConfig parameter of custom component initializer	2016-03-15 13:11:09 +11:00
keegan-lillo	07a847457f	Document the clayConfig parameter of custom component initializer	2016-03-15 13:07:19 +11:00
Keegan	9347c9f3d2	Allow unicode characters in config	2016-03-15 12:06:04 +11:00
Keegan	4ee5a7361c	When setting the value for the color picker, round it to the closest available value in the layout	2016-03-15 04:53:58 +11:00
Keegan	dad8b2a025	add allowGray option to color picker	2016-03-14 03:09:23 +11:00
Keegan	d52f6d4aa2	Globally increase mocha timeout because Travis struggles sometimes	2016-03-14 01:55:22 +11:00
keegan-lillo	a94eae9a16	Clarify acceptable default values for the color picker.	2016-03-14 01:30:41 +11:00
keegan-lillo	317f6fd4e8	Grammar fixes in color picker docs	2016-03-14 01:23:46 +11:00
keegan-lillo	b19b07c47d	Fix syntax error in Color Picker examples	2016-03-14 01:20:07 +11:00
Keegan	0a2ddab597	Document new color picker functionality	2016-03-14 01:02:40 +11:00
Keegan	005ac939b1	Refine color picker styles	2016-03-14 01:01:58 +11:00
Keegan	12b0ae9bd6	Allow custom layouts in the color picker and automatically choose a layout based on platform	2016-03-14 01:01:13 +11:00
Keegan	6f92c0d267	Merge remote-tracking branch 'origin/master' into #47/range-slider-component # Conflicts: # index.js	2016-03-12 10:27:27 +11:00
keegan-lillo	756cdc0d9e	Merge pull request #50 from pebble/#20/allow-user-data #20/allow user data	2016-03-12 10:25:04 +11:00
Keegan	783bc84779	fix typo in Clay JSdoc	2016-03-12 10:22:01 +11:00
Keegan	e621bbf0bd	Merge remote-tracking branch 'origin/master' into #20/allow-user-data	2016-03-12 10:16:47 +11:00
keegan-lillo	43c5c3cc9f	Merge pull request #51 from pebble/#39/fix-event-targets Fix events firing on wrong element for button component	2016-03-12 10:15:37 +11:00
Keegan	d8738e06b2	fix tests for slider	2016-03-11 11:12:00 +11:00
Keegan	67449ec34e	Use number for value display in slider because of vendor implementation inconsistencies	2016-03-11 11:04:52 +11:00
keegan-lillo	5c63b00eda	Make slider update value display as user is adjusting it	2016-03-11 10:49:23 +11:00
Keegan	79eef99731	Fix events firing on wrong element for button component	2016-03-11 03:57:30 +11:00
Keegan	e5496c62d6	Add developers to send arbitrary data to the config page	2016-03-11 03:36:00 +11:00
Keegan	b1a6f184ba	Stop exposing config as a reference. resolves #35	2016-03-11 02:25:59 +11:00
Keegan	878fea0340	Allow floats in the slider component and update docs	2016-03-11 01:07:17 +11:00
Keegan	1142d1adee	Renamed `ClayConfig.getSettings()` to `ClayConfig.serialize()`	2016-03-10 21:00:44 +11:00
Keegan	0873f5eba2	Added Slider component	2016-03-10 04:20:50 +11:00
Keegan	0faa585d5f	Clean up manipulators tests	2016-03-10 00:03:50 +11:00
keegan-lillo	3b7c4cda7c	Merge pull request #42 from pebble/fix-readme-getsetting-link Fix link in readme	2016-03-09 15:41:01 +11:00
keegan-lillo	3839a47f5c	Merge branch 'master' into fix-readme-getsetting-link	2016-03-09 15:37:16 +11:00
keegan-lillo	85503d2846	Merge pull request #46 from clach04/readme_json_v_js Clarify config.json versus config.js differences	2016-03-09 15:35:30 +11:00
clach04	d6ae6faef4	Merge branch 'master' into readme_json_v_js	2016-03-08 18:06:23 -08:00
clach04	2c2f003e15	Clarify config.json versus config.js differences Make example config clear, main impact is for CloudPebble usage where json is not yet an option.	2016-03-08 18:02:49 -08:00
keegan-lillo	2bd9623ab1	Merge pull request #45 from pebble/release/v0.1.3 Bump version to v0.1.3	2016-03-09 12:46:28 +11:00
keegan-lillo	9f3c78de17	Bump version to v0.1.3	2016-03-09 12:38:10 +11:00
keegan-lillo	1af5828b18	Update README.md	2016-03-09 12:32:51 +11:00
keegan-lillo	99dc081b69	Merge pull request #41 from pebble/#40/move-settings-conversion `Clay.getSettings()` now does type conversion, not `ClayConfg.getSettings()`	2016-03-09 12:30:31 +11:00
Keegan	37c64a6e05	minified does not work in the emulator or iOS so move settings iteration to utils.prepareSettingsForAppMessage()	2016-03-09 12:24:29 +11:00
Keegan	34d83de59e	Add deamdify transform to 'clay' task in gulpfile	2016-03-09 11:52:27 +11:00
Keegan	e80a1630f1	Don't assume string in checkboxgroup set manipulator	2016-03-09 11:51:49 +11:00
Keegan	d0af7b0fac	fix typo in readme	2016-03-09 11:28:42 +11:00
Keegan	1af4dfd8ef	Change the behavior so that type conversions only run inside of Clay.getSettings no ClayConfig.getSettings	2016-03-09 11:25:13 +11:00
keegan-lillo	42fc8f1da4	Merge pull request #38 from pebble/fix-getsettings-in-readme Moved the conversion information from `Clay.getSettings` to `ClayConfg.getSettings`	2016-03-08 10:56:48 +11:00
keegan-lillo	d469d404ab	Moved the conversion information from `Clay.getSettings` to `ClayConfig.getSettings`	2016-03-08 10:47:55 +11:00
keegan-lillo	ad807020ca	Merge pull request #36 from pebble/release/v0.1.2 Bump version to v0.1.2	2016-03-08 08:56:20 +11:00
keegan-lillo	bd3e4a55c8	Bump version to v0.1.2	2016-03-08 08:52:06 +11:00
keegan-lillo	f50f569c98	Merge pull request #21 from pebble/#13/fix-checkboxgroups-return-value Separate the results of the checkboxgroup manipulator with a zero.	2016-03-08 08:47:43 +11:00
Keegan	be17456f8b	Merge remote-tracking branch 'origin/master' into #13/fix-checkboxgroups-return-value # Conflicts: # test/spec/lib/manipulators.js	2016-03-08 08:41:24 +11:00
keegan-lillo	49f92de102	Merge pull request #32 from pebble/#31/generic-btn-component Add generic button component	2016-03-08 08:38:28 +11:00
Keegan	c4f6b17a58	Update button to be compatible with new events behavior.	2016-03-08 08:31:30 +11:00
Keegan	061bb34c91	Merge remote-tracking branch 'origin/master' into #31/generic-btn-component	2016-03-08 08:28:29 +11:00
keegan-lillo	20e7460c2f	Merge pull request #33 from pebble/#26/fix-aggressive-events #26/fix aggressive events	2016-03-08 08:27:55 +11:00
keegan-lillo	6e5c2f5847	Merge branch 'master' into #26/fix-aggressive-events	2016-03-08 08:20:43 +11:00
keegan-lillo	71ea309346	Merge pull request #30 from pebble/config-based-on-platform-readme Made documentation less ambiguous about classes	2016-03-08 08:20:25 +11:00
Keegan	d63c6c832d	Change behavior of the toggle to return a boolean again	2016-03-07 13:13:36 +11:00
Keegan	de00ac1fd6	update readme to reflect new behavior of ClayConfig.getSettings()	2016-03-07 13:05:38 +11:00
Keegan	271a0d1cfd	Change the ClayConfig.getSettings() method to convert data types to be compatible with sendAppMessage	2016-03-07 12:58:46 +11:00
Keegan	d6659db3ac	Merge remote-tracking branch 'origin/master' into #13/fix-checkboxgroups-return-value	2016-03-07 10:45:38 +11:00
Keegan	264866ce26	update readme to explain new events behavior.	2016-03-06 14:32:53 +11:00
Keegan	069d4a80da	only dispatch manipulator events if the state is actually changed.	2016-03-06 14:28:38 +11:00
keegan-lillo	c99ad44b5c	remove copy-paste error	2016-03-06 13:17:39 +11:00
Keegan	75c846a8ba	Fix links to checkboxgroup and radiogroup manipulators in readme	2016-03-06 12:39:03 +11:00
Keegan	a1df49623d	Add generic button component	2016-03-06 12:31:25 +11:00
keegan-lillo	08e41036da	Clarify when Clay.meta is actually available.	2016-03-05 23:08:52 +11:00
keegan-lillo	663f91e9bd	Made documentation less ambiguous about classes + added example for loading a different config based on platform	2016-03-05 23:03:39 +11:00
keegan-lillo	bdcd820f7c	Merge pull request #29 from pebble/release/v0.1.1 Bump version to 0.1.1	2016-03-03 13:25:14 +11:00
Keegan	51a44b18b0	Bump version to 0.1.1	2016-03-03 13:15:23 +11:00
keegan-lillo	64931dabc9	Merge pull request #28 from pebble/fix-dist Fix release links in readme	2016-03-03 12:17:39 +11:00
keegan-lillo	b7be587542	Merge branch 'master' into fix-dist	2016-03-03 11:53:35 +11:00
keegan-lillo	4508c73de2	Fix release links in readme	2016-03-03 11:53:11 +11:00
keegan-lillo	f804cb0efd	Merge pull request #27 from pebble/fix-dist Get rid of dist/clay.js and use GitHub releases instead	2016-03-03 11:48:02 +11:00
keegan-lillo	525a78fc53	Update download instructions for CloudPebble	2016-03-03 11:32:31 +11:00
Keegan	05c62d466e	Get rid of dist/clay.js and use GitHub releases instead	2016-03-03 11:25:19 +11:00
keegan-lillo	dbf798daff	Merge pull request #24 from pebble/#11/description-for-input-components Add description field to all input type components.	2016-03-03 10:54:45 +11:00
Keegan	b91b45bd23	Fix padding issue after merge	2016-03-03 10:49:05 +11:00
Keegan	2e447e5cd2	Merge remote-tracking branch 'origin/master' into #11/description-for-input-components # Conflicts: # src/styles/clay/_base.scss	2016-03-03 10:45:20 +11:00
keegan-lillo	9782737256	Merge pull request #25 from pebble/#6/show-hide-items Add hide/show method to manipulators.	2016-03-03 10:37:03 +11:00
Keegan	3a4d962a37	Update example image with description	2016-03-03 10:36:30 +11:00
Keegan	87d8b91153	Update dev/config.js with more useful examples	2016-03-03 10:27:38 +11:00
Keegan	7bf4117d87	Clean up styles	2016-03-03 10:26:23 +11:00
Keegan	35fc64de99	Document hide and show methods	2016-03-03 10:06:37 +11:00
Keegan	de982960e2	fix tests after the input component changed HTML structure.	2016-03-03 01:03:23 +11:00
Keegan	797fa1d9ab	make the tap-highlight not highlight the description	2016-03-03 00:49:55 +11:00
Keegan	4fb8db32da	Fix section spacing when all items in a section are hidden.	2016-03-03 00:13:51 +11:00
Keegan	aa8409912c	fix separator visibility when items are hidden	2016-03-02 23:57:24 +11:00
Keegan	8e3cd119b8	use !important for .hide class	2016-03-02 22:11:19 +11:00
Keegan	beb623f4fd	fix separator visibility on disabled and hidden items	2016-03-02 14:02:18 +11:00
Keegan	226dd682e0	Merge remote-tracking branch 'origin/master' into #11/description-for-input-components # Conflicts: # dist/clay.js # src/styles/clay/_base.scss # src/templates/components/select.tpl # src/templates/components/toggle.tpl	2016-03-02 10:58:17 +11:00
Keegan	011f40ea0d	Merge remote-tracking branch 'origin/master' into #6/show-hide-items # Conflicts: # dev/custom-fn.js # src/styles/clay/_base.scss	2016-03-02 10:54:20 +11:00
keegan-lillo	a98b4e69c1	Merge pull request #23 from pebble/#22/css-issues #22/css issues	2016-03-02 10:48:59 +11:00
Matthew Tole	0ad931e47c	Merge branch 'master' into #22/css-issues	2016-02-29 15:11:19 -08:00
keegan-lillo	f7717dc781	Merge pull request #19 from pebble/PBL-31966/include-user-and-watch-info Pbl 31966/include user and watch info	2016-03-01 08:52:04 +11:00
Keegan	2f5f3cc4e8	Add description field to all input type components.	2016-02-29 23:58:03 +11:00
Keegan	3b9bf842cb	Fix value not showing up for select in old Android versions	2016-02-29 23:18:25 +11:00
Keegan	eb1d336f8f	Center align submit button	2016-02-29 21:54:45 +11:00
Keegan	d6461e1fb5	fix missing value display on old android	2016-02-29 15:54:12 +11:00
Keegan	fa72cfb3a3	fix autoprefixer not working in dev mode	2016-02-29 15:46:15 +11:00
Keegan	b50a7dc72d	Fix checkboxgroup/radiogroup weirdness on old android	2016-02-29 15:45:59 +11:00
Keegan	7def2f741d	try adding longer timeout to try and make travis stop timing out	2016-02-29 15:19:28 +11:00
Keegan	ca498c6e3c	fix tap-highlight and missing divider	2016-02-29 14:35:39 +11:00
Keegan	060704cb1a	Add hide/show method to manipulators.	2016-02-29 14:24:59 +11:00
Keegan	aa30ef7d7a	Account for cases where the Pebble global is undefined	2016-02-27 08:51:54 +11:00
Keegan	1cd4590691	Merge remote-tracking branch 'origin/master' into PBL-31966/include-user-and-watch-info # Conflicts: # dist/clay.js # test/spec/index.js	2016-02-27 08:35:04 +11:00
keegan-lillo	75aaa07048	Merge pull request #17 from pebble/#15/fix-travis-random-fails #15/fix travis random fails	2016-02-27 08:31:20 +11:00
Keegan	5b2aba4312	fix table layout in readme	2016-02-26 12:37:48 +11:00
keegan-lillo	4584fe5dc5	Merge branch 'master' into #15/fix-travis-random-fails	2016-02-26 12:13:51 +11:00
keegan-lillo	d50ff0a9a4	Merge pull request #14 from pebble/readme-intro-fix Fix link in intro of readme	2016-02-26 09:47:52 +11:00
Keegan	c908e681ad	Sub clay.generateUrl() to avoid the very large string comparison	2016-02-25 14:40:40 +11:00
keegan-lillo	8fdd5dad07	Fix link in intro of readme	2016-02-23 00:03:11 -08:00
Keegan	2169d5334f	expose meta containing watch and account info in ClayConfig	2016-02-19 19:31:17 -08:00
Keegan	94428b1826	extract watchinfo etc from Pebble object	2016-02-19 15:29:11 -08:00