diff -urpN thickbox-5-x/README.txt thickbox/README.txt
--- thickbox-5-x/README.txt	2007-04-05 01:11:49.000000000 -0700
+++ thickbox/README.txt	2008-04-09 11:01:00.000000000 -0700
@@ -38,7 +38,7 @@ activate Thickbox for all image nodes.
 Contributions:
 -------------
 * imagecache+thickbox formatters to imagefields (CCK)
-  by Jšrg Hermsdorf (yojoe)
+  by Jörg Hermsdorf (yojoe)
 * thickbox_auto.js contributed by Johannes Dillmann (kleingeist).
   Provides automated integration with the image module.
 * thickbox_login.js contributed by Jeff Miccolis (jmiccolis).
diff -urpN thickbox-5-x/thickbox.css thickbox/thickbox.css
--- thickbox-5-x/thickbox.css	2007-06-05 00:34:35.000000000 -0700
+++ thickbox/thickbox.css	2008-04-09 11:01:00.000000000 -0700
@@ -11,12 +11,6 @@
 	color:#666666;
 }
 
-#TB_window a:link {color: #666666;}
-#TB_window a:visited {color: #666666;}
-#TB_window a:hover {color: #000;}
-#TB_window a:active {color: #666666;}
-#TB_window a:focus{color: #666666;}
-
 /* ----------------------------------------------------------------------------------------------------------------*/
 /* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/
 /* ----------------------------------------------------------------------------------------------------------------*/
@@ -26,9 +20,9 @@
 	top: 0px;
 	left: 0px;
 	background-color:#000;
-	filter:alpha(opacity=75);
-	-moz-opacity: 0.75;
-	opacity: 0.75;
+	filter:alpha(opacity=85);
+	-moz-opacity: 0.85;
+	opacity: 0.85;
 	height:100%;
 	width:100%;
 }
diff -urpN thickbox-5-x/thickbox.info thickbox/thickbox.info
--- thickbox-5-x/thickbox.info	2007-09-22 10:20:09.000000000 -0700
+++ thickbox/thickbox.info	2008-04-09 11:01:01.000000000 -0700
@@ -1,6 +1,7 @@
 ; $Id: thickbox.info,v 1.2.2.2 2007/06/16 10:11:28 frjo Exp $
 name = Thickbox
 description = Enables Thickbox, a jQuery plugin.
+core = 6.x
 
 ; Information added by drupal.org packaging script on 2007-09-22
 version = "5.x-1.1"
diff -urpN thickbox-5-x/thickbox.module thickbox/thickbox.module
--- thickbox-5-x/thickbox.module	2007-06-20 19:19:55.000000000 -0700
+++ thickbox/thickbox.module	2008-04-09 11:01:06.000000000 -0700
@@ -55,45 +55,43 @@ function thickbox_admin_settings() {
 /**
  * Implementation of hook_menu().
  */
-function thickbox_menu($may_cache) {
+function thickbox_menu() {
   global $user;
 
   $items = array();
-
-  if ($may_cache) {
-    $items[] = array(
-      'path' => 'admin/settings/thickbox',
-      'title' => t('Thickbox'),
-      'description' => t('Configure Thickbox behavior.'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => 'thickbox_admin_settings',
-      'access' => user_access('administer site configuration'),
-      'type' => MENU_NORMAL_ITEM
-    );
-    $items[] = array(
-      'path' => 'thickbox_login',
-      'title' => t('Login'),
-      'callback' => 'thickbox_login',
-      'access' => !$user->uid,
-      'type' => MENU_CALLBACK
+  $items['admin/settings/thickbox'] = array(
+    'title' => t('Thickbox'),
+    'description' => t('Configure Thickbox behavior.'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('thickbox_admin_settings'),
+    'access arguments' => array('administer site configuration'),
+    'type' => MENU_NORMAL_ITEM
     );
+  $items['thickbox_login'] = array(
+    'title' => t('Login'),
+    'page callback' => 'thickbox_login',
+    'access arguments' => array(!$user->uid),
+    'type' => MENU_CALLBACK
+  );
+  return $items;
+}
+
+/**
+ * Implementation of hook_init()
+ */
+function thickbox_init() {
+  // Code from the block_list funtion in block.module.
+  // If the path doesn't match any of the exeptions, load header files.
+  $path = drupal_get_path_alias($_GET['q']);
+  $regexp = '/^('. preg_replace(array('/(\r\n?|\n)/', '/\\\\\*/', '/(^|\|)\\\\<front\\\\>($|\|)/'), array('|', '.*', '\1'. preg_quote(variable_get('site_frontpage', 'node'), '/') .'\2'), preg_quote(variable_get('thickbox_pages', ''), '/')) .')$/';
+  // Compare with the internal and path alias (if any).
+  $page_match = preg_match($regexp, $path);
+  if ($path != $_GET['q']) {
+    $page_match = $page_match || preg_match($regexp, $_GET['q']);
   }
-  else {
-    // Code from the block_list funtion in block.module.
-    // If the path doesn't match any of the exeptions, load header files.
-    $path = drupal_get_path_alias($_GET['q']);
-    $regexp = '/^('. preg_replace(array('/(\r\n?|\n)/', '/\\\\\*/', '/(^|\|)\\\\<front\\\\>($|\|)/'), array('|', '.*', '\1'. preg_quote(variable_get('site_frontpage', 'node'), '/') .'\2'), preg_quote(variable_get('thickbox_pages', ''), '/')) .')$/';
-    // Compare with the internal and path alias (if any).
-    $page_match = preg_match($regexp, $path);
-    if ($path != $_GET['q']) {
-      $page_match = $page_match || preg_match($regexp, $_GET['q']);
-    }
-    if (!$page_match) {
-      _thickbox_doheader();
-    }
+  if (!$page_match) {
+    _thickbox_doheader();
   }
-
-  return $items;
 }
 
 /**