diff --git a/account_edit.php b/account_edit.php
index ef6f59a43..d165e7d6a 100644
--- a/account_edit.php
+++ b/account_edit.php
@@ -182,7 +182,7 @@
       <?php if (tep_not_null(ENTRY_DATE_OF_BIRTH_TEXT)) echo '<span class="help-block">' . ENTRY_DATE_OF_BIRTH_TEXT . '</span>'; ?>
       <?php echo FORM_REQUIRED_INPUT; ?>
     </div>
-    <script type="text/javascript">
+    <script>
     $('#dob').datepicker({
       dateFormat: '<?php echo JQUERY_DATEPICKER_FORMAT; ?>',
       viewMode: 2
@@ -225,4 +225,4 @@
 <?php
   require(DIR_WS_INCLUDES . 'template_bottom.php');
   require(DIR_WS_INCLUDES . 'application_bottom.php');
-?>
\ No newline at end of file
+?>
diff --git a/advanced_search.php b/advanced_search.php
index a6e1b107b..121ed3e96 100644
--- a/advanced_search.php
+++ b/advanced_search.php
@@ -19,8 +19,8 @@
   require(DIR_WS_INCLUDES . 'template_top.php');
 ?>
 
-<script type="text/javascript" src="includes/general.js"></script>
-<script type="text/javascript"><!--
+<script src="includes/general.js"></script>
+<script><!--
 function check_form() {
   var error_message = "<?php echo JS_ERROR; ?>";
   var error_found = false;
@@ -202,7 +202,7 @@ function check_form() {
         echo tep_draw_input_field('dfrom', '', 'id="dfrom" placeholder="' . ENTRY_DATE_FROM . '"');
         ?>
       </div>
-      <script type="text/javascript">
+      <script>
       var nowTemp = new Date();
       var now = new Date(nowTemp.getFullYear(), nowTemp.getMonth(), nowTemp.getDate(), 0, 0, 0, 0);
       $('#dfrom').datepicker({
@@ -220,7 +220,7 @@ function check_form() {
         echo tep_draw_input_field('dto', '', 'id="dto" placeholder="' . ENTRY_DATE_TO . '"');
         ?>
       </div>
-      <script type="text/javascript">
+      <script>
       $('#dto').datepicker({
         dateFormat: '<?php echo JQUERY_DATEPICKER_FORMAT; ?>',
         onRender: function(date) {
diff --git a/checkout_payment.php b/checkout_payment.php
index abd7fc3ec..cef09135e 100644
--- a/checkout_payment.php
+++ b/checkout_payment.php
@@ -86,7 +86,7 @@
   require(DIR_WS_INCLUDES . 'template_top.php');
 ?>
 
-<script type="text/javascript"><!--
+<script><!--
 var selected;
 
 function selectRowEffect(object, buttonSelect) {
diff --git a/checkout_payment_address.php b/checkout_payment_address.php
index 52a292192..913486680 100644
--- a/checkout_payment_address.php
+++ b/checkout_payment_address.php
@@ -197,7 +197,7 @@
   require(DIR_WS_INCLUDES . 'template_top.php');
 ?>
 
-<script type="text/javascript"><!--
+<script><!--
 var selected;
 
 function selectRowEffect(object, buttonSelect) {
diff --git a/checkout_shipping.php b/checkout_shipping.php
index d0b8db358..e88b8f96e 100644
--- a/checkout_shipping.php
+++ b/checkout_shipping.php
@@ -159,7 +159,7 @@
   require(DIR_WS_INCLUDES . 'template_top.php');
 ?>
 
-<script type="text/javascript"><!--
+<script><!--
 var selected;
 
 function selectRowEffect(object, buttonSelect) {
diff --git a/checkout_shipping_address.php b/checkout_shipping_address.php
index 1273a5106..7a3b7208d 100644
--- a/checkout_shipping_address.php
+++ b/checkout_shipping_address.php
@@ -209,7 +209,7 @@
   require(DIR_WS_INCLUDES . 'template_top.php');
 ?>
 
-<script type="text/javascript"><!--
+<script><!--
 var selected;
 
 function selectRowEffect(object, buttonSelect) {
diff --git a/create_account.php b/create_account.php
index ad8abcf61..e629283b3 100644
--- a/create_account.php
+++ b/create_account.php
@@ -333,7 +333,7 @@
         if (tep_not_null(ENTRY_DATE_OF_BIRTH_TEXT)) echo '<span class="help-block">' . ENTRY_DATE_OF_BIRTH_TEXT . '</span>';
         ?>
       </div>
-      <script type="text/javascript">
+      <script>
       $('#dob').datepicker({
         dateFormat: '<?php echo JQUERY_DATEPICKER_FORMAT; ?>',
         viewMode: 2
diff --git a/ext/modules/payment/sage_pay/direct_3dauth.php b/ext/modules/payment/sage_pay/direct_3dauth.php
index bc2fe4ace..868fb284b 100644
--- a/ext/modules/payment/sage_pay/direct_3dauth.php
+++ b/ext/modules/payment/sage_pay/direct_3dauth.php
@@ -46,7 +46,7 @@
 <NOSCRIPT>
 <?php echo '<center><p>' . MODULE_PAYMENT_SAGE_PAY_DIRECT_3DAUTH_INFO . '</p><p><input type="submit" value="' . MODULE_PAYMENT_SAGE_PAY_DIRECT_3DAUTH_BUTTON . '"/></p></center>'; ?>
 </NOSCRIPT>
-<script type="text/javascript"><!--
+<script><!--
 document.form.submit();
 //--></script>
 </body>
diff --git a/ext/modules/payment/sage_pay/redirect.php b/ext/modules/payment/sage_pay/redirect.php
index d041e73e5..beae484e1 100644
--- a/ext/modules/payment/sage_pay/redirect.php
+++ b/ext/modules/payment/sage_pay/redirect.php
@@ -49,7 +49,7 @@
   <p align="center" class="main"><input type="submit" value="Continue" /></p>
 </noscript>
 </form>
-<script type="text/javascript">
+<script>
 document.redirect.submit();
 </script>
 </body>
diff --git a/includes/classes/payment.php b/includes/classes/payment.php
index 575a3b324..b2b61a7db 100644
--- a/includes/classes/payment.php
+++ b/includes/classes/payment.php
@@ -76,7 +76,7 @@ function update_status() {
     function javascript_validation() {
       $js = '';
       if (is_array($this->modules)) {
-        $js = '<script type="text/javascript"><!-- ' . "\n" .
+        $js = '<script><!-- ' . "\n" .
               'function check_form() {' . "\n" .
               '  var error = 0;' . "\n" .
               '  var error_message = "' . JS_ERROR . '";' . "\n" .
diff --git a/includes/footer.php b/includes/footer.php
index 5c74785d2..5107e052b 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -27,6 +27,6 @@
   }
 ?>
 
-<script type="text/javascript">
+<script>
 $('.productListTable tr:nth-child(even)').addClass('alt');
 </script>
diff --git a/includes/form_check.js.php b/includes/form_check.js.php
index cb4daa320..f2370cd02 100644
--- a/includes/form_check.js.php
+++ b/includes/form_check.js.php
@@ -10,7 +10,7 @@
   Released under the GNU General Public License
 */
 ?>
-<script type="text/javascript"><!--
+<script><!--
 var form = "";
 var submitted = false;
 var error = false;
diff --git a/includes/modules/boxes/bm_best_sellers.php b/includes/modules/boxes/bm_best_sellers.php
index 1dfa723d3..7ae1c0169 100644
--- a/includes/modules/boxes/bm_best_sellers.php
+++ b/includes/modules/boxes/bm_best_sellers.php
@@ -47,7 +47,7 @@ function execute() {
           }
           $bestsellers_list .= '</ol>';
 
-          $data = '<div class="panel panel-default">' .
+          $data = '<div class="panel panel-default hidden-xs">' .
                   '  <div class="panel-heading">' . MODULE_BOXES_BEST_SELLERS_BOX_TITLE . '</div>' .
                   '  <div class="panel-body">' . $bestsellers_list . '</div>' .
                   '</div>';
diff --git a/includes/modules/boxes/bm_manufacturer_info.php b/includes/modules/boxes/bm_manufacturer_info.php
index 484785cfd..262be1d87 100644
--- a/includes/modules/boxes/bm_manufacturer_info.php
+++ b/includes/modules/boxes/bm_manufacturer_info.php
@@ -42,7 +42,7 @@ function execute() {
           if (tep_not_null($manufacturer['manufacturers_image'])) $manufacturer_info_string .= '<div>' . tep_image(DIR_WS_IMAGES . $manufacturer['manufacturers_image'], $manufacturer['manufacturers_name']) . '</div>';
           if (tep_not_null($manufacturer['manufacturers_url'])) $manufacturer_info_string .= '<div class="text-center"><a href="' . tep_href_link(FILENAME_REDIRECT, 'action=manufacturer&manufacturers_id=' . $manufacturer['manufacturers_id']) . '" target="_blank">' . sprintf(MODULE_BOXES_MANUFACTURER_INFO_BOX_HOMEPAGE, $manufacturer['manufacturers_name']) . '</a></div>';
 
-          $data = '<div class="panel panel-default">' .
+          $data = '<div class="panel panel-default hidden-xs">' .
                   '  <div class="panel-heading">' . MODULE_BOXES_MANUFACTURER_INFO_BOX_TITLE . '</div>' .
                   '  <div class="panel-body">' . $manufacturer_info_string . '</div>';
           $data .='  <div class="panel-footer clearfix"><a href="' . tep_href_link(FILENAME_DEFAULT, 'manufacturers_id=' . $manufacturer['manufacturers_id']) . '">' . MODULE_BOXES_MANUFACTURER_INFO_BOX_OTHER_PRODUCTS . '</a></div>';
diff --git a/includes/modules/boxes/bm_reviews.php b/includes/modules/boxes/bm_reviews.php
index a5d6ead44..2d5668d54 100644
--- a/includes/modules/boxes/bm_reviews.php
+++ b/includes/modules/boxes/bm_reviews.php
@@ -58,7 +58,7 @@ function execute() {
         $reviews_box_contents .= '<p>' . MODULE_BOXES_REVIEWS_BOX_NO_REVIEWS . '</p>';
       }
 
-      $data = '<div class="panel panel-default">' .
+      $data = '<div class="panel panel-default hidden-xs">' .
               '  <div class="panel-heading"><a href="' . tep_href_link(FILENAME_REVIEWS) . '">' . MODULE_BOXES_REVIEWS_BOX_TITLE . '</a></div>' .
               '  <div class="panel-body">' . $reviews_box_contents . '</div>' . 
               '</div>';
diff --git a/includes/modules/boxes/bm_specials.php b/includes/modules/boxes/bm_specials.php
index 3e3e20231..e253e09d8 100644
--- a/includes/modules/boxes/bm_specials.php
+++ b/includes/modules/boxes/bm_specials.php
@@ -35,7 +35,7 @@ function execute() {
 
       if (!isset($HTTP_GET_VARS['products_id'])) {
         if ($random_product = tep_random_select("select p.products_id, pd.products_name, p.products_price, p.products_tax_class_id, p.products_image, s.specials_new_products_price from " . TABLE_PRODUCTS . " p, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_SPECIALS . " s where p.products_status = '1' and p.products_id = s.products_id and pd.products_id = s.products_id and pd.language_id = '" . (int)$languages_id . "' and s.status = '1' order by s.specials_date_added desc limit " . MAX_RANDOM_SELECT_SPECIALS)) {
-          $data = '<div class="panel panel-default">' .
+          $data = '<div class="panel panel-default hidden-xs">' .
                   '  <div class="panel-heading"><a href="' . tep_href_link(FILENAME_SPECIALS) . '">' . MODULE_BOXES_SPECIALS_BOX_TITLE . '</a></div>' .
                   '  <div class="panel-body text-center"><a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $random_product["products_id"]) . '">' . tep_image(DIR_WS_IMAGES . $random_product['products_image'], $random_product['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '</a><br /><a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $random_product['products_id']) . '">' . $random_product['products_name'] . '</a><br /><del>' . $currencies->display_price($random_product['products_price'], tep_get_tax_rate($random_product['products_tax_class_id'])) . '</del><br /><span class="productSpecialPrice">' . $currencies->display_price($random_product['specials_new_products_price'], tep_get_tax_rate($random_product['products_tax_class_id'])) . '</span></div>' .
                   '</div>';
diff --git a/includes/modules/boxes/bm_whats_new.php b/includes/modules/boxes/bm_whats_new.php
index 64d66f343..7c1e6deb0 100644
--- a/includes/modules/boxes/bm_whats_new.php
+++ b/includes/modules/boxes/bm_whats_new.php
@@ -44,7 +44,7 @@ function execute() {
           $whats_new_price = $currencies->display_price($random_product['products_price'], tep_get_tax_rate($random_product['products_tax_class_id']));
         }
 
-        $data = '<div class="panel panel-default">' .
+        $data = '<div class="panel panel-default hidden-xs">' .
                 '  <div class="panel-heading"><a href="' . tep_href_link(FILENAME_PRODUCTS_NEW) . '">' . MODULE_BOXES_WHATS_NEW_BOX_TITLE . '</a></div>' .
                 '  <div class="panel-body text-center"><a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $random_product['products_id']) . '">' . tep_image(DIR_WS_IMAGES . $random_product['products_image'], $random_product['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '</a><br /><a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $random_product['products_id']) . '">' . $random_product['products_name'] . '</a><br />' . $whats_new_price . '</div>' .
                 '</div>';
diff --git a/includes/modules/header_tags/ht_datepicker_jquery.php b/includes/modules/header_tags/ht_datepicker_jquery.php
index 8ca114bf4..5b61208d2 100644
--- a/includes/modules/header_tags/ht_datepicker_jquery.php
+++ b/includes/modules/header_tags/ht_datepicker_jquery.php
@@ -43,7 +43,7 @@ function execute() {
         }
 
         if (in_array(basename($PHP_SELF), $pages_array)) {
-          $oscTemplate->addBlock('<script type="text/javascript" src="ext/datepicker/js/bootstrap-datepicker.js"></script>' . "\n", $this->group);
+          $oscTemplate->addBlock('<script src="ext/datepicker/js/bootstrap-datepicker.js"></script>' . "\n", $this->group);
           $oscTemplate->addBlock('<link rel="stylesheet" type="text/css" href="ext/datepicker/css/datepicker.css" />' . "\n", $this->group);
         }
       }
@@ -112,7 +112,7 @@ function ht_datepicker_jquery_edit_pages($values, $key) {
 
     $output .= tep_draw_hidden_field('configuration[' . $key . ']', '', 'id="htrn_files"');
 
-    $output .= '<script type="text/javascript">
+    $output .= '<script>
                 function htrn_update_cfg_value() {
                   var htrn_selected_files = \'\';
 
diff --git a/includes/modules/header_tags/ht_google_adwords_conversion.php b/includes/modules/header_tags/ht_google_adwords_conversion.php
index 43b9f49db..756451c9a 100644
--- a/includes/modules/header_tags/ht_google_adwords_conversion.php
+++ b/includes/modules/header_tags/ht_google_adwords_conversion.php
@@ -66,7 +66,7 @@ function execute() {
           $conversion_value = $this->format_raw($order_subtotal['value'], $order['currency'], $order['currency_value']);
 
           $output = <<<EOD
-<script type="text/javascript">
+<script>
 /* <![CDATA[ */
 var google_conversion_id = {$conversion_id};
 var google_conversion_language = "{$conversion_language}";
@@ -76,7 +76,7 @@ function execute() {
 var google_conversion_value = {$conversion_value};
 /* ]]> */
 </script>
-<script type="text/javascript" src="//www.googleadservices.com/pagead/conversion.js"></script>
+<script src="//www.googleadservices.com/pagead/conversion.js"></script>
 <noscript>
 <div style="display:inline;">
 <img height="1" width="1" style="border-style:none;" alt="" src="//www.googleadservices.com/pagead/conversion/{$conversion_id}/?value={$conversion_value}&amp;label={$conversion_label}&amp;guid=ON&amp;script=0"/>
diff --git a/includes/modules/header_tags/ht_google_analytics.php b/includes/modules/header_tags/ht_google_analytics.php
index 7cf970a1b..226e91735 100644
--- a/includes/modules/header_tags/ht_google_analytics.php
+++ b/includes/modules/header_tags/ht_google_analytics.php
@@ -36,7 +36,7 @@ function execute() {
           $this->group = 'footer_scripts';
         }
 
-        $header = '<script type="text/javascript">
+        $header = '<script>
   var _gaq = _gaq || [];
   _gaq.push([\'_setAccount\', \'' . tep_output_string(MODULE_HEADER_TAGS_GOOGLE_ANALYTICS_ID) . '\']);
   _gaq.push([\'_trackPageview\']);' . "\n";
diff --git a/includes/modules/header_tags/ht_grid_list_view.php b/includes/modules/header_tags/ht_grid_list_view.php
index 2ce2ed933..a2cd1dcd2 100644
--- a/includes/modules/header_tags/ht_grid_list_view.php
+++ b/includes/modules/header_tags/ht_grid_list_view.php
@@ -43,8 +43,8 @@ function execute() {
         }
 
         if (in_array(basename($PHP_SELF), $pages_array)) {
-          $oscTemplate->addBlock('<script type="text/javascript" src="ext/jquery/cookie.js"></script>' . "\n", $this->group);
-          $oscTemplate->addBlock('<script type="text/javascript">$(function() { var cc = $.cookie(\'list_grid\'); if (cc == \'grid\') { $(\'#products .item\').removeClass(\'list-group-item\').addClass(\'grid-group-item\'); } else { $(\'#products .item\').removeClass(\'grid-group-item\').addClass(\'list-group-item\'); }});$(document).ready(function() {$(\'#list\').click(function(event){event.preventDefault();$(\'#products .item\').addClass(\'list-group-item\');$.cookie(\'list_grid\', \'list\');});$(\'#grid\').click(function(event){event.preventDefault();$(\'#products .item\').removeClass(\'list-group-item\');$(\'#products .item\').addClass(\'grid-group-item\');$.cookie(\'list_grid\', \'grid\');});});</script>' . "\n", $this->group);
+          $oscTemplate->addBlock('<script src="ext/jquery/cookie.js"></script>' . "\n", $this->group);
+          $oscTemplate->addBlock('<script>$(function() { var cc = $.cookie(\'list_grid\'); if (cc == \'grid\') { $(\'#products .item\').removeClass(\'list-group-item\').addClass(\'grid-group-item\'); } else { $(\'#products .item\').removeClass(\'grid-group-item\').addClass(\'list-group-item\'); }});$(document).ready(function() {$(\'#list\').click(function(event){event.preventDefault();$(\'#products .item\').addClass(\'list-group-item\');$.cookie(\'list_grid\', \'list\');});$(\'#grid\').click(function(event){event.preventDefault();$(\'#products .item\').removeClass(\'list-group-item\');$(\'#products .item\').addClass(\'grid-group-item\');$.cookie(\'list_grid\', \'grid\');});});</script>' . "\n", $this->group);
         }
       }
     }
@@ -113,7 +113,7 @@ function ht_grid_list_view_edit_pages($values, $key) {
 
     $output .= tep_draw_hidden_field('configuration[' . $key . ']', '', 'id="htrn_files"');
 
-    $output .= '<script type="text/javascript">
+    $output .= '<script>
                 function htrn_update_cfg_value() {
                   var htrn_selected_files = \'\';
 
diff --git a/includes/modules/header_tags/ht_product_colorbox.php b/includes/modules/header_tags/ht_product_colorbox.php
index 43ae2d67a..b535e5f09 100644
--- a/includes/modules/header_tags/ht_product_colorbox.php
+++ b/includes/modules/header_tags/ht_product_colorbox.php
@@ -43,9 +43,9 @@ function execute() {
         }
 
         if (in_array(basename($PHP_SELF), $pages_array)) {
-          $oscTemplate->addBlock('<script type="text/javascript" src="ext/photoset-grid/jquery.photoset-grid.min.js"></script>' . "\n", $this->group);
+          $oscTemplate->addBlock('<script src="ext/photoset-grid/jquery.photoset-grid.min.js"></script>' . "\n", $this->group);
           $oscTemplate->addBlock('<link rel="stylesheet" type="text/css" href="ext/colorbox/colorbox.css" />' . "\n", $this->group);
-          $oscTemplate->addBlock('<script type="text/javascript" src="ext/colorbox/jquery.colorbox-min.js"></script>' . "\n", $this->group);
+          $oscTemplate->addBlock('<script src="ext/colorbox/jquery.colorbox-min.js"></script>' . "\n", $this->group);
         }
       }
     }
@@ -111,7 +111,7 @@ function ht_product_colorbox_edit_pages($values, $key) {
 
     $output .= tep_draw_hidden_field('configuration[' . $key . ']', '', 'id="htrn_files"');
 
-    $output .= '<script type="text/javascript">
+    $output .= '<script>
                 function htrn_update_cfg_value() {
                   var htrn_selected_files = \'\';
 
diff --git a/includes/modules/header_tags/ht_robot_noindex.php b/includes/modules/header_tags/ht_robot_noindex.php
index 79b2b1b82..c222bb41a 100644
--- a/includes/modules/header_tags/ht_robot_noindex.php
+++ b/includes/modules/header_tags/ht_robot_noindex.php
@@ -135,7 +135,7 @@ function ht_robot_noindex_edit_pages($values, $key) {
 
     $output .= tep_draw_hidden_field('configuration[' . $key . ']', '', 'id="htrn_files"');
 
-    $output .= '<script type="text/javascript">
+    $output .= '<script>
                 function htrn_update_cfg_value() {
                   var htrn_selected_files = \'\';
 
diff --git a/includes/modules/social_bookmarks/sb_google_plus_one.php b/includes/modules/social_bookmarks/sb_google_plus_one.php
index b9de29139..c29baf337 100644
--- a/includes/modules/social_bookmarks/sb_google_plus_one.php
+++ b/includes/modules/social_bookmarks/sb_google_plus_one.php
@@ -52,7 +52,7 @@ function getOutput() {
 
       $output .= '></div>';
 
-      $output .= '<script type="text/javascript">
+      $output .= '<script>
   if ( typeof window.___gcfg == "undefined" ) {
     window.___gcfg = { };
   }
diff --git a/includes/modules/social_bookmarks/sb_google_plus_share.php b/includes/modules/social_bookmarks/sb_google_plus_share.php
index 9ab9bf5be..27e983ba4 100644
--- a/includes/modules/social_bookmarks/sb_google_plus_share.php
+++ b/includes/modules/social_bookmarks/sb_google_plus_share.php
@@ -58,7 +58,7 @@ function getOutput() {
 
       $output .= ' data-height="' . $button_height . '" data-align="' . strtolower(MODULE_SOCIAL_BOOKMARKS_GOOGLE_PLUS_SHARE_ALIGN) . '"></div>';
 
-      $output .= '<script type="text/javascript">
+      $output .= '<script>
   if ( typeof window.___gcfg == "undefined" ) {
     window.___gcfg = { };
   }
diff --git a/includes/modules/social_bookmarks/sb_pinterest.php b/includes/modules/social_bookmarks/sb_pinterest.php
index d730f01db..60d85d49c 100644
--- a/includes/modules/social_bookmarks/sb_pinterest.php
+++ b/includes/modules/social_bookmarks/sb_pinterest.php
@@ -33,7 +33,7 @@ function getOutput() {
       global $HTTP_GET_VARS, $oscTemplate;
 
 // add the js in the footer
-      $oscTemplate->addBlock('<script type="text/javascript" src="//assets.pinterest.com/js/pinit.js"></script>', 'footer_scripts');
+      $oscTemplate->addBlock('<script src="//assets.pinterest.com/js/pinit.js"></script>', 'footer_scripts');
 
       $params = array();
 
diff --git a/includes/modules/social_bookmarks/sb_twitter_button.php b/includes/modules/social_bookmarks/sb_twitter_button.php
index a7303b720..7ff51266f 100644
--- a/includes/modules/social_bookmarks/sb_twitter_button.php
+++ b/includes/modules/social_bookmarks/sb_twitter_button.php
@@ -50,7 +50,7 @@ function getOutput() {
 
       $params = implode('&', $params);
 
-      return '<script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script><a href="http://twitter.com/share?' . $params . '" target="_blank" class="twitter-share-button">' . tep_output_string_protected($this->public_title) . '</a>';
+      return '<script src="http://platform.twitter.com/widgets.js"></script><a href="http://twitter.com/share?' . $params . '" target="_blank" class="twitter-share-button">' . tep_output_string_protected($this->public_title) . '</a>';
     }
 
     function isEnabled() {
diff --git a/includes/template_top.php b/includes/template_top.php
index e4019500d..c60ebe71b 100644
--- a/includes/template_top.php
+++ b/includes/template_top.php
@@ -44,7 +44,7 @@
  <!-- User -->
  <link href="user.css" rel="stylesheet">
  
- <script type="text/javascript" src="ext/jquery/jquery-1.8.0.min.js"></script>
+ <script src="ext/jquery/jquery-1.8.0.min.js"></script>
  <script src="ext/bootstrap/js/bootstrap.min.js"></script>
 
  <?php echo $oscTemplate->getBlocks('header_tags'); ?>
diff --git a/product_info.php b/product_info.php
index ccfae70c2..e73f1998b 100644
--- a/product_info.php
+++ b/product_info.php
@@ -111,7 +111,7 @@
     }
 ?>
 
-<script type="text/javascript">
+<script>
 $(function() {
   $('#piGal').css({
     'visibility': 'hidden'
diff --git a/product_reviews_write.php b/product_reviews_write.php
index d471d60da..a69ebfeb4 100644
--- a/product_reviews_write.php
+++ b/product_reviews_write.php
@@ -78,7 +78,7 @@
   require(DIR_WS_INCLUDES . 'template_top.php');
 ?>
 
-<script type="text/javascript"><!--
+<script><!--
 function checkForm() {
   var error = 0;
   var error_message = "<?php echo JS_ERROR; ?>";