diff --git a/html/plugins/users/style/user_tab.css b/html/plugins/users/style/user_tab.css
index cfa42b9c18e5ef418cd0a7b017d7508dd1f10182..d301f3b1be0bca2aee55bf9537f20921e9f0062c 100644
--- a/html/plugins/users/style/user_tab.css
+++ b/html/plugins/users/style/user_tab.css
@@ -1,7 +1,7 @@
 
 /* On big screens */
 @media (min-width: 640px) {
-  .plugin_section#perso img#jpegPhoto_img {
+  .plugin-section#perso img#jpegPhoto_img {
   position:absolute;
   left:5px;
   top:32px;
@@ -9,7 +9,7 @@
   max-height:80%;
   }
 
-  .plugin_section#perso > div > table {
+  .plugin-section#perso > div > table {
   padding-left:160px;
   }
 }
diff --git a/html/themes/breezy/menu.css b/html/themes/breezy/menu.css
index d91359689db5f6f031f9e530713fea565c465be8..3ce8f748c349b7833b61063ff729e716597d7908 100644
--- a/html/themes/breezy/menu.css
+++ b/html/themes/breezy/menu.css
@@ -33,7 +33,7 @@ padding-bottom: 5px;
 padding-top: 5px;
 border-style: solid;
 border-color: #c0c2c3;
-border-width: 0px 0px 1px;
+border-width: 0 0 1px;
 }
 
 ul.menu ul > li > a {
diff --git a/html/themes/breezy/plugin.css b/html/themes/breezy/plugin.css
index ae6f6a5555f8b215478674de53f8118cd75b918c..4c4c10ce88134743cde576d71ead881f2dbcbfeb 100644
--- a/html/themes/breezy/plugin.css
+++ b/html/themes/breezy/plugin.css
@@ -66,7 +66,7 @@ display: block;
 clear: both;
 }
 
