diff --git a/package.json b/package.json
index 894cf0b35..94a73828d 100644
--- a/package.json
+++ b/package.json
@@ -55,13 +55,13 @@
     "vm-compatibility-layer": "0.1.0"
   },
   "packageDependencies": {
-    "atom-dark-syntax": "0.12.0",
-    "atom-dark-ui": "0.21.0",
-    "atom-light-syntax": "0.12.0",
-    "atom-light-ui": "0.20.0",
-    "base16-tomorrow-dark-theme": "0.10.0",
-    "solarized-dark-syntax": "0.8.0",
-    "solarized-light-syntax": "0.4.0",
+    "atom-dark-syntax": "0.13.0",
+    "atom-dark-ui": "0.22.0",
+    "atom-light-syntax": "0.13.0",
+    "atom-light-ui": "0.21.0",
+    "base16-tomorrow-dark-theme": "0.11.0",
+    "solarized-dark-syntax": "0.9.0",
+    "solarized-light-syntax": "0.5.0",
     "archive-view": "0.21.0",
     "autocomplete": "0.21.0",
     "autoflow": "0.12.0",
@@ -89,7 +89,7 @@
     "metrics": "0.24.0",
     "package-generator": "0.25.0",
     "release-notes": "0.17.0",
-    "settings-view": "0.63.0",
+    "settings-view": "0.64.0",
     "snippets": "0.24.0",
     "spell-check": "0.21.0",
     "status-bar": "0.32.0",
diff --git a/spec/fixtures/packages/theme-with-index-css/package.json b/spec/fixtures/packages/theme-with-index-css/package.json
index a4dc0188d..16e770b05 100644
--- a/spec/fixtures/packages/theme-with-index-css/package.json
+++ b/spec/fixtures/packages/theme-with-index-css/package.json
@@ -1,3 +1,3 @@
 {
-  "theme": true
+  "theme": "ui"
 }
diff --git a/spec/fixtures/packages/theme-with-index-less/package.json b/spec/fixtures/packages/theme-with-index-less/package.json
index a4dc0188d..16e770b05 100644
--- a/spec/fixtures/packages/theme-with-index-less/package.json
+++ b/spec/fixtures/packages/theme-with-index-less/package.json
@@ -1,3 +1,3 @@
 {
-  "theme": true
+  "theme": "ui"
 }
diff --git a/spec/fixtures/packages/theme-with-multiple-imported-files/package.json b/spec/fixtures/packages/theme-with-multiple-imported-files/package.json
index a4dc0188d..16e770b05 100644
--- a/spec/fixtures/packages/theme-with-multiple-imported-files/package.json
+++ b/spec/fixtures/packages/theme-with-multiple-imported-files/package.json
@@ -1,3 +1,3 @@
 {
-  "theme": true
+  "theme": "ui"
 }
diff --git a/spec/fixtures/packages/theme-with-package-file/package.json b/spec/fixtures/packages/theme-with-package-file/package.json
index b429a1151..a5e06495a 100644
--- a/spec/fixtures/packages/theme-with-package-file/package.json
+++ b/spec/fixtures/packages/theme-with-package-file/package.json
@@ -1,4 +1,4 @@
 {
-  "theme": true,
+  "theme": "ui",
   "stylesheets": ["first.css", "second.less", "last.css"]
 }
diff --git a/spec/fixtures/packages/theme-with-ui-variables/package.json b/spec/fixtures/packages/theme-with-ui-variables/package.json
index fa1446fd6..047ee57c9 100644
--- a/spec/fixtures/packages/theme-with-ui-variables/package.json
+++ b/spec/fixtures/packages/theme-with-ui-variables/package.json
@@ -1,4 +1,4 @@
 {
-  "theme": true,
+  "theme": "ui",
   "stylesheets": ["editor.less"]
 }
diff --git a/src/package.coffee b/src/package.coffee
index ca4450bc6..2c4eb9043 100644
--- a/src/package.coffee
+++ b/src/package.coffee
@@ -54,7 +54,7 @@ class Package
     atom.config.pushAtKeyPath('core.disabledPackages', @metadata.name)
 
   isTheme: ->
-    !!@metadata?.theme
+    @metadata?.theme?
 
   # Private:
   measure: (key, fn) ->
diff --git a/vendor/apm b/vendor/apm
index 490e9aee6..97ca21abb 160000
--- a/vendor/apm
+++ b/vendor/apm
@@ -1 +1 @@
-Subproject commit 490e9aee661b20728f3681a225ef322bf3fbb4eb
+Subproject commit 97ca21abb99e8201b57bbda226f6aff67b8cfd20