diff --git a/index.html b/index.html
index 3108b56f2f..ce27d99a5e 100644
--- a/index.html
+++ b/index.html
@@ -64,7 +64,7 @@
 						<li class="txView" title="Transaction"><i class="fa fa-send"></i></li>
 						<li class="envView" title="Environment"><i class="fa fa-cube"></i></li>
 						<li class="publishView" title="Publish" ><i class="fa fa-cloud-upload"></i></li>
-						<li class="debugView" title="Debugger"><i class="fa fa-cube"></i></li>
+						<li class="debugView" title="Debugger"><i class="fa fa-bug"></i></li>
 						<li id="helpButton"><a href="https://solidity.readthedocs.org" target="_blank" title="Open Documentation" class="fa fa-question"></a></li>
 					</ul>
 					<img id="solIcon" title="Solidity realtime compiler and runtime" src="assets/img/sol.svg" alt="Solidity realtime compiler and runtime">
@@ -131,6 +131,5 @@
 		</div>
 
 		<script src="build/app.js"></script>
-		<script src="node_modules/ethereum-remix/build/app.js"></script>
 	</body>
 </html>
diff --git a/package.json b/package.json
index df3ab1afc8..81211d9c0a 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,9 @@
     "semistandard": "^7.0.0",
     "tape": "^4.5.1",
     "web3": "^0.16.0",
-    "webworkify": "^1.2.1"
+    "webworkify": "^1.2.1",
+    "yo-yo": "^1.2.2",
+    "yo-yoify": "^3.3.0"
   },
   "repository": {
     "type": "git",
diff --git a/src/app/debugger.js b/src/app/debugger.js
index 27a4d1b736..ecce0de8a1 100644
--- a/src/app/debugger.js
+++ b/src/app/debugger.js
@@ -1,8 +1,9 @@
 var $ = require('jquery');
+var Remix = require('ethereum-remix');
 
 function Debugger (executionContext, _id) {
   this.el = document.querySelector(_id);
-  this.debugger = new window.remix.Debugger(executionContext.web3());
+  this.debugger = new Remix.Debugger(executionContext.web3());
   this.el.appendChild(this.debugger.render());
   this.web3 = executionContext.web3();
   this.debugView = $('ul#options li.debugView');