diff --git a/core/boot.js b/core/boot.js
index 00e957c5ac..85cedcb715 100644
--- a/core/boot.js
+++ b/core/boot.js
@@ -107,7 +107,7 @@ async function initFrontend() {
     debug('End: Frontend Settings');
 
     debug('Begin: Themes');
-    const themeService = require('./frontend/services/themes');
+    const themeService = require('./server/services/themes');
     await themeService.init();
     debug('End: Themes');
 
@@ -206,7 +206,7 @@ async function initBackgroundServices({config}) {
     }
 
     // Load all inactive themes
-    const themeService = require('./frontend/services/themes');
+    const themeService = require('./server/services/themes');
     themeService.loadInactiveThemes();
 
     debug('End: initBackgroundServices');
diff --git a/core/server/api/canary/themes.js b/core/server/api/canary/themes.js
index 0bd9f8482c..cbb2888db0 100644
--- a/core/server/api/canary/themes.js
+++ b/core/server/api/canary/themes.js
@@ -3,7 +3,7 @@ const os = require('os');
 const path = require('path');
 const security = require('@tryghost/security');
 const {events} = require('../../lib/common');
-const themeService = require('../../../frontend/services/themes');
+const themeService = require('../../services/themes');
 const limitService = require('../../services/limits');
 const models = require('../../models');
 const request = require('../../lib/request');
diff --git a/core/server/api/v2/themes.js b/core/server/api/v2/themes.js
index 0ff1cf20c6..f1ba7318cf 100644
--- a/core/server/api/v2/themes.js
+++ b/core/server/api/v2/themes.js
@@ -1,5 +1,5 @@
 const {events} = require('../../lib/common');
-const themeService = require('../../../frontend/services/themes');
+const themeService = require('../../services/themes');
 const limitService = require('../../services/limits');
 const models = require('../../models');
 
diff --git a/core/server/api/v3/themes.js b/core/server/api/v3/themes.js
index 2185a49b45..e9043c685d 100644
--- a/core/server/api/v3/themes.js
+++ b/core/server/api/v3/themes.js
@@ -1,5 +1,5 @@
 const {events} = require('../../lib/common');
-const themeService = require('../../../frontend/services/themes');
+const themeService = require('../../services/themes');
 const limitService = require('../../services/limits');
 const models = require('../../models');
 
diff --git a/core/frontend/services/themes/ThemeStorage.js b/core/server/services/themes/ThemeStorage.js
similarity index 96%
rename from core/frontend/services/themes/ThemeStorage.js
rename to core/server/services/themes/ThemeStorage.js
index c9b0ff1a80..3d599af7ae 100644
--- a/core/frontend/services/themes/ThemeStorage.js
+++ b/core/server/services/themes/ThemeStorage.js
@@ -4,7 +4,7 @@ const path = require('path');
 const config = require('../../../shared/config');
 const security = require('@tryghost/security');
 const {compress} = require('@tryghost/zip');
-const LocalFileStorage = require('../../../server/adapters/storage/LocalFileStorage');
+const LocalFileStorage = require('../../adapters/storage/LocalFileStorage');
 
 /**
  * @TODO: combine with loader.js?
diff --git a/core/frontend/services/themes/index.js b/core/server/services/themes/index.js
similarity index 98%
rename from core/frontend/services/themes/index.js
rename to core/server/services/themes/index.js
index 445dda1ac1..d4cb6b0b27 100644
--- a/core/frontend/services/themes/index.js
+++ b/core/server/services/themes/index.js
@@ -7,7 +7,7 @@ const themeLoader = require('./loader');
 const bridge = require('../../../bridge');
 const validate = require('./validate');
 const list = require('./list');
-const settingsCache = require('../../../server/services/settings/cache');
+const settingsCache = require('../settings/cache');
 
 module.exports = {
     // Init themes module
diff --git a/core/frontend/services/themes/list.js b/core/server/services/themes/list.js
similarity index 100%
rename from core/frontend/services/themes/list.js
rename to core/server/services/themes/list.js
diff --git a/core/frontend/services/themes/loader.js b/core/server/services/themes/loader.js
similarity index 92%
rename from core/frontend/services/themes/loader.js
rename to core/server/services/themes/loader.js
index 49bca9cddc..8425d42b20 100644
--- a/core/frontend/services/themes/loader.js
+++ b/core/server/services/themes/loader.js
@@ -1,6 +1,6 @@
 const debug = require('ghost-ignition').debug('themes:loader');
 const config = require('../../../shared/config');
-const packageJSON = require('../../../server/lib/fs/package-json');
+const packageJSON = require('../../lib/fs/package-json');
 const themeList = require('./list');
 
 const loadAllThemes = function loadAllThemes() {
diff --git a/core/frontend/services/themes/storage.js b/core/server/services/themes/storage.js
similarity index 98%
rename from core/frontend/services/themes/storage.js
rename to core/server/services/themes/storage.js
index bb8601823d..b38fe97fd0 100644
--- a/core/frontend/services/themes/storage.js
+++ b/core/server/services/themes/storage.js
@@ -7,7 +7,7 @@ const ThemeStorage = require('./ThemeStorage');
 const themeLoader = require('./loader');
 const toJSON = require('./to-json');
 
-const settingsCache = require('../../../server/services/settings/cache');
+const settingsCache = require('../settings/cache');
 const {i18n} = require('../../../server/lib/common');
 const logging = require('../../../shared/logging');
 const errors = require('@tryghost/errors');
diff --git a/core/frontend/services/themes/to-json.js b/core/server/services/themes/to-json.js
similarity index 91%
rename from core/frontend/services/themes/to-json.js
rename to core/server/services/themes/to-json.js
index 2236575e1e..2b5eb69780 100644
--- a/core/frontend/services/themes/to-json.js
+++ b/core/server/services/themes/to-json.js
@@ -1,8 +1,8 @@
 const _ = require('lodash');
 const themeList = require('./list');
 const bridge = require('../../../bridge');
-const packageJSON = require('../../../server/lib/fs/package-json');
-const settingsCache = require('../../../server/services/settings/cache');
+const packageJSON = require('../../lib/fs/package-json');
+const settingsCache = require('../settings/cache');
 
 /**
  *
diff --git a/core/frontend/services/themes/validate.js b/core/server/services/themes/validate.js
similarity index 98%
rename from core/frontend/services/themes/validate.js
rename to core/server/services/themes/validate.js
index 5c51299e0d..f18502b5d6 100644
--- a/core/frontend/services/themes/validate.js
+++ b/core/server/services/themes/validate.js
@@ -2,7 +2,7 @@ const _ = require('lodash');
 const Promise = require('bluebird');
 const fs = require('fs-extra');
 const config = require('../../../shared/config');
-const {i18n} = require('../../../server/lib/common');
+const {i18n} = require('../../lib/common');
 const errors = require('@tryghost/errors');
 
 const canActivate = function canActivate(checkedTheme) {
diff --git a/test/unit/helpers/body_class_spec.js b/test/unit/helpers/body_class_spec.js
index cd6be1b806..2c2ffe840f 100644
--- a/test/unit/helpers/body_class_spec.js
+++ b/test/unit/helpers/body_class_spec.js
@@ -1,5 +1,5 @@
 const should = require('should');
-const themeList = require('../../../core/frontend/services/themes/list');
+const themeList = require('../../../core/server/services/themes/list');
 
 // Stuff we are testing
 const helpers = require('../../../core/frontend/helpers');
diff --git a/test/unit/services/themes/list_spec.js b/test/unit/services/themes/list_spec.js
index 5e8c1d27f6..7f875a871c 100644
--- a/test/unit/services/themes/list_spec.js
+++ b/test/unit/services/themes/list_spec.js
@@ -1,7 +1,7 @@
 const should = require('should');
 const sinon = require('sinon');
 const _ = require('lodash');
-const themeList = require('../../../../core/frontend/services/themes/list');
+const themeList = require('../../../../core/server/services/themes/list');
 
 describe('Themes', function () {
     afterEach(function () {
diff --git a/test/unit/services/themes/loader_spec.js b/test/unit/services/themes/loader_spec.js
index 8c3b58f6f3..19c15b82a9 100644
--- a/test/unit/services/themes/loader_spec.js
+++ b/test/unit/services/themes/loader_spec.js
@@ -4,8 +4,8 @@ const fs = require('fs-extra');
 const tmp = require('tmp');
 const join = require('path').join;
 const config = require('../../../../core/shared/config');
-const loader = require('../../../../core/frontend/services/themes/loader');
-const themeList = require('../../../../core/frontend/services/themes/list');
+const loader = require('../../../../core/server/services/themes/loader');
+const themeList = require('../../../../core/server/services/themes/list');
 
 describe('Themes', function () {
     afterEach(function () {
diff --git a/test/unit/services/themes/validate_spec.js b/test/unit/services/themes/validate_spec.js
index e0e7b49755..8b2d047aa2 100644
--- a/test/unit/services/themes/validate_spec.js
+++ b/test/unit/services/themes/validate_spec.js
@@ -2,7 +2,7 @@ const should = require('should');
 const sinon = require('sinon');
 const _ = require('lodash');
 
-const validate = require('../../../../core/frontend/services/themes/validate');
+const validate = require('../../../../core/server/services/themes/validate');
 
 const gscan = require('gscan');
 
diff --git a/test/utils/index.js b/test/utils/index.js
index 7071618c09..53b8e81235 100644
--- a/test/utils/index.js
+++ b/test/utils/index.js
@@ -21,7 +21,7 @@ const settingsService = require('../../core/server/services/settings');
 const frontendSettingsService = require('../../core/frontend/services/settings');
 const settingsCache = require('../../core/server/services/settings/cache');
 const web = require('../../core/server/web');
-const themeService = require('../../core/frontend/services/themes');
+const themeService = require('../../core/server/services/themes');
 const limits = require('../../core/server/services/limits');
 
 // Other Test Utilities
diff --git a/test/utils/old-integration-utils.js b/test/utils/old-integration-utils.js
index 3f90584e75..97a339b079 100644
--- a/test/utils/old-integration-utils.js
+++ b/test/utils/old-integration-utils.js
@@ -7,7 +7,7 @@ const routingService = require('../../core/frontend/services/routing');
 const settingsService = require('../../core/server/services/settings');
 const settingsCache = require('../../core/server/services/settings/cache');
 const imageLib = require('../../core/server/lib/image');
-const themeService = require('../../core/frontend/services/themes');
+const themeService = require('../../core/server/services/themes');
 
 // Other Test Utilities
 const configUtils = require('./configUtils');