diff --git a/phpgwapi/templates/default/login.tpl b/phpgwapi/templates/default/login.tpl
deleted file mode 100644
index 336d3f022e..0000000000
--- a/phpgwapi/templates/default/login.tpl
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-{phpgw_loginscreen_message}
-
-
-
-
-
-
-
- |
- phpGroupWare
- |
-
-
- |
-
- |
-
-
- |
-
-
-
-
-
-
-
-{phpgw_loginscreen_message}
-
-
-
-
-
-
-
- |
- phpGroupWare
- |
-
-
- |
-
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
- Opps! You caught us in the middle of a system upgrade.
Please, check back with us shortly.
- |
-
-
-
diff --git a/phpgwapi/templates/default/msgbox.tpl b/phpgwapi/templates/default/msgbox.tpl
deleted file mode 100644
index d00231d981..0000000000
--- a/phpgwapi/templates/default/msgbox.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
- {msgbox_text} |
-
-
-
-
-
diff --git a/phpgwapi/templates/default/portal.tpl b/phpgwapi/templates/default/portal.tpl
deleted file mode 100755
index b9ef1e9a69..0000000000
--- a/phpgwapi/templates/default/portal.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
- |
-
- |
-
-
- |
-
-
- |
-
- |
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/phpgwapi/templates/default/portal_linkbox.tpl b/phpgwapi/templates/default/portal_linkbox.tpl
deleted file mode 100755
index d86fd030e5..0000000000
--- a/phpgwapi/templates/default/portal_linkbox.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-{text}
-
-
diff --git a/phpgwapi/templates/default/portal_linkbox_footer.tpl b/phpgwapi/templates/default/portal_linkbox_footer.tpl
deleted file mode 100755
index e42cc68861..0000000000
--- a/phpgwapi/templates/default/portal_linkbox_footer.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/phpgwapi/templates/default/portal_linkbox_header.tpl b/phpgwapi/templates/default/portal_linkbox_header.tpl
deleted file mode 100755
index 52421d5e7a..0000000000
--- a/phpgwapi/templates/default/portal_linkbox_header.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/phpgwapi/templates/default/portal_main.tpl b/phpgwapi/templates/default/portal_main.tpl
deleted file mode 100755
index 57434c5155..0000000000
--- a/phpgwapi/templates/default/portal_main.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- | {title} |
-
-
- |
-
- |
-
-
diff --git a/phpgwapi/templates/idsociety/idsociety-alphabet-4.xcf b/phpgwapi/templates/idsociety/idsociety-alphabet-4.xcf
deleted file mode 100644
index bfc55291a5..0000000000
Binary files a/phpgwapi/templates/idsociety/idsociety-alphabet-4.xcf and /dev/null differ
diff --git a/phpgwapi/templates/idsociety/parts.inc.php b/phpgwapi/templates/idsociety/parts.inc.php
deleted file mode 100644
index 8f04e9fe70..0000000000
--- a/phpgwapi/templates/idsociety/parts.inc.php
+++ /dev/null
@@ -1,187 +0,0 @@
-template->set_var('phpgw_left_table_width','5%');
- $GLOBALS['phpgw']->template->set_var('phpgw_body_table_height','85%');
- $GLOBALS['phpgw']->template->set_var('phpgw_bottom_table_height','5%');
-
- function parse_toppart($output)
- {
- $GLOBALS['phpgw']->template->set_file('parts','parts.tpl');
- $GLOBALS['phpgw']->template->set_block('parts','top_part');
- $var['img_root'] = PHPGW_IMAGES_DIR;
-
- $find_single = strrpos($GLOBALS['phpgw_info']['server']['webserver_url'],'/');
- $find_double = strpos(strrev($GLOBALS['phpgw_info']['server']['webserver_url'].' '),'//');
- if($find_double)
- {
- $find_double = strlen($GLOBALS['phpgw_info']['server']['webserver_url']) - $find_double - 1;
- }
- if($find_double)
- {
- if($find_single == $find_double + 1)
- {
- $GLOBALS['strip_portion'] = $GLOBALS['phpgw_info']['server']['webserver_url'];
- }
- else
- {
- $GLOBALS['strip_portion'] = substr($GLOBALS['phpgw_info']['server']['webserver_url'],0,$find_double + 1);
- }
- }
- else
- {
- $GLOBALS['strip_portion'] = $GLOBALS['phpgw_info']['server']['webserver_url'].'/';
- }
-
- $var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url'];
- $var['preferences_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url'];
- $var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url'];
- $var['help_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url'];
-
- if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home')
- {
- $var['welcome_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','welcome2');
- $GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over');
- }
- else
- {
- $var['welcome_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over');
- $GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image('phpgwapi','welcome2');
- }
- $var['welcome_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','welcome2','_over');
-
- if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'preferences')
- {
- $var['preferences_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','preferences2');
- $GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over');
- }
- else
- {
- $var['preferences_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over');
- $GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image('phpgwapi','preferences2');
- }
- $var['preferences_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','preferences2','_over');
-
- $var['logout_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','log_out2');
- $GLOBALS['phpgw_info']['flags']['preload_images'][] = $GLOBALS['phpgw']->common->image_on('phpgwapi','log_out2','_over');
- $var['logout_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','log_out2','_over');
-
- if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'about')
- {
- $var['about_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','question_mark2');
- $var['about_img_hover'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','question_mark2','_over');
- }
- else
- {
- $var['about_img'] = $GLOBALS['phpgw']->common->image_on('phpgwapi','question_mark2','_over');
- $var['about_img_hover'] = $GLOBALS['phpgw']->common->image('phpgwapi','question_mark2');
- }
-
- $var['logo_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','logo2');
-
- // "powered_by_color" and "_size" are is also used by number of current users thing
-
- if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
- {
- $db = $GLOBALS['phpgw']->db;
- $db->query('select count(session_id) from phpgw_sessions');
- $db->next_record();
- $var['current_users'] = ' ' . lang('Current users') . ': ' . $db->f(0) . '';
- $GLOBALS['phpgw']->template->set_var($var);
- }
- else
- {
- $var['current_users'] = '';
- $GLOBALS['phpgw']->template->set_var($var);
- }
-
- $var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname();
- $now = time();
- $var['user_info_date'] =
- lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
- . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
- $var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date'];
-
- $GLOBALS['phpgw']->template->set_var($var);
- $GLOBALS['phpgw']->template->fp($output,'top_part');
- }
-
- function parse_leftpart($output)
- {
- $GLOBALS['phpgw']->template->set_file('parts','parts.tpl');
- $GLOBALS['phpgw']->template->set_block('parts','left_part');
- $applications = '';
- while ($app = each($GLOBALS['phpgw_info']['navbar']))
- {
- if ($app[0] != 'home' && $app[0] != 'preferences' && $app[0] != 'about' && $app[0] != 'logout')
- {
- $title = '![' . $app[1]['title'] . '](' . $app[1]['icon'] . ' "'
- . $app[1]['title'] . '") ';
- $img_src_over = $app[1]['icon_hover'];
- $img_src_out = $app[1]['icon'];
-
- $applications .= ' | '."\r\n";
- }
- else
- {
- $img_src_over = $GLOBALS['phpgw']->common->image_on($app[0],Array('navbar','nonav'),'-over');
- }
- if($img_src_over != '')
- {
-// if($GLOBALS['strip_portion'])
-// {
-// $img_src_over = str_replace($GLOBALS['strip_portion'],'',$img_src_over);
-// }
- $GLOBALS['phpgw_info']['flags']['preload_images'][] = $img_src_over;
- }
- }
-
- $var['applications'] = $applications;
- $var['nav_bar_left_top_bg_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','nav_bar_left_top_bg');
-
- $GLOBALS['phpgw']->template->set_var($var);
- $GLOBALS['phpgw']->template->fp($output,'left_part');
- }
-
- function parse_bodypart()
- {
- }
-
- function parse_bottompart($output)
- {
- $GLOBALS['phpgw']->template->set_file('parts','parts.tpl');
- $GLOBALS['phpgw']->template->set_block('parts','bottom_part');
-
- $var = Array
- (
- 'powered' => lang('Powered by phpGroupWare version x', $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
- );
- $var['top_spacer_middle_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle');
- $GLOBALS['phpgw']->template->set_var($var);
- $GLOBALS['phpgw']->template->fp($output,'bottom_part');
- }
diff --git a/phpgwapi/templates/idsociety/parts.tpl b/phpgwapi/templates/idsociety/parts.tpl
deleted file mode 100644
index 19205320cb..0000000000
--- a/phpgwapi/templates/idsociety/parts.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
- 
- |
-
-
-
- | {user_info_name} |
- {current_users} |
- {user_info_date} |
-
-
- |
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
- {applications}
-
-  |
-
-
- |
-
-
-
-
-
-
-
|