diff --git a/ghost/admin/app/controllers/settings/design/change-theme.js b/ghost/admin/app/controllers/settings/design/change-theme.js
index d5262f4d28..9effa53847 100644
--- a/ghost/admin/app/controllers/settings/design/change-theme.js
+++ b/ghost/admin/app/controllers/settings/design/change-theme.js
@@ -18,13 +18,6 @@ export default class ChangeThemeController extends Controller {
         previewUrl: 'https://demo.ghost.io/',
         ref: 'default',
         image: 'assets/img/themes/Casper.jpg'
-    }, {
-        name: 'Edition',
-        category: 'Newsletter',
-        url: 'https://github.com/TryGhost/Edition',
-        previewUrl: 'https://edition.ghost.io/',
-        ref: 'TryGhost/Edition',
-        image: 'assets/img/themes/Edition.png'
     }, {
         name: 'Headline',
         category: 'News',
@@ -33,12 +26,19 @@ export default class ChangeThemeController extends Controller {
         ref: 'TryGhost/Headline',
         image: 'assets/img/themes/Headline.jpg'
     }, {
-        name: 'Journal',
+        name: 'Edition',
         category: 'Newsletter',
-        url: 'https://github.com/TryGhost/Journal',
-        previewUrl: 'https://journal.ghost.io/',
-        ref: 'TryGhost/Journal',
-        image: 'assets/img/themes/Journal.png'
+        url: 'https://github.com/TryGhost/Edition',
+        previewUrl: 'https://edition.ghost.io/',
+        ref: 'TryGhost/Edition',
+        image: 'assets/img/themes/Edition.png'
+    }, {
+        name: 'Solo',
+        category: 'Blog',
+        url: 'https://github.com/TryGhost/Solo',
+        previewUrl: 'https://solo.ghost.io',
+        ref: 'TryGhost/Solo',
+        image: 'assets/img/themes/Solo.png'
     }, {
         name: 'Digest',
         category: 'Newsletter',
@@ -53,13 +53,6 @@ export default class ChangeThemeController extends Controller {
         previewUrl: 'https://bulletin.ghost.io/',
         ref: 'TryGhost/Bulletin',
         image: 'assets/img/themes/Bulletin.png'
-    }, {
-        name: 'Dawn',
-        category: 'Newsletter',
-        url: 'https://github.com/TryGhost/Dawn',
-        previewUrl: 'https://dawn.ghost.io/',
-        ref: 'TryGhost/Dawn',
-        image: 'assets/img/themes/Dawn.png'
     }, {
         name: 'Alto',
         category: 'Blog',
@@ -67,27 +60,6 @@ export default class ChangeThemeController extends Controller {
         previewUrl: 'https://alto.ghost.io',
         ref: 'TryGhost/Alto',
         image: 'assets/img/themes/Alto.png'
-    }, {
-        name: 'Edge',
-        category: 'Photography',
-        url: 'https://github.com/TryGhost/Edge',
-        previewUrl: 'https://edge.ghost.io',
-        ref: 'TryGhost/Edge',
-        image: 'assets/img/themes/Edge.png'
-    }, {
-        name: 'Ease',
-        category: 'Documentation',
-        url: 'https://github.com/TryGhost/Ease',
-        previewUrl: 'https://ease.ghost.io',
-        ref: 'TryGhost/Ease',
-        image: 'assets/img/themes/Ease.png'
-    }, {
-        name: 'Ruby',
-        category: 'Magazine',
-        url: 'https://github.com/TryGhost/Ruby',
-        previewUrl: 'https://ruby.ghost.io',
-        ref: 'TryGhost/Ruby',
-        image: 'assets/img/themes/Ruby.png'
     }, {
         name: 'Dope',
         category: 'Magazine',
@@ -102,6 +74,34 @@ export default class ChangeThemeController extends Controller {
         previewUrl: 'https://wave.ghost.io',
         ref: 'TryGhost/Wave',
         image: 'assets/img/themes/Wave.png'
+    }, {
+        name: 'Edge',
+        category: 'Photography',
+        url: 'https://github.com/TryGhost/Edge',
+        previewUrl: 'https://edge.ghost.io',
+        ref: 'TryGhost/Edge',
+        image: 'assets/img/themes/Edge.png'
+    }, {
+        name: 'Dawn',
+        category: 'Newsletter',
+        url: 'https://github.com/TryGhost/Dawn',
+        previewUrl: 'https://dawn.ghost.io/',
+        ref: 'TryGhost/Dawn',
+        image: 'assets/img/themes/Dawn.png'
+    }, {
+        name: 'Ease',
+        category: 'Documentation',
+        url: 'https://github.com/TryGhost/Ease',
+        previewUrl: 'https://ease.ghost.io',
+        ref: 'TryGhost/Ease',
+        image: 'assets/img/themes/Ease.png'
+    }, {
+        name: 'Ruby',
+        category: 'Magazine',
+        url: 'https://github.com/TryGhost/Ruby',
+        previewUrl: 'https://ruby.ghost.io',
+        ref: 'TryGhost/Ruby',
+        image: 'assets/img/themes/Ruby.png'
     }, {
         name: 'London',
         category: 'Photography',
@@ -109,6 +109,13 @@ export default class ChangeThemeController extends Controller {
         previewUrl: 'https://london.ghost.io',
         ref: 'TryGhost/London',
         image: 'assets/img/themes/London.jpg'
+    }, {
+        name: 'Journal',
+        category: 'Newsletter',
+        url: 'https://github.com/TryGhost/Journal',
+        previewUrl: 'https://journal.ghost.io/',
+        ref: 'TryGhost/Journal',
+        image: 'assets/img/themes/Journal.png'
     }];
 
     get themesList() {
diff --git a/ghost/admin/public/assets/img/themes/Solo.png b/ghost/admin/public/assets/img/themes/Solo.png
new file mode 100644
index 0000000000..0ba1f67d5d
Binary files /dev/null and b/ghost/admin/public/assets/img/themes/Solo.png differ