diff --git a/src/atom.coffee b/src/atom.coffee
index cb257f760..5690d1b12 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -66,8 +66,10 @@ window.atom =
     if packagePath = @resolvePackagePath(name)
       return pack if pack = @getLoadedPackage(name)
       pack = Package.load(packagePath, options)
-      @loadedPackages[pack.name] = pack
-      @themes.register(pack) if pack.metadata.theme?
+      if pack.metadata.theme
+        @themes.register(pack)
+      else
+        @loadedPackages[pack.name] = pack
       pack
     else
       throw new Error("Could not resolve '#{name}' to a package path")
diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee
index d4a895383..9940b4e61 100644
--- a/src/theme-manager.coffee
+++ b/src/theme-manager.coffee
@@ -38,7 +38,7 @@ class ThemeManager
       @trigger('reloaded')
 
   activateTheme: (name) ->
-    theme = _.find(@registeredTheme, (t) -> t.metadata.name == name)
+    theme = _.find(@registeredThemes, (t) -> t.metadata.name == name)
     return console.warn("Theme '#{name}' not found.") unless theme
 
     try
diff --git a/src/window.coffee b/src/window.coffee
index 8ae1014cb..ecf8100c8 100644
--- a/src/window.coffee
+++ b/src/window.coffee
@@ -54,8 +54,8 @@ window.startEditorWindow = ->
   config.load()
   keymap.loadBundledKeymaps()
   atom.loadBaseStylesheets()
-  atom.loadThemes()
   atom.loadPackages()
+  atom.loadThemes()
   deserializeEditorWindow()
   atom.activatePackages()
   keymap.loadUserKeymaps()