diff --git a/spec/atom-spec.coffee b/spec/atom-spec.coffee
index 54a94c9a8..d1c7ef6df 100644
--- a/spec/atom-spec.coffee
+++ b/spec/atom-spec.coffee
@@ -520,7 +520,7 @@ describe "the `atom` global", ->
 
             reloadedHandler = jasmine.createSpy('reloadedHandler')
             reloadedHandler.reset()
-            atom.themes.on('reloaded', reloadedHandler)
+            atom.themes.onDidReloadAll reloadedHandler
 
             pack = atom.packages.disablePackage(packageName)
 
diff --git a/src/atom.coffee b/src/atom.coffee
index dd87eb6a4..9d0faab5d 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -373,7 +373,7 @@ class Atom extends Model
     @themes.load()
 
   watchThemes: ->
-    @themes.on 'reloaded', =>
+    @themes.onDidReloadAll =>
       # Only reload stylesheets from non-theme packages
       for pack in @packages.getActivePackages() when pack.getType() isnt 'theme'
         pack.reloadStylesheets?()