-.plugin_section {
+.plugin-section {
 display: block;
 float: left;
 clear: left;
@@ -79,48 +79,48 @@ margin-bottom: 0.5%;
 margin-right: 0;
 position: relative;
 }
-html.rtl .plugin_section {
+html.rtl .plugin-section {
 float: right;
 clear: right;
 margin-left: 0;
 margin-right: 0.5%;
 }
 
-html.ltr .plugin_section:nth-child(even) {
+html.ltr .plugin-section:nth-child(even) {
 float: right;
 clear: right;
 margin-left: 0;
 margin-right: 0.5%;
 }
-html.rtl .plugin_section:nth-child(even) {
+html.rtl .plugin-section:nth-child(even) {
 float: left;
 clear: left;
 margin-left: 0.5%;
 margin-right: 0;
 }
 
-div.plugin_section {
+div.plugin-section {
 padding-top: 25px;
 }
 
-.plugin_section > div {
+.plugin-section > div {
 padding: 5px;
 }
 
-fieldset.plugin_section > div {
+fieldset.plugin-section > div {
 padding-top: 30px;
 }
 
-fieldset.plugin_section legend {
+fieldset.plugin-section legend {
 float: left;
 padding: 0;
 margin: 0;
 }
-html.rtl fieldset.plugin_section legend {
+html.rtl fieldset.plugin-section legend {
 float: right;
 }
 
-fieldset.plugin_section legend span, .plugin_section > span.legend {
+fieldset.plugin-section legend span, .plugin-section > span.legend {
 font-weight: bold;
 background-color: #e5e5e7;
 border: 1px solid #c0c2c3;
@@ -130,49 +130,49 @@ padding-bottom: 5px;
 text-align: center;
 display: block;
 }
-html.ltr fieldset.plugin_section legend span, html.ltr .plugin_section > span.legend {
+html.ltr fieldset.plugin-section legend span, html.ltr .plugin-section > span.legend {
 margin-left: -1px;
 }
-html.rtl fieldset.plugin_section legend span, html.rtl .plugin_section > span.legend {
+html.rtl fieldset.plugin-section legend span, html.rtl .plugin-section > span.legend {
 margin-right: -1px;
 }
 
-fieldset.plugin_section legend span {
+fieldset.plugin-section legend span {
 position: absolute;
 top: 0;
 margin-top: -1px;
 }
-html.ltr fieldset.plugin_section legend span {
+html.ltr fieldset.plugin-section legend span {
 left: 0;
 }
-html.rtl fieldset.plugin_section legend span {
+html.rtl fieldset.plugin-section legend span {
 right: 0;
 }
 
-.plugin_section > span.legend {
+.plugin-section > span.legend {
 margin-top: -26px;
 }
 
-fieldset.plugin_section legend img, .plugin_section span.legend img {
+fieldset.plugin-section legend img, .plugin-section span.legend img {
 vertical-align: middle;
 }
-html.ltr fieldset.plugin_section legend img, html.ltr .plugin_section span.legend img {
+html.ltr fieldset.plugin-section legend img, html.ltr .plugin-section span.legend img {
 margin-right: 3px;
 }
-html.rtl fieldset.plugin_section legend img, html.rtl .plugin_section span.legend img {
+html.rtl fieldset.plugin-section legend img, html.rtl .plugin-section span.legend img {
 margin-left: 3px;
 }
 
 
-fieldset.plugin_section select[multiple], fieldset.plugin_section textarea {
+fieldset.plugin-section select[multiple], fieldset.plugin-section textarea {
 width: 100%;
 }
 
-.plugin_section > div > table {
+.plugin-section > div > table {
 min-width: 80%;
 }
 
-html.ltr .plugin_section.fullwidth, html.rtl .plugin_section.fullwidth {
+html.ltr .plugin-section.fullwidth, html.rtl .plugin-section.fullwidth {
 float: none;
 clear: both;
 width: auto;
@@ -182,26 +182,26 @@ margin-bottom: 0.5%;
 margin-right: 0.5%;
 }
 
-html.ltr .plugin_section.alone, html.rtl .plugin_section.alone {
+html.ltr .plugin-section.alone, html.rtl .plugin-section.alone {
 float: none;
 clear: both;
 }
 
-html.ltr .plugin_section.invisible, html.rtl .plugin_section.invisible {
+html.ltr .plugin-section.invisible, html.rtl .plugin-section.invisible {
 display: none;
 }
 
-fieldset.plugin_section.critical legend span, .plugin_section.critical > span.legend {
+fieldset.plugin-section.critical legend span, .plugin-section.critical > span.legend {
 font-weight: bold;
 background-color: #BCF;
 }
 
-fieldset.plugin_section.critical legend span:after, .plugin_section.critical > span.legend:after {
+fieldset.plugin-section.critical legend span:after, .plugin-section.critical > span.legend:after {
 content: "   (editing this can break your LDAP)";
 color: #D00;
 }
 
-.plugin_section.critical > div {
+.plugin-section.critical > div {
 background-color: #DFEFFF;
 }
 
@@ -212,11 +212,11 @@ background-color: #DFEFFF;
   border: none;
   width: 100%;
   }
-  .plugin_section > div > table {
+  .plugin-section > div > table {
   width: 100%;
   }
-  html.ltr .plugin_section, html.ltr .plugin_section:nth-child(even), html.ltr .plugin_section.fullwidth,
-  html.rtl .plugin_section, html.rtl .plugin_section:nth-child(even), html.rtl .plugin_section.fullwidth
+  html.ltr .plugin-section, html.ltr .plugin-section:nth-child(even), html.ltr .plugin-section.fullwidth,
+  html.rtl .plugin-section, html.rtl .plugin-section:nth-child(even), html.rtl .plugin-section.fullwidth
   {
   display: block;
   float: none;
diff --git a/html/themes/breezy/setup.css b/html/themes/breezy/setup.css
index 4a1211280a3dd32af64f17d97284f0269dbdda15..ad1ca3d45f6f376ab94719ba8085c3940699df1e 100644
--- a/html/themes/breezy/setup.css
+++ b/html/themes/breezy/setup.css
@@ -17,35 +17,35 @@ padding: 2px 10px;
 vertical-align: middle;
 }
 
-#menucell.setup_navigation {
+#menucell.setup-navigation {
 width: 200px;
 }
 
 /* The box used for each setup step */
-#menucell.setup_navigation li.menuitem {
+#menucell.setup-navigation li.menuitem {
 text-decoration: none;
 padding-top: 8px;
 padding-bottom: 8px;
 margin-top: 5px;
 margin-bottom: 5px;
 }
-#menucell.setup_navigation li.menuitem > a {
+#menucell.setup-navigation li.menuitem > a {
 margin: 0;
 }
 
 /* An enabled setup step will use this style in navigation*/
-#menucell.setup_navigation li.menuitem.menucurrent a.navigation_title {
+#menucell.setup-navigation li.menuitem.menucurrent a.navigation-title {
 cursor: default;
 }
 
 /* Disabled setup steps */
-#menucell.setup_navigation li.menuitem.disabled a.navigation_title {
+#menucell.setup-navigation li.menuitem.disabled a.navigation-title {
 cursor: default;
 color: #C0C2C3;
 }
 
 /* Disabled setup steps */
-#menucell.setup_navigation li.menuitem a.navigation_title {
+#menucell.setup-navigation li.menuitem a.navigation-title {
 font-size: 1.2em;
 font-weight: bold;
 text-decoration: none;
@@ -55,20 +55,20 @@ padding-bottom: 3px;
 }
 
 /* The style for the info of an active setup */
-#menucell.setup_navigation li.menuitem a.navigation_info {
+#menucell.setup-navigation li.menuitem a.navigation_info {
 font-size: 1em;
 color: #31363b;
 margin: 0;
 cursor: default;
 }
-html.ltr #menucell.setup_navigation li.menuitem a.navigation_info {
+html.ltr #menucell.setup-navigation li.menuitem a.navigation_info {
 padding: 4px 4px 3px 15px;
 }
-html.rtl #menucell.setup_navigation li.menuitem a.navigation_info {
+html.rtl #menucell.setup-navigation li.menuitem a.navigation_info {
 padding: 4px 15px 3px 4px;
 }
 
-.setup_language select#lang_selected {
+.setup-language select#lang_selected {
 width: 100%;
 }
 
@@ -76,24 +76,24 @@ width: 100%;
   Setup step 2 styles
 */
 /* used to hide display info div */
-div.solution_visible {
+div.solution-visible {
 display: block;
 width: 100%;
 text-align: left;
 }
-html.rtl div.solution_visible {
+html.rtl div.solution-visible {
 text-align: right;
 }
 
 /* Container for name and status */
-div.step2_entry_container {
+div.step2-entry-container {
 padding: 3px;
 width: 99%;
 cursor: default;
 }
 
 /* Container for name and status, when status is failed */
-div.step2_entry_container_info {
+div.step2-entry-container-info {
 padding: 3px;
 border: 1px solid #C0C2C3;
 width: 99%;
@@ -101,23 +101,23 @@ cursor: default;
 }
 
 /* Text shown for each entry */
-div.step2_entry_name {
+div.step2-entry-name {
 float: left;
 padding-bottom: 4px;
 vertical-align: middle;
 }
-html.rtl div.step2_entry_name {
+html.rtl div.step2-entry-name {
 float: right;
 }
 
 /* Status container */
-div.step2_entry_status {
+div.step2-entry-status {
 float: none;
 text-align: right;
 padding-bottom: 4px;
 vertical-align: middle;
 }
-html.rtl div.step2_entry_status {
+html.rtl div.step2-entry-status {
 text-align: left;
 }
 
diff --git a/html/themes/legacy/menu.css b/html/themes/legacy/menu.css
index ceaa1cf9887317dbc719448d5a2613f58d69475d..74974dddd8722963a53334dd7ace455bdfab7809 100644
--- a/html/themes/legacy/menu.css
+++ b/html/themes/legacy/menu.css
@@ -115,7 +115,7 @@ max-width: 48px;
 h1.menuheader {
 margin: 0;
 padding: 10px;
-display: inline-block;
+display: block;
 border-bottom: 1px solid #AAAAAA;
 background-color: #DBE6C6;
 }
diff --git a/html/themes/legacy/plugin.css b/html/themes/legacy/plugin.css
index f787c86217295f51ce9bfd9b99220eea546c53e0..cfbbb0daba11bcc18cdad6c17ffa34dbe43fb58c 100644
--- a/html/themes/legacy/plugin.css
+++ b/html/themes/legacy/plugin.css
@@ -1,5 +1,4 @@
-.plugin-window
-{
+.plugin-window {
 vertical-align: top;
 text-align: justify;
 background-color:  white;
@@ -67,7 +66,7 @@ display: block;
 clear: both;
 }
 
-.plugin_section {
+.plugin-section {
 display: block;
 float: left;
 clear: left;
@@ -81,48 +80,48 @@ margin-bottom: 0.5%;
 margin-right: 0;
 position: relative;
 }
-html.rtl .plugin_section {
+html.rtl .plugin-section {
 float: right;
 clear: right;
 margin-left: 0;
 margin-right: 0.5%;
 }
 
-html.ltr .plugin_section:nth-child(even) {
+html.ltr .plugin-section:nth-child(even) {
 float: right;
 clear: right;
 margin-left: 0;
 margin-right: 0.5%;
 }
-html.rtl .plugin_section:nth-child(even) {
+html.rtl .plugin-section:nth-child(even) {
 float: left;
 clear: left;
 margin-left: 0.5%;
 margin-right: 0;
 }
 
-div.plugin_section {
+div.plugin-section {
 padding-top: 25px;
 }
 
-.plugin_section > div {
+.plugin-section > div {
 padding: 5px;
 }
 
-fieldset.plugin_section > div {
+fieldset.plugin-section > div {
 padding-top: 30px;
 }
 
-fieldset.plugin_section legend {
+fieldset.plugin-section legend {
 float: left;
 padding: 0;
 margin: 0;
 }
-html.rtl fieldset.plugin_section legend {
+html.rtl fieldset.plugin-section legend {
 float: right;
 }
 
-fieldset.plugin_section legend span, .plugin_section > span.legend {
+fieldset.plugin-section legend span, .plugin-section > span.legend {
 font-weight: bold;
 background-color: #DBE6C6;
 border: 1px solid #B0B0B0;
@@ -132,49 +131,49 @@ padding-bottom: 5px;
 text-align: center;
 display: block;
 }
-html.ltr fieldset.plugin_section legend span, html.ltr .plugin_section > span.legend {
+html.ltr fieldset.plugin-section legend span, html.ltr .plugin-section > span.legend {
 margin-left: -1px;
 }
-html.rtl fieldset.plugin_section legend span, html.rtl .plugin_section > span.legend {
+html.rtl fieldset.plugin-section legend span, html.rtl .plugin-section > span.legend {
 margin-right: -1px;
 }
 
-fieldset.plugin_section legend span {
+fieldset.plugin-section legend span {
 position: absolute;
 top: 0;
 margin-top: -1px;
 }
-html.ltr fieldset.plugin_section legend span {
+html.ltr fieldset.plugin-section legend span {
 left: 0;
 }
-html.rtl fieldset.plugin_section legend span {
+html.rtl fieldset.plugin-section legend span {
 right: 0;
 }
 
-.plugin_section > span.legend {
+.plugin-section > span.legend {
 margin-top: -26px;
 }
 
-fieldset.plugin_section legend img, .plugin_section span.legend img {
+fieldset.plugin-section legend img, .plugin-section span.legend img {
 vertical-align: middle;
 }
-html.ltr fieldset.plugin_section legend img, html.ltr .plugin_section span.legend img {
+html.ltr fieldset.plugin-section legend img, html.ltr .plugin-section span.legend img {
 margin-right: 3px;
 }
-html.rtl fieldset.plugin_section legend img, html.rtl .plugin_section span.legend img {
+html.rtl fieldset.plugin-section legend img, html.rtl .plugin-section span.legend img {
 margin-left: 3px;
 }
 
 
-fieldset.plugin_section select[multiple], fieldset.plugin_section textarea {
+fieldset.plugin-section select[multiple], fieldset.plugin-section textarea {
 width: 100%;
 }
 
-.plugin_section > div > table {
+.plugin-section > div > table {
 min-width: 80%;
 }
 
-html.ltr .plugin_section.fullwidth, html.rtl .plugin_section.fullwidth {
+html.ltr .plugin-section.fullwidth, html.rtl .plugin-section.fullwidth {
 float: none;
 clear: both;
 width: auto;
@@ -184,26 +183,26 @@ margin-bottom: 0.5%;
 margin-right: 0.5%;
 }
 
-html.ltr .plugin_section.alone, html.rtl .plugin_section.alone {
+html.ltr .plugin-section.alone, html.rtl .plugin-section.alone {
 float: none;
 clear: both;
 }
 
-html.ltr .plugin_section.invisible, html.rtl .plugin_section.invisible {
+html.ltr .plugin-section.invisible, html.rtl .plugin-section.invisible {
 display: none;
 }
 
-fieldset.plugin_section.critical legend span, .plugin_section.critical > span.legend {
+fieldset.plugin-section.critical legend span, .plugin-section.critical > span.legend {
 font-weight: bold;
 background-color: #BCF;
 }
 
-fieldset.plugin_section.critical legend span:after, .plugin_section.critical > span.legend:after {
+fieldset.plugin-section.critical legend span:after, .plugin-section.critical > span.legend:after {
 content: "   (editing this can break your LDAP)";
 color: #D00;
 }
 
-.plugin_section.critical > div {
+.plugin-section.critical > div {
 background-color: #DFEFFF;
 }
 
@@ -214,11 +213,11 @@ background-color: #DFEFFF;
   border: none;
   width: 100%;
   }
-  .plugin_section > div > table {
+  .plugin-section > div > table {
   width: 100%;
   }
-  html.ltr .plugin_section, html.ltr .plugin_section:nth-child(even), html.ltr .plugin_section.fullwidth,
-  html.rtl .plugin_section, html.rtl .plugin_section:nth-child(even), html.rtl .plugin_section.fullwidth
+  html.ltr .plugin-section, html.ltr .plugin-section:nth-child(even), html.ltr .plugin-section.fullwidth,
+  html.rtl .plugin-section, html.rtl .plugin-section:nth-child(even), html.rtl .plugin-section.fullwidth
   {
   display: block;
   float: none;
diff --git a/html/themes/legacy/setup.css b/html/themes/legacy/setup.css
index 52911ea175649247108a908b072dfb2c1558f65d..24215f238f94c3d400816fc6b01a6a049812e037 100644
--- a/html/themes/legacy/setup.css
+++ b/html/themes/legacy/setup.css
@@ -17,35 +17,35 @@ padding: 2px 10px;
 vertical-align: middle;
 }
 
-#menucell.setup_navigation {
+#menucell.setup-navigation {
 width: 200px;
 }
 
 /* The box used for each setup step */
-#menucell.setup_navigation li.menuitem {
+#menucell.setup-navigation li.menuitem {
 text-decoration: none;
 padding-top: 8px;
 padding-bottom: 8px;
 margin-top: 5px;
 margin-bottom: 5px;
 }
-#menucell.setup_navigation li.menuitem > a {
+#menucell.setup-navigation li.menuitem > a {
 margin: 0;
 }
 
 /* An enabled setup step will use this style in navigation*/
-#menucell.setup_navigation li.menuitem.menucurrent a.navigation_title {
+#menucell.setup-navigation li.menuitem.menucurrent a.navigation-title {
 cursor: default;
 }
 
 /* Disabled setup steps */
-#menucell.setup_navigation li.menuitem.disabled a.navigation_title {
+#menucell.setup-navigation li.menuitem.disabled a.navigation-title {
 cursor: default;
 color: #AAA;
 }
 
 /* Disabled setup steps */
-#menucell.setup_navigation li.menuitem a.navigation_title {
+#menucell.setup-navigation li.menuitem a.navigation-title {
 font-size: 1.2em;
 font-weight: bold;
 text-decoration: none;
@@ -55,20 +55,20 @@ padding-bottom: 3px;
 }
 
 /* The style for the info of an active setup */
-#menucell.setup_navigation li.menuitem a.navigation_info {
+#menucell.setup-navigation li.menuitem a.navigation_info {
 font-size: 1em;
 color: #000;
 margin: 0;
 cursor: default;
 }
-html.ltr #menucell.setup_navigation li.menuitem a.navigation_info {
+html.ltr #menucell.setup-navigation li.menuitem a.navigation_info {
 padding: 4px 4px 3px 15px;
 }
-html.rtl #menucell.setup_navigation li.menuitem a.navigation_info {
+html.rtl #menucell.setup-navigation li.menuitem a.navigation_info {
 padding: 4px 15px 3px 4px;
 }
 
-.setup_language select#lang_selected {
+.setup-language select#lang_selected {
 width: 100%;
 }
 
@@ -76,24 +76,24 @@ width: 100%;
   Setup step 2 styles
 */
 /* used to hide display info div */
-div.solution_visible {
+div.solution-visible {
 display: block;
 width: 100%;
 text-align: left;
 }
-html.rtl div.solution_visible {
+html.rtl div.solution-visible {
 text-align: right;
 }
 
 /* Container for name and status */
-div.step2_entry_container {
+div.step2-entry-container {
 padding: 3px;
 width: 99%;
 cursor: default;
 }
 
 /* Container for name and status, when status is failed */
-div.step2_entry_container_info {
+div.step2-entry-container-info {
 padding: 3px;
 border: 1px solid #AAA;
 width: 99%;
@@ -101,23 +101,23 @@ cursor: default;
 }
 
 /* Text shown for each entry */
-div.step2_entry_name {
+div.step2-entry-name {
 float: left;
 padding-bottom: 4px;
 vertical-align: middle;
 }
-html.rtl div.step2_entry_name {
+html.rtl div.step2-entry-name {
 float: right;
 }
 
 /* Status container */
-div.step2_entry_status {
+div.step2-entry-status {
 float: none;
 text-align: right;
 padding-bottom: 4px;
 vertical-align: middle;
 }
-html.rtl div.step2_entry_status {
+html.rtl div.step2-entry-status {
 text-align: left;
 }
 
diff --git a/ihtml/themes/breezy/simpleplugin_section.tpl b/ihtml/themes/breezy/simpleplugin_section.tpl
index e27c7385fd8c3321bf37beabab23d8d8b5bb6b01..0c9b525010bbf53f6717842dbdfdb8906449f241 100644
--- a/ihtml/themes/breezy/simpleplugin_section.tpl
+++ b/ihtml/themes/breezy/simpleplugin_section.tpl
@@ -1,4 +1,4 @@
-<fieldset id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<fieldset id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <legend><span>{$section}</span></legend>
   <div>
   <table>
diff --git a/plugins/addons/dashboard/groups_stats.tpl b/plugins/addons/dashboard/groups_stats.tpl
index 2869668ac6ddbdf1124e434c118c5a8ef7cadd53..10459eadf0f2abb8f32257c3ce3baf443b04f862 100644
--- a/plugins/addons/dashboard/groups_stats.tpl
+++ b/plugins/addons/dashboard/groups_stats.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}"  class="plugin_section">
+<div id="{$sectionId}"  class="plugin-section">
   <span class="legend">
     {$section}
   </span>
diff --git a/plugins/addons/dashboard/main_stats.tpl b/plugins/addons/dashboard/main_stats.tpl
index 9b34b12c1755d62db406aa57f2c843b5bca60aa3..336f09534baa692c7e95a51522bd83b63823654f 100644
--- a/plugins/addons/dashboard/main_stats.tpl
+++ b/plugins/addons/dashboard/main_stats.tpl
@@ -1,4 +1,4 @@
-<div class="plugin_section">
+<div class="plugin-section">
   <span class="legend">
     {t}Statistics{/t}
   </span>
diff --git a/plugins/addons/dashboard/users_accounts.tpl b/plugins/addons/dashboard/users_accounts.tpl
index 7f936105a483e391026b57f3de08133e390e66e7..fcb8f286284a29a58d280dc65e7ce1a5841d4c1d 100644
--- a/plugins/addons/dashboard/users_accounts.tpl
+++ b/plugins/addons/dashboard/users_accounts.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}"  class="plugin_section fullwidth">
+<div id="{$sectionId}"  class="plugin-section fullwidth">
   <span class="legend">
     {$section}
   </span>
diff --git a/plugins/addons/dashboard/users_stats.tpl b/plugins/addons/dashboard/users_stats.tpl
index 9ad688bb7e6d4eeeac5439f179260bb7e60b78f9..b158efd44a7ef0c664fc7f472f653ffb56ba4f3f 100644
--- a/plugins/addons/dashboard/users_stats.tpl
+++ b/plugins/addons/dashboard/users_stats.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}"  class="plugin_section">
+<div id="{$sectionId}"  class="plugin-section">
   <span class="legend">
     {$section}
   </span>
diff --git a/plugins/generic/references/contents.tpl b/plugins/generic/references/contents.tpl
index 2243e3968ff6f4155c0654f290b01fc17c296d9a..c4fec404ddad08c414f61fa63b98aab07c0fba71 100644
--- a/plugins/generic/references/contents.tpl
+++ b/plugins/generic/references/contents.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<div id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <span class="legend">
     {$section}
   </span>
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index ea42be777b5d54ce6ba7751765d7a94ee37795fc..ea157603fb532569a2b4d413ae475610f279f6a9 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -207,18 +207,18 @@ class setup
       if ($b_enabled) {
         if ($b_active) {
           $str .= '<li class="menuitem menucurrent" title="'.$s_description.'">';
-          $str .= '<a class="navigation_title">'.$s.$s_short_name.'</a>';
+          $str .= '<a class="navigation-title">'.$s.$s_short_name.'</a>';
           $str .= '<a class="navigation_info">'.$s_description.'</a>';
           $str .= '</li>';
         } else {
           $str .= '<li class="menuitem" title="'.$s_description.'">';
           $str .= '<a onClick="document.mainform.setup_goto_step.value=\''.$key.'\';document.mainform.submit();"
-            class="navigation_title">'.$s.$s_short_name.'</a>';
+            class="navigation-title">'.$s.$s_short_name.'</a>';
           $str .= '</li>';
         }
       } else {
         $str .= '<li class="menuitem disabled" title="'.$s_description.'">';
-        $str .= '<a class="navigation_title">'.$s.$s_short_name.'</a>';
+        $str .= '<a class="navigation-title">'.$s.$s_short_name.'</a>';
         $str .= '</li>';
       }
     }
diff --git a/setup/class_setupStep_Language.inc b/setup/class_setupStep_Language.inc
index cfd3e4cd7ff555400ca771ce779c13121de62f8a..088bff6e0ca91930189506c906153d40ce5324ab 100644
--- a/setup/class_setupStep_Language.inc
+++ b/setup/class_setupStep_Language.inc
@@ -28,7 +28,7 @@ class Step_Language extends setupStep
     return array(
       'lang' => array(
         'name'      => _('Preferred language'),
-        'class'     => array('fullwidth', 'setup_language'),
+        'class'     => array('fullwidth', 'setup-language'),
         'attrs'     => array(
           new DisplayAttribute(
             '', '',
diff --git a/setup/setup_checks.tpl b/setup/setup_checks.tpl
index 2479df2fd4ea4f90dd2ceb20ca07e9150e4d7a31..162887d9f7cb58d6c3cc45f6a4458d5031c159bf 100644
--- a/setup/setup_checks.tpl
+++ b/setup/setup_checks.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}" class="plugin_section">
+<div id="{$sectionId}" class="plugin-section">
   <span class="legend">
     {$section}
   </span>
@@ -10,15 +10,15 @@
         {if $val.SOLUTION != "" && !$val.RESULT}
 
           <!-- Add ability to display info popup -->
-          <div class='step2_entry_container_info' style='background-color:{cycle values="#F0F0F0, #FFF"}'>
+          <div class='step2-entry-container-info' style='background-color:{cycle values="#F0F0F0, #FFF"}'>
         {else}
 
           <!-- Normal entry everything is fine -->
-          <div class='step2_entry_container' style='background-color:{cycle values="#F0F0F0, #FFF"}'>
+          <div class='step2-entry-container' style='background-color:{cycle values="#F0F0F0, #FFF"}'>
         {/if}
 
-        <div class='step2_entry_name'>{$val.NAME}</div>
-        <div class='step2_entry_status'>
+        <div class='step2-entry-name'>{$val.NAME}</div>
+        <div class='step2-entry-status'>
 
         {if $val.RESULT}
           <div class='step2_successful'>{t}Ok{/t}</div>
@@ -31,7 +31,7 @@
           {if $val.SOLUTION != ""}
 
           <!-- Information popup -->
-          <div class='solution_visible' id='sol_{$key}'>
+          <div class='solution-visible' id='sol_{$key}'>
             {if $val.MUST}
               <div class='step2_failed_text' style="background-image: url('geticon.php?context=status&icon=dialog-error&size=16')">
               {$val.SOLUTION}<br/>
diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index ac8a2d6465803c74d8123010b9ed12c7aa38b1a1..0021498746e517968f464438633038b8476688d6 100644
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -20,7 +20,7 @@
       <tbody>
         <tr>
           <!-- Menu -->
-          <td id="menucell" class="setup_navigation">
+          <td id="menucell" class="setup-navigation">
             {$navigation}
             <br/>
           </td>
diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index fe194fdf5acf607472465baa301674e46dd63510..473fb07021b3e065cc99f7dd61d87812a2a0fd42 100644
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -1,4 +1,4 @@
-<div id="{$sectionId}" class="plugin_section{$sectionClasses}">
+<div id="{$sectionId}" class="plugin-section{$sectionClasses}">
   <span class="legend">
     {$section}
   </span>
@@ -11,13 +11,13 @@
         <div style="width:98%; padding:4px; background-color:{cycle values="#F0F0F0, #FFF"}">
           {if $check->error}
             <!-- Add ability to display info popup -->
-            <div class="step2_entry_container_info">
+            <div class="step2-entry-container-info">
           {else}
             <!-- Normal entry everything is fine -->
-            <div class="step2_entry_container">
+            <div class="step2-entry-container">
           {/if}
-          <div class="step2_entry_name"><b>{$check->title}</b></div>
-          <div class="step2_entry_status">
+          <div class="step2-entry-name"><b>{$check->title}</b></div>
+          <div class="step2-entry-status">
             {if $check->status}
               <div class="step2_successful">{$check->msg}</div>
             {else}
diff --git a/setup/setup_migrate_baseOC.tpl b/setup/setup_migrate_baseOC.tpl
index 1a320dbbce3c726bda8635f6dbfe06f346d0b83e..4a85846dff236694f76c63d6a5d104d290a971fc 100644
--- a/setup/setup_migrate_baseOC.tpl
+++ b/setup/setup_migrate_baseOC.tpl
@@ -3,14 +3,14 @@
     <h2>{t}Add required object classes to the LDAP base{/t}</h2>
 
     <b>{t}Current{/t}</b>
-    <div class="step2_entry_container_info">
+    <div class="step2-entry-container-info">
       <div style='padding-left:20px;'>
         <pre>{$infos.current}</pre>
       </div>
     </div>
     <br/>
     <b>{t}After migration{/t}</b>
-    <div class="step2_entry_container_info">
+    <div class="step2-entry-container-info">
       <div style='padding-left:20px;'>
         <pre>{$infos.target}</pre>
       </div>
diff --git a/setup/setup_migrate_gosaAccounts.tpl b/setup/setup_migrate_gosaAccounts.tpl
index 6094760c643ef347389dbf90819ba16bdd3ef26c..a2ebcdd4795042ad22aa069b060976d440c9fcfa 100644
--- a/setup/setup_migrate_gosaAccounts.tpl
+++ b/setup/setup_migrate_gosaAccounts.tpl
@@ -25,7 +25,7 @@
         <input type="checkbox" name="migrate_{$key}" checked="checked" id="migrate_{$key}"/>
         <label for="migrate_{$key}">{$entry.dn}</label>
         {if $entry.after != ""}
-          <div class="step2_entry_container_info">
+          <div class="step2-entry-container-info">
             {t}Current{/t}
             <div style="padding-left:20px;">
 <pre>
@@ -42,7 +42,7 @@ dn: {$entry.dn}
             </div>
           </div>
         {elseif $entry.ldif != ""}
-          <div class="step2_entry_container_info">
+          <div class="step2-entry-container-info">
             <div style="padding-left:20px;">
               <pre>{$entry.ldif}</pre>
             </div>