diff --git a/cms/static/edx-pattern-library b/cms/static/edx-pattern-library
new file mode 120000
index 0000000000..0d3ed215ee
--- /dev/null
+++ b/cms/static/edx-pattern-library
@@ -0,0 +1 @@
+../../common/static/edx-pattern-library
\ No newline at end of file
diff --git a/cms/static/edx-ui-toolkit b/cms/static/edx-ui-toolkit
new file mode 120000
index 0000000000..32e7d34a2c
--- /dev/null
+++ b/cms/static/edx-ui-toolkit
@@ -0,0 +1 @@
+../../common/static/edx-ui-toolkit
\ No newline at end of file
diff --git a/cms/static/js_test.yml b/cms/static/js_test.yml
index 25f2adc05c..41006cc764 100644
--- a/cms/static/js_test.yml
+++ b/cms/static/js_test.yml
@@ -78,6 +78,8 @@ src_paths:
     - js/certificates
     - js/factories
     - common/js
+    - edx-pattern-library/js
+    - edx-ui-toolkit/js
 
 # Paths to spec (test) JavaScript files
 # We should define the custom path mapping in /coffee/spec/main.coffee as well e.g. certificates etc.
diff --git a/cms/static/js_test_squire.yml b/cms/static/js_test_squire.yml
index 122505d073..29a812f738 100644
--- a/cms/static/js_test_squire.yml
+++ b/cms/static/js_test_squire.yml
@@ -73,6 +73,8 @@ src_paths:
     - js/utils
     - js/views
     - common/js
+    - edx-pattern-library/js
+    - edx-ui-toolkit/js
 
 # Paths to spec (test) JavaScript files
 spec_paths:
diff --git a/common/static/pattern-library/fonts b/common/static/edx-pattern-library/fonts
similarity index 100%
rename from common/static/pattern-library/fonts
rename to common/static/edx-pattern-library/fonts
diff --git a/common/static/pattern-library/js b/common/static/edx-pattern-library/js
similarity index 100%
rename from common/static/pattern-library/js
rename to common/static/edx-pattern-library/js
diff --git a/common/static/edx-ui-toolkit/js b/common/static/edx-ui-toolkit/js
new file mode 120000
index 0000000000..0e607da1cd
--- /dev/null
+++ b/common/static/edx-ui-toolkit/js
@@ -0,0 +1 @@
+../../../node_modules/edx-ui-toolkit/src/js
\ No newline at end of file
diff --git a/common/static/js_test_requirejs.yml b/common/static/js_test_requirejs.yml
index c6724e32c7..c080273947 100644
--- a/common/static/js_test_requirejs.yml
+++ b/common/static/js_test_requirejs.yml
@@ -50,6 +50,8 @@ lib_paths:
 # Paths to source JavaScript files
 src_paths:
     - common/js
+    - edx-pattern-library/js
+    - edx-ui-toolkit/js
 
 # Paths to spec (test) JavaScript files
 spec_paths:
diff --git a/lms/djangoapps/teams/static/teams/js/views/instructor_tools.js b/lms/djangoapps/teams/static/teams/js/views/instructor_tools.js
index b760b209a1..212f904804 100644
--- a/lms/djangoapps/teams/static/teams/js/views/instructor_tools.js
+++ b/lms/djangoapps/teams/static/teams/js/views/instructor_tools.js
@@ -4,10 +4,11 @@
     define(['backbone',
             'underscore',
             'gettext',
+            'edx-ui-toolkit/js/utils/string-utils',
             'teams/js/views/team_utils',
             'common/js/components/utils/view_utils',
             'text!teams/templates/instructor-tools.underscore'],
-        function (Backbone, _, gettext, TeamUtils, ViewUtils, instructorToolbarTemplate) {
+        function (Backbone, _, gettext, StringUtils, TeamUtils, ViewUtils, instructorToolbarTemplate) {
             return Backbone.View.extend({
 
                 events: {
@@ -53,8 +54,8 @@
                             });
                             Backbone.history.navigate('topics/' + self.team.get('topic_id'), {trigger: true});
                             TeamUtils.showMessage(
-                                interpolate(
-                                    gettext('Team "%(team)s" successfully deleted.'),
+                                StringUtils.interpolate(
+                                    gettext('Team "{team}" successfully deleted.'),
                                     {team: self.team.get('name')},
                                     true
                                 ),
diff --git a/lms/static/certificates/sass/_config.scss b/lms/static/certificates/sass/_config.scss
index 99bf24e3d9..d8e3a022d5 100644
--- a/lms/static/certificates/sass/_config.scss
+++ b/lms/static/certificates/sass/_config.scss
@@ -8,7 +8,7 @@
 // ------------------------------
 // #VARIABLES
 // ------------------------------
-$pattern-library-path: '../../pattern-library' !default;
+$pattern-library-path: '../../edx-pattern-library' !default;
 
 // certificate characteristics
 $cert-base-color: palette(grayscale-cool, dark);
diff --git a/lms/static/edx-pattern-library b/lms/static/edx-pattern-library
new file mode 120000
index 0000000000..0d3ed215ee
--- /dev/null
+++ b/lms/static/edx-pattern-library
@@ -0,0 +1 @@
+../../common/static/edx-pattern-library
\ No newline at end of file
diff --git a/lms/static/edx-ui-toolkit b/lms/static/edx-ui-toolkit
new file mode 120000
index 0000000000..32e7d34a2c
--- /dev/null
+++ b/lms/static/edx-ui-toolkit
@@ -0,0 +1 @@
+../../common/static/edx-ui-toolkit
\ No newline at end of file
diff --git a/lms/static/js_test.yml b/lms/static/js_test.yml
index 5f892b1122..4bf01e4b79 100644
--- a/lms/static/js_test.yml
+++ b/lms/static/js_test.yml
@@ -75,9 +75,11 @@ src_paths:
     - js
     - coffee/src
     - common/js
+    - edx-pattern-library/js
+    - edx-ui-toolkit/js
+    - support/js
     - teams/js
     - xmodule_js/common_static/coffee
-    - support/js
 
 # Paths to spec (test) JavaScript files
 spec_paths:
diff --git a/package.json b/package.json
index 3b2cad384e..ba4272a987 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "dependencies": {
     "coffee-script": "1.6.1",
     "edx-pattern-library": "0.10.4",
+    "edx-ui-toolkit": "~0.8.0",
     "requirejs": "~2.1.22",
     "uglify-js": "2.4.24",
     "underscore": "~1.8.3"