diff --git a/CHANGELOG.md b/CHANGELOG.md
index c16731346..15ae281d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 * **Build 125** (2014-07-xx)
+  - Added new Theme picker to the backend via Settings > Front-end theme
   - New shorthand method for `$this->getClassExtension('Backend.Behaviors.FormController')` becomes `$this->asExtension('FormController')`.
   - Buttons inside a popup support new `data-popup-load-indicator` attribute.
 
diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php
index ffa48de90..fede08556 100644
--- a/modules/cms/ServiceProvider.php
+++ b/modules/cms/ServiceProvider.php
@@ -111,7 +111,7 @@ class ServiceProvider extends ModuleServiceProvider
                     'description' => 'cms::lang.theme.settings_menu_description',
                     'category'    => 'CMS',
                     'icon'        => 'icon-picture-o',
-                    'url'         => Backend::URL('cms/theme'),
+                    'url'         => Backend::URL('cms/themes'),
                     'order'       => 200
                 ]
             ]);
diff --git a/modules/cms/controllers/Theme.php b/modules/cms/controllers/Themes.php
similarity index 95%
rename from modules/cms/controllers/Theme.php
rename to modules/cms/controllers/Themes.php
index 32ee05ad7..1fabb4f48 100644
--- a/modules/cms/controllers/Theme.php
+++ b/modules/cms/controllers/Themes.php
@@ -14,7 +14,7 @@ use Cms\Classes\Theme as CmsTheme;
  * @author Alexey Bobkov, Samuel Georges
  *
  */
-class Theme extends Controller
+class Themes extends Controller
 {
     public $requiredPermissions = ['cms.manage_themes'];
 
@@ -35,7 +35,7 @@ class Theme extends Controller
 
     public function index()
     {
-        
+
     }
 
     public function index_onSetActiveTheme()
diff --git a/modules/cms/controllers/theme/_theme_list.htm b/modules/cms/controllers/themes/_theme_list.htm
similarity index 100%
rename from modules/cms/controllers/theme/_theme_list.htm
rename to modules/cms/controllers/themes/_theme_list.htm
diff --git a/modules/cms/controllers/theme/index.htm b/modules/cms/controllers/themes/index.htm
similarity index 100%
rename from modules/cms/controllers/theme/index.htm
rename to modules/cms/controllers/themes/index.htm