diff --git a/class2.php b/class2.php
index 92221c703..b565565f2 100644
--- a/class2.php
+++ b/class2.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/class2.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2006-12-05 09:32:15 $
-|     $Author: mrpete $
+|     $Revision: 1.4 $
+|     $Date: 2006-12-07 15:41:49 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 //
@@ -797,6 +797,14 @@ if (strpos(e_SELF, $ADMIN_DIRECTORY) !== FALSE || strpos(e_SELF, "admin.php") !=
 
 if(!defined("IMODE")) define("IMODE", "lite");
 
+if (IMODE == 'lite') {
+	$imode = 'nuvola_light';
+} else if (IMODE == 'dark') {
+	$imode = 'nuvola_dark';
+} else {
+	$imode = IMODE;
+}
+
 if ($pref['anon_post'] ? define("ANON", TRUE) : define("ANON", FALSE));
 
 if (Empty($pref['newsposts']) ? define("ITEMVIEW", 15) : define("ITEMVIEW", $pref['newsposts']));
diff --git a/download.php b/download.php
index 60d9bd86d..54a7e2d63 100644
--- a/download.php
+++ b/download.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/download.php,v $
-|     $Revision: 1.2 $ - with modifications
-|     $Date: 2006-12-07 12:48:42 $
-|     $Author: mrpete $
+|     $Revision: 1.3 $ - with modifications
+|     $Date: 2006-12-07 15:41:49 $
+|     $Author: sweetas $
 |
 | Modifications by steved:
 |	1. Can display sub-categories which contain sub-sub categories and files
@@ -36,8 +36,8 @@ if(!defined("USER_WIDTH")){ define("USER_WIDTH","width:100%"); }
 
 
 /* define images */
-define("IMAGE_DOWNLOAD", (file_exists(THEME."images/download.png") ? THEME."images/download.png" : e_IMAGE."generic/".IMODE."/download.png"));
-define("IMAGE_NEW", (file_exists(THEME."images/new.png") ? THEME."images/new.png" : e_IMAGE."generic/".IMODE."/new.png"));
+define("IMAGE_DOWNLOAD", (file_exists(THEME."images/download.png") ? THEME."images/download.png" : e_IMAGE."packs/".$imode."/generic/download.png"));
+define("IMAGE_NEW", (file_exists(THEME."images/new.png") ? THEME."images/new.png" : e_IMAGE."packs/".$imode."/generic/new.png"));
 
 /* define image style */
 
diff --git a/e107_admin/ad_links.php b/e107_admin/ad_links.php
index 41abf641e..b1205b8be 100644
--- a/e107_admin/ad_links.php
+++ b/e107_admin/ad_links.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/ad_links.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:11 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:49 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 
@@ -25,335 +25,335 @@ if (file_exists(THEME.'admin_images/admin_images.php')) {
 
 // Small Category Images
 if (!defined('E_16_CAT_SETT')) {
-	define('E_16_CAT_SETT', e_IMAGE.'admin_images/cat_settings_16.png');
+	define('E_16_CAT_SETT', e_IMAGE.'packs/'.$imode.'/admin_images/cat_settings_16.png');
 }
 if (!defined('E_16_CAT_USER')) {
-	define('E_16_CAT_USER', e_IMAGE.'admin_images/cat_users_16.png');
+	define('E_16_CAT_USER', e_IMAGE.'packs/'.$imode.'/admin_images/cat_users_16.png');
 }
 if (!defined('E_16_CAT_CONT')) {
-	define('E_16_CAT_CONT', e_IMAGE.'admin_images/cat_content_16.png');
+	define('E_16_CAT_CONT', e_IMAGE.'packs/'.$imode.'/admin_images/cat_content_16.png');
 }
 if (!defined('E_16_CAT_FILE')) {
-	define('E_16_CAT_FILE', e_IMAGE.'admin_images/cat_files_16.png');
+	define('E_16_CAT_FILE', e_IMAGE.'packs/'.$imode.'/admin_images/cat_files_16.png');
 }
 if (!defined('E_16_CAT_TOOL')) {
-	define('E_16_CAT_TOOL', e_IMAGE.'admin_images/cat_tools_16.png');
+	define('E_16_CAT_TOOL', e_IMAGE.'packs/'.$imode.'/admin_images/cat_tools_16.png');
 }
 if (!defined('E_16_CAT_PLUG')) {
-	define('E_16_CAT_PLUG', e_IMAGE.'admin_images/cat_plugins_16.png');
+	define('E_16_CAT_PLUG', e_IMAGE.'packs/'.$imode.'/admin_images/cat_plugins_16.png');
 }
 
 // Large Category Images
 if (!defined('E_32_CAT_SETT')) {
-	define('E_32_CAT_SETT', "<img src='".e_IMAGE."admin_images/cat_settings_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CAT_SETT', "<img src='".e_IMAGE."packs/".$imode."/admin_images/cat_settings_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_CAT_USER')) {
-	define('E_32_CAT_USER', "<img src='".e_IMAGE."admin_images/cat_users_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CAT_USER', "<img src='".e_IMAGE."packs/".$imode."/admin_images/cat_users_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_CAT_CONT')) {
-	define('E_32_CAT_CONT', "<img src='".e_IMAGE."admin_images/cat_content_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CAT_CONT', "<img src='".e_IMAGE."packs/".$imode."/admin_images/cat_content_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_CAT_FILE')) {
-	define('E_32_CAT_FILE', "<img src='".e_IMAGE."admin_images/cat_files_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CAT_FILE', "<img src='".e_IMAGE."packs/".$imode."/admin_images/cat_files_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_CAT_TOOL')) {
-	define('E_32_CAT_TOOL', "<img src='".e_IMAGE."admin_images/cat_tools_32.png' alt='' style='border:0px; width:32px; height:32px' />");
+	define('E_32_CAT_TOOL', "<img src='".e_IMAGE."packs/".$imode."/admin_images/cat_tools_32.png' alt='' style='border:0px; width:32px; height:32px' />");
 }
 if (!defined('E_32_CAT_PLUG')) {
-	define('E_32_CAT_PLUG', "<img src='".e_IMAGE."admin_images/cat_plugins_32.png' alt='' style='border:0px; width:32px; height:32px' />");
+	define('E_32_CAT_PLUG', "<img src='".e_IMAGE."packs/".$imode."/admin_images/cat_plugins_32.png' alt='' style='border:0px; width:32px; height:32px' />");
 }
 
 // Small Nav Images
 if (!defined('E_16_NAV_MAIN')) {
-	define('E_16_NAV_MAIN', e_IMAGE.'admin_images/main_16.png');
+	define('E_16_NAV_MAIN', e_IMAGE.'packs/'.$imode.'/admin_images/main_16.png');
 }
 if (!defined('E_16_NAV_DOCS')) {
-	define('E_16_NAV_DOCS', e_IMAGE.'admin_images/docs_16.png');
+	define('E_16_NAV_DOCS', e_IMAGE.'packs/'.$imode.'/admin_images/docs_16.png');
 }
 if (!defined('E_16_NAV_LEAV')) {
-	define('E_16_NAV_LEAV', e_IMAGE.'admin_images/leave_16.png');
+	define('E_16_NAV_LEAV', e_IMAGE.'packs/'.$imode.'/admin_images/leave_16.png');
 }
 if (!defined('E_16_NAV_LGOT')) {
-	define('E_16_NAV_LGOT', e_IMAGE.'admin_images/logout_16.png');
+	define('E_16_NAV_LGOT', e_IMAGE.'packs/'.$imode.'/admin_images/logout_16.png');
 }
 if (!defined('E_16_NAV_ARROW')) {
-	define('E_16_NAV_ARROW', e_IMAGE.'admin_images/arrow_16.png');
+	define('E_16_NAV_ARROW', e_IMAGE.'packs/'.$imode.'/admin_images/arrow_16.png');
 }
 if (!defined('E_16_NAV_ARROW_OVER')) {
-	define('E_16_NAV_ARROW_OVER', e_IMAGE.'admin_images/arrow_over_16.png');
+	define('E_16_NAV_ARROW_OVER', e_IMAGE.'packs/'.$imode.'/admin_images/arrow_over_16.png');
 }
 
 // Large Nav Images
 if (!defined('E_32_NAV_MAIN')) {
-	define('E_32_NAV_MAIN', "<img src='".e_IMAGE."'admin_images/main_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NAV_MAIN', "<img src='".e_IMAGE."packs/".$imode."/admin_images/main_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_NAV_DOCS')) {
-	define('E_32_NAV_DOCS', "<img src='".e_IMAGE."'admin_images/docs_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NAV_DOCS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/docs_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_NAV_LEAV')) {
-	define('E_32_NAV_LEAV', "<img src='".e_IMAGE."'admin_images/leave_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NAV_LEAV', "<img src='".e_IMAGE."packs/".$imode."/admin_images/leave_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_NAV_LGOT')) {
-	define('E_32_NAV_LGOT', "<img src='".e_IMAGE."'admin_images/logout_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NAV_LGOT', "<img src='".e_IMAGE."packs/".$imode."/admin_images/logout_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_NAV_ARROW')) {
-	define('E_32_NAV_ARROW', "<img src='".e_IMAGE."'admin_images/arrow_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NAV_ARROW', "<img src='".e_IMAGE."packs/".$imode."/admin_images/arrow_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_NAV_ARROW_OVER')) {
-	define('E_32_NAV_ARROW_OVER', "<img src='".e_IMAGE."'admin_images/arrow_over_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NAV_ARROW_OVER', "<img src='".e_IMAGE."packs/".$imode."/admin_images/arrow_over_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 
 // Small Admin Main Link Images
 if (!defined('E_16_ADMIN')) {
-	define('E_16_ADMIN', "<img src='".e_IMAGE."admin_images/admins_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_ADMIN', "<img src='".e_IMAGE."packs/".$imode."/admin_images/admins_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_ADPASS')) {
-	define('E_16_ADPASS', "<img src='".e_IMAGE."admin_images/adminpass_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_ADPASS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/adminpass_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_BANLIST')) {
-	define('E_16_BANLIST', "<img src='".e_IMAGE."admin_images/banlist_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_BANLIST', "<img src='".e_IMAGE."packs/".$imode."/admin_images/banlist_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_BANNER')) {
-	define('E_16_BANNER', "<img src='".e_IMAGE."admin_images/banners_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_BANNER', "<img src='".e_IMAGE."packs/".$imode."/admin_images/banners_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_CACHE')) {
-	define('E_16_CACHE', "<img src='".e_IMAGE."admin_images/cache_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_CACHE', "<img src='".e_IMAGE."packs/".$imode."/admin_images/cache_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_CREDITS')) {
-	define('E_16_CREDITS', "<img src='".e_IMAGE."admin_images/credits_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_CREDITS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/credits_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_CUST')) {
-	define('E_16_CUST', "<img src='".e_IMAGE."admin_images/custom_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_CUST', "<img src='".e_IMAGE."packs/".$imode."/admin_images/custom_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_DATAB')) {
-	define('E_16_DATAB', "<img src='".e_IMAGE."admin_images/database_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_DATAB', "<img src='".e_IMAGE."packs/".$imode."/admin_images/database_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_DOWNL')) {
-	define('E_16_DOWNL', "<img src='".e_IMAGE."admin_images/downloads_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_DOWNL', "<img src='".e_IMAGE."packs/".$imode."/admin_images/downloads_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_EMOTE')) {
-	define('E_16_EMOTE', "<img src='".e_IMAGE."admin_images/emoticons_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_EMOTE', "<img src='".e_IMAGE."packs/".$imode."/admin_images/emoticons_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_FILE')) {
-	define('E_16_FILE', "<img src='".e_IMAGE."admin_images/filemanager_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_FILE', "<img src='".e_IMAGE."packs/".$imode."/admin_images/filemanager_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_FORUM')) {
-	define('E_16_FORUM', "<img src='".e_IMAGE."admin_images/forums_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_FORUM', "<img src='".e_IMAGE."packs/".$imode."/admin_images/forums_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_FRONT')) {
-	define('E_16_FRONT', "<img src='".e_IMAGE."admin_images/frontpage_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_FRONT', "<img src='".e_IMAGE."packs/".$imode."/admin_images/frontpage_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_IMAGES')) {
-	define('E_16_IMAGES', "<img src='".e_IMAGE."admin_images/images_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_IMAGES', "<img src='".e_IMAGE."packs/".$imode."/admin_images/images_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_INSPECT')) {
-	define('E_16_INSPECT', "<img src='".e_IMAGE."admin_images/fileinspector_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_INSPECT', "<img src='".e_IMAGE."packs/".$imode."/admin_images/fileinspector_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_LINKS')) {
-	define('E_16_LINKS', "<img src='".e_IMAGE."admin_images/links_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_LINKS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/links_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_WELCOME')) {
-	define('E_16_WELCOME', "<img src='".e_IMAGE."admin_images/welcome_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_WELCOME', "<img src='".e_IMAGE."packs/".$imode."/admin_images/welcome_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_MAIL')) {
-	define('E_16_MAIL', "<img src='".e_IMAGE."admin_images/mail_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_MAIL', "<img src='".e_IMAGE."packs/".$imode."/admin_images/mail_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_MAINTAIN')) {
-	define('E_16_MAINTAIN', "<img src='".e_IMAGE."admin_images/maintain_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_MAINTAIN', "<img src='".e_IMAGE."packs/".$imode."/admin_images/maintain_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_MENUS')) {
-	define('E_16_MENUS', "<img src='".e_IMAGE."admin_images/menus_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_MENUS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/menus_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_META')) {
-	define('E_16_META', "<img src='".e_IMAGE."admin_images/meta_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_META', "<img src='".e_IMAGE."packs/".$imode."/admin_images/meta_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_NEWS')) {
-	define('E_16_NEWS', "<img src='".e_IMAGE."admin_images/news_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_NEWS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/news_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_NEWSFEED')) {
-	define('E_16_NEWSFEED', "<img src='".e_IMAGE."admin_images/newsfeeds_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_NEWSFEED', "<img src='".e_IMAGE."packs/".$imode."/admin_images/newsfeeds_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_NOTIFY')) {
-	define('E_16_NOTIFY', "<img src='".e_IMAGE."admin_images/notify_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_NOTIFY', "<img src='".e_IMAGE."packs/".$imode."/admin_images/notify_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_PHP')) {
-	define('E_16_PHP', "<img src='".e_IMAGE."admin_images/phpinfo_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_PHP', "<img src='".e_IMAGE."packs/".$imode."/admin_images/phpinfo_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_POLLS')) {
-	define('E_16_POLLS', "<img src='".e_IMAGE."admin_images/polls_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_POLLS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/polls_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_PREFS')) {
-	define('E_16_PREFS', "<img src='".e_IMAGE."admin_images/prefs_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_PREFS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/prefs_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_SEARCH')) {
-	define('E_16_SEARCH', "<img src='".e_IMAGE."admin_images/search_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_SEARCH', "<img src='".e_IMAGE."packs/".$imode."/admin_images/search_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_UPLOADS')) {
-	define('E_16_UPLOADS', "<img src='".e_IMAGE."admin_images/uploads_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_UPLOADS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/uploads_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_USER')) {
-	define('E_16_USER', "<img src='".e_IMAGE."admin_images/users_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_USER', "<img src='".e_IMAGE."packs/".$imode."/admin_images/users_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_USER_EXTENDED')) {
-	define('E_16_USER_EXTENDED', "<img src='".e_IMAGE."admin_images/extended_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_USER_EXTENDED', "<img src='".e_IMAGE."packs/".$imode."/admin_images/extended_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_USERCLASS')) {
-	define('E_16_USERCLASS', "<img src='".e_IMAGE."admin_images/userclass_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_USERCLASS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/userclass_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_LANGUAGE')) {
-	define('E_16_LANGUAGE', "<img src='".e_IMAGE."admin_images/language_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_LANGUAGE', "<img src='".e_IMAGE."packs/".$imode."/admin_images/language_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 
 // Small Admin Other Link Images
 if (!defined('E_16_PLUGIN')) {
-	define('E_16_PLUGIN', "<img src='".e_IMAGE."admin_images/plugins_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_PLUGIN', "<img src='".e_IMAGE."packs/".$imode."/admin_images/plugins_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_PLUGMANAGER')) {
-	define('E_16_PLUGMANAGER', "<img src='".e_IMAGE."admin_images/plugmanager_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_PLUGMANAGER', "<img src='".e_IMAGE."packs/".$imode."/admin_images/plugmanager_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_DOCS')) {
-	define('E_16_DOCS', "<img src='".e_IMAGE."admin_images/docs_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_DOCS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/docs_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_THEMEMANAGER')) {
-	define('E_16_THEMEMANAGER', "<img src='".e_IMAGE."admin_images/themes_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_THEMEMANAGER', "<img src='".e_IMAGE."packs/".$imode."/admin_images/themes_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 
 // Small Admin Other Images
 if (!defined('E_16_COMMENT')) {
-	define('E_16_COMMENT', "<img src='".e_IMAGE."admin_images/comments_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_COMMENT', "<img src='".e_IMAGE."packs/".$imode."/admin_images/comments_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 if (!defined('E_16_ADMINLOG')) {
-	define('E_16_ADMINLOG', "<img src='".e_IMAGE."admin_images/adminlogs_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
+	define('E_16_ADMINLOG', "<img src='".e_IMAGE."packs/".$imode."/admin_images/adminlogs_16.png' alt='' style='border:0px; vertical-align:bottom; width: 16px; height: 16px' />");
 }
 
 // Large Admin Main Link Images
 if (!defined('E_32_ADMIN')) {
-	define('E_32_ADMIN', "<img src='".e_IMAGE."admin_images/admins_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_ADMIN', "<img src='".e_IMAGE."packs/".$imode."/admin_images/admins_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_ADPASS')) {
-	define('E_32_ADPASS', "<img src='".e_IMAGE."admin_images/adminpass_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_ADPASS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/adminpass_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_BANLIST')) {
-	define('E_32_BANLIST', "<img src='".e_IMAGE."admin_images/banlist_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_BANLIST', "<img src='".e_IMAGE."packs/".$imode."/admin_images/banlist_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_BANNER')) {
-	define('E_32_BANNER', "<img src='".e_IMAGE."admin_images/banners_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_BANNER', "<img src='".e_IMAGE."packs/".$imode."/admin_images/banners_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_CACHE')) {
-	define('E_32_CACHE', "<img src='".e_IMAGE."admin_images/cache_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CACHE', "<img src='".e_IMAGE."packs/".$imode."/admin_images/cache_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_CREDITS')) {
-	define('E_32_CREDITS', "<img src='".e_IMAGE."admin_images/credits_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CREDITS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/credits_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_CUST')) {
-	define('E_32_CUST', "<img src='".e_IMAGE."admin_images/custom_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_CUST', "<img src='".e_IMAGE."packs/".$imode."/admin_images/custom_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_DATAB')) {
-	define('E_32_DATAB', "<img src='".e_IMAGE."admin_images/database_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_DATAB', "<img src='".e_IMAGE."packs/".$imode."/admin_images/database_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_DOWNL')) {
-	define('E_32_DOWNL', "<img src='".e_IMAGE."admin_images/downloads_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_DOWNL', "<img src='".e_IMAGE."packs/".$imode."/admin_images/downloads_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_EMOTE')) {
-	define('E_32_EMOTE', "<img src='".e_IMAGE."admin_images/emoticons_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_EMOTE', "<img src='".e_IMAGE."packs/".$imode."/admin_images/emoticons_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_FILE')) {
-	define('E_32_FILE', "<img src='".e_IMAGE."admin_images/filemanager_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_FILE', "<img src='".e_IMAGE."packs/".$imode."/admin_images/filemanager_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_FORUM')) {
-	define('E_32_FORUM', "<img src='".e_IMAGE."admin_images/forums_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_FORUM', "<img src='".e_IMAGE."packs/".$imode."/admin_images/forums_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_FRONT')) {
-	define('E_32_FRONT', "<img src='".e_IMAGE."admin_images/frontpage_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_FRONT', "<img src='".e_IMAGE."packs/".$imode."/admin_images/frontpage_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_IMAGES')) {
-	define('E_32_IMAGES', "<img src='".e_IMAGE."admin_images/images_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_IMAGES', "<img src='".e_IMAGE."packs/".$imode."/admin_images/images_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_INSPECT')) {
-	define('E_32_INSPECT', "<img src='".e_IMAGE."admin_images/fileinspector_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_INSPECT', "<img src='".e_IMAGE."packs/".$imode."/admin_images/fileinspector_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_LINKS')) {
-	define('E_32_LINKS', "<img src='".e_IMAGE."admin_images/links_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_LINKS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/links_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_WELCOME')) {
-	define('E_32_WELCOME', "<img src='".e_IMAGE."admin_images/welcome_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_WELCOME', "<img src='".e_IMAGE."packs/".$imode."/admin_images/welcome_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_MAIL')) {
-	define('E_32_MAIL', "<img src='".e_IMAGE."admin_images/mail_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_MAIL', "<img src='".e_IMAGE."packs/".$imode."/admin_images/mail_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_MAINTAIN')) {
-	define('E_32_MAINTAIN', "<img src='".e_IMAGE."admin_images/maintain_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_MAINTAIN', "<img src='".e_IMAGE."packs/".$imode."/admin_images/maintain_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_MENUS')) {
-	define('E_32_MENUS', "<img src='".e_IMAGE."admin_images/menus_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_MENUS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/menus_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_META')) {
-	define('E_32_META', "<img src='".e_IMAGE."admin_images/meta_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_META', "<img src='".e_IMAGE."packs/".$imode."/admin_images/meta_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_NEWS')) {
-	define('E_32_NEWS', "<img src='".e_IMAGE."admin_images/news_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NEWS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/news_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_NEWSFEED')) {
-	define('E_32_NEWSFEED', "<img src='".e_IMAGE."admin_images/newsfeeds_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NEWSFEED', "<img src='".e_IMAGE."packs/".$imode."/admin_images/newsfeeds_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_NOTIFY')) {
-	define('E_32_NOTIFY', "<img src='".e_IMAGE."admin_images/notify_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_NOTIFY', "<img src='".e_IMAGE."packs/".$imode."/admin_images/notify_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_PHP')) {
-	define('E_32_PHP', "<img src='".e_IMAGE."admin_images/phpinfo_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_PHP', "<img src='".e_IMAGE."packs/".$imode."/admin_images/phpinfo_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_POLLS')) {
-	define('E_32_POLLS', "<img src='".e_IMAGE."admin_images/polls_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_POLLS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/polls_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_PREFS')) {
-	define('E_32_PREFS', "<img src='".e_IMAGE."admin_images/prefs_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_PREFS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/prefs_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_SEARCH')) {
-	define('E_32_SEARCH', "<img src='".e_IMAGE."admin_images/search_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_SEARCH', "<img src='".e_IMAGE."packs/".$imode."/admin_images/search_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_UPLOADS')) {
-	define('E_32_UPLOADS', "<img src='".e_IMAGE."admin_images/uploads_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_UPLOADS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/uploads_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_USER')) {
-	define('E_32_USER', "<img src='".e_IMAGE."admin_images/users_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_USER', "<img src='".e_IMAGE."packs/".$imode."/admin_images/users_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_USER_EXTENDED')) {
-	define('E_32_USER_EXTENDED', "<img src='".e_IMAGE."admin_images/extended_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_USER_EXTENDED', "<img src='".e_IMAGE."packs/".$imode."/admin_images/extended_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_USERCLASS')) {
-	define('E_32_USERCLASS', "<img src='".e_IMAGE."admin_images/userclass_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_USERCLASS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/userclass_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_LANGUAGE')) {
-	define('E_32_LANGUAGE', "<img src='".e_IMAGE."admin_images/language_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_LANGUAGE', "<img src='".e_IMAGE."packs/".$imode."/admin_images/language_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 
 // Large Admin Other Link Images
 if (!defined('E_32_PLUGIN')) {
-	define('E_32_PLUGIN', "<img src='".e_IMAGE."admin_images/plugins_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_PLUGIN', "<img src='".e_IMAGE."packs/".$imode."/admin_images/plugins_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_PLUGMANAGER')) {
-	define('E_32_PLUGMANAGER', "<img src='".e_IMAGE."admin_images/plugmanager_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_PLUGMANAGER', "<img src='".e_IMAGE."packs/".$imode."/admin_images/plugmanager_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_DOCS')) {
-	define('E_32_DOCS', "<img src='".e_IMAGE."admin_images/docs_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_DOCS', "<img src='".e_IMAGE."packs/".$imode."/admin_images/docs_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_MAIN')) {
-	define('E_32_MAIN', "<img src='".e_IMAGE."admin_images/main_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_MAIN', "<img src='".e_IMAGE."packs/".$imode."/admin_images/main_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 
 if (!defined('E_32_THEMEMANAGER')) {
-	define('E_32_THEMEMANAGER', "<img src='".e_IMAGE."admin_images/themes_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_THEMEMANAGER', "<img src='".e_IMAGE."packs/".$imode."/admin_images/themes_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 
 // Large Admin Other Images
 if (!defined('E_32_COMMENT')) {
-	define('E_32_COMMENT', "<img src='".e_IMAGE."admin_images/comments_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_COMMENT', "<img src='".e_IMAGE."packs/".$imode."/admin_images/comments_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_ADMINLOG')) {
-	define('E_32_ADMINLOG', "<img src='".e_IMAGE."admin_images/adminlogs_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_ADMINLOG', "<img src='".e_IMAGE."packs/".$imode."/admin_images/adminlogs_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 if (!defined('E_32_LOGOUT')) {
-	define('E_32_LOGOUT', "<img src='".e_IMAGE."admin_images/logout_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
+	define('E_32_LOGOUT', "<img src='".e_IMAGE."packs/".$imode."/admin_images/logout_32.png' alt='' style='border:0px; width: 32px; height: 32px' />");
 }
 
 $e_icon_array = array(
diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php
index 9e827a2ea..d196cf0b2 100644
--- a/e107_admin/admin_log.php
+++ b/e107_admin/admin_log.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/admin_log.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:11 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:49 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -74,21 +74,22 @@ $ns->tablerender(LAN_ADMINLOG_0, $text);
 require_once("footer.php");
 
 function get_log_img($log_type) {
+	global $imode;
 	switch ($log_type) {
 		case E_LOG_INFORMATIVE:
-			return "<img src='".e_IMAGE_ABS."admin_images/docs_16.png' alt='".LAN_ADMINLOG_6."' title='".LAN_ADMINLOG_7."' />";
+			return "<img src='".e_IMAGE_ABS."packs/".$imode."/admin_images/docs_16.png' alt='".LAN_ADMINLOG_6."' title='".LAN_ADMINLOG_7."' />";
 		break;
 		case E_LOG_NOTICE:
-			return "<img src='".e_IMAGE_ABS."admin_images/notice_16.png' alt='".LAN_ADMINLOG_8."' title='".LAN_ADMINLOG_9."' />";
+			return "<img src='".e_IMAGE_ABS."packs/".$imode."/admin_images/notice_16.png' alt='".LAN_ADMINLOG_8."' title='".LAN_ADMINLOG_9."' />";
 		break;
 		case E_LOG_WARNING:
-			return "<img src='".e_IMAGE_ABS."admin_images/blocked.png' alt='".LAN_ADMINLOG_10."' title='".LAN_ADMINLOG_11."' style='width:16p;height:16px'  />";
+			return "<img src='".e_IMAGE_ABS."packs/".$imode."/admin_images/blocked.png' alt='".LAN_ADMINLOG_10."' title='".LAN_ADMINLOG_11."' style='width:16p;height:16px'  />";
 		break;
 		case E_LOG_FATAL:
-			return "<img src='".e_IMAGE_ABS."admin_images/nopreview.png' alt='".LAN_ADMINLOG_12."' title='".LAN_ADMINLOG_13."' />";
+			return "<img src='".e_IMAGE_ABS."packs/".$imode."/admin_images/nopreview.png' alt='".LAN_ADMINLOG_12."' title='".LAN_ADMINLOG_13."' />";
 		break;
 		case E_LOG_PLUGIN;
-			return "<img src='".e_IMAGE_ABS."admin_images/plugins_16.png' alt='".LAN_ADMINLOG_6."' title='".LAN_ADMINLOG_6."' />";
+			return "<img src='".e_IMAGE_ABS."packs/".$imode."/admin_images/plugins_16.png' alt='".LAN_ADMINLOG_6."' title='".LAN_ADMINLOG_6."' />";
         break;
 	}
 	return $log_type;
diff --git a/e107_admin/administrator.php b/e107_admin/administrator.php
index 9168d4e5f..aa85070a0 100644
--- a/e107_admin/administrator.php
+++ b/e107_admin/administrator.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/administrator.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:11 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:49 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 require_once('../class2.php');
@@ -104,7 +104,7 @@ if($_POST['edit_admin'] || $action == "edit"){
 }
 
 function show_admins(){
-    global $sql,$tp,$ns,$pref;
+    global $sql, $tp, $ns, $pref, $imode;
 
 	$sql->db_Select("user", "*", "user_admin='1'");
 
@@ -136,8 +136,8 @@ function show_admins(){
 		if($row['user_id'] != "1")
 		{
     		$text .= "
-			<input type='image' name='edit_admin[{$row['user_id']}]' value='edit' src='".e_IMAGE."admin_images/edit_16.png' title='".LAN_EDIT."' />
-			<input type='image' name='del_admin[{$row['user_id']}]' value='del' src='".e_IMAGE."admin_images/delete_16.png' onclick=\"return jsconfirm('".$tp->toJS(ADMSLAN_59."? [".$row['user_name']."]")."') \"  title='".ADMSLAN_59."' style='border:0px' />";
+			<input type='image' name='edit_admin[{$row['user_id']}]' value='edit' src='".e_IMAGE."packs/".$imode."/admin_images/edit_16.png' title='".LAN_EDIT."' />
+			<input type='image' name='del_admin[{$row['user_id']}]' value='del' src='".e_IMAGE."packs/".$imode."/admin_images/delete_16.png' onclick=\"return jsconfirm('".$tp->toJS(ADMSLAN_59."? [".$row['user_name']."]")."') \"  title='".ADMSLAN_59."' style='border:0px' />";
     	}
 		$text .= "&nbsp;</td>
 
diff --git a/e107_admin/docs.php b/e107_admin/docs.php
index 1d5361765..100033340 100644
--- a/e107_admin/docs.php
+++ b/e107_admin/docs.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/docs.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:19 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:49 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -47,8 +47,8 @@ if (e_QUERY) {
 	fclose ($fd);
 	 
 	$text = $tp->toHTML($text, TRUE);
-	$text = preg_replace("/Q\>(.*?)A>/si", "<img src='".e_IMAGE."generic/".IMODE."/question.png' style='vertical-align: middle' /><b>\\1</b>A>", $text);
-	$text = str_replace("A>", "<img src='".e_IMAGE."generic/".IMODE."/answer.png' style='vertical-align: middle' />", $text);
+	$text = preg_replace("/Q\>(.*?)A>/si", "<img src='".e_IMAGE."packs/".$imode."/generic/question.png' style='vertical-align: middle' /><b>\\1</b>A>", $text);
+	$text = str_replace("A>", "<img src='".e_IMAGE."packs/".$imode."/generic/answer.png' style='vertical-align: middle' />", $text);
 	 
 	$ns->tablerender(str_replace("_", " ", $helplist[e_QUERY]), $text."<br />");
 	unset($text);
diff --git a/e107_admin/header.php b/e107_admin/header.php
index 96d9b85a8..86b0b2acf 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -12,9 +12,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |   $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
-|   $Revision: 1.3 $
-|   $Date: 2006-12-07 12:59:43 $
-|   $Author: mrpete $
+|   $Revision: 1.4 $
+|   $Date: 2006-12-07 15:41:49 $
+|   $Author: sweetas $
 +---------------------------------------------------------------+
 */
 
@@ -101,16 +101,16 @@ if (!defined('ADMIN_FALSE_ICON'))
 
 if (!defined('ADMIN_EDIT_ICON'))
 {
-	define("ADMIN_EDIT_ICON", "<img src='".e_IMAGE_ABS."admin_images/edit_16.png' alt='' title='".LAN_EDIT."' style='border:0px; height:16px; width:16px' />");
-	define("ADMIN_EDIT_ICON_PATH", e_IMAGE."admin_images/edit_16.png");
+	define("ADMIN_EDIT_ICON", "<img src='".e_IMAGE_ABS."packs/".$imode."/admin_images/edit_16.png' alt='' title='".LAN_EDIT."' style='border:0px; height:16px; width:16px' />");
+	define("ADMIN_EDIT_ICON_PATH", e_IMAGE."packs/".$imode."/admin_images/edit_16.png");
 }
 
 
 
 if (!defined('ADMIN_DELETE_ICON'))
 {
-	define("ADMIN_DELETE_ICON", "<img src='".e_IMAGE_ABS."admin_images/delete_16.png' alt='' title='".LAN_DELETE."' style='border:0px; height:16px; width:16px' />");
-	define("ADMIN_DELETE_ICON_PATH", e_IMAGE."admin_images/delete_16.png");
+	define("ADMIN_DELETE_ICON", "<img src='".e_IMAGE_ABS."packs/".$imode."/admin_images/delete_16.png' alt='' title='".LAN_DELETE."' style='border:0px; height:16px; width:16px' />");
+	define("ADMIN_DELETE_ICON_PATH", e_IMAGE."packs/".$imode."/admin_images/delete_16.png");
 }
 
 //
diff --git a/e107_admin/links.php b/e107_admin/links.php
index 3af69833e..d8a3eb799 100644
--- a/e107_admin/links.php
+++ b/e107_admin/links.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/links.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:24 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:49 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 
@@ -316,7 +316,7 @@ class links
 	}
 
 	function display_row($row2, $indent = FALSE) {
-		global $sql, $rs, $ns, $tp, $linkArray,$previous_cat;
+		global $sql, $rs, $ns, $tp, $linkArray, $previous_cat, $imode;
 		extract($row2);
 
 		//
@@ -340,7 +340,7 @@ class links
 		}
 
 		if ($indent) {
-			$subimage = "<img src='".e_IMAGE."admin_images/sublink.png' alt='' />";
+			$subimage = "<img src='".e_IMAGE."packs/".$imode."/admin_images/sublink.png' alt='' />";
 			$subspacer = ($indent > 1) ? " style='padding-left: ".(($indent - 1) * 16)."px'" : "";
 			$subindent = "<td".$subspacer.">".$subimage."</td>";
 		}
@@ -357,14 +357,14 @@ class links
 				</table>
 				</td>";
 				$text .= "<td style='text-align:center; white-space: nowrap' class='forumheader3'>";
-				$text .= "<a href='".e_SELF."?create.sub.{$link_id}'><img src='".e_IMAGE."admin_images/sublink_16.png' title='".LINKLAN_10."' alt='".LINKLAN_10."' /></a>&nbsp;";
+				$text .= "<a href='".e_SELF."?create.sub.{$link_id}'><img src='".e_IMAGE."packs/".$imode."/admin_images/sublink_16.png' title='".LINKLAN_10."' alt='".LINKLAN_10."' /></a>&nbsp;";
 				$text .= "<a href='".e_SELF."?create.edit.{$link_id}'>".ADMIN_EDIT_ICON."</a>&nbsp;";
 				$text .= "<input type='image' title='".LAN_DELETE."' name='main_delete_{$link_id}' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$tp->toJS(LCLAN_58." [ $link_name ]")."') \" />";
 				$text .= "</td>";
 				$text .= "<td style='text-align:center' class='forumheader3'>".r_userclass("link_class[".$link_id."]", $link_class, "off", "public,guest,nobody,member,admin,classes")."</td>";
 				$text .= "<td style='text-align:center; white-space: nowrap' class='forumheader3'>";
-				$text .= "<input type='image' src='".e_IMAGE."admin_images/up.png' title='".LCLAN_30."' value='".$link_id.".".$link_order."' name='inc' />";
-				$text .= "<input type='image' src='".e_IMAGE."admin_images/down.png' title='".LCLAN_31."' value='".$link_id.".".$link_order."' name='dec' />";
+				$text .= "<input type='image' src='".e_IMAGE."packs/".$imode."/admin_images/up.png' title='".LCLAN_30."' value='".$link_id.".".$link_order."' name='inc' />";
+				$text .= "<input type='image' src='".e_IMAGE."packs/".$imode."/admin_images/down.png' title='".LCLAN_31."' value='".$link_id.".".$link_order."' name='dec' />";
 				$text .= "</td>";
 				$text .= "<td style='text-align:center' class='forumheader3'>";
 				$text .= "<select name='link_order[]' class='tbox'>\n";
diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 1bfb79a90..9c78c7556 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/mailout.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:25 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:49 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 
@@ -663,7 +663,7 @@ $text = "
 
 function showList()
 	{
-		global $sql,$ns,$tp;
+		global $sql, $ns, $tp, $imode;
 		$gen = new convert;
 		$qry ="SELECT g.*,u.* FROM #generic AS g LEFT JOIN #user AS u ON g.gen_user_id = u.user_id WHERE g.gen_type = 'massmail' ORDER BY g.gen_datestamp DESC";
 	 //	$count = $sql -> db_Select("generic", "*", "gen_type ='massmail' ORDER BY gen_datestamp DESC");
@@ -711,8 +711,8 @@ function showList()
 
 				<td style='width:50px;white-space:nowrap' class='forumheader3'>
 				<div>
-				<input type='image' name='edit[{$row2['gen_id']}]' value='edit' src='".e_IMAGE."admin_images/edit_16.png' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' />
-				<input type='image' name='delete[{$row2['gen_id']}]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$row2['gen_ip']."]")."') \" src='".e_IMAGE."admin_images/delete_16.png' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' />
+				<input type='image' name='edit[{$row2['gen_id']}]' value='edit' src='".e_IMAGE."packs/".$imode."/admin_images/edit_16.png' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' />
+				<input type='image' name='delete[{$row2['gen_id']}]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$row2['gen_ip']."]")."') \" src='".e_IMAGE."packs/".$imode."/admin_images/delete_16.png' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' />
 				</div>
 				</td>
 				</tr>
diff --git a/e107_admin/modcomment.php b/e107_admin/modcomment.php
index fe5e39864..110305bb9 100644
--- a/e107_admin/modcomment.php
+++ b/e107_admin/modcomment.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/modcomment.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:25 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:49 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -121,12 +121,12 @@ if (!$sql->db_Select("comments", "*", "(comment_type='".$type."' OR comment_type
 
 		$comments .= "
 		<tr>
-			<td class='forumheader3' style='width:5%; text-align:center;'>".($row['comment_blocked'] ? "<img src='".e_IMAGE."admin_images/blocked.png' />" : "&nbsp;")."</td>
+			<td class='forumheader3' style='width:5%; text-align:center;'>".($row['comment_blocked'] ? "<img src='".e_IMAGE."packs/".$imode."/admin_images/blocked.png' />" : "&nbsp;")."</td>
 			<td class='forumheader3' style='width:15%;'>".$datestamp."</td>
 			<td class='forumheader3' style='width:15%;'><b>".$comment_nick."</b><br />".$comment_str."</td>
 			<td class='forumheader3' style='width:40%;'>".$row['comment_comment']."</td>
 			<td class='forumheader3' style='width:25%;'>
-				<a href='".e_ADMIN."modcomment.php?{$table}.{$id}.".$row['comment_id']."'><img src='".e_IMAGE."admin_images/edit_16.png' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:none' /></a>"
+				<a href='".e_ADMIN."modcomment.php?{$table}.{$id}.".$row['comment_id']."'><img src='".e_IMAGE."packs/".$imode."/admin_images/edit_16.png' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:none' /></a>"
 				."&nbsp;".($row['comment_blocked'] ? "<input type='checkbox' name='comment_unblocked[]' value='".$row['comment_id']."' /> ".MDCLAN_5."" : "<input type='checkbox' name='comment_blocked[]' value='".$row['comment_id']."' /> ".MDCLAN_6."")
 				."&nbsp;<input type='checkbox' name='comment_delete[]' value='".$row['comment_id']."' /> ".LAN_DELETE."
 			</td>
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index 5eaa8d3b4..dab02355f 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -11,9 +11,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |   $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $
-|   $Revision: 1.1.1.1 $
-|   $Date: 2006-12-02 04:33:26 $
-|   $Author: mcfly_e107 $
+|   $Revision: 1.2 $
+|   $Date: 2006-12-07 15:41:49 $
+|   $Author: sweetas $
 +---------------------------------------------------------------+
 
 */
@@ -276,7 +276,7 @@ class newspost {
 
 	function show_existing_items($action, $sub_action, $id, $from, $amount) {
 		// ##### Display scrolling list of existing news items ---------------------------------------------------------------------------------------------------------
-		global $sql, $rs, $ns, $tp;
+		global $sql, $rs, $ns, $tp, $imode;
 		$text = "<div style='text-align:center'>";
 
 		if (isset($_POST['searchquery'])) {
@@ -313,7 +313,7 @@ class newspost {
 				$text .= $ren_type[$news_render_type];
 				if($news_sticky)
 				{
-					$sicon = (file_exists(THEME."images/sticky.png") ? THEME."images/sticky.png" : e_IMAGE."generic/".IMODE."/sticky.png");
+					$sicon = (file_exists(THEME."images/sticky.png") ? THEME."images/sticky.png" : e_IMAGE."packs/".$imode."/generic/sticky.png");
 					$text .= " <img src='".$sicon."' alt='' />";
 				}
 				$text .= "
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index d657a5b3e..9f4ceced9 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:27 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 
@@ -405,7 +405,7 @@ $text .= render_plugs($uninstalled);
 
 
 function render_plugs($pluginList){
-	global $tp;
+	global $tp, $imode;
 
 	foreach($pluginList as $plug) {
 	//Unset any possible eplug_ variables set by last plugin.php
@@ -419,13 +419,13 @@ function render_plugs($pluginList){
 		include(e_PLUGIN.$plug['plugin_path'].'/plugin.php');
 
  		if ($eplug_conffile || is_array($eplug_table_names) || is_array($eplug_prefs) || is_array($eplug_user_prefs) || is_array($eplug_sc) || is_array($eplug_bb) || $eplug_module || $eplug_userclass || $eplug_status || $eplug_latest) {
-			$img = (!$plug['plugin_installflag'] ? "<img src='".e_IMAGE."admin_images/uninstalled.png' alt='' />" : "<img src='".e_IMAGE."admin_images/installed.png' alt='' />");
+			$img = (!$plug['plugin_installflag'] ? "<img src='".e_IMAGE."packs/".$imode."/admin_images/uninstalled.png' alt='' />" : "<img src='".e_IMAGE."packs/".$imode."/admin_images/installed.png' alt='' />");
 		} else {
-			$img = "<img src='".e_IMAGE."admin_images/noinstall.png' alt='' />";
+			$img = "<img src='".e_IMAGE."packs/".$imode."/admin_images/noinstall.png' alt='' />";
 		}
 
 		if ($plug['plugin_version'] != $eplug_version && $plug['plugin_installflag']) {
-			$img = "<img src='".e_IMAGE."admin_images/upgrade.png' alt='' />";
+			$img = "<img src='".e_IMAGE."packs/".$imode."/admin_images/upgrade.png' alt='' />";
 		}
 
 		$plugin_icon = $eplug_icon ? "<img src='".e_PLUGIN.$eplug_icon."' alt='' style='border:0px;vertical-align: bottom; width: 32px; height: 32px' />" : E_32_CAT_PLUG;
@@ -496,10 +496,10 @@ return $text;
 
 $text .= "</table>
 	<div style='text-align:center'><br />
-	<img src='".e_IMAGE."admin_images/uninstalled.png' alt='' /> ".EPL_ADLAN_23."&nbsp;&nbsp;
-	<img src='".e_IMAGE."admin_images/installed.png' alt='' /> ".EPL_ADLAN_22."&nbsp;&nbsp;
-	<img src='".e_IMAGE."admin_images/upgrade.png' alt='' /> ".EPL_ADLAN_24."&nbsp;&nbsp;
-	<img src='".e_IMAGE."admin_images/noinstall.png' alt='' /> ".EPL_ADLAN_25."</div></div>";
+	<img src='".e_IMAGE."packs/".$imode."/admin_images/uninstalled.png' alt='' /> ".EPL_ADLAN_23."&nbsp;&nbsp;
+	<img src='".e_IMAGE."packs/".$imode."/admin_images/installed.png' alt='' /> ".EPL_ADLAN_22."&nbsp;&nbsp;
+	<img src='".e_IMAGE."packs/".$imode."/admin_images/upgrade.png' alt='' /> ".EPL_ADLAN_24."&nbsp;&nbsp;
+	<img src='".e_IMAGE."packs/".$imode."/admin_images/noinstall.png' alt='' /> ".EPL_ADLAN_25."</div></div>";
 
 $ns->tablerender(EPL_ADLAN_16, $text);
 // ----------------------------------------------------------
diff --git a/e107_admin/upload.php b/e107_admin/upload.php
index 65117594f..3ee558f83 100644
--- a/e107_admin/upload.php
+++ b/e107_admin/upload.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/upload.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:30 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -239,8 +239,8 @@ if (!$active_uploads = $sql->db_Select("upload", "*", "upload_active=0 ORDER BY
 		<td style='width:20%' class='forumheader3'>".$upload_file ."</td>
 		<td style='width:50px;white-space:nowrap' class='forumheader3'>
 		<form action='".e_SELF."?dis.$upload_id' id='uploadform_{$upload_id}' method='post'>
-		<div><a href='".e_SELF."?dlm.$upload_id'><img src='".e_IMAGE."admin_images/downloads_16.png' alt='".UPLAN_COPYTODLS."' title='".UPLAN_COPYTODLS."' style='border:0' /></a>
-		<a href='".e_SELF."?news.$upload_id'><img src='".e_IMAGE."admin_images/news_16.png' alt='".UPLLAN_16."' title='".UPLLAN_16."' style='border:0' /></a>
+		<div><a href='".e_SELF."?dlm.$upload_id'><img src='".e_IMAGE."packs/".$imode."/admin_images/downloads_16.png' alt='".UPLAN_COPYTODLS."' title='".UPLAN_COPYTODLS."' style='border:0' /></a>
+		<a href='".e_SELF."?news.$upload_id'><img src='".e_IMAGE."packs/".$imode."/admin_images/news_16.png' alt='".UPLLAN_16."' title='".UPLLAN_16."' style='border:0' /></a>
         <input type='image' title='".LAN_DELETE."' name='updelete[upload_{$upload_id}]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".$tp->toJS(UPLLAN_45." [ $upload_name ]")."') \"/>
 		</div></form></td>
 		</tr>";
diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php
index b20fd1a62..5d66e5c23 100755
--- a/e107_admin/users_extended.php
+++ b/e107_admin/users_extended.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/users_extended.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:32 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 require_once("../class2.php");
@@ -230,7 +230,7 @@ class users_ext
 
 	function show_extended($current)
 	{
-		global $sql, $ns, $ue, $curtype, $tp, $mySQLdefaultdb, $action, $sub_action;
+		global $sql, $ns, $ue, $curtype, $tp, $mySQLdefaultdb, $action, $sub_action, $imode;
 
 		$catList = $ue->user_extended_get_categories();
 		$catList[0][0] = array('user_extended_struct_name' => EXTLAN_36);
@@ -282,12 +282,12 @@ class users_ext
 						";
 						if($i > 0){
 							$text .= "
-							<input type='image' alt='' title='".EXTLAN_26."' src='".e_IMAGE."/admin_images/up.png' name='up' value='{$ext['user_extended_struct_id']}.{$ext['user_extended_struct_order']}.{$ext['user_extended_struct_parent']}' />
+							<input type='image' alt='' title='".EXTLAN_26."' src='".e_IMAGE."packs/".$imode."/admin_images/up.png' name='up' value='{$ext['user_extended_struct_id']}.{$ext['user_extended_struct_order']}.{$ext['user_extended_struct_parent']}' />
 							";
 						}
 						if($i <= count($extendedList[$cn])-2)
 						{
-							$text .= "<input type='image' alt='' title='".EXTLAN_25."' src='".e_IMAGE."/admin_images/down.png' name='down' value='{$ext['user_extended_struct_id']}.{$ext['user_extended_struct_order']}.{$ext['user_extended_struct_parent']}' />";
+							$text .= "<input type='image' alt='' title='".EXTLAN_25."' src='".e_IMAGE."packs/".$imode."/admin_images/down.png' name='down' value='{$ext['user_extended_struct_id']}.{$ext['user_extended_struct_order']}.{$ext['user_extended_struct_parent']}' />";
 						}
 						$text .= "
 						</form>
@@ -605,7 +605,7 @@ class users_ext
 
 	function show_categories($current)
 	{
-		global $sql, $ns, $ue;
+		global $sql, $ns, $ue, $imode;
 
 		$text = "<div style='text-align:center'>";
 		$text .= "
@@ -639,12 +639,12 @@ class users_ext
 				if($i > 0)
 				{
 					$text .= "
-					<input type='image' alt='' title='".EXTLAN_26."' src='".e_IMAGE."/admin_images/up.png' name='catup' value='{$ext['user_extended_struct_id']}' />
+					<input type='image' alt='' title='".EXTLAN_26."' src='".e_IMAGE."packs/".$imode."/admin_images/up.png' name='catup' value='{$ext['user_extended_struct_id']}' />
 					";
 				}
 				if($i <= count($catList)-2)
 				{
-					$text .= "<input type='image' alt='' title='".EXTLAN_25."' src='".e_IMAGE."/admin_images/down.png' name='catdown' value='{$ext['user_extended_struct_id']}' />";
+					$text .= "<input type='image' alt='' title='".EXTLAN_25."' src='".e_IMAGE."packs/".$imode."/admin_images/down.png' name='catdown' value='{$ext['user_extended_struct_id']}' />";
 				}
 				$text .= "
 				</form>
diff --git a/e107_files/bbcode/file.bb b/e107_files/bbcode/file.bb
index 1e549ebce..1d646eb44 100644
--- a/e107_files/bbcode/file.bb
+++ b/e107_files/bbcode/file.bb
@@ -1,8 +1,8 @@
-global $pref, $fromadmin;
+global $pref, $fromadmin, $imode;
 
 if (array_key_exists('forum_attach', $pref) && $pref['forum_attach'] && FILE_UPLOADS || ADMIN || $fromadmin)
 {
-	$image = (file_exists(THEME."images/file.png") ? THEME."images/file.png" : e_IMAGE."generic/".IMODE."/file.png");
+	$image = (file_exists(THEME."images/file.png") ? THEME."images/file.png" : e_IMAGE."packs/".$imode."/generic/file.png");
 	list($fname, $uc) = explode("^", $parm."^");
 	if(isset($uc))
 	{
diff --git a/e107_files/shortcode/admin_lang.sc b/e107_files/shortcode/admin_lang.sc
index fcb2473a5..8277d87d6 100644
--- a/e107_files/shortcode/admin_lang.sc
+++ b/e107_files/shortcode/admin_lang.sc
@@ -1,5 +1,5 @@
 if (ADMIN) {
-	global $ns, $sql, $pref;
+	global $ns, $sql, $pref, $imode;
 	if ($pref['multilanguage'])
 	{
 		$filepath = e_PLUGIN."userlanguage_menu/languages/".e_LANGUAGE.".php";
@@ -52,7 +52,7 @@ if (ADMIN) {
 		}
 
 
-		$text .= "<div><img src='".e_IMAGE."admin_images/language_16.png' alt='' />&nbsp;";
+		$text .= "<div><img src='".e_IMAGE."packs/".$imode."/admin_images/language_16.png' alt='' />&nbsp;";
 		if(isset($aff))
 		{
 			$text .= $sql->mySQLlanguage;
diff --git a/e107_files/shortcode/admin_status.sc b/e107_files/shortcode/admin_status.sc
index 00b9c13d5..ae55ac5a2 100644
--- a/e107_files/shortcode/admin_status.sc
+++ b/e107_files/shortcode/admin_status.sc
@@ -1,7 +1,7 @@
 if (ADMIN) {
 	if (!function_exists('admin_status')) {
 		function admin_status() {
-			global $sql, $ns, $pref;
+			global $sql, $ns, $pref, $imode;
 			$members = $sql -> db_Count("user");
 			$unverified = $sql -> db_Count("user", "(*)", "WHERE user_ban=2");
 			$banned = $sql -> db_Count("user", "(*)", "WHERE user_ban=1");
@@ -24,7 +24,7 @@ if (ADMIN) {
 
 			if($flo = $sql -> db_Count("generic", "(*)", "WHERE gen_type='failed_login'"))
 			{
-				$text .= "<img src='".e_IMAGE."admin_images/failedlogin_16.png' alt='' style='vertical-align: middle;' /> <a href='".e_ADMIN."fla.php'>".ADLAN_146.": $flo</a>";
+				$text .= "<img src='".e_IMAGE."packs/".$imode."/admin_images/failedlogin_16.png' alt='' style='vertical-align: middle;' /> <a href='".e_ADMIN."fla.php'>".ADLAN_146.": $flo</a>";
 			}
 
 
diff --git a/e107_files/shortcode/batch/comment_shortcodes.php b/e107_files/shortcode/batch/comment_shortcodes.php
index 9455ff484..c3d6f7f85 100644
--- a/e107_files/shortcode/batch/comment_shortcodes.php
+++ b/e107_files/shortcode/batch/comment_shortcodes.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/comment_shortcodes.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:40 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -97,16 +97,16 @@ return (isset($comrow['comment_blocked']) && $comrow['comment_blocked'] ? COMLAN
 SC_END
 
 SC_BEGIN COMMENTEDIT
-global $COMMENTEDIT, $pref, $comrow;
+global $COMMENTEDIT, $pref, $comrow, $imode;
 if ($pref['allowCommentEdit'] && USER && $comrow['user_id'] == USERID && $comrow['comment_lock'] != "1")
 {
 	if (!strstr(e_QUERY, "."))
 	{
-		return "<a href='".e_SELF."?".e_QUERY."&amp;comment=edit&amp;comment_id=".$comrow['comment_id']."'><img src='".e_IMAGE."generic/".IMODE."/newsedit.png' alt='".COMLAN_318."' title='".COMLAN_318."' style='border: 0;' /></a>";
+		return "<a href='".e_SELF."?".e_QUERY."&amp;comment=edit&amp;comment_id=".$comrow['comment_id']."'><img src='".e_IMAGE."packs/".$imode."/generic/newsedit.png' alt='".COMLAN_318."' title='".COMLAN_318."' style='border: 0;' /></a>";
 	}
 	else
 	{
-		return "<a href='".e_SELF."?".e_QUERY.".edit.".$comrow['comment_id']."'><img src='".e_IMAGE."generic/".IMODE."/newsedit.png' alt='".COMLAN_318."' title='".COMLAN_318."' style='border: 0;' /></a>";
+		return "<a href='".e_SELF."?".e_QUERY.".edit.".$comrow['comment_id']."'><img src='".e_IMAGE."packs/".$imode."/generic/newsedit.png' alt='".COMLAN_318."' title='".COMLAN_318."' style='border: 0;' /></a>";
 	}
 }
 else
diff --git a/e107_files/shortcode/batch/download_shortcodes.php b/e107_files/shortcode/batch/download_shortcodes.php
index 31fb001f3..43acc3f2b 100644
--- a/e107_files/shortcode/batch/download_shortcodes.php
+++ b/e107_files/shortcode/batch/download_shortcodes.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/download_shortcodes.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:40 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -281,7 +281,7 @@ SC_END
 SC_BEGIN DOWNLOAD_VIEW_RATING
 	require_once(e_HANDLER."rate_class.php");
 	$rater = new rater;
-global $dl;
+	global $dl, $imode;
 	$text = "
 		<table style='width:100%'>
 		<tr>
@@ -289,10 +289,10 @@ global $dl;
 
 	if ($ratearray = $rater->getrating("download", $dl['download_id'])) {
 		for($c = 1; $c <= $ratearray[1]; $c++) {
-			$text .= "<img src='".e_IMAGE."rate/".IMODE."/star.png' alt='' />";
+			$text .= "<img src='".e_IMAGE."packs/".$imode."/rate/star.png' alt='' />";
 		}
 		if ($ratearray[2]) {
-			$text .= "<img src='".e_IMAGE."rate/".IMODE."/".$ratearray[2].".png'  alt='' />";
+			$text .= "<img src='".e_IMAGE."packs/".$imode."/rate/".$ratearray[2].".png'  alt='' />";
 		}
 		if ($ratearray[2] == "") {
 			$ratearray[2] = 0;
diff --git a/e107_files/shortcode/batch/news_shortcodes.php b/e107_files/shortcode/batch/news_shortcodes.php
index 782e6a0ac..478965847 100644
--- a/e107_files/shortcode/batch/news_shortcodes.php
+++ b/e107_files/shortcode/batch/news_shortcodes.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/news_shortcodes.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:41 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -169,10 +169,11 @@ return $news_item['news_id'];
 SC_END
 
 SC_BEGIN ADMINOPTIONS
+global $imode;
 $news_item = getcachedvars('current_news_item');
 $param = getcachedvars('current_news_param');
 if (ADMIN && getperms("H")) {
-	$adop_icon = (file_exists(THEME."images/newsedit.png") ? THEME."images/newsedit.png" : e_IMAGE."generic/".IMODE."/newsedit.png");
+	$adop_icon = (file_exists(THEME."images/newsedit.png") ? THEME."images/newsedit.png" : e_IMAGE."packs/".$imode."/generic/newsedit.png");
 	return " <a href='".e_BASE.e_ADMIN."newspost.php?create.edit.".$news_item['news_id']."'><img src='".$adop_icon."' alt='' style='border:0' /></a>\n";
 } else {
 	return '';
diff --git a/e107_files/shortcode/batch/user_shortcodes.php b/e107_files/shortcode/batch/user_shortcodes.php
index 3601ad0c0..3b141839e 100644
--- a/e107_files/shortcode/batch/user_shortcodes.php
+++ b/e107_files/shortcode/batch/user_shortcodes.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/user_shortcodes.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:41 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -149,6 +149,7 @@ return $gen -> computeLapse($user['user_join'])." ".LAN_426;
 SC_END
 
 SC_BEGIN USER_REALNAME_ICON
+global $imode;
 if(defined("USER_REALNAME_ICON"))
 {
 	return USER_REALNAME_ICON;
@@ -157,7 +158,7 @@ if(file_exists(THEME."images/user_realname.png"))
 {
 	return "<img src='".THEME_ABS."images/user_realname.png' alt='' style='border:0px;vertical-align:middle;' /> ";
 }
-return "<img src='".e_IMAGE_ABS."user_icons/user_realname_".IMODE.".png' alt='' style='border:0px;vertical-align:middle;' /> ";
+return "<img src='".e_IMAGE_ABS."packs/".$imode."/user_icons/user_realname.png' alt='' style='border:0px;vertical-align:middle;' /> ";
 SC_END
 
 SC_BEGIN USER_REALNAME
@@ -166,6 +167,7 @@ return $user['user_login'] ? $user['user_login'] : "<i>".LAN_401."</i>";
 SC_END
 
 SC_BEGIN USER_EMAIL_ICON
+global $imode;
 if(defined("USER_EMAIL_ICON"))
 {
 	return USER_EMAIL_ICON;
@@ -174,7 +176,7 @@ if(file_exists(THEME."images/email.png"))
 {
 	return "<img src='".THEME_ABS."images/email.png' alt='' style='vertical-align:middle;' /> ";
 }
-return "<img src='".e_IMAGE_ABS."generic/".IMODE."/email.png' alt='' style='vertical-align:middle;' /> ";
+return "<img src='".e_IMAGE_ABS."packs/".$imode."/generic/email.png' alt='' style='vertical-align:middle;' /> ";
 SC_END
 
 SC_BEGIN USER_EMAIL_LINK
@@ -188,6 +190,7 @@ return ($user['user_hideemail'] && !ADMIN) ? "<i>".LAN_143."</i>" : $tp->toHTML(
 SC_END
 
 SC_BEGIN USER_ICON
+global $imode;
 if(defined("USER_ICON"))
 {
 	return USER_ICON;
@@ -196,11 +199,11 @@ if(file_exists(THEME."images/user.png"))
 {
 	return "<img src='".THEME_ABS."images/user.png' alt='' style='border:0px;vertical-align:middle;' /> ";
 }
-return "<img src='".e_IMAGE_ABS."user_icons/user_".IMODE.".png' alt='' style='border:0px;vertical-align:middle;' /> ";
+return "<img src='".e_IMAGE_ABS."packs/".$imode."/user_icons/user.png' alt='' style='border:0px;vertical-align:middle;' /> ";
 SC_END
 
 SC_BEGIN USER_ICON_LINK
-global $user;
+global $user, $imode;
 if(defined("USER_ICON"))
 {
 	$icon = USER_ICON;
@@ -211,7 +214,7 @@ else if(file_exists(THEME."images/user.png"))
 }
 else
 {
-	$icon = "<img src='".e_IMAGE_ABS."user_icons/user_".IMODE.".png' alt='' style='border:0px;vertical-align:middle;' /> ";
+	$icon = "<img src='".e_IMAGE_ABS."packs/".$imode."/user_icons/user.png' alt='' style='border:0px;vertical-align:middle;' /> ";
 }
 return "<a href='".e_SELF."?id.{$user['user_id']}'>{$icon}</a>";
 SC_END
@@ -239,6 +242,7 @@ if(ADMIN && getperms("4")) {
 SC_END
 
 SC_BEGIN USER_BIRTHDAY_ICON
+global $imode;
 if(defined("USER_BIRTHDAY_ICON"))
 {
 	return USER_BIRTHDAY_ICON;
@@ -247,7 +251,7 @@ if(file_exists(THEME."images/user_birthday.png"))
 {
 	return "<img src='".THEME_ABS."images/user_birthday.png' alt='' style='vertical-align:middle;' /> ";
 }
-return "<img src='".e_IMAGE_ABS."user_icons/user_birthday_".IMODE.".png' alt='' style='vertical-align:middle;' /> ";
+return "<img src='".e_IMAGE_ABS."packs/".$imode."/user_icons/user_birthday.png' alt='' style='vertical-align:middle;' /> ";
 SC_END
 
 SC_BEGIN USER_BIRTHDAY
@@ -283,7 +287,7 @@ return $tp->parseTemplate("{SENDPM={$user['user_id']}}");
 SC_END
 
 SC_BEGIN USER_RATING
-global $pref, $user;
+global $pref, $user, $imode;
 if($pref['profile_rate'] && USER)
 {
 	include_once(e_HANDLER."rate_class.php");
@@ -294,7 +298,7 @@ if($pref['profile_rate'] && USER)
 		$num = $rating[1];
 		for($i=1; $i<= $num; $i++)
 		{
-			$ret .= "<img src='".e_IMAGE_ABS."user_icons/user_star_".IMODE.".png' style='border:0' alt='' />";
+			$ret .= "<img src='".e_IMAGE_ABS."packs/".$imode."/user_icons/user_star.png' style='border:0' alt='' />";
 		}
 	}
 	if(!$rater->checkrated('user', $user['user_id']))
diff --git a/e107_files/shortcode/email_item.sc b/e107_files/shortcode/email_item.sc
index 8935b02ff..5acaba65b 100644
--- a/e107_files/shortcode/email_item.sc
+++ b/e107_files/shortcode/email_item.sc
@@ -1,10 +1,12 @@
+global $imode;
+
 if (defined("ICONMAIL") && file_exists(THEME."images/".ICONMAIL)) 
 {
 	$icon = THEME."images/".ICONMAIL;
 }
 else
 {
-	$icon = e_IMAGE."generic/".IMODE."/email.png";
+	$icon = e_IMAGE."packs/".$imode."/generic/email.png";
 }
 $parms = explode("^",$parm);
 // message^source^other_parms
diff --git a/e107_files/shortcode/newsfile.sc b/e107_files/shortcode/newsfile.sc
index 7d84bf074..e62125289 100644
--- a/e107_files/shortcode/newsfile.sc
+++ b/e107_files/shortcode/newsfile.sc
@@ -1,5 +1,5 @@
+global $imode;
 
-
-$image = (file_exists(THEME."images/download.png") ? THEME."images/download.png" : e_IMAGE."generic/".IMODE."/download.png");
+$image = (file_exists(THEME."images/download.png") ? THEME."images/download.png" : e_IMAGE."packs/".$imode."/generic/download.png");
 return "<img src='$image' alt='' style='vertical-align: middle;' /> <a href='".e_FILE."downloads/".$parm."'>".$parm."</a>";
 
diff --git a/e107_files/shortcode/print_item.sc b/e107_files/shortcode/print_item.sc
index 16326d3c5..e60cccd34 100644
--- a/e107_files/shortcode/print_item.sc
+++ b/e107_files/shortcode/print_item.sc
@@ -1,10 +1,12 @@
+global $imode;
+
 if (defined("ICONPRINT") && file_exists(THEME."images/".ICONPRINT))
 {
 	$icon = THEME."images/".ICONPRINT;
 }
 else
 {
-	$icon = e_IMAGE."generic/".IMODE."/printer.png";
+	$icon = e_IMAGE."packs/".$imode."/generic/printer.png";
 }
 $parms = explode("^",$parm);
 return "<a href='".e_BASE."print.php?{$parms[1]}'><img src='".$icon."' style='border:0' alt='{$parms[0]}' title='{$parms[0]}' /></a>";
\ No newline at end of file
diff --git a/e107_files/shortcode/sitelinks_alt.sc b/e107_files/shortcode/sitelinks_alt.sc
index f1e96bf55..a3aeb58b3 100644
--- a/e107_files/shortcode/sitelinks_alt.sc
+++ b/e107_files/shortcode/sitelinks_alt.sc
@@ -3,18 +3,18 @@
 |     e107 website system
 |
 |     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/sitelinks_alt.sc,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:40 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 
-	global $sql, $pref;
+	global $sql, $pref, $imode;
 	$params = explode('+', $parm);
 	if (isset($params[0]) && $params[0] && $params[0] != 'no_icons' && $params[0] != 'default') {
 		$icon = $params[0];
 	} else {
-		$icon = e_IMAGE."generic/".IMODE."/arrow.png";
+		$icon = e_IMAGE."packs/".$imode."/generic/arrow.png";
 	}
 
 	function adnav_cat($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_open=FALSE) {
diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php
index f6aa0fa70..01389014a 100644
--- a/e107_handlers/comment_class.php
+++ b/e107_handlers/comment_class.php
@@ -12,9 +12,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/comment_class.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:42 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 
@@ -172,7 +172,7 @@ class comment {
 	 */
 	function render_comment($row, $table, $action, $id, $width, $subject, $addrating=FALSE) {
 		//addrating	: boolean, to show rating system in rendered comment
-		global $sql, $sc_style, $comment_shortcodes, $COMMENTSTYLE, $rater, $gen;
+		global $sql, $sc_style, $comment_shortcodes, $COMMENTSTYLE, $rater, $gen, $imode;
 		global $pref, $comrow, $tp, $NEWIMAGE, $USERNAME, $RATING, $datestamp;
 		global $thisaction, $thistable, $thisid;
 
@@ -196,10 +196,10 @@ class comment {
 			$width = 0;
 		}
 		if(!defined("IMAGE_nonew_comments")){
-			define("IMAGE_nonew_comments", (file_exists(THEME."images/nonew_comments.png") ? "<img src='".THEME_ABS."images/nonew_comments.png' alt=''  /> " : "<img src='".e_IMAGE_ABS."generic/".IMODE."/nonew_comments.png' alt=''  />"));
+			define("IMAGE_nonew_comments", (file_exists(THEME."images/nonew_comments.png") ? "<img src='".THEME_ABS."images/nonew_comments.png' alt=''  /> " : "<img src='".e_IMAGE_ABS."packs/".$imode."/generic/nonew_comments.png' alt=''  />"));
 		}
 		if(!defined("IMAGE_new_comments")){
-			define("IMAGE_new_comments", (file_exists(THEME."images/new_comments.png") ? "<img src='".THEME_ABS."images/new_comments.png' alt=''  /> " : "<img src='".e_IMAGE_ABS."generic/".IMODE."/new_comments.png' alt=''  /> "));
+			define("IMAGE_new_comments", (file_exists(THEME."images/new_comments.png") ? "<img src='".THEME_ABS."images/new_comments.png' alt=''  /> " : "<img src='".e_IMAGE_ABS."packs/".$imode."/generic/new_comments.png' alt=''  /> "));
 		}
 		$ns			= new e107table;
 		if(!$gen || !is_object($gen)){ $gen = new convert; }
diff --git a/e107_handlers/emailprint_class.php b/e107_handlers/emailprint_class.php
index c061c0017..4856109e5 100644
--- a/e107_handlers/emailprint_class.php
+++ b/e107_handlers/emailprint_class.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/emailprint_class.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:44 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 
@@ -29,6 +29,9 @@ class emailprint {
 		// $look = 0  --->display all icons
 		// $look = 1  --->display email icon only
 		// $look = 2  --->display print icon only
+		
+		global $imode;
+		
 		$text_emailprint = "";
 
 		//new method emailprint_class : (only news is core, rest is plugin: searched for e_emailprint.php which should hold $email and $print values)
@@ -51,11 +54,11 @@ class emailprint {
 		}
 
 		if ($look == 0 || $look == 1) {
-			$ico_mail = (file_exists(THEME."images/email.png") ? THEME."images/email.png" : e_IMAGE."generic/".IMODE."/email.png");
+			$ico_mail = (file_exists(THEME."images/email.png") ? THEME."images/email.png" : e_IMAGE."packs/".$imode."/generic/email.png");
 			$text_emailprint .= "<a href='".e_BASE."email.php?".$email.".".$id."'><img src='".$ico_mail."' style='border:0' alt='".LAN_EMAIL_7."' title='".LAN_EMAIL_7."' /></a> ";
 		}
 		if ($look == 0 || $look == 2) {
-			$ico_print = (file_exists(THEME."images/printer.png") ? THEME."images/printer.png" : e_IMAGE."generic/".IMODE."/printer.png");
+			$ico_print = (file_exists(THEME."images/printer.png") ? THEME."images/printer.png" : e_IMAGE."packs/".$imode."/generic/printer.png");
 			$text_emailprint .= "<a href='".e_BASE."print.php?".$print.".".$id."'><img src='".$ico_print."' style='border:0' alt='".LAN_PRINT_1."' title='".LAN_PRINT_1."' /></a>";
 		}
 		return $text_emailprint;
diff --git a/e107_handlers/level_handler.php b/e107_handlers/level_handler.php
index df17ee5ab..69bf1787b 100644
--- a/e107_handlers/level_handler.php
+++ b/e107_handlers/level_handler.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/level_handler.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:45 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 	
@@ -22,7 +22,7 @@ if (!defined('e107_INIT')) { exit; }
 function get_level($user_id, $user_forums, $user_comments, $user_chats, $user_visits, $user_join, $user_admin, $user_perms, $pref, $fmod = "")
 {
 	 
-	global $tp;
+	global $tp, $imode;
 
 	if (!$user_id) {
 		return FALSE;
@@ -95,7 +95,7 @@ function get_level($user_id, $user_forums, $user_comments, $user_chats, $user_vi
 		$rank = 9;
 	}
 
-	$data['pic'] = (file_exists(THEME."forum/".$level_images[$rank]) ? THEME."forum/".$level_images[$rank] : e_IMAGE."rate/".IMODE."/".$level_images[$rank]);
+	$data['pic'] = (file_exists(THEME."forum/".$level_images[$rank]) ? THEME."forum/".$level_images[$rank] : e_IMAGE."packs/".$imode."/rate/".$level_images[$rank]);
 	$data['name'] = "[ ".$tp->toHTML($level_names[$rank], FALSE, 'defs')." ]";
 
 	if($level_names[$rank])
diff --git a/e107_handlers/news_class.php b/e107_handlers/news_class.php
index 5b762374d..484b3d17e 100644
--- a/e107_handlers/news_class.php
+++ b/e107_handlers/news_class.php
@@ -12,9 +12,9 @@
 | GNU General Public License (http://gnu.org).
 |
 | $Source: /cvs_backup/e107_0.8/e107_handlers/news_class.php,v $
-| $Revision: 1.1.1.1 $
-| $Date: 2006-12-02 04:33:47 $
-| $Author: mcfly_e107 $
+| $Revision: 1.2 $
+| $Date: 2006-12-07 15:41:50 $
+| $Author: sweetas $
 +---------------------------------------------------------------+
 */
 
@@ -108,7 +108,7 @@ class news {
 	}
 
 	function render_newsitem($news, $mode = 'default', $n_restrict = '', $NEWS_TEMPLATE = '', $param='') {
-		global $tp, $sql, $override, $pref, $ns, $NEWSSTYLE, $NEWSLISTSTYLE, $news_shortcodes, $loop_uid;
+		global $tp, $sql, $override, $pref, $ns, $NEWSSTYLE, $NEWSLISTSTYLE, $news_shortcodes, $loop_uid, $imode;
 		if ($override_newsitem = $override -> override_check('render_newsitem')) {
 			$result = call_user_func($override_newsitem, $news, $mode, $n_restrict, $NEWS_TEMPLATE, $param);
 			if ($result == 'return') {
@@ -131,13 +131,13 @@ class news {
 
 		if (!$param) {
 			if (!defined("IMAGE_nonew_small")){
-				define("IMAGE_nonew_small", (file_exists(THEME."images/nonew_comments.png") ? "<img src='".THEME_ABS."images/nonew_comments.png' alt=''  /> " : "<img src='".e_IMAGE_ABS."generic/".IMODE."/nonew_comments.png' alt=''  />"));
+				define("IMAGE_nonew_small", (file_exists(THEME."images/nonew_comments.png") ? "<img src='".THEME_ABS."images/nonew_comments.png' alt=''  /> " : "<img src='".e_IMAGE_ABS."packs/".$imode."/generic/nonew_comments.png' alt=''  />"));
 			}
 			if (!defined("IMAGE_new_small"))	{
-				define("IMAGE_new_small", (file_exists(THEME."images/new_comments.png") ? "<img src='".THEME_ABS."images/new_comments.png' alt=''  /> " : "<img src='".e_IMAGE_ABS."generic/".IMODE."/new_comments.png' alt=''  /> "));
+				define("IMAGE_new_small", (file_exists(THEME."images/new_comments.png") ? "<img src='".THEME_ABS."images/new_comments.png' alt=''  /> " : "<img src='".e_IMAGE_ABS."packs/".$imode."/generic/new_comments.png' alt=''  /> "));
 			}
 			if (!defined("IMAGE_sticky")){
-				define("IMAGE_sticky", (file_exists(THEME."images/sticky.png") ? "<img src='".THEME_ABS."images/sticky.png' alt=''  /> " : "<img src='".e_IMAGE_ABS."generic/".IMODE."/sticky.png' alt='' style='width: 14px; height: 14px; vertical-align: bottom' /> "));
+				define("IMAGE_sticky", (file_exists(THEME."images/sticky.png") ? "<img src='".THEME_ABS."images/sticky.png' alt=''  /> " : "<img src='".e_IMAGE_ABS."packs/".$imode."/generic/sticky.png' alt='' style='width: 14px; height: 14px; vertical-align: bottom' /> "));
 			}
 
 			$param['image_nonew_small'] = IMAGE_nonew_small;
diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index d3347dd33..576e793b4 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/theme_handler.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2006-12-05 09:15:08 $
-|     $Author: mrpete $
+|     $Revision: 1.3 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 
@@ -287,11 +287,11 @@ class themeHandler{
 		mode = 2 :: selected admin theme
 		*/
 
-		global $ns, $pref;
+		global $ns, $pref, $imode;
 
 		$author = ($theme['email'] ? "<a href='mailto:".$theme['email']."' title='".$theme['email']."'>".$theme['author']."</a>" : $theme['author']);
 		$website = ($theme['website'] ? "<a href='".$theme['website']."' rel='external'>".$theme['website']."</a>" : "");
-		$preview = "<a href='".e_BASE."news.php?themepreview.".$theme['id']."' title='".TPVLAN_9."' >".($theme['preview'] ? "<img src='".$theme['preview']."' style='border: 1px solid #000;width:200px' alt='' />" : "<img src='".e_IMAGE."admin_images/nopreview.png' style='border:0px' title='".TPVLAN_12."' alt='' />")."</a>";
+		$preview = "<a href='".e_BASE."news.php?themepreview.".$theme['id']."' title='".TPVLAN_9."' >".($theme['preview'] ? "<img src='".$theme['preview']."' style='border: 1px solid #000;width:200px' alt='' />" : "<img src='".e_IMAGE."packs/".$imode."/admin_images/nopreview.png' style='border:0px' title='".TPVLAN_12."' alt='' />")."</a>";
 		$selectmainbutton = ($mode != 1 ? "<input class='button' type='submit' name='selectmain_".$theme['id']."' value='".TPVLAN_10."' />" : "");
 		$selectadminbutton = ($mode != 2 ? "<input class='button' type='submit' name='selectadmin_".$theme['id']."' value='".TPVLAN_32."' />" : "");
 		$previewbutton = (!$mode ? "<input class='button' type='submit' name='preview_".$theme['id']."' value='".TPVLAN_9."' /> " : "");
diff --git a/e107_handlers/user_select_class.php b/e107_handlers/user_select_class.php
index ff08f61b4..265a32ae9 100644
--- a/e107_handlers/user_select_class.php
+++ b/e107_handlers/user_select_class.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/user_select_class.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:59 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 
@@ -84,7 +84,7 @@ class user_select {
 	}
 	
 	function select_form($type, $user_form, $user_value = '', $class_form = false, $class_value = '', $class = false) {
-		global $tp;
+		global $tp, $imode;
 		$text .= "<script type='text/javascript'>
 		<!--
 		function uc_switch(uctype) {
@@ -109,7 +109,7 @@ class user_select {
 			{
 				$text .= "<input class='tbox' type='text' name='".$form_id."' id='".$form_id."' size='25' maxlength='30' value='".$tp -> post_toForm($user_value)."'>&nbsp;";
 			}
-			$text .= "<img src='".e_IMAGE_ABS."generic/".IMODE."/user_select.png' 
+			$text .= "<img src='".e_IMAGE_ABS."packs/".$imode."/generic/user_select.png' 
 			style='width: 16px; height: 16px; vertical-align: top' alt='".US_LAN_4."...' 
 			title='".US_LAN_4."...' onclick=\"window.open('".e_HANDLER_ABS."user_select_class.php?".$user_form."','user_search', 'toolbar=no,location=no,status=yes,scrollbars=yes,resizable=yes,width=300,height=200,left=100,top=100'); return false;\" />";
 		}
diff --git a/e107_plugins/calendar_menu/calendar_shortcodes.php b/e107_plugins/calendar_menu/calendar_shortcodes.php
index 55704ac19..3d99c6e9d 100644
--- a/e107_plugins/calendar_menu/calendar_shortcodes.php
+++ b/e107_plugins/calendar_menu/calendar_shortcodes.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar_shortcodes.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:34:46 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 |
 | 10.11.06 - mods for next CVS release
 +----------------------------------------------------------------------------+
@@ -182,10 +182,10 @@ SC_BEGIN SHOWEVENT_HEADING
 SC_END
 
 SC_BEGIN CALENDAR_CALENDAR_RECENT_ICON
-  global $ev;
+  global $ev, $imode;
   if (!isset($ev['is_recent'])) return "";
 //  $recent_icon = e_PLUGIN."calendar_menu/images/recent_icon.png";
-  $recent_icon = e_IMAGE."generic/".IMODE."/new.png";
+  $recent_icon = e_IMAGE."packs/".$imode."/generic/new.png";
   if (file_exists($recent_icon))
 	{
 	  return "<img style='border:0' src='".$recent_icon."' alt='' /> ";
@@ -291,10 +291,10 @@ SC_END
 // EVENT SHOWEVENT ------------------------------------------------------------
 
 SC_BEGIN EVENT_RECENT_ICON
-  global $thisevent, $ecal_class;
+  global $thisevent, $ecal_class, $imode;
   if (($ecal_class->max_recent_show == 0) || (time() - $thisevent['event_datestamp']) > $ecal_class->max_recent_show) return "";
 // Can use the generic icon, or a calendar-specific one  
-  $recent_icon = e_IMAGE."generic/".IMODE."/new.png";
+  $recent_icon = e_IMAGE."packs/".$imode."/generic/new.png";
 //  $recent_icon = e_PLUGIN."calendar_menu/images/recent_icon.png";
   if (file_exists($recent_icon))
 	{
@@ -416,9 +416,9 @@ SC_BEGIN EVENT_THREAD
 SC_END
 
 SC_BEGIN EVENT_OPTIONS
-	global $EVENT_OPTIONS, $thisevent, $event_author_name, $cal_super;
+	global $EVENT_OPTIONS, $thisevent, $event_author_name, $cal_super, $imode;
 	if (USERNAME == $event_author_name || $cal_super){
-		$EVENT_OPTIONS = "<a href='event.php?ed.".$thisevent['event_id']."'><img style='border:0;' src='".e_IMAGE."admin_images/edit_16.png' title='".EC_LAN_35."' alt='".EC_LAN_35 . "'/></a>&nbsp;&nbsp;<a href='".e_PLUGIN."calendar_menu/event.php?de.".$thisevent['event_id']."'><img style='border:0;' src='".e_IMAGE."admin_images/delete_16.png' title='".EC_LAN_36."' alt='".EC_LAN_36."'/></a>";
+		$EVENT_OPTIONS = "<a href='event.php?ed.".$thisevent['event_id']."'><img style='border:0;' src='".e_IMAGE."packs/".$imode."/admin_images/edit_16.png' title='".EC_LAN_35."' alt='".EC_LAN_35 . "'/></a>&nbsp;&nbsp;<a href='".e_PLUGIN."calendar_menu/event.php?de.".$thisevent['event_id']."'><img style='border:0;' src='".e_IMAGE."packs/".$imode."/admin_images/delete_16.png' title='".EC_LAN_36."' alt='".EC_LAN_36."'/></a>";
 	}
 	return $EVENT_OPTIONS;
 SC_END
diff --git a/e107_plugins/content/handlers/content_class.php b/e107_plugins/content/handlers/content_class.php
index bdab9f0c3..006be3eb2 100644
--- a/e107_plugins/content/handlers/content_class.php
+++ b/e107_plugins/content/handlers/content_class.php
@@ -12,9 +12,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |		$Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_class.php,v $
-|		$Revision: 1.1.1.1 $
-|		$Date: 2006-12-02 04:34:58 $
-|		$Author: mcfly_e107 $
+|		$Revision: 1.2 $
+|		$Date: 2006-12-07 15:41:50 $
+|		$Author: sweetas $
 +---------------------------------------------------------------+
 */
 
@@ -1076,9 +1076,11 @@ class content{
 			//$width	:	the width of the popup (uses a default width of 500)
 			//$title	:	the window title of the popup (uses a default title of ...)
 			//$text		:	the help text to show into the popup
+			
+			global $imode;
 
 			if(!$image || !file_exists($image)){
-				$image = e_IMAGE."admin_images/docs_16.png";
+				$image = e_IMAGE."packs/".$imode."/admin_images/docs_16.png";
 			}
 			if(!$width){ $width = "320"; }
 			if(!$title){ $title = "content management help area"; }
diff --git a/e107_plugins/content/handlers/content_defines.php b/e107_plugins/content/handlers/content_defines.php
index 592b67f50..ba901397e 100644
--- a/e107_plugins/content/handlers/content_defines.php
+++ b/e107_plugins/content/handlers/content_defines.php
@@ -1,9 +1,9 @@
 <?php
 if (!defined('e107_INIT')) { exit; }
 
-global $plugindir;
+global $plugindir, $imode;
 $plugindir = e_PLUGIN."content/";
-$imagedir = e_IMAGE."admin_images/";
+$imagedir = e_IMAGE."packs/".$imode."/admin_images/";
 $lan_file = e_PLUGIN.'content/languages/'.e_LANGUAGE.'/lan_content_admin.php';
 include_once(file_exists($lan_file) ? $lan_file : e_PLUGIN.'content/languages/English/lan_content_admin.php');
 $lan_file = e_PLUGIN.'content/languages/'.e_LANGUAGE.'/lan_content.php';
diff --git a/e107_plugins/gsitemap/admin_config.php b/e107_plugins/gsitemap/admin_config.php
index d7528edad..086785203 100644
--- a/e107_plugins/gsitemap/admin_config.php
+++ b/e107_plugins/gsitemap/admin_config.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/gsitemap/admin_config.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:19 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
@@ -98,7 +98,7 @@ class gsitemap
 
 	function showList()
 	{
-		global $sql,$ns,$tp;
+		global $sql, $ns, $tp, $imode;
 		$gen = new convert;
 		$count = $sql -> db_Select("gsitemap", "*", "gsitemap_id !=0 ORDER BY gsitemap_order ASC");
 
@@ -150,8 +150,8 @@ class gsitemap
 
 				<td style='width:50px;white-space:nowrap' class='forumheader3'>
 				<div>
-				<input type='image' name='edit[{$row2['gsitemap_id']}]' value='edit' src='".e_IMAGE."admin_images/edit_16.png' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' />
-				<input type='image' name='delete[{$row2['gsitemap_id']}]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$row2['gsitemap_name']."]")."') \" src='".e_IMAGE."admin_images/delete_16.png' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' />
+				<input type='image' name='edit[{$row2['gsitemap_id']}]' value='edit' src='".e_IMAGE."packs/".$imode."/admin_images/edit_16.png' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' />
+				<input type='image' name='delete[{$row2['gsitemap_id']}]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$row2['gsitemap_name']."]")."') \" src='".e_IMAGE."packs/".$imode."/admin_images/delete_16.png' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' />
 				</div>
 				</td>
 				</tr>
diff --git a/e107_plugins/links_page/link_defines.php b/e107_plugins/links_page/link_defines.php
index 342c06ec4..f969c7a9a 100644
--- a/e107_plugins/links_page/link_defines.php
+++ b/e107_plugins/links_page/link_defines.php
@@ -11,16 +11,18 @@
 |    GNU    General Public  License (http://gnu.org).
 |
 |    $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/link_defines.php,v $
-|    $Revision: 1.1.1.1 $
-|    $Date: 2006-12-02 04:35:22 $
-|    $Author: mcfly_e107 $
+|    $Revision: 1.2 $
+|    $Date: 2006-12-07 15:41:50 $
+|    $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
 
-$imagedir = e_IMAGE."admin_images/";
-if (!defined("IMAGE_NEW")){ define("IMAGE_NEW", (file_exists(THEME."images/new.png") ? THEME."images/new.png" : e_IMAGE."generic/".IMODE."/new.png")); }
+global $imode;
+
+$imagedir = e_IMAGE."packs/".$imode."/admin_images/";
+if (!defined("IMAGE_NEW")){ define("IMAGE_NEW", (file_exists(THEME."images/new.png") ? THEME."images/new.png" : e_IMAGE."packs/".$imode."/generic/new.png")); }
 if (!defined('LINK_ICON_EDIT')) { define("LINK_ICON_EDIT", "<img src='".$imagedir."edit_16.png' alt='' style='border:0; cursor:pointer;' />"); }
 if (!defined('LINK_ICON_DELETE')) { define("LINK_ICON_DELETE", "<img src='".$imagedir."delete_16.png' alt='' style='border:0; cursor:pointer;' />"); }
 if (!defined('LINK_ICON_DELETE_BASE')) { define("LINK_ICON_DELETE_BASE", $imagedir."delete_16.png"); }
diff --git a/e107_plugins/online_extended_menu/online_extended_menu.php b/e107_plugins/online_extended_menu/online_extended_menu.php
index e0dbdce09..b2101aad4 100644
--- a/e107_plugins/online_extended_menu/online_extended_menu.php
+++ b/e107_plugins/online_extended_menu/online_extended_menu.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/online_extended_menu/online_extended_menu.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:32 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -48,7 +48,7 @@ if(!defined("e_TRACKING_DISABLED") && (isset($pref['track_online']) && $pref['tr
 				$pinfo = "comment.php";
 				$online_location_page = "comment.php";
 			}
-			$text .= "<img src='".e_IMAGE."admin_images/users_16.png' alt='' style='vertical-align:middle' /> <a href='".e_BASE."user.php?id.$oid'>$oname</a> ".ONLINE_EL7;
+			$text .= "<img src='".e_IMAGE."packs/".$imode."/admin_images/users_16.png' alt='' style='vertical-align:middle' /> <a href='".e_BASE."user.php?id.$oid'>$oname</a> ".ONLINE_EL7;
 			(!strstr($pinfo, $ADMIN_DIRECTORY) ? $text .= " <a href='{$pinfo}'>$online_location_page</a><br />" : $text .= " $online_location_page<br />");
 		}
 	}
diff --git a/e107_plugins/rss_menu/admin_prefs.php b/e107_plugins/rss_menu/admin_prefs.php
index c8cc6e595..0f2f8050c 100644
--- a/e107_plugins/rss_menu/admin_prefs.php
+++ b/e107_plugins/rss_menu/admin_prefs.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/admin_prefs.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:41 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:50 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 /*
@@ -35,7 +35,7 @@ require_once(file_exists($lan_file) ? $lan_file : e_PLUGIN."rss_menu/languages/E
 
 require_once(e_ADMIN."auth.php");
 
-$imagedir = e_IMAGE."admin_images/";
+$imagedir = e_IMAGE."packs/".$imode."/admin_images/";
 $lan_file = e_PLUGIN.'rss_menu/languages/'.e_LANGUAGE.'.php';
 include_once(file_exists($lan_file) ? $lan_file : e_PLUGIN.'rss_menu/languages/English.php');
 require_once(e_PLUGIN.'rss_menu/rss_shortcodes.php');
diff --git a/e107_themes/templates/login_template.php b/e107_themes/templates/login_template.php
index db869b048..715e4cd92 100644
--- a/e107_themes/templates/login_template.php
+++ b/e107_themes/templates/login_template.php
@@ -18,7 +18,7 @@ if(!$LOGIN_TABLE){
 		}
 		$LOGIN_TABLE .= "
 		<div style='text-align:center'>
-		".$rs -> form_open("post", e_SELF)."<table class='fborder' style='width:60%' >\n<tr>\n<td class='forumheader' style='text-align:center;' colspan='3'>".LAN_LOGIN_4."</td>\n</tr>\n<tr>\n<td class='forumheader3' width='40%'>".LAN_LOGIN_1."</td>\n<td class='forumheader3' width='40%'>{LOGIN_TABLE_USERNAME}</td>\n<td class='forumheader3' width='20%' rowspan='".($LOGIN_TABLE_SECIMG_SECIMG ? 3 : 2)."' style='vertical-align: middle; margin-left: auto; margin-right: auto; text-align: center;'>".(file_exists(THEME."images/password.png") ? "<img src='".THEME."images/password.png' alt='' />\n" : "<img src='".e_IMAGE."generic/".IMODE."/password.png' alt='' />\n" )."</td>\n</tr>\n<tr>\n<td class='forumheader3'>".LAN_LOGIN_2."</td>\n<td class='forumheader3'>{LOGIN_TABLE_PASSWORD}</td>\n</tr>\n";
+		".$rs -> form_open("post", e_SELF)."<table class='fborder' style='width:60%' >\n<tr>\n<td class='forumheader' style='text-align:center;' colspan='3'>".LAN_LOGIN_4."</td>\n</tr>\n<tr>\n<td class='forumheader3' width='40%'>".LAN_LOGIN_1."</td>\n<td class='forumheader3' width='40%'>{LOGIN_TABLE_USERNAME}</td>\n<td class='forumheader3' width='20%' rowspan='".($LOGIN_TABLE_SECIMG_SECIMG ? 3 : 2)."' style='vertical-align: middle; margin-left: auto; margin-right: auto; text-align: center;'>".(file_exists(THEME."images/password.png") ? "<img src='".THEME."images/password.png' alt='' />\n" : "<img src='".e_IMAGE."packs/".$imode."/generic/password.png' alt='' />\n" )."</td>\n</tr>\n<tr>\n<td class='forumheader3'>".LAN_LOGIN_2."</td>\n<td class='forumheader3'>{LOGIN_TABLE_PASSWORD}</td>\n</tr>\n";
 	if($LOGIN_TABLE_SECIMG_SECIMG){
 		$LOGIN_TABLE .= "<tr><td class='forumheader3'>{LOGIN_TABLE_SECIMG_LAN}</td>\n<td class='forumheader3'>{LOGIN_TABLE_SECIMG_HIDDEN} {LOGIN_TABLE_SECIMG_SECIMG} {LOGIN_TABLE_SECIMG_TEXTBOC}</td>\n</tr>\n";
 	}
diff --git a/page.php b/page.php
index 9978bdaa0..35522badc 100644
--- a/page.php
+++ b/page.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/page.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:09 $ - mods to make password protected pages work
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:49 $ - mods to make password protected pages work
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 
@@ -346,7 +346,7 @@ class pageClass
 
 	function pageCheckPerms($page_class, $page_password)
 	{
-		global $ns, $tp, $HEADER, $FOOTER, $sql;     // $tp added
+		global $ns, $tp, $HEADER, $FOOTER, $sql, $imode;
 
 		if (!check_class($page_class))
 		{
@@ -391,7 +391,7 @@ class pageClass
 		<tr>
 		<td class='forumheader3' style='width:20%;'>".LAN_PAGE_9.":</td>
 		<td class='forumheader3' style='width: 60%;'><input type='password' id='page_pw' name='page_pw' style='width: 90%;'/></td>
-		<td class='forumheader3' style='width:20%; vertical-align:middle; margin-left:auto; margin-right:auto; text-align:center;'><img src='".e_IMAGE."generic/".IMODE."/password.png' alt='' /></td>
+		<td class='forumheader3' style='width:20%; vertical-align:middle; margin-left:auto; margin-right:auto; text-align:center;'><img src='".e_IMAGE."packs/".$imode."/generic/password.png' alt='' /></td>
 		</tr>
 		<tr>
 		<td class='forumheader' colspan='3' style='text-align:center;'><input class='button' type='submit' name='submit_page_pw' value='".LAN_PAGE_10."' /></td>
diff --git a/search.php b/search.php
index b085f9cc6..e66aa3a04 100644
--- a/search.php
+++ b/search.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/search.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:33:09 $
-|     $Author: mcfly_e107 $
+|     $Revision: 1.2 $
+|     $Date: 2006-12-07 15:41:49 $
+|     $Author: sweetas $
 +----------------------------------------------------------------------------+
 */
 
@@ -309,7 +309,7 @@ if ($search_prefs['selector'] == 1) {
 
 $SEARCH_MAIN_SUBMIT = "<input type='hidden' name='r' value='0' /><input class='button' type='submit' name='s' value='".LAN_180."' />";
 
-$ENHANCED_ICON = "<img src='".e_IMAGE."generic/".IMODE."/search_enhanced.png' style='width: 16px; height: 16px; vertical-align: top'
+$ENHANCED_ICON = "<img src='".e_IMAGE."packs/".$imode."/generic/search_enhanced.png' style='width: 16px; height: 16px; vertical-align: top'
 alt='".LAN_SEARCH_23."' title='".LAN_SEARCH_23."' onclick=\"expandit('en_in'); expandit('en_ex'); expandit('en_ep'); expandit('en_be')\"/>";
 
 $enhanced_types['in'] = LAN_SEARCH_24.':';