diff --git a/e107_files/bbcode/img.bb b/e107_files/bbcode/img.bb
index d1a6155a0..06850af49 100644
--- a/e107_files/bbcode/img.bb
+++ b/e107_files/bbcode/img.bb
@@ -80,6 +80,7 @@ if (strpos($img_file['basename'],'*') !== FALSE)
 	}
 }
 
+$pref['image_post_class'] = 0;
 
 // Check for whether we can display image down here - so we can show image name if appropriate
 if (!varsettrue($pref['image_post']) || !check_class($pref['image_post_class']))
diff --git a/e107_files/default_install.xml b/e107_files/default_install.xml
index e93b99593..33c599f98 100644
--- a/e107_files/default_install.xml
+++ b/e107_files/default_install.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8' ?>
-<e107Export version='0.8.0 (cvs)' timestamp='1251834958' >
+<e107Export version='0.8.0 (cvs)' timestamp='1251856226' >
 	<prefs>
 		<core name='admin_alerts_ok'>1</core>
 		<core name='admin_alerts_uniquemenu'>0</core>
@@ -10,17 +10,17 @@
 		<core name='adminstyle'>infopanel</core>
 		<core name='admintheme'>jayya</core>
 		<core name='allowCommentEdit'>0</core>
-		<core name='allowEmailLogin'>0</core>
+		<core name='allowEmailLogin'>1</core>
 		<core name='anon_post'>0</core>
 		<core name='antiflood1'>1</core>
 		<core name='antiflood_timeout'>10</core>
 		<core name='auth_method'></core>
 		<core name='autoban'>1</core>
-		<core name='autologinpostsignup'>0</core>
+		<core name='autologinpostsignup'>1</core>
 		<core name='ban_max_online_access'>100,200</core>
 		<core name='ban_retrigger'>0</core>
 		<core name='cachestatus'></core>
-		<core name='check_updates'>0</core>
+		<core name='check_updates'>1</core>
 		<core name='comments_disabled'>0</core>
 		<core name='comments_emoticons'>0</core>
 		<core name='comments_icon'>0</core>
@@ -371,6 +371,132 @@ City, State, Country
     'email' => '',
   ),
 )]]></notify>
