diff --git a/upload/account/details.php b/upload/account/details.php
index 2dd557d2..6f6117b5 100644
--- a/upload/account/details.php
+++ b/upload/account/details.php
@@ -17,26 +17,26 @@
  *   @author          Black Cat Development
  *   @copyright       2013, Black Cat Development
  *   @link            http://blackcat-cms.org
- * @license         http://www.gnu.org/licenses/gpl.html
+ *   @license         http://www.gnu.org/licenses/gpl.html
  *   @category        CAT_Core
  *   @package         CAT_Core
  *
  */
 
-if (defined('CAT_PATH')) {	
-	include(CAT_PATH.'/framework/class.secure.php'); 
+if (defined('CAT_PATH')) {    
+    include(CAT_PATH.'/framework/class.secure.php'); 
 } else {
-	$root = "../";
-	$level = 1;
-	while (($level < 10) && (!file_exists($root.'/framework/class.secure.php'))) {
-		$root .= "../";
-		$level += 1;
-	}
-	if (file_exists($root.'/framework/class.secure.php')) { 
-		include($root.'/framework/class.secure.php'); 
-	} else {
-		trigger_error(sprintf("[ <b>%s</b> ] Can't include class.secure.php!", $_SERVER['SCRIPT_NAME']), E_USER_ERROR);
-	}
+    $root = "../";
+    $level = 1;
+    while (($level < 10) && (!file_exists($root.'/framework/class.secure.php'))) {
+        $root .= "../";
+        $level += 1;
+    }
+    if (file_exists($root.'/framework/class.secure.php')) { 
+        include($root.'/framework/class.secure.php'); 
+    } else {
+        trigger_error(sprintf("[ <b>%s</b> ] Can't include class.secure.php!", $_SERVER['SCRIPT_NAME']), E_USER_ERROR);
+    }
 }
 
 global $wb;
@@ -46,76 +46,74 @@
 $val = CAT_Helper_Validate::getInstance();
 
 // Get and sanitize entered values
-$display_name = strip_tags($val->sanitizePost( 'display_name', 'string', true ));
-$date_format  = ( CAT_Helper_DateTime::checkDateformat($val->sanitizePost( 'date_format', 'string', true )) === true )
-              ? $val->sanitizePost( 'date_format', 'string', true )
-              : NULL;
-$time_format  = ( CAT_Helper_DateTime::checkTimeformat($val->sanitizePost( 'time_format', 'string', true )) === true )
-              ? $val->sanitizePost( 'time_format', 'string', true )
-              : NULL;
-$language     = ( $wb->lang->checkLang($val->sanitizePost( 'language', 'string', true )) === true )
-              ? $val->sanitizePost( 'language', 'string', true )
-              : NULL;
+$display_name    = strip_tags($val->sanitizePost( 'display_name', 'string', true ));
+$date_format     = ( CAT_Helper_DateTime::checkDateformat($val->sanitizePost( 'date_format', 'string', true )) === true )
+                 ? $val->sanitizePost( 'date_format', 'string', true )
+                 : NULL;
+$time_format     = ( CAT_Helper_DateTime::checkTimeformat($val->sanitizePost( 'time_format', 'string', true )) === true )
+                 ? $val->sanitizePost( 'time_format', 'string', true )
+                 : NULL;
+$language        = ( $wb->lang->checkLang($val->sanitizePost( 'language', 'string', true )) === true )
+                 ? $val->sanitizePost( 'language', 'string', true )
+                 : NULL;
 $timezone_string = ( CAT_Helper_DateTime::checkTZ($val->sanitizePost('timezone_string')) === true )
                  ? $val->sanitizePost('timezone_string')
                  : DEFAULT_TIMEZONESTRING;
 
 // Update the database
 $database = new database();
-$query    = "UPDATE " . CAT_TABLE_PREFIX . "users
-			SET %s = '%s'
-			WHERE user_id = '%s'";
+$query    = "UPDATE `%susers` SET %s = '%s' WHERE user_id = '%s'";
 
 foreach ( array( 'display_name','date_format','time_format','language','timezone_string' ) as $key )
 {
     $item = ${$key};
     if ( $item !== NULL )
     {
-        $database->query( sprintf($query,$key,$item,$wb->get_user_id()) );
+        $database->query( sprintf($query,CAT_TABLE_PREFIX,$key,$item,$wb->get_user_id()) );
         if ( $database->is_error() )
         {
-	$wb->print_error( $database->get_error, 'index.php', false );
+            $wb->print_error( $database->get_error, 'index.php', false );
         }
     }
 }
 
 $wb->print_success( 'Details saved successfully',CAT_URL.'/account/preferences.php' );
 
-$_SESSION[ 'DISPLAY_NAME' ] = $display_name;
-$_SESSION[ 'LANGUAGE' ]     = $language;
+$_SESSION['DISPLAY_NAME'] = $display_name;
+$_SESSION['LANGUAGE']     = $language;
 // Update date format
 if ( $date_format != '' )
 {
-		$_SESSION[ 'DATE_FORMAT' ] = $date_format;
-		if ( isset( $_SESSION[ 'USE_DEFAULT_DATE_FORMAT' ] ) )
-		{
-			unset( $_SESSION[ 'USE_DEFAULT_DATE_FORMAT' ] );
-		}
+	$_SESSION['CAT_DATE_FORMAT'] = $date_format;
+	if ( isset( $_SESSION['USE_DEFAULT_DATE_FORMAT'] ) )
+	{
+		unset( $_SESSION['USE_DEFAULT_DATE_FORMAT'] );
+	}
 }
 else
 {
-		$_SESSION[ 'USE_DEFAULT_DATE_FORMAT' ] = true;
-		if ( isset( $_SESSION[ 'DATE_FORMAT' ] ) )
-		{
-			unset( $_SESSION[ 'DATE_FORMAT' ] );
-		}
+	$_SESSION['USE_DEFAULT_DATE_FORMAT'] = true;
+	if ( isset( $_SESSION['CAT_DATE_FORMAT'] ) )
+	{
+		unset( $_SESSION['CAT_DATE_FORMAT'] );
+	}
 }
 // Update time format
 if ( $time_format != '' )
 {
-		$_SESSION[ 'TIME_FORMAT' ] = $time_format;
-		if ( isset( $_SESSION[ 'USE_DEFAULT_TIME_FORMAT' ] ) )
-		{
-			unset( $_SESSION[ 'USE_DEFAULT_TIME_FORMAT' ] );
-		}
+	$_SESSION['CAT_TIME_FORMAT'] = $time_format;
+	if ( isset( $_SESSION['USE_DEFAULT_TIME_FORMAT'] ) )
+	{
+		unset( $_SESSION['USE_DEFAULT_TIME_FORMAT'] );
+	}
 }
 else
 {
-		$_SESSION[ 'USE_DEFAULT_TIME_FORMAT' ] = true;
-		if ( isset( $_SESSION[ 'TIME_FORMAT' ] ) )
-		{
-			unset( $_SESSION[ 'TIME_FORMAT' ] );
-		}
+	$_SESSION['USE_DEFAULT_TIME_FORMAT'] = true;
+	if ( isset( $_SESSION['CAT_TIME_FORMAT'] ) )
+	{
+		unset( $_SESSION['CAT_TIME_FORMAT'] );
+	}
 }
 // Update timezone
-$_SESSION[ 'TIMEZONE_STRING' ] = $timezone_string;
+$_SESSION['CAT_TIMEZONE_STRING'] = $timezone_string;
diff --git a/upload/account/preferences_form.php b/upload/account/preferences_form.php
index 32731f7b..27a78108 100644
--- a/upload/account/preferences_form.php
+++ b/upload/account/preferences_form.php
@@ -50,19 +50,19 @@
 $submit_ok = false;
 $message   = false;
 $save      = $val->sanitizePost('save');
+$wbcompat  = (defined('WB2COMPAT') && WB2COMPAT===true) ? true : false;
 
 if ( $save && ( $save == 'account_settings' ) )
 {
-	$query   = "SELECT `password` from `" . CAT_TABLE_PREFIX . "users` where `user_id`='" . $user->get_user_id()
-             . "' AND `password`='" . md5( $val->sanitizePost('current_password') ) . "'";
-	$result  = $database->query( $query );
+	$query  = "SELECT `password` from `%susers` where `user_id`='%d' AND `password`='%s'";
+	$result = $database->query(sprintf($query,CAT_TABLE_PREFIX,$user->get_user_id(),md5($val->sanitizePost('current_password'))));
 	if ( $result->numRows() == 1 )
 	{
 		$submit_ok = true;
 	}
-	unset( $query );
-	unset( $result );
-	unset( $_POST['save'] );
+	unset($query);
+	unset($result);
+	unset($_POST['save']);
 }
 
 if (true === $submit_ok)
@@ -147,21 +147,21 @@
 		foreach($fields as $k=>$v)
             $_SESSION[ strtoupper($k) ] = $v;
 
-		$_SESSION['TIMEZONE_STRING'] = $timezone_string;
+		$_SESSION['CAT_TIMEZONE_STRING'] = $timezone_string;
 		date_default_timezone_set($timezone_string);
 
-		if ( $_SESSION['TIME_FORMAT'] != '' ) {
+		if ( $_SESSION['CAT_TIME_FORMAT'] != '' ) {
 			if(isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) unset($_SESSION['USE_DEFAULT_TIME_FORMAT']);
 		} else {
 			$_SESSION['USE_DEFAULT_TIME_FORMAT'] = true;
-			unset($_SESSION['TIME_FORMAT']);
+			unset($_SESSION['CAT_TIME_FORMAT']);
 		}
 
-		if ( $_SESSION['DATE_FORMAT'] != '' ) {
+		if ( $_SESSION['CAT_DATE_FORMAT'] != '' ) {
 			if(isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) unset($_SESSION['USE_DEFAULT_DATE_FORMAT']);
 		} else {
 			$_SESSION['USE_DEFAULT_DATE_FORMAT'] = true;
-			unset($_SESSION['DATE_FORMAT']);
+			unset($_SESSION['CAT_DATE_FORMAT']);
 		}
 	}
 
@@ -181,18 +181,18 @@
 $parser->setFallbackPath(dirname(__FILE__).'/templates/default'); // fallback to default dir
 $parser->output('account_preferences_form',
     array(
-        'languages' => $languages,
-        'timezones' => CAT_Helper_DateTime::getTimezones(),
-        'current_tz' => CAT_Helper_DateTime::getTimezone(),
-        'date_formats' => CAT_Helper_DateTime::getDateFormats(),
-        'current_df' => CAT_Helper_DateTime::getDefaultDateFormatShort(),
-        'time_formats' => CAT_Helper_DateTime::getTimeFormats(),
-        'current_tf' => CAT_Helper_DateTime::getDefaultTimeFormat(),
-        'PREFERENCES_URL' => PREFERENCES_URL,
-        'USER_ID' => $user->get_user_id(),
-        'DISPLAY_NAME' => $user->get_display_name(),
-        'GET_EMAIL' => $user->get_email(),
-        'RESULT_MESSAGE' => $message,
+        'languages'             => $languages,
+        'timezones'             => CAT_Helper_DateTime::getTimezones(),
+        'current_tz'            => CAT_Helper_DateTime::getTimezone(),
+        'date_formats'          => CAT_Helper_DateTime::getDateFormats(),
+        'current_df'            => CAT_Helper_DateTime::getDefaultDateFormatShort(),
+        'time_formats'          => CAT_Helper_DateTime::getTimeFormats(),
+        'current_tf'            => CAT_Helper_DateTime::getDefaultTimeFormat(),
+        'PREFERENCES_URL'       => PREFERENCES_URL,
+        'USER_ID'               => $user->get_user_id(),
+        'DISPLAY_NAME'          => $user->get_display_name(),
+        'GET_EMAIL'             => $user->get_email(),
+        'RESULT_MESSAGE'        => $message,
         'AUTH_MIN_LOGIN_LENGTH' => AUTH_MIN_LOGIN_LENGTH,
     )
 );
diff --git a/upload/backend/media/index.php b/upload/backend/media/index.php
index e829ad0c..e26b3a2c 100755
--- a/upload/backend/media/index.php
+++ b/upload/backend/media/index.php
@@ -105,8 +105,8 @@
         $tpl_data['files'][$counter]['FILETYPE']     = strtolower(pathinfo($file_path, PATHINFO_EXTENSION));
         $tpl_data['files'][$counter]['show_preview'] = ( in_array( strtolower($tpl_data['files'][$counter]['FILETYPE']), $allowed_img_types ) ) ? true : false;
         $tpl_data['files'][$counter]['FILESIZE']     = $dirh->getSize($file_path,true);
-        $tpl_data['files'][$counter]['FILEDATE']     = date (DEFAULT_DATE_FORMAT, filemtime($file_path));
-        $tpl_data['files'][$counter]['FILETIME']     = date (DEFAULT_TIME_FORMAT, filemtime($file_path));
+        $tpl_data['files'][$counter]['FILEDATE']     = date (CAT_DEFAULT_DATE_FORMAT, filemtime($file_path));
+        $tpl_data['files'][$counter]['FILETIME']     = date (CAT_DEFAULT_TIME_FORMAT, filemtime($file_path));
         $tpl_data['files'][$counter]['FULL_NAME']    = $file;
         $tpl_data['files'][$counter]['NAME']         = substr($file , 0 , -( strlen($tpl_data['files'][$counter]['FILETYPE'])+1 ) );
     }
diff --git a/upload/backend/pages/modify.php b/upload/backend/pages/modify.php
index 4ce0c258..2d4c4506 100644
--- a/upload/backend/pages/modify.php
+++ b/upload/backend/pages/modify.php
@@ -105,7 +105,7 @@
 
 $tpl_data['SECTION_BLOCKS'] = SECTION_BLOCKS;
 $tpl_data['SEC_ANCHOR']     = SEC_ANCHOR;
-$tpl_data['DATE_FORMAT']    = DATE_FORMAT;
+$tpl_data['DATE_FORMAT']    = CAT_DATE_FORMAT;
 
 $tpl_data['CUR_TAB']     = 'modify';
 $tpl_data['PAGE_HEADER'] = $backend->lang()->translate('Modify page');
diff --git a/upload/backend/preferences/ajax_save.php b/upload/backend/preferences/ajax_save.php
index b6175e31..7bf90a6c 100644
--- a/upload/backend/preferences/ajax_save.php
+++ b/upload/backend/preferences/ajax_save.php
@@ -190,19 +190,15 @@
             $date_format = $val->sanitizePost('date_format');
 			if ( $date_format != '' )
 			{
-				$_SESSION['DATE_FORMAT'] = $date_format;
+				$_SESSION['CAT_DATE_FORMAT'] = $date_format;
 				if ( isset($_SESSION['USE_DEFAULT_DATE_FORMAT']) )
-				{
 					unset($_SESSION['USE_DEFAULT_DATE_FORMAT']);
 				}
-			}
 			else
 			{
 				$_SESSION['USE_DEFAULT_DATE_FORMAT']	= true;
-				if ( isset($_SESSION['DATE_FORMAT']) )
-				{
-					unset($_SESSION['DATE_FORMAT']);
-				}
+				if ( isset($_SESSION['CAT_DATE_FORMAT']) )
+					unset($_SESSION['CAT_DATE_FORMAT']);
 			}
 			// ====================== 
 			// ! Update time format   
@@ -210,19 +206,22 @@
             $time_format = $val->sanitizePost('time_format');
 			if ( $time_format != '' )
 			{
-				$_SESSION['TIME_FORMAT']		= $time_format;
+				$_SESSION['CAT_TIME_FORMAT'] = $time_format;
 				if ( isset($_SESSION['USE_DEFAULT_TIME_FORMAT']) )
-				{
 					unset($_SESSION['USE_DEFAULT_TIME_FORMAT']);
 				}
-			}
 			else
 			{
 				$_SESSION['USE_DEFAULT_TIME_FORMAT'] = true;
-				if ( isset($_SESSION['TIME_FORMAT']) )
+				if ( isset($_SESSION['CAT_TIME_FORMAT']) )
+					unset($_SESSION['CAT_TIME_FORMAT']);
+			}
+
+            if( defined('WB2COMPAT') && WB2COMPAT === true )
 				{
-					unset($_SESSION['TIME_FORMAT']);
-				}
+                $wb2compat_format_map = CAT_Registry::get('WB2COMPAT_FORMAT_MAP');
+                $_SESSION['DATE_FORMAT'] = $wb2compat_format_map[$_SESSION['CAT_DATE_FORMAT']];
+                $_SESSION['TIME_FORMAT'] = $wb2compat_format_map[$_SESSION['CAT_TIME_FORMAT']];
 			}
 
 			// ==================== 
