diff --git a/html/themes/breezy/menu.css b/html/themes/breezy/menu.css
index 3ce8f748c349b7833b61063ff729e716597d7908..c3737231aa9db1d025b613518b7de45c081d340f 100644
--- a/html/themes/breezy/menu.css
+++ b/html/themes/breezy/menu.css
@@ -164,13 +164,14 @@ background-color: #fcfcfc;
 
 /* On small screens */
 @media (max-width: 640px) {
-  .iconmenu {
+  html.ltr .iconmenu,
+  html.rtl .iconmenu {
   text-align: center;
   margin: 2px;
   padding: 2px;
   min-width: 70px;
   min-height: 80px;
-  display: inline-block;
+  display: block;
   }
   .iconmenu .imgcontainer {
   margin: auto;
diff --git a/html/themes/breezy/plugin.css b/html/themes/breezy/plugin.css
index 4c4c10ce88134743cde576d71ead881f2dbcbfeb..c0ab12b52ca84bcb5d18d8aacffcc11239b0daba 100644
--- a/html/themes/breezy/plugin.css
+++ b/html/themes/breezy/plugin.css
@@ -1,5 +1,4 @@
-.plugin-window
-{
+.plugin-window {
 vertical-align: top;
 text-align: justify;
 background-color: #f3f4f4;
@@ -216,8 +215,7 @@ background-color: #DFEFFF;
   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.rtl .plugin-section, html.rtl .plugin-section:nth-child(even), html.rtl .plugin-section.fullwidth {
   display: block;
   float: none;
   clear: both;
diff --git a/html/themes/breezy/printer.css b/html/themes/breezy/printer.css
index e33376af0ec8a6b1ddfaedeb631b5616393c8a43..88ed4b5b06a6b32db8b5ec3af948386062cf8c19 100644
--- a/html/themes/breezy/printer.css
+++ b/html/themes/breezy/printer.css
@@ -15,6 +15,6 @@ display: none;
 width: 100%;
 }
 
-div.setup_header {
+div.setup-header {
 display: none;
 }
diff --git a/html/themes/breezy/setup.css b/html/themes/breezy/setup.css
index ad1ca3d45f6f376ab94719ba8085c3940699df1e..435aaf72925a0a254fb069e2e10176dfce8901c8 100644
--- a/html/themes/breezy/setup.css
+++ b/html/themes/breezy/setup.css
@@ -55,16 +55,16 @@ 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;
 }
 
@@ -122,41 +122,41 @@ text-align: left;
 }
 
 /* Status failed */
-div.step2_failed {
+div.step2-failed {
 color: red;
 padding-bottom: 4px;
 }
 
 /* Status failed but not necessary for setup */
-div.step2_warning {
+div.step2-warning {
 color: orange;
 padding-bottom: 4px;
 }
 
 /* Status successful */
-div.step2_successful {
+div.step2-successful {
 color: green;
 }
 
 /* Text used in info div. */
-div.step2_failed_text {
+div.step2-failed-text {
 background-repeat: no-repeat;
 }
-html.ltr div.step2_failed_text {
+html.ltr div.step2-failed-text {
 padding-left: 25px;
 }
-html.rtl div.step2_failed_text {
+html.rtl div.step2-failed-text {
 padding-right: 25px;
 }
 
 /* Text used in info div. On warnings */
-div.step2_warning_text {
+div.step2-warning-text {
 background-repeat: no-repeat;
 }
-html.ltr div.step2_warning_text {
+html.ltr div.step2-warning-text {
 padding-left: 25px;
 }
-html.rtl div.step2_warning_text {
+html.rtl div.step2-warning-text {
 padding-right: 25px;
 }
 
diff --git a/html/themes/breezy/style.css b/html/themes/breezy/style.css
index d0102c59c1f402b698b99e354b86b72e29b56e1f..cb0bbeb605404730e0ebd219765fc8ba34a18a0e 100644
--- a/html/themes/breezy/style.css
+++ b/html/themes/breezy/style.css
@@ -504,7 +504,7 @@ span.mark {
 color: #B22;
 }
 
-#debug_handling {
+#debug-handling {
 border-color: #ddd;
 }
 .error, .notice, .success, .info {
@@ -586,11 +586,11 @@ div#header-left img {
 vertical-align: middle;
 }
 
-html.ltr div#header-left img#fd_logo {
+html.ltr div#header-left img#fd-logo {
 padding-left: 2px;
 padding-right: 25px;
 }
-html.rtl div#header-left img#fd_logo {
+html.rtl div#header-left img#fd-logo {
 padding-left: 25px;
 padding-right: 2px;
 }
@@ -618,7 +618,7 @@ font-size: 20px;
 }
 
 /* Header col */
-div.setup_header {
+div.setup-header {
 background-color: #eff0f1;
 padding: 4px 5px 4px;
 color: #31363b;
@@ -626,7 +626,7 @@ color: #31363b;
 
 /* On small screens */
 @media (max-width: 640px) {
-  div.setup_header {
+  div.setup-header {
   padding: 2px;
   height: 36px;
   }
@@ -701,8 +701,7 @@ color: #31363b;
   width: 100%;
   border-spacing: 0;
   }
-  table.framework #maincell
-  {
+  table.framework #maincell {
   padding-bottom: 55px;
   }
 }
diff --git a/html/themes/breezy/tabs.css b/html/themes/breezy/tabs.css
index c9f508cc12edbbf1131fd75281fdb901f49114d3..3f1f123f314525bf5250b077a10eb1a255a0c44b 100644
--- a/html/themes/breezy/tabs.css
+++ b/html/themes/breezy/tabs.css
@@ -1,4 +1,4 @@
-table.tabs_header {
+table.tabs-header {
 width: 100%;
 border: none;
 border-spacing: 0;
@@ -10,17 +10,17 @@ font-weight: bold;
 }
 
 /* tabs header */
-table.tabs_header > tbody > tr > td {
+table.tabs-header > tbody > tr > td {
 padding: 0;
 vertical-align: bottom;
 white-space: nowrap;
 width: 1px;
 }
-table.tabs_header > tbody > tr > td:last-child {
+table.tabs-header > tbody > tr > td:last-child {
 width: auto;
 }
 
-table.tabs_header > tbody > tr > td > div > a {
+table.tabs-header > tbody > tr > td > div > a {
 display: inline-block;
 border-radius: 5px 5px 0 0;
 text-align: center;
@@ -33,13 +33,13 @@ padding-right: 8px;
 padding-bottom: 5px;
 transition: margin .4s ease, padding .4s ease;
 }
-table.tabs_header > tbody > tr > td > div > a:hover {
+table.tabs-header > tbody > tr > td > div > a:hover {
 margin-top: 0;
 padding-top: 2px;
 padding-bottom: 7px;
 }
 
-table.tabs_header > tbody > tr > td > div.tab_active > a {
+table.tabs-header > tbody > tr > td > div.tab-active > a {
 background-color: #f8f8f8;
 border-bottom: 0;
 margin-top: 2px;
@@ -47,52 +47,52 @@ padding-top: 2px;
 padding-bottom: 8px;
 }
 
-table.tabs_header > tbody > tr > td > div.tab_inactive > a {
+table.tabs-header > tbody > tr > td > div.tab-inactive > a {
 color: grey;
 font-weight: normal;
 }
 
-table.tabs_header > tbody > tr > td > div.tab_disabled > a {
+table.tabs-header > tbody > tr > td > div.tab-disabled > a {
 color: grey;
 }
-table.tabs_header > tbody > tr > td > div.tab_disabled > a:hover {
+table.tabs-header > tbody > tr > td > div.tab-disabled > a:hover {
 margin-top: 5px;
 padding-top: 1px;
 padding-bottom: 5px;
 }
 
-table.tabs_header > tbody > tr > td > div.tab_notify > a {
+table.tabs-header > tbody > tr > td > div.tab-notify > a {
 background-image: url(../../geticon.php?context=status&icon=dialog-information&size=16);
 background-repeat: no-repeat;
 background-position: 1px 1px;
 }
-html.ltr table.tabs_header > tbody > tr > td > div.tab_notify > a {
+html.ltr table.tabs-header > tbody > tr > td > div.tab-notify > a {
 padding-left: 18px;
 }
-html.rtl table.tabs_header > tbody > tr > td > div.tab_notify > a {
+html.rtl table.tabs-header > tbody > tr > td > div.tab-notify > a {
 padding-right: 18px;
 }
 
-html.ltr table.tabs_header > tbody > tr > td > div.tab_left > a {
+html.ltr table.tabs-header > tbody > tr > td > div.tab-left > a {
 border-right-width: 0;
 }
-html.rtl table.tabs_header > tbody > tr > td > div.tab_left > a {
+html.rtl table.tabs-header > tbody > tr > td > div.tab-left > a {
 border-left-width: 0;
 }
 
-html.ltr table.tabs_header > tbody > tr > td > div.tab_right > a {
+html.ltr table.tabs-header > tbody > tr > td > div.tab-right > a {
 border-left-width: 0;
 }
-html.rtl table.tabs_header > tbody > tr > td > div.tab_right > a {
+html.rtl table.tabs-header > tbody > tr > td > div.tab-right > a {
 border-right-width: 0;
 }
 
-table.tabs_header > tbody > tr > td > div.tab_border {
+table.tabs-header > tbody > tr > td > div.tab-border {
 border-bottom: 1px solid #999;
 }
 
 /* tabs content */
-div.tab_content {
+div.tab-content {
 padding: 4px;
 width: auto;
 background-color: #F8F8F8;
diff --git a/html/themes/legacy/printer.css b/html/themes/legacy/printer.css
index e33376af0ec8a6b1ddfaedeb631b5616393c8a43..88ed4b5b06a6b32db8b5ec3af948386062cf8c19 100644
--- a/html/themes/legacy/printer.css
+++ b/html/themes/legacy/printer.css
@@ -15,6 +15,6 @@ display: none;
 width: 100%;
 }
 
-div.setup_header {
+div.setup-header {
 display: none;
 }
diff --git a/html/themes/legacy/setup.css b/html/themes/legacy/setup.css
index 24215f238f94c3d400816fc6b01a6a049812e037..d31f72359b0f6eeffe26e0cca0810cbc2884fb0b 100644
--- a/html/themes/legacy/setup.css
+++ b/html/themes/legacy/setup.css
@@ -55,16 +55,16 @@ 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;
 }
 
@@ -122,41 +122,41 @@ text-align: left;
 }
 
 /* Status failed */
-div.step2_failed {
+div.step2-failed {
 color: red;
 padding-bottom: 4px;
 }
 
 /* Status failed but not necessary for setup */
-div.step2_warning {
+div.step2-warning {
 color: orange;
 padding-bottom: 4px;
 }
 
 /* Status successful */
-div.step2_successful {
+div.step2-successful {
 color: green;
 }
 
 /* Text used in info div. */
-div.step2_failed_text {
+div.step2-failed-text {
 background-repeat: no-repeat;
 }
-html.ltr div.step2_failed_text {
+html.ltr div.step2-failed-text {
 padding-left: 25px;
 }
-html.rtl div.step2_failed_text {
+html.rtl div.step2-failed-text {
 padding-right: 25px;
 }
 
 /* Text used in info div. On warnings */
-div.step2_warning_text {
+div.step2-warning-text {
 background-repeat: no-repeat;
 }
-html.ltr div.step2_warning_text {
+html.ltr div.step2-warning-text {
 padding-left: 25px;
 }
-html.rtl div.step2_warning_text {
+html.rtl div.step2-warning-text {
 padding-right: 25px;
 }
 
diff --git a/html/themes/legacy/style.css b/html/themes/legacy/style.css
index 5f991a655ddef4de8021718180211f50bb9a2139..3b06d336243196b4d739e8e97f0aef346828ce80 100644
--- a/html/themes/legacy/style.css
+++ b/html/themes/legacy/style.css
@@ -493,7 +493,7 @@ span.mark {
 color: #B22;
 }
 
-#debug_handling {
+#debug-handling {
 border-color: #ddd;
 }
 .error, .notice, .success, .info {
@@ -576,11 +576,11 @@ div#header-left img {
 vertical-align: middle;
 }
 
-html.ltr div#header-left img#fd_logo {
+html.ltr div#header-left img#fd-logo {
 padding-left: 2px;
 padding-right: 25px;
 }
-html.rtl div#header-left img#fd_logo {
+html.rtl div#header-left img#fd-logo {
 padding-left: 25px;
 padding-right: 2px;
 }
@@ -608,7 +608,7 @@ font-size: 20px;
 }
 
 /* Header col */
-div.setup_header {
+div.setup-header {
 background-color: #bbcc99;
 padding: 4px 5px 2px;
 color: #000;
@@ -616,7 +616,7 @@ color: #000;
 
 /* On small screens */
 @media (max-width: 640px) {
-  div.setup_header {
+  div.setup-header {
   padding: 2px;
   height: 36px;
   }
diff --git a/html/themes/legacy/tabs.css b/html/themes/legacy/tabs.css
index 343394254758acf991319b80b02b54bcf4dbf8d8..d4fd403b9e4da4a4a1492a9b5af6709ec4cc5990 100644
--- a/html/themes/legacy/tabs.css
+++ b/html/themes/legacy/tabs.css
@@ -1,4 +1,4 @@
-table.tabs_header {
+table.tabs-header {
 width: 100%;
 border: none;
 border-spacing: 0px;
@@ -10,17 +10,17 @@ font-weight: bold;
 }
 
 /* tabs header */
-table.tabs_header > tbody > tr > td {
+table.tabs-header > tbody > tr > td {
 padding: 0;
 vertical-align: bottom;
 white-space: nowrap;
 width: 1px;
 }
-table.tabs_header > tbody > tr > td:last-child {
+table.tabs-header > tbody > tr > td:last-child {
 width: auto;
 }
 
-table.tabs_header > tbody > tr > td > div > a {
+table.tabs-header > tbody > tr > td > div > a {
 display: inline-block;
 border-radius: 5px 5px 0 0;
 text-align: center;
@@ -33,13 +33,13 @@ padding-right: 8px;
 padding-bottom: 5px;
 transition: margin .4s ease, padding .4s ease;
 }
-table.tabs_header > tbody > tr > td > div > a:hover {
+table.tabs-header > tbody > tr > td > div > a:hover {
 margin-top: 0;
 padding-top: 2px;
 padding-bottom: 7px;
 }
 
-table.tabs_header > tbody > tr > td > div.tab_active > a {
+table.tabs-header > tbody > tr > td > div.tab-active > a {
 background-color: #f8f8f8;
 border-bottom: 0;
 margin-top: 2px;
@@ -47,52 +47,52 @@ padding-top: 2px;
 padding-bottom: 8px;
 }
 
-table.tabs_header > tbody > tr > td > div.tab_inactive > a {
+table.tabs-header > tbody > tr > td > div.tab-inactive > a {
 color: grey;
 font-weight: normal;
 }
 
-table.tabs_header > tbody > tr > td > div.tab_disabled > a {
+table.tabs-header > tbody > tr > td > div.tab-disabled > a {
 color: grey;
 }
-table.tabs_header > tbody > tr > td > div.tab_disabled > a:hover {
+table.tabs-header > tbody > tr > td > div.tab-disabled > a:hover {
 margin-top: 5px;
 padding-top: 1px;
 padding-bottom: 5px;
 }
 
-table.tabs_header > tbody > tr > td > div.tab_notify > a {
+table.tabs-header > tbody > tr > td > div.tab-notify > a {
 background-image: url(../../geticon.php?context=status&icon=dialog-information&size=16);
 background-repeat: no-repeat;
 background-position: 1px 1px;
 }
-html.ltr table.tabs_header > tbody > tr > td > div.tab_notify > a {
+html.ltr table.tabs-header > tbody > tr > td > div.tab-notify > a {
 padding-left: 18px;
 }
-html.rtl table.tabs_header > tbody > tr > td > div.tab_notify > a {
+html.rtl table.tabs-header > tbody > tr > td > div.tab-notify > a {
 padding-right: 18px;
 }
 
-html.ltr table.tabs_header > tbody > tr > td > div.tab_left > a {
+html.ltr table.tabs-header > tbody > tr > td > div.tab-left > a {
 border-right-width: 0;
 }
-html.rtl table.tabs_header > tbody > tr > td > div.tab_left > a {
+html.rtl table.tabs-header > tbody > tr > td > div.tab-left > a {
 border-left-width: 0;
 }
 
-html.ltr table.tabs_header > tbody > tr > td > div.tab_right > a {
+html.ltr table.tabs-header > tbody > tr > td > div.tab-right > a {
 border-left-width: 0;
 }
-html.rtl table.tabs_header > tbody > tr > td > div.tab_right > a {
+html.rtl table.tabs-header > tbody > tr > td > div.tab-right > a {
 border-right-width: 0;
 }
 
-table.tabs_header > tbody > tr > td > div.tab_border {
+table.tabs-header > tbody > tr > td > div.tab-border {
 border-bottom: 1px solid #999;
 }
 
 /* tabs content */
-div.tab_content {
+div.tab-content {
 padding: 4px;
 width: auto;
 background-color: #F8F8F8;
diff --git a/ihtml/themes/breezy/framework.tpl b/ihtml/themes/breezy/framework.tpl
index 418219353fa9b0024f7b3498184707c21169e01f..d1061fe2821622203d72f5cd9a4e8a4f95ec1a95 100644
--- a/ihtml/themes/breezy/framework.tpl
+++ b/ihtml/themes/breezy/framework.tpl
@@ -3,9 +3,9 @@
   {$game_screen}
   {$php_errors}
   <form action="main.php{$plug}" name="mainform" id="mainform" method="post" enctype="multipart/form-data">
-    <div class="setup_header">
+    <div class="setup-header">
       <div id="header-left">
-        <img id="fd_logo" class="optional" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory"/>
+        <img id="fd-logo" class="optional" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory"/>
         <a class="maintitlebar" href="main.php?reset=1">
           <img src="geticon.php?context=actions&amp;icon=go-home&amp;size=22" alt="Main"/>&nbsp;{t}Main{/t}
         </a>
diff --git a/ihtml/themes/breezy/setup_header.tpl b/ihtml/themes/breezy/setup_header.tpl
index ca9320f1d27969b8d532e85a00a60ada6ebddd4f..de0450960fd8db43fa4b693506432677f05b2f38 100644
--- a/ihtml/themes/breezy/setup_header.tpl
+++ b/ihtml/themes/breezy/setup_header.tpl
@@ -1,6 +1,6 @@
-<div class="setup_header">
+<div class="setup-header">
   <div id="header-left">
-    <img id="fd_logo" class="optional" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory"/>
+    <img id="fd-logo" class="optional" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory"/>
   </div>
   <div id="header-right">
     <div class="version">
diff --git a/include/functions.inc b/include/functions.inc
index fb204f3fcd44ccc916129f4c855e5b570e7ad50b..dea768df5fd2a499a1b298df8eb16893e6af1bf6 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -250,7 +250,7 @@ function DEBUG($level, $line, $function, $file, $data, $info = '')
   }
   if (session::global_get('DEBUGLEVEL') & $level) {
     if ($first) {
-      echo '<div id="debug_handling" class="notice">'.
+      echo '<div id="debug-handling" class="notice">'.
             '<img src="geticon.php?context=status&amp;icon=dialog-information&amp;size=22" alt="info icon" style="vertical-align:middle;margin-right:.2em;"/>'.
             'There is some debug output '.
             '<button onClick="javascript:$$(\'div.debug_div\').each(function (a) { a.toggle(); });">Toggle</button>'.
diff --git a/include/simpleplugin/class_simpleTabs.inc b/include/simpleplugin/class_simpleTabs.inc
index 8fc27d5041ef1ee6b9e7048830cdb970025b9307..571f21f465624a13b9b4ba0e6da34aa3d16e1535 100644
--- a/include/simpleplugin/class_simpleTabs.inc
+++ b/include/simpleplugin/class_simpleTabs.inc
@@ -184,7 +184,7 @@ class simpleTabs
     unset($obj);
 
     /* Show object */
-    $display = '<div class="tab_content">'."\n";
+    $display = '<div class="tab-content">'."\n";
 
     $display .= $this->by_object[$this->current]->execute();
 
@@ -231,16 +231,16 @@ class simpleTabs
     if (!$disabled) {
       $display .= '<input type="hidden" name="arg" value=""/>';
     }
-    $display  .= '<table class="tabs_header"><tbody><tr>';
+    $display  .= '<table class="tabs-header"><tbody><tr>';
     $index    = 0;
-    $style    = array('tab_left', 'tab_active', 'tab_right');
+    $style    = array('tab-left', 'tab-active', 'tab-right');
     foreach ($this->by_name as $class => $name) {
 
-      /* Activate right tabs with style "tab_right" */
+      /* Activate right tabs with style "tab-right" */
       if ($index == 1) {
         $index++;
       } elseif ($class == $this->current) {
-        /* Activate current tab with style "tab_active " */
+        /* Activate current tab with style "tab-active " */
         $index++;
       }
 
@@ -261,13 +261,13 @@ class simpleTabs
       /* Take care about notifications */
       $obj = $this->by_object[$class];
       if ($this->by_object[$class]->pl_notify && ($obj->is_account || $obj->ignore_account)) {
-        $cssClasses .= ' tab_notify';
+        $cssClasses .= ' tab-notify';
       }
       if ($disabled) {
-        $cssClasses .= ' tab_disabled';
+        $cssClasses .= ' tab-disabled';
       }
       if (!$obj->is_account && !$obj->ignore_account) {
-        $cssClasses .= ' tab_inactive';
+        $cssClasses .= ' tab-inactive';
       }
 
 
@@ -284,7 +284,7 @@ class simpleTabs
     }
 
     $display .= "<td>\n";
-    $display .= '<div class="tab_border">&nbsp;</div></td></tr></tbody></table>';
+    $display .= '<div class="tab-border">&nbsp;</div></td></tr></tbody></table>';
 
     return $display;
   }
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index ea157603fb532569a2b4d413ae475610f279f6a9..a0593e5a7a81ca07d68cabf7c2d033f5457b2cb3 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -208,7 +208,7 @@ class setup
         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_info">'.$s_description.'</a>';
+          $str .= '<a class="navigation-info">'.$s_description.'</a>';
           $str .= '</li>';
         } else {
           $str .= '<li class="menuitem" title="'.$s_description.'">';
diff --git a/setup/setup_checks.tpl b/setup/setup_checks.tpl
index 162887d9f7cb58d6c3cc45f6a4458d5031c159bf..80776db1c243919eb69e191e9c62e2353ef1bdf7 100644
--- a/setup/setup_checks.tpl
+++ b/setup/setup_checks.tpl
@@ -21,23 +21,23 @@
         <div class='step2-entry-status'>
 
         {if $val.RESULT}
-          <div class='step2_successful'>{t}Ok{/t}</div>
+          <div class='step2-successful'>{t}Ok{/t}</div>
         {else}
           {if $val.MUST}
-            <div class='step2_failed'>{t}Error{/t}</div>
+            <div class='step2-failed'>{t}Error{/t}</div>
           {else}
-            <div class='step2_warning'>{t}Warning{/t}</div>
+            <div class='step2-warning'>{t}Warning{/t}</div>
           {/if}
           {if $val.SOLUTION != ""}
 
           <!-- Information popup -->
           <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')">
+              <div class='step2-failed-text' style="background-image: url('geticon.php?context=status&icon=dialog-error&size=16')">
               {$val.SOLUTION}<br/>
               <b>{t}FusionDirectory will NOT run without fixing this.{/t}</b>
             {else}
-              <div class="step2_warning_text" style="background-image: url('geticon.php?context=status&icon=dialog-warning&size=16')">
+              <div class="step2-warning-text" style="background-image: url('geticon.php?context=status&icon=dialog-warning&size=16')">
               {$val.SOLUTION}<br/>
               <b>{t}FusionDirectory will run without fixing this.{/t}</b>
             {/if}
diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl
index 0021498746e517968f464438633038b8476688d6..071f5365c7636c16143a1b124394f27cb7a7bd75 100644
--- a/setup/setup_frame.tpl
+++ b/setup/setup_frame.tpl
@@ -2,9 +2,9 @@
 <body class="setup">
   {$php_errors}
   <form action="setup.php" name="mainform" id="mainform" method="post" enctype="multipart/form-data">
-    <div class="setup_header">
+    <div class="setup-header">
       <div id="header-left">
-        <img id="fd_logo" class="optional" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory"/>
+        <img id="fd-logo" class="optional" src="geticon.php?context=applications&amp;icon=fusiondirectory&amp;size=48" alt="FusionDirectory"/>
         <a class="plugtop">
           <img src="{$headline_image|escape}" alt="{t}{$headline}{/t}"/>{t}{$headline}{/t}
         </a>
diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index 473fb07021b3e065cc99f7dd61d87812a2a0fd42..346595123a707c7d598b5513d5283c4f38eb940f 100644
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -19,9 +19,9 @@
           <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>
+              <div class="step2-successful">{$check->msg}</div>
             {else}
-              <div class="step2_failed">{$check->msg}</div>
+              <div class="step2-failed">{$check->msg}</div>
             {/if}
           </div>
             {if $check->error}