diff --git a/preferences/inc/hook_config.inc.php b/preferences/inc/hook_config.inc.php
index 50e7d962d6..5634a903d5 100644
--- a/preferences/inc/hook_config.inc.php
+++ b/preferences/inc/hook_config.inc.php
@@ -39,89 +39,4 @@
 		return $out;
 	}
 
-	function force_theme($config)
-	{
-		global $phpgw;
-
-		$themes  = array('user_choice');
-		$themes += $phpgw->common->list_themes();
-
-		while (list ($key, $value) = each ($themes))
-		{
-			if ($config['force_theme'] == $value)
-			{
-				$selected = ' selected';
-			}
-			else
-			{
-				$selected = '';
-			}
-			if ($value == 'user_choice')
-			{
-				$descr = lang('Users Choice');
-			}
-			else
-			{
-				$descr = $value;
-			}
-			$out .= '<option value="' . $value . '"' . $selected .'>'.$descr.'</option>' . "\n";
-		}
-		return $out;
-	}
-
-	function template_set($config)
-	{
-		global $phpgw;
-
-		$templ['user_choice']  = array(
-			'name' => 'user_choice',
-			'title' => lang('Users Choice')
-		);
-		$templ += $phpgw->common->list_templates();
-
-		while (list ($key, $value) = each ($templ))
-		{
-			if ($config['template_set'] == $key)
-			{
-				$selected = ' selected';
-			}
-			else
-			{
-				$selected = '';
-			}
-
-			$descr = $templ[$key]['title'];
-			$out .= '<option value="' . $key . '"' . $selected . '>'.$descr.'</option>' . "\n";
-		}
-		return $out;
-	}
-
-	function force_default_app($config)
-	{
-		global $phpgw, $phpgw_info;
-
-		$out = '<option value="user_choice"';
-		if ($config['force_default_app'] == 'user_choice')
-		{
-			$out .= ' selected';
-		}
-		$out .= '>' . lang('Users Choice') . '</option>' . "\n";
-
-		reset($phpgw_info['user']['apps']);
-		while ($permission = each($phpgw_info['user']['apps']))
-		{
-			if ($phpgw_info['apps'][$permission[0]]['status'] != 2)
-			{
-				$out .= '<option value="' . $permission[0] . '"';
-				if ($config['force_default_app'] == $permission[0])
-				{
-					$out .= ' selected';
-				}
-				$out .= '>' . lang($phpgw_info['apps'][$permission[0]]['title']) . '</option>' . "\n";
-			}
-		}
-
-		return $out;
-	}
-
-?>
+?>
\ No newline at end of file
diff --git a/preferences/setup/config.inc.php b/preferences/setup/config.inc.php
index 28a984c88d..a0cd8d2c84 100644
--- a/preferences/setup/config.inc.php
+++ b/preferences/setup/config.inc.php
@@ -37,71 +37,6 @@
    </tr>
    <?php $selected = array(); ?>
 
-   <?php $selected[$current_config["template_set"]] = " selected"; ?>
-   <tr bgcolor="e6e6e6">
-    <td>Interface/Template Selection:<br> <!---(if user choice, and they dont make a selection, then classic will be used)---></td>
-    <td>
-     <select name="newsettings[template_set]">
-    <?php
-	if ($phpgw_setup)
-	{
-		$templates = $phpgw_setup->get_template_list();
-	}
-	else
-	{
-		$templates = $phpgw->common->list_templates();
-	}
-	echo '<option value="user_choice"' . $selected['user_choice'] . '>Users Choice</option>';
-	while (list ($key, $value) = each ($templates))
-	{
-		echo '<option value="'.$key.'" '.$selected[$key].'>'.$templates[$key]["title"].'</option>';
-	}
-    ?>
-     </select>
-    </td>
-   </tr>
-   <?php $selected = array(); ?>
-
-   <?php $selected[$current_config["force_theme"]] = " selected"; ?>
-   <tr bgcolor="e6e6e6">
-    <td>Use theme:<br></td>
-    <td>
-     <select name="newsettings[force_theme]">
-    <?php
-	if ($phpgw_setup)
-	{
-		$themes = $phpgw_setup->list_themes();
-	}
-	else
-	{
-		$themes = $phpgw->common->list_themes();
-	}
-	echo '<option value="user_choice"' . $selected['user_choice'] . '>Users Choice</option>';
-	while (list ($key, $value) = each ($themes))
-	{
-		echo '<option value="'.$value.'" '.$selected[$value].'>'.$value.'</option>';
-	}
-    ?>
-     </select>
-    </td>
-   </tr>
-   <?php $selected = array(); ?>
-
-   <?php
-   /* $selected[$current_config["useframes"]] = " selected"; ?>
-   <tr bgcolor="e6e6e6">
-    <td>Frame support:</td>
-    <td>
-     <select name="newsettings[useframes]">
-      <option value="allowed"<?php echo $selected["allowed"]; ?>>Allow frames</option>
-      <option value="always"<?php echo $selected["always"]; ?>>Force frames</option>
-      <option value="never"<?php echo $selected["never"]; ?>>Disable frames</option>
-     </select>
-    </td>
-   </tr>
-   <?php $selected = array(); */
-   ?>
-
    <?php $selected = array(); ?>
    <?php $selected[$current_config['htmlcompliant']] = ' selected'; ?>
    <tr bgcolor="e6e6e6">
diff --git a/preferences/templates/default/config.tpl b/preferences/templates/default/config.tpl
index e492b1ddcc..49fc4d03ac 100644
--- a/preferences/templates/default/config.tpl
+++ b/preferences/templates/default/config.tpl
@@ -48,33 +48,6 @@
     </td>
    </tr>
 
-   <tr bgcolor="{row_on}">
-    <td>{lang_Interface}/{lang_Template_Selection}:</td>
-    <td>
-     <select name="newsettings[template_set]">
-{hook_template_set}
-     </select>
-    </td>
-   </tr>
-
-   <tr bgcolor="{row_off}">
-    <td>{lang_Use_theme}:<br></td>
-    <td>
-     <select name="newsettings[force_theme]">
-{hook_force_theme}
-     </select>
-    </td>
-   </tr>
-
-   <tr bgcolor="{row_off}">
-    <td>{lang_Force_default_application}:<br></td>
-    <td>
-     <select name="newsettings[force_default_app]">
-{hook_force_default_app}
-     </select>
-    </td>
-   </tr>
-
    <tr bgcolor="{row_on}">
     <td>{lang_Use_pure_HTML_compliant_code_(not_fully_working_yet)}:</td>
     <td>