diff --git a/keymaps/darwin.cson b/keymaps/darwin.cson
index f2cd35ca2..ddddc5783 100644
--- a/keymaps/darwin.cson
+++ b/keymaps/darwin.cson
@@ -1,4 +1,4 @@
-'body.platform-darwin':
+'.platform-darwin':
   # Apple specific
   'cmd-q': 'application:quit'
   'cmd-h': 'application:hide'
@@ -87,7 +87,7 @@
   'cmd-8': 'pane:show-item-8'
   'cmd-9': 'pane:show-item-9'
 
-'body.platform-darwin .editor':
+'.platform-darwin .editor':
   # Apple Specific
   'cmd-backspace': 'editor:backspace-to-beginning-of-line'
   'cmd-delete': 'editor:backspace-to-beginning-of-line'
diff --git a/keymaps/win32.cson b/keymaps/win32.cson
index 1030da753..60825bf16 100644
--- a/keymaps/win32.cson
+++ b/keymaps/win32.cson
@@ -1,4 +1,4 @@
-'body.platform-win32':
+'.platform-win32':
   # Atom Specific
   'enter': 'core:confirm'
   'escape': 'core:cancel'
@@ -45,12 +45,12 @@
   'ctrl-k down': 'pane:split-down' # Atom Specific
   'ctrl-k left': 'pane:split-left' # Atom Specific
   'ctrl-k right': 'pane:split-right' # Atom Specific
-  'ctrl-k cmd-w': 'pane:close' # Atom Specific
-  'ctrl-k alt-cmd-w': 'pane:close-other-items' # Atom Specific
-  'ctrl-k cmd-left': 'window:focus-previous-pane'
-  'ctrl-k cmd-right': 'window:focus-next-pane'
+  'ctrl-k ctrl-w': 'pane:close' # Atom Specific
+  'ctrl-k alt-ctrl-w': 'pane:close-other-items' # Atom Specific
+  'ctrl-k ctrl-left': 'window:focus-previous-pane'
+  'ctrl-k ctrl-right': 'window:focus-next-pane'
 
-'body.platform-win32 .editor':
+'.platform-win32 .editor':
   # Windows specific
   'ctrl-delete': 'editor:backspace-to-beginning-of-word'
 
@@ -60,7 +60,7 @@
   'ctrl-k ctrl-u': 'editor:upper-case'
   'ctrl-k ctrl-l': 'editor:lower-case'
 
-'body.platform-win32 .editor:not(.mini)':
+'.platform-win32 .editor:not(.mini)':
   # Atom specific
   'alt-ctrl-z': 'editor:checkout-head-revision'
   'ctrl-<': 'editor:scroll-to-cursor'
@@ -94,7 +94,7 @@
   'ctrl-k ctrl-9': 'editor:fold-at-indent-level-9'
 
 # allow standard input fields to work correctly
-'body.platform-win32 input:not(.hidden-input), body.platform-win32 .native-key-bindings':
+'.platform-win32 input:not(.hidden-input), .platform-win32 .native-key-bindings':
   'ctrl-z': 'native!'
   'ctrl-Z': 'native!'
   'ctrl-x': 'native!'
diff --git a/package.json b/package.json
index c2461d0fe..452a08012 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "dev-live-reload": "0.15.0",
     "editor-stats": "0.5.0",
     "exception-reporting": "0.7.0",
-    "find-and-replace": "0.42.0",
+    "find-and-replace": "0.43.0",
     "fuzzy-finder": "0.20.0",
     "gists": "0.8.0",
     "git-diff": "0.13.0",
@@ -107,7 +107,7 @@
     "to-the-hubs": "0.11.0",
     "tree-view": "0.31.0",
     "visual-bell": "0.3.0",
-    "whitespace": "0.8.0",
+    "whitespace": "0.9.0",
     "wrap-guide": "0.5.0",
     "language-c": "0.2.0",
     "language-clojure": "0.1.0",
diff --git a/spec/atom-spec.coffee b/spec/atom-spec.coffee
index 1e8c5dda8..6b9d200d8 100644
--- a/spec/atom-spec.coffee
+++ b/spec/atom-spec.coffee
@@ -262,12 +262,13 @@ describe "the `atom` global", ->
         describe "when the package has no grammars but does have preferences", ->
           it "loads the package's preferences as scoped properties", ->
             jasmine.unspy(window, 'setTimeout')
-            spyOn(syntax, 'addProperties').andCallThrough()
+            spyOn(atom.syntax, 'addProperties').andCallThrough()
 
             atom.activatePackage('package-with-preferences-tmbundle')
 
             waitsFor ->
               atom.syntax.addProperties.callCount > 0
+
             runs ->
               expect(atom.syntax.getProperty(['.source.pref'], 'editor.increaseIndentPattern')).toBe '^abc$'
 
diff --git a/src/window.coffee b/src/window.coffee
index 34a0d80ee..8b5e001f0 100644
--- a/src/window.coffee
+++ b/src/window.coffee
@@ -123,9 +123,9 @@ window.requireWithGlobals = (args...) ->
 #
 # Returns the value returned by the given function.
 window.measure = (description, fn) ->
-  start = new Date().getTime()
+  start = Date.now()
   value = fn()
-  result = new Date().getTime() - start
+  result = Date.now() - start
   console.log description, result
   value
 
diff --git a/static/index.html b/static/index.html
index d8df334f5..9db5e2271 100644
--- a/static/index.html
+++ b/static/index.html
@@ -22,6 +22,6 @@
     }
   </script>
 </head>
-<body tabindex="-1">
+<body class="workspace" tabindex="-1">
 </body>
 </html>