diff --git a/package-lock.json b/package-lock.json
index 01e49522a..984b96fd4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,14 @@
         "prop-types": "^15.5.10"
       }
     },
+    "@atlaskit/analytics-next-types": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@atlaskit/analytics-next-types/-/analytics-next-types-3.1.2.tgz",
+      "integrity": "sha512-3FtXrvfUafOhVLpgaW3uUlOXO0BKfVSkvfvsRlxA6j+Y6RG6iHtVSQd657Tp+0j24f3WVb9Hq119M4NUOAU38w==",
+      "requires": {
+        "@atlaskit/type-helpers": "^2.0.0"
+      }
+    },
     "@atlaskit/avatar": {
       "version": "14.0.10",
       "resolved": "https://registry.npmjs.org/@atlaskit/avatar/-/avatar-14.0.10.tgz",
@@ -78,55 +86,49 @@
       }
     },
     "@atlaskit/button": {
-      "version": "9.0.8",
-      "resolved": "https://registry.npmjs.org/@atlaskit/button/-/button-9.0.8.tgz",
-      "integrity": "sha512-AsFKp57S7FqmumI6wS05hSrgRJB+0XDFBYZJNuiqDcbIyeyaqLrrOTMnLMpcztbHeTYaMcv1fDiROClMj1xZ/w==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/@atlaskit/button/-/button-10.1.1.tgz",
+      "integrity": "sha512-tDnBqMmngLexgDrrdBTRlJYZ0exlB07AYm4Xgda2rohRmes7pNmvQkkkEeFR/hL9ZUaaz0baz9RfH/XayWtOBA==",
       "requires": {
-        "@atlaskit/analytics-next": "^3.0.6",
-        "@atlaskit/spinner": "9.0.8",
-        "@atlaskit/theme": "^6.0.2",
-        "babel-runtime": "^6.26.0"
+        "@atlaskit/analytics-next": "^3.1.2",
+        "@atlaskit/analytics-next-types": "^3.1.2",
+        "@atlaskit/spinner": "9.0.13",
+        "@atlaskit/theme": "^7.0.1",
+        "@atlaskit/type-helpers": "^2.0.0",
+        "@babel/runtime": "^7.0.0",
+        "babel-runtime": "^6.26.0",
+        "tslib": "^1.8.0"
       },
       "dependencies": {
-        "@atlaskit/spinner": {
-          "version": "9.0.8",
-          "resolved": "https://registry.npmjs.org/@atlaskit/spinner/-/spinner-9.0.8.tgz",
-          "integrity": "sha512-jYv8VSuXcvppONSquL7cmHQMR7WBS8VDB0kpWQPVJngrGfzG691kdW32C6q6A1bzNB88QpEIQxcme7bLlM5/hg==",
+        "@atlaskit/analytics-next": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/@atlaskit/analytics-next/-/analytics-next-3.1.2.tgz",
+          "integrity": "sha512-bkYDvl3Ojsnim+bsc9BALfvOjiL7xdb2rTp/4yqUP9pfidtf5HudbOJ849+dKcRCmk/rFbfB/nhDBRU6rv1Ueg==",
           "requires": {
-            "@atlaskit/theme": "^6.0.2",
+            "@babel/runtime": "^7.0.0",
+            "babel-runtime": "^6.26.0",
+            "prop-types": "^15.5.10"
+          }
+        },
+        "@atlaskit/spinner": {
+          "version": "9.0.13",
+          "resolved": "https://registry.npmjs.org/@atlaskit/spinner/-/spinner-9.0.13.tgz",
+          "integrity": "sha512-EA5weoo1lftixC1oxVT1ePNCWATNaWETrAwOf6uuj/fpPTXjZ5HEwbgddlyCLVZ3vcljpXFTwmM1Nj24sGnrdg==",
+          "requires": {
+            "@atlaskit/theme": "^7.0.1",
+            "@babel/runtime": "^7.0.0",
             "babel-runtime": "^6.26.0",
             "react-transition-group": "^2.2.1"
           }
         },
         "@atlaskit/theme": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-6.0.3.tgz",
-          "integrity": "sha512-s90qPe3S0fXtf1xHxH4uhT2IIbvGkMWLp1HW66rv0c8VSBj0f5VaJW+xVs7BLii5rN1QnOtsYS3ykx307mZOJQ==",
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-7.0.1.tgz",
+          "integrity": "sha512-wxXDnkUablJketNCrQuNUuazufYEA7kv0Y6Yzv6uvqfuyNpWUQt4H1psz/MW8DbZmCdku9dEYbNVK3nFP5TDGg==",
           "requires": {
+            "@babel/runtime": "^7.0.0",
             "prop-types": "^15.5.10"
           }
-        },
-        "react-transition-group": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
-          "integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==",
-          "requires": {
-            "dom-helpers": "^3.3.1",
-            "loose-envify": "^1.3.1",
-            "prop-types": "^15.6.2",
-            "react-lifecycles-compat": "^3.0.4"
-          },
-          "dependencies": {
-            "prop-types": {
-              "version": "15.6.2",
-              "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz",
-              "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==",
-              "requires": {
-                "loose-envify": "^1.3.1",
-                "object-assign": "^4.1.1"
-              }
-            }
-          }
         }
       }
     },
