diff --git a/addon/components/md-btn-dropdown.js b/addon/components/md-btn-dropdown.js
index 650914f4..96a46084 100644
--- a/addon/components/md-btn-dropdown.js
+++ b/addon/components/md-btn-dropdown.js
@@ -1,6 +1,7 @@
 import { computed } from '@ember/object';
 import layout from '../templates/components/md-btn-dropdown';
 import MaterializeButton from './md-btn';
+import jQuery from 'jquery';
 
 export default MaterializeButton.extend({
   layout,
@@ -30,7 +31,7 @@ export default MaterializeButton.extend({
 
   _setupDropdown() {
     // needed until the Materialize.dropdown plugin is replaced
-    this.$().attr('data-activates', this.get('_dropdownContentId'));
+    jQuery.attr('data-activates', this.get('_dropdownContentId'));
     let options = {
       hover: !!this.getWithDefault('hover', false),
       // Ignore requireCamelCaseOrUpperCaseIdentifiers because the original
@@ -45,7 +46,7 @@ export default MaterializeButton.extend({
       alignment: this.getWithDefault('alignment', 'left')
     };
 
-    this.$().dropdown(options);
+    jQuery.dropdown(options);
   },
   _dropdownContentId: computed(function() {
     return `${this.get('elementId')}-dropdown-content`;
diff --git a/addon/components/md-card-collapsible.js b/addon/components/md-card-collapsible.js
index f96a7c28..91055431 100644
--- a/addon/components/md-card-collapsible.js
+++ b/addon/components/md-card-collapsible.js
@@ -1,6 +1,7 @@
 import { computed } from '@ember/object';
 import Component from '@ember/component';
 import layout from '../templates/components/md-card-collapsible';
+import jQuery from 'jquery';
 
 export default Component.extend({
   layout,
@@ -20,12 +21,12 @@ export default Component.extend({
 
   _setupCollapsible() {
     const accordion = this.get('accordion');
-    this.$().collapsible({ accordion });
+    jQuery().collapsible({ accordion });
   },
 
   _teardownCollapsible() {
-    const $panelHeaders = this.$('> li > .collapsible-header');
-    this.$().off('click.collapse', '.collapsible-header');
+    const $panelHeaders = jQuery('> li > .collapsible-header');
+    jQuery().off('click.collapse', '.collapsible-header');
     $panelHeaders.off('click.collapse');
   },
 
diff --git a/addon/components/md-input-date.js b/addon/components/md-input-date.js
index db4062ad..a3fcdf49 100644
--- a/addon/components/md-input-date.js
+++ b/addon/components/md-input-date.js
@@ -1,6 +1,7 @@
 import $ from 'jquery';
 import MaterializeInput from './md-input';
 import layout from '../templates/components/md-input-date';
+import jQuery from 'jquery';
 
 const MONTH_NAMES = [
   'January',
@@ -50,7 +51,7 @@ export default MaterializeInput.extend({
       }
     };
 
-    this.$('.datepicker').pickadate(
+    jQuery('.datepicker').pickadate(
       $.extend(datePickerOptions, {
         onSet: this._onDateSet
       })
@@ -58,7 +59,7 @@ export default MaterializeInput.extend({
   },
 
   _teardownPicker() {
-    const $pickadate = this.$('.datepicker').data('pickadate');
+    const $pickadate = jQuery('.datepicker').data('pickadate');
     if ($pickadate) {
       $pickadate.stop();
     }
diff --git a/addon/components/md-input-field.js b/addon/components/md-input-field.js
index 1339ac3e..5d94cdc4 100644
--- a/addon/components/md-input-field.js
+++ b/addon/components/md-input-field.js
@@ -1,6 +1,7 @@
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import { isPresent } from '@ember/utils';
+import jQuery from 'jquery';
 
 export default Component.extend({
   classNames: ['input-field'],
@@ -30,7 +31,7 @@ export default Component.extend({
     this._super(...arguments);
     // pad the errors element when an icon is present
     if (isPresent(this.get('icon'))) {
-      this.$('> span').css('padding-left', '3rem');
+      jQuery('> span').css('padding-left', '3rem');
     }
   },
 
@@ -39,7 +40,7 @@ export default Component.extend({
   }),
 
   _setupLabel() {
-    const $label = this.$('> label');
+    const $label = jQuery('> label');
     if (isPresent(this.get('value')) && !$label.hasClass('active')) {
       $label.addClass('active');
     }
diff --git a/addon/components/md-navbar.js b/addon/components/md-navbar.js
index 6b42e9e1..be749f8a 100644
--- a/addon/components/md-navbar.js
+++ b/addon/components/md-navbar.js
@@ -4,6 +4,7 @@ import Component from '@ember/component';
 import { typeOf } from '@ember/utils';
 import { scheduleOnce } from '@ember/runloop';
 import layout from '../templates/components/md-navbar';
+import jQuery from 'jquery';
 
 export default Component.extend({
   tagName: 'nav',
@@ -19,7 +20,7 @@ export default Component.extend({
   _setupNavbar() {
     if (typeOf($('.button-collapse').sideNav) === 'function') {
       this.notifyPropertyChange('_sideNavId');
-      this.$('.button-collapse').sideNav({
+      jQuery('.button-collapse').sideNav({
         closeOnClick: true
       });
     }
diff --git a/addon/components/md-parallax.js b/addon/components/md-parallax.js
index 1615182e..0f72c7db 100644
--- a/addon/components/md-parallax.js
+++ b/addon/components/md-parallax.js
@@ -1,5 +1,6 @@
 import Component from '@ember/component';
 import layout from '../templates/components/md-parallax';
+import jQuery from 'jquery';
 
 export default Component.extend({
   layout,
@@ -11,7 +12,7 @@ export default Component.extend({
   },
 
   _setupParallax() {
-    this.$('.parallax').parallax();
+    jQuery('.parallax').parallax();
   }
 
   // TODO: unregister any listeners that $.parallax() registers
diff --git a/addon/components/md-select.js b/addon/components/md-select.js
index e8fb1644..48d75f67 100644
--- a/addon/components/md-select.js
+++ b/addon/components/md-select.js
@@ -4,6 +4,7 @@ import { later } from '@ember/runloop';
 import { get, observer, computed } from '@ember/object';
 import MaterializeInputField from './md-input-field';
 import layout from '../templates/components/md-select';
+import jQuery from 'jquery';
 
 export default MaterializeInputField.extend({
   layout,
@@ -26,7 +27,7 @@ export default MaterializeInputField.extend({
 
   _setupSelect() {
     // jscs: disable
-    this.$('select').material_select();
+    jQuery('select').material_select();
     // jscs: enable
   },
 
@@ -47,7 +48,7 @@ export default MaterializeInputField.extend({
 
   _teardownSelect() {
     // jscs: disable
-    this.$('select').material_select('destroy');
+    jQuery('select').material_select('destroy');
     // jscs: enable
   },
 
@@ -68,13 +69,13 @@ export default MaterializeInputField.extend({
   // TODO: this could be converted to a computed property, returning a string
   //  that is bound to the class attribute of the inputSelector
   errorsDidChange: observer('errors', function() {
-    const inputSelector = this.$('input');
+    const inputSelector = jQuery('input');
     // monitor the select's validity and copy the appropriate validation class to the materialize input element.
     if (!isNone(inputSelector)) {
       later(
         this,
         function() {
-          const isValid = this.$('select').hasClass('valid');
+          const isValid = jQuery('select').hasClass('valid');
           if (isValid) {
             inputSelector.removeClass('invalid');
             inputSelector.addClass('valid');
diff --git a/addon/components/md-tabs.js b/addon/components/md-tabs.js
index 3c56f394..814ba34e 100644
--- a/addon/components/md-tabs.js
+++ b/addon/components/md-tabs.js
@@ -5,6 +5,7 @@ import { A } from '@ember/array';
 import { observer, computed, get } from '@ember/object';
 import ParentComponentSupport from 'ember-composability/mixins/parent-component-support';
 import layout from '../templates/components/md-tabs';
+import jQuery from 'jquery';
 
 export default Component.extend(ParentComponentSupport, {
   layout,
@@ -48,12 +49,12 @@ export default Component.extend(ParentComponentSupport, {
       };
 
       if (!animate) {
-        this.$('.indicator').css(cssParams);
+        jQuery('.indicator').css(cssParams);
       } else {
-        this.$('.indicator1').velocity(cssParams, {
+        jQuery('.indicator1').velocity(cssParams, {
           duration: 150
         });
-        this.$('.indicator2').velocity(cssParams, {
+        jQuery('.indicator2').velocity(cssParams, {
           duration: 150,
           delay: 40
         });
diff --git a/addon/components/selectable-item.js b/addon/components/selectable-item.js
index 96b59625..490e9628 100644
--- a/addon/components/selectable-item.js
+++ b/addon/components/selectable-item.js
@@ -3,6 +3,7 @@ import { alias } from '@ember/object/computed';
 import Component from '@ember/component';
 import ChildComponentSupport from 'ember-composability/mixins/child-component-support';
 import SelectableItemGroup from './selectable-item-group';
+import jQuery from 'jquery';
 
 export default Component.extend(ChildComponentSupport, {
   // eslint-disable-next-line
@@ -35,12 +36,12 @@ export default Component.extend(ChildComponentSupport, {
   isSelected: alias('_checked'),
 
   _setupLabel() {
-    let [$input] = this.$(
+    let [$input] = jQuery(
       '.materialize-selectable-item-input, .materialize-selectable-item-input-container input'
     ).toArray();
 
     let inputId = $input ? $input.id : null;
-    this.$('.materialize-selectable-item-label').attr('for', inputId);
+    jQuery('.materialize-selectable-item-label').attr('for', inputId);
   },
 
   didInsertElement() {
diff --git a/app/components/materialize-badge.js b/app/components/materialize-badge.js
index 7648f92c..fc0fdd89 100644
--- a/app/components/materialize-badge.js
+++ b/app/components/materialize-badge.js
@@ -5,6 +5,8 @@ export default MaterializeBadge.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-badge}} has been deprecated. Please use {{md-badge}} instead', false, {
+      id: 'materialize-badge',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-button-submit.js b/app/components/materialize-button-submit.js
index 870b531f..33f02cd1 100644
--- a/app/components/materialize-button-submit.js
+++ b/app/components/materialize-button-submit.js
@@ -5,6 +5,8 @@ export default MaterializeButtonSubmit.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-button-submit}} has been deprecated. Please use {{md-btn-submit}} instead', false, {
+      id: 'materialize-button-submit',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-button.js b/app/components/materialize-button.js
index 203fdc30..9742a5a2 100644
--- a/app/components/materialize-button.js
+++ b/app/components/materialize-button.js
@@ -5,6 +5,8 @@ export default MaterializeButton.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-button}} has been deprecated. Please use {{md-btn}} instead', false, {
+      id: 'materialize-button',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-card-action.js b/app/components/materialize-card-action.js
index eaa1a57f..098ffa5a 100644
--- a/app/components/materialize-card-action.js
+++ b/app/components/materialize-card-action.js
@@ -5,6 +5,8 @@ export default MaterializeCardAction.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-card-action}} has been deprecated. Please use {{md-card-action}} instead', false, {
+      id: 'materialize-card-action',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-card-content.js b/app/components/materialize-card-content.js
index ebe0d278..5ed21857 100644
--- a/app/components/materialize-card-content.js
+++ b/app/components/materialize-card-content.js
@@ -5,6 +5,8 @@ export default MaterializeCardContent.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-card-content}} has been deprecated. Please use {{md-card-content}} instead', false, {
+      id: 'materialize-card-content',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-card-panel.js b/app/components/materialize-card-panel.js
index 9dfc600e..103067bc 100644
--- a/app/components/materialize-card-panel.js
+++ b/app/components/materialize-card-panel.js
@@ -5,6 +5,8 @@ export default MaterializeCardPanel.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-card-panel}} has been deprecated. Please use {{md-card-panel}} instead', false, {
+      id: 'materialize-card-panel',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-card-reveal.js b/app/components/materialize-card-reveal.js
index 122207ba..872c5cd5 100644
--- a/app/components/materialize-card-reveal.js
+++ b/app/components/materialize-card-reveal.js
@@ -5,6 +5,8 @@ export default MaterializeCardReveal.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-card-reveal}} has been deprecated. Please use {{md-card-reveal}} instead', false, {
+      id: 'materialize-card-reveal',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-card.js b/app/components/materialize-card.js
index 72e80b31..da03e923 100644
--- a/app/components/materialize-card.js
+++ b/app/components/materialize-card.js
@@ -5,6 +5,8 @@ export default MaterializeCard.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-card}} has been deprecated. Please use {{md-card}} instead', false, {
+      id: 'materialize-card',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-checkbox.js b/app/components/materialize-checkbox.js
index f6ddfe54..9cdb2e92 100644
--- a/app/components/materialize-checkbox.js
+++ b/app/components/materialize-checkbox.js
@@ -5,6 +5,8 @@ export default materializeCheckbox.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-checkbox}} has been deprecated. Please use {{md-check}} instead', false, {
+      id: 'materialize-checkbox',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-checkboxes.js b/app/components/materialize-checkboxes.js
index da4c0629..ea62e87d 100644
--- a/app/components/materialize-checkboxes.js
+++ b/app/components/materialize-checkboxes.js
@@ -5,6 +5,8 @@ export default materializeCheckboxes.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-checkboxes}} has been deprecated. Please use {{md-checks}} instead', false, {
+      id: 'materialize-checkboxes',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-collapsible-card.js b/app/components/materialize-collapsible-card.js
index 9167d4be..9cfb8118 100644
--- a/app/components/materialize-collapsible-card.js
+++ b/app/components/materialize-collapsible-card.js
@@ -4,10 +4,10 @@ import MaterializeCollapsibleCard from './md-card-collapsible';
 export default MaterializeCollapsibleCard.extend({
   init() {
     this._super(...arguments);
-    deprecate(
-      '{{materialize-collapsible-card}} has been deprecated. Please use {{md-card-collapsible}} instead',
-      false,
-      { url: 'https://github.com/sgasser/ember-cli-materialize/issues/67' }
-    );
+    deprecate('{{materialize-collapsible-card}} has been deprecated. Please use {{md-card-collapsible}} instead', false, {
+      id: 'materialize-collapsible-card',
+      until: '1.0.0',
+      url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
+    });
   }
 });
diff --git a/app/components/materialize-collapsible.js b/app/components/materialize-collapsible.js
index 05aa51ba..7e5736a4 100644
--- a/app/components/materialize-collapsible.js
+++ b/app/components/materialize-collapsible.js
@@ -5,6 +5,8 @@ export default MaterializeCollapsible.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-collapsible}} has been deprecated. Please use {{md-collapsible}} instead', false, {
+      id: 'materialize-collapsible',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-copyright.js b/app/components/materialize-copyright.js
index 5b348708..a181b523 100644
--- a/app/components/materialize-copyright.js
+++ b/app/components/materialize-copyright.js
@@ -5,6 +5,8 @@ export default materializeCopyright.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-copyright}} has been deprecated. Please use {{md-copyright}} instead', false, {
+      id: 'materialize-copyright',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-date-input.js b/app/components/materialize-date-input.js
index e2e3e422..8f39cd94 100644
--- a/app/components/materialize-date-input.js
+++ b/app/components/materialize-date-input.js
@@ -5,6 +5,8 @@ export default materializeDateInput.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-date-input}} has been deprecated. Please use {{md-input-date}} instead', false, {
+      id: 'materialize-date-input',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-input-field.js b/app/components/materialize-input-field.js
index 29cc8c9c..71362abe 100644
--- a/app/components/materialize-input-field.js
+++ b/app/components/materialize-input-field.js
@@ -5,6 +5,8 @@ export default materializeInputField.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-input-field}} has been deprecated. Please use {{md-input-field}} instead', false, {
+      id: 'materialize-input-field',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-input.js b/app/components/materialize-input.js
index da5621e7..d830dfd4 100644
--- a/app/components/materialize-input.js
+++ b/app/components/materialize-input.js
@@ -5,6 +5,8 @@ export default materializeInput.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-input}} has been deprecated. Please use {{md-input}} instead', false, {
+      id: 'materialize-input',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-loader.js b/app/components/materialize-loader.js
index 0a9945dd..cb0cf5c9 100644
--- a/app/components/materialize-loader.js
+++ b/app/components/materialize-loader.js
@@ -5,6 +5,8 @@ export default materializeLoader.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-loader}} has been deprecated. Please use {{md-loader}} instead', false, {
+      id: 'materialize-loader',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-modal.js b/app/components/materialize-modal.js
index a0becabd..81fba132 100644
--- a/app/components/materialize-modal.js
+++ b/app/components/materialize-modal.js
@@ -5,6 +5,8 @@ export default MaterializeModal.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-modal}} has been deprecated. Please use {{md-modal}} instead', false, {
+      id: 'materialize-modal',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-navbar.js b/app/components/materialize-navbar.js
index 2a19b6b3..0c972f1b 100644
--- a/app/components/materialize-navbar.js
+++ b/app/components/materialize-navbar.js
@@ -5,6 +5,8 @@ export default MaterializeNavBar.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-navbar}} has been deprecated. Please use {{md-navbar}} instead', false, {
+      id: 'materialize-navbar',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-pagination.js b/app/components/materialize-pagination.js
index afdbd030..eb0585f3 100644
--- a/app/components/materialize-pagination.js
+++ b/app/components/materialize-pagination.js
@@ -5,6 +5,8 @@ export default materializePagination.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-pagination}} has been deprecated. Please use {{md-pagination}} instead', false, {
+      id: 'materialize-pagination',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-parallax.js b/app/components/materialize-parallax.js
index a6431e62..0a98de37 100644
--- a/app/components/materialize-parallax.js
+++ b/app/components/materialize-parallax.js
@@ -5,6 +5,8 @@ export default materializeParallax.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-parallax}} has been deprecated. Please use {{md-parallax}} instead', false, {
+      id: 'materialize-parallax',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-radio.js b/app/components/materialize-radio.js
index b7e11716..3d967655 100644
--- a/app/components/materialize-radio.js
+++ b/app/components/materialize-radio.js
@@ -5,6 +5,8 @@ export default materializeRadio.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-radio}} has been deprecated. Please use {{md-radio}} instead', false, {
+      id: 'materialize-radio',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-radios.js b/app/components/materialize-radios.js
index 45b0bcdd..c6e2c474 100644
--- a/app/components/materialize-radios.js
+++ b/app/components/materialize-radios.js
@@ -5,6 +5,8 @@ export default materializeRadios.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-radios}} has been deprecated. Please use {{md-radios}} instead', false, {
+      id: 'materialize-radios',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-range.js b/app/components/materialize-range.js
index 57b10dcd..3dd374d0 100644
--- a/app/components/materialize-range.js
+++ b/app/components/materialize-range.js
@@ -5,6 +5,8 @@ export default materializeRange.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-range}} has been deprecated. Please use {{md-range}} instead', false, {
+      id: 'materialize-range',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-select.js b/app/components/materialize-select.js
index ccb9a50c..ece2e97f 100644
--- a/app/components/materialize-select.js
+++ b/app/components/materialize-select.js
@@ -5,6 +5,8 @@ export default materializeSelect.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-select}} has been deprecated. Please use {{md-select}} instead', false, {
+      id: 'materialize-select',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-switch.js b/app/components/materialize-switch.js
index 82e34146..04022796 100644
--- a/app/components/materialize-switch.js
+++ b/app/components/materialize-switch.js
@@ -5,6 +5,8 @@ export default materializeSwitch.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-switch}} has been deprecated. Please use {{md-switch}} instead', false, {
+      id: 'materialize-switch',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-switches.js b/app/components/materialize-switches.js
index 23dece0b..4b2ec82b 100644
--- a/app/components/materialize-switches.js
+++ b/app/components/materialize-switches.js
@@ -5,6 +5,8 @@ export default materializeSwitches.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-switches}} has been deprecated. Please use {{md-switches}} instead', false, {
+      id: 'materialize-switches',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-tabs-tab.js b/app/components/materialize-tabs-tab.js
index a1e5e5ed..4cb4c6f5 100644
--- a/app/components/materialize-tabs-tab.js
+++ b/app/components/materialize-tabs-tab.js
@@ -5,6 +5,8 @@ export default materializeTabsTab.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-tabs-tab}} has been deprecated. Please use {{md-tab}} instead', false, {
+      id: 'materialize-tabs-tab',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-tabs.js b/app/components/materialize-tabs.js
index c4d3b388..dd904bc8 100644
--- a/app/components/materialize-tabs.js
+++ b/app/components/materialize-tabs.js
@@ -5,6 +5,8 @@ export default materializeTabs.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-tabs}} has been deprecated. Please use {{md-tabs}} instead', false, {
+      id: 'materialize-tabs',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/app/components/materialize-textarea.js b/app/components/materialize-textarea.js
index 7458402a..71cce35a 100644
--- a/app/components/materialize-textarea.js
+++ b/app/components/materialize-textarea.js
@@ -5,6 +5,8 @@ export default materializeTextarea.extend({
   init() {
     this._super(...arguments);
     deprecate('{{materialize-textarea}} has been deprecated. Please use {{md-textarea}} instead', false, {
+      id: 'materialize-textarea',
+      until: '1.0.0',
       url: 'https://github.com/sgasser/ember-cli-materialize/issues/67'
     });
   }
diff --git a/index.js b/index.js
index d04b318b..73c91336 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,8 @@
 'use strict';
 
 module.exports = {
-  name: 'ember-cli-materialize'
+  name: 'ember-cli-materialize',
+  included: function(/* app */) {
+    this._super.included.apply(this, arguments);
+  }
 };
diff --git a/package.json b/package.json
index 5e83560d..b7cbaae6 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "ember-keyboard": "4.0.0",
     "ember-load-initializers": "2.0.0",
     "ember-material-design-icons-shim": "0.1.13",
-    "ember-materialize-shim": "0.5.1",
+    "ember-materialize-shim": "queenvictoria/ember-materialize-shim#remove-bower",
     "ember-modal-dialog": "3.0.0",
     "ember-percy": "1.5.0",
     "ember-radio-button": "2.0.1",
@@ -87,8 +87,8 @@
     "ember-addon"
   ],
   "dependencies": {
-    "ember-cli-babel": "^7.1.3",
-    "ember-cli-htmlbars": "^3.0.1",
+    "ember-cli-babel": "^7.18.0",
+    "ember-cli-htmlbars": "^3.1.0",
     "rsvp": "^4.7.0"
   },
   "ember-addon": {