+		<ipool name='core-icons'><![CDATA[array (
+  0 => '{e_IMAGE}icons/alarm_16.png',
+  1 => '{e_IMAGE}icons/alarm_32.png',
+  2 => '{e_IMAGE}icons/colors_16.png',
+  3 => '{e_IMAGE}icons/colors_32.png',
+  4 => '{e_IMAGE}icons/config_16.png',
+  5 => '{e_IMAGE}icons/config_32.png',
+  6 => '{e_IMAGE}icons/download_32.png',
+  7 => '{e_IMAGE}icons/folder_32.png',
+  8 => '{e_IMAGE}icons/folder_48.png',
+  9 => '{e_IMAGE}icons/folderx_32.png',
+  10 => '{e_IMAGE}icons/folderx_48.png',
+  11 => '{e_IMAGE}icons/help_16.png',
+  12 => '{e_IMAGE}icons/help_32.png',
+  13 => '{e_IMAGE}icons/html_16.png',
+  14 => '{e_IMAGE}icons/html_32.png',
+  15 => '{e_IMAGE}icons/important_16.png',
+  16 => '{e_IMAGE}icons/important_32.png',
+  17 => '{e_IMAGE}icons/info_16.png',
+  18 => '{e_IMAGE}icons/info_32.png',
+  19 => '{e_IMAGE}icons/news_16.png',
+  20 => '{e_IMAGE}icons/news_32.png',
+  21 => '{e_IMAGE}icons/plug_16.png',
+  22 => '{e_IMAGE}icons/plug_32.png',
+  23 => '{e_IMAGE}icons/sound_16.png',
+  24 => '{e_IMAGE}icons/sound_32.png',
+  25 => '{e_IMAGE}icons/thumbnail_16.png',
+  26 => '{e_IMAGE}icons/thumbnail_32.png',
+  27 => '{e_IMAGE}icons/video_16.png',
+  28 => '{e_IMAGE}icons/video_32.png',
+  29 => '{e_IMAGE}icons/view_16.png',
+  30 => '{e_IMAGE}icons/view_32.png',
+  31 => '{e_IMAGE}icons/wizard_16.png',
+  32 => '{e_IMAGE}icons/wizard_32.png',
+)]]></ipool>
+		<ipool name='plugin-alt_auth'><![CDATA[array (
+  0 => '{e_PLUGIN}alt_auth/images/alt_auth_16.png',
+  1 => '{e_PLUGIN}alt_auth/images/alt_auth_32.png',
+)]]></ipool>
+		<ipool name='plugin-banner'><![CDATA[array (
+  0 => '{e_PLUGIN}banner/images/banners_16.png',
+  1 => '{e_PLUGIN}banner/images/banners_32.png',
+)]]></ipool>
+		<ipool name='plugin-calendar_menu'><![CDATA[array (
+  0 => '{e_PLUGIN}calendar_menu/images/calendar_16.png',
+  1 => '{e_PLUGIN}calendar_menu/images/calendar_32.png',
+)]]></ipool>
+		<ipool name='plugin-chatbox_menu'><![CDATA[array (
+  0 => '{e_PLUGIN}chatbox_menu/images/chatbox_16.png',
+  1 => '{e_PLUGIN}chatbox_menu/images/chatbox_32.png',
+)]]></ipool>
+		<ipool name='plugin-download'><![CDATA[array (
+  0 => '{e_PLUGIN}download/images/downloads_16.png',
+  1 => '{e_PLUGIN}download/images/downloads_32.png',
+)]]></ipool>
+		<ipool name='plugin-fbox'><![CDATA[array (
+  0 => '{e_PLUGIN}fbox/images/icon_16.png',
+  1 => '{e_PLUGIN}fbox/images/icon_32.png',
+)]]></ipool>
+		<ipool name='plugin-featurebox'><![CDATA[array (
+  0 => '{e_PLUGIN}featurebox/images/featurebox_16.png',
+  1 => '{e_PLUGIN}featurebox/images/featurebox_32.png',
+)]]></ipool>
+		<ipool name='plugin-forum'><![CDATA[array (
+  0 => '{e_PLUGIN}forum/images/forums_16.png',
+  1 => '{e_PLUGIN}forum/images/forums_32.png',
+  2 => '{e_PLUGIN}forum/images/sub_forums_16.png',
+)]]></ipool>
+		<ipool name='plugin-gsitemap'><![CDATA[array (
+  0 => '{e_PLUGIN}gsitemap/images/icon_16.png',
+)]]></ipool>
+		<ipool name='plugin-import'><![CDATA[array (
+  0 => '{e_PLUGIN}import/images/import_16.png',
+  1 => '{e_PLUGIN}import/images/import_32.png',
+)]]></ipool>
+		<ipool name='plugin-log'><![CDATA[array (
+  0 => '{e_PLUGIN}log/images/stats_16.png',
+  1 => '{e_PLUGIN}log/images/stats_32.png',
+)]]></ipool>
+		<ipool name='plugin-newforumposts_main'><![CDATA[array (
+  0 => '{e_PLUGIN}newforumposts_main/images/new_forum_16.png',
+  1 => '{e_PLUGIN}newforumposts_main/images/new_forum_32.png',
+)]]></ipool>
+		<ipool name='plugin-newsfeed'><![CDATA[array (
+  0 => '{e_PLUGIN}newsfeed/images/newsfeed_16.png',
+  1 => '{e_PLUGIN}newsfeed/images/newsfeed_32.png',
+)]]></ipool>
+		<ipool name='plugin-newsletter'><![CDATA[array (
+  0 => '{e_PLUGIN}newsletter/images/nl_16.png',
+  1 => '{e_PLUGIN}newsletter/images/nl_32.png',
+)]]></ipool>
+		<ipool name='plugin-pdf'><![CDATA[array (
+  0 => '{e_PLUGIN}pdf/images/pdf_16.png',
+  1 => '{e_PLUGIN}pdf/images/pdf_32.png',
+)]]></ipool>
+		<ipool name='plugin-pm'><![CDATA[array (
+  0 => '{e_PLUGIN}pm/images/pvt_message_16.png',
+  1 => '{e_PLUGIN}pm/images/pvt_message_32.png',
+)]]></ipool>
+		<ipool name='plugin-poll'><![CDATA[array (
+  0 => '{e_PLUGIN}poll/images/polls_16.png',
+  1 => '{e_PLUGIN}poll/images/polls_32.png',
+)]]></ipool>
+		<ipool name='plugin-rss_menu'><![CDATA[array (
+  0 => '{e_PLUGIN}rss_menu/images/rss_16.png',
+  1 => '{e_PLUGIN}rss_menu/images/rss_32.png',
+)]]></ipool>
+		<ipool name='plugin-search_menu'><![CDATA[array (
+  0 => '{e_PLUGIN}search_menu/images/search_32.png',
+)]]></ipool>
+		<ipool name='plugin-tagwords'><![CDATA[array (
+  0 => '{e_PLUGIN}tagwords/images/tagwords_16.png',
+  1 => '{e_PLUGIN}tagwords/images/tagwords_32.png',
+)]]></ipool>
+		<ipool name='plugin-trackback'><![CDATA[array (
+  0 => '{e_PLUGIN}trackback/images/trackback_16.png',
+  1 => '{e_PLUGIN}trackback/images/trackback_32.png',
+)]]></ipool>
+		<ipool name='theme-jayya'><![CDATA[array (
+  0 => '{e_THEME}jayya/images/arrow_16.png',
+  1 => '{e_THEME}jayya/images/arrow_over_16.png',
+  2 => '{e_THEME}jayya/images/comments_16.png',
+  3 => '{e_THEME}jayya/images/email_16.png',
+  4 => '{e_THEME}jayya/images/postedby_16.png',
+  5 => '{e_THEME}jayya/images/print_16.png',
+)]]></ipool>
 	</prefs>
 	<database>
 	<dbTable name='generic'>
