diff --git a/html/main.php b/html/main.php
index f0c5ac8b9fed62da076cb44278da9f1aaf59be45..63bfb3ef7b829a3508a8803aba1fada28cdc53e0 100644
--- a/html/main.php
+++ b/html/main.php
@@ -249,7 +249,7 @@ if ($error_collector != "") {
   $smarty->assign("php_errors", "");
 }
 
-$focus = '<script type="text/javascript">';
+$focus = '<script>';
 $focus .= 'next_msg_dialog();';
 $focus .= '</script>';
 $smarty->assign('focus',      $focus);
diff --git a/html/setup.php b/html/setup.php
index 093ba5a36b498cfc0a0f4b97dea189300823e583..305a076c617969af38e4de55947f5f5c544a1094 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -116,7 +116,7 @@ setup::mainInc();
  * @var string $display filled by setup::mainInc
  */
 
-$focus = '<script type="text/javascript">';
+$focus = '<script>';
 $focus .= 'next_msg_dialog();';
 $focus .= '</script>';
 
diff --git a/ihtml/themes/breezy/baseselector.tpl b/ihtml/themes/breezy/baseselector.tpl
index 1e5a45caea7db924976699d10992e45c10954e20..27365dbd9c664381aac2ef11eb1cc3792102c532 100644
--- a/ihtml/themes/breezy/baseselector.tpl
+++ b/ihtml/themes/breezy/baseselector.tpl
@@ -10,7 +10,7 @@
   value="{$currentValue|escape}"/>
 
 <div id="autocomplete_{$pid}" class="autocomplete"></div>
