diff --git a/package-lock.json b/package-lock.json
index 8315fa34..7af0e3a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -374,7 +374,7 @@
       "dependencies": {
         "chalk": {
           "version": "2.3.1",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
           "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==",
           "dev": true,
           "requires": {
@@ -387,13 +387,13 @@
     },
     "@commitlint/config-conventional": {
       "version": "6.1.3",
-      "resolved": "http://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-6.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-6.1.3.tgz",
       "integrity": "sha1-bAburgTFrHicNhjfTVKu2on/uBA=",
       "dev": true
     },
     "@commitlint/ensure": {
       "version": "6.1.3",
-      "resolved": "http://registry.npmjs.org/@commitlint/ensure/-/ensure-6.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-6.1.3.tgz",
       "integrity": "sha1-gTtYyf364VNRty/mRqFi69tx6io=",
       "dev": true,
       "requires": {
@@ -406,7 +406,7 @@
     },
     "@commitlint/execute-rule": {
       "version": "6.1.3",
-      "resolved": "http://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-6.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-6.1.3.tgz",
       "integrity": "sha1-SJKOc27xXocQ0zKhXHyJlVXk4Qs=",
       "dev": true,
       "requires": {
@@ -415,7 +415,7 @@
     },
     "@commitlint/format": {
       "version": "6.1.3",
-      "resolved": "http://registry.npmjs.org/@commitlint/format/-/format-6.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-6.1.3.tgz",
       "integrity": "sha1-QUuQSKmvVFh9qWIicXujMjR6veM=",
       "dev": true,
       "requires": {
@@ -425,7 +425,7 @@
     },
     "@commitlint/is-ignored": {
       "version": "6.1.3",
-      "resolved": "http://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-6.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-6.1.3.tgz",
       "integrity": "sha1-icm5ZKTWIoh1pXnCv1UtADc0t+g=",
       "dev": true,
       "requires": {
@@ -447,7 +447,7 @@
     },
     "@commitlint/load": {
       "version": "6.1.3",
-      "resolved": "http://registry.npmjs.org/@commitlint/load/-/load-6.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-6.1.3.tgz",
       "integrity": "sha1-G+QHETl5WPMWz0BXepyHmhbwClQ=",
       "dev": true,
       "requires": {
@@ -464,13 +464,13 @@
     },
     "@commitlint/message": {
       "version": "6.1.3",
-      "resolved": "http://registry.npmjs.org/@commitlint/message/-/message-6.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-6.1.3.tgz",
       "integrity": "sha1-XgRzMwyIcBYBDExWJwcjuAARRdI=",
       "dev": true
     },
     "@commitlint/parse": {
       "version": "6.1.3",
-      "resolved": "http://registry.npmjs.org/@commitlint/parse/-/parse-6.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-6.1.3.tgz",
       "integrity": "sha1-/x5NksJ81naBK7a512zYhTwNlAc=",
       "dev": true,
       "requires": {
@@ -480,7 +480,7 @@
     },
     "@commitlint/read": {
       "version": "6.1.3",
-      "resolved": "http://registry.npmjs.org/@commitlint/read/-/read-6.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-6.1.3.tgz",
       "integrity": "sha1-n52NtQ+/Z/MACSFlftbvrbjPnxo=",
       "dev": true,
       "requires": {
@@ -492,7 +492,7 @@
     },
     "@commitlint/resolve-extends": {
       "version": "6.1.3",
-      "resolved": "http://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-6.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-6.1.3.tgz",
       "integrity": "sha1-9F/P5Dhg4F4489lNVMrtfdqkHiU=",
       "dev": true,
       "requires": {
@@ -518,13 +518,13 @@
     },
     "@commitlint/to-lines": {
       "version": "6.1.3",
-      "resolved": "http://registry.npmjs.org/@commitlint/to-lines/-/to-lines-6.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-6.1.3.tgz",
       "integrity": "sha1-erFqAsrtjapH6Vkmm5YWRhCinQw=",
       "dev": true
     },
     "@commitlint/top-level": {
       "version": "6.1.3",
-      "resolved": "http://registry.npmjs.org/@commitlint/top-level/-/top-level-6.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-6.1.3.tgz",
       "integrity": "sha1-Em3LbeFnY0LGnNQiYUg/RHhUcpk=",
       "dev": true,
       "requires": {
@@ -1228,7 +1228,7 @@
     },
     "@storybook/podda": {
       "version": "1.2.3",
-      "resolved": "http://registry.npmjs.org/@storybook/podda/-/podda-1.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/@storybook/podda/-/podda-1.2.3.tgz",
       "integrity": "sha512-g7dsdsn50AhlGZ8iIDKdF8bi7Am++iFOq+QN+hNKz3FvgLuf8Dz+mpC/BFl90eE9bEYxXqXKeMf87399Ec5Qhw==",
       "dev": true,
       "requires": {
@@ -1468,7 +1468,7 @@
     },
     "@types/bootstrap": {
       "version": "3.3.32",
-      "resolved": "http://registry.npmjs.org/@types/bootstrap/-/bootstrap-3.3.32.tgz",
+      "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-3.3.32.tgz",
       "integrity": "sha1-q69LNk0IbeDLd5HbDP1VcDtZH60=",
       "dev": true,
       "requires": {
@@ -1502,7 +1502,7 @@
     },
     "@types/events": {
       "version": "1.2.0",
-      "resolved": "http://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
       "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
       "dev": true
     },
@@ -1618,7 +1618,7 @@
     },
     "@types/react-modal": {
       "version": "3.1.2",
-      "resolved": "http://registry.npmjs.org/@types/react-modal/-/react-modal-3.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/react-modal/-/react-modal-3.1.2.tgz",
       "integrity": "sha512-EmzMU61fnQiTe1rajQRgo0ceaTo/TD5qsBCjMgPhp9PWia0HOD2VyDMnNErcVfWq8VBmkBJZoGhFmtQm2COY5g==",
       "dev": true,
       "requires": {
@@ -1637,7 +1637,7 @@
     },
     "@types/react-router-dom": {
       "version": "4.2.5",
-      "resolved": "http://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.2.5.tgz",
       "integrity": "sha512-e03TTlYW8cEIJw8bRPmfpVvXN8BpeusjOypxNwlbovPGltR7WwQzZBlutsJC6XQxhhHd7g62Qkyt1oBCcosjkQ==",
       "dev": true,
       "requires": {
@@ -1658,7 +1658,7 @@
     },
     "@types/storybook__addon-actions": {
       "version": "3.0.3",
-      "resolved": "http://registry.npmjs.org/@types/storybook__addon-actions/-/storybook__addon-actions-3.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@types/storybook__addon-actions/-/storybook__addon-actions-3.0.3.tgz",
       "integrity": "sha512-IjZllv+vZ/AFsxQjtBFtMu7Ec/5LCTzIWhmEXLl6Xf6Stg0iHROkjiQ57i9wDH8NF6zALsP1fM/738gUyh0chQ==",
       "dev": true
     },
@@ -2989,7 +2989,7 @@
     },
     "async": {
       "version": "1.5.2",
-      "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
       "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
     },
     "async-array-reduce": {
@@ -3100,7 +3100,7 @@
     },
     "autoprefixer": {
       "version": "7.2.6",
-      "resolved": "http://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
       "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
       "dev": true,
       "requires": {
@@ -3380,7 +3380,7 @@
     },
     "babel-helper-is-nodes-equiv": {
       "version": "0.0.1",
-      "resolved": "http://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz",
       "integrity": "sha1-NOmzALFHnd2Y7HfqC76TQt/jloQ=",
       "dev": true
     },
@@ -3653,79 +3653,79 @@
     },
     "babel-plugin-syntax-async-functions": {
       "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
       "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
       "dev": true
     },
     "babel-plugin-syntax-async-generators": {
       "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
       "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
       "dev": true
     },
     "babel-plugin-syntax-class-constructor-call": {
       "version": "6.18.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
       "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
       "dev": true
     },
     "babel-plugin-syntax-class-properties": {
       "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
       "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
       "dev": true
     },
     "babel-plugin-syntax-decorators": {
       "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
       "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
       "dev": true
     },
     "babel-plugin-syntax-do-expressions": {
       "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
       "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
       "dev": true
     },
     "babel-plugin-syntax-dynamic-import": {
       "version": "6.18.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
       "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
       "dev": true
     },
     "babel-plugin-syntax-exponentiation-operator": {
       "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
       "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
       "dev": true
     },
     "babel-plugin-syntax-export-extensions": {
       "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
       "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
       "dev": true
     },
     "babel-plugin-syntax-flow": {
       "version": "6.18.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
       "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
       "dev": true
     },
     "babel-plugin-syntax-function-bind": {
       "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
       "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
       "dev": true
     },
     "babel-plugin-syntax-jsx": {
       "version": "6.18.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
       "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
       "dev": true
     },
     "babel-plugin-syntax-object-rest-spread": {
       "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
       "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
       "dev": true
     },
@@ -6690,7 +6690,7 @@
     },
     "browserify-rsa": {
       "version": "4.0.1",
-      "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
@@ -6757,7 +6757,7 @@
     },
     "buffer": {
       "version": "4.9.1",
-      "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
@@ -7524,7 +7524,7 @@
     },
     "color": {
       "version": "0.11.4",
-      "resolved": "http://registry.npmjs.org/color/-/color-0.11.4.tgz",
+      "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
       "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
       "dev": true,
       "requires": {
@@ -8209,7 +8209,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
@@ -8331,9 +8331,9 @@
       }
     },
     "cryptiles": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.4.tgz",
+      "integrity": "sha512-8I1sgZHfVwcSOY6mSGpVU3lw/GSIZvusg8dD2+OGehCJpOhQRLNcH0qb9upQnOH4XhgxxFJSg6E2kx95deb1Tw==",
       "dev": true,
       "requires": {
         "boom": "5.x.x"
@@ -8377,7 +8377,7 @@
     },
     "css-color-names": {
       "version": "0.0.4",
-      "resolved": "http://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
       "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
       "dev": true
     },
@@ -8471,7 +8471,7 @@
     },
     "css-select": {
       "version": "1.2.0",
-      "resolved": "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
       "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
       "dev": true,
       "requires": {
@@ -8519,7 +8519,7 @@
     },
     "cssnano": {
       "version": "3.10.0",
-      "resolved": "http://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz",
       "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
       "dev": true,
       "requires": {
@@ -9365,7 +9365,7 @@
       "dependencies": {
         "domelementtype": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
           "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
           "dev": true
         }
@@ -9428,7 +9428,7 @@
     },
     "dotenv": {
       "version": "5.0.1",
-      "resolved": "http://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz",
       "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow==",
       "dev": true
     },
@@ -9443,7 +9443,7 @@
     },
     "duplexer": {
       "version": "0.1.1",
-      "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E="
     },
     "duplexer2": {
@@ -9977,7 +9977,7 @@
     },
     "es6-promisify": {
       "version": "5.0.0",
-      "resolved": "http://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
       "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
       "dev": true,
       "requires": {
@@ -11040,7 +11040,7 @@
     },
     "file-loader": {
       "version": "1.1.11",
-      "resolved": "http://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
       "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
       "dev": true,
       "requires": {
@@ -11120,7 +11120,7 @@
     },
     "finalhandler": {
       "version": "1.1.1",
-      "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
       "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
       "dev": true,
       "requires": {
@@ -11389,7 +11389,8 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -11413,13 +11414,15 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -11436,19 +11439,22 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -11579,7 +11585,8 @@
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -11593,6 +11600,7 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -11609,6 +11617,7 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -11617,13 +11626,15 @@
           "version": "0.0.8",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz",
           "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -11644,6 +11655,7 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -11732,7 +11744,8 @@
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -11746,6 +11759,7 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -11841,7 +11855,8 @@
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
           "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -11883,6 +11898,7 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -11904,6 +11920,7 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -11952,13 +11969,15 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
           "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -12019,7 +12038,7 @@
     },
     "get-stream": {
       "version": "3.0.0",
-      "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
       "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
       "dev": true
     },
@@ -12363,7 +12382,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.1.3",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz",
           "integrity": "sha1-O+39kaktOQFvz6ocaB6Pqhoe/ag=",
           "dev": true
         }
@@ -12371,7 +12390,7 @@
     },
     "got": {
       "version": "6.7.1",
-      "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
       "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
       "dev": true,
       "requires": {
@@ -12841,7 +12860,7 @@
     },
     "hoist-non-react-statics": {
       "version": "1.2.0",
-      "resolved": "http://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz",
       "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=",
       "dev": true
     },
@@ -12996,7 +13015,7 @@
     },
     "htmlparser2": {
       "version": "3.3.0",
-      "resolved": "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz",
       "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
       "dev": true,
       "requires": {
@@ -13017,7 +13036,7 @@
         },
         "readable-stream": {
           "version": "1.0.34",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "requires": {
@@ -13299,7 +13318,7 @@
     },
     "inquirer": {
       "version": "0.11.4",
-      "resolved": "http://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz",
       "integrity": "sha1-geM3ToNhvq/y2XAWIG01nQsy+k0=",
       "dev": true,
       "requires": {
@@ -13345,7 +13364,7 @@
         },
         "lodash": {
           "version": "3.10.1",
-          "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
           "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
           "dev": true
         },
@@ -13585,7 +13604,7 @@
     },
     "is-builtin-module": {
       "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "dev": true,
       "requires": {
@@ -13764,7 +13783,7 @@
     },
     "is-obj": {
       "version": "1.0.1",
-      "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
@@ -15353,7 +15372,7 @@
     },
     "json5": {
       "version": "0.5.1",
-      "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
       "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
     },
     "jsonfile": {
@@ -16973,7 +16992,7 @@
     },
     "media-typer": {
       "version": "0.3.0",
-      "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
       "dev": true
     },
@@ -17015,16 +17034,16 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
       }
     },
     "merge": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz",
-      "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
       "dev": true
     },
     "merge-deep": {
@@ -17057,7 +17076,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
@@ -17192,7 +17211,7 @@
     },
     "minimist": {
       "version": "0.0.8",
-      "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
     "minimist-options": {
@@ -17260,7 +17279,7 @@
     },
     "mkdirp": {
       "version": "0.5.1",
-      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "requires": {
         "minimist": "0.0.8"
@@ -17573,7 +17592,7 @@
         },
         "chalk": {
           "version": "0.4.0",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
           "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
           "dev": true,
           "requires": {
@@ -17584,7 +17603,7 @@
         },
         "strip-ansi": {
           "version": "0.1.1",
-          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
           "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
           "dev": true
         }
@@ -17981,7 +18000,7 @@
     },
     "onetime": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
       "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
     },
     "opn": {
@@ -18789,7 +18808,7 @@
     },
     "postcss-calc": {
       "version": "5.3.1",
-      "resolved": "http://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
       "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
       "dev": true,
       "requires": {
@@ -18989,7 +19008,7 @@
     },
     "postcss-discard-comments": {
       "version": "2.0.4",
-      "resolved": "http://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
       "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
       "dev": true,
       "requires": {
@@ -19119,7 +19138,7 @@
     },
     "postcss-discard-empty": {
       "version": "2.1.0",
-      "resolved": "http://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
       "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
       "dev": true,
       "requires": {
@@ -19184,7 +19203,7 @@
     },
     "postcss-discard-overridden": {
       "version": "0.1.1",
-      "resolved": "http://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
       "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
       "dev": true,
       "requires": {
@@ -19249,7 +19268,7 @@
     },
     "postcss-discard-unused": {
       "version": "2.2.3",
-      "resolved": "http://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
       "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
       "dev": true,
       "requires": {
@@ -19673,7 +19692,7 @@
     },
     "postcss-merge-idents": {
       "version": "2.1.7",
-      "resolved": "http://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
       "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
       "dev": true,
       "requires": {
@@ -19890,7 +19909,7 @@
     },
     "postcss-minify-font-values": {
       "version": "1.0.5",
-      "resolved": "http://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
       "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
       "dev": true,
       "requires": {
@@ -19957,7 +19976,7 @@
     },
     "postcss-minify-gradients": {
       "version": "1.0.5",
-      "resolved": "http://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
       "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
       "dev": true,
       "requires": {
@@ -20023,7 +20042,7 @@
     },
     "postcss-minify-params": {
       "version": "1.2.2",
-      "resolved": "http://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
       "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
       "dev": true,
       "requires": {
@@ -20091,7 +20110,7 @@
     },
     "postcss-minify-selectors": {
       "version": "2.1.1",
-      "resolved": "http://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
       "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
       "dev": true,
       "requires": {
@@ -20198,7 +20217,7 @@
     },
     "postcss-normalize-charset": {
       "version": "1.1.1",
-      "resolved": "http://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
       "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
       "dev": true,
       "requires": {
@@ -20263,7 +20282,7 @@
     },
     "postcss-normalize-url": {
       "version": "3.0.8",
-      "resolved": "http://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
       "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
       "dev": true,
       "requires": {
@@ -20397,7 +20416,7 @@
     },
     "postcss-reduce-idents": {
       "version": "2.4.0",
-      "resolved": "http://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
       "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
       "dev": true,
       "requires": {
@@ -20463,7 +20482,7 @@
     },
     "postcss-reduce-initial": {
       "version": "1.0.1",
-      "resolved": "http://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
       "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
       "dev": true,
       "requires": {
@@ -20528,7 +20547,7 @@
     },
     "postcss-reduce-transforms": {
       "version": "1.0.4",
-      "resolved": "http://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
       "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
       "dev": true,
       "requires": {
@@ -20816,7 +20835,7 @@
     },
     "postcss-svgo": {
       "version": "2.1.6",
-      "resolved": "http://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
       "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
       "dev": true,
       "requires": {
@@ -20890,7 +20909,7 @@
     },
     "postcss-unique-selectors": {
       "version": "2.0.2",
-      "resolved": "http://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
       "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
       "dev": true,
       "requires": {
@@ -20963,7 +20982,7 @@
     },
     "postcss-zindex": {
       "version": "2.2.0",
-      "resolved": "http://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
       "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
       "dev": true,
       "requires": {
@@ -21530,7 +21549,7 @@
       "dependencies": {
         "inline-style-prefixer": {
           "version": "2.0.5",
-          "resolved": "http://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz",
+          "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz",
           "integrity": "sha1-wVPH6I/YT+9cYC6VqBaLJ3BnH+c=",
           "dev": true,
           "requires": {
@@ -21649,7 +21668,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
@@ -22007,7 +22026,7 @@
     },
     "react-modal": {
       "version": "3.3.2",
-      "resolved": "http://registry.npmjs.org/react-modal/-/react-modal-3.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.3.2.tgz",
       "integrity": "sha512-DLrmPG9PyXWSNA2ve1LttnNRE9Umy3u3awFeK+72dLOksLM+EoTg8Z2h/i/DV3O8ZGvnEhacjAVXdZuRDGvaag==",
       "dev": true,
       "requires": {
@@ -22328,7 +22347,7 @@
     },
     "reduce-css-calc": {
       "version": "1.3.0",
-      "resolved": "http://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
       "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
       "dev": true,
       "requires": {
@@ -22470,7 +22489,7 @@
     },
     "regjsgen": {
       "version": "0.2.0",
-      "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
       "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
       "dev": true
     },
@@ -23057,7 +23076,7 @@
     },
     "safe-regex": {
       "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
@@ -23328,7 +23347,7 @@
         },
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
@@ -23738,7 +23757,7 @@
     },
     "slice-ansi": {
       "version": "0.0.4",
-      "resolved": "http://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
       "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
       "dev": true
     },
@@ -24417,7 +24436,7 @@
     },
     "strip-ansi": {
       "version": "3.0.1",
-      "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "requires": {
         "ansi-regex": "^2.0.0"
@@ -24476,7 +24495,7 @@
     },
     "strip-eof": {
       "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
@@ -24830,7 +24849,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
@@ -25529,7 +25548,7 @@
         },
         "load-json-file": {
           "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
           "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
           "dev": true,
           "requires": {
@@ -25592,7 +25611,7 @@
         },
         "pify": {
           "version": "2.3.0",
-          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "dev": true
         },
@@ -25647,7 +25666,7 @@
     },
     "through": {
       "version": "2.3.8",
-      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "through2": {
@@ -26161,7 +26180,7 @@
     },
     "ts-loader": {
       "version": "3.5.0",
-      "resolved": "http://registry.npmjs.org/ts-loader/-/ts-loader-3.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-3.5.0.tgz",
       "integrity": "sha512-JTia3kObhTk36wPFgy0RnkZReiusYx7Le9IhcUWRrCTcFcr6Dy1zGsFd3x8DG4gevlbN65knI8W50FfoykXcng==",
       "dev": true,
       "requires": {
@@ -27860,7 +27879,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
           "dev": true
         }
@@ -27986,7 +28005,7 @@
           "dependencies": {
             "yargs": {
               "version": "3.10.0",
-              "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+              "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
               "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
               "dev": true,
               "requires": {
@@ -28198,7 +28217,7 @@
     },
     "wrap-ansi": {
       "version": "2.1.0",
-      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
       "requires": {
diff --git a/src/Button/BtnGroupOption.tsx b/src/Button/BtnGroupOption.tsx
index 3722a75d..7aff7298 100644
--- a/src/Button/BtnGroupOption.tsx
+++ b/src/Button/BtnGroupOption.tsx
@@ -25,7 +25,8 @@ export const BtnGroupOption: React.SFC<BtnGroupOptionProps> = props => {
   return (
     <button
       className={`btn btn-primary ${className}`}
-      role="button"
+      role="switch"
+      aria-checked={props.selected}
       disabled={props.disabled}
       onClick={props.onClick}
       aria-label={ariaLabel}
diff --git a/src/Filter/__tests__/__snapshots__/CombinedFilter.test.tsx.snap b/src/Filter/__tests__/__snapshots__/CombinedFilter.test.tsx.snap
index 3462790d..473e4d0e 100644
--- a/src/Filter/__tests__/__snapshots__/CombinedFilter.test.tsx.snap
+++ b/src/Filter/__tests__/__snapshots__/CombinedFilter.test.tsx.snap
@@ -582,11 +582,12 @@ exports[`FilterContainer renders 1`] = `
                   selected={true}
                 >
                   <button
+                    aria-checked={true}
                     aria-label="Select All TechType"
                     className="btn btn-primary active"
                     disabled={false}
                     onClick={[Function]}
-                    role="button"
+                    role="switch"
                   >
                     All
                   </button>
@@ -602,11 +603,12 @@ exports[`FilterContainer renders 1`] = `
                     selected={false}
                   >
                     <button
+                      aria-checked={false}
                       aria-label="tech2"
                       className="btn btn-primary "
                       disabled={false}
                       onClick={[Function]}
-                      role="button"
+                      role="switch"
                     >
                       tech2
                     </button>
@@ -619,11 +621,12 @@ exports[`FilterContainer renders 1`] = `
                     selected={false}
                   >
                     <button
+                      aria-checked={false}
                       aria-label="tech1"
                       className="btn btn-primary "
                       disabled={false}
                       onClick={[Function]}
-                      role="button"
+                      role="switch"
                     >
                       tech1
                     </button>
@@ -1480,11 +1483,12 @@ exports[`FilterContainer toggles the advanced filter 1`] = `
                   selected={true}
                 >
                   <button
+                    aria-checked={true}
                     aria-label="Select All TechType"
                     className="btn btn-primary active"
                     disabled={false}
                     onClick={[Function]}
-                    role="button"
+                    role="switch"
                   >
                     All
                   </button>
@@ -1500,11 +1504,12 @@ exports[`FilterContainer toggles the advanced filter 1`] = `
                     selected={false}
                   >
                     <button
+                      aria-checked={false}
                       aria-label="tech2"
                       className="btn btn-primary "
                       disabled={false}
                       onClick={[Function]}
-                      role="button"
+                      role="switch"
                     >
                       tech2
                     </button>
@@ -1517,11 +1522,12 @@ exports[`FilterContainer toggles the advanced filter 1`] = `
                     selected={false}
                   >
                     <button
+                      aria-checked={false}
                       aria-label="tech1"
                       className="btn btn-primary "
                       disabled={false}
                       onClick={[Function]}
-                      role="button"
+                      role="switch"
                     >
                       tech1
                     </button>
@@ -2378,11 +2384,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                   selected={true}
                 >
                   <button
+                    aria-checked={true}
                     aria-label="Select All TechType"
                     className="btn btn-primary active"
                     disabled={false}
                     onClick={[Function]}
-                    role="button"
+                    role="switch"
                   >
                     All
                   </button>
@@ -2398,11 +2405,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                     selected={false}
                   >
                     <button
+                      aria-checked={false}
                       aria-label="tech2"
                       className="btn btn-primary "
                       disabled={false}
                       onClick={[Function]}
-                      role="button"
+                      role="switch"
                     >
                       tech2
                     </button>
@@ -2415,11 +2423,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                     selected={false}
                   >
                     <button
+                      aria-checked={false}
                       aria-label="tech1"
                       className="btn btn-primary "
                       disabled={false}
                       onClick={[Function]}
-                      role="button"
+                      role="switch"
                     >
                       tech1
                     </button>
@@ -2749,11 +2758,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                     selected={true}
                   >
                     <button
+                      aria-checked={true}
                       aria-label="Select All Grade"
                       className="btn btn-primary active"
                       disabled={false}
                       onClick={[Function]}
-                      role="button"
+                      role="switch"
                     >
                       All
                     </button>
@@ -2769,11 +2779,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                       selected={false}
                     >
                       <button
+                        aria-checked={false}
                         aria-label="Grades 3-5"
                         className="btn btn-primary "
                         disabled={false}
                         onClick={[Function]}
-                        role="button"
+                        role="switch"
                       >
                         Grades 3-5
                       </button>
@@ -2786,11 +2797,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                       selected={false}
                     >
                       <button
+                        aria-checked={false}
                         aria-label="Grades 6-8"
                         className="btn btn-primary "
                         disabled={false}
                         onClick={[Function]}
-                        role="button"
+                        role="switch"
                       >
                         Grades 6-8
                       </button>
@@ -2803,11 +2815,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                       selected={false}
                     >
                       <button
+                        aria-checked={false}
                         aria-label="High School"
                         className="btn btn-primary "
                         disabled={false}
                         onClick={[Function]}
-                        role="button"
+                        role="switch"
                       >
                         High School
                       </button>
@@ -2915,11 +2928,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                       selected={false}
                     >
                       <button
+                        aria-checked={false}
                         aria-label="English Literacy & Arts"
                         className="btn btn-primary "
                         disabled={false}
                         onClick={[Function]}
-                        role="button"
+                        role="switch"
                       >
                         English Literacy & Arts
                       </button>
@@ -2932,11 +2946,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                       selected={false}
                     >
                       <button
+                        aria-checked={false}
                         aria-label="Maths"
                         className="btn btn-primary "
                         disabled={false}
                         onClick={[Function]}
-                        role="button"
+                        role="switch"
                       >
                         Maths
                       </button>
@@ -3093,11 +3108,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                     selected={true}
                   >
                     <button
+                      aria-checked={true}
                       aria-label="Select All Multi All"
                       className="btn btn-primary active"
                       disabled={false}
                       onClick={[Function]}
-                      role="button"
+                      role="switch"
                     >
                       All
                     </button>
@@ -3113,11 +3129,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                       selected={false}
                     >
                       <button
+                        aria-checked={false}
                         aria-label="US History"
                         className="btn btn-primary "
                         disabled={false}
                         onClick={[Function]}
-                        role="button"
+                        role="switch"
                       >
                         US History
                       </button>
@@ -3130,11 +3147,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                       selected={false}
                     >
                       <button
+                        aria-checked={false}
                         aria-label="World History"
                         className="btn btn-primary "
                         disabled={false}
                         onClick={[Function]}
-                        role="button"
+                        role="switch"
                       >
                         World History
                       </button>
@@ -3239,11 +3257,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                     selected={true}
                   >
                     <button
+                      aria-checked={true}
                       aria-label="Select All Multi All Disabled"
                       className="btn btn-primary active"
                       disabled={false}
                       onClick={[Function]}
-                      role="button"
+                      role="switch"
                     >
                       All
                     </button>
@@ -3259,11 +3278,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                       selected={false}
                     >
                       <button
+                        aria-checked={false}
                         aria-label="Calculus"
                         className="btn btn-primary "
                         disabled={false}
                         onClick={[Function]}
-                        role="button"
+                        role="switch"
                       >
                         Calculus
                       </button>
@@ -3276,11 +3296,12 @@ exports[`FilterContainer toggles the advanced filter 2`] = `
                       selected={false}
                     >
                       <button
+                        aria-checked={false}
                         aria-label="Geometry"
                         className="btn btn-primary "
                         disabled={false}
                         onClick={[Function]}
-                        role="button"
+                        role="switch"
                       >
                         Geometry
                       </button>
@@ -4114,11 +4135,12 @@ exports[`FilterContainer toggles the advanced filter 3`] = `
                   selected={true}
                 >
                   <button
+                    aria-checked={true}
                     aria-label="Select All TechType"
                     className="btn btn-primary active"
                     disabled={false}
                     onClick={[Function]}
-                    role="button"
+                    role="switch"
                   >
                     All
                   </button>
@@ -4134,11 +4156,12 @@ exports[`FilterContainer toggles the advanced filter 3`] = `
                     selected={false}
                   >
                     <button
+                      aria-checked={false}
                       aria-label="tech2"
                       className="btn btn-primary "
                       disabled={false}
                       onClick={[Function]}
-                      role="button"
+                      role="switch"
                     >
                       tech2
                     </button>
@@ -4151,11 +4174,12 @@ exports[`FilterContainer toggles the advanced filter 3`] = `
                     selected={false}
                   >
                     <button
+                      aria-checked={false}
                       aria-label="tech1"
                       className="btn btn-primary "
                       disabled={false}
                       onClick={[Function]}
-                      role="button"
+                      role="switch"
                     >
                       tech1
                     </button>
diff --git a/stories/Filter/__snapshots__/AdvancedFilter.storybook.storyshot b/stories/Filter/__snapshots__/AdvancedFilter.storybook.storyshot
index 26c521b1..521300d8 100644
--- a/stories/Filter/__snapshots__/AdvancedFilter.storybook.storyshot
+++ b/stories/Filter/__snapshots__/AdvancedFilter.storybook.storyshot
@@ -95,11 +95,12 @@ exports[`Storyshots Advanced Filter disabled multi all 1`] = `
       data-toggle="buttons"
     >
       <button
+        aria-checked={true}
         aria-label="Select All Multi All Disabled"
         className="btn btn-primary active"
         disabled={false}
         onClick={[Function]}
-        role="button"
+        role="switch"
       >
         All
       </button>
@@ -107,20 +108,22 @@ exports[`Storyshots Advanced Filter disabled multi all 1`] = `
         className="btn-group filter-btn-group"
       >
         <button
+          aria-checked={false}
           aria-label="Calculus"
           className="btn btn-primary "
           disabled={false}
           onClick={[Function]}
-          role="button"
+          role="switch"
         >
           Calculus
         </button>
         <button
+          aria-checked={false}
           aria-label="Geometry"
           className="btn btn-primary "
           disabled={false}
           onClick={[Function]}
-          role="button"
+          role="switch"
         >
           Geometry
         </button>
@@ -211,20 +214,22 @@ exports[`Storyshots Advanced Filter multi select 1`] = `
         className="btn-group filter-btn-group"
       >
         <button
+          aria-checked={true}
           aria-label="English Literacy & Arts"
           className="btn btn-primary active"
           disabled={false}
           onClick={[Function]}
-          role="button"
+          role="switch"
         >
           English Literacy & Arts
         </button>
         <button
+          aria-checked={true}
           aria-label="Maths"
           className="btn btn-primary active"
           disabled={false}
           onClick={[Function]}
-          role="button"
+          role="switch"
         >
           Maths
         </button>
@@ -295,11 +300,12 @@ exports[`Storyshots Advanced Filter multi select all  1`] = `
       data-toggle="buttons"
     >
       <button
+        aria-checked={true}
         aria-label="Select All Multi All"
         className="btn btn-primary active"
         disabled={false}
         onClick={[Function]}
-        role="button"
+        role="switch"
       >
         All
       </button>
@@ -307,20 +313,22 @@ exports[`Storyshots Advanced Filter multi select all  1`] = `
         className="btn-group filter-btn-group"
       >
         <button
+          aria-checked={false}
           aria-label="US History"
           className="btn btn-primary "
           disabled={false}
           onClick={[Function]}
-          role="button"
+          role="switch"
         >
           US History
         </button>
         <button
+          aria-checked={false}
           aria-label="World History"
           className="btn btn-primary "
           disabled={false}
           onClick={[Function]}
-          role="button"
+          role="switch"
         >
           World History
         </button>
@@ -391,11 +399,12 @@ exports[`Storyshots Advanced Filter multi select all selected  1`] = `
       data-toggle="buttons"
     >
       <button
+        aria-checked={false}
         aria-label="Select All Multi All"
         className="btn btn-primary "
         disabled={false}
         onClick={[Function]}
-        role="button"
+        role="switch"
       >
         All
       </button>
@@ -403,20 +412,22 @@ exports[`Storyshots Advanced Filter multi select all selected  1`] = `
         className="btn-group filter-btn-group"
       >
         <button
+          aria-checked={true}
           aria-label="English Literacy & Arts"
           className="btn btn-primary active"
           disabled={false}
           onClick={[Function]}
-          role="button"
+          role="switch"
         >
           English Literacy & Arts
         </button>
         <button
+          aria-checked={true}
           aria-label="Maths"
           className="btn btn-primary active"
           disabled={false}
           onClick={[Function]}
-          role="button"
+          role="switch"
         >
           Maths
         </button>
@@ -562,20 +573,22 @@ exports[`Storyshots Advanced Filter single select 1`] = `
         className="btn-group filter-btn-group"
       >
         <button
+          aria-checked={false}
           aria-label="English Literacy/ Arts"
           className="btn btn-primary "
           disabled={false}
           onClick={[Function]}
-          role="button"
+          role="switch"
         >
           English Literacy/ Arts
         </button>
         <button
+          aria-checked={false}
           aria-label="Mathematics"
           className="btn btn-primary "
           disabled={false}
           onClick={[Function]}
-          role="button"
+          role="switch"
         >
           Mathematics
         </button>
diff --git a/stories/Filter/__snapshots__/BasicFilterContainer.storybook.storyshot b/stories/Filter/__snapshots__/BasicFilterContainer.storybook.storyshot
index 37d99bb8..75779929 100644
--- a/stories/Filter/__snapshots__/BasicFilterContainer.storybook.storyshot
+++ b/stories/Filter/__snapshots__/BasicFilterContainer.storybook.storyshot
@@ -125,11 +125,12 @@ exports[`Storyshots Basic Filter Container Basic Filter only 1`] = `
         data-toggle="buttons"
       >
         <button
+          aria-checked={true}
           aria-label="Select All TechType"
           className="btn btn-primary active"
           disabled={false}
           onClick={[Function]}
-          role="button"
+          role="switch"
         >
           All
         </button>
@@ -137,20 +138,22 @@ exports[`Storyshots Basic Filter Container Basic Filter only 1`] = `
           className="btn-group filter-btn-group"
         >
           <button
+            aria-checked={false}
             aria-label="tech2"
             className="btn btn-primary "
             disabled={false}
             onClick={[Function]}
-            role="button"
+            role="switch"
           >
             tech2
           </button>
           <button
+            aria-checked={false}
             aria-label="tech1"
             className="btn btn-primary "
             disabled={false}
             onClick={[Function]}
-            role="button"
+            role="switch"
           >
             tech1
           </button>
@@ -286,11 +289,12 @@ exports[`Storyshots Basic Filter Container Basic Filter with Advanced filter exp
         data-toggle="buttons"
       >
         <button
+          aria-checked={true}
           aria-label="Select All TechType"
           className="btn btn-primary active"
           disabled={false}
           onClick={[Function]}
-          role="button"
+          role="switch"
         >
           All
         </button>
@@ -298,20 +302,22 @@ exports[`Storyshots Basic Filter Container Basic Filter with Advanced filter exp
           className="btn-group filter-btn-group"
         >
           <button
+            aria-checked={false}
             aria-label="tech2"
             className="btn btn-primary "
             disabled={false}
             onClick={[Function]}
-            role="button"
+            role="switch"
           >
             tech2
           </button>
           <button
+            aria-checked={false}
             aria-label="tech1"
             className="btn btn-primary "
             disabled={false}
             onClick={[Function]}
-            role="button"
+            role="switch"
           >
             tech1
           </button>
diff --git a/stories/Filter/__snapshots__/Filter.storybook.storyshot b/stories/Filter/__snapshots__/Filter.storybook.storyshot
index eb7453f1..8bc9cfb6 100644
--- a/stories/Filter/__snapshots__/Filter.storybook.storyshot
+++ b/stories/Filter/__snapshots__/Filter.storybook.storyshot
@@ -128,11 +128,12 @@ exports[`Storyshots Filter Container Contains both Basic and Advanced Filter 1`]
           data-toggle="buttons"
         >
           <button
+            aria-checked={true}
             aria-label="Select All TechType"
             className="btn btn-primary active"
             disabled={false}
             onClick={[Function]}
-            role="button"
+            role="switch"
           >
             All
           </button>
@@ -140,20 +141,22 @@ exports[`Storyshots Filter Container Contains both Basic and Advanced Filter 1`]
             className="btn-group filter-btn-group"
           >
             <button
+              aria-checked={false}
               aria-label="tech2"
               className="btn btn-primary "
               disabled={false}
               onClick={[Function]}
-              role="button"
+              role="switch"
             >
               tech2
             </button>
             <button
+              aria-checked={false}
               aria-label="tech1"
               className="btn btn-primary "
               disabled={false}
               onClick={[Function]}
-              role="button"
+              role="switch"
             >
               tech1
             </button>
diff --git a/stories/Filter/__snapshots__/SIWFilter.storybook.storyshot b/stories/Filter/__snapshots__/SIWFilter.storybook.storyshot
index 7adf157c..182406d9 100644
--- a/stories/Filter/__snapshots__/SIWFilter.storybook.storyshot
+++ b/stories/Filter/__snapshots__/SIWFilter.storybook.storyshot
@@ -138,11 +138,12 @@ exports[`Storyshots SIW-Filter Container Default 1`] = `
           data-toggle="buttons"
         >
           <button
+            aria-checked={true}
             aria-label="Select All Claims"
             className="btn btn-primary active"
             disabled={false}
             onClick={[Function]}
-            role="button"
+            role="switch"
           >
             All
           </button>
@@ -150,20 +151,22 @@ exports[`Storyshots SIW-Filter Container Default 1`] = `
             className="btn-group filter-btn-group"
           >
             <button
+              aria-checked={false}
               aria-label="Problem Solving"
               className="btn btn-primary "
               disabled={false}
               onClick={[Function]}
-              role="button"
+              role="switch"
             >
               Problem Solving
             </button>
             <button
+              aria-checked={false}
               aria-label="Concepts and Procedures"
               className="btn btn-primary "
               disabled={false}
               onClick={[Function]}
-              role="button"
+              role="switch"
             >
               Concepts and Procedures
             </button>
@@ -191,11 +194,12 @@ exports[`Storyshots SIW-Filter Container Default 1`] = `
           data-toggle="buttons"
         >
           <button
+            aria-checked={true}
             aria-label="Select All Item Types"
             className="btn btn-primary active"
             disabled={false}
             onClick={[Function]}
-            role="button"
+            role="switch"
           >
             All
           </button>
@@ -203,20 +207,22 @@ exports[`Storyshots SIW-Filter Container Default 1`] = `
             className="btn-group filter-btn-group"
           >
             <button
+              aria-checked={false}
               aria-label="Equation"
               className="btn btn-primary "
               disabled={false}
               onClick={[Function]}
-              role="button"
+              role="switch"
             >
               Equation
             </button>
             <button
+              aria-checked={false}
               aria-label="Grid Item"
               className="btn btn-primary "
               disabled={false}
               onClick={[Function]}
-              role="button"
+              role="switch"
             >
               Grid Item
             </button>
@@ -293,11 +299,12 @@ exports[`Storyshots SIW-Filter Container Default 1`] = `
           data-toggle="buttons"
         >
           <button
+            aria-checked={true}
             aria-label="Select All Targets"
             className="btn btn-primary active"
             disabled={false}
             onClick={[Function]}
-            role="button"
+            role="switch"
           >
             All
           </button>
@@ -305,20 +312,22 @@ exports[`Storyshots SIW-Filter Container Default 1`] = `
             className="btn-group filter-btn-group"
           >
             <button
+              aria-checked={false}
               aria-label="t1"
               className="btn btn-primary "
               disabled={false}
               onClick={[Function]}
-              role="button"
+              role="switch"
             >
               t1
             </button>
             <button
+              aria-checked={false}
               aria-label="t2"
               className="btn btn-primary "
               disabled={false}
               onClick={[Function]}
-              role="button"
+              role="switch"
             >
               t2
             </button>