diff --git a/upload/backend/preferences/index.php b/upload/backend/preferences/index.php
index 03fcd29a..779660ee 100644
--- a/upload/backend/preferences/index.php
+++ b/upload/backend/preferences/index.php
@@ -114,7 +114,7 @@
 // =========================== 
 $DATE_FORMATS = CAT_Helper_DateTime::getDateFormats();
 $USE_DEFAULT  = $val->fromSession('USE_DEFAULT_DATE_FORMAT');
-$userformat   = $val->fromSession('DATE_FORMAT');
+$userformat   = $val->fromSession('CAT_DATE_FORMAT');
 $counter=0;
 foreach ( $DATE_FORMATS AS $format => $title )
 {
@@ -134,7 +134,7 @@
 // =========================== 
 $TIME_FORMATS = CAT_Helper_DateTime::getTimeFormats();
 $USE_DEFAULT  = $val->fromSession('USE_DEFAULT_TIME_FORMAT');
-$userformat   = $val->fromSession('TIME_FORMAT');
+$userformat   = $val->fromSession('CAT_TIME_FORMAT');
 $counter	= 0;
 foreach ( $TIME_FORMATS AS $format => $title )
 {
diff --git a/upload/backend/settings/functions.php b/upload/backend/settings/functions.php
index 0b444bd5..6a119fec 100644
--- a/upload/backend/settings/functions.php
+++ b/upload/backend/settings/functions.php
@@ -220,7 +220,7 @@ function getDateformats() {
         $data[$counter] = array(
             'NAME'     => $title,
             'VALUE'    => ( $format != 'system_default' )    ? $format : '',
-            'SELECTED' => ( DEFAULT_DATE_FORMAT == $format ) ? true    : false
+            'SELECTED' => ( CAT_DEFAULT_DATE_FORMAT == $format ) ? true    : false
         );
         $counter++;
     }
@@ -334,15 +334,15 @@ function saveDatetime($backend) {
        ? $default_language
        : $old_settings['default_language'];
     // check date format
-    $settings['default_date_format']
+    $settings['cat_default_date_format']
        = CAT_Helper_DateTime::checkDateformat($val->sanitizePost('default_date_format'))
        ? $val->sanitizePost('default_date_format')
-       : $old_settings['default_date_format'];
+       : $old_settings['cat_default_date_format'];
     // check time format
-    $settings['default_time_format']
+    $settings['cat_default_time_format']
        = CAT_Helper_DateTime::checkTimeformat($val->sanitizePost('default_time_format'))
        ? $val->sanitizePost('default_time_format')
-       : $old_settings['default_date_format'];
+       : $old_settings['cat_default_time_format'];
     // check timezone string
     $settings['default_timezone_string']
        = CAT_Helper_DateTime::checkTZ($val->sanitizePost('default_timezone_string'))
diff --git a/upload/framework/CAT/Backend.php b/upload/framework/CAT/Backend.php
index f39f7ecd..5326b89e 100644
--- a/upload/framework/CAT/Backend.php
+++ b/upload/framework/CAT/Backend.php
@@ -267,7 +267,7 @@ public function print_header()
                 'DD',
                 'MM'
             );
-            $tpl_data['DATE_FORMAT'] = str_replace($date_search, $date_replace, CAT_Registry::get('DATE_FORMAT'));
+            $tpl_data['DATE_FORMAT'] = str_replace($date_search, $date_replace, CAT_Registry::get('CAT_DATE_FORMAT'));
             $time_search             = array(
                 'H',
                 'i',
diff --git a/upload/framework/CAT/Helper/DateTime.php b/upload/framework/CAT/Helper/DateTime.php
index 27d22109..d13c5a21 100644
--- a/upload/framework/CAT/Helper/DateTime.php
+++ b/upload/framework/CAT/Helper/DateTime.php
@@ -140,7 +140,7 @@ public static function getTimezone()
             return
                 isset($tz)
                 ? $tz
-                : DEFAULT_TIMEZONESTRING;
+                : DEFAULT_TIMEZONE_STRING;
         }
 
         /**
@@ -236,11 +236,15 @@ public static function getDateFormats()
         public static function getDefaultTimeFormat()
         {
             global $language_time;
-            if ( isset ($_SESSION['TIME_FORMAT']) ) return $_SESSION['TIME_FORMAT'];
-            if ( defined('DEFAULT_TIME_FORMAT') ) return DEFAULT_TIME_FORMAT;
+            // user defined format
+            if ( isset ($_SESSION['CAT_TIME_FORMAT']) ) return $_SESSION['CAT_TIME_FORMAT'];
+            // default format
+            if ( defined('CAT_DEFAULT_TIME_FORMAT') )   return CAT_DEFAULT_TIME_FORMAT;
+            // language file
             if ( isset($language_time) )          return $language_time;
+            // global default
             return '%H:%M';
-        }
+        }   // end function getDefaultTimeFormat()
 
         /**
          * returns the default date format (short)
@@ -252,22 +256,27 @@ public static function getDefaultTimeFormat()
         public static function getDefaultDateFormatShort()
         {
             global $language_date_short;
-            if ( isset ($_SESSION['DATE_FORMAT_SHORT']) ) return $_SESSION['DATE_FORMAT'];
-            if ( defined('DEFAULT_DATE_FORMAT_SHORT') )   return DEFAULT_DATE_FORMAT_SHORT;
+            // user defined format
+            if ( isset ($_SESSION['CAT_DATE_FORMAT']) )       return $_SESSION['CAT_DATE_FORMAT'];
+            // default format short
+            if ( defined('CAT_DEFAULT_DATE_FORMAT_SHORT') )   return CAT_DEFAULT_DATE_FORMAT_SHORT;
+            // language file
             if ( isset($language_date_short) )            return $language_date_short;
-            if ( defined('DEFAULT_DATE_FORMAT') )   return DEFAULT_DATE_FORMAT;
+            // default format
+            if ( defined('CAT_DEFAULT_DATE_FORMAT') )         return CAT_DEFAULT_DATE_FORMAT;
+            // global default
             return '%d-%m-%Y';
-        }
+        }   // end function getDefaultDateFormatShort()
 
         public static function getDefaultDateFormatLong()
         {
             global $language_date_long;
             $format = NULL;
-            if ( defined('DEFAULT_DATE_FORMAT') ) $format = DEFAULT_DATE_FORMAT;
+            if ( defined('CAT_DEFAULT_DATE_FORMAT') ) $format = CAT_DEFAULT_DATE_FORMAT;
             elseif ( isset($language_date_long) ) $format = $language_date_long;
             else                                  $format = '%x';
             $format .= ' ' . self::getDefaultTimeFormat();
             return $format;
-        }
+        }   // end function getDefaultDateFormatLong()
     }
 }
diff --git a/upload/framework/CAT/Helper/Page.php b/upload/framework/CAT/Helper/Page.php
index 75cba330..97da242f 100644
--- a/upload/framework/CAT/Helper/Page.php
+++ b/upload/framework/CAT/Helper/Page.php
@@ -975,9 +975,9 @@ public static function getHeaders($for = NULL, $section = false)
             DATE_FORMAT						  = '" . str_replace(
             	array( '%', 'Y', 'm', 'd' ),
             	array( '', 'yy', 'mm', 'dd' ),
-            	DATE_FORMAT
+            	CAT_DATE_FORMAT
             ) . "',
-			TIME_FORMAT						  = '" . str_replace( '%', '', TIME_FORMAT ) . "',
+			TIME_FORMAT						  = '" . str_replace( '%', '', CAT_TIME_FORMAT ) . "',
 			DEFAULT_LANGUAGE				  = '" . DEFAULT_LANGUAGE . "',
 			SESSION							  =	'" . session_name() . "';
             ";
diff --git a/upload/framework/CAT/Users.php b/upload/framework/CAT/Users.php
index f8e79b4d..c8f82278 100644
--- a/upload/framework/CAT/Users.php
+++ b/upload/framework/CAT/Users.php
@@ -169,18 +169,25 @@ public static function handleLogin($output=true)
                                 : CAT_Registry::get('DEFAULT_TIMEZONE_STRING')
                                 ;
 
-                            $_SESSION['DATE_FORMAT']
+                            $_SESSION['CAT_DATE_FORMAT']
                                 = ( isset($prefs['date_format']) && $prefs['date_format'] != '' )
                                 ? $prefs['date_format']
-                                : CAT_Registry::get('DEFAULT_DATE_FORMAT')
+                                : CAT_Registry::get('CAT_DEFAULT_DATE_FORMAT')
                                 ;
 
-                            $_SESSION['TIME_FORMAT']
+                            $_SESSION['CAT_TIME_FORMAT']
                                 = ( isset($prefs['time_format']) && $prefs['time_format'] != '' )
                                 ? $prefs['time_format']
-                                : CAT_Registry::get('DEFAULT_TIME_FORMAT')
+                                : CAT_Registry::get('CAT_DEFAULT_TIME_FORMAT')
                                 ;
 
+                            if( defined('WB2COMPAT') && WB2COMPAT === true )
+                            {
+                                $wb2compat_format_map = CAT_Registry::get('WB2COMPAT_FORMAT_MAP');
+                                $_SESSION['DATE_FORMAT'] = $wb2compat_format_map[$_SESSION['CAT_DATE_FORMAT']];
+                                $_SESSION['TIME_FORMAT'] = $wb2compat_format_map[$_SESSION['CAT_TIME_FORMAT']];
+                            }
+
                 			date_default_timezone_set($_SESSION['TIMEZONE_STRING']);
 
                             $_SESSION['SYSTEM_PERMISSIONS']		= 0;
diff --git a/upload/framework/initialize.php b/upload/framework/initialize.php
index c3d5d351..0191538e 100644
--- a/upload/framework/initialize.php
+++ b/upload/framework/initialize.php
@@ -219,8 +219,8 @@
     //**************************************************************************
     $timezone_string = (isset($_SESSION['TIMEZONE_STRING']) ? $_SESSION['TIMEZONE_STRING'] : DEFAULT_TIMEZONE_STRING);
 	date_default_timezone_set($timezone_string);
-    CAT_Registry::register('TIME_FORMAT', CAT_Helper_DateTime::getDefaultTimeFormat(), true);
-    CAT_Registry::register('DATE_FORMAT', CAT_Helper_DateTime::getDefaultDateFormatShort(), true);
+    CAT_Registry::register('CAT_TIME_FORMAT', CAT_Helper_DateTime::getDefaultTimeFormat(), true);
+    CAT_Registry::register('CAT_DATE_FORMAT', CAT_Helper_DateTime::getDefaultDateFormatShort(), true);
     
     //**************************************************************************
     // Disable magic_quotes_runtime
diff --git a/upload/framework/wb2compat.php b/upload/framework/wb2compat.php
index 1202030d..98fd0a58 100644
--- a/upload/framework/wb2compat.php
+++ b/upload/framework/wb2compat.php
@@ -59,3 +59,36 @@
 
 // old language definitions - needed for some older modules, like Code2
 define('ENABLE_OLD_LANGUAGE_DEFINITIONS',true);
+
+// map new date and time formats to old ones
+$wb2compat_format_map = array(
+    '%A, %d. %B %Y' => 'l, jS F, Y',
+    '%e %B, %Y'     => 'jS F, Y',
+    '%d %m %Y'      => 'd M Y',
+    '%b %d %Y'      => 'M d Y',
+    '%a %b %d, %Y'  => 'D M d, Y',
+    '%d-%m-%Y'      => 'd-m-Y',
+    '%m-%d-%Y'      => 'm-d-Y',
+    '%d.%m.%Y'      => 'd.m.Y',
+    '%m.%d.%Y'      => 'm.d.Y',
+    '%d/%m/%Y'      => 'd/m/Y',
+    '%m/%d/%Y'      => 'm/d/Y',
+    '%a, %d %b %Y %H:%M:%S %z' => 'r',
+    '%A, %d. %B %Y' => 'l, jS F Y',
+    '%H:%M'         => 'H:i',
+    '%H:%M:%S'      => 'H:i:s',
+    '%I:%M %p'      => 'g:i a',
+);
+
+// global settings
+if(defined('CAT_DATE_FORMAT') && array_key_exists(CAT_DATE_FORMAT,$wb2compat_format_map))
+    define('DATE_FORMAT',$wb2compat_format_map[CAT_DATE_FORMAT]);
+if(defined('CAT_DEFAULT_DATE_FORMAT') && array_key_exists(CAT_DEFAULT_DATE_FORMAT,$wb2compat_format_map))
+    define('DEFAULT_DATE_FORMAT',$wb2compat_format_map[CAT_DEFAULT_DATE_FORMAT]);
+
+if(defined('CAT_TIME_FORMAT') && array_key_exists(CAT_TIME_FORMAT,$wb2compat_format_map))
+    define('TIME_FORMAT',$wb2compat_format_map[CAT_TIME_FORMAT]);
+if(defined('CAT_DEFAULT_TIME_FORMAT') && array_key_exists(CAT_DEFAULT_TIME_FORMAT,$wb2compat_format_map))
+    define('DEFAULT_TIME_FORMAT',$wb2compat_format_map[CAT_DEFAULT_TIME_FORMAT]);
+
+CAT_Registry::set('WB2COMPAT_FORMAT_MAP',$wb2compat_format_map);
diff --git a/upload/install/index.php b/upload/install/index.php
index 9bda8e89..d5cf08ec 100644
--- a/upload/install/index.php
+++ b/upload/install/index.php
@@ -45,7 +45,7 @@
 error_reporting(E_ALL^E_NOTICE);
 
 // set global default to avoid warnings
-date_default_timezone_set('Europe/Paris');
+date_default_timezone_set('Europe/Berlin');
 
 set_include_path (
     implode(
diff --git a/upload/install/update/update.php b/upload/install/update/update.php
index a5175124..07aeca54 100644
--- a/upload/install/update/update.php
+++ b/upload/install/update/update.php
@@ -135,6 +135,20 @@
     ));
 }
 
+/*******************************************************************************
+    1.0.2 TO 1.0.3
+*******************************************************************************/
+
+// date and time formats
+$database->query(sprintf(
+    'UPDATE `%ssettings` SET `name`="CAT_DEFAULT_DATE_FORMAT" WHERE `name`="DEFAULT_DATE_FORMAT"',
+    CAT_TABLE_PREFIX
+));
+$database->query(sprintf(
+    'UPDATE `%ssettings` SET `name`="CAT_DEFAULT_TIME_FORMAT" WHERE `name`="DEFAULT_TIME_FORMAT"',
+    CAT_TABLE_PREFIX
+));
+
 /*******************************************************************************
     update version info
 *******************************************************************************/
diff --git a/upload/templates/freshcat/js/backend_preferences.js b/upload/templates/freshcat/js/backend_preferences.js
index 750960f3..b61e5f5e 100644
--- a/upload/templates/freshcat/js/backend_preferences.js
+++ b/upload/templates/freshcat/js/backend_preferences.js
@@ -23,7 +23,7 @@
 
 jQuery(document).ready(function()
 {
-    var fields = new Array( 'fc_pref_display_name', 'fc_language', 'fc_timezone_string', 'fc_date_format', 'fc_email' );
+    var fields = new Array( 'fc_pref_display_name', 'fc_language', 'fc_timezone_string', 'fc_date_format', 'fc_time_format', 'fc_email' );
     for( i=0; i<=fields.length; i++ )
 	{
         $('#'+fields[i]).change( function() {