--- a/Gruntfile.js	Tue Apr 12 23:43:26 2016 +0300
+++ b/Gruntfile.js	Thu Apr 13 15:44:35 2017 +0300
@@ -1,15 +1,15 @@
 'use strict';
 
 module.exports = function (grunt) {
-    var path = require('path'),
-        helpers = require('amber-dev').helpers;
-
     // These plugins provide necessary tasks.
     grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-contrib-requirejs');
     grunt.loadNpmTasks('grunt-execute');
     grunt.loadNpmTasks('amber-dev');
 
+    var path = require('path'),
+        helpers = require('amber-dev').helpers;
+
     // Default task.
     grunt.registerTask('default', ['amdconfig:app', 'amberc:all']);
     grunt.registerTask('test', ['amdconfig:app', 'requirejs:test_runner', 'execute:test_runner', 'clean:test_runner']);
@@ -37,7 +37,7 @@
                     'src/Serpentron-Tests.st' // list all tests in dependency order
                 ],
                 amd_namespace: 'amber-serpentron',
-                libraries: ['amber_core/SUnit', 'silk/Silk']
+                libraries: ['amber_core/SUnit', 'amber/web/Web', 'silk/Silk']
             }
         },
 
@@ -59,7 +59,7 @@
                         excludeIdeData: true,
                         excludeDebugContexts: true
                     },
-                    include: ['config', 'config-browser', 'node_modules/requirejs/require', 'app'],
+                    include: ['config', 'config-browser', 'node_modules/requirejs/require', 'app', 'amber/lazypack'],
                     optimize: "uglify2",
                     out: "the.js"
                 }
@@ -93,7 +93,7 @@
                     pragmas: {
                         excludeIdeData: true
                     },
-                    include: ['config-node', 'app'],
+                    include: ['config-node', 'app', 'amber/lazypack'],
                     insertRequire: ['app'],
                     optimize: "none",
                     wrap: helpers.nodeWrapperWithShebang,

--- a/bower.json	Tue Apr 12 23:43:26 2016 +0300
+++ b/bower.json	Thu Apr 13 15:44:35 2017 +0300
@@ -26,14 +26,14 @@
   ],
   "private": false,
   "dependencies": {
-    "amber": "^0.15.1",
-    "amber-compat-es2015": "^0.1.0",
-    "domite": "^0.4.0",
-    "silk": "^0.2.0"
+    "amber": "^0.18.3",
+    "amber-compat-es2015": "^0.1.5",
+    "domite": "^0.6.0",
+    "silk": "^0.2.3"
   },
   "devDependencies": {
-    "amber-contrib-legacy": "^0.3.0",
+    "amber-contrib-legacy": "^0.4.2",
     "amber-ide-starter-dialog": "^0.1.0",
-    "helios": "^0.6.0"
+    "helios": "^0.7.1"
   }
 }

--- a/package.json	Tue Apr 12 23:43:26 2016 +0300
+++ b/package.json	Thu Apr 13 15:44:35 2017 +0300
@@ -28,7 +28,7 @@
     "test": "grunt test"
   },
   "devDependencies": {
-    "amber-dev": "^0.8.2",
+    "amber-dev": "^0.8.7",
     "grunt": "^0.4.5",
     "grunt-contrib-clean": "^0.7.0",
     "grunt-contrib-requirejs": "^0.4.4",
@@ -39,4 +39,4 @@
     "Amber",
     "Smalltalk"
   ]
-}
+}
\ No newline at end of file

--- a/src/Serpentron.st	Tue Apr 12 23:43:26 2016 +0300
+++ b/src/Serpentron.st	Thu Apr 13 15:44:35 2017 +0300
@@ -385,12 +385,12 @@
 	"No reason to polyfill requestAnimationFrame
 	 or use vendor prefixes as browsers that do not have it
 	 will likely have other incompatibilities."
-	< return window.requestAnimationFrame && true || false >
+	<inlineJS: 'return window.requestAnimationFrame && true || false'>
 !
 
 toggleFullscreen
 	"Sample code from https://developer.mozilla.org/en-US/docs/Web/API/Fullscreen_API"
-	<
+	<inlineJS: '
 	if (!!document.fullscreenElement &&
 	    !!document.mozFullScreenElement && !!document.webkitFullscreenElement && !!document.msFullscreenElement ) {
 	  if (document.documentElement.requestFullscreen) {
@@ -412,8 +412,7 @@
 	  } else if (document.webkitExitFullscreen) {
 	    document.webkitExitFullscreen();
 	  }
-	}
-	>
+	}'>
 ! !
 
 !Serpentron class methodsFor: 'starting'!