diff --git a/lib/philomena_web/controllers/api/json/theme_controller.ex b/lib/philomena_web/controllers/theme_controller.ex
similarity index 74%
rename from lib/philomena_web/controllers/api/json/theme_controller.ex
rename to lib/philomena_web/controllers/theme_controller.ex
index d9e2c28f..e00289c4 100644
--- a/lib/philomena_web/controllers/api/json/theme_controller.ex
+++ b/lib/philomena_web/controllers/theme_controller.ex
@@ -1,4 +1,4 @@
-defmodule PhilomenaWeb.Api.Json.ThemeController do
+defmodule PhilomenaWeb.ThemeController do
   use PhilomenaWeb, :controller
 
   alias PhilomenaWeb.SettingView
diff --git a/lib/philomena_web/router.ex b/lib/philomena_web/router.ex
index a0744ac7..50b839f0 100644
--- a/lib/philomena_web/router.ex
+++ b/lib/philomena_web/router.ex
@@ -157,8 +157,6 @@ defmodule PhilomenaWeb.Router do
         resources "/posts", Forum.Topic.PostController, only: [:show, :index]
       end
     end
-
-    resources "/themes", ThemeController, only: [:index]
   end
 
   scope "/", PhilomenaWeb do
@@ -492,6 +490,8 @@ defmodule PhilomenaWeb.Router do
       resources "/tags", TagController, only: [:index]
     end
 
+    resources "/themes", ThemeController, only: [:index]
+
     resources "/tags", TagController, only: [:index, :show] do
       resources "/tag_changes", Tag.TagChangeController, only: [:index]
     end