diff --git a/api.js b/api.js
index 840529a..45be359 100644
--- a/api.js
+++ b/api.js
@@ -22,6 +22,7 @@ api.use('/api/categories', require('./routes/category'));
 api.use('/api/bookmarks', require('./routes/bookmark'));
 api.use('/api/queries', require('./routes/queries'));
 api.use('/api/auth', require('./routes/auth'));
+api.use('/api/themes', require('./routes/themes'));
 
 // Custom error handler
 api.use(errorHandler);
diff --git a/controllers/queries/addQuery.js b/controllers/queries/addQuery.js
index cd61c67..9db41a8 100644
--- a/controllers/queries/addQuery.js
+++ b/controllers/queries/addQuery.js
@@ -1,4 +1,5 @@
 const asyncWrapper = require('../../middleware/asyncWrapper');
+const ErrorResponse = require('../../utils/ErrorResponse');
 const File = require('../../utils/File');
 
 // @desc      Add custom search query
@@ -8,6 +9,12 @@ const addQuery = asyncWrapper(async (req, res, next) => {
   const file = new File('data/customQueries.json');
   let content = JSON.parse(file.read());
 
+  const prefixes = content.queries.map((q) => q.prefix);
+
+  if (prefixes.includes(req.body.prefix)) {
+    return next(new ErrorResponse('Prefix must be unique', 400));
+  }
+
   // Add new query
   content.queries.push(req.body);
   file.write(content, true);
diff --git a/controllers/themes/addTheme.js b/controllers/themes/addTheme.js
new file mode 100644
index 0000000..1d2cf0c
--- /dev/null
+++ b/controllers/themes/addTheme.js
@@ -0,0 +1,28 @@
+const asyncWrapper = require('../../middleware/asyncWrapper');
+const ErrorResponse = require('../../utils/ErrorResponse');
+const File = require('../../utils/File');
+
+// @desc      Create new theme
+// @route     POST /api/themes
+// @access    Private
+const addTheme = asyncWrapper(async (req, res, next) => {
+  const file = new File('data/themes.json');
+  let content = JSON.parse(file.read());
+
+  const themeNames = content.themes.map((t) => t.name);
+
+  if (themeNames.includes(req.body.name)) {
+    return next(new ErrorResponse('Name must be unique', 400));
+  }
+
+  // Add new theme
+  content.themes.push(req.body);
+  file.write(content, true);
+
+  res.status(201).json({
+    success: true,
+    data: req.body,
+  });
+});
+
+module.exports = addTheme;
diff --git a/controllers/themes/index.js b/controllers/themes/index.js
index 84cc8e8..7ec3b92 100644
--- a/controllers/themes/index.js
+++ b/controllers/themes/index.js
@@ -1,3 +1,4 @@
 module.exports = {
   getThemes: require('./getThemes'),
+  addTheme: require('./addTheme'),
 };
diff --git a/routes/queries.js b/routes/queries.js
index 2262611..ec15790 100644
--- a/routes/queries.js
+++ b/routes/queries.js
@@ -2,7 +2,7 @@ const express = require('express');
 const router = express.Router();
 
 // middleware
-const { auth, requireAuth } = require('../middleware');
+const { auth, requireAuth, requireBody } = require('../middleware');
 
 const {
   getQueries,
@@ -11,7 +11,16 @@ const {
   updateQuery,
 } = require('../controllers/queries/');
 
-router.route('/').post(auth, requireAuth, addQuery).get(getQueries);
+router
+  .route('/')
+  .post(
+    auth,
+    requireAuth,
+    requireBody(['name', 'prefix', 'template']),
+    addQuery
+  )
+  .get(getQueries);
+
 router
   .route('/:prefix')
   .delete(auth, requireAuth, deleteQuery)
diff --git a/routes/themes.js b/routes/themes.js
new file mode 100644
index 0000000..42d6b35
--- /dev/null
+++ b/routes/themes.js
@@ -0,0 +1,19 @@
+const express = require('express');
+const router = express.Router();
+
+// middleware
+const { auth, requireAuth, requireBody } = require('../middleware');
+
+const { getThemes, addTheme } = require('../controllers/themes/');
+
+router
+  .route('/')
+  .get(getThemes)
+  .post(
+    auth,
+    requireAuth,
+    requireBody(['name', 'colors', 'isCustom']),
+    addTheme
+  );
+
+module.exports = router;