-<script type="text/javascript">
+<script>
   new Ajax.Autocompleter('{$htmlid}', 'autocomplete_{$pid}', 'autocomplete.php?type=base', { minChars: 3, frequency: 0.5 });
   {if $submitButton}
     $('{$htmlid}').observe(
diff --git a/ihtml/themes/breezy/framework.tpl b/ihtml/themes/breezy/framework.tpl
index 9b039f79826cee49caa09a19c1f72831e4d0287e..7549810bb6c393c408141103c8d12af2ed9ad90e 100644
--- a/ihtml/themes/breezy/framework.tpl
+++ b/ihtml/themes/breezy/framework.tpl
@@ -57,7 +57,7 @@
 
 
   <!-- Automatic logout when session is expired -->
-  <script type="text/javascript">
+  <script>
   {literal}
    function logout()
    {
diff --git a/ihtml/themes/breezy/headers.tpl b/ihtml/themes/breezy/headers.tpl
index 4c19b263a2c4a004e34342a5544fb200b7b5443d..979c619fcb8554a94d1a924fc22834dcb2b1c584 100644
--- a/ihtml/themes/breezy/headers.tpl
+++ b/ihtml/themes/breezy/headers.tpl
@@ -15,19 +15,19 @@
 
   <link rel="shortcut icon" href="favicon.ico"/>
 
-  <script src="include/prototype.js" type="text/javascript"></script>
-  <script src="include/fusiondirectory.js" type="text/javascript"></script>
+  <script src="include/prototype.js"></script>
+  <script src="include/fusiondirectory.js"></script>
 {if $usePrototype == 'true'}
-  <script src="include/scriptaculous.js" type="text/javascript"></script>
-  <script src="include/builder.js" type="text/javascript"></script>
-  <script src="include/effects.js" type="text/javascript"></script>
-  <script src="include/dragdrop.js" type="text/javascript"></script>
-  <script src="include/controls.js" type="text/javascript"></script>
-  <script src="include/pulldown.js" type="text/javascript"></script>
+  <script src="include/scriptaculous.js"></script>
+  <script src="include/builder.js"></script>
+  <script src="include/effects.js"></script>
+  <script src="include/dragdrop.js"></script>
+  <script src="include/controls.js"></script>
+  <script src="include/pulldown.js"></script>
 {/if}
-  <script src="include/tsorter.js" type="text/javascript"></script>
+  <script src="include/tsorter.js"></script>
 {foreach from=$js_files item=file}
-  <script src="{$file}" type="text/javascript"></script>
+  <script src="{$file}"></script>
 {/foreach}
 </head>
 
diff --git a/ihtml/themes/breezy/login.tpl b/ihtml/themes/breezy/login.tpl
index 754d858fed34ec250d585cb7c07be9c738ee9138..9c44fac25df41c3c3238edbae4bcf082b5873357 100644
--- a/ihtml/themes/breezy/login.tpl
+++ b/ihtml/themes/breezy/login.tpl
@@ -47,7 +47,7 @@
 
       <!-- check, if cookies are enabled -->
       <p class="fusiondirectoryLoginWarning">
-       <script type="text/javascript">
+       <script>
         <!--
         document.cookie = "fdtest=empty;path=/";
         if (document.cookie.indexOf( "fdtest=") > -1 )
@@ -76,7 +76,7 @@
 
 {include file={filePath file="copynotice.tpl"}}
 
-<script type="text/javascript">
+<script>
 <!--
   enable_keyPress = false;
   focus_field("{$focusfield|escape}");
diff --git a/ihtml/themes/breezy/msg_dialog.tpl b/ihtml/themes/breezy/msg_dialog.tpl
index 9f2d7d6147a2fe816671af166ace3715bb5b2b80..843b553450f918f4d001ce5527bfd87148ee91a0 100644
--- a/ihtml/themes/breezy/msg_dialog.tpl
+++ b/ihtml/themes/breezy/msg_dialog.tpl
@@ -45,7 +45,7 @@
         {/if}
       </div>
     </div>
-    <script type="text/javascript">
+    <script>
       focus_field('MSG_OK{$dialog.id}');
     </script>
   {/foreach}
diff --git a/ihtml/themes/breezy/recovery.tpl b/ihtml/themes/breezy/recovery.tpl
index 6e29c287f48ac1fa24e347b06fcd13f626e267d8..5b33713f0be4eee7bcd549326f0f6e316d405fa9 100644
--- a/ihtml/themes/breezy/recovery.tpl
+++ b/ihtml/themes/breezy/recovery.tpl
@@ -128,7 +128,7 @@
 {include file={filePath file="copynotice.tpl"}}
 
   <!-- Place cursor in email field -->
-  <script type="text/javascript">
+  <script>
     <!-- // First input field on page
     focus_field('error_accept','login','directory','username','current_password','email_address');
     next_msg_dialog();
diff --git a/ihtml/themes/breezy/secondfactor.tpl b/ihtml/themes/breezy/secondfactor.tpl
index ad537562cfbcd6fc5ba332b544f284dafc1e6303..c75fee9f699e940b1e464b04a2f8a4e784bbac29 100644
--- a/ihtml/themes/breezy/secondfactor.tpl
+++ b/ihtml/themes/breezy/secondfactor.tpl
@@ -41,7 +41,7 @@
 
 {include file={filePath file="copynotice.tpl"}}
 
-<script type="text/javascript">
+<script>
 <!--
   next_msg_dialog();
 -->
diff --git a/ihtml/themes/breezy/simpleplugin.tpl b/ihtml/themes/breezy/simpleplugin.tpl
index f5eeedaa2da247dc882e1b76acd0f893a5e986e4..cec63d08e317b53256156cc9b4c7ac95363f4683 100644
--- a/ihtml/themes/breezy/simpleplugin.tpl
+++ b/ihtml/themes/breezy/simpleplugin.tpl
@@ -14,7 +14,7 @@
 
 {if isset($focusedField)}
   <!-- Place cursor -->
-  <script type="text/javascript">
+  <script>
     <!-- // First input field on page
       focus_field('{$focusedField|escape}');
     -->
diff --git a/ihtml/themes/legacy/login.tpl b/ihtml/themes/legacy/login.tpl
index 3cf3a9f5433a27bd3b6edb4c6d46ceacf8536648..b660661b4a8a4fa5e08230f260b262e5492ade03 100644
--- a/ihtml/themes/legacy/login.tpl
+++ b/ihtml/themes/legacy/login.tpl
@@ -47,7 +47,7 @@
 
       <!-- check, if cookies are enabled -->
       <p class="fusiondirectoryLoginWarning">
-       <script type="text/javascript">
+       <script>
         <!--
         document.cookie = "fdtest=empty;path=/";
         if (document.cookie.indexOf( "fdtest=") > -1 )
@@ -76,7 +76,7 @@
 
 {include file={filePath file="copynotice.tpl"}}
 
-<script type="text/javascript">
+<script>
 <!--
   enable_keyPress = false;
   focus_field("{$focusfield}");
diff --git a/ihtml/themes/legacy/recovery.tpl b/ihtml/themes/legacy/recovery.tpl
index bf98737099555f7d6d513cf03ba722ad18adb2c7..a8858d1391a8ce1ab30266052cebb9b6bd6f178a 100644
--- a/ihtml/themes/legacy/recovery.tpl
+++ b/ihtml/themes/legacy/recovery.tpl
@@ -129,7 +129,7 @@
 {include file={filePath file="copynotice.tpl"}}
 
   <!-- Place cursor in email field -->
-  <script type="text/javascript">
+  <script>
     <!-- // First input field on page
     focus_field('error_accept','login','directory','username','current_password','email_address');
     next_msg_dialog();
diff --git a/include/class_divSelectBox.inc b/include/class_divSelectBox.inc
index fb6290a239c55a9565af68fd2316738a409cc0c0..b3ecb0adce0d4b706ccca2a939c7ee314bff8788 100644
--- a/include/class_divSelectBox.inc
+++ b/include/class_divSelectBox.inc
@@ -105,7 +105,7 @@ class divSelectBox
     $s_return .= '</table></div></div>';
     if ($this->headers !== FALSE) {
       $s_return .=
-        '<script type="text/javascript">
+        '<script>
           var sorter'.$this->id.' = tsorter.create(\''.$this->id.'\');
         </script>';
     }
diff --git a/setup/setup_migrate_adminAccount.tpl b/setup/setup_migrate_adminAccount.tpl
index a7cd35fffa0b26e7f8c23aab558a93bb40a9719f..8cdf83296760d2d82e4b832c19a9016da38756e2 100644
--- a/setup/setup_migrate_adminAccount.tpl
+++ b/setup/setup_migrate_adminAccount.tpl
@@ -42,7 +42,7 @@
     </table>
 
     <!-- Place cursor -->
-    <script type="text/javascript">
+    <script>
       <!-- // First input field on page
       focus_field('new_user_password');
       -->