@@ -191,6 +193,61 @@
         "uuid": "^3.1.0"
       },
       "dependencies": {
+        "@atlaskit/button": {
+          "version": "9.0.16",
+          "resolved": "https://registry.npmjs.org/@atlaskit/button/-/button-9.0.16.tgz",
+          "integrity": "sha512-VFk7Qyp+IM2AxsPseHubrqU4ORq5BQPRDafWHVFqg/yf2AzKU1sDavRIX8jQfchnu5rBdBgmQjffX5cArzCawg==",
+          "requires": {
+            "@atlaskit/analytics-next": "^3.0.10",
+            "@atlaskit/spinner": "9.0.10",
+            "@atlaskit/theme": "^6.1.1",
+            "@babel/runtime": "^7.0.0",
+            "babel-runtime": "^6.26.0"
+          },
+          "dependencies": {
+            "@atlaskit/analytics-next": {
+              "version": "3.1.2",
+              "resolved": "https://registry.npmjs.org/@atlaskit/analytics-next/-/analytics-next-3.1.2.tgz",
+              "integrity": "sha512-bkYDvl3Ojsnim+bsc9BALfvOjiL7xdb2rTp/4yqUP9pfidtf5HudbOJ849+dKcRCmk/rFbfB/nhDBRU6rv1Ueg==",
+              "requires": {
+                "@babel/runtime": "^7.0.0",
+                "babel-runtime": "^6.26.0",
+                "prop-types": "^15.5.10"
+              }
+            },
+            "@atlaskit/theme": {
+              "version": "6.2.1",
+              "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-6.2.1.tgz",
+              "integrity": "sha512-6u0OxpnZ2n+G7Wc1wckgtOEiYl3wmJ2HvBd28N7d+Fi/fbi+C4TzfBvyeENUqtrp1UIEhweVbB2WLoVoKA5c/w==",
+              "requires": {
+                "@babel/runtime": "^7.0.0",
+                "prop-types": "^15.5.10"
+              }
+            }
+          }
+        },
+        "@atlaskit/spinner": {
+          "version": "9.0.10",
+          "resolved": "https://registry.npmjs.org/@atlaskit/spinner/-/spinner-9.0.10.tgz",
+          "integrity": "sha512-1akBXR6uC/cRWzwGPF4IfS7YpCsHdlncvo98p4W9ZGRn822SBQk9hiZBL0BfvkEFViAakPV7JZ5zZKc75UExhA==",
+          "requires": {
+            "@atlaskit/theme": "^6.1.1",
+            "@babel/runtime": "^7.0.0",
+            "babel-runtime": "^6.26.0",
+            "react-transition-group": "^2.2.1"
+          },
+          "dependencies": {
+            "@atlaskit/theme": {
+              "version": "6.2.1",
+              "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-6.2.1.tgz",
+              "integrity": "sha512-6u0OxpnZ2n+G7Wc1wckgtOEiYl3wmJ2HvBd28N7d+Fi/fbi+C4TzfBvyeENUqtrp1UIEhweVbB2WLoVoKA5c/w==",
+              "requires": {
+                "@babel/runtime": "^7.0.0",
+                "prop-types": "^15.5.10"
+              }
+            }
+          }
+        },
         "@atlaskit/theme": {
           "version": "6.0.3",
           "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-6.0.3.tgz",
@@ -517,6 +574,39 @@
         "@atlaskit/theme": "^6.0.2"
       },
       "dependencies": {
+        "@atlaskit/button": {
+          "version": "9.0.16",
+          "resolved": "https://registry.npmjs.org/@atlaskit/button/-/button-9.0.16.tgz",
+          "integrity": "sha512-VFk7Qyp+IM2AxsPseHubrqU4ORq5BQPRDafWHVFqg/yf2AzKU1sDavRIX8jQfchnu5rBdBgmQjffX5cArzCawg==",
+          "requires": {
+            "@atlaskit/analytics-next": "^3.0.10",
+            "@atlaskit/spinner": "9.0.10",
+            "@atlaskit/theme": "^6.1.1",
+            "@babel/runtime": "^7.0.0",
+            "babel-runtime": "^6.26.0"
+          },
+          "dependencies": {
+            "@atlaskit/analytics-next": {
+              "version": "3.1.2",
+              "resolved": "https://registry.npmjs.org/@atlaskit/analytics-next/-/analytics-next-3.1.2.tgz",
+              "integrity": "sha512-bkYDvl3Ojsnim+bsc9BALfvOjiL7xdb2rTp/4yqUP9pfidtf5HudbOJ849+dKcRCmk/rFbfB/nhDBRU6rv1Ueg==",
+              "requires": {
+                "@babel/runtime": "^7.0.0",
+                "babel-runtime": "^6.26.0",
+                "prop-types": "^15.5.10"
+              }
+            },
+            "@atlaskit/theme": {
+              "version": "6.2.1",
+              "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-6.2.1.tgz",
+              "integrity": "sha512-6u0OxpnZ2n+G7Wc1wckgtOEiYl3wmJ2HvBd28N7d+Fi/fbi+C4TzfBvyeENUqtrp1UIEhweVbB2WLoVoKA5c/w==",
+              "requires": {
+                "@babel/runtime": "^7.0.0",
+                "prop-types": "^15.5.10"
+              }
+            }
+          }
+        },
         "@atlaskit/inline-dialog": {
           "version": "9.0.5",
           "resolved": "https://registry.npmjs.org/@atlaskit/inline-dialog/-/inline-dialog-9.0.5.tgz",
@@ -527,6 +617,28 @@
             "@atlaskit/theme": "^6.0.2",
             "react-node-resolver": "^1.0.1"
           }
+        },
+        "@atlaskit/spinner": {
+          "version": "9.0.10",
+          "resolved": "https://registry.npmjs.org/@atlaskit/spinner/-/spinner-9.0.10.tgz",
+          "integrity": "sha512-1akBXR6uC/cRWzwGPF4IfS7YpCsHdlncvo98p4W9ZGRn822SBQk9hiZBL0BfvkEFViAakPV7JZ5zZKc75UExhA==",
+          "requires": {
+            "@atlaskit/theme": "^6.1.1",
+            "@babel/runtime": "^7.0.0",
+            "babel-runtime": "^6.26.0",
+            "react-transition-group": "^2.2.1"
+          },
+          "dependencies": {
+            "@atlaskit/theme": {
+              "version": "6.2.1",
+              "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-6.2.1.tgz",
+              "integrity": "sha512-6u0OxpnZ2n+G7Wc1wckgtOEiYl3wmJ2HvBd28N7d+Fi/fbi+C4TzfBvyeENUqtrp1UIEhweVbB2WLoVoKA5c/w==",
+              "requires": {
+                "@babel/runtime": "^7.0.0",
+                "prop-types": "^15.5.10"
+              }
+            }
+          }
         }
       }
     },
@@ -623,6 +735,61 @@
         "react-transition-group": "^2.2.1"
       },
       "dependencies": {
+        "@atlaskit/button": {
+          "version": "9.0.16",
+          "resolved": "https://registry.npmjs.org/@atlaskit/button/-/button-9.0.16.tgz",
+          "integrity": "sha512-VFk7Qyp+IM2AxsPseHubrqU4ORq5BQPRDafWHVFqg/yf2AzKU1sDavRIX8jQfchnu5rBdBgmQjffX5cArzCawg==",
+          "requires": {
+            "@atlaskit/analytics-next": "^3.0.10",
+            "@atlaskit/spinner": "9.0.10",
+            "@atlaskit/theme": "^6.1.1",
+            "@babel/runtime": "^7.0.0",
+            "babel-runtime": "^6.26.0"
+          },
+          "dependencies": {
+            "@atlaskit/analytics-next": {
+              "version": "3.1.2",
+              "resolved": "https://registry.npmjs.org/@atlaskit/analytics-next/-/analytics-next-3.1.2.tgz",
+              "integrity": "sha512-bkYDvl3Ojsnim+bsc9BALfvOjiL7xdb2rTp/4yqUP9pfidtf5HudbOJ849+dKcRCmk/rFbfB/nhDBRU6rv1Ueg==",
+              "requires": {
+                "@babel/runtime": "^7.0.0",
+                "babel-runtime": "^6.26.0",
+                "prop-types": "^15.5.10"
+              }
+            },
+            "@atlaskit/theme": {
+              "version": "6.2.1",
+              "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-6.2.1.tgz",
+              "integrity": "sha512-6u0OxpnZ2n+G7Wc1wckgtOEiYl3wmJ2HvBd28N7d+Fi/fbi+C4TzfBvyeENUqtrp1UIEhweVbB2WLoVoKA5c/w==",
+              "requires": {
+                "@babel/runtime": "^7.0.0",
+                "prop-types": "^15.5.10"
+              }
+            }
+          }
+        },
+        "@atlaskit/spinner": {
+          "version": "9.0.10",
+          "resolved": "https://registry.npmjs.org/@atlaskit/spinner/-/spinner-9.0.10.tgz",
+          "integrity": "sha512-1akBXR6uC/cRWzwGPF4IfS7YpCsHdlncvo98p4W9ZGRn822SBQk9hiZBL0BfvkEFViAakPV7JZ5zZKc75UExhA==",
+          "requires": {
+            "@atlaskit/theme": "^6.1.1",
+            "@babel/runtime": "^7.0.0",
+            "babel-runtime": "^6.26.0",
+            "react-transition-group": "^2.2.1"
+          },
+          "dependencies": {
+            "@atlaskit/theme": {
+              "version": "6.2.1",
+              "resolved": "https://registry.npmjs.org/@atlaskit/theme/-/theme-6.2.1.tgz",
+              "integrity": "sha512-6u0OxpnZ2n+G7Wc1wckgtOEiYl3wmJ2HvBd28N7d+Fi/fbi+C4TzfBvyeENUqtrp1UIEhweVbB2WLoVoKA5c/w==",
+              "requires": {
+                "@babel/runtime": "^7.0.0",
+                "prop-types": "^15.5.10"
+              }
+            }
+          }
+        },
         "react-transition-group": {
           "version": "2.4.0",
           "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz",
@@ -830,6 +997,14 @@
         }
       }
     },
+    "@atlaskit/type-helpers": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@atlaskit/type-helpers/-/type-helpers-2.0.2.tgz",
+      "integrity": "sha512-UY37unuQ8uLkeeMOs281+uUobY4B6YHZe628cn4WJUCJ/sjZH2+6ZLcVTquinwKwK5NcVwx7Lc4gEYxGoL0D6A==",
+      "requires": {
+        "react": "^16.4.0"
+      }
+    },
     "@atlaskit/util-shared-styles": {
       "version": "2.10.6",
       "resolved": "https://registry.npmjs.org/@atlaskit/util-shared-styles/-/util-shared-styles-2.10.6.tgz",
@@ -14268,8 +14443,7 @@
     "tslib": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
-      "dev": true
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
     },
     "tty-browserify": {
       "version": "0.0.0",
diff --git a/package.json b/package.json
index 3d66ea0bc..414bbf374 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   "readmeFilename": "README.md",
   "dependencies": {
     "@atlaskit/avatar": "14.0.10",
-    "@atlaskit/button": "9.0.8",
+    "@atlaskit/button": "10.1.1",
     "@atlaskit/checkbox": "5.0.10",
     "@atlaskit/dropdown-menu": "6.1.12",
     "@atlaskit/field-text": "7.0.10",