@@ -634,6 +760,50 @@ City, State, Country
 			<field name='menu_layout'></field>
 			<field name='menu_parms'></field>
 		</item>
+		<item>
+			<field name='menu_id'>23</field>
+			<field name='menu_name'>debug_menu</field>
+			<field name='menu_location'>0</field>
+			<field name='menu_order'>0</field>
+			<field name='menu_class'>0</field>
+			<field name='menu_pages'></field>
+			<field name='menu_path'>debug_menu/</field>
+			<field name='menu_layout'></field>
+			<field name='menu_parms'></field>
+		</item>
+		<item>
+			<field name='menu_id'>24</field>
+			<field name='menu_name'>counter_menu</field>
+			<field name='menu_location'>0</field>
+			<field name='menu_order'>0</field>
+			<field name='menu_class'>0</field>
+			<field name='menu_pages'></field>
+			<field name='menu_path'>siteinfo_menu/</field>
+			<field name='menu_layout'></field>
+			<field name='menu_parms'></field>
+		</item>
+		<item>
+			<field name='menu_id'>25</field>
+			<field name='menu_name'>latestnews_menu</field>
+			<field name='menu_location'>0</field>
+			<field name='menu_order'>0</field>
+			<field name='menu_class'>0</field>
+			<field name='menu_pages'></field>
+			<field name='menu_path'>siteinfo_menu/</field>
+			<field name='menu_layout'></field>
+			<field name='menu_parms'></field>
+		</item>
+		<item>
+			<field name='menu_id'>26</field>
+			<field name='menu_name'>usertheme_menu</field>
+			<field name='menu_location'>0</field>
+			<field name='menu_order'>0</field>
+			<field name='menu_class'>0</field>
+			<field name='menu_pages'></field>
+			<field name='menu_path'>user_menu/</field>
+			<field name='menu_layout'></field>
+			<field name='menu_parms'></field>
+		</item>
 	</dbTable>
 	<dbTable name='news'>
 		<item>
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index 6e5dc9414..d95c69b8b 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $
-|     $Revision: 1.75 $
-|     $Date: 2009-08-31 02:00:51 $
+|     $Revision: 1.76 $
+|     $Date: 2009-09-02 02:05:51 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -322,7 +322,7 @@ class e107plugin
        		$iconpool[$key][] = $tp->createConstants($file['path'],1).$file['fname'];
 		}
 
- 		$srch = array(e_PLUGIN,"/images/","/icons/");
+ 		$srch = array(e_PLUGIN,"/images/","/icons/","/icon/");
 		$repl = array("","","");
 
 		foreach($plugin_icons as $file)
@@ -332,6 +332,9 @@ class e107plugin
        		$iconpool[$key][] = $tp->createConstants($file['path'],1).$file['fname'];
 		}
 
+		$srch = array(e_THEME,"/images/","/icons/","/demo/");
+		$repl = array("","","");
+
 		foreach($theme_icons as $file)
 		{
 			$path = str_replace($srch,$repl,$file['path']);