diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js
index 1c11545a36..9d72414a03 100644
--- a/apps/common/main/lib/controller/Themes.js
+++ b/apps/common/main/lib/controller/Themes.js
@@ -259,7 +259,7 @@ define([
 
             setTheme: function (id, force) {
                 if ( (this.currentThemeId() != id || force) && !!themes_map[id] ) {
-                    var classname = document.body.className.replace(/theme-\w+\s?/, '');
+                    var classname = document.body.className.replace(/theme-[\w-]+\s?/, '');
                     document.body.className = classname;
 
                     $('body').addClass(id);