diff --git a/mobile/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs b/mobile/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
index 788dd21..61bcf77 100644
--- a/mobile/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
+++ b/mobile/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
@@ -1,14 +1,15 @@
 {{#if isShowingModal}}
-  {{#modal-dialog close="close" alignment="center" translucentOverlay=true attachment="center" targetAttachment="center"}}
+  {{#paper-dialog fullscreen=fullscreen onClose=(action "close") origin=dialogOrigin clickOutsideToClose=true}}
+    {{#paper-dialog-content}}
+      <p>Enter a <a href="https://soundcloud.com" target="_blank" rel="noopener noreferrer">SoundCloud</a> track or playlist/set
+        URL</p>
+      <p>(ex. https://soundcloud.com/mrsuicidesheep/tracks)</p>
 
-    <p>Enter a <a href="#" onclick="window.open('https://soundcloud.com', '_blank');">SoundCloud</a> track or playlist/set URL</p>
-    <p>(ex. https://soundcloud.com/mrsuicidesheep/tracks)</p>
+      {{paper-input label="SoundCloud URL" class="full-width" icon="search" value=url onChange=(action (mut url))}}
+    {{/paper-dialog-content}}
 
-    {{paper-input label="SoundCloud URL" icon="search" value=url onChange=(action (mut url))}}
-
-    <div>
-      {{paper-button onClick=(action "close") label="Close"}}
-    	{{paper-button class="pull-right" onClick=(action "add") disabled=saveDisabled primary=true label="Add Music"}}
-    </div>
-  {{/modal-dialog}}
+    {{#paper-dialog-actions class="layout-row" }}
+      <span class="flex"></span> {{paper-button onClick=(action "close") label="Close"}} {{paper-button class="pull-right" onClick=(action "add") disabled=saveDisabled primary=true label="Add Music"}}
+    {{/paper-dialog-actions}}
+  {{/paper-dialog}}
 {{/if}}
\ No newline at end of file
diff --git a/mobile/app/styles/app.scss b/mobile/app/styles/app.scss
index 38011fc..3db559a 100644
--- a/mobile/app/styles/app.scss
+++ b/mobile/app/styles/app.scss
@@ -1,6 +1,3 @@
-@import 'ember-modal-dialog/ember-modal-structure';
-@import 'ember-modal-dialog/ember-modal-appearance';
-
 @import 'huegasm-variables';
 
 @import 'bootstrap'; // used to take out bootstrap scss modules that we don't need
@@ -28,6 +25,16 @@ body, button {
   font-family: 'Raleway', sans-serif;
 }
 
+.full-width {
+  width: 100%;
+}
+
+md-dialog {
+  p {
+    word-break: break-word;
+  }
+}
+
 .alert {
   margin-bottom: 0;
   border: none;
@@ -37,20 +44,6 @@ button.md-warn {
   background: $secondaryThemeColor;
 }
 
-div.ember-modal-dialog {
-  padding: 20px;
-  color: $blackish;
-  md-input-container {
-    width: 100%;
-    input.md-input[type="text"] {
-      color: $blackish !important;
-    }
-  }
-  md-input-container label {
-    color: rgba(0, 0, 0, 0.26);
-  }
-}
-
 .ps-scrollbar-y-rail {
   opacity: 1 !important;
 }
diff --git a/mobile/app/styles/dimmer.scss b/mobile/app/styles/dimmer.scss
index 285c745..2bea319 100644
--- a/mobile/app/styles/dimmer.scss
+++ b/mobile/app/styles/dimmer.scss
@@ -11,6 +11,9 @@ html.dimmerOn {
 body.dimmerOn {
   color: $whitish;
   background: $blackish;
+  md-dialog {
+    background-color: rgba(0, 0, 0, 0.9) !important;
+  }
   md-input-container {
     label {
       color: #3f51b5 !important;
diff --git a/mobile/app/styles/light-group.scss b/mobile/app/styles/light-group.scss
index acccb70..fb6bf21 100644
--- a/mobile/app/styles/light-group.scss
+++ b/mobile/app/styles/light-group.scss
@@ -46,10 +46,6 @@
   }
 }
 
-.ember-modal-overlay.translucent {
-  background-color: rgba(0, 0, 0, 0.50);
-}
-
 .remove-button {
   margin: 10px 0 10px 60px;
 }
diff --git a/mobile/package.json b/mobile/package.json
index 6656977..47fd27b 100644
--- a/mobile/package.json
+++ b/mobile/package.json
@@ -36,7 +36,6 @@
     "ember-export-application-global": "^2.0.0",
     "ember-inline-svg": "^0.1.7",
     "ember-load-initializers": "^1.0.0",
-    "ember-modal-dialog": "^2.0.0",
     "ember-notify": "^5.0.4",
     "ember-paper": "^1.0.0-alpha.19",
     "ember-resolver": "^4.0.0",
diff --git a/mobile/yarn.lock b/mobile/yarn.lock
index 7580afc..a56749d 100644
--- a/mobile/yarn.lock
+++ b/mobile/yarn.lock
@@ -345,10 +345,6 @@ ast-types@0.8.12:
   version "0.8.12"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc"
 
-ast-types@0.8.15:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.15.tgz#8eef0827f04dff0ec8857ba925abe3fea6194e52"
-
 ast-types@0.9.6:
   version "0.9.6"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
@@ -2679,7 +2675,7 @@ ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-c
     ember-cli-version-checker "^1.0.2"
     resolve "^1.1.2"
 
-ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0:
+ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.1.0.tgz#d9c83a7d0c67cc8a3ccb9bd082971c3593e54fad"
   dependencies:
@@ -2739,7 +2735,7 @@ ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.0.3
     json-stable-stringify "^1.0.0"
     strip-bom "^2.0.0"
 
-ember-cli-htmlbars@^2.0.0, ember-cli-htmlbars@^2.0.1:
+ember-cli-htmlbars@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.1.tgz#e1e333c7ef4cc546c67734996541fd94ca4423ca"
   dependencies:
@@ -3038,12 +3034,6 @@ ember-getowner-polyfill@1.1.1, ember-getowner-polyfill@^1.1.0:
     ember-cli-babel "^5.1.6"
     ember-cli-version-checker "^1.2.0"
 
-ember-ignore-children-helper@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ember-ignore-children-helper/-/ember-ignore-children-helper-1.0.0.tgz#7645d769377779ff292235725b5b1f5c2e4c16ab"
-  dependencies:
-    ember-cli-babel "^5.1.6"
-
 ember-inline-svg@^0.1.7:
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/ember-inline-svg/-/ember-inline-svg-0.1.11.tgz#bb5af24cef1db3ab2e1a8aec543bee262a368c37"
@@ -3075,15 +3065,6 @@ ember-maybe-import-regenerator@^0.1.4:
     ember-cli-babel "^6.0.0-beta.4"
     regenerator-runtime "^0.9.5"
 
-ember-modal-dialog@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ember-modal-dialog/-/ember-modal-dialog-2.1.0.tgz#e3beb05bcaaa52c37766b82e8fda0561cd95fdb8"
-  dependencies:
-    ember-cli-babel "^6.1.0"
-    ember-cli-htmlbars "^2.0.1"
-    ember-ignore-children-helper "^1.0.0"
-    ember-wormhole "^0.5.1"
-
 ember-notify@^5.0.4:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/ember-notify/-/ember-notify-5.2.1.tgz#c603e928bc6e92885a8f98181e7bdbf8d90eb2d3"
@@ -4167,7 +4148,11 @@ homedir-polyfill@^1.0.0:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^2.1.4, hosted-git-info@^2.1.5, hosted-git-info@~2.1.4, hosted-git-info@~2.1.5:
+hosted-git-info@^2.1.4, hosted-git-info@^2.1.5:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+
+hosted-git-info@~2.1.4, hosted-git-info@~2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.1.5.tgz#0ba81d90da2e25ab34a332e6ec77936e1598118b"
 
@@ -5388,14 +5373,10 @@ mustache@^2.2.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0"
 
-mute-stream@0.0.6:
+mute-stream@0.0.6, mute-stream@~0.0.4:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db"
 
-mute-stream@~0.0.4:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-
 nan@^2.3.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
@@ -6404,7 +6385,7 @@ realize-package-specifier@~3.0.1:
     dezalgo "^1.0.1"
     npm-package-arg "^4.1.1"
 
-recast@0.10.33:
+recast@0.10.33, recast@^0.10.10:
   version "0.10.33"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
   dependencies:
@@ -6413,15 +6394,6 @@ recast@0.10.33:
     private "~0.1.5"
     source-map "~0.5.0"
 
-recast@^0.10.10:
-  version "0.10.43"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.43.tgz#b95d50f6d60761a5f6252e15d80678168491ce7f"
-  dependencies:
-    ast-types "0.8.15"
-    esprima-fb "~15001.1001.0-dev-harmony-fb"
-    private "~0.1.5"
-    source-map "~0.5.0"
-
 recast@^0.11.17, recast@^0.11.3:
   version "0.11.23"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
diff --git a/web/app/pods/components/hue-controls/template.hbs b/web/app/pods/components/hue-controls/template.hbs
index 9a8ae89..d858dea 100644
--- a/web/app/pods/components/hue-controls/template.hbs
+++ b/web/app/pods/components/hue-controls/template.hbs
@@ -60,8 +60,7 @@
   </div>
 
   {{#if firstVisitApp}}
-    {{#paper-dialog fullscreen=fullscreen onClose=(action "closeNotificationModal") origin=dialogOrigin}}
-
+    {{#paper-dialog fullscreen=fullscreen onClose=(action "closeNotificationModal") origin=dialogOrigin clickOutsideToClose=true}}
       {{#paper-dialog-content}}
         <p class="promo-title">
           Check out the <a href="https://chrome.google.com/webstore/detail/huegasm-for-philips-hue-l/mbjanbdhcpohhfecjgbdpcfhnnbofooj" target="_blank">Huegasm Chrome extension</a>
@@ -75,7 +74,7 @@
           </ul>
 
           <a href="https://chrome.google.com/webstore/detail/huegasm-for-philips-hue-l/mbjanbdhcpohhfecjgbdpcfhnnbofooj" target="_blank">
-            <img class="promo-img" src="assets/images/promo.png">
+            <img class="promo-img hidden-xs" src="assets/images/promo.png">
           </a>
         </p>
       {{/paper-dialog-content}}
@@ -87,7 +86,6 @@
 
     {{/paper-dialog}}
   {{/if}}
-
 {{else}}
   {{paper-progress-circular diameter=100}}
 {{/if}}
diff --git a/web/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs b/web/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
index 7a639b4..243fb05 100644
--- a/web/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
+++ b/web/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
@@ -1,14 +1,16 @@
 {{#if isShowingModal}}
-  {{#modal-dialog close="close" alignment="center" translucentOverlay=true attachment="center" targetAttachment="center"}}
+  {{#paper-dialog fullscreen=fullscreen onClose=(action "close") origin=dialogOrigin clickOutsideToClose=true}}
+    {{#paper-dialog-content}}
+      <p>Enter a <a href="https://soundcloud.com" target="_blank" rel="noopener noreferrer">SoundCloud</a> track or playlist/set URL</p>
+      <p>(ex. https://soundcloud.com/mrsuicidesheep/tracks)</p>
 
-    <p>Enter a <a href="https://soundcloud.com" target="_blank" rel="noopener noreferrer">SoundCloud</a> track or playlist/set URL</p>
-    <p>(ex. https://soundcloud.com/mrsuicidesheep/tracks)</p>
+      {{paper-input label="SoundCloud URL" class="full-width" icon="search" value=url onChange=(action (mut url))}}
+    {{/paper-dialog-content}}
 
-    {{paper-input label="SoundCloud URL" icon="search" value=url onChange=(action (mut url))}}
-
-    <div>
-      {{paper-button onClick=(action "close") label="Close"}}
-      {{paper-button class="pull-right" onClick=(action "add") disabled=saveDisabled primary=true label="Add Music"}}
-    </div>
-  {{/modal-dialog}}
+    {{#paper-dialog-actions class="layout-row" }}
+      <span class="flex"></span>
+       {{paper-button onClick=(action "close") label="Close"}} 
+       {{paper-button class="pull-right" onClick=(action "add") disabled=saveDisabled primary=true label="Add Music"}}
+    {{/paper-dialog-actions}}
+  {{/paper-dialog}}
 {{/if}}
\ No newline at end of file
diff --git a/web/app/styles/app.scss b/web/app/styles/app.scss
index 7ad2e8d..acca74b 100644
--- a/web/app/styles/app.scss
+++ b/web/app/styles/app.scss
@@ -1,6 +1,3 @@
-@import 'ember-modal-dialog/ember-modal-structure';
-@import 'ember-modal-dialog/ember-modal-appearance';
-
 @import 'huegasm-variables';
 
 @import 'bootstrap'; // used to take out bootstrap scss modules that we don't need
@@ -26,6 +23,10 @@ body, button {
   font-family: 'Raleway', sans-serif;
 }
 
+.full-width {
+  width: 100%;
+}
+
 #huegasm {
   flex: 1;
   justify-content: center;
@@ -71,20 +72,6 @@ button.md-warn {
   background: $secondaryThemeColor;
 }
 
-div.ember-modal-dialog {
-  padding: 20px;
-  color: $blackish;
-  md-input-container {
-    width: 100%;
-    input.md-input[type="text"] {
-      color: $blackish !important;
-    }
-  }
-  md-input-container label {
-    color: rgba(0, 0, 0, 0.26);
-  }
-}
-
 .display-flex {
   display: flex !important;
 }
diff --git a/web/app/styles/dimmer.scss b/web/app/styles/dimmer.scss
index 8cffff3..36db140 100644
--- a/web/app/styles/dimmer.scss
+++ b/web/app/styles/dimmer.scss
@@ -11,6 +11,9 @@ html.dimmerOn {
 body.dimmerOn {
   color: $whitish;
   background: $blackish;
+  md-dialog {
+    background-color: rgba(0, 0, 0, 0.9) !important;
+  }
   md-input-container {
     label {
       color: #3f51b5 !important;
diff --git a/web/app/styles/light-group.scss b/web/app/styles/light-group.scss
index c7fbc6e..e7ac733 100644
--- a/web/app/styles/light-group.scss
+++ b/web/app/styles/light-group.scss
@@ -54,10 +54,6 @@
   }
 }
 
-.ember-modal-overlay.translucent {
-  background-color: rgba(0, 0, 0, 0.50);
-}
-
 .remove-button {
   margin: 10px 0 10px 60px;
 }
diff --git a/web/package.json b/web/package.json
index 510d8a1..aa10865 100644
--- a/web/package.json
+++ b/web/package.json
@@ -37,7 +37,6 @@
     "ember-export-application-global": "^2.0.0",
     "ember-inline-svg": "^0.1.7",
     "ember-load-initializers": "^1.0.0",
-    "ember-modal-dialog": "^2.0.0",
     "ember-notify": "^5.0.4",
     "ember-paper": "^1.0.0-alpha.19",
     "ember-resolver": "^4.0.0",
diff --git a/web/yarn.lock b/web/yarn.lock
index dcfa46d..bb4164a 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -1505,8 +1505,8 @@ can-symlink@^1.0.0:
     tmp "0.0.28"
 
 caniuse-db@^1.0.30000153, caniuse-db@^1.0.30000214, caniuse-db@^1.0.30000639:
-  version "1.0.30000667"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000667.tgz#fb6060dbf349c101df26f421442419802fc6dab1"
+  version "1.0.30000669"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000669.tgz#dbe8f25700ecda631dfb05cb71027762bd4b03e5"
 
 capture-exit@^1.1.0:
   version "1.2.0"
@@ -2089,7 +2089,7 @@ ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-c
     ember-cli-version-checker "^1.0.2"
     resolve "^1.1.2"
 
-ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.0.0-beta.9:
+ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.1.0.tgz#d9c83a7d0c67cc8a3ccb9bd082971c3593e54fad"
   dependencies:
@@ -2182,7 +2182,7 @@ ember-cli-htmlbars-inline-precompile@^0.4.0:
     hash-for-dep "^1.0.2"
     silent-error "^1.1.0"
 
-ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.1:
+ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.1.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.3.2.tgz#906279c48be32986a3cc41e730ecc3513a34c4d1"
   dependencies:
@@ -2499,14 +2499,6 @@ ember-maybe-import-regenerator@^0.1.4:
     ember-cli-babel "^6.0.0-beta.4"
     regenerator-runtime "^0.9.5"
 
-ember-modal-dialog@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ember-modal-dialog/-/ember-modal-dialog-2.0.0.tgz#ee3a6d06dc551f2a6befd719e9549df896f41480"
-  dependencies:
-    ember-cli-babel "^6.0.0-beta.9"
-    ember-cli-htmlbars "^1.0.8"
-    ember-wormhole "^0.5.1"
-
 ember-notify@^5.0.4:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/ember-notify/-/ember-notify-5.2.1.tgz#c603e928bc6e92885a8f98181e7bdbf8d90eb2d3"
@@ -3444,7 +3436,11 @@ homedir-polyfill@^1.0.0:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^2.1.4, hosted-git-info@^2.1.5, hosted-git-info@~2.1.4:
+hosted-git-info@^2.1.4, hosted-git-info@^2.1.5:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+
+hosted-git-info@~2.1.4:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.1.5.tgz#0ba81d90da2e25ab34a332e6ec77936e1598118b"
 
@@ -4510,14 +4506,10 @@ mustache@^2.2.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0"
 
-mute-stream@0.0.6:
+mute-stream@0.0.6, mute-stream@~0.0.4:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db"
 
-mute-stream@~0.0.4:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-
 nan@^2.3.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"