From: alison benjamin <radiocontrolled@gmail.com>
Date: Tue, 6 Sep 2011 19:55:11 +0000 (-0000)
Subject: simplified-desktop theme
X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=atutor.git;a=commitdiff_plain;h=c324645af32416e65999dace9b2f276733fa0c3e

simplified-desktop theme
---

diff --git a/docs/themes/simplified-desktop/TeraWurflRemoteClient.php b/docs/themes/simplified-desktop/TeraWurflRemoteClient.php
new file mode 100644
index 000000000..92204c397
--- /dev/null
+++ b/docs/themes/simplified-desktop/TeraWurflRemoteClient.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * Tera_WURFL - PHP MySQL driven WURFL
+ * 
+ * Tera-WURFL was written by Steve Kamerman, and is based on the
+ * Java WURFL Evolution package by Luca Passani and WURFL PHP Tools by Andrea Trassati.
+ * This version uses a MySQL database to store the entire WURFL file, multiple patch
+ * files, and a persistent caching mechanism to provide extreme performance increases.
+ * 
+ * @package TeraWurflRemoteClient
+ * @author Steve Kamerman <stevekamerman AT gmail.com>
+ * @version Stable 2.1.2 $Date: 2010/05/14 15:53:02
+ * @license http://www.mozilla.org/MPL/ MPL Vesion 1.1
+ */
+/**
+ * Tera-WURFL remote webservice client for PHP
+ * @package TeraWurflRemoteClient
+ */
+class TeraWurflRemoteClient {
+	
+	/**
+	 * XML Data Format - this should only be used to communicate with Tera-WURFL 2.1.1 and older
+	 * @var String
+	 */
+	public static $FORMAT_XML = 'xml';
+	/**
+	 * The JSON Data Format is the default transport for Tera-WURFL 2.1.2 and newer due to it's smaller size
+	 * and better performance with the builtin PHP functions 
+	 * @var String
+	 */
+	public static $FORMAT_JSON = 'json';
+	/**
+	 * If you try to use a capability that has not been retrieved yet and this is set to true,
+	 * it will generate another request to the webservice and retrieve this capability automatically.
+	 * @var Bool
+	 */
+	public $autolookup = true;
+	/**
+	 * Flattened version of Tera-WURFL's capabilities array, containing only capability names and values.
+	 * Since it is 'Flattened', there a no groups in this array, just individual capabilities.
+	 * @var Array
+	 */
+	public $capabilities;
+	/**
+	 * Array of errors that were encountered while processing the request and/or response.
+	 * @var Array
+	 */
+	public $errors;
+	/**
+	 * The HTTP Headers that Tera-WURFL will look through to find the best User Agent, if one is not specified
+	 * @var Array
+	 */
+	public static $userAgentHeaders = array(
+		'HTTP_X_DEVICE_USER_AGENT',
+		'HTTP_X_ORIGINAL_USER_AGENT',
+		'HTTP_X_OPERAMINI_PHONE_UA',
+		'HTTP_X_SKYFIRE_PHONE',
+		'HTTP_X_BOLT_PHONE_UA',
+		'HTTP_USER_AGENT'
+	);
+	protected $format;
+	protected $userAgent;
+	protected $webserviceUrl;
+	protected $xml;
+	protected $json;
+	protected $clientVersion = '2.1.2';
+	protected $apiVersion;
+	
+	/**
+	 * Creates a TeraWurflRemoteClient object.  NOTE: in Tera-WURFL 2.1.2 the default data format is JSON.
+	 * This format is not supported in Tera-WURFL 2.1.1 or earlier, so if you must use this client with 
+	 * an earlier version of the server, set the second parameter to TeraWurflRemoteClient::$FORMAT_XML
+	 * @param String URL to the master Tera-WURFL Server's webservice.php
+	 * @param String TeraWurflRemoteClient::$FORMAT_JSON or TeraWurflRemoteClient::$FORMAT_XML
+	 */
+	public function __construct($TeraWurflWebserviceURL,$data_format='json'){
+		$this->format = $data_format;
+		if(!self::validURL($TeraWurflWebserviceURL)){
+			throw new Exception("TeraWurflRemoteClient Error: the specified webservice URL is invalid.  Please make sure you pass the full url to Tera-WURFL's webservice.php.");
+			exit(1);
+		}
+		$this->capabilities = array();
+		$this->errors = array();
+		$this->webserviceUrl = $TeraWurflWebserviceURL;
+	}
+	/**
+	 * Get the requested capabilities from Tera-WURFL for the given user agent
+	 * @param String HTTP User Agent of the device being detected
+	 * @param Array Array of capabilities that you would like to retrieve
+	 * @return bool Success
+	 */
+	public function getCapabilitiesFromAgent($userAgent, Array $capabilities){
+		$this->userAgent = (is_null($userAgent))? self::getUserAgent(): $userAgent;
+		// build request string
+		$uri = $this->webserviceUrl . (strpos($this->webserviceUrl,'?')===false?'?':'&') 
+		. 'ua=' . urlencode($this->userAgent)
+		. '&format=' . $this->format
+		. '&search=' . implode('|',$capabilities);
+		$this->callTeraWurfl($uri);
+		$this->loadCapabilities();
+		$this->loadErrors();
+		return true;
+	}
+	/**
+	 * Returns the value of the requested capability
+	 * @param String The WURFL capability you are looking for (e.g. "is_wireless_device")
+	 * @return Mixed String, Numeric, Bool
+	 */
+	public function getDeviceCapability($capability){
+		$capability = strtolower($capability);
+		if(!array_key_exists($capability, $this->capabilities)){
+			if($this->autolookup){
+				$this->getCapabilitiesFromAgent($this->userAgent, array($capability), array());
+			}
+			return $this->capabilities[$capability];
+		}
+		return $this->capabilities[$capability];
+	}
+	/**
+	 * Get the version of the Tera-WURFL Remote Client (this file)
+	 * @return String
+	 */
+	public function getClientVersion(){
+		return $this->clientVersion;
+	}
+	/**
+	 * Get the version of the Tera-WURFL Webservice (webservice.php on server).  This is only available
+	 * after a query has been made since it is returned in the XML response.
+	 * @return String
+	 */
+	public function getAPIVersion(){
+		return $this->apiVersion;
+	}
+	/**
+	 * Make the webservice call to the server using the GET method and load the XML response into $this->xml 
+	 * @param String The URI of the master server
+	 * @return void
+	 */
+	protected function callTeraWurfl($uri){
+		try{
+			switch($this->format){
+				case self::$FORMAT_JSON:
+					$data = file_get_contents($uri);
+					$this->json = json_decode($data,true);
+					if(is_null($this->json)){
+						// Trigger the catch block
+						throw new Exception("foo");
+					}
+					unset($data);
+					break;
+				default:
+				case self::$FORMAT_XML:
+					if(!$this->xml = simplexml_load_file($uri)){
+						throw new Exception("foo");
+					}
+					break;
+			}
+		}catch(Exception $ex){
+			// Can't use builtin logging here through Tera-WURFL since it is on the client, not the server
+			throw new Exception("TeraWurflRemoteClient Error: Could not query Tera-WURFL master server.");
+			exit(1);
+		}
+	}
+	/**
+	 * Parse the response into the capabilities array
+	 * @return void
+	 */
+	protected function loadCapabilities(){
+		switch($this->format){
+			case self::$FORMAT_JSON:
+				$this->apiVersion = $this->json['apiVersion'];
+				$this->capabilities = $this->json['capabilities'];
+				break;
+			default:
+			case self::$FORMAT_XML:
+				$this->apiVersion = $this->xml->device['apiVersion'];
+				foreach($this->xml->device->capability as $cap){
+					$this->capabilities[(string)$cap['name']] = self::niceCast((string)$cap['value']);
+				}
+				break;
+		}
+	}
+	/**
+	 * Parse the response's errors into the errors array
+	 * @return void
+	 */
+	protected function loadErrors(){
+		switch($this->format){
+			case self::$FORMAT_JSON:
+				$this->errors &= $this->json['errors'];
+				break;
+			default:
+			case self::$FORMAT_XML:
+				foreach($this->xml->errors->error as $error){
+					$this->errors[(string)$error['name']]=(string)$error['description'];
+				}
+				break;
+		}
+	}
+	/**
+	 * Cast strings into proper variable types, i.e. 'true' into true
+	 * @param $value
+	 * @return Mixed String, Bool, Float
+	 */
+	protected static function niceCast($value){
+		// Clean Boolean values
+		if($value === 'true')$value=true;
+		if($value === 'false')$value=false;
+		if(!is_bool($value)){
+			// Clean Numeric values by loosely comparing the (float) to the (string)
+			$numval = (float)$value;
+			if(strcmp($value,$numval)==0)$value=$numval;
+		}
+		return $value;
+	}
+	/**
+	 * Is the given URL valid
+	 * @param $url
+	 * @return Bool
+	 */
+	protected static function validURL($url){
+		if(preg_match('/^(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/',$url)) return true;
+		return false;
+	}	
+	/**
+	 * Return the requesting client's User Agent
+	 * @param $source
+	 * @return String
+	 */
+	public static function getUserAgent($source=null){
+		if(is_null($source) || !is_array($source))$source = $_SERVER;
+		$userAgent = '';
+		if(isset($_GET['UA'])){
+			$userAgent = $_GET['UA'];
+		}else{
+			foreach(self::$userAgentHeaders as $header){
+				if(array_key_exists($header,$source) && $source[$header]){
+					$userAgent = $source[$header];
+					break;
+				}
+			}
+		}
+		return $userAgent;
+	}
+}
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/about.tmpl.php b/docs/themes/simplified-desktop/about.tmpl.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/themes/simplified-desktop/admin/courses/courses.tmpl.php b/docs/themes/simplified-desktop/admin/courses/courses.tmpl.php
new file mode 100644
index 000000000..2a69e4803
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/courses/courses.tmpl.php
@@ -0,0 +1,227 @@
+<?php if ($this->mobile_device_type != IPAD_DEVICE): ?>
+<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+	<div class="input-form">
+		
+			<h3><?php echo _AT('results_found', $this->num_results); ?></h3>
+		<div id="results-hide-show-simple-content" class="hide-show-container-surround">		
+			<a id="results-hide-show-link" class="content-expand" href="javascript:void(0);" tabindex="1">Refine Results</a>
+		</div>
+	
+		
+	<div id="results-hide-show" role="search"  aria-live="assertive">
+	<div id="results-display">
+	
+		<div class="row">
+		<fieldset>
+			<legend><?php echo _AT('access'); ?></legend>
+
+			<input type="radio" name="access" value="0" id="s0" <?php if ($_GET['access'] == 0) { echo 'checked="checked"'; } ?> /><label for="s0"><?php echo _AT('public'); ?></label> 
+
+			<input type="radio" name="access" value="1" id="s1" <?php if ($_GET['access'] == 1) { echo 'checked="checked"'; } ?> /><label for="s1"><?php echo _AT('protected'); ?></label> 
+
+			<input type="radio" name="access" value="2" id="s2" <?php if ($_GET['access'] == 2) { echo 'checked="checked"'; } ?> /><label for="s2"><?php echo _AT('private'); ?></label>
+
+			<input type="radio" name="access" value="" id="s" <?php if ($_GET['access'] == '') { echo 'checked="checked"'; } ?> /><label for="s"><?php echo _AT('all'); ?></label>
+		</fieldset>
+		</div>
+
+		<div class="row">
+			<label for="search"><?php echo _AT('search'); ?> (<?php echo _AT('title').', '._AT('description'); ?>)</label><br />
+			<input type="text" name="search" id="search" size="20" value="<?php echo htmlspecialchars($_GET['search']); ?>" />
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="filter" value="<?php echo _AT('filter'); ?>" />
+			<input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>" />
+		</div>
+	</div>
+	</div> <!-- end #results-display -->
+	</div> <!-- end #results-hide-show -->
+</form>
+
+<?php print_paginator($this->page, $this->num_results, $this->page_string . SEP . $this->order .'='. $col, $this->results_per_page); ?>
+
+<form name="form" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="table-surround">
+<table class="data" summary="Course title, instructor, and enrollment." >
+<colgroup>
+	<?php if ($col == 'title'): ?>
+		<col />
+		<col class="sort" />
+		<col span="6" />
+	<?php elseif($col == 'login'): ?>
+		<col span="2" />
+		<col class="sort" />
+		<col span="5" />
+	<?php// elseif($col == 'access'): ?>
+		<!-- REMOVED FOR MOBILE <col span="3" />
+		<col class="sort" />
+		<col span="4" /> -->
+	<?php //elseif($col == 'created_date'): ?>
+		<!-- REMOVED FOR MOBILE<col span="4" />
+		<col class="sort" />
+		<col span="3" />-->
+	<?php //elseif($col == 'cat_name'): ?> 
+		<!-- REMOVED FOR MOBILE<col span="5" />
+		<col class="sort" />
+		<col span="2" /> -->
+	<?php endif; ?>
+</colgroup>
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><a href="mods/_core/courses/admin/courses.php?<?php echo $this->orders[$this->order]; ?>=title<?php echo $page_string; ?>"><?php echo _AT('title');               ?></a></th>
+	<th scope="col"><a href="mods/_core/courses/admin/courses.php?<?php echo $this->orders[$this->order]; ?>=login<?php echo $page_string; ?>"><?php echo _AT('Instructor');          ?></a></th>
+<!-- REMOVEED FOR MOBILE	<th scope="col"><a href="mods/_core/courses/admin/courses.php?<?php // echo $this->orders[$this->order]; ?>=access<?php echo $page_string; ?>"><?php echo _AT('access');             ?></a></th> -->
+<!-- 	<th scope="col"><a href="mods/_core/courses/admin/courses.php?<?php //echo $this->orders[$this->order]; ?>=created_date<?php //echo $page_string; ?>"><?php // echo _AT('created_date'); ?></a></th> -->
+<!-- 	<th scope="col"><a href="mods/_core/courses/admin/courses.php?<?php //echo $this->orders[$this->order]; ?>=cat_name<?php //echo $page_string; ?>"><?php //echo _AT('category'); ?></a></th> -->
+	<th scope="col"><?php echo _AT('enrolled'); ?></th>
+<!-- 	<th scope="col"><?php //echo _AT('alumni'); ?></th> -->
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="8"><input type="submit" name="view" value="<?php echo _AT('view'); ?>" /> 
+					<input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" /> 
+					<input type="submit" name="backups" value="<?php echo _AT('backups'); ?>" /> 
+					<input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" /></td>
+</tr>
+</tfoot>
+<tbody>
+<?php if ($this->num_rows): ?>
+	<?php while ($row = mysql_fetch_assoc($this->result)): ?>
+		<tr onkeydown="document.form['m<?php echo $row['course_id']; ?>'].checked = true; rowselect(this);" onmousedown="document.form['m<?php echo $row['course_id']; ?>'].checked = true; rowselect(this);" id="r_<?php echo $row['course_id']; ?>">
+			<td><input type="radio" name="id" value="<?php echo $row['course_id']; ?>" id="m<?php echo $row['course_id']; ?>" /></td>
+			<td><label for="m<?php echo $row['course_id']; ?>"><?php echo AT_print($row['title'], 'courses.title'); ?></label></td>
+			<td><?php echo AT_print($row['login'],'members.login'); ?></td>
+		<!-- REMOVED FOR MOBILE	<td><?php //echo _AT($row['access']); ?></td> -->
+		<!-- 	<td><?php //echo AT_date($startend_date_long_format, $row['created_date'], AT_DATE_UNIX_TIMESTAMP); ?></td> -->
+		<!--	<td><?php //echo ($row['cat_name'] ? $row['cat_name'] : '-')?></td>-->
+			<td><?php echo ($this->enrolled[$row['course_id']]['y'] ? $this->enrolled[$row['course_id']]['y'] : 0); ?></td>
+		<!-- 	<td><?php //echo ($this->enrolled[$row['course_id']]['a'] ? $this->enrolled[$row['course_id']]['a'] : 0); ?></td> -->
+		</tr>
+	<?php endwhile; ?>
+<?php else: ?>
+	<tr>
+		<td colspan="8"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</div>
+</form>
+<?php endif; ?> <!--  end template for smartphone -->
+<?php if ($this->mobile_device_type == IPAD_DEVICE): ?> 
+
+<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+	<div class="input-form">
+		
+			<h3><?php echo _AT('results_found', $this->num_results); ?></h3>
+		<div id="hide-show-container">		
+			<a id="results-hide-show-link" class="content-expand" href="javascript:void(0);" tabindex="1">Refine Results</a>
+		</div>
+	
+		
+	<div id="results-hide-show" role="search"  aria-live="assertive">
+	<div id="results-display">
+	
+		<div class="row">
+		<fieldset>
+			<legend><?php echo _AT('access'); ?></legend>
+
+			<input type="radio" name="access" value="0" id="s0" <?php if ($_GET['access'] == 0) { echo 'checked="checked"'; } ?> /><label for="s0"><?php echo _AT('public'); ?></label> 
+
+			<input type="radio" name="access" value="1" id="s1" <?php if ($_GET['access'] == 1) { echo 'checked="checked"'; } ?> /><label for="s1"><?php echo _AT('protected'); ?></label> 
+
+			<input type="radio" name="access" value="2" id="s2" <?php if ($_GET['access'] == 2) { echo 'checked="checked"'; } ?> /><label for="s2"><?php echo _AT('private'); ?></label>
+
+			<input type="radio" name="access" value="" id="s" <?php if ($_GET['access'] == '') { echo 'checked="checked"'; } ?> /><label for="s"><?php echo _AT('all'); ?></label>
+		</fieldset>
+		</div>
+
+		<div class="row">
+			<label for="search"><?php echo _AT('search'); ?> (<?php echo _AT('title').', '._AT('description'); ?>)</label><br />
+			<input type="text" name="search" id="search" size="20" value="<?php echo htmlspecialchars($_GET['search']); ?>" />
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="filter" value="<?php echo _AT('filter'); ?>" />
+			<input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>" />
+		</div>
+	</div>
+	</div> <!-- end #results-display -->
+	</div> <!-- end #results-hide-show -->
+</form>
+
+<?php print_paginator($this->page, $this->num_results, $this->page_string . SEP . $this->order .'='. $col, $this->results_per_page); ?>
+
+<form name="form" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="table-surround">
+<table class="data" summary="Course title, instructor, and enrollment." >
+<colgroup>
+	<?php if ($col == 'title'): ?>
+		<col />
+		<col class="sort" />
+		<col span="6" />
+	<?php elseif($col == 'login'): ?>
+		<col span="2" />
+		<col class="sort" />
+		<col span="5" />
+	<?php// elseif($col == 'access'): ?>
+		<!-- REMOVED FOR MOBILE <col span="3" />
+		<col class="sort" />
+		<col span="4" /> -->
+	<?php //elseif($col == 'created_date'): ?>
+		<!-- REMOVED FOR MOBILE<col span="4" />
+		<col class="sort" />
+		<col span="3" />-->
+	<?php //elseif($col == 'cat_name'): ?> 
+		<!-- REMOVED FOR MOBILE<col span="5" />
+		<col class="sort" />
+		<col span="2" /> -->
+	<?php endif; ?>
+</colgroup>
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><a href="mods/_core/courses/admin/courses.php?<?php echo $this->orders[$this->order]; ?>=title<?php echo $page_string; ?>"><?php echo _AT('title');               ?></a></th>
+	<th scope="col"><a href="mods/_core/courses/admin/courses.php?<?php echo $this->orders[$this->order]; ?>=login<?php echo $page_string; ?>"><?php echo _AT('Instructor');          ?></a></th>
+<!-- REMOVEED FOR MOBILE	<th scope="col"><a href="mods/_core/courses/admin/courses.php?<?php // echo $this->orders[$this->order]; ?>=access<?php echo $page_string; ?>"><?php echo _AT('access');             ?></a></th> -->
+<!-- 	<th scope="col"><a href="mods/_core/courses/admin/courses.php?<?php //echo $this->orders[$this->order]; ?>=created_date<?php //echo $page_string; ?>"><?php // echo _AT('created_date'); ?></a></th> -->
+<!-- 	<th scope="col"><a href="mods/_core/courses/admin/courses.php?<?php //echo $this->orders[$this->order]; ?>=cat_name<?php //echo $page_string; ?>"><?php //echo _AT('category'); ?></a></th> -->
+	<th scope="col"><?php echo _AT('enrolled'); ?></th>
+<!-- 	<th scope="col"><?php //echo _AT('alumni'); ?></th> -->
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="8"><input type="submit" name="view" value="<?php echo _AT('view'); ?>" /> 
+					<input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" /> 
+					<input type="submit" name="backups" value="<?php echo _AT('backups'); ?>" /> 
+					<input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" /></td>
+</tr>
+</tfoot>
+<tbody>
+<?php if ($this->num_rows): ?>
+	<?php while ($row = mysql_fetch_assoc($this->result)): ?>
+		<tr onkeydown="document.form['m<?php echo $row['course_id']; ?>'].checked = true; rowselect(this);" onmousedown="document.form['m<?php echo $row['course_id']; ?>'].checked = true; rowselect(this);" id="r_<?php echo $row['course_id']; ?>">
+			<td><input type="radio" name="id" value="<?php echo $row['course_id']; ?>" id="m<?php echo $row['course_id']; ?>" /></td>
+			<td><label for="m<?php echo $row['course_id']; ?>"><?php echo AT_print($row['title'], 'courses.title'); ?></label></td>
+			<td><?php echo AT_print($row['login'],'members.login'); ?></td>
+		<!-- REMOVED FOR MOBILE	<td><?php //echo _AT($row['access']); ?></td> -->
+		<!-- 	<td><?php //echo AT_date($startend_date_long_format, $row['created_date'], AT_DATE_UNIX_TIMESTAMP); ?></td> -->
+		<!--	<td><?php //echo ($row['cat_name'] ? $row['cat_name'] : '-')?></td>-->
+			<td><?php echo ($this->enrolled[$row['course_id']]['y'] ? $this->enrolled[$row['course_id']]['y'] : 0); ?></td>
+		<!-- 	<td><?php //echo ($this->enrolled[$row['course_id']]['a'] ? $this->enrolled[$row['course_id']]['a'] : 0); ?></td> -->
+		</tr>
+	<?php endwhile; ?>
+<?php else: ?>
+	<tr>
+		<td colspan="8"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</div>
+</form>
+<?php endif; ?> <!--  end template for tablet -->
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/courses/create_course.tmpl.php b/docs/themes/simplified-desktop/admin/courses/create_course.tmpl.php
new file mode 100644
index 000000000..32285bb48
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/courses/create_course.tmpl.php
@@ -0,0 +1,449 @@
+
+<?php 
+global $languageManager,  $_config, $MaxCourseSize, $MaxFileSize;
+
+?>
+<?php //echo _AT('available_immediately'); ?>
+<form method="post" action="<?php echo $_SERVER['PHP_SELF'];  ?>" name="course_form" enctype="multipart/form-data">
+	<input type="hidden" name="form_course" value="true" />
+	<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_config['prof_pic_max_file_size']; ?>" />
+	<input type="hidden" name="course" value="<?php echo $this->course; ?>" />
+	<input type="hidden" name="old_access" value="<?php echo $this->row['access']; ?>" />
+	<input type="hidden" name="created_date" value="<?php echo $this->row['created_date']; ?>" />
+	<input type="hidden" name="show_courses" value="<?php echo $_GET['show_courses']; ?>" />
+	<input type="hidden" name="current_cat" value="<?php echo $_GET['current_cat']; ?>" />
+	<input type="submit" name="submit" style="display:none;"/>
+
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('properties'); ?></legend>
+<?php if ($this->isadmin): ?>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="inst"><?php echo  _AT('instructor'); ?></label><br />
+			<?php 
+			
+			
+			if ($instructor_row = mysql_fetch_assoc($this->result)) {
+				echo '<select name="instructor" id="inst">';
+				do {
+					if ($instructor_row['member_id'] == $this->row['member_id']) {
+						echo '<option value="'.$instructor_row['member_id'].'" selected="selected">'.$instructor_row['login'].'</option>';
+					} else {
+						echo '<option value="'.$instructor_row['member_id'].'">'.$instructor_row['login'].'</option>';
+					}
+				} while($instructor_row = mysql_fetch_assoc($this->result));
+				echo '</select>';
+			} else {
+				echo '<span id="inst">'._AT('none_found').'</span>';
+			}
+			?>
+	</div>
+<?php endif; ?>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="title"><?php echo _AT('title'); ?></label><br />
+		<input type="text" id="title" name="title" size="40" value="<?php echo htmlspecialchars($this->row['title']); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="pri_lang"><?php  echo _AT('primary_language'); ?></label><br />
+		<?php $languageManager->printDropdown($this->row['primary_language'], 'pri_lang', 'pri_lang'); ?>
+	</div>
+
+	<div class="row">
+		<label for="description"><?php echo _AT('description'); ?></label><br />
+		<textarea id="description" cols="40" rows="2" name="description"><?php echo $this->row['description']; ?></textarea>
+	</div>
+	<?php if ($_config['course_dir_name']): ?>
+	<div class="row">
+		<label for="course_dir_name"><?php echo _AT('course_dir_name'); ?></label><br />
+		<input type="text" id="course_dir_name" name="course_dir_name" size="40" value="<?php echo htmlspecialchars($this->row['course_dir_name']); ?>" />
+	</div>
+	<?php endif; ?>
+
+	<?php $categories = get_categories(); ?>
+	<?php if (is_array($categories)): ?>
+		<div class="row">
+		<label for="cat"><?php echo _AT('category'); ?></label><br />
+			<select name="category_parent" id="cat">
+				<option value="0">&nbsp;&nbsp;&nbsp;[&nbsp;&nbsp;<?php echo _AT('cats_uncategorized'); ?>&nbsp;&nbsp;]&nbsp;&nbsp;&nbsp;</option>
+				<?php select_categories($categories, 0, $this->row['cat_id'], false); ?>
+
+			</select>
+		</div>
+	<?php endif; ?>
+
+	<div class="row">
+	<fieldset>
+	<legend><?php  echo _AT('export_content'); ?></legend>
+		<?php
+			switch ($this->row['content_packaging']) {
+				case 'none':
+						$none = ' checked="checked"';
+						break;
+
+				case 'top':
+						$top	 = ' checked="checked"';
+						break;
+
+				case 'all':
+						$all	= ' checked="checked"';
+						break;
+			}
+			?>
+		<label for="none" ><input type="radio" name="content_packaging" value="none" id="none" <?php echo $none; ?> /><?php echo _AT('content_packaging_none'); ?></label><br />
+		<label for="ctop"><input type="radio" name="content_packaging" value="top" id="ctop"  <?php echo $top; ?> /><?php  echo _AT('content_packaging_top'); ?></label><br />
+		<label for="all"><input type="radio" name="content_packaging" value="all" id="all" <?php echo $all; ?> /><?php  echo _AT('content_packaging_all'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+		<legend><?php echo _AT('syndicate_announcements'); ?></legend>
+		<?php
+				$rss_no = $rss_yes = '';
+
+				if ($this->row['rss']) {
+					$rss_yes = ' checked="checked"';
+				} else {
+					$rss_no = ' checked="checked"';
+				}
+		?>
+		<label for="rss_y"><input type="radio" name="rss" value="1" id="rss_y" <?php echo $rss_yes; ?> /><?php echo _AT('enable_syndicate'); ?></label><br />
+		<label for="rss_n"><input type="radio" name="rss" value="0" id="rss_n"  <?php echo $rss_no; ?> /><?php  echo _AT('disable_syndicate'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+		<legend><?php echo _AT('access'); ?></legend>
+		<?php
+				switch ($this->row['access']) {
+					case 'public':
+							$pub = ' checked="checked"';
+							$disable = 'disabled="disabled"'; // disable the nofity box
+							break;
+
+					case 'protected':
+							$prot	 = ' checked="checked"';
+							$disable = 'disabled="disabled"'; // disable the nofity box
+							break;
+
+					case 'private':
+							$priv	= ' checked="checked"';
+							break;
+				}
+
+				if ($this->row['notify']) {
+					$notify = ' checked="checked"';
+				}
+
+				if ($this->row['hide']) {
+					$hide = ' checked="checked"';
+				}
+		?>
+		<input type="radio" name="access" value="public" id="pub" onclick="disableNotify();" <?php echo $pub; ?> /><label for="pub"><strong> <?php echo  _AT('public'); ?>: </strong></label><?php echo  _AT('about_public'); ?><br /><br />
+
+		<input type="radio" name="access" value="protected" id="prot" onclick="disableNotify();" <?php echo $prot; ?> /><label for="prot"><strong><?php echo  _AT('protected'); ?>:</strong></label> <?php echo _AT('about_protected'); ?><br /><br />
+
+		<input type="radio" name="access" value="private" id="priv" onclick="enableNotify();" <?php echo $priv; ?> /><label for="priv"><strong><?php echo  _AT('private'); ?>:</strong></label> <?php echo  _AT('about_private'); ?><br />
+		<input type="checkbox" name="notify" id="notify" value="1" <?php
+			echo $disable;
+			echo $notify; ?> /><label for="notify"><?php echo  _AT('email_approvals'); ?></label>
+		<br />
+		<input type="checkbox" name="hide" id="hide" value="1" <?php
+		echo $disable;
+		echo $hide; ?> /><label for="hide"><?php echo  _AT('hide_course'); ?></label>.
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+		<legend><?php echo _AT('release_date'); ?></legend>
+		<?php
+			$rel_no = $rel_yes = '';
+
+			if (intval($this->row['release_date'])) {
+				$rel_yes = ' checked="checked"';
+
+				$today_day   = substr($this->row['release_date'], 8, 2);
+				$today_mon   = substr($this->row['release_date'], 5, 2);
+				$today_year  = substr($this->row['release_date'], 0, 4);
+
+				$today_hour  = substr($this->row['release_date'], 11, 2);
+				$today_min   = substr($this->row['release_date'], 14, 2);
+			} else {
+				$rel_no = ' checked="checked"'; 
+				$today_year  = date('Y');
+			}
+
+		?>
+
+		<input type="radio" name="release_date" value="0" id="release_now" <?php echo $rel_no; ?> /> <label for="release_now"><?php echo _AT('available_immediately'); ?></label><br />
+
+
+		<input type="radio" name="release_date" value="1" id="release_later" <?php echo $rel_yes; ?> /> <label for="release_later"><?php echo _AT('release_on'); ?></label> 
+		<?php
+			$name = '_release';
+			require(AT_INCLUDE_PATH.'html/release_date.inc.php');
+		?>
+	</fieldset>	
+	</div>
+
+	<div class="row">
+	<fieldset><legend>
+		<?php echo _AT('end_date'); ?></legend>
+		<?php
+			$end_no = $end_yes = '';
+
+			if (intval($this->row['end_date'])) {
+				$end_yes = ' checked="checked"';
+
+				$today_day   = substr($this->row['end_date'], 8, 2);
+				$today_mon   = substr($this->row['end_date'], 5, 2);
+				$today_year  = substr($this->row['end_date'], 0, 4);
+
+				$today_hour  = substr($this->row['end_date'], 11, 2);
+				$today_min   = substr($this->row['end_date'], 14, 2);
+			} else {
+				$end_no = ' checked="checked"'; 
+				$today_year  = date('Y')+1;
+			}
+
+		?>
+
+		<input type="radio" name="end_date" value="0" id="end_now" <?php echo $end_no; ?> /> <label for="end_now"><?php echo _AT('no_end_date'); ?></label><br />
+
+		<input type="radio" name="end_date" value="1" id="end_later" <?php echo $end_yes; ?> /> <label for="end_later"><?php echo _AT('end_on'); ?></label> 
+		<?php
+			$name = '_end';
+			require(AT_INCLUDE_PATH.'html/release_date.inc.php');
+		?>
+		</fieldset>
+	</div>
+
+	<div class="row">
+		<?php
+			if (($_POST['setvisual'] && !$_POST['settext']) || $_GET['setvisual']){
+				echo '<input type="hidden" name="setvisual" value="'.$_POST['setvisual'].'" />';
+				echo '<input type="submit" name="settext" value="'._AT('switch_text').'"  class="button"/>';
+			} else {
+				echo '<input type="submit" name="setvisual" value="'._AT('switch_visual').'" class="button"/>';
+			}
+		?>
+	</div>
+	<div class="row">
+
+		<label for="banner"><?php echo _AT('banner'); ?></label><br />
+		<textarea id="banner" cols="40" rows="15" name="banner"><?php echo $this->row['banner']; ?></textarea>
+	</div>
+<!-- FIX  -->
+<?php if (!$this->course) : ?>
+	<div class="row">
+		<label for="initial_content"><?php echo _AT('initial_content'); ?></label><br />
+		<select name="initial_content" id="initial_content" size="5">
+			<option value="0"><?php echo _AT('empty'); ?></option>
+			<option value="1" selected="selected"><?php echo _AT('create_basic'); ?></option>
+			<?php 
+			
+			if ($course_row = mysql_fetch_assoc($result)) {
+				do {
+					$Backup->setCourseID($course_row['course_id']);
+					$list = $Backup->getAvailableList();
+
+					if (!empty($list)) { 
+						echo '<optgroup label="'. _AT('restore').': '.$course_row['title'].'">';
+						foreach ($list as $list_item) {
+							echo '<option value="'.$list_item['backup_id'].'_'.$list_item['course_id'].'">'.$list_item['file_name'].' - '.get_human_size($list_item['file_size']).'</option>';
+						}
+						echo '</optgroup>';
+					}
+				} while ($course_row = mysql_fetch_assoc($result));
+			}
+			?>
+			</select>
+	</div>
+<?php endif; // !$course_id ?>
+
+<?php if ($this->isadmin) : ?>
+	<div class="row">
+		<?php  echo _AT('course_quota'); ?><br />
+		<?php 
+			if ($this->row['max_quota'] == AT_COURSESIZE_UNLIMITED) { 
+				$c_unlim = ' checked="checked" ';
+				$c_oth2 = ' disabled="disabled" ';
+			} elseif ($this->row['max_quota'] == AT_COURSESIZE_DEFAULT) {
+				$c_def = ' checked="checked" ';
+				$c_oth2 = ' disabled="disabled" ';
+			} else {
+				$c_oth = ' checked="checked" ';
+				$c_oth2 = '';
+			}
+
+			if ($this->course > 0) {
+				$course_size = dirsize(AT_CONTENT_DIR . $this->course.'/');
+			} else {
+				$course_size = 0;
+			}
+
+			if ($this->course) {
+				echo _AT('current_course_size') .': '.get_human_size($course_size).'<br />'; 
+			}
+		?>
+
+		<input type="radio" id="c_default" name="quota" value="<?php echo AT_COURSESIZE_DEFAULT; ?>" onclick="disableOther();" <?php echo $c_def;?> /><label for="c_default"> <?php echo _AT('default') . ' ('.get_human_size($MaxCourseSize).')'; ?></label> <br />
+		<input type="radio" id="c_unlim" name="quota" value="<?php echo AT_COURSESIZE_UNLIMITED; ?>" onclick="disableOther();" <?php echo $c_unlim;?>/><label for="c_unlim"> <?php echo _AT('unlimited'); ?></label> <br />
+		<input type="radio" id="c_other" name="quota" value="2" onclick="enableOther();" <?php echo $c_oth;?>/><label for="c_other"> <?php echo _AT('other'); ?> </label> - 
+		<label for="quota_entered">Quota Entered</label>
+		<input type="text" id="quota_entered" name="quota_entered" <?php echo $c_oth2?> value="<?php if ($this->row['max_quota']!=AT_COURSESIZE_UNLIMITED && $this->row['max_quota']!=AT_COURSESIZE_DEFAULT) { echo bytes_to_megabytes($this->row['max_quota']); } ?>" size="4" /> <?php echo _AT('mb'); ?>
+	</div>
+
+	<div class="row">
+		<?php  echo _AT('max_file_size'); ?><br />
+		<?php 
+			$max_allowed = megabytes_to_bytes(substr(ini_get('upload_max_filesize'), 0, -1));
+
+			if ($this->row['max_file_size'] == AT_FILESIZE_DEFAULT) { 
+				$f_def = ' checked="checked" ';
+				$f_oth2 = ' disabled="disabled" ';
+			} elseif ($this->row['max_file_size'] == AT_FILESIZE_SYSTEM_MAX) {
+				$f_max = ' checked="checked" ';
+				$f_oth2 = ' disabled="disabled" ';
+			} else {
+				$f_oth = ' checked="checked" ';
+				$f_oth2 = '';
+			}
+		?>
+		<input type="radio" id="f_default" name="filesize" value="<?php echo AT_FILESIZE_DEFAULT; ?>" onclick="disableOther2();" <?php echo $f_def;?> /><label for="f_default"> <?php echo _AT('default') . ' ('.get_human_size($MaxFileSize).')'; ?></label> <br />
+		<input type="radio" id="f_maxallowed" name="filesize" value="<?php echo AT_FILESIZE_SYSTEM_MAX; ?>" onclick="disableOther2();" <?php echo $f_max;?>/><label for="f_maxallowed"> <?php echo _AT('max_file_size_system') . ' ('.get_human_size($max_allowed).')'; ?></label> <br />
+		<input type="radio" id="f_other" name="filesize" value="2" onclick="enableOther2();" <?php echo $f_oth;?>/><label for="f_other"> <?php echo _AT('other'); ?> </label> - 
+		<label for="filesize_entered">Filesize entered</label>
+		<input type="text" id="filesize_entered" name="filesize_entered" <?php echo $f_oth2?> value="<?php if ($this->row['max_file_size']!=AT_FILESIZE_DEFAULT && $this->row['max_file_size']!=AT_FILESIZE_SYSTEM_MAX) { echo bytes_to_megabytes($this->row['max_file_size']); } ?>" size="4" /> <?php echo _AT('mb'); ?>
+	</div>
+
+<?php else: ?>
+	<input type="hidden" name="quota" value="<?php echo $this->row['max_quota']; ?>" />
+	<input type="hidden" name="filesize" value="<?php echo $this->row['max_file_size']; ?>" />
+	<input type="hidden" name="tracking" value="<?php echo $this->row['tracking']; ?>" />
+<?php endif; ?>
+
+	<div class="row">
+		<label for="copyright"><?php echo _AT('course_copyright'); ?></label><br />
+		<textarea name="copyright" rows="2" cols="40" id="copyright"><?php echo $this->row['copyright']; ?></textarea>
+	</div>
+	<div class="row">
+		<?php 
+            if ($this->row['icon'] != ''): 
+                $path = AT_CONTENT_DIR.$this->row['course_id']."/custom_icons/";
+                if (file_exists($path.$this->row['icon'])) {
+                    if (defined('AT_FORCE_GET_FILE') && AT_FORCE_GET_FILE) {
+                        $custom_icon_path = 'get_course_icon.php/?id='.$this->row['course_id'];
+                    } else {
+                        $_base_href = 'content/' . $this->row['course_id'] . '/';
+                    }
+                } else {
+                    $_base_href = "images/courses/";	//$_base_href = 'get_course_icon.php/?id='.$row['course_id'];
+                }
+
+            $force_get = (defined('AT_FORCE_GET_FILE') && AT_FORCE_GET_FILE) ? true : false;
+            echo "<input type='hidden' name='boolForce' id='boolForce' value='$force_get' />";
+        
+       //include(AT_INCLUDE_PATH.'html/course_icon.inc.php');        
+        ?>
+		<img id="i0" src="<?php echo ($custom_icon_path=='')?$_base_href.$this->row['icon']:$custom_icon_path; ?>" alt="<?php echo $this->row['icon']; ?>" border="1" height="79" width="79"  />
+
+		<?php else: ?>
+			<img id="i0" src="images/clr.gif" alt="" border="1" height="79" width="79"  />
+			<input type='hidden' name='boolForce' id='boolForce' value='' />
+		<?php endif; ?>
+		<div>
+		<label for="icons"><?php echo _AT('icon'); ?></label><br />
+		<select name="icon" id="icons" onchange="SelectImg()">
+			<option value=""><?php echo _AT('no_icon'); ?></option>
+            <?php // ------------- custom course icons
+                $path = AT_CONTENT_DIR.$this->row['course_id']."/custom_icons/";
+                $boolCustom = false;
+                $optCount = 0;
+
+                if (is_dir($path)) {
+                    $boolCustom = true;  // true if custom icons are uploaded, otherwise false
+                    
+                    /*$files = scandir($path);  //SCANDIR STOPS ATUTOR WHEN RUN AS INSTRUCTOR, BUT NOT AS ADMIN. WHY? -Gorzan */
+                    
+                    /* PHP 4 REPLACEMENT FOR SCANDIR */
+					$dh  = opendir($path);
+					while (false !== ($filename = readdir($dh))) {
+						$files[] = $filename;
+					}
+
+					/*END PHP 4 REPLACEMENT FOR SCANDIR*/
+                    echo "<optgroup label='"._AT('custom_icons')."'>";
+                    foreach($files as $val) {
+						$file_ext = substr(strtolower($val), -3);
+                        if ($file_ext == "jpg" || $file_ext == "png" || $file_ext == "gif") {
+                            $optCount++;
+                            echo "<option value='".$val."'";
+                            if ($val == $this->row['icon']) {
+                                echo 'selected="selected"';
+                            }
+                            echo ">".$val."</option>";
+                        }
+                    }
+                    echo "</optgroup>";
+                }
+                
+            ?>
+			<?php // ------------- other icons
+
+				$course_imgs = array();
+				if ($dir = opendir(AT_INCLUDE_PATH.'../images/courses/')) {
+					while (false !== ($file = readdir($dir)) ) {
+						if( ($file == '.') || ($file == '..')) { 
+							continue;
+						}
+						$course_imgs[] = $file;
+					}		
+					closedir($dir);	
+				}
+				sort($course_imgs);
+                if ($boolCustom == true) {
+                    echo "<optgroup label='"._AT('builtin_icons')."'>";
+                }
+				foreach ($course_imgs as $file) {
+					echo '<option value="' . $file . '" ';
+					if ($file == $this->row['icon']) { 
+						echo 'selected="selected"'; 
+					}
+					echo ' >' . $file . '</option>';	
+				}
+                if ($boolCustom == true) {
+                    echo "</optgroup>";
+                }
+			?>
+		</select><?php echo "&nbsp;&nbsp;&nbsp; "._AT('or'); echo "<br />"?>
+	</div>
+    
+            <?php echo _AT('upload_icon'); ?><br />
+            	<label for="customicon"><input type="file" name="customicon" title="custom icon" id="customicon" value="<?php echo $_POST['customicon']; ?>"/></label><br />
+                <small><?php echo _AT('upload_icon_text'); ?></small>
+       
+        <?php  //require_once(AT_INCLUDE_PATH.'../mods/_core/courses/html/course_icon.inc.php'); ?>
+
+        <br />
+
+	</div>
+
+   
+	<div class="buttons">
+
+	        <?php
+            echo "<input type='hidden' name='custOptCount' id='custOptCount' value='".$optCount."' />";
+            echo "<input type='hidden' name='courseId' id='courseId' value='".$this->row['course_id']."' />";
+		?>
+
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" /> 
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel');?>" />
+	</div>
+    </fieldset>
+</div>
+
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/courses/default_mods.tmpl.php b/docs/themes/simplified-desktop/admin/courses/default_mods.tmpl.php
new file mode 100644
index 000000000..13bd8043f
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/courses/default_mods.tmpl.php
@@ -0,0 +1,67 @@
+
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<table class="data static" summary="Table of default course tools">
+<thead>
+<tr>
+	<th scope="cols"><?php echo _AT('section'); ?></th>
+	<th><?php echo _AT('location'); ?></th>
+	<th><?php echo _AT('order'); ?></th>
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="3" >		
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s"  />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>"  />	
+	</td>
+</tr>
+</tfoot>
+<tbody>
+<?php 
+
+
+foreach ($this->current_modules as $tool) :
+	$count++; 
+?>
+	<tr>
+		<td><?php 
+		if (isset($this->pages[$tool]['title'])) {
+			echo $this->pages[$tool]['title'];
+		} else {
+			echo _AT($this->pages[$tool]['title_var']);
+		} ?></td>
+		<td align="center">
+			<?php if (in_array($tool, $this->main_defaults)): ?>
+				<input type="checkbox" name="main[]" value="<?php echo $tool; ?>" id="m<?php echo $tool; ?>" checked="checked" /><label for="m<?php echo $tool; ?>"><?php echo _AT('main_navigation'); ?></label>
+			<?php else: ?>
+				<input type="checkbox" name="main[]" value="<?php echo $tool; ?>" id="m<?php echo $tool; ?>" /><label for="m<?php echo $tool; ?>"><?php echo _AT('main_navigation'); ?></label>
+			<?php endif; ?>
+
+			<?php if (in_array($tool, $this->home_defaults)): ?>
+				<input type="checkbox" name="home[]" value="<?php echo $tool; ?>" id="h<?php echo $tool; ?>" checked="checked" /><label for="h<?php echo $tool; ?>"><?php echo _AT('home'); ?></label>
+			<?php else: ?>
+				<input type="checkbox" name="home[]" value="<?php echo $tool; ?>" id="h<?php echo $tool; ?>" /><label for="h<?php echo $tool; ?>"><?php echo _AT('home'); ?></label>
+			<?php endif; ?>
+		</td>
+		<td align="right">
+			<?php if (!in_array($tool, $this->home_defaults) && !in_array($tool, $this->main_defaults)): ?>
+				&nbsp;
+			<?php else: ?>
+				<?php if (($count != $this->num_main+1) && ($count > 1)): ?>
+					<input type="submit" name="up[<?php echo $tool; ?>]" value="<?php echo _AT('move_up'); ?>" title="<?php echo _AT('move_up'); ?>" style="background-color: white; border: 1px solid; padding: 0px;" />
+				<?php else: ?>
+					<img src="images/clr.gif" alt="" width="12" />
+				<?php endif; ?>
+				<?php if (($count != $this->num_main) && ($count < $this->num_modules)): ?>
+					<input type="submit" name="down[<?php echo $tool; ?>]" value="<?php echo _AT('move_down'); ?>" title="<?php echo _AT('move_down'); ?>" style="background-color: white; border: 1px solid; padding: 0px;"/>
+				<?php else: ?>
+					<img src="images/clr.gif" alt="" width="12" />
+				<?php endif; ?>
+			<?php endif; ?>
+		</td>
+	</tr>
+<?php 
+endforeach; ?>
+</tbody>
+</table>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/courses/edit_course.tmpl.php b/docs/themes/simplified-desktop/admin/courses/edit_course.tmpl.php
new file mode 100644
index 000000000..32285bb48
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/courses/edit_course.tmpl.php
@@ -0,0 +1,449 @@
+
+<?php 
+global $languageManager,  $_config, $MaxCourseSize, $MaxFileSize;
+
+?>
+<?php //echo _AT('available_immediately'); ?>
+<form method="post" action="<?php echo $_SERVER['PHP_SELF'];  ?>" name="course_form" enctype="multipart/form-data">
+	<input type="hidden" name="form_course" value="true" />
+	<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_config['prof_pic_max_file_size']; ?>" />
+	<input type="hidden" name="course" value="<?php echo $this->course; ?>" />
+	<input type="hidden" name="old_access" value="<?php echo $this->row['access']; ?>" />
+	<input type="hidden" name="created_date" value="<?php echo $this->row['created_date']; ?>" />
+	<input type="hidden" name="show_courses" value="<?php echo $_GET['show_courses']; ?>" />
+	<input type="hidden" name="current_cat" value="<?php echo $_GET['current_cat']; ?>" />
+	<input type="submit" name="submit" style="display:none;"/>
+
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('properties'); ?></legend>
+<?php if ($this->isadmin): ?>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="inst"><?php echo  _AT('instructor'); ?></label><br />
+			<?php 
+			
+			
+			if ($instructor_row = mysql_fetch_assoc($this->result)) {
+				echo '<select name="instructor" id="inst">';
+				do {
+					if ($instructor_row['member_id'] == $this->row['member_id']) {
+						echo '<option value="'.$instructor_row['member_id'].'" selected="selected">'.$instructor_row['login'].'</option>';
+					} else {
+						echo '<option value="'.$instructor_row['member_id'].'">'.$instructor_row['login'].'</option>';
+					}
+				} while($instructor_row = mysql_fetch_assoc($this->result));
+				echo '</select>';
+			} else {
+				echo '<span id="inst">'._AT('none_found').'</span>';
+			}
+			?>
+	</div>
+<?php endif; ?>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="title"><?php echo _AT('title'); ?></label><br />
+		<input type="text" id="title" name="title" size="40" value="<?php echo htmlspecialchars($this->row['title']); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="pri_lang"><?php  echo _AT('primary_language'); ?></label><br />
+		<?php $languageManager->printDropdown($this->row['primary_language'], 'pri_lang', 'pri_lang'); ?>
+	</div>
+
+	<div class="row">
+		<label for="description"><?php echo _AT('description'); ?></label><br />
+		<textarea id="description" cols="40" rows="2" name="description"><?php echo $this->row['description']; ?></textarea>
+	</div>
+	<?php if ($_config['course_dir_name']): ?>
+	<div class="row">
+		<label for="course_dir_name"><?php echo _AT('course_dir_name'); ?></label><br />
+		<input type="text" id="course_dir_name" name="course_dir_name" size="40" value="<?php echo htmlspecialchars($this->row['course_dir_name']); ?>" />
+	</div>
+	<?php endif; ?>
+
+	<?php $categories = get_categories(); ?>
+	<?php if (is_array($categories)): ?>
+		<div class="row">
+		<label for="cat"><?php echo _AT('category'); ?></label><br />
+			<select name="category_parent" id="cat">
+				<option value="0">&nbsp;&nbsp;&nbsp;[&nbsp;&nbsp;<?php echo _AT('cats_uncategorized'); ?>&nbsp;&nbsp;]&nbsp;&nbsp;&nbsp;</option>
+				<?php select_categories($categories, 0, $this->row['cat_id'], false); ?>
+
+			</select>
+		</div>
+	<?php endif; ?>
+
+	<div class="row">
+	<fieldset>
+	<legend><?php  echo _AT('export_content'); ?></legend>
+		<?php
+			switch ($this->row['content_packaging']) {
+				case 'none':
+						$none = ' checked="checked"';
+						break;
+
+				case 'top':
+						$top	 = ' checked="checked"';
+						break;
+
+				case 'all':
+						$all	= ' checked="checked"';
+						break;
+			}
+			?>
+		<label for="none" ><input type="radio" name="content_packaging" value="none" id="none" <?php echo $none; ?> /><?php echo _AT('content_packaging_none'); ?></label><br />
+		<label for="ctop"><input type="radio" name="content_packaging" value="top" id="ctop"  <?php echo $top; ?> /><?php  echo _AT('content_packaging_top'); ?></label><br />
+		<label for="all"><input type="radio" name="content_packaging" value="all" id="all" <?php echo $all; ?> /><?php  echo _AT('content_packaging_all'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+		<legend><?php echo _AT('syndicate_announcements'); ?></legend>
+		<?php
+				$rss_no = $rss_yes = '';
+
+				if ($this->row['rss']) {
+					$rss_yes = ' checked="checked"';
+				} else {
+					$rss_no = ' checked="checked"';
+				}
+		?>
+		<label for="rss_y"><input type="radio" name="rss" value="1" id="rss_y" <?php echo $rss_yes; ?> /><?php echo _AT('enable_syndicate'); ?></label><br />
+		<label for="rss_n"><input type="radio" name="rss" value="0" id="rss_n"  <?php echo $rss_no; ?> /><?php  echo _AT('disable_syndicate'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+		<legend><?php echo _AT('access'); ?></legend>
+		<?php
+				switch ($this->row['access']) {
+					case 'public':
+							$pub = ' checked="checked"';
+							$disable = 'disabled="disabled"'; // disable the nofity box
+							break;
+
+					case 'protected':
+							$prot	 = ' checked="checked"';
+							$disable = 'disabled="disabled"'; // disable the nofity box
+							break;
+
+					case 'private':
+							$priv	= ' checked="checked"';
+							break;
+				}
+
+				if ($this->row['notify']) {
+					$notify = ' checked="checked"';
+				}
+
+				if ($this->row['hide']) {
+					$hide = ' checked="checked"';
+				}
+		?>
+		<input type="radio" name="access" value="public" id="pub" onclick="disableNotify();" <?php echo $pub; ?> /><label for="pub"><strong> <?php echo  _AT('public'); ?>: </strong></label><?php echo  _AT('about_public'); ?><br /><br />
+
+		<input type="radio" name="access" value="protected" id="prot" onclick="disableNotify();" <?php echo $prot; ?> /><label for="prot"><strong><?php echo  _AT('protected'); ?>:</strong></label> <?php echo _AT('about_protected'); ?><br /><br />
+
+		<input type="radio" name="access" value="private" id="priv" onclick="enableNotify();" <?php echo $priv; ?> /><label for="priv"><strong><?php echo  _AT('private'); ?>:</strong></label> <?php echo  _AT('about_private'); ?><br />
+		<input type="checkbox" name="notify" id="notify" value="1" <?php
+			echo $disable;
+			echo $notify; ?> /><label for="notify"><?php echo  _AT('email_approvals'); ?></label>
+		<br />
+		<input type="checkbox" name="hide" id="hide" value="1" <?php
+		echo $disable;
+		echo $hide; ?> /><label for="hide"><?php echo  _AT('hide_course'); ?></label>.
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+		<legend><?php echo _AT('release_date'); ?></legend>
+		<?php
+			$rel_no = $rel_yes = '';
+
+			if (intval($this->row['release_date'])) {
+				$rel_yes = ' checked="checked"';
+
+				$today_day   = substr($this->row['release_date'], 8, 2);
+				$today_mon   = substr($this->row['release_date'], 5, 2);
+				$today_year  = substr($this->row['release_date'], 0, 4);
+
+				$today_hour  = substr($this->row['release_date'], 11, 2);
+				$today_min   = substr($this->row['release_date'], 14, 2);
+			} else {
+				$rel_no = ' checked="checked"'; 
+				$today_year  = date('Y');
+			}
+
+		?>
+
+		<input type="radio" name="release_date" value="0" id="release_now" <?php echo $rel_no; ?> /> <label for="release_now"><?php echo _AT('available_immediately'); ?></label><br />
+
+
+		<input type="radio" name="release_date" value="1" id="release_later" <?php echo $rel_yes; ?> /> <label for="release_later"><?php echo _AT('release_on'); ?></label> 
+		<?php
+			$name = '_release';
+			require(AT_INCLUDE_PATH.'html/release_date.inc.php');
+		?>
+	</fieldset>	
+	</div>
+
+	<div class="row">
+	<fieldset><legend>
+		<?php echo _AT('end_date'); ?></legend>
+		<?php
+			$end_no = $end_yes = '';
+
+			if (intval($this->row['end_date'])) {
+				$end_yes = ' checked="checked"';
+
+				$today_day   = substr($this->row['end_date'], 8, 2);
+				$today_mon   = substr($this->row['end_date'], 5, 2);
+				$today_year  = substr($this->row['end_date'], 0, 4);
+
+				$today_hour  = substr($this->row['end_date'], 11, 2);
+				$today_min   = substr($this->row['end_date'], 14, 2);
+			} else {
+				$end_no = ' checked="checked"'; 
+				$today_year  = date('Y')+1;
+			}
+
+		?>
+
+		<input type="radio" name="end_date" value="0" id="end_now" <?php echo $end_no; ?> /> <label for="end_now"><?php echo _AT('no_end_date'); ?></label><br />
+
+		<input type="radio" name="end_date" value="1" id="end_later" <?php echo $end_yes; ?> /> <label for="end_later"><?php echo _AT('end_on'); ?></label> 
+		<?php
+			$name = '_end';
+			require(AT_INCLUDE_PATH.'html/release_date.inc.php');
+		?>
+		</fieldset>
+	</div>
+
+	<div class="row">
+		<?php
+			if (($_POST['setvisual'] && !$_POST['settext']) || $_GET['setvisual']){
+				echo '<input type="hidden" name="setvisual" value="'.$_POST['setvisual'].'" />';
+				echo '<input type="submit" name="settext" value="'._AT('switch_text').'"  class="button"/>';
+			} else {
+				echo '<input type="submit" name="setvisual" value="'._AT('switch_visual').'" class="button"/>';
+			}
+		?>
+	</div>
+	<div class="row">
+
+		<label for="banner"><?php echo _AT('banner'); ?></label><br />
+		<textarea id="banner" cols="40" rows="15" name="banner"><?php echo $this->row['banner']; ?></textarea>
+	</div>
+<!-- FIX  -->
+<?php if (!$this->course) : ?>
+	<div class="row">
+		<label for="initial_content"><?php echo _AT('initial_content'); ?></label><br />
+		<select name="initial_content" id="initial_content" size="5">
+			<option value="0"><?php echo _AT('empty'); ?></option>
+			<option value="1" selected="selected"><?php echo _AT('create_basic'); ?></option>
+			<?php 
+			
+			if ($course_row = mysql_fetch_assoc($result)) {
+				do {
+					$Backup->setCourseID($course_row['course_id']);
+					$list = $Backup->getAvailableList();
+
+					if (!empty($list)) { 
+						echo '<optgroup label="'. _AT('restore').': '.$course_row['title'].'">';
+						foreach ($list as $list_item) {
+							echo '<option value="'.$list_item['backup_id'].'_'.$list_item['course_id'].'">'.$list_item['file_name'].' - '.get_human_size($list_item['file_size']).'</option>';
+						}
+						echo '</optgroup>';
+					}
+				} while ($course_row = mysql_fetch_assoc($result));
+			}
+			?>
+			</select>
+	</div>
+<?php endif; // !$course_id ?>
+
+<?php if ($this->isadmin) : ?>
+	<div class="row">
+		<?php  echo _AT('course_quota'); ?><br />
+		<?php 
+			if ($this->row['max_quota'] == AT_COURSESIZE_UNLIMITED) { 
+				$c_unlim = ' checked="checked" ';
+				$c_oth2 = ' disabled="disabled" ';
+			} elseif ($this->row['max_quota'] == AT_COURSESIZE_DEFAULT) {
+				$c_def = ' checked="checked" ';
+				$c_oth2 = ' disabled="disabled" ';
+			} else {
+				$c_oth = ' checked="checked" ';
+				$c_oth2 = '';
+			}
+
+			if ($this->course > 0) {
+				$course_size = dirsize(AT_CONTENT_DIR . $this->course.'/');
+			} else {
+				$course_size = 0;
+			}
+
+			if ($this->course) {
+				echo _AT('current_course_size') .': '.get_human_size($course_size).'<br />'; 
+			}
+		?>
+
+		<input type="radio" id="c_default" name="quota" value="<?php echo AT_COURSESIZE_DEFAULT; ?>" onclick="disableOther();" <?php echo $c_def;?> /><label for="c_default"> <?php echo _AT('default') . ' ('.get_human_size($MaxCourseSize).')'; ?></label> <br />
+		<input type="radio" id="c_unlim" name="quota" value="<?php echo AT_COURSESIZE_UNLIMITED; ?>" onclick="disableOther();" <?php echo $c_unlim;?>/><label for="c_unlim"> <?php echo _AT('unlimited'); ?></label> <br />
+		<input type="radio" id="c_other" name="quota" value="2" onclick="enableOther();" <?php echo $c_oth;?>/><label for="c_other"> <?php echo _AT('other'); ?> </label> - 
+		<label for="quota_entered">Quota Entered</label>
+		<input type="text" id="quota_entered" name="quota_entered" <?php echo $c_oth2?> value="<?php if ($this->row['max_quota']!=AT_COURSESIZE_UNLIMITED && $this->row['max_quota']!=AT_COURSESIZE_DEFAULT) { echo bytes_to_megabytes($this->row['max_quota']); } ?>" size="4" /> <?php echo _AT('mb'); ?>
+	</div>
+
+	<div class="row">
+		<?php  echo _AT('max_file_size'); ?><br />
+		<?php 
+			$max_allowed = megabytes_to_bytes(substr(ini_get('upload_max_filesize'), 0, -1));
+
+			if ($this->row['max_file_size'] == AT_FILESIZE_DEFAULT) { 
+				$f_def = ' checked="checked" ';
+				$f_oth2 = ' disabled="disabled" ';
+			} elseif ($this->row['max_file_size'] == AT_FILESIZE_SYSTEM_MAX) {
+				$f_max = ' checked="checked" ';
+				$f_oth2 = ' disabled="disabled" ';
+			} else {
+				$f_oth = ' checked="checked" ';
+				$f_oth2 = '';
+			}
+		?>
+		<input type="radio" id="f_default" name="filesize" value="<?php echo AT_FILESIZE_DEFAULT; ?>" onclick="disableOther2();" <?php echo $f_def;?> /><label for="f_default"> <?php echo _AT('default') . ' ('.get_human_size($MaxFileSize).')'; ?></label> <br />
+		<input type="radio" id="f_maxallowed" name="filesize" value="<?php echo AT_FILESIZE_SYSTEM_MAX; ?>" onclick="disableOther2();" <?php echo $f_max;?>/><label for="f_maxallowed"> <?php echo _AT('max_file_size_system') . ' ('.get_human_size($max_allowed).')'; ?></label> <br />
+		<input type="radio" id="f_other" name="filesize" value="2" onclick="enableOther2();" <?php echo $f_oth;?>/><label for="f_other"> <?php echo _AT('other'); ?> </label> - 
+		<label for="filesize_entered">Filesize entered</label>
+		<input type="text" id="filesize_entered" name="filesize_entered" <?php echo $f_oth2?> value="<?php if ($this->row['max_file_size']!=AT_FILESIZE_DEFAULT && $this->row['max_file_size']!=AT_FILESIZE_SYSTEM_MAX) { echo bytes_to_megabytes($this->row['max_file_size']); } ?>" size="4" /> <?php echo _AT('mb'); ?>
+	</div>
+
+<?php else: ?>
+	<input type="hidden" name="quota" value="<?php echo $this->row['max_quota']; ?>" />
+	<input type="hidden" name="filesize" value="<?php echo $this->row['max_file_size']; ?>" />
+	<input type="hidden" name="tracking" value="<?php echo $this->row['tracking']; ?>" />
+<?php endif; ?>
+
+	<div class="row">
+		<label for="copyright"><?php echo _AT('course_copyright'); ?></label><br />
+		<textarea name="copyright" rows="2" cols="40" id="copyright"><?php echo $this->row['copyright']; ?></textarea>
+	</div>
+	<div class="row">
+		<?php 
+            if ($this->row['icon'] != ''): 
+                $path = AT_CONTENT_DIR.$this->row['course_id']."/custom_icons/";
+                if (file_exists($path.$this->row['icon'])) {
+                    if (defined('AT_FORCE_GET_FILE') && AT_FORCE_GET_FILE) {
+                        $custom_icon_path = 'get_course_icon.php/?id='.$this->row['course_id'];
+                    } else {
+                        $_base_href = 'content/' . $this->row['course_id'] . '/';
+                    }
+                } else {
+                    $_base_href = "images/courses/";	//$_base_href = 'get_course_icon.php/?id='.$row['course_id'];
+                }
+
+            $force_get = (defined('AT_FORCE_GET_FILE') && AT_FORCE_GET_FILE) ? true : false;
+            echo "<input type='hidden' name='boolForce' id='boolForce' value='$force_get' />";
+        
+       //include(AT_INCLUDE_PATH.'html/course_icon.inc.php');        
+        ?>
+		<img id="i0" src="<?php echo ($custom_icon_path=='')?$_base_href.$this->row['icon']:$custom_icon_path; ?>" alt="<?php echo $this->row['icon']; ?>" border="1" height="79" width="79"  />
+
+		<?php else: ?>
+			<img id="i0" src="images/clr.gif" alt="" border="1" height="79" width="79"  />
+			<input type='hidden' name='boolForce' id='boolForce' value='' />
+		<?php endif; ?>
+		<div>
+		<label for="icons"><?php echo _AT('icon'); ?></label><br />
+		<select name="icon" id="icons" onchange="SelectImg()">
+			<option value=""><?php echo _AT('no_icon'); ?></option>
+            <?php // ------------- custom course icons
+                $path = AT_CONTENT_DIR.$this->row['course_id']."/custom_icons/";
+                $boolCustom = false;
+                $optCount = 0;
+
+                if (is_dir($path)) {
+                    $boolCustom = true;  // true if custom icons are uploaded, otherwise false
+                    
+                    /*$files = scandir($path);  //SCANDIR STOPS ATUTOR WHEN RUN AS INSTRUCTOR, BUT NOT AS ADMIN. WHY? -Gorzan */
+                    
+                    /* PHP 4 REPLACEMENT FOR SCANDIR */
+					$dh  = opendir($path);
+					while (false !== ($filename = readdir($dh))) {
+						$files[] = $filename;
+					}
+
+					/*END PHP 4 REPLACEMENT FOR SCANDIR*/
+                    echo "<optgroup label='"._AT('custom_icons')."'>";
+                    foreach($files as $val) {
+						$file_ext = substr(strtolower($val), -3);
+                        if ($file_ext == "jpg" || $file_ext == "png" || $file_ext == "gif") {
+                            $optCount++;
+                            echo "<option value='".$val."'";
+                            if ($val == $this->row['icon']) {
+                                echo 'selected="selected"';
+                            }
+                            echo ">".$val."</option>";
+                        }
+                    }
+                    echo "</optgroup>";
+                }
+                
+            ?>
+			<?php // ------------- other icons
+
+				$course_imgs = array();
+				if ($dir = opendir(AT_INCLUDE_PATH.'../images/courses/')) {
+					while (false !== ($file = readdir($dir)) ) {
+						if( ($file == '.') || ($file == '..')) { 
+							continue;
+						}
+						$course_imgs[] = $file;
+					}		
+					closedir($dir);	
+				}
+				sort($course_imgs);
+                if ($boolCustom == true) {
+                    echo "<optgroup label='"._AT('builtin_icons')."'>";
+                }
+				foreach ($course_imgs as $file) {
+					echo '<option value="' . $file . '" ';
+					if ($file == $this->row['icon']) { 
+						echo 'selected="selected"'; 
+					}
+					echo ' >' . $file . '</option>';	
+				}
+                if ($boolCustom == true) {
+                    echo "</optgroup>";
+                }
+			?>
+		</select><?php echo "&nbsp;&nbsp;&nbsp; "._AT('or'); echo "<br />"?>
+	</div>
+    
+            <?php echo _AT('upload_icon'); ?><br />
+            	<label for="customicon"><input type="file" name="customicon" title="custom icon" id="customicon" value="<?php echo $_POST['customicon']; ?>"/></label><br />
+                <small><?php echo _AT('upload_icon_text'); ?></small>
+       
+        <?php  //require_once(AT_INCLUDE_PATH.'../mods/_core/courses/html/course_icon.inc.php'); ?>
+
+        <br />
+
+	</div>
+
+   
+	<div class="buttons">
+
+	        <?php
+            echo "<input type='hidden' name='custOptCount' id='custOptCount' value='".$optCount."' />";
+            echo "<input type='hidden' name='courseId' id='courseId' value='".$this->row['course_id']."' />";
+		?>
+
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" /> 
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel');?>" />
+	</div>
+    </fieldset>
+</div>
+
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/courses/enrollment.tmpl.php b/docs/themes/simplified-desktop/admin/courses/enrollment.tmpl.php
new file mode 100644
index 000000000..87731352b
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/courses/enrollment.tmpl.php
@@ -0,0 +1,140 @@
+
+
+<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+	<input type="hidden" name="tab" value="<?php echo $this->current_tab; ?>"/>
+	<input type="hidden" name="course_id" value="<?php echo $this->course_id; ?>"/>
+	<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('search'); ?></legend>
+		<?php if (admin_authenticate(AT_ADMIN_PRIV_ENROLLMENT, TRUE)): ?>
+			<div class="row">
+				<label for="course"><?php echo _AT('course'); ?></label><br/>
+				<select name="course_id" id="course">
+				<?php
+				
+				while ($courses_row = mysql_fetch_assoc($this->result)) {
+					if ($courses_row['course_id'] == $this->course_id) {
+						echo '<option value="'.$courses_row['course_id'].'" selected="selected">'.validate_length($courses_row['title'], 45,VALIDATE_LENGTH_FOR_DISPLAY).'</option>';
+					} else {
+						echo '<option value="'.$courses_row['course_id'].'">'.validate_length($courses_row['title'],45,VALIDATE_LENGTH_FOR_DISPLAY).'</option>';
+					}
+				}
+				?></select>
+			</div>
+		<?php endif; ?>
+
+		<div class="row">
+			<label for="search"><?php echo _AT('search'); ?> (<?php echo _AT('login_name').', '._AT('first_name').', '._AT('second_name').', '._AT('last_name') .', '._AT('email'); ?>)</label><br />
+			<input type="text" name="search" id="search" size="40" value="<?php echo htmlspecialchars($_GET['search']); ?>" />
+			<br/>
+			<?php echo _AT('search_match'); ?>:
+			<input type="radio" name="match" value="all" id="match_all" <?php echo $this->checked_match_all; ?> /><label for="match_all"><?php echo _AT('search_all_words'); ?></label> <input type="radio" name="match" value="one" id="match_one" <?php echo $this->checked_match_one; ?> /><label for="match_one"><?php echo _AT('search_any_word'); ?></label>
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="filter" value="<?php echo _AT('filter'); ?>" />
+			<input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>" />
+		</div>
+	</fieldset>
+	</div>
+</form>
+
+<?php print_paginator($this->page, $this->tab_counts[$this->current_tab], $this->page_string_w_tab . SEP . $this->order .'='. $this->col, $this->results_per_page); ?>
+
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="selectform">
+<input type="hidden" name="tab" value="<?php echo $this->current_tab; ?>" />
+<input type="hidden" name="course_id" value="<?php echo $this->course_id; ?>"/>
+
+<ul id="subnavlist">
+	<?php for ($i = 0; $i< $this->num_tabs; $i++): ?>
+		<?php if ($this->current_tab == $i): ?>
+			<li class="active"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?tab=<?php echo $i.$this->page_string; ?>" class="active"><strong><?php echo _AT($this->tabs[$i]); ?> - <?php echo $this->tab_counts[$i]; ?></strong></a></li>
+		<?php else: ?>
+			<li><a href="<?php echo $_SERVER['PHP_SELF']; ?>?tab=<?php echo $i.$this->page_string; ?>"><?php echo _AT($this->tabs[$i]); ?> - <?php echo $this->tab_counts[$i]; ?></a></li>
+		<?php endif; ?>
+	<?php endfor; ?>
+</ul>
+
+
+<table class="data" style="width:95%;" summary="" rules="cols" >
+<colgroup>
+	<?php if ($this->col == 'login'): ?>
+		<col />
+		<col class="sort" />
+		<col span="4" />
+	<?php elseif($this->col == 'first_name'): ?>
+		<col span="2" />
+		<col class="sort" />
+		<col span="3" />
+	<?php //elseif($this->col == 'second_name'): ?>
+		<!--  REMOVED FOR MOBILE <col span="3" />
+		<col class="sort" />
+		<col span="2" />-->
+	<?php elseif($this->col == 'last_name'): ?>
+		<col span="4" />
+		<col class="sort" />
+		<col />
+	<?php //elseif($this->col == 'email'): ?>
+		<!-- REMOVED FOR MOBILE <col span="5" />
+		<col class="sort" /> -->
+	<?php endif; ?>
+</colgroup>
+<thead>
+<tr>
+	<th scope="col" align="left"><input type="checkbox" value="<?php echo _AT('select_all'); ?>" id="all" title="<?php echo _AT('select_all'); ?>" name="selectall" onclick="CheckAll();" /></th>
+
+	<th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $this->orders[$this->order]; ?>=login<?php echo $this->page_string_w_tab;?>"><?php echo _AT('login_name'); ?></a></th>
+
+	<th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $this->orders[$this->order]; ?>=first_name<?php echo $this->page_string_w_tab;?>"><?php echo _AT('first_name'); ?></a></th>
+
+<!-- 	<th scope="col"><a href="<?php //echo $_SERVER['PHP_SELF']; ?>?<?php //echo $this->orders[$this->order]; ?>=second_name<?php // echo $this->page_string_w_tab;?>"><?php //echo _AT('second_name'); ?></a></th> -->
+
+	<th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $this->orders[$this->order]; ?>=last_name<?php echo $this->page_string_w_tab;?>"><?php echo _AT('last_name'); ?></a></th>
+
+<!--	<th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $this->orders[$this->order]; ?>=email<?php echo $this->page_string_w_tab;?>"><?php echo _AT('email'); ?></a></th> -->
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="6">
+		<?php if ($this->current_tab == 0): ?>
+			<input type="submit" name="role"     value="<?php echo _AT('privileges');  ?>" /> 
+			<input type="submit" name="unenroll" value="<?php echo _AT('remove');    ?>" /> 
+			<input type="submit" name="alumni"   value="<?php echo _AT('mark_alumni'); ?>" />
+		<?php elseif ($this->current_tab == 1): ?>
+			<input type="submit" name="role" value="<?php echo _AT('privileges'); ?>" /> 
+			<input type="submit" name="unenroll" value="<?php echo _AT('remove'); ?>" /> 
+
+		<?php elseif ($this->current_tab == 2): ?>
+			<input type="submit" name="enroll"   value="<?php echo _AT('enroll'); ?>" /> 
+			<input type="submit" name="unenroll" value="<?php echo _AT('remove'); ?>" />
+		
+		<?php elseif ($this->current_tab == 3): ?>
+			<input type="submit" name="enroll" value="<?php echo _AT('enroll'); ?>" /> 
+			<input type="submit" name="unenroll" value="<?php echo _AT('remove'); ?>" />
+
+		<?php elseif ($this->current_tab == 4): ?>
+			<input type="submit" name="enroll"   value="<?php echo _AT('enroll'); ?>" /> 
+
+		<?php endif; ?></td>
+</tr>
+</tfoot>
+<tbody>
+<?php if ($this->tab_counts[$this->current_tab]): ?>
+	<?php while ($row = mysql_fetch_assoc($this->enrollment_result)): ?>
+		<tr onmousedown="document.selectform['m<?php echo $row['member_id']; ?>'].checked = !document.selectform['m<?php echo $row['member_id']; ?>'].checked; togglerowhighlight(this, 'm<?php echo $row['member_id']; ?>');" id="rm<?php echo $row['member_id']; ?>">
+			<td><input type="checkbox" name="id[]" value="<?php echo $row['member_id']; ?>" id="m<?php echo $row['member_id']; ?>" onmouseup="this.checked=!this.checked" title="<?php echo AT_print($row['login'], 'members.login'); ?>" /></td>
+			<td><?php echo AT_print($row['login'], 'members.login'); ?></td>
+			<td><?php echo AT_print($row['first_name'], 'members.name'); ?></td>
+			<!-- REMOVED FOR MOBILE <td><?php // echo AT_print($row['second_name'], 'members.name'); ?></td> -->
+			<td><?php echo AT_print($row['last_name'], 'members.name'); ?></td>
+			<!-- REMOVED FOR MOBILE<td><?php // echo AT_print($row['email'], 'members.email'); ?></td> -->
+		</tr>
+	<?php endwhile; ?>
+<?php else: ?>
+	<tr>
+		<td colspan="6"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/courses/forum_add.tmpl.php b/docs/themes/simplified-desktop/admin/courses/forum_add.tmpl.php
new file mode 100644
index 000000000..0fccc48ab
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/courses/forum_add.tmpl.php
@@ -0,0 +1,39 @@
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<input type="hidden" name="add_forum" value="true" />
+
+<div class="input-form">
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="title"><?php echo _AT('title'); ?></label><br />
+		<input type="text" name="title" size="40" id="title" value="<?php echo $_POST['title']; ?>" />
+	</div>
+
+	<div class="row">
+		<label for="body"><?php echo _AT('description'); ?></label><br />
+		<textarea name="description" cols="45" rows="2" id="body" ><?php echo $_POST['description']; ?></textarea>
+	</div>
+
+	<div class="row">
+		<label for="edit"><?php echo _AT('allow_editing'); ?></label><br />
+		<input type="text" name="edit" size="3" id="edit" value="<?php echo intval($row['mins_to_edit']); ?>" /> <?php echo _AT('in_minutes'); ?>
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="courses"><?php echo _AT('courses'); ?></label><br />
+		<?php if ($this->system_courses): ?>
+			<select name="courses[]" id="courses" multiple="multiple" size="5"><?php
+				while ($row = mysql_fetch_assoc($this->result)) {
+					echo '<option value="'.$row['course_id'].'">'.$row['title'].'</option>';		
+				}
+				?>
+			</select>
+		<?php else: ?>
+			<span id="courses"><?php echo _AT('no_courses_found'); ?></span>
+		<?php endif; ?>
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" /> 
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/courses/forums.tmpl.php b/docs/themes/simplified-desktop/admin/courses/forums.tmpl.php
new file mode 100644
index 000000000..8f45ac9c3
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/courses/forums.tmpl.php
@@ -0,0 +1,61 @@
+
+<form name="form" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="table-surround">
+<table class="data" summary="Course forums" >
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><?php echo _AT('title');       ?></th>
+	<!-- REMOVED FOR MOBILE<th scope="col"><?php// echo _AT('description'); ?></th> -->
+	<th scope="col"><?php echo _AT('courses');  
+	   ?></th>
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="4"><input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" /> <input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" /></td>
+</tr>
+
+</tfoot>
+<tbody>
+
+<tr>
+	<th colspan="4"><?php echo _AT('shared_forums'); ?></th>
+</tr>
+<?php 
+foreach ($this->shared_forums as $forum) {
+
+?>
+<!--     <tr onmousedown="document.form[\'f'.$forum['forum_id'].'\'].checked = true; rowselect(this);"  id="r_'.$forum['forum_id'].'"></tr> -->      
+    <tr onkeydown="document.form['f<?php echo $forum['id']; ?>'].checked = true; rowselect(this);" onmousedown="document.form['f<?php echo $forum['id']; ?>'].checked = true; rowselect(this);" id="r_<?php echo $forum['id']; ?>">
+    <td><input type="radio" name="id" value= "<?php echo $forum['id']; ?>" id="f<?php echo $forum['id']; ?>"</td>
+	<td><label for="f<?php echo $forum['id']; ?>"> <?php echo	AT_print($forum['title'], 'forums.title'); ?>  </label></td>
+	<!-- REMOVED FOR MOBILE<td><?php // echo AT_print($forum['desc'], 'forums.description'); ?></td> -->
+	<td> <?php foreach ($forum["courses"] as $course) {echo $course. "  ";} ?>
+	</td>
+	</tr>
+<?php }?>
+
+</tbody>
+<tbody>
+	<tr>
+		<th colspan="4"><?php echo _AT('unshared_forums'); ?></th>
+	</tr>
+<?php if ($this->num_nonshared) : ?>
+	<?php foreach ($this->all_forums['nonshared'] as $forum) : ?>
+		<tr onkeydown="document.form['f<?php echo $forum['forum_id']; ?>'].checked = true; rowselect(this);" onmousedown="document.form['f<?php echo $forum['forum_id']; ?>'].checked = true; rowselect(this);" id="r_<?php echo $forum['forum_id']; ?>">
+			<td><input type="radio" name="id" value="<?php echo $forum['forum_id']; ?>" id="f<?php echo $forum['forum_id']; ?>" /></td>
+			<td><label for="f<?php echo $forum['forum_id']; ?>"><?php echo AT_print($forum['title'], 'forums.title'); ?></label></td>
+			<!-- REMOVED FOR MOBILE <td><?php // echo AT_print($forum['description'], 'forums.description'); ?></td> -->
+			<td><?php echo $this->system_courses[$forum['course_id']]['title']; ?></td>
+		</tr>
+	<?php endforeach; ?>
+<?php else: ?>
+	<tr>
+		<td colspan="4"><strong><?php echo _AT('no_forums'); ?></strong></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/courses/scaffolds.tmpl.php b/docs/themes/simplified-desktop/admin/courses/scaffolds.tmpl.php
new file mode 100644
index 000000000..ded75fd15
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/courses/scaffolds.tmpl.php
@@ -0,0 +1,25 @@
+<?php global $_config;?>
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="scaffolds">
+<div class="input-form">
+ <fieldset class="group_form"> <legend class="group_form"><strong><?php echo _AT("support_tools"); ?></strong>  </legend>  
+	<div class="row">
+		<p><?php echo _AT('scaffold_text'); ?></p>
+	</div>
+	<div class="row">
+
+		<label for="encyclopedia"><?php echo _AT('encyclopedia'); ?></label><br /><input type="text" id="encyclopedia"  name="encyclopedia" value="<?php echo $_config['encyclopedia']; ?>"  size="40"/><br />
+		<label for="dictionary"><?php echo _AT('dictionary'); ?></label><br /><input type="text" id="dictionary"  name="dictionary" value="<?php echo $_config['dictionary']; ?>"  size="40"/><br />
+		<label for="thesaurus"><?php echo _AT('thesaurus'); ?></label><br /><input type="text" id="thesaurus"  name="thesaurus" value="<?php echo $_config['thesaurus']; ?>" size="40"/><br />
+		<label for="atlas"><?php echo _AT('atlas'); ?></label><br /><input type="text" id="atlas"  name="atlas" value="<?php echo $_config['atlas']; ?>"  size="40"/><br />
+		<label for="calculator"><?php echo _AT('calculator'); ?></label><br /><input type="text" id="calculator"  name="calculator" value="<?php echo $_config['calculator']; ?>"  size="40"/><br />
+		<label for="note_taking"><?php echo _AT('note_taking'); ?></label><br /><input type="text" id="note_taking"  name="note_taking" value="<?php echo $_config['note_taking']; ?>"  size="40"/>	<br />
+		<label for="abacas"><?php echo _AT('abacus'); ?></label><br /><input type="text" id="abacas"  name="abacas" value="<?php echo $_config['abacas']; ?>"  size="40"/><br />
+	</div>
+	<div class="buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>"  />
+	</div>
+</fieldset>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/index.tmpl.php b/docs/themes/simplified-desktop/admin/index.tmpl.php
new file mode 100644
index 000000000..d22cf5c65
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/index.tmpl.php
@@ -0,0 +1,152 @@
+<?php global $_config; $_config_defaults;?>
+
+<div class="admin_container"> 
+
+	<?php /*
+	$this->path_length = strlen($this->base_path);
+
+	echo '<ul class="fl-list-menu ">';
+	foreach ($this->top_level_pages as $page_info) {
+		echo '<li><a href="' . $page_info['url'] . '">' . $page_info['title'] . '</a>  ';
+
+		$page_info['url'] = substr($page_info['url'], $this->path_length);
+
+		if ($this->pages[$page_info['url']]['children']) {
+	
+			foreach ($this->pages[$page_info['url']]['children'] as $child) {
+				// check whether the page is set to be available for mobile themes. @see include/lib/menu_pages.php
+				if (page_available($child)) {
+					echo ' <li  ><a href="'.$child.'">'._AT($this->pages[$child]['title_var']).'</a></li>';
+				}
+			}
+			
+		}
+		echo '</li>'; //end top-tool
+	}
+	echo '</ul>';*/
+	
+?>
+
+
+<div class="" style="">
+	<div class="input-form" >
+		
+				<h3><?php echo _AT('social_switch'); ?></h3>
+				<p><?php echo _AT('social_switch_text'); ?></p>
+		
+			<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+			<fieldset>
+			<legend id="social_networking"><?php echo _AT('social_switch'); ?></legend>(<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['just_social'] ? _AT('just_social') : _AT('social_and_lms')); ?>)
+			<div class="row">
+			<input type="radio" name="just_social" value="1" id="social_y" <?php if($_config['just_social']) { echo 'checked="checked"'; }?>  /><label for="social_y"><?php echo _AT('just_social'); ?></label> <br /><input type="radio" name="just_social" value="0" id="social_n" <?php if(!$_config['just_social']) { echo 'checked="checked"'; }?>  /><label for="social_n"><?php echo _AT('social_and_lms'); ?></label>
+			</div>
+
+			<div class="row buttons">
+				<input type="submit" name="social_submit" value="<?php echo _AT('save'); ?>" />
+			</div>
+			</fieldset>
+			</form>
+
+	</div>
+	<div class="input-form" >
+		
+				<h3><?php echo _AT('donate'); ?></h3>
+				<p><?php echo _AT('donate_text'); ?></p>
+			
+
+			<div >
+				<a href="http://www.atutor.ca/payment/index.php?project=ATutor-Donation"><img src="<?php echo $this->base_href; ?>/images/donate.gif" height="28" width="136" border="0" alt="<?php echo _AT('donate'); ?>" /></a><br /><br />
+			</div>
+	</div>
+	
+		
+	<div class="input-form">
+		<form method="get" action="mods/_core/users/instructor_requests.php">
+			
+			<h3><?php echo _AT('instructor_requests'); ?></h3>
+				
+				<?php foreach($this->row_instructor as $key => $value): ?>
+				
+				<p><?php echo _AT('instructor_requests_text', $value['cnt']); ?></p>
+				<?php endforeach;?>
+			
+
+			<div class="row buttons">
+				<input type="submit" name="submit" value="<?php echo _AT('view'); ?>" />
+			</div>
+		</form>
+	</div>
+	
+	
+	<div class="input-form">
+		<form method="get" action="mods/_standard/patcher/index_admin.php">
+			
+				<h3><?php echo _AT('available_patches'); ?></h3>
+				<p><?php echo _AT('available_patches_text', $this->cnt); ?></p>
+		
+
+			<div class="row buttons">
+				<input type="submit" name="submit" value="<?php echo _AT('view'); ?>" />
+			</div>
+		</form>
+	</div>
+	<div class="input-form" >
+		
+			<h3><?php echo _AT('statistics_information'); ?></h3>
+
+			<dl class="col-list">
+				<?php if ($this->db_size): ?>
+					<dt><?php echo _AT('database'); ?>:</dt>
+					<dd><?php echo number_format($this->db_size/AT_KBYTE_SIZE/AT_KBYTE_SIZE,2); ?> <acronym title="<?php echo _AT('megabytes'); ?>"><?php echo _AT('mb'); ?></acronym></dd>
+				<?php endif; ?>
+
+				<?php if ($this->du_size): ?>
+					<dt><?php echo _AT('disk_usage'); ?>:</dt>
+					<dd><?php echo number_format($this->du_size/AT_KBYTE_SIZE,2); ?> <acronym title="<?php echo _AT('megabytes'); ?>"><?php echo _AT('mb'); ?></acronym></dd>
+				<?php endif; ?>
+
+				<dt><?php echo _AT('courses'); ?>:</dt>
+				<dd><?php echo $this->num_courses; ?></dd>
+
+				<dt><?php echo _AT('users'); ?>:</dt>
+				<dd><?php echo $this->num_users; ?></dd>
+
+				<dt><?php echo _AT('atutor_version'); ?>:</dt>
+                <?php
+                    require('../svn.php');
+                    if (!empty($svn_data)) {
+                        $svn_data   = explode("\n", $svn_data);
+                        if (substr($svn_data[1], 0, 1) == 'r') {
+                            $svn_data = $svn_data[1];
+                        } else if (substr($svn_data[2], 0, 1) == 'r') {
+                            $svn_data = $svn_data[2];
+                        }
+
+                        if (count($svn_data) > 1) {
+                            $build = 'unknown';
+                            $build_date = date('Y-m-d H:i:s');
+                        } else {
+                            $svn_data   = explode(' ', $svn_data);
+
+                            $build      = $svn_data[0];
+                            $build_date = $svn_data[4] .' '. $svn_data[5];
+                        }
+                        $build_str = '(' . $build . ' - '.$build_date . ')';
+                    }
+                ?>
+				<dd><?php echo _AT('atutor_version_text', VERSION . $build_str, urlencode(VERSION)); ?></dd>
+
+				<dt><?php echo _AT('php_version'); ?>:</dt>
+				<dd><?php echo PHP_VERSION; ?></dd>
+
+				<dt><?php echo _AT('mysql_version'); ?>:</dt>
+				<dd><?php echo $mysql_version; ?></dd>
+
+				<dt><?php echo _AT('os'); ?>:</dt>
+				<dd><?php echo @php_uname('s') . ' ' . @php_uname('r'); ?></dd>
+			</dl>
+		</div>
+	</div>
+
+</div> 
+
diff --git a/docs/themes/simplified-desktop/admin/modules/details.tmpl.php b/docs/themes/simplified-desktop/admin/modules/details.tmpl.php
new file mode 100644
index 000000000..3f5cbec34
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/modules/details.tmpl.php
@@ -0,0 +1,85 @@
+<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<input type="hidden" name="mod" value="<?php echo $_GET['mod']; ?>" />
+<input type="hidden" name="new" value="<?php echo $_GET['new']; ?>" />
+
+<input type="hidden" name="enabled" value="<?php echo (int) isset($_GET['enabled']); ?>" />
+<input type="hidden" name="disabled" value="<?php echo (int) isset($_GET['disabled']); ?>" />
+<input type="hidden" name="core" value="<?php echo (int) isset($_GET['core']); ?>" />
+<input type="hidden" name="standard" value="<?php echo (int) isset($_GET['standard']); ?>" />
+<input type="hidden" name="extra" value="<?php echo (int) isset($_GET['extra']); ?>" />
+<input type="hidden" name="missing" value="<?php echo (int) isset($_GET['missing']); ?>" />
+
+<div class="input-form">
+	<div class="row">
+		<h3><?php echo $this->module->getName(); ?></h3>
+	</div>
+
+	<div class="row">
+		<?php echo _AT('description'); ?><br />
+		<?php echo nl2br($this->module->getDescription($_SESSION['lang'])); ?>
+	</div>
+
+	<div class="row">
+		<?php echo _AT('maintainers'); ?><br />
+			<ul class="horizontal">
+				<?php foreach ($this->properties['maintainers'] as $maintainer): ?>
+					<li><?php echo $maintainer['name'] .' &lt;'.$maintainer['email'].'&gt;'; ?></li>
+				<?php endforeach; ?>
+			</ul>
+	</div>
+
+	<div class="row">
+		<?php echo _AT('url'); ?><br />
+		<?php echo $this->properties['url']; ?>
+	</div>
+
+	<div class="row">
+		<?php echo _AT('version'); ?><br />
+		<?php echo $this->properties['version']; ?>
+	</div>
+
+	<div class="row">
+		<?php echo _AT('date'); ?><br />
+		<?php echo $this->properties['date']; ?>
+	</div>
+
+	<div class="row">
+		<?php echo _AT('license'); ?><br />
+		<?php echo $this->properties['license']; ?>
+	</div>
+
+	<div class="row">
+		<?php echo _AT('state'); ?><br />
+		<?php echo $this->properties['state']; ?>
+	</div>
+
+	<div class="row">
+		<?php echo _AT('notes'); ?><br />
+		<?php echo nl2br($this->properties['notes']); ?>
+	</div>
+
+	<?php if (is_array($this->module->_pages)): ?>
+		<div class="row">
+			<?php if (!isset($_GET['files'])): ?>
+				<a href="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES).SEP; ?>files#files"><?php echo _AT('files'); ?></a><br />
+			<?php else: ?>
+				<?php $module_pages = array_keys($this->module->_pages); ?>
+				<?php natsort($module_pages); ?>
+				<a name="files"></a><?php echo _AT('files'); ?><br />
+				<ul class="">
+					<?php foreach ($module_pages as $key): ?>
+						<?php if (defined($key)) : continue; endif; ?>
+						<li><kbd><?php echo $key; ?></kbd></li>
+					<?php endforeach; ?>
+				</ul>
+			<?php endif; ?>
+		</div>
+	<?php endif; ?>
+
+<?php if (!isset($_REQUEST['new'])): ?>
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('back'); ?>" />
+	</div>
+<?php endif; ?>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/modules/index.tmpl.php b/docs/themes/simplified-desktop/admin/modules/index.tmpl.php
new file mode 100644
index 000000000..87b34a930
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/modules/index.tmpl.php
@@ -0,0 +1,127 @@
+
+
+<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+	<div class="input-form">
+		
+			<h3><?php echo _AT('results_found', count($this->keys)); ?></h3>
+			<a id="results-hide-show-link" href="javascript:void(0);" tabindex="1">Refine Results</a>
+		
+	
+		
+	<div id="results-hide-show" role="search"  aria-live="assertive">
+	<div id="results-display">
+
+		<div class="row">
+			<?php echo _AT('type'); ?><br />
+			<input type="checkbox" name="core" value="1" id="t0" <?php if ($_GET['core']) { echo 'checked="checked"'; } ?> /><label for="t0"><?php echo _AT('core'); ?></label>
+
+			<input type="checkbox" name="standard" value="1" id="t1" <?php if ($_GET['standard']) { echo 'checked="checked"'; } ?> /><label for="t1"><?php echo _AT('standard'); ?></label> 
+
+			<input type="checkbox" name="extra" value="1" id="t2" <?php if ($_GET['extra']) { echo 'checked="checked"'; } ?> /><label for="t2"><?php echo _AT('extra'); ?></label> 
+		</div>
+
+
+		<div class="row">
+			<?php echo _AT('status'); ?><br />
+			<input type="checkbox" name="enabled" value="1" id="s0" <?php if ($_GET['enabled']) { echo 'checked="checked"'; } ?> /><label for="s0"><?php echo _AT('enabled'); ?></label> 
+
+			<input type="checkbox" name="disabled" value="1" id="s1" <?php if ($_GET['disabled']) { echo 'checked="checked"'; } ?> /><label for="s1"><?php echo _AT('disabled'); ?></label> 
+
+			<input type="checkbox" name="missing" value="1" id="s2" <?php if ($_GET['missing']) { echo 'checked="checked"'; } ?> /><label for="s2"><?php echo _AT('missing'); ?></label> 
+
+			<input type="checkbox" name="partially_uninstalled" value="1" id="s3" <?php if ($_GET['partially_uninstalled']) { echo 'checked="checked"'; } ?> /><label for="s3"><?php echo _AT('partially_uninstalled'); ?></label> 
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="filter" value="<?php echo _AT('filter'); ?>" />
+			<input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>" />
+		</div>
+	</div>
+	</div> <!-- end #results-display -->
+	</div> <!-- end #results-hide-show -->
+</form>
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="get" name="form">
+
+<input type="hidden" name="enabled" value="<?php echo (int) $_GET['enabled']; ?>" />
+<input type="hidden" name="disabled" value="<?php echo (int) $_GET['disabled']; ?>" />
+<input type="hidden" name="core" value="<?php echo (int) $_GET['core']; ?>" />
+<input type="hidden" name="standard" value="<?php echo (int) $_GET['standard']; ?>" />
+<input type="hidden" name="extra" value="<?php echo (int) $_GET['extra']; ?>" />
+<input type="hidden" name="missing" value="<?php echo (int) $_GET['missing']; ?>" />
+<input type="hidden" name="partially_uninstalled" value="<?php echo (int) $_GET['partially_uninstalled']; ?>" />
+<div class="table-surround">
+<table class="data" summary="List of modules" >
+<colgroup>
+		<col />
+		<col class="sort" />
+		<col span="4" />
+</colgroup>
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><?php echo _AT('module_name'); ?></th>
+	<!-- REMOVED FOR MOBILE <th scope="col"><?php echo _AT('type'); ?></th>-->
+	<th scope="col"><?php echo _AT('status'); ?></th>
+	<!-- REMOVED FOR MOBILE <th scope="col"><?php echo _AT('cron'); ?></th> -->
+	<!-- REMOVED FOR MOBILE <th scope="col"><?php echo _AT('directory_name'); ?></th>-->
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="6">
+		<input type="submit" name="details" value="<?php echo _AT('details'); ?>" />
+		<input type="submit" name="enable"  value="<?php echo _AT('enable'); ?>" />
+		<input type="submit" name="disable" value="<?php echo _AT('disable'); ?>" />
+		<input type="submit" name="uninstall" value="<?php echo _AT('uninstall'); ?>" />
+		<input type="submit" name="export" value="<?php echo _AT('export'); ?>" />
+	</td>
+</tr>
+</tfoot>
+<tbody>
+
+
+
+<?php foreach($this->keys as $dir_name) : $module =& $this->module_list[$dir_name]; $i++; $readme = get_readme(AT_INCLUDE_PATH.'../mods/'.$dir_name);?>
+
+	<tr onkeydown="document.form['t_<?php echo $i; ?>'].checked = true; rowselect(this);" onmousedown="document.form['t_<?php echo $i; ?>'].checked = true; rowselect(this);" id="r_<?php echo $i; ?>">
+		<td valign="top"><input type="radio" id="t_<?php echo $i; ?>" name="mod_dir" value="<?php echo $dir_name; ?>" /></td>
+		<td nowrap="nowrap" valign="top"><label for="t_<?php echo $i; ?>"><?php echo $module->getName(); if ($readme <> '') echo '&nbsp;<a href="#" onclick="ATutor.poptastic(\''.AT_BASE_HREF.'mods/'.$dir_name.'/'.$readme.'\');return false;">'._AT('view_readme').'</a>'; ?></label></td>
+		<!-- REMOVED FOR MOBILE><td valign="top"><?php
+			/*if ($module->isCore()) {
+				echo '<strong>'._AT('core').'</strong>';
+			} else if ($module->isStandard()) {
+				echo _AT('standard');
+			} else {
+				echo _AT('extra');
+			}*/
+			?></td> -->
+		<td valign="top"><?php
+			if ($module->isEnabled()) {
+				echo _AT('enabled');
+			} else if ($module->isMissing()) {
+				echo '<strong>'._AT('missing').'</strong>';
+			} else if ($module->isPartiallyUninstalled()) {
+				echo _AT('partially_uninstalled');
+			} else {
+				echo '<strong>'._AT('disabled').'</strong>';
+			}
+			?></td>
+		<!-- REMOVED FOR MOBILE <td valign="top" align="center">
+			<?php // if ($module->getCronInterval()): ?>
+				<?php //echo _AT('minutes', $module->getCronInterval()); ?>
+			<?php //else: ?>
+				
+			<?php // endif; ?>
+		</td>
+		<td valign="top"><code><?php //echo $dir_name; ?>/</code></td> -->
+	</tr>
+<?php endforeach; ?>
+<?php if (!$this->keys): ?>
+	<tr>
+		<td colspan="6"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</form>
diff --git a/docs/themes/simplified-desktop/admin/modules/install_modules.tmpl.php b/docs/themes/simplified-desktop/admin/modules/install_modules.tmpl.php
new file mode 100644
index 000000000..f5e0bc586
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/modules/install_modules.tmpl.php
@@ -0,0 +1,142 @@
+
+<form name="frm_upload" enctype="multipart/form-data" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" >
+	
+<div class="input-form">
+		<div class="row"><?php echo _AT("upload_module"); ?></div>
+
+		<div class="row">
+			<input type="hidden" name="MAX_FILE_SIZE" value="52428800" />
+			<input type="file" name="modulefile"  size="50" />
+		</div>
+		
+		<div class="row buttons">
+			<input type="submit" name="install_upload" value="<?php echo _AT('install'); ?>" onclick="javascript: return validate_filename(); " class="submit" />
+			<input type="hidden" name="uploading" value="1" />
+		</div>
+</div>
+
+</form>
+
+<?php 
+if (count($this->keys) > 0)
+{
+?>
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="installform">
+<table class="data" summary="" rules="cols">
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><?php echo _AT('module_name'); ?></th>
+	<th scope="col"><?php echo _AT('directory_name'); ?></th>
+	<th scope="col"><?php echo _AT('description'); ?></th>
+</tr>
+</thead>
+
+<tfoot>
+<tr>
+	<td colspan="4">
+		<input type="submit" name="install_manually"  value="<?php echo _AT('install'); ?>" />
+	</td>
+</tr>
+</tfoot>
+
+<tbody>
+<?php if (!empty($this->keys)): ?>
+	<?php foreach($this->keys as $dir_name) : $module =& $this->module_list[$dir_name]; ?>
+		<tr onmousedown="document.installform['m_<?php echo $dir_name; ?>'].checked = true; rowselect(this);" id="r_<?php echo $dir_name; ?>">
+			<td valign="top"><input type="radio" id="m_<?php echo $dir_name; ?>" name="mod" value="<?php echo $dir_name; ?>" /></td>
+			<td valign="top"><label for="m_<?php echo $row['dir_name']; ?>"><?php echo $module->getName(); ?></label></td>
+			<td valign="top"><code><?php echo $dir_name; ?>/</code></td>
+			<td valign="top"><?php echo $module->getDescription($_SESSION['lang']); ?></td>
+		</tr>
+	<?php endforeach; ?>
+<?php else: ?>
+	<tr>
+		<td colspan="4"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</form>
+<br />
+<?php 
+}
+?>
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<?php 
+?>
+<table class="data" summary="" rules="cols">
+<thead>
+	<tr>
+		<th scope="col">&nbsp;</th>
+		<th scope="col"><?php echo _AT('module_name');?></th>
+		<th scope="col"><?php echo _AT('description');?></th>
+		<th scope="col"><?php echo _AT('version');?></th>
+		<th scope="col"><?php echo _AT('atutor_version_tested_with');?></th>
+		<th scope="col"><?php echo _AT('maintainers');?></th>
+		<th scope="col"><?php echo _AT('installed').'?';?></th>
+	</tr>
+</thead>
+	
+<tfoot>
+<tr>
+	<td colspan="7">
+		<input type="submit" name="install" value="<?php echo _AT('install'); ?>" />
+		<input type="submit" name="download" value="<?php echo _AT('download'); ?>" />
+		<input type="submit" name="version_history" value="<?php echo _AT('version_history'); ?>" />
+	</td>
+</tr>
+</tfoot>
+
+<tbody>
+<?php 
+$num_of_modules = count($this->module_list_array);
+
+if ($num_of_modules == 0)
+{
+?>
+
+<tr>
+	<td colspan="7"><?php echo _AT('none_found'); ?></td>
+</tr>
+
+<?php 
+}
+else
+{
+	// display modules
+	if(is_array($this->module_list_array))
+	{
+		for ($i=0; $i < $num_of_modules; $i++)
+		{
+			// check if the module has been installed
+			//$sql = "SELECT * FROM ".TABLE_PREFIX."modules WHERE dir_name = '" . $this->module_list_array[$i]["history"][0]["install_folder"] . "'";
+			//$result = mysql_query($sql, $db) or die(mysql_error());
+
+			if (mysql_num_rows($this->result) == 0) $installed = false;
+			else $installed = true;
+
+?>
+	<tr onmousedown="document.form['m<?php echo $i; ?>'].checked = true; rowselect(this);"  id="r_<?php echo $i; ?>">
+		<td><input type="radio" name="id" value="<?php echo $i; ?>" id="m<?php echo $i; ?>" <?php if ($installed) echo 'disabled="disabled"'; ?> /></td>
+		<td><label for="m<?php echo $i; ?>"><?php echo $this->module_list_array[$i]["name"]; ?></label></td>
+		<td><?php echo $this->module_list_array[$i]["description"]; ?></td>
+		<td><?php echo $this->module_list_array[$i]["history"][0]["version"]; ?></td>
+		<td><?php echo $this->module_list_array[$i]["atutor_version"]; ?></td>
+		<td><?php echo $this->module_list_array[$i]["history"][0]["maintainer"]; ?></td>
+		<td><?php if ($installed) echo _AT("installed"); else echo _AT("not_installed"); ?></td>
+	</tr>
+
+<?php 
+		}
+	}
+
+?>
+</tbody>
+
+<?php 
+}
+?>
+</table>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/modules/version_history.tmpl.php b/docs/themes/simplified-desktop/admin/modules/version_history.tmpl.php
new file mode 100644
index 000000000..af2cc2196
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/modules/version_history.tmpl.php
@@ -0,0 +1,76 @@
+<?php 
+//$this->module_list_array[$id]['history']
+?>
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<div class="input-form">
+<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
+<table class="data" summary="" style="width: 100%" rules="cols">
+<thead>
+	<tr>
+		<th scope="col">&nbsp;</th>
+		<th scope="col"><?php echo _AT('version');?></th>
+		<th scope="col"><?php echo _AT('publish_date');?></th>
+		<th scope="col"><?php echo _AT('state');?></th>
+		<th scope="col"><?php echo _AT('maintainers');?></th>
+		<th scope="col"><?php echo _AT('notes');?></th>
+	</tr>
+</thead>
+
+<tfoot>
+<tr>
+	<td colspan="6">
+		<input type="submit" name="download" value="<?php echo _AT('download'); ?>" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</td>
+</tr>
+</tfoot>
+
+<tbody>
+<?php 
+$num_of_versions = count($this->module_list_array[$this->id]['history']);
+
+if ($num_of_versions == 0)
+{
+?>
+
+<tr>
+	<td colspan="7">
+<?php 
+	echo _AT('none_found'); 
+?>
+	</td>
+</tr>
+
+<?php 
+}
+else
+{
+	// display version list
+	if(is_array($this->module_list_array[$this->id]['history']))
+	{
+		for ($i=0; $i < $num_of_versions; $i++)
+		{
+?>
+	<tr onmousedown="document.form['m<?php echo $i; ?>'].checked = true; rowselect(this);"  id="r_<?php echo $i; ?>">
+		<td><input type="radio" name="vid" value="<?php echo $i; ?>" id="m<?php echo $i; ?>" /></td>
+		<td><label for="m<?php echo $i; ?>"><?php echo $this->module_list_array[$this->id]["name"] . ' ' .$this->module_list_array[$this->id]['history'][$i]["version"]; ?></label></td>
+		<td><?php echo $this->module_list_array[$this->id]['history'][$i]["date"]; ?></td>
+		<td><?php echo $this->module_list_array[$this->id]['history'][$i]["state"]; ?></td>
+		<td><?php echo $this->module_list_array[$this->id]['history'][$i]["maintainer"]; ?></td>
+		<td><?php echo $this->module_list_array[$this->id]['history'][$i]["notes"]; ?></td>
+	</tr>
+
+<?php 
+		}
+	}
+
+?>
+</tbody>
+
+<?php 
+}
+?>
+</table>
+
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/my_edit.tmpl.php b/docs/themes/simplified-desktop/admin/my_edit.tmpl.php
new file mode 100644
index 000000000..829bb0503
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/my_edit.tmpl.php
@@ -0,0 +1,18 @@
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="input-form">
+	<div class="row">
+		<label for="real_name"><?php echo _AT('real_name'); ?></label><br />
+		<input type="text" name="real_name" id="real_name" size="40" value="<?php echo htmlspecialchars($_POST['real_name']); ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="email"><?php echo _AT('email'); ?></label><br />
+		<input type="text" name="email" id="email" size="40" value="<?php echo htmlspecialchars($_POST['email']); ?>" />
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+</div>
+</form>
diff --git a/docs/themes/simplified-desktop/admin/patcher/index_admin.tmpl.php b/docs/themes/simplified-desktop/admin/patcher/index_admin.tmpl.php
new file mode 100644
index 000000000..6ba05628f
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/patcher/index_admin.tmpl.php
@@ -0,0 +1,116 @@
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<div class="input-form">
+
+<table class="data" summary="" style="width: 100%" rules="cols">
+<thead>
+	<tr>
+		<th scope="col">&nbsp;</th>
+		<th scope="col"><?php echo _AT('atutor_patch_id');?></th>
+		<th scope="col"><?php echo _AT('description');?></th>
+		<th scope="col"><?php echo _AT('status');?></th>
+		<th scope="col"><?php echo _AT('available_to');?></th>
+		<th scope="col"><?php echo _AT('author');?></th>
+		<th scope="col"><?php echo _AT('installed_date');?></th>
+		<th scope="col"><?php echo _AT('view_message');?></th>
+	</tr>
+</thead>
+	
+<tbody>
+<?php 
+if ($this->num_of_patches == 0)
+{
+?>
+
+<tr>
+	<td colspan="8">
+<?php 
+	echo _AT('none_found');
+?>
+	</td>
+</tr>
+
+<?php 
+}
+else
+{
+	while ($row = mysql_fetch_assoc($this->result))
+	{
+			print_patch_row($row, $row['patches_id'], false);
+	}
+	
+	$array_id = 0;
+	// display un-installed patches
+	if(is_array($this->patch_list_array))
+	{
+		foreach ($this->patch_list_array as $row_num => $new_patch)
+		{
+			if (!is_patch_installed($new_patch['atutor_patch_id']))
+			{
+				$dependent_patches_installed = true;
+				$dependent_patches = "";
+				
+				// check if the dependent patches are installed
+				if (is_array($new_patch["dependent_patches"]))
+				{
+					
+					foreach ($new_patch["dependent_patches"] as $num => $dependent_patch)
+					{
+						if (!is_patch_installed($dependent_patch))
+						{
+							$dependent_patches_installed = false;
+							$dependent_patches .= $dependent_patch. ", ";
+						}
+					}
+					
+					// remove the last comma in the string
+					if ($dependent_patches <> "") $dependent_patches = substr($dependent_patches, 0, -2);
+				}
+	
+				// display patch row
+				if ($dependent_patches_installed)
+					print_patch_row($new_patch, $array_id++, true);
+				else
+				{
+					print_patch_row($new_patch, $array_id++, false);
+					$dependent_patches_installed = true;
+				}
+			}
+			else
+				$array_id++;
+		}
+	}
+?>
+</tbody>
+<tfoot>
+<tr>
+	<td colspan="8">
+		<input type="submit" name="install" value="<?php echo _AT('install'); ?>" />
+	</td>
+</tr>
+</tfoot>
+
+<?php 
+}
+?>
+</table>
+
+</div>
+</form>
+
+<form name="frm_upload" enctype="multipart/form-data" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" >
+	
+<div class="input-form">
+		<div class="row"><?php echo _AT("upload_patch"); ?></div>
+
+		<div class="row">
+			<input type="hidden" name="MAX_FILE_SIZE" value="52428800" />
+			<input type="file" name="patchfile"  size="50" />
+		</div>
+		
+		<div class="row buttons">
+			<input type="submit" name="install_upload" value="Install" onclick="javascript: return validate_filename(); " class="submit" />
+			<input type="hidden" name="uploading" value="1" />
+		</div>
+</div>
+
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/add_feed.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/add_feed.tmpl.php
new file mode 100644
index 000000000..5ce873a7c
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/add_feed.tmpl.php
@@ -0,0 +1,51 @@
+<?php
+global $stripslashes;
+
+if (!isset($_POST['confirm'])) {
+?>
+	<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+		<input type="hidden" name="confirm" value="1" />
+
+		<div class="input-form" style="width: 95%x">
+			<div class="row">
+				<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="title"><?php echo _AT('title'); ?></label><br />
+				<input id="title" name="title" type="text" size="40" maxlength="255" value="<?php echo $stripslashes(htmlspecialchars($_POST['title'])); ?>" /><br />
+			</div>
+
+			<div class="row">
+				<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="url"><?php echo _AT('url'); ?></label><br />
+				<input id="url" name="url" type="text" size="40" maxlength="255" value="<?php echo $stripslashes(htmlspecialchars($_POST['url'])); ?>" /><br />
+			</div>
+
+			<div class="row buttons">
+				<input type="submit" name="submit" value=" <?php echo _AT('save'); ?> " accesskey="s" />
+				<input type="submit" name="cancel" value=" <?php echo _AT('cancel'); ?> " />
+			</div>
+		</div>
+	</form>
+<?php 
+} else { ?>
+
+	<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+	<input type="hidden" name="new" value="<?php echo $_POST['new']; ?>" />
+
+	<div class="input-form">
+		<div class="row">
+			<h3><?php if (file_exists($this->title_file)) { 
+					readfile($this->title_file); 
+				} else {
+					echo $_POST['title'];
+				}?>
+			</h3>
+		</div>
+
+		<div class="row">
+			<?php echo $this->output; ?>
+		</div>
+	</div>
+	</form>
+
+	<?php
+		$this->msg->printConfirm();
+}
+?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/config_edit.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/config_edit.tmpl.php
new file mode 100644
index 000000000..e0febaefb
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/config_edit.tmpl.php
@@ -0,0 +1,322 @@
+<?php global $_config, $languageManager, $_config_defaults, $stripslashes;?>
+
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="form">
+<div class="input-form">
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="sitename"><?php echo _AT('site_name'); ?></label><br />
+		<input type="text" name="site_name" size="40" maxlength="60" id="sitename" value="<?php if (!empty($_POST['site_name'])) { echo $stripslashes(htmlspecialchars($_POST['site_name'])); } else { echo $_config['site_name']; } ?>" />
+	</div>
+
+	<div class="row">
+		<label for="home_url"><?php echo _AT('home_url'); ?></label><br />
+
+		<input type="text" name="home_url" size="50" maxlength="60" id="home_url" value="<?php if (!empty($_POST['home_url'])) { echo $stripslashes(htmlspecialchars($_POST['home_url'])); } else { echo $_config['home_url']; } ?>"  />
+	</div>
+
+	<div class="row">
+		<label for="default_lang"><?php echo _AT('default_language'); ?></label><br />
+
+		<?php if (!empty($_POST['default_language'])) { 
+				$select_lang = $_POST['default_language']; 
+			} else { 
+				$select_lang = $_config['default_language'];
+			} ?>
+		<?php if ($disabled): ?>
+			<select name="default_language" id="default_lang" disabled="disabled"><option><?php echo $select_lang; ?></option></select>
+		<?php else: ?>
+			<?php $languageManager->printDropdown($select_lang, 'default_language', 'default_lang'); ?>
+		<?php endif; ?>
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="cemail"><?php echo _AT('contact_email'); ?></label><br />
+		<input type="text" name="contact_email" id="cemail" size="40" value="<?php if (!empty($_POST['email'])) { echo $stripslashes(htmlspecialchars($_POST['email'])); } else { echo $_config['contact_email']; } ?>"  />
+	</div>
+
+	<div class="row">
+		<label for="time_zone"><?php echo _AT('time_zone'); ?></label><br />
+
+		<?php
+
+
+		// Replace this hack to use the PHP timezone functions when the PHP requirement is raised to 5.3
+		global $utc_timezones; // set in include/lib/constants.inc.php
+		$local_offset = ((date(Z)/3600));
+		echo '<select name="time_zone" id="time_zone">';	
+			echo '<option value="0">'._AT('none').'</option>';
+		foreach ($utc_timezones as $zone => $offset){
+			if(($offset[1]) == $_config['time_zone']){
+			echo '<option value="'.($offset[1]).'" selected="selected">'.$offset[1].'</option>';
+			}else{
+			echo '<option value="'.($offset[1]).'">'.$offset[1].'</option>';
+
+			}
+		}
+		echo "</select>";
+
+
+		//echo '<input type="text" name="time_zone" value="'.$_config['time_zone'].'" size="5" maxlength="5"/> ';
+
+		// If PHP 5+ generate a list of timezones
+/*
+		if(phpversion() >= 5){
+			$timezone_names = timezone_identifiers_list();
+		}else{
+		// if less than PHP version 5, read a text file to generate the menu
+			$timezone_names = file("timezones.txt");
+		}
+
+		echo '<select name="time_zone">';
+		foreach($timezone_names as $timezone_name){
+			if($timezone_name == $_config{'time_zone'}){
+				$selected = ' selected="selected"';
+			}
+			echo '<option'.$selected.'>'.$timezone_name.'</option>';
+			$selected = '';
+		}
+		echo '</select>';
+*/
+echo AT_date(_AT('server_date_format'), '', AT_DATE_MYSQL_DATETIME);
+?>
+	</div>
+
+	<div class="row">
+		<label for="maxfile"><?php echo _AT('maximum_file_size'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['max_file_size']; ?>)<br />
+		<input type="text" size="10" name="max_file_size" id="maxfile" value="<?php if (!empty($_POST['max_file_size'])) { echo $stripslashes(htmlspecialchars($_POST['max_file_size'])); } else { echo $_config['max_file_size']; } ?>"  /> <?php echo _AT('bytes'); ?>
+	</div>
+
+	<div class="row">
+		<label for="maxcourse"><?php echo _AT('maximum_course_size'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['max_course_size']; ?>)<br />
+		<input type="text" size="10" name="max_course_size" id="maxcourse" value="<?php if (!empty($_POST['max_course_size'])) { echo $stripslashes(htmlspecialchars($_POST['max_course_size'])); } else { echo $_config['max_course_size']; } ?>"  /> <?php echo _AT('bytes'); ?>
+	</div>
+
+	<div class="row">
+		<label for="float"><?php echo _AT('maximum_course_float'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['max_course_float']; ?>)<br />
+		<input type="text" size="10" name="max_course_float" id="float" value="<?php if (!empty($_POST['max_course_float'])) { echo $stripslashes(htmlspecialchars($_POST['max_course_float'])); } else { echo $_config['max_course_float']; } ?>"  /> <?php echo _AT('bytes'); ?>
+	</div>
+
+	<div class="row">
+		<label for="maximum_login_attempt"><?php echo _AT('maximum_login_attempt'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['max_login']; ?>)<br />
+		<input type="text" size="10" name="max_login" id="maximum_login_attempt" value="<?php if (!empty($_POST['max_login'])) { echo $stripslashes(htmlspecialchars($_POST['max_login'])); } else { echo $_config['max_login']; } ?>"  /> <?php echo _AT('times'); ?>
+	</div>
+	
+	<div class="row">
+	<fieldset>
+		<legend><?php echo _AT('display_name_format'); ?> </legend>
+		(<?php echo _AT('default'); ?>: <?php echo _AT($this->display_name_formats[$_config_defaults['display_name_format']], _AT('login_name'), _AT('first_name'), _AT('second_name'), _AT('last_name')); ?>)<br />
+		<?php foreach ($this->display_name_formats as $key => $value): ?>
+			<input type="radio" name="display_name_format" value="<?php echo $key; ?>" id="dnf<?php echo $key; ?>" <?php if ($_config['display_name_format'] == $key) { echo 'checked="checked"'; }?> /><label for="dnf<?php echo $key; ?>"><?php echo _AT($value, _AT('login_name'), _AT('first_name'), _AT('second_name'), _AT('last_name')); ?></label><br />
+		<?php endforeach; ?>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+		<legend><?php echo _AT('master_list_authentication'); ?></legend>
+		 (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['master_list'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="master_list" value="1" id="ml_y" <?php if ($_config['master_list']) { echo 'checked="checked"'; }?>  /><label for="ml_y"><?php echo _AT('enable'); ?></label> 
+
+		<input type="radio" name="master_list" value="0" id="ml_n" <?php if(!$_config['master_list']) { echo 'checked="checked"'; }?>  /><label for="ml_n"><?php echo  _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+	
+	<div class="row">
+	<fieldset>
+		<legend><?php echo _AT('allow_registration'); ?></legend> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['allow_registration'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="allow_registration" value="1" id="reg_y" <?php if($_config['allow_registration']) { echo 'checked="checked"'; }?>  /><label for="reg_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="allow_registration" value="0" id="reg_n" <?php if(!$_config['allow_registration']) { echo 'checked="checked"'; }?>  /><label for="reg_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+	
+	<div class="row">
+	<fieldset><legend>	<?php echo _AT('allow_browse'); ?> </legend>
+	(<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['allow_browse'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="allow_browse" value="1" id="browse_y" <?php if($_config['allow_browse']) { echo 'checked="checked"'; }?>  /><label for="browse_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="allow_browse" value="0" id="browse_n" <?php if(!$_config['allow_browse']) { echo 'checked="checked"'; }?>  /><label for="browse_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+	<legend><?php echo _AT('allow_instructor_registration'); ?> </legend>
+	(<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['allow_instructor_registration'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="allow_instructor_registration" value="1" id="enrollreg_y" <?php if($_config['allow_instructor_registration']) { echo 'checked="checked"'; }?>  /><label for="enrollreg_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="allow_instructor_registration" value="0" id="enrollreg_n" <?php if(!$_config['allow_instructor_registration']) { echo 'checked="checked"'; }?>  /><label for="enrollreg_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+	
+	<div class="row">		
+	<fieldset><legend><?php echo _AT('use_captcha'); ?> </legend>(<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['use_captcha'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<?php if (extension_loaded('gd')): ?>
+		<input type="radio" name="use_captcha" value="1" id="use_captcha_y" <?php if($_config['use_captcha']) { echo 'checked="checked"'; }?>  /><label for="use_captcha_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="use_captcha" value="0" id="use_captcha_n" <?php if(!$_config['use_captcha']) { echo 'checked="checked"'; }?>  /><label for="use_captcha_n"><?php echo _AT('disable'); ?></label>
+		<?php else: ?>
+		<input type="radio" name="use_captcha" value="1" id="use_captcha_y" disabled="disabled" /><label for="use_captcha_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="use_captcha" value="0" id="use_captcha_n" checked="checked" /><label for="use_captcha_n"><?php echo _AT('disable'); ?></label>
+		<?php endif; ?>
+		</fieldset>
+	</div>
+	
+	<div class="row">
+	<fieldset><legend><?php echo _AT('allow_unenroll'); ?></legend>
+		 (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['allow_unenroll'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="allow_unenroll" value="1" id="ene_y" <?php if($_config['allow_unenroll']) { echo 'checked="checked"'; }?>  /><label for="ene_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="allow_unenroll" value="0" id="ene_n" <?php if(!$_config['allow_unenroll']) { echo 'checked="checked"'; }?>  /><label for="ene_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+	<legend><?php echo _AT('require_email_confirmation'); ?></legend>
+	 (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['email_confirmation'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="email_confirmation" value="1" id="ec_y" <?php if ($_config['email_confirmation']) { echo 'checked="checked"'; }?>  /><label for="ec_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="email_confirmation" value="0" id="ec_n" <?php if(!$_config['email_confirmation']) { echo 'checked="checked"'; }?>  /><label for="ec_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+		
+	<div class="row">
+	<fieldset><legend><?php echo _AT('allow_instructor_requests'); ?></legend>
+	 (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['allow_instructor_requests'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="allow_instructor_requests" value="1" id="air_y" <?php if($_config['allow_instructor_requests']) { echo 'checked="checked"'; }?>  /><label for="air_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="allow_instructor_requests" value="0" id="air_n" <?php if(!$_config['allow_instructor_requests']) { echo 'checked="checked"'; }?>  /><label for="air_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+	<legend><?php echo _AT('instructor_request_email_notification'); ?></legend>
+	 (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['email_notification'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="email_notification" value="1" id="en_y" <?php if ($_config['email_notification']) { echo 'checked="checked"'; }?>  /><label for="en_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="email_notification" value="0" id="en_n" <?php if(!$_config['email_notification']) { echo 'checked="checked"'; }?>  /><label for="en_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+	<legend><?php echo _AT('auto_approve_instructors'); ?></legend>
+	 (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['auto_approve_instructors'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="auto_approve_instructors" value="1" id="aai_y" <?php if($_config['auto_approve_instructors']) { echo 'checked="checked"'; }?>  /><label for="aai_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="auto_approve_instructors" value="0" id="aai_n" <?php if(!$_config['auto_approve_instructors']) { echo 'checked="checked"'; }?>  /><label for="aai_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+	<legend><?php echo _AT('theme_specific_categories'); ?></legend>
+	 (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['theme_categories'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="theme_categories" value="1" id="tc_y" <?php if($_config['theme_categories']) { echo 'checked="checked"'; }?>  /><label for="tc_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="theme_categories" value="0" id="tc_n" <?php if(!$_config['theme_categories']) { echo 'checked="checked"'; }?>  /><label for="tc_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+	<legend><?php echo _AT('user_contributed_notes'); ?> </legend>
+	(<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['user_notes'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="user_notes" value="1" id="un_y" <?php if($_config['user_notes']) { echo 'checked="checked"'; }?>  /><label for="un_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="user_notes" value="0" id="un_n" <?php if(!$_config['user_notes']) { echo 'checked="checked"'; }?>  /><label for="un_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+		<label for="ext"><?php echo _AT('illegal_file_extensions'); ?></label><br />
+		<textarea name="illegal_extentions" cols="24" id="ext" rows="2" class="formfield" ><?php if ($_config['illegal_extentions']) { echo str_replace('|',' ',$_config['illegal_extentions']); }?></textarea>
+	</div>
+
+	<div class="row">
+		<label for="cache"><?php echo _AT('cache_directory'); ?></label><br />
+		<input type="text" name="cache_dir" id="cache" size="40" value="<?php if (!empty($_POST['cache_dir'])) { echo $stripslashes(htmlspecialchars($_POST['cache_dir'])); } else { echo $_config['cache_dir']; } ?>"  />
+	</div>
+
+	<div class="row">
+		<label for="latex_server"><?php echo _AT('latex_server'); ?></label><br />
+		<input type="text" name="latex_server" id="latex_server" size="40" value="<?php if (!empty($_POST['latex_server'])) { echo $stripslashes(htmlspecialchars($_POST['latex_server'])); } else { echo $_config['latex_server']; } ?>"  />
+	</div>
+
+	<div class="row">
+		<label for="course_backups"><?php echo _AT('course_backups'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['course_backups']; ?>)<br />
+		<input type="text" size="2" name="course_backups" id="course_backups" value="<?php if (!empty($_POST['course_backups'])) { echo $stripslashes(htmlspecialchars($_POST['course_backups'])); } else { echo $_config['course_backups']; } ?>"  />
+	</div>
+
+	<div class="row">
+		<label for="sent_msgs_ttl"><?php echo _AT('sent_msgs_ttl_text'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['sent_msgs_ttl']; ?>)<br />
+		<input type="text" size="3" name="sent_msgs_ttl" id="sent_msgs_ttl" value="<?php if (!empty($_POST['sent_msgs_ttl'])) { echo intval($_POST['sent_msgs_ttl']); } else { echo $_config['sent_msgs_ttl']; } ?>"  />
+	</div>
+
+	<div class="row">
+		<fieldset>
+		<legend><?php echo _AT('auto_check_new_version'); ?></legend>
+		 (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['check_version'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="check_version" value="1" id="cv_y" <?php if($_config['check_version']) { echo 'checked="checked"'; }?>  /><label for="cv_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="check_version" value="0" id="cv_n" <?php if(!$_config['check_version']) { echo 'checked="checked"'; }?>  /><label for="cv_n"><?php echo _AT('disable'); ?></label>
+		</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+	<legend><?php echo _AT('file_storage_version_control'); ?> </legend>
+	(<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['fs_versioning'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="fs_versioning" value="1" id="cf_y" <?php if($_config['fs_versioning']) { echo 'checked="checked"'; }?>  /><label for="cf_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="fs_versioning" value="0" id="cf_n" <?php if(!$_config['fs_versioning']) { echo 'checked="checked"'; }?>  /><label for="cf_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+		<input type="hidden" name="old_enable_mail_queue" value="<?php echo $_config['enable_mail_queue']; ?>" />
+		<legend><?php echo _AT('enable_mail_queue'); ?></legend>
+		 (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['enable_mail_queue'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<?php echo _AT('mail_queue_cron'); ?><br />
+		<?php if (!$_config['last_cron'] || (time() - (int) $_config['last_cron'] > 2 * 60 * 60)): ?>
+			
+			<input type="radio" name="enable_mail_queue" id="mq_y" value="1" disabled="disabled" /><?php echo _AT('enable'); ?> 
+			<label for="mq_y"><?php echo _AT('enable'); ?></label> 
+			<input type="radio" name="enable_mail_queue" value="0" id="mq_n" checked="checked" />
+			<label for="mq_n"><?php echo _AT('disable'); ?></label>
+		<?php else: ?>
+	
+			<input type="radio" name="enable_mail_queue" value="1" id="mq_y" <?php if($_config['enable_mail_queue']) { echo 'checked="checked"'; }?>  />
+			<label for="mq_y"><?php echo _AT('enable'); ?></label> 
+			<input type="radio" name="enable_mail_queue" value="0" id="mq_n" <?php if(!$_config['enable_mail_queue']) { echo 'checked="checked"'; }?>  />
+			<label for="mq_n"><?php echo _AT('disable'); ?></label>
+		<?php endif; ?>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+		<legend><?php echo _AT('auto_install_languages'); ?> </legend>
+		(<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['auto_install_languages'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<?php echo _AT('auto_install_languages_cron'); ?><br />
+		<?php if (!$_config['last_cron'] || (time() - (int) $_config['last_cron'] > 2 * 60 * 60)): ?>
+			<input type="radio" name="auto_install_languages" id="ai_y" value="1" disabled="disabled" />
+			<label for="ai_y"><?php echo _AT('enable'); ?> </label>
+			<input type="radio" name="auto_install_languages" value="0" id="ai_n" checked="checked" />
+			<label for="ai_n"><?php echo _AT('disable'); ?></label>
+		<?php else: ?>
+			<input type="radio" name="auto_install_languages" value="1" id="ai_y" <?php if($_config['auto_install_languages']) { echo 'checked="checked"'; }?>  /><label for="ai_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="auto_install_languages" value="0" id="ai_n" <?php if(!$_config['auto_install_languages']) { echo 'checked="checked"'; }?>  /><label for="ai_n"><?php echo _AT('disable'); ?></label>
+		<?php endif; ?>
+		</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+	<legend><?php echo _AT('pretty_url'); ?></legend>
+	 (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['pretty_url'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="pretty_url" value="1" id="pu_y" <?php if($_config['pretty_url']) { echo 'checked="checked"'; }?> onclick="apache_mod_rewrite_toggler(true);"/><label for="pu_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="pretty_url" value="0" id="pu_n" <?php if(!$_config['pretty_url']) { echo 'checked="checked"'; }?> onclick="apache_mod_rewrite_toggler(false);"/><label for="pu_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+	<legend><?php echo _AT('course_dir_name'); ?></legend>
+	 (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['course_dir_name'] ? _AT('enable') : _AT('disable')); ?>)<br />
+		<input type="radio" name="course_dir_name" value="1" id="cdn_y" <?php if($_config['course_dir_name']) { echo 'checked="checked"'; }?> /><label for="cdn_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="course_dir_name" value="0" id="cdn_n" <?php if(!$_config['course_dir_name']) { echo 'checked="checked"'; }?>  /><label for="cdn_n"><?php echo _AT('disable'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+	<fieldset>
+	<legend><?php echo _AT('apache_mod_rewrite'); ?></legend>
+		<?php if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules())): ?>
+			<?php echo _AT('mod_rewrite'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['apache_mod_rewrite'] ? _AT('enable') : _AT('disable')); ?>)<br />
+			<input type="radio" name="apache_mod_rewrite" value="1" id="mr_y" <?php if($_config['apache_mod_rewrite']) { echo 'checked="checked"'; }?> /><label for="mr_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="apache_mod_rewrite" value="0" id="mr_n" <?php if(!$_config['apache_mod_rewrite']) { echo 'checked="checked"'; }?>  /><label for="mr_n"><?php echo _AT('disable'); ?></label>
+		<?php else: ?>
+			<?php echo _AT('mod_rewrite'); ?> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['apache_mod_rewrite'] ? _AT('enable') : _AT('disable')); ?>)<br />
+			<input type="radio" name="apache_mod_rewrite" value="1" id="mr_y" disabled="disabled" /><label for="mr_y"><?php echo _AT('enable'); ?></label> <input type="radio" name="apache_mod_rewrite" value="0" id="mr_n" checked="checked" /><label for="mr_n"><?php echo _AT('disable'); ?></label>
+		<?php endif; ?>
+	</fieldset>
+	</div>
+
+	<div class="row buttons">
+			<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s"  />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>"  />
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/cron_config.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/cron_config.tmpl.php
new file mode 100644
index 000000000..827c3c15c
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/cron_config.tmpl.php
@@ -0,0 +1,12 @@
+<?php global $_config; ?>
+<div class="input-form">
+	<div class="row">
+		<p><?php echo _AT('cron_url_usage'); ?></p>
+	<p>
+		<?php echo _AT('cron_url'); ?><br />
+		<code><wbr><?php echo AT_BASE_HREF; ?>admin/cron.php?k=<?php echo $_config['cron_key']; ?></wbr></code>
+	</p>
+	</div>
+	
+	
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/edit_feed.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/edit_feed.tmpl.php
new file mode 100644
index 000000000..f17f299bd
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/edit_feed.tmpl.php
@@ -0,0 +1,20 @@
+<?php global $stripslashes;?>
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="get" name="form">
+	<input type="hidden" name="fid" value="<?php echo $this->feed_id; ?>" />
+	<div class="input-form" style="width:95%">
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="title"><?php echo _AT('title'); ?></label><br />
+			<input id="title" name="title" type="text" size="40" maxlength="255" value="<?php echo $stripslashes(htmlspecialchars($_GET['title'])); ?>" /><br />
+		</div>
+
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="url"><?php echo _AT('url'); ?></label><br />
+			<input id="url" name="url" type="text" size="40" maxlength="255" value="<?php echo $stripslashes(htmlspecialchars($_GET['url'])); ?>" /><br />
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="submit" value=" <?php echo _AT('save'); ?> " accesskey="s" />
+			<input type="submit" name="cancel" value=" <?php echo _AT('cancel'); ?> " />
+		</div>
+	</div>
+</form>
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/index.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/index.tmpl.php
new file mode 100644
index 000000000..b5f16385c
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/index.tmpl.php
@@ -0,0 +1,45 @@
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="get" name="form">
+<div class="table-surround">
+<table class="data" summary="Title and URL of News Feeds">
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><?php echo _AT('title'); ?></th>
+	<th scope="col"><?php echo _AT('url'); ?></th>
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="3">
+		<input type="submit" name="preview" value="<?php echo _AT('preview'); ?>" />
+		<input type="submit" name="edit"    value="<?php echo _AT('edit'); ?>" />
+		<input type="submit" name="delete"  value="<?php echo _AT('delete'); ?>" />
+	</td>
+</tr>
+</tfoot>
+<tbody>
+<?php 
+
+
+if (!($row = mysql_fetch_assoc($this->result))) { 
+?>
+
+	<tr>
+		<td colspan="3"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php } else { ?>
+	<?php do { 
+		$title_file = AT_CONTENT_DIR.'feeds/'.$row['feed_id'].'_rss_title.cache'; ?>
+		<tr onkeydown="document.form['f_<?php echo $row['feed_id']; ?>'].checked = true; rowselect(this);" onmousedown="document.form['f_<?php echo $row['feed_id']; ?>'].checked = true; rowselect(this);" id="r_<?php echo $row['feed_id']; ?>">
+			<td valign="top"><input type="radio" id="f_<?php echo $row['feed_id']; ?>" name="fid" value="<?php echo $row['feed_id']; ?>" /></td>
+			<td><label for="f_<?php echo $row['feed_id']; ?>"><?php if (file_exists($title_file)) { readfile($title_file); } ?></label></td>
+			<td><?php echo $row['url']; ?></td>
+		</tr>
+	<?php } while ($row = mysql_fetch_assoc($this->result)); ?>
+
+<?php } ?>
+</tbody>
+</table>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/index_admin.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/index_admin.tmpl.php
new file mode 100644
index 000000000..1ce8248a5
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/index_admin.tmpl.php
@@ -0,0 +1,15 @@
+<?php global $_config; ?>
+
+<div style="width:95%;margin-left:auto;margin-right:auto;">
+	<div class="headingbox"><h3><?php echo _AT('admin_social'); ?></h3></div>
+	<div class="contentbox">
+	<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
+		<p><?php echo _AT('shindig_blurb'); ?></p>
+
+				<label for="shindig"><?php echo _AT('shindig_url'); ?></label>
+				<input type="text" id="shindig" name="shindig_url" size="40" value="<?php echo $_config['shindig_url']; ?>" />
+
+		<input type="submit" name="save" value="<?php echo _AT('save'); ?>" />
+	</form>
+	</div>
+</div>
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/language.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/language.tmpl.php
new file mode 100644
index 000000000..d4bb83361
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/language.tmpl.php
@@ -0,0 +1,48 @@
+<?php global $languageManager;?>
+<form name="form" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="table-surround">
+<table summary="ATutor langauge names in English and translated" class="data">
+<colgroup>
+	<col />
+	<col class="sort" />
+	<col span="3" />
+</colgroup>
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><?php echo _AT('name_in_language'); ?></th>
+	<th scope="col"><?php echo _AT('name_in_english'); ?></th>
+	<!-- REMOVED FOR MOBILE <th scope="col"><?php //echo _AT('lang_code'); ?></th> -->
+	<!--  <th scope="col"><?php echo _AT('charset'); ?></th> -->
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="5">
+		<?php if (defined('AT_DEVEL_TRANSLATE') && AT_DEVEL_TRANSLATE): ?>
+			<input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" />  
+			<input type="submit" name="export" value="<?php echo _AT('export'); ?>"  /> 
+			<input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" /> 
+			<?php echo _AT('or'); ?> <a href="mods/_core/languages/language_add.php"><?php echo _AT('add_a_new_language'); ?></a>
+		<?php else: ?>
+			<input type="submit" name="export" value="<?php echo _AT('export'); ?>" /> 
+			<input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" />
+		<?php endif; ?>
+	</td>
+</tr>
+</tfoot>
+<tbody>
+	<?php foreach ($languageManager->getAvailableLanguages() as $codes): ?>
+		<?php $language = current($codes); ?>
+		<tr onmousedown="document.form['m<?php echo $language->getCode(); ?>'].checked = true; rowselect(this);" id="r_<?php echo $language->getCode(); ?>">
+			<td><input type="radio" name="id" value="<?php echo $language->getCode(); ?>" id="m<?php echo $language->getCode(); ?>" /></td>
+			<td><label for="m<?php echo $language->getCode(); ?>"><?php echo $language->getNativeName(); ?></label></td>
+			<td><?php echo $language->getEnglishName(); ?></td>
+		<!-- REMOVED FOR MOBILE 	<td><?php //echo strtolower($language->getCode()); ?></td>-->
+		<!-- 	<td><?php //echo strtolower($language->getCharacterSet()); ?></td> -->
+		</tr>
+	<?php endforeach; ?>
+</tbody>
+</table>
+</div>
+</form>
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/language_add.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/language_add.tmpl.php
new file mode 100644
index 000000000..3d058e13c
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/language_add.tmpl.php
@@ -0,0 +1,53 @@
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<input type="hidden" name="import" value="1" />
+<div class="input-form" style="width:95%">
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="code"><?php echo _AT('lang_code'); ?></label><br />
+		<input id="code" name="code" type="text" size="2" maxlength="2" class="formfield" value="<?php echo $_POST['code']; ?>" />
+	</div>
+
+	<div class="row">
+		<label for="locale"><?php echo _AT('locale'); ?></label><br />
+		<input id="locale" name="locale" type="text" size="2" maxlength="2" class="formfield" value="<?php echo $_POST['locale']; ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="charset"><?php echo _AT('charset'); ?></label><br />
+		<input id="charset" name="charset" type="text" size="31" maxlength="20" class="formfield" value="<?php echo $_POST['charset']; ?>" />
+	</div>
+
+	<div class="row">
+		<label for="ltr"><?php echo _AT('direction'); ?></label><br />
+		<?php 
+			if ($_POST['direction'] == 'rtl') { 
+				$rtl = 'checked="checked"';  
+				$ltr='';  
+			} else { 
+				$rtl = '';  
+				$ltr='checked="checked"'; 
+			}
+		?>
+		<input id="ltr" name="direction" type="radio" value="ltr" <?php echo $ltr; ?> /><label for="ltr"><?php echo _AT('ltr'); ?></label>, <input id="rtl" name="direction" type="radio" value="rtl" <?php echo $rtl; ?> /><label for="rtl"><?php echo _AT('rtl'); ?></label>
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="reg_exp"><?php echo _AT('reg_exp'); ?></label><br />
+		<input id="reg_exp" name="reg_exp" type="text" size="31" class="formfield" value="<?php echo $_POST['reg_exp']; ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="nname"><?php echo _AT('name_in_language'); ?></label><br />
+		<input id="nname" name="native_name" type="text" size="31" maxlength="20" class="formfield" value="<?php echo $_POST['native_name']; ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="ename"><?php echo _AT('name_in_english'); ?></label><br />
+		<input id="ename" name="english_name" type="text" size="31" maxlength="20" class="formfield" value="<?php echo $_POST['english_name'];?>" />
+	</div>
+
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('submit'); ?>" /> <input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />		
+	</div>
+</div>
+</form>
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/language_edit.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/language_edit.tmpl.php
new file mode 100644
index 000000000..db8725d14
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/language_edit.tmpl.php
@@ -0,0 +1,56 @@
+
+<form method="post" action="<?php echo $_SERVER['PHP_SELF'] . '?lang_code=' . $_GET['lang_code']; ?>">
+
+<input type="hidden" name="old_code" value="<?php echo $this->lang->getCode(); ?>" />
+
+<div class="input-form" style="width:95%">
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="code"><?php echo _AT('lang_code'); ?></label><br />
+		<input id="code" name="code" type="text" size="2" maxlength="2" class="formfield" value="<?php echo $_POST['code']; ?>" />
+	</div>
+
+	<div class="row">
+		<label for="locale"><?php echo _AT('locale'); ?></label><br />
+		<input id="locale" name="locale" type="text" size="2" maxlength="2" class="formfield" value="<?php echo $_POST['locale']; ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="charset"><?php echo _AT('charset'); ?></label><br />
+		<input id="charset" name="charset" type="text" size="31" maxlength="20" class="formfield" value="<?php echo $_POST['charset']; ?>" />
+	</div>
+
+	<div class="row">
+		<label for="ltr"><?php echo _AT('direction'); ?></label><br />
+		<?php 
+			if ($_POST['direction'] == 'rtl') { 
+				$rtl = 'checked="checked"';  
+				$ltr='';  
+			} else { 
+				$rtl = '';  
+				$ltr='checked="checked"'; 
+			}
+		?>
+		<input id="ltr" name="direction" type="radio" value="ltr" <?php echo $ltr; ?> /><label for="ltr"><?php echo _AT('ltr'); ?></label>, <input id="rtl" name="direction" type="radio" value="rtl" <?php echo $rtl; ?> /><label for="rtl"><?php echo _AT('rtl'); ?></label>
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="reg_exp"><?php echo _AT('reg_exp'); ?></label><br />
+		<input id="reg_exp" name="reg_exp" type="text" size="31" class="formfield" value="<?php echo $_POST['reg_exp']; ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="nname"><?php echo _AT('name_in_language'); ?></label><br />
+		<input id="nname" name="native_name" type="text" size="31" maxlength="20" class="formfield" value="<?php echo $_POST['native_name']; ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="ename"><?php echo _AT('name_in_english'); ?></label><br />
+		<input id="ename" name="english_name" type="text" size="31" maxlength="20" class="formfield" value="<?php echo $_POST['english_name'];?>" />
+	</div>
+
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('submit'); ?>" /> <input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />		
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/language_editor.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/language_editor.tmpl.php
new file mode 100644
index 000000000..bf01427fa
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/language_editor.tmpl.php
@@ -0,0 +1,60 @@
+
+<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+	<div class="input-form">
+		<div class="row">
+			<h3><?php echo _AT('results_found', $this->num_results); ?></h3>
+		</div>
+
+		<div class="row">
+			<?php echo _AT('type'); ?><br />
+			<input type="radio" name="type" value="template" id="tyte" <?php if ($_GET['type'] == 'template') { echo 'checked="checked"'; } ?> /><label for="tyte"><?php echo _AT('template'); ?></label>
+			<input type="radio" name="type" value="feedback" id="tyfe" <?php if ($_GET['type'] == 'feedback') { echo 'checked="checked"'; } ?> /><label for="tyfe"><?php echo _AT('feedback'); ?></label>
+		</div>
+
+		<div class="row">
+			<input type="checkbox" name="custom" value="1" id="cus" <?php if (isset($_GET['custom'])) { echo 'checked="checked"'; } ?> /><label for="cus"><?php echo _AT('only_show_edited_terms'); ?></label>
+		</div>
+
+		<div class="row">
+			<label for="search"><?php echo _AT('search'); ?></label><br />
+			<input type="text" name="search" id="search" size="40" value="<?php echo htmlspecialchars($_GET['search']); ?>" />
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="filter" value="<?php echo _AT('filter'); ?>" />
+			<input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>" />
+		</div>
+	</div>
+</form>
+<form name="form" method="post">
+<div class="input-form">
+	<table cellspacing="0" cellpadding="0">
+	<tr>
+	<td valign="top">
+		<?php if ($this->num_results): ?>
+			<select size="<?php echo min(max($this->num_results,2), 25); ?>" name="terms" id="terms" onchange="javascript:showtext(this);">
+				<?php
+					while ($row = mysql_fetch_assoc($result)): 
+						if ($strlen($row['text']) > 30) {
+							$row['text'] = $substr($row['text'], 0, 28) . '...';
+						}
+					?>
+						<option value="<?php echo $row['term']; ?>"><?php echo htmlspecialchars($row['text']); ?></option>
+					<?php endwhile; ?>
+			</select>
+		<?php else: ?>
+			<p><?php echo _AT('none_found'); ?></p>
+		<?php endif; ?>
+	</td>
+
+	<td valign="top">
+		<div class="row">
+			<iframe src="mods/_core/languages/language_term.php" frameborder="0" height="430" width="450" marginheight="0" marginwidth="0" name="tran" id="tran"></iframe>
+		</div>
+	</td>
+	</tr>
+	</table>
+</div>
+</form>
+
+			
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/language_import.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/language_import.tmpl.php
new file mode 100644
index 000000000..16572e9d9
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/language_import.tmpl.php
@@ -0,0 +1,53 @@
+<?php global $languageManager;?>
+<form name="form1" method="post" action="mods/_core/languages/language_import.php" enctype="multipart/form-data" onsubmit="openWindow('<?php echo AT_BASE_HREF; ?>tools/prog.php');">
+<div class="input-form">
+	<div class="row">
+		<p><?php echo _AT('import_lang_howto'); ?></p>
+	</div>
+	
+	<div class="row">
+		<label for="file"><?php echo _AT('import_a_new_lang'); ?></label><br />
+		<input type="file" name="file" id="file" />
+	</div>
+	
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('import'); ?>" />
+	</div>
+</div>
+</form>
+<form name="form1" method="post" action="mods/_core/languages/language_import.php">
+<div class="input-form">
+	<div class="row">
+		<?php echo _AT('import_remote_language'); ?>
+	</div>
+
+	<div class="row">
+		<?php
+			
+			$remoteLanguageManager = new RemoteLanguageManager();
+			if ($remoteLanguageManager->getNumLanguages()) {
+				$found = false;
+				foreach ($remoteLanguageManager->getAvailableLanguages() as $codes){
+					$language = current($codes);
+					if (!$languageManager->exists($language->getCode()) && ($language->getStatus() == AT_LANG_STATUS_PUBLISHED)) {
+						if (!$found) {
+							echo '<select name="language" title="language">';
+							$found = true;
+						}
+						echo '<option value="'.$language->getCode().'">'.$language->getEnglishName().' - '.$language->getNativeName().'</option>';
+					}
+				}
+				if ($found) {
+					echo '</select></div>';
+					echo '<div class="row buttons"><input type="submit" name="submit_import" value="' . _AT('import') . '" class="button" /></div>';
+				} else {
+					echo _AT('none_found');
+					echo '</div>';
+				}
+			} else {
+				echo _AT('cannot_find_remote_languages');
+				echo '</div>';
+			}
+		?>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/language_translate.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/language_translate.tmpl.php
new file mode 100644
index 000000000..1cb986981
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/language_translate.tmpl.php
@@ -0,0 +1,37 @@
+<?php debug($_REQUEST); ?>
+<form method="get">
+<div class="input-form">
+	<div class="row">
+		<h3><?php echo _AT('translate'); ?></h3>
+	</div>
+
+	<div class="row">
+		<p><?php echo _AT('translate_lang_howto'); ?></p>
+	</div>
+
+	<div class="row buttons">
+		<input type="button" onclick="javascript:window.open('<?php echo AT_BASE_HREF; ?>mods/_core/languages/translate_atutor.php', 'newWin1', 'toolbar=0, location=0, directories=0, status=0, menubar=0, scrollbars=1, resizable=1, copyhistory=0, width=640, height=480')" value="<?php echo _AT('translate'); ?>" <?php echo $this->button_state; ?> />
+	</div>
+</div>
+</form>
+
+<?php if (defined('AT_DEVEL_TRANSLATE') && AT_DEVEL_TRANSLATE): ?>
+	<form name="form1" method="post" action="mods/_core/languages/language_translate.php">
+		<div class="input-form">
+			<div class="row">
+				Import partial language from the <strong>live ATutor language database</strong> to your local installation for translating.
+			</div>
+			<div class="row">
+				<?php
+					require_once(AT_INCLUDE_PATH.'../mods/_core/languages/classes/RemoteLanguageManager.class.php');
+					$remoteLanguageManager = new RemoteLanguageManager();
+					$remoteLanguageManager->printDropdown($_SESSION['lang'], 'import_lang', 'import_lang');
+				?>
+			</div>
+
+			<div class="row buttons">
+				<input type="submit" name="svn_submit" value="<?php echo _AT('import'); ?>" />
+			</div>
+		</div>
+	</form>
+<?php endif; ?>
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/module_prefs.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/module_prefs.tmpl.php
new file mode 100644
index 000000000..57858650d
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/module_prefs.tmpl.php
@@ -0,0 +1,36 @@
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post">
+	<div class="input-form" style="max-width: 95%">
+		<div class="row">
+			<fieldset>
+			<legend><?php echo _AT("google_search_type_txt"); ?></legend>
+			<?php
+				if ($this->googleType==GOOGLE_TYPE_SOAP){
+					$type1=' checked="checked"'; 
+				} elseif ($this->googleType==GOOGLE_TYPE_AJAX){
+					$type2=' checked="checked"'; 
+				}
+			?>
+		
+			<input type="radio" name="gtype" id="googleTypeSoap" value="<?php echo GOOGLE_TYPE_SOAP?>" <?php echo $type1 ?>/>
+			<label for="googleTypeSoap"><?php echo _AT("google_search_soap"); ?></label><br/>
+
+			<input type="radio" name="gtype" id="googleTypeAjax" value="<?php echo GOOGLE_TYPE_AJAX?>" <?php echo $type2 ?>/>
+			<label for="googleTypeAjax"><?php echo _AT("google_search_ajax"); ?></label><br/>
+		</fieldset>
+		</div>
+		
+		<div class="row">
+			<?php echo _AT('google_search_attn'); ?><br/><br/>
+			<?php echo _AT('google_key_txt'); ?>
+		</div>
+		<div class="row">
+			<label for="key">Key</label>
+			<input type="text" name="key" id="key" size="40" value="<?php echo $key; ?>" style="min-width: 90%;" />
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" />
+		</div>
+	</div>
+
+</form>
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/module_setup.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/module_setup.tmpl.php
new file mode 100644
index 000000000..82f235338
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/module_setup.tmpl.php
@@ -0,0 +1,20 @@
+<?php global $_config; ?>
+<form action="<?php  $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+    <div class="input-form">
+        <div class="row">
+         	<p><label for="uri"><?php echo _AT('transformable_uri'); ?></label></p>
+            	<input type="text" name="transformable_uri" value="<?php echo $_config['transformable_uri']; ?>" id="uri" size="40" style="min-width: 95%;" />
+    	     
+		    <p><label for="key"><?php echo _AT('web_service_id'); ?></label></p>
+           	    <input type="text" name="transformable_web_service_id" value="<?php echo $_config['transformable_web_service_id']; ?>" id="key" size="40" style="min-width: 95%;" />
+
+		    <p><label for="key"><?php echo _AT('oauth_expire'); ?></label></p>
+           	    <input type="text" name="transformable_oauth_expire" value="<?php echo $_config['transformable_oauth_expire']; ?>" id="key" size="20" />&nbsp;<?php echo _AT('seconds'); ?><br />
+		       <small>&middot; <?php echo _AT('oauth_expire_note'); ?><br /></small>
+        </div>
+
+        <div class="row buttons">
+            <input type="submit" name="submit" value="<?php echo _AT('save'); ?>"  />
+        </div>
+    </div>
+</form> 
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/system_preferences/preview.tmpl.php b/docs/themes/simplified-desktop/admin/system_preferences/preview.tmpl.php
new file mode 100644
index 000000000..e4a7c3e87
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/system_preferences/preview.tmpl.php
@@ -0,0 +1,22 @@
+
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+
+<div class="input-form">
+	<div class="row">
+		<h3><?php if (file_exists($this->title_file)) { readfile($this->title_file); } ?></h3>
+	</div>
+
+	<div class="row">
+		<?php if (file_exists($this->cache_file) && filesize($this->cache_file) > 0) { 
+			readfile($this->cache_file); 
+			echo '<p><br /><small>'._AT('new_window').'</small></p>';
+		} else {
+			echo _AT('no_content_avail');
+		}?>
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="back" value="<?php echo _AT('back'); ?>" />
+	</div>
+</div>
+</form>
diff --git a/docs/themes/simplified-desktop/admin/users/admin_email.tmpl.php b/docs/themes/simplified-desktop/admin/users/admin_email.tmpl.php
new file mode 100644
index 000000000..9978e51b8
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/users/admin_email.tmpl.php
@@ -0,0 +1,30 @@
+
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="form">
+<input type="hidden" name="admin" value="admin" />
+
+<div class="input-form">
+	<div class="row">
+	<fieldset>
+<legend><span class="required" title="<?php echo _AT('required_field'); ?>">*</span><?php echo  _AT('to'); ?></legend>
+		<input type="radio" name="to" value="3" checked="checked" id="all" /><label for="all"><?php echo _AT('all_users'); ?></label>  
+	  <input type="radio" name="to" value="1" id="inst" <?php if ($_POST['to'] == AT_STATUS_INSTRUCTOR) { echo 'checked="checked"'; } ?> /><label for="inst"><?php echo  _AT('instructors'); ?></label>
+	  <input type="radio" name="to" value="2" id="stud" <?php if ($_POST['to'] == AT_STATUS_STUDENT) { echo 'checked="checked"'; } ?> /><label for="stud"><?php echo  _AT('students'); ?></label>
+	</fieldset>
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="subject"><?php echo _AT('subject'); ?></label><br />
+		<input type="text" name="subject" size="45" id="subject" value="<?php echo $_POST['subject']; ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="body"><?php echo _AT('body'); ?></label><br />
+		<textarea cols="45" rows="18" name="body" id="body"><?php echo $_POST['body']; ?></textarea>
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('send'); ?>" accesskey="s" /> 
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/users/create.tmpl.php b/docs/themes/simplified-desktop/admin/users/create.tmpl.php
new file mode 100644
index 000000000..ffcb46952
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/users/create.tmpl.php
@@ -0,0 +1,49 @@
+
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="form">
+<input type="hidden" name="form_password_hidden" value="" />
+<input type="hidden" name="password_error" value="" />
+
+<div class="input-form">
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="login"><?php echo _AT('login_name'); ?></label><br />
+		<input type="text" name="login" id="login" size="25" value="<?php echo htmlspecialchars($_POST['login']); ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="password"><?php echo _AT('password'); ?></label><br />
+		<input type="password" name="password" id="password" size="25" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="password2"><?php echo _AT('confirm_password'); ?></label><br />
+		<input type="password" name="confirm_password" id="password2" size="25" />
+	</div>
+
+	<div class="row">
+		<label for="real_name"><?php echo _AT('real_name'); ?></label><br />
+		<input type="text" name="real_name" id="real_name" size="30" value="<?php echo htmlspecialchars($_POST['real_name']); ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="email"><?php echo _AT('email'); ?></label><br />
+		<input type="text" name="email" id="email" size="25" value="<?php echo htmlspecialchars($_POST['email']); ?>" />
+	</div>
+
+	<div class="row">
+		<?php echo _AT('privileges'); ?><br />
+		<input type="checkbox" name="priv_admin" value="1" id="priv_admin" <?php if ($_POST['priv_admin']) { echo 'checked="checked"'; } ?> /><label for="priv_admin"><?php echo _AT('priv_admin_super'); ?></label><br /><br />
+
+	
+		<?php foreach ($this->keys as $module_name): ?>
+			<?php $module =& $this->module_list[$module_name]; ?>
+			<?php if (!($module->getAdminPrivilege() > 1)) { continue; } ?>
+				<input type="checkbox" name="privs[]" value="<?php echo $module->getAdminPrivilege(); ?>" id="priv_<?php echo $module->getAdminPrivilege(); ?>" <?php if (query_bit($_POST['privs'], $module->getAdminPrivilege())) { echo 'checked="checked"'; }  ?> /><label for="priv_<?php echo $module->getAdminPrivilege(); ?>"><?php echo $module->getName() ?></label><br />
+		<?php endforeach; ?>
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" onclick="return encrypt_password();" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/users/index.tmpl.php b/docs/themes/simplified-desktop/admin/users/index.tmpl.php
new file mode 100644
index 000000000..c42821524
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/users/index.tmpl.php
@@ -0,0 +1,79 @@
+
+<form name="form" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="table-surround">
+<table summary="List of administrators' login name, real name, and account status" class="data" >
+<colgroup>
+	<?php if ($col == 'login'): ?>
+		<col />
+		<col class="sort" />
+		<col span="4" />
+	<?php elseif($col == 'real_name'): ?>
+		<col span="2" />
+		<col class="sort" />
+		<col span="3" />
+	<?php elseif($col == 'email'): ?>
+		<col span="3" />
+		<col class="sort" />
+		<col span="2" />
+	<?php elseif($col == 'last_login'): ?>
+		<col span="4" />
+		<col class="sort" />
+		<col />
+	<?php endif; ?>
+</colgroup>
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><a href="mods/_core/users/admins/index.php?<?php echo $orders[$order]; ?>=login<?php echo $page_string; ?>"><?php echo _AT('login_name');        ?></a></th>
+	<th scope="col"><a href="mods/_core/users/admins/index.php?<?php echo $orders[$order]; ?>=real_name<?php echo $page_string; ?>"><?php echo _AT('real_name');   ?></a></th>
+	<!-- REMOVED FOR MOBILE THEME -->
+	<!-- <th scope="col"><a href="mods/_core/users/admins/index.php?<?php echo $orders[$order]; ?>=email<?php echo $page_string; ?>"><?php echo _AT('email');           ?></a></th> -->
+	<!--<th scope="col"><a href="mods/_core/users/admins/index.php?<?php echo $orders[$order]; ?>=last_login<?php echo $page_string; ?>"><?php echo _AT('last_login'); ?></a></th> -->
+	<th scope="col"><?php echo _AT('account_status'); ?></th>
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="6">
+		<input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" />
+		<input type="submit" name="view_log" value="<?php echo _AT('view_log'); ?>" />
+		<input type="submit" name="password" value="<?php echo _AT('password'); ?>" />
+		<input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" />
+	</td>
+</tr>
+</tfoot>
+<tbody>
+<?php if (mysql_num_rows($this->result) == 0) { ?>
+	<tr>
+		<td colspan="6"><?php echo _AT('no_admins_found'); ?></td>
+	</tr>
+<?php } else {
+		while ($row = mysql_fetch_assoc($this->result)): ?>
+			<tr onkeydown="document.form['m<?php echo $row['login']; ?>'].checked = true;rowselect(this);" onmousedown="document.form['m<?php echo $row['login']; ?>'].checked = true;rowselect(this);" id="r_<?php echo $row['login']; ?>">
+				<td><input type="radio" name="login" value="<?php echo $row['login']; ?>" id="m<?php echo $row['login']; ?>" /></td>
+				<td><label for="m<?php echo $row['login']; ?>"><?php echo $row['login'];      ?></label></td>
+				<td><?php echo $row['real_name'];  ?></td>
+				<!--  REMOVED FOR MOBILE THEME
+				<td><?php echo $row['email'];      ?></td>
+				<td><?php 
+					if ($row['last_login'] == '0000-00-00 00:00:00') {
+						echo _AT('never');
+					} else {
+						echo $row['last_login'];
+					} ?></td> -->
+				<td><?php 
+					if ($row['privileges'] == 1) { 
+						echo _AT('priv_admin_super');
+					} else if ($row['privileges'] > 0) {
+						echo _AT('active_admin');
+					} else {
+						echo _AT('inactive_admin');
+					}
+				 ?> </td>
+			</tr>
+	 	<?php endwhile; ?>
+	<?php } ?>
+</tbody>
+</table>
+</div>
+</form>
diff --git a/docs/themes/simplified-desktop/admin/users/instructor_requests.tmpl.php b/docs/themes/simplified-desktop/admin/users/instructor_requests.tmpl.php
new file mode 100644
index 000000000..83ca4f8bc
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/users/instructor_requests.tmpl.php
@@ -0,0 +1,45 @@
+
+<form name="form" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="table-surround">
+<table class="data" summary="Table listing instructor requets" >
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><?php echo _AT('login_name');     ?></th>
+	<!-- REMOVED FOR MOBILE <th scope="col"><?php echo _AT('first_name');   ?></th>-->
+	<!-- <th scope="col"><?php echo _AT('last_name');    ?></th>  -->
+	<!--  <th scope="col"><?php echo _AT('email');        ?></th> -->
+	<th scope="col"><?php echo _AT('notes');        ?></th>
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="6">
+	<input type="submit" name="deny" value="<?php echo _AT('deny'); ?>" /> 
+	<input type="submit" name="approve" value="<?php echo _AT('approve'); ?>" /></td>
+</tr>
+</tfoot>
+<tbody>
+<?php
+	if ($row = mysql_fetch_assoc($this->result)) {
+		do {
+			echo '<tr onkeydown ="document.form[\'i'.$row['member_id'].'\'].checked = true;rowselect(this);" onmousedown="document.form[\'i'.$row['member_id'].'\'].checked = true;rowselect(this);" id="r_'.$row['member_id'].'">';
+			echo '<td><input type="radio" name="id" value="'.$row['member_id'].'" id="i'.$row['member_id'].'" /></td>';
+			echo '<td><label for="i'.$row['member_id'].'">'.AT_print($row['login'], 'members.login').'</label></td>';
+			// REMOVED FOR MOBILE
+			// echo '<td>'.AT_print($row['first_name'], 'members.first_name').'</td>';
+		    // echo '<td>'.AT_print($row['last_name'], 'members.last_name').'</td>';
+			// echo '<td>'.AT_print($row['email'], 'members.email').'</td>';
+			
+			echo '<td>'.AT_print($row['notes'], 'instructor_approvals.notes').'</td>';
+
+			echo '</tr>';
+		} while ($row = mysql_fetch_assoc($this->result));
+	} else {
+		echo '<tr><td colspan="6">'._AT('none_found').'</td></tr>';
+	}
+?>
+</tbody>
+</table>
+</div>
+</form>
diff --git a/docs/themes/simplified-desktop/admin/users/log.tmpl.php b/docs/themes/simplified-desktop/admin/users/log.tmpl.php
new file mode 100644
index 000000000..8ae881dda
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/users/log.tmpl.php
@@ -0,0 +1,30 @@
+<div class="table-surround">
+<table summary="Date and login name associated with an action in a database table" class="data" >
+
+<thead>
+<tr>
+	<th scope="col"><?php echo _AT('date');           ?></th>
+<!-- 	<th scope="col"><?php echo _AT('login_name');     ?></th> -->
+<!-- 	<th scope="col"><?php echo _AT('action');         ?></th> -->
+	<th scope="col"><?php echo _AT('database_table'); ?></th>
+</tr>
+</thead>
+<tbody>
+<?php if (mysql_num_rows($this->result) > 0) : ?>
+	<?php while ($row = mysql_fetch_assoc($this->result)): ?>
+		<?php $offset++; ?>
+		<tr onkeydown="document.location='<?php echo AT_BASE_HREF; ?>mods/_core/users/admins/detail_log.php?offset=<?php echo $offset.SEP.'p='.$page.SEP.'login='.$_GET['login']; ?>'" onmousedown="document.location='<?php echo AT_BASE_HREF; ?>mods/_core/users/admins/detail_log.php?offset=<?php echo $offset.SEP.'p='.$page.SEP.'login='.$_GET['login']; ?>'" title="<?php echo _AT('view_details'); ?>">
+			<td><a href="<?php echo AT_BASE_HREF; ?>mods/_core/users/admins/detail_log.php?offset=<?php echo $offset.SEP.'p='.$page.SEP.'login='.$_GET['login']; ?>"><?php echo $row['time']; ?></a></td>
+			<!-- <td><?php echo $row['login']; ?></td> -->
+			<!--  <td><?php echo $this->operations[$row['operation']]; ?></td>-->
+			<td><?php echo $row['table']; ?></td>
+		</tr>
+	<?php endwhile; ?>
+<?php else: ?>
+<tr>
+	<td colspan="4"><?php echo _AT('none_found'); ?></td>
+</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/users/master_list.tmpl.php b/docs/themes/simplified-desktop/admin/users/master_list.tmpl.php
new file mode 100644
index 000000000..431b0e3fe
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/users/master_list.tmpl.php
@@ -0,0 +1,129 @@
+
+<form name="importForm" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" enctype="multipart/form-data">
+<div class="input-form">
+	<div class="row">
+		<h3><?php echo _AT('update_list'); ?></h3>
+		<label for="file"><?php echo _AT('file'); ?></label><br />
+		<input type="file" name="file" size="40" id="file" />
+	</div>
+	
+	<div class="row">
+		<fieldset>
+		<legend><?php echo _AT('master_not_in_list'); ?></legend>
+		<input type="radio" name="override" id="o0" value="0" checked="checked" /><label for="o0"><?php echo _AT('leave_unchanged'); ?></label>
+		<input type="radio" name="override" id="o1" value="1" /><label for="o1"><?php echo _AT('disable');     ?></label>
+		</fieldset>
+	</div>
+
+	<div class="row buttons">
+		<input type= "submit" name="submit" value="<?php echo _AT('upload'); ?>" />
+	</div>
+</div>
+</form>
+
+<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+	<div class="input-form">
+		
+			<h3><?php echo _AT('results_found', $this->num_results); ?></h3>
+			<a id="results-hide-show-link" href="javascript:void(0);" tabindex="1">Refine Results</a>
+		
+	
+		
+	<div id="results-hide-show" role="search"  aria-live="assertive">
+	<div id="results-display">
+		<div class="row">
+			<fieldset>
+			<legend><?php echo _AT('account_status'); ?></legend>
+			<input type="radio" name="status" value="1" id="s0" <?php if ($_GET['status'] == 1) { echo 'checked="checked"'; } ?> /><label for="s0"><?php echo _AT('not_created'); ?></label> 
+
+			<input type="radio" name="status" value="2" id="s1" <?php if ($_GET['status'] == 2) { echo 'checked="checked"'; } ?> /><label for="s1"><?php echo _AT('created'); ?></label> 
+
+			<input type="radio" name="status" value="" id="s" <?php if ($_GET['status'] == '') { echo 'checked="checked"'; } ?> /><label for="s"><?php echo _AT('all'); ?></label> 
+			</fieldset>
+		</div>
+
+		<div class="row">
+			<label for="search"><?php echo _AT('search'); ?> (<?php echo _AT('student_id'); ?>)</label><br />
+			<input type="text" name="search" id="search" size="20" value="<?php echo htmlspecialchars($_GET['search']); ?>" />
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="filter" value="<?php echo _AT('filter'); ?>" />
+			<input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>" />
+		</div>
+	</div>
+	</div> <!-- end #results-display -->
+	</div> <!-- end #results-hide-show -->
+</form>
+
+<div class="paging">
+	<ul>
+	<?php for ($i=1; $i<=$this->num_pages; $i++): ?>
+		<li>
+			<?php if ($i == $page) : ?>
+				<a class="current" href="<?php echo $_SERVER['PHP_SELF']; ?>?p=<?php echo $i.$page_string; ?>"><strong><?php echo $i; ?></strong></a>
+			<?php else: ?>
+				<a href="<?php echo $_SERVER['PHP_SELF']; ?>?p=<?php echo $i.$page_string; ?>"><?php echo $i; ?></a>
+			<?php endif; ?>
+		</li>
+	<?php endfor; ?>
+	</ul>
+</div>
+
+
+<form name="form" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<input type="hidden" name="status" value="<?php echo $_GET['status']; ?>" />
+<div class="table-surround">
+<table summary="Table lists results by Student ID, Login Name, First Name, Second Name, and Last Name." class="data"  >
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><?php echo _AT('student_id'); ?></th>
+	<th scope="col"><?php echo _AT('login_name'); ?></th>
+	<th scope="col"><?php echo _AT('last_name'); ?></th>
+</tr>
+</thead>
+<?php if ($this->num_results > 0): ?>
+<tfoot>
+<tr>
+	<td colspan="6"><input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" /> <input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" /></td>
+</tr>
+</tfoot>
+<tbody>
+	<?php while($row = mysql_fetch_assoc($this->result)): ?>
+		<tr onmousedown="document.form['m<?php echo $row['public_field']; ?>'].checked = true;rowselect(this);" onkeydown="document.form['m<?php echo $row['public_field']; ?>'].checked = true;rowselect(this);" id="r_<?php echo $row['public_field']; ?>">
+			<td><input type="radio" name="id" value="<?php 
+				if ($row['member_id']) {
+					echo $row['member_id'];
+				} else {
+					echo '-'.$row['public_field'];
+				}
+				?>" id="m<?php echo $row['public_field']; ?>" /></td>
+			<td><label for="m<?php echo $row['public_field']; ?>"><?php echo $row['public_field']; ?></label></td>
+			<td><?php
+				if ($row['member_id']) {
+					echo $row['login'];
+				} else {
+					echo '-';
+				}
+				?></td>
+
+			<td><?php
+				if ($row['member_id']) {
+					echo $row['last_name'];
+				} else {
+					echo '-';
+				}
+				?></td>
+		</tr>
+	<?php endwhile; ?>
+</tbody>
+<?php else: ?>
+	<tr>
+		<td colspan="6"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+
+</table>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/users/user_enrollment.tmpl.php b/docs/themes/simplified-desktop/admin/users/user_enrollment.tmpl.php
new file mode 100644
index 000000000..463eb2466
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/users/user_enrollment.tmpl.php
@@ -0,0 +1,85 @@
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>?id=<?php echo $this->id; ?>">
+<input type="hidden" name="id" value="<?php echo $this->id; ?>"/>
+<div class="input-form">
+	<div class="row">
+	<h3><?php echo _AT('instructor'); ?></h3>
+		<?php if ($this->instruct): ?>
+			<ul>
+			<?php foreach ($this->instruct as $cid): ?>
+				<li><?php echo $this->system_courses[$cid]['title']; ?></li>
+			<?php endforeach; ?>
+			</ul>
+		<?php else: ?>
+			<?php echo _AT('none'); ?>
+		<?php endif; ?>
+	</div>
+	<div class="row buttons">
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>"/>
+	</div>
+</div>
+
+<div class="input-form">
+	<div class="row">
+	<h3><?php echo _AT('enrolled'); ?></h3>
+		<?php if ($this->enrolled): ?>
+			<ul>
+			<?php foreach ($this->enrolled as $cid): ?>
+				<li><input type="checkbox" name="enrolled[]" value="<?php echo $cid; ?>" id="c<?php echo $cid; ?>"/><label for="c<?php echo $cid; ?>"><?php echo $this->system_courses[$cid]['title']; ?></label></li>
+			<?php endforeach; ?>
+			</ul>
+		<?php else: ?>
+			<?php echo _AT('none'); ?>
+		<?php endif; ?>
+	</div>
+	<div class="row buttons">
+	<?php if ($this->enrolled): ?>
+		<input type="submit" name="enrolled_unenroll" value="<?php echo _AT('unenroll'); ?>"/>
+	<?php endif; ?>
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>"/>
+	</div>
+
+</div>
+
+<div class="input-form">
+	<div class="row">
+	<h3><?php echo _AT('pending_enrollment'); ?></h3>
+		<?php if ($this->pending): ?>
+			<ul>
+			<?php foreach ($this->pending as $cid): ?>
+				<li><input type="checkbox" name="pending[]" value="<?php echo $cid; ?>" id="c<?php echo $cid; ?>"/><label for="c<?php echo $cid; ?>"><?php echo $this->system_courses[$cid]['title']; ?></label></li>
+			<?php endforeach; ?>
+			</ul>
+		<?php else: ?>
+			<?php echo _AT('none'); ?>
+		<?php endif; ?>
+	</div>
+	<div class="row buttons">
+	<?php if ($this->pending): ?>
+		<input type="submit" name="pending_remove" value="<?php echo _AT('remove'); ?>"/>
+		<input type="submit" name="pending_enroll" value="<?php echo _AT('enroll'); ?>"/>
+	<?php endif; ?>
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>"/>
+	</div>	
+</div>
+
+<div class="input-form">
+	<div class="row">
+		<h3><?php echo _AT('not_enrolled');?></h3>
+			<?php if ($this->not_enrolled): ?>
+				<ul>
+				<?php foreach ($this->not_enrolled as $cid): ?>
+					<li><input type="checkbox" name="not_enrolled[]" value="<?php echo $cid; ?>" id="c<?php echo $cid; ?>"/><label for="c<?php echo $cid; ?>"><?php echo $this->system_courses[$cid]['title']; ?></label></li>
+				<?php endforeach; ?>
+				</ul>
+			<?php else: ?>
+				<?php echo _AT('none'); ?>
+			<?php endif; ?>
+	</div>
+	<div class="row buttons">
+	<?php if ($this->not_enrolled): ?>
+		<input type="submit" name="not_enrolled_enroll" value="<?php echo _AT('enroll'); ?>"/>
+	<?php endif; ?>
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>"/>
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/admin/users/users.tmpl.php b/docs/themes/simplified-desktop/admin/users/users.tmpl.php
new file mode 100644
index 000000000..5a48c0a0c
--- /dev/null
+++ b/docs/themes/simplified-desktop/admin/users/users.tmpl.php
@@ -0,0 +1,176 @@
+
+<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+	<h3><?php echo _AT('results_found', $this->num_results); ?></h3>
+	<div class="input-form">
+	<div id="results-hide-show-simple-content" class="hide-show-container-surround ">	
+			
+			<a id="results-hide-show-link"  class="content-expand" href="javascript:void(0);" tabindex="1">Refine Results</a>
+	</div>
+		
+	<div id="results-hide-show" role="search"  aria-live="assertive">
+	<div id="results-display">
+	
+		
+		<div class="row">
+		<fieldset>
+			<legend><?php echo _AT('account_status'); ?></legend>
+			<input type="radio" name="status" value="0" id="s0" <?php if ($_GET['status'] == 0) { echo 'checked="checked"'; } ?> /><label for="s0"><?php echo _AT('disabled'); ?></label> 
+
+			<input type="radio" name="status" value="1" id="s1" <?php if ($_GET['status'] == 1) { echo 'checked="checked"'; } ?> /><label for="s1"><?php echo _AT('unconfirmed'); ?></label> 
+
+			<input type="radio" name="status" value="2" id="s2" <?php if ($_GET['status'] == 2) { echo 'checked="checked"'; } ?> /><label for="s2"><?php echo _AT('student'); ?></label>
+
+			<input type="radio" name="status" value="3" id="s3" <?php if ($_GET['status'] == 3) { echo 'checked="checked"'; } ?> /><label for="s3"><?php echo _AT('instructor'); ?></label>
+
+			<input type="radio" name="status" value="" id="s" <?php if ($_GET['status'] === '') { echo 'checked="checked"'; } ?> /><label for="s"><?php echo _AT('all'); ?></label>
+		</fieldset>
+		</div>
+
+		<div class="row">
+			<label for="search"><?php echo _AT('search'); ?> (<?php echo _AT('login_name').', '._AT('first_name').', '._AT('second_name').', '._AT('last_name') .', '._AT('email'); ?>)</label><br />
+			<fieldset><legend><?php echo _AT('search_match'); ?>:</legend>
+			<input type="radio" name="include" value="all" id="match_all" <?php echo $checked_include_all; ?> /><label for="match_all"><?php echo _AT('search_all_words'); ?></label> 
+			<input type="radio" name="include" value="one" id="match_one" <?php echo $checked_include_one; ?> /><label for="match_one"><?php echo _AT('search_any_word'); ?></label>
+			</fieldset>
+			<input type="text" name="search" id="search" size="40" value="<?php echo htmlspecialchars($_GET['search']); ?>" />
+			<br/>
+		
+		</div>
+
+		<?php if (defined('AT_MASTER_LIST') && AT_MASTER_LIST): ?>
+			<div class="row">
+				<label for="searchid"><?php echo _AT('search'); ?> (<?php echo _AT('student_id'); ?>)</label><br />
+				<input type="text" name="searchid" id="searchid" size="20" value="<?php echo htmlspecialchars($_GET['searchid']); ?>" />
+			</div>
+		<?php endif; ?>
+
+		<div class="row">
+			<label for="last_login_have"><?php echo _AT('last_login'); ?></label><br />					
+			<select name="last_login_have" id="last_login_have">
+				<option value="-1">- <?php echo _AT('select'); ?> -</option>
+				<option value="1" <?php if($_GET['last_login_have']=='1') { echo 'selected="selected"';}?>><?php echo _AT('have'); ?></option>
+				<option value="0" <?php if(isset($_GET['last_login_have']) && $_GET['last_login_have']=='0') { echo 'selected="selected"';}?>><?php echo _AT('have_not'); ?></option>
+			</select> 
+			
+		<label for="last_login_days"><?php echo _AT('logged_in_within'); ?>:</label> <input type="text" id="last_login_days" name="last_login_days" size="3" value="<?php echo htmlspecialchars($_GET['last_login_days']); ?>" /> <?php echo _AT('days'); ?> <br />
+			
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="filter" value="<?php echo _AT('filter'); ?>" />
+			<input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>" />
+		</div>
+	</div>
+	</div> <!-- end #results-display -->
+	</div> <!-- end #results-hide-show -->
+	
+</form>
+
+
+<?php print_paginator($this->page, $this->num_results, $this->page_string . SEP . $this->order .'='. $col, $this->results_per_page); ?>
+<?php echo "<br>";?>
+<form name="form" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<input type="hidden" name="status" value="<?php echo $_GET['status']; ?>" />
+<input type="hidden" name="search" value="<?php echo htmlspecialchars($_GET['search']); ?>" />
+<input type="hidden" name="include" value="<?php echo htmlspecialchars($_GET['include']); ?>" />
+
+<?php if (defined('AT_MASTER_LIST') && AT_MASTER_LIST) {  $col_counts = 1; } else { $col_counts = 0; } ?>
+<div class="table-surround">
+<table summary="" class="data" >
+<colgroup>
+	<?php if ($col == 'login'): ?>
+		<col />
+		<col class="sort" />
+		<col span="<?php echo 5 + $col_counts; ?>" />
+	<?php elseif($col == 'public_field'): ?>
+		<col span="<?php echo 1 + $col_counts; ?>" />
+		<col class="sort" />
+		<col span="6" />
+	<?php elseif($col == 'first_name'): ?>
+		<col span="<?php echo 2 + $col_counts; ?>" />
+		<col class="sort" />
+		<col span="5" />
+	<?php elseif($col == 'second_name'): ?>
+		<col span="<?php echo 3 + $col_counts; ?>" />
+		<col class="sort" />
+		<col span="4" />
+	<?php elseif($col == 'last_name'): ?>
+		<col span="<?php echo 4 + $col_counts; ?>" />
+		<col class="sort" />
+		<col span="3" />
+	<?php elseif($col == 'email'): ?>
+		<col span="<?php echo 5 + $col_counts; ?>" />
+		<col class="sort" />
+		<col span="2" />
+	<?php elseif($col == 'status'): ?>
+		<col span="<?php echo 6 + $col_counts; ?>" />
+		<col class="sort" />
+		<col />
+	<?php elseif($col == 'last_login'): ?>
+		<col span="<?php echo 7 + $col_counts; ?>" />
+		<col class="sort" />
+	<?php elseif($col == 'creation_date'): ?>
+		<col span="<?php echo 8 + $col_counts; ?>" />
+		<col class="sort" />
+	<?php endif; ?>
+</colgroup>
+<thead>
+<tr>
+	<th scope="col" align="left"><input type="checkbox" value="<?php echo _AT('select_all'); ?>" id="all" title="<?php echo _AT('select_all'); ?>" name="selectall" onclick="CheckAll();" /></th>
+
+	<th scope="col"><a href="mods/_core/users/users.php?<?php echo $this->orders[$this->order]; ?>=login<?php echo $page_string; ?>"><?php echo _AT('login_name');      ?></a></th>
+	<th scope="col"><a href="mods/_core/users/users.php?<?php echo $this->orders[$this->order]; ?>=last_name<?php echo $page_string; ?>"><?php echo _AT('last_name');   ?></a></th>
+	<th scope="col"><a href="mods/_core/users/users.php?<?php echo $this->orders[$this->order]; ?>=status<?php echo $page_string; ?>"><?php echo _AT('account_status'); ?></a></th>
+	
+</tr>
+
+</thead>
+<?php if ($this->num_results > 0): ?>
+	<tfoot>
+	<tr>
+		<td colspan="<?php echo 9 + $col_counts; ?>">
+			<input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" /> 
+			<input type="submit" name="password" value="<?php echo _AT('password'); ?>" />
+			<?php if (admin_authenticate(AT_ADMIN_PRIV_ENROLLMENT, true)): ?>
+				<input type="submit" name="enrollment" value="<?php echo _AT('enrollment'); ?>" />
+			<?php endif; ?>	
+			<label for="change_status"><?php echo _AT('more_options'); ?></label>
+			<select name="change_status" id="change_status">
+			<!-- REMOVED FOR MOBILE	<option value="-2"><?php echo _AT('more_options'); ?></option> -->
+				<optgroup label="<?php echo _AT('status'); ?>">
+					<option value="<?php echo AT_STATUS_STUDENT; ?>"><?php echo _AT('student'); ?></option>
+					<option value="<?php echo AT_STATUS_INSTRUCTOR; ?>"><?php echo _AT('instructor'); ?></option>	
+					<?php if ($_config['email_confirmation']): ?>
+						<option value="<?php echo AT_STATUS_UNCONFIRMED; ?>"><?php echo _AT('unconfirmed'); ?></option>
+					<?php endif; ?>
+					<option value="<?php echo AT_STATUS_DISABLED; ?>"><?php echo _AT('disable'); ?></option>				
+				</optgroup>
+				<option value="-2" disabled="disabled">- - - - - - - - -</option>	
+				<option value="-1"><?php echo _AT('delete'); ?></option>				
+			</select>
+			<input type="submit" name="apply" value="<?php echo _AT('apply'); ?>" />
+			<input type="submit" name="apply_all" value="<?php echo _AT('apply_to_all_results'); ?>" />
+		</td>
+	</tr>
+	</tfoot>
+	<tbody>
+		<?php while($row = mysql_fetch_assoc($this->result)): ?>
+			<tr onmousedown="document.form['m<?php echo $row['member_id']; ?>'].checked = !document.form['m<?php echo $row['member_id']; ?>'].checked; togglerowhighlight(this, 'm<?php echo $row['member_id']; ?>');" id="rm<?php echo $row['member_id']; ?>">
+				<td><input type="checkbox" name="id[]" value="<?php echo $row['member_id']; ?>" id="m<?php echo $row['member_id']; ?>" onmouseup="this.checked=!this.checked" /></td>
+				<td><?php echo $row['login']; ?></td>
+				
+				<?php $startend_date_longs_format=_AT('startend_date_longs_format'); ?>
+				<td><?php echo AT_print($row['last_name'], 'members.last_name'); ?></td>
+				<td><?php echo get_status_name($row['status']); ?></td>
+				
+			</tr>
+		<?php endwhile; ?>
+	</tbody>
+<?php else: ?>
+	<tr>
+		<td colspan="<?php echo 9 + $col_counts; ?>"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</table>
+</div>
+</form>
diff --git a/docs/themes/simplified-desktop/android.css b/docs/themes/simplified-desktop/android.css
new file mode 100644
index 000000000..4ae88b9f3
--- /dev/null
+++ b/docs/themes/simplified-desktop/android.css
@@ -0,0 +1,2250 @@
+/* Style is optimized for iphone. Note that -webkit properties 
+create errors in the CSS validator. 
+Classes beginning with ".fl-" are overriding Mobile FSS, 
+see the API @ http://wiki.fluidproject.org/display/fluid/Mobile+FSS+API 
+for more details. 
+*/
+html, body{
+	height: 100%;
+}
+#main{
+	padding-bottom: 2.3em;
+	overflow: auto;
+}
+
+body,ul,li {
+	padding:0;
+	margin:0;
+}
+
+.fl-theme-iphone{
+	background: white;	
+}
+
+#header{
+	width:100%;
+	height:1.063em;
+	line-height:2.813em;
+	padding:0;
+	font-size:1.063em;
+}
+
+#header-section-title {
+	text-align: center;
+	background-image: -webkit-gradient(linear, left top, left bottom,
+   	from(#4b6b90),
+    color-stop(0.5, #6d8cb3),
+    color-stop(0.50, #4b6b90),
+    color-stop(0.5, #6d8cb3),
+    to(#4b6b90)
+    ); 
+}
+
+.fl-theme-iphone .fl-navbar{
+	border: none;
+	border-top: none;
+}
+
+.fl-navbar a{
+	font-size: 0.969em;
+	background-image: -webkit-gradient(linear, left top, left bottom,
+   	from(#4b6b90),
+    color-stop(0.5, #6d8cb3),
+    color-stop(0.50, #4b6b90),
+    color-stop(0.5, #6d8cb3),
+    to(#4b6b90)
+    ); 
+}
+
+.fl-navbar .fl-tabs {
+	padding-top: .3em;
+	padding-bottom: .3em;
+	border-top: 1px solid black;
+	border-bottom: .5px solid black;
+	background-color: #4b6b90; 
+    height: 2em;   
+}
+
+#navigation-contentwrapper{
+	position: relative;
+	background-color: #4b6b90;
+	height: 2.5em; 
+}
+
+#navigation-bar{
+ 	height: 2.5em; 
+    border-bottom: .5px solid black;
+   /* padding-bottom: .3em;*/
+     
+}
+
+#wrapper{
+	width:100%;
+	overflow:hidden;
+	overflow: auto;
+	min-height: 100%;
+}
+
+#site-name, h1#section-title{
+	display: inline;
+	text-shadow: none;
+	font-size: 90%;
+	color: #4C566C;
+	color: white;
+}
+
+/*this CSS creates a button that looks exactly like a Mobile FSS tab.*/
+.navigation-bar-button{
+    border-width:5px;
+    -webkit-border-radius: 5px;
+	font-size: 18px;/*keep this in px*/
+	padding: 0 .3em;
+	color: white;
+	position: relative;
+	top: .69em; 
+	left: 0.188em; 
+    /* default mobile fss color scheme for tabs not AA compliant. Here is a compliant bg image: */
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    );
+ 	-webkit-border-image: url(images/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+    -webkit-border-left-image: none;
+    -webkit-background-origin: border;
+    -webkit-background-clip: border;
+    /* to mimick the mobile FSS scolor scheme (iphone) uncomment these lines 
+	background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#9aafca),
+        color-stop(0.5, #6d8cb3),
+        color-stop(0.50, #4b6b90),
+        to(#4b6b90)
+    );*/
+}
+
+.fl-theme-iphone .fl-tabs li{
+    /* default mobile fss color scheme for tabs not AA compliant against a white foreground text.therefore its backgroud-image must be overrided */
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    ); 
+}
+
+div#content-link-container{/*REMOVE
+	background-color:#F5F5F5;
+	padding:.375em;
+	border: #A9ADB0 solid 1px;
+	-webkit-border-radius: 2px;
+	
+	border: #A9ADB0 solid 1px;
+	-webkit-border-radius: 2px;
+	padding: 1em;
+ 	padding-left: 0.313em;
+ 	text-decoration: none;*/
+ 	border: #A9ADB0 solid 1px;
+ 
+}
+
+#content_link{
+	display: block;
+	text-decoration: none;
+	padding-bottom: 12px;
+  	padding-left: 8px;
+    padding-top: 12px;
+}
+#home-guide{
+	position: absolute;
+	top: .45em;
+ 	right: 0.188em; 
+ 	font-size: 17px;/*keep this in px*/
+	white-space:nowrap;
+	display: inline;
+
+}
+
+/* main body attributes */
+p {
+    text-align: left;
+    line-height: 150%;
+	font-size: 1em;
+	padding:.75em 0;
+	margin: 0 auto;
+}
+
+p a {
+    text-decoration: underline;
+}
+
+p a:visited {
+	color: #3F2670;
+    background-color: transparent;
+}
+p a:active {
+	color: #A50707;
+    background-color: transparent;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    color: #4C566C;
+    clear: right;
+    font: 100% Verdana, Helvetica, Arial, sans-serif;
+	font-weight: bold;
+    margin: 0;
+	padding: 0;
+}
+
+h1 {
+    font-size: 160%;
+	color: #FFF;
+}
+
+h2 {
+    font-size: 150%;
+}
+h2.sidebox{
+    font-size: 110%;
+}
+h3 {
+    font-size: 130%;
+	padding: 0;
+}
+h3.browse-courses{
+	font-size: 90%;
+	text-decoration: none;
+	clear: none;
+	display: inline;
+}
+h3 a {
+    font-size: 100%;
+}
+h4 {
+    font-size: 120%;
+}
+
+
+h5 {
+    font-size: 100%;
+}
+
+
+/* Preferences tabs */
+.etabbed-list-container	{
+	padding:0;
+	margin: 0;
+	width:70%;
+	clear: left;
+	height: 3em;
+}
+
+.prefs_buttontab {
+	padding:0;
+	margin: 0;
+	white-space: nowrap;
+}
+.prefs_tab{
+	padding:0.5em 0.3em 0;
+	margin: 0;
+	white-space: nowrap;
+    display: inline;
+}
+
+.prefs_tab_selected{  
+	padding:0.7em 0.3em 0;
+	margin: 0;
+	margin: 0px;
+	font-weight:bold;
+	text-align:center;
+	white-space: nowrap;
+    display: inline;
+}
+
+
+
+/*  Table of content attributes*/
+p.toc{
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+	background-color: #E9F4F3;
+	padding: .6em;
+	margin-bottom: .6em;
+	margin-top: 0em;
+	margin-left: 1em;
+	margin-right: 3em;
+	border: 1px #ACCFCC solid;
+} 
+
+
+/* link attributes */
+a:link, /*a:visited*/ a:focus  {
+	color: #4C566C;
+	text-decoration: underline;
+}
+
+a:hover {
+	color: #4C566C;
+	text-decoration: underline;
+}
+a:active {
+	color: #ffffff;
+	text-decoration: underline;
+}
+/* align text to the left */
+.left {
+	text-align: left;
+}
+
+a.dropdown-title {
+	color: white;
+	font-weight: normal;
+	text-decoration: none;
+}
+
+
+/* table border */
+.tableborder {
+	border: 1px #595241 solid;
+}
+
+/* main submit button */
+.button {
+	background-color: #808080;
+	font-weight: normal;
+	color: black;
+	text-align: center;
+	-webkit-border-radius:3px;
+	padding-top: 0.313em;
+	padding-bottom: 0.313em;
+
+}
+.button:focus {
+	border:1px solid #A50707;
+	background-color:  #FFDAB9;	
+}
+/* small submit button at top */
+.button2 {
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+	background-color: #E9F4F3;
+
+}
+.button2:focus {
+	background-color: #E9F4F3;
+	border:  #ACCFCC  solid 1px;
+}
+
+/* date attributes */
+small.date {
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+	color: #595241;	
+	margin-bottom: 0; 
+	margin-top: 0;
+	margin-left: 0.313em;
+	margin-right: 0;
+	font-size:1em;
+}
+
+/* page breakline */
+hr {
+	color: #ACCFCC;
+	background-color: white;
+	height: .063em;
+}
+
+/* message box styles */
+
+/* Editor box small */
+.editorsmallbox {
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+	background-color: #E9F4F3;
+	padding: 0.125em;
+	padding-right: .188em;
+	border: 1px #ACCFCC solid;
+}
+
+/* Editor box large */
+.editorlargebox {
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+	background-color: #E9F4F3;
+	margin-left:1em;
+	padding-left: .2em;
+	padding-right: .5em;
+	padding-top: .5em;
+	padding-bottom: .4em;
+	border: 1px #ACCFCC solid;
+}
+
+
+select.dropdown {
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+}
+
+.highlight, a.highlight {
+	background-color: #5B8E88;
+	color: white;
+}
+
+a .highlight{
+	background-color: #5B8E88;
+	color: white;
+}
+
+.center {
+	text-align: center;
+}
+
+
+/* edit content tabs */
+.buttontab {
+	background-color: #E6E6E6;
+	font-weight: 500;
+	border:0;
+	padding-left: .188em;
+	padding-right: .188em;
+	padding-top: .188em;
+
+}
+
+.tab {
+	color: black;
+	background-color: #E6E6E6;
+	border-top: 1px #B8AE9C solid;
+	border-left: 1px #B8AE9C solid;
+	border-right: 1px #B8AE9C solid;
+	text-decoration: none;
+	text-align: center;
+	font-weight: bold;
+
+	
+}
+.buttontab selected {
+	font-family: Helvetica, Arial, Helvetica, sans-serif;
+	background-color: #6F7172;
+	font-weight: 600;
+	border:0;
+	padding-left: .188em;
+	padding-right: .188em;
+	padding-top: .188em;
+
+}
+td.selected{
+	font-family: Helvetica, Arial, Helvetica, sans-serif;
+	font-weight: 600;
+	text-decoration: none;
+	text-align: center;
+	background-color: white;
+	border-top: 1px #B8AE9C solid;
+	border-left: 1px #B8AE9C solid;
+	border-right: 1px #B8AE9C solid;
+}
+.econtainer{
+	background-color: #fffaf0;
+	border:1px #6F7172 solid;
+	margin-left:.5em;
+}
+
+.tab a:link, .etab a:visited {
+	/* color: black;*/
+	color: #4C566C;
+	background-color: white;
+
+}
+.tab a:hover {
+	color: black;
+	background-color: white;
+}
+
+.etabself {
+	background-color: #6F7172;
+
+	text-align: center;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+
+.unsaved {
+	color: red;
+	background-color: #FFFDE0;
+	font-weight: bold;
+}
+.saved {
+	background-color: #FFFDE0;
+	margin: 0.625em;
+}
+
+
+/* the side menu */
+td.dropdown-heading {
+	background-color: #DBFDD4;
+	color: #595241;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-top: 1px solid #ECFEEA;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+td.dropdown-heading a, td.dropdown-heading a:hover, td.dropdown-heading a:visited {
+	text-decoration: none;
+}
+
+td.dropdown-heading.closed {
+	border-bottom: 1px solid #ECFEEA;
+}
+
+/* the side menu content */
+td.dropdown {
+	padding: 0.125em;
+	background-color: white;
+	color: black;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-bottom: 1px solid #ECFEEA;
+	font-weight: normal;
+}
+td.dropdown a, td.dropdown a:visited  {
+	/* color: #595241; */
+	color: #4C566C;
+	text-decoration: none;
+}
+td.dropdown a:hover {
+	color: #595241;
+	text-decoration: underline;
+}
+td.dropdown.cell {
+	border-bottom: 0;
+}
+td.dropdown strong {
+	color: #2A6C28;
+}
+
+/* added for 1.4.2: */
+.results {
+	padding-left: 1.25em;
+}
+
+h5.search-results {
+	padding: 0.063em;
+	margin-bottom: 0.313em;
+	margin-top: 1em;
+	padding-top: 3em;
+	margin-left: 0.313em;
+}
+
+small.search-info {
+	color: #595241;
+}
+
+p.search-description {
+	background-color: #FFFCE5;
+	color: #595241;
+}
+
+.test-box {
+	background-color: #F7F3ED;
+	color: #595241;
+	border-left: 1px solid #595241;
+	border-right: 1px solid #595241;
+	border-top: 1px solid #595241;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+/*preferences*/
+
+.input-form 
+table.tabbed-table {
+	width: 100%;
+	border:thin black solid;
+}
+table.tabbed-table th#left-empty-tab {
+	background-color: transparent;
+	width: 0.938em;
+	border-bottom: 1px solid #B8AE9C;
+}
+table.tabbed-table th#right-empty-tab {
+	text-align: right;
+	background-color: transparent;
+	border-bottom: 1px solid #B8AE9C;
+	width: 25em;
+	padding-right: 0.313em;
+}
+table.tabbed-table th#right-empty-tab a {
+	text-decoration: underline;
+}
+table.tabbed-table th.tab-spacer {
+	background-color: transparent;
+	width: 0.313em;
+	border-bottom: 1px solid #B8AE9C;
+}
+
+table.tabbed-table th.tab {
+	padding-top: 0.125em;
+	padding-bottom: 0.125em;
+	width: 6.875em;
+	background-color: #E9F4F3;
+	border-bottom: 1px solid #B8AE9C;
+	border-left: 1px solid #B8AE9C;
+	border-top: 1px solid #B8AE9C;
+	border-right: 1px solid #B8AE9C;
+}
+table.tabbed-table th.tab:hover {
+	background-color: #ACCFCC;
+}
+
+table.tabbed-table th.tab a:focus {
+	color: white;
+}
+table.tabbed-table th.selected {
+	padding-top: 0.125em;
+	padding-bottom: 0.125em;
+	width: 6.875em;
+	background-color: #ACCFCC;
+	border-left: 1px solid #B8AE9C;
+	border-top: 1px solid #B8AE9C;
+	border-right: 1px solid #B8AE9C;
+}
+
+table.tabbed-table a, table.tabbed-table a:visited, table.tabbed-table a:hover {
+	/* color: black;*/
+	color: #4C566C;
+	text-decoration: none;
+}
+
+
+.preference-buttons-container{
+	background-color: red;
+	height: 2.5em;
+	width: 100%;
+	text-align: center;
+}
+
+div.preference-buttons-container li{
+	display: inline; 
+	float: right;
+}
+
+.prefs_tab_selected{
+	font-style: italic;
+	width: 10%;
+}
+.prefs_tab{
+	width: 10%;
+}
+
+.etabbed-table{
+	margin: 0 auto;
+}
+#previewText{
+	font-family: monospace;
+	border: 2px solid rgb(0, 0, 0); 
+	padding: 2em;
+	width: 80%; 
+	color: rgb(255, 255, 255);
+	background-color: rgb(0, 0, 0);
+}
+#previewArea{;
+	padding: 0em;
+	border-bottom-width: 0; 
+	margin-left: auto; 
+	margin-right: auto; 
+	font-weight: normal; 
+	width: 70%;
+	float:left;
+	clear:right;
+}
+#display-settings-preview{
+	width:90%;
+	height:20em; 
+	margin: 0 auto;
+}
+#feedback{
+	width: 90%;
+}
+#defaultfontsize-wrapper{
+	width:90%; 
+}
+
+/* end of preferences */
+
+a#my-start-page {
+	padding: 0.125em;
+	padding-left:  0.938em;
+	background-repeat: no-repeat;
+	background-position: 0.125em 0.313em;
+}
+
+a#back-to {
+	padding-left: 1.25em;
+	background-image: url(images/back.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0;
+}
+
+.breadcrumbs, .previous-next /*a#guide*/{
+    /* The path bar, including breadcrumbs and add to favorites */
+	clear:both;
+    font-size: 0.85em;
+	padding:0 0.375em;
+	color: #4C566C;
+	background-color: white;
+
+}
+#breadcrumbs-container{
+	background-color: #4d4d4d;
+	position: relative;
+}
+.breadcrumbs{
+	display:none;
+}
+h2.page-title {
+	padding-top: .5em;
+	margin-top: .5em;
+}
+h1 {
+	margin-bottom: 0.313em;
+	
+}
+
+
+div#help {
+	border-left: 1px solid black;
+	border-right: 1px solid black;
+	border-bottom: 1px solid black;
+	padding-left: 0.313em;
+	padding-right: 0.313em;
+	padding-bottom: 0.313em;
+	background-color: #F7F3ED;
+	margin-left: 0.313em;
+	margin-right: 0.313em;
+	font-size: small;
+}
+
+h3#help-title {
+	margin-left: 0.313em;
+	margin-right: 0.313em;
+	border-left: 1px solid black;
+	border-right: 1px solid black;
+	padding: 0.063em;
+	background-color: #F7F3ED;
+}
+.line {
+	border-bottom: 1px solid black;
+}
+div#help p {
+	padding: 0;
+	margin: 0;
+}
+
+div#toctoggle {
+	float: left;
+	padding-left: 0.625em;
+}
+
+h1#section-title {
+	font-size: 90%;
+}
+
+div#top-links {
+	margin: 0 auto;
+	font-size: .938em;
+/* moved inside of #footer for mobile theme */
+}
+#footer{
+	/*width:100%;*/
+	height:2.3em;
+	background-color: #4b6b90;
+	margin-top: -2.3em;
+	position: relative;
+	clear: both;
+	
+}
+
+div#top-links a:link, div#top-links a:visited {
+	text-decoration:none;
+}
+
+#jumpmenu:focus{
+	background-color:#F6EAD6;
+}
+#jumpmenu{
+	margin: 0 auto;
+}
+
+a#editor-link {
+	background-color: #F7F3ED;
+	padding-top: 0.063em;
+	padding-bottom: 0.063em;
+	padding-left:  0.938em;
+	padding-right: 0.5em;
+	border: 1px solid #cccccc;
+	font-weight: normal;
+	text-decoration: none;
+}
+
+a#editor-link:hover {
+	background-color: #F7F3ED;
+	border: 1px solid #B8AE9C;
+}
+
+a#editor-link.off {
+	background-image: url(images/pen.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0.125em;
+}
+a#editor-link.on {
+	background-image: url(images/pen2.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0.125em;
+}
+
+
+/* for data tables */
+.table-surround {
+	border: #A9ADB0 1px solid;
+	border: #cccccc 1px solid;
+	-webkit-border-radius:5px;
+	margin-top: 1em;
+	margin-bottom: 1em;
+	
+}
+
+table.data {
+	margin:0;
+	width:100%;
+	padding: 0;
+	color: black;
+	font-size: .8em;
+	text-align: left;
+	background-color: transparent;
+} 
+/* contains the headings */
+table.data th {
+
+	padding: 0.188em;
+}
+
+table.data th a {
+	color: #595241;
+	background-image: url('../default/images/sort.gif');
+	background-repeat: no-repeat;
+	background-position: right;
+}
+
+table.data tbody {
+/*
+	border-top: 1px solid #B8AE9C;
+	border-bottom: 1px solid #B8AE9C;
+	*/
+}
+/*headings text*/
+table.data tbody th {
+	text-align: left;
+
+}
+
+table.data td {
+	padding: 0.188em;
+	color: black;
+	font-size: .875em;
+	font-style: normal;
+}
+table.data td a:link, a:visited{
+	/*color: black;*/
+	color: #4C566C
+}
+table.data tbody tr:hover {
+	background-color: #efefef;
+	cursor: pointer;
+}
+
+table.data tbody tr.selected {
+	background-color: #E9F4F3;
+	cursor: auto;
+	border: 5px solid #E9F4F3;
+}
+
+table.data tfoot {
+	background-color: #F7F3ED;
+}
+
+table.data tfoot tr:first-child td {
+	padding: 0.313em;
+	background-image: url('images/arrow_ltr.gif');
+	background-repeat: no-repeat;
+	background-position: .25em 0.313em;
+}
+
+table.data.static tfoot td, table.data.static tfoot tr:first-child td {
+	/*border-top: 1px solid #B8AE9C;*/
+	padding: 0.313em;
+	background-image: none;
+	padding-left: 0;
+
+}
+/* add borders to row in Required Information, Personal Information*/
+.row{
+	padding:.375em 0;
+	border-bottom: 1px #cccccc solid;
+	font-size: 0.938em;
+}
+#last-row, .row-buttons, #last-row1, .row-blurb{
+	border: none;
+}
+#browse-courses-table{
+	font-size: .875em;
+}
+
+
+/*buttons*/
+table.data tfoot input {
+	background-color: #efefef;
+	font-weight: normal;
+	/*border:  #AAA  solid 1px;*/
+}
+table.data tfoot input:focus {
+	background-color: #FFDAB9;
+	/*border:  #AAA  solid 1px;*/
+}
+
+
+/* used for static tables with no form elements: */
+table.data.static tbody tr:hover {
+	background-color: transparent;
+	cursor: auto;
+}
+
+
+
+/* course browser: */
+
+div#browse {
+	margin-left: auto; 
+	margin-right: auto; 
+	width: 80%;
+}
+
+div.browse-selected {
+	background-image: url('images/side_arrow.gif'); 
+	background-repeat: no-repeat; 
+	padding-left: 0.563em; 
+	background-position: center left;
+}
+
+div.browse-unselected {
+	padding-left: 0.563em; 
+}
+
+ul.browse-list {
+	list-style: none;
+	padding:0;
+}
+
+/* feedback /errors */
+div#error {
+	width: 89%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #DD0000;
+	padding: 0.313em;
+	background-color: #F4DCDC;
+	color: #A50707;
+	background-color: #F4DCDC;
+	padding-left: 1.563em;
+	font-weight: bold;
+	-webkit-border-radius:5px;
+}
+div#error h4 {
+	color: black;
+	margin-left: 0;
+}
+
+div#error ul, div#feedback ul, div#help ul {
+	position: relative;
+	list-style: none;
+	margin-left: 0;
+	padding-left: 0;
+}
+
+div#error ul li{
+	margin-top: 0.313em;
+}
+
+div#feedback, div#info {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 0.313em;
+	margin-bottom: 0.313em;
+	padding: 0.313em;
+	font-family: Helvetica, Arial, sans-serif;
+	-webkit-border-radius:5px;
+	border: 1px solid #17B506;
+	background-color: #E7EFD0;
+	color: #3f4559;
+	font-size: 90%;
+	z-index: -1;
+}
+div#feedback li, div#info li, div#error li{
+	color: #4C566C;
+	z-index: -1;
+}
+
+div#help {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #ACCFCC;
+	padding: 0.313em;
+	background-color: #E9F4F3;
+	color: #024C41;
+}
+
+
+div#warning {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #FF8400;
+	padding: 0.313em;
+	background-color: #FFF6ED;
+	color: #D95900;
+	font-weight: bold;
+}
+acronym {
+	cursor: help;
+}
+
+div.news p {
+	margin: 0;
+	padding:0;
+}
+div.news span.date {
+	font-family:Helevetica, Arial, sans-serif;
+	color: #4C566C;	
+	font-size: .5em;
+}
+
+.news{
+	padding: 0;
+	margin-bottom: 1em;
+	margin-top: 1em;
+}
+/* home page links */
+div.home-link {
+	padding: 0.125em;
+	float: left;
+	text-align: center;
+	margin: 0.125em;
+	width: 7.5em;
+	height: 5.625em;
+}
+div.home-link:hover {
+	padding: 0.063em;
+	background-color: #F7F3ED;
+	border: 1px solid #afafaf;
+	float: left;
+	text-align: center;
+	margin: 0.125em;
+}
+div.home-link a {
+	text-decoration: none;
+	font-weight: bold;
+}
+
+div.home-link img {
+	border: 0;
+}
+
+/* sequence links */
+div#sequence-links {
+
+}
+div#sequence-links a {
+	text-decoration: none;
+	display: block;
+}
+
+.previous-next{
+	display: block;
+}
+div.dropdown {
+	width: 12.5em;
+	padding: 0.125em;
+	background-color: white;
+	color: black;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-bottom: 1px solid #ECFEEA;
+	font-weight: normal;
+}
+
+div.dropdown-heading {
+	background-color: #ACCFCC;
+	color: #595241;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-top: 1px solid #ECFEEA;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+div.required {
+	font-weight: bold;
+	color: red;
+	font-size: large;
+	float: left;
+	position: relative;
+	margin-top: -0.313em;
+	height:  0.938em;
+	padding-right: 0.125em;
+}
+
+div#content_text {
+	margin-left: 0.313em;
+}
+
+#content{
+/*
+	padding-top:.5em;
+	margin-top: .5em;
+	background-color: #F5F5F5;
+	
+	border: #A9ADB0 1px solid;
+	border: #cccccc 1px solid;
+	-webkit-border-radius:5px;
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;*/
+	padding-top: .313em;
+}
+form {
+	display:inline;
+	max-width: 100%;
+}
+
+
+optgroup {
+	/*font-size: small;*/
+}
+
+/* paging*/
+div.paging {
+	margin-top: 1em;
+	text-align: center;
+}
+div.paging ul {
+    list-style: none;
+    display: inline;
+    padding: 0;
+	max-width: 10%;
+	margin-bottom: 1em;
+}
+div.paging li { 
+	display: inline; 
+	padding-left: 0.125em; 
+	padding-right: 0.125em;
+	padding-top: 0;
+	padding-bottom: 0;
+	width: 10%;
+}
+
+div.paging li a {
+	text-decoration: none;
+	padding-left: 0.25em;
+	padding-right: 0.25em;
+	border-left: 1px solid white;
+	border-right: 1px solid white;
+}
+
+div.paging li a:hover, div.paging li a.current {
+   border-left: 1px solid #000;
+   border-right: 1px solid #000;
+   color: black;
+}
+
+#tl_corner{
+
+	background-image:url(images/tl_corner.gif);
+	background-position: top left;
+	background-repeat: no-repeat;
+	padding:0;
+}
+
+div.tabs {
+	/* Navigational Plone Tabs(tm), implemented by customizing the a tag - they are surprisingly elegant. The power of CSS runs strong in these :) */
+    background-color: transparent;
+	border-collapse: collapse;
+	border-bottom: 1px solid #B8AE9C;
+	padding: 0.5em 0em 0em 2em;
+	white-space: nowrap;
+}
+
+div.tabs a {
+    /* The normal, unselected tabs. They are all links */
+    background-color: transparent;
+    border-color: #B8AE9C;
+    border-width: 1px; 
+    border-style: solid solid none solid;
+    color: #595241;
+    height: 1.2em;
+    margin-right: 0.5em;
+    padding: 0em 2em 0em;
+    
+}
+
+div.tabs a.selected {
+    /* The selected tab. There's only one of this */
+    background-color: white;
+    border-bottom: #B8AE9C 1px solid;
+    color: #595241;
+    font-weight: normal;
+}
+
+div.tabs a:hover, div.tabs a.active {
+    background-color: #B8AE9C;
+    border-bottom: 1px solid #B8AE9C;
+    color: white;
+}
+
+.headingbox a{
+	color: #4C566C;
+}
+.headingbox a:link, .headingbox a:visited{
+	text-decoration: none;
+}
+div.box {
+}
+h4.box {
+	background-color: #F5F5F5;
+	padding: .313em; 
+}
+h4.box a {
+	display: block;
+	color: #4C566C;
+	background-color: #F5F5F5;
+	text-decoration: none;
+}
+.content-expand {
+	background-image:url("images/content-arrow-down.png");
+	background-position: top right;
+	background-repeat: no-repeat;
+}
+.content-closed{
+	background-image:url("images/content-arrow-up.png");
+	background-position: center right;
+	background-repeat: no-repeat;
+}
+
+div.box {
+	padding: 0.313em;
+	background-color: #F5F5F5;
+	color: black;
+	border: 1px solid #B8AE9C;
+	font-size:0.85em;
+	font-weight: normal;
+	padding:0.125em;
+}
+
+h5.box { 
+    background-color: #6F7172;
+    border: 1px solid #B8AE9C;
+    border-style: solid solid none solid;
+    color: Black;
+    padding: 0em 1em 0em 1em;
+    display: inline;
+	font-size:  1em;
+    height: 1em;
+}
+
+div.box a:link {
+	text-decoration: none;
+}
+
+div.box a:visited {
+	color: #2A6C28;
+	text-decoration: none;
+}
+
+div.box a:hover {
+	text-decoration: underline;
+}
+
+.boxDetails {
+    text-align: right;
+}
+
+div.box .content {
+    padding: 1em;
+	font-size:  1em;
+}
+
+div.box a.close {
+    float: right;
+    text-transform: none;
+    border-left: 1pt solid #B8AE9C;
+    padding: 0em 0.2em;
+}
+
+div.box h1, 
+div.box h2, 
+div.box h3, 
+div.box h4 {
+    margin: 0;
+    padding: 0;
+}
+
+div.box .even {
+    background-color: #F7F3ED;
+}
+
+div.box .odd {
+    background-color: transparent;
+}
+
+
+/* users/index.php */
+
+div.course {
+	position: relative;
+	width: 12.5em;
+	height: 10.5em;
+	border: rgb(204, 204, 204) 1px solid;
+	background-color: #F7F7F7;
+	float: left;
+	margin: 0.188em;
+	padding: 0.313em;
+}
+
+div.course.break {
+	clear: left;
+}
+
+div.course h2 {
+	border: 0;
+	font-weight: normal;
+	font-size: large;
+
+}
+
+div.course:hover {
+	background-color:#FBF4E9;
+	border: #B8AE9C 1px solid;
+}
+
+
+table.data .odd img.headicon{
+	width: 2.469em;
+	height: 2.469em; 
+	-webkit-border-radius:5px;
+}
+
+.icon{
+	-webkit-border-radius:10px;
+	border-color: white;
+	width: 2.5em;
+	height: 2.5em;
+	float: left;
+}
+div.course div.shortcuts {
+	text-align: right;
+	clear: left;
+	vertical-align: middle;
+	width: 12.5em;
+}
+
+fieldset#shortcuts {
+	float: right;
+	background-color: #FEFDEF;
+	border: 1pt solid #B8AE9C;
+	margin: -5pt 5pt 5pt 5pt;
+	padding-right: 10pt;
+	padding-bottom: 5pt;
+	padding-left: 10pt;
+}
+
+.shortcuts{
+
+}
+
+fieldset {
+	margin-bottom: 10pt;
+	-webkit-border-radius:5px;
+	padding: 0 0.375em;
+	width: 90%;
+	margin: 0 auto; 
+	width:95%;
+	margin:0 auto;
+	border:thin #6D7B8D solid;
+	border:thin #A9ADB0 solid;
+	margin-bottom: 1em;
+}
+#shortcuts legend {
+}
+#shortcuts ul {
+	position: relative;
+	margin-top: 0pt;
+	margin-bottom: 0pt;
+	margin-left: 0pt;
+	list-style-type:  none;
+	padding-left: 0pt; 
+}
+
+/*a#guide,*/ a#my-courses-link {
+	background-color: #6D84A2;
+}
+
+#guide img{
+	border:none;
+}
+
+#guide a:hover{
+	
+}
+div#content-text {
+	padding-right: 5pt;
+	line-height:150%;
+}
+
+div#content-text li {
+	margin-left: 15pt;
+}
+
+div#content-test, div.content-from-module {	
+	float: left;
+	margin-top: 2em;
+	margin-bottom: 2em;
+	padding-right: 5pt;
+	width: 80%;
+}
+div#content-test ol{	
+	margin-right: 5pt;;	
+}
+
+div#content-test ol ul li{
+	list-style: none;
+	padding: 0 0.125em 0  0.938em;
+	margin-bottom: 0.063em; 
+	line-height: 200%; 
+	background-color: #fdfdfd; 
+	border-bottom: 1px solid #efefef; 
+	border: 1px solid #eeeeff;
+}
+
+div#content-info {
+	margin: 5pt;
+	font-size: small;
+	color: #b8ae9c;
+	clear: both;
+}
+
+div#container {
+	text-align: left;
+	margin: 0 auto;
+	padding: 0;
+	border:0;
+	width: 95%;
+}
+
+div#menutoggle{
+	text-align: right; 
+	padding-bottom: 0.625em; 
+	padding-right: 0.625em; 
+	float: left; 
+	margin-top: 0.625em; 
+	padding-right: 0.313em; 
+	font-size:0.95em;
+}
+
+
+/* login page */
+div.column {
+	float: left;
+	width: 45%;
+	margin: 0.313em;
+	min-width: 10.625em;
+}
+
+div.column h3 {
+	background-color: #F6EAD6;
+	border-bottom: .05em solid #6F7172;
+	font-size: small;
+	display:block;
+	color:black;
+	font-weight:600;	
+	padding-left:0.5em;
+}
+
+div.insidecol {
+   min-height: 10.625em;
+   height: 10.625em;
+   padding:0.313em;
+}
+
+
+/* index page */
+ul#home-links, ul#home-detail-links {
+	list-style: none;
+}
+ul#home-links li {
+	
+	display: inline;
+	float: left;
+	padding: 0.8em;
+	text-align: center;
+	margin: 0.1em;
+	width: 8.5em;
+	height: 7.0em;
+	padding-left:0;
+
+}
+ul#home-links li a {
+	text-decoration: none;
+	border: 1px transparent;
+	font-weight: bold;
+}
+ul#home-links li a img {
+	border: 0;
+	display: block;
+	padding-left:1.563em;
+}
+
+/*my start page */
+#my_courses_container{
+	text-align: left;
+	margin: 0 auto;
+	border:0;	
+	min-width: 100%;
+}
+#my-courses-navlist{
+}
+.my-courses-list{
+	border: solid 1px #A9ADB0;
+	-webkit-border-radius:5px;
+	padding: .375em;
+	color: #4C566C;
+	margin: .375em;
+	padding: .375em;
+}
+.my-courses-list-ul{
+	margin: 0 auto;
+	padding-left: 0;
+	width: 100%;
+}
+.my-courses-links{
+	font-size: 80%;
+	padding-top: .75em;
+}
+.my-courses-resume{
+	float: right;
+}
+.fl-link-summary{
+	padding-left: 0.875em;
+	padding-bottom: 0.875em;
+	display: inline;
+}
+.fl-list-menu li a {
+}
+.fl-theme-iphone [class*="fl-list"]:not(.fl-list):not(.fl-grid) a {
+}
+.fl-theme-iphone [class*="fl-list"] > li .fl-link-summary{
+	color: #4C566C;
+}
+.current_head{
+	padding-top: .5em;
+}
+.fl-list-menu {
+
+}
+
+.current_box{
+	max-width: 100%;
+}
+.current_list{
+	width: 95%;
+	padding: 0 0.375em;
+}
+.current_list li{
+	list-style-type: none;
+	padding:0;
+	margin:0;
+
+}
+.current_list img{
+
+}
+
+#show-all{
+	text-align: center;
+}
+/* enrollment tabs */
+#navlist {
+	padding: 0;
+	margin-left: 0;
+	margin-right: auto;
+	margin-left: auto;
+	margin-bottom: .25em;
+	margin-top: 0.938em;
+	white-space: nowrap;
+}
+
+#navlist li {
+	list-style: none;
+	display: inline;
+	margin: 0;
+}
+
+#navlist li a {
+	padding: 0.188em 0.563em;
+	border: 1px solid #F7F3ED;
+	border-bottom: none;
+	background-color: #F7F3ED;
+	text-decoration: none;
+	margin-left: .25em;
+	white-space: nowrap;
+}
+
+#navlist li a:hover, #navlist li a:active {
+	color: #000;
+	background-color: #fff;
+}
+
+/* tree */
+.img-size-tree {
+	vertical-align: middle;
+	margin-top: 0;
+    padding:0;
+	height:1.45em;
+	width:1.5em;
+}
+/* profile page */
+
+dl#public-profile {
+	width: 100%;
+	
+}
+
+dl#public-profile {
+	width: 100%;
+	
+}
+dl#public-profile dt {
+	float: left;
+	width: 90%;
+	border-right: 1px solid #F7F3ED;
+	padding: 0.313em 0.313em 0.313em 0;
+
+	margin-right: 0.313em;
+}
+dl#public-profile dd {
+	margin: 0;
+}
+
+div.social-right{
+	margin-left:.5em;
+	margin-top: 1em;
+}
+div.social-left{
+	margin-left:.5em;
+}
+h4.profile{
+	float: left;
+}
+.social-wrapper h3{  
+	padding-top: .5em;
+}
+.my-contacts h3{
+	padding-bottom: .375em;
+}
+img#profile{
+	border: 1px #cccccc solid;
+	margin-left: 1em;
+}
+dd{
+    margin: 0;
+}
+
+
+/** forum stuff **/
+#forum-thread li {border:1px solid #eee; border-bottom: 1px solid #F7F3ED; float:left; width: 97%; list-style: none; }
+#forum-thread li.even { background-color: #F7F3ED; border-top: none; }
+#forum-thread li.odd { background-color: #fff; }
+div.forum-post-author { float:left; width:19.375em; padding:0.5em 0.625em; }
+div.forum-post-author a.title {font-size: 1.1em; line-height: 1.2em; font-weight: bold; text-decoration:none; }	
+div.forum-post-author img.profile-picture { border: 2px solid #F7F3ED; text-align:right;}
+div.forum-post-content { margin-left: 19.375em; padding: 0.313em 0 1.125em 1.125em;}
+div.forum-post-content h3 { font-weight: 500; float:left;clear:right; }
+div.forum-post-ctrl { float: right; padding-right: 0.313em; color: #a1a1a1;}
+div.forum-post-ctrl a { text-decoration: none; }
+div.forum-post-ctrl span { color: black; background-color: #fefdc2; padding: 0.188em; }
+div.forum-post-content p.date { color: #a1a1a1; border-bottom: 1px solid #F7F3ED; }
+div.forum-post-content div.body p { margin-bottom:1em; }
+div.forum-paginator{border:thin #cccccc solid; padding:.3em; width:95%;margin:auto;background-color:#F7F3ED;}
+span.forum-paginator-active{font-weight:700;text-decoration:underline; height:2em;}
+
+
+
+/** inbox stuff - reuses some of the forum layout **/
+#inbox-msg li {border:1px solid #eee; border-bottom: 1px solid #F7F3ED; width: 95%; list-style: none; min-height: 11em;}
+	
+/*  tool list on admin home and manage screens  */
+ li.top-tool { 
+	list-style: none;
+	padding: 0.125em 0.125em 0.125em  0.938em;
+	margin-bottom: 0.313em; 
+	line-height: 200%; 
+	border: solid 1px #A9ADB0;
+	-webkit-border-radius:5px;
+}
+li.top-tool a {  font-weight: bold; } /* ol#tools>li>a */ 
+
+li.child-tool a { 
+	font-size: x-small;
+	font-weight: normal; 
+}
+
+/* ol#tools>li>ul, */ 
+ul.child-top-tool {
+	margin-top: -0.313em;
+	padding-left: 0;
+	margin-left: 0;
+	display: inline;
+}
+ul.child-top-tool:before {
+	content: " : ";
+}
+
+li.child-tool {
+	display: inline;
+	margin-right: 0.313em;
+	font-size: x-small;
+}
+
+.img-size-home {
+	height:3.85em;
+	width:3.9em;
+}
+
+/* browse courses */
+div.browse-course {
+	width: 28em;
+	padding-bottom: 0.625em;
+	background-color: #fffaf0;
+	border:1px #6F7172 solid;
+	font-size:9pt;
+	min-height:18em;
+	margin:auto;
+	margin-left:1em;
+	margin-top:1em;
+}
+
+dl.browse-course {
+	width: 90%;
+	padding-bottom: 0.625em;
+	background-color: #fffaf0;
+
+	margin:auto;
+	margin-left:1em;
+}
+dl.browse-course dt {
+	float: left;
+	font-weight: bold;
+	width: 25%;
+	text-align: right;
+	clear: left;
+	padding: 0.313em 0.625em 0.313em 0;
+	vertical-align: middle;
+
+}
+dl.browse-course dd {
+	margin-bottom: 0.313em;
+	clear: right;
+	padding: 0.313em 0 0.313em 0.625em;
+	margin-left: 26%;
+
+}
+.row .buttons{
+	border: none;
+}
+
+/*  form fields grouping for WCAG 2.0 conformance*/
+
+fieldset.group_form{
+	width:95%;
+	margin:0 auto;
+	margin-bottom: 1em;
+	border: 1px #6D7B8D solid;
+	-webkit-border-radius:5px;
+}
+
+legend.group_form{
+	background-color:white;
+	font-weight: 600;
+	color: #4c566c;
+	padding:.5em;
+	border: 1px #6D7B8D solid;
+	-webkit-border-radius:5px;
+}
+/* file storage */
+
+#fsfloat1{
+	float:right;
+}
+#fsfloat2{
+	float:right;
+	width:48%;
+}
+
+
+/* highlight active links for WCAG 2.0 conformance */
+a:active, a:hover,a:focus{
+	background-color:#F6EAD6;
+	color:#000000;
+	
+	background-color: #e6e6e6; 	
+ 	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+  
+}
+}
+
+
+/*Added by Silvia */
+div.column_primary {
+	float: left;
+	width: 42%;
+	margin: 0.313em;
+	padding: 0;
+	min-width: 10.625em;
+/*	position: relative;*/
+}
+
+div.column_equivalent{
+	float: left;
+	width: 52%;
+	margin-left:  0.938em;
+	margin-top: 0.313em;
+	margin-right: 0.313em;
+	margin-bottom: 0.313em;
+	min-width: 10.625em;
+	padding: 0.313em;
+	border: 1px solid #EEE;
+	background-color: #FFF;
+/*	position: relative;*/
+
+}
+
+div.resource_box{
+	border: 1px solid #aaa;
+	width: 95%;
+	margin: 0.313em;
+	padding: 0.313em;
+	min-width: 9.375em;
+	background-color: #eee;
+/*	position: relative;*/
+}
+
+h2.alternatives_to{
+	margin-top: 0.75em;
+	font-size: 90%;
+	color: #A50707;
+}
+
+div.alternative_box{
+	border: 1px solid #ddd;
+	/*width: 90%;*/
+	margin: 0.313em;
+	padding: 0.313em;
+	min-width: 9.375em;
+	background-color: #fff;
+}
+
+div.alternative_box legend {
+	color: #000;
+}
+
+div.resource_box legend {
+	color: #000;
+}
+
+label.primary a{
+	color: #A50707;
+	font-weight: bolder;
+	background-color: white;
+}
+
+/* format of "table of contents" on content page */
+#toc a 		{ display:block; margin:0.188em; }
+#toc .h2, #toc .h3, #toc .h4, #toc .h5, #toc .h6{ 
+	padding:0 0 0 0;
+}
+
+
+fieldset#toc {
+	background-color: #FEFDEF;
+	border: 1pt solid #B8AE9C;
+	width:89%;
+}
+
+#side-menu{
+	overflow:hidden;
+}
+
+/* cleans up glossary question mark line spacing*/
+sup{
+	border: 1pt solid #B8AE9C;
+	vertical-align:bottom;
+	margin-top: 1em;
+}
+
+/* jQuery tooltip styles */
+#tooltip{
+	position:absolute;
+	z-index:3000;
+	border:3px solid #111;
+	background-color:#eeeeee;
+	padding:0.313em;
+}
+#tooltip h3,#tooltip div{
+	margin:0;
+}
+
+/* style for home page modules "detail view" */
+div.home_box {
+	padding: .75em 0;
+	margin: 0 auto;
+}
+
+.outside_box{
+	background:#e0e0e0;
+	width: 17em;
+	margin: .375em;
+	padding: 0;
+	height:9.8em;
+}
+
+.inside_box{
+	width:100%;
+	margin:auto;
+	height:52%;
+	margin-bottom:.2em;
+	background:#eeeeee;
+
+}
+.details_or{
+	width:28.8em;
+	height:9.8em;
+	margin:0;
+	background-image:url(images/details_r.png);
+	background-position: top right;
+	background-repeat:no-repeat;
+}
+.details_ol{
+	height:9.8em;
+	margin:0;
+	width:.45em;
+	background-image:url(images/details_l.png);
+	background-position: top left;
+	background-repeat:no-repeat;
+}
+.details_ir{
+	width:.5em;
+	height:100%;
+	float:right;
+	background-image:url(images/details_ir.png);
+	background-position: top right;
+	background-repeat:no-repeat;
+}
+.details_il{
+	height:100%;
+	float:left;
+	background-image:url(images/details_il.png);
+	background-position: top left;
+	background-repeat:no-repeat;
+}
+.home-title{
+	font-size:12pt;
+}
+.buttonbox{
+	float:right;
+}
+.details_text{
+	margin-left:1em;
+}
+.draggable_selected {
+	background-color: lightgrey;
+	cursor: move;
+}
+
+div.menuedit{
+	float:right;
+	margin-top:-1.2em; 
+	border:1px solid #cccccc;
+}
+li.folders {
+	list-style: disc url(../../images/folder.gif) outside;
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+	margin-bottom: 0;
+	margin-top: 0;
+	margin-right: 0;
+}
+
+li.folders .disabled {
+	color: #B8AE9C;
+}
+
+ul.folder{
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0em;
+	padding:0em;
+}
+
+
+/*	hiding/showing top navigation and results-display */
+
+#topnavlist-link {
+	color: white;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+ul#topnavlist {
+	display: none;
+	position: relative;
+	top: 1.2em;
+	z-index: 1;
+	background-color: white;
+}
+
+div#results-display{
+	display: none;
+}
+
+ul#topnavlist li {
+	padding: 0;
+	margin: 0;
+}
+ul#topnavlist li a.active {
+	color: black;
+	font-style: italic;
+	}
+	
+ul#topnavlist li a:hover, ul#topnavlist li a:focus {
+	/*Replicates mobile FSS list highlighting, currently there's a bug:
+		see:	http://issues.fluidproject.org/browse/FLUID-4313
+	/*border: 1px solid #e0e0e0;*/
+	background-color: #e6e6e6;
+	color: black; 	
+	
+ 	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+    -webkit-tap-highlight-color:url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+}
+
+ul#topnavlist li a  {
+ 	color: #4C566C;
+ 	text-decoration: none;
+}
+
+
+div.toolcontainer{
+	border: #A9ADB0 1px solid;
+	border: #cccccc 1px solid;
+	-webkit-border-radius:5px;
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+
+ul#subnavlist {
+	padding: 0;
+	padding-bottom: 0.313em;
+	margin: 0;
+	font-size: 90%;
+}
+
+
+ul#subnavlist li {
+	display: inline;
+}
+
+ul#subnavlist li#test{
+	display: none;
+}
+ul#subnavlist li a:hover, ul#subnavlist li a:focus, ul#subnavlist li a.active{ /*
+  	color: black;
+	text-decoration:none;*/
+}
+
+ul#subnavlist li a, ul#subnavlist li a:visited {
+	color: #4C566C;
+}
+
+
+/* list attributes */
+ul {
+	list-style: none;
+}
+li {
+	color: black;
+	list-style: none;
+}
+
+ol#tools>li:hover, ol#tools>li:hover a {
+	/*border: 1px solid #e0e0e0;*/
+	background-color: #e6e6e6;
+	color: black; 	
+	
+ 	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+  	
+}
+
+
+#content-contentwrapper{
+	height:100%;
+    position:relative;	
+	z-index:1000;			
+	width:100%;
+	overflow:hidden;
+}
+
+#leftcolumn{
+	float: left;
+	width: 17em;
+	margin-left: 0.313em;
+	margin-top:-0.625em;
+}
+
+#copyright{
+	font-size: 0.5em;
+}
+#gototop{
+	text-align: center;
+	color: #4B6B90;
+}
+
+#tools{
+	margin: 0 auto;
+	padding: 0.375em;
+}
+
+
+/* ATutor Social Styles */
+
+div .profile_container {
+	background-color:#eee; 
+	border: 1px solid #8e8e8e; 
+	width:80%; 
+	padding:0.5em; 
+	margin-bottom: 0.5em;
+}
+
+div .profile_container .top_right {
+	float: right;
+}
+
+dl.public-profile dd{
+	margin-left:0;
+}
+dl.public-profile dt {
+	float: left;
+	font-weight: bold;
+	min-width:12em;
+}
+
+/* Search form */
+div .search_form {
+	margin-bottom: 1em;
+}
+
+div .search_form .row{
+	background-color: #DEDEC0;
+	padding: 0.5em;
+}
+div .button {
+	background-color: #eee;
+	border: 1px solid #aaa;
+}
+div .button:hover{
+	background-color: #cccccc;
+	color: #ffffff;
+}
+
+/* Side menu */
+
+
+ul.social_side_menu {
+	padding-left: 2em;
+}
+ul.social_side_menu li {
+	padding-bottom: 0.2em;
+	list-style: circle;
+}
+
+div .divider {
+	border-bottom:1px solid #C1C157; 
+	padding-bottom:0.5em; 
+	margin-bottom:0.5em;
+}
+
+.activity{
+ 	line-height:18pt;
+	font-size:.8em;
+}
+
+div.contentbox, input-form{
+
+	padding:.5em;
+	background-color: #ffffff;
+    overflow:hidden;
+    border: #A9ADB0 solid 1px;
+	-webkit-border-radius: 5px;
+}
+
+div.suggestions{
+	border:1px solid #a50707;
+	margin-left:0.625em; 
+	width:50%;
+}
+li.inlinelist{
+	display: inline; 
+	padding-right: 1em;
+}
+ul.social_inline_menu{
+	background-color: #eeeeee;
+	border:thin #cccccc solid;
+	padding:.5em;
+	width:90%;
+	margin:auto;
+}
+div.social-wrapper{ 
+	width: 100%;
+}
+
+
+.contentbox-a{
+    width: 100%;
+}
+.contentbox-b{
+    padding-bottom:0.2em;
+}
+ 
+div.logo{
+float:left;
+clear:right;
+margin-left:2em;}
+
+
+
diff --git a/docs/themes/simplified-desktop/blackberry.css b/docs/themes/simplified-desktop/blackberry.css
new file mode 100644
index 000000000..8bf3b88bb
--- /dev/null
+++ b/docs/themes/simplified-desktop/blackberry.css
@@ -0,0 +1,2263 @@
+/* Style is optimized for blackberry devices. Classes beginning with ".fl-" are overriding Mobile FSS, 
+see the API @ http://wiki.fluidproject.org/display/fluid/Mobile+FSS+API 
+for more details. 
+*/
+html, body{
+	height: 100%;
+}
+#main{
+	padding-bottom: 2.3em;
+	overflow: auto;
+}
+
+body,ul,li {
+	padding:0;
+	margin:0;
+}
+
+.fl-theme-iphone{
+	background: white;	
+}
+
+#header{
+	width:100%;
+	height:1.063em;
+	line-height:2.813em;
+	padding:0;
+	font-size:1.063em;
+	color:#3866C4 !important;
+}
+
+#header-section-title {
+	text-align: left;
+	background-color:#fff; /*testing - joel*/
+	color:#3866C4 !important;
+	padding-bottom:2px;
+	font-size:18px !important;
+}
+
+/*.fl-theme-blackberry .fl-navbar{
+	border: none;
+	border-top: none;
+}
+*/
+
+.fl-navbar {border:none !important;}
+.fl-navbar a{
+	font-size: 0.969em;
+	/*background-image: -webkit-gradient(linear, left top, left bottom,
+   	from(#4b6b90),
+    color-stop(0.5, #6d8cb3),
+    color-stop(0.50, #4b6b90),
+    color-stop(0.5, #6d8cb3),
+    to(#4b6b90)
+    ); */
+}
+
+.fl-navbar .fl-tabs {
+	padding-top: .3em;
+	padding-bottom: .3em;
+	background-color: #F4F4F4; 
+		border: 1px solid #999;
+
+    height: 2em;   
+}
+
+#navigation-contentwrapper{
+	position: relative;
+	background-color: #F4F4F4;
+	border: 1px solid #999;
+	height: 2.5em; 
+}
+
+#navigation-bar{
+ 	height: 2.5em; 
+    padding-bottom: .3em;
+     
+}
+
+#wrapper{
+	width:100%;
+	overflow:hidden;
+	overflow: auto;
+	min-height: 100%;
+}
+
+#site-name, h1#section-title{
+/* Armin 31.08.2010: Remove display: inline to make heading 1 show on Blackberry */
+/*	display: inline;*/
+	font-size: 90%;
+	color: #3866C4;
+}
+
+#site-name {padding-bottom:4px;}
+
+/*this CSS creates a button that looks exactly like a Mobile FSS tab.*/
+
+#topnavlist-link a:link {color:red !important;}
+
+.navigation-bar-button {
+	/* -webkit-border-radius: 5px;*/
+	font-size: 18px;
+	color: #000;
+	position: relative;
+	top: .69em;
+	left: 0.188em;
+	padding-right:20px;
+	color:# !important;
+	text-decoration:underline;}
+	
+
+    /* default mobile fss color scheme for tabs not AA compliant. Here is a compliant bg image: */
+   /* background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    );
+ 	-webkit-border-image: url(images/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+    -webkit-border-left-image: none;
+    -webkit-background-origin: border;
+    -webkit-background-clip: border;
+    /* to mimick the mobile FSS scolor scheme (iphone) uncomment these lines 
+	background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#9aafca),
+        color-stop(0.5, #6d8cb3),
+        color-stop(0.50, #4b6b90),
+        to(#4b6b90)
+    );*/
+}
+
+.navigation-bar-button a {color:#000;}
+
+
+.fl-theme-iphone .fl-tabs li{
+    /* default mobile fss color scheme for tabs not AA compliant against a white foreground text.therefore its backgroud-image must be overrided */
+    /*background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    ); */
+}
+
+div#content-link-container{
+	background-color:#F5F5F5;
+	padding:.375em;
+	border: #A9ADB0 solid 1px;
+	/*-webkit-border-radius: 2px;*/
+}
+#content_link{
+	display: block;
+}
+#home-guide{
+	position: absolute;
+	top: .45em;
+ 	right: 0.188em; 
+ 	font-size: 17px;/*keep this in px*/
+	white-space:nowrap;
+	display: inline;
+
+}
+#home-guide a{
+	color:#6699ff;
+}
+/* main body attributes */
+p {
+    text-align: left;
+    line-height: 150%;
+	font-size: 1em;
+	padding:.75em 0;
+	margin: 0 auto;
+}
+
+p a {
+    text-decoration: underline;
+}
+
+p a:visited {
+	color: #3F2670;
+    background-color: transparent;
+}
+p a:active {
+	color: #A50707;
+    background-color: transparent;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	color: #333;
+	clear: right;
+	font: 100% Helevetica, Arial, sans-serif;
+	font-weight: bold;
+	margin: 0;
+	padding: 0;
+}
+
+h1 {
+    font-size: 160%;
+	color: #FFF;
+}
+
+h2 {
+    font-size: 150%;
+}
+h2.sidebox{
+    font-size: 110%;
+}
+h3 {
+	font-size: 130%;
+	padding-top: 0;
+	padding-right: 0;
+	padding-bottom: 0.5em;
+	padding-left: 0;
+}
+h3.browse-courses{
+	font-size: 90%;
+	text-decoration: none;
+	clear: none;
+	display: inline;
+}
+h3 a {
+    font-size: 100%;
+}
+h4 {
+    font-size: 120%;
+}
+
+
+h5 {
+    font-size: 100%;
+}
+
+
+/* Preferences tabs */
+.etabbed-list-container	{
+	padding:0;
+	margin: 0;
+	width:70%;
+	clear: left;
+	height: 3em;
+}
+
+.prefs_buttontab {
+	padding:0;
+	margin: 0;
+	white-space: nowrap;
+}
+.prefs_tab{
+	padding:0.5em 0.3em 0;
+	margin: 0;
+	white-space: nowrap;
+    display: inline;
+}
+
+.prefs_tab_selected{  
+	padding:0.7em 0.3em 0;
+	margin: 0;
+	margin: 0px;
+	font-weight:bold;
+	text-align:center;
+	white-space: nowrap;
+    display: inline;
+}
+
+
+
+/*  Table of content attributes*/
+p.toc{
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+	background-color: #E9F4F3;
+	padding: .6em;
+	margin-bottom: .6em;
+	margin-top: 0em;
+	margin-left: 1em;
+	margin-right: 3em;
+	border: 1px #ACCFCC solid;
+} 
+
+
+/* link attributes */
+a:link, a:visited  {
+	color: #5984C4;
+	text-decoration: underline;
+}
+a:hover {
+	color: #5984C4;
+	text-decoration: underline;
+}
+a:active {
+	color: #ffffff;
+	text-decoration: underline;
+}
+/* align text to the left */
+.left {
+	text-align: left;
+}
+
+a.dropdown-title {
+	color: white;
+	font-weight: normal;
+	text-decoration: none;
+}
+
+
+/* table border */
+.tableborder {
+	border: 1px #595241 solid;
+}
+
+/* main submit button */
+.button {
+	background-color: #3866C4 !important;
+	font-weight:bold;
+	color:#fff;
+	text-align: center;
+		border:  #153877  solid 1px;
+
+	/*-webkit-border-radius:3px;*/
+	padding-top: 0.313em;
+	padding-bottom: 0.313em;
+	
+
+
+}
+.button:focus {
+	
+}
+/* small submit button at top */
+.button2 {
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+	background-color: #3866C4;
+
+}
+.button2:focus {
+	background-color: #3866C4;
+	border:  #ACCFCC  solid 1px;
+}
+
+/* date attributes */
+small.date {
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+	color: #595241;	
+	margin-bottom: 0; 
+	margin-top: 0;
+	margin-left: 0.313em;
+	margin-right: 0;
+	font-size:1em;
+}
+
+/* page breakline */
+hr {
+	color: #ACCFCC;
+	background-color: white;
+	height: .063em;
+}
+
+/* message box styles */
+
+/* Editor box small */
+.editorsmallbox {
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+	background-color: #E9F4F3;
+	padding: 0.125em;
+	padding-right: .188em;
+	border: 1px #ACCFCC solid;
+}
+
+/* Editor box large */
+.editorlargebox {
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+	background-color: #E9F4F3;
+	margin-left:1em;
+	padding-left: .2em;
+	padding-right: .5em;
+	padding-top: .5em;
+	padding-bottom: .4em;
+	border: 1px #ACCFCC solid;
+}
+
+
+select.dropdown {
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+}
+
+.highlight, a.highlight {
+	background-color: #5B8E88;
+	color: white;
+}
+
+a .highlight{
+	background-color: #5B8E88;
+	color: white;
+}
+
+.center {
+	text-align: center;
+}
+
+
+/* edit content tabs */
+.buttontab {
+	background-color: #E6E6E6;
+	font-weight: 500;
+	border:0;
+	padding-left: .188em;
+	padding-right: .188em;
+	padding-top: .188em;
+
+}
+
+.tab {
+	color: black;
+	background-color: #E6E6E6;
+	border-top: 1px #B8AE9C solid;
+	border-left: 1px #B8AE9C solid;
+	border-right: 1px #B8AE9C solid;
+	text-decoration: none;
+	text-align: center;
+	font-weight: bold;
+
+	
+}
+.buttontab selected {
+	font-family: Helvetica, Arial, Helvetica, sans-serif;
+	background-color: #6F7172;
+	font-weight: 600;
+	border:0;
+	padding-left: .188em;
+	padding-right: .188em;
+	padding-top: .188em;
+
+}
+td.selected{
+	font-family: Helvetica, Arial, Helvetica, sans-serif;
+	font-weight: 600;
+	text-decoration: none;
+	text-align: center;
+	background-color: white;
+	border-top: 1px #B8AE9C solid;
+	border-left: 1px #B8AE9C solid;
+	border-right: 1px #B8AE9C solid;
+}
+.econtainer{
+	background-color: #fffaf0;
+	border:1px #6F7172 solid;
+	margin-left:.5em;
+}
+
+.tab a:link, .etab a:visited {
+	color: black;
+	background-color: white;
+
+}
+.tab a:hover {
+	color: black;
+	background-color: white;
+}
+
+.etabself {
+	background-color: #6F7172;
+
+	text-align: center;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+
+.unsaved {
+	color: red;
+	background-color: #FFFDE0;
+	font-weight: bold;
+}
+.saved {
+	background-color: #FFFDE0;
+	margin: 0.625em;
+}
+
+
+/* the side menu */
+td.dropdown-heading {
+	background-color: #DBFDD4;
+	color: #595241;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-top: 1px solid #ECFEEA;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+td.dropdown-heading a, td.dropdown-heading a:hover, td.dropdown-heading a:visited {
+	text-decoration: none;
+}
+
+td.dropdown-heading.closed {
+	border-bottom: 1px solid #ECFEEA;
+}
+
+/* the side menu content */
+td.dropdown {
+	padding: 0.125em;
+	background-color: white;
+	color: black;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-bottom: 1px solid #ECFEEA;
+	font-weight: normal;
+}
+td.dropdown a, td.dropdown a:visited  {
+	color: #595241;
+	text-decoration: none;
+}
+td.dropdown a:hover {
+	color: #595241;
+	text-decoration: underline;
+}
+td.dropdown.cell {
+	border-bottom: 0;
+}
+td.dropdown strong {
+	color: #2A6C28;
+}
+
+/* added for 1.4.2: */
+.results {
+	padding-left: 1.25em;
+}
+
+h5.search-results {
+	padding: 0.063em;
+	margin-bottom: 0.313em;
+	margin-top: 1em;
+	padding-top: 3em;
+	margin-left: 0.313em;
+}
+
+small.search-info {
+	color: #595241;
+}
+
+p.search-description {
+	background-color: #FFFCE5;
+	color: #595241;
+}
+
+.test-box {
+	background-color: #F7F3ED;
+	color: #595241;
+	border-left: 1px solid #595241;
+	border-right: 1px solid #595241;
+	border-top: 1px solid #595241;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+/*preferences*/
+
+.input-form 
+table.tabbed-table {
+	width: 100%;
+	border:thin black solid;
+}
+table.tabbed-table th#left-empty-tab {
+	background-color: transparent;
+	width: 0.938em;
+	border-bottom: 1px solid #B8AE9C;
+}
+table.tabbed-table th#right-empty-tab {
+	text-align: right;
+	background-color: transparent;
+	border-bottom: 1px solid #B8AE9C;
+	width: 25em;
+	padding-right: 0.313em;
+}
+table.tabbed-table th#right-empty-tab a {
+	text-decoration: underline;
+}
+table.tabbed-table th.tab-spacer {
+	background-color: transparent;
+	width: 0.313em;
+	border-bottom: 1px solid #B8AE9C;
+}
+
+table.tabbed-table th.tab {
+	padding-top: 0.125em;
+	padding-bottom: 0.125em;
+	width: 6.875em;
+	background-color: #E9F4F3;
+	border-bottom: 1px solid #B8AE9C;
+	border-left: 1px solid #B8AE9C;
+	border-top: 1px solid #B8AE9C;
+	border-right: 1px solid #B8AE9C;
+}
+table.tabbed-table th.tab:hover {
+	background-color: #ACCFCC;
+}
+
+table.tabbed-table th.tab a:focus {
+	color: white;
+}
+table.tabbed-table th.selected {
+	padding-top: 0.125em;
+	padding-bottom: 0.125em;
+	width: 6.875em;
+	background-color: #ACCFCC;
+	border-left: 1px solid #B8AE9C;
+	border-top: 1px solid #B8AE9C;
+	border-right: 1px solid #B8AE9C;
+}
+
+table.tabbed-table a, table.tabbed-table a:visited, table.tabbed-table a:hover {
+	color: black;
+	text-decoration: none;
+}
+
+
+.preference-buttons-container{
+	background-color: red;
+	height: 2.5em;
+	width: 100%;
+	text-align: center;
+}
+
+div.preference-buttons-container li{
+	display: inline; 
+	float: right;
+}
+
+.prefs_tab_selected{
+	font-style: italic;
+	width: 10%;
+}
+.prefs_tab{
+	width: 10%;
+}
+
+.etabbed-table{
+	margin: 0 auto;
+}
+#previewText{
+	font-family: monospace;
+	border: 2px solid rgb(0, 0, 0); 
+	padding: 2em;
+	width: 80%; 
+	color: rgb(255, 255, 255);
+	background-color: rgb(0, 0, 0);
+}
+#previewArea{;
+	padding: 0em;
+	border-bottom-width: 0; 
+	margin-left: auto; 
+	margin-right: auto; 
+	font-weight: normal; 
+	width: 70%;
+	float:left;
+	clear:right;
+}
+#display-settings-preview{
+	width:90%;
+	height:20em; 
+	margin: 0 auto;
+}
+#feedback{
+	width: 100%;
+	padding: 2px;
+}
+#defaultfontsize-wrapper{
+	width:90%; 
+}
+
+/* end of preferences */
+
+a#my-start-page {
+	padding: 0.125em;
+	padding-left:  0.938em;
+	background-repeat: no-repeat;
+	background-position: 0.125em 0.313em;
+}
+
+a#back-to {
+	padding-left: 1.25em;
+	background-image: url(images/back.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0;
+}
+
+.breadcrumbs, .previous-next /*a#guide*/{
+    /* The path bar, including breadcrumbs and add to favorites */
+	clear:both;
+    font-size: 0.85em;
+	padding:0 0.375em;
+	color: #5984C4;
+	background-color: white;
+
+}
+#breadcrumbs-container{
+	background-color: #4d4d4d;
+	position: relative;
+}
+.breadcrumbs{
+	display:none;
+}
+h2.page-title {
+	padding-top: .5em;
+	margin-top: .5em;
+}
+h1 {
+	margin-bottom: 0.313em;
+	
+}
+
+
+div#help {
+	border-left: 1px solid black;
+	border-right: 1px solid black;
+	border-bottom: 1px solid black;
+	padding-left: 0.313em;
+	padding-right: 0.313em;
+	padding-bottom: 0.313em;
+	background-color: #F7F3ED;
+	margin-left: 0.313em;
+	margin-right: 0.313em;
+	font-size: small;
+}
+
+h3#help-title {
+	margin-left: 0.313em;
+	margin-right: 0.313em;
+	border-left: 1px solid black;
+	border-right: 1px solid black;
+	padding: 0.063em;
+	background-color: #F7F3ED;
+}
+.line {
+	border-bottom: 1px solid black;
+}
+div#help p {
+	padding: 0;
+	margin: 0;
+}
+
+div#toctoggle {
+	float: left;
+	padding-left: 0.625em;
+}
+
+h1#section-title {
+	font-size: 90%;
+}
+
+div#top-links {
+	margin: 0 auto;
+	font-size: .938em;
+/* moved inside of #footer for mobile theme */
+}
+#footer{
+	/*width:100%;*/
+	height:2.3em;
+	/*background-color: #4b6b90;*/
+	margin-top: -2.3em;
+	position: relative;
+	clear: both;
+	
+}
+
+div#top-links a:link, div#top-links a:visited {
+	text-decoration:none;
+}
+
+#jumpmenu:focus{
+	background-color:#F6EAD6;
+}
+#jumpmenu{
+	margin: 0 auto;
+}
+
+a#editor-link {
+	background-color: #F7F3ED;
+	padding-top: 0.063em;
+	padding-bottom: 0.063em;
+	padding-left:  0.938em;
+	padding-right: 0.5em;
+	border: 1px solid #cccccc;
+	font-weight: normal;
+	text-decoration: none;
+}
+
+a#editor-link:hover {
+	background-color: #F7F3ED;
+	border: 1px solid #B8AE9C;
+}
+
+a#editor-link.off {
+	background-image: url(images/pen.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0.125em;
+}
+a#editor-link.on {
+	background-image: url(images/pen2.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0.125em;
+}
+
+
+/* for data tables */
+table.data {
+	width: 95%; 
+	margin: 0 auto;
+	padding: 0;
+	color: black;
+	text-align: left;
+	/*-webkit-border-radius:5px;*/
+	border: #6D7B8D 1px solid;
+
+} 
+/* contains the headings */
+table.data th {
+
+	padding: 0.188em;
+}
+
+table.data th a {
+	color: #595241;
+	background-image: url('../default/images/sort.gif');
+	background-repeat: no-repeat;
+	background-position: right;
+}
+
+table.data tbody {
+	border-top: 1px solid #B8AE9C;
+	border-bottom: 1px solid #B8AE9C;
+}
+/*headings text*/
+table.data tbody th {
+	text-align: left;
+
+}
+
+table.data td {
+	padding: 0.188em;
+	color: black;
+	font-size: .875em;
+	font-style: normal;
+}
+table.data td a:link, a:visited{
+	color: black;
+}
+table.data tbody tr:hover {
+	background-color: #efefef;
+	cursor: pointer;
+}
+
+table.data tbody tr.selected {
+	background-color: #E9F4F3;
+	cursor: auto;
+}
+
+table.data tfoot {
+	background-color: #F7F3ED;
+}
+
+table.data tfoot tr:first-child td {
+	padding: 0.313em;
+	background-image: url('images/arrow_ltr.gif');
+	background-repeat: no-repeat;
+	background-position: .25em 0.313em;
+}
+
+table.data.static tfoot td, table.data.static tfoot tr:first-child td {
+	border-top: 1px solid #B8AE9C;
+	padding: 0.313em;
+	background-image: none;
+	padding-left: 0;
+
+}
+/* add borders to row in Required Information, Personal Information*/
+.row{
+	padding:.375em 0;
+	border-bottom: 1px #cccccc solid;
+	font-size: 0.938em;
+}
+#last-row, .row-buttons, #last-row1, .row-blurb{
+	border: none;
+}
+#browse-courses-table{
+	font-size: .875em;
+}
+
+
+/*buttons*/
+table.data tfoot input {
+	background-color: #efefef;
+	font-weight: normal;
+	border:  #AAA  solid 1px;
+}
+table.data tfoot input:focus {
+	background-color: #FFDAB9;
+	border:  #AAA  solid 1px;
+}
+
+
+/* used for static tables with no form elements: */
+table.data.static tbody tr:hover {
+	background-color: transparent;
+	cursor: auto;
+}
+
+
+
+/* course browser: */
+
+div#browse {
+	margin-left: auto; 
+	margin-right: auto; 
+	width: 80%;
+}
+
+div.browse-selected {
+	background-image: url('images/side_arrow.gif'); 
+	background-repeat: no-repeat; 
+	padding-left: 0.563em; 
+	background-position: center left;
+}
+
+div.browse-unselected {
+	padding-left: 0.563em; 
+}
+
+ul.browse-list {
+	list-style: none;
+	padding:0;
+}
+
+/* feedback /errors */
+div#error {
+	width: 89%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	padding: 0.313em;
+	color: #A50707;
+	background-color: #FFFBD9;
+	padding-left: 1.563em;
+	font-weight: bold;
+	/*-webkit-border-radius:5px;*/
+}
+div#error h4 {
+	color: black;
+	margin-left: 0;
+}
+
+div#error ul, div#feedback ul, div#help ul {
+	position: relative;
+	list-style: none;
+	margin-left: 0;
+	padding-left: 0;
+}
+
+div#error ul li{
+	margin-top: 0.313em;
+}
+
+div#feedback, div#info {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 0.313em;
+	padding-left: 0.313em;
+	padding-right: 0.313em;
+	font-family: Helvetica, Arial, sans-serif;
+	/*-webkit-border-radius:5px;*/
+	background-color: #FFFBD9;
+	color: #333;
+	font-size: 90%;
+	z-index: -1;
+}
+div#feedback li, div#info li, div#error li{
+	color: #333;
+	z-index: -1;
+}
+
+div#help {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #ACCFCC;
+	padding: 0.313em;
+	background-color: #E9F4F3;
+	color: #024C41;
+}
+
+
+div#warning {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	padding: 0.313em;
+	background-color: #FFFBD9;
+	color: #D95900;
+	font-weight: bold;
+}
+acronym {
+	cursor: help;
+}
+
+div.news p {
+	margin: 0;
+	padding:0;
+}
+div.news span.date {
+	font-family:Helevetica, Arial, sans-serif;
+	color: #5984C4;	
+}
+
+.news{
+	padding: 0;
+}
+/* home page links */
+div.home-link {
+	padding: 0.125em;
+	float: left;
+	text-align: center;
+	margin: 0.125em;
+	width: 7.5em;
+	height: 5.625em;
+}
+div.home-link:hover {
+	padding: 0.063em;
+	background-color: #F7F3ED;
+	border: 1px solid #afafaf;
+	float: left;
+	text-align: center;
+	margin: 0.125em;
+}
+div.home-link a {
+	text-decoration: none;
+	font-weight: bold;
+}
+
+div.home-link img {
+	border: 0;
+}
+
+/* sequence links */
+div#sequence-links {
+	
+	margin-top: 0.625em;
+	padding-right: 0.313em;
+	padding-top:0.438em;
+}
+div#sequence-links a {
+	text-decoration: none;
+	display: block;
+}
+
+.previous-next{
+	display: block;
+}
+div.dropdown {
+	width: 12.5em;
+	padding: 0.125em;
+	background-color: white;
+	color: black;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-bottom: 1px solid #ECFEEA;
+	font-weight: normal;
+}
+
+div.dropdown-heading {
+	background-color: #ACCFCC;
+	color: #595241;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-top: 1px solid #ECFEEA;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+div.required {
+	font-weight: bold;
+	color: red;
+	font-size: large;
+	float: left;
+	position: relative;
+	margin-top: -0.313em;
+	height:  0.938em;
+	padding-right: 0.125em;
+}
+
+div#content_text {
+	margin-left: 0.313em;
+}
+/*needs to be set to display: none so drawer can open */
+#content{
+
+	padding-top:.5em;
+	margin-top: .5em;
+	background-color: #F5F5F5;
+}
+form {
+	display:inline;
+	max-width: 100%;
+}
+
+
+optgroup {
+	/*font-size: small;*/
+}
+
+/* paging*/
+div.paging {
+
+}
+div.paging ul {
+    list-style: none;
+    display: inline;
+    padding: 0;
+	max-width: 10%;
+	margin-bottom: 1em;
+}
+div.paging li { 
+	float: left;
+	display: inline; 
+	padding-left: 0.125em; 
+	padding-right: 0.125em;
+	padding-top: 0;
+	padding-bottom: 0;
+	width: 10%;
+}
+
+div.paging li a {
+	text-decoration: none;
+	padding-left: 0.25em;
+	padding-right: 0.25em;
+	border-left: 1px solid white;
+	border-right: 1px solid white;
+}
+
+div.paging li a:hover, div.paging li a.current {
+   background-color: #5B8E88;
+   border-left: 1px solid #000;
+   border-right: 1px solid #000;
+   color: white;
+}
+
+#tl_corner{
+
+	background-image:url(images/tl_corner.gif);
+	background-position: top left;
+	background-repeat: no-repeat;
+	padding:0;
+}
+
+div.tabs {
+	/* Navigational Plone Tabs(tm), implemented by customizing the a tag - they are surprisingly elegant. The power of CSS runs strong in these :) */
+    background-color: transparent;
+	border-collapse: collapse;
+	border-bottom: 1px solid #B8AE9C;
+	padding: 0.5em 0em 0em 2em;
+	white-space: nowrap;
+}
+
+div.tabs a {
+    /* The normal, unselected tabs. They are all links */
+    background-color: transparent;
+    border-color: #B8AE9C;
+    border-width: 1px; 
+    border-style: solid solid none solid;
+    color: #595241;
+    height: 1.2em;
+    margin-right: 0.5em;
+    padding: 0em 2em 0em;
+    
+}
+
+div.tabs a.selected {
+    /* The selected tab. There's only one of this */
+    background-color: white;
+    border-bottom: #B8AE9C 1px solid;
+    color: #595241;
+    font-weight: normal;
+}
+
+div.tabs a:hover, div.tabs a.active {
+    background-color: #B8AE9C;
+    border-bottom: 1px solid #B8AE9C;
+    color: white;
+}
+
+.headingbox a{
+	color: #5984C4;
+	text-decoration:underline;
+}
+div.box {
+}
+h4.box {
+	background-color: #F5F5F5;
+	padding: .313em; 
+}
+h4.box a {
+	display: block;
+	color: #5984C4;
+	background-color: #F5F5F5;
+	text-decoration: none;
+}
+.content-expand {
+	background-image:url("images/content-arrow-down.png");
+	background-position: top right;
+	background-repeat: no-repeat;
+}
+.content-closed{
+	background-image:url("images/content-arrow-up.png");
+	background-position: center right;
+	background-repeat: no-repeat;
+}
+
+div.box {
+	padding: 0.313em;
+	background-color: #F5F5F5;
+	color: black;
+	border: 1px solid #B8AE9C;
+	font-size:0.85em;
+	font-weight: normal;
+	padding:0.125em;
+}
+
+h5.box { 
+    background-color: #6F7172;
+    border: 1px solid #B8AE9C;
+    border-style: solid solid none solid;
+    color: Black;
+    padding: 0em 1em 0em 1em;
+    display: inline;
+	font-size:  1em;
+    height: 1em;
+}
+
+div.box a:link {
+	text-decoration: none;
+}
+
+div.box a:visited {
+	color: #2A6C28;
+	text-decoration: none;
+}
+
+div.box a:hover {
+	text-decoration: underline;
+}
+
+.boxDetails {
+    text-align: right;
+}
+
+div.box .content {
+    padding: 1em;
+	font-size:  1em;
+}
+
+div.box a.close {
+    float: right;
+    text-transform: none;
+    border-left: 1pt solid #B8AE9C;
+    padding: 0em 0.2em;
+}
+
+div.box h1, 
+div.box h2, 
+div.box h3, 
+div.box h4 {
+    margin: 0;
+    padding: 0;
+}
+
+div.box .even {
+    background-color: #F7F3ED;
+}
+
+div.box .odd {
+    background-color: transparent;
+}
+
+
+/* users/index.php */
+
+div.course {
+	position: relative;
+	width: 12.5em;
+	height: 10.5em;
+	border: rgb(204, 204, 204) 1px solid;
+	background-color: #F7F7F7;
+	float: left;
+	margin: 0.188em;
+	padding: 0.313em;
+}
+
+div.course.break {
+	clear: left;
+}
+
+div.course h2 {
+	border: 0;
+	font-weight: normal;
+	font-size: large;
+
+}
+
+div.course:hover {
+	background-color:#F3F6FA;
+	border: #B8AE9C 1px solid;
+}
+
+
+table.data .odd img.headicon{
+	width: 2.469em;
+	height: 2.469em; 
+	/*-webkit-border-radius:5px;*/
+}
+
+.icon{
+	/*-webkit-border-radius:10px;*/
+	border-color: white;
+	width: 2.5em;
+	height: 2.5em;
+	float: left;
+}
+div.course div.shortcuts {
+	text-align: right;
+	clear: left;
+	vertical-align: middle;
+	width: 12.5em;
+}
+
+fieldset#shortcuts {
+	float: right;
+	background-color: #FEFDEF;
+	/*border: 1pt solid #B8AE9C;*/
+	margin: -5pt 5pt 5pt 5pt;
+	padding-right: 10pt;
+	padding-bottom: 5pt;
+	padding-left: 10pt;
+}
+
+.shortcuts{
+
+}
+
+fieldset {
+	margin-bottom: 10pt;
+	/*-webkit-border-radius:5px;*/
+	padding: 0 0.375em;
+	width: 90%;
+	margin: 0 auto; 
+	width:95%;
+	margin:0 auto;
+	/*border:thin #6D7B8D solid;*/
+	margin-bottom: 1em;
+}
+#shortcuts legend {
+}
+#shortcuts ul {
+	position: relative;
+	margin-top: 0pt;
+	margin-bottom: 0pt;
+	margin-left: 0pt;
+	list-style-type:  none;
+	padding-left: 0pt; 
+}
+
+/*a#guide,*/ a#my-courses-link {
+	background-color: #6D84A2;
+}
+
+#guide img{
+	border:none;
+}
+
+#guide a:hover{
+	
+}
+div#content-text {
+	padding-right: 5pt;
+	line-height:150%;
+}
+
+div#content-text li {
+	margin-left: 15pt;
+}
+
+div#content-test, div.content-from-module {	
+	float: left;
+	margin-top: 2em;
+	margin-bottom: 2em;
+	padding-right: 5pt;
+	width: 80%;
+}
+div#content-test ol{	
+	margin-right: 5pt;;	
+}
+
+div#content-test ol ul li{
+	list-style: none;
+	padding: 0 0.125em 0  0.938em;
+	margin-bottom: 0.063em; 
+	line-height: 200%; 
+	background-color: #fdfdfd; 
+	border-bottom: 1px solid #efefef; 
+	border: 1px solid #eeeeff;
+}
+
+div#content-info {
+	margin: 5pt;
+	font-size: small;
+	color: #b8ae9c;
+	clear: both;
+}
+
+div#container {
+	text-align: left;
+	margin: 0 auto;
+	padding: 0;
+	border:0;
+	width: 95%;
+}
+
+div#menutoggle{
+	text-align: right; 
+	padding-bottom: 0.625em; 
+	padding-right: 0.625em; 
+	float: left; 
+	margin-top: 0.625em; 
+	padding-right: 0.313em; 
+	font-size:0.95em;
+}
+
+
+/* login page */
+div.column {
+	float: left;
+	width: 45%;
+	margin: 0.313em;
+	min-width: 10.625em;
+}
+
+div.column h3 {
+	background-color: #F6EAD6;
+	border-bottom: .05em solid #6F7172;
+	font-size: small;
+	display:block;
+	color:black;
+	font-weight:600;	
+	padding-left:0.5em;
+}
+
+div.insidecol {
+   min-height: 10.625em;
+   height: 10.625em;
+   padding:0.313em;
+}
+
+
+/* index page */
+ul#home-links, ul#home-detail-links {
+	list-style: none;
+}
+ul#home-links li {
+	
+	display: inline;
+	float: left;
+	padding: 0.8em;
+	text-align: center;
+	margin: 0.1em;
+	width: 8.5em;
+	height: 7.0em;
+	padding-left:0;
+
+}
+ul#home-links li a {
+	text-decoration: none;
+	border: 1px transparent;
+	font-weight: bold;
+}
+ul#home-links li a img {
+	border: 0;
+	display: block;
+	padding-left:1.563em;
+}
+
+/*my start page */
+#my_courses_container{
+	text-align: left;
+	margin: 0 auto;
+	border:0;	
+	min-width: 100%;
+}
+#my-courses-navlist{
+}
+.my-courses-list{
+	border: solid 1px #A9ADB0;
+	/*-webkit-border-radius:5px;*/
+	padding: .375em;
+	color: #5984C4;
+	margin: .375em;
+	padding: .375em;
+}
+.my-courses-list-ul{
+	margin: 0 auto;
+	padding-left: 0;
+	width: 100%;
+}
+.my-courses-links{
+	font-size: 80%;
+	padding-top: .75em;
+}
+.my-courses-resume{
+	float: right;
+}
+.fl-link-summary{
+	padding-left: 0.875em;
+	padding-bottom: 0.875em;
+	display: inline;
+}
+.fl-list-menu li a {
+}
+.fl-theme-iphone [class*="fl-list"]:not(.fl-list):not(.fl-grid) a {
+}
+.fl-theme-iphone [class*="fl-list"] > li .fl-link-summary{
+	color: #5984C4;
+}
+.current_head{
+	padding-top: .5em;
+}
+.fl-list-menu {
+
+}
+
+.current_box{
+	max-width: 100%;
+	background-color:#F3F6FA;
+}
+.current_list{
+	width: 95%;
+	padding: 0 0.375em;
+}
+.current_list li{
+	list-style-type: none;
+	padding:0;
+	margin:0;
+
+}
+.current_list img{
+
+}
+
+#show-all{
+	text-align: center;
+}
+/* enrollment tabs */
+#navlist {
+	padding: 0;
+	margin-left: 0;
+	margin-right: auto;
+	margin-left: auto;
+	margin-bottom: .25em;
+	margin-top: 0.938em;
+	white-space: nowrap;
+}
+
+#navlist li {
+	list-style: none;
+	display: inline;
+	margin: 0;
+}
+
+#navlist li a {
+	padding: 0.188em 0.563em;
+	border: 1px solid #F7F3ED;
+	border-bottom: none;
+	background-color: #F7F3ED;
+	text-decoration: none;
+	margin-left: .25em;
+	white-space: nowrap;
+}
+
+#navlist li a:hover, #navlist li a:active {
+	color: #000;
+	background-color: #fff;
+}
+
+/* tree */
+.img-size-tree {
+	vertical-align: middle;
+	margin-top: 0;
+    padding:0;
+	height:1.45em;
+	width:1.5em;
+}
+/* profile page */
+
+dl#public-profile {
+	width: 100%;
+	
+}
+
+dl#public-profile {
+	width: 100%;
+	
+}
+dl#public-profile dt {
+	float: left;
+	width: 90%;
+	border-right: 1px solid #F7F3ED;
+	padding: 0.313em 0.313em 0.313em 0;
+
+	margin-right: 0.313em;
+}
+dl#public-profile dd {
+	margin: 0;
+}
+
+div.social-right{
+	margin-left:.5em;
+	margin-top: 1em;
+}
+div.social-left{
+	margin-left:.5em;
+}
+h4.profile{
+	float: left;
+}
+.social-wrapper h3{  
+	padding-top: .5em;
+}
+.my-contacts h3{
+	padding-bottom: .375em;
+}
+img#profile{
+	border: 1px #cccccc solid;
+	margin-left: 1em;
+}
+dd{
+    margin: 0;
+}
+
+
+/** forum stuff **/
+#forum-thread li {border:1px solid #eee; border-bottom: 1px solid #F7F3ED; float:left; width: 97%; list-style: none; }
+#forum-thread li.even { background-color: #F7F3ED; border-top: none; }
+#forum-thread li.odd { background-color: #fff; }
+div.forum-post-author { float:left; width:19.375em; padding:0.5em 0.625em; }
+div.forum-post-author a.title {font-size: 1.1em; line-height: 1.2em; font-weight: bold; text-decoration:none; }	
+div.forum-post-author img.profile-picture { border: 2px solid #F7F3ED; text-align:right;}
+div.forum-post-content { margin-left: 19.375em; padding: 0.313em 0 1.125em 1.125em;}
+div.forum-post-content h3 { font-weight: 500; float:left;clear:right; }
+div.forum-post-ctrl { float: right; padding-right: 0.313em; color: #a1a1a1;}
+div.forum-post-ctrl a { text-decoration: none; }
+div.forum-post-ctrl span { color: black; background-color: #fefdc2; padding: 0.188em; }
+div.forum-post-content p.date { color: #a1a1a1; border-bottom: 1px solid #F7F3ED; }
+div.forum-post-content div.body p { margin-bottom:1em; }
+div.forum-paginator{border:thin #cccccc solid; padding:.3em; width:95%;margin:auto;background-color:#F7F3ED;}
+span.forum-paginator-active{font-weight:700;text-decoration:underline; height:2em;}
+
+
+
+/** inbox stuff - reuses some of the forum layout **/
+#inbox-msg li {border:1px solid #eee; border-bottom: 1px solid #F7F3ED; width: 95%; list-style: none; min-height: 11em;}
+	
+/*  tool list on admin home and manage screens  */
+ li.top-tool { 
+	list-style: none;
+	padding: 0.125em 0.125em 0.125em  0.938em;
+	margin-bottom: 0.313em; 
+	line-height: 200%; 
+	border: solid 1px #A9ADB0;
+	/*-webkit-border-radius:5px;*/
+}
+li.top-tool a {  font-weight: bold; } /* ol#tools>li>a */ 
+
+li.child-tool a { 
+	font-size: x-small;
+	font-weight: normal; 
+}
+
+/* ol#tools>li>ul, */ 
+ul.child-top-tool {
+	margin-top: -0.313em;
+	padding-left: 0;
+	margin-left: 0;
+	display: inline;
+}
+ul.child-top-tool:before {
+	content: " : ";
+}
+
+li.child-tool {
+	display: inline;
+	margin-right: 0.313em;
+	font-size: x-small;
+}
+
+.img-size-home {
+	height:3.85em;
+	width:3.9em;
+}
+
+/* browse courses */
+div.browse-course {
+	width: 28em;
+	padding-bottom: 0.625em;
+	background-color: #fffaf0;
+	border:1px #6F7172 solid;
+	font-size:9pt;
+	min-height:18em;
+	margin:auto;
+	margin-left:1em;
+	margin-top:1em;
+}
+
+dl.browse-course {
+	width: 90%;
+	padding-bottom: 0.625em;
+	background-color: #fffaf0;
+
+	margin:auto;
+	margin-left:1em;
+}
+dl.browse-course dt {
+	float: left;
+	font-weight: bold;
+	width: 25%;
+	text-align: right;
+	clear: left;
+	padding: 0.313em 0.625em 0.313em 0;
+	vertical-align: middle;
+
+}
+dl.browse-course dd {
+	margin-bottom: 0.313em;
+	clear: right;
+	padding: 0.313em 0 0.313em 0.625em;
+	margin-left: 26%;
+
+}
+.row .buttons{
+	border: none;
+}
+
+/*  form fields grouping for WCAG 2.0 conformance*/
+
+fieldset.group_form{
+	width:95%;
+	margin:0 auto;
+	margin-bottom: 1em;
+	/*border: 1px #6D7B8D solid;*/
+	/*-webkit-border-radius:5px;*/
+}
+
+legend.group_form{
+	background-color:white;
+	font-weight: 600;
+	color: #333;
+	padding:.5em;
+	/*border: 1px #6D7B8D solid;*/
+	/*-webkit-border-radius:5px;*/
+	text-align:left;
+}
+/* file storage */
+
+#fsfloat1{
+	float:right;
+}
+#fsfloat2{
+	float:right;
+	width:48%;
+}
+
+
+/* highlight active links for WCAG 2.0 conformance */
+a:active,a:hover,a:focus{
+	background-color:#F6EAD6;
+	color:#000000;
+}
+
+
+/*Added by Silvia */
+div.column_primary {
+	float: left;
+	width: 42%;
+	margin: 0.313em;
+	padding: 0;
+	min-width: 10.625em;
+/*	position: relative;*/
+}
+
+div.column_equivalent{
+	float: left;
+	width: 52%;
+	margin-left:  0.938em;
+	margin-top: 0.313em;
+	margin-right: 0.313em;
+	margin-bottom: 0.313em;
+	min-width: 10.625em;
+	padding: 0.313em;
+	border: 1px solid #EEE;
+	background-color: #FFF;
+/*	position: relative;*/
+
+}
+
+div.resource_box{
+	border: 1px solid #aaa;
+	width: 95%;
+	margin: 0.313em;
+	padding: 0.313em;
+	min-width: 9.375em;
+	background-color: #eee;
+/*	position: relative;*/
+}
+
+h2.alternatives_to{
+	margin-top: 0.75em;
+	font-size: 90%;
+	color: #A50707;
+}
+
+div.alternative_box{
+	border: 1px solid #ddd;
+	/*width: 90%;*/
+	margin: 0.313em;
+	padding: 0.313em;
+	min-width: 9.375em;
+	background-color: #fff;
+}
+
+div.alternative_box legend {
+	color: #000;
+}
+
+div.resource_box legend {
+	color: #000;
+}
+
+label.primary a{
+	color: #A50707;
+	font-weight: bolder;
+	background-color: white;
+}
+
+/* format of "table of contents" on content page */
+#toc a 		{ display:block; margin:0.188em; }
+#toc a:hover, a:focus {color:#fff; background-color:#3866C4;}
+#toc .h2, #toc .h3, #toc .h4, #toc .h5, #toc .h6{ 
+	padding:0 0 0 0;
+}
+
+#toc .h2 {font-size:80%;
+padding:0.8em 0 0 1em;}
+
+#toc .h3 {font-size:80%; font-weight:normal;
+padding:0 0 0 2em;}
+
+#toc {border: none;
+padding-bottom:-1em;
+margin-bottom:0;}
+
+div#content-text {margin-top:-0.5em;}
+
+fieldset#toc {
+	/*background-color: #B8AE9C;*/
+	/*border: 1pt solid #B8AE9C;*/
+	width:89%;
+	background-color:#E8EEF7;
+}
+
+#toc legend {
+	font-family:Arial,Helvetica,sans-serif;
+	font-size:12pt;
+	font-weight:bold;
+	margin-top: 16pt;
+	margin-right: 0;
+	margin-bottom: 0;
+	margin-left: 0;
+	padding-top: 2em;
+	padding-right: 0;
+	padding-bottom: 0.5em;
+	padding-left: 0;
+}
+
+#content-text blockquote {
+border-bottom:2px solid black;
+border-top:2px solid black;
+color:#000000;
+clear:both;
+font-size:1em;
+font-style:italic;
+line-height:1.4em;
+margin:0.5em 1.5em 0.5em 0;
+padding:0.1em 0 0;
+width:14em;}
+
+#side-menu{
+	overflow:hidden;
+}
+
+/* cleans up glossary question mark line spacing*/
+sup{
+	border: 1pt solid #B8AE9C;
+	vertical-align:bottom;
+	margin-top: 1em;
+}
+
+/* jQuery tooltip styles */
+#tooltip{
+	position:absolute;
+	z-index:3000;
+	border:3px solid #111;
+	background-color:#eeeeee;
+	padding:0.313em;
+}
+#tooltip h3,#tooltip div{
+	margin:0;
+}
+
+/* style for home page modules "detail view" */
+div.home_box {
+	padding: .75em 0;
+	margin: 0 auto;
+}
+
+.outside_box{
+	background:#e0e0e0;
+	width: 17em;
+	margin: .375em;
+	padding: 0;
+	height:9.8em;
+}
+
+.inside_box{
+	width:100%;
+	margin:auto;
+	height:52%;
+	margin-bottom:.2em;
+	background:#eeeeee;
+
+}
+.details_or{
+	width:28.8em;
+	height:9.8em;
+	margin:0;
+	background-image:url(images/details_r.png);
+	background-position: top right;
+	background-repeat:no-repeat;
+}
+.details_ol{
+	height:9.8em;
+	margin:0;
+	width:.45em;
+	background-image:url(images/details_l.png);
+	background-position: top left;
+	background-repeat:no-repeat;
+}
+.details_ir{
+	width:.5em;
+	height:100%;
+	float:right;
+	background-image:url(images/details_ir.png);
+	background-position: top right;
+	background-repeat:no-repeat;
+}
+.details_il{
+	height:100%;
+	float:left;
+	background-image:url(images/details_il.png);
+	background-position: top left;
+	background-repeat:no-repeat;
+}
+.home-title{
+	font-size:12pt;
+}
+.buttonbox{
+	float:right;
+}
+.details_text{
+	margin-left:1em;
+}
+.draggable_selected {
+	background-color: lightgrey;
+	cursor: move;
+}
+
+div.menuedit{
+	float:right;
+	margin-top:-1.2em; 
+	border:1px solid #cccccc;
+}
+li.folders {
+	list-style: disc url(../../images/folder.gif) outside;
+	font-family: Verdana, Helevetica, Arial, sans-serif;
+	margin-bottom: 0;
+	margin-top: 0;
+	margin-right: 0;
+}
+
+li.folders .disabled {
+	color: #B8AE9C;
+}
+
+ul.folder{
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0em;
+	padding:0em;
+}
+
+
+/*	top navigation */
+
+#topnavlist-link {
+	color: #000;
+	text-decoration: none;
+	font-weight: bold;
+	
+	margin-right:-20px;
+	background-image:url(images/tree/tree_collapse.gif);
+	background-repeat:no-repeat;
+	background-position: center right;
+	
+	/*border: thin solid red;*/}
+	
+	#topnavlist-link a:link {color:#5984C4;}
+
+
+ul#topnavlist {
+	display: none;
+	position: relative;
+	top: 1.2em;
+	z-index: 1;
+	background-color:#fff;
+	}
+
+
+ul#topnavlist li {
+	padding: 0;
+	margin: 0;
+}
+ul#topnavlist li a.active {
+	color: #5984C4;
+	font-style: italic;
+	}
+
+#topnavlist a:hover {color:#3866c4 !important;
+text-decoration:underline !important;
+background-color:transparent;}
+
+ul#topnavlist li a  {
+ 	color: #5984C4;
+ 	text-decoration: none;
+}
+
+
+div.toolcontainer{
+	width:90%;
+	margin:auto;
+	border:thin solid #e8e8e8;
+	padding-top:1em;
+	padding-bottom:1em;
+}
+
+ul#subnavlist {
+	padding: 0;
+	padding-bottom: 0.313em;
+	margin: 0;
+	font-size: 90%;
+}
+
+
+ul#subnavlist li {
+	display: inline;
+}
+
+ul#subnavlist li#test{
+	display: none;
+}
+ul#subnavlist li a:hover, ul#subnavlist li a:focus, ul#subnavlist li a.active{ /*
+  	color: black;
+	text-decoration:none;*/
+}
+
+ul#subnavlist li a, ul#subnavlist li a:visited {
+	color: #5984C4;
+}
+
+
+/* list attributes */
+ul {
+	list-style: none;
+}
+li {
+	color: black;
+	list-style: none;
+}
+
+ol#tools>li:hover, ol#tools>li:hover a {
+	border: 1px solid #e0e0e0;
+	background-color: #e6e6e6;
+	color: black; 	
+}
+
+
+#content-contentwrapper{
+	height:100%;
+    position:relative;	
+	z-index:1000;			
+	width:100%;
+	overflow:hidden;
+}
+
+#leftcolumn{
+	float: left;
+	width: 17em;
+	margin-left: 0.313em;
+	margin-top:-0.625em;
+}
+
+#copyright{
+	font-size: 0.5em color:#333;
+}
+#gototop{
+	text-align: right;
+	color: #4B6B90;
+}
+
+ #tools{
+	margin: 0 auto;
+	padding: 0.375em;
+}
+
+
+/* ATutor Social Styles */
+
+div .profile_container {
+	background-color:#eee; 
+	border: 1px solid #8e8e8e; 
+	width:80%; 
+	padding:0.5em; 
+	margin-bottom: 0.5em;
+}
+
+div .profile_container .top_right {
+	float: right;
+}
+
+dl.public-profile dd{
+	margin-left:0;
+}
+dl.public-profile dt {
+	float: left;
+	font-weight: bold;
+	min-width:12em;
+}
+
+/* Search form */
+div .search_form {
+	margin-bottom: 1em;
+}
+
+div .search_form .row{
+	background-color: #DEDEC0;
+	padding: 0.5em;
+}
+div .button {
+	background-color: #eee;
+	border: 1px solid #aaa;
+}
+div .button:hover{
+	background-color: #cccccc;
+	color: #ffffff;
+}
+
+/* Side menu */
+
+
+ul.social_side_menu {
+	padding-left: 2em;
+}
+ul.social_side_menu li {
+	padding-bottom: 0.2em;
+	list-style: circle;
+}
+
+div .divider {
+	border-bottom:1px solid #C1C157; 
+	padding-bottom:0.5em; 
+	margin-bottom:0.5em;
+}
+
+.activity{
+ 	line-height:18pt;
+	font-size:.8em;
+}
+
+div.contentbox, input-form{
+
+	padding:.5em;
+	background-color: #ffffff;
+    overflow:hidden;
+    /*border: #A9ADB0 solid 1px;
+	/*-webkit-border-radius: 5px;*/
+}
+
+div.suggestions{
+	border:1px solid #a50707;
+	margin-left:0.625em; 
+	width:50%;
+}
+li.inlinelist{
+	display: inline; 
+	padding-right: 1em;
+}
+ul.social_inline_menu{
+	background-color: #eeeeee;
+	border:thin #cccccc solid;
+	padding:.5em;
+	width:90%;
+	margin:auto;
+}
+div.social-wrapper{ 
+	width: 100%;
+}
+
+
+.contentbox-a{
+    width: 100%;
+}
+.contentbox-b{
+    padding-bottom:0.2em;
+}
+ 
+div.logo{
+float:left;
+clear:right;
+margin-left:2em;}
+
+
+/* Overrides for external stylesheets */
+
+.fl-tabs li a {
+	color:#6699ff;
+ -moz-background-clip:none;
+-moz-background-clip: none;
+-moz-background-origin: none;
+border-style:none;}
+
+#top-links .fl-tabs li a{
+	color:#6699ff;
+}
+
+.recent_item {padding-bottom:1em;}
diff --git a/docs/themes/simplified-desktop/confirm.tmpl.php b/docs/themes/simplified-desktop/confirm.tmpl.php
new file mode 100644
index 000000000..62c5d5f82
--- /dev/null
+++ b/docs/themes/simplified-desktop/confirm.tmpl.php
@@ -0,0 +1,19 @@
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+
+<div class="input-form" style="max-width: 400px">
+	<div class="row">
+		<p><?php echo _AT('send_confirmation'); ?></p>
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="email"><?php echo _AT('email'); ?></label><br />
+		<input type="text" name="email" id="email" size="40" />
+		<input type="hidden" name="en_id" id="en_id" value="<?php echo $_REQUEST['en_id']; ?>" size="50" />
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('send'); ?>" /> 
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/content.tmpl.php b/docs/themes/simplified-desktop/content.tmpl.php
new file mode 100644
index 000000000..6ac2a1c69
--- /dev/null
+++ b/docs/themes/simplified-desktop/content.tmpl.php
@@ -0,0 +1,78 @@
+<?php
+/****************************************************************/
+/* ATutor														*/
+/****************************************************************/
+/* Copyright (c) 2002-2009										*/
+/* Adaptive Technology Resource Centre / University of Toronto  */
+/* http://atutor.ca												*/
+/*                                                              */
+/* This program is free software. You can redistribute it and/or*/
+/* modify it under the terms of the GNU General Public License  */
+/* as published by the Free Software Foundation.				*/
+/****************************************************************/
+if (!defined('AT_INCLUDE_PATH')) { exit; } 
+
+// print the AccessForAll alternatives tool bar
+// see /content.php for details of the alt_infos() array
+// images for the toolbar can be customized by adding images of the same name to a theme's images directory
+?>
+<div id="alternatives_shortcuts">
+<?php 
+	foreach ($this->alt_infos as $alt_info){
+		echo '<a href="'.$_SERVER['PHP_SELF'].'?cid='.$this->cid.(($_GET['alternative'] == $alt_info['0']) ? '' : htmlentities_utf8(SEP).'alternative='.$alt_info[0]).'">
+			<img src="'.AT_BASE_HREF.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[3] : $alt_info[4]).'" alt="'.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[2] : $alt_info[1]).'" title="'.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[2] : $alt_info[1]).'" border="0" class="img1616"/></a>';
+	} 
+?>
+</div>
+
+<?php 
+if ($_SESSION["prefs"]["PREF_SHOW_CONTENTS"] && $this->content_table <> "") 
+	echo $this->content_table;
+?>
+
+<div id="content-text">
+	<?php echo $this->body; ?>
+</div>
+
+<?php if (!empty($this->test_ids)): ?>
+<div id="content-test" class="input-form">
+	<ol>
+		<strong><?php echo _AT('tests') . ':' ; ?></strong>
+		<li class="top-tool"><?php echo $this->test_message; ?></li>
+		<ul class="tools">
+		<?php 
+			foreach ($this->test_ids as $id => $test_obj){
+				echo '<li><a href="'.url_rewrite('mods/_standard/tests/test_intro.php?tid='.$test_obj['test_id'], AT_PRETTY_URL_IS_HEADER).'">'.
+					AT_print($test_obj['title'], 'tests.title').'</a><br /></li>';
+			}
+		?>
+		</ul>
+	</li></ol>
+</div>
+<?php endif; ?>
+
+<?php
+
+if (!empty($this->forum_ids)): ?>
+<div id="content-test" class="input-form">
+    <ol>
+        <strong><?php echo _AT('forums') . ':' ; ?></strong>
+        <li class="top-tool"><?php echo $this->forum_message; ?></li>
+            <ul class="tools">
+                <?php
+                foreach ($this->forum_ids as $id => $forum_obj) {
+                    echo '<li><a href="'.url_rewrite('mods/_standard/forums/forum/index.php?fid='.$forum_obj['forum_id'], AT_PRETTY_URL_IS_HEADER).'">'.
+                        AT_print($forum_obj['title'], 'forums.title').'</a><br /></li>';
+                }
+                ?>
+            </ul>
+        </li>
+    </ol>
+</div>
+<?php endif; ?>
+
+
+<div id="content-info">
+	<?php echo $this->content_info; ?>
+
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/editor/edit_content_folder.tmpl.php b/docs/themes/simplified-desktop/editor/edit_content_folder.tmpl.php
new file mode 100644
index 000000000..6591038d8
--- /dev/null
+++ b/docs/themes/simplified-desktop/editor/edit_content_folder.tmpl.php
@@ -0,0 +1,110 @@
+<?php
+/************************************************************************/
+/* ATutor																*/
+/************************************************************************/
+/* Copyright (c) 2002-2010                                              */
+/* Inclusive Design Institute                                           */
+/* http://atutor.ca														*/
+/*																		*/
+/* This program is free software. You can redistribute it and/or        */
+/* modify it under the terms of the GNU General Public License          */
+/* as published by the Free Software Foundation.                        */
+/************************************************************************/
+if (!defined('AT_INCLUDE_PATH')) { exit; } 
+
+global $onload;
+$onload = 'document.form.title.focus();';
+?>
+<form action="<?php echo $_SERVER['PHP_SELF']; if ($this->cid > 0) echo '?cid='.$this->cid; else if ($this->pid > 0) echo '?pid='.$this->pid;?>" method="post" name="form"> 
+<div class="input-form" >
+<!-- <?php
+if ($this->shortcuts): 
+?>
+ <fieldset id="shortcuts" style="margin-top:1em;float:right;clear:right;"><legend><?php echo _AT('shortcuts'); ?></legend>
+	<ul>
+		<?php foreach ($this->shortcuts as $link): ?>
+			<li><a href="<?php echo $link['url']; ?>"><?php echo $link['title']; ?></a></li>
+		<?php endforeach; ?>
+	</ul>
+</fieldset>
+<?php endif; ?> -->
+	<div class="row">
+		<div style="font-weight:bold;"><span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="ftitle"><?php echo _AT('content_folder_title');  ?></label></div>
+		<input type="text" name="title" id="ftitle" size="40" class="formfield" value="<?php echo ContentManager::cleanOutput($this->ftitle); ?>" />
+	</div>
+	
+	<div class="row">
+		<div style="font-weight:bold;"><?php echo _AT('release_date');  ?></div>
+		<?php if ($_POST['day']) { ?>
+			<?php
+				$today_day   = $_POST['day'];
+				$today_mon   = $_POST['month'];
+				$today_year  = $_POST['year'];
+
+				$today_hour  = $_POST['hour'];
+				$today_min   = $_POST['min'];		
+		}?>
+		<?php require(AT_INCLUDE_PATH.'html/release_date.inc.php');	?>
+	</div>
+
+	<?php if (isset($this->pretests)) {?>
+	<div class="row">
+		<div style="font-weight:bold;"><?php echo _AT('define_pretest'); ?></div>
+		<p><?php echo _AT('about_pretest'); ?></p>
+	</div>
+
+	<div class="row">
+	<div class="table-surround">
+	<table class="data" summary="Title, status, release results, and pass score of available tests">
+	<thead>
+	<tr>
+		<th scope="col">&nbsp;</th>
+		<th scope="col"><?php echo _AT('title');          ?></th>
+		<th scope="col"><?php echo _AT('status');         ?></th>
+		<th scope="col"><?php echo _AT('result_release'); ?></th>
+		<th scope="col"><?php echo _AT('pass_score');	  ?></th>
+		<!-- REMOVED FOR MOBILE <th scope="col"><?php// echo _AT('assigned_to');	  ?></th>-->
+	</tr>
+	</thead>
+	<tbody>
+	<?php foreach ($this->pretests as $row) { ?>
+	<?php
+		$checkMe = '';
+		if (is_array($_POST['pre_tid']) && in_array($row['test_id'], $_POST['pre_tid'])){
+			$checkMe = ' checked="checked"';
+		} 
+	?>
+	<tr onmousedown="toggleTestSelect('r_<?php echo $row['test_id']; ?>');rowselect(this);" id="r_<?php echo $row['test_id']; ?>">
+		<td><input type="checkbox" name="tid[]" value="<?php echo $row['test_id']; ?>" id="t<?php echo $row['test_id']; ?>" <?php echo $checkMe; ?> onmouseup="this.checked=!this.checked" /></td>
+		<td><?php echo $row['title']; ?></td>
+		<td><?php echo $row['status']; ?></td>
+		<!-- <td><?php echo $row['availability']; ?></td> -->
+		<td><?php echo $row['result_release']; ?></td>
+		<td><?php echo $row['pass_score']; ?></td>
+		<!-- REMOVED FOR MOBILE <td><?php echo $row['assign_to']; ?></td>-->
+	</tr>
+	<?php } ?>
+	</tbody>
+	</table>
+	</div>
+	</div>
+<?php }?>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" title="<?php echo _AT('save_changes'); ?> alt-s" accesskey="s" />
+	</div>
+</div>
+</form>
+
+<script language="javascript" type="text/javascript">
+	function toggleTestSelect(r_id){
+		var row = document.getElementById(r_id);
+		var checkBox = row.cells[0].firstChild;
+
+		if (checkBox.checked == true){
+			checkBox.checked = false;
+		} else {
+			checkBox.checked = true;
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/editor/page_student_stats.tmpl.php b/docs/themes/simplified-desktop/editor/page_student_stats.tmpl.php
new file mode 100644
index 000000000..f9a650f2b
--- /dev/null
+++ b/docs/themes/simplified-desktop/editor/page_student_stats.tmpl.php
@@ -0,0 +1,26 @@
+<table class="data" summary="">
+<thead>
+<tr>
+	<th scope="col"><?php echo _AT('login_name'); ?></th>
+	<th scope="col"><?php echo _AT('visits'); ?></th>
+	<th scope="col"><?php echo _AT('avg_duration'); ?></th>
+	<th scope="col"><?php echo _AT('duration'); ?></th>
+</tr>
+</thead>
+<tbody>
+<?php if ($row = mysql_fetch_assoc($this->result)) : ?>
+	<?php do { ?>
+	<tr onmousedown="document.location='<?php echo AT_BASE_HREF; ?>mods/_standard/tracker/tools/student_usage.php?id=<?php echo $row['member_id']; ?>'" title="<?php echo _AT('member_stats'); ?>">
+		<td><a href="<?php echo AT_BASE_HREF; ?>mods/_standard/tracker/tools/student_usage.php?id=<?php echo $row['member_id']; ?>"><?php echo get_display_name($row['member_id']); ?></a></td>
+		<td><?php echo $row['counter']; ?></td>
+		<td><?php echo $row['average']; ?></td>
+		<td><?php echo $row['total']; ?></td>
+	</tr>
+	<?php } while ($row = mysql_fetch_assoc($this->result)); ?>
+<?php else: ?>
+	<tr>
+		<td colspan="4"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
diff --git a/docs/themes/simplified-desktop/forms.css b/docs/themes/simplified-desktop/forms.css
new file mode 100644
index 000000000..2e2ea5f71
--- /dev/null
+++ b/docs/themes/simplified-desktop/forms.css
@@ -0,0 +1,152 @@
+
+
+/* login page */
+div.container{
+	width:100%;
+	text-align: center;
+	margin: 0 auto;
+}
+
+div.container p {
+	text-align: left;
+	padding: .5em;
+}
+
+div.column-login{
+}
+div.column-new-user{
+width: 100%;
+
+/* end of login page */
+
+
+/*
+#contentcolumn{
+	width: 90%;
+}
+*/
+
+
+
+fieldset{
+	border: none;
+}
+
+fieldset.group_form{
+	border: none;
+	text-align: center;
+	width:80%;
+	margin:0 auto;
+	border:thin #ffffff solid;
+	padding-bottom: 0em;
+}
+
+/* on registration page, group form fields to the left */
+fieldset.group_form .row{
+text-align: left}
+
+legend.group_form{
+	border:none;
+	 font-size: 150%;
+	background-color: #4D4D4D;
+	color: #F7941E;
+	padding:.5em;
+}
+	
+div.input-form {
+	width: 110%; 
+    margin:0 auto;
+	margin-bottom: 20px;
+	padding: 0 6px;
+    line-height:150%;
+	border: none;
+	background-color: #4D4D4D;
+
+}
+
+div.input-form div.row h3 {
+	margin-left: 0px;
+}
+
+div.input-form div.row {
+	background-color: #4d4d4d;
+	padding:8px;
+}
+
+
+/*<img> and <a> tags: on mouse hover the color of the background will keep the same!*/
+div.input-form div.row img,a:hover{
+    background-color:#F8F8F8;
+}
+
+div.input-form .footer {
+	border-top: 1px solid #F9F6F2;
+}
+
+div.input-form p {
+	margin-left: 0px;
+}
+
+div.input-form input {
+	z-index: 2;
+}
+div.input-form textarea {
+	border: 1px solid #595241;
+	width: 98%;
+	padding: 2px;
+	margin-right: 2px;
+}
+
+div.input-form input[type=text], div.input-form input[type=password] {
+	border: 1px solid #595241;
+	padding: 2px;
+	max-width: 60%;
+	background-color:white;
+}
+
+div.input-form textarea:focus, div.input-form  input[type=password]:focus, div.input-form  input[type=text]:focus{
+	border:1px solid #4D4D4D;
+	
+	padding: 2px;
+}
+
+input[type=checkbox]{
+
+	background-color: #FFDAB9;
+}
+
+div.input-form div.buttons {
+	text-align: center;
+padding: 0; 
+margin: 0;
+}
+div.input-form div.buttons input {
+	background-color: #efefef;
+	font-weight: normal;
+	border:  #AAA  solid 1px;
+}
+.formfield:focus{
+	background-color: #FFDAB9;
+}
+
+#ot:focus{
+	background-color: #FFDAB9;
+}
+
+/*Added by Silvia*/
+div.input-form div.row_alternatives {
+	background-color: #F8F8F8;
+	padding: 5px;
+/*	width: 70%;
+	float: left;
+	width: 100%;
+	float: left;*/
+	/*clear: both;*/
+}
+
+#radio_alt{
+	/*width: auto;*/
+	/*border-bottom: 1px #CCCCCC solid;*/
+
+}
+
diff --git a/docs/themes/simplified-desktop/images/arrow-up-black.png b/docs/themes/simplified-desktop/images/arrow-up-black.png
new file mode 100644
index 000000000..8e0ed50c0
Binary files /dev/null and b/docs/themes/simplified-desktop/images/arrow-up-black.png differ
diff --git a/docs/themes/simplified-desktop/images/arrow-up.png b/docs/themes/simplified-desktop/images/arrow-up.png
new file mode 100644
index 000000000..b1e84194f
Binary files /dev/null and b/docs/themes/simplified-desktop/images/arrow-up.png differ
diff --git a/docs/themes/simplified-desktop/images/clr.gif b/docs/themes/simplified-desktop/images/clr.gif
new file mode 100644
index 000000000..4146548cf
Binary files /dev/null and b/docs/themes/simplified-desktop/images/clr.gif differ
diff --git a/docs/themes/simplified-desktop/images/down.png b/docs/themes/simplified-desktop/images/down.png
new file mode 100644
index 000000000..f12a7b662
Binary files /dev/null and b/docs/themes/simplified-desktop/images/down.png differ
diff --git a/docs/themes/simplified-desktop/images/idi_background.png b/docs/themes/simplified-desktop/images/idi_background.png
new file mode 100644
index 000000000..08785537c
Binary files /dev/null and b/docs/themes/simplified-desktop/images/idi_background.png differ
diff --git a/docs/themes/simplified-desktop/images/minus.png b/docs/themes/simplified-desktop/images/minus.png
new file mode 100644
index 000000000..08338fa0d
Binary files /dev/null and b/docs/themes/simplified-desktop/images/minus.png differ
diff --git a/docs/themes/simplified-desktop/images/navbar_back_button_insetShadow_right.png b/docs/themes/simplified-desktop/images/navbar_back_button_insetShadow_right.png
new file mode 100644
index 000000000..bcedbcd86
Binary files /dev/null and b/docs/themes/simplified-desktop/images/navbar_back_button_insetShadow_right.png differ
diff --git a/docs/themes/simplified-desktop/images/navbar_normal_button_insetShadow.png b/docs/themes/simplified-desktop/images/navbar_normal_button_insetShadow.png
new file mode 100644
index 000000000..ed445cb65
Binary files /dev/null and b/docs/themes/simplified-desktop/images/navbar_normal_button_insetShadow.png differ
diff --git a/docs/themes/simplified-desktop/images/plus.png b/docs/themes/simplified-desktop/images/plus.png
new file mode 100644
index 000000000..3757fb1e8
Binary files /dev/null and b/docs/themes/simplified-desktop/images/plus.png differ
diff --git a/docs/themes/simplified-desktop/images/up.png b/docs/themes/simplified-desktop/images/up.png
new file mode 100644
index 000000000..817589875
Binary files /dev/null and b/docs/themes/simplified-desktop/images/up.png differ
diff --git a/docs/themes/simplified-desktop/images/white_listmenu_arrow.png b/docs/themes/simplified-desktop/images/white_listmenu_arrow.png
new file mode 100644
index 000000000..8c39032a9
Binary files /dev/null and b/docs/themes/simplified-desktop/images/white_listmenu_arrow.png differ
diff --git a/docs/themes/simplified-desktop/inbox/inbox.tmpl.php b/docs/themes/simplified-desktop/inbox/inbox.tmpl.php
new file mode 100644
index 000000000..f4a82f678
--- /dev/null
+++ b/docs/themes/simplified-desktop/inbox/inbox.tmpl.php
@@ -0,0 +1,100 @@
+
+<?php 
+	if ($row = mysql_fetch_assoc($this->result_messages)) {
+?>
+	<ul id="inbox-msg">
+	<li>
+		<div class="forum-post-author">
+			<a href="profile.php?id=<?php echo $row['from_member_id']; ?>" class="title"><?php echo get_display_name($row['from_member_id']); ?></a><br />
+			<?php print_profile_img($row['from_member_id']); ?>
+		</div>
+
+		<div class="forum-post-content">
+			<h3><?php echo AT_print($row['subject'], 'messages.subject'); ?></h3>
+			<div>
+				<div class="forum-post-ctrl">
+					<a href="inbox/send_message.php?reply=<?php echo $_GET['view']; ?>"><?php echo _AT('reply'); ?></a> | <a href="<?php echo $_SERVER['PHP_SELF']; ?>?delete=<?php echo $_GET['view']; ?>"><?php echo _AT('delete'); ?></a>
+				</div>
+				<p class="date"><?php echo AT_date(_AT('forum_date_format'), $row['date_sent'], AT_DATE_MYSQL_DATETIME); ?></p>
+			</div>
+
+			<div class="body">
+				<p><?php echo AT_print($row['body'], 'messages.body'); ?></p>
+			</div>
+		</div>
+
+	</li>
+	</ul><br /><br />
+	<?php
+	}
+?>
+	
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="form" >
+<div class="table-surround">
+<table class="data" summary="" >
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col">&nbsp;</th>
+	<th scope="col" ><?php echo _AT('from');   ?></th>
+	<th scope="col" ><?php echo _AT('subject');?></th>
+	<th scope="col" ><?php echo _AT('date');   ?></th>
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="5"><input type="submit" name="delete" value="<?php echo _AT('delete'); ?>"/></td>
+</tr>
+</tfoot>
+<tbody>
+<?php if ($row = mysql_fetch_assoc($this->result)): ?>
+	<?php do { ?>
+		<?php if ($row['message_id'] == $_GET['view']): ?>
+			<tr class="selected">
+		<?php else: ?>
+			<tr onmousedown="document.form['m<?php echo $row['message_id']; ?>'].checked = !document.form['m<?php echo $row['message_id']; ?>'].checked; rowselectbox(this, document.form['m<?php echo $row['message_id']; ?>'].checked, '');" id="r_<?php echo $row['message_id']; ?>_1">
+		<?php endif; ?>
+		<td><input type="checkbox" name="id[]" value="<?php echo $row['message_id']; ?>" id="m<?php echo $row['message_id']; ?>" <?php if (isset($_POST['id']) && in_array($row['message_id'], $_POST['id'])) { echo 'checked="checked"'; } ?> title="<?php echo _AT('delete').': '.AT_print($row['subject'], 'messages.subject');?>" onmouseup="this.checked=!this.checked" /></td>
+		<td valign="middle">
+		<?php
+		if ($row['new'] == 1)	{
+			echo _AT('new');
+		} else if ($row['replied'] == 1) {
+			echo _AT('replied');
+		}
+		echo '</td>';
+
+		$name = get_display_name($row['from_member_id']);
+
+		echo '<td align="left" valign="middle">';
+
+		if ($_GET['view'] != $row['message_id']) {
+			echo $name;
+		} else {
+			echo '<strong>'.$name.'</strong>';
+		}
+		echo '</td>';
+
+		echo '<td><label for="m'.$row['message_id'].'">';
+		if ($_GET['view'] != $row['message_id']) {
+			echo '<a href="'.$_SERVER['PHP_SELF'].'?view='.$row['message_id'].'">'.AT_print($row['subject'], 'messages.subject').'</a>';
+		} else {
+			echo '<strong>'.AT_print($row['subject'], 'messages.subject').'</strong>';
+		}
+		echo '</label></td>';
+	
+		echo '<td valign="middle" align="left" nowrap="nowrap">';
+		echo AT_date(_AT('forum_date_format'),  $row['date_sent'], AT_DATE_MYSQL_DATETIME);
+		//echo AT_date(_AT('%D',  $row['date_sent'], AT_DATE_MYSQL_DATETIME);
+		echo '</td>';
+		echo '</tr>';
+	} while ($row = mysql_fetch_assoc($this->result)); ?>
+<?php else: ?>
+	<tr>
+		<td colspan="5"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/inbox/sent_messages.tmpl.php b/docs/themes/simplified-desktop/inbox/sent_messages.tmpl.php
new file mode 100644
index 000000000..f92a648da
--- /dev/null
+++ b/docs/themes/simplified-desktop/inbox/sent_messages.tmpl.php
@@ -0,0 +1,94 @@
+
+<?php 
+	if ($row = mysql_fetch_assoc($this->result_messages)) {
+?>
+	<ul id="inbox-msg">
+	<li>
+		<div class="forum-post-author">
+			<a href="profile.php?id=<?php echo $row['to_member_id']; ?>" class="title"><?php echo get_display_name($row['to_member_id']); ?></a><br />
+			<?php print_profile_img($row['to_member_id']); ?>
+		</div>
+
+		<div class="forum-post-content">
+			<h3><?php echo AT_print($row['subject'], 'messages.subject'); ?></h3>
+			<div>
+				<div class="forum-post-ctrl">
+					<a href="inbox/send_message.php?forward=<?php echo $_GET['view']; ?>"><?php echo _AT('forward'); ?></a> | <a href="<?php echo $_SERVER['PHP_SELF']; ?>?delete=<?php echo $_GET['view']; ?>"><?php echo _AT('delete'); ?></a>
+				</div>
+				<p class="date"><?php echo AT_date(_AT('forum_date_format'), $row['date_sent'], AT_DATE_MYSQL_DATETIME); ?></p>
+			</div>
+
+			<div class="body">
+				<p><?php echo AT_print($row['body'], 'messages.body'); ?></p>
+			</div>
+			<div style="clear: both; font-size:0.1em"></div>
+		</div>
+	</li>
+	</ul>
+	<?php
+	}
+?>
+
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="form">
+<div class="table-surround">
+<table class="data" >
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col" ><?php echo _AT('to');   ?></th>
+	<th scope="col" ><?php echo _AT('subject');?></th>
+	<th scope="col" ><?php echo _AT('date');   ?></th>
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="4">
+		<input type="submit" name="delete" value="<?php echo _AT('delete'); ?>"/>
+		<input type="submit" name="move" value="<?php echo _AT('move_to_inbox'); ?>"/>
+	</td>
+</tr>
+</tfoot>
+<tbody>
+<?php if ($row = mysql_fetch_assoc($this->result)): ?>
+	<?php do { ?>
+		<?php if ($row['message_id'] == $_GET['view']): ?>
+			<tr class="selected">
+		<?php else: ?>
+			<tr onmousedown="document.form['m<?php echo $row['message_id']; ?>'].checked = !document.form['m<?php echo $row['message_id']; ?>'].checked; rowselectbox(this, document.form['m<?php echo $row['message_id']; ?>'].checked, '');" id="r_<?php echo $row['message_id']; ?>_1">
+		<?php endif; ?>
+		<td><input type="checkbox" name="id[]" value="<?php echo $row['message_id']; ?>" id="m<?php echo $row['message_id']; ?>" <?php if (isset($_POST['id']) && in_array($row['message_id'], $_POST['id'])) { echo 'checked="checked"'; } ?> title="<?php echo _AT('delete').': '.AT_print($row['subject'], 'messages.subject');?>" onmouseup="this.checked=!this.checked" /></td>
+		<?php
+
+		$name = get_display_name($row['to_member_id']);
+
+		echo '<td align="left" valign="middle">';
+
+		if ($_GET['view'] != $row['message_id']) {
+			echo $name;
+		} else {
+			echo '<strong>'.$name.'</strong>';
+		}
+		echo '</td>';
+
+		echo '<td><label for="m'.$row['message_id'].'">';
+		if ($_GET['view'] != $row['message_id']) {
+			echo '<a href="'.$_SERVER['PHP_SELF'].'?view='.$row['message_id'].'">'.AT_print($row['subject'], 'messages.subject').'</a>';
+		} else {
+			echo '<strong>'.AT_print($row['subject'], 'messages.subject').'</strong>';
+		}
+		echo '</label></td>';
+	
+		echo '<td valign="middle" align="left" nowrap="nowrap">';
+		echo AT_date(_AT('forum_date_format'),  $row['date_sent'], AT_DATE_MYSQL_DATETIME);
+		echo '</td>';
+		echo '</tr>';
+	} while ($row = mysql_fetch_assoc($this->result)); ?>
+<?php else: ?>
+	<tr>
+		<td colspan="4"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</div>
+</form>
diff --git a/docs/themes/simplified-desktop/include/TeraWurflRemoteClient.php b/docs/themes/simplified-desktop/include/TeraWurflRemoteClient.php
new file mode 100644
index 000000000..92204c397
--- /dev/null
+++ b/docs/themes/simplified-desktop/include/TeraWurflRemoteClient.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * Tera_WURFL - PHP MySQL driven WURFL
+ * 
+ * Tera-WURFL was written by Steve Kamerman, and is based on the
+ * Java WURFL Evolution package by Luca Passani and WURFL PHP Tools by Andrea Trassati.
+ * This version uses a MySQL database to store the entire WURFL file, multiple patch
+ * files, and a persistent caching mechanism to provide extreme performance increases.
+ * 
+ * @package TeraWurflRemoteClient
+ * @author Steve Kamerman <stevekamerman AT gmail.com>
+ * @version Stable 2.1.2 $Date: 2010/05/14 15:53:02
+ * @license http://www.mozilla.org/MPL/ MPL Vesion 1.1
+ */
+/**
+ * Tera-WURFL remote webservice client for PHP
+ * @package TeraWurflRemoteClient
+ */
+class TeraWurflRemoteClient {
+	
+	/**
+	 * XML Data Format - this should only be used to communicate with Tera-WURFL 2.1.1 and older
+	 * @var String
+	 */
+	public static $FORMAT_XML = 'xml';
+	/**
+	 * The JSON Data Format is the default transport for Tera-WURFL 2.1.2 and newer due to it's smaller size
+	 * and better performance with the builtin PHP functions 
+	 * @var String
+	 */
+	public static $FORMAT_JSON = 'json';
+	/**
+	 * If you try to use a capability that has not been retrieved yet and this is set to true,
+	 * it will generate another request to the webservice and retrieve this capability automatically.
+	 * @var Bool
+	 */
+	public $autolookup = true;
+	/**
+	 * Flattened version of Tera-WURFL's capabilities array, containing only capability names and values.
+	 * Since it is 'Flattened', there a no groups in this array, just individual capabilities.
+	 * @var Array
+	 */
+	public $capabilities;
+	/**
+	 * Array of errors that were encountered while processing the request and/or response.
+	 * @var Array
+	 */
+	public $errors;
+	/**
+	 * The HTTP Headers that Tera-WURFL will look through to find the best User Agent, if one is not specified
+	 * @var Array
+	 */
+	public static $userAgentHeaders = array(
+		'HTTP_X_DEVICE_USER_AGENT',
+		'HTTP_X_ORIGINAL_USER_AGENT',
+		'HTTP_X_OPERAMINI_PHONE_UA',
+		'HTTP_X_SKYFIRE_PHONE',
+		'HTTP_X_BOLT_PHONE_UA',
+		'HTTP_USER_AGENT'
+	);
+	protected $format;
+	protected $userAgent;
+	protected $webserviceUrl;
+	protected $xml;
+	protected $json;
+	protected $clientVersion = '2.1.2';
+	protected $apiVersion;
+	
+	/**
+	 * Creates a TeraWurflRemoteClient object.  NOTE: in Tera-WURFL 2.1.2 the default data format is JSON.
+	 * This format is not supported in Tera-WURFL 2.1.1 or earlier, so if you must use this client with 
+	 * an earlier version of the server, set the second parameter to TeraWurflRemoteClient::$FORMAT_XML
+	 * @param String URL to the master Tera-WURFL Server's webservice.php
+	 * @param String TeraWurflRemoteClient::$FORMAT_JSON or TeraWurflRemoteClient::$FORMAT_XML
+	 */
+	public function __construct($TeraWurflWebserviceURL,$data_format='json'){
+		$this->format = $data_format;
+		if(!self::validURL($TeraWurflWebserviceURL)){
+			throw new Exception("TeraWurflRemoteClient Error: the specified webservice URL is invalid.  Please make sure you pass the full url to Tera-WURFL's webservice.php.");
+			exit(1);
+		}
+		$this->capabilities = array();
+		$this->errors = array();
+		$this->webserviceUrl = $TeraWurflWebserviceURL;
+	}
+	/**
+	 * Get the requested capabilities from Tera-WURFL for the given user agent
+	 * @param String HTTP User Agent of the device being detected
+	 * @param Array Array of capabilities that you would like to retrieve
+	 * @return bool Success
+	 */
+	public function getCapabilitiesFromAgent($userAgent, Array $capabilities){
+		$this->userAgent = (is_null($userAgent))? self::getUserAgent(): $userAgent;
+		// build request string
+		$uri = $this->webserviceUrl . (strpos($this->webserviceUrl,'?')===false?'?':'&') 
+		. 'ua=' . urlencode($this->userAgent)
+		. '&format=' . $this->format
+		. '&search=' . implode('|',$capabilities);
+		$this->callTeraWurfl($uri);
+		$this->loadCapabilities();
+		$this->loadErrors();
+		return true;
+	}
+	/**
+	 * Returns the value of the requested capability
+	 * @param String The WURFL capability you are looking for (e.g. "is_wireless_device")
+	 * @return Mixed String, Numeric, Bool
+	 */
+	public function getDeviceCapability($capability){
+		$capability = strtolower($capability);
+		if(!array_key_exists($capability, $this->capabilities)){
+			if($this->autolookup){
+				$this->getCapabilitiesFromAgent($this->userAgent, array($capability), array());
+			}
+			return $this->capabilities[$capability];
+		}
+		return $this->capabilities[$capability];
+	}
+	/**
+	 * Get the version of the Tera-WURFL Remote Client (this file)
+	 * @return String
+	 */
+	public function getClientVersion(){
+		return $this->clientVersion;
+	}
+	/**
+	 * Get the version of the Tera-WURFL Webservice (webservice.php on server).  This is only available
+	 * after a query has been made since it is returned in the XML response.
+	 * @return String
+	 */
+	public function getAPIVersion(){
+		return $this->apiVersion;
+	}
+	/**
+	 * Make the webservice call to the server using the GET method and load the XML response into $this->xml 
+	 * @param String The URI of the master server
+	 * @return void
+	 */
+	protected function callTeraWurfl($uri){
+		try{
+			switch($this->format){
+				case self::$FORMAT_JSON:
+					$data = file_get_contents($uri);
+					$this->json = json_decode($data,true);
+					if(is_null($this->json)){
+						// Trigger the catch block
+						throw new Exception("foo");
+					}
+					unset($data);
+					break;
+				default:
+				case self::$FORMAT_XML:
+					if(!$this->xml = simplexml_load_file($uri)){
+						throw new Exception("foo");
+					}
+					break;
+			}
+		}catch(Exception $ex){
+			// Can't use builtin logging here through Tera-WURFL since it is on the client, not the server
+			throw new Exception("TeraWurflRemoteClient Error: Could not query Tera-WURFL master server.");
+			exit(1);
+		}
+	}
+	/**
+	 * Parse the response into the capabilities array
+	 * @return void
+	 */
+	protected function loadCapabilities(){
+		switch($this->format){
+			case self::$FORMAT_JSON:
+				$this->apiVersion = $this->json['apiVersion'];
+				$this->capabilities = $this->json['capabilities'];
+				break;
+			default:
+			case self::$FORMAT_XML:
+				$this->apiVersion = $this->xml->device['apiVersion'];
+				foreach($this->xml->device->capability as $cap){
+					$this->capabilities[(string)$cap['name']] = self::niceCast((string)$cap['value']);
+				}
+				break;
+		}
+	}
+	/**
+	 * Parse the response's errors into the errors array
+	 * @return void
+	 */
+	protected function loadErrors(){
+		switch($this->format){
+			case self::$FORMAT_JSON:
+				$this->errors &= $this->json['errors'];
+				break;
+			default:
+			case self::$FORMAT_XML:
+				foreach($this->xml->errors->error as $error){
+					$this->errors[(string)$error['name']]=(string)$error['description'];
+				}
+				break;
+		}
+	}
+	/**
+	 * Cast strings into proper variable types, i.e. 'true' into true
+	 * @param $value
+	 * @return Mixed String, Bool, Float
+	 */
+	protected static function niceCast($value){
+		// Clean Boolean values
+		if($value === 'true')$value=true;
+		if($value === 'false')$value=false;
+		if(!is_bool($value)){
+			// Clean Numeric values by loosely comparing the (float) to the (string)
+			$numval = (float)$value;
+			if(strcmp($value,$numval)==0)$value=$numval;
+		}
+		return $value;
+	}
+	/**
+	 * Is the given URL valid
+	 * @param $url
+	 * @return Bool
+	 */
+	protected static function validURL($url){
+		if(preg_match('/^(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/',$url)) return true;
+		return false;
+	}	
+	/**
+	 * Return the requesting client's User Agent
+	 * @param $source
+	 * @return String
+	 */
+	public static function getUserAgent($source=null){
+		if(is_null($source) || !is_array($source))$source = $_SERVER;
+		$userAgent = '';
+		if(isset($_GET['UA'])){
+			$userAgent = $_GET['UA'];
+		}else{
+			foreach(self::$userAgentHeaders as $header){
+				if(array_key_exists($header,$source) && $source[$header]){
+					$userAgent = $source[$header];
+					break;
+				}
+			}
+		}
+		return $userAgent;
+	}
+}
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/include/footer.tmpl.php b/docs/themes/simplified-desktop/include/footer.tmpl.php
new file mode 100644
index 000000000..45b9c2d06
--- /dev/null
+++ b/docs/themes/simplified-desktop/include/footer.tmpl.php
@@ -0,0 +1,96 @@
+<?php if (!defined('AT_INCLUDE_PATH')) { exit; } ?>
+<?php if ($this->mobile_device_type != IPAD_DEVICE): ?><!-- begin footer template for iphone, android, and blackberry -->
+
+
+</div> <!-- end innner-contentwrapper -->	
+</div> <!-- end contentcolumn -->
+</div> <!-- end contentwrapper -->
+</div> <!-- end main -->
+</div> <!-- end wrapper -->
+
+<div id="footer" class="fl-navbar fl-table">
+<div id="footer-links"> <!-- top help/search/login links -->
+	<ul class="footer-links-tabs fl-tabs flc-themer" role="menu">  
+		<?php if (isset($_SESSION['member_id']) && $_SESSION['member_id'] > 0): ?>
+			<?php if(!$this->just_social): ?>					
+				<?php if ($_SESSION['is_super_admin']): ?>
+				<li role="menuitem">	<a  href="<?php echo $this->base_path; ?>bounce.php?admin"><?php echo _AT('back'); ?></a> </li>
+				<?php endif; ?>
+	
+				<?php if ($this->course_id > -1): ?>
+					<?php if (get_num_new_messages()): ?>
+				<li role="menuitem">		<a  href="<?php echo $this->base_path; ?>inbox/index.php"><?php echo _AT('inbox'); ?> (<?php echo get_num_new_messages(); ?>)</a> </li>
+					<?php else: ?>
+				<li role="menuitem">		<a href="<?php echo $this->base_path; ?>inbox/index.php"><?php echo _AT('inbox'); ?></a></li>
+					<?php endif; ?>
+				<?php endif; ?>
+			<?php endif; ?>
+		<?php endif; ?>
+		<!--  SEARCH MOVED TO #topnavlist 
+		<?php if(!$this->just_social): ?>
+			<li><a href="<?php echo $this->base_path; ?>search.php"><?php echo _AT('search'); ?></a> </li>
+		<?php endif; ?> -->
+		<li role="menuitem"><a href="<?php echo $this->base_path; ?>help/index.php"><?php echo _AT('help'); ?></a></li>
+
+		<?php if (isset($_SESSION['valid_user']) && $_SESSION['valid_user']): ?>					 
+			<li role="menuitem"><a href="<?php echo $this->base_path; ?>logout.php"><?php echo _AT('logout'); ?></a></li>
+		<?php else: ?>
+			<!-- <li><a href="<?php echo $this->base_path; ?>login.php?course=<?php echo $this->course_id; ?>"><?php echo _AT('login'); ?></a></li> -->
+		<?php endif; ?>
+</ul>			
+ </div>			
+</div>
+
+	<script language="javascript" type="text/javascript">
+//<!--
+    <?php require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); ?>
+//-->
+</script>
+</body>
+<?php endif;?><!--  end footer template for iphone, android and blackberry -->
+<?php if ($this->mobile_device_type == IPAD_DEVICE): ?> <!-- start footer template for ipad/talets -->
+
+</div> <!-- end main -->
+</div> <!-- end innner-contentwrapper -->	
+</div> <!-- end contentcolumn -->
+
+<div id="footer" class="fl-navbar fl-table">
+<div id="footer-links"> <!-- top help/search/login links -->
+	<ul class="footer-links-tabs fl-tabs flc-themer" role="menu">  
+		<?php if (isset($_SESSION['member_id']) && $_SESSION['member_id'] > 0): ?>
+			<?php if(!$this->just_social): ?>					
+				<?php if ($_SESSION['is_super_admin']): ?>
+				<li role="menuitem">	<a  href="<?php echo $this->base_path; ?>bounce.php?admin"><?php echo _AT('back'); ?></a> </li>
+				<?php endif; ?>
+	
+				<?php if ($this->course_id > -1): ?>
+					<?php if (get_num_new_messages()): ?>
+				<li role="menuitem">		<a  href="<?php echo $this->base_path; ?>inbox/index.php"><?php echo _AT('inbox'); ?> (<?php echo get_num_new_messages(); ?>)</a> </li>
+					<?php else: ?>
+				<li role="menuitem">		<a href="<?php echo $this->base_path; ?>inbox/index.php"><?php echo _AT('inbox'); ?></a></li>
+					<?php endif; ?>
+				<?php endif; ?>
+			<?php endif; ?>
+		<?php endif; ?>
+		
+		<?php if(!$this->just_social): ?>
+			<li role="menuitem"><a href="<?php echo $this->base_path; ?>search.php"><?php echo _AT('search'); ?></a> </li>
+		<?php endif; ?> 
+		<li role="menuitem"><a href="<?php echo $this->base_path; ?>help/index.php"><?php echo _AT('help'); ?></a></li>
+
+		<?php if (isset($_SESSION['valid_user']) && $_SESSION['valid_user']): ?>					 
+			<li role="menuitem"><a href="<?php echo $this->base_path; ?>logout.php"><?php echo _AT('logout'); ?></a></li>
+		<?php else: ?>
+			<!-- <li><a href="<?php echo $this->base_path; ?>login.php?course=<?php echo $this->course_id; ?>"><?php echo _AT('login'); ?></a></li> -->
+		<?php endif; ?>
+</ul>			
+ </div>			
+</div>
+	<script language="javascript" type="text/javascript">
+//<!--
+    <?php require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); ?>
+//-->
+</script>
+</body>
+<?php endif; ?><!--  end footer template for ipad/tablets -->
+</html>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/include/header.tmpl.php b/docs/themes/simplified-desktop/include/header.tmpl.php
new file mode 100644
index 000000000..e1c60f7d0
--- /dev/null
+++ b/docs/themes/simplified-desktop/include/header.tmpl.php
@@ -0,0 +1,661 @@
+<?php
+/************************************************************************/
+/* ATutor																*/
+/************************************************************************/
+/* Copyright (c) 2002-2008 by Greg Gay, Joel Kronenberg & Heidi Hazelton*/
+/* Adaptive Technology Resource Centre / University of Toronto			*/
+/* http://atutor.ca														*/
+/*																		*/
+/* This program is free software. You can redistribute it and/or		*/
+/* modify it under the terms of the GNU General Public License			*/
+/* as published by the Free Software Foundation.						*/
+/************************************************************************/
+// $Id: header.tmpl.php 3825 2005-03-11 15:35:51 joel $
+if (!defined('AT_INCLUDE_PATH')) { exit; }
+/* available header.tmpl.php variables:
+ * $this->lang_code			the ISO language code
+ * SITE_NAME				the site name from the config file
+ * $this->page_title		the name of this page to use in the <title>
+ * $this->lang_charset		the ISO language character set
+ * $this->content_base_href	the <base href> to use for this page
+ * $this->base_path			the absolute path to this atutor installation
+ * $this->rtl_css			if set, the path to the RTL style sheet
+ * $this->icon			the path to a course icon
+ * $this->banner_style		-deprecated-
+ * $this->theme				the directory name of the current theme
+ * $this->base_href			the full url to this atutor installation
+ * $this->onload			javascript onload() calls
+ * $this->img				the absolute path to this theme's images/ directory
+ * $this->sequence_links	associative array of 'previous', 'next', and/or 'resume' links
+ * $this->path				associative array of path to this page: aka bread crumbs
+ * $this->rel_url			the relative url from the installation root to this page
+ * $this->nav_courses		associative array of this user's enrolled courses
+ * $this->section_title		the title of this section (course, public, admin, my start page)
+ * $this->current_top_level_page	the full path to the current top level page with file name
+ * $this->sub_level_pages			associate array of sub level navigation
+ * $this->back_to_page				if set, the path and file name to the part of this page (if parent is not a top level nav)
+ * $this->current_sub_level_page	the full path to the current sub level page with file name
+ * $this->guide				the full path and file name to the guide page
+ * ======================================
+ * top_level_pages           array(array('url', 'title'))     the top level pages. ATutor default creates tabs.
+ * section_title             string                           the name of the current section. either name of the course, administration, my start page, etc.
+ * page_title                string                           the title of the current page.
+ * path                      array(array('url', 'title'))     the path to the current page.
+ * back_to_page              array('url', 'title')            the link back to the part of the current page, if needed.
+ * current_top_level_page    string                           full url to the current top level page in "top_leve_pages"
+ * current_sub_level_page    string                           full url to the current sub level page in the "sub_level_pages"
+ * sub_level_pages           array(array('url', 'title'))     the sub level pages.
+ * is_mobile_device          true or false                    the request is from a mobile device or a desktop device
+ * mobile_device_type        One of the constants: IPOD_DEVICE, BLACKBERRY_DEVICE, ANDROID_DEVICE, UNKNOWN_DEVICE (@see include/lib/constants.inc.php)
+ */
+ 
+
+// will have to be moved to the header.inc.php
+global $system_courses, $_custom_css, $db, $_base_path, $contentManager;
+
+// 1. any click on the page closes the content menu but the link "content_link" itself
+// 2. the click on link "content_link" opens the content menu
+
+
+require ('TeraWurflRemoteClient.php');
+$wurflObj = new TeraWurflRemoteClient('http://wurfl.thesedays.com/webservice.php');
+$capabilities = array("product_info");
+$data_format = TeraWurflRemoteClient::$FORMAT_JSON;
+$wurflObj->getCapabilitiesFromAgent(null, $capabilities, $data_format);
+
+// open/close content menu
+$this->onload .= "
+jQuery('#content_link').click(function(e) {
+  e.stopPropagation();
+  
+  jQuery('#content').slideToggle(0);
+  jQuery('#content_link').toggleClass('content_link_tablet_highlight');
+  jQuery('#content_link').toggleClass('triangle-isosceles'); 
+  jQuery('#content_link').toggleClass('top'); 
+  jQuery('#content_link').toggleClass('right');    
+  ";
+$this->onload .= "});
+";
+
+//open/close subnavlist in smartphones    
+
+$this->onload .= "
+jQuery('#subnavlist-link').click(function(e) {
+  e.stopPropagation();
+  
+  jQuery('#subnavlist').slideToggle();
+  jQuery('#subnavlist-link').toggleClass('content-closed');
+  jQuery('#subnavlist-link').toggleClass('subnavcontain-active');
+  jQuery('.subnavcontain').toggleClass('subnavcontain3');     
+  ";
+$this->onload .= "});
+";
+// open/close content menu - smartphones 
+$this->onload .= "
+jQuery('#content_link_phone').click(function(e) {
+  e.stopPropagation();
+  
+  jQuery('#content').slideToggle();
+ 
+  jQuery('#content_link_phone').toggleClass('topnavlist-link-highlight');
+  jQuery('#content_link_phone').toggleClass('content-closed'); 
+  jQuery('.subnavcontain').toggleClass('subnavcontain3'); 
+  ";
+$this->onload .= "});
+";
+
+// open/close header navigational menu for smartphones
+// jQuery('#topnavlist-link').toggleClass('topnavlist-link-highlight');
+$this->onload .= "
+jQuery(document).click(function () {
+jQuery('#topnavlist').slideUp(600);}); 
+jQuery('.topnavlist-link').click(function(e) {
+  e.stopPropagation();
+  jQuery('#topnavlist').slideToggle();
+ jQuery('#topnavlist-link').toggleClass('.topnavlist-link-highlight');
+});
+";
+
+// open/close header navigational menu for tablets
+
+$this->onload .= "
+jQuery(document).click(function () {
+jQuery('#navigation-column').slideUp(200);}); 
+jQuery('.topnavlist-link').click(function(e) {
+  e.stopPropagation();
+  jQuery('#navigation-column').slideToggle(0);
+    jQuery('#topnavlist-link').toggleClass('topnavlist-link-highlight');
+    jQuery('#topnavlist-link').toggleClass('triangle-isosceles');
+    jQuery('#topnavlist-link').toggleClass('top');
+});
+";
+
+//jQuery for Gmail dock-style "more" button that makes the subnavlist expand for more options
+$this->onload .= "
+
+jQuery('.more-button').toggle(function(e) {
+  jQuery('.subnavlist-more').show();
+  jQuery('#switch').attr('src','images/hidemenu.gif' );
+  jQuery('#switch').attr('title', 'less menu items'); 
+  jQuery('#switch').attr('alt', 'less menu items');
+},function(){
+  jQuery('.subnavlist-more').hide(); 
+  jQuery('#switch').attr('src', 'images/showmenu.gif' );
+  jQuery('#switch').attr('title', 'more menu items'); 
+  jQuery('#switch').attr('alt', 'more menu items');
+});
+";
+
+//hide and show results	on Browse Courses page
+
+$this->onload .= "
+jQuery('#results-hide-show-link').click(function(e) {
+  e.stopPropagation();
+    jQuery('#results-display').slideToggle();
+    jQuery(this).toggleClass('content-closed');
+    jQuery(this).preventDefault();
+  ";
+$this->onload .= "});
+";
+
+//hide and show results	elsewhere (uses classes) 
+$this->onload .= "
+jQuery('.results-hide-show-link').click(function(e) {
+  e.stopPropagation();
+	jQuery(this).parent().next('.results-display').slideToggle(); 
+	  jQuery(this).toggleClass('content-closed');
+  ";
+$this->onload .= "});
+";
+	
+
+// Hide the addressbar
+$this->onload .= "
+setTimeout(function() { window.scrollTo(0, 1) }, 100);
+";
+
+
+
+?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="<?php echo $this->lang_code; ?>"> 
+
+<head>
+	<title><?php echo SITE_NAME; ?> : <?php echo $this->page_title; ?></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $this->lang_charset; ?>" />
+	<meta name="Generator" content="ATutor - Copyright 2005 by http://atutor.ca" />
+	<base href="<?php echo $this->content_base_href; ?>" />
+	<link rel="shortcut icon" href="<?php echo $this->base_path; ?>favicon.ico" type="image/x-icon" /> 
+	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/print.css" type="text/css" media="print" />
+	<!-- mobile fss -->	
+	<link rel="stylesheet" href="<?php echo $this->base_path; ?>jscripts/infusion/framework/fss/css/fss-mobile-layout.css" type="text/css"/>
+	<link rel="stylesheet" href="<?php echo $this->base_path; ?>jscripts/infusion/framework/fss/css/fss-mobile-theme-iphone.css" type="text/css"/>	
+	
+<?php if ($this->is_mobile_device == true): ?>
+	<?php if ($this->mobile_device_type == ANDROID_DEVICE): ?>
+	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/mobile.css" type="text/css"/>
+	<meta name="viewport" content="user-scalable=no, width=device-width" />
+	<?php endif; ?>
+	<?php if ($this->mobile_device_type == IPOD_DEVICE || $this->mobile_device_type == IPHONE_DEVICE): ?>
+	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/mobile.css" type="text/css"/>
+	<meta name="viewport" content="user-scalable=no, width=device-width" />
+	<?php endif; ?>
+	<!-- Armin 25.08.2010: Detect BLACKBERRY_DEVICE and use blackberry.css-->
+	<?php if ($this->mobile_device_type == BLACKBERRY_DEVICE): ?>
+	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/blackberry.css" type="text/css"/>
+	<meta name="viewport" content="user-scalable=no, width=device-width" />
+	<?php endif; ?>
+	<?php if ($this->mobile_device_type == IPAD_DEVICE): ?>
+	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/tablet.css" type="text/css"/>
+	<meta name="viewport" content="width=768px, minimum-scale=1.0, maximum-scale=1.0" />
+	<?php endif; ?>
+<?php endif; ?>
+
+	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/forms.css" type="text/css" />
+	<!-- Fluid Infusion mobile fss extension... Remove when it is committed to Mobile FSS.  
+	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/moz.css" type="text/css" />-->	
+	<!-- Fluid Infusion -->
+	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
+	<script language="javascript" type="text/javascript">
+
+	//<!--
+	jQuery.noConflict();
+	//-->
+	</script>
+	<script src="<?php echo $this->base_path; ?>jscripts/ATutor.js" type="text/javascript"></script>   
+
+	
+<?php echo $this->rtl_css; ?>
+<?php if (isset($this->course_id) && $system_courses[$this->course_id]['rss']): ?>
+	<link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 2.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-2" />
+	<link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 1.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-1" />
+<?php endif; ?>
+
+
+<?php echo $this->custom_css; ?>
+</head>
+
+
+<?php if ($this->mobile_device_type != IPAD_DEVICE): ?><!--  smartphone theme only -->
+
+<body onload="<?php echo $this->onload; ?>" class="fl-theme-iphone ui-mobile-viewport">
+
+<div id="wrapper">
+<div id="main">
+	<div id="header">
+
+		<a href="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES); ?>#content">
+		<img src="<?php echo $this->base_path; ?>images/clr.gif" height="1" width="1" border="0" alt="<?php echo _AT('goto_content'); ?> ALT+c" /></a>		
+
+		<div id="header-section-title">
+			<!-- <?php if (isset($_SESSION['valid_user']) && $_SESSION['valid_user']): 
+					echo '<div id="site-name">'.stripslashes(SITE_NAME).'</div>'; 
+				endif; ?> --> 
+			<h1 id="section-title"><?php echo $this->section_title; ?>
+				<?php if ((isset($this->course_id) && $this->course_id > 0) && ($_SESSION['enroll'] == AT_ENROLL_NO)) : ?> 
+				<!-- <small><a href="<?php echo $this->base_path; ?>enroll.php?course=<?php echo $this->course_id; ?>"><?php echo _AT('enroll_me'); ?></a></small>-->
+				<?php endif; ?>
+				</h1>
+		</div>
+	</div> <!--  END HEADER -->
+
+
+	<div id="contentwrapper">
+	<div id="navigation-contentwrapper">
+	<div id="navigation-bar">
+
+			<?php if ($this->current_sub_level_page): ?>
+			<div id="topnavlistcontainer" role="menu" aria-live="assertive" class="topnavlistcontainer" >
+			<a class="navigation-bar-button topnavlist-link" id="topnavlist-link" href="javascript:void(0);" tabindex="1"><?php echo _AT('navigation'); ?></a>
+				<ul id="topnavlist"  class="fl-list-menu" role="menu">
+					<?php $accesscounter = 0; //initialize ?>
+					<?php foreach ($this->top_level_pages as $page): ?>
+						<?php ++$accesscounter; $accesscounter = ($accesscounter == 10 ? 0 : $accesscounter); ?>
+						<?php $accesskey_text = ($accesscounter < 10 ? 'accesskey="'.$accesscounter.'"' : ''); ?>
+						<?php $accesskey_title = ($accesscounter < 10 ? ' Alt+'.$accesscounter : ''); ?>
+						<?php if ($page['url'] == $this->current_top_level_page): ?>
+							<li role="menuitem"><span class="arrow-highlight"><a  href="<?php echo $page['url']; ?>" <?php echo $accesskey_text; ?> title="<?php echo $page['title'];?>"><?php echo $page['title']; ?></a></span></li>
+						<?php else: ?>
+							<li role="menuitem"><span class="arrow-highlight"><a  href="<?php echo $page['url']; ?>" <?php echo $accesskey_text; ?> title="<?php echo $page['title']; ?>"><?php echo $page['title']; ?></a></span></li>
+						<?php endif; ?>
+				
+						<?php $accesscounter = ($accesscounter == 0 ? 11 : $accesscounter); ?>
+					
+					<?php endforeach; ?>
+					<?php if(!$this->just_social): ?>
+					<li role="menuitem"><span class="arrow-highlight"><a href="<?php echo $this->base_path; ?>search.php"><?php echo _AT('search'); ?></a></span></li>
+					<?php endif; ?> 
+				</ul>
+			</div>
+			<?php endif; ?>
+		</div>
+
+				
+
+
+	<ul class="home-guide fl-tabs" id="home-guide" role="menu">
+	<!--  CHECK TO SEE IF USER IS A STUDENT -->
+	<?php if($_SESSION['is_admin'] == 0 && $_SESSION['privileges'] == 0 ):?>
+		<li role="menuitem"><a  href="<?php echo $this->base_path; ?>users/index.php"><?php echo _AT("home"); ?></a></li> 
+	<?php endif;?>		
+	<!--  CHECK TO SEE IF USER IS AN ADMINISTRATOR -->
+	<?php //if($_SESSION['is_admin'] == 0 && $_SESSION['privileges'] == 1):
+		if($_SESSION['is_admin'] == 0 && $_SESSION['privileges'] == AT_ADMIN_PRIV_ADMIN):?>
+		<li role="menuitem"><a href="<?php echo $this->base_path; ?>admin/index.php"><?php echo _AT("home"); ?></a></li> 
+	<?php endif;?>
+	<!--  CHECK TO SEE IF USER IS AN INSTRUCTOR -->
+	<?php if($_SESSION['is_admin'] == 1): ?>
+		<li role="menuitem"><a href="<?php echo $this->base_path; ?>users/index.php"><?php echo _AT("home"); ?></a></li> 
+	<?php endif;?>
+	
+	<?php if (isset($this->guide) && isset($_SESSION["course_id"]) && $this->guide && ($_SESSION["prefs"]["PREF_SHOW_GUIDE"] || $_SESSION["course_id"] == "-1")) : ?>
+			<li role="menuitem">
+		    	<div id="guide_box">
+					<!--    <a href="<?php echo $this->guide; ?>" id="guide" onclick="ATutor.poptastic('<?php echo $this->guide; ?>'); return false;" target="_new"><img src="<?php echo $this->img; ?>guide-icon.png" width="30" height="30" title="guide: <?php echo $this->page_title; ?>"alt="guide: <?php echo $this->page_title; ?>"></img></a> -->
+      		
+				  <a href="<?php echo $this->guide; ?>" id="guide" onclick="ATutor.poptastic('<?php echo $this->guide; ?>'); return false;" target="_new"><?php echo _AT("guide"); ?></a> 
+      			</div>
+			</li>
+			<?php endif; ?>
+		</ul>
+	</div><!--  END navigation-contentwrapper -->
+	
+
+		<div id="inner-contentwrapper" class="fl-container" >
+
+	
+			
+		<!-- the sub navigation -->
+		<div id="subnavbacktopage">
+		<?php if (count($this->sub_level_pages) > 0): ?>
+			
+			<div id="subnavlistcontainer">
+				
+				<!-- id="subnavlist" -->
+			<div class="subnavcontain-contain" role="menu" aria-live="assertive">	
+				<div class="subnavcontain">
+					<div class="rectangle">
+						<?php $num_pages = count($this->sub_level_pages); ?>	
+								<?php for ($i=0; $i<$num_pages; $i++): ?>	
+									<?php if($i==0): ?>
+				
+									<a id="subnavlist-link" class="content-expand" href="javascript:void(0);"> Topics in <?php echo $this->sub_level_pages[$i]['title']; ?></a>
+									<?php endif; ?>
+								<?php endfor;?>
+					</div>
+				</div>
+					<ul id="subnavlist" class="fl-list-menu">
+					<?php $num_pages = count($this->sub_level_pages); ?>	
+					<?php for ($i=0; $i<$num_pages; $i++): ?>				
+						<?php if ($this->sub_level_pages[$i]['url'] == $this->current_sub_level_page): ?>
+							<li><a href="<?php echo $this->sub_level_pages[$i]['url']; ?>"><?php echo $this->sub_level_pages[$i]['title']; ?></a></li> 
+						<?php else: ?>
+							<li><a href="<?php echo $this->sub_level_pages[$i]['url']; ?>"><?php echo $this->sub_level_pages[$i]['title']; ?></a></li>
+						<?php endif; ?>
+					<?php if ($i < $num_pages-1): 
+						echo " ";?>
+					<?php endif; ?>
+					<?php endfor; ?>
+					</ul>
+				</div>
+			</div>	
+		<?php endif; ?>
+	</div> <!--end subnavbacktopage-->	
+
+	<div id="contentcolumn">	
+		
+
+		<!--the page title-->
+		<div id="page-title-back-to-page">
+		<a name="content" title="<?php echo _AT('content'); ?>"></a>
+		<h2 class="page-title"><?php echo $this->page_title; ?></h2>
+			<div id="back-to-page">
+				<?php if (isset($this->back_to_page)): ?>
+					<a href="<?php echo $this->back_to_page['url']; ?>">
+					<img border="0" width="10" height="11" alt="<?php echo _AT('back_to').' '.$this->back_to_page['title']; ?>" src="<?php echo $this->base_href; ?>images/arrowicon.gif" style="float:left;"/></a>&nbsp;
+				<?php endif; ?>
+		</div>		
+		</div><!--  end page-title-back-to-page -->
+	
+		<?php global $msg; $msg->printAll(); $_base_href;?>
+			<div id="content-sequence-links">
+			<!-- ENSURE "content_link" DOESN'T APPEAR IF NOT LOGGED IN -->
+		<?php if (isset($this->course_id) && $this->course_id > 0): ?>
+	
+		<?php endif; ?>
+	
+	
+	<?php if(isset($_SESSION['course_id']) && $_SESSION['course_id'] > 0): ?> 
+		
+		<div class="subnavcontain-contain" role="menu" aria-live="assertive">	
+			<div class="subnavcontain">
+				<div class="rectangle">
+				<a id="content_link_phone"  class="content-expand" href="javascript:void(0);" >View Course Content</a> 
+				<!-- <a href="#">content</a> -->
+				</div>
+			</div>
+					
+		<div id="content">
+			<?php $contentManager->printMainMenu(); ?>
+				<script language="javascript" type="text/javascript"></script>
+		</div>
+
+	</div>
+
+
+		
+			<?php if (isset($this->course_id) && $this->course_id > 0): ?>
+			
+			<div class="subnavcontain2">
+			<ul class="sequence-links">
+				<?php if ($_SESSION["prefs"]["PREF_SHOW_NEXT_PREVIOUS_BUTTONS"]) { ?>
+					<?php if ($this->sequence_links['resume']): ?>
+						
+						<li class="rectangle2">
+							<a href="<?php echo $this->sequence_links['resume']['url']; ?>" class="previous-next resume" title="<?php echo _AT('resume').': '.$this->sequence_links['resume']['title']; ?>"><?php echo _AT('resume'); ?></a>
+						</li>
+						
+					<?php else:
+						if ($this->sequence_links['previous']): ?>
+					
+						<li class="rectangle2 arrow back">
+							<a  href="<?php echo $this->sequence_links['previous']['url']; ?>" class="arrow back" title="<?php echo _AT('previous_topic').': '. $this->sequence_links['previous']['title']; ?>"> <?php echo "Previous"; ?> </a>
+						</li>
+						
+					<?php endif;
+						if ($this->sequence_links['next']): ?>
+						
+						<li class=" rectangle2 arrow forward">
+							<a  href="<?php echo $this->sequence_links['next']['url']; ?>" class=""  title="<?php echo _AT('next_topic').': '.$this->sequence_links['next']['title']; ?>"> <?php echo "Next"; ?></a>
+						</li>
+						
+					<?php endif; ?>
+				<?php endif; ?>
+			<?php } ?>
+				&nbsp;
+				</div>
+			</ul>  
+		<?php endif; ?>
+			
+			
+	</div>
+	<?php endif; ?>	
+
+
+	
+		<!-- the sub navigation -->
+<?php endif; ?>
+
+
+
+<!--  end header template for iphone, android, blackberry -->
+<?php if ($this->mobile_device_type == IPAD_DEVICE): ?><!-- start header template for ipad/tablets -->
+<body onload="<?php echo $this->onload; ?>" class="fl-theme-iphone ui-mobile-viewport">
+
+<div id="wrapper">
+<div id="main">
+	
+	<div id="header" role="header">
+	
+	<div class="bypass">
+		<a href="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES); ?>#page-title" accesskey="c">
+		<img src="<?php echo $this->base_path; ?>images/clr.gif" height="1" width="1" border="0" alt="<?php echo _AT('goto_content'); ?> ALT+c" /></a>		
+</div>	
+	
+	
+	<div id="header-section-title">
+			<h1 id="section-title"><?php echo $this->section_title; ?></h1>
+		</div>
+
+	
+	<div id="navigation-contentwrapper" role="menubar" >
+	
+			<?php if ($this->current_sub_level_page): ?>
+			<div id="topnavlistcontainer" role="navigation" aria-live="assertive" class="topnavlistcontainer fl-container" >
+			<a class="navigation-bar-button topnavlist-link" id="topnavlist-link" href="javascript:void(0);" tabindex="1"><?php echo _AT('navigation'); ?></a>
+			
+				<div id="navigation-column">
+				<?php if ($this->current_sub_level_page): ?>
+				<ul id="topnavlist-tablet"  class="fl-list-menu" role="menu">
+					<?php $accesscounter = 0; //initialize ?>
+					<?php foreach ($this->top_level_pages as $page): ?>
+						<?php ++$accesscounter; $accesscounter = ($accesscounter == 10 ? 0 : $accesscounter); ?>
+						<?php $accesskey_text = ($accesscounter < 10 ? 'accesskey="'.$accesscounter.'"' : ''); ?>
+						<?php $accesskey_title = ($accesscounter < 10 ? ' Alt+'.$accesscounter : ''); ?>
+						<?php if ($page['url'] == $this->current_top_level_page): ?>
+							<!-- note bug http://issues.fluidproject.org/browse/FLUID-4313 makes class "flc-screenNavigator-backButton fl-link-hilight" not work -->
+							<li role="menuitem"><a  href="<?php echo $page['url']; ?>" <?php echo $accesskey_text; ?> class="flc-screenNavigator-backButton fl-link-hilight" title="<?php echo $page['title'];?>"><?php echo $page['title']; ?></a>  </li>
+						<?php else: ?>
+							<li role="menuitem"><a  href="<?php echo $page['url']; ?>" <?php echo $accesskey_text; ?> title="<?php echo $page['title']; ?>"><?php echo $page['title']; ?></a></li>
+						<?php endif; ?>
+				
+						<?php $accesscounter = ($accesscounter == 0 ? 11 : $accesscounter); ?>
+					
+					<?php endforeach; ?>
+					 
+				</ul>
+				<?php endif; ?>
+			</div>
+			</div>
+			<?php endif; ?>	
+		
+	<ul class="home-guide fl-tabs" id="home-guide" role="menu">
+	<!--  CHECK TO SEE IF USER IS A STUDENT -->
+	<?php if($_SESSION['is_admin'] == 0 && $_SESSION['privileges'] == 0 ):?>
+		<li role="menuitem"><a href="<?php echo $this->base_path; ?>users/index.php"><?php echo _AT("home"); ?></a></li> 
+	<?php endif;?>		
+	<!--  CHECK TO SEE IF USER IS AN ADMINISTRATOR -->
+	<?php //if($_SESSION['is_admin'] == 0 && $_SESSION['privileges'] == 1):
+		if($_SESSION['is_admin'] == 0 && $_SESSION['privileges'] == AT_ADMIN_PRIV_ADMIN):?>
+		<li role="menuitem"><a href="<?php echo $this->base_path; ?>admin/index.php"><?php echo _AT("home"); ?></a></li> 
+	<?php endif;?>
+	<!--  CHECK TO SEE IF USER IS AN INSTRUCTOR -->
+	<?php if($_SESSION['is_admin'] == 1): ?>
+		<li role="menuitem"><a href="<?php echo $this->base_path; ?>users/index.php"><?php echo _AT("home"); ?></a></li> 
+	<?php endif;?>
+	
+	<?php if (isset($this->guide) && isset($_SESSION["course_id"]) && $this->guide && ($_SESSION["prefs"]["PREF_SHOW_GUIDE"] || $_SESSION["course_id"] == "-1")) : ?>
+			<li>
+		    	<div id="guide_box">
+					<!--    <a href="<?php echo $this->guide; ?>" id="guide" onclick="ATutor.poptastic('<?php echo $this->guide; ?>'); return false;" target="_new"><img src="<?php echo $this->img; ?>guide-icon.png" width="30" height="30" title="guide: <?php echo $this->page_title; ?>"alt="guide: <?php echo $this->page_title; ?>"></img></a> -->
+      		
+				  <a href="<?php echo $this->guide; ?>" id="guide" onclick="ATutor.poptastic('<?php echo $this->guide; ?>'); return false;" target="_new"><?php echo _AT("guide"); ?></a> 
+      			</div>
+			</li>
+			<?php endif; ?>
+		</ul>
+	
+	<?php if (isset($this->course_id) && $this->course_id > 0): ?>
+			
+<div id="sequence-links-course-navigation">	
+		<ul class="sequence-links fl-tabs" id="sequence-links" >
+			<?php if ($_SESSION["prefs"]["PREF_SHOW_NEXT_PREVIOUS_BUTTONS"]) { ?>
+				<?php if ($this->sequence_links['resume']): ?>
+						<li >
+						<a href="<?php echo $this->sequence_links['resume']['url']; ?>" class="previous-next" title="<?php echo _AT('resume').': '.$this->sequence_links['resume']['title']; ?>"><?php echo _AT('resume'); ?></a>
+						</li>
+				<?php else:
+					if ($this->sequence_links['previous']): ?>
+						<li  class="arrow back"><a  href="<?php echo $this->sequence_links['previous']['url']; ?>" class="arrow back" title="<?php echo _AT('previous_topic').': '. $this->sequence_links['previous']['title']; ?>"> <?php echo "Previous"; ?> </a>
+						</li>
+					<?php endif;
+					if ($this->sequence_links['next']): ?>
+						<li class="arrow forward">
+						<a href="<?php echo $this->sequence_links['next']['url']; ?>" class=""  title="<?php echo _AT('next_topic').': '.$this->sequence_links['next']['title']; ?>"> <?php echo "Next"; ?></a>
+						</li>
+					<?php endif; ?>
+				<?php endif; ?>
+			<?php } ?>
+				&nbsp;
+			</ul> <!-- end sequence-links -->
+		<?php endif; ?>
+		
+		<?php if(isset($_SESSION['course_id']) && $_SESSION['course_id'] > 0): ?> 	
+		<div id="course-level-navigation">
+		
+	
+			
+			<div id="content-link-container" role="navigation" aria-live="assertive" class="flc-screenNavigator-navbar ">
+				<a id="content_link" class="content_link_tablet content_link"  href="javascript:void(0);"><?php echo "Content";//_AT("content_navigation"); ?></a>	
+			</div>	
+			</div><!-- course-level navigation -->				
+				<div id="content">
+					<?php $contentManager->printMainMenu(); ?>
+					<script language="javascript" type="text/javascript"></script>
+				</div>
+		
+		</div> <!-- end sequence-links-course-navigation -->
+		<?php endif;?>
+	
+	
+		
+
+	
+
+	
+	</div>
+	</div> <!--  END HEADER -->
+
+<?php if (count($this->sub_level_pages) > 0): ?>
+				<div id="subnavlistcontainer" role="menu" aria-live="assertive" > 
+				
+					<!-- Markup for a subnavlist styled like a Gmail dock. Clean up this code for redundancy but it works for now. -->
+					<!-- background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#B6C0C6), to(#F8FAFB));  -->
+					<ul id="subnavlist" style="text-decoration: none; text-align: center; border-bottom: 1px #B6C0C6 solid; background: #B6C0C6; ">
+					<?php $num_pages = count($this->sub_level_pages); ?>
+						<?php for ($i=0; $i<$num_pages; $i++): ?>	
+							
+							<?php if($num_pages <= 5): ?>
+								<?php if($this->sub_level_pages[$i][url] == $this->current_sub_level_page): ?>
+								<li role="menuitem" class="selected" style="font-size: 14px; padding-left: .313em; padding-right: .313em;"><a href="<?php echo $this->sub_level_pages[$i]['url']; ?>"><?php echo $this->sub_level_pages[$i]['title']; ?></a></li>
+								<?php else: ?> 
+								<li role="menuitem" style="font-size: 14px; padding-left: .313em; padding-right: .313em"><a href="<?php echo $this->sub_level_pages[$i]['url']; ?>"><?php echo $this->sub_level_pages[$i]['title']; ?></a></li>
+								<?php endif; ?> 
+							<?php endif; ?>
+							<?php if($num_pages > 5): ?>
+								<?php if($i <= 5):?>
+									<?php if($this->sub_level_pages[$i][url] == $this->current_sub_level_page): ?>
+										<li role="menuitem" class="selected" style="font-size: 14px; padding-left: .313em; padding-right: .313em;"><a href="<?php echo $this->sub_level_pages[$i]['url']; ?>"><?php echo $this->sub_level_pages[$i]['title']; ?></a></li>
+									<?php else: ?> 
+										<li role="menuitem" style="font-size: 14px; padding-left: .313em; padding-right: .313em"><a href="<?php echo $this->sub_level_pages[$i]['url']; ?>"><?php echo $this->sub_level_pages[$i]['title']; ?></a></li>
+									<?php endif; ?> 
+								<?php endif;?>
+								<?php if($i== 6): ?>
+									<li role="menuitem" class="more-button-surround" style="font-size: 14px; padding-left: .313em; padding-right: .313em; position: relative; top: .313em;"><a class="more-button" href="javascript:void(0);" tabindex="1"><img id="switch" border="" width="20" height="20" alt="More menu items" title="More menu items" src="<?php echo $this->base_href; ?>images/showmenu.gif"/></a></li>
+									<li role="menuitem">
+									<ul class="subnavlist-more">
+									<li role="menuitem" class="more-item" style="font-size: 14px; list-style-type: bullet"><a href="<?php echo $this->sub_level_pages[$i]['url']; ?>"><?php echo $this->sub_level_pages[$i]['title']; ?></a></li>
+									
+								<?php endif;?>
+								<?php if($i > 6 && $i < $num_pages): ?>
+									<li role="menuitem" style="font-size: 14px; list-style-type: bullet"><a href="<?php echo $this->sub_level_pages[$i]['url']; ?>"><?php echo $this->sub_level_pages[$i]['title']; ?></a></li>
+								<?php endif;?>
+								<?php if($i==$num_pages): ?>
+									<li role="menuitem" style="font-size: 14px; list-style-type: bullet"><a href="<?php echo $this->sub_level_pages[$i]['url']; ?>"><?php echo $this->sub_level_pages[$i]['title']; ?></a></li>
+									</ul>
+									</li>
+								<?php endif; ?>
+							<?php endif; ?>
+						
+						
+							
+					<?php if ($i < $num_pages-1): 
+						echo " ";?>
+					<?php endif; ?>
+					<?php endfor; ?>
+					</ul>
+
+				</div> <!--  end subnavlistcontainer -->				
+		<?php endif; ?>	
+	
+	<?php global $msg; $msg->printAll(); $_base_href;?>
+	
+	
+	<!-- </div>end #main -->
+		<div id="contentwrapper" class="fl-container" >
+		<a name="page-title" id="page-title"></a>
+		<h2 class="page-title" ><?php echo $this->page_title; ?></h2>
+		<div id="subnavbacktopage" >
+					<?php if (isset($this->back_to_page)): ?>
+						<a href="<?php echo $this->back_to_page['url']; ?>">
+						<img border="0" width="10" height="11" alt="<?php echo _AT('back_to').' '.$this->back_to_page['title']; ?>" src="<?php echo $this->base_href; ?>images/arrowicon.gif" style="float:left;"/></a>&nbsp;
+					<?php endif; ?>
+				</div>
+	
+	<!--  check if a user is logged-into a course and if so display breadcrumbs.  -->	
+		<?php if(isset($_SESSION['course_id']) && $_SESSION['course_id'] > 0): ?> 		
+		<?php if (isset($_SESSION["prefs"]["PREF_SHOW_BREAD_CRUMBS"]) && $_SESSION["prefs"]["PREF_SHOW_BREAD_CRUMBS"]) { ?>
+		 
+			<div class="crumbcontainer">
+			  <div id="breadcrumbs">
+			  <?php foreach ($this->path as $page): ?>
+				  <a href="<?php echo $page['url']; ?>"><?php echo htmlspecialchars($page['title'], ENT_COMPAT, "UTF-8"); ?></a> > 
+			  <?php endforeach; ?> <?php echo $this->page_title; ?>
+		  	  </div>
+			</div>
+	  <?php } ?>
+	 <?php endif; ?> 
+				
+<?php endif; ?><!--  end header template for ipad/tablets -->
diff --git a/docs/themes/simplified-desktop/index.tmpl.php b/docs/themes/simplified-desktop/index.tmpl.php
new file mode 100644
index 000000000..4be4541e6
--- /dev/null
+++ b/docs/themes/simplified-desktop/index.tmpl.php
@@ -0,0 +1,175 @@
+<?php
+/************************************************************************/
+/* ATutor                                                               */
+/************************************************************************/
+/* Copyright (c) 2002 - 2009                                            */
+/* Adaptive Technology Resource Centre / University of Toronto          */
+/*                                                                      */
+/* This program is free software. You can redistribute it and/or        */
+/* modify it under the terms of the GNU General Public License          */
+/* as published by the Free Software Foundation.                        */
+/************************************************************************/
+
+if (!defined('AT_INCLUDE_PATH')) { exit; }
+global $_base_path;
+
+if ($this->banner): ?>
+
+<?php echo $this->banner; ?><br /><?php endif;
+/** Icon View removed for mobile.
+// positioning switch of home ONLY FOR INSTRUCTORS. two icons will be used for identification to distinguish the two different views of the home.
+if(authenticate(AT_PRIV_ADMIN,AT_PRIV_RETURN) && count($this->home_links) > 0){
+	if($this->view_mode==0)
+		echo '<a href ="'.AT_BASE_HREF.'switch_view.php?swid='.$this->view_mode.'" ><img src="'.AT_BASE_HREF.'images/detail_view.png" title ="'._AT('detail_view').'"  alt ="'._AT('detail_view').'" /></a><br />';
+	else
+		echo '<a href ="'.AT_BASE_HREF.'switch_view.php?swid='.$this->view_mode.'" ><img src="'.AT_BASE_HREF.'images/icon_view.png"  title ="'._AT('icon_view').'" alt ="'._AT('icon_view').'" /></a><br 	/>';
+}	
+
+
+// Icon View, $this->view_mode = 0. course will be made changes to the icons to restore the classic icons.
+if($this->view_mode==0){
+?>
+	<div id="home-links-container">
+		<ul id="home-links">
+		<?php if (is_array($this->home_links)): ?>
+		<?php foreach ($this->home_links as $link): ?>
+			<li><a href="<?php echo $link['url']; ?>"><img src="<?php echo $link['img']; ?>" alt="" class="img-size-home" border="0" /><?php echo $link['title']; ?></a></li>
+		<?php endforeach; ?>
+		<?php endif; ?>
+		</ul>
+	</div> <?php
+} else { ?>
+	
+	<div id="details_view" class="fluid-horizontal-order">
+<?php 				// create table container divided into two columns for the placement of modules
+	if(authenticate(AT_PRIV_ADMIN,AT_PRIV_RETURN) && is_array($this->home_links)){		// display enabled course tool
+		foreach ($this->home_links as $link){ 
+?>
+		<div class="home_box" id="<?php echo str_replace('/', '-', substr($link['url'], strlen($_base_path))); ?>"> 
+<?php print_sublinks($link); 						// display each module ?>
+		</div>
+<?php
+		} // end of foreach 
+	}  // end of inner if 
+	else {
+		if (is_array($this->home_links)) {
+			foreach ($this->home_links as $link){?>
+		<div class="home_box">
+<?php print_sublinks($link); ?>
+		</div>
+<?php			}  // end of foreach
+		}// end of inner inner if
+	} ?>
+	</div> 
+<?php
+} // end of if
+*/
+
+if ($this->announcements): ?>
+<h2 class="page-title"><?php echo _AT('announcements'); ?></h2>
+	<?php foreach ($this->announcements as $item): ?>
+		<div class="news">
+			<h3><?php echo $item['title']; ?></h3>
+			<span class="date"><?php echo $item['date'] .' '. _AT('by').' ' . $item['author']; ?></span></p> <?php echo $item['body']; ?></span>
+			
+		</div>
+	<?php endforeach; ?>
+
+	<?php if ($this->num_pages > 1): ?>
+		<?php echo _AT('page'); ?>: | 
+		<?php for ($i=1; $i<=$this->num_pages; $i++): ?>
+			<?php if ($i == $this->current_page): ?>
+				<strong><?php echo $i; ?></strong>
+			<?php else: ?>
+				<a href="<?php echo $_SERVER['PHP_SELF']; ?>?p=<?php echo $i; ?>"><?php echo $i; ?></a>
+			<?php endif; ?>
+			 | 
+		<?php endfor; ?>
+	<?php endif; ?>
+<?php endif;
+
+// Generate HTML for modules at "detail view"
+function print_sublinks($link){
+	global $_base_path;
+?>
+<div class="details_ol">
+	<div class="details_or">
+		<div class="outside_box">
+<?php if (authenticate(AT_PRIV_ADMIN,AT_PRIV_RETURN)) {?>
+			<div class="buttonbox">
+			<a href="#" onclick="javascript: remove_module('<?php echo htmlentities(substr($link['url'], strlen($_base_path))); ?>'); return false;"><img src="<?php echo AT_BASE_HREF; ?>images/x.gif" border="0" alt="<?php echo _AT('close'); ?>"/></a>
+			</div>
+<?php }?>
+			<img src="<?php echo $link['img']; ?>" alt="" border="0" height="45" width="45"/>
+			<span class="home-title"><a href="<?php echo $link['url']; ?>"><?php echo $link['title']; ?></a></span>
+			<div class="inside_box">
+
+<?php
+	// if $link['sub_file'] is defined, print the text array returned from sub_file, otherwise, print the text defined in $link['text']
+	if($link['sub_file']!=""){
+		$array = require(AT_INCLUDE_PATH.'../'.$link['sub_file']);
+		if(!is_array($array)){ 
+?>
+				<div class="details-text">
+				<i><?php echo _AT('none_found'); ?></i>
+				</div>
+<?php } else { ?>
+				<div class="details-text">
+<?php 	foreach($array as $sublink){ ?>
+					<img src="<?php echo $link['icon']; ?>" border="0" alt=""/> 
+<?php		if ($sublink <> '') echo $sublink."<br />"; } ?>
+				</div> 
+<?php 
+		} // end of else						
+	} else { ?>
+				<div class="details_text"><?php echo $link['text']; ?></div>
+<?php } ?>
+			</div>
+		</div>
+	</div>
+</div>
+
+
+
+
+<!--
+<div class="details_ol">
+	<div class="details_or">
+		<div class="outside_box">
+<?php if (authenticate(AT_PRIV_ADMIN,AT_PRIV_RETURN)) {?>
+			<div class="buttonbox">
+			<a href="#" onclick="javascript: remove_module('<?php echo htmlentities(substr($link['url'], strlen($_base_path))); ?>'); return false;"><img src="<?php echo AT_BASE_HREF; ?>images/x.gif" border="0" alt="<?php echo _AT('close'); ?>"/></a>
+			</div>
+<?php }?>
+			<img src="<?php echo $link['img']; ?>" alt="" border="0" height="51" width="51"/>
+			<span class="home-title"><a href="<?php echo $link['url']; ?>"><?php echo $link['title']; ?></a></span>
+			<div class="inside_box">
+				<div class="details_il">&nbsp;</div>
+				<div class="details_ir"></div>
+<?php
+	// if $link['sub_file'] is defined, print the text array returned from sub_file, otherwise, print the text defined in $link['text']
+	if($link['sub_file']!=""){
+		//$array = require(AT_INCLUDE_PATH.'../'.$link['sub_file']);
+		if(!is_array($array)){ 
+?>
+				<div class="details-text">
+				<i><?php echo _AT('none_found'); ?></i>
+				</div>
+<?php } else { ?>
+				<div class="details-text">
+<?php 	foreach($array as $sublink){ ?>
+					<img src="<?php echo $link['icon']; ?>" border="0" alt="" /> 
+<?php		if ($sublink <> '') echo $sublink."<br />"; } ?>
+				</div> 
+<?php 
+		} // end of else						
+	} else { ?>
+				<div class="details_text"><?php echo $link['text']; ?></div>
+<?php } ?>
+			</div>
+		</div>
+	</div>
+</div>
+-->
+<?php } ?>
+
diff --git a/docs/themes/simplified-desktop/instructor/announcements/add_news.tmpl.php b/docs/themes/simplified-desktop/instructor/announcements/add_news.tmpl.php
new file mode 100644
index 000000000..c682aa5f4
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/announcements/add_news.tmpl.php
@@ -0,0 +1,42 @@
+	<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+	<input type="hidden" name="add_news" value="true" />
+	<input type="submit" name="submit" style="display:none;"/>
+	<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('add_announcement'); ?></legend>
+		<div class="row">
+			<label for="title"><?php echo _AT('title'); ?></label><br />
+			<input type="text" name="title" size="40" id="title" value="<?php echo $_POST['title']; ?>" />
+		</div>
+
+		<div class="row">
+			<?php echo _AT('formatting'); ?><br />
+			<input type="radio" name="formatting" value="0" id="text" <?php if ($_POST['formatting'] == 0) { echo 'checked="checked"'; } ?> onclick="javascript: document.form.setvisual.disabled=true;" <?php if ($_POST['setvisual'] && !$_POST['settext']) { echo 'disabled="disabled"'; } ?> />
+
+			<label for="text"><?php echo _AT('plain_text'); ?></label>
+			<input type="radio" name="formatting" value="1" id="html" <?php if ($_POST['formatting'] == 1 || $_POST['setvisual']) { echo 'checked="checked"'; } ?> onclick="javascript: document.form.setvisual.disabled=false;"/>
+
+			<label for="html"><?php echo _AT('html'); ?></label>
+			<?php   //Button for enabling/disabling visual editor
+				if (($_POST['setvisual'] && !$_POST['settext']) || $_GET['setvisual']){
+					echo '<input type="hidden" name="setvisual" value="'.$_POST['setvisual'].'" />';
+					echo '<input type="submit" name="settext" value="'._AT('switch_text').'" class="button"/>';
+				} else {
+					echo '<input type="submit" name="setvisual" value="'._AT('switch_visual').'"  ';
+					if ($_POST['formatting']==0) { echo 'disabled="disabled"'; }
+					echo ' class="button" />';
+				}
+			?>
+		</div>
+
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="body_text"><?php echo _AT('body'); ?></label><br />
+			<textarea name="body_text" cols="40" rows="15" id="body_text"><?php echo $_POST['body_text']; ?></textarea>
+		</div>
+		
+		<div class="row buttons">
+			<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s"  class="button"/>
+			<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?> "  class="button"/>
+		</div>
+	</fieldset>
+	</div>
+	</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/announcements/edit_news.tmpl.php b/docs/themes/simplified-desktop/instructor/announcements/edit_news.tmpl.php
new file mode 100644
index 000000000..40f777f2f
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/announcements/edit_news.tmpl.php
@@ -0,0 +1,41 @@
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<input type="hidden" name="edit_news" value="true">
+<input type="hidden" name="aid" value="<?php echo $this->row['news_id']; ?>">
+<input type="submit" name="submit" style="display:none;"/>
+<div class="input-form">
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="title"><?php echo _AT('title'); ?></label><br />
+		<input type="text" name="title" id="title" value="<?php echo AT_print($this->row['title'], 'input.text'); ?>" size="40">
+	</div>
+
+	<div class="row">
+		<?php echo _AT('formatting'); ?><br />
+		<input type="radio" name="formatting" value="0" id="text" <?php if ($_POST['formatting'] === 0) { echo 'checked="checked"'; } ?> onclick="javascript: document.form.setvisual.disabled=true;" <?php if ($_POST['setvisual'] && !$_POST['settext']) { echo 'disabled="disabled"'; } ?> /><label for="text"><?php echo _AT('plain_text'); ?></label>,
+
+		<input type="radio" name="formatting" value="1" id="html" <?php if ($_POST['formatting'] == 1 || $_POST['setvisual']) { echo 'checked="checked"'; } ?> onclick="javascript: document.form.setvisual.disabled=false;"  /> <label for="html"><?php echo _AT('html'); ?></label>
+		<?php
+			if (($_POST['setvisual'] && !$_POST['settext']) || $_GET['setvisual']){
+				echo '<input type="hidden" name="setvisual" value="'.$_POST['setvisual'].'" />';
+				echo '<input type="submit" name="settext"   value="'._AT('switch_text').'" />';
+			} else {
+				echo '<input type="submit" name="setvisual" value="'._AT('switch_visual').'" ';
+				if ($_POST['formatting']==0) { echo 'disabled="disabled"'; }
+				echo '/>';
+			} 
+		?>
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="body_text"><?php echo _AT('body'); ?></label><br />
+		<textarea name="body_text" cols="40" rows="15" id="body_text" wrap="wrap"><?php echo AT_print($this->row['body'], 'input.text'); ?></textarea>
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?> " />
+	</div>
+
+
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/announcements/index.tmpl.php b/docs/themes/simplified-desktop/instructor/announcements/index.tmpl.php
new file mode 100644
index 000000000..277da3f3d
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/announcements/index.tmpl.php
@@ -0,0 +1,45 @@
+<form name="form" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="table-surround">
+<table class="data" summary="Title and date of instructor announcements" >
+<colgroup>
+	<?php if ($this->col == 'title'): ?>
+		<col />
+		<col class="sort" />
+		<col />
+	<?php elseif($this->col == 'date'): ?>
+		<col span="2" />
+		<col class="sort" />
+	<?php endif; ?>
+</colgroup>
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><a href="mods/_standard/announcements/index.php?<?php echo $this->orders[$this->order]; ?>=title"><?php echo _AT('title'); ?></a></th>
+	<th scope="col"><a href="mods/_standard/announcements/index.php?<?php echo $this->orders[$this->order]; ?>=date"><?php echo _AT('date'); ?></a></th>
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="3"><input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" class="button"/> <input type="submit" name="delete" value="<?php echo _AT('delete'); ?>"  class="button"/></td>
+</tr>
+</tfoot>
+<tbody>
+	<?php if ($row = mysql_fetch_assoc($this->result)): ?>
+		<?php do { ?>
+			<tr onkeydown="document.form['n<?php echo $row['news_id']; ?>'].checked = true; rowselect(this);" onmousedown="document.form['n<?php echo $row['news_id']; ?>'].checked = true; rowselect(this);" id="r_<?php echo $row['news_id']; ?>">
+			
+				<td><input type="radio" name="aid" value="<?php echo $row['news_id']; ?>" id="n<?php echo $row['news_id']; ?>" /></td>
+				
+				<td><label for="n<?php echo $row['news_id']; ?>"><?php echo AT_print($row['title'], 'news.title'); ?></label></td>
+				<td><?php echo AT_date(_AT('announcement_date_format'), $row['date'], AT_DATE_MYSQL_DATETIME); ?></td>
+			</tr>
+		<?php } while ($row = mysql_fetch_assoc($this->result)); ?>
+	<?php else: ?>
+		<tr>
+			<td colspan="3"><?php echo _AT('none_found'); ?></td>
+		</tr>
+	<?php endif; ?>
+</tbody>
+</table>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/assignments/index_instructor.tmpl.php b/docs/themes/simplified-desktop/instructor/assignments/index_instructor.tmpl.php
new file mode 100644
index 000000000..1f1400374
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/assignments/index_instructor.tmpl.php
@@ -0,0 +1,79 @@
+
+<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="form">
+<div class="table-surround">
+<table class="data">
+<colgroup>
+	<?php if ($this->sort == 'title'): ?>
+		<col />
+		<col class="sort" />
+		<col span="5" />
+	<?php elseif($this->sort == 'assign_to'): ?>
+		<col span="2" />
+		<col class="sort" />
+		<col span="4" />
+	<?php elseif($this->sort == 'date_due'): ?>
+		<col span="3" />
+		<col class="sort" />
+		<col span="3" />
+	<?php endif; ?>
+</colgroup>
+<thead>
+<tr>
+	<th>&nbsp;</th>
+	<th scope="col"><a href="mods/_standard/assignments/index_instructor.php?sort=title<?php echo SEP; ?>order=<?php echo $orders[$order]; ?>"><?php echo _AT('title'); ?></a></th>
+	<th scope="col"><?php echo _AT('assigned_to'); ?></th>
+	<th scope="col"><a href="mods/_standard/assignments/index_instructor.php?sort=date_due<?php echo SEP; ?>order=<?php echo $orders[$order]; ?>"><?php echo _AT('due_date'); ?></a></th>
+</tr>
+</thead>
+<?php if (($this->result != 0) && ($row = mysql_fetch_assoc($this->result))) : ?>
+<tfoot>
+<tr>
+	<td colspan="4">
+		<input type="submit" name="submissions" value="<?php echo _AT('submissions'); ?>" class="button"/> 
+		<input type="submit" name="edit" value="<?php echo _AT('edit'); ?>"  class="button"/> 
+		<input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" class="button" />
+					
+	</td>
+</tr>
+</tfoot>
+<tbody>
+	<?php do { ?>
+		<tr onkeydown="document.form['a<?php echo $row['assignment_id']; ?>'].checked = true; rowselect(this);" onmousedown="document.form['a<?php echo $row['assignment_id']; ?>'].checked = true; rowselect(this);" id="a_<?php echo $row['assignment_id']; ?>_0">
+		
+		<td><input type="radio" id="a<?php echo $row['assignment_id']; ?>" name="assignment" value="<?php echo $row['assignment_id']; ?>" 
+
+		<?php // set first item as checked if nothing selected
+		if (isset($_GET['assignment_id'])){
+			if ($_GET['assignment_id'] == $row['assignment_id']){ 
+				echo ' checked="checked"'; 
+			} 
+		}
+		else {
+			echo ' checked="checked"';
+			$_GET['assignment_id'] = $row['assignment_id'];
+		}
+		?>/></td>
+
+		<td><label for="a<?php echo $row['assignment_id']; ?>"><?php echo AT_print($row['title'], 'assignment.title'); ?></label></td>
+
+		<td><?php if($row['assign_to'] == '0'){echo _AT('all_students'); } else {
+				
+					$type_row = mysql_fetch_assoc($this->type_result);
+					echo $type_row['title']; } ?></td>
+
+		<td><?php  if ($row['date_due'] == '0000-00-00 00:00:00'){
+			echo _AT('none');
+		}else {
+			echo AT_Date(_AT('forum_date_format'), $row['date_due'], AT_DATE_MYSQL_DATETIME);
+		}?></td>
+		</tr>
+	<?php } while($row = mysql_fetch_assoc($this->result)); ?>
+</tbody>
+<?php else: ?>
+	<tr>
+		<td colspan="4"><strong><?php echo _AT('none_found'); ?></strong></td>
+	</tr>
+<?php endif; ?>
+</table>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/backups/edit.tmpl.php b/docs/themes/simplified-desktop/instructor/backups/edit.tmpl.php
new file mode 100644
index 000000000..87dcf9bc1
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/backups/edit.tmpl.php
@@ -0,0 +1,16 @@
+<form name="form1" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<input type="hidden" name="backup_id" value="<?php echo $_GET['backup_id']; ?>" />
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('edit'); ?></legend>
+	<div class="row">
+		<label for="description"><?php echo _AT('optional_description'); ?></label>
+		<textarea cols="40" rows="2" id="description" name="new_description"><?php echo AT_print($this->row['description'], 'backups.description'); ?></textarea>
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="edit" value="<?php echo _AT('save'); ?>" accesskey="s" /> 
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+	</fieldset>
+</div>
+</form>
diff --git a/docs/themes/simplified-desktop/instructor/backups/index.tmpl.php b/docs/themes/simplified-desktop/instructor/backups/index.tmpl.php
new file mode 100644
index 000000000..e768db52a
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/backups/index.tmpl.php
@@ -0,0 +1,45 @@
+
+<form name="form" method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="table-surround">
+<table class="data" summary="List of backups available" >
+<thead>
+<tr>
+	<th><?php echo _AT('file_name');    ?></th>
+	<th><?php echo _AT('date_created'); ?></th>
+	<th><?php echo _AT('file_size');    ?></th>
+	<!-- REMOVED FOR MOBILE<th><?php //echo _AT('description');  ?></th> -->
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="6"><input type="submit" name="restore" value="<?php echo _AT('restore'); ?>"  class="button"/> 
+				  <input type="submit" name="download" value="<?php echo _AT('download'); ?>"  class="button"/> 
+				  <input type="submit" name="delete" value="<?php echo _AT('delete'); ?>"  class="button"/> 
+				  <input type="submit" name="edit" value="<?php echo _AT('edit'); ?>"  class="button"/></td>
+</tr>
+</tfoot>
+<tbody>
+<?php
+
+	if (!$this->list) {
+		?>
+	<tr>
+		<td colspan="4"><?php echo _AT('none_found'); ?></td>
+	</tr>
+	<?php
+	} else {
+		foreach ($this->list as $row) {
+			echo '<tr onmousedown="document.form[\'b'.$row['backup_id'].'\'].checked = true; rowselect(this);" id="r_'.$row['backup_id'].'">';
+			echo '<td class="row1"><label><input type="radio" value="'.$row['backup_id'].'" name="backup_id" id="b'.$row['backup_id'].'" />';
+			echo $row['file_name'].'</label></td>';
+			echo '<td>'.AT_date(_AT('filemanager_date_format'), $row['date'], AT_DATE_MYSQL_DATETIME).'</td>';
+			echo '<td align="right">'.get_human_size($row['file_size']).'</td>';
+		// REMOVED FOR MOBILE	echo '<td>'.AT_print($row['description'], 'backups.description').'</td>';
+			echo '</tr>';
+		}
+?>
+	<?php } ?>
+</tbody>
+</table>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/chat/index.tmpl.php b/docs/themes/simplified-desktop/instructor/chat/index.tmpl.php
new file mode 100644
index 000000000..c75c33d5e
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/chat/index.tmpl.php
@@ -0,0 +1,70 @@
+<?php if (count($this->tran_files) == 0) {
+	echo '<div style="width:90%;" class="input-form"><p>'._AT('chat_none_found').'</p></div>';
+} else {?>
+	
+<form name="form" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="table-surround">
+	<table class="data" summary="List of transcripts for chat">
+	<colgroup>
+		<?php if ($this->col == 'name'): ?>
+			<col />
+			<col class="sort" />
+			<col span="2" />
+		<?php elseif($this->col == 'date'): ?>
+			<col span="3" />
+			<col class="sort" />
+		<?php endif; ?>
+	</colgroup>
+	<thead>
+	<tr>
+		<th scope="col">&nbsp;</th>
+		<th scope="col"><a href="mods/_standard/chat/index.php?<?php echo $this->orders[$this->order]; ?>=name"><?php echo _AT('chat_transcript');?></a></th>
+		<th scope="col"><?php echo _AT('status'); ?></th>
+		<th scope="col"><a href="mods/_standard/chat/index.php?<?php echo $this->orders[$this->order]; ?>=date"><?php echo _AT('date'); ?></a></th> 
+		</th> 
+	</tr>
+	</thead>
+	<?php
+
+	if (($this->col == 'date') && ($this->order == 'asc')) {
+		asort($this->tran_files);
+	} else if (($this->col == 'date') && ($this->order == 'desc')) {
+		arsort($this->tran_files);
+	} else if (($this->col == 'name') && ($this->order == 'asc')) {
+		ksort($this->tran_files);
+	} else if (($this->col == 'name') && ($this->order == 'desc')) {
+		krsort($this->tran_files);
+	}
+	reset ($this->tran_files);
+	?>
+
+	<tbody>
+	<?php foreach ($this->tran_files as $file => $date) { ?>
+		<tr onkeydown="document.form['<?php echo $file; ?>'].checked = true; rowselect(this);" onmousedown="document.form['<?php echo $file; ?>'].checked = true; rowselect(this);" id="r_<?php echo $file; ?>">
+			<td><input type="radio" name="file" value="<?php echo $file; ?>" id="<?php echo $file; ?>" /></td>
+
+			<td><label for="<?php echo $file; ?>"><?php echo $file; ?></label></td>
+			<td>
+				<?php if (($file.'.html' == $this->admin['tranFile']) && ($this->admin['produceTran'])) { 
+					echo _AT('chat_currently_active');
+				} else {
+					echo _AT('chat_inactive');
+				}?>
+			</td>
+	
+			<td><?php echo AT_DATE(_AT('server_date_format'), $date); ?></td>
+		</tr>
+	<?php } ?>
+	</tbody>
+
+	<tfoot>
+	<tr>
+		<td colspan="4"><input type="submit" name="view" value="<?php echo _AT('view'); ?>" /> <input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" /></td>
+	</tr>
+	</tfoot>
+
+	</table>
+</div>	
+</form>
+<?php
+}?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/content/index.tmpl.php b/docs/themes/simplified-desktop/instructor/content/index.tmpl.php
new file mode 100644
index 000000000..449309bcd
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/content/index.tmpl.php
@@ -0,0 +1,62 @@
+<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="input-form">
+	<div class="row">
+		<h3><label for="ctid"><?php echo _AT('select_parent_topic'); ?></label></h3>
+	</div>
+
+	<div class="row">
+		<select name="ctid" id="ctid">
+			<option value="0"><?php echo _AT('top_level'); ?></option>
+			<?php
+				print_select(0, 1);
+			?>
+		</select>
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="sub_content" value="<?php echo _AT('view_sub_topics'); ?>" />
+	</div>
+</div>
+</form>
+
+<form name="form" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="table-surround">
+<table class="data" summary="Parent topics and subtopics">
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col">#</th>
+	<th scope="col"><?php echo _AT('title'); ?></th>
+	<th scope="col"><?php echo _AT('num_pages'); ?></th>
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="5">
+		<input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" /> 
+		<input type="submit" name="view" value="<?php echo _AT('view'); ?>" />
+		<input type="submit" name="usage" value="<?php echo _AT('usage'); ?>" />
+		<input type="submit" name="sub_content" value="<?php echo _AT('sub_topics'); ?>" />
+		<input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" />
+	</td>
+</tr>
+</tfoot>
+<tbody>
+	<?php if (!empty($this->content)): ?>
+		<?php foreach ($this->content as $row): ?>
+			<tr onkeydown="document.form['c<?php echo $row['content_id']; ?>'].checked = true; rowselect(this);" onmousedown="document.form['c<?php echo $row['content_id']; ?>'].checked = true; rowselect(this);" id="r_<?php echo $row['content_id']; ?>">
+				<td><input type="radio" name="ctid" value="<?php echo $row['content_id']; ?>" id="c<?php echo $row['content_id']; ?>" /></td>
+				<td><?php echo $row['ordering']; ?></td>
+				<td><label for="c<?php echo $row['content_id']; ?>"><?php echo AT_print($row['title'], 'content.title'); ?></label></td>
+				<td><?php echo count($this->all_content[$row['content_id']]); ?></td>
+			</tr>
+		<?php endforeach; ?>
+	<?php else: ?>
+		<tr>
+			<td colspan="5"><?php echo _AT('none_found'); ?></td>
+		</tr>
+	<?php endif; ?>
+</tbody>
+</table>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/content/page_student_stats.tmpl.php b/docs/themes/simplified-desktop/instructor/content/page_student_stats.tmpl.php
new file mode 100644
index 000000000..ea7031fb7
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/content/page_student_stats.tmpl.php
@@ -0,0 +1,28 @@
+<div class="table-surround">
+<table class="data" summary="Student usage statistics by login name">
+<thead>
+<tr>
+	<th scope="col"><?php echo _AT('login_name'); ?></th>
+	<th scope="col"><?php echo _AT('visits'); ?></th>
+	<th scope="col"><?php echo _AT('avg_duration'); ?></th>
+	<th scope="col"><?php echo _AT('duration'); ?></th>
+</tr>
+</thead>
+<tbody>
+<?php if ($row = mysql_fetch_assoc($this->result)) : ?>
+	<?php do { ?>
+	<tr onmousedown="document.location='<?php echo AT_BASE_HREF; ?>mods/_standard/tracker/tools/student_usage.php?id=<?php echo $row['member_id']; ?>'" title="<?php echo _AT('member_stats'); ?>">
+		<td><a href="<?php echo AT_BASE_HREF; ?>mods/_standard/tracker/tools/student_usage.php?id=<?php echo $row['member_id']; ?>"><?php echo get_display_name($row['member_id']); ?></a></td>
+		<td><?php echo $row['counter']; ?></td>
+		<td><?php echo $row['average']; ?></td>
+		<td><?php echo $row['total']; ?></td>
+	</tr>
+	<?php } while ($row = mysql_fetch_assoc($this->result)); ?>
+<?php else: ?>
+	<tr>
+		<td colspan="4"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</div>
diff --git a/docs/themes/simplified-desktop/instructor/content/tracker/index.tmpl.php b/docs/themes/simplified-desktop/instructor/content/tracker/index.tmpl.php
new file mode 100644
index 000000000..18563d508
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/content/tracker/index.tmpl.php
@@ -0,0 +1,66 @@
+<?php global $contentManager;?>
+<div class="toolcontainer">
+<div class="paging">
+	<ul>
+	<?php for ($i=1; $i<=$this->num_pages; $i++): ?>
+		<li>
+			<?php if ($i == $this->page) : ?>
+				<a class="current" href="<?php echo $_SERVER['PHP_SELF']; ?>?p=<?php echo $i.$this->page_string; ?>"><strong><?php echo $i; ?></strong></a>
+			<?php else: ?>
+				<a href="<?php echo $_SERVER['PHP_SELF']; ?>?p=<?php echo $i.$this->page_string; ?>"><?php echo $i; ?></a>
+			<?php endif; ?>
+		</li>
+	<?php endfor; ?>
+	</ul>
+</div>
+<table class="data" summary="Lists usage of content pages.">
+<colgroup>
+	<?php if ($this->col == 'total_hits'): ?>
+		<col />
+		<col class="sort" />
+		<col span="4" />
+	<?php elseif($this->col == 'unique_hits'): ?>
+		<col span="2" />
+		<col class="sort" />
+		<col span="3" />
+	<?php // REMOVED FOR MOBILE elseif($this->col == 'average_duration'): ?>
+	<!--  <col span="3" />
+		<col class="sort" />
+		<col span="2" />-->	
+	<?php // REMOVED FOR MOBILE elseif($this->col == 'total_duration'): ?>
+		<!--  <col span="4" />
+		<col class="sort" />
+		<col /> -->
+	<?php endif; ?>
+</colgroup>
+<thead>
+<tr>
+	<th scope="col"><?php echo _AT('page'); ?></th>
+	<th scope="col"><a href="mods/_standard/tracker/tools/index.php?<?php echo $orders[$order]; ?>=total_hits"><?php echo _AT('visits');             ?></a></th>
+	<th scope="col"><a href="mods/_standard/tracker/tools/index.php?<?php echo $orders[$order]; ?>=unique_hits"><?php echo _AT('unique_visits');     ?></a></th>
+	<!-- REMOVED FOR MOBILE <th scope="col"><a href="mods/_standard/tracker/tools/index.php?<?php echo $orders[$order]; ?>=average_duration"><?php echo _AT('avg_duration'); ?></a></th>-->
+	<!-- REMOVED FOR MOBILE <th scope="col"><a href="mods/_standard/tracker/tools/index.php?<?php echo $orders[$order]; ?>=total_duration"><?php echo _AT('duration');       ?></a></th>-->
+	<th scope="col"><?php echo _AT('details');       ?></th>
+</tr>
+</thead>
+<tbody>
+<?php if ($row = mysql_fetch_assoc($this->result)): ?>
+	<?php do { ?>
+		<tr onmousedown="document.location='<?php echo AT_BASE_HREF; ?>mods/_standard/tracker/tools/page_student_stats.php?content_id=<?php echo $row['content_id']; ?>'" title="<?php echo _AT('details'); ?>">
+			<td><?php echo $contentManager->_menu_info[$row['content_id']]['title']; ?></td>
+			<td><?php echo $row['total_hits'];       ?></td>
+			<td><?php echo $row['unique_hits'];      ?></td>
+			<!-- REMOVED FOR MOBILE <td><?php //echo $row['average_duration']; ?></td>-->
+			<!-- REMOVED FOR MOBILE<td><?php echo $row['total_duration'];   ?></td> -->
+			<td><a href="mods/_standard/tracker/tools/page_student_stats.php?content_id=<?php echo $row['content_id']; ?>"><?php echo _AT('details'); ?></a></td>
+		</tr>
+	<?php } while ($row = mysql_fetch_assoc($this->result)); ?>
+<?php else: ?>
+	<tr>
+		<td colspan="6"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/content/tracker/student_usage.tmpl.php b/docs/themes/simplified-desktop/instructor/content/tracker/student_usage.tmpl.php
new file mode 100644
index 000000000..f9d07d151
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/content/tracker/student_usage.tmpl.php
@@ -0,0 +1,53 @@
+<?php global $contentManager;?>
+<form name="form" action="<?php echo $_SERVER['PHP_SELF']; ?>" method="get">
+<div class="input-form">
+	<div class="row">
+		<label for="id"><?php echo _AT('select_member'); ?></label><br />
+		<select name="id" id="id">
+			<?php
+				while ($row = mysql_fetch_assoc($this->result)) {
+					$sender = get_display_name($row['member_id']);
+					echo '<option value="'.$row['member_id'].'"';
+					if ($row['member_id'] == $_GET['id']) {
+						echo ' selected="selected"';
+					}
+					echo '>'.$sender.'</option>';
+				}
+			?>
+		</select>
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('view'); ?>" />
+	</div>
+</div>
+</form>
+
+<?php if ($_GET['id']) : ?>
+<div class="table-surround">
+	<table class="data" summary="View the usage of a specific student">
+	<thead>
+	<tr>
+		<th scope="col"><?php echo _AT('page'); ?></th>
+		<th scope="col"><?php echo _AT('visits'); ?></th>
+		<th scope="col"><?php echo _AT('duration'); ?></th>
+	</tr>
+	</thead>
+	<tbody>
+	<?php if ($row = mysql_fetch_assoc($this->result_list)): ?>
+		<?php do { ?>
+			<tr>
+				<td><?php echo $contentManager->_menu_info[$row['content_id']]['title']; ?></td>
+				<td><?php echo $row['counter']; ?></td>
+				<td><?php echo $row['total']; ?></td>
+			</tr>
+		<?php } while ($row = mysql_fetch_assoc($this->result_list)); ?>
+	<?php else: ?>
+		<tr>
+			<td colspan="3"><?php echo _AT('none_found'); ?></td>
+		</tr>
+	<?php endif; ?>
+</tbody>
+</table>
+</div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/course_email/course_email.tmpl.php b/docs/themes/simplified-desktop/instructor/course_email/course_email.tmpl.php
new file mode 100644
index 000000000..88054d4cd
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/course_email/course_email.tmpl.php
@@ -0,0 +1,45 @@
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<input type="hidden" name="course" value="<?php echo $course; ?>" />
+
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('course_email'); ?></legend>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span>
+		<?php echo  _AT('to'); ?><br />
+		<input type="checkbox" name="to_assistants" value="1" id="assistants" <?php if ($_POST['to_assistants']=='1') { echo 'checked="checked"'; } ?> /><label for="assistants"><?php echo  _AT('assistants'); ?></label>
+		<input type="checkbox" name="to_enrolled" value="1" id="enrolled" <?php if ($_POST['to_enrolled']=='1') { echo 'checked="checked"'; } else { echo 'checked="checked"'; } ?> /><label for="enrolled"><?php echo  _AT('enrolled'); ?></label>
+		<input type="checkbox" name="to_unenrolled" value="1" id="unenrolled" <?php if ($_POST['to_unenrolled']=='1') { echo 'checked="checked"'; } ?> /><label for="unenrolled"><?php echo  _AT('unenrolled'); ?></label>
+		<input type="checkbox" name="to_alumni" value="1" id="alumni" <?php if ($_POST['to_alumni']=='1') { echo 'checked="checked"'; } ?> /><label for="alumni"><?php echo  _AT('alumni'); ?></label>
+
+		<?php if (!empty($this->group_type_rows)): ?>
+			<br /><br />
+			<?php echo _AT('or_groups'); ?>:<br />
+			<select name="groups[]" multiple="multiple" size="10" style="padding-right: 5px">
+				<?php foreach ($this->group_type_rows as $type_id => $row): ?>
+					<optgroup label="<?php echo $row['title']; ?>">
+						<?php foreach ($row['group_type_row'] as $group_row): ?>
+							<option value="<?php echo $group_row['group_id']; ?>"><?php echo $group_row['title']; ?></option>
+						<?php endforeach; ?>
+					</optgroup>
+				<?php endforeach; ?>
+			</select>
+		<?php endif; ?>
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="subject"><?php echo _AT('subject'); ?></label><br />
+		<input type="text" name="subject" size="40" id="subject" value="<?php echo $_POST['subject']; ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="body"><?php echo _AT('body'); ?></label><br />
+		<textarea cols="40" rows="18" name="body" id="body"><?php echo $_POST['body']; ?></textarea>
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('send'); ?>" accesskey="s" /> 
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+	</fieldset>
+</div>
+</form>
diff --git a/docs/themes/simplified-desktop/instructor/enrolment/index.tmpl.php b/docs/themes/simplified-desktop/instructor/enrolment/index.tmpl.php
new file mode 100644
index 000000000..1ce87e40b
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/enrolment/index.tmpl.php
@@ -0,0 +1,141 @@
+
+<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+	<input type="hidden" name="tab" value="<?php echo $this->current_tab; ?>"/>
+	<input type="hidden" name="course_id" value="<?php echo $this->course_id; ?>"/>
+	<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('search'); ?></legend>
+		<?php if (admin_authenticate(AT_ADMIN_PRIV_ENROLLMENT, TRUE)): ?>
+			<div class="row">
+				<label for="course"><?php echo _AT('course'); ?></label><br/>
+				<select name="course_id" id="course">
+				<?php
+				
+				while ($courses_row = mysql_fetch_assoc($this->result)) {
+					if ($courses_row['course_id'] == $this->course_id) {
+						echo '<option value="'.$courses_row['course_id'].'" selected="selected">'.validate_length($courses_row['title'], 45,VALIDATE_LENGTH_FOR_DISPLAY).'</option>';
+					} else {
+						echo '<option value="'.$courses_row['course_id'].'">'.validate_length($courses_row['title'],45,VALIDATE_LENGTH_FOR_DISPLAY).'</option>';
+					}
+				}
+				?></select>
+			</div>
+		<?php endif; ?>
+
+		<div class="row">
+			<label for="search"><?php echo _AT('search'); ?> (<?php echo _AT('login_name').', '._AT('first_name').', '._AT('second_name').', '._AT('last_name') .', '._AT('email'); ?>)</label><br />
+			<input type="text" name="search" id="search" size="40" value="<?php echo htmlspecialchars($_GET['search']); ?>" />
+			<fieldset>
+			<legend><?php echo _AT('search_match'); ?>:</legend>
+			<input type="radio" name="match" value="all" id="match_all" <?php echo $this->checked_match_all; ?> /><label for="match_all"><?php echo _AT('search_all_words'); ?></label> <input type="radio" name="match" value="one" id="match_one" <?php echo $this->checked_match_one; ?> /><label for="match_one"><?php echo _AT('search_any_word'); ?></label>
+			</fieldset>
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="filter" value="<?php echo _AT('filter'); ?>" />
+			<input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>" />
+		</div>
+	</fieldset>
+	</div>
+</form>
+
+<?php print_paginator($this->page, $this->tab_counts[$this->current_tab], $this->page_string_w_tab . SEP . $this->order .'='. $this->col, $this->results_per_page); ?>
+
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="selectform">
+<input type="hidden" name="tab" value="<?php echo $this->current_tab; ?>" />
+<input type="hidden" name="course_id" value="<?php echo $this->course_id; ?>"/>
+
+<ul id="subnavlist">
+	<?php for ($i = 0; $i< $this->num_tabs; $i++): ?>
+		<?php if ($this->current_tab == $i): ?>
+			<li class="active"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?tab=<?php echo $i.$this->page_string; ?>" class="active"><strong><?php echo _AT($this->tabs[$i]); ?> - <?php echo $this->tab_counts[$i]; ?></strong></a></li>
+		<?php else: ?>
+			<li><a href="<?php echo $_SERVER['PHP_SELF']; ?>?tab=<?php echo $i.$this->page_string; ?>"><?php echo _AT($this->tabs[$i]); ?> - <?php echo $this->tab_counts[$i]; ?></a></li>
+		<?php endif; ?>
+	<?php endfor; ?>
+</ul>
+
+<div class="table-surround">
+<table class="data" summary="Student enrolment by login name, first name and last name"  >
+<colgroup>
+	<?php if ($this->col == 'login'): ?>
+		<col />
+		<col class="sort" />
+		<col span="4" />
+	<?php elseif($this->col == 'first_name'): ?>
+		<col span="2" />
+		<col class="sort" />
+		<col span="3" />
+	<?php // REMOVED FOR MOBILE elseif($this->col == 'second_name'): ?>
+		<!-- <col span="3" />
+		<col class="sort" />
+		<col span="2" /> -->
+	<?php elseif($this->col == 'last_name'): ?>
+		<col span="4" />
+		<col class="sort" />
+		<col />
+	<?php // REMOVED FOR MOBILE elseif($this->col == 'email'): ?>
+		<!-- <col span="5" />
+		<col class="sort" /> -->
+	<?php endif; ?>
+</colgroup>
+<thead>
+<tr>
+	<th scope="col" align="left"><input type="checkbox" value="<?php echo _AT('select_all'); ?>" id="all" title="<?php echo _AT('select_all'); ?>" name="selectall" onclick="CheckAll();" /></th>
+
+	<th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $this->orders[$this->order]; ?>=login<?php echo $this->page_string_w_tab;?>"><?php echo _AT('login_name'); ?></a></th>
+
+	<th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $this->orders[$this->order]; ?>=first_name<?php echo $this->page_string_w_tab;?>"><?php echo _AT('first_name'); ?></a></th>
+
+	<!-- REMOVED FOR MOBILE <th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $this->orders[$this->order]; ?>=second_name<?php echo $this->page_string_w_tab;?>"><?php echo _AT('second_name'); ?></a></th>-->
+
+	<th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $this->orders[$this->order]; ?>=last_name<?php echo $this->page_string_w_tab;?>"><?php echo _AT('last_name'); ?></a></th>
+
+	<!-- REMOVED FOR MOBILE <th scope="col"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?<?php echo $this->orders[$this->order]; ?>=email<?php echo $this->page_string_w_tab;?>"><?php echo _AT('email'); ?></a></th>-->
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="6">
+		<?php if ($this->current_tab == 0): ?>
+			<input type="submit" name="role"     value="<?php echo _AT('privileges');  ?>" /> 
+			<input type="submit" name="unenroll" value="<?php echo _AT('remove');    ?>" /> 
+			<input type="submit" name="alumni"   value="<?php echo _AT('mark_alumni'); ?>" />
+		<?php elseif ($this->current_tab == 1): ?>
+			<input type="submit" name="role" value="<?php echo _AT('privileges'); ?>" /> 
+			<input type="submit" name="unenroll" value="<?php echo _AT('remove'); ?>" /> 
+
+		<?php elseif ($this->current_tab == 2): ?>
+			<input type="submit" name="enroll"   value="<?php echo _AT('enroll'); ?>" /> 
+			<input type="submit" name="unenroll" value="<?php echo _AT('remove'); ?>" />
+		
+		<?php elseif ($this->current_tab == 3): ?>
+			<input type="submit" name="enroll" value="<?php echo _AT('enroll'); ?>" /> 
+			<input type="submit" name="unenroll" value="<?php echo _AT('remove'); ?>" />
+
+		<?php elseif ($this->current_tab == 4): ?>
+			<input type="submit" name="enroll"   value="<?php echo _AT('enroll'); ?>" /> 
+
+		<?php endif; ?></td>
+</tr>
+</tfoot>
+<tbody>
+<?php if ($this->tab_counts[$this->current_tab]): ?>
+	<?php while ($row = mysql_fetch_assoc($this->enrollment_result)): ?>
+		<tr onmousedown="document.selectform['m<?php echo $row['member_id']; ?>'].checked = !document.selectform['m<?php echo $row['member_id']; ?>'].checked; togglerowhighlight(this, 'm<?php echo $row['member_id']; ?>');" id="rm<?php echo $row['member_id']; ?>">
+			<td><input type="checkbox" name="id[]" value="<?php echo $row['member_id']; ?>" id="m<?php echo $row['member_id']; ?>" onmouseup="this.checked=!this.checked" title="<?php echo AT_print($row['login'], 'members.login'); ?>" /></td>
+			<td><?php echo AT_print($row['login'], 'members.login'); ?></td>
+			<td><?php echo AT_print($row['first_name'], 'members.name'); ?></td>
+		<!-- REMOVED FOR MOBILE	<td><?php // echo AT_print($row['second_name'], 'members.name'); ?></td> -->
+			<td><?php echo AT_print($row['last_name'], 'members.name'); ?></td>
+		<!-- REMOVED FOR MOBILE	<td><?php // echo AT_print($row['email'], 'members.email'); ?></td>-->
+		</tr>
+	<?php endwhile; ?>
+<?php else: ?>
+	<tr>
+		<td colspan="6"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/faq/add_question.tmpl.php b/docs/themes/simplified-desktop/instructor/faq/add_question.tmpl.php
new file mode 100644
index 000000000..f009212d1
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/faq/add_question.tmpl.php
@@ -0,0 +1,32 @@
+<?php global $stripslashes;?>
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('add_question'); ?></legend>
+	<div class="row">
+
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="topic"><?php  echo _AT('topic'); ?></label><br />
+		<select name="topic_id" id="topic">
+			<?php while ($row = mysql_fetch_assoc($this->result)): ?>
+				<option value="<?php echo $row['topic_id']; ?>"<?php if (isset($_POST['topic_id']) && ($row['topic_id'] == $_POST['topic_id'])) { echo ' selected="selected"'; } ?>><?php echo AT_print($row['name'], 'input.text'); ?></option>
+			<?php endwhile; ?>
+		</select>
+	</div>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="question"><?php  echo _AT('question'); ?></label><br />
+		<input type="text" name="question" size="40" id="question" value="<?php if (isset($_POST['question'])) echo AT_print($stripslashes($_POST['question']), 'input.text');  ?>" />
+
+	</div>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="answer"><?php  echo _AT('answer'); ?></label><br />
+		<textarea name="answer" cols="40" rows="3" id="answer" style="width:90%;"><?php if (isset ($_POST['answer'])) echo AT_print($stripslashes($_POST['answer']), 'text.input');  ?></textarea>
+	</div>
+
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+	</fieldset>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/faq/add_topic.tmpl.php b/docs/themes/simplified-desktop/instructor/faq/add_topic.tmpl.php
new file mode 100644
index 000000000..349224351
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/faq/add_topic.tmpl.php
@@ -0,0 +1,17 @@
+<?php global $stripslashes;?>
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+
+<div class="input-form">	
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('add_topic'); ?></legend>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="name"><?php  echo _AT('name'); ?></label><br />
+		<input type="text" name="name" size="40" id="name" value="<?php if (isset($_POST['name'])) echo $stripslashes($_POST['name']);  ?>" />
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+	</fieldset>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/faq/edit_question.tmpl.php b/docs/themes/simplified-desktop/instructor/faq/edit_question.tmpl.php
new file mode 100644
index 000000000..1019fdd12
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/faq/edit_question.tmpl.php
@@ -0,0 +1,37 @@
+<?php global $stripslashes;
+?>
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<input type="hidden" name="id" value="<?php echo $this->row['entry_id']; ?>" />
+
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('create_new_file'); ?></legend>
+	<div class="row">
+		
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="topic"><?php  echo _AT('topic'); ?></label><br />
+		<select name="topic_id" id="topic">
+		<?php if(!empty($this->faq_topics)):?>
+			<?php foreach($this->faq_topics as $topic_row):?>
+				<option value="<?php echo $topic_row['topic_id']; ?>"<?php if ($topic_row['topic_id'] == $row['topic_id']) { echo ' selected="selected"'; } ?>><?php echo AT_print($topic_row['name'], 'input.text'); ?></option>			
+			<?php endforeach;?>		
+		<?php endif;?>
+		</select>
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="question"><?php echo _AT('question'); ?>:</label><br />
+		<input type="text" name="question" size="40" id="question" value="<?php if (isset ($_POST['question'])) { echo AT_print($stripslashes($_POST['question']), 'input.text'); } else { echo AT_print($this->row['question'], 'input.text'); } ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="answer"><?php  echo _AT('answer'); ?></label><br />
+		<textarea name="answer" cols="45" rows="3" id="answer" style="width:90%;"><?php if (isset ($_POST['answer'])) { echo AT_print($stripslashes($_POST['answer']), 'input.text'); } else { echo AT_print($this->row['answer'], 'input.text'); } ?></textarea>
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?> " />
+	</div>
+	</fieldset>
+</div>
+</form>
diff --git a/docs/themes/simplified-desktop/instructor/faq/edit_topic.tmpl.php b/docs/themes/simplified-desktop/instructor/faq/edit_topic.tmpl.php
new file mode 100644
index 000000000..4308b5615
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/faq/edit_topic.tmpl.php
@@ -0,0 +1,18 @@
+<?php global $stripslashes;?>
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
+
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('edit'); ?></legend>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="name"><?php  echo _AT('name'); ?></label><br />
+		<input type="text" name="name" size="40" id="name" value="<?php if (isset($_POST['name'])) echo AT_print($stripslashes($_POST['name']), 'input.text');  ?>" />
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?> " />
+	</div>
+	</fieldset>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/faq/index_instructor.tmpl.php b/docs/themes/simplified-desktop/instructor/faq/index_instructor.tmpl.php
new file mode 100644
index 000000000..c7af3d24d
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/faq/index_instructor.tmpl.php
@@ -0,0 +1,51 @@
+
+
+<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="form">
+<div class="table-surround">
+<table class="data" summary="View and edit frequently asked questions for the course">
+<thead>
+<tr>
+	<th>&nbsp;</th>
+	<th><?php echo _AT('name'); ?></th>
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="2"><input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" /> 
+				    <input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" /></td>
+</tr>
+</tfoot>
+<?php if (!empty($this->faq_topics)): ?>
+		<?php foreach ($this->faq_topics as $topic_id => $row): ?>
+					<tr onmousedown="document.form['t<?php echo $row['topic_id']; ?>'].checked = true; rowselect(this);" id="r_<?php echo $row['topic_id']; ?>_0">
+					<th style="border-top:1pt solid #e0e0e0;"><input type="radio" name="item" id="t<?php echo $row['topic_id']; ?>" value="<?php echo $row['topic_id']; ?>" /></th>
+					<th style="border-top:1pt solid #e0e0e0;"><?php echo AT_print($row['name'], 'faqs.topic'); ?></th>
+					</tr>
+	
+			<?php if (!empty($row['entry_rows'])): ?>
+				<?php foreach($row['entry_rows'] as $question_row): ?>
+				<tr onmousedown="document.form['q<?php echo $question_row['entry_id']; ?>'].checked = true; rowselect(this);" id="r_<?php echo $row['topic_id']; ?>_<?php echo $question_row['entry_id']; ?>">
+					<td><input type="radio" name="item" id="q<?php echo $question_row['entry_id']; ?>" value="<?php echo $question_row['entry_id']; ?>q" /></td>
+					<td><?php echo AT_print($question_row['question'], 'faqs.question'); ?></td>
+				</tr>
+				<?php endforeach;?>
+			
+			<?php else:?>
+			<tr>
+					<td>&nbsp;</td>
+					<td><?php echo _AT('no_questions'); ?></td>
+				</tr>
+			<?php endif;?>
+		<?php endforeach; ?>
+	<tbody>
+	
+		
+	</tbody>
+<?php else: ?>
+	<tr>
+		<td colspan="2"><strong><?php echo _AT('none_found'); ?></strong></td>
+	</tr>
+<?php endif; ?>
+</table>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/forums/add_forum.tmpl.php b/docs/themes/simplified-desktop/instructor/forums/add_forum.tmpl.php
new file mode 100644
index 000000000..8952dc470
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/forums/add_forum.tmpl.php
@@ -0,0 +1,24 @@
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<input type="hidden" name="add_forum" value="true">
+
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('create_forum'); ?></legend>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="title"><?php echo _AT('title'); ?></label><br />
+		<input type="text" name="title" size="40" id="title" />
+	</div>
+	<div class="row">
+		<label for="body"><?php echo _AT('description'); ?></label><br />
+		<textarea name="body" cols="40" rows="2" id="body" wrap="wrap"></textarea>
+	</div>
+	<div class="row">
+		<label for="edit"><?php echo _AT('allow_editing'); ?></label><br />
+		<input type="text" name="edit" size="3" id="edit" value="<?php echo intval($row['mins_to_edit']); ?>" /> <?php echo _AT('in_minutes'); ?>
+	</div>
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" /> 
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+	</fieldset>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/forums/edit_forum.tmpl.php b/docs/themes/simplified-desktop/instructor/forums/edit_forum.tmpl.php
new file mode 100644
index 000000000..1114aaab2
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/forums/edit_forum.tmpl.php
@@ -0,0 +1,28 @@
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<input type="hidden" name="edit_forum" value="true">
+<input type="hidden" name="fid" value="<?php echo $this->fid; ?>">
+
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('edit_forum'); ?></legend>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="title"><?php echo _AT('title'); ?></label><br />
+		<input type="text" name="title" size="40" id="title" value="<?php echo htmlspecialchars(stripslashes($this->row['title'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="body"><?php echo _AT('description'); ?></label><br />
+		<textarea name="body" cols="40" rows="2" id="body" wrap="wrap"><?php echo AT_print($this->row['description'], 'input.text'); ?></textarea>
+	</div>
+
+	<div class="row">
+		<label for="edit"><?php echo _AT('allow_editing'); ?></label><br />
+		<input type="text" name="edit" size="3" id="edit" value="<?php echo intval($this->row['mins_to_edit']); ?>" /> <?php echo _AT('in_minutes'); ?>
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" /> 
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+	</fieldset>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/forums/index.tmpl.php b/docs/themes/simplified-desktop/instructor/forums/index.tmpl.php
new file mode 100644
index 000000000..8cdc0c341
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/forums/index.tmpl.php
@@ -0,0 +1,41 @@
+<form name="form" method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+<div class="table-surround">
+<table class="data" summary="List of course forums">
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><?php echo _AT('title'); ?></th>
+	<th scope="col"><?php echo _AT('description'); ?></th>
+	<!--  REMOVED FOR MOBILE <th scope="col"><?php echo _AT('allow_editing'); ?></th>-->
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="4"><input type="submit" name="edit" value="<?php echo _AT('edit'); ?>" /> <input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" /></td>
+</tr>
+</tfoot>
+<tbody>
+<?php if ($this->all_forums['nonshared']): ?>
+	<?php foreach($this->all_forums['nonshared'] as $row): ?>
+		<tr onmousedown="document.form['f<?php echo $row['forum_id']; ?>'].checked = true; rowselect(this);" id="r_<?php echo $row['forum_id']; ?>">
+			<td width="10"><input type="radio" name="id" value="<?php echo $row['forum_id']; ?>" id="f<?php echo $row['forum_id']; ?>" /></td>
+			<td><label for="f<?php echo $row['forum_id']; ?>"><?php echo AT_print($row['title'], 'forums.title'); ?></label></td>
+			<td><?php echo AT_print($row['description'], 'forums.description'); ?></td>
+			<!-- REMOVED FOR MOBILE <td>
+				<?php if (!$row['mins_to_edit']): ?>
+					<?php echo _AT('no'); ?>
+				<?php else: ?>
+					<?php echo  _AT('minutes', $row['mins_to_edit']); ?>
+				<?php endif; ?>
+			</td>-->
+		</tr>
+	<?php endforeach; ?>
+<?php else: ?>
+	<tr>
+		<td colspan="4"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/glossary/add.tmpl.php b/docs/themes/simplified-desktop/instructor/glossary/add.tmpl.php
new file mode 100644
index 000000000..27bd08d6f
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/glossary/add.tmpl.php
@@ -0,0 +1,61 @@
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<input type="hidden" name="num_terms" value="<?php echo $this->num_terms; ?>" />
+<?php
+for ($i=0;$i<$this->num_terms;$i++) {
+	if ($glossary[$word[$i]] != '') {
+		echo '<input type="hidden" name="ignore['.$i.']" value="1" />';
+		continue;
+	}
+	
+	for ($j=0;$j<$i;$j++) {
+		if ($word[$j] == $word[$i]) {
+			echo '<input type="hidden" name="ignore['.$i.']" value="1" />';
+			continue 2;
+		}
+	}
+
+	if ($word[$i] == '') {
+		$word[$i] = ContentManager::cleanOutput($_POST['word'][$i]);
+	}
+?>
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('add_glossary'); ?></legend>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="title<?php echo $i; ?>"><?php echo _AT('glossary_term');  ?></label><br />
+		<input type="text" name="word[<?php echo $i; ?>]" size="30" value="<?php echo trim($word[$i]); ?>" id="title<?php echo $i; ?>" /><?php			
+		if ($_GET['pcid'] != '') { 
+			echo '<input type="checkbox" name="ignore['.$i.']" value="1" id="ig'.$i.'" /><label for="ig'.$i.'">Ignore this term</label>.';	
+		}
+		?>
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="body<?php echo $i; ?>"><?php echo _AT('glossary_definition');  ?></label><br />
+		<textarea name="definition[<?php echo $i; ?>]" class="formfield" cols="55" rows="7" id="body<?php echo $i; ?>" style="width:90%;"><?php echo ContentManager::cleanOutput($_POST['definition'][$i]); ?></textarea>
+	</div>
+
+	<div class="row">
+	<?php echo _AT('glossary_related');  ?><br />
+	<?php
+			
+			if ($row_g = mysql_fetch_assoc($this->result_glossary)) {
+				echo '<select name="related_term['.$i.']">';
+				echo '<option value="0"></option>';
+				do {
+					echo '<option value="'.$row_g['word_id'].'">'.$row_g['word'].'</option>';
+				} while ($row_g = mysql_fetch_assoc($this->result_glossary));
+				echo '</select>';
+			} else {
+				echo _AT('none_available');
+			}
+		} // endfor
+	?>
+	</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+	</fieldset>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/polls/add.tmpl.php b/docs/themes/simplified-desktop/instructor/polls/add.tmpl.php
new file mode 100644
index 000000000..c0f586ddb
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/polls/add.tmpl.php
@@ -0,0 +1,27 @@
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<input type="hidden" name="add_poll" value="true" />
+
+<div class="input-form">	
+<fieldset class="group_form"><legend class="group_form"><?php echo _AT('add_poll'); ?></legend>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="question"><?php  echo _AT('question'); ?></label><br />
+		<textarea name="question" cols="40" rows="3" id="question" ><?php if (isset ($_POST['question'])) echo htmlspecialchars($_POST['question']);  ?></textarea>
+	</div>
+
+<?php for ($i=1; $i<= AT_NUM_POLL_CHOICES; $i++): ?>
+	<div class="row">
+		<?php if (($i==1) || ($i==2)) { ?>
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span>
+		<?php } ?>
+		<label for="c<?php echo $i; ?>"><?php echo _AT('choice'); ?> <?php echo $i; ?></label><br />
+		<input type="text" name="c<?php echo $i; ?>" value="<?php if (isset($_POST['c' . $i])) echo htmlspecialchars($_POST['c' . $i]);  ?>" size="40" id="c<?php echo $i; ?>" />
+	</div>
+<?php endfor; ?>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+	</fieldset>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/polls/edit.tmpl.php b/docs/themes/simplified-desktop/instructor/polls/edit.tmpl.php
new file mode 100644
index 000000000..047a1e835
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/polls/edit.tmpl.php
@@ -0,0 +1,30 @@
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<input type="hidden" name="edit_poll" value="true" />
+<input type="hidden" name="poll_id" value="<?php echo $this->row['poll_id']; ?>" />
+
+<div class="input-form">
+<fieldset class="group_form"><legend class="group_form"><?php echo _AT('edit_poll'); ?></legend>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="question"><?php echo _AT('question'); ?>:</label><br />
+		<textarea name="question" cols="40" rows="3" id="question"><?php if (isset ($_POST['question'])) { echo AT_print($_POST['question'], 'input.text'); } else { echo AT_print($this->row['question'], 'input.text'); } ?></textarea>
+	</div>
+
+<?php
+	for ($i=1; $i<= AT_NUM_POLL_CHOICES; $i++): ?>
+		<div class="row">
+			<?php if (($i==1) || ($i==2)) { ?>
+				<span class="required" title="<?php echo _AT('required_field'); ?>">*</span>
+			<?php } ?>
+			<label for="c<?php echo $i; ?>"><?php echo _AT('choice'); ?> <?php echo $i; ?>:</label><br />
+			<input type="text" name="c<?php echo $i; ?>" id="c<?php echo $i; ?>" value="<?php if (isset ($_POST['c' . $i])) { echo AT_print($_POST['c' . $i], 'input.text'); } else { echo AT_print($this->row['choice' . $i], 'input.text'); }?>" size="40" />
+		</div>
+
+<?php endfor; ?>
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?> " />
+	</div>
+	</fieldset>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/polls/index.tmpl.php b/docs/themes/simplified-desktop/instructor/polls/index.tmpl.php
new file mode 100644
index 000000000..36d9eace4
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/polls/index.tmpl.php
@@ -0,0 +1,52 @@
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+<div class="table-surround">
+<table class="data" summary="Course polls listed by question, creation date and votes" >
+<colgroup>
+	<?php if ($this->col == 'question'): ?>
+		<col />
+		<col class="sort" />
+		<col span="2" />
+	<?php elseif($this->col == 'created_date'): ?>
+		<col span="2" />
+		<col class="sort" />
+		<col />
+	<?php elseif($this->col == 'total'): ?>
+		<col span="3" />
+		<col class="sort" />
+	<?php endif; ?>
+</colgroup>
+<thead>
+<tr>
+	<th scope="col">&nbsp;</th>
+	<th scope="col"><a href="mods/_standard/polls/tools/index.php?<?php echo $this->orders[$this->order]; ?>=question"><?php echo _AT('question'); ?></a></th>
+	<th scope="col"><a href="mods/_standard/polls/tools/index.php?<?php echo $this->orders[$this->order]; ?>=created_date"><?php echo _AT('created'); ?></a></th>
+	<th scope="col"><a href="mods/_standard/polls/tools/index.php?<?php echo $this->orders[$this->order]; ?>=total"><?php echo _AT('total_votes'); ?></a></th>
+</tr>
+</thead>
+<tfoot>
+<tr>
+	<td colspan="4">
+		<input type="submit" name="edit"   value="<?php echo _AT('edit'); ?>" />
+		<input type="submit" name="delete" value="<?php echo _AT('delete'); ?>" />
+	</td>
+</tr>
+</tfoot>
+<tbody>
+<?php if ($row = mysql_fetch_assoc($this->result)) : ?>
+	<?php do { ?>
+		<tr onmousedown="document.form['p_<?php echo $row['poll_id']; ?>'].checked = true; rowselect(this);" id="r_<?php echo $row['poll_id']; ?>">
+			<td><input type="radio" id="p_<?php echo $row['poll_id']; ?>" name="poll" value="<?php echo $row['poll_id']; ?>" /></td>
+			<td><label for="p_<?php echo $row['poll_id']; ?>"><?php echo AT_print($row['question'], 'polls.question'); ?></label></td>
+			<td><?php echo AT_DATE(_AT("server_date_format"), $row['created_date']); ?></td>
+			<td><?php echo $row['total']; ?></td>
+		</tr>
+	<?php } while($row = mysql_fetch_assoc($this->result)); ?>
+<?php else: ?>
+	<tr>
+		<td colspan="4"><?php echo _AT('none_found'); ?></td>
+	</tr>
+<?php endif; ?>
+</tbody>
+</table>
+</div>
+</form>
diff --git a/docs/themes/simplified-desktop/instructor/properties/course_properties.tmpl.php b/docs/themes/simplified-desktop/instructor/properties/course_properties.tmpl.php
new file mode 100644
index 000000000..6f833b5ed
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/properties/course_properties.tmpl.php
@@ -0,0 +1,441 @@
+<?php 
+global $languageManager,  $_config, $MaxCourseSize, $MaxFileSize;
+
+?>
+<?php echo _AT('available_immediately'); ?>
+<form method="post" action="<?php echo $_SERVER['PHP_SELF'];  ?>" name="course_form" enctype="multipart/form-data">
+	<input type="hidden" name="form_course" value="true" />
+	<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_config['prof_pic_max_file_size']; ?>" />
+	<input type="hidden" name="course" value="<?php echo $this->course; ?>" />
+	<input type="hidden" name="old_access" value="<?php echo $this->row['access']; ?>" />
+	<input type="hidden" name="created_date" value="<?php echo $this->row['created_date']; ?>" />
+	<input type="hidden" name="show_courses" value="<?php echo $_GET['show_courses']; ?>" />
+	<input type="hidden" name="current_cat" value="<?php echo $_GET['current_cat']; ?>" />
+	<input type="submit" name="submit" style="display:none;"/>
+
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('properties'); ?></legend>
+<?php if ($this->isadmin): ?>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="inst"><?php echo  _AT('instructor'); ?></label><br />
+			<?php 
+			
+			
+			if ($instructor_row = mysql_fetch_assoc($this->result)) {
+				echo '<select name="instructor" id="inst">';
+				do {
+					if ($instructor_row['member_id'] == $this->row['member_id']) {
+						echo '<option value="'.$instructor_row['member_id'].'" selected="selected">'.$instructor_row['login'].'</option>';
+					} else {
+						echo '<option value="'.$instructor_row['member_id'].'">'.$instructor_row['login'].'</option>';
+					}
+				} while($instructor_row = mysql_fetch_assoc($this->result));
+				echo '</select>';
+			} else {
+				echo '<span id="inst">'._AT('none_found').'</span>';
+			}
+			?>
+	</div>
+<?php endif; ?>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="title"><?php echo _AT('title'); ?></label><br />
+		<input type="text" id="title" name="title" size="40" value="<?php echo htmlspecialchars($this->row['title']); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="pri_lang"><?php  echo _AT('primary_language'); ?></label><br />
+		<?php $languageManager->printDropdown($this->row['primary_language'], 'pri_lang', 'pri_lang'); ?>
+	</div>
+
+	<div class="row">
+		<label for="description"><?php echo _AT('description'); ?></label><br />
+		<textarea id="description" cols="45" rows="2" name="description"><?php echo $this->row['description']; ?></textarea>
+	</div>
+	<?php if ($_config['course_dir_name']): ?>
+	<div class="row">
+		<label for="course_dir_name"><?php echo _AT('course_dir_name'); ?></label><br />
+		<input type="text" id="course_dir_name" name="course_dir_name" size="40" value="<?php echo htmlspecialchars($this->row['course_dir_name']); ?>" />
+	</div>
+	<?php endif; ?>
+
+	<?php $categories = get_categories(); ?>
+	<?php if (is_array($categories)): ?>
+		<div class="row">
+		<label for="cat"><?php echo _AT('category'); ?></label><br />
+			<select name="category_parent" id="cat">
+				<option value="0">&nbsp;&nbsp;&nbsp;[&nbsp;&nbsp;<?php echo _AT('cats_uncategorized'); ?>&nbsp;&nbsp;]&nbsp;&nbsp;&nbsp;</option>
+				<?php select_categories($categories, 0, $this->row['cat_id'], false); ?>
+
+			</select>
+		</div>
+	<?php endif; ?>
+
+	<div class="row">
+		<?php  echo _AT('export_content'); ?><br />
+		<?php
+			switch ($this->row['content_packaging']) {
+				case 'none':
+						$none = ' checked="checked"';
+						break;
+
+				case 'top':
+						$top	 = ' checked="checked"';
+						break;
+
+				case 'all':
+						$all	= ' checked="checked"';
+						break;
+			}
+			?>
+		<label for="none" ><input type="radio" name="content_packaging" value="none" id="none" <?php echo $none; ?> /><?php echo _AT('content_packaging_none'); ?></label><br />
+		<label for="ctop"><input type="radio" name="content_packaging" value="top" id="ctop"  <?php echo $top; ?> /><?php  echo _AT('content_packaging_top'); ?></label><br />
+		<label for="all"><input type="radio" name="content_packaging" value="all" id="all" <?php echo $all; ?> /><?php  echo _AT('content_packaging_all'); ?></label>
+	</div>
+
+	<div class="row">
+		<?php echo _AT('syndicate_announcements'); ?><br />
+		<?php
+				$rss_no = $rss_yes = '';
+
+				if ($this->row['rss']) {
+					$rss_yes = ' checked="checked"';
+				} else {
+					$rss_no = ' checked="checked"';
+				}
+		?>
+		<label for="rss_y"><input type="radio" name="rss" value="1" id="rss_y" <?php echo $rss_yes; ?> /><?php echo _AT('enable_syndicate'); ?></label><br />
+		<label for="rss_n"><input type="radio" name="rss" value="0" id="rss_n"  <?php echo $rss_no; ?> /><?php  echo _AT('disable_syndicate'); ?></label>
+	</div>
+
+	<div class="row">
+		<?php echo _AT('access'); ?><br />
+		<?php
+				switch ($this->row['access']) {
+					case 'public':
+							$pub = ' checked="checked"';
+							$disable = 'disabled="disabled"'; // disable the nofity box
+							break;
+
+					case 'protected':
+							$prot	 = ' checked="checked"';
+							$disable = 'disabled="disabled"'; // disable the nofity box
+							break;
+
+					case 'private':
+							$priv	= ' checked="checked"';
+							break;
+				}
+
+				if ($this->row['notify']) {
+					$notify = ' checked="checked"';
+				}
+
+				if ($this->row['hide']) {
+					$hide = ' checked="checked"';
+				}
+		?>
+		<input type="radio" name="access" value="public" id="pub" onclick="disableNotify();" <?php echo $pub; ?> /><label for="pub"><strong> <?php echo  _AT('public'); ?>: </strong></label><?php echo  _AT('about_public'); ?><br /><br />
+
+		<input type="radio" name="access" value="protected" id="prot" onclick="disableNotify();" <?php echo $prot; ?> /><label for="prot"><strong><?php echo  _AT('protected'); ?>:</strong></label> <?php echo _AT('about_protected'); ?><br /><br />
+
+		<input type="radio" name="access" value="private" id="priv" onclick="enableNotify();" <?php echo $priv; ?> /><label for="priv"><strong><?php echo  _AT('private'); ?>:</strong></label> <?php echo  _AT('about_private'); ?><br />
+		<input type="checkbox" name="notify" id="notify" value="1" <?php
+			echo $disable;
+			echo $notify; ?> /><label for="notify"><?php echo  _AT('email_approvals'); ?></label>
+		<br />
+		<input type="checkbox" name="hide" id="hide" value="1" <?php
+		echo $disable;
+		echo $hide; ?> /><label for="hide"><?php echo  _AT('hide_course'); ?></label>.
+	</div>
+
+	<div class="row">
+		<?php echo _AT('release_date'); ?><br />
+		<?php
+			$rel_no = $rel_yes = '';
+
+			if (intval($this->row['release_date'])) {
+				$rel_yes = ' checked="checked"';
+
+				$today_day   = substr($this->row['release_date'], 8, 2);
+				$today_mon   = substr($this->row['release_date'], 5, 2);
+				$today_year  = substr($this->row['release_date'], 0, 4);
+
+				$today_hour  = substr($this->row['release_date'], 11, 2);
+				$today_min   = substr($this->row['release_date'], 14, 2);
+			} else {
+				$rel_no = ' checked="checked"'; 
+				$today_year  = date('Y');
+			}
+
+		?>
+
+		<input type="radio" name="release_date" value="0" id="release_now" <?php echo $rel_no; ?> /> <label for="release_now"><?php echo _AT('available_immediately'); ?></label><br />
+
+
+		<input type="radio" name="release_date" value="1" id="release_later" <?php echo $rel_yes; ?> /> <label for="release_later"><?php echo _AT('release_on'); ?></label> 
+		<?php
+			$name = '_release';
+			require(AT_INCLUDE_PATH.'html/release_date.inc.php');
+		?>
+	</div>
+
+	<div class="row">
+		<?php echo _AT('end_date'); ?><br />
+		<?php
+			$end_no = $end_yes = '';
+
+			if (intval($this->row['end_date'])) {
+				$end_yes = ' checked="checked"';
+
+				$today_day   = substr($this->row['end_date'], 8, 2);
+				$today_mon   = substr($this->row['end_date'], 5, 2);
+				$today_year  = substr($this->row['end_date'], 0, 4);
+
+				$today_hour  = substr($this->row['end_date'], 11, 2);
+				$today_min   = substr($this->row['end_date'], 14, 2);
+			} else {
+				$end_no = ' checked="checked"'; 
+				$today_year  = date('Y')+1;
+			}
+
+		?>
+
+		<input type="radio" name="end_date" value="0" id="end_now" <?php echo $end_no; ?> /> <label for="end_now"><?php echo _AT('no_end_date'); ?></label><br />
+
+		<input type="radio" name="end_date" value="1" id="end_later" <?php echo $end_yes; ?> /> <label for="end_later"><?php echo _AT('end_on'); ?></label> 
+		<?php
+			$name = '_end';
+			require(AT_INCLUDE_PATH.'html/release_date.inc.php');
+		?>
+	</div>
+
+	<div class="row">
+		<?php
+			if (($_POST['setvisual'] && !$_POST['settext']) || $_GET['setvisual']){
+				echo '<input type="hidden" name="setvisual" value="'.$_POST['setvisual'].'" />';
+				echo '<input type="submit" name="settext" value="'._AT('switch_text').'"  class="button"/>';
+			} else {
+				echo '<input type="submit" name="setvisual" value="'._AT('switch_visual').'" class="button"/>';
+			}
+		?>
+	</div>
+	<div class="row">
+
+		<label for="banner"><?php echo _AT('banner'); ?></label><br />
+		<textarea id="banner" cols="45" rows="15" name="banner"><?php echo $this->row['banner']; ?></textarea>
+	</div>
+<!-- FIX  -->
+<?php if (!$this->course) : ?>
+	<div class="row">
+		<label for="initial_content"><?php echo _AT('initial_content'); ?></label><br />
+		<select name="initial_content" id="initial_content" size="5">
+			<option value="0"><?php echo _AT('empty'); ?></option>
+			<option value="1" selected="selected"><?php echo _AT('create_basic'); ?></option>
+			<?php 
+			
+			if ($course_row = mysql_fetch_assoc($result)) {
+				do {
+					$Backup->setCourseID($course_row['course_id']);
+					$list = $Backup->getAvailableList();
+
+					if (!empty($list)) { 
+						echo '<optgroup label="'. _AT('restore').': '.$course_row['title'].'">';
+						foreach ($list as $list_item) {
+							echo '<option value="'.$list_item['backup_id'].'_'.$list_item['course_id'].'">'.$list_item['file_name'].' - '.get_human_size($list_item['file_size']).'</option>';
+						}
+						echo '</optgroup>';
+					}
+				} while ($course_row = mysql_fetch_assoc($result));
+			}
+			?>
+			</select>
+	</div>
+<?php endif; // !$course_id ?>
+
+<?php if ($this->isadmin) : ?>
+	<div class="row">
+		<?php  echo _AT('course_quota'); ?><br />
+		<?php 
+			if ($this->row['max_quota'] == AT_COURSESIZE_UNLIMITED) { 
+				$c_unlim = ' checked="checked" ';
+				$c_oth2 = ' disabled="disabled" ';
+			} elseif ($this->row['max_quota'] == AT_COURSESIZE_DEFAULT) {
+				$c_def = ' checked="checked" ';
+				$c_oth2 = ' disabled="disabled" ';
+			} else {
+				$c_oth = ' checked="checked" ';
+				$c_oth2 = '';
+			}
+
+			if ($this->course > 0) {
+				$course_size = dirsize(AT_CONTENT_DIR . $this->course.'/');
+			} else {
+				$course_size = 0;
+			}
+
+			if ($this->course) {
+				echo _AT('current_course_size') .': '.get_human_size($course_size).'<br />'; 
+			}
+		?>
+
+		<input type="radio" id="c_default" name="quota" value="<?php echo AT_COURSESIZE_DEFAULT; ?>" onclick="disableOther();" <?php echo $c_def;?> /><label for="c_default"> <?php echo _AT('default') . ' ('.get_human_size($MaxCourseSize).')'; ?></label> <br />
+		<input type="radio" id="c_unlim" name="quota" value="<?php echo AT_COURSESIZE_UNLIMITED; ?>" onclick="disableOther();" <?php echo $c_unlim;?>/><label for="c_unlim"> <?php echo _AT('unlimited'); ?></label> <br />
+		<input type="radio" id="c_other" name="quota" value="2" onclick="enableOther();" <?php echo $c_oth;?>/><label for="c_other"> <?php echo _AT('other'); ?> </label> - 
+		<label for="quota_entered">Quota Entered</label>
+		<input type="text" id="quota_entered" name="quota_entered" <?php echo $c_oth2?> value="<?php if ($this->row['max_quota']!=AT_COURSESIZE_UNLIMITED && $this->row['max_quota']!=AT_COURSESIZE_DEFAULT) { echo bytes_to_megabytes($this->row['max_quota']); } ?>" size="4" /> <?php echo _AT('mb'); ?>
+	</div>
+
+	<div class="row">
+		<?php  echo _AT('max_file_size'); ?><br />
+		<?php 
+			$max_allowed = megabytes_to_bytes(substr(ini_get('upload_max_filesize'), 0, -1));
+
+			if ($this->row['max_file_size'] == AT_FILESIZE_DEFAULT) { 
+				$f_def = ' checked="checked" ';
+				$f_oth2 = ' disabled="disabled" ';
+			} elseif ($this->row['max_file_size'] == AT_FILESIZE_SYSTEM_MAX) {
+				$f_max = ' checked="checked" ';
+				$f_oth2 = ' disabled="disabled" ';
+			} else {
+				$f_oth = ' checked="checked" ';
+				$f_oth2 = '';
+			}
+		?>
+		<input type="radio" id="f_default" name="filesize" value="<?php echo AT_FILESIZE_DEFAULT; ?>" onclick="disableOther2();" <?php echo $f_def;?> /><label for="f_default"> <?php echo _AT('default') . ' ('.get_human_size($MaxFileSize).')'; ?></label> <br />
+		<input type="radio" id="f_maxallowed" name="filesize" value="<?php echo AT_FILESIZE_SYSTEM_MAX; ?>" onclick="disableOther2();" <?php echo $f_max;?>/><label for="f_maxallowed"> <?php echo _AT('max_file_size_system') . ' ('.get_human_size($max_allowed).')'; ?></label> <br />
+		<input type="radio" id="f_other" name="filesize" value="2" onclick="enableOther2();" <?php echo $f_oth;?>/><label for="f_other"> <?php echo _AT('other'); ?> </label> - 
+		<label for="filesize_entered">Filesize entered</label>
+		<input type="text" id="filesize_entered" name="filesize_entered" <?php echo $f_oth2?> value="<?php if ($this->row['max_file_size']!=AT_FILESIZE_DEFAULT && $this->row['max_file_size']!=AT_FILESIZE_SYSTEM_MAX) { echo bytes_to_megabytes($this->row['max_file_size']); } ?>" size="4" /> <?php echo _AT('mb'); ?>
+	</div>
+
+<?php else: ?>
+	<input type="hidden" name="quota" value="<?php echo $this->row['max_quota']; ?>" />
+	<input type="hidden" name="filesize" value="<?php echo $this->row['max_file_size']; ?>" />
+	<input type="hidden" name="tracking" value="<?php echo $this->row['tracking']; ?>" />
+<?php endif; ?>
+
+	<div class="row">
+		<label for="copyright"><?php echo _AT('course_copyright'); ?></label><br />
+		<textarea name="copyright" rows="2" cols="65" id="copyright"><?php echo $this->row['copyright']; ?></textarea>
+	</div>
+	<div class="row">
+		<?php 
+            if ($this->row['icon'] != ''): 
+                $path = AT_CONTENT_DIR.$this->row['course_id']."/custom_icons/";
+                if (file_exists($path.$this->row['icon'])) {
+                    if (defined('AT_FORCE_GET_FILE') && AT_FORCE_GET_FILE) {
+                        $custom_icon_path = 'get_course_icon.php/?id='.$this->row['course_id'];
+                    } else {
+                        $_base_href = 'content/' . $this->row['course_id'] . '/';
+                    }
+                } else {
+                    $_base_href = "images/courses/";	//$_base_href = 'get_course_icon.php/?id='.$row['course_id'];
+                }
+
+            $force_get = (defined('AT_FORCE_GET_FILE') && AT_FORCE_GET_FILE) ? true : false;
+            echo "<input type='hidden' name='boolForce' id='boolForce' value='$force_get' />";
+        
+       //include(AT_INCLUDE_PATH.'html/course_icon.inc.php');        
+        ?>
+		<img id="i0" src="<?php echo ($custom_icon_path=='')?$_base_href.$this->row['icon']:$custom_icon_path; ?>" alt="<?php echo $this->row['icon']; ?>" border="1" height="79" width="79"  style="float: left; margin: 2px;" />
+
+		<?php else: ?>
+			<img id="i0" src="images/clr.gif" alt="" style="float: left; margin: 2px;" border="1" height="79" width="79"  />
+			<input type='hidden' name='boolForce' id='boolForce' value='' />
+		<?php endif; ?>
+		<div style="width:40%; float:left;">
+		<label for="icons"><?php echo _AT('icon'); ?></label><br />
+		<select name="icon" id="icons" onchange="SelectImg()">
+			<option value=""><?php echo _AT('no_icon'); ?></option>
+            <?php // ------------- custom course icons
+                $path = AT_CONTENT_DIR.$this->row['course_id']."/custom_icons/";
+                $boolCustom = false;
+                $optCount = 0;
+
+                if (is_dir($path)) {
+                    $boolCustom = true;  // true if custom icons are uploaded, otherwise false
+                    
+                    /*$files = scandir($path);  //SCANDIR STOPS ATUTOR WHEN RUN AS INSTRUCTOR, BUT NOT AS ADMIN. WHY? -Gorzan */
+                    
+                    /* PHP 4 REPLACEMENT FOR SCANDIR */
+					$dh  = opendir($path);
+					while (false !== ($filename = readdir($dh))) {
+						$files[] = $filename;
+					}
+
+					/*END PHP 4 REPLACEMENT FOR SCANDIR*/
+                    echo "<optgroup label='"._AT('custom_icons')."'>";
+                    foreach($files as $val) {
+						$file_ext = substr(strtolower($val), -3);
+                        if ($file_ext == "jpg" || $file_ext == "png" || $file_ext == "gif") {
+                            $optCount++;
+                            echo "<option value='".$val."'";
+                            if ($val == $this->row['icon']) {
+                                echo 'selected="selected"';
+                            }
+                            echo ">".$val."</option>";
+                        }
+                    }
+                    echo "</optgroup>";
+                }
+                
+            ?>
+			<?php // ------------- other icons
+
+				$course_imgs = array();
+				if ($dir = opendir(AT_INCLUDE_PATH.'../images/courses/')) {
+					while (false !== ($file = readdir($dir)) ) {
+						if( ($file == '.') || ($file == '..')) { 
+							continue;
+						}
+						$course_imgs[] = $file;
+					}		
+					closedir($dir);	
+				}
+				sort($course_imgs);
+                if ($boolCustom == true) {
+                    echo "<optgroup label='"._AT('builtin_icons')."'>";
+                }
+				foreach ($course_imgs as $file) {
+					echo '<option value="' . $file . '" ';
+					if ($file == $this->row['icon']) { 
+						echo 'selected="selected"'; 
+					}
+					echo ' >' . $file . '</option>';	
+				}
+                if ($boolCustom == true) {
+                    echo "</optgroup>";
+                }
+			?>
+		</select><?php echo "&nbsp;&nbsp;&nbsp; "._AT('or'); ?>
+	</div>
+            <!-- div class="row" style="float:right;width:40%;">
+            <?php echo _AT('upload_icon'); ?><br />
+            	<label for="customicon"><input type="file" name="customicon" title="custom icon" id="customicon" value="<?php echo $_POST['customicon']; ?>"/></label><br />
+                <small><?php echo _AT('upload_icon_text'); ?></small>
+            </div -->
+
+        <?php  require_once(AT_INCLUDE_PATH.'../mods/_core/courses/html/course_icon.inc.php'); ?>
+
+        <br style="clear: left;" />
+
+	</div>
+
+    <div style="clear: both;"></div>
+
+    
+
+	<div class="buttons">
+	        <?php
+            echo "<input type='hidden' name='custOptCount' id='custOptCount' value='".$optCount."' />";
+            echo "<input type='hidden' name='courseId' id='courseId' value='".$this->row['course_id']."' />";
+		?>
+
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s" /> 
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel');?>" />
+	</div>
+    </fieldset>
+</div>
+
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/statistics/course_stats.tmpl.php b/docs/themes/simplified-desktop/instructor/statistics/course_stats.tmpl.php
new file mode 100644
index 000000000..dac7f60db
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/statistics/course_stats.tmpl.php
@@ -0,0 +1,179 @@
+<?php if ($this->mobile_device_type == IPAD_DEVICE): ?>
+<table cellspacing="1" cellpadding="1" border="0" class="bodyline" summary="course statistics" align="center">
+	<tr>
+		<th colspan="2" class="cyan"><small class="bigspacer"><?php
+			echo '<a href="'.$_SERVER['PHP_SELF'].'?month='.($this->last_month).SEP.'year='.$this->last_year.'">';
+			echo ' '.AT_date('%F', $this->last_month, AT_DATE_INDEX_VALUE ); ?></a> |</small>
+			<?php echo AT_date('%F', $this->month, AT_DATE_INDEX_VALUE ); ?> <small class="bigspacer">| <?php
+			echo '<a href="'.$_SERVER['PHP_SELF'].'?month='.$this->next_month.SEP.'year='.$this->next_year.'">';
+			echo AT_date('%F', $this->next_month, AT_DATE_INDEX_VALUE); ?> </a></small></th>
+	</tr>
+<?php
+		if (($this->num_days == 0) || ($this->empty)) {
+			echo '<tr>';
+			echo '<td class="row1" colspan="2">'._AT('no_month_data').'</td>';
+			echo '</tr>';
+			echo '</table>';
+			require(AT_INCLUDE_PATH.'footer.inc.php');
+			exit;
+		}
+?>
+	<tr>
+		<td class="row1" valign="top" align="right"><strong><?php echo _AT('total'); ?>:</strong></td>
+		<td class="row1"><?php echo $this->total_logins; ?></td>
+	</tr>
+	<tr><td height="1" class="row2" colspan="2"></td></tr>
+	<tr>
+		<td class="row1" valign="top" align="right"><strong><?php echo _AT('maximum'); ?>:</strong></td>
+		<td class="row1"><?php echo $this->max_total_logins; ?></td>
+	</tr>
+	<tr><td height="1" class="row2" colspan="2"></td></tr>
+
+	<tr>
+		<td class="row1" valign="top" align="right"><strong><?php echo _AT('minimum'); ?>:</strong></td>
+		<td class="row1"><?php
+		if ($this->min_total_logins < 99999999) {
+			echo $this->min_total_logins; 
+		} else {
+			echo '0';
+		} ?></td>
+	</tr>
+	<tr><td height="1" class="row2" colspan="2"></td></tr>
+	<tr>
+		<td class="row1" valign="top" align="right"><strong><?php   echo _AT('average'); ?>:</strong></td>
+		<td class="row1"><?php echo number_format($this->avg_total_logins, 1); ?> <?php   echo _AT('per_day'); ?></td>
+	</tr>
+	<tr><td height="1" class="row2" colspan="2"></td></tr>
+
+	<tr>
+		<td class="row1" valign="top" align="right" <strong><?php   echo _AT('graph'); ?>:</strong></td>
+		<td class="row1">
+			<table border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td valign="top" class="graph1"><small><?php echo $this->max_total_logins; ?></small></td>
+
+<?php
+			foreach ($this->days as $day => $logins) {
+			$dd++;
+				echo '<td valign="bottom" class="graph"><img src="images/clr.gif" height="'.(($this->max_total_logins*$this->multiplyer_height) % $this->block_height + $this->block_height).'" width="10" alt="" /><br /><img src="images/blue.gif" height="'.($logins[0]*$this->multiplyer_height).'" width="9" alt="'.$logins[0].' '._AT('guests').' ('.($logins[0]+$logins[1]).' '._AT('total').')" /><br /><img src="images/red.gif" height="'.($logins[1]*$this->multiplyer_height).'" width="9" alt="'.$logins[1].' '._AT('members').' ('.($logins[1]+$logins[0]).' '._AT('total').')" /><br /><small>'.$dd.'&nbsp;</small></td>';
+
+			} while ($row = mysql_fetch_array($this->result));
+?>
+
+			</tr>
+			<tr>
+				<td valign="top"><small>0</small></td>
+			</tr>
+			</table>
+
+			<small><?php  echo _AT('legend'); ?>: <img src="images/red.gif" height="10" width="10" alt="<?php echo _AT('red_members'); ?>" /> <?php   echo _AT('members'); ?>,
+				<img src="images/blue.gif" height="10" width="10" alt="<?php echo _AT('blue_guests'); ?>" /> <?php echo _AT('guests'); ?>.</small>
+		</td>
+	</tr>
+	<tr><td height="1" class="row2" colspan="2"></td></tr>
+	<tr>
+		<td class="row1" valign="top" align="right"><strong><?php echo _AT('raw_data'); ?>:</strong></td>
+		<td class="row1" align="center">
+	
+		<table class="data static" summary="" rules="cols">
+		<thead>
+		<tr>
+			<th scope="col"><?php echo _AT('date');    ?></th>
+			<th scope="col"><?php echo _AT('guests');  ?></th>
+			<th scope="col"><?php echo _AT('members'); ?></th>
+		</tr>
+		</thead>
+		<tbody>
+		<?php $short_name = $month_name_con['en'][$month-1]; ?>
+		<?php foreach ($this->days as $day => $logins):?>
+			<tr>
+				<td><?php echo $short_name.' '.$day; ?></td>
+				<td><?php echo $logins[0]; ?></td>
+				<td><?php echo $logins[1]; ?></td>
+			</tr>
+		<?php endforeach; ?>
+		<tbody>
+		</table>
+
+		</td>
+	</tr>
+	</table>
+<?php endif;?>
+<?php if ($this->mobile_device_type != IPAD_DEVICE): ?>
+
+<table style="width: 100%" cellspacing="1" cellpadding="1" border="0" class="bodyline" summary="course statistics" align="center" frame="box" >
+	<tr>
+		<th colspan="2" class="cyan"><small class="bigspacer"><?php
+			echo '<a href="'.$_SERVER['PHP_SELF'].'?month='.($this->last_month).SEP.'year='.$this->last_year.'">';
+			echo ' '.AT_date('%F', $this->last_month, AT_DATE_INDEX_VALUE ); ?></a> |</small>
+			<?php echo AT_date('%F', $this->month, AT_DATE_INDEX_VALUE ); ?> <small class="bigspacer">| <?php
+			echo '<a href="'.$_SERVER['PHP_SELF'].'?month='.$this->next_month.SEP.'year='.$this->next_year.'">';
+			echo AT_date('%F', $this->next_month, AT_DATE_INDEX_VALUE); ?> </a></small></th>
+	</tr>
+<?php
+		if (($this->num_days == 0) || ($this->empty)) {
+			echo '<tr>';
+			echo '<td class="row1" colspan="2">'._AT('no_month_data').'</td>';
+			echo '</tr>';
+			echo '</table>';
+			require(AT_INCLUDE_PATH.'footer.inc.php');
+			exit;
+		}
+?>
+	<tr>
+		<td class="row1" valign="top" align="right"><strong><?php echo _AT('total'); ?>:</strong></td>
+		<td class="row1"><?php echo $this->total_logins; ?></td>
+	</tr>
+	<tr><td height="1" class="row2" colspan="2"></td></tr>
+	<tr>
+		<td class="row1" valign="top" align="right"><strong><?php echo _AT('maximum'); ?>:</strong></td>
+		<td class="row1"><?php echo $this->max_total_logins; ?></td>
+	</tr>
+	<tr><td height="1" class="row2" colspan="2"></td></tr>
+
+	<tr>
+		<td class="row1" valign="top" align="right"><strong><?php echo _AT('minimum'); ?>:</strong></td>
+		<td class="row1"><?php
+		if ($this->min_total_logins < 99999999) {
+			echo $this->min_total_logins; 
+		} else {
+			echo '0';
+		} ?></td>
+	</tr>
+	<tr><td height="1" class="row2" colspan="2"></td></tr>
+	<tr>
+		<td class="row1" valign="top" align="right"><strong><?php   echo _AT('average'); ?>:</strong></td>
+		<td class="row1"><?php echo number_format($this->avg_total_logins, 1); ?> <?php   echo _AT('per_day'); ?></td>
+	</tr>
+	<tr><td height="1" class="row2" colspan="2"></td></tr>
+
+
+	<tr><td height="1" class="row2" colspan="2"></td></tr>
+	<tr>
+		<td class="row1" valign="top" align="right"><strong><?php echo _AT('raw_data'); ?>:</strong></td>
+		<td class="row1" align="center">
+	
+		<table class="data static" summary="" rules="cols" frame="box">
+		<thead>
+		<tr>
+			<th scope="col"><?php echo _AT('date');    ?></th>
+			<th scope="col"><?php echo _AT('guests');  ?></th>
+			<th scope="col"><?php echo _AT('members'); ?></th>
+		</tr>
+		</thead>
+		<tbody>
+		<?php $short_name = $month_name_con['en'][$month-1]; ?>
+		<?php foreach ($this->days as $day => $logins):?>
+			<tr>
+				<td><?php echo $short_name.' '.$day; ?></td>
+				<td><?php echo $logins[0]; ?></td>
+				<td><?php echo $logins[1]; ?></td>
+			</tr>
+		<?php endforeach; ?>
+		<tbody>
+		</table>
+
+		</td>
+	</tr>
+	</table>
+<?php endif;?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/instructor/statistics/tracker/my_stats.tmpl.php b/docs/themes/simplified-desktop/instructor/statistics/tracker/my_stats.tmpl.php
new file mode 100644
index 000000000..b5e6d3667
--- /dev/null
+++ b/docs/themes/simplified-desktop/instructor/statistics/tracker/my_stats.tmpl.php
@@ -0,0 +1,44 @@
+<?php global $contentManager;?>
+<div class="table-surround">
+<table class="data static" summary="">
+<thead>
+<tr>
+	<th scope="col"><?php echo _AT('page'); ?></th>
+	<th scope="col"><?php echo _AT('visits'); ?></th>
+	<th scope="col"><?php echo _AT('duration'); ?></th>
+	<th scope="col"><?php echo _AT('last_accessed'); ?></th>
+</tr>
+</thead>
+<tbody>
+<?php
+	
+
+	if (mysql_num_rows($this->result) > 0) {
+		while ($row = mysql_fetch_assoc($this->result)) {
+			if ($row['total'] == '') {
+				$row['total'] = _AT('na');
+			}
+
+			echo '<tr>';
+			echo '<td><a href='.AT_BASE_HREF.url_rewrite('content.php?cid='.$row['content_id']). '>' . $contentManager->_menu_info[$row['content_id']]['title'] . '</a></td>';
+			echo '<td>' . $row['total_hits'] . '</td>';
+			echo '<td>' . $row['total_duration'] . '</td>';
+			if ($row['last_accessed'] == '') {
+				echo '<td>' . _AT('na') . '</td>';
+			} else {
+				echo '<td>' . AT_date(_AT('forum_date_format'), $row['last_accessed'], AT_DATE_MYSQL_DATETIME) . '</td>';
+			}
+			echo '</tr>';
+		} //end while
+
+		echo '</tbody>';
+
+	} else {
+		echo '<tr><td colspan="4">' . _AT('none_found') . '</td></tr>';
+		echo '</tbody>';
+	}
+	?>
+</tbody>
+</table>
+</div>
+
diff --git a/docs/themes/simplified-desktop/iphone.css b/docs/themes/simplified-desktop/iphone.css
new file mode 100644
index 000000000..d7466ac66
--- /dev/null
+++ b/docs/themes/simplified-desktop/iphone.css
@@ -0,0 +1,2312 @@
+/* Style is optimized for iphone. Note that -webkit properties create errors in the CSS validator. Relative units 
+for sizes are used unless it is a border. Classes beginning with ".fl-" override Mobile FSS, 
+see the API @ http://wiki.fluidproject.org/display/fluid/Mobile+FSS+API for more details. 
+*/
+html, body{
+	height: 100%;
+}
+#main{
+	padding-bottom: 2.3em;
+	overflow: auto;
+}
+
+body,ul,li {
+	padding:0;
+	margin:0;
+}
+
+.fl-theme-iphone{
+	background: white;	
+}
+
+#header{
+	width:100%;
+	height:1.2em;
+	line-height:2.813em;
+	padding:0;
+	font-size:1.063em;
+}
+
+#header-section-title {
+	text-align: center;
+	background-image: -webkit-gradient(linear, left top, left bottom,
+   	from(#6d8cb3),
+    color-stop(0.5, #6d8cb3),
+    color-stop(0.50, #4b6b90),
+    color-stop(0.5, #6d8cb3),
+    to(#4b6b90)
+    ); 
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#6d8cb3), to(#4b6b90));
+
+}
+
+.fl-theme-iphone .fl-navbar{
+	border: none;
+	border-top: none;
+}
+
+.fl-navbar a{
+	font-size: 0.969em;
+	background-image: -webkit-gradient(linear, left top, left bottom,
+   	from(#4b6b90),
+    color-stop(0.5, #6d8cb3),
+    color-stop(0.50, #4b6b90),
+    color-stop(0.5, #6d8cb3),
+    to(#4b6b90)
+    ); 
+}
+
+.fl-navbar .fl-tabs {
+	padding-top: .3em;
+	padding-bottom: .3em;
+	border-top: 1px solid black;
+	border-bottom: .5px solid black;
+	background-color: #4b6b90; 
+    height: 2em;   
+}
+
+#navigation-contentwrapper{
+	position: relative;
+	background-color: #4b6b90;
+	height: 2.5em; 
+}
+
+#navigation-bar{
+ 	height: 2.5em; 
+    border-bottom: .5px solid black;
+   /*padding-bottom: .3em;*/
+     
+}
+
+#wrapper{
+	width:100%;
+	overflow:hidden;
+	overflow: auto;
+	min-height: 100%;
+}
+
+#site-name, h1#section-title{
+	display: inline;
+	text-shadow: none;
+	font-size: 90%;
+	color: #4C566C;
+	color: white;
+	margin-bottom: 1em;
+	
+}
+
+/************************************************************************************************/
+/* "Navigation" button, also this CSS creates a button that looks exactly like a Mobile FSS tab.*/
+/************************************************************************************************/
+.navigation-bar-button{
+    border-width:5px;
+    -webkit-border-radius: 5px;
+	font-size: 18px;/*keep this in px*/
+	padding: 0 .3em;
+	color: white;
+	position: relative;
+	top: .69em; 
+	left: 0.188em; 
+    /* default mobile fss color scheme for tabs not AA compliant. Here is a compliant bg image: */
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    );
+ 	-webkit-border-image: url(images/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+    -webkit-border-left-image: none;
+    -webkit-background-origin: border;
+    -webkit-background-clip: border;
+}
+
+.navigation-bar-button a:hover, .navigation-bar-button a:active, .navigation-bar-button a:focus{
+	background-color: white;
+}
+
+.fl-theme-iphone .fl-tabs li{
+    /* default mobile fss color scheme for tabs not AA compliant against a white foreground text.therefore its backgroud-image must be overrided */
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    ); 
+}
+.fl-theme-iphone .topnavlistcontainer .topnavlist-link {/*makes the navigation button link white*/
+	color: white;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+#content_link_phone.topnavlist-link-highlight, fl-theme-iphone .topnavlistcontainer .topnavlist-link-highlight{/*makes the navigation button link highlight*/
+	color: #4c96f4;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+
+
+#topnavlist-link {
+
+}
+
+ul#topnavlist {
+	display: none;
+	position: relative;
+	top: 1.2em;
+	z-index: 1000;
+	/*background-color: white;*/
+}
+
+div#content-link-container.flc-screenNavigator-navbar {
+  
+/*
+  border-width:5px;
+    -webkit-border-radius: 5px;
+	font-size: 18px; keep this in px
+	color: white;
+	
+    /* default mobile fss color scheme for tabs not AA compliant. Here is a compliant bg image: 
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    );
+ 	-webkit-border-image: url(images/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+    -webkit-border-left-image: none;
+    -webkit-background-origin: border;
+    -webkit-background-clip: border;
+float: left;
+font-weight: bold;*/
+	color: #005689;
+}
+
+.content-link-surround a:active, .content-link-surround a:focus, .content-link-surround a:hover{
+	background: none;
+	
+}
+ #content_link_phone {
+	
+	display: block;
+	text-decoration: none;
+	
+    color: white;
+    font-style: bold;
+    color: #005689;
+}
+.resume{
+	font-size: 1em;
+}
+
+
+#home-guide{
+	position: absolute;
+	top: .45em;
+ 	right: 0.188em; 
+ 	font-size: 17px;/*keep this in px*/
+	white-space:nowrap;
+	display: inline;
+}
+
+ul.home-guide li a:hover, ul.home-guide li a:focus, ul.home-guide li a:active,
+ul.home-guide li.back a:hover, ul.home-guide li.back a:focus, ul.home-guide li.back a:active,
+ul.home-guide li.forward a:hover, ul.home-guide li.forward a:focus, ul.home-guide li.forward a:active {
+    color: #4c96f4;
+    background:transparent;
+}
+
+/* main body attributes */
+p {
+    text-align: left;
+    line-height: 150%;
+	font-size: 1em;
+	padding:.75em 0;
+	margin: 0 auto;
+}
+
+p a {
+    text-decoration: underline;
+}
+
+p a:visited {
+	color: #3F2670;
+    background-color: transparent;
+}
+p a:active {
+	color: #A50707;
+    background-color: transparent;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    color: #4C566C;
+    clear: right;
+    font: 100% Helvetica, Arial, sans-serif;
+	font-weight: bold;
+    margin: 0;
+	padding: 0;
+}
+h2, h3, h4, h5, h6{
+	padding-top: .5em;
+}
+h1 {
+    font-size: 160%;
+	color: #FFF;
+}
+
+
+h2 {
+    font-size: 150%;
+}
+
+h3.input-form {
+	padding-top: .875em;
+}
+h3.browse-courses{
+	font-size: 90%;
+	text-decoration: none;
+	clear: none;
+	display: inline;
+}
+
+h3 a {
+    font-size: 100%;
+}
+
+
+/************************************************************************************************/
+/* Preferences tabs */
+/************************************************************************************************/
+.etabbed-list-container	{
+	padding:0;
+	margin: 0;
+	width:70%;
+	clear: left;
+	height: 3em;
+}
+
+.prefs_buttontab {
+	padding:0;
+	margin: 0;
+	white-space: nowrap;
+}
+.prefs_tab{
+	padding:0.5em 0.3em 0;
+	margin: 0;
+	white-space: nowrap;
+    display: inline;
+}
+
+.prefs_tab_selected{  
+	padding:0.7em 0.3em 0;
+	margin: 0;
+	margin: 0;
+	font-weight:bold;
+	text-align:center;
+	white-space: nowrap;
+    display: inline;
+}
+
+/************************************************************************************************/
+/* link attributes */
+/************************************************************************************************/
+a:link, /*a:visited*/ a:focus  {
+	color: #4C566C;
+	
+}
+.top-tool a:link, .top-tool a:focus{
+	text-decoration: none;	
+}	
+
+/* main submit button */
+.button {
+	background-color: #808080;
+	color: black;
+	text-align: center;
+	-webkit-border-radius:3px;
+	padding-top: 0.313em;
+	padding-bottom: 0.313em;
+
+}
+.button:focus {
+	border:1px solid #A50707;
+	background-color:  #FFDAB9;	
+}
+/* small submit button at top */
+.button2 {
+	font-family: Helvetica,sans-serif;
+	background-color: #E9F4F3;
+
+}
+.button2:focus {
+	background-color: #E9F4F3;
+	border:  #ACCFCC  solid 1px;
+}
+
+/* Editor box large */
+.editorlargebox {
+	font-family: Helvetica,sans-serif;
+	background-color: #E9F4F3;
+	margin-left:1em;
+	padding-left: .2em;
+	padding-right: .5em;
+	padding-top: .5em;
+	padding-bottom: .4em;
+	border: 1px #ACCFCC solid;
+}
+
+/* edit content tabs */
+.buttontab {
+	background-color: #E6E6E6;
+	font-weight: 500;
+	border:0;
+	padding-left: .188em;
+	padding-right: .188em;
+	padding-top: .188em;
+
+}
+
+.tab {
+	color: black;
+	background-color: #E6E6E6;
+	border-top: 1px #B8AE9C solid;
+	border-left: 1px #B8AE9C solid;
+	border-right: 1px #B8AE9C solid;
+	text-decoration: none;
+	text-align: center;
+	font-weight: bold;
+
+	
+}
+.buttontab selected {
+	font-family: Helvetica, Arial, Helvetica, sans-serif;
+	background-color: #6F7172;
+	font-weight: 600;
+	border:0;
+	padding-left: .188em;
+	padding-right: .188em;
+	padding-top: .188em;
+
+}
+td.selected{
+	font-family: Helvetica, Arial, Helvetica, sans-serif;
+	font-weight: 600;
+	text-decoration: none;
+	text-align: center;
+	background-color: white;
+	border-top: 1px #B8AE9C solid;
+	border-left: 1px #B8AE9C solid;
+	border-right: 1px #B8AE9C solid;
+}
+
+.tab a:link, .etab a:visited {
+	color: #4C566C;
+	background-color: white;
+}
+
+/* the side menu */
+td.dropdown-heading {
+	background-color: #DBFDD4;
+	color: #595241;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-top: 1px solid #ECFEEA;
+}
+
+/* the side menu content */
+td.dropdown {
+	padding: 0.125em;
+	background-color: white;
+	color: black;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-bottom: 1px solid #ECFEEA;
+	font-weight: normal;
+}
+td.dropdown a, td.dropdown a:visited  {
+	color: #4C566C;
+	text-decoration: none;
+}
+td.dropdown a:hover {
+	color: #595241;
+	text-decoration: underline;
+}
+
+/* added for 1.4.2: */
+.results {
+	padding-left: 1.25em;
+}
+
+h5.search-results {
+	padding: 0.063em;
+	margin-bottom: 0.313em;
+	margin-top: 1em;
+	padding-top: 3em;
+	margin-left: 0.313em;
+}
+
+.test-box {
+	background-color: #F7F3ED;
+	color: #595241;
+	border-left: 1px solid #595241;
+	border-right: 1px solid #595241;
+	border-top: 1px solid #595241;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+/*preferences*/
+
+.input-form 
+table.tabbed-table {
+	width: 100%;
+	border:thin black solid;
+}
+table.tabbed-table th#left-empty-tab {
+	background-color: transparent;
+	width: 0.938em;
+	border-bottom: 1px solid #B8AE9C;
+}
+table.tabbed-table th#right-empty-tab {
+	text-align: right;
+	background-color: transparent;
+	border-bottom: 1px solid #B8AE9C;
+	width: 25em;
+	padding-right: 0.313em;
+}
+table.tabbed-table th#right-empty-tab a {
+	text-decoration: underline;
+}
+table.tabbed-table th.tab-spacer {
+	background-color: transparent;
+	width: 0.313em;
+	border-bottom: 1px solid #B8AE9C;
+}
+
+table.tabbed-table th.tab {
+	padding-top: 0.125em;
+	padding-bottom: 0.125em;
+	width: 6.875em;
+	background-color: #E9F4F3;
+	border-bottom: 1px solid #B8AE9C;
+	border-left: 1px solid #B8AE9C;
+	border-top: 1px solid #B8AE9C;
+	border-right: 1px solid #B8AE9C;
+}
+table.tabbed-table th.tab:hover {
+	background-color: #ACCFCC;
+}
+
+table.tabbed-table th.tab a:focus {
+	color: white;
+}
+table.tabbed-table th.selected {
+	padding-top: 0.125em;
+	padding-bottom: 0.125em;
+	width: 6.875em;
+	background-color: #ACCFCC;
+	border-left: 1px solid #B8AE9C;
+	border-top: 1px solid #B8AE9C;
+	border-right: 1px solid #B8AE9C;
+}
+
+table.tabbed-table a, table.tabbed-table a:visited, table.tabbed-table a:hover {
+	/* color: black;*/
+	color: #4C566C;
+	text-decoration: none;
+}
+
+
+.preference-buttons-container{
+	background-color: red;
+	height: 2.5em;
+	width: 100%;
+	text-align: center;
+}
+
+div.preference-buttons-container li{
+	display: inline; 
+	float: right;
+}
+
+.prefs_tab_selected{
+	font-style: italic;
+	width: 10%;
+}
+.prefs_tab{
+	width: 10%;
+}
+
+.etabbed-table{
+	margin: 0 auto;
+}
+#previewText{
+	font-family: monospace;
+	border: 2px solid rgb(0, 0, 0); 
+	padding: 2em;
+	width: 80%; 
+	color: rgb(255, 255, 255);
+	background-color: rgb(0, 0, 0);
+}
+#previewArea{;
+	padding: 0em;
+	border-bottom-width: 0; 
+	margin-left: auto; 
+	margin-right: auto; 
+	font-weight: normal; 
+	width: 70%;
+	float:left;
+	clear:right;
+}
+#display-settings-preview{
+	width:90%;
+	height:20em; 
+	margin: 0 auto;
+}
+#feedback{
+	width: 90%;
+}
+#defaultfontsize-wrapper{
+	width:90%; 
+}
+
+/* end of preferences */
+
+a#my-start-page {
+	padding: 0.125em;
+	padding-left:  0.938em;
+	background-repeat: no-repeat;
+	background-position: 0.125em 0.313em;
+}
+
+a#back-to {
+	padding-left: 1.25em;
+	background-image: url(images/back.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0;
+}
+
+.breadcrumbs, .previous-next /*a#guide*/{
+    /* The path bar, including breadcrumbs and add to favorites */
+	clear:both;
+    font-size: 1em;
+	padding:0;
+	color: #4C566C;
+	background-color: white;
+
+}
+#breadcrumbs-container{
+	background-color: #4d4d4d;
+	position: relative;
+}
+.breadcrumbs{
+	display:none;
+}
+h2.page-title  {
+	
+	
+}
+#subnavlistbacktopage{
+	float: left;
+}
+
+h1 {
+	margin-bottom: 0.313em;
+	
+}
+
+
+div#help {
+	border-left: 1px solid black;
+	border-right: 1px solid black;
+	border-bottom: 1px solid black;
+	padding-left: 0.313em;
+	padding-right: 0.313em;
+	padding-bottom: 0.313em;
+	background-color: #F7F3ED;
+	margin-left: 0.313em;
+	margin-right: 0.313em;
+	font-size: small;
+}
+
+h3#help-title {
+	margin-left: 0.313em;
+	margin-right: 0.313em;
+	border-left: 1px solid black;
+	border-right: 1px solid black;
+	padding: 0.063em;
+	background-color: #F7F3ED;
+}
+.line {
+	border-bottom: 1px solid black;
+}
+div#help p {
+	padding: 0;
+	margin: 0;
+}
+
+div#toctoggle {
+	float: left;
+	padding-left: 0.625em;
+}
+
+h1#section-title {
+	font-size: 90%;
+}
+/**********************************************************************/
+/*FOOTER*/
+/**********************************************************************/
+div#footer-links {
+	margin: 0 auto;
+	font-size: .938em;
+/* moved inside of #footer for mobile theme */
+}
+#footer{
+	/*width:100%;*/
+	height:2.3em;
+	background-color: #4b6b90;
+	margin-top: -2.3em;
+	position: relative;
+	clear: both;
+	
+}
+
+ul.footer-links-tabs li a:hover, ul.footer-links-tabs li a:focus, ul.footer-links-tabs li a:active,
+ul.footer-links-tabs li.back a:hover, ul.footer-links-tabs li.back a:focus, ul.footer-links-tabs li.back a:active,
+ul.footer-links-tabs li.forward a:hover, ul.footer-links-tabs li.forward a:focus, ul.footer-links-tabs li.forward a:active {
+    color: #4c96f4;
+    background:transparent;
+}
+div#top-links a:link, div#top-links a:visited {
+	text-decoration:none;
+}
+
+#jumpmenu:focus{
+	background-color:#F6EAD6;
+}
+#jumpmenu{
+	margin: 0 auto;
+}
+
+a#editor-link {
+	background-color: #F7F3ED;
+	padding-top: 0.063em;
+	padding-bottom: 0.063em;
+	padding-left:  0.938em;
+	padding-right: 0.5em;
+	border: 1px solid #cccccc;
+	font-weight: normal;
+	text-decoration: none;
+}
+
+a#editor-link:hover {
+	background-color: #F7F3ED;
+	border: 1px solid #B8AE9C;
+}
+
+a#editor-link.off {
+	background-image: url(images/pen.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0.125em;
+}
+a#editor-link.on {
+	background-image: url(images/pen2.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0.125em;
+}
+
+
+/* for data tables */
+.table-surround {
+	border: #A9ADB0 1px solid;
+	border: #cccccc 1px solid;
+	-webkit-border-radius:5px;
+	margin-top: 1em;
+	margin-bottom: 1em;
+	
+}
+
+table.data {
+	margin:0;
+	width:100%;
+	padding: 0;
+	color: #4C566C;
+	font-size: .8em;
+	text-align: left;
+	background-color: transparent;
+} 
+/* contains the headings */
+table.data th {
+
+	padding: 0.188em;
+}
+
+table.data th a {
+	color: #595241;
+	background-image: url('../default/images/sort.gif');
+	background-repeat: no-repeat;
+	background-position: right;
+}
+
+table.data tbody {
+/*
+	border-top: 1px solid #B8AE9C;
+	border-bottom: 1px solid #B8AE9C;
+	*/
+}
+/*headings text*/
+table.data tbody th {
+	text-align: left;
+
+}
+
+table.data td {
+	padding: 0.188em;
+	color: black;
+	font-size: .875em;
+	font-style: normal;
+}
+table.data td a:link, a:visited{
+	/*color: black;*/
+	color: #4C566C
+}
+
+/*should table.data tbody tr:hover  and table.data tbody tr.selected  highlighting
+be improved to sync with Mobile FSS highlighting */
+table.data tbody tr:hover {
+	background-color: #efefef;
+	cursor: pointer;
+}
+
+table.data tbody tr.selected {
+	background-color: #E9F4F3;
+	cursor: auto;
+	border: 5px solid #E9F4F3;
+}
+
+table.data tfoot {
+	background-color: #F7F3ED;
+}
+
+table.data tfoot tr:first-child td {
+	padding: 0.313em;
+	background-image: url('images/arrow_ltr.gif');
+	background-repeat: no-repeat;
+	background-position: .25em 0.313em;
+}
+
+table.data.static tfoot td, table.data.static tfoot tr:first-child td {
+	/*border-top: 1px solid #B8AE9C;*/
+	padding: 0.313em;
+	background-image: none;
+	padding-left: 0;
+
+}
+/* add borders to row in Required Information, Personal Information*/
+.row{
+	padding:.375em 0;
+	/*border-bottom: 1px #cccccc solid;*/
+	font-size: 0.938em;
+}
+#last-row, .row-buttons, #last-row1, .row-blurb{
+	border: none;
+}
+#browse-courses-table{
+	font-size: .875em;
+}
+
+
+/*buttons*/
+table.data tfoot input {
+	background-color: #efefef;
+	font-weight: normal;
+	/*border:  #AAA  solid 1px;*/
+}
+table.data tfoot input:focus {
+	background-color: #FFDAB9;
+	/*border:  #AAA  solid 1px;*/
+}
+
+
+/* used for static tables with no form elements: */
+table.data.static tbody tr:hover {
+	background-color: transparent;
+	cursor: auto;
+}
+
+
+
+/* course browser: */
+
+div#browse {
+	margin-left: auto; 
+	margin-right: auto; 
+	width: 80%;
+}
+
+div.browse-selected {
+	background-image: url('images/side_arrow.gif'); 
+	background-repeat: no-repeat; 
+	padding-left: 0.563em; 
+	background-position: center left;
+}
+
+div.browse-unselected {
+	padding-left: 0.563em; 
+}
+
+ul.browse-list {
+	list-style: none;
+	padding:0;
+}
+
+/* feedback /errors */
+div#error {
+	width: 89%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #DD0000;
+	padding: 0.313em;
+	background-color: #F4DCDC;
+	color: #A50707;
+	background-color: #F4DCDC;
+	padding-left: 1.563em;
+	font-weight: bold;
+	-webkit-border-radius:5px;
+}
+div#error h4 {
+	color: black;
+	margin-left: 0;
+}
+
+div#error ul, div#feedback ul, div#help ul {
+	position: relative;
+	list-style: none;
+	margin-left: 0;
+	padding-left: 0;
+}
+
+div#error ul li{
+	margin-top: 0.313em;
+}
+
+div#feedback, div#info {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 0.313em;
+	margin-bottom: 0.313em;
+	padding: 0.313em;
+	font-family: Helvetica, Arial, sans-serif;
+	-webkit-border-radius:5px;
+	border: 1px solid #17B506;
+	background-color: #E7EFD0;
+	color: #3f4559;
+	font-size: 90%;
+	z-index: -1;
+}
+div#feedback li, div#info li, div#error li{
+	color: #4C566C;
+	z-index: -1;
+}
+
+div#help {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #ACCFCC;
+	padding: 0.313em;
+	background-color: #E9F4F3;
+	color: #024C41;
+}
+
+
+div#warning {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #FF8400;
+	padding: 0.313em;
+	background-color: #FFF6ED;
+	color: #D95900;
+	font-weight: bold;
+}
+acronym {
+	cursor: help;
+}
+
+div.news p {
+	margin: 0;
+	padding:0;
+}
+div.news span.date {
+	font-family:Helevetica, Arial, sans-serif;
+	color: #4C566C;	
+	font-size: .5em;
+}
+
+.news{
+	padding: 0;
+	margin-bottom: 1em;
+	margin-top: 1em;
+}
+/* home page links */
+div.home-link {
+	padding: 0.125em;
+	float: left;
+	text-align: center;
+	margin: 0.125em;
+	width: 7.5em;
+	height: 5.625em;
+}
+div.home-link:hover {
+	padding: 0.063em;
+	background-color: #F7F3ED;
+	border: 1px solid #afafaf;
+	float: left;
+	text-align: center;
+	margin: 0.125em;
+}
+div.home-link a {
+	text-decoration: none;
+	font-weight: bold;
+}
+
+div.home-link img {
+	border: 0;
+}
+
+/* sequence links */
+div#sequence-links {
+	
+}
+div#sequence-links a {
+	text-decoration: none;
+	display: block;
+}
+
+.previous-next{
+	display: block;
+}
+div.dropdown {
+	width: 12.5em;
+	padding: 0.125em;
+	background-color: white;
+	color: black;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-bottom: 1px solid #ECFEEA;
+	font-weight: normal;
+}
+
+div.dropdown-heading {
+	background-color: #ACCFCC;
+	color: #595241;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-top: 1px solid #ECFEEA;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+div.required {
+	font-weight: bold;
+	color: red;
+	font-size: large;
+	float: left;
+	position: relative;
+	margin-top: -0.313em;
+	height:  0.938em;
+	padding-right: 0.125em;
+}
+
+div#content_text {
+	margin-left: 0.313em;
+}
+
+#content{
+/*
+	padding-top:.5em;
+	margin-top: .5em;
+	background-color: #F5F5F5;
+	
+	border: #A9ADB0 1px solid;
+	border: #cccccc 1px solid;
+	-webkit-border-radius:5px;
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;*/
+	padding-top: .313em;
+	background-color: white;
+	z-index: 1000;
+}
+form {
+	display:inline;
+	max-width: 100%;
+}
+
+
+optgroup {
+	/*font-size: small;*/
+}
+
+/* paging*/
+div.paging {
+	margin-top: 1em;
+	text-align: center;
+}
+div.paging ul {
+    list-style: none;
+    display: inline;
+    padding: 0;
+	max-width: 10%;
+	margin-bottom: 1em;
+}
+div.paging li { 
+	display: inline; 
+	padding-left: 0.125em; 
+	padding-right: 0.125em;
+	padding-top: 0;
+	padding-bottom: 0;
+	width: 10%;
+}
+
+div.paging li a {
+	text-decoration: none;
+	padding-left: 0.25em;
+	padding-right: 0.25em;
+	border-left: 1px solid white;
+	border-right: 1px solid white;
+}
+
+div.paging li a:hover, div.paging li a.current {
+   border-left: 1px solid #000;
+   border-right: 1px solid #000;
+   color: black;
+}
+
+#tl_corner{
+
+	background-image:url(images/tl_corner.gif);
+	background-position: top left;
+	background-repeat: no-repeat;
+	padding:0;
+}
+
+div.tabs {
+	/* Navigational Plone Tabs(tm), implemented by customizing the a tag - they are surprisingly elegant. The power of CSS runs strong in these :) */
+    background-color: transparent;
+	border-collapse: collapse;
+	border-bottom: 1px solid #B8AE9C;
+	padding: 0.5em 0em 0em 2em;
+	white-space: nowrap;
+}
+
+div.tabs a {
+    /* The normal, unselected tabs. They are all links */
+    background-color: transparent;
+    border-color: #B8AE9C;
+    border-width: 1px; 
+    border-style: solid solid none solid;
+    color: #595241;
+    height: 1.2em;
+    margin-right: 0.5em;
+    padding: 0em 2em 0em;
+    
+}
+
+div.tabs a.selected {
+    /* The selected tab. There's only one of this */
+    background-color: white;
+    border-bottom: #B8AE9C 1px solid;
+    color: #595241;
+    font-weight: normal;
+}
+
+div.tabs a:hover, div.tabs a.active {
+    background-color: #B8AE9C;
+    border-bottom: 1px solid #B8AE9C;
+    color: white;
+}
+
+.headingbox a{
+	color: #4C566C;
+}
+.headingbox a:link, .headingbox a:visited{
+	text-decoration: none;
+}
+div.box {
+}
+h4.box {
+	background-color: #F5F5F5;
+	padding: .313em; 
+}
+h4.box a {
+	display: block;
+	color: #4C566C;
+	background-color: #F5F5F5;
+	text-decoration: none;
+}
+
+
+div.box {
+	padding: 0.313em;
+	background-color: #F5F5F5;
+	color: black;
+	border: 1px solid #B8AE9C;
+	font-size:0.85em;
+	font-weight: normal;
+	padding:0.125em;
+}
+
+h5.box { 
+    background-color: #6F7172;
+    border: 1px solid #B8AE9C;
+    border-style: solid solid none solid;
+    color: Black;
+    padding: 0em 1em 0em 1em;
+    display: inline;
+	font-size:  1em;
+    height: 1em;
+}
+
+div.box a:link {
+	text-decoration: none;
+}
+
+div.box a:visited {
+	color: #2A6C28;
+	text-decoration: none;
+}
+
+div.box a:hover {
+	text-decoration: underline;
+}
+
+.boxDetails {
+    text-align: right;
+}
+
+div.box .content {
+    padding: 1em;
+	font-size:  1em;
+}
+
+div.box a.close {
+    float: right;
+    text-transform: none;
+    border-left: 1pt solid #B8AE9C;
+    padding: 0em 0.2em;
+}
+
+div.box h1, 
+div.box h2, 
+div.box h3, 
+div.box h4 {
+    margin: 0;
+    padding: 0;
+}
+
+div.box .even {
+    background-color: #F7F3ED;
+}
+
+div.box .odd {
+    background-color: transparent;
+}
+
+
+/* users/index.php */
+
+div.course {
+	position: relative;
+	width: 12.5em;
+	height: 10.5em;
+	border: rgb(204, 204, 204) 1px solid;
+	background-color: #F7F7F7;
+	float: left;
+	margin: 0.188em;
+	padding: 0.313em;
+}
+
+div.course.break {
+	clear: left;
+}
+
+div.course h2 {
+	border: 0;
+	font-weight: normal;
+	font-size: large;
+
+}
+
+div.course:hover {
+	background-color:#FBF4E9;
+	border: #B8AE9C 1px solid;
+}
+
+
+table.data .odd img.headicon{
+	width: 2.469em;
+	height: 2.469em; 
+	-webkit-border-radius:5px;
+}
+
+.icon{
+	-webkit-border-radius:10px;
+	border-color: white;
+	width: 2.5em;
+	height: 2.5em;
+	float: left;
+}
+div.course div.shortcuts {
+	text-align: right;
+	clear: left;
+	vertical-align: middle;
+	width: 12.5em;
+}
+
+fieldset#shortcuts {
+	float: right;
+	background-color: #FEFDEF;
+	border: 1pt solid #B8AE9C;
+	margin: -5pt 5pt 5pt 5pt;
+	padding-right: 10pt;
+	padding-bottom: 5pt;
+	padding-left: 10pt;
+}
+
+.shortcuts{
+
+}
+
+fieldset {
+	margin-bottom: 10pt;
+	-webkit-border-radius:5px;
+	padding: 0 0.375em;
+	width: 90%;
+	margin: 0 auto; 
+	width:95%;
+	margin:0 auto;
+	border:thin #6D7B8D solid;
+	border:thin #A9ADB0 solid;
+	margin-bottom: 1em;
+}
+#shortcuts legend {
+}
+#shortcuts ul {
+	position: relative;
+	margin-top: 0pt;
+	margin-bottom: 0pt;
+	margin-left: 0pt;
+	list-style-type:  none;
+	padding-left: 0pt; 
+}
+
+/*a#guide,*/ a#my-courses-link {
+	background-color: #6D84A2;
+}
+
+#guide img{
+	border:none;
+}
+
+#guide a:hover{
+	
+}
+
+div#content-test, div.content-from-module {	
+	float: left;
+	margin-top: 2em;
+	margin-bottom: 2em;
+	padding-right: 5pt;
+	width: 80%;
+}
+
+div#container {
+	text-align: left;
+	margin: 0 auto;
+	padding: 0;
+	border:0;
+	width: 95%;
+}
+
+/* index page */
+ul#home-links, ul#home-detail-links {
+	list-style: none;
+}
+
+/*my start page */
+#my_courses_container{
+	text-align: left;
+	margin: 0 auto;
+	border:0;	
+	min-width: 100%;
+}
+#my-courses-navlist{
+}
+.my-courses-list{
+	border: solid 1px #A9ADB0;
+	-webkit-border-radius:8px;
+	-moz-border-radius:8px;
+	border-radius:8px;
+	padding: .375em;
+	color: #4C566C;
+	margin-bottom: .375em; 
+	margin-top: .375em;
+	padding: .375em;
+}
+.my-courses-list-ul{
+	margin: 0 auto;
+	padding-left: 0;
+	width: 100%;
+}
+.my-courses-links{
+	font-size: 80%;
+	padding-top: .75em;
+}
+.my-courses-resume{
+	float: right;
+}
+.fl-link-summary{
+	padding-left: 0.875em;
+	padding-bottom: 0.875em;
+	display: inline;
+}
+
+.fl-theme-iphone [class*="fl-list"] > li .fl-link-summary{
+	color: #4C566C;
+}
+.current_head{
+	padding-top: .5em;
+}
+
+.current_box{
+	max-width: 100%;
+}
+.current_list{
+	width: 95%;
+	padding: 0.375em;
+}
+.current_list li{
+	list-style-type: none;
+	font-style: bold;
+	padding-bottom: .5em;
+	padding-left: .5em;
+	margin:0;
+}
+.current_list_date_time{
+	font-size: 65%;
+}
+.current_list img{
+}
+
+#show-all, #show-pages{
+	text-align: center;
+	
+}
+/* enrollment tabs */
+#navlist {
+	padding: 0;
+	margin-left: 0;
+	margin-right: auto;
+	margin-left: auto;
+	margin-bottom: .25em;
+	margin-top: 0.938em;
+	white-space: nowrap;
+}
+
+#navlist li {
+	list-style: none;
+	display: inline;
+	margin: 0;
+}
+
+#navlist li a {
+	padding: 0.188em 0.563em;
+	border: 1px solid #F7F3ED;
+	border-bottom: none;
+	background-color: #F7F3ED;
+	text-decoration: none;
+	margin-left: .25em;
+	white-space: nowrap;
+}
+
+#navlist li a:hover, #navlist li a:active {
+	color: #000;
+	background-color: #fff;
+}
+
+/* tree */
+.img-size-tree {
+	vertical-align: middle;
+	margin-top: 0;
+    padding:0;
+	height:1.45em;
+	width:1.5em;
+}
+/* profile page */
+
+dl#public-profile dt {
+	float: left;
+	width: 90%;
+	border-right: 1px solid #F7F3ED;
+	padding: 0.313em 0.313em 0.313em 0;
+
+	margin-right: 0.313em;
+}
+dl#public-profile dd {
+	margin: 0;
+}
+
+div.social-right{
+	margin-left:.5em;
+	margin-top: 1em;
+}
+div.social-left{
+	margin-left:.5em;
+}
+h4.profile{
+	float: left;
+}
+.social-wrapper h3{  
+	padding-top: .5em;
+}
+.my-contacts h3{
+	padding-bottom: .375em;
+}
+img#profile{
+	border: 1px #cccccc solid;
+	margin-left: 1em;
+}
+dd{
+    margin: 0;
+}
+
+/** forum stuff **/
+#forum-thread li {border:1px solid #eee; border-bottom: 1px solid #F7F3ED; float:left; width: 97%; list-style: none; }
+#forum-thread li.even { background-color: #F7F3ED; border-top: none; }
+#forum-thread li.odd { background-color: #fff; }
+div.forum-post-author { float:left; width:19.375em; padding:0.5em 0.625em; }
+div.forum-post-author a.title {font-size: 1.1em; line-height: 1.2em; font-weight: bold; text-decoration:none; }	
+div.forum-post-author img.profile-picture { border: 2px solid #F7F3ED; text-align:right;}
+div.forum-post-content { margin-left: 19.375em; padding: 0.313em 0 1.125em 1.125em;}
+div.forum-post-content h3 { font-weight: 500; float:left;clear:right; }
+div.forum-post-ctrl { float: right; padding-right: 0.313em; color: #a1a1a1;}
+div.forum-post-ctrl a { text-decoration: none; }
+div.forum-post-ctrl span { color: black; background-color: #fefdc2; padding: 0.188em; }
+div.forum-post-content p.date { color: #a1a1a1; border-bottom: 1px solid #F7F3ED; }
+div.forum-post-content div.body p { margin-bottom:1em; }
+div.forum-paginator{border:thin #cccccc solid; padding:.3em; width:95%;margin:auto;background-color:#F7F3ED;}
+span.forum-paginator-active{font-weight:700;text-decoration:underline; height:2em;}
+
+
+
+/** inbox stuff - reuses some of the forum layout **/
+#inbox-msg li {border:1px solid #eee; border-bottom: 1px solid #F7F3ED; width: 95%; list-style: none; min-height: 11em;}
+	
+/*  tool list on admin home and manage screens  */
+ li.top-tool { 
+	list-style: none;
+	padding: 0.125em 0.125em 0.125em  0.938em;
+	margin-bottom: 0.313em; 
+	line-height: 200%; 
+	border: solid 1px #A9ADB0;
+	-webkit-border-radius:5px;
+}
+	
+li.child-tool a { 
+	font-size: x-small;
+	font-weight: normal; 
+}
+
+/* ol#tools>li>ul, */ 
+ul.child-top-tool {
+	margin-top: -0.313em;
+	padding-left: 0;
+	margin-left: 0;
+	display: inline;
+}
+
+li.child-tool {
+	display: inline;
+	margin-right: 0.313em;
+	font-size: x-small;
+}
+
+
+/* browse courses */
+div.browse-course {
+	padding-bottom: 0.625em;
+}
+
+dl.browse-course {
+	width: 90%;
+	padding-bottom: 0.625em;
+	background-color: #fffaf0;
+	margin:auto;
+	margin-left:1em;
+}
+dl.browse-course dt {
+	float: left;
+	font-weight: bold;
+	width: 25%;
+	text-align: right;
+	clear: left;
+	padding: 0.313em 0.625em 0.313em 0;
+	vertical-align: middle;
+
+}
+dl.browse-course dd {
+	margin-bottom: 0.313em;
+	clear: right;
+	padding: 0.313em 0 0.313em 0.625em;
+	margin-left: 26%;
+
+}
+.row .buttons{
+	border: none;
+}
+
+/*  form fields grouping for WCAG 2.0 conformance*/
+
+fieldset.group_form{
+	width:95%;
+	margin:0 auto;
+	margin-bottom: 1em;
+	border: 1px #6D7B8D solid;
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
+	border-radius: 5px;
+	margin-top: .5em;
+}
+
+legend.group_form{
+	background-color:white;
+	font-weight: 600;
+	color: #4c566c;
+	padding:.5em;
+	border: 1px #6D7B8D solid;
+	-webkit-border-radius:5px;
+}
+
+/* highlight active links for WCAG 2.0 conformance */
+
+a:active:not(.subnavcontain a), 
+a:hover:not(.subnavcontain a),
+a:focus:not(.subnavcontain a),
+.buttontab-hover{
+ 	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+ 
+}
+
+/*Overrides above a:active, a:hover, a:focus so the "Navigation" button itself isn't highlighted when activated.
+Ensure styling matches that in fl-tabs.*/
+.topnavlistcontainer a:hover, .topnavlistcontainer a:active, .topnavlistcontainer a:focus{
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    );
+}
+
+
+/*Added by Silvia */
+div.column_primary {
+	float: left;
+	width: 42%;
+	margin: 0.313em;
+	padding: 0;
+	min-width: 10.625em;
+/*	position: relative;*/
+}
+
+div.column_equivalent{
+	float: left;
+	width: 52%;
+	margin-left:  0.938em;
+	margin-top: 0.313em;
+	margin-right: 0.313em;
+	margin-bottom: 0.313em;
+	min-width: 10.625em;
+	padding: 0.313em;
+	border: 1px solid #EEE;
+	background-color: #FFF;
+/*	position: relative;*/
+
+}
+
+div.resource_box{
+	border: 1px solid #aaa;
+	width: 95%;
+	margin: 0.313em;
+	padding: 0.313em;
+	min-width: 9.375em;
+	background-color: #eee;
+/*	position: relative;*/
+}
+
+h2.alternatives_to{
+	margin-top: 0.75em;
+	font-size: 90%;
+	color: #A50707;
+}
+
+div.alternative_box{
+	border: 1px solid #ddd;
+	/*width: 90%;*/
+	margin: 0.313em;
+	padding: 0.313em;
+	min-width: 9.375em;
+	background-color: #fff;
+}
+
+div.alternative_box legend {
+	color: #000;
+}
+
+div.resource_box legend {
+	color: #000;
+}
+
+label.primary a{
+	color: #A50707;
+	font-weight: bolder;
+	background-color: white;
+}
+
+/* format of "table of contents" on content page */
+#toc a 		{ display:block; margin:0.188em; }
+#toc .h2, #toc .h3, #toc .h4, #toc .h5, #toc .h6{ 
+	padding:0 0 0 0;
+}
+
+
+fieldset#toc {
+	background-color: #FEFDEF;
+	border: 1pt solid #B8AE9C;
+	width:89%;
+}
+
+#side-menu{
+	overflow:hidden;
+}
+
+/* cleans up glossary question mark line spacing*/
+sup{
+	border: 1pt solid #B8AE9C;
+	vertical-align:bottom;
+	margin-top: 1em;
+}
+
+/* jQuery tooltip styles */
+#tooltip{
+	position:absolute;
+	z-index:3000;
+	border:3px solid #111;
+	background-color:#eeeeee;
+	padding:0.313em;
+}
+#tooltip h3,#tooltip div{
+	margin:0;
+}
+
+/* style for home page modules "detail view" */
+div.home_box {
+	padding: .75em 0;
+	margin: 0 auto;
+}
+
+.outside_box{
+	background:#e0e0e0;
+	width: 17em;
+	margin: .375em;
+	padding: 0;
+	height:9.8em;
+}
+
+.inside_box{
+	width:100%;
+	margin:auto;
+	height:52%;
+	margin-bottom:.2em;
+	background:#eeeeee;
+
+}
+.details_or{
+	width:28.8em;
+	height:9.8em;
+	margin:0;
+	background-image:url(images/details_r.png);
+	background-position: top right;
+	background-repeat:no-repeat;
+}
+.details_ol{
+	height:9.8em;
+	margin:0;
+	width:.45em;
+	background-image:url(images/details_l.png);
+	background-position: top left;
+	background-repeat:no-repeat;
+}
+.details_ir{
+	width:.5em;
+	height:100%;
+	float:right;
+	background-image:url(images/details_ir.png);
+	background-position: top right;
+	background-repeat:no-repeat;
+}
+.details_il{
+	height:100%;
+	float:left;
+	background-image:url(images/details_il.png);
+	background-position: top left;
+	background-repeat:no-repeat;
+}
+.home-title{
+	font-size:12pt;
+}
+.buttonbox{
+	float:right;
+}
+.details_text{
+	margin-left:1em;
+}
+.draggable_selected {
+	background-color: lightgrey;
+	cursor: move;
+}
+
+div.menuedit{
+	float:right;
+	margin-top:-1.2em; 
+	border:1px solid #cccccc;
+}
+li.folders {
+	list-style: disc url(../../images/folder.gif) outside;
+	font-family: Helvetica,sans-serif;
+	margin-bottom: 0;
+	margin-top: 0;
+	margin-right: 0;
+}
+
+li.folders .disabled {
+	color: #B8AE9C;
+}
+
+ul.folder{
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0em;
+	padding:0em;
+}
+
+
+/*	hiding/showing  results-display */
+
+
+div#results-display{
+	display: none;
+}
+
+ul#topnavlist li {
+	padding: 0;
+	margin: 0;
+}
+	
+ul#topnavlist>li:hover,
+ul#topnavlist>li:hover a, 
+ul#topnavlist>li:active,
+ul#topnavlist>li:active a,
+ul#topnavlist>li:focus, 
+ul#topnavlist>li:focus a {
+	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+}
+
+ul#topnavlist li a  {
+ 	color: #4C566C;
+ 	text-decoration: none;
+}
+
+
+div.toolcontainer{
+	border: #cccccc 1px solid;
+	-webkit-border-radius:5px;
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+
+
+ul#subnavlist li a:hover, ul#subnavlist li a:focus, ul#subnavlist li a.active{ /*
+  	color: black;
+	text-decoration:none;*/
+}
+#subnavlist{
+	display: none;
+}
+ul#subnavlist li a, ul#subnavlist li a:visited {
+	color: #4C566C;
+}
+
+
+/* list attributes */
+ul {
+	list-style: none;
+}
+li {
+	color: black;
+	list-style: none;
+}
+
+ol#tools>li:hover {
+	/*border: 1px solid #e0e0e0;*/
+	background-color: #e6e6e6;
+	color: black; 	
+	
+ 	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+  	
+}
+ol#tools>li:hover a{
+	color: white;
+}
+
+#contentwrapper{
+	
+}
+#content-contentwrapper{
+	height:100%;
+    position:relative;	
+	z-index:1000;			
+	width:100%;
+	overflow:hidden;
+}
+
+#leftcolumn{
+	float: left;
+	width: 17em;
+	margin-left: 0.313em;
+	margin-top:-0.625em;
+}
+
+#copyright{
+	font-size: 0.5em;
+}
+#gototop{
+	text-align: center;
+	color: #4B6B90;
+}
+
+#tools{
+	margin: 0 auto;
+	padding: 0;
+}
+
+
+/* ATutor Social Styles */
+
+div .profile_container {
+	background-color:#eee; 
+	border: 1px solid #8e8e8e; 
+	width:80%; 
+	padding:0.5em; 
+	margin-bottom: 0.5em;
+}
+
+div .profile_container .top_right {
+	float: right;
+}
+
+dl.public-profile dd{
+	margin-left:0;
+}
+dl.public-profile dt {
+	float: left;
+	font-weight: bold;
+	min-width:12em;
+}
+
+/* Search form */
+div .search_form {
+	margin-bottom: 1em;
+}
+
+div .search_form .row{
+	background-color: #DEDEC0;
+	padding: 0.5em;
+}
+div .button {
+	background-color: #eee;
+	border: 1px solid #aaa;
+}
+div .button:hover{
+	background-color: #cccccc;
+	color: #ffffff;
+}
+
+/* Side menu */
+
+
+ul.social_side_menu {
+	padding-left: 2em;
+}
+ul.social_side_menu li {
+	padding-bottom: 0.2em;
+	list-style: circle;
+}
+
+div .divider {
+	border-bottom:1px solid #C1C157; 
+	padding-bottom:0.5em; 
+	margin-bottom:0.5em;
+}
+
+.activity{
+ 	line-height:18pt;
+	font-size:.8em;
+}
+
+div.contentbox, input-form{
+
+	padding:.5em;
+	background-color: #ffffff;
+    overflow:hidden;
+    border: #A9ADB0 solid 1px;
+	-webkit-border-radius: 5px;
+}
+
+div.suggestions{
+	border:1px solid #a50707;
+	margin-left:0.625em; 
+	width:50%;
+}
+li.inlinelist{
+	display: inline; 
+	padding-right: 1em;
+}
+ul.social_inline_menu{
+	background-color: #eeeeee;
+	border:thin #cccccc solid;
+	padding:.5em;
+	width:90%;
+	margin:auto;
+}
+div.social-wrapper{ 
+	width: 100%;
+}
+
+div.logo{
+float:left;
+clear:right;
+margin-left:2em;}
+
+/*mobile FSS overrides */
+.fl-theme-iphone [class*="fl-list"]:not(.fl-list):not(.fl-grid) a:hover, 
+.fl-theme-iphone [class*="fl-list"]:not(.fl-list):not(.fl-grid) a:focus,
+.fl-theme-iphone [class*="fl-list"]:not(.fl-list):not(.fl-grid) a:active {
+	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+  
+}
+ul#subnavlist li a:focus, ul#subnavlist li a:active, ul#subnavlist li a:hover{
+	color: white;
+}
+/* isolates fl tabs 
+.fl-theme-iphone .fl-tabs li a, .fl-theme-iphone .fl-tabs .fl-tabs-active {
+	background-color: white;
+} */
+
+
+/************************************************************************************************/
+/*Adds arrows to Fluid Tabs. Here is a good guide for creating triangles with CSS: 
+http://jonrohan.me/guide/css/creating-triangles-in-css/ */
+/************************************************************************************************/
+ul.sequence-links {
+}
+
+ul.sequence-links li {
+    position:relative;
+    overflow:hidden;
+    list-style:none;
+   /* padding:0;
+    margin:0 0 0 0 ;*/
+}
+
+ul.sequence-links li.back a:link, 
+ul.sequence-links li.back a:visited {
+    display:block;
+   /* border :0;*/
+    padding-left:0.438em;
+   	color: #005689;
+}
+
+ul.sequence-links li.forward a:link, 
+ul.sequence-links li.forward a:visited {
+    display:block;
+   /* border :0;*/
+    padding-right:0.313em;
+  	color: #005689;
+}
+/*WCAG*/
+ul.sequence-links li a:hover, ul.sequence-links li a:focus, ul.sequence-links li a:active,
+ul.sequence-links li.back a:hover, ul.sequence-links li.back a:focus, ul.sequence-links li.back a:active,
+ul.sequence-links li.forward a:hover, ul.sequence-links li.forward a:focus, ul.sequence-links li.forward a:active {
+    color: #4c96f4;
+    background:transparent;
+}
+
+
+ul.sequence-links li:before, 
+ul.sequence-links li:after,
+ul.sequence-links li a:before, 
+ul.sequence-links li a:after {
+    content:"";
+    position:absolute;
+    top:50%;
+   /* left:0;*/
+}
+
+ul.sequence-links li a:before, 
+ul.sequence-links li a:after {
+    margin:-0.5em 0 0;
+  }
+
+ul.sequence-links li a:hover:before, 
+ul.sequence-links li a:focus:before, 
+ul.sequence-links li a:active:before {
+ 
+}
+/*arrow that points to the left, beside the "Previous" text */
+.arrow.back a:after {/*arrow pointing to the left*/
+     background: none repeat scroll 0% 0% transparent;
+     border-color: transparent #005689;
+   
+     border-style: solid;
+     border-width: 5px 0pt 5px 6px;
+     left: 0.5em;
+     margin-top: -0.39em;
+}
+
+/*left and right triangle icons change color*/
+.arrow a:hover:after, .arrow a:focus:after, .arrow a:active:after, 
+.arrow.forward a:hover:after, .arrow.forward a:focus:after, .arrow.forward a:active:after{
+	border-color: transparent #4c96f4;
+}
+
+.arrow.back a:after {
+     border-width: 6px 6px 6px 0pt;    
+     left: 0.188em;
+     top: 1.25em;
+}
+
+.arrow.back:before {
+     
+}
+.arrow.forward:before {
+     
+}
+.arrow:before {
+
+}
+/*arrow that points to the right, beside the "Next" text */
+.arrow.forward a:after {
+     background: none repeat scroll 0% 0% transparent;
+     border-color: transparent #FFFFFF;
+     border-style: solid;
+     margin-top: -0.425em;
+     margin-top: -0.313em;
+   
+}
+.arrow.forward a:after {
+     /*top: 11px;*/
+       background: none repeat scroll 0% 0% transparent;
+     border-color: transparent transparent transparent    #005689;
+  	 border-width: 6px;
+  	 border-style: solid;
+  	 width:0;
+  	 height:0;
+  	 right: -0.313em;
+  	 top: 1.19em;
+}
+
+
+#content-sequence-links{/*
+	width: 98%;
+	padding: .313em;
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#999), to(black));
+	background: #B6C0C6;
+	float: left;
+	margin: 0 auto;
+	margin-bottom: .313em;*/
+}
+
+
+#sequence-links{
+	float: left;
+}
+	
+
+#content{
+	text-align: left;
+	width: 93.5%;
+	width: 99%;
+	border-left: #A9ADB0 1px solid;
+	border-right: #A9ADB0 1px solid;
+	border-bottom: #A9ADB0 1px solid;
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px; 
+	border-radius: 5px;
+	display: none;
+	position: relative;
+	top: 0em; 
+	clear: left;
+	clear: right;
+	z-index: 1;
+}
+
+/*hiding and showing content */
+
+#results-hide-show-simple-content{
+	-webkit-border-radius:5px;
+	border: 1px #A9ADB0 solid;
+	/*margin-top: 0.875em;
+	margin-bottom: 0.875em;
+	padding: 0.875em;
+	padding-right: .2em;*/
+	padding-top: .6em;
+	padding-bottom: .6em;
+	padding-right: .2em;
+	padding-left: .6em;
+	margin-bottom: 0.875em;
+	margin-top: 0.875em;
+	color: #005689;
+/*	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#999), to(black));*/
+	background-color: none;
+}
+#results-hide-show-link{
+	color: white;
+	color: #005689;
+	text-decoration: none;	
+	display: block;
+	font-weight: bold;
+}
+
+
+.content-expand{
+	background-image:url("images/plus.png");
+	background-position: 100% 100%;
+	background-repeat: no-repeat;
+}
+
+.content-closed{
+	background-image:url("images/minus.png");
+	background-position: 100% 100%;
+	background-repeat: no-repeat;	
+}
+#results-display{
+	background-color: #F7F3ED; 
+	-webkit-border-radius:8px;
+	border: 1px #A9ADB0 solid;
+	padding: .313em;
+	
+}
+.hide-show-container-surround a:active, .hide-show-container-surround a:focus, .hide-show-container-surround a:hover{
+	background-color: transparent;
+	
+}
+.subnavcontain2, .subnavcontain{
+	margin: .313em 0; 
+	
+	border: #A9ADB0 1px solid; 
+	-webkit-border-radius:8px;
+	width: 100%;
+
+}
+
+.fl-theme-iphone .subnavcontain a, .fl-theme-iphone .subnavcontain a:hover, .fl-theme-iphone .subnavcontain a:active, .fl-theme-iphone .subnavcontain a:focus {
+	text-decoration: none;
+	font-weight: bold; 
+	color: #005689;
+	background-repeat: no-repeat;
+	
+}
+#subnavlist-link{
+	display: block;
+}
+#page-title-back-to-page{
+    display: inline-block;
+    width: 100%;
+}
+
+.page-title, #back-to-page{
+    float: left;
+}
+
+.fl-theme-iphone #subnavlist-link  a:active, 
+.fl-theme-iphone #subnavlist-link  a:hover, 
+.fl-theme-iphone #subnavlist-link a:focus{
+	background-color: none;
+}
+.fl-theme-iphone .subnavcontain{
+	margin-top: 1em;
+	background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   	-webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+}
+.rectangle2{
+	display: inline-block; 
+	color: #005689;
+	font-weight: bold; 
+	padding: .6em;
+	margin: -.1em;
+	border-right: #A9ADB0 1px solid; 
+}
+
+.rectangle2:last-child{
+	border: none;
+}
+.rectangle2 a{
+	color: #005689;
+	text-decoration: none;
+	font-weight: bold;
+}
+.rectangle{
+	display: block;
+	color: #005689;
+	font-weight: bold; 
+	padding: .313em;
+	margin: .313em 0;
+	    
+}
+#content_link_phone a:active, #content_link_phone a:focus, #content_link_phone a:hover{
+	color: #005689;
+	background-color: white;
+}
+/* style for "last modified" information of course content*/
+#content-info{
+	padding-top: 1em;
+	font-size: 80%;
+}	
+ul.my-courses-list-ul > li:hover{
+background-color: #e6e6e6;
+	color: black; 	
+	
+ 	color: #fff;
+}
+ul.my-courses-list-ul > li:hover a{
+	color: white;
+}
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/login.tmpl.php b/docs/themes/simplified-desktop/login.tmpl.php
new file mode 100644
index 000000000..01c448ad8
--- /dev/null
+++ b/docs/themes/simplified-desktop/login.tmpl.php
@@ -0,0 +1,119 @@
+<?php require(AT_INCLUDE_PATH.'header.inc.php'); ?>
+<?php if ($this->mobile_device_type != IPAD_DEVICE): ?>
+<script language="JavaScript" src="sha-1factory.js" type="text/javascript"></script>
+
+<script type="text/javascript">
+/* 
+ * Encrypt login password with sha1
+ */
+function encrypt_password() {
+	document.form.form_password_hidden.value = hex_sha1(hex_sha1(document.form.form_password.value) + "<?php echo $_SESSION['token']; ?>");
+	document.form.form_password.value = "";
+	return true;
+}
+
+</script>
+<div class="container">
+	<div class="column-login">
+		<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+		<input type="hidden" name="form_login_action" value="true" />
+		<input type="hidden" name="form_course_id" value="<?php echo $this->course_id; ?>" />
+		<input type="hidden" name="form_password_hidden" value="" />
+		<div class="input-form">
+			<fieldset class="group_form"><legend class="group_form"><?php echo _AT('login') ;?></legend>
+			
+				<?php if ($_GET['course']): ?>
+					<div class="row">
+						<h3><?php echo _AT('login'). ' ' . $this->title; ?></h3>
+					</div>
+				<?php endif;?>
+
+				<label for="login"><?php echo _AT('login_name_or_email'); ?></label><br />
+				<input type="text" name="form_login" size="50" style="max-width: 80%; width: 80%;" id="login" /><br />
+
+				<label for="pass"><?php echo _AT('password'); ?></label><br />
+				<input type="password" class="formfield" name="form_password" style="max-width: 80%; width: 80%;" id="pass" />
+				<br /><br />
+				<input type="submit" name="submit" value="<?php echo _AT('login'); ?>" class="button" onclick="return encrypt_password();" /> 
+				<br /><br />
+			</form>
+			<?php
+			if($_config['allow_registration'] ==1){
+			?>
+			Don't have an account? 
+			<form action="registration.php" method="get">
+			<?php if (defined('AT_EMAIL_CONFIRMATION') && AT_EMAIL_CONFIRMATION): ?>
+				<p><?php echo _AT('confirm_account_text'); ?></p>
+			<?php endif; ?>
+			<input type="submit" name="register" value="<?php echo _AT('register'); ?>" class="button" />
+			<br /><br />
+			</form>
+			<?php } ?>
+			
+			</fieldset>			
+		</div>
+		
+	</div>
+</div>
+<?php endif; ?>
+<?php if ($this->mobile_device_type == IPAD_DEVICE): ?>
+<script language="JavaScript" src="sha-1factory.js" type="text/javascript"></script>
+
+<script type="text/javascript">
+/* 
+ * Encrypt login password with sha1
+ */
+function encrypt_password() {
+	document.form.form_password_hidden.value = hex_sha1(hex_sha1(document.form.form_password.value) + "<?php echo $_SESSION['token']; ?>");
+	document.form.form_password.value = "";
+	return true;
+}
+
+</script>
+<div class="container">
+	<div class="column-login">
+		<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+		<input type="hidden" name="form_login_action" value="true" />
+		<input type="hidden" name="form_course_id" value="<?php echo $this->course_id; ?>" />
+		<input type="hidden" name="form_password_hidden" value="" />
+		<div class="input-form">
+			<fieldset class="group_form"><legend class="group_form"><?php echo _AT('login') ;?></legend>
+			
+				<?php if ($_GET['course']): ?>
+					<div class="row">
+						<h3><?php echo _AT('login'). ' ' . $this->title; ?></h3>
+					</div>
+				<?php endif;?>
+
+				<label for="login"><?php echo _AT('login_name_or_email'); ?></label><br />
+				<input type="text" name="form_login" size="50" style="max-width: 80%; width: 80%;" id="login" /><br />
+
+				<label for="pass"><?php echo _AT('password'); ?></label><br />
+				<input type="password" class="formfield" name="form_password" style="max-width: 80%; width: 80%;" id="pass" />
+				<br /><br />
+				<input type="submit" name="submit" value="<?php echo _AT('login'); ?>" class="button" onclick="return encrypt_password();" /> 
+				<br /><br />
+			</fieldset>	
+			</div>
+			</form>
+			<?php
+			if($_config['allow_registration'] ==1){
+			?>
+			Don't have an account? 
+			<form action="registration.php" method="get">
+			<?php if (defined('AT_EMAIL_CONFIRMATION') && AT_EMAIL_CONFIRMATION): ?>
+				<p><?php echo _AT('confirm_account_text'); ?></p>
+			<?php endif; ?>
+			<input type="submit" name="register" value="<?php echo _AT('register'); ?>" class="button" />
+			<br /><br />
+			</form>
+			
+			<?php } ?>
+			
+			
+		</div>
+		
+	</div>
+</div>
+<?php endif; ?>
+<?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/mobile.css b/docs/themes/simplified-desktop/mobile.css
new file mode 100644
index 000000000..5e5dce01f
--- /dev/null
+++ b/docs/themes/simplified-desktop/mobile.css
@@ -0,0 +1,2289 @@
+/* Style is optimized for iphone and android. Note that -webkit properties create errors in the CSS validator. Relative units 
+for sizes are used unless it is a border. Classes beginning with ".fl-" override Mobile FSS, 
+see the API @ http://wiki.fluidproject.org/display/fluid/Mobile+FSS+API for more details. 
+*/
+html, body{
+	height: 100%;
+}
+#main{
+	padding-bottom: 2.3em;
+	overflow: auto;
+}
+
+body,ul,li {
+	padding:0;
+	margin:0;
+}
+
+.fl-theme-iphone{
+	background: white;	
+}
+
+#header{
+	width:100%;
+	height:1.2em;
+	line-height:2.813em;
+	padding:0;
+	font-size:1.063em;
+	background-color: #4B6B90;
+	/*firefox*/
+	background-image: -moz-linear-gradient(
+        center top,
+        #9aafca,
+        #4b6b90,
+        #6d8cb3 10%,
+        #4b6b90 90%        
+    );        
+}
+
+#header-section-title {
+	text-align: center;
+	
+	background-image: -webkit-gradient(linear, left top, left bottom,
+   	from(#6d8cb3),
+    color-stop(0.5, #6d8cb3),
+    color-stop(0.50, #4b6b90),
+    color-stop(0.5, #6d8cb3),
+    to(#4b6b90)
+    ); 
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#6d8cb3), to(#4b6b90));
+
+}
+
+.fl-theme-iphone .fl-navbar{
+	border: none;
+	border-top: none;
+}
+
+.fl-navbar a{
+	font-size: 0.969em;
+}
+
+.fl-navbar .fl-tabs {
+	padding-top: .3em;
+	padding-bottom: .3em;
+	border-top: 1px solid black;
+	border-bottom: .5px solid black;
+	background-color: #4b6b90; 
+    height: 2em;   
+}
+
+#navigation-contentwrapper{
+	position: relative;
+	background-color: #4b6b90;
+	height: 2.5em; 
+}
+
+#navigation-bar{
+ 	height: 2.5em; 
+    border-bottom: .5px solid black;
+   /*padding-bottom: .3em;*/
+     
+}
+
+#wrapper{
+	width:100%;
+	overflow:hidden;
+	overflow: auto;
+	min-height: 100%;
+	background-color:white;
+}
+
+#site-name, h1#section-title{
+	display: inline;
+	text-shadow: none;
+	font-size: 90%;
+	color: #4C566C;
+	color: white;
+	margin-bottom: 1em;	
+}
+
+/************************************************************************************************/
+/* "Navigation" button, also this CSS creates a button that looks exactly like a Mobile FSS tab.*/
+/************************************************************************************************/
+.navigation-bar-button{
+    border-width:5px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius:5px;
+	border-radius: 5px;
+	font-size: 18px;/*keep this in px*/
+	padding: 0 .3em;
+	color: white;
+	position: relative;
+	top: .69em; 
+	left: 0.188em; 
+    /* default mobile fss color scheme for tabs not AA compliant. Here is a compliant bg image: */
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    );
+ 	-webkit-border-image: url(images/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+    -webkit-border-left-image: none;
+    -webkit-background-origin: border;
+    -webkit-background-clip: border;
+
+}
+
+.navigation-bar-button a:hover, .navigation-bar-button a:active, .navigation-bar-button a:focus{
+	background-color: white;
+}
+
+.fl-theme-iphone .fl-tabs li{
+    /* default mobile fss color scheme for tabs not AA compliant against a white foreground text.therefore its backgroud-image must be overrided */
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    ); 
+}
+.fl-theme-iphone .topnavlistcontainer .topnavlist-link {/*makes the navigation button link white*/
+	color: white;
+	text-decoration: none;
+	font-weight: bold;
+	/*firefox*/
+	 -moz-border-image: url("images/navbar_normal_button_insetShadow.png") 5 5 5 5 stretch;
+    background-color: #354D68;
+}
+
+#content_link_phone.topnavlist-link-highlight {/*makes the content link highlight*/
+	color: white;
+	text-decoration: none;
+	font-weight: bold;
+}
+.fl-theme-iphone .topnavlistcontainer .topnavlist-link-highlight{/*makes the navigation button link highlight*/
+	color: #4c96f4;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+ul#topnavlist {
+	display: none;
+	position: relative;
+	top: 1.2em;
+	z-index: 1000;
+	/*background-color: white;*/
+}
+
+div#content-link-container.flc-screenNavigator-navbar {
+	color: #005689;
+}
+
+.content-link-surround a:active, .content-link-surround a:focus, .content-link-surround a:hover{
+	background: none;
+	
+}
+ #content_link_phone {
+	
+	display: block;
+	text-decoration: none;
+	
+    color: white;
+    font-style: bold;
+    color: #005689;
+}
+.resume{
+	font-size: 1em;
+}
+
+
+#home-guide{
+	position: absolute;
+	top: .45em;
+ 	right: 0.188em; 
+ 	font-size: 17px;/*keep this in px*/
+	white-space:nowrap;
+	display: inline;
+}
+
+ul.home-guide li a:hover, ul.home-guide li a:focus, ul.home-guide li a:active, ul.home-guide li.back a:hover, ul.home-guide li.back a:focus, ul.home-guide li.back a:active,
+ul.home-guide li.forward a:hover, ul.home-guide li.forward a:focus, ul.home-guide li.forward a:active {
+    color: #4c96f4;
+    background:transparent;
+}
+
+/* main body attributes */
+p {
+    text-align: left;
+    line-height: 150%;
+	font-size: 1em;
+	padding:.75em 0;
+	margin: 0 auto;
+}
+
+p a {
+    text-decoration: underline;
+}
+
+p a:visited {
+	color: #3F2670;
+    background-color: transparent;
+}
+p a:active {
+	color: #A50707;
+    background-color: transparent;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    color: #4C566C;
+    clear: right;
+    font: 100% Helvetica, Arial, sans-serif;
+	font-weight: bold;
+    margin: 0;
+	padding: 0;
+}
+h2, h3, h4, h5, h6{
+	padding-top: .5em;
+}
+h1 {
+    font-size: 160%;
+	color: #FFF;
+}
+
+
+h2 {
+    font-size: 150%;
+}
+
+h3.input-form {
+	padding-top: .875em;
+}
+h3.browse-courses{
+	font-size: 90%;
+	text-decoration: none;
+	clear: none;
+	display: inline;
+}
+
+h3 a {
+    font-size: 100%;
+}
+
+a:hover, a:visited, a:focus {
+	color: #4C96F4;
+	text-decoration: underline;
+
+}
+/************************************************************************************************/
+/* Preferences tabs */
+/************************************************************************************************/
+.etabbed-list-container	{
+	padding:0;
+	margin: 0;
+	width:70%;
+	clear: left;
+	height: 3em;
+}
+
+.prefs_buttontab {
+	padding:0;
+	margin: 0;
+	white-space: nowrap;
+}
+.prefs_tab{
+	padding:0.5em 0.3em 0;
+	margin: 0;
+	white-space: nowrap;
+    display: inline;
+}
+
+.prefs_tab_selected{  
+	padding:0.7em 0.3em 0;
+	margin: 0;
+	margin: 0;
+	font-weight:bold;
+	text-align:center;
+	white-space: nowrap;
+    display: inline;
+}
+
+/************************************************************************************************/
+/* link attributes */
+/************************************************************************************************/
+a:link, /*a:visited*/ a:focus  {
+	color: #4C566C;
+	
+}
+.top-tool a:link, .top-tool a:focus{
+	text-decoration: none;	
+}	
+
+/* main submit button */
+.button {
+	background-color: #808080;
+	color: black;
+	text-align: center;
+	-webkit-border-radius:3px;
+	-moz-border-radius:3px;
+	border-radius: 3px;
+	padding-top: 0.313em;
+	padding-bottom: 0.313em;
+
+}
+.button:focus {
+	border:1px solid #A50707;
+	background-color:  #FFDAB9;	
+}
+/* small submit button at top */
+.button2 {
+	font-family: Helvetica,sans-serif;
+	background-color: #E9F4F3;
+
+}
+.button2:focus {
+	background-color: #E9F4F3;
+	border:  #ACCFCC  solid 1px;
+}
+
+/* Editor box large */
+.editorlargebox {
+	font-family: Helvetica,sans-serif;
+	background-color: #E9F4F3;
+	margin-left:1em;
+	padding-left: .2em;
+	padding-right: .5em;
+	padding-top: .5em;
+	padding-bottom: .4em;
+	border: 1px #ACCFCC solid;
+}
+
+/* edit content tabs */
+.buttontab {
+	background-color: #E6E6E6;
+	font-weight: 500;
+	border:0;
+	padding-left: .188em;
+	padding-right: .188em;
+	padding-top: .188em;
+
+}
+
+.tab {
+	color: black;
+	background-color: #E6E6E6;
+	border-top: 1px #B8AE9C solid;
+	border-left: 1px #B8AE9C solid;
+	border-right: 1px #B8AE9C solid;
+	text-decoration: none;
+	text-align: center;
+	font-weight: bold;
+
+	
+}
+.buttontab selected {
+	font-family: Helvetica, Arial, Helvetica, sans-serif;
+	background-color: #6F7172;
+	font-weight: 600;
+	border:0;
+	padding-left: .188em;
+	padding-right: .188em;
+	padding-top: .188em;
+
+}
+td.selected{
+	font-family: Helvetica, Arial, Helvetica, sans-serif;
+	font-weight: 600;
+	text-decoration: none;
+	text-align: center;
+	background-color: white;
+	border-top: 1px #B8AE9C solid;
+	border-left: 1px #B8AE9C solid;
+	border-right: 1px #B8AE9C solid;
+}
+
+.tab a:link, .etab a:visited {
+	color: #4C566C;
+	background-color: white;
+}
+
+/* the side menu */
+td.dropdown-heading {
+	background-color: #DBFDD4;
+	color: #595241;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-top: 1px solid #ECFEEA;
+}
+
+/* the side menu content */
+td.dropdown {
+	padding: 0.125em;
+	background-color: white;
+	color: black;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-bottom: 1px solid #ECFEEA;
+	font-weight: normal;
+}
+td.dropdown a, td.dropdown a:visited  {
+	color: #4C566C;
+	text-decoration: none;
+}
+td.dropdown a:hover {
+	color: #595241;
+	text-decoration: underline;
+}
+
+/* added for 1.4.2: */
+.results {
+	padding-left: 1.25em;
+}
+
+h5.search-results {
+	padding: 0.063em;
+	margin-bottom: 0.313em;
+	margin-top: 1em;
+	padding-top: 3em;
+	margin-left: 0.313em;
+}
+
+.test-box {
+	background-color: #F7F3ED;
+	color: #595241;
+	border-left: 1px solid #595241;
+	border-right: 1px solid #595241;
+	border-top: 1px solid #595241;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+/*preferences*/
+
+.input-form 
+table.tabbed-table {
+	width: 100%;
+	border:thin black solid;
+}
+table.tabbed-table th#left-empty-tab {
+	background-color: transparent;
+	width: 0.938em;
+	border-bottom: 1px solid #B8AE9C;
+}
+table.tabbed-table th#right-empty-tab {
+	text-align: right;
+	background-color: transparent;
+	border-bottom: 1px solid #B8AE9C;
+	width: 25em;
+	padding-right: 0.313em;
+}
+table.tabbed-table th#right-empty-tab a {
+	text-decoration: underline;
+}
+table.tabbed-table th.tab-spacer {
+	background-color: transparent;
+	width: 0.313em;
+	border-bottom: 1px solid #B8AE9C;
+}
+
+table.tabbed-table th.tab {
+	padding-top: 0.125em;
+	padding-bottom: 0.125em;
+	width: 6.875em;
+	background-color: #E9F4F3;
+	border-bottom: 1px solid #B8AE9C;
+	border-left: 1px solid #B8AE9C;
+	border-top: 1px solid #B8AE9C;
+	border-right: 1px solid #B8AE9C;
+}
+table.tabbed-table th.tab:hover {
+	background-color: #ACCFCC;
+}
+
+table.tabbed-table th.tab a:focus {
+	color: white;
+}
+table.tabbed-table th.selected {
+	padding-top: 0.125em;
+	padding-bottom: 0.125em;
+	width: 6.875em;
+	background-color: #ACCFCC;
+	border-left: 1px solid #B8AE9C;
+	border-top: 1px solid #B8AE9C;
+	border-right: 1px solid #B8AE9C;
+}
+
+table.tabbed-table a, table.tabbed-table a:visited, table.tabbed-table a:hover {
+	color: #4C566C;
+	text-decoration: none;
+}
+
+
+.preference-buttons-container{
+	background-color: red;
+	height: 2.5em;
+	width: 100%;
+	text-align: center;
+}
+
+div.preference-buttons-container li{
+	display: inline; 
+	float: right;
+}
+
+.prefs_tab_selected{
+	font-style: italic;
+	width: 10%;
+}
+.prefs_tab{
+	width: 10%;
+}
+
+.etabbed-table{
+	margin: 0 auto;
+}
+#previewText{
+	font-family: monospace;
+	border: 2px solid rgb(0, 0, 0); 
+	padding: 2em;
+	width: 80%; 
+	color: rgb(255, 255, 255);
+	background-color: rgb(0, 0, 0);
+}
+#previewArea{;
+	padding: 0em;
+	border-bottom-width: 0; 
+	margin-left: auto; 
+	margin-right: auto; 
+	font-weight: normal; 
+	width: 70%;
+	float:left;
+	clear:right;
+}
+#display-settings-preview{
+	width:90%;
+	height:20em; 
+	margin: 0 auto;
+}
+#feedback{
+	width: 90%;
+}
+#defaultfontsize-wrapper{
+	width:90%; 
+}
+
+a#my-start-page {
+	padding: 0.125em;
+	padding-left:  0.938em;
+	background-repeat: no-repeat;
+	background-position: 0.125em 0.313em;
+}
+
+a#back-to {
+	padding-left: 1.25em;
+	background-image: url(images/back.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0;
+}
+
+.breadcrumbs, .previous-next /*a#guide*/{
+    /* The path bar, including breadcrumbs and add to favorites */
+	clear:both;
+    font-size: 1em;
+	padding:0;
+	color: #4C566C;
+	background-color: white;
+
+}
+#breadcrumbs-container{
+	background-color: #4d4d4d;
+	position: relative;
+}
+.breadcrumbs{
+	display:none;
+}
+h2.page-title  {
+	
+	
+}
+#subnavlistbacktopage{
+	float: left;
+}
+
+h1 {
+	margin-bottom: 0.313em;
+	
+}
+
+
+div#help {
+	border-left: 1px solid black;
+	border-right: 1px solid black;
+	border-bottom: 1px solid black;
+	padding-left: 0.313em;
+	padding-right: 0.313em;
+	padding-bottom: 0.313em;
+	background-color: #F7F3ED;
+	margin-left: 0.313em;
+	margin-right: 0.313em;
+	font-size: small;
+}
+
+h3#help-title {
+	margin-left: 0.313em;
+	margin-right: 0.313em;
+	border-left: 1px solid black;
+	border-right: 1px solid black;
+	padding: 0.063em;
+	background-color: #F7F3ED;
+}
+.line {
+	border-bottom: 1px solid black;
+}
+div#help p {
+	padding: 0;
+	margin: 0;
+}
+
+div#toctoggle {
+	float: left;
+	padding-left: 0.625em;
+}
+
+
+/**********************************************************************/
+/*FOOTER*/
+/**********************************************************************/
+div#footer-links {
+	margin: 0 auto;
+	font-size: .938em;
+}
+#footer{
+	height:2.3em;
+	background-color: #4b6b90;
+	margin-top: -2.3em;
+	position: relative;
+	clear: both;
+	
+}
+
+ul.footer-links-tabs li a:hover, ul.footer-links-tabs li a:focus, ul.footer-links-tabs li a:active,
+ul.footer-links-tabs li.back a:hover, ul.footer-links-tabs li.back a:focus, ul.footer-links-tabs li.back a:active,
+ul.footer-links-tabs li.forward a:hover, ul.footer-links-tabs li.forward a:focus, ul.footer-links-tabs li.forward a:active {
+    color: #4c96f4;
+    background:transparent;
+}
+div#top-links a:link, div#top-links a:visited {
+	text-decoration:none;
+}
+
+#jumpmenu:focus{
+	background-color:#F6EAD6;
+}
+#jumpmenu{
+	margin: 0 auto;
+}
+
+a#editor-link {
+	background-color: #F7F3ED;
+	padding-top: 0.063em;
+	padding-bottom: 0.063em;
+	padding-left:  0.938em;
+	padding-right: 0.5em;
+	border: 1px solid #cccccc;
+	font-weight: normal;
+	text-decoration: none;
+}
+
+a#editor-link:hover {
+	background-color: #F7F3ED;
+	border: 1px solid #B8AE9C;
+}
+
+a#editor-link.off {
+	background-image: url(images/pen.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0.125em;
+}
+a#editor-link.on {
+	background-image: url(images/pen2.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0.125em;
+}
+
+
+/* for data tables */
+.table-surround {
+	border: #A9ADB0 1px solid;
+	border: #cccccc 1px solid;
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
+	border-radius: 5px;
+	margin-top: 1em;
+	margin-bottom: 1em;
+	
+}
+
+table.data {
+	margin:0;
+	width:100%;
+	padding: 0;
+	color: #4C566C;
+	font-size: .8em;
+	text-align: left;
+	background-color: transparent;
+} 
+/* contains the headings */
+table.data th {
+
+	padding: 0.188em;
+}
+
+table.data th a {
+	color: #595241;
+	background-image: url('../default/images/sort.gif');
+	background-repeat: no-repeat;
+	background-position: right;
+}
+
+
+/*headings text*/
+table.data tbody th {
+	text-align: left;
+
+}
+
+table.data td {
+	padding: 0.188em;
+	color: black;
+	font-size: .875em;
+	font-style: normal;
+}
+table.data td a:link, a:visited{
+	/*color: black;*/
+	color: #4C566C
+}
+
+/*should table.data tbody tr:hover  and table.data tbody tr.selected  highlighting 
+be improved to sync with Mobile FSS highlighting */
+table.data tbody tr:hover {
+	background-color: #efefef;
+	cursor: pointer;
+}
+
+table.data tbody tr.selected {
+	background-color: #E9F4F3;
+	cursor: auto;
+	border: 5px solid #E9F4F3;
+}
+
+table.data tfoot {
+	background-color: #F7F3ED;
+}
+
+table.data tfoot tr:first-child td {
+	padding: 0.313em;
+	background-image: url('images/arrow_ltr.gif');
+	background-repeat: no-repeat;
+	background-position: .25em 0.313em;
+}
+
+table.data.static tfoot td, table.data.static tfoot tr:first-child td {
+	padding: 0.313em;
+	background-image: none;
+	padding-left: 0;
+
+}
+/* add borders to row in Required Information, Personal Information*/
+.row{
+	padding:.375em 0;
+	font-size: 0.938em;
+}
+#last-row, .row-buttons, #last-row1, .row-blurb{
+	border: none;
+}
+#browse-courses-table{
+	font-size: .875em;
+}
+
+
+/*buttons*/
+table.data tfoot input {
+	background-color: #efefef;
+	font-weight: normal;
+}
+table.data tfoot input:focus {
+	background-color: #FFDAB9;
+}
+
+
+/* used for static tables with no form elements: */
+table.data.static tbody tr:hover {
+	background-color: transparent;
+	cursor: auto;
+}
+
+
+
+/* course browser: */
+
+div#browse {
+	margin-left: auto; 
+	margin-right: auto; 
+	width: 80%;
+}
+
+div.browse-selected {
+	background-image: url('images/side_arrow.gif'); 
+	background-repeat: no-repeat; 
+	padding-left: 0.563em; 
+	background-position: center left;
+}
+
+div.browse-unselected {
+	padding-left: 0.563em; 
+}
+
+ul.browse-list {
+	list-style: none;
+	padding:0;
+}
+
+/* feedback /errors */
+div#error {
+	width: 89%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #DD0000;
+	padding: 0.313em;
+	background-color: #F4DCDC;
+	color: #A50707;
+	background-color: #F4DCDC;
+	padding-left: 1.563em;
+	font-weight: bold;
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
+	border-radius: 5px;
+}
+div#error h4 {
+	color: black;
+	margin-left: 0;
+}
+
+div#error ul, div#feedback ul, div#help ul {
+	position: relative;
+	list-style: none;
+	margin-left: 0;
+	padding-left: 0;
+}
+
+div#error ul li{
+	margin-top: 0.313em;
+}
+
+div#feedback, div#info {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 0.313em;
+	margin-bottom: 0.313em;
+	padding: 0.313em;
+	font-family: Helvetica, Arial, sans-serif;
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
+	border-radius: 5px;
+	border: 1px solid #17B506;
+	background-color: #E7EFD0;
+	color: #3f4559;
+	font-size: 90%;
+	z-index: -1;
+}
+div#feedback li, div#info li, div#error li{
+	color: #4C566C;
+	z-index: -1;
+}
+
+div#help {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #ACCFCC;
+	padding: 0.313em;
+	background-color: #E9F4F3;
+	color: #024C41;
+}
+
+
+div#warning {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #FF8400;
+	padding: 0.313em;
+	background-color: #FFF6ED;
+	color: #D95900;
+	font-weight: bold;
+}
+acronym {
+	cursor: help;
+}
+
+div.news p {
+	margin: 0;
+	padding:0;
+}
+div.news span.date {
+	font-family:Helevetica, Arial, sans-serif;
+	color: #4C566C;	
+	font-size: .5em;
+}
+
+.news{
+	padding: 0;
+	margin-bottom: 1em;
+	margin-top: 1em;
+}
+/* home page links */
+div.home-link {
+	padding: 0.125em;
+	float: left;
+	text-align: center;
+	margin: 0.125em;
+	width: 7.5em;
+	height: 5.625em;
+}
+div.home-link:hover {
+	padding: 0.063em;
+	background-color: #F7F3ED;
+	border: 1px solid #afafaf;
+	float: left;
+	text-align: center;
+	margin: 0.125em;
+}
+div.home-link a {
+	text-decoration: none;
+	font-weight: bold;
+}
+
+div.home-link img {
+	border: 0;
+}
+
+/* sequence links */
+div#sequence-links {
+	
+}
+div#sequence-links a {
+	text-decoration: none;
+	display: block;
+}
+
+.previous-next{
+	display: block;
+}
+div.dropdown {
+	width: 12.5em;
+	padding: 0.125em;
+	background-color: white;
+	color: black;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-bottom: 1px solid #ECFEEA;
+	font-weight: normal;
+}
+
+div.dropdown-heading {
+	background-color: #ACCFCC;
+	color: #595241;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-top: 1px solid #ECFEEA;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+div.required {
+	font-weight: bold;
+	color: red;
+	font-size: large;
+	float: left;
+	position: relative;
+	margin-top: -0.313em;
+	height:  0.938em;
+	padding-right: 0.125em;
+}
+
+div#content_text {
+	margin-left: 0.313em;
+}
+
+#content{
+	padding-top: .313em;
+	background-color: white;
+	z-index: 1000;
+}
+form {
+	display:inline;
+	max-width: 100%;
+}
+
+
+/* paging*/
+div.paging {
+	margin-top: 1em;
+	text-align: center;
+}
+div.paging ul {
+    list-style: none;
+    display: inline;
+    padding: 0;
+	max-width: 10%;
+	margin-bottom: 1em;
+}
+div.paging li { 
+	display: inline; 
+	padding-left: 0.125em; 
+	padding-right: 0.125em;
+	padding-top: 0;
+	padding-bottom: 0;
+	width: 10%;
+}
+
+div.paging li a {
+	text-decoration: none;
+	padding-left: 0.25em;
+	padding-right: 0.25em;
+	border-left: 1px solid white;
+	border-right: 1px solid white;
+}
+
+
+div.paging li a:hover, div.paging li a.current {
+   border: 1px solid #4c96f4;
+   color: white;
+   background-color: #4c96f4;
+   -webkit-border-radius: 3px;
+   -moz-border-radius: 3px;
+   border-radius: 3px;
+}
+
+#tl_corner{
+
+	background-image:url(images/tl_corner.gif);
+	background-position: top left;
+	background-repeat: no-repeat;
+	padding:0;
+}
+
+div.tabs {
+	/* Navigational Plone Tabs(tm), implemented by customizing the a tag - they are surprisingly elegant. The power of CSS runs strong in these :) */
+    background-color: transparent;
+	border-collapse: collapse;
+	border-bottom: 1px solid #B8AE9C;
+	padding: 0.5em 0em 0em 2em;
+	white-space: nowrap;
+}
+
+div.tabs a {
+    /* The normal, unselected tabs. They are all links */
+    background-color: transparent;
+    border-color: #B8AE9C;
+    border-width: 1px; 
+    border-style: solid solid none solid;
+    color: #595241;
+    height: 1.2em;
+    margin-right: 0.5em;
+    padding: 0em 2em 0em;
+    
+}
+
+div.tabs a.selected {
+    /* The selected tab. There's only one of this */
+    background-color: white;
+    border-bottom: #B8AE9C 1px solid;
+    color: #595241;
+    font-weight: normal;
+}
+
+div.tabs a:hover, div.tabs a.active {
+    background-color: #B8AE9C;
+    border-bottom: 1px solid #B8AE9C;
+    color: white;
+}
+
+.headingbox a{
+	color: #4C566C;
+}
+.headingbox a:link, .headingbox a:visited{
+	text-decoration: none;
+}
+div.box {
+}
+h4.box {
+	background-color: #F5F5F5;
+	padding: .313em; 
+}
+h4.box a {
+	display: block;
+	color: #4C566C;
+	background-color: #F5F5F5;
+	text-decoration: none;
+}
+
+
+div.box {
+	padding: 0.313em;
+	background-color: #F5F5F5;
+	color: black;
+	border: 1px solid #B8AE9C;
+	font-size:0.85em;
+	font-weight: normal;
+	padding:0.125em;
+}
+
+h5.box { 
+    background-color: #6F7172;
+    border: 1px solid #B8AE9C;
+    border-style: solid solid none solid;
+    color: Black;
+    padding: 0em 1em 0em 1em;
+    display: inline;
+	font-size:  1em;
+    height: 1em;
+}
+
+div.box a:link {
+	text-decoration: none;
+}
+
+div.box a:visited {
+	color: #2A6C28;
+	text-decoration: none;
+}
+
+div.box a:hover {
+	text-decoration: underline;
+}
+
+.boxDetails {
+    text-align: right;
+}
+
+div.box .content {
+    padding: 1em;
+	font-size:  1em;
+}
+
+div.box a.close {
+    float: right;
+    text-transform: none;
+    border-left: 1pt solid #B8AE9C;
+    padding: 0em 0.2em;
+}
+
+div.box h1, 
+div.box h2, 
+div.box h3, 
+div.box h4 {
+    margin: 0;
+    padding: 0;
+}
+
+div.box .even {
+    background-color: #F7F3ED;
+}
+
+div.box .odd {
+    background-color: transparent;
+}
+
+
+/* users/index.php */
+
+div.course {
+	position: relative;
+	width: 12.5em;
+	height: 10.5em;
+	border: rgb(204, 204, 204) 1px solid;
+	background-color: #F7F7F7;
+	float: left;
+	margin: 0.188em;
+	padding: 0.313em;
+}
+
+div.course.break {
+	clear: left;
+}
+
+div.course h2 {
+	border: 0;
+	font-weight: normal;
+	font-size: large;
+
+}
+
+div.course:hover {
+	background-color:#FBF4E9;
+	border: #B8AE9C 1px solid;
+}
+
+
+table.data .odd img.headicon{
+	width: 2.469em;
+	height: 2.469em; 
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
+	border-radius: 5px;
+}
+
+.icon{
+	-webkit-border-radius:10px;
+	-moz-border-radius:10px;
+	border-radius: 10px;
+	border-color: white;
+	width: 2.5em;
+	height: 2.5em;
+	float: left;
+}
+div.course div.shortcuts {
+	text-align: right;
+	clear: left;
+	vertical-align: middle;
+	width: 12.5em;
+}
+
+fieldset#shortcuts {
+	float: right;
+	background-color: #FEFDEF;
+	border: 1pt solid #B8AE9C;
+	margin: -5pt 5pt 5pt 5pt;
+	padding-right: 10pt;
+	padding-bottom: 5pt;
+	padding-left: 10pt;
+}
+
+fieldset {
+	margin-bottom: 10pt;
+	-webkit-border-radius:5px;
+	moz-border-radius:5px;
+	border-radius:5px;
+	padding: 0 0.375em;
+	width: 90%;
+	margin: 0 auto; 
+	width:95%;
+	margin:0 auto;
+	border:thin #6D7B8D solid;
+	border:thin #A9ADB0 solid;
+	margin-bottom: 1em;
+}
+#shortcuts ul {
+	position: relative;
+	margin-top: 0pt;
+	margin-bottom: 0pt;
+	margin-left: 0pt;
+	list-style-type:  none;
+	padding-left: 0pt; 
+}
+
+/*a#guide,*/ a#my-courses-link {
+	background-color: #6D84A2;
+}
+
+#guide img{
+	border:none;
+}
+
+#guide a:hover{
+	
+}
+
+div#content-test, div.content-from-module {	
+	float: left;
+	margin-top: 2em;
+	margin-bottom: 2em;
+	padding-right: 5pt;
+	width: 80%;
+}
+
+div#container {
+	text-align: left;
+	margin: 0 auto;
+	padding: 0;
+	border:0;
+	width: 95%;
+}
+
+/* index page */
+ul#home-links, ul#home-detail-links {
+	list-style: none;
+}
+
+/*my start page */
+#my_courses_container{
+	text-align: left;
+	margin: 0 auto;
+	border:0;	
+	min-width: 100%;
+}
+.my-courses-list{
+	border: solid 1px #A9ADB0;
+	-webkit-border-radius:8px;
+	-moz-border-radius:8px;
+	border-radius:8px;
+	padding: .375em;
+	color: #4C566C;
+	margin-bottom: .375em; 
+	margin-top: .375em;
+	padding: .375em;
+}
+.my-courses-list-ul{
+	margin: 0 auto;
+	padding-left: 0;
+	width: 100%;
+}
+.my-courses-links{
+	font-size: 80%;
+	padding-top: .75em;
+}
+.my-courses-resume{
+	float: right;
+}
+.fl-link-summary{
+	padding-left: 0.875em;
+	padding-bottom: 0.875em;
+	display: inline;
+}
+
+.fl-theme-iphone [class*="fl-list"] > li .fl-link-summary{
+	color: #4C566C;
+}
+.current_head{
+	padding-top: .5em;
+}
+
+.current_box{
+	max-width: 100%;
+}
+.current_list{
+	width: 95%;
+	padding: 0.375em;
+}
+.current_list li{
+	list-style-type: none;
+	font-style: bold;
+	padding-bottom: .5em;
+	padding-left: .5em;
+	margin:0;
+}
+.current_list_date_time{
+	font-size: 65%;
+}
+#show-all, #show-pages{
+	text-align: center;
+	
+}
+/* enrollment tabs */
+#navlist {
+	padding: 0;
+	margin-left: 0;
+	margin-right: auto;
+	margin-left: auto;
+	margin-bottom: .25em;
+	margin-top: 0.938em;
+	white-space: nowrap;
+}
+
+#navlist li {
+	list-style: none;
+	display: inline;
+	margin: 0;
+}
+
+#navlist li a {
+	padding: 0.188em 0.563em;
+	border: 1px solid #F7F3ED;
+	border-bottom: none;
+	background-color: #F7F3ED;
+	text-decoration: none;
+	margin-left: .25em;
+	white-space: nowrap;
+}
+
+#navlist li a:hover, #navlist li a:active {
+	color: #000;
+	background-color: #fff;
+}
+
+/* tree */
+.img-size-tree {
+	vertical-align: middle;
+	margin-top: 0;
+    padding:0;
+	height:1.45em;
+	width:1.5em;
+}
+/* profile page */
+dl#public-profile dt {
+	float: left;
+	width: 90%;
+	border-right: 1px solid #F7F3ED;
+	padding: 0.313em 0.313em 0.313em 0;
+
+	margin-right: 0.313em;
+}
+dl#public-profile dd {
+	margin: 0;
+}
+
+div.social-right{
+	margin-left:.5em;
+	margin-top: 1em;
+}
+div.social-left{
+	margin-left:.5em;
+}
+h4.profile{
+	float: left;
+}
+.social-wrapper h3{  
+	padding-top: .5em;
+}
+.my-contacts h3{
+	padding-bottom: .375em;
+}
+img#profile{
+	border: 1px #cccccc solid;
+	margin-left: 1em;
+}
+dd{
+    margin: 0;
+}
+
+/** forum stuff **/
+#forum-thread li {border:1px solid #eee; border-bottom: 1px solid #F7F3ED; float:left; width: 97%; list-style: none; }
+#forum-thread li.even { background-color: #F7F3ED; border-top: none; }
+#forum-thread li.odd { background-color: #fff; }
+div.forum-post-author { float:left; width:19.375em; padding:0.5em 0.625em; }
+div.forum-post-author a.title {font-size: 1.1em; line-height: 1.2em; font-weight: bold; text-decoration:none; }	
+div.forum-post-author img.profile-picture { border: 2px solid #F7F3ED; text-align:right;}
+div.forum-post-content { margin-left: 19.375em; padding: 0.313em 0 1.125em 1.125em;}
+div.forum-post-content h3 { font-weight: 500; float:left;clear:right; }
+div.forum-post-ctrl { float: right; padding-right: 0.313em; color: #a1a1a1;}
+div.forum-post-ctrl a { text-decoration: none; }
+div.forum-post-ctrl span { color: black; background-color: #fefdc2; padding: 0.188em; }
+div.forum-post-content p.date { color: #a1a1a1; border-bottom: 1px solid #F7F3ED; }
+div.forum-post-content div.body p { margin-bottom:1em; }
+div.forum-paginator{border:thin #cccccc solid; padding:.3em; width:95%;margin:auto;background-color:#F7F3ED;}
+span.forum-paginator-active{font-weight:700;text-decoration:underline; height:2em;}
+
+
+
+/** inbox stuff - reuses some of the forum layout **/
+#inbox-msg li {border:1px solid #eee; border-bottom: 1px solid #F7F3ED; width: 95%; list-style: none; min-height: 11em;}
+	
+/*  tool list on admin home and manage screens  */
+ li.top-tool { 
+	list-style: none;
+	padding: 0.125em 0.125em 0.125em  0.938em;
+	margin-bottom: 0.313em; 
+	line-height: 200%; 
+	border: solid 1px #A9ADB0;
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
+	border-radius:5px;
+}
+	
+li.child-tool a { 
+	font-size: x-small;
+	font-weight: normal; 
+}
+
+ul.child-top-tool {
+	margin-top: -0.313em;
+	padding-left: 0;
+	margin-left: 0;
+	display: inline;
+}
+
+li.child-tool {
+	display: inline;
+	margin-right: 0.313em;
+	font-size: x-small;
+}
+
+
+/* browse courses */
+div.browse-course {
+	padding-bottom: 0.625em;
+}
+
+dl.browse-course {
+	width: 90%;
+	padding-bottom: 0.625em;
+	background-color: #fffaf0;
+	margin:auto;
+	margin-left:1em;
+}
+dl.browse-course dt {
+	float: left;
+	font-weight: bold;
+	width: 25%;
+	text-align: right;
+	clear: left;
+	padding: 0.313em 0.625em 0.313em 0;
+	vertical-align: middle;
+
+}
+dl.browse-course dd {
+	margin-bottom: 0.313em;
+	clear: right;
+	padding: 0.313em 0 0.313em 0.625em;
+	margin-left: 26%;
+
+}
+.row .buttons{
+	border: none;
+}
+
+/*  form fields grouping for WCAG 2.0 conformance*/
+fieldset.group_form{
+	width:95%;
+	margin:0 auto;
+	margin-bottom: 1em;
+	border: 1px #6D7B8D solid;
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
+	border-radius: 5px;
+	margin-top: .5em;
+}
+
+legend.group_form{
+	background-color:white;
+	font-weight: 600;
+	color: #4c566c;
+	padding:.5em;
+	border: 1px #6D7B8D solid;
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
+	border-radius: 5px;
+}
+
+/* highlight active links for WCAG 2.0 conformance */
+a:active:not(.subnavcontain a), 
+a:hover:not(.subnavcontain a),
+a:focus:not(.subnavcontain a),
+.buttontab-hover{
+ 	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+ 
+}
+
+/*Overrides above a:active, a:hover, a:focus so the "Navigation" button itself isn't highlighted when activated.
+Ensure styling matches that in fl-tabs.*/
+.topnavlistcontainer a:hover, .topnavlistcontainer a:active, .topnavlistcontainer a:focus{
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    );
+
+}
+
+
+/*Added by Silvia */
+div.column_primary {
+	float: left;
+	width: 42%;
+	margin: 0.313em;
+	padding: 0;
+	min-width: 10.625em;
+}
+
+div.column_equivalent{
+	float: left;
+	width: 52%;
+	margin-left:  0.938em;
+	margin-top: 0.313em;
+	margin-right: 0.313em;
+	margin-bottom: 0.313em;
+	min-width: 10.625em;
+	padding: 0.313em;
+	border: 1px solid #EEE;
+	background-color: #FFF;
+}
+
+div.resource_box{
+	border: 1px solid #aaa;
+	width: 95%;
+	margin: 0.313em;
+	padding: 0.313em;
+	min-width: 9.375em;
+	background-color: #eee;
+}
+
+h2.alternatives_to{
+	margin-top: 0.75em;
+	font-size: 90%;
+	color: #A50707;
+}
+
+div.alternative_box{
+	border: 1px solid #ddd;
+	/*width: 90%;*/
+	margin: 0.313em;
+	padding: 0.313em;
+	min-width: 9.375em;
+	background-color: #fff;
+}
+
+div.alternative_box legend {
+	color: #000;
+}
+
+div.resource_box legend {
+	color: #000;
+}
+
+label.primary a{
+	color: #A50707;
+	font-weight: bolder;
+	background-color: white;
+}
+
+/* format of "table of contents" on content page */
+#toc a 		{ display:block; margin:0.188em; }
+#toc .h2, #toc .h3, #toc .h4, #toc .h5, #toc .h6{ 
+	padding:0 0 0 0;
+}
+
+
+fieldset#toc {
+	background-color: #FEFDEF;
+	border: 1pt solid #B8AE9C;
+	width:89%;
+}
+
+#side-menu{
+	overflow:hidden;
+}
+
+/* cleans up glossary question mark line spacing*/
+sup{
+	border: 1pt solid #B8AE9C;
+	vertical-align:bottom;
+	margin-top: 1em;
+}
+
+/* jQuery tooltip styles */
+#tooltip{
+	position:absolute;
+	z-index:3000;
+	border:3px solid #111;
+	background-color:#eeeeee;
+	padding:0.313em;
+}
+#tooltip h3,#tooltip div{
+	margin:0;
+}
+
+/* style for home page modules "detail view" */
+div.home_box {
+	padding: .75em 0;
+	margin: 0 auto;
+}
+
+.outside_box{
+	background:#e0e0e0;
+	width: 17em;
+	margin: .375em;
+	padding: 0;
+	height:9.8em;
+}
+
+.inside_box{
+	width:100%;
+	margin:auto;
+	height:52%;
+	margin-bottom:.2em;
+	background:#eeeeee;
+
+}
+.details_or{
+	width:28.8em;
+	height:9.8em;
+	margin:0;
+	background-image:url(images/details_r.png);
+	background-position: top right;
+	background-repeat:no-repeat;
+}
+.details_ol{
+	height:9.8em;
+	margin:0;
+	width:.45em;
+	background-image:url(images/details_l.png);
+	background-position: top left;
+	background-repeat:no-repeat;
+}
+.details_ir{
+	width:.5em;
+	height:100%;
+	float:right;
+	background-image:url(images/details_ir.png);
+	background-position: top right;
+	background-repeat:no-repeat;
+}
+.details_il{
+	height:100%;
+	float:left;
+	background-image:url(images/details_il.png);
+	background-position: top left;
+	background-repeat:no-repeat;
+}
+.home-title{
+	font-size:12pt;
+}
+.buttonbox{
+	float:right;
+}
+.details_text{
+	margin-left:1em;
+}
+.draggable_selected {
+	background-color: lightgrey;
+	cursor: move;
+}
+
+div.menuedit{
+	float:right;
+	margin-top:-1.2em; 
+	border:1px solid #cccccc;
+}
+li.folders {
+	list-style: disc url(../../images/folder.gif) outside;
+	font-family: Helvetica,sans-serif;
+	margin-bottom: 0;
+	margin-top: 0;
+	margin-right: 0;
+}
+
+li.folders .disabled {
+	color: #B8AE9C;
+}
+
+ul.folder{
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0em;
+	padding:0em;
+}
+
+
+/*	hiding/showing  results-display */
+
+
+div#results-display{
+	display: none;
+}
+
+ul#topnavlist li {
+	padding: 0;
+	margin: 0;
+}
+	
+ul#topnavlist>li:hover, ul#topnavlist>li:hover a,  ul#topnavlist>li:active, ul#topnavlist>li:active a, ul#topnavlist>li:focus, 
+ul#topnavlist>li:focus a {
+	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+}
+
+ul#topnavlist li a  {
+ 	color: #4C566C;
+ 	text-decoration: none;
+}
+
+
+div.toolcontainer{
+	border: #cccccc 1px solid;
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
+	border-radius: 5px;
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+
+ul#subnavlist li a:hover, ul#subnavlist li a:focus, ul#subnavlist li a.active{
+}
+#subnavlist{
+	display: none;
+}
+ul#subnavlist li a, ul#subnavlist li a:visited {
+	color: #4C566C;
+}
+
+
+/* list attributes */
+ul {
+	list-style: none;
+}
+li {
+	color: black;
+	list-style: none;
+}
+
+ol#tools>li:hover {
+	/*border: 1px solid #e0e0e0;*/
+	background-color: #e6e6e6;
+	color: black; 	
+	
+ 	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+  	
+}
+ol#tools>li:hover a{
+	color: white;
+}
+
+#contentwrapper{
+	
+}
+#content-contentwrapper{
+	height:100%;
+    position:relative;	
+	z-index:1000;			
+	width:100%;
+	overflow:hidden;
+}
+
+#leftcolumn{
+	float: left;
+	width: 17em;
+	margin-left: 0.313em;
+	margin-top:-0.625em;
+}
+
+#copyright{
+	font-size: 0.5em;
+}
+#gototop{
+	text-align: center;
+	color: #4B6B90;
+}
+
+#tools{
+	margin: 0 auto;
+	padding: 0;
+}
+
+
+/* ATutor Social Styles */
+
+div .profile_container {
+	background-color:#eee; 
+	border: 1px solid #8e8e8e; 
+	width:80%; 
+	padding:0.5em; 
+	margin-bottom: 0.5em;
+}
+
+div .profile_container .top_right {
+	float: right;
+}
+
+dl.public-profile dd{
+	margin-left:0;
+}
+dl.public-profile dt {
+	float: left;
+	font-weight: bold;
+	min-width:12em;
+}
+
+/* Search form */
+div .search_form {
+	margin-bottom: 1em;
+}
+
+div .search_form .row{
+	background-color: #DEDEC0;
+	padding: 0.5em;
+}
+div .button {
+	background-color: #eee;
+	border: 1px solid #aaa;
+}
+div .button:hover{
+	background-color: #cccccc;
+	color: #ffffff;
+}
+
+/* Side menu */
+
+
+ul.social_side_menu {
+	padding-left: 2em;
+}
+ul.social_side_menu li {
+	padding-bottom: 0.2em;
+	list-style: circle;
+}
+
+div .divider {
+	border-bottom:1px solid #C1C157; 
+	padding-bottom:0.5em; 
+	margin-bottom:0.5em;
+}
+
+.activity{
+ 	line-height:18pt;
+	font-size:.8em;
+}
+
+div.contentbox, input-form{
+
+	padding:.5em;
+	background-color: #ffffff;
+    overflow:hidden;
+    border: #A9ADB0 solid 1px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius:5px;
+	border-radius: 5px;
+}
+
+div.suggestions{
+	border:1px solid #a50707;
+	margin-left:0.625em; 
+	width:50%;
+}
+li.inlinelist{
+	display: inline; 
+	padding-right: 1em;
+}
+ul.social_inline_menu{
+	background-color: #eeeeee;
+	border:thin #cccccc solid;
+	padding:.5em;
+	width:90%;
+	margin:auto;
+}
+div.social-wrapper{ 
+	width: 100%;
+}
+
+div.logo{
+float:left;
+clear:right;
+margin-left:2em;}
+
+/*mobile FSS override */
+.fl-theme-iphone [class*="fl-list"]:not(.fl-list):not(.fl-grid) a:hover, 
+.fl-theme-iphone [class*="fl-list"]:not(.fl-list):not(.fl-grid) a:focus,
+.fl-theme-iphone [class*="fl-list"]:not(.fl-list):not(.fl-grid) a:active {
+	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+  
+}
+ul#subnavlist li a:focus, ul#subnavlist li a:active, ul#subnavlist li a:hover{
+	color: white;
+}
+
+
+
+/************************************************************************************************/
+/*Adds arrows to Fluid Tabs. Here is a good guide for creating triangles with CSS: 
+http://jonrohan.me/guide/css/creating-triangles-in-css/ */
+/************************************************************************************************/
+ul.sequence-links {
+}
+
+ul.sequence-links li {
+    position:relative;
+    overflow:hidden;
+    list-style:none;
+}
+
+ul.sequence-links li.back a:link, ul.sequence-links li.back a:visited {
+    display:block;
+    padding-left:0.438em;
+   	color: #005689;
+}
+
+ul.sequence-links li.forward a:link, ul.sequence-links li.forward a:visited {
+    display:block;
+    padding-right:0.313em;
+  	color: #005689;
+}
+/*WCAG*/
+ul.sequence-links li a:hover, ul.sequence-links li a:focus, ul.sequence-links li a:active,
+ul.sequence-links li.back a:hover, ul.sequence-links li.back a:focus, ul.sequence-links li.back a:active,
+ul.sequence-links li.forward a:hover, ul.sequence-links li.forward a:focus, ul.sequence-links li.forward a:active {
+    color: #4c96f4;
+    background:transparent;
+}
+
+
+ul.sequence-links li:before, ul.sequence-links li:after, ul.sequence-links li a:before, ul.sequence-links li a:after {
+    content:"";
+    position:absolute;
+    top:50%;
+   /* left:0;*/
+}
+
+ul.sequence-links li a:before, ul.sequence-links li a:after {
+    margin:-0.5em 0 0;
+  }
+
+ul.sequence-links li a:hover:before, ul.sequence-links li a:focus:before, ul.sequence-links li a:active:before {
+ 
+}
+/*arrow that points to the left, beside the "Previous" text */
+.arrow.back a:after {/*arrow pointing to the left*/
+     background: none repeat scroll 0% 0% transparent;
+     border-color: transparent #005689;
+   
+     border-style: solid;
+     border-width: 5px 0pt 5px 6px;
+     left: 0.5em;
+     margin-top: -0.39em;
+}
+
+/*left and right triangle icons change color*/
+.arrow a:hover:after, .arrow a:focus:after, .arrow a:active:after, .arrow.forward a:hover:after, .arrow.forward a:focus:after, .arrow.forward a:active:after{
+	border-color: transparent #4c96f4;
+}
+
+.arrow.back a:after {
+     border-width: 6px 6px 6px 0pt;    
+     left: 0.188em;
+     top: 1.25em;
+}
+
+
+/*arrow that points to the right, beside the "Next" text */
+.arrow.forward a:after {
+     background: none repeat scroll 0% 0% transparent;
+     border-color: transparent #FFFFFF;
+     border-style: solid;
+     margin-top: -0.425em;
+     margin-top: -0.313em;
+   
+}
+.arrow.forward a:after {
+     /*top: 11px;*/
+       background: none repeat scroll 0% 0% transparent;
+     border-color: transparent transparent transparent    #005689;
+  	 border-width: 6px;
+  	 border-style: solid;
+  	 width:0;
+  	 height:0;
+  	 right: -0.313em;
+  	 top: 1.19em;
+}
+
+#sequence-links{
+	float: left;
+}
+	
+
+#content{
+	text-align: left;
+	width: 93.5%;
+	width: 99%;
+	border-left: #A9ADB0 1px solid;
+	border-right: #A9ADB0 1px solid;
+	border-bottom: #A9ADB0 1px solid;
+	-webkit-border-radius: 5px; 
+	-moz-border-radius: 5px; 
+	border-radius: 5px;
+	display: none;
+	position: relative;
+	top: 0em; 
+	clear: left;
+	clear: right;
+	z-index: 1;
+}
+
+/*hiding and showing content */
+
+#results-hide-show-simple-content{
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
+	border-radius: 5px;
+	border: 1px #A9ADB0 solid;
+	padding-top: .6em;
+	padding-bottom: .6em;
+	padding-right: .2em;
+	padding-left: .6em;
+	margin-bottom: 0.875em;
+	margin-top: 0.875em;
+	color: #005689;
+	background-color: none;
+}
+#results-hide-show-link{
+	color: white;
+	color: #005689;
+	text-decoration: none;	
+	display: block;
+	font-weight: bold;
+}
+
+
+.content-expand{
+	background-image:url("images/up.png");
+	background-position: 100% 100%;
+	background-repeat: no-repeat;
+}
+
+.content-closed{
+	background-image:url("images/down.png");
+	background-position: 100% 100%;
+	background-repeat: no-repeat;	
+}
+#results-display{
+	background-color: #F7F3ED; 
+	-webkit-border-radius:8px;
+	-moz-border-radius:8px;
+	border-radius: 8px;
+	border: 1px #A9ADB0 solid;
+	padding: .313em;
+	
+}
+.hide-show-container-surround a:active, .hide-show-container-surround a:focus, .hide-show-container-surround a:hover{
+	background-color: transparent;
+	
+}
+.subnavcontain2, .subnavcontain{
+	margin: .313em 0; 
+	background-color: white;
+	border: #A9ADB0 1px solid; 
+	-webkit-border-radius:8px;
+	-moz-border-radius:8px;
+	border-radius: 8px;
+	width: 100%;
+
+}
+/* .fl-theme-iphone .subnavcontain a:hover, .fl-theme-iphone .subnavcontain a:active, .fl-theme-iphone .subnavcontain a:focus*/
+.fl-theme-iphone .subnavcontain a {
+	text-decoration: none;
+
+}
+.fl-theme-iphone .subnavcontain-active{
+	color: white;
+	text-decoration: none;
+} 
+.subnavcontain3{
+	margin: .313em 0; 
+	background-color: #4c96f4;
+	background-image:	-webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+	border: #A9ADB0 1px solid; 
+	-webkit-border-radius:8px;
+	-moz-border-radius:8px;
+	border-radius: 8px;
+	width: 100%;
+} 
+#subnavlist-link{
+	display: block;
+	
+}
+#page-title-back-to-page{
+    display: inline-block;
+    width: 100%;
+}
+
+.page-title, #back-to-page{
+    float: left;
+}
+
+.fl-theme-iphone #subnavlist-link  a:active, 
+.fl-theme-iphone #subnavlist-link  a:hover, 
+.fl-theme-iphone #subnavlist-link a:focus{
+	background-color: none;
+}
+.fl-theme-iphone .subnavcontain{
+	margin-top: 1em;
+	
+}
+.rectangle2{
+	display: inline-block; 
+	color: #005689;
+	font-weight: bold; 
+	padding: .6em;
+	margin: -.1em;
+	border-right: #A9ADB0 1px solid; 
+}
+
+.rectangle2:last-child{
+	border: none;
+}
+.rectangle2 a{
+	color: #005689;
+	text-decoration: none;
+	font-weight: bold;
+}
+.rectangle{
+	display: block;
+	color: #005689;
+	font-weight: bold; 
+	padding: .313em;
+	margin: .313em 0;
+	    
+}
+#content_link_phone a:active, #content_link_phone a:focus, #content_link_phone a:hover{
+	color: #005689;
+	background-color: white;
+}
+/* style for "last modified" information of course content*/
+#content-info{
+	padding-top: 1em;
+	font-size: 80%;
+}	
+ul.my-courses-list-ul > li:hover{
+	background-color: #4c96f4;
+	color: black; 	
+ 	color: #fff;
+}
+ul.my-courses-list-ul > li:hover a{
+	color: white;
+	text-decoration: none;
+}
+
+/* to be created as a separate desktop theme file. The classes below should be removed when 
+Mark McLaren's port of mobile fss to firefox is committed to infusion: 
+https://github.com/fluid-project/infusion/blob/25ad6755ef78347b414d60bd4037a0f197f9d09d/infusion-branch/src/webapp/framework/fss/css/fss-mobile-theme-firefox.css */ 
+.fl-tabs li:first-child {
+    border-bottom-left-radius: 5px;
+    border-top-left-radius: 5px;
+}
+
+.fl-theme-iphone .fl-tabs li {
+    -moz-border-image: url("images/navbar_normal_button_insetShadow.png") 5 5 5 5 stretch;
+    background-color: #354D68;
+}
+[class*="fl-container"] [class*="fl-list"] > li:first-child, [class*="fl-container"] [class*="fl-list"] > li:first-child a {
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
+}
+[class*="fl-container"] [class*="fl-list"] > li:last-child, [class*="fl-container"] [class*="fl-list"] > li:last-child a {
+    border-bottom-left-radius: 8px;
+    border-bottom-right-radius: 8px;
+}
+
+.fl-theme-iphone .fl-tabs .fl-tabs-active {
+    background-image: -moz-linear-gradient(
+        center top,
+        rgba(149, 184, 239,1),
+        rgba(35,109,229,1),
+        rgba(149, 184, 239,1)  50%,
+        rgba(75,148,244,1) 50%
+    );
+}
+
+/* A simulation for a:active on the device, requires JS */
+/* since .fl-list is for mixed material lists, dont include them in these effects */
+.fl-theme-iphone [class*=fl-list]:not(.fl-list):not(.fl-grid) a:active,
+.fl-theme-iphone [class*=fl-list]:not(.fl-list):not(.fl-grid) a.fl-link-hilight {
+    background: url(../images/themes/iphone/listmenu_arrow.png) no-repeat right -25px,
+                -moz-linear-gradient(#4a94f4, #236de5);
+}
diff --git a/docs/themes/simplified-desktop/moz.css b/docs/themes/simplified-desktop/moz.css
new file mode 100644
index 000000000..03531d6f0
--- /dev/null
+++ b/docs/themes/simplified-desktop/moz.css
@@ -0,0 +1,464 @@
+/*
+ * Contributed by Mark McLaren on the Infusion Users List
+ * http://fluidproject.org/pipermail/infusion-users/2010-April/000186.html
+ This should be deleted from mobile/when it is committed to mobile FSS. 
+ */
+
+.fl-icon {
+    -moz-border-radius: 5px;
+}
+
+/*****************************************/
+/* 					 */
+/* 					 */
+/*         fl-theme-android              */
+/* 					 */
+/* 					 */
+/*****************************************/
+
+.fl-theme-android h1,
+.fl-theme-android h2,
+.fl-theme-android h3 {
+    background: #999 -moz-linear-gradient(
+    	center top,
+    	#ccc, 
+    	#999) no-repeat top left;
+}
+
+/***************************************/
+/* Navigation Bar */
+
+.fl-theme-android .fl-navbar {
+    background-image: -moz-linear-gradient(
+    	center top,
+        #666,
+        #333 50%,
+        #000 50%,
+        #000
+    );
+    -moz-box-shadow: 0px 0px 5px rgba(0,0,0,0.5);
+}
+
+.fl-theme-android .fl-navbar .fl-button {
+    -moz-border-image:none;
+    background-image: -moz-linear-gradient(
+    	center top,    
+        #444,
+        #666 50%,
+        #333 50%,
+        #000
+    );
+}
+.fl-theme-android .fl-navbar [class*=fl-button]:active {
+    background-image: -moz-linear-gradient(
+    	center top,   
+        #ffb347,
+        #ff702f
+    );
+}
+
+.fl-theme-android .fl-navbar .fl-backButton {
+    -moz-border-image: url(../images/themes/android/navbar_back_button_insetShadow.png) 0 15 stretch;
+}
+
+.fl-theme-android .fl-navbar .fl-button-inner {
+    -moz-border-image: url(../images/themes/android/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+}
+
+/***************************************/
+/* general purpose gel buttons */
+/* effect is applied anywhere but the navbar, which has its own button look */
+
+.fl-theme-android .fl-button {
+    -moz-border-image: url(../images/themes/android/button_bg_insetShadow.png) 10 stretch;
+    -moz-background-origin: border;
+    -moz-background-clip: border;    
+}
+.fl-theme-android .fl-button-white {
+    background-image: -moz-linear-gradient(
+    	center top,   
+    	rgba(240,240,240,0.25),
+        rgba(220,220,220,0.75),
+        rgba(240,240,240,1) 50%,
+        rgba(200,200,200,0.8) 50%
+    );
+}
+.fl-theme-android .fl-button-black {
+    background-image: -moz-linear-gradient(
+    	center top,   
+        rgba(106,106,106,0.25),
+        rgba(00,00,00,0.75),
+        rgba(130,130,130,1)  50%,
+        rgba(75,75,75,0.8) 50%
+    );
+}
+.fl-theme-android .fl-button-green {
+    background-image: -moz-linear-gradient(
+    	center top,   
+        rgba(120,190,130,0.2),
+        rgba(50,170,60,0.75),
+        rgba(120,190,130,1) 50%,
+        rgba(0,150,10,0.8) 50%
+    );
+}
+.fl-theme-android .fl-button-blue {
+    background-image: -moz-linear-gradient(
+    	center top,   
+        rgba(149, 184, 239,0.2),
+        rgba(35,109,229,0.75),
+        rgba(149, 184, 239,1)  50%,
+        rgba(75,148,244,0.8) 50%
+    );
+}
+/***************************************/
+/* tabs 1: small general purpose content dividers */
+.fl-theme-android .fl-tabs li {
+    background-image: -moz-linear-gradient(
+    	center top,   
+        #666,
+        #666 50%,
+        #000 50%,
+        #000
+    );
+    -moz-border-image: url(../images/themes/android/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+    -moz-border-left-image: none;
+    -moz-background-origin: border;
+    -moz-background-clip: border;
+}
+
+.fl-theme-android .fl-tabs .fl-tabs-active {
+    background-image: -moz-linear-gradient(
+    	center top,   
+        #ff702f,
+        #ffb347
+    );
+}
+
+/*************************************************/
+/* Ordered lists, Unordererd lists, Thumbnail lists, Icon lists, Definition lists */
+/*************************************************/
+/* Default list system setup */
+
+.fl-theme-android [class*=fl-list] > li {
+    background: transparent -moz-radial-gradient(center 45deg, circle farthest-side, 
+    	#FFF 0%, 
+    	#000 100%) no-repeat bottom center;;
+    -moz-background-size: 100% 1px; 
+}
+
+/* A simulation for a:active on the device, requires JS */
+.fl-theme-android [class*=fl-list]:not(.fl-list):not(.fl-grid) a:active,
+.fl-theme-android [class*=fl-list]:not(.fl-list):not(.fl-grid) a.fl-link-hilight {
+    background: -moz-linear-gradient(
+    	center top,   
+    	#ffb347, 
+    	#ff702f);
+}
+
+.fl-theme-android [class*=fl-list]:not(.fl-list) a.fl-link-loading {
+    background: url(../images/themes/android/listmenu_loader.gif) no-repeat 97% center,
+		        -moz-linear-gradient(
+    	center top,   
+    	#ffb347, 
+    	#ff702f);
+}
+
+/***************************************/
+/* Grid overrides, removes nav coloring */
+
+.fl-theme-android .fl-grid li a:active,
+.fl-theme-android .fl-grid .fl-link-hilight {
+    background: -moz-linear-gradient(
+    	center top,   
+    	#ffb347, #ff702f);
+}
+
+/****************************/
+/* Collapsing and expanding panels */
+
+.fl-theme-android .fl-container-autoHeading > *:first-child {
+    background: -moz-linear-gradient(
+    	center top,   
+    	#CCC, #999);
+}
+.fl-theme-android .fl-container-autoHeading > *:first-child:focus {
+    background: -moz-linear-gradient(
+    	center top,   
+    	#FFF, 
+    	#CCC);
+}
+.fl-theme-android .fl-container-autoHeading > :last-child {
+        background: transparent 
+        -moz-radial-gradient(50% 0, circle, rgba(100,100,100,1) 0%, rgba(0,0,0,0) 100%);
+    );
+}
+
+/*****************************************/
+/* 					 */
+/* 					 */
+/*         fl-theme-iphone               */
+/* 					 */
+/* 					 */
+/*****************************************/
+
+.fl-theme-iphone {
+    background: -moz-repeating-linear-gradient(top left 0deg, #c5ccd3, #c5ccd3 1px, #cfd5dd 10px, #c5ccd3 10px);
+}
+
+
+/***************************************/
+/* Navigation Bar */
+
+.fl-theme-iphone .fl-navbar {
+    background-image: -moz-linear-gradient(
+        center top,
+        #B0BCCD,
+        #889BB3 50%,
+        #6D84A2 50%,
+        #6D84A2
+    )
+}
+
+.fl-theme-iphone .fl-navbar .fl-button {
+    -moz-border-image:none;
+    background-image: -moz-linear-gradient(
+        center top,
+        #9aafca,
+        #6d8cb3 50%,
+        #4b6b90 50%,
+        #4b6b90
+    );
+}
+
+.fl-theme-iphone .fl-navbar [class*=fl-button]:active {
+    background-image: -moz-linear-gradient(
+        center top,
+        rgba(149, 184, 239,1),
+        rgba(35,109,229,1),
+        rgba(149, 184, 239,1) 35%,
+        rgba(75,148,244,1) 50%
+    );
+}
+
+.fl-theme-iphone .fl-navbar .fl-backButton {
+    /* See mobile layout for details */
+    -moz-border-image: url(../images/themes/iphone/navbar_back_button_insetShadow.png) 0 15 stretch;
+}
+
+.fl-theme-iphone .fl-navbar .fl-button-inner {
+    -moz-border-image: url(../images/themes/iphone/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+}
+
+
+/***************************************/
+/* general purpose gel buttons */
+/* effect is applied anywhere but the navbar, which has its own button look */
+
+.fl-theme-iphone .fl-button {
+    -moz-border-image: url(../images/themes/iphone/button_bg_insetShadow.png) 10 stretch stretch;
+    -moz-background-origin: border;
+    -moz-background-clip: border;
+}
+.fl-theme-iphone .fl-button-white {
+    background-image: -moz-linear-gradient(center top,
+        rgba(240,240,240,0.25),
+        rgba(220,220,220,0.75),
+        rgba(240,240,240,1),
+        rgba(200,200,200,0.8)
+    );
+}
+.fl-theme-iphone .fl-button-black {
+    background-image: -moz-linear-gradient(center top,
+        rgba(106,106,106,0.25),
+        rgba(00,00,00,0.75),
+        rgba(130,130,130,1),
+        rgba(75,75,75,0.8)
+    );
+}
+.fl-theme-iphone .fl-button-green {
+    background-image: -moz-linear-gradient(center top,
+        rgba(120,190,130,0.2),
+        rgba(50,170,60,0.75),
+        rgba(120,190,130,1),
+        rgba(0,150,10,0.8)
+    );
+}
+.fl-theme-iphone .fl-button-blue {
+    background-image: -moz-linear-gradient(center top,
+        rgba(149, 184, 239,0.2),
+        rgba(35,109,229,0.75),
+        rgba(149, 184, 239,1),
+        rgba(75,148,244,0.8)
+    );
+}
+
+/***************************************/
+/* tabs 1: small general purpose content dividers */
+
+.fl-theme-iphone .fl-tabs li {
+    background-image: -moz-linear-gradient(
+        center top,
+        #9aafca,
+        #4b6b90,
+        #6d8cb3 50%,
+        #4b6b90 50%        
+    );                    
+    -moz-border-image: url(../images/themes/iphone/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+    -moz-background-origin: border;
+    -moz-background-clip: border;
+}
+
+.fl-theme-iphone .fl-tabs .fl-tabs-active {
+    background-image: -moz-linear-gradient(
+        center top,
+        rgba(149, 184, 239,1),
+        rgba(35,109,229,1),
+        rgba(149, 184, 239,1)  50%,
+        rgba(75,148,244,1) 50%
+    );
+}
+
+/* A simulation for a:active on the device, requires JS */
+/* since .fl-list is for mixed material lists, dont include them in these effects */
+.fl-theme-iphone [class*=fl-list]:not(.fl-list):not(.fl-grid) a:active,
+.fl-theme-iphone [class*=fl-list]:not(.fl-list):not(.fl-grid) a.fl-link-hilight {
+    background: url(../images/themes/iphone/listmenu_arrow.png) no-repeat right -25px,
+                -moz-linear-gradient(#4a94f4, #236de5);
+}
+
+.fl-theme-iphone [class*=fl-list]:not(.fl-list) a.fl-link-loading {
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+		 -moz-linear-gradient(center top, #4a94f4, #236de5);
+}
+
+/****************************/
+/* Collapsing and expanding panels */
+.fl-theme-iphone .fl-container-autoHeading > *:first-child {
+    background: -moz-linear-gradient(center top, #999, #000);
+}
+.fl-theme-iphone .fl-container-autoHeading > *:first-child:focus {
+    background: -moz-linear-gradient(center top, #FFF, #CCC);
+}
+
+
+
+/*****************************************/
+/* 					 */
+/* 					 */
+/* Originates from fss-mobile-layout.css */
+/* 					 */
+/* 					 */
+/*****************************************/
+
+
+
+/***************************************/
+/**
+ * Basic overrides for fss layout
+ */
+
+.fl-icon {
+    -moz-border-radius: 5px;
+}
+
+/***************************************/
+/* iPhone general purpose gel buttons */
+/* effect is applied anywhere but the navbar, which has its own button look */
+
+.fl-button {
+    -moz-border-radius: 10px;
+}
+
+.fl-navbar .fl-button-inner {
+    -moz-background-origin: border;
+    -moz-background-clip: border;
+}
+
+
+/*************************************************/
+/* Navigation Bar
+ */
+.fl-navbar [class*=fl-button] {
+    -moz-border-radius: 5px;
+}
+
+.fl-navbar .fl-backButton {
+    -moz-border-radius: 0 5px 5px 0;  
+    -moz-background-origin: border;
+    -moz-background-clip: border;  
+}
+
+
+
+/*************************************************/
+/* iPhone tabs: general purpose dividers, or fixed to the bottom of the screen
+ */
+/*************************************************/
+
+.fl-tabs li:first-child {
+    -moz-border-radius-topleft:5px;
+    -moz-border-radius-bottomleft:5px;
+}
+.fl-tabs li:last-child {
+    -moz-border-radius-topright:5px;
+    -moz-border-radius-bottomright:5px;
+}
+
+/*************************************************/
+/* Glossy icons (and thumbnails?) */
+
+/* Glossiness for 30x30 icons */
+.fl-list-glossy > li a::before {
+    -moz-border-radius: 3px;    
+}
+
+/*************************************************/
+/* Content Panels */
+/*************************************************/
+[class*=fl-container] [class*=fl-list] > li:first-child,
+[class*=fl-container] [class*=fl-list] > li:first-child a {
+    -moz-border-radius-topleft: 8px;
+    -moz-border-radius-topright: 8px;    
+}
+
+[class*=fl-container] [class*=fl-list] > li:last-child,
+[class*=fl-container] [class*=fl-list] > li:last-child a {
+    -moz-border-radius-bottomleft:8px;
+    -moz-border-radius-bottomright:8px;    
+}
+
+[class*=fl-container] [class*=fl-list]:not(.fl-thumbnails-expanded) > li a .fl-icon {
+    -moz-border-radius-bottomleft:8px;
+    -moz-border-radius-topleft:8px;    
+}
+
+[class*=fl-container] .fl-list-thumbnails:not(.fl-thumbnails-expanded) > li,
+[class*=fl-container] .fl-list-thumbnails:not(.fl-thumbnails-expanded) > li a {
+    -moz-border-radius: 8px;
+}
+/* Panel Auto Headings */
+/* The first element found becomes the "heading" */
+.fl-container-autoHeading > *:first-child {
+	-moz-border-radius-topleft: 8px;
+	-moz-border-radius-topright: 8px;
+}
+/* The last element found becomes the "content" - list or otherwise */
+.fl-container-autoHeading > *:last-child {
+	-moz-border-radius:0px;
+	-moz-border-radius-bottomleft:8px;
+	-moz-border-radius-bottomright:8px;
+}
+.fl-container-autoHeading [class*=fl-list] > li:first-child,
+.fl-container-autoHeading [class*=fl-list] > li:first-child a {
+	-moz-border-radius:0;
+}
+.fl-container-autoHeading [class*=fl-list] > li:first-child:last-child,
+.fl-container-autoHeading [class*=fl-list] > li:first-child:last-child a {
+	-moz-border-radius-bottomleft:8px;
+	-moz-border-radius-bottomright:8px;
+}
+
+/* Collapsing and expanding panels */
+.fl-container-collapsable {
+	-moz-border-radius:8px;
+}
diff --git a/docs/themes/simplified-desktop/password_reminder.tmpl.php b/docs/themes/simplified-desktop/password_reminder.tmpl.php
new file mode 100644
index 000000000..9979edb25
--- /dev/null
+++ b/docs/themes/simplified-desktop/password_reminder.tmpl.php
@@ -0,0 +1,28 @@
+<?php 
+global $onload;
+$onload = 'document.form.form_email.focus();';
+
+require(AT_INCLUDE_PATH.'header.inc.php'); 
+?>
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+	<input type="hidden" name="form_password_reminder" value="true" />
+	<div class="input-form" style="width: 90%;">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('password_reminder'); ?></legend>
+		<div class="row">
+			<?php echo _AT('password_blurb'); ?>
+		</div>
+
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="email"><?php echo _AT('email_address'); ?></label><br />
+			<input type="text" name="form_email" id="email" size="40" />
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="submit" value="<?php echo _AT('submit'); ?>" /> <input type="submit" name="cancel" value=" <?php echo _AT('cancel'); ?> " />
+		</div>
+	</fieldset>
+	</div>
+</form>
+
+<?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/print.css b/docs/themes/simplified-desktop/print.css
new file mode 100644
index 000000000..c83c763cd
--- /dev/null
+++ b/docs/themes/simplified-desktop/print.css
@@ -0,0 +1,13 @@
+body {
+	background-color: White;
+	font-family: Helvetica, arial, sans serif;
+	margin: 0px;
+	margin-top: 0px;
+	color: black;
+	border: 0px;
+}
+
+div#side-menu, div#member-links, span#side-menushowlink, div#rightcolumn, div#suv-nav-logout, div#top-links, span#side-menuhidelink, div.sequence-links, select#jumpmenu, a#guide, div#gototop, input#jump-button, div#topnavlistcontainer, a#guide, div#breadcrumbs, div#jump-area, table.tabbed-table, div#sub-navigation, div#sequence-links, div#language, div#toc, fieldset#shortcuts {
+	display: none;
+}
+
diff --git a/docs/themes/simplified-desktop/readme.txt b/docs/themes/simplified-desktop/readme.txt
new file mode 100644
index 000000000..fac655a95
--- /dev/null
+++ b/docs/themes/simplified-desktop/readme.txt
@@ -0,0 +1,343 @@
+******************************************************************************************
+Theme:		1.6.4 Mobile Theme
+Date:		August 2011
+******************************************************************************************
+
+
+Installing:	 See section "Installing a New Theme" in the themes_readme.txt file located in the themes/ top directory.
+Licence:	Falls under the GPL agreement.  See http://www.gnu.org/copyleft/gpl.html.
+
+==============================================================================
+What's new: 
+==============================================================================
+
+/mobile.css 
+* style for android, iphone, & ipod rolled into one stylesheet
+* improved subnavigation and in-course navigation
+
+/tablet.css 
+* new style for tablet devices, beginning with -webkit browsers
+* generic CSS used to broaden browser support
+
+include/header.tmpl.php
+* accessibility: increased support for ARIA roles that Safari recognizes. Note: ARIA roles create HTML validation errors.
+
+==================================================================================
+Known Issues / More work needed
+==================================================================================
+
+why isn't simplified-desktop in svn? 
+
+Outstanding templates to be created: 
+* see "TEMPLATES - CREATED & OUTSTANDING" for a list of my progress &  "Omitted from mobile/" for a list of work that needs to be done. 
+ 
+Towards a simplified desktop theme: 
+* develop a desktop theme based on tablet.css (harder) 
+* develop a desktop theme based on mobile.css (easier) & do a final update to ensure generic CSS is used
+** update to -moz rules
+* erase commented out styles from mobile.css and tablet.css and re-order where necessary
+
+Simplify or remove this rule in mobile.css and tablet.css
+* navigation-bar-button-content
+
+Tablet bug? 
+In Firefox, the "Home" and "Previous/Next" buttons are the wrong height. Test on the tablet
+then see if it can be reproduced there before fixing. 
+
+Aesthetic improvements, mobile: 
+* Resume, Previous, Next on mobile should highlight as a block (outstanding)
+* on activation should highlight as a block (done-AUG27) 
+* the Subnavigation div should highlight as a block (done-AUG27)
+* Instructor user: (done-AUG27) /docs/mods/_standard/statistics/course_stats.php - (template now includes graph)
+
+
+* "0004796: Student user's Preferences template won't display"
+** see: http://atutor.ca/atutor/mantis/view.php?id=4796
+** see: http://atutor.ca/atutor/mantis/view.php?id=4679
+
+
+Mobile FSS 
+* "Activation hightlighting is visible on the desktop but not the on the mobile device"
+** see: http://issues.fluidproject.org/browse/FLUID-4313
+** both arrows and background color don't highlight.
+** affects .fl-lists, including:
+*** the "Navigation" menus on mobiles and tablets after a link is highlighted 
+*** docs/users/browse.php in mobile and tablets
+
+Mark McLaren's moz.css
+https://github.com/fluid-project/infusion/commit/25ad6755ef78347b414d60bd4037a0f197f9d09d#diff-7
+==================================================================================
+Omitted from mobile/
+==================================================================================
+Administrator user: 
+*Patcher 
+*/docs/mods/_core/cats_categories/admin/course_categories.php
+*/docs/mods/_core/enrolment/admin/privileges.php 
+*/docs/mods/_core/modules/install_modules.php
+*/docs/mods/_core/languages/language_editor.php
+
+Instructor user: 
+*/docs/mods/_standard/assignments/add_assignment.php
+*Course Tools
+*/docs/mods/_core/enrolment/create_course_list.php
+*/docs/mods/_core/enrolment/privileges.php
+*mods/_core/file_manager/index.php
+*file manager -- removed for mobile 
+*reading list
+*groups
+*gradebook
+*glossary
+** /docs/mods/_core/glossary/tools/index.php ** NOT DONE
+** docs/mods/_core/glossary/tools/add.php ** DONE - August 31st
+*patcher
+*student tools
+
+===================================================================================================
+Accessibility notes, features, & validation issues 
+===================================================================================================
+*Newer versions of iPods, iPads, & iPhones have limited support for WAI-ARIA. I deployed the roles that were supported. 
+VoiceOver users can enable or disable speaking, for example, of various WAI-ARIA roles. Here is Apple's documentation:
+ http://developer.apple.com/library/safari/#documentation/appleapplications/reference/SafariHTMLRef/Articles/AccessibilityRoles.html
+
+WCAG AA
+I primarily used WCAG to guide the evolution of content generated from the header and footer. 
+Below are Success Criteria that apply to my work, and I have listed criteria that don't pass
+ or that may need more attention. Further Success Criteria apply to the LMS but would depend on, 
+for example, course content used.  I checked for WCAG as a part of my AChecker workflow 
+(to WCAG AA) along with validating markup, and manually on the following capstone pages: 
+**
+
+Applicable Success Criteria 
+1.1.1 Non-text Content***
+1.3.1 Info and Relationships 
+	Note: should fieldset/legends and onkeydown be added to these pages?
+	/docs/mods/_core/users/users.php 
+	/docs/mods/_core/users/instructor_requests.php
+	/docs/mods/_core/users/master_list.php 
+	/docs/mods/_core/users/admins/index.php 
+	/docs/mods/_core/users/admins/log.php 
+	/docs/mods/_core/courses/admin/courses.php 
+	/docs/mods/_standard/forums/admin/forums.php 
+	/docs/mods/_core/courses/admin/default_mods.php 
+	/docs/mods/_core/modules/index.php 
+	/docs/mods/_standard/rss_feeds/index.php 
+	/docs/mods/_standard/announcements/index.php
+	/docs/mods/_standard/assignments/index_instructor.php
+	/docs/mods/_core/backups/index.php
+	/docs/mods/_standard/chat/manage/index.php
+	/docs/mods/_core/content/index.php 
+	/docs/mods/_standard/tracker/tools/page_student_stats.php
+	/docs/mods/_standard/forums/index.php
+	/docs/mods/_standard/faq/index_instructor.php
+	/docs/mods/_standard/polls/tools/index.php
+ 
+
+1.3.2 Meaningful Sequence
+Mobile - passes, but Tablet - fails. Logged into a course as a student user, the DOM order should match the visual order.
+I have listed this as an issue.  
+
+1.3.3 Sensory Characteristics
+1.4.3 Contrast (Minimum)
+1.4.4 Resize text
+-- Applies but unsure how to test using the zoom feature (i.e. to what proportion it magnifies to). 
+-- Increasing text size with finger gestures is disabled, but using Apple's zoom feature, text appears readable.
+
+2.1.1 Keyboard
+**Mobile - passes, but Tablet - fails (Navigation button). I have listed this as an issue. 
+2.1.2 No Keyboard Trap
+2.4.1 Bypass Blocks
+**Note: This passes for both mobile & tablet because heading groupings are used at the beginning of content. 
+**Also, skip-links are working with VoiceOver now on tablet.
+2.4.3 Focus Order
+2.4.4 Link Purpose (In Context)
+2.4.5 Multiple Ways
+2.4.6 Headings and Labels
+2.4.7 Focus Visible
+3.1.1 Language of Page
+3.2.1 On Focus
+**Is this violated by the pop-up "guide" button in the mobile and tablet devices? 
+
+3.2.3 Consistent Navigation
+3.2.4 Consistent Identification
+3.3.2 Labels or Instructions
+3.3.3 Error Suggestion - already handled 
+4.1.1 Parsing, 4.1.2 Name, Role, Value
+
+==============================================================================
+TEMPLATES - CREATED & OUTSTANDING
+==============================================================================
+ADMINISTRATORS: MOBILE -------------------------------------------------------
+
+NOTE there are 4 errors in HTML validator due to using an ARIA role. 
+
+[ADMIN-HOME] 
+1. /docs/admin/index.php -  ****  DONE / WCAG AA / Valid HTML
+2. /docs/mods/_core/users/admins/my_edit.php  ****  DONE / WCAG AA / Valid HTML
+3. /docs/mods/_core/users/admins/my_password.php  ****  DONE / WCAG AA / Valid HTML
+
+[USERS]
+1.  /docs/mods/_core/users/user_enrollment.php **** DONE / WCAG AA / Valid HTML
+2.  /docs/mods/_core/users/password_user.php **** DONE / WCAG AA / Valid HTML
+3.  /docs/mods/_core/users/create_user.php **** DONE / WCAG AA / Valid HTML
+4.  /docs/mods/_core/users/users.php **** DONE / WCAG AA / Valid HTML
+5.  /docs/mods/_core/users/instructor_requests.php **** DONE / WCAG AA / Valid HTML
+6.  /docs/mods/_core/users/master_list.php **** DONE / WCAG AA / Valid HTML (note: lacks fieldset, added onkeydown)
+7.  /docs/mods/_core/users/admin_email.php **** DONE / WCAG AA / Valid HTML  
+8.  /docs/mods/_core/users/admins/index.php **** DONE / WCAG AA / Valid HTML  (note: lacks fieldset, added onkeydown)
+9.  /docs/mods/_core/users/admins/edit.php **** DONE / WCAG AA / Valid HTML  
+10. /docs/mods/_core/users/admins/password.php **** DONE / WCAG AA / Valid HTML 
+11. /docs/mods/_core/users/admins/create.php **** DONE / WCAG AA / Valid HTML
+12. /docs/mods/_core/users/admins/log.php **** DONE / WCAG AA / Valid HTML
+13. /docs/mods/_core/users/admins/reset_log.php  **** DONE / WCAG AA / Valid HTML  
+14. /docs/mods/_core/users/edit_user.php?id=4 **** DONE / WCAG AA / Valid HTML
+
+[COURSES]
+1.  /docs/mods/_core/courses/admin/courses.php **** DONE / WCAG AA / Valid HTML (note: lacks fieldset, added onkeydown)
+2.  /docs/mods/_core/properties/admin/edit_course.php *** DONE (Linearizes)
+3.  /docs/mods/_standard/forums/admin/forums.php ****DONE HTML (note: lacks fieldset, added onkeydown)
+4.  /docs/mods/_standard/forums/admin/forum_add.php **** DONE / WCAG AA / Valid HTML
+5.  /docs/mods/_standard/forums/admin/forum_edit.php **** DONE / WCAG AA / Valid HTML
+6.  /docs/mods/_core/courses/admin/create_course.php *** DONE (Linearizes)
+7.  /docs/mods/_core/enrolment/admin/index.php3 ****  DONE / WCAG AA / Valid HTML
+8.  /docs/mods/_core/enrolment/admin/privileges.php  **** NOT DONE NEEDS TEMPLATING 
+9.  /docs/mods/_core/courses/admin/default_mods.php *** DONE / WCAG AA / Valid HTML - should not be a part of mobile.
+10. /docs/mods/_core/courses/admin/default_side.php **** DONE / HELP WCAG / Valid HTML
+11. /docs/mods/_standard/support_tools/scaffolds.php **** DONE / WCAG AA / Valid HTML
+12. /docs/mods/_core/cats_categories/admin/create_category.php  **** DONE /WCAG AA / Valid HTML
+13. /docs/mods/_core/cats_categories/admin/course_categories.php **** NOT DONE NEEDS TEMPLATING  (subcategories must display)
+
+[PATCHER] 
+DON'T INCLUDE IN MOBILE THEME. 
+http://localhost/GSoC2011/docs/mods/_standard/patcher/index_admin.php
+
+
+[PHOTOS] 
+1.  /docs/mods/_standard/photos/index_admin.php **** DONE / WCAG AA / Valid HTML 
+2.  /docs/mods/_standard/photos/admin/preferences.php  **** DONE / WCAG AA / Valid HTML 
+
+[MODULES] 
+1.  /docs/mods/_core/modules/index.php **** DONE / WCAG AA / Valid HTML (note: lacks fieldset, added onkeydown) -  ?
+2.  /docs/mods/_core/modules/install_modules.php  **** INSTALL MODULES SHOULD BE ENABLED FOR IPAD.CSS and NOT MOBILE -- TOO COMPLICATED 
+3.  /docs/mods/_core/modules/details.php **** DONE / WCAG AA / Valid HTML *** won't text wrap. 
+
+[SYSTEM PREFERENCES]
+1.  /docs/admin/config_edit.php  **** DONE / WCAG AA / Valid HTML 
+2.  /docs/mods/_core/languages/language_translate.php -- **** DONE, VALID WCAG, Valid HTML
+3.  /docs/mods/_core/languages/language_import.php  -- **** DONE, WCAG AA, VALID HTML 
+4.  /docs/mods/_core/languages/language.php -- **** DONE, VALID WCAG, HELP on HTML (CHANNEL BUG)  *** valid HTML except for fieldset
+5.  /docs/mods/_core/languages/language_editor.php -  **** NOT DONE NEEDS TEMPLATING 
+6.  /docs/mods/_standard/rss_feeds/preview.php
+7.  /docs/mods/_standard/rss_feeds/edit_feed.php **** DONE / WCAG AA / Valid HTML
+8.  /docs/mods/_standard/rss_feeds/index.php **** DONE / WCAG AA / Valid HTML (note: lacks fieldset, added onkeydown)
+9. /docs/mods/_standard/rss_feeds/add_feed.php **** DONE / WCAG AA / Valid HTML
+10. /docs/mods/_standard/tile_search/admin/module_setup.php **** DONE / HELP WCAG / HELP HTML (CHANNEL BUG)
+11. /docs/mods/_standard/google_search/admin/module_prefs.php **** DONE, VALID WCAG, HTML good (except for legacy <b> tag)
+12. /docs/mods/_standard/social/admin/delete_applications.php ==  already templated
+13. /docs/mods/_standard/social/index_admin.php **** DONE / WCAG AA / Valid HTML
+14. /docs/admin/cron_config.php **** DONE / WCAG AA / Valid HTML -- wrap bug. 
+15. /docs/admin/error_logging.php
+
+INSTRUCTORS: MOBILE ---------------------------------------------------------------------------------- 
+	--- course home ***DONE 
+	--- networking ***DONE 
+	--- glossary ***DONE 
+	--- mytracker ***DONE 
+	--- index ***DONE
+
+[INBOX]
+/docs/inbox/index.php **** DONE
+/docs/inbox/sent_messages.php **** DONE
+/docs/inbox/send_message.php **** DONE
+/docs/inbox/export.php **** DONE
+
+[ANNOUNCEMENTS] 
+/docs/mods/_standard/announcements/index.php **** DONE 
+/docs/mods/_standard/announcements/add_news.php **** DONE
+/docs/mods/_standard/announcements/edit_news.php **** DONE 
+
+[ASSIGNMENTS]
+/docs/mods/_standard/assignments/index_instructor.php **** DONE
+NOT DONE: /docs/mods/_standard/assignments/add_assignment.php **** NOT DONE, remove for mobile? 
+
+[BACKUPS]
+/docs/mods/_core/backups/index.php  **** DONE 
+/docs/mods/_core/backups/create.php **** DONE 
+/docs/mods/_core/backups/edit.php **** DONE 
+/docs/mods/_core/backups/upload.php **** DONE
+/docs/mods/_core/backups/delete.php **** DONE 
+
+[CHAT] 
+/docs/mods/_standard/chat/manage/index.php **** DONE 
+/docs/mods/_standard/chat/manage/start_transcript.php **** 
+
+[CONTENT]
+/docs/mods/_core/content/index.php  **** DONE 
+/docs/mods/_core/editor/edit_content_folder.php?cid=240 **** DONE 
+/docs/mods/_standard/tracker/tools/page_student_stats.php **** DONE 
+/docs/mods/_standard/tracker/tools/index.php  **** DONE 
+/docs/mods/_standard/tracker/tools/student_usage.php **** DONE 
+/docs/mods/_standard/tracker/tools/reset.php ***** DONE 
+/docs/mods/_core/editor/add_content.php **** NOT DONE, remove for mobile? 
+/docs/mods/_core/editor/edit_content.php? **** NOT DONE, remove for mobile? (link from /index.php should be removed)
+
+[COURSE EMAIL] 
+http://localhost/GSoC2011/docs/mods/_standard/course_email/course_email.php **** DONE 
+
+[ENROLLMENT]
+/docs/mods/_core/enrolment/export_course_list.php **** DONE 
+/docs/mods/_core/enrolment/import_course_list.php **** DONE 
+/docs/mods/_core/enrolment/create_course_list.php *** Remove for mobile
+/docs/mods/_core/enrolment/index.php **** DONE 
+/docs/mods/_core/enrolment/privileges.php   **** NOT DONE
+
+
+[FORUMS]
+/docs/mods/_standard/forums/edit_forum.php  *** DONE
+/docs/mods/_standard/forums/index.php  *** DONE
+/docs/mods/_standard/forums/add_forum.php  *** DONE
+/docs/mods/_standard/farchive/index_instructor.php  *** DONE
+
+
+[FAQ] 
+/docs/mods/_standard/faq/add_question.php  *** DONE
+/docs/mods/_standard/faq/index_instructor.php  *** DONE
+/docs/mods/_standard/faq/add_topic.php *** DONE  *** DONE
+/docs/mods/_standard/faq/edit_topic.php *** DONE  *** DONE
+/docs/mods/_standard/faq/edit_question.php  *** DONE
+
+
+[GLOSSARY]
+/docs/mods/_core/glossary/tools/add.php
+NOT DONE
+
+[GRADEBOOK]
+NOT DONE
+
+[GROUPS]
+/docs/mods/_core/groups/create.php
+/docs/mods/_core/groups/create_automatic.php
+/docs/mods/_core/groups/create_manual.php
+NOT DONE: - /docs/mods/_core/groups/index.php
+
+
+[POLLS] 
+/docs/mods/_standard/polls/tools/index.php  *** DONE
+/docs/mods/_standard/polls/tools/edit.php  *** DONE
+/docs/mods/_standard/polls/tools/add.php  *** DONE
+
+[PROPERTIES] 
+http://localhost/GSoC2011/docs/mods/_core/properties/course_properties.php  *** DONE
+
+[STUDENT TOOLS]
+NOT DONE: /docs/mods/_standard/student_tools/instructor_index.php 
+
+----------------------------------------------------------------------------------------
+TABLET TEMPLATE: STUDENT 
+*Note: there are 4 ARIA-errors! 
+
+/docs/login.php - WCAG AA / Valid HTML
+/docs/browse.php - WCAG AA / Valid HTML - 6 errors - ARIA-related
+/docs/users/profile.php  - WCAG AA / Valid HTML
+/docs/users/preferences.php - WCAG AA / Valid HTML
+/docs/users/index.php - WCAG AA / Problem with HTML validation, likely to do with the "Things Current" list
+/docs/registration.php
diff --git a/docs/themes/simplified-desktop/registration.tmpl.php b/docs/themes/simplified-desktop/registration.tmpl.php
new file mode 100644
index 000000000..176806089
--- /dev/null
+++ b/docs/themes/simplified-desktop/registration.tmpl.php
@@ -0,0 +1,239 @@
+<?php 
+require(AT_INCLUDE_PATH.'header.inc.php'); 
+?>
+
+<script language="JavaScript" src="sha-1factory.js" type="text/javascript"></script>
+
+<script type="text/javascript">
+function encrypt_password()
+{
+	document.form.password_error.value = "";
+
+	err = verify_password(document.form.form_password1.value, document.form.form_password2.value);
+	
+	if (err.length > 0)
+	{
+		document.form.password_error.value = err;
+	}
+	else
+	{
+		document.form.form_password_hidden.value = hex_sha1(document.form.form_password1.value);
+		document.form.form_password1.value = "";
+		document.form.form_password2.value = "";
+	}
+}
+</script>
+
+<form method="post" action="<?php if (isset($_REQUEST["en_id"]) && $_REQUEST["en_id"] <> "") $getvars = '?en_id='. $_REQUEST["en_id"]; echo $_SERVER['PHP_SELF'] . $getvars; ?>" name="form">
+<?php global $languageManager, $_config, $moduleFactory; ?>
+<input name="ml" type="hidden" value="<?php echo $this->ml; ?>" />
+<input name="password_error" type="hidden" />
+<input type="hidden" name="form_password_hidden" value="" />
+<input type="hidden" name="registration_token" value="<?php echo sha1($_SESSION['token']); ?>" />
+
+<div class="input-form">
+<fieldset class="group_form"><legend class="group_form"><?php echo _AT('required_information'); ?></legend>
+
+<p><span class="required">*</span><?php echo _AT('required_field'); ?></p>
+	<?php if (!$_POST['member_id'] && defined('AT_MASTER_LIST') && AT_MASTER_LIST && !admin_authenticate(AT_ADMIN_PRIV_USERS, TRUE)): ?>
+		<div class="row">
+			<h3><?php echo _AT('account_authorization'); ?></h3>
+		</div>
+
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="student_id"><?php echo _AT('student_id'); ?></label><br />
+			<input id="student_id" name="student_id" type="text" size="15" maxlength="15" value="<?php echo stripslashes(htmlspecialchars($_POST['student_id'])); ?>" /><br />
+		</div>
+
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="student_pin"><?php echo _AT('student_pin'); ?></label><br />
+			<input id="student_pin" name="student_pin" type="password" size="15" maxlength="15" value="<?php echo stripslashes(htmlspecialchars($_POST['student_pin'])); ?>" /><br />
+		</div>
+	<?php endif; ?>
+
+	<?php 
+		$table_title="
+		<div class=\"row\">
+			<h3>" . _AT('course_to_auto_enroll'). "</h3>
+			<small>&middot; " ._AT('auto_enroll_msg')."</small>
+		</div>";
+		
+		require(AT_INCLUDE_PATH.'html/auto_enroll_list_courses.inc.php'); 
+	?>
+	
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="login"><?php echo _AT('login_name'); ?></label><br />
+		<?php if ($_POST['member_id']) : ?>
+				<span id="login"><?php echo stripslashes(htmlspecialchars($_POST['login'])); ?></span>
+				<input name="member_id" type="hidden" value="<?php echo intval($_POST['member_id']); ?>" />
+				<input name="login" type="hidden" value="<?php echo stripslashes(htmlspecialchars($_POST['login'])); ?>" />
+		<?php else: ?>
+			<input id="login" name="login" type="text" maxlength="20" size="30" value="<?php echo stripslashes(htmlspecialchars($_POST['login'])); ?>" title="<?php echo _AT('login_name').':'._AT('contain_only'); ?>"/><br />
+			<small>&middot; <?php echo _AT('contain_only'); ?><br />
+				   &middot; <?php echo _AT('20_max_chars'); ?></small>
+		<?php endif; ?>
+	</div>
+
+	<?php if (!admin_authenticate(AT_ADMIN_PRIV_USERS, TRUE) || !$_POST['member_id']): ?>
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="form_password1"><?php echo _AT('password'); ?></label><br />
+			<input id="form_password1" name="form_password1" type="password" size="15" maxlength="15" title="<?php echo _AT('password').':'._AT('combination'); ?>"/><br />
+			<small>&middot; <?php echo _AT('combination'); ?><br />
+				   &middot; <?php echo _AT('15_max_chars'); ?></small>
+		</div>
+
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="form_password2"><?php echo _AT('password_again'); ?></label><br />
+			<input id="form_password2" name="form_password2" type="password" size="15" maxlength="15" />
+		</div>
+	<?php endif; ?>
+
+	<?php if (isset($_config['use_captcha']) && $_config['use_captcha']==1 && !$this->no_captcha): ?>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span>
+		<label for="secret"><img src="<?php echo AT_INCLUDE_PATH; ?>securimage/securimage_show.php?sid=<?php echo md5(uniqid(time())); ?>" id="simage" align="left" /></label>
+		<a href="<?php echo AT_INCLUDE_PATH; ?>securimage/securimage_play.php" title="<?php echo _AT('audible_captcha'); ?>"><img src="<?php echo AT_INCLUDE_PATH; ?>securimage/images/audio_icon.gif" alt="<?php echo _AT('audible_captcha'); ?>" onclick="this.blur()" align="top" border="0"></a><br>
+		<a href="#" title="<?php echo _AT('refresh_image'); ?>" onclick="document.getElementById('simage').src = '<?php echo AT_INCLUDE_PATH; ?>securimage/securimage_show.php?sid=' + Math.random(); return false"><img src="<?php echo AT_INCLUDE_PATH; ?>securimage/images/refresh.gif" alt="<?php echo _AT('refresh_image'); ?>" onclick="this.blur()" align="bottom" border="0"></a>
+
+		<br /><br />
+		<label for="secret"><?php echo _AT('image_validation_text'); ?></label>
+		<input id="secret" name="secret" type="text" size="6" maxlength="6" value="" />
+		<br />
+		<small><?php echo _AT('image_validation_text2'); ?><br /></small>
+	</div>
+	<?php endif; ?>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="email"><?php echo _AT('email_address'); ?></label><br />
+		<input id="email" name="email" type="text" size="30" maxlength="50" value="<?php echo stripslashes(htmlspecialchars($_POST['email'])); ?>" />
+		<input type="checkbox" id="priv" name="private_email" value="1" <?php if ($_POST['private_email'] || !isset($_POST['submit'])) { echo 'checked="checked"'; } ?> /><label for="priv"><?php echo _AT('keep_email_private');?></label>
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="email2"><?php echo _AT('email_again'); ?></label><br />
+		<input id="email2" name="email2" type="text" size="30" maxlength="60" value="<?php echo stripslashes(htmlspecialchars($_POST['email2'])); ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="first_name"><?php echo _AT('first_name'); ?></label><br />
+		<input id="first_name" name="first_name" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['first_name'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="second_name"><?php echo _AT('second_name'); ?></label><br />
+		<input id="second_name" name="second_name" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['second_name'])); ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="last_name"><?php echo _AT('last_name'); ?></label><br />
+		<input id="last_name" name="last_name" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['last_name'])); ?>" />
+	</div>
+	
+	<?php if (admin_authenticate(AT_ADMIN_PRIV_USERS, TRUE)): 
+			if ($_POST['status'] == AT_STATUS_INSTRUCTOR) {
+				$inst = ' checked="checked"';
+			} else if ($_POST['status'] == AT_STATUS_STUDENT) {
+				$stud = ' checked="checked"';
+			}  else if ($_POST['status'] == AT_STATUS_DISABLED) {
+				$disa = ' checked="checked"';
+			} else {
+				$uncon = ' checked="checked"';
+			}?>
+			<input type="hidden" name="id" value="<?php echo $_POST['member_id']; ?>" />
+			<div class="row">
+				<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><?php echo _AT('account_status'); ?><br />
+
+				<input type="radio" name="status" value="0" id="disa" <?php echo $disa; ?> /><label for="disa"><?php echo _AT('disabled'); ?></label>
+				<?php if (defined('AT_EMAIL_CONFIRMATION') && AT_EMAIL_CONFIRMATION): ?>
+					<input type="radio" name="status" value="1" id="uncon" <?php echo $uncon; ?> /><label for="uncon"><?php echo _AT('unconfirmed'); ?></label>
+				<?php endif; ?>
+
+				<input type="radio" name="status" value="2" id="stud" <?php echo $stud; ?> /><label for="stud"><?php echo _AT('student'); ?></label>
+
+				<input type="radio" name="status" value="3" id="inst" <?php echo $inst; ?> /><label for="inst"><?php echo _AT('instructor'); ?></label>
+
+				<input type="hidden" name="old_status" value="<?php echo $_POST['old_status']; ?>" />
+			</div>
+	<?php endif; ?>
+</fieldset>
+<fieldset class="group_form"><legend class="group_form"><?php echo _AT('personal_information').' ('._AT('optional').')'; ?></legend>
+	<?php 
+	$mod = $moduleFactory->getModule('_standard/profile_pictures');
+	if (admin_authenticate(AT_ADMIN_PRIV_USERS, TRUE) && $_POST['member_id'] && $mod->isEnabled() === TRUE): ?>
+		<div class="row">
+			<?php echo _AT('picture'); ?><br/>
+			<?php if (profile_image_exists($_POST['member_id'])): ?>
+				<a href="get_profile_img.php?id=<?php echo $_POST['member_id'].SEP.'size=o'; ?>"><?php print_profile_img($_POST['member_id']); ?></a>
+				<input type="checkbox" name="profile_pic_delete" value="1" id="profile_pic_delete" /><label for="profile_pic_delete"><?php echo _AT('delete'); ?></label>
+			<?php else: ?>
+				<?php echo _AT('none'); ?> <a href="mods/_standard/profile_pictures/admin/profile_picture.php?member_id=<?php echo $_POST['member_id']; ?>"><?php echo _AT('add'); ?></a>
+			<?php endif; ?>
+		</div>
+	<?php endif; ?>
+
+	<?php if (admin_authenticate(AT_ADMIN_PRIV_USERS, TRUE) && defined('AT_MASTER_LIST') && AT_MASTER_LIST): ?>
+		<input type="hidden" name="old_student_id" value="<?php echo $_POST['old_student_id']; ?>" />
+		<div class="row">
+			<label for="student_id" value="student id"><?php echo _AT('student_id'); ?></label><br />
+				<input type="text" id="student_id" name="student_id" value="<?php echo $_POST['student_id']; ?>" size="20" /><br />
+		</div>
+		<div class="row">
+			<input type="checkbox" id="overwrite" name="overwrite" value="1" <?php if ($_POST['overwrite']) { echo 'checked="checked"'; } ?> /><label for="overwrite"><?php echo _AT('overwrite_master');?></label>
+		</div>
+
+	<?php endif; ?>
+
+	<div class="row">
+		<?php echo _AT('date_of_birth'); ?><br />
+		<label for="year"><?php echo _AT('year'); ?>: </label><input id="year" class="formfield" name="year" type="text" size="4" maxlength="4" value="<?php echo $_POST['year']; ?>" />  <label for="month"><?php echo _AT('month'); ?>: </label><input id="month" class="formfield" name="month" type="text" size="2" maxlength="2" value="<?php echo $_POST['month']; ?>" /> <label for="day"><?php echo _AT('day'); ?>: </label><input id="day" class="formfield" name="day" type="text" size="2" maxlength="2" value="<?php echo $_POST['day']; ?>" />
+	</div>
+
+	<div class="row">
+		<?php echo _AT('gender'); ?><br />
+		<input type="radio" name="gender" id="m" value="m" <?php if ($_POST['gender'] == 'm') { echo 'checked="checked"'; } ?> /><label for="m"><?php echo _AT('male'); ?></label> <input type="radio" value="f" name="gender" id="f" <?php if ($_POST['gender'] == 'f') { echo 'checked="checked"'; } ?> /><label for="f"><?php echo _AT('female'); ?></label>  <input type="radio" value="n" name="gender" id="ns" <?php if (($_POST['gender'] == 'n') || ($_POST['gender'] == '')) { echo 'checked="checked"'; } ?> /><label for="ns"><?php echo _AT('not_specified'); ?></label>
+	</div>
+
+	<div class="row">
+		<label for="address"><?php echo _AT('street_address'); ?></label><br />
+		<input id="address" name="address" size="40" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['address'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="postal"><?php echo _AT('postal_code'); ?></label><br />
+		<input id="postal" name="postal" size="7" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['postal'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="city"><?php echo _AT('city'); ?></label><br />
+		<input id="city" name="city" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['city'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="province"><?php echo _AT('province'); ?></label><br />
+		<input id="province" name="province" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['province'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="country"><?php echo _AT('country'); ?></label><br />
+		<input id="country" name="country" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['country'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="phone"><?php echo _AT('phone'); ?></label><br />
+		<input size="11" name="phone" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['phone'])); ?>" id="phone" />
+	</div>
+
+	<div class="row">
+		<label for="website"><?php echo _AT('web_site'); ?></label><br />
+		<input id="website" name="website" size="40" type="text" value="<?php if ($_POST['website'] == '') { echo 'http://'; } else { echo stripslashes(htmlspecialchars($_POST['website'])); } ?>" />
+	</div>
+</fieldset>
+	<div class="row buttons">
+		<input type="submit" name="submit" value=" <?php echo _AT('save'); ?> " accesskey="s" onclick="encrypt_password()" class="button"/>
+		<input type="submit" name="cancel" value=" <?php echo _AT('cancel'); ?> "  class="button" />
+	</div>
+</div>
+</form>
+
+<?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/rtl.css b/docs/themes/simplified-desktop/rtl.css
new file mode 100644
index 000000000..4e06fdff8
--- /dev/null
+++ b/docs/themes/simplified-desktop/rtl.css
@@ -0,0 +1,16 @@
+/* for right to left languages */
+html, body {
+	direction: rtl;
+}
+
+.img-size-tree {
+	vertical-align: middle;
+	margin-top: 0px;
+	height:1.45em;
+	width:1.45em;
+	float: right;
+}
+
+div.box {
+	line-height:150%;
+}
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/screenshot.gif b/docs/themes/simplified-desktop/screenshot.gif
new file mode 100644
index 000000000..3b01840b8
Binary files /dev/null and b/docs/themes/simplified-desktop/screenshot.gif differ
diff --git a/docs/themes/simplified-desktop/social/activities.tmpl.php b/docs/themes/simplified-desktop/social/activities.tmpl.php
new file mode 100644
index 000000000..cee24c31f
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/activities.tmpl.php
@@ -0,0 +1,32 @@
+
+<div class="">
+	<div class="headingbox">
+		<h3><?php echo _AT('network_updates'); ?></h3>
+		<?php
+			$user = new Member($_SESSION['member_id']); 
+			$count = $user->getVisitors();
+			echo _AT('visitor_counts').': '.$count['total'];
+		?>
+	</div>
+
+
+	<div class="contentbox">
+	<?php
+	/**
+	 * Loop through all the friends and print out a list.  
+	 */
+	if (!empty($this->activities)): ?>
+			<ul>
+				<?php foreach ($this->activities as $id=>$array): ?>
+				<li class="activity"><?php echo $array['created_date']. ' - '. printSocialName($array['member_id']).' '. $array['title']; ?></li>
+				<?php endforeach; ?>
+			</ul>
+			<?php //little hack, show_all will only be displayed when the flag is used.
+			if (sizeof($this->activities)==SOCIAL_FRIEND_ACTIVITIES_MAX): ?>
+			<a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'activities.php', AT_PRETTY_URL_IS_HEADER); ?>"><?php echo _AT('show_all');?></a>
+			<?php endif; ?>	
+	<?php else: ?>
+	<?php echo _AT('no_activities'); ?>
+	<?php endif; ?>
+	</div><br />
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/admin/delete_applications.tmpl.php b/docs/themes/simplified-desktop/social/admin/delete_applications.tmpl.php
new file mode 100644
index 000000000..fd6036877
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/admin/delete_applications.tmpl.php
@@ -0,0 +1,42 @@
+<form class="input-form" action="<?php echo AT_SOCIAL_BASENAME;?>admin/delete_applications.php" method="post">
+<div class="gadget_wrapper">
+<div class="headingbox"><h3><?php echo _AT('available_applications'); ?></h3></div>
+<div class="contentbox" style="padding:1em;">
+	
+<?php if (!empty($this->all_apps)): ?>
+<?php
+	foreach ($this->all_apps as $id=>$app_obj): 
+	//skip the ones that are installed already
+	if ($this->list_of_my_apps[$id]!=null){
+		continue;
+	}
+	$author = ($app_obj->getAuthor()!='')?$app_obj->getAuthor():_AT('unknown'); 	
+?>
+	<div>
+		<div style="float:left; ">
+			<?php echo $app_obj->getAppLink($app_obj->getTitle(), $id); ?><br/>
+			<?php echo $app_obj->getAppLink('<img src="'.$app_obj->getThumbnail().'" alt=""/>', $id); ?><br/>
+			<?php echo _AT('by'); ?> 
+			<?php if ($app_obj->getAuthorEmail()!=''): ?>
+				<a href="<?php echo $app_obj->getAuthorEmail(); ?>"><?php echo $author; ?></a>
+			<?php else: echo $author; ?>
+			<?php endif; ?>			
+		</div>
+
+		<div style="float: right;">
+			<label for="app_<?php echo $id;?>"><?php echo _AT('delete');?></label>
+			<input type="checkbox" id="app_<?php echo $id;?>" name="apps[]" value="<?php echo $id; ?>" />
+		</div>
+		<div style="width:60%; margin-left:10em; padding-top:1.5em;">
+			<?php echo $app_obj->getDescription(); ?><br/><br/>
+			<?php echo $app_obj->getUrl(); ?><br/>
+		</div>
+		<div style="clear:both;"><hr/></div>
+	</div>
+<?php endforeach; ?>
+<?php else: ?>
+<?php echo _AT('no_gadgets_installed'); ?>
+<?php endif; ?>
+</div></div>
+<div class="row" style="float: right;"><input class="button" type="submit" name="delete" value="<?php echo _AT('delete');?>"/></div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/application_settings.tmpl.php b/docs/themes/simplified-desktop/social/application_settings.tmpl.php
new file mode 100644
index 000000000..7c6ea39ff
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/application_settings.tmpl.php
@@ -0,0 +1,66 @@
+<div class="social-wrapper">
+<form method="post" action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'applications.php');?>">
+<?php 
+  $html = '<div>';
+  if (! empty($this->settings)) {
+    $settings = $this->settings;
+    foreach ($settings as $key => $setting) {
+      $name = ! empty($setting->displayName) ? $setting->displayName : $key;
+      $default = isset($setting->default) ? $setting->default : '';
+//      $value = isset($vars['application']['user_prefs'][$key]) ? $vars['application']['user_prefs'][$key] : $default;
+      $html .= "<div class=\"settings_label\">$name</div>";
+      switch ($setting->type) {
+        case 'ENUM':
+          $html .= "<select name=\"$key\">\n";
+          foreach ($setting->enumValues as $k => $v) {
+            $sel = ($k == $value) ? ' SELECTED' : '';
+            $html .= "<option value=\"$k\" $sel>$v</option>\n";
+          }
+          $html .= "</select>\n";
+          break;
+        case 'STRING':
+			if (isset($this->user_settings[$key]) && $this->user_settings[$key]!=''){
+				$default=$this->user_settings[$key];
+			}
+			$html .= "<input type=\"text\" name=\"$key\" value=\"$default\" />\n";
+			break;
+		case 'HIDDEN':
+			//hide these for now so that they don't get saved?
+			//echo "<input type=\"hidden\" name=\"$key\" value=\"$default\" />\n";
+			$html = '';	//do not display anything
+			break;
+        case 'BOOL':
+			//TODO add radio boxes here, should they be yes / no?
+			$yes = '';
+			$no = '';
+			if ($default=='true'){
+				$yes = ' checked="checked"';
+			} else {
+				$no = ' checked="checked"';
+			}
+			$html .= '<label for="'.$key.'_yes">'._AT('yes').'</label>';
+			$html .= '<input id="'.$key.'_yes" type="radio" name="'.$key.'" value="true" '.$yes.' />';
+			$html .= '<label for="'.$key.'_no">'._AT('no').'</label>';
+			$html .= '<input id="'.$key.'_no" type="radio" name="'.$key.'" value="false" '.$no.' />';			
+			break;
+        case 'LIST':
+			//TODO not sure what to do with this one yet
+			break;
+        case 'NUMBER':
+			$html .= "<input type=\"text\" name=\"$key\" value=\"$default\" />\n";
+			break;
+      }
+    }
+  }
+  if ($html != '') : 
+	  echo $html . "</div>"; 
+  ?>
+  <input type="hidden" name="app_id" value="<?php echo $this->app_id; ?>" />
+  <input type="hidden" name="app_settings" value="1" />
+  <input type="submit" value="<?php echo _AT('save');?>"/>
+  <?php else: ?>
+  <?php echo _AT('no_settings'); ?>
+  <?php endif; ?>
+</form>
+<div style="clear:both;"></div>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/applications.tmpl.php b/docs/themes/simplified-desktop/social/applications.tmpl.php
new file mode 100644
index 000000000..6f5bf97f2
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/applications.tmpl.php
@@ -0,0 +1,108 @@
+<!--  compressed with java -jar {$path}/yuicompressor-2.3.5.jar -o {$file}-min.js {$file}.js -->
+<script type="text/javascript"
+	src="<?php echo AT_SHINDIG_URL; ?>/gadgets/js/rpc.js?c=1"></script>
+<!-- header.inc.php has jscript/InfusionAll.js imported.  Jquery should be there with it
+<script type="text/javascript" src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/jquery-1.3.2.js"></script>
+-->
+<script type="text/javascript"
+	src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/prototype.js"></script>
+<script type="text/javascript" src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/container.js"></script>
+<div class="social-wrapper">
+<div class="search_form">	
+		<div class="headingbox"><h3><?php echo _AT('add_application'); ?></h3></div>
+		<div class="contentbox">
+			<form method="POST" action="<?php echo url_rewrite(AT_SOCIAL_BASENAME."applications.php"); ?>">
+			<label for="app_url"><?php echo _AT('add_application_url'); ?>: </label>
+			<input id="app_url" name="app_url" type="text" />
+			<input type="hidden" name="add_application" value="1" />
+			<input type="submit" value="<?php echo _AT('add_application'); ?>" class="button" />
+			</form>
+
+			<form method="POST" action="<?php echo url_rewrite(AT_SOCIAL_BASENAME."applications.php"); ?>">
+			<?php if (!isset($this->list_of_all_apps)): ?>
+			<input type="hidden" name="show_applications" value="1" />
+			<input type="submit" value="<?php echo _AT('show_available_applications'); ?>" class="button" />
+			<?php else: ?>
+			<input type="submit" value="<?php echo _AT('show_your_applications'); ?>" class="button" />	
+			<?php endif; ?>
+			</form>
+			<button type="button"  onclick="ATutor.poptastic('http://atutor.ca/get_gadgets.php')" class="button" /><?php echo _AT('find_gadgets'); ?></button>
+		</div>
+</div>
+
+<?php if (isset($this->list_of_all_apps) && !empty($this->list_of_all_apps)): ?>
+<div class="gadget_wrapper">
+<div class="headingbox"><h3><?php echo _AT('available_applications'); ?></h3></div>
+<?php	
+	foreach ($this->list_of_all_apps as $id=>$app_obj): 
+	//skip the ones that are installed already
+	if ($this->list_of_my_apps[$id]!=null){
+		continue;
+	}
+	$author = ($app_obj->getAuthor()!='')?$app_obj->getAuthor():_AT('unknown'); 	
+?>
+<div class="contentbox">	
+	<div class="contentbox-a">
+		<?php echo $app_obj->getAppLink($app_obj->getTitle(), $id); ?><br/>
+		<?php echo $app_obj->getAppLink('<img src="'.$app_obj->getThumbnail().'"/>', $id); ?><br/>
+		<?php echo _AT('by'); ?> 
+		<?php if ($app_obj->getAuthorEmail()!=''): ?>
+			<a href="mailto:<?php echo $app_obj->getAuthorEmail(); ?>"><?php echo $author; ?></a>
+		<?php else: echo $author; ?>
+		<?php endif; ?>			
+	</div>
+
+	<div class="contentbox-b">
+	<!--
+		<a href="<?php echo  'mods/social/applications.php?app_id='.$id.SEP.'settings=1'; ?>"><img src="<?php echo $_base_href;?>mods/social/images/icon-settings.png" alt="<?php echo _AT('settings');?>" title="<?php echo _AT('settings');?>" border="0"/></a>
+	-->
+		<a href="<?php echo AT_SOCIAL_BASENAME.'applications.php?app_id='.$id.SEP.'add=1'; ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME;?>images/plus_icon.gif" alt="<?php echo _AT('add_to_mygadgets');?>" title="<?php echo _AT('add_to_mygadgets');?>" border="0"/></a>
+	</div>
+	<div class="contentbox-c">
+		<?php echo $app_obj->getDescription(); ?><br/><br/>
+		<?php echo $app_obj->getUrl(); ?><br/>
+	</div>
+	<br/>
+</div>
+<?php endforeach; ?>
+</div>
+<?php else: ?>
+<div class="gadget_wrapper">
+<div class="headingbox"><h3><?php echo _AT('your_applications'); ?></h3></div>
+<?php	
+	foreach ($this->list_of_my_apps as $id=>$app_obj): 
+	$author = ($app_obj->getAuthor()!='')?$app_obj->getAuthor():_AT('unknown'); 	
+?>
+<div class="contentbox">	
+	<div class="contentbox-d">
+		<?php echo $app_obj->getAppLink($app_obj->getTitle(), $id); ?><br/>
+		<?php echo $app_obj->getAppLink('<img src="'.$app_obj->getThumbnail().'"/>', $id); ?><br/>
+		<?php echo _AT('by'); ?> 
+		<?php if ($app_obj->getAuthorEmail()!=''): ?>
+			<a href="mailto:<?php echo $app_obj->getAuthorEmail(); ?>"><?php echo $author; ?></a>
+		<?php else: echo $author; ?>
+		<?php endif; ?>			
+	</div>
+
+	<div class="contentbox-e">
+		<a href="<?php echo AT_SOCIAL_BASENAME.'applications.php?app_id='.$id.SEP.'settings=1'; ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME;?>images/icon-settings.png" alt="<?php echo _AT('settings');?>" title="<?php echo _AT('settings');?>" border="0"/></a>
+	
+		<a href="<?php echo AT_SOCIAL_BASENAME.'applications.php?app_id='.$id.SEP.'delete=1'; ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME;?>images/b_drop.png" alt="<?php echo _AT('delete');?>" title="<?php echo _AT('delete');?>" border="0"/></a>
+	</div>
+	<div class="contentbox-f">
+		<?php echo $app_obj->getDescription(); ?><br/><br/>
+		<?php echo $app_obj->getUrl(); ?><br/>
+	</div>
+	
+</div>
+<?php endforeach; ?>
+</div>
+<?php if(empty($id)){
+echo '<div class="contentbox">';
+echo _AT('no_gadgets_installed');
+echo '</div>';
+}
+?>
+<?php endif; ?>
+<div style="clear:both;"></div>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/basic_profile.tmpl.php b/docs/themes/simplified-desktop/social/basic_profile.tmpl.php
new file mode 100644
index 000000000..76a04b8e9
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/basic_profile.tmpl.php
@@ -0,0 +1,135 @@
+<div class="social-wrapper">
+<?php
+include('lib/profile_menu.inc.php');
+?>
+<br />
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="form">
+<?php global $languageManager, $_config; ?>
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('required_information'); ?></legend>
+	<div class="row">
+		<h3><?php echo _AT('required_information'); ?></h3>
+	</div>
+
+	<div class="row">
+		<label for="login"><?php echo _AT('login_name'); ?></label><br />
+				<span id="login"><?php echo stripslashes(htmlspecialchars($_POST['login'])); ?></span>
+				<input name="member_id" type="hidden" value="<?php echo intval($_POST['member_id']); ?>" />
+				<input name="login" type="hidden" value="<?php echo stripslashes(htmlspecialchars($_POST['login'])); ?>" />
+	</div>
+	<div class="row">
+		<?php echo _AT('email_address'); ?><br />
+		<?php echo stripslashes(htmlspecialchars($_POST['email'])); ?>
+		<input type="checkbox" id="priv" name="private_email" value="1" <?php if ($_POST['private_email']) { echo 'checked="checked"'; } ?> /><label for="priv"><?php echo _AT('keep_email_private');?></label>
+	</div>
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="first_name"><?php echo _AT('first_name'); ?></label><br />
+		<input id="first_name" name="first_name" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['first_name'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="second_name"><?php echo _AT('second_name'); ?></label><br />
+		<input id="second_name" name="second_name" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['second_name'])); ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="last_name"><?php echo _AT('last_name'); ?></label><br />
+		<input id="last_name" name="last_name" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['last_name'])); ?>" />
+	</div>
+	
+	<?php if (admin_authenticate(AT_ADMIN_PRIV_USERS, TRUE)): 
+			if ($_POST['status'] == AT_STATUS_INSTRUCTOR) {
+				$inst = ' checked="checked"';
+			} else if ($_POST['status'] == AT_STATUS_STUDENT) {
+				$stud = ' checked="checked"';
+			}  else if ($_POST['status'] == AT_STATUS_DISABLED) {
+				$disa = ' checked="checked"';
+			} else {
+				$uncon = ' checked="checked"';
+			}?>
+			<input type="hidden" name="id" value="<?php echo $_POST['member_id']; ?>" >
+			<div class="row">
+				<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><?php echo _AT('account_status'); ?><br />
+
+				<input type="radio" name="status" value="0" id="disa" <?php echo $disa; ?> /><label for="disa"><?php echo _AT('disabled'); ?></label>
+				<?php if (defined('AT_EMAIL_CONFIRMATION') && AT_EMAIL_CONFIRMATION): ?>
+					<input type="radio" name="status" value="1" id="uncon" <?php echo $uncon; ?> /><label for="uncon"><?php echo _AT('unconfirmed'); ?></label>
+				<?php endif; ?>
+
+				<input type="radio" name="status" value="2" id="stud" <?php echo $stud; ?> /><label for="stud"><?php echo _AT('student'); ?></label>
+
+				<input type="radio" name="status" value="3" id="inst" <?php echo $inst; ?> /><label for="inst"><?php echo _AT('instructor'); ?></label>
+
+				<input type="hidden" name="old_status" value="<?php echo $_POST['old_status']; ?>" />
+			</div>
+	<?php endif; ?>
+	</fieldset>
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('personal_information'); ?></legend>
+	<div class="row">
+		<h3><?php echo _AT('personal_information').' ('._AT('optional').')'; ?></h3>
+	</div>
+
+	<?php if (admin_authenticate(AT_ADMIN_PRIV_USERS, TRUE) && defined('AT_MASTER_LIST') && AT_MASTER_LIST): ?>
+		<div class="row">
+			<label for="student_id"><?php echo _AT('student_id'); ?></label><br />
+				<input type="text" name="student_id" value="<?php echo $_POST['student_id']; ?>" size="20" /><br />
+		</div>
+		<div class="row">
+			<label for="student_pin"><?php echo _AT('student_pin'); ?></label><br />
+			<input id="student_pin" name="student_pin" type="password" size="15" maxlength="15" value="<?php echo stripslashes(htmlspecialchars($_POST['student_pin'])); ?>" /><br />
+		</div>
+	<?php endif; ?>
+
+	<div class="row">
+		<?php echo _AT('date_of_birth'); ?><br />
+		<label for="year"><?php echo _AT('year'); ?>: </label><input id="year" class="formfield" name="year" type="text" size="4" maxlength="4" value="<?php echo $_POST['year']; ?>" />  <label for="month"><?php echo _AT('month'); ?>: </label><input id="month" class="formfield" name="month" type="text" size="2" maxlength="2" value="<?php echo $_POST['month']; ?>" /> <label for="day"><?php echo _AT('day'); ?>: </label><input id="day" class="formfield" name="day" type="text" size="2" maxlength="2" value="<?php echo $_POST['day']; ?>" />
+	</div>
+
+	<div class="row">
+		<?php echo _AT('gender'); ?><br />
+		<input type="radio" name="gender" id="m" value="m" <?php if ($_POST['gender'] == 'm') { echo 'checked="checked"'; } ?> /><label for="m"><?php echo _AT('male'); ?></label> <input type="radio" value="f" name="gender" id="f" <?php if ($_POST['gender'] == 'f') { echo 'checked="checked"'; } ?> /><label for="f"><?php echo _AT('female'); ?></label>  <input type="radio" value="n" name="gender" id="ns" <?php if (($_POST['gender'] == 'n') || ($_POST['gender'] == '')) { echo 'checked="checked"'; } ?> /><label for="ns"><?php echo _AT('not_specified'); ?></label>
+	</div>
+
+	<div class="row">
+		<label for="address"><?php echo _AT('street_address'); ?></label><br />
+		<input id="address" name="address" size="30" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['address'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="postal"><?php echo _AT('postal_code'); ?></label><br />
+		<input id="postal" name="postal" size="7" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['postal'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="city"><?php echo _AT('city'); ?></label><br />
+		<input id="city" name="city" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['city'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="province"><?php echo _AT('province'); ?></label><br />
+		<input id="province" name="province" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['province'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="country"><?php echo _AT('country'); ?></label><br />
+		<input id="country" name="country" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['country'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="phone"><?php echo _AT('phone'); ?></label><br />
+		<input size="11" name="phone" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['phone'])); ?>" id="phone" />
+	</div>
+
+	<div class="row">
+		<label for="website"><?php echo _AT('web_site'); ?></label><br />
+		<input id="website" name="website" size="30" type="text" value="<?php if ($_POST['website'] == '') { echo 'http://'; } else { echo stripslashes(htmlspecialchars($_POST['website'])); } ?>" />
+	</div>
+	</fieldset>
+	<div class="row buttons">
+		<input type="submit" name="submit" value=" <?php echo _AT('save'); ?> " accesskey="s" />
+		<input type="submit" name="cancel" value=" <?php echo _AT('cancel'); ?> " />
+	</div>
+</div>
+</form>
+<div style="clear:both;"></div>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/connections.tmpl.php b/docs/themes/simplified-desktop/social/connections.tmpl.php
new file mode 100644
index 000000000..d3918bd0f
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/connections.tmpl.php
@@ -0,0 +1,109 @@
+<script src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/livesearch.js" type="text/javascript"></script>
+<?php 
+	//Add Friends Template
+	//Generate a random number for the search input name fields, so that the browser will not remember any previous entries.
+	$rand = md5(rand(0, time())); 
+	if ($this->rand_key != ''){
+		$last_search = $_POST['search_friends_'.$this->rand_key];
+	} elseif(isset($_GET['search_friends'])) {
+		$last_search = htmlentities_utf8($_GET['search_friends']);
+	} else {
+		$last_search = html_entity_decode($_POST['search_friends_'.$rand]);
+	}
+	//take out double quotes until there is a way to escape XSS from the ajax script.
+	$last_search = preg_replace('/\"/', '', $last_search);
+?>
+<div class="social-wrapper">
+<?php print_paginator($this->page, $this->num_pages, 'search_friends='.$this->search_field, 1);  ?>
+<div class="input-form">
+	<div class="contentrow">
+		<h3><?php echo _AT('search_for_friends'); ?></h3>
+		<form action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'connections.php');?>" method="POST" id="search_friends_form">
+			<label for="search_friends" style="display:none;"><?php echo _AT('search'); ?></label>
+			<input type="text" size="45" name="search_friends_<?php echo $rand;?>" id="search_friends" value="<?php echo $last_search; ?>" onkeyup="showResults(this.value, 'livesearch', '<?php echo AT_SOCIAL_BASENAME; ?>connections.php')"/>
+			<input type="submit" name="search" value="<?php echo _AT('search'); ?>">
+			<?php 
+			if (isset($_POST['myFriendsOnly'])){
+				$mfo_checked = ' checked="checked"';
+			}
+			?>
+			<br/> <div class="social-wrapper-myFriendsOnly"><input type="checkbox" name="myFriendsOnly" id="myFriendsOnly" value="<?php echo _AT('yes'); ?>" <?php echo $mfo_checked; ?> />
+			<label for ="myFriendsOnly"><?php echo _AT('my_friends_only'); ?></label></div>
+			<input type="hidden" name="rand_key" value="<?php echo $rand; ?>" />
+			
+			<div id="livesearch"></div>
+		</form>
+	</div>
+</div>
+<div class="headingbox-contentbox">
+	<div class="headingbox"><h3><?php echo _AT('connections'); ?></h3></div>
+	<div class="contentbox">
+	<?php 
+	if (!empty($this->friends)):
+		$privacy_controller = new PrivacyController();
+		echo "<h4>"._AT('there_are_entries', sizeof($this->friends))."</h4>";
+		foreach ($this->friends as $id=>$person): 
+			$privacy_obj = $privacy_controller->getPrivacyObject($id);
+//			debug($privacy_obj->getSearch(), 'search'.$id);
+			$relationship = $privacy_controller->getRelationship($id);
+
+			if ((!isset($person['added']) || $person['added']!=1) && !PrivacyController::validatePrivacy(AT_SOCIAL_SEARCH_VISIBILITY, $relationship, $privacy_obj->getSearch())){
+				//if this user doesn't want to be searched.
+				continue;
+			}
+	?>
+	<div class="contact_mini" >
+		<?php if (isset($person['added']) && $person['added']==1): ?>			
+			<div>
+				<div style="float:left;"><?php echo printSocialProfileImg($id); ?></div>
+				<div style="padding-left:0.5em; float:left;">
+					<?php 
+						$member_obj = new Member($id);
+						$address = $member_obj->getAddress();
+						echo printSocialName($id) . '<br/>';
+						echo $address['province'] . ' ' . $address['country'] . '<br/>';
+					?>
+				</div>
+				<div style="float:right;"><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.AT_SOCIAL_INDEX);?>?remove=yes<?php echo SEP;?>id=<?php echo $id;?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('delete'); ?>" title="<?php echo _AT('delete'); ?>" border="0"/></a></div>
+				<div style="clear:both;"></div><br/>
+			</div>
+
+		<?php else: ?>
+			<?php if (!isset($_POST['myFriendsOnly'])): ?>
+			<div>
+				<div style="float:left;"><?php echo printSocialProfileImg($id); ?></div>
+				<div style="padding-left:0.5em; float:left;">
+					<?php 
+						$member_obj = new Member($id);
+						$address = $member_obj->getAddress();
+						echo printSocialName($id) . '<br/>';
+						echo $address['country'] . ' ' . $address['province'] . '<br/>';
+					?>
+				</div>
+				<?php if ($person['pending']==1): ?>	
+			<div style="float:right;"><?php echo _AT('pending'); ?></div>
+			<?php else: ?>
+			<div style="float:right;"><a href="<?php echo AT_SOCIAL_BASENAME; ?>connections.php?id=<?php echo $id; ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/plus_icon.gif" alt="<?php echo _AT('add_to_friends'); ?>" title="<?php echo _AT('add_to_friends'); ?>" border="0"/></a> </div>
+			<?php endif; ?>
+				<div style="clear:both;"></div><br/>
+			</div>
+			<?php endif; ?>
+		<?php endif; ?>
+	</div>
+	<?php 
+		endforeach; 
+	else:
+		echo _AT('none_found');
+	endif;
+	?>
+	</div>
+	<!--
+	<div style="float:right;">
+		TODO: Paginator 
+	</div>
+	-->
+</div>
+<div style="clear:both;"></div>
+
+<?php print_paginator($this->page, $this->num_pages, 'search_friends='.$this->search_field, 1);  ?>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/edit_profile.tmpl.php b/docs/themes/simplified-desktop/social/edit_profile.tmpl.php
new file mode 100644
index 000000000..5a3ee3d8c
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/edit_profile.tmpl.php
@@ -0,0 +1,166 @@
+<div class="social-wrapper">
+
+<?php include(AT_SOCIAL_INCLUDE."profile_menu.inc.php")  ?>
+<h2><?php echo $this->profile['first_name'].' '.$this->profile['last_name']; ?></h2>
+<ul>
+	<li>
+		<div>
+		<strong><?php echo _AT('position'); ?></strong>	<br/>
+		<?php 
+		if (!empty($this->position)):
+			//note: $id is just a array holder, it does not represent $row[id]
+			foreach ($this->position as $id=>$row): ?>
+		<div class="profile_container">
+			<div class="top_right" style="border:thin #cccccc solid;"><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?edit=position'.SEP.'id='.$row['id']); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/edit_profile.gif" alt="<?php echo _AT('edit'); ?>" title="<?php echo _AT('edit'); ?>" border="0" /></a>  <a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?delete=position'.SEP.'id='.$row['id']); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('remove'); ?>" title="<?php echo _AT('remove'); ?>" border="0" /></a></div>
+			<div><?php echo _AT('company') . ': ' . htmlentities_utf8($row['company']); ?></div>
+			<div><?php echo _AT('position') . ': ' . htmlentities_utf8($row['title']); ?></div>
+			<div><?php echo _AT('from') . ': ' . htmlentities_utf8($row['from']);?></div>
+			<div><?php echo _AT('to') . ': ' . htmlentities_utf8($row['to']); ?></div>
+			<div><?php echo _AT('description') . ': ' . htmlentities_utf8($row['description']); ?></div>
+		</div>
+		<?php
+			endforeach;
+		endif; ?>
+			<p><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?add=position'); ?>"><?php echo _AT('add_new_position'); ?></a></p>
+		</div>
+	</li>
+	<li>
+		<strong><?php echo _AT('education'); ?></strong><br/>
+		<?php 	
+		if (!empty($this->education)):
+			foreach ($this->education as $id=>$row): ?>
+		<div class="profile_container">
+			<div class="top_right" style="border:thin #cccccc solid;"><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?edit=education'.SEP.'id='.$row['id']); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/edit_profile.gif" alt="<?php echo _AT('edit'); ?>" title="<?php echo _AT('edit'); ?>" border="0" /></a>  <a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?delete=education'.SEP.'id='.$row['id']); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('remove'); ?> ?>" title="<?php echo _AT('remove'); ?>" border="0" /></a></div>
+			<div><?php echo _AT('university') . ': ' . htmlentities_utf8($row['university']); ?></div>
+			<div><?php echo _AT('location') . ': ' . htmlentities_utf8($row['country']) . ', ' . htmlentities_utf8($row['province']); ?></div>
+			<div><?php echo _AT('degree') . ': ' . htmlentities_utf8($row['degree']); ?></div>
+			<div><?php echo _AT('field') . ': ' . htmlentities_utf8($row['field']); ?></div>
+			<div><?php echo _AT('from') . ': ' . htmlentities_utf8($row['from']);?></div>
+			<div><?php echo _AT('to') . ': ' . htmlentities_utf8($row['to']); ?></div>
+			<div><?php echo _AT('description') . ': ' . htmlentities_utf8($row['description']); ?></div>
+		</div>
+		<?php 
+			endforeach; 
+		endif; ?>
+			<p><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?add=education'); ?>"><?php echo _AT('add_new_education'); ?></a></p>
+	</li>
+	<li>
+		<strong><?php echo _AT('websites'); ?></strong><br/>
+		<?php 	
+		if (!empty($this->websites)):
+			foreach ($this->websites as $id=>$row): ?>
+		<div class="profile_container">
+			<div class="top_right" style="border:thin #cccccc solid;"><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?edit=websites'.SEP.'id='.$row['id']); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/edit_profile.gif" alt="<?php echo _AT('edit'); ?>" title="<?php echo _AT('edit'); ?>" border="0" /></a>  <a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?delete=websites'.SEP.'id='.$row['id']); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('remove'); ?> ?>" title="<?php echo _AT('remove'); ?>" border="0" /></a></div>
+			<div><?php echo _AT('site_name') . ': ' . htmlentities_utf8($row['site_name']); ?></div>
+			<div><?php echo _AT('url') . ': ' . $row['url']; ?></div>
+		</div>
+		<?php 
+			endforeach; 
+		endif; ?>
+		<p><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?add=websites'); ?>"><?php echo _AT('add_new_website'); ?></a></p>
+	</li>
+
+	<li>
+		<strong><?php echo _AT('interests'); ?></strong><br/>
+		<?php if (!empty($this->profile['interests'])): ?>
+		<div class="profile_container">
+			<div class="top_right" style="border:thin #cccccc solid;"><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?edit=interests'.SEP.'id='.$_SESSION['member_id']); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/edit_profile.gif" alt="<?php echo _AT('edit'); ?>" title="<?php echo _AT('edit'); ?>" border="0" /></a>  <a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?delete=interests'); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('remove'); ?> ?>" title="<?php echo _AT('remove'); ?>" border="0" /></a></div>
+			<div><?php echo htmlentities_utf8($this->profile['interests']); ?></div>
+		</div>
+		<?php else: ?>
+		<p><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?add=interests'); ?>"><?php echo _AT('add_new_interest'); ?></a></p>
+		<?php endif; ?>
+	</li>
+
+	<li>
+		<strong><?php echo _AT('associations'); ?></strong><br/>
+		<?php if (!empty($this->profile['associations'])): ?>
+		<div class="profile_container">
+			<div class="top_right" style="border:thin #cccccc solid;"><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?edit=associations'.SEP.'id='.$_SESSION['member_id']); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/edit_profile.gif" alt="<?php echo _AT('edit'); ?>" title="<?php echo _AT('edit'); ?>" border="0" /></a>  <a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?delete=associations'); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('remove'); ?> ?>" title="<?php echo _AT('remove'); ?>" border="0" /></a></div>
+			<div><?php echo htmlentities_utf8($this->profile['associations']); ?></div>
+		</div>
+		<?php else: ?>
+		<p><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?add=associations'); ?>"><?php echo _AT('add_new_association'); ?></a></p>
+		<?php endif; ?>
+	</li>
+
+	<li>
+		<strong><?php echo _AT('awards'); ?></strong><br/>
+		<?php if (!empty($this->profile['awards'])): ?>
+		<div class="profile_container">
+			<div class="top_right" style="border:thin #cccccc solid;"><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?edit=awards'.SEP.'id='.$_SESSION['member_id']); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/edit_profile.gif" alt="<?php echo _AT('edit'); ?>" title="<?php echo _AT('edit'); ?>" border="0" /></a>  <a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?delete=awards'); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('remove'); ?> ?>" title="<?php echo _AT('remove'); ?>" border="0" /></a></div>
+			<div><?php echo htmlentities_utf8($this->profile['awards']); ?></div>
+		</div>
+		<?php else: ?>
+		<p><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?add=awards'); ?>"><?php echo _AT('add_new_award'); ?></a></p>
+		<?php endif; ?>
+	</li>
+	<li>
+		<strong><?php echo _AT('representation'); ?></strong><br/>
+		<?php if (!empty($this->representation)): ?>
+		<div class="profile_container">
+			<div class="top_right" style="border:thin #cccccc solid;">
+			<?php foreach($this->representation as $row=>$value){  ?>
+			<a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?edit=representation'.SEP.'id='.$value['rep_id']); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/edit_profile.gif" alt="<?php echo _AT('edit'); ?>" title="<?php echo _AT('edit'); ?>" border="0" /></a>  <a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?delete=representation'); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('remove'); ?> ?>" title="<?php echo _AT('remove'); ?>" border="0" /></a></div>
+
+				<dl class="public-profile">
+				<dt><?php echo _AT('name') . ':' ?></dt> <dd>  &nbsp;<?php echo htmlentities_utf8($value['rep_name']); ?></dd>
+				<dt><?php echo _AT('title') . ': ' ?></dt> <dd>  &nbsp;<?php echo htmlentities_utf8($value['rep_title']); ?></dd>
+				<dt><?php echo _AT('phone') . ':' ?></dt> <dd>  &nbsp;<?php echo htmlentities_utf8($value['rep_phone']);?></dd>
+				<dt><?php echo _AT('email') . ': ' ?></dt> <dd>  &nbsp;<?php echo  htmlentities_utf8($value['rep_email']); ?></dd>
+				<dt><?php echo _AT('street_address') . ': ' ?></dt> <dd>  &nbsp;<?php echo htmlentities_utf8($value['rep_address']); ?></dd>
+				</dl>
+			<?php } ?>
+		</div>
+		<?php else: ?>
+		<p><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?add=representation'); ?>"><?php echo _AT('add_new_representation'); ?></a></p>
+		<?php endif; ?>
+
+	</li>
+	<li>
+		<strong><?php echo _AT('alt_contact'); ?></strong><br/>
+		<?php if (!empty($this->contact)): ?>
+		<div class="profile_container">
+			<div class="top_right" style="border:thin #cccccc solid;">
+			<?php foreach($this->contact as $row=>$value){  ?>
+
+			<a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?edit=contact'.SEP.'id='.$value['contact_id']); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/edit_profile.gif" alt="<?php echo _AT('edit'); ?>" title="<?php echo _AT('edit'); ?>" border="0" /></a>  <a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?delete=contact'); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('remove'); ?> ?>" title="<?php echo _AT('remove'); ?>" border="0" /></a></div>
+
+				<dl class="public-profile">
+				<dt><?php echo _AT('name') . ':' ?></dt> <dd>  &nbsp;<?php echo htmlentities_utf8($value['con_name']); ?></dd>
+				<dt><?php echo _AT('phone') . ':' ?></dt> <dd> &nbsp; <?php echo htmlentities_utf8($value['con_phone']);?></dd>
+				<dt><?php echo _AT('email') . ': ' ?></dt> <dd> &nbsp; <?php echo  htmlentities_utf8($value['con_email']); ?></dd>
+				<dt><?php echo _AT('street_address') . ': ' ?></dt> <dd> &nbsp; <?php echo htmlentities_utf8($value['con_address']); ?></dd>
+				</dl>
+			<?php } ?>
+		</div>
+		<?php else: ?>
+		<p><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?add=contact'); ?>"><?php echo _AT('add_new_contact'); ?></a></p>
+		<?php endif; ?>
+	</li>
+	<li>
+		<strong><?php echo _AT('personal'); ?></strong><br/>
+		<?php if (!empty($this->personal)): ?>
+		<div class="profile_container">
+			<div class="top_right" style="border:thin #cccccc solid;">
+			<a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?edit=personal'.SEP.'id='.$this->personal['per_id']); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/edit_profile.gif" alt="<?php echo _AT('edit'); ?>" title="<?php echo _AT('edit'); ?>" border="0" /></a>  <a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?delete=personal'); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('remove'); ?> ?>" title="<?php echo _AT('remove'); ?>" border="0" /></a></div>
+
+				<dl class="public-profile">
+				<dt><?php echo _AT('per_weight') . ':' ?></dt> <dd> &nbsp;<?php echo htmlentities_utf8($this->personal['per_weight']);?></dd>
+				<dt><?php echo _AT('per_height') . ': ' ?></dt> <dd> &nbsp; <?php echo  htmlentities_utf8($this->personal['per_height']); ?></dd>
+				<dt><?php echo _AT('per_hair') . ': ' ?></dt> <dd> &nbsp; <?php echo htmlentities_utf8($this->personal['per_hair']); ?></dd>
+				<dt><?php echo _AT('per_eyes') . ':' ?></dt> <dd> &nbsp; <?php echo htmlentities_utf8($this->personal['per_eyes']);?></dd>
+				<dt><?php echo _AT('per_ethnicity') . ': ' ?></dt> <dd> &nbsp; <?php echo  htmlentities_utf8($this->personal['per_ethnicity']); ?></dd>
+				<dt><?php echo _AT('per_languages') . ': ' ?></dt> <dd> &nbsp; <?php echo htmlentities_utf8($this->personal['per_languages']); ?></dd>
+				<dt><?php echo _AT('per_disabilities') . ': ' ?></dt> <dd>  &nbsp;<?php echo htmlentities_utf8($this->personal['per_disabilities']); ?></dd>
+				</dl>
+		</div>
+		<?php else: ?>
+		<p><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php?add=personal'); ?>"><?php echo _AT('add_new_personal'); ?></a></p>
+		<?php endif; ?>
+	</li>
+
+
+</ul>
+<div style="clear:both;"></div>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/edit_profile/account_settings.tmpl.php b/docs/themes/simplified-desktop/social/edit_profile/account_settings.tmpl.php
new file mode 100644
index 000000000..7e16ea81b
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/edit_profile/account_settings.tmpl.php
@@ -0,0 +1,10 @@
+<form action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'settings.php');?>" method="POST">
+<div class="input-form">
+	<h4><?php echo _AT('account_settings'); ?></h4>
+	<div class="row"><?php echo _AT('account_control_blurb'); ?> </div>
+	<div class="row">
+		<input type="hidden" name="n" value="account_settings" />
+		<input class="button" type="submit" name="submit" value="<?php echo _AT('save'); ?>"/>
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/edit_profile/edit_additional.tmpl.php b/docs/themes/simplified-desktop/social/edit_profile/edit_additional.tmpl.php
new file mode 100644
index 000000000..e954bb2f8
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/edit_profile/edit_additional.tmpl.php
@@ -0,0 +1,29 @@
+<?php
+	global $addslashes;
+	//escape all strings
+	$title			= AT_print($this->title, 'input.text');
+	$interests		= AT_print($this->interests, 'input.text');
+	$associations	= AT_print($this->associations, 'input.text');
+	$awards			= AT_print($this->awards, 'input.text');
+?>
+<form method="post" action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php'); ?>">
+
+<div class="headingbox"><h3><?php if($_GET['id']){ echo _AT($title);}else{echo  _AT($title);}?></h3></div>
+<div class="contentbox">
+	<div>	
+			<label for="<?php echo $title;?>"><?php echo _AT($title); ?></label>
+		<div>
+			<textarea rows="4" cols="40" id="<?php echo $title;?>" name="<?php echo $title;?>"><?php echo $$title; ?></textarea>
+		</div>
+		
+		<?php if (isset($this->id)): ?>
+		<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
+		<input type="hidden" name="edit" value="<?php echo $title; ?>" />
+		<?php else: ?>	
+		<input type="hidden" name="add" value="<?php echo $title; ?>" />
+		<?php endif; ?>
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" class="button"/>
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" class="button"/>
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/edit_profile/edit_contact.tmpl.php b/docs/themes/simplified-desktop/social/edit_profile/edit_contact.tmpl.php
new file mode 100644
index 000000000..cd6ad0336
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/edit_profile/edit_contact.tmpl.php
@@ -0,0 +1,42 @@
+<?php
+	global $addslashes;
+
+	//escape all strings
+	$con_name  	 = htmlentities_utf8($this->con_name);
+	$con_phone	 = htmlentities_utf8($this->con_phone);
+	$con_email	 = htmlentities_utf8($this->con_email);
+	$con_address	 = htmlentities_utf8($this->con_address);
+
+?>
+
+<div class="headingbox"><h3><?php if($_GET['id']){echo _AT('edit_contact');}else{echo  _AT('add_new_contact');}?></h3></div>
+<div class="contentbox">
+<form method="post" action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php'); ?>">
+	<dl id="public-profile">
+		<div class="row">
+		<dt><label for="con_name"><?php echo _AT('name'); ?></label></dt>
+		<dd><input type="text" id="con_name" name="con_name" value="<?php echo $con_name; ?>" /></dd>
+		</div>
+		<div class="row">
+		<dt><label for="con_phone"><?php echo _AT('phone'); ?></label></dt>
+		<dd><input type="text" id="con_phone"  name="con_phone" value="<?php echo $con_phone; ?>" /></dd>
+		</div>
+		<div class="row">
+		<dt><label for="con_email"><?php echo _AT('email'); ?></label></dt>
+		<dd><input type="text" id="con_email"  name="con_email" value="<?php echo $con_email; ?>" /></dd>
+		</div>
+		<dt><label for="con_address"><?php echo _AT('street_address'); ?></label></dt>	
+		<dd><textarea name="con_address" id="con_address" cols="40" rows="5"><?php echo $con_address; ?></textarea></dd>
+		</dl>
+		<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
+		<?php if($_GET['id']){ ?>
+		<input type="hidden" name="edit" value="contact" />
+		<?php }else { ?>
+		<input type="hidden" name="add" value="contact" />
+		<?php } ?>
+	
+		<input type="submit" name="submit" class="button" value="<?php echo _AT('save'); ?>" />
+		<input type="submit" name="cancel" class="button" value="<?php echo _AT('cancel'); ?>" />
+	
+</form>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/edit_profile/edit_education.tmpl.php b/docs/themes/simplified-desktop/social/edit_profile/edit_education.tmpl.php
new file mode 100644
index 000000000..75ffcbc64
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/edit_profile/edit_education.tmpl.php
@@ -0,0 +1,70 @@
+<?php
+	global $addslashes;
+
+	//escape all strings
+	$university  = htmlentities_utf8($this->university);
+	$country	 = htmlentities_utf8($this->country);
+	$province	 = htmlentities_utf8($this->province);
+	$degree		 = htmlentities_utf8($this->degree);
+	$field		 = htmlentities_utf8($this->field);
+	$from		 = htmlentities_utf8($this->from);
+	$to			 = htmlentities_utf8($this->to);
+	$description = htmlentities_utf8($this->description, false);
+?>
+<script type='text/javascript' src='jscripts/lib/calendar.js'></script>
+<script type="text/javascript"> 
+<!--
+	//overwrite calendar dates range settings.
+	scwBaseYear			= scwDateNow.getFullYear()-50; 
+	scwDropDownYears	= 70; 
+-->
+</script>
+<div class="headingbox"><h3><?php if($_GET['id']){echo _AT('edit_education');}else{echo  _AT('add_new_education');}?></h3></div>
+<div class="contentbox">
+<form method="post" action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php'); ?>">
+	<dl id="public-profile">
+		<div class="row">
+		<dt><label for="university"><?php echo _AT('university'); ?></label></dt><br />
+		<dd><input type="text" id="university" name="university" value="<?php echo $university; ?>" /></dd>
+		</div>
+		<div class="row">
+		<dt><label for="province"><?php echo _AT('province'); ?></label></dt><br />
+		<dd><input type="text" id="province"  name="province" value="<?php echo $province; ?>" /></dd>
+		</div>
+		<div class="row">
+		<dt><label for="country"><?php echo _AT('country'); ?></label></dt><br />
+		<dd><input type="text" id="country"  name="country" value="<?php echo $country; ?>" /></dd>
+		</div>
+		<div class="row">
+		<dt><label for="degree"><?php echo _AT('degree'); ?></label></dt><br />
+		<dd><input type="text" id="degree"  name="degree" value="<?php echo $degree; ?>" /></dd>
+		</div>
+		<div class="row">
+		<dt><label for="field"><?php echo _AT('field'); ?></label></dt><br />
+		<dd><input type="text" id="field"  name="field" value="<?php echo $field; ?>" /></dd>
+		</div>
+		<div class="row">
+		<dt><label for="from"><?php echo _AT('from'); ?></label></dt><br />
+		<dd><input type="text" id="from"  name="from" value="<?php echo $from; ?>" />
+		<img src='images/calendar.gif' style="vertical-align: middle; cursor: pointer;" onclick="scwShow(scwID('from'),event);"  alt="<?php echo _AT('date'); ?>"/></dd>
+		</div>
+		<div class="row">
+		<dt><label for="to"><?php echo _AT('to'); ?></label></dt>	<br />
+		<dd><input type="text" id="to"  name="to" value="<?php echo $to; ?>" />
+		<img src='images/calendar.gif' style="vertical-align: middle; cursor: pointer;" onclick="scwShow(scwID('to'),event);" alt="<?php echo _AT('date'); ?>" /></dd>
+		</div>
+		<dt><label for="description"><?php echo _AT('description'); ?></label></dt>	
+		<dd><textarea name="description" id="description" cols="35" rows="5"><?php echo $description; ?></textarea></dd>
+		</dl>
+		<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
+		<?php if($_GET['id']){ ?>
+		<input type="hidden" name="edit" value="education" />
+		<?php }else { ?>
+		<input type="hidden" name="add" value="education" />
+		<?php } ?>
+	
+		<input type="submit" name="submit" class="button" value="<?php echo _AT('save'); ?>" />
+		<input type="submit" name="cancel" class="button" value="<?php echo _AT('cancel'); ?>" />
+	
+</form>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/edit_profile/edit_personal.tmpl.php b/docs/themes/simplified-desktop/social/edit_profile/edit_personal.tmpl.php
new file mode 100644
index 000000000..4482652f7
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/edit_profile/edit_personal.tmpl.php
@@ -0,0 +1,66 @@
+<?php
+	global $addslashes;
+
+	//escape all strings
+	$per_weight	 = htmlentities_utf8($this->per_weight);
+	$per_height	 = htmlentities_utf8($this->per_height);
+	$per_hair	 = htmlentities_utf8($this->per_hair);
+	$per_eyes	 = htmlentities_utf8($this->per_eyes);
+	$per_ethnicity	 = htmlentities_utf8($this->per_ethnicity);
+	$per_languages	 = htmlentities_utf8($this->per_languages);
+	$per_disabilities = htmlentities_utf8($this->per_disabilities);
+
+?>
+
+<div class="headingbox"><h3><?php if($_GET['id']){echo _AT('edit_personal');}else{echo  _AT('add_new_personal');}?></h3></div>
+<div class="contentbox">
+<form method="post" action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php'); ?>">
+	<dl id="public-profile">
+		<div class="row"> 
+		<dt><label for="per_weight"><?php echo _AT('per_weight'); ?></label></dt>
+		<dd><input type="text" id="per_weight"  name="per_weight" value="<?php echo $per_weight; ?>" /></dd>
+		</div>	
+		
+		<div class="row">
+		<dt><label for="per_height"><?php echo _AT('per_height'); ?></label></dt>
+		<dd><input type="text" id="per_height"  name="per_height" value="<?php echo $per_height; ?>" /></dd>
+		</div>		
+		
+		<div class="row">
+		<dt><label for="per_hair"><?php echo _AT('per_hair'); ?></label></dt>
+		<dd><input type="text" id="per_hair"  name="per_hair" value="<?php echo $per_hair; ?>" /></dd>
+		</div>
+
+		<div class="row">
+		<dt><label for="per_eyes"><?php echo _AT('per_eyes'); ?></label></dt>
+		<dd><input type="text" id="per_eyes"  name="per_eyes" value="<?php echo $per_eyes; ?>" /></dd>
+		</div>
+	
+		<div class="row">
+		<dt><label for="per_ethnicity"><?php echo _AT('per_ethnicity'); ?></label></dt>
+		<dd><input type="text" id="per_ethnicity"  name="per_ethnicity" value="<?php echo $per_ethnicity; ?>" /></dd>
+		</div>
+
+		<div class="row">
+		<dt><label for="per_languages"><?php echo _AT('per_languages'); ?></label></dt>
+		<dd><input type="text" id="per_languages"  name="per_languages" value="<?php echo $per_languages; ?>" /></dd>
+		</div>
+
+		<div class="row">
+		<dt><label for="per_disabilities"><?php echo _AT('per_disabilities'); ?></label></dt>
+		<dd><input type="text" id="per_disabilities"  name="per_disabilities" value="<?php echo $per_disabilities; ?>" /></dd>
+		</div>
+
+		</dl>
+		<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
+		<?php if($_GET['id']){ ?>
+		<input type="hidden" name="edit" value="personal" />
+		<?php }else { ?>
+		<input type="hidden" name="add" value="personal" />
+		<?php } ?>
+	
+		<input type="submit" name="submit" class="button" value="<?php echo _AT('save'); ?>" />
+		<input type="submit" name="cancel" class="button" value="<?php echo _AT('cancel'); ?>" />
+	
+</form>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/edit_profile/edit_position.tmpl.php b/docs/themes/simplified-desktop/social/edit_profile/edit_position.tmpl.php
new file mode 100644
index 000000000..c70b5c456
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/edit_profile/edit_position.tmpl.php
@@ -0,0 +1,54 @@
+<?php
+	global $addslashes;
+	//escape all strings
+	$company		= htmlentities_utf8($this->company);
+	$title			= htmlentities_utf8($this->profile_title);
+	$description	= htmlentities_utf8($this->description, false);
+	$from			= htmlentities_utf8($this->from);
+	$to				= htmlentities_utf8($this->to);
+?>
+<script type="text/javascript" src="jscripts/lib/calendar.js"></script>
+<script type="text/javascript"> 
+<!--
+	//overwrite calendar dates range settings.
+	scwBaseYear			= scwDateNow.getFullYear()-50; 
+	scwDropDownYears	= 70; 
+-->
+</script>
+<div class="headingbox"><h3><?php if($_GET['id']){echo _AT('edit_position');}else{echo  _AT('add_new_position');}?></h3></div>
+<div class="contentbox">
+<form method="post" action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php'); ?>">
+	<dl id="public-profile">
+		<div class="row">
+		<dt><label for="company"><?php echo _AT('company'); ?></label></dt>
+		<dd><input type="text" id="company" name="company" value="<?php echo $company; ?>" /></dd>
+		</div>
+		<div class="row">
+		<dt><label for="title"><?php echo _AT('position'); ?></label></dt>
+		<dd><input type="text" id="title" name="title" value="<?php echo $title; ?>" /></dd>
+		</div>
+		<div class="row">
+		<dt><label for="from"><?php echo _AT('from'); ?></label></dt>
+		<dd><input type="text" id="from" name="from" value="<?php echo $from; ?>" />
+		<img src='images/calendar.gif' style="vertical-align: middle; cursor: pointer;" onclick="scwShow(scwID('from'),event);"  alt="<?php echo _AT('date'); ?>"/></dd>
+		</div>
+		<div class="row">
+		<dt><label for="to"><?php echo _AT('to'); ?></label></dt>
+		<dd><input type="text" id="to" name="to" value="<?php echo $to; ?>" />
+		<img src='images/calendar.gif' style="vertical-align: middle; cursor: pointer;" onclick="scwShow(scwID('to'),event);"  alt="<?php echo _AT('date'); ?>"/></dd>
+		</div>
+		<dt><label for="description"><?php echo _AT('description'); ?></label>	</dt>
+		<dd><textarea name="description" id="description" cols="40" rows="5"><?php echo $description; ?></textarea></dd>
+	</dl>
+	<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
+	
+		<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
+		<?php if($_GET['id']){ ?>
+		<input type="hidden" name="edit" value="position" />
+		<?php } else { ?>
+		<input type="hidden" name="add" value="position" />
+		<?php } ?>
+	<input type="submit" class="button" name="submit" value="<?php echo _AT('save'); ?>" />
+	<input type="submit" class="button" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+</form>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/edit_profile/edit_representation.tmpl.php b/docs/themes/simplified-desktop/social/edit_profile/edit_representation.tmpl.php
new file mode 100644
index 000000000..bc97d108b
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/edit_profile/edit_representation.tmpl.php
@@ -0,0 +1,49 @@
+<?php
+	global $addslashes;
+
+	//escape all strings
+	$rep_name  	 = htmlentities_utf8($this->rep_name);
+	$rep_title	 = htmlentities_utf8($this->rep_title);
+	$rep_phone	 = htmlentities_utf8($this->rep_phone);
+	$rep_email	 = htmlentities_utf8($this->rep_email);
+	$rep_address	 = htmlentities_utf8($this->rep_address);
+
+?>
+
+<div class="headingbox"><h3><?php if($_GET['id']){echo _AT('edit_representation');}else{echo  _AT('add_new_representation');}?></h3></div>
+<div class="contentbox">
+<form method="post" action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php'); ?>">
+	<dl id="public-profile">
+		<div class="row">
+		<dt><label for="rep_name"><?php echo _AT('name'); ?></label></dt>
+		<dd><input type="text" id="rep_name" name="rep_name" value="<?php echo $rep_name; ?>" /></dd>
+		</div>
+		<div class="row">
+		<dt><label for="rep_title"><?php echo _AT('title'); ?></label></dt>
+		<dd><input type="text" id="rep_title"  name="rep_title" value="<?php echo $rep_title; ?>" /></dd>
+		</div>
+		<div class="row">
+		<dt><label for="rep_phone"><?php echo _AT('phone'); ?></label></dt>
+		<dd><input type="text" id="rep_phone"  name="rep_phone" value="<?php echo $rep_phone; ?>" /></dd>
+		</div>
+		<div class="row">
+		<dt><label for="rep_email"><?php echo _AT('email'); ?></label></dt>
+		<dd><input type="text" id="rep_email"  name="rep_email" value="<?php echo $rep_email; ?>" /></dd>
+		</div>
+		
+		<dt><label for="rep_address"><?php echo _AT('street_address'); ?></label></dt>	
+		<dd><textarea name="rep_address" id="rep_address" cols="40" rows="5"><?php echo $rep_address; ?></textarea></dd>
+		</dl>
+		
+		<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
+		<?php if($_GET['id']){ ?>
+		<input type="hidden" name="edit" value="representation" />
+		<?php }else { ?>
+		<input type="hidden" name="add" value="representation" />
+		<?php } ?>
+	
+		<input type="submit" name="submit" class="button" value="<?php echo _AT('save'); ?>" />
+		<input type="submit" name="cancel" class="button" value="<?php echo _AT('cancel'); ?>" />
+	
+</form>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/edit_profile/edit_websites.tmpl.php b/docs/themes/simplified-desktop/social/edit_profile/edit_websites.tmpl.php
new file mode 100644
index 000000000..e604da6a9
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/edit_profile/edit_websites.tmpl.php
@@ -0,0 +1,32 @@
+<?php
+	global $addslashes;
+
+	//escape all strings
+	$url		= htmlentities_utf8($this->url);
+	$site_name	= htmlentities_utf8($this->site_name);
+?>
+<div class="headingbox"><h3><?php if($_GET['id']){echo _AT('edit_websites');}else{echo  _AT('add_new_website');}?></h3></div>
+<div class="contentbox">
+<form method="POST" action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'edit_profile.php'); ?>">
+	<dl id="public-profile">
+	<div class="row">
+	<dt><label for="url"><?php echo _AT('url'); ?></label></dt>
+	<dd><input type="text" id="url" name="url" value="<?php echo $url; ?>" /></dd>
+	</div>
+	<div class="row">
+	<dt><label for="site_name"><?php echo _AT('site_name'); ?></label></dt>
+	<dd><input type="text" id="site_name" name="site_name" value="<?php echo $site_name; ?>" /></dd>
+	</div>
+	<br />
+	<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
+		<input type="hidden" name="id" value="<?php echo $this->id; ?>" />
+		<?php if($_GET['id']){ ?>
+		<input type="hidden" name="edit" value="websites" />
+		<?php }else { ?>
+		<input type="hidden" name="add" value="websites" />
+		<?php } ?>
+	<input type="submit" name="submit" class="button" value="<?php echo _AT('save'); ?>" />
+	<input type="submit" name="cancel" class="button" value="<?php echo _AT('cancel'); ?>" />
+	</dl>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/friend_list.tmpl.php b/docs/themes/simplified-desktop/social/friend_list.tmpl.php
new file mode 100644
index 000000000..edb78d8c8
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/friend_list.tmpl.php
@@ -0,0 +1,35 @@
+<div style="float:right;width:100%;">
+<?php require('notifications.tmpl.php'); ?>
+</div>
+<div style="float:right;min-width:100%;">
+	<div class="headingbox">
+	<h3><a href="<?php echo AT_SOCIAL_BASENAME; ?>connections.php"><?php echo _AT('connections'); ?></a></h3></div>
+	<div class="contentbox">
+	<?php
+	/**
+	 * Loop through all the friends and print out a list.  
+	 */
+	if (!empty($this->friends)): ?>
+		<?php foreach ($this->friends as $id=>$m_obj): 
+			if (is_array($m_obj) && $m_obj['added']!=1){
+				//skip over members that are not "my" friends
+				continue;
+			} ?>
+			<div style="width:100%;">
+				<!-- don't want delete on the front page
+				<div style="float:right;">
+					<a style="vertical-align:top;" href="<?php echo url_rewrite('mods/social/index.php');?>?remove=yes<?php echo SEP;?>id=<?php echo $id;?>"><img src="<?php echo $_base_href; ?>mods/social/images/b_drop.png" alt="<?php echo _AT('delete'); ?>" title="<?php echo _AT('delete'); ?>" border="0"/></a>
+				</div>
+				-->
+				<div style="width:110px; float:left; padding-bottom:0.2em;">
+					<?php echo printSocialProfileImg($id); ?><br />
+					<?php echo printSocialName($id); ?>
+				</div>
+			</div>
+		<?php endforeach; ?>
+		<div style="clear:both;"><a href="<?php echo AT_SOCIAL_BASENAME; ?>connections.php"><?php echo _AT('show_all');?></a></div>
+	<?php else: ?>
+	<?php echo _AT('no_friends'); ?>
+	<?php endif; ?>
+	</div>
+</div>
diff --git a/docs/themes/simplified-desktop/social/index_public.tmpl.php b/docs/themes/simplified-desktop/social/index_public.tmpl.php
new file mode 100644
index 000000000..da3172de2
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/index_public.tmpl.php
@@ -0,0 +1,73 @@
+<script src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/livesearch.js" type="text/javascript"></script>
+<?php 
+	//Add Friends Template
+	//Generate a random number for the search input name fields, so that the browser will not remember any previous entries.
+	$rand = md5(rand(0, time())); 
+	if ($this->rand_key != ''){
+		$last_search = $_POST['search_friends_'.$this->rand_key];
+	} else {
+		$last_search = $_POST['search_friends_'.$rand];	
+	}
+?>
+<?php print_paginator($this->page, $this->num_pages, 'search_friends='.$this->search_field, 1);  ?>
+
+<div class="input-form">
+	<div class="contentrow">
+		<h3><?php echo _AT('search_for_friends'); ?></h3>
+		<form action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'index_public.php');?>" method="POST" id="search_friends_form">
+			<label for="searchFriends" style="display:none;"><?php echo _AT('search'); ?></label>
+			<input type="text" size="40" name="search_friends_<?php echo $rand;?>" id="search_friends" value="<?php echo $last_search; ?>" onkeyup="showResults(this.value, 'livesearch', '<?php echo AT_SOCIAL_BASENAME; ?>index_public.php')"/>
+			<input type="submit" name="search" value="<?php echo _AT('search'); ?>">
+			<input type="hidden" name="rand_key" value="<?php echo $rand; ?>" />
+			
+			<div id="livesearch"></div>
+		</form>
+	</div>
+</div>
+<div>
+	<div class="headingbox"><h3><?php echo _AT('search_results'); ?></h3></div>
+	<div class="contentbox">
+	<?php 
+	if (!empty($this->friends)):
+		$privacy_controller = new PrivacyController();
+		echo "<h4>"._AT('there_are_entries', sizeof($this->friends))."</h4>";
+		foreach ($this->friends as $id=>$person): 
+			$privacy_obj = $privacy_controller->getPrivacyObject($id);
+//			debug($privacy_obj->getSearch(), 'search'.$id);
+			$relationship = $privacy_controller->getRelationship($id);
+
+			if ((!isset($person['added']) || $person['added']!=1) && !PrivacyController::validatePrivacy(AT_SOCIAL_SEARCH_VISIBILITY, $relationship, $privacy_obj->getSearch())){
+				//if this user doesn't want to be searched.
+				continue;
+			}
+	?>
+	<div class="contact_mini" >
+		<div>
+			<div ><?php echo printSocialProfileImg($id); ?></div>
+			<div>
+				<?php 
+					$member_obj = new Member($id);
+					$profile = $member_obj->getAddress();
+					echo printSocialName($id) . '<br/>';
+					echo $profile['country'] . ' ' . $profile['province'] . '<br/>';
+				?>
+			</div>
+			<div style="clear:both;"></div><br/>
+		</div>	
+	</div>
+	<?php 
+		endforeach; 
+		else: 
+			echo _AT('none_found');
+	endif;
+	?>
+	</div>
+	<!--
+	<div style="float:right;">
+		[-- TODO: Paginator --]
+	</div>
+	-->
+</div>
+</div>
+<div style="clear:both;"></div>
+<?php print_paginator($this->page, $this->num_pages, 'search_friends='.$this->search_field, 1);  ?>
diff --git a/docs/themes/simplified-desktop/social/individual_application.tmpl.php b/docs/themes/simplified-desktop/social/individual_application.tmpl.php
new file mode 100644
index 000000000..54d64556c
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/individual_application.tmpl.php
@@ -0,0 +1,20 @@
+<!--  compressed with java -jar {$path}/yuicompressor-2.3.5.jar -o {$file}-min.js {$file}.js -->
+<script type="text/javascript"
+	src="<?php echo AT_SHINDIG_URL; ?>/gadgets/js/rpc.js?c=1"></script>
+<!-- header.inc.php has jscript/InfusionAll.js imported.  Jquery should be there with it
+<script type="text/javascript" src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/jquery-1.3.2.js"></script>
+-->
+<script type="text/javascript"
+	src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/prototype.js"></script>
+<script type="text/javascript" src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/container.js"></script>
+<div class="social-wrapper">
+<h3><?php echo $this->app->getTitle(); ?></h3>
+<div class="gadgets-gadget-content"><iframe width="95%"
+	scrolling="<?php echo $this->app->getScrolling(); ?>"
+	height="<?php $app=$this->app; echo $app->getHeight();?>px"
+	frameborder="0" src="<?php echo $this->iframe_url;?>" class="gadgets-gadget"
+	name="remote_iframe_<?php echo $this->app->getId();?>"
+	id="remote_iframe_<?php echo $this->app->getId();?>"></iframe>
+</div>
+<div style="clear:both;"></div>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/notifications.tmpl.php b/docs/themes/simplified-desktop/social/notifications.tmpl.php
new file mode 100644
index 000000000..719660637
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/notifications.tmpl.php
@@ -0,0 +1,72 @@
+<?php 
+//Friend request
+if(!empty($this->pending_requests)): 
+?>
+
+<div class="headingbox"><h3><?php echo _AT('pending_friend_requests'); ?></h3></div>
+<div class="contentbox">
+<?php foreach ($this->pending_requests as $id=>$r_obj): ?>
+	<div class="box" style="border:thin solid black;">
+		<div style="float:right;">
+			<a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.AT_SOCIAL_INDEX);?>?approval=y<?php echo SEP;?>id=<?php echo $r_obj->id;?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/check_icon.gif" alt="<?php echo _AT('accept_request'); ?>" title="<?php echo _AT('accept_request'); ?>" border="0"/></a><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'index.php');?>?approval=n<?php echo SEP;?>id=<?php echo $r_obj->id;?>"> <img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('reject_request'); ?>" title="<?php echo _AT('reject_request'); ?>" border="0"/></a>
+		</div>
+		<ul style="list-style:none;">
+			<li style="display:inline;"><?php echo printSocialProfileImg($id);?></li>
+			<li style="display:inline;"><?php echo printSocialName($id) ?></li>
+		</ul>
+	</div><br />
+<?php endforeach; ?>
+</div><br />
+<?php endif; ?>
+
+<?php 
+//Group invitations requests
+if(!empty($this->group_invitations)): ?>
+<div class="headingbox"><h3><?php echo _AT('new_group_invitations'); ?></h3></div>
+<?php
+	foreach ($this->group_invitations as $id=>$sender_ids): 
+	$gobj = new SocialGroup($id);
+	$name = '';
+		foreach($sender_ids as $index=>$sender_id){
+			$name .= printSocialName($sender_id).', ';
+		}
+	$name = substr($name, 0, -2);
+?>
+<div class="contentbox">
+	<div style="float:right;">
+		<a href="<?php echo AT_SOCIAL_BASENAME; ?>groups/invitation_handler.php?invitation=accept<?php echo SEP;?>id=<?php echo $gobj->getID();?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/check_icon.gif" alt="<?php echo _AT('accept_request'); ?>" title="<?php echo _AT('accept_request'); ?>" border="0"/></a> <a href="<?php echo AT_SOCIAL_BASENAME;?>groups/invitation_handler.php?invitation=reject<?php echo SEP;?>id=<?php echo $gobj->getID();?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('reject_request'); ?>" title="<?php echo _AT('reject_request'); ?>" border="0"/></a>
+	</div>
+	<ul>
+		<li class="activity"><?php echo _AT('has_invited_join', $name, '<a href="'.url_rewrite(AT_SOCIAL_BASENAME . 'groups/view.php?id='.$gobj->getID()).'">'.$gobj->getName().'</a>'); ?></li>
+	</ul>
+</div>
+<?php endforeach; ?><br />
+
+<?php endif; ?>
+
+<?php
+//Group requests
+if (!empty($this->group_requests)): 
+?>
+
+<div class="headingbox"><h3><?php echo _AT('new_group_requests'); ?></h3></div>
+<div class="contentbox">
+<?php
+foreach ($this->group_requests as $id=>$senders):
+	$gobj = new SocialGroup($id);
+	foreach($senders as $index=>$sender_id):
+	$name = printSocialName($sender_id);?>
+	<div class="box" style="border:thin solid black;">
+		<div style="float:right;">
+			<a href="<?php echo AT_SOCIAL_BASENAME; ?>groups/invitation_handler.php?request=accept<?php echo SEP;?>id=<?php echo $gobj->getID().SEP;?>sender_id=<?php echo $sender_id;?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/check_icon.gif" alt="<?php echo _AT('accept_request'); ?>" title="<?php echo _AT('accept_request'); ?>" border="0"/></a> <a href="<?php echo AT_SOCIAL_BASENAME; ?>groups/invitation_handler.php?request=reject<?php echo SEP;?>id=<?php echo $gobj->getID().SEP;?>sender_id=<?php echo $sender_id;?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('reject_request'); ?>" title="<?php echo _AT('reject_request'); ?>" border="0"/></a>
+		</div>
+		<ul>
+			<li id="activity"><?php echo _AT('has_requested_to', $name, '<a href="'.url_rewrite(AT_SOCIAL_BASENAME . 'groups/view.php?id='.$gobj->getID()).'">'.$gobj->getName().'</a>'); ?></li>
+		</ul>
+	</div>
+	<?php endforeach;?>
+	
+<?php endforeach; ?>
+</div><br />
+
+<?php endif; ?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/oauth/authorize.tmpl.php b/docs/themes/simplified-desktop/social/oauth/authorize.tmpl.php
new file mode 100644
index 000000000..ea700409e
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/oauth/authorize.tmpl.php
@@ -0,0 +1,15 @@
+<div>
+<h1>Grant access to your private information?</h1>
+
+<form class="input-form" action="approve_authorization.php" method="post">
+	<div class="row">
+		An application is requesting access to your information. You should
+		only approve this request if you trust the application.
+	</div>
+	<input type="hidden" name="oauth_token"	value="<?php echo htmlspecialchars($this->token); ?>" /> 
+	<input type="hidden" name="oauth_callback" value="<?php echo htmlspecialchars($this->callback); ?>" />
+	<input class="button" type="submit" value="Approve" />
+	<input class="button" type="button" value="Decline" onclick="location.href='/'" />
+</form>
+<div style="clear: both"></div>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/oauth/footer.tmpl.php b/docs/themes/simplified-desktop/social/oauth/footer.tmpl.php
new file mode 100644
index 000000000..5bb337465
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/oauth/footer.tmpl.php
@@ -0,0 +1,10 @@
+</div>
+
+<div id="footer">
+	<br /><br />
+	<?php require(AT_INCLUDE_PATH.'html/languages.inc.php'); ?>
+	<?php require(AT_INCLUDE_PATH.'html/copyright.inc.php'); ?>
+</div>
+
+</div></body>
+</html>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/oauth/header.tmpl.php b/docs/themes/simplified-desktop/social/oauth/header.tmpl.php
new file mode 100644
index 000000000..3aa0f384f
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/oauth/header.tmpl.php
@@ -0,0 +1,70 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="<?php echo $this->lang_code; ?>"> 
+<head>
+	<title><?php echo SITE_NAME; ?> : <?php echo $this->page_title; ?></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $this->lang_charset; ?>" />
+	<meta name="Generator" content="ATutor - Copyright 2005 by http://atutor.ca" />
+	<base href="<?php echo $this->content_base_href; ?>" />
+	<link rel="shortcut icon" href="<?php echo $this->base_path; ?>favicon.ico" type="image/x-icon" />
+	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/print.css" type="text/css" media="print" />
+	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/styles.css" type="text/css" />
+	<!--[if IE]>
+	  <link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/ie_styles.css" type="text/css" />
+	<![endif]-->
+    <link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/forms.css" type="text/css" />
+    <link rel="stylesheet" href="<?php echo $this->base_path; ?>jscripts/jquery-ui-1.7.2/css/smoothness/jquery-ui-1.7.2.custom.css" type="text/css" />
+<?php echo $this->rtl_css; ?>
+<?php if (isset($this->course_id) && $system_courses[$this->course_id]['rss']): ?>
+	<link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 2.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-2" />
+	<link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 1.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-1" />
+<?php endif; ?>
+	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
+    <script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
+    <script src="<?php echo $this->base_path; ?>jscripts/jquery-ui-1.7.2/development-bundle/ui/ui.resizable.js" type="text/javascript"></script>
+	<script language="javascript" type="text/javascript">
+	//<!--
+	jQuery.noConflict();
+	//-->
+	</script>
+    <script src="<?php echo $this->base_path; ?>jscripts/ATutor.js" type="text/javascript"></script>   
+<?php echo $this->custom_css; ?>
+    <style id="pref_style" type="text/css"></style> 
+</head>
+
+<body>
+<div class="page_wrapper">
+<div id="header">
+	<a href="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES); ?>#content" accesskey="c">
+	<img src="<?php echo $this->base_path; ?>images/clr.gif" height="1" width="1" border="0" alt="<?php echo _AT('goto_content'); ?> ALT+c" /></a>	
+	<a href="<?php echo htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES); ?>#menu<?php echo $_REQUEST['cid']  ?>"  accesskey="m"><img src="<?php echo $this->base_path; ?>images/clr.gif" height="1" width="1" border="0" alt="<?php echo _AT('goto_menu'); ?> ALT+m" /></a>
+
+	<?php if (!empty($this->icon)) { // if a course icon is available, display it here.  ?>
+		<a href="<?php echo $this->base_path.url_rewrite('index.php'); ?>"><img src="<?php echo $this->icon; ?>" class="headicon" alt="<?php echo  _AT('home'); ?>" /></a>	
+	<?php } ?>
+
+
+
+	<?php
+	// If there is a custom course banner in the file manager called banner.html, display it here
+	@readfile(AT_CONTENT_DIR . $this->course_id.'/banner.txt'); 
+
+	/*
+	and example banner.html file might look like:
+	<div style="width: 760px; height: 42px; background: white;"><img src="http://[mysite]/atutor15rc3/banners/kart-camb.jpg"></div>
+	*/
+
+	?>
+	<!-- section title -->
+	<?php if (isset($_SESSION['valid_user']) && $_SESSION['valid_user']): 
+		echo '<div class="site-name">'.stripslashes(SITE_NAME).'</div>'; 
+	else:
+		echo '<br />';	
+	endif; ?>
+	<h1 id="section-title"><?php echo $this->section_title; ?>
+		<?php if ((isset($this->course_id) && $this->course_id > 0) && ($_SESSION['enroll'] == AT_ENROLL_NO)) : ?> 
+			- <small><a href="<?php echo $this->base_path; ?>enroll.php?course=<?php echo $this->course_id; ?>"><?php echo _AT('enroll_me'); ?></a></small>
+		<?php endif; ?>
+	</h1>
+</div>
+<div class="contentwrapper">
diff --git a/docs/themes/simplified-desktop/social/profile_picture.html.php b/docs/themes/simplified-desktop/social/profile_picture.html.php
new file mode 100644
index 000000000..f5126d2b2
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/profile_picture.html.php
@@ -0,0 +1,216 @@
+<?php
+/************************************************************************/
+/* ATutor																*/
+/************************************************************************/
+/* Copyright (c) 2002-2008 by Greg Gay, Joel Kronenberg & Heidi Hazelton*/
+/* Adaptive Technology Resource Centre / University of Toronto			*/
+/* http://atutor.ca														*/
+/*																		*/
+/* This program is free software. You can redistribute it and/or		*/
+/* modify it under the terms of the GNU General Public License			*/
+/* as published by the Free Software Foundation.						*/
+/************************************************************************/
+// $Id: profile_picture.html.php 9418 2010-03-03 16:39:24Z greg $
+if (!defined('AT_INCLUDE_PATH')) { exit; }
+
+function resize_image($src, $dest, $src_h, $src_w, $dest_h, $dest_w, $type, $src_x=0, $src_y=0) {
+	$thumbnail_img = imagecreatetruecolor($dest_w, $dest_h);
+
+	if ($type == 'gif') {
+		$source = imagecreatefromgif($src);
+	} else if ($type == 'jpg') {
+		$source = imagecreatefromjpeg($src);
+	} else {
+		$source = imagecreatefrompng($src);
+	}
+	
+	if ($src_x > 0 || $src_y > 0){
+		imagecopyresized($thumbnail_img, $source, 0, 0, $src_x, $src_y, $dest_w, $dest_h, $src_w, $src_h);
+	} else {
+		imagecopyresampled($thumbnail_img, $source, $src_x, $src_y, 0, 0, $dest_w, $dest_h, $src_w, $src_h);
+	}
+
+	if ($type == 'gif') {
+		imagegif($thumbnail_img, $dest);
+	} else if ($type == 'jpg') {
+		imagejpeg($thumbnail_img, $dest, 75);
+	} else {
+		imagepng($thumbnail_img, $dest, 7);
+	}
+}
+
+// check if GD is installed
+if (!extension_loaded('gd')) {
+	require(AT_INCLUDE_PATH.'header.inc.php');
+	$msg->printInfos('FEATURE_NOT_AVAILABLE');
+	require(AT_INCLUDE_PATH.'footer.inc.php');
+	exit;
+}
+
+// check if folder exists, if not, create it
+if (!is_dir(AT_CONTENT_DIR.'/profile_pictures/profile')) {
+	mkdir(AT_CONTENT_DIR.'/profile_pictures/profile');
+}
+
+$gd_info = gd_info();
+$supported_images = array();
+if ($gd_info['GIF Create Support']) {
+	$supported_images[] = 'gif';
+}
+if ($gd_info['JPG Support']) {
+	$supported_images[] = 'jpg';
+}
+if ($gd_info['PNG Support']) {
+	$supported_images[] = 'png';
+}
+
+if (!$supported_images) {
+	require(AT_INCLUDE_PATH.'header.inc.php');
+	$msg->printInfos('FEATURE_NOT_AVAILABLE');
+	require(AT_INCLUDE_PATH.'footer.inc.php');
+	exit;
+}
+
+if (isset($_POST['cancel'])) {
+	$msg->addFeedback('CANCELLED');
+	header('Location: '.$_SERVER['PHP_SELF'].'?member_id='.$member_id);
+	exit;
+} else if (isset($_POST['submit'])) {
+	if (isset($_POST['delete']) && !$_FILES['file']['size']) {
+		profile_image_delete($member_id);
+
+		$msg->addFeedback('PROFILE_UPDATED');
+
+		header('Location: '.$_SERVER['PHP_SELF'].'?member_id='.$member_id);
+		exit;
+	} else if ($_FILES['file']['error'] == UPLOAD_ERR_FORM_SIZE) {
+		$msg->addError(array('FILE_MAX_SIZE', $_config['prof_pic_max_file_size'] . ' ' . _AT('bytes')));
+		header('Location: '.$_SERVER['PHP_SELF'].'?member_id='.$member_id);
+		exit;
+	} else if (!$_FILES['file']['size']) {
+		header('Location: '.$_SERVER['PHP_SELF'].'?member_id='.$member_id);
+		exit;
+	}
+
+	// check if this is a supported file type
+	$filename   = $stripslashes($_FILES['file']['name']);
+	$path_parts = pathinfo($filename);
+	$extension  = strtolower($path_parts['extension']);
+	$image_attributes = getimagesize($_FILES['file']['tmp_name']);
+
+	if ($extension == 'jpeg') {
+		$extension = 'jpg';
+	}
+
+	if (!in_array($extension, $supported_images)) {
+		$msg->addError(array('FILE_ILLEGAL', $extension));
+		header('Location: '.$_SERVER['PHP_SELF'].'?member_id='.$member_id);
+		exit;
+	} else if ($image_attributes[2] > IMAGETYPE_PNG) {
+		$msg->addError(array('FILE_ILLEGAL', $extension));
+		header('Location: '.$_SERVER['PHP_SELF'].'?member_id='.$member_id);
+		exit;
+	}
+
+	// make sure under max file size
+	if ($_FILES['file']['size'] > $_config['prof_pic_max_file_size']) {
+		$msg->addError('FILE_MAX_SIZE');
+		header('Location: '.$_SERVER['PHP_SELF'].'?member_id='.$member_id);
+		exit;
+	}
+
+	// delete the old images (if any)
+	profile_image_delete($member_id);
+
+	$new_filename   = $member_id . '.' . $extension;
+	$original_img  = AT_CONTENT_DIR.'profile_pictures/originals/'. $new_filename;
+	$profile_img   = AT_CONTENT_DIR.'profile_pictures/profile/'. $new_filename;
+	$thumbnail_img = AT_CONTENT_DIR.'profile_pictures/thumbs/'. $new_filename;
+
+	// save original
+	if (!move_uploaded_file($_FILES['file']['tmp_name'], $original_img)) {
+		$msg->addError('CANNOT_OVERWRITE_FILE');
+		header('Location: '.$_SERVER['PHP_SELF'].'?member_id='.$member_id);
+		exit;
+	}
+
+	// resize the original and save it at $thumbnail_file
+	$width  = $image_attributes[0];
+	$height = $image_attributes[1];
+
+	$thumbnail_fixed_height = 60; 
+	$thumbnail_fixed_width = 60; 
+
+	if ($width > $height && $height > $thumbnail_fixed_height) {
+		$thumbnail_height= $thumbnail_fixed_height;
+		$thumbnail_width = intval($thumbnail_fixed_height * $width / $height);
+		resize_image($original_img, $thumbnail_img, $height, $width, $thumbnail_height, $thumbnail_width, $extension);
+		//cropping
+		resize_image($thumbnail_img, $thumbnail_img, $thumbnail_fixed_height, $thumbnail_fixed_width, $thumbnail_fixed_height, $thumbnail_fixed_width, $extension, ($thumbnail_width-$thumbnail_fixed_width)/2);
+	} else if ($width <= $height && $width>$thumbnail_fixed_width) {
+		$thumbnail_height = intval($thumbnail_fixed_width * $height / $width);
+		$thumbnail_width  = $thumbnail_fixed_width;
+		resize_image($original_img, $thumbnail_img, $height, $width, $thumbnail_height, $thumbnail_width, $extension);
+		//cropping
+		resize_image($thumbnail_img, $thumbnail_img, $thumbnail_fixed_height, $thumbnail_fixed_width, $thumbnail_fixed_height, $thumbnail_fixed_width, $extension, 0, ($thumbnail_height-$thumbnail_fixed_height)/2);
+	} else {
+		// no resizing, just copy the image.
+		// it's too small to resize.
+		copy($original_img, $thumbnail_img);
+	}
+
+	// resize the original and save it to profile
+	$profile_fixed_height = 320;
+	$profile_fixed_width = 240;
+	if ($width > $height && $height>$profile_fixed_height) {
+		$profile_width = intval($profile_fixed_height * $width / $height);
+		$profile_height  = $profile_fixed_height;
+		resize_image($original_img, $profile_img, $height, $width, $profile_height, $profile_width, $extension);
+		//cropping
+		resize_image($profile_img, $profile_img, $profile_fixed_height, $profile_fixed_width, $profile_fixed_height, $profile_fixed_width, $extension, ($profile_width-$profile_fixed_width)/2);
+	} else if ($width <= $height && $width > $profile_fixed_width) {
+		$profile_width = $profile_fixed_width;
+		$profile_height = intval($profile_fixed_width * $height / $width);
+		resize_image($original_img, $profile_img, $height, $width, $profile_height, $profile_width, $extension);
+		//cropping
+		resize_image($profile_img, $profile_img, $profile_fixed_height, $profile_fixed_width, $profile_fixed_height, $profile_fixed_width, $extension, 0, ($profile_height-$profile_fixed_height)/2);
+	} else {
+		// no resizing, just copy the image.
+		// it's too small to resize.
+		copy($original_img, $profile_img);
+	}
+
+	$msg->addFeedback('PROFILE_UPDATED');
+
+	header('Location: '.$_SERVER['PHP_SELF'].'?member_id='.$member_id);
+	exit;
+}
+
+require(AT_INCLUDE_PATH.'header.inc.php');
+
+?>
+<div class="social-wrapper">
+<?php include("lib/profile_menu.inc.php")  ?>
+<br />
+<form method="post" enctype="multipart/form-data" action="<?php echo $_SERVER['PHP_SELF']; ?>?member_id=<?php echo $member_id; ?>" name="form">
+<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_config['prof_pic_max_file_size']; ?>" />
+<div class="input-form">
+<?php if (profile_image_exists($member_id)): ?>
+	<div class="row">
+		<a href="get_profile_img.php?id=<?php echo $member_id.SEP.'size=o'; ?>"><img src="get_profile_img.php?id=<?php echo $member_id; ?>" alt="" /></a>
+		<input type="checkbox" name="delete" value="1" id="del"/><label for="del"><?php echo _AT('delete'); ?></label>
+	</div>
+<?php endif; ?>
+	<div class="row">
+		<h3><label for="upload_picture"><?php echo _AT('upload_new_picture'); ?></label></h3>
+		<input type="file" name="file" id="upload_picture"/> (<?php echo implode(', ', $supported_images); ?>)</div>
+
+	<div class="row buttons">
+		<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" />
+		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />
+	</div>
+</div>
+</form>
+<div style="clear:both;"></div>
+</div>
+<?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/settings/account_settings.tmpl.php b/docs/themes/simplified-desktop/social/settings/account_settings.tmpl.php
new file mode 100644
index 000000000..7e16ea81b
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/settings/account_settings.tmpl.php
@@ -0,0 +1,10 @@
+<form action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'settings.php');?>" method="POST">
+<div class="input-form">
+	<h4><?php echo _AT('account_settings'); ?></h4>
+	<div class="row"><?php echo _AT('account_control_blurb'); ?> </div>
+	<div class="row">
+		<input type="hidden" name="n" value="account_settings" />
+		<input class="button" type="submit" name="submit" value="<?php echo _AT('save'); ?>"/>
+	</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/settings/application_settings.tmpl.php b/docs/themes/simplified-desktop/social/settings/application_settings.tmpl.php
new file mode 100644
index 000000000..a2f0b313c
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/settings/application_settings.tmpl.php
@@ -0,0 +1,27 @@
+<?php 
+if (empty($this->my_apps)):
+	echo _AT('no_gadgets_installed'); 
+else: ?>
+<br />
+<form action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'settings.php');?>" method="POST">
+<div class="input-form"  style="padding:1em;">
+	<h4><?php echo _AT('application_settings'); ?></h4>
+	<div class="row"><?php echo _AT('application_control_blurb'); ?></div>
+	<?php foreach($this->my_apps as $id=>$app_obj): ?>
+	<div class="row" style="width:60%; border-bottom:1px solid #bbb;">
+		<div style="float:left;"><?php echo $app_obj->getTitle(); ?></div>
+		<div style="float:right;">
+			<label for="app_<?php echo $app_obj->getID();?>"><?php echo _AT('show_on_home_page'); ?></label>
+			<?php (isset($this->home_display[$id]))? $checked = ' checked="checked"': $checked = ''; ?>
+			<input type="checkbox" id="app_<?php echo $app_obj->getID();?>" name="app[<?php echo $app_obj->getID();?>]" value="1" <?php echo $checked; ?>/>
+		</div>
+		<div><br/></div>
+	</div>
+	<?php endforeach;?>
+	<div class="row">
+		<input type="hidden" name="n" value="application_settings" />
+		<input class="button" type="submit" name="submit" value="<?php echo _AT('save'); ?>"/>
+	</div>
+</div>
+</form>
+<?php endif; ?>
diff --git a/docs/themes/simplified-desktop/social/settings/privacy_settings.tmpl.php b/docs/themes/simplified-desktop/social/settings/privacy_settings.tmpl.php
new file mode 100644
index 000000000..83082a17e
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/settings/privacy_settings.tmpl.php
@@ -0,0 +1,145 @@
+<br /><form action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'settings.php');?>" method="POST">
+<div class="input-form">
+<h4><?php echo _AT('privacy_settings'); ?></h4>
+<div class="row-blurb"><?php echo _AT('privacy_control_blurb'); ?> </div>
+<br />
+<fieldset class="group_form"><legend class="group_form"><?php echo _AT('profile_control'); ?></legend>
+<div class="row">
+	<label for="basic_profile"><?php echo _AT('basic_profile'); ?></label>
+		<div>
+		<?php foreach ($this->controller->getPermissionLevels() as $control_id=>$control_string): 
+			(isset($this->profile_prefs[AT_SOCIAL_PROFILE_BASIC][$control_id]))?$checked=' checked="checked"':$checked='';	?>		
+		<label for="boxes_profile_<?php echo AT_SOCIAL_PROFILE_BASIC.'_'.$control_id; ?>"><?php echo $control_string; ?></label>
+		<input type="checkbox" id="boxes_profile_<?php echo AT_SOCIAL_PROFILE_BASIC.'_'.$control_id; ?>" name="profile_prefs[<?php echo AT_SOCIAL_PROFILE_BASIC;?>][<?php echo $control_id; ?>]" value="1"  <?php echo $checked; ?>>
+		<?php endforeach; ?>
+		</div>
+</div>
+<div class="row">
+	<label for="detailed_profile"><?php echo _AT('detailed_profile'); ?></label>
+	<div>
+		<?php foreach ($this->controller->getPermissionLevels() as $control_id=>$control_string): 
+			(isset($this->profile_prefs[AT_SOCIAL_PROFILE_PROFILE][$control_id]))?$checked=' checked="checked"':$checked='';	?>		
+		<label for="boxes_profile_<?php echo AT_SOCIAL_PROFILE_PROFILE.'_'.$control_id; ?>"><?php echo $control_string; ?></label>
+		<input type="checkbox" id="boxes_profile_<?php echo AT_SOCIAL_PROFILE_PROFILE.'_'.$control_id; ?>" name="profile_prefs[<?php echo AT_SOCIAL_PROFILE_PROFILE;?>][<?php echo $control_id; ?>]" value="1"  <?php echo $checked; ?>>
+		<?php endforeach; ?>
+	</div>
+</div>
+<div class="row">
+	<label for="status_update"><?php echo _AT('activities'); ?></label>
+	<div>
+		<?php foreach ($this->controller->getPermissionLevels() as $control_id=>$control_string): 
+			(isset($this->profile_prefs[AT_SOCIAL_PROFILE_STATUS_UPDATE][$control_id]))?$checked=' checked="checked"':$checked='';	?>		
+		<label for="boxes_profile_<?php echo AT_SOCIAL_PROFILE_STATUS_UPDATE.'_'.$control_id; ?>"><?php echo $control_string; ?></label>
+		<input type="checkbox" id="boxes_profile_<?php echo AT_SOCIAL_PROFILE_STATUS_UPDATE.'_'.$control_id; ?>" name="profile_prefs[<?php echo AT_SOCIAL_PROFILE_STATUS_UPDATE;?>][<?php echo $control_id; ?>]" value="1"  <?php echo $checked; ?>>
+		<?php endforeach; ?>
+	</div>
+</div>
+<!-- 
+  -- Not implemented yet.
+  --
+<div class="row">
+	<label for="media"><?php echo _AT('media'); ?></label>
+	<div>
+		<?php foreach ($this->controller->getPermissionLevels() as $control_id=>$control_string): 
+			(isset($this->profile_prefs[AT_SOCIAL_PROFILE_MEDIA][$control_id]))?$checked=' checked="checked"':$checked='';	?>		
+		<label for="boxes_profile_<?php echo AT_SOCIAL_PROFILE_MEDIA.'_'.$control_id; ?>"><?php echo $control_string; ?></label>
+		<input type="checkbox" id="boxes_profile_<?php echo AT_SOCIAL_PROFILE_MEDIA.'_'.$control_id; ?>" name="profile_prefs[<?php echo AT_SOCIAL_PROFILE_MEDIA;?>][<?php echo $control_id; ?>]" value="1"  <?php echo $checked; ?>>
+		<?php endforeach; ?>
+	</div>
+</div>
+  -->
+<div class="row">
+	<label for="connection"><?php echo _AT('connections'); ?></label>
+	<div>
+		<?php foreach ($this->controller->getPermissionLevels() as $control_id=>$control_string): 
+			(isset($this->profile_prefs[AT_SOCIAL_PROFILE_CONNECTION][$control_id]))?$checked=' checked="checked"':$checked='';	?>		
+		<label for="boxes_profile_<?php echo AT_SOCIAL_PROFILE_CONNECTION.'_'.$control_id; ?>"><?php echo $control_string; ?></label>
+		<input type="checkbox" id="boxes_profile_<?php echo AT_SOCIAL_PROFILE_CONNECTION.'_'.$control_id; ?>" name="profile_prefs[<?php echo AT_SOCIAL_PROFILE_CONNECTION;?>][<?php echo $control_id; ?>]" value="1"  <?php echo $checked; ?>>
+		<?php endforeach; ?>
+	</div>
+</div>
+<div class="row">
+	<label for="education"><?php echo _AT('education'); ?></label>
+	<div>
+		<?php foreach ($this->controller->getPermissionLevels() as $control_id=>$control_string): 
+			(isset($this->profile_prefs[AT_SOCIAL_PROFILE_EDUCATION][$control_id]))?$checked=' checked="checked"':$checked='';	?>		
+		<label for="boxes_profile_<?php echo AT_SOCIAL_PROFILE_EDUCATION.'_'.$control_id; ?>"><?php echo $control_string; ?></label>
+		<input type="checkbox" id="boxes_profile_<?php echo AT_SOCIAL_PROFILE_EDUCATION.'_'.$control_id; ?>" name="profile_prefs[<?php echo AT_SOCIAL_PROFILE_EDUCATION;?>][<?php echo $control_id; ?>]" value="1"  <?php echo $checked; ?>>
+		<?php endforeach; ?>
+	</div>
+</div>
+<div class="row">
+	<label for="position"><?php echo _AT('position'); ?></label>
+	<div>
+		<?php foreach ($this->controller->getPermissionLevels() as $control_id=>$control_string): 
+			(isset($this->profile_prefs[AT_SOCIAL_PROFILE_POSITION][$control_id]))?$checked=' checked="checked"':$checked='';	?>		
+		<label for="boxes_profile_<?php echo AT_SOCIAL_PROFILE_POSITION.'_'.$control_id; ?>"><?php echo $control_string; ?></label>
+		<input type="checkbox" id="boxes_profile_<?php echo AT_SOCIAL_PROFILE_POSITION.'_'.$control_id; ?>" name="profile_prefs[<?php echo AT_SOCIAL_PROFILE_POSITION;?>][<?php echo $control_id; ?>]" value="1"  <?php echo $checked; ?>>
+		<?php endforeach; ?>
+	</div>
+</div>
+</fieldset>
+
+<fieldset class="group_form"><legend class="group_form"><?php echo _AT('search_control'); ?></legend>
+<div class="row">
+	<label for="search_visibility"><?php echo _AT('search_visibility'); ?></label>
+		<div>
+		<?php foreach ($this->controller->getPermissionLevels() as $control_id=>$control_string): 
+			(isset($this->search_prefs[AT_SOCIAL_SEARCH_VISIBILITY][$control_id]))?$checked=' checked="checked"':$checked='';	?>		
+		<label for="boxes_search_<?php echo AT_SOCIAL_SEARCH_VISIBILITY.'_'.$control_id; ?>"><?php echo $control_string; ?></label>
+		<input type="checkbox" id="boxes_search_<?php echo AT_SOCIAL_SEARCH_VISIBILITY.'_'.$control_id; ?>" name="search_prefs[<?php echo AT_SOCIAL_SEARCH_VISIBILITY;?>][<?php echo $control_id; ?>]" value="1"  <?php echo $checked; ?>>
+		<?php endforeach; ?>
+		</div>
+</div>
+<!-- These settings will be implemented after
+[[[Following are to be implemented...]]]
+<div class="row">
+	<label for="search_profile"><?php echo _AT('search_profile'); ?></label>
+		<div>
+		<?php foreach ($this->controller->getPermissionLevels() as $control_id=>$control_string): 
+			(isset($this->search_prefs[AT_SOCIAL_SEARCH_PROFILE][$control_id]))?$checked=' checked="checked"':$checked='';	?>		
+		<label for="boxes_search_<?php echo AT_SOCIAL_SEARCH_PROFILE.'_'.$control_id; ?>"><?php echo $control_string; ?></label>
+		<input type="checkbox" id="boxes_search_<?php echo AT_SOCIAL_SEARCH_PROFILE.'_'.$control_id; ?>" name="search_prefs[<?php echo AT_SOCIAL_SEARCH_PROFILE;?>][<?php echo $control_id; ?>]" value="1"  <?php echo $checked; ?>>
+		<?php endforeach; ?>
+		</div>
+</div>
+<div class="row">
+	<label for="search_connection"><?php echo _AT('search_connections'); ?></label>
+		<div>
+		<?php foreach ($this->controller->getPermissionLevels() as $control_id=>$control_string): 
+			(isset($this->search_prefs[AT_SOCIAL_SEARCH_CONNECTION][$control_id]))?$checked=' checked="checked"':$checked='';	?>		
+		<label for="boxes_search_<?php echo AT_SOCIAL_SEARCH_CONNECTION.'_'.$control_id; ?>"><?php echo $control_string; ?></label>
+		<input type="checkbox" id="boxes_search_<?php echo AT_SOCIAL_SEARCH_CONNECTION.'_'.$control_id; ?>" name="search_prefs[<?php echo AT_SOCIAL_SEARCH_CONNECTION;?>][<?php echo $control_id; ?>]" value="1"  <?php echo $checked; ?>>
+		<?php endforeach; ?>
+		</div>
+</div>
+<div class="row">
+	<label for="search_education"><?php echo _AT('search_education'); ?></label>
+		<div>
+		<?php foreach ($this->controller->getPermissionLevels() as $control_id=>$control_string): 
+			(isset($this->search_prefs[AT_SOCIAL_SEARCH_EDUCATION][$control_id]))?$checked=' checked="checked"':$checked='';	?>		
+		<label for="boxes_search_<?php echo AT_SOCIAL_SEARCH_EDUCATION.'_'.$control_id; ?>"><?php echo $control_string; ?></label>
+		<input type="checkbox" id="boxes_search_<?php echo AT_SOCIAL_SEARCH_EDUCATION.'_'.$control_id; ?>" name="search_prefs[<?php echo AT_SOCIAL_SEARCH_EDUCATION;?>][<?php echo $control_id; ?>]" value="1"  <?php echo $checked; ?>>
+		<?php endforeach; ?>
+		</div>
+</div>
+<div class="row">
+	<label for="search_position"><?php echo _AT('search_position'); ?></label>
+		<div>
+		<?php foreach ($this->controller->getPermissionLevels() as $control_id=>$control_string): 
+			(isset($this->search_prefs[AT_SOCIAL_SEARCH_POSITION][$control_id]))?$checked=' checked="checked"':$checked='';	?>		
+		<label for="boxes_search_<?php echo AT_SOCIAL_SEARCH_POSITION.'_'.$control_id; ?>"><?php echo $control_string; ?></label>
+		<input type="checkbox" id="boxes_search_<?php echo AT_SOCIAL_SEARCH_POSITION.'_'.$control_id; ?>" name="search_prefs[<?php echo AT_SOCIAL_SEARCH_POSITION;?>][<?php echo $control_id; ?>]" value="1"  <?php echo $checked; ?>>
+		<?php endforeach; ?>
+		</div>
+</div>
+-->
+</fieldset>
+
+
+<div class="row" id="last-row">
+	<input type="hidden" name="n" value="privacy_settings" />
+	<input class="button" type="submit" name="submit" value="<?php echo _AT('save'); ?>"/>
+</div>
+</div>
+</form>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/settings/settings_menu.tmpl.php b/docs/themes/simplified-desktop/social/settings/settings_menu.tmpl.php
new file mode 100644
index 000000000..117d2773d
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/settings/settings_menu.tmpl.php
@@ -0,0 +1,6 @@
+<?php //include this file in all the settings template under the html/settings/ directory ?>
+<ul class="social_inline_menu">
+<!--	<li class="inlinelist"><a href="<?php echo 'mods/social/settings.php?n=account_settings'; ?>"><?php echo _AT('account_settings'); ?></a></li> -->
+	<li class="inlinelist"><a href="<?php echo AT_SOCIAL_BASENAME.'settings.php?n=privacy_settings'; ?>"><?php echo _AT('privacy_settings'); ?></a></li>
+	<li class="inlinelist"><a href="<?php echo AT_SOCIAL_BASENAME.'settings.php?n=application_settings'; ?>"><?php echo _AT('application_settings'); ?></a></li>
+</ul>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/sgroup_create.tmpl.php b/docs/themes/simplified-desktop/social/sgroup_create.tmpl.php
new file mode 100644
index 000000000..b4766c8da
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/sgroup_create.tmpl.php
@@ -0,0 +1,38 @@
+<?php
+//Deprecated
+//Use sgroup_edit.tmpl.php instead.
+//keeping this just as a record
+//@harris
+?>
+
+<div class="input-form">	
+	<form action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'groups/create.php'); ?>" method="POST" >
+		<div class="row">
+			<label for="group_name"><?php echo _AT('group_name'); ?></label>
+			<input type="text" size="45" name="group_name" id="group_name" value="<?php echo $_POST['group_name']; ?>"/>
+		</div>
+
+		<div class="row">
+			<label for="group_type"><?php echo _AT('group_type'); ?></label>
+			<select name="group_type" id="group_type">
+			<?php foreach ($this->group_types as $type_id=>$type): ?>
+				<option value="<?php echo $type_id;?>"><?php echo _AT($type);?></option>
+			<?php endforeach; ?>
+			</select>
+		</div>
+
+		<div class="row">
+			<label for="logo"><?php echo _AT('group_logo'); ?></label>
+			<input type="text" size="45" name="logo" id="logo" value="<?php echo $_POST['logo']; ?>"/>
+		</diV>
+
+		<div class="row">
+			<label for="description"><?php echo _AT('description'); ?></label>
+			<textarea cols="40" rows="5" name="description" id="description"><?php echo $_POST['description']; ?></textarea>
+		</div>
+
+		<div class="row">
+			<input class="button" type="submit" name="create" value="<?php echo _AT('create'); ?>" />	
+		</div>
+	</form>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/sgroup_edit.tmpl.php b/docs/themes/simplified-desktop/social/sgroup_edit.tmpl.php
new file mode 100644
index 000000000..681dbf88e
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/sgroup_edit.tmpl.php
@@ -0,0 +1,93 @@
+<?php 
+if (isset($this->group_obj)){
+	//edit
+	$form_url = AT_SOCIAL_BASENAME.'groups/edit.php';
+	$button_name = 'save';
+	$name = $this->group_obj->getName();
+	$logo = $this->group_obj->getLogo();
+	$privacy = $this->group_obj->getPrivacy();
+	$description = $this->group_obj->getDescription(false);
+	$id = $this->group_obj->getID();
+} else {
+	//create new one
+	$form_url = AT_SOCIAL_BASENAME.'groups/create.php';
+	$button_name = 'create';
+}
+?>
+
+<div class="input-form">	
+	<form action="<?php echo $form_url; ?>" method="POST" enctype="multipart/form-data">
+		<div class="row">
+			<label for="group_name"><?php echo _AT('group_name'); ?></label>
+			<input type="text" size="45" name="group_name" id="group_name" value="<?php echo $name; ?>"/>
+		</div>
+
+		<?php if (isset($this->group_obj)): ?>
+		<div class="row">
+			<label for="group_admin"><?php echo _AT('group_admin'); ?></label>
+			<select name="group_admin" id="group_admin">
+			<?php 
+				foreach($this->group_obj->getGroupMembers() as $garbage=>$member_obj):
+					$selected = '';
+					if ($this->group_obj->getUser()==$member_obj->getID()){
+						$selected = ' selected="selected"';
+					} 
+			?>
+				<option value="<?php echo $member_obj->getID();?>" <?php echo $selected;?>><?php echo printSocialName($member_obj->getID());?></option>
+			<?php endforeach; ?>
+			</select>
+		</div>
+		<?php endif; ?>
+
+		<div class="row">
+			<label for="group_type"><?php echo _AT('group_type'); ?></label>
+			<select name="group_type" id="group_type">
+			<?php 
+				foreach ($this->group_types as $type_id=>$type): 
+					$selected = '';
+					if ($this->group_obj->type_id==$type_id){
+						$selected = ' selected="selected"';
+					} 
+			?>
+				<option value="<?php echo $type_id;?>" <?php echo $selected;?>><?php echo _AT($type);?></option>
+			<?php endforeach; ?>
+			</select>
+		</div>
+
+		<div class="row">
+			<?php
+				if ($privacy==1){
+					$private_selected = ' checked="checked"';
+				}  else {
+					$public_selected = ' checked="checked"';
+				}
+			?>
+			<label><?php echo _AT('access');?></label><br/>
+			<input type="radio" name="group_privacy" id="group_about_public" value="public" <?php echo $public_selected; ?>/>
+			<label for="group_about_public"><?php echo _AT('public').': '._AT('group_about_public'); ?></label><br/>
+			<input type="radio" name="group_privacy" id="group_about_private" value="private" <?php echo $private_selected; ?>/>
+			<label for="group_about_private"><?php echo _AT('private').': '._AT('group_about_private'); ?></label>
+		</div>
+
+		<div class="row">
+			<?php 
+				if ($logo!='') {
+					echo $logo;
+				} 
+			?>
+			<label for="logo"><?php echo _AT('group_logo'); ?></label>
+			<input type="file" size="30" name="logo" id="logo" />
+		</diV>
+
+		<div class="row">
+			<label for="description"><?php echo _AT('description'); ?></label>
+			<textarea cols="30" rows="5" name="description" id="description"><?php echo $description; ?></textarea>
+		</div>
+
+		<div class="row">
+			<input type="hidden" name="id" value="<?php echo $id;?>" /?>
+			<input class="button" type="submit" name="<?php echo $button_name; ?>" value="<?php echo _AT($button_name); ?>" />	
+			<input class="button" type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>" />	
+		</div>
+	</form>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/sgroup_invite.tmpl.php b/docs/themes/simplified-desktop/social/sgroup_invite.tmpl.php
new file mode 100644
index 000000000..79c6c5d48
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/sgroup_invite.tmpl.php
@@ -0,0 +1,46 @@
+<?php //debug($this->group_obj); ?>
+<div style="width:90%">
+	<div style="float:left;width:47%; clear:right;">
+		<div class="headingbox"><h3><?php echo _AT('added_members'); ?></h3></div>
+		<div class="contentbox">
+			<ul>
+			<?php foreach ($this->group_obj->getGroupMembers() as $k=>$person_obj): ?>
+				<li><?php echo printSocialName($person_obj->getID()); ?></li>
+			<?php endforeach; ?>
+			</ul>
+		</div>
+	</div>
+ 	<div style="float:right;width:47%;">
+		<form class="input-form" method="POST" action="<?php echo AT_SOCIAL_BASENAME; ?>groups/invite.php">
+			<div class="headingbox"><h3><?php echo _AT('not_added_members'); ?></h3></div>
+			<div class="contentbox">
+			<!-- 
+			  -- To be implemented 
+			  --
+			<label for="search_not_added_members"><?php echo _AT('search');?></label>
+			<input type="text" name="search_not_added_members" id="search_not_added_members">
+			  -->
+			<div style="height:300px;overflow:scroll;">
+				<?php 
+				$all_friends = getFriends($_SESSION['member_id']);
+				foreach ($all_friends as $k=>$member_id): 
+					if(in_array(new Member($member_id), $this->group_obj->getGroupMembers())){
+						$extra = ' disabled="disabled"';
+					} else {
+						$extra = '';
+					}
+
+					if(isset($_POST['new_members'][$member_id])){
+						$extra .= ' checked="checked"';
+					}
+				?>
+					<input type="checkbox" name="new_members[<?php echo $member_id;?>]" id="member_<?php echo $member_id; ?>" <?php echo $extra;?>/>
+					<label for="member_<?php echo $member_id; ?>"><?php echo printSocialName($member_id, false); ?></label><br/>
+				<?php endforeach; ?>
+			</div>
+			<input type="hidden" name="id" value="<?php echo $_REQUEST['id']; ?>" />
+			<input class="button" type="submit" name="inviteMember" value="<?php echo _AT('invite');?>" />
+			</div>
+		</form>
+	</div>
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/sgroup_list.tmpl.php b/docs/themes/simplified-desktop/social/sgroup_list.tmpl.php
new file mode 100644
index 000000000..bed3e3901
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/sgroup_list.tmpl.php
@@ -0,0 +1,61 @@
+<script src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/livesearch.js" type="text/javascript"></script>
+<?php 
+	//Add Friends Template
+	//Generate a random number for the search input name fields, so that the browser will not remember any previous entries.
+	$rand = md5(rand(0, time())); 
+	if ($this->rand_key != ''){
+		$last_search = $_POST['search_friends_'.$this->rand_key];
+	} else {
+		$last_search = $_POST['search_friends_'.$rand];	
+	}
+?>
+
+<div class="input-form" style="float:right; width:34%;padding:1em;min-height:4.5em;">
+	<div class="contentrow">
+		<h3><?php echo _AT('search_for_friends'); ?></h3>
+		<form action="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'groups/list.php');?>" method="POST" id="search_friends_form">
+			<label for="searchFriends" style="display:none;"><?php echo _AT('search'); ?></label>
+			<input type="text" size="60" name="search_friends_<?php echo $rand;?>" id="search_friends" value="<?php echo $last_search; ?>" onkeyup="showResults(this.value, 'livesearch', '<?php echo AT_SOCIAL_BASENAME; ?>groups/list.php')"/>
+			<input type="submit" name="search" value="<?php echo _AT('search'); ?>">
+			<input type="hidden" name="rand_key" value="<?php echo $rand; ?>" />
+			<input type="hidden" name="id" value="<?php echo $this->grp_obj->getID(); ?>" />			
+			<div id="livesearch"></div>
+		</form>
+	</div>
+</div>
+<div class="" style="float:left; width:59%">
+	<div class="headingbox"><h3><?php echo _AT('connections'); ?></h3></div>
+	<div class="contentbox">
+	<?php 
+	if (!empty($this->grp_members)):
+		echo "<h4>"._AT('there_are_entries', sizeof($this->grp_members))."</h4>";
+		foreach ($this->grp_members as $id=>$person_obj): 
+	?>
+	<div class="contact_mini" >
+		<?php if($_SESSION['member_id']==$this->grp_obj->getUser()): ?>
+		<div style="float:right;"><a href="<?php echo AT_SOCIAL_BASENAME;?>groups/list.php?remove=yes<?php echo SEP;?>id=<?php echo $this->grp_obj->getID(); ?><?php echo SEP;?>member_id=<?php echo $person_obj->getID(); ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('remove_group_member'); ?>" title="<?php echo _AT('remove_group_member'); ?>" border="0"/></a> </div>
+		<?php endif; ?>
+		<div>
+			<div style="float:left;"><?php echo printSocialProfileImg($person_obj->getID()); ?></div>
+			<div style="padding-left:0.5em; float:left;">
+				<?php 
+					$profile = $person_obj->getDetails();
+					echo printSocialName($person_obj->getID()) . '<br/>';
+					echo $profile['country'] . ' ' . $profile['province'] . '<br/>';
+				?>
+			</div>
+			<div style="clear:both;"></div><br/>
+		</div>
+	</div>
+	<?php 
+		endforeach; 
+	endif;
+	?>
+	</div>
+	<!--
+	<div style="float:right;">
+		[-- TODO: Paginator --]
+	</div>
+	-->
+</div>
+
diff --git a/docs/themes/simplified-desktop/social/sgroup_search.tmpl.php b/docs/themes/simplified-desktop/social/sgroup_search.tmpl.php
new file mode 100644
index 000000000..4e09da9a8
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/sgroup_search.tmpl.php
@@ -0,0 +1,42 @@
+<script src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/livesearch.js" type="text/javascript"></script>
+
+<div class="social-wrapper">
+<div class="input-form">
+	<h3><?php echo _AT('search_for_groups'); ?></h3>
+	<form action="<?php echo AT_SOCIAL_BASENAME.'groups/search.php'; ?>" method="POST" id="search_group_form">
+		<div class="row">
+			<label for="search_groups"><?php echo _AT('search'); ?></label>
+				<input type="text" size="60" name="search_groups_<?php echo $this->rand_key;?>" id="search_groups" value="<?php echo $this->last_search; ?>" onkeyup="showResults(this.value, 'livesearch', '<?php echo AT_SOCIAL_BASENAME; ?>groups/search.php')"/>
+			<input type="hidden" name="rand_key" value="<?php echo $this->rand_key;?>"/>
+			<input class="button" type="submit" name="search" value="<?php echo _AT('search'); ?>" />
+			<span><a href="<?php echo AT_SOCIAL_BASENAME; ?>groups/create.php"><?php echo _AT('create_group'); ?></a></span><br />
+			<div id="livesearch"></div>
+		</div>
+	</form>
+</div>
+
+<div class="headingbox"><h3><?php echo _AT('search_results'); ?></h3></div>
+<div class="contentbox">
+	<?php if (!empty($this->search_result)):
+	foreach($this->search_result as $group_id=>$group_array): 
+	$grp_obj = $group_array['obj'];
+	?>
+	<div class="box">
+		<div>
+		<?php echo $grp_obj->getLogo(); ?>			
+		</div>
+		<div>
+			<a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'groups/view.php?id='.$grp_obj->getId());?>"><h4><?php echo $grp_obj->getName(); ?></h4></a><br/>
+			<?php echo _AT('type') .': '. $grp_obj->getGroupType();?><br/>
+			<?php echo _AT('description') .': <br/>'. $grp_obj->getDescription();?><br/>
+		</div>
+		<div style="clear:both;"></div>
+	</div>
+	<?php endforeach; 
+	else: 
+		echo _AT('none_found');
+	endif;?>
+</div>
+
+<div style="clear:both;"></div>
+</div>
diff --git a/docs/themes/simplified-desktop/social/sgroup_view.tmpl.php b/docs/themes/simplified-desktop/social/sgroup_view.tmpl.php
new file mode 100644
index 000000000..9631e9905
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/sgroup_view.tmpl.php
@@ -0,0 +1,135 @@
+<?php global $msg; $msg->printConfirm(); ?>
+<div class="box">
+	<?php //existing members ?>
+	<?php if (in_array(new Member($_SESSION['member_id']), $this->group_obj->group_members)): ?>
+	| <a href="<?php echo AT_SOCIAL_BASENAME; ?>groups/invite.php?id=<?php echo $this->group_obj->getID();?>"><?php echo _AT('invite'); ?></a> |
+
+	<?php //group admin ?>
+	<?php if ($this->group_obj->getUser() == $_SESSION['member_id']): ?>
+	<a href="<?php echo AT_SOCIAL_BASENAME; ?>groups/edit.php?id=<?php echo $this->group_obj->getID();?>"><?php echo _AT('edit_group'); ?></a> |
+	<a href="<?php echo AT_SOCIAL_BASENAME; ?>groups/view.php?id=<?php echo $this->group_obj->getID().SEP;?>delete=confirm"><?php echo _AT('disband_group'); ?></a> |
+	<?php //existing members ?>
+	<?php else: ?>
+	<a href="<?php echo AT_SOCIAL_BASENAME; ?>groups/view.php?id=<?php echo $this->group_obj->getID().SEP;?>remove=1"><?php echo _AT('leave_group'); ?></a> |
+	<?php endif; ?>
+
+	<?php //new members ?>
+	<?php else: ?>
+	<a href="<?php echo AT_SOCIAL_BASENAME; ?>groups/join.php?id=<?php echo $this->group_obj->getID();?>"><?php echo _AT('join_group'); ?></a> |
+	<?php endif; ?>
+
+	<?php //everyone ?>
+	<a href="<?php echo AT_SOCIAL_BASENAME; ?>groups/list.php?id=<?php echo $this->group_obj->getID();?>"><?php echo _AT('group_members'); ?></a> |
+
+	<?php include('notifications.tmpl.php'); ?>
+</div>
+<div>
+	<?php 
+		foreach ($this->group_obj->getGroupActivities() as $activity_id=>$activity_title){
+			echo $activity_title;
+		}				
+	?>
+</div>
+<br/>
+
+<?php if (in_array(new Member($_SESSION['member_id']), $this->group_obj->group_members)): ?>
+<div style="width:59%; float:left;">
+	<div class="headingbox" style="margin-right:1em;">
+		<h3><?php echo _AT('message_board'); ?></h3></div>
+	<div class="contentbox" style="margin-right:1em;">	
+		<form method="POST" action="">
+			<label for="message"></label>
+			<textarea name="msg_body" id="message" cols="40" rows="5"></textarea><br />
+			<input class="button" type="submit" name="submit" value="<?php echo _AT('post');?>" />
+		</form><hr/>
+		
+		<!-- handles sliding -->
+		<script type="text/javascript">
+		  jQuery(document).ready(function(){		
+			var h = jQuery("#messages").height();
+			var line_of_height = 250;
+
+			if (h>=500){
+				jQuery('#buttonList').show();
+				jQuery('#message_board').css({'height':'500px'});
+			} else {
+				jQuery('#buttonList').hide();
+			}
+
+			jQuery("#prevButton").click(function(event){
+			  if (h < jQuery("#messages").height()){
+				  jQuery("#messages").animate({"marginTop": "+="+line_of_height+"px"}, "slow");
+				  h += line_of_height;
+ 				  jQuery("#temp").html(h);
+			  }
+			  event.preventDefault();
+			});
+
+			jQuery("#nextButton").click(function(event){
+			  if ( h >= line_of_height) {
+				  jQuery("#messages").animate({"marginTop": "-="+line_of_height +"px"}, "slow");
+				  h -= line_of_height ;
+				  jQuery("#temp").html(h);
+			  }
+			  event.preventDefault();
+			});
+
+		  });
+		  </script>
+
+		<div id="message_board" style="max-height:500px; overflow:hidden;">
+		<div id="messages">
+		<?php 
+			$counter=0;
+			foreach ($this->group_obj->getMessages() as $id=>$message_array): ?>
+			<div class="content">
+				<?php echo $message_array['created_date'].' - '.printSocialName($message_array['member_id']); ?>
+				<?php 
+				if ($message_array['member_id']==$_SESSION['member_id'] || $this->group_obj->getUser()==$_SESSION['member_id']){
+					echo '<a href="'.url_rewrite(AT_SOCIAL_BASENAME.'groups/delete_message.php?gid='.$this->group_obj->getID().SEP.'delete='.$id).'"><img src="'.$_base_href.AT_SOCIAL_BASENAME.'images/b_drop.png" alt="'._AT('remove').'" title="'._AT('remove').'" border="0" /></a>';
+				}
+				?>
+				<p><?php echo $message_array['body']; ?></p>
+			</div>
+		<?php 
+			$counter++;
+			endforeach;
+		?>		
+		</div></div>
+		<div id="buttonList">
+			<a id="prevButton" href="#">&lt;&lt;<?php echo _AT('previous'); ?></a>
+			<a id="nextButton" href="#"><?php echo _AT('next'); ?>&gt;&gt;</a>
+		</div>
+		<div id="temp"></div>
+	</div>
+</div>
+<?php endif; ?>
+
+<div style="width:39%;float:left;">
+	<div class="headingbox"><h3><?php echo _AT('group_info'); ?></h3></div>
+	<div class="contentbox">
+		<div><?php echo $this->group_obj->getLogo();?></div>
+		<dl  id="public-profile">
+			<dt><?php echo _AT('group_name'); ?></dt>
+			<dd><?php echo $this->group_obj->getName();?></dd>
+
+			<dt><?php echo _AT('group_type'); ?></dt>
+			<dd><?php echo $this->group_obj->getGroupType();?></dd>
+
+			<dt><?php echo _AT('access'); ?></dt>
+			<dd><?php echo ($this->group_obj->getPrivacy()?_AT('private'):_AT('public'))?><br/></dd>			
+
+			<dt><?php echo _AT('created_by'); ?></dt>
+			<dd><?php echo printSocialName($this->group_obj->getUser());?></dd>
+
+			<dt><?php echo _AT('created_date'); ?></dt>
+			<dd><?php echo AT_DATE(_AT('startend_date_long_format'), $this->group_obj->getCreatedDate(), AT_DATE_MYSQL_DATETIME);?></dd>
+
+			<dt><?php echo _AT('group_last_updated'); ?></dt>
+			<dd><?php echo AT_DATE(_AT('startend_date_long_format'), $this->group_obj->getLastUpdated(), AT_DATE_MYSQL_DATETIME);?></dd>
+
+			<dt><?php echo _AT('number_of_members');?></dt>
+			<dd><?php echo count($this->group_obj->group_members);?></dd>
+		</dl>
+	</div><br />
+</div>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/sgroups.tmpl.php b/docs/themes/simplified-desktop/social/sgroups.tmpl.php
new file mode 100644
index 000000000..80f35dd77
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/sgroups.tmpl.php
@@ -0,0 +1,40 @@
+<script src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/livesearch.js" type="text/javascript"></script>
+<?php 
+	//Generate a random number for the search input name fields, so that the browser will not remember any previous entries.
+	$rand = md5(rand(0, time())); 
+	if ($this->rand_key != ''){
+		$last_search = $_POST['search_groups_'.$this->rand_key];
+	} else {
+		$last_search = $_POST['search_groups_'.$rand];	
+	}
+?>
+<div class="social-wrapper">
+<div>
+<?php include('tiny_sgroups.tmpl.php'); ?>
+</div>
+<div>
+	<div class="input-form">
+		<div class="contentrow">
+			<h3><?php echo _AT('search_for_groups'); ?></h3>
+			<form action="<?php echo AT_SOCIAL_BASENAME.'groups/search.php'; ?>" method="POST" id="search_group_form">
+				<div class="row">
+					<label for="search_groups"><?php echo _AT('search'); ?></label>
+					<input type="text" size="45" name="search_groups_<?php echo $rand;?>" id="search_groups" value="<?php echo $last_search; ?>" onkeyup="showResults(this.value, 'livesearch', '<?php echo AT_SOCIAL_BASENAME; ?>groups/search.php')"/>
+					<input type="hidden" name="rand_key" value="<?php echo $rand;?>"/>
+					<input class="button" type="submit" name="search" value="<?php echo _AT('search'); ?>" />
+					<div id="livesearch"></div>
+				</div>
+				<div class="row"><a href="<?php echo AT_SOCIAL_BASENAME.'groups/search.php?search_groups_'.$rand.'='.$last_search.SEP.'rand_key='.$rand; ?>"><?php echo _AT('browse_all');?></a></div>
+			</form>		
+		</div>		
+	</div>
+</div>
+<div>
+	<div>
+	<h3><?php echo _AT('create_group'); ?></h3>
+		<p><?php echo _AT('create_group_blurb');  ?></p>
+		<span><a href="<?php echo AT_SOCIAL_BASENAME; ?>groups/create.php"><?php echo _AT('create_group'); ?></a></span><br />
+	</div>
+</div>
+<div style="clear:both;"></div>
+</div>
diff --git a/docs/themes/simplified-desktop/social/sprofile.tmpl.php b/docs/themes/simplified-desktop/social/sprofile.tmpl.php
new file mode 100644
index 000000000..1940e2c8d
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/sprofile.tmpl.php
@@ -0,0 +1,320 @@
+<?php
+//Profile template for social
+?>
+
+<div  class="social-wrapper">
+	<div><h3><?php echo printSocialName($this->profile['member_id'], false); ?></h3></div>
+	<div class="social-left">		
+		<div class="row">
+			<h4 class="profile"><?php echo _AT('profile'); ?></h4>
+				<?php if ($this->scope=='owner'): ?>
+				<a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME."edit_profile.php");?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME;?>images/edit_profile.gif" alt="<?php echo _AT('edit_profile'); ?>" id="profile" title="<?php echo _AT('edit_profile'); ?>" border="0"/></a>
+				<?php endif; ?>
+		</div>
+		<div class="contentbox">
+		<div class="row">
+		<?php 
+		//TODO: include this in the printSocialProfileImg function itself
+		if (profile_image_exists($this->profile['member_id'])): ?>
+			<a href="get_profile_img.php?id=<?php echo $this->profile['member_id'].SEP ;?>size=o"><?php echo printSocialProfileImg($this->profile['member_id'], 2, false); ?>
+		<?php else: ?>
+			<?php echo printSocialProfileImg($this->profile['member_id'], 2, false); ?>
+		<?php endif; ?>
+		<a href="inbox/send_message.php?id=<?php echo $this->profile['member_id']; ?>"><?php echo _AT('send_message'); ?></a>
+		
+		</div>
+
+		<?php         if($this->profile['occupation']){ ?>
+			
+			<dt><?php echo _AT('occupation'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->profile['occupation']); ?></dd>
+			<?php }?>
+	
+			
+			<?php if($this->profile['expertise']){ ?>
+			<dt><?php echo _AT('expertise'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->profile['expertise']); ?></dd>
+			<?php }?>
+			
+			
+			<?php if ($this->relationship==AT_SOCIAL_FRIENDS_VISIBILITY || $this->relationship==AT_SOCIAL_OWNER_VISIBILITY): ?>
+			<?php if($this->profile['email']): ?>
+			<dl>
+			<dt><?php echo _AT('email'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->profile['email']); ?></dd>
+			<?php endif; ?>
+			<?php endif; ?>
+		
+			<?php if($this->profile['gender']!='n'){ ?>
+			<dt><?php echo _AT('gender'); ?></dt>
+			<dd><?php echo $this->profile['gender']; ?></dd>
+			<?php }?>
+		
+			<?php if($this->profile['dob']!='0000-00-00'){ ?>
+			<dt><?php echo _AT('dob'); ?></dt>
+			<dd><?php echo $this->profile['dob']; ?></dd>
+			<?php }?>
+		
+			<?php if($this->profile['phone']){ ?>
+			<dt><?php echo _AT('phone'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->profile['phone']); ?></dd>
+			<?php }?>
+			
+			<?php if($this->profile['country']){ ?>
+			<dt><?php echo _AT('country'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->profile['country']); ?></dd>
+			<?php }?>
+			
+			<?php if($this->profile['postal']){ ?>
+			<dt><?php echo _AT('street_address'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->profile['postal']); ?></dd>
+			<?php }?>
+		
+			<?php if($this->profile['interests']){ ?>
+			<dt><?php echo _AT('interests'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->profile['interests']); ?></dd>
+			<?php }?>
+			
+			<?php if($this->profile['associations']){ ?>
+			<dt><?php echo _AT('associations'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->profile['associations']); ?></dd>
+			<?php }?>
+		
+			<?php if($this->profile['awards']){ ?>
+			<dt><?php echo _AT('awards'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->profile['awards']); ?></dd>
+			<?php }?>
+		
+			<?php if($this->profile['others']){ ?>
+			<dt><?php echo _AT('others'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->profile['others']); ?></dd>
+			<?php }?>
+		
+			<?php if($this->personal['per_weight']){ ?>
+			<dt><?php echo _AT('per_weight'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->personal['per_weight']); ?></dd>
+			<?php }?>
+		
+			<?php if($this->personal['per_height']){ ?>
+			<dt><?php echo _AT('per_height'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->personal['per_height']); ?></dd>
+			<?php }?>
+		
+			<?php if($this->personal['per_hair']){ ?>
+			<dt><?php echo _AT('per_hair'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->personal['per_hair']); ?></dd>
+			<?php }?>
+		
+			<?php if($this->personal['per_eyes']){ ?>
+			<dt><?php echo _AT('per_eyes'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->personal['per_eyes']); ?></dd>
+			<?php }?>
+		
+			<?php if($this->personal['per_ethnicity']){ ?>
+			<dt><?php echo _AT('per_ethnicity'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->personal['per_ethnicity']); ?></dd>
+			<?php }?>
+		
+			<?php if($this->personal['per_languages']){ ?>
+			<dt><?php echo _AT('per_languages'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->personal['per_languages']); ?></dd>
+			<?php }?>
+		
+			<?php if($this->personal['per_disabilities']){ ?>
+			<dt><?php echo _AT('per_disabilities'); ?></dt>
+			<dd><?php echo htmlentities_utf8($this->personal['per_disabilities']); ?></dd>
+			<?php }?>
+		
+
+
+			</dl>
+		</div>
+		<?php if (!empty($this->representation)){ ?>
+			<br /><div  class="headingbox"><h4><?php echo _AT('representation'); ?></h4></div>
+			<div class="contentbox" >
+
+				<?php 	foreach($this->representation as $row=>$value){  ?>
+				<dl class="public-profile">
+				<dt><?php echo _AT('name') . ':' ?></dt> <br /><dd> <?php echo htmlentities_utf8($value['rep_name']); ?></dd>
+
+				<dt><?php echo _AT('title') . ': ' ?></dt> <br /><dd> <?php echo htmlentities_utf8($value['rep_title']); ?></dd>
+				<dt><?php echo _AT('phone') . ':' ?></dt><br /> <dd> <?php echo htmlentities_utf8($value['rep_phone']);?></dd>
+				<dt><?php echo _AT('email') . ': ' ?></dt><br /> <dd> <?php echo  htmlentities_utf8($value['rep_email']); ?></dd>	
+				<dt><?php echo _AT('street_address') . ': ' ?></dt> <br /><dd> <?php echo htmlentities_utf8($value['rep_address']); ?></dd>
+				</dl>
+			
+			<?php } ?>
+			</div>
+			<?php } ?>
+
+		<?php if (!empty($this->contact)){ ?>
+			<br /><div  class="headingbox"><h4><?php echo _AT('alt_contact'); ?></h4></div>
+			<div class="contentbox" >
+
+				<?php 	foreach($this->contact as $row=>$value){  ?>
+				<dl class="public-profile">
+				<dt><?php echo _AT('name') . ':' ?></dt> <br /><dd> <?php echo htmlentities_utf8($value['con_name']); ?></dd>
+				<dt><?php echo _AT('phone') . ':' ?></dt> <br /><dd> <?php echo htmlentities_utf8($value['con_phone']);?></dd>
+				<dt><?php echo _AT('email') . ': ' ?></dt><br /> <dd> <?php echo  htmlentities_utf8($value['con_email']); ?></dd>
+				<dt><?php echo _AT('street_address') . ': ' ?></dt><br /> <dd> <?php echo htmlentities_utf8($value['con_address']); ?></dd>
+				</dl>
+			
+			<?php } ?>
+			</div>
+			<br/>
+			<?php } ?>
+
+
+
+	</div>
+
+	<div class="social-right">	
+		<?php if (PrivacyController::validatePrivacy(AT_SOCIAL_PROFILE_EDUCATION, $this->relationship, $this->prefs)): ?>
+			<?php if (!empty($this->education)){ ?>
+			<div>
+				<div class="headingbox"><h5><?php echo _AT('training_and_education'); ?></h5></div>
+				<div class="contentbox">
+				<table class="data static">	
+					<thead><tr>
+						<th> <?php echo _AT('institution'); ?></th>
+						<th> <?php echo _AT('degrees'); ?></th>
+						<th> <?php echo _AT('year'); ?></th>
+					</tr></thead>
+					<tbody>
+					<?php
+						foreach($this->education as $edu){
+							echo '<tr><td>'.htmlentities_utf8($edu['university']).'</td>';
+							echo '<td>'.htmlentities_utf8($edu['degree'].'/'.$edu['field']).'</td>';
+							echo '<td>'.htmlentities_utf8($edu['from'].'-'.$edu['to']).'</td></tr>';
+						}							
+					?>
+					</tbody>
+				</table>
+				</div>
+			</div><br/>
+			<?php } ?>
+		<?php endif; ?>
+
+		<?php if (PrivacyController::validatePrivacy(AT_SOCIAL_PROFILE_POSITION, $this->relationship, $this->prefs)): ?>
+		
+			<?php if (!empty($this->position)){ ?>
+			<div>
+				<div class="headingbox"><h5><?php echo _AT('credits_and_work_experience'); ?></h5></div>
+				<div class="contentbox">
+				<table class="data static">	
+					<thead><tr>
+						<th><?php echo _AT('company'); ?></th>
+						<th><?php echo _AT('position'); ?></th>
+						<th><?php echo _AT('year'); ?></th>
+					</tr></thead>
+					<tbody>
+					<?php
+						foreach($this->position as $pos){
+							echo '<tr><td>'.htmlentities_utf8($pos['company']).'</td>';
+							echo '<td>'.htmlentities_utf8($pos['title']).'</td>';
+							echo '<td>'.htmlentities_utf8($pos['from'].'-'.$pos['to']).'</td></tr>';
+						}							
+					?>
+					</tbody>
+				</table></div>
+			</div><br/>
+			<?php } ?>		
+		<?php endif; ?>
+
+		<?php if (PrivacyController::validatePrivacy(AT_SOCIAL_PROFILE_MEDIA, $this->relationship, $this->prefs)): ?>
+		<div>
+			<?php if (!empty($this->websites)): ?>
+			<div class="headingbox"><h5><?php echo _AT('websites'); ?></h5></div>
+			<div class="contentbox">
+			<table class="data static">	
+				<thead><tr>
+					<th><?php echo _AT('site_name'); ?></th>
+					<th><?php echo _AT('url'); ?></th>
+				</tr></thead>
+				<tbody>
+				<?php
+					foreach($this->websites as $sites){
+						$is_http = preg_match("/^http/", $sites['url']);
+						if ($is_http==0){
+							$sites['url'] = 'http://' . $sites['url'];
+						}
+						echo '<tr><td>'.htmlentities_utf8($sites['site_name']).'</td>';
+						echo '<td><a href="'.$sites['url'].'" target="user_profile_site">'.$sites['url'].'</a></td></tr>';
+					}							
+				?>
+				</tbody>
+			</table>
+			</div><br/>
+			<?php endif; ?>
+		</div>
+		<?php endif; ?>
+
+		<?php if (PrivacyController::validatePrivacy(AT_SOCIAL_PROFILE_STATUS_UPDATE, $this->relationship, $this->prefs)): ?>
+		<div class="headingbox">
+			<h5><?php echo _AT('activities'); ?></h5></div>
+		<div class="contentbox" id="activity">
+			<?php if(!empty($this->activities)): ?>
+			<ul>
+				<?php
+					foreach($this->activities as $id=>$activity):
+						/*
+						 * harris @may 26, 2009
+						 * Would be nice to use this, but we will have to change "has" to "have" for _AT('you')
+						 *
+						if ($_SESSION['member_id']== $this->profile['member_id']){
+							echo '<li>'._AT('you');
+							echo ' '.$activity.' ';
+							echo '<a href="'.url_rewrite(AT_SOCIAL_BASENAME.'sprofile.php?delete='.$id).'"><img src="'.$_base_href.AT_SOCIAL_BASENAME.'images/b_drop.png" alt="'._AT('remove').'" title="'._AT('remove').'" border="0" /></a></li>';
+						} else {
+							echo '<li>'.printSocialName($this->profile['member_id']).' '.$activity.'</li>';
+						}
+						*/
+				 ?>
+				 <li><?php echo $activity['created_date']. ' - '. printSocialName($activity['member_id']).' '. $activity['title']; ?></li>
+				<?php endforeach; ?>
+			</ul>
+			<?php else: ?>
+			<?php echo _AT('no_activities'); ?>
+			<?php endif; ?>
+		</div><br />
+		<?php endif; ?>
+
+		<?php if (PrivacyController::validatePrivacy(AT_SOCIAL_PROFILE_CONNECTION, $this->relationship, $this->prefs)): ?>
+		<div class="headingbox">
+			<h5><?php echo _AT('connections'); ?></h5>
+		</div>
+		<div class="contentbox">
+			<?php if (sizeof($this->friends)>0):
+					foreach($this->friends as $friend_id): ?>													
+				<div>
+				<?php echo printSocialProfileImg($friend_id); ?><br/>
+				<?php echo printSocialName($friend_id); ?>
+				</div>
+			<?php 	endforeach;
+				else: 
+					echo _AT('no_friends');
+				endif; ?>
+		</div><br/>
+
+		<?php if (isset($this->mutual_friends)): ?>
+		<div class="headingbox">
+			<h5><?php echo _AT('mutual_connections'); ?></h5>
+		</div>
+		<div class="contentbox">
+			<?php foreach($this->mutual_friends as $friend_id): ?>
+				<div>
+				<?php echo printSocialProfileImg($friend_id); ?><br/>
+				<?php echo printSocialName($friend_id); ?>
+				</div>
+			<?php endforeach; ?>
+		</div>
+		<?php endif; //this->mutual_friends != empty ?>
+	
+	<?php endif; ?>
+
+
+			
+	</div>
+<div style="clear:both;"></div>
+</div>
+
diff --git a/docs/themes/simplified-desktop/social/tiny_applications.tmpl.php b/docs/themes/simplified-desktop/social/tiny_applications.tmpl.php
new file mode 100644
index 000000000..17472bb93
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/tiny_applications.tmpl.php
@@ -0,0 +1,37 @@
+<!--  compressed with java -jar {$path}/yuicompressor-2.3.5.jar -o {$file}-min.js {$file}.js -->
+<script type="text/javascript"
+	src="<?php echo AT_SHINDIG_URL; ?>/gadgets/js/rpc.js?c=1"></script>
+<!-- header.inc.php has jscript/InfusionAll.js imported.  Jquery should be there with it
+<script type="text/javascript" src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/jquery-1.3.2.js"></script>
+-->
+<script type="text/javascript"
+	src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/prototype.js"></script>
+<script type="text/javascript" src="<?php echo AT_SOCIAL_BASENAME; ?>lib/js/container.js"></script>
+
+<?php	
+	foreach ($this->list_of_my_apps as $id=>$app_obj): 
+?>
+<div class="gadget_wrapper">
+<div class="headingbox">
+	<div style="float:right">
+		<a href="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>applications.php?app_id=<?php echo $app_obj->getId().SEP;?>delete=1"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" border="0" alt="<?php echo _AT('delete'); ?>" title="<?php echo _AT('delete'); ?>" style="float:right;" /></a>
+
+		<a href="<?php echo AT_SOCIAL_BASENAME.'applications.php?app_id='.$id.SEP.'settings=1'; ?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME;?>images/icon-settings.png" alt="<?php echo _AT('settings');?>" title="<?php echo _AT('settings');?>" border="0" style="float:right;" /></a>
+	</div>	
+	<h3><?php echo $app_obj->getAppLink($app_obj->getTitle(), $id); ?></h3>
+</div>
+<div class="contentbox" style="padding:0.5em;">
+<?php
+	//the name and id here in the iframe is used by the container.js to identify the caller.
+	//Simply, the id is used here to generate the $(this.f)
+	//Originally it was using the ModID, I changed it to appId.
+	//@harris
+?>
+	<iframe 
+	scrolling="<?php echo $app_obj->getScrolling(); ?>"
+	height="<?php echo $app_obj->getHeight();?>px" width="100%"
+	frameborder="0" src="<?php echo $app_obj->getIframeUrl($_REQUEST['id'], 'default', $_GET['appParams']);?>" class="gadgets-gadget"
+	name="remote_iframe_<?php echo $app_obj->getId(); ?>"
+	id="remote_iframe_<?php echo $app_obj->getId(); ?>"></iframe>	
+</div></div><br />
+<?php endforeach; ?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/social/tiny_sgroups.tmpl.php b/docs/themes/simplified-desktop/social/tiny_sgroups.tmpl.php
new file mode 100644
index 000000000..ec712db7c
--- /dev/null
+++ b/docs/themes/simplified-desktop/social/tiny_sgroups.tmpl.php
@@ -0,0 +1,36 @@
+	<div class="headingbox"><h3><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'groups/index.php'); ?>"><?php echo _AT('my_groups'); ?></a></h3></div>
+	<div class="contentbox">
+		<?php foreach ($this->my_groups as $i=>$grp): 
+			$grp_obj = new SocialGroup($grp);
+
+		?>
+		<div class="contact_mini">
+			<?php if ($grp_obj->getUser() == $_SESSION['member_id']): ?>
+				<div style="float:right;margin:1em;"><a href="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>groups/edit.php?id=<?php echo $grp;?>"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/icon-settings.png" alt="<?php echo _AT('settings'); ?>" title="<?php echo _AT('settings'); ?>" border="0"/></a></div>
+			<?php endif; ?>
+			<?php if ($grp_obj->getUser() != $_SESSION['member_id']): ?>
+				<div style="float:right;margin:1em;"><a href="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>groups/view.php?id=<?php echo $grp.SEP;?>remove=1"><img src="<?php echo $_base_href.AT_SOCIAL_BASENAME; ?>images/b_drop.png" alt="<?php echo _AT('delete'); ?>" title="<?php echo _AT('leave_group'); ?>" border="0"/></a></div>
+			<?php endif; ?>
+
+
+
+			<div class="box">
+				<div style="float:left;">
+				<?php echo $grp_obj->getLogo(); ?>
+				
+				</div>
+				<div style="float:left; padding-left:0.5em;">
+				<h4><a href="<?php echo url_rewrite(AT_SOCIAL_BASENAME.'groups/view.php?id='.$grp);?>"><?php echo $grp_obj->getName(); ?></a></h4><br/>
+					<?php echo _AT('group_type') .': '. $grp_obj->getGroupType();?><br/>
+					<?php echo _AT('access') .': '. ($grp_obj->getPrivacy()?_AT('private'):_AT('public'))?><br/>
+					<?php echo _AT('description') .': <br/>'. $grp_obj->getDescription();?><br/>
+				</div>
+				<div style="clear:both;"></div>
+			</div><br />
+		</div>
+		<?php endforeach; ?>
+		<?php		
+		if(!$grp){ 
+			echo _AT('no_groups_yet');
+		 } ?>
+	</div>
diff --git a/docs/themes/simplified-desktop/tablet.css b/docs/themes/simplified-desktop/tablet.css
new file mode 100644
index 000000000..83667164e
--- /dev/null
+++ b/docs/themes/simplified-desktop/tablet.css
@@ -0,0 +1,2463 @@
+
+/************************************************************************************************/
+/* Style is optimized for tablets. Note that -webkit  and -moz properties create errors in the CSS validator. 
+Relative units for sizes are used unless it is a border. Classes beginning with ".fl-" override Mobile FSS,
+see the API @ http://wiki.fluidproject.org/display/fluid/Mobile+FSS+API  */
+/************************************************************************************************/
+
+
+html, body{
+	height: 100%;
+}
+		
+#main{
+	overflow-x: visible;
+}
+
+body,ul,li {
+	padding:0;
+	margin:0;
+	font-size: 18px;/*fix*/
+}
+
+
+#header{
+	width:100%;
+	line-height:1em;
+	padding-top: 158;
+	font-size:1.063em;
+	height: 3.2em;
+	background: #999; /*fallback*/
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#999), to(black));
+	background: -moz-linear-gradient(#999, black);
+}
+
+
+.fl-theme-iphone .fl-navbar{
+	border: none;
+	border-top: none;
+	
+}
+
+.fl-navbar a{
+	font-size: 0.969em;
+}
+.fl-navbar .fl-tabs{
+	padding-top: .3em;
+	padding-bottom: .3em;
+	border-top: 1px solid black;
+	border-bottom: .5px solid black;
+	background-color: #4b6b90; 
+    height: 2em;   
+    background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#999), to(black));
+    background: -moz-linear-gradient(#999, black);
+}
+
+#navigation-contentwrapper{
+	position: relative;
+	height: 2.5em; /*requires a height, do not remove */	
+	top: 1em;
+	
+}
+
+#contentwrapper{
+	margin-bottom: 3em;
+	padding: .313em;
+}
+#wrapper{
+	width:100%;
+	overflow: auto;
+	min-height: 100%;
+	background-image: url(images/idi_background.png);
+
+
+	
+}
+#header-section-title {
+	width: 100%;
+	position: relative;
+ 	color: white;
+ 	font-size: 0.938em;
+ 	height: .3em;
+ 	
+}
+
+#site-name, h1#section-title{
+	width: 100%;
+	color: white;
+	text-shadow: none;
+	
+}
+
+/************************************************************************************************/
+/* "Navigation" button, also this CSS creates a button that looks exactly like a Mobile FSS tab.*/
+/************************************************************************************************/
+
+
+.navigation-bar-button-content{
+  	border-width:5px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+	border-radius: 5px;
+	font-size: 18px;/*keep this in px*/
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    );
+ 	-webkit-border-image: url(images/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+ 	-moz-border-image: url(images/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+    -webkit-border-left-image: none;
+    -moz-border-left-image: none;
+    -webkit-background-origin: border;
+    -moz-background-origin: border;
+    -webkit-background-clip: border;
+	-moz-background-clip: border;
+}
+
+.fl-theme-iphone .topnavlistcontainer .topnavlist-link {/*makes the navigation button link white*/
+	color: white;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+.fl-theme-iphone .topnavlistcontainer .topnavlist-link-highlight{/*makes the navigation button link highlight*/
+	color: #4c96f4;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+.fl-theme-iphone .fl-tabs li{
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    ); 
+}
+/************************************************************************************************/
+/*fl-tabs for the "home" and "guide" and sequence links*/
+/************************************************************************************************/
+#home-guide{
+	padding-top: 0;
+	margin-top: 0;
+	padding-right: .313em;
+	position: relative;
+	left: 0em;
+	float: left;	
+	top: 0;
+}
+
+
+ul.home-guide li a:hover, ul.home-guide li a:focus, ul.home-guide li a:active,
+ul.home-guide li.back a:hover, ul.home-guide li.back a:focus, ul.home-guide li.back a:active,
+ul.home-guide li.forward a:hover, ul.home-guide li.forward a:focus, ul.home-guide li.forward a:active {
+    color: #4c96f4;
+    background:transparent;
+}
+/************************************************************************************************/
+/* main body attributes */
+/************************************************************************************************/
+p {
+    text-align: left;
+    line-height: 150%;
+	font-size: 1em;
+	padding:.75em 0;
+	margin: 0 auto;
+}
+
+p a {
+    text-decoration: underline;
+}
+
+p a:visited {
+	color: #005689;
+	color: #4c96f4;
+    background-color: transparent;
+}
+p a:active {
+	color: #005689;
+	color: #4c96f4;
+    background-color: transparent;
+}
+
+
+h1, h2, h3, h4, h5, h6 {
+    color: #4C566C;
+    clear: right;
+    font: 100% Helvetica, Arial, sans-serif;
+	font-weight: bold;
+    margin: 0;
+	padding: 0;
+}
+
+h1 {
+  font-size: 160%;
+	color: #FFF;
+}
+ 
+h2 {
+    font-size: 150%;
+}
+h2.page-title{
+	padding-top: .313em;
+}
+
+
+#subnavbacktopage{
+	padding: .313em;
+	float: left;
+	
+}
+
+h3 {
+	padding: 0;
+}
+h3.browse-courses{
+	font-size: 90%;
+	text-decoration: none;
+	clear: none;
+	display: inline;
+}
+
+
+h3 a {
+    font-size: 100%;
+}
+/************************************************************************************************/
+/* Highlighting outside of the header and footer */
+/************************************************************************************************/
+link highlighting -- add when the header and footer is done 
+.fl-theme-iphone a:not(.fl-tabs){
+	 color: #4c96f4;
+}
+
+/************************************************************************************************/
+/* Preferences tabs */
+/************************************************************************************************/
+.etabbed-list-container	{
+	padding:0;
+	margin: 0;
+	width:70%;
+	clear: left;
+	height: 3em;
+}
+
+.prefs_buttontab {
+	padding:0;
+	margin: 0;
+	white-space: nowrap;
+}
+.prefs_tab{
+	padding:0.5em 0.3em 0;
+	margin: 0;
+	white-space: nowrap;
+    display: inline;
+}
+
+.prefs_tab_selected{  
+	padding:0.7em 0.3em 0;
+	margin: 0;
+	margin: 0;
+	font-weight:bold;
+	text-align:center;
+	white-space: nowrap;
+    display: inline;
+}
+
+/************************************************************************************************/
+/* link attributes */
+/************************************************************************************************/
+
+/* link attributes */
+a:link {
+ 	color: #4C96F4;
+	color: #005689;
+	text-decoration: underline;
+}
+a:hover, a:visited, a:focus {
+	color: #4C96F4;
+	text-decoration: underline;
+}
+.fl-list-menu a, .fl-list-menu a:visited{ /*may need to be removed when FLUID-4313 is fixed*/
+	color: black;
+}
+
+/* main submit button */
+.button {
+	background-color: #808080;
+	color: black;
+	text-align: center;
+	-webkit-border-radius:3px;
+	-moz-border-radius:3px;
+	border-radius: 3px;
+	padding-top: 0.313em;
+	padding-bottom: 0.313em;
+}
+
+
+
+.button:focus {
+	border:1px solid #A50707;
+	background-color:  #FFDAB9;	
+}
+/* small submit button at top */
+.button2 {
+	font-family: Helvetica,sans-serif;
+	background-color: #E9F4F3;
+
+}
+.button2:focus {
+	background-color: #E9F4F3;
+	border:  #ACCFCC  solid 1px;
+}
+
+/* Editor box large */
+.editorlargebox {
+	font-family: Helvetica,sans-serif;
+	background-color: #E9F4F3;
+	margin-left:1em;
+	padding-left: .2em;
+	padding-right: .5em;
+	padding-top: .5em;
+	padding-bottom: .4em;
+	border: 1px #ACCFCC solid;
+}
+
+/* edit content tabs */
+.buttontab {
+	background-color: #E6E6E6;
+	font-weight: 500;
+	border:0;
+	padding-left: .188em;
+	padding-right: .188em;
+	padding-top: .188em;
+
+}
+
+.tab {
+	color: black;
+	background-color: #E6E6E6;
+	border-top: 1px #B8AE9C solid;
+	border-left: 1px #B8AE9C solid;
+	border-right: 1px #B8AE9C solid;
+	text-decoration: none;
+	text-align: center;
+	font-weight: bold;
+
+	
+}
+.buttontab selected {
+	font-family: Helvetica, Arial, Helvetica, sans-serif;
+	background-color: #6F7172;
+	font-weight: 600;
+	border:0;
+	padding-left: .188em;
+	padding-right: .188em;
+	padding-top: .188em;
+
+}
+td.selected{
+	font-family: Helvetica, Arial, Helvetica, sans-serif;
+	font-weight: 600;
+	text-decoration: none;
+	text-align: center;
+	background-color: white;
+	border-top: 1px #B8AE9C solid;
+	border-left: 1px #B8AE9C solid;
+	border-right: 1px #B8AE9C solid;
+}
+
+.tab a:link, .etab a:visited {
+	color: #4C566C;
+	background-color: white;
+}
+
+/* the side menu */
+td.dropdown-heading {
+	background-color: #DBFDD4;
+	color: #595241;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-top: 1px solid #ECFEEA;
+}
+
+/* the side menu content */
+td.dropdown {
+	padding: 0.125em;
+	background-color: white;
+	color: black;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-bottom: 1px solid #ECFEEA;
+	font-weight: normal;
+}
+td.dropdown a, td.dropdown a:visited  {
+	color: #4C566C;
+	text-decoration: none;
+}
+td.dropdown a:hover {
+	color: #595241;
+	text-decoration: underline;
+}
+
+/* added for 1.4.2: */
+.results {
+	padding-left: 1.25em;
+}
+
+h5.search-results {
+	padding: 0.063em;
+	margin-bottom: 0.313em;
+	margin-top: 1em;
+	padding-top: 3em;
+	margin-left: 0.313em;
+}
+
+.test-box {
+	background-color: #F7F3ED;
+	color: #595241;
+	border-left: 1px solid #595241;
+	border-right: 1px solid #595241;
+	border-top: 1px solid #595241;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+/*preferences*/
+
+.input-form table.tabbed-table {
+	width: 100%;
+	border:thin black solid;
+}
+table.tabbed-table th#left-empty-tab {
+	background-color: transparent;
+	width: 0.938em;
+	border-bottom: 1px solid #B8AE9C;
+}
+table.tabbed-table th#right-empty-tab {
+	text-align: right;
+	background-color: transparent;
+	border-bottom: 1px solid #B8AE9C;
+	width: 25em;
+	padding-right: 0.313em;
+}
+table.tabbed-table th#right-empty-tab a {
+	text-decoration: underline;
+}
+table.tabbed-table th.tab-spacer {
+	background-color: transparent;
+	width: 0.313em;
+	border-bottom: 1px solid #B8AE9C;
+}
+
+table.tabbed-table th.tab {
+	padding-top: 0.125em;
+	padding-bottom: 0.125em;
+	width: 6.875em;
+	background-color: #E9F4F3;
+	border-bottom: 1px solid #B8AE9C;
+	border-left: 1px solid #B8AE9C;
+	border-top: 1px solid #B8AE9C;
+	border-right: 1px solid #B8AE9C;
+}
+table.tabbed-table th.tab:hover {
+	background-color: #ACCFCC;
+}
+
+table.tabbed-table th.tab a:focus {
+	color: white;
+}
+table.tabbed-table th.selected {
+	padding-top: 0.125em;
+	padding-bottom: 0.125em;
+	width: 6.875em;
+	background-color: #ACCFCC;
+	border-left: 1px solid #B8AE9C;
+	border-top: 1px solid #B8AE9C;
+	border-right: 1px solid #B8AE9C;
+}
+
+table.tabbed-table a, table.tabbed-table a:visited, table.tabbed-table a:hover {
+	/* color: black;*/
+	color: #4C566C;
+	text-decoration: none;
+}
+
+
+.preference-buttons-container{
+	background-color: red;
+	height: 2.5em;
+	width: 100%;
+	text-align: center;
+}
+
+div.preference-buttons-container li{
+	display: inline; 
+	float: right;
+}
+
+.prefs_tab_selected{
+	font-style: italic;
+	width: 10%;
+}
+.prefs_tab{
+	width: 10%;
+}
+
+.etabbed-table{
+	margin: 0 auto;
+}
+#previewText{
+	font-family: monospace;
+	border: 2px solid rgb(0, 0, 0); 
+	padding: 2em;
+	width: 80%; 
+	color: rgb(255, 255, 255);
+	background-color: rgb(0, 0, 0);
+}
+#previewArea{;
+	padding: 0em;
+	border-bottom-width: 0; 
+	margin-left: auto; 
+	margin-right: auto; 
+	font-weight: normal; 
+	width: 70%;
+	float:left;
+	clear:right;
+}
+#display-settings-preview{
+	width:90%;
+	height:20em; 
+	margin: 0 auto;
+}
+#feedback{
+	width: 90%;
+}
+#defaultfontsize-wrapper{
+	width:90%; 
+}
+
+/* end of preferences */
+
+a#my-start-page {
+	padding: 0.125em;
+	padding-left:  0.938em;
+	background-repeat: no-repeat;
+	background-position: 0.125em 0.313em;
+}
+
+a#back-to {
+	padding-left: 1.25em;
+	background-image: url(images/back.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0;
+}
+
+
+#breadcrumbs-container{
+	background-color: #4d4d4d;
+	position: relative;
+}
+
+#breadcrumbs{
+font-size: 80%;
+    margin-top: .7em;
+text-align: left;
+}
+h1 {
+	margin-bottom: 0.313em;	
+}
+
+
+div#help {
+	border-left: 1px solid black;
+	border-right: 1px solid black;
+	border-bottom: 1px solid black;
+	padding-left: 0.313em;
+	padding-right: 0.313em;
+	padding-bottom: 0.313em;
+	background-color: #F7F3ED;
+	margin-left: 0.313em;
+	margin-right: 0.313em;
+	font-size: small;
+}
+
+h3#help-title {
+	margin-left: 0.313em;
+	margin-right: 0.313em;
+	border-left: 1px solid black;
+	border-right: 1px solid black;
+	padding: 0.063em;
+	background-color: #F7F3ED;
+}
+.line {
+	border-bottom: 1px solid black;
+}
+div#help p {
+	padding: 0;
+	margin: 0;
+}
+
+div#toctoggle {
+	float: left;
+	padding-left: 0.625em;
+}
+
+h1#section-title {
+	font-size: 100%;
+	position: absolute;
+	top: 0em;
+ 	text-align: center;
+	white-space:nowrap;
+	display: inline;
+	
+}
+
+/**********************************************************************/
+/*FOOTER*/
+/**********************************************************************/
+
+#footer{
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#999), to(black));
+	background: -moz-linear-gradient(#999, black);
+	height:2.3em;
+	margin-top: -2.3em;
+	position: relative;
+	clear: both;
+	
+}
+div#footer-links{
+	margin: 0 auto;
+	font-size: .938em;
+}
+
+ul.footer-links-tabs li a:hover, ul.footer-links-tabs li a:focus, ul.footer-links-tabs li a:active,
+ul.footer-links-tabs li.back a:hover, ul.footer-links-tabs li.back a:focus, ul.footer-links-tabs li.back a:active,
+ul.footer-links-tabs li.forward a:hover, ul.footer-links-tabs li.forward a:focus, ul.footer-links-tabs li.forward a:active {
+    color: #4c96f4;
+    background:transparent;
+}
+
+div#footer-links a:link, div#footer-links a:visited {
+	text-decoration:none;
+}
+
+#jumpmenu:focus{
+	background-color:#F6EAD6;
+}
+#jumpmenu{
+	margin: 0 auto;
+}
+
+a#editor-link {
+	background-color: #F7F3ED;
+	padding-top: 0.063em;
+	padding-bottom: 0.063em;
+	padding-left:  0.938em;
+	padding-right: 0.5em;
+	border: 1px solid #cccccc;
+	font-weight: normal;
+	text-decoration: none;
+}
+
+a#editor-link:hover {
+	background-color: #F7F3ED;
+	border: 1px solid #B8AE9C;
+}
+
+a#editor-link.off {
+	background-image: url(images/pen.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0.125em;
+}
+a#editor-link.on {
+	background-image: url(images/pen2.gif);
+	background-repeat: no-repeat;
+	background-position: 0 0.125em;
+}
+
+
+/* for data tables */
+.table-surround {
+	border: #A9ADB0 1px solid;
+	border: #cccccc 1px solid;
+	-webkit-border-radius:5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	margin-top: 1em;
+	margin-bottom: 1em;
+	
+}
+
+table.data {
+	margin:0;
+	width:100%;
+	padding: 0;
+	color: #4C566C;
+	font-size: .8em;
+	text-align: left;
+	background-color: transparent;
+} 
+/* contains the headings */
+table.data th {
+
+	padding: 0.188em;
+}
+
+table.data th a {
+	color: #595241;
+	background-image: url('../default/images/sort.gif');
+	background-repeat: no-repeat;
+	background-position: right;
+}
+
+/*headings text*/
+table.data tbody th {
+	text-align: left;
+
+}
+
+table.data td {
+	padding: 0.188em;
+	color: black;
+	font-size: .875em;
+	font-style: normal;
+}
+table.data td a:link, a:visited{
+	/*color: black;*/
+	color: #4C566C
+}
+
+/*should table.data tbody tr:hover  and table.data tbody tr.selected  highlighting
+be improved to sync with Mobile FSS highlighting */
+table.data tbody tr:hover {
+	background-color: #efefef;
+	cursor: pointer;
+}
+
+table.data tbody tr.selected {
+	background-color: #E9F4F3;
+	cursor: auto;
+	border: 5px solid #E9F4F3;
+}
+
+table.data tfoot {
+	background-color: #F7F3ED;
+}
+
+table.data tfoot tr:first-child td {
+	padding: 0.313em;
+	background-image: url('images/arrow_ltr.gif');
+	background-repeat: no-repeat;
+	background-position: .25em 0.313em;
+}
+
+table.data.static tfoot td, table.data.static tfoot tr:first-child td {
+	padding: 0.313em;
+	background-image: none;
+	padding-left: 0;
+
+}
+/* add borders to row in Required Information, Personal Information*/
+.row{
+	padding:.375em 0;
+	font-size: 0.938em;
+}
+#last-row, .row-buttons, #last-row1, .row-blurb{
+	border: none;
+}
+#browse-courses-table{
+	font-size: .875em;
+}
+
+
+/*buttons*/
+table.data tfoot input {
+	background-color: #efefef;
+	font-weight: normal;
+}
+table.data tfoot input:focus {
+	background-color: #FFDAB9;
+}
+
+
+/* used for static tables with no form elements: */
+table.data.static tbody tr:hover {
+	background-color: transparent;
+	cursor: auto;
+}
+
+/* course browser: */
+div#browse {
+	margin-left: auto; 
+	margin-right: auto; 
+	width: 80%;
+}
+
+div.browse-selected {
+	background-image: url('images/side_arrow.gif'); 
+	background-repeat: no-repeat; 
+	padding-left: 0.563em; 
+	background-position: center left;
+}
+
+div.browse-unselected {
+	padding-left: 0.563em; 
+}
+
+ul.browse-list {
+	list-style: none;
+	padding:0;
+}
+
+/* feedback /errors */
+div#error {
+	width: 89%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #DD0000;
+	padding: 0.313em;
+	background-color: #F4DCDC;
+	color: #A50707;
+	background-color: #F4DCDC;
+	padding-left: 1.563em;
+	font-weight: bold;
+	-webkit-border-radius:5px;
+	-moz-border-radius: 5px;
+	-border-radius: 5px;
+}
+div#error h4 {
+	color: black;
+	margin-left: 0;
+}
+
+div#error ul, div#feedback ul, div#help ul {
+	position: relative;
+	list-style: none;
+	margin-left: 0;
+	padding-left: 0;
+}
+
+div#error ul li{
+	margin-top: 0.313em;
+}
+
+div#feedback, div#info {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 0.313em;
+	margin-bottom: 0.313em;
+	padding: 0.313em;
+	font-family: Helvetica, Arial, sans-serif;
+	-webkit-border-radius:5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	border: 1px solid #17B506;
+	background-color: #E7EFD0;
+	color: #3f4559;
+	font-size: 90%;
+	z-index: -1;
+}
+div#feedback li, div#info li, div#error li{
+	color: #4C566C;
+}
+
+div#help {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #ACCFCC;
+	padding: 0.313em;
+	background-color: #E9F4F3;
+	color: #024C41;
+}
+
+div#warning {
+	width: 95%;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:  0.938em;
+	margin-bottom:  0.938em;
+	border: 1px solid #FF8400;
+	padding: 0.313em;
+	background-color: #FFF6ED;
+	color: #D95900;
+	font-weight: bold;
+}
+acronym {
+	cursor: help;
+}
+
+div.news p {
+	margin: 0;
+	padding:0;
+}
+div.news span.date {
+	font-family:Helevetica, Arial, sans-serif;
+	color: #4C566C;	
+	font-size: .5em;
+}
+
+.news{
+	padding: 0;
+	margin-bottom: 1em;
+	margin-top: 1em;
+}
+/* home page links */
+div.home-link {
+	padding: 0.125em;
+	float: left;
+	text-align: center;
+	margin: 0.125em;
+	width: 7.5em;
+	height: 5.625em;
+}
+div.home-link:hover {
+	padding: 0.063em;
+	background-color: #F7F3ED;
+	border: 1px solid #afafaf;
+	float: left;
+	text-align: center;
+	margin: 0.125em;
+}
+div.home-link a {
+	text-decoration: none;
+	font-weight: bold;
+}
+
+div.home-link img {
+	border: 0;
+}
+
+div.dropdown {
+	width: 12.5em;
+	padding: 0.125em;
+	background-color: white;
+	color: black;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-bottom: 1px solid #ECFEEA;
+	font-weight: normal;
+}
+
+div.dropdown-heading {
+	background-color: #ACCFCC;
+	color: #595241;
+	border-left: 1px solid #ECFEEA;
+	border-right: 1px solid #ECFEEA;
+	border-top: 1px solid #ECFEEA;
+	font-weight: bold;
+	padding: 0.125em;
+}
+
+div.required {
+	font-weight: bold;
+	color: red;
+	font-size: large;
+	float: left;
+	position: relative;
+	margin-top: -0.313em;
+	height:  0.938em;
+	padding-right: 0.125em;
+}
+
+div#content_text {
+	margin-left: 0.313em;
+}
+
+#content, #content-tablet{
+	padding-top: .313em;
+	z-index: 1000;
+	background-color: white;
+}
+form {
+	display:inline;
+	max-width: 100%;
+}
+
+/* paging*/
+div.paging {
+	margin-top: 1em;
+	text-align: center;
+
+
+}
+div.paging ul {
+    list-style: none;
+    display: inline;
+    padding: 0;
+	max-width: 10%;
+	margin-bottom: 1em;
+}
+div.paging li { 
+	display: inline; 
+	padding-left: 0.125em; 
+	padding-right: 0.125em;
+	padding-top: 0;
+	padding-bottom: 0;
+	width: 10%;
+}
+
+div.paging li a {
+	text-decoration: none;
+	padding-left: 0.25em;
+	padding-right: 0.25em;
+	color: black;
+}
+
+div.paging li a:hover, div.paging li a.current, #show-all a:active, #show-all a:focus, #show-all a:hover,
+#show-pages a:active, #show-pages a:focus, #show-pages a:hover   {
+   border: 1px solid #4c96f4;
+   color: white;
+   background-color: #4c96f4;
+   -webkit-border-radius: 3px;
+   -moz-border-radius: 3px;
+   border-radius: 3px;
+}
+#show-pages:active, #show-pages:focus, #show-pages:hover, #show-all:active, #show-all:focus, #show-all:hover{
+	background-color: #4c96f4;
+} 
+
+#tl_corner{
+
+	background-image:url(images/tl_corner.gif);
+	background-position: top left;
+	background-repeat: no-repeat;
+	padding:0;
+}
+
+div.tabs {
+	/* Navigational Plone Tabs(tm), implemented by customizing the a tag - they are surprisingly elegant. The power of CSS runs strong in these :) */
+    background-color: transparent;
+	border-collapse: collapse;
+	border-bottom: 1px solid #B8AE9C;
+	padding: 0.5em 0em 0em 2em;
+	white-space: nowrap;
+}
+
+div.tabs a {
+    /* The normal, unselected tabs. They are all links */
+    background-color: transparent;
+    border-color: #B8AE9C;
+    border-width: 1px; 
+    border-style: solid solid none solid;
+    color: #595241;
+    height: 1.2em;
+    margin-right: 0.5em;
+    padding: 0em 2em 0em;
+    
+}
+
+div.tabs a.selected {
+    /* The selected tab. There's only one of this */
+    background-color: white;
+    border-bottom: #B8AE9C 1px solid;
+    color: #595241;
+    font-weight: normal;
+}
+
+div.tabs a:hover, div.tabs a.active {
+    background-color: #B8AE9C;
+    border-bottom: 1px solid #B8AE9C;
+    color: white;
+}
+
+.headingbox a{
+	color: #4C566C;
+}
+.headingbox a:link, .headingbox a:visited{
+	text-decoration: none;
+}
+div.box {
+}
+h4.box {
+	background-color: #F5F5F5;
+	padding: .313em; 
+}
+h4.box a {
+	display: block;
+	color: #4C566C;
+	background-color: #F5F5F5;
+	text-decoration: none;
+}
+div.box {
+	padding: 0.313em;
+	background-color: #F5F5F5;
+	color: black;
+	border: 1px solid #B8AE9C;
+	font-size:0.85em;
+	font-weight: normal;
+	padding:0.125em;
+}
+
+h5.box { 
+    background-color: #6F7172;
+    border: 1px solid #B8AE9C;
+    border-style: solid solid none solid;
+    color: Black;
+    padding: 0em 1em 0em 1em;
+    display: inline;
+	font-size:  1em;
+    height: 1em;
+}
+
+div.box a:link {
+	text-decoration: none;
+}
+
+div.box a:visited {
+	color: #2A6C28;
+	text-decoration: none;
+}
+
+div.box a:hover {
+	text-decoration: underline;
+}
+
+.boxDetails {
+    text-align: right;
+}
+
+div.box .content {
+    padding: 1em;
+	font-size:  1em;
+}
+
+div.box a.close {
+    float: right;
+    text-transform: none;
+    border-left: 1pt solid #B8AE9C;
+    padding: 0em 0.2em;
+}
+
+div.box h1, div.box h2, div.box h3, div.box h4 {
+    margin: 0;
+    padding: 0;
+}
+
+div.box .even {
+    background-color: #F7F3ED;
+}
+
+div.box .odd {
+    background-color: transparent;
+}
+
+
+/* users/index.php */
+div.course {
+	position: relative;
+	width: 12.5em;
+	height: 10.5em;
+	border: rgb(204, 204, 204) 1px solid;
+	background-color: #F7F7F7;
+	float: left;
+	margin: 0.188em;
+	padding: 0.313em;
+}
+
+div.course.break {
+	clear: left;
+}
+
+div.course h2 {
+	border: 0;
+	font-weight: normal;
+	font-size: large;
+
+}
+
+div.course:hover {
+	background-color:#FBF4E9;
+	border: #B8AE9C 1px solid;
+}
+
+
+table.data .odd img.headicon{
+	width: 2.469em;
+	height: 2.469em; 
+	-webkit-border-radius:5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+
+.icon{
+	-webkit-border-radius:10px;
+	-moz-border-radius: 10px;
+	border-radius: 10px;
+	border-color: white;
+	width: 2.5em;
+	height: 2.5em;
+	float: left;
+}
+div.course div.shortcuts {
+	text-align: right;
+	clear: left;
+	vertical-align: middle;
+	width: 12.5em;
+}
+
+fieldset#shortcuts {
+	float: right;
+	background-color: #FEFDEF;
+	border: 1pt solid #B8AE9C;
+	margin: -5pt 5pt 5pt 5pt;
+	padding-right: 10pt;
+	padding-bottom: 5pt;
+	padding-left: 10pt;
+}
+
+fieldset {
+	margin-bottom: 10pt;
+	-webkit-border-radius:5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	padding: 0 0.375em;
+	width: 90%;
+	margin: 0 auto; 
+	width:95%;
+	margin:0 auto;
+	border:thin #A9ADB0 solid;
+	margin-bottom: 1em;
+
+}
+#shortcuts legend {
+}
+#shortcuts ul {
+	position: relative;
+	margin-top: 0pt;
+	margin-bottom: 0pt;
+	margin-left: 0pt;
+	list-style-type:  none;
+	padding-left: 0pt; 
+}
+
+/*a#guide,*/ a#my-courses-link {
+	background-color: #6D84A2;
+}
+
+#guide img{
+	border:none;
+}
+
+div#content-test, div.content-from-module {	
+	float: left;
+	margin-top: 2em;
+	margin-bottom: 2em;
+	padding-right: 5pt;
+	width: 80%;
+}
+
+div#container {
+	text-align: left;
+	margin: 0 auto;
+	padding: 0;
+	border:0;
+	width: 95%;
+}
+
+/* index page */
+ul#home-links, ul#home-detail-links {
+	list-style: none;
+}
+
+/*my start page */
+#my_courses_container{
+	text-align: left;
+	margin: 0 auto;
+	border:0;	
+	min-width: 100%;	
+}
+
+.my-courses-list{
+	border: solid 1px #A9ADB0;
+	-webkit-border-radius:5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	padding: .313em;
+	margin: .313em;
+	padding: .313em;
+	background-color: white;
+}
+.my-courses-list a{
+	color: black;
+	text-decoration: none;
+
+}
+
+.my-courses-list-ul{
+	margin: 0 auto;
+	padding-left: 0;
+	width: 100%;
+}
+.my-courses-links{
+	font-size: 80%;
+	padding-top: .75em;
+}
+.my-courses-resume{
+	float: right;
+}
+.fl-link-summary{
+	padding-left: 0.875em;
+	padding-bottom: 0.875em;
+	display: inline;
+}
+
+.fl-theme-iphone [class*="fl-list"] > li .fl-link-summary{
+	color: #4C566C;
+}
+.current_head{
+	padding-top: .5em;
+}
+.current_box{
+	max-width: 100%;
+}
+.current_list{
+	width: 95%;
+	padding: 0.375em;
+}
+.current_list li{
+	list-style-type: none;
+	font-style: bold;
+	padding-bottom: .5em;
+	padding-left: .5em;
+	margin:0;
+}
+.current_list li a:active, .current_list li a:focus, .current_list li a:hover{
+	color: white; 
+	background-color: #4C96F4;
+}
+
+.current_list_date_time{
+	font-size: 65%;
+}
+#show-all, #show-pages{
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	padding: .5em;
+	border: solid 1px #A9ADB0;
+	background-color: white;
+	
+	
+}
+#show-all{
+	
+}
+#show-all a, #show-pages a{
+    color: black;
+    padding-left: 0.25em;
+    padding-right: 0.25em;
+    text-decoration: none;
+    display: block;
+}
+
+/* enrollment tabs */
+#navlist {
+	padding: 0;
+	margin-left: 0;
+	margin-right: auto;
+	margin-left: auto;
+	margin-bottom: .25em;
+	margin-top: 0.938em;
+	white-space: nowrap;
+}
+
+#navlist li {
+	list-style: none;
+	display: inline;
+	margin: 0;
+}
+
+#navlist li a {
+	padding: 0.188em 0.563em;
+	border: 1px solid #F7F3ED;
+	border-bottom: none;
+	background-color: #F7F3ED;
+	text-decoration: none;
+	margin-left: .25em;
+	white-space: nowrap;
+}
+
+#navlist li a:hover, #navlist li a:active {
+	color: #000;
+	background-color: #fff;
+}
+
+/* tree */
+.img-size-tree {
+	vertical-align: middle;
+	margin-top: 0;
+    padding:0;
+	height:1.45em;
+	width:1.5em;
+}
+/* profile page */
+dl#public-profile dt {
+	float: left;
+	width: 90%;
+	border-right: 1px solid #F7F3ED;
+	padding: 0.313em 0.313em 0.313em 0;
+
+	margin-right: 0.313em;
+}
+dl#public-profile dd {
+	margin: 0;
+}
+
+div.social-right{
+	margin-left:.5em;
+	margin-top: 1em;
+}
+div.social-left{
+	margin-left:.5em;
+}
+h4.profile{
+	float: left;
+}
+.social-wrapper h3{  
+	padding-top: .5em;
+}
+.my-contacts h3{
+	padding-bottom: .375em;
+}
+img#profile{
+	border: 1px #cccccc solid;
+	margin-left: 1em;
+}
+dd{
+    margin: 0;
+}
+
+/** forum stuff **/
+#forum-thread li {border:1px solid #eee; border-bottom: 1px solid #F7F3ED; float:left; width: 97%; list-style: none; }
+#forum-thread li.even { background-color: #F7F3ED; border-top: none; }
+#forum-thread li.odd { background-color: #fff; }
+div.forum-post-author { float:left; width:19.375em; padding:0.5em 0.625em; }
+div.forum-post-author a.title {font-size: 1.1em; line-height: 1.2em; font-weight: bold; text-decoration:none; }	
+div.forum-post-author img.profile-picture { border: 2px solid #F7F3ED; text-align:right;}
+div.forum-post-content { margin-left: 19.375em; padding: 0.313em 0 1.125em 1.125em;}
+div.forum-post-content h3 { font-weight: 500; float:left;clear:right; }
+div.forum-post-ctrl { float: right; padding-right: 0.313em; color: #a1a1a1;}
+div.forum-post-ctrl a { text-decoration: none; }
+div.forum-post-ctrl span { color: black; background-color: #fefdc2; padding: 0.188em; }
+div.forum-post-content p.date { color: #a1a1a1; border-bottom: 1px solid #F7F3ED; }
+div.forum-post-content div.body p { margin-bottom:1em; }
+div.forum-paginator{border:thin #cccccc solid; padding:.3em; width:95%;margin:auto;background-color:#F7F3ED;}
+span.forum-paginator-active{font-weight:700;text-decoration:underline; height:2em;}
+
+
+
+/** inbox stuff - reuses some of the forum layout **/
+#inbox-msg li {border:1px solid #eee; border-bottom: 1px solid #F7F3ED; width: 95%; list-style: none; min-height: 11em;}
+	
+/*  tool list on admin home and manage screens  */
+ li.top-tool { 
+	list-style: none;
+	padding: 0.125em 0.125em 0.125em  0.938em;
+	margin-bottom: 0.313em; 
+	line-height: 200%; 
+	border: solid 1px #A9ADB0;
+	-webkit-border-radius:8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	background: white;
+}
+	
+li.child-tool a { 
+	font-size: x-small;
+	font-weight: normal; 
+}
+
+ul.child-top-tool {
+	margin-top: -0.313em;
+	padding-left: 0;
+	margin-left: 0;
+	display: inline;
+}
+
+li.child-tool {
+	display: inline;
+	margin-right: 0.313em;
+	font-size: x-small;
+}
+
+
+/* browse courses */
+div.browse-course {
+	padding-bottom: 0.625em;
+}
+
+dl.browse-course {
+	width: 90%;
+	padding-bottom: 0.625em;
+	background-color: #fffaf0;
+	margin:auto;
+	margin-left:1em;
+}
+dl.browse-course dt {
+	float: left;
+	font-weight: bold;
+	width: 25%;
+	text-align: right;
+	clear: left;
+	padding: 0.313em 0.625em 0.313em 0;
+	vertical-align: middle;
+
+}
+dl.browse-course dd {
+	margin-bottom: 0.313em;
+	clear: right;
+	padding: 0.313em 0 0.313em 0.625em;
+	margin-left: 26%;
+
+}
+.row .buttons{
+	border: none;
+}
+
+/*  form fields grouping for WCAG 2.0 conformance*/
+fieldset.group_form{
+	width:98%;
+	margin:0 auto;
+	color: #4C566C; 
+	padding:.313em;
+	margin: .313em;
+	border: 1px #A9ADB0 solid;
+	background-color: white;
+}
+
+legend.group_form{
+	background-color:white;
+	font-weight: 600;
+	color: #4C566C;
+	padding:.313em;
+	margin: .313em;
+	border: 1px #4C566C solid;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+}
+
+/*Overrides above a:active, a:hover, a:focus so the "Navigation" button itself isn't highlighted when activated.
+Ensure styling matches that in fl-tabs.*/
+.topnavlistcontainer a:hover, .topnavlistcontainer a:active, .topnavlistcontainer a:focus{
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    );
+}
+
+/*Added by Silvia */
+div.column_primary {
+	float: left;
+	width: 42%;
+	margin: 0.313em;
+	padding: 0;
+	min-width: 10.625em;
+}
+
+div.column_equivalent{
+	float: left;
+	width: 52%;
+	margin-left:  0.938em;
+	margin-top: 0.313em;
+	margin-right: 0.313em;
+	margin-bottom: 0.313em;
+	min-width: 10.625em;
+	padding: 0.313em;
+	border: 1px solid #EEE;
+	background-color: #FFF;
+}
+
+div.resource_box{
+	border: 1px solid #aaa;
+	width: 95%;
+	margin: 0.313em;
+	padding: 0.313em;
+	min-width: 9.375em;
+	background-color: #eee;
+}
+
+h2.alternatives_to{
+	margin-top: 0.75em;
+	font-size: 90%;
+	color: #A50707;
+}
+
+div.alternative_box{
+	border: 1px solid #ddd;
+	margin: 0.313em;
+	padding: 0.313em;
+	min-width: 9.375em;
+	background-color: #fff;
+}
+
+div.alternative_box legend {
+	color: #000;
+}
+
+div.resource_box legend {
+	color: #000;
+}
+
+label.primary a{
+	color: #A50707;
+	font-weight: bolder;
+	background-color: white;
+}
+
+/* format of "table of contents" on content page */
+#toc a { 
+	display:block; 
+	margin:0.188em; 
+}
+#toc .h2, #toc .h3, #toc .h4, #toc .h5, #toc .h6{ 
+	padding:0 0 0 0;
+}
+
+
+fieldset#toc {
+	background-color: #FEFDEF;
+	border: 1pt solid #B8AE9C;
+	width:89%;
+}
+
+#side-menu{
+	overflow:hidden;
+}
+
+/* cleans up glossary question mark line spacing*/
+sup{
+	border: 1pt solid #B8AE9C;
+	vertical-align:bottom;
+	margin-top: 1em;
+}
+
+/* jQuery tooltip styles */
+#tooltip{
+	position:absolute;
+	z-index:3000;
+	border:3px solid #111;
+	background-color:#eeeeee;
+	padding:0.313em;
+}
+#tooltip h3,#tooltip div{
+	margin:0;
+}
+
+/* style for home page modules "detail view" */
+div.home_box {
+	padding: .75em 0;
+	margin: 0 auto;
+}
+
+.outside_box{
+	background:#e0e0e0;
+	width: 17em;
+	margin: .375em;
+	padding: 0;
+	height:9.8em;
+}
+
+.inside_box{
+	width:100%;
+	margin:auto;
+	height:52%;
+	margin-bottom:.2em;
+	background:#eeeeee;
+
+}
+.details_or{
+	width:28.8em;
+	height:9.8em;
+	margin:0;
+	background-image:url(images/details_r.png);
+	background-position: top right;
+	background-repeat:no-repeat;
+}
+.details_ol{
+	height:9.8em;
+	margin:0;
+	width:.45em;
+	background-image:url(images/details_l.png);
+	background-position: top left;
+	background-repeat:no-repeat;
+}
+.details_ir{
+	width:.5em;
+	height:100%;
+	float:right;
+	background-image:url(images/details_ir.png);
+	background-position: top right;
+	background-repeat:no-repeat;
+}
+.details_il{
+	height:100%;
+	float:left;
+	background-image:url(images/details_il.png);
+	background-position: top left;
+	background-repeat:no-repeat;
+}
+.home-title{
+	font-size:12pt;
+}
+.buttonbox{
+	float:right;
+}
+.details_text{
+	margin-left:1em;
+}
+.draggable_selected {
+	background-color: lightgrey;
+	cursor: move;
+}
+
+div.menuedit{
+	float:right;
+	margin-top:-1.2em; 
+	border:1px solid #cccccc;
+}
+li.folders {
+	list-style: disc url(../../images/folder.gif) outside;
+	font-family: Helvetica,sans-serif;
+	margin-bottom: 0;
+	margin-top: 0;
+	margin-right: 0;
+}
+
+li.folders .disabled {
+	color: #B8AE9C;
+}
+
+ul.folder{
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0em;
+	padding:0em;
+}
+
+#topnavlist-tablet{
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	border: black;
+	background: black; 
+	z-index: 1000;
+	padding-bottom: 0; 
+	margin-bottom: 0;	
+}
+
+ul#topnavlist-tablet li {
+	color: white;
+}
+	
+ul#topnavlist-tablet>li:hover, ul#topnavlist-tablet>li:hover a,  ul#topnavlist-tablet>li:active,
+ul#topnavlist-tablet>li:active a, ul#topnavlist-tablet>li:focus, ul#topnavlist-tablet>li:focus a {
+	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center, -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+	background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center, -moz-linear-gradient(#4a94f4, #236de5);
+}
+
+ul#topnavlist-tablet li a  {
+ 	text-decoration: none;
+}
+
+.flc-screenNavigator-backButton .fl-link-hilight{
+	display: none;
+}
+
+div.toolcontainer{
+	border: #cccccc 1px solid;
+	-webkit-border-radius:5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+
+
+
+
+
+/* list attributes */
+ul {
+	list-style: none;
+}
+li {
+	color: black;
+	list-style: none;
+}
+
+ol#tools>li:hover, ol#tools>li:hover a {
+	/*border: 1px solid #e0e0e0;*/
+	background-color: #e6e6e6;
+	color: black; 	
+	
+ 	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -moz-linear-gradient(#4a94f4, #236de5);	
+}
+
+[class*="fl-container"]:not(.fl-navbar){
+	margin: 0;
+	margin-left: .313em;
+	margin-right: .313em;
+	padding: 0;	
+}	
+div#navigation-column{
+	
+	width: 50%;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	z-index: 1000;
+	position: absolute; 
+	top: 2em;
+	background: black;
+	padding-right: .2em;
+	padding-left: .2em;
+	padding-top: .2em;
+	padding-bottom: .2em;
+	display: none;
+}
+div#contentcolumn{
+	padding-top: .313em;
+	margin-top: .313em;
+	padding: .313em;
+	margin-bottom: 1em;
+	position: absolute; 
+	top: .7em;
+	top: 1.2em;
+	top: 2em;
+}
+#content-text{
+	position: relative;
+	top: .7em;
+}
+
+	
+
+
+#content-contentwrapper{
+	height:100%;
+    position:relative;	
+	z-index:1000;			
+	width:100%;
+	overflow:hidden;
+	
+}
+
+#leftcolumn{
+	float: left;
+	width: 17em;
+	margin-left: 0.313em;
+	margin-top:-0.625em;
+}
+
+#copyright{
+	font-size: 0.5em;
+}
+#gototop{
+	text-align: center;
+	color: #4B6B90;
+}
+
+#tools{
+	margin: 0 auto;
+	padding: 0.313em;
+	
+}
+
+
+/* ATutor Social Styles */
+div .profile_container {
+	background-color:#eee; 
+	border: 1px solid #8e8e8e; 
+	width:80%; 
+	padding:0.5em; 
+	margin-bottom: 0.5em;
+}
+
+div .profile_container .top_right {
+	float: right;
+}
+
+dl.public-profile dd{
+	margin-left:0;
+}
+dl.public-profile dt {
+	float: left;
+	font-weight: bold;
+	min-width:12em;
+}
+
+/* Search form */
+div .search_form {
+	margin-bottom: 1em;
+}
+
+div .search_form .row{
+	background-color: #DEDEC0;
+	padding: 0.5em;
+}
+div .button {
+	background-color: #eee;
+	border: 1px solid #aaa;
+}
+div .button:hover{
+	background-color: #cccccc;
+	color: #ffffff;
+}
+
+/* Side menu */
+ul.social_side_menu {
+	padding-left: 2em;
+}
+ul.social_side_menu li {
+	padding-bottom: 0.2em;
+	list-style: circle;
+}
+
+div .divider {
+	border-bottom:1px solid #C1C157; 
+	padding-bottom:0.5em; 
+	margin-bottom:0.5em;
+}
+
+.activity{
+ 	line-height:18pt;
+	font-size:.8em;
+}
+
+div.contentbox, input-form{
+	padding:.5em;
+	background-color: #ffffff;
+    overflow:hidden;
+    border: #A9ADB0 solid 1px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+
+div.suggestions{
+	border:1px solid #a50707;
+	margin-left:0.625em; 
+	width:50%;
+}
+li.inlinelist{
+	display: inline; 
+	padding-right: 1em;
+}
+ul.social_inline_menu{
+	background-color: #eeeeee;
+	border:thin #cccccc solid;
+	padding:.5em;
+	width:90%;
+	margin:auto;
+}
+.results-hide-show-link-container{
+	border: #A9ADB0 solid 1px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+#results-hide-show-link{
+	height: 100%;
+}
+
+#hide-show-container{
+	-webkit-border-radius:8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	margin-top: 0.875em;
+	margin-bottom: 0.875em;
+	padding: 0.875em;
+	padding-right: .2em;
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#999), to(black));
+	background: -moz-linear-gradient(#999, black);
+}
+
+.hide-show-container h4{
+	border: #A9ADB0 solid 1px;
+	-webkit-border-radius:8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	margin-top: 0.875em;
+	margin-bottom: 0.875em;
+	padding: 0.875em;
+	padding-right: .2em;
+	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#F8FAFB), to(#B6C0C6));
+	background: -moz-linear-gradient(#F8FAFB, #B6C0C6);
+	background: white; 
+}
+
+#hide-show-container a:link,
+#hide-show-container a:focus,
+#hide-show-container a:hover{
+ 	color: white;
+	text-decoration: none;
+	text-shadow: none;
+	display: block; 
+}
+
+.hide-show-container a:link:not(.fl-list-menu):not(.fl-list-brief),  
+.hide-show-container a:focus:not(.fl-list-menu):not(.fl-list-brief), 
+.hide-show-container a:hover:not(.fl-list-menu):not(.fl-list-brief),
+.hide-show-container a:active:not(.fl-list-menu):not(.fl-list-brief),
+#hide-show-container a:active{
+	color: white;
+	color: #4C566C;
+	text-decoration: none;
+	text-shadow: none;
+	display: block; 
+}
+
+.hide-show-container a>h4, .fl-theme-iphone a .results-hide-show-link{
+	color: white;
+}
+/* REBUILDING THE TOP NAVIGATION MENU */
+
+#navigation-bar{
+ 	height: 2; 
+    border-bottom: .5px solid black;    
+}
+
+/*Overrides above a:active, a:hover, a:focus so the "Navigation" button itself isn't highlighted when activated.
+Ensure styling matches that in fl-tabs.*/
+.topnavlistcontainer a:hover, .topnavlistcontainer a:active, .topnavlistcontainer a:focus{
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    );
+}
+
+
+
+/*this CSS creates a button that looks exactly like a Mobile FSS tab.*/
+.navigation-bar-button{
+    border-width:5px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+	border-radius: 5px;
+	font-size: 18px;/*keep this in px*/
+	padding-left: .3em;
+	padding-right: .3em;
+	padding-top: .1em;
+	color: white;
+	position: relative;
+	top: .4em; 
+
+	
+    /* default mobile fss color scheme for tabs not AA compliant. Here is a compliant bg image: */
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    );
+	background-color: #354D68;
+	-moz-border-image: url("images/navbar_normal_button_insetShadow.png") 5 5 5 5 stretch;
+ 	-webkit-border-image: url(images/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+ 	-moz-border-image:url(images/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+    -webkit-border-left-image: none;
+    -moz-border-left-image: none;
+    -webkit-background-origin: border;
+    -moz-background-origin: border;
+    -webkit-background-clip: border;
+	-moz-background-clip: border;
+	margin-top: .3em;
+	margin-bottom: -1em;
+}
+
+
+/* hiding/showing course content */
+
+div#content-link-container{
+ 	list-style: none; 
+	padding-top: .316em;
+	float: right;
+}
+ 
+
+.content_link_tablet {
+	border-width:5px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+	border-radius: 5px;
+	font-size: 0.875em;/*keep this in px*/
+	font-size: 18px;
+	/*padding: .1em;*/
+	padding-left: .3em;
+	padding-right: .3em;
+	padding-top: .1em;
+	padding-bottom: .1em;
+	margin-right: .313em;
+
+	
+    /* default mobile fss color scheme for tabs not AA compliant. Here is a compliant bg image: */
+    background-image: -webkit-gradient(linear, left top, left bottom,
+     	from(#3b5371),
+        color-stop(0.5, #374e6b),
+        color-stop(0.50, #354d68),
+        to(#354d68)
+    );
+ 	-webkit-border-image: url(images/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+    -moz-border-image: url(images/navbar_normal_button_insetShadow.png) 5 5 5 5 stretch;
+    -webkit-border-left-image: none;
+    -moz-border-left-image: none;
+    -webkit-background-origin: border;
+    -moz-background-origin: border;
+    -webkit-background-clip: border;
+    -moz-background-clip: border;
+    margin-bottom: -0.25em;
+
+
+}
+.flc-screenNavigator-navbar .content_link{
+	color: white;
+	text-decoration: none;
+	font-weight: bold;
+	background-color: #354D68;
+}
+.fl-theme-iphone .content_link_tablet_highlight{
+	 color: #4c96f4;
+	 font-weight: bold;
+	
+}
+
+#content{
+	position: absolute;
+	top: 2em; 
+	right: 0.313em;
+	width: 50%;
+	float: right;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	border: 4px solid black;
+	z-index: 1000;
+	display: none;
+}
+
+/*	hiding/showing top navigation and results-display */
+ul#topnavlist {
+	display: none;
+	position: relative;
+	top: 1.2em;
+	z-index: 1;
+}
+
+div#results-display, .results-display{
+	display: none;
+}
+
+ul#topnavlist li {
+	padding: 0;
+	margin: 0;
+}
+	
+ul#topnavlist>li:hover, ul#topnavlist>li:hover a,  ul#topnavlist>li:active, ul#topnavlist>li:active a,
+ul#topnavlist>li:focus, ul#topnavlist>li:focus a {
+	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+   -moz-linear-gradient(#4a94f4, #236de5);
+}
+
+ul#topnavlist li a  {
+ 	color: #4C566C;
+ 	text-decoration: none;
+}
+.content-expand {
+	background-image:url("images/plus.png");
+	background-position: 100% 100%;
+	background-repeat: no-repeat;
+}
+.content-closed{
+	background-image:url("images/minus.png");
+	background-position: 100% 100%;
+	background-repeat: no-repeat;	
+}
+
+/* SUBNAVLIST HIGHLIGHTING and Gmail-STYLE "more" button */
+ul#subnavlist li a{
+	color: black;
+}
+
+ul#subnavlist li a:active, ul#subnavlist li a:focus, ul#subnavlist li  a:hover {
+	color: red;	
+	border-bottom: #4C566C 2px solid;
+	text-decoration: none;
+}
+ul#subnavlist{
+	color: black;
+	padding: 0;
+	padding-bottom: 0.313em;
+	margin: 0;
+	font-size: 90%;
+	text-align: center;  
+}
+.selected{
+	color: red;
+	font-size: 0.875em;
+	border-bottom: #4C566C 2px solid;
+}
+#subnavlist-more .more-item{
+	font-size: 0.875em; list-style-type: bullet;
+	
+}
+.more-icon {
+	background-image:url('images/hidemenu.gif');
+	background-position: 100% 100%;
+	background-repeat: no-repeat;
+}
+.more-button{
+}
+.more-button-surround{
+}
+.subnavlist-more{
+	
+	display: block;
+	display: none;
+}
+ul#subnavlist li:not(#subnavlist-more){
+	display: inline;
+}
+
+ul#subnavlist li a, ul#subnavlist li a:visited {
+	color: black;
+}
+ul#subnavlist li a{
+	text-decoration: none;
+}
+
+ /*creates a little up-facing arrow to help mimick an ipad-style popover.  
+ See http://nicolasgallagher.com/pure-css-speech-bubbles/demo/ */
+.triangle-isosceles {
+     position: relative;
+}
+
+.triangle-isosceles:after {
+     border-style: solid;
+     content: "";
+     display: block;
+     position: absolute;
+}
+
+.triangle-isosceles.top:after {
+     border-color: black transparent;
+     border-width: 0pt 15px 15px;
+     bottom: auto;
+     left: auto;
+     left: 20%;
+     top: 95%;
+     z-index: 1000;
+}
+
+.triangle-isosceles.top.right:after {
+     border-color: black transparent;
+     border-width: 0pt 15px 15px;
+     bottom: auto;
+     left: auto;
+     right: 30%;
+     top: 98%;
+     z-index: 1000;
+}
+
+/*'Previous' and 'Next' buttons */
+.previous{
+	margin-left:3.125em;
+}
+
+.triangle-isosceles.previous:after {
+	top:1em; /* controls vertical position */
+	left:-3.125em; /* value = - border-left-width - border-right-width */
+	bottom:auto;
+	border-width:15px 50px 10px 0;
+	border-color:transparent #f3961c;
+	border-color: transparent #F3961C;
+    border-width: 10px 10px 10px 0pt;
+    bottom: auto;
+    left: -0.75em;
+    top: 0;
+}
+
+/* sequence links */
+#sequence-links{
+	float: left;
+	padding-right:0;
+	position: relative; 
+	right: -.313em;
+}
+
+#course-level-navigation, #sequence-links-course-navigation{	
+		float: right;
+}
+
+/************************************************************************************************/
+/*Adds arrows to Fluid Tabs. Here is a good guide for creating triangles with CSS: 
+http://jonrohan.me/guide/css/creating-triangles-in-css/ */
+/************************************************************************************************/
+
+ul.sequence-links li {
+    position:relative;
+    z-index:1;
+    overflow:hidden;
+    list-style:none;
+}
+
+ul.sequence-links li.back a:link, 
+ul.sequence-links li.back a:visited {
+    display:block;
+    padding-left:12px;
+    color:white;
+}
+
+ul.sequence-links li.forward a:link, 
+ul.sequence-links li.forward a:visited {
+    display:block;
+    padding-right:0.75em;
+    color:white;
+}
+/*WCAG*/
+ul.sequence-links li a:hover, ul.sequence-links li a:focus, ul.sequence-links li a:active,
+ul.sequence-links li.back a:hover, ul.sequence-links li.back a:focus, ul.sequence-links li.back a:active,
+ul.sequence-links li.forward a:hover, ul.sequence-links li.forward a:focus, ul.sequence-links li.forward a:active {
+    color: #4c96f4;
+    background:transparent;
+}
+
+
+ul.sequence-links li:before, 
+ul.sequence-links li:after,
+ul.sequence-links li a:before, 
+ul.sequence-links li a:after {
+    content:"";
+    position:absolute;
+    top:50%;
+   /* left:0;*/
+}
+
+ul.sequence-links li a:before, 
+ul.sequence-links li a:after {
+    margin:-0.5em 0 0;
+  }
+
+/*arrow that points to the left, beside the "Previous" text */
+.arrow.back a:after {/*arrow pointing to the left*/
+     background: none repeat scroll 0% 0% transparent;
+     border-color: transparent #FFFFFF;
+     border-style: solid;
+     border-width: 5px 0pt 5px 6px;
+     left: .5em;
+     margin-top: -0.438em;
+}
+
+/*left and right triangle icons change color*/
+.arrow a:hover:after, .arrow a:focus:after, .arrow a:active:after, 
+.arrow.forward a:hover:after, .arrow.forward a:focus:after, .arrow.forward a:active:after{
+	border-color: transparent #4c96f4;
+}
+
+.arrow.back a:after {
+     border-width: 6px 6px 6px 0pt;    
+     left: 0.188em;
+     
+     top: .75em;
+}
+
+}
+/*arrow that points to the right, beside the "Next" text */
+.arrow.forward a:after {
+     background: none repeat scroll 0% 0% transparent;
+     border-color: transparent #FFFFFF;
+     border-style: solid;
+     margin-top: -0.425em;
+   
+}
+.arrow.forward a:after {
+  
+      background: none repeat scroll 0% 0% transparent;
+     border-color: transparent transparent transparent white;
+  	 border-width: 6px;
+  	 border-style: solid;
+  	 width:0;
+  	 height:0;
+  	 right: -0.313em;
+  	 top: 0.85em;
+}
+/* style for "last modified" information of course content*/
+#content-info{
+	padding-top: 2em;
+	font-size: 80%;
+}
+
+ul.my-courses-list-ul > li:hover{
+	background-color: #4c96f4;
+ 	color: #fff;
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+    -webkit-gradient(linear, left top, left bottom, from(#4a94f4), to(#236de5));
+    background: url(../images/themes/iphone/listmenu_loader.gif) no-repeat 97% center,
+    -moz-linear-gradient(#4a94f4, #236de5);
+} 
+ul.my-courses-list-ul > li:hover a{
+	color: white;
+}
+#topnavlistcontainer {
+    float: left;
+}
+
+/* to be created as a separate desktop theme file. The classes below should be removed when 
+Mark McLaren's port of mobile fss to firefox is committed to infusion: 
+https://github.com/fluid-project/infusion/blob/25ad6755ef78347b414d60bd4037a0f197f9d09d/infusion-branch/src/webapp/framework/fss/css/fss-mobile-theme-firefox.css */ 
+.fl-tabs li:first-child {
+    border-bottom-left-radius: 5px;
+    border-top-left-radius: 5px;
+}
+
+.fl-theme-iphone .fl-tabs li {
+    -moz-border-image: url("images/navbar_normal_button_insetShadow.png") 5 5 5 5 stretch;
+    background-color: #354D68;
+}
+[class*="fl-container"] [class*="fl-list"] > li:first-child, [class*="fl-container"] [class*="fl-list"] > li:first-child a {
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
+}
+[class*="fl-container"] [class*="fl-list"] > li:last-child, [class*="fl-container"] [class*="fl-list"] > li:last-child a {
+    border-bottom-left-radius: 8px;
+    border-bottom-right-radius: 8px;
+}
+
+.fl-theme-iphone .fl-tabs .fl-tabs-active {
+    background-image: -moz-linear-gradient(
+        center top,
+        rgba(149, 184, 239,1),
+        rgba(35,109,229,1),
+        rgba(149, 184, 239,1)  50%,
+        rgba(75,148,244,1) 50%
+    );
+}
+
+/* A simulation for a:active on the device, requires JS */
+/* since .fl-list is for mixed material lists, dont include them in these effects */
+.fl-theme-iphone [class*=fl-list]:not(.fl-list):not(.fl-grid) a:active,
+.fl-theme-iphone [class*=fl-list]:not(.fl-list):not(.fl-grid) a.fl-link-hilight {
+    background: url(../images/themes/iphone/listmenu_arrow.png) no-repeat right -25px,
+                -moz-linear-gradient(#4a94f4, #236de5);
+}
diff --git a/docs/themes/simplified-desktop/test.html b/docs/themes/simplified-desktop/test.html
new file mode 100644
index 000000000..f91ff9714
--- /dev/null
+++ b/docs/themes/simplified-desktop/test.html
@@ -0,0 +1,109 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="<?php echo $this->lang_code; ?>"> 
+
+<head>
+	<title><?php echo SITE_NAME; ?> : <?php echo $this->page_title; ?></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $this->lang_charset; ?>" />
+	<meta name="Generator" content="ATutor - Copyright 2005 by http://atutor.ca" />
+	<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0," />
+	<meta name="apple-mobile-web-app-capable" content="yes"/>
+	<base href="<?php echo $this->content_base_href; ?>" />
+	<link rel="shortcut icon" href="<?php echo $this->base_path; ?>favicon.ico" type="image/x-icon" /> 
+	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/print.css" type="text/css" media="print" />
+	<!-- mobile FSS -->
+	<link rel="stylesheet" href="<?php echo $this->base_path; ?>jscripts/infusion/framework/fss/css/fss-mobile-layout.css" type="text/css"/>
+	<link rel="stylesheet" href="<?php echo $this->base_path; ?>jscripts/infusion/framework/fss/css/fss-mobile-theme-iphone.css" type="text/css"/>	
+	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/styles.css" type="text/css"/>
+
+	
+	<!--[if IE]>
+	  <link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/ie_styles.css" type="text/css" />
+	<![endif]-->
+	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/forms.css" type="text/css" />
+		
+<?php echo $this->rtl_css; ?>
+<?php if (isset($this->course_id) && $system_courses[$this->course_id]['rss']): ?>
+	<link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 2.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-2" />
+	<link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 1.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-1" />
+<?php endif; ?>
+	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
+	<script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
+	<script src="<?php echo $this->base_path; ?>jscripts/ATutor.js" type="text/javascript"></script>   
+	<script src="<?php echo $this->base_path; ?>jscripts/ATutorCourse.js" type="text/javascript"></script>   
+	<script src="<?php echo $this->base_path.'themes/'.$this->theme; ?>/iscroll.js" type="text/javascript"></script>
+	<script language="javascript" type="text/javascript">
+	//<!--
+	jQuery.noConflict();
+	//-->
+	</script>
+<script type="text/javascript">
+var myScroll;
+
+function setHeight() {
+	var headerH = document.getElementById('header').offsetHeight;
+	var footerH = document.getElementById('footer').offsetHeight;
+	var wrapperH = window.innerHeight - headerH - footerH;
+	document.getElementById('wrapper').style.height = wrapperH + 'px';
+}
+
+function loaded() {
+	setHeight();
+	myScroll = new iScroll('scroller', { checkDOMChanges: true, fadeScrollbar: false, vScrollbar: true, bounce: false, desktopCompatibility: true });
+}
+
+window.addEventListener('onorientationchange' in window ? 'orientationchange' : 'resize', setHeight, false); //destroy on horizontal? 
+document.addEventListener('touchmove', function(e){ e.preventDefault(); }, false);
+document.addEventListener('DOMContentLoaded', loaded, false);
+</script>
+
+
+<?php echo $this->custom_css; ?>
+</head>
+
+<body>
+<div id="header"><a href="http://cubiq.org/iscroll">iScroll</a></div>
+
+<div id="wrapper">
+	<div id="scroller">
+		<ul id="thelist">
+			<li>Pretty content row 1</li>
+			<li>Pretty content row 2</li>
+
+			<li>Pretty content row 3</li>
+			<li>Pretty content row 4</li>
+			<li>Pretty content row 5</li>
+			<li>Pretty content row 1</li>
+			<li>Pretty content row 2</li>
+
+			<li>Pretty content row 3</li>
+			<li>Pretty content row 4</li>
+			<li>Pretty content row 5</li>
+			<li>Pretty content row 1</li>
+			<li>Pretty content row 2</li>
+
+			<li>Pretty content row 3</li>
+			<li>Pretty content row 4</li>
+			<li>Pretty content row 5</li>
+			<li>Pretty content row 1</li>
+			<li>Pretty content row 2</li>
+
+			<li>Pretty content row 3</li>
+			<li>Pretty content row 4</li>
+			<li>Pretty content row 5</li>
+			<li>Pretty content row 1</li>
+			<li>Pretty content row 2</li>
+
+			<li>Pretty content row 3</li>
+			<li>Pretty content row 4</li>
+			<li>Pretty content row 5</li>
+
+		</ul>
+	</div>
+</div>
+
+<div id="footer"></div>
+<div id="test"><div></div></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/theme.cfg.php b/docs/themes/simplified-desktop/theme.cfg.php
new file mode 100644
index 000000000..b180cf4cf
--- /dev/null
+++ b/docs/themes/simplified-desktop/theme.cfg.php
@@ -0,0 +1,45 @@
+<?php
+/************************************************************************/
+/* ATutor																*/
+/************************************************************************/
+/* Copyright (c) 2002-2008 by Greg Gay, Joel Kronenberg & Heidi Hazelton*/
+/* Adaptive Technology Resource Centre / University of Toronto			*/
+/* http://atutor.ca														*/
+/*																		*/
+/* This program is free software. You can redistribute it and/or		*/
+/* modify it under the terms of the GNU General Public License			*/
+/* as published by the Free Software Foundation.						*/
+/************************************************************************/
+
+// $Id: theme.cfg.php 2813 2004-12-12 15:37:46Z greg $
+
+/* This is the default configuration file for the default theme. */
+
+/* The theme's name. */
+	$_theme['name'] = 'AliMobile 2.0';
+
+/* The theme's version number. */
+	$_theme['version'] = '1.0';
+
+/* Which version of ATutor is this theme intended for. */
+	$_theme['atutor-version'] = '2.0';
+
+/* author information */
+	$_theme['author_name']  = 'Alison Benjamin';
+	$_theme['author_url']   = 'http://atutor.ca';
+	$_theme['author_email'] = 'alison.benjamin@gmail.com';
+
+/* theme default course banner styles: */
+/*
+	$_theme['banner']['font-family'] = 'Verdana, Arial, sans-serif';
+	$_theme['banner']['font-weight'] = 'bold';
+	$_theme['banner']['color']       = 'black';
+	$_theme['banner']['font-size']   = 'xx-large';
+	$_theme['banner']['text-align']  = 'center';
+
+	$_theme['banner']['background-color'] = 'white';
+	$_theme['banner']['background-image'] = '';
+	$_theme['banner']['vertical-align']   = 'middle';
+	$_theme['banner']['padding']          = '3px';*/
+
+?>
diff --git a/docs/themes/simplified-desktop/theme_info.xml b/docs/themes/simplified-desktop/theme_info.xml
new file mode 100644
index 000000000..6becef119
--- /dev/null
+++ b/docs/themes/simplified-desktop/theme_info.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--This is an ATutor Theme Generator document-->
+<!--Created from the ATutor Themes Export Generator-->
+
+<theme>
+	<title>Mobile</title>
+	<version>1.0</version>
+	<type>Mobile</type>
+	<last_updated>2010-08-16</last_updated>
+	<extra_info>This is the default theme for Android and iPhone mobile devices.</extra_info>
+</theme>
+
diff --git a/docs/themes/simplified-desktop/users/browse.tmpl.php b/docs/themes/simplified-desktop/users/browse.tmpl.php
new file mode 100644
index 000000000..f46e94757
--- /dev/null
+++ b/docs/themes/simplified-desktop/users/browse.tmpl.php
@@ -0,0 +1,163 @@
+<?php require(AT_INCLUDE_PATH.'header.inc.php'); ?>
+<?php if ($this->mobile_device_type == IPAD_DEVICE): ?><!--  smartphone theme only -->
+<div class="column-login">
+<div class="input-form">
+
+
+
+<div id="hide-show-container" >
+	<h3><a id="results-hide-show-link" class="content-expand" href="javascript:void(0);" role="search"  aria-live="assertive"	tabindex="1" ><?php echo $this->num_results; echo " courses found."?></a></h3>
+</div>
+<div id="results-display">
+
+<fieldset class="group_form"><legend class="group_form"><?php echo "Filter by:"; ?></legend>
+		<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+				<div class="row">
+					
+					<fieldset><legend><?php echo _AT('access'); ?></legend>
+					<input type="radio" name="access" value="private" id="s1" <?php if ($_GET['access'] == 'private') { echo 'checked="checked"'; } ?> /><label for="s1"><?php echo _AT('private'); ?></label> 
+	
+					<input type="radio" name="access" value="protected" id="s2" <?php if ($_GET['access'] == 'protected') { echo 'checked="checked"'; } ?> /><label for="s2"><?php echo _AT('protected'); ?></label>
+
+					<input type="radio" name="access" value="public" id="s3" <?php if ($_GET['access'] == 'public') { echo 'checked="checked"'; } ?> /><label for="s3"><?php echo _AT('public'); ?></label>
+
+					<input type="radio" name="access" value="" id="s" <?php if ($_GET['access'] == '') { echo 'checked="checked"'; } ?> /><label for="s"><?php echo _AT('all'); ?></label>
+					</fieldset>
+				</div>
+
+			<?php if ($this->has_categories): ?>
+				<div class="row">
+					<label for="category"><?php echo _AT('category'); ?></label><br/>
+					<select name="category" id="category">
+						<option value="-1">- - - <?php echo _AT('cats_all'); ?> - - -</option>
+						<option value="0" <?php if ($_GET['category'] == 0) { echo 'selected="selected"'; } ?>>- - - <?php echo _AT('cats_uncategorized'); ?> - - -</option>
+						<?php echo $this->categories_select; ?>
+					</select>
+				</div>
+			<?php endif; ?>
+
+			<div class="row">
+				<label for="search"><?php echo _AT('search'); ?> (<?php echo _AT('title').', '._AT('description'); ?>)</label><br />
+
+				<input type="text" name="search" id="search" size="30" value="<?php echo htmlspecialchars($_GET['search']); ?>" />
+				<br/>
+				
+				<fieldset><legend><?php echo _AT('search_match'); ?>:</legend>
+				<input type="radio" name="include" value="all" id="match_all" <?php echo $this->checked_include_all; ?> /><label for="match_all"><?php echo _AT('search_all_words'); ?></label> 
+				<input type="radio" name="include" value="one" id="match_one" <?php echo $this->checked_include_one; ?> /><label for="match_one"><?php echo _AT('search_any_word'); ?></label>
+				</fieldset>
+			</div>
+
+			<div class="row buttons">
+				<input type="submit" name="filter" value="<?php echo _AT('filter'); ?>"/>
+				<input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>"/>
+			</div>
+		
+		</form>
+
+</fieldset>
+</div>
+</div>
+</div>
+<div>
+<?php if (is_array($this->courses_rows)){ ?>
+	<?php foreach ($this->courses_rows as $row){ ?>
+	    <?php  $counter++; ?>
+		<ul class="fl-list-menu fl-list-thumbnails">
+		 <li>
+				<h3 class="browse-courses"><a href="<?php echo url_rewrite('bounce.php?course='.$row['course_id'], true); ?>"><?php echo htmlentities($row['title'], ENT_QUOTES, 'UTF-8'); ?></a></h3>      
+		     
+		      <?php if ($row['description']): ?>
+				<span class="fl-link-summary" title="<?php echo htmlentities($row['description']);?>"><?php echo substr(nl2br(htmlentities($row['description'], ENT_QUOTES, 'UTF-8')),0,150); 
+				if(strlen($row['description']) > 150){
+				echo "...";
+				}
+				?>&nbsp;</span>
+			<?php else: ?>
+				<span class="fl-link-summary" title="<?php echo htmlentities($row['description']);?>">&nbsp;</span>
+			<?php endif; ?>
+		
+		</li>
+	
+	</ul>	      
+	<?php } // end foreach ?>
+<?php } // end if ?>
+</div>
+<?php endif; ?>
+<?php if ($this->mobile_device_type != IPAD_DEVICE): ?><!--  smartphone theme only -->
+<div class="column-login">
+<div class="input-form">
+<fieldset class="group_form"><legend class="group_form"><?php echo _AT('filter'); ?></legend>
+	<form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
+		
+			<div class="row">
+				<h3><?php echo _AT('results_found', $this->num_results); ?></h3>
+			</div>
+			<div class="row">
+				<?php echo _AT('access'); ?><br />
+				<input type="radio" name="access" value="private" id="s1" <?php if ($_GET['access'] == 'private') { echo 'checked="checked"'; } ?> /><label for="s1"><?php echo _AT('private'); ?></label> 
+
+				<input type="radio" name="access" value="protected" id="s2" <?php if ($_GET['access'] == 'protected') { echo 'checked="checked"'; } ?> /><label for="s2"><?php echo _AT('protected'); ?></label>
+
+				<input type="radio" name="access" value="public" id="s3" <?php if ($_GET['access'] == 'public') { echo 'checked="checked"'; } ?> /><label for="s3"><?php echo _AT('public'); ?></label>
+
+				<input type="radio" name="access" value="" id="s" <?php if ($_GET['access'] == '') { echo 'checked="checked"'; } ?> /><label for="s"><?php echo _AT('all'); ?></label>
+			</div>
+
+		<?php if ($this->has_categories): ?>
+			<div class="row">
+				<label for="category"><?php echo _AT('category'); ?></label><br/>
+				<select name="category" id="category">
+					<option value="-1">- - - <?php echo _AT('cats_all'); ?> - - -</option>
+					<option value="0" <?php if ($_GET['category'] == 0) { echo 'selected="selected"'; } ?>>- - - <?php echo _AT('cats_uncategorized'); ?> - - -</option>
+					<?php echo $this->categories_select; ?>
+				</select>
+			</div>
+		<?php endif; ?>
+
+			<div class="row">
+				<label for="search"><?php echo _AT('search'); ?> (<?php echo _AT('title').', '._AT('description'); ?>)</label><br />
+
+				<input type="text" name="search" id="search" size="30" value="<?php echo htmlspecialchars($_GET['search']); ?>" />
+				<br/>
+				<?php echo _AT('search_match'); ?>:
+				<input type="radio" name="include" value="all" id="match_all" <?php echo $this->checked_include_all; ?> /><label for="match_all"><?php echo _AT('search_all_words'); ?></label> 
+				<input type="radio" name="include" value="one" id="match_one" <?php echo $this->checked_include_one; ?> /><label for="match_one"><?php echo _AT('search_any_word'); ?></label>
+			</div>
+
+			<div class="row buttons">
+				<input type="submit" name="filter" value="<?php echo _AT('filter'); ?>"/>
+				<input type="submit" name="reset_filter" value="<?php echo _AT('reset_filter'); ?>"/>
+			</div>
+		
+	</form>
+</fieldset>
+</div>
+</div>
+<div>
+<?php if (is_array($this->courses_rows)){ ?>
+	<?php foreach ($this->courses_rows as $row){ ?>
+	    <?php  $counter++; ?>
+		<ul class="fl-list-menu fl-list-thumbnails">
+		 <li>
+				<h3 class="browse-courses"><a href="<?php echo url_rewrite('bounce.php?course='.$row['course_id'], true); ?>"><?php echo htmlentities($row['title'], ENT_QUOTES, 'UTF-8'); ?></a></h3>      
+		     
+		      <?php if ($row['description']): ?>
+				<span class="fl-link-summary" title="<?php echo htmlentities($row['description']);?>"><?php echo substr(nl2br(htmlentities($row['description'], ENT_QUOTES, 'UTF-8')),0,150); 
+				if(strlen($row['description']) > 150){
+				echo "...";
+				}
+				?>&nbsp;</span>
+			<?php else: ?>
+				<span class="fl-link-summary" title="<?php echo htmlentities($row['description']);?>">&nbsp;</span>
+			<?php endif; ?>
+		
+		</li>
+	
+	</ul>	      
+	<?php } // end foreach ?>
+<?php } // end if ?>
+</div>
+
+<?php endif; ?>
+<?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/users/email_change.tmpl.php b/docs/themes/simplified-desktop/users/email_change.tmpl.php
new file mode 100644
index 000000000..f11d8096b
--- /dev/null
+++ b/docs/themes/simplified-desktop/users/email_change.tmpl.php
@@ -0,0 +1,39 @@
+<?php 
+global $onload;
+$onload = 'document.form.form_password.focus();';
+require(AT_INCLUDE_PATH.'header.inc.php'); 
+?>
+
+<script language="JavaScript" type="text/javascript" src="sha-1factory.js"></script>
+
+<script type="text/javascript">
+function encrypt_password()
+{
+	document.form.form_password_hidden.value = hex_sha1(document.form.form_password.value);
+	document.form.form_password.value = "";
+}
+</script>
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+	<input type="hidden" name="form_password_hidden" value="" />
+
+	<div class="input-form" style="width:90%;">
+
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="form_password"><?php echo _AT('password'); ?></label><br />
+			<input id="form_password" name="form_password" type="password" size="15" maxlength="15" value="" /><br />
+		</div>
+
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="email"><?php echo _AT('email_address'); ?></label><br />
+			<input id="email" name="email" type="text" size="50" maxlength="50" value="<?php echo stripslashes(htmlspecialchars($_POST['email'])); ?>" />
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="submit" value="<?php echo _AT('submit'); ?>" onClick="encrypt_password()" />
+			<input type="submit" name="cancel" value=" <?php echo _AT('cancel'); ?> " />
+		</div>
+	</div>
+</form>
+
+<?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/users/index.tmpl.php b/docs/themes/simplified-desktop/users/index.tmpl.php
new file mode 100644
index 000000000..2f41cdac5
--- /dev/null
+++ b/docs/themes/simplified-desktop/users/index.tmpl.php
@@ -0,0 +1,79 @@
+<?php require(AT_INCLUDE_PATH.'header.inc.php'); ?>
+
+<div id="my_courses_container">
+<ul class="my-courses-list-ul" >
+
+<?php foreach ($this->courses as $row):
+	static $counter;
+	$counter++;
+?>
+
+<li class="my-courses-list">
+  <?php echo '<a href="'.url_rewrite('bounce.php?course=' . $row['course_id']) . '"> '.htmlentities($row['title']).'</a>' ?>
+  <?php if ($row['last_cid']): ?>
+	 	  <a class="my-courses-resume" href="bounce.php?course=<?php echo $row['course_id'].SEP.'p='.urlencode('content.php?cid='.$row['last_cid']); ?>"><img src="<?php echo $_base_href;  ?>themes/default/images/resume.png" border="" alt="<?php echo _AT('resume'); ?>" title="<?php echo _AT('resume'); ?>" /></a>
+    <?php endif; ?>  
+
+ 	<div class="my-courses-links">
+    <?php if ($row['member_id'] != $_SESSION['member_id']  && $_config['allow_unenroll'] == 1): ?>
+	 <a href="users/remove_course.php?course=<?php echo $row['course_id']; ?>"><?php echo _AT('unenroll_me'); ?></a>
+    <?php endif; ?>
+    <?php if ($row['tests']): ?>
+	    <?php foreach ($row['tests'] as $test): ?>
+		   <a href="bounce.php?course=<?php echo $row['course_id'].SEP.'p='.urlencode('mods/_standard/tests/test_intro.php?tid='.$test['test_id']); ?>"><span title="<?php echo _AT('tests'); ?>:<?php echo $test['title']; ?>"><?php echo $test['title']; ?></span></a> 
+	    <?php endforeach ;?>
+    <?php endif; ?>  
+    </div>
+   
+</li>
+
+<?php endforeach; ?>
+
+</ul>
+</div>
+
+<div class="current_box">
+<div class="current_head"> <h3><?php echo _AT('things_current'); ?></h3></div>
+    <?php
+		
+    //display current news
+
+    if($_GET['p'] == 0){
+      $p = 1;
+    }else{
+      $p = intval($_GET['p']);
+    }
+    if($_GET['p'] == "all"){
+      $perpage = count($this->all_news);
+    }else{
+      $perpage = 10;
+    }
+
+    $newscount = count($this->all_news);
+    $num_pages = (ceil($newscount/$perpage));;
+    $start = ($p-1)*$perpage;
+    $end = ($p*$perpage);
+
+    print_paginator($page, $num_pages, '', 1); 
+    for($i=$start;$i<=$end; $i++){
+	$count = $i;
+	if (isset($this->all_news)) {
+	    echo '<ul class="current_list">';
+	      if(isset($this->all_news[$i]['thumb'])){
+		    echo '<li><img src="'.$this->all_news[$i]['thumb'].'" alt="'.$this->all_news[$i]['alt'].'" title="'.$this->all_news[$i]['alt'].'"/> ' . $this->all_news[$i]['link'] .' <br />';
+		    if($this->all_news[$i]['object']['course_id']){
+		    echo '<span class="current_list_date_time">'.'Posted in&nbsp;'.'<a href="bounce.php?course='.$this->all_news[$i]['object']['course_id'].'">'.$this->all_news[$i]['course'].'</a>';
+		    }
+		    echo '&nbsp;on&nbsp;'.AT_DATE('%F %j, %g:%i',$this->all_news[$i]['time']).'</span></li>';
+		}
+	    echo '</ul>';
+	}
+    }
+    if($perpage == count($this->all_news)){ ?>
+	<div id="show-pages"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?p=1"><?php echo _AT('show_pages'); ?></a></div>
+    <?php }else{ ?>
+	<div id="show-all"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?p=all"><?php echo "Show All"; ?></a></div>
+    <?php } ?>
+<br /><br />
+</div>  
+<?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/users/password_change.tmpl.php b/docs/themes/simplified-desktop/users/password_change.tmpl.php
new file mode 100644
index 000000000..410fa728d
--- /dev/null
+++ b/docs/themes/simplified-desktop/users/password_change.tmpl.php
@@ -0,0 +1,66 @@
+<?php 
+global $onload;
+$onload = 'document.form.old_password.focus();';
+
+require(AT_INCLUDE_PATH.'header.inc.php'); 
+?>
+
+<script language="JavaScript" src="sha-1factory.js" type="text/javascript"></script>
+
+<script type="text/javascript">
+function encrypt_password()
+{
+	document.form.password_error.value = "";
+
+	document.form.form_old_password_hidden.value = hex_sha1(document.form.old_password.value);
+	document.form.old_password.value = "";
+
+	// verify new password
+	err = verify_password(document.form.password.value, document.form.password2.value);
+	
+	if (err.length > 0)
+	{
+		document.form.password_error.value = err;
+	}
+	else
+	{
+		document.form.form_password_hidden.value = hex_sha1(document.form.password.value);
+		document.form.password.value = "";
+		document.form.password2.value = "";
+	}
+}
+</script>
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form">
+	<input type="hidden" name="form_change" value="true" />
+	<input name="password_error" type="hidden" />
+	<input type="hidden" name="form_old_password_hidden" value="" />
+	<input type="hidden" name="form_password_hidden" value="" />
+
+	<div class="input-form" style="width:90%;">
+
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="old_password"><?php echo _AT('password_old'); ?></label><br />
+			<input id="old_password" name="old_password" type="password" size="15" maxlength="15" /><br />
+		</div>
+
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="password"><?php echo _AT('password'); ?></label><br />
+			<input id="password" name="password" type="password" size="15" maxlength="15" /><br />
+			<small>&middot; <?php echo _AT('combination'); ?><br />
+				   &middot; <?php echo _AT('15_max_chars'); ?></small>
+		</div>
+
+		<div class="row">
+			<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="password2"><?php echo _AT('password_again'); ?></label><br />
+			<input id="password2" name="password2" type="password" size="15" maxlength="15" />
+		</div>
+
+		<div class="row buttons">
+			<input type="submit" name="submit" value="<?php echo _AT('submit'); ?>" onClick="encrypt_password()" /> 
+			<input type="submit" name="cancel" value=" <?php echo _AT('cancel'); ?> " />
+		</div>
+	</div>
+</form>
+
+<?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/users/pref_wizard/index.tmpl.php b/docs/themes/simplified-desktop/users/pref_wizard/index.tmpl.php
new file mode 100644
index 000000000..0d384b1c7
--- /dev/null
+++ b/docs/themes/simplified-desktop/users/pref_wizard/index.tmpl.php
@@ -0,0 +1,73 @@
+<?php 
+global $savant;
+global $_base_path;
+global $msg;
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="<?php echo $this->lang_code; ?>">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $this->lang_charset; ?>" />
+        <title><?php echo SITE_NAME; ?> : <?php echo _AT('preferences'); ?></title>
+        <script src="<?php echo $_base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
+		<script src="<?php echo $_base_path; ?>jscripts/lib/TILE.js" type="text/javascript"></script>
+        <link rel="shortcut icon" href="<?php echo $_base_path; ?>favicon.ico" type="image/x-icon" />
+        <link rel="stylesheet" href="<?php echo $_base_path ?>jscripts/infusion/framework/fss/css/fss-layout.css" type="text/css" />       
+        <link rel="stylesheet" href="<?php echo $_base_path; ?>themes/default/styles.css" type="text/css" />
+        <script src="<?php echo $_base_path; ?>jscripts/ATutor.js" type="text/javascript"></script>   
+        <style id="pref_style" type="text/css"></style>    
+    </head>
+    <body onload="<?php echo $this->onload; ?>">
+        <div class="fl-force-right"><br /><a href="javascript:window.close()"><?php echo _AT('close'); ?></a></div>
+        <a name="content"></a>
+
+        <h1><?php echo _AT('preferences') ?></h1>
+        <?php $msg->printAll(); ?>
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post" name="form" enctype="multipart/form-data">
+<?php
+    if ($this->start_template != null) {
+        $savant->display($this->start_template);
+    }
+    else if ($this->pref_template != null) {
+    	echo '<fieldset class="wizscreen">';
+        include_once($this->pref_template);
+
+        
+        foreach ($this->pref_wiz as $pref => $template) { 
+            echo '<input type="hidden" name="pref_wiz[]" value="'.$template.'" />';
+        }
+        echo '<input type="hidden" value="'.$this->pref_index.'" name="pref_index" id="pref_index" />';    
+        echo '<input type="hidden" value="'.$_SESSION['course_id'].'" name="course_id" id="course_id" />';
+        
+        echo '<div class="row buttons"><input class="button" type="submit" name="set_default" value="'._AT("reapply_default").'" accesskey="d" />';
+        echo '<span class="fl-force-right"><input type="submit" value="'._AT('previous').'" name="previous" id="previous" class="button"/>';
+        if ($this->pref_index < count($this->pref_wiz) - 1) echo '<input type="submit" value="'._AT('next').'" name="next" id="next" class="button"/>';
+        else echo '<input type="submit" value="'._AT('done').'" name="done" id="done" class="button"/>';
+        echo '</span></div>';
+        echo '</fieldset>';
+    }
+?>
+</form>
+<script type="text/javascript">
+//<!--
+    <?php 
+    if (isset($_POST['done']) || isset($_POST['set_default'])) {
+        echo 'ATutor.users.preferences.setStyles("'.$_SESSION["prefs"]["PREF_BG_COLOUR"].
+            '","'.$_SESSION["prefs"]["PREF_FG_COLOUR"].
+            '","'.$_SESSION["prefs"]["PREF_HL_COLOUR"].
+            '","'.$_SESSION["prefs"]["PREF_FONT_FACE"].
+            '","'.$_SESSION["prefs"]["PREF_FONT_TIMES"].'");';
+        
+    } 
+    if (isset($_POST['done'])) {
+        echo "window.close();";
+    }
+    require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); 
+    ?>
+//-->
+
+
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/users/pref_wizard/initialize.tmpl.php b/docs/themes/simplified-desktop/users/pref_wizard/initialize.tmpl.php
new file mode 100644
index 000000000..ed759cff6
--- /dev/null
+++ b/docs/themes/simplified-desktop/users/pref_wizard/initialize.tmpl.php
@@ -0,0 +1,47 @@
+<?php $prefs_set = isset($this->pref_wiz);?>
+
+<fieldset class="wizscreen"><legend><?php echo _AT('prefs_set_init_legend'); ?></legend>
+<div id="feedback">
+<?php echo _AT('prefs_set_init'); ?>
+</div>
+    <div>
+        <input type="checkbox" name="pref_wiz[]" value="<?php echo DISPLAY ?>" id="display" <?php if ($prefs_set && in_array(DISPLAY, $this->pref_wiz)) echo checked ?> />
+        <label for="display"><?php echo _AT('prefs_set_init_see'); ?></label>
+    </div>
+
+    <div>
+        <input type="checkbox" name="pref_wiz[]" value="<?php echo NAVIGATION ?>" id="navigation" <?php if ($prefs_set && in_array(NAVIGATION, $this->pref_wiz)) echo checked ?> />
+        <label for="navigation"><?php echo _AT('prefs_set_init_nav'); ?></label>
+    </div>
+
+    <div>
+        <input type="checkbox" name="pref_wiz[]" value="<?php echo ALT_TO_TEXT ?>" id="altToText" <?php if ($prefs_set && in_array(ALT_TO_TEXT, $this->pref_wiz)) echo checked ?> />
+        <label for="altToText"><?php echo _AT('prefs_set_init_text'); ?></label>
+    </div>
+
+    <div>
+        <input type="checkbox" name="pref_wiz[]" value="<?php echo ALT_TO_AUDIO ?>" id="altToAudio" <?php if ($prefs_set && in_array(ALT_TO_AUDIO, $this->pref_wiz)) echo checked ?> />
+        <label for="altToAudio"><?php echo _AT('prefs_set_init_audio'); ?></label>
+    </div>
+    
+    <div>
+        <input type="checkbox" name="pref_wiz[]" value="<?php echo ALT_TO_VISUAL ?>" id="altToVisual" <?php if ($prefs_set && in_array(ALT_TO_VISUAL, $this->pref_wiz)) echo checked ?> />
+        <label for="altToVisual"><?php echo _AT('prefs_set_init_visual'); ?></label>
+    </div>
+    
+    <div>
+        <input type="checkbox" name="pref_wiz[]" value="<?php echo SUPPORT ?>" id="support" <?php if ($prefs_set && in_array(SUPPORT, $this->pref_wiz)) echo checked ?> />
+        <label for="support"><?php echo _AT('prefs_set_init_tool'); ?></label>
+    </div>
+    
+    <div>
+        <input type="checkbox" name="pref_wiz[]" value="<?php echo ATUTOR ?>" id="atutor_pref" <?php if ($prefs_set && in_array(ATUTOR, $_POST['pref_wiz'])) echo checked ?> />
+        <label for="atutor_pref"><?php echo _AT('prefs_set_init_atutor'); ?></label>
+    </div>
+    
+    <input type="hidden" value="-1" name="pref_index" id="pref_index" /><br />
+    <input type="hidden" value="<?php echo $_SESSION['course_id']; ?>" name="course_id" id="course_id" /><br />
+    <input class="button" type="submit" name="set_default" value="<?php echo _AT("reapply_default"); ?>" accesskey="d" />
+    <input class="button" type="submit" value="<?php echo _AT('next'); ?>" name="next" id="next"/>
+
+</fieldset>
\ No newline at end of file
diff --git a/docs/themes/simplified-desktop/users/preferences.tmpl.php b/docs/themes/simplified-desktop/users/preferences.tmpl.php
new file mode 100644
index 000000000..640c96be6
--- /dev/null
+++ b/docs/themes/simplified-desktop/users/preferences.tmpl.php
@@ -0,0 +1,280 @@
+
+<?php 
+
+$tabs = get_tabs();	
+$num_tabs = count($tabs);
+
+$current_tab = 0;  // set default tab
+$switch_tab = false;
+
+for ($i=0; $i < $num_tabs; $i++) 
+{
+	if (isset($_POST['button_'.$i]) && ($_POST['button_'.$i] != -1)) 
+	{ 
+		$current_tab = $i;
+		$switch_tab = true;
+		break;
+	}
+}
+
+if (!$switch_tab && isset($_POST['current_tab'])) {
+	$current_tab = intval($_POST['current_tab']);
+}
+
+if ($current_tab == 1)
+{
+	global $_custom_head, $onload;
+	
+	$_custom_head = "<script language=\"JavaScript\" src=\"jscripts/lib/TILE.js\" type=\"text/javascript\"></script>";
+	$onload = "setPreviewFace(); setPreviewSize(); setPreviewColours();";
+}
+
+require(AT_INCLUDE_PATH.'header.inc.php'); 
+
+if($_SESSION['course_id'] == "-1"){
+echo '<div id="container"><br />';
+}
+
+?>
+
+<form action="<?php echo $_SERVER['PHP_SELF']; ?>"  method="post" name="form" enctype="multipart/form-data">
+
+
+		<?php output_tabs($current_tab, $changes_made); ?>
+
+
+	<div class="input-form">
+		<input type="hidden" name="current_tab" value="<?php echo $current_tab; ?>" />
+<?php
+	if ($current_tab != 0) 
+	{
+		// save selected options on tab 0 (ATutor settings)
+		if (isset($_POST['theme']))
+			echo '	<input type="hidden" name="theme" value="'.$_POST['theme'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_THEME']))
+			echo '	<input type="hidden" name="theme" value="'.$_SESSION['prefs']['PREF_THEME'].'" />'."\n\r";
+		
+		if (isset($_POST['mnot']))
+			echo '	<input type="hidden" name="mnot" value="'.$_POST['mnot'].'" />'."\n\r";
+		else if (isset($this->notify))
+			echo '	<input type="hidden" name="mnot" value="'.$this->notify.'" />'."\n\r";
+
+		if (isset($_POST['time_zone']))
+			echo '	<input type="hidden" name="time_zone" value="'.$_POST['time_zone'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_TIMEZONE']))
+			echo '	<input type="hidden" name="time_zone" value="'.$_SESSION['prefs']['PREF_TIMEZONE'].'" />'."\n\r";
+		
+		if (isset($_POST['numbering']))
+			echo '	<input type="hidden" name="numbering" value="'.$_POST['numbering'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_NUMBERING']))
+			echo '	<input type="hidden" name="numbering" value="'.$_SESSION['prefs']['PREF_NUMBERING'].'" />'."\n\r";
+		
+		if (isset($_POST['use_jump_redirect']))
+			echo '	<input type="hidden" name="use_jump_redirect" value="'.$_POST['use_jump_redirect'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_JUMP_REDIRECT']))
+			echo '	<input type="hidden" name="use_jump_redirect" value="'.$_SESSION['prefs']['PREF_JUMP_REDIRECT'].'" />'."\n\r";
+		
+		if (isset($_POST['auto']))
+			echo '	<input type="hidden" name="auto" value="'.$_POST['auto'].'" />'."\n\r";
+		else if (isset($this->is_auto_login))
+			echo '	<input type="hidden" name="auto" value="'.$this->is_auto_login.'" />'."\n\r";
+		
+		if (isset($_POST['form_focus']))
+			echo '	<input type="hidden" name="form_focus" value="'.$_POST['form_focus'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_FORM_FOCUS']))
+			echo '	<input type="hidden" name="form_focus" value="'.$_SESSION['prefs']['PREF_FORM_FOCUS'].'" />'."\n\r";
+		
+		if (isset($_POST['show_guide']))
+			echo '	<input type="hidden" name="show_guide" value="'.$_POST['show_guide'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_SHOW_GUIDE']))
+			echo '	<input type="hidden" name="show_guide" value="'.$_SESSION['prefs']['PREF_SHOW_GUIDE'].'" />'."\n\r";
+		
+		if (isset($_POST['content_editor']))
+			echo '	<input type="hidden" name="content_editor" value="'.$_POST['content_editor'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_CONTENT_EDITOR']))
+			echo '	<input type="hidden" name="content_editor" value="'.$_SESSION['prefs']['PREF_CONTENT_EDITOR'].'" />'."\n\r";
+	}
+
+	if ($current_tab != 1) 
+	{
+		// save selected options on tab 1 (display settings)
+		if (isset($_POST['fontface']))
+			echo '	<input type="hidden" name="fontface" value="'.$_POST['fontface'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_FONT_FACE']))
+			echo '	<input type="hidden" name="fontface" value="'.$_SESSION['prefs']['PREF_FONT_FACE'].'" />'."\n\r";
+
+		if (isset($_POST['font_times']))
+			echo '	<input type="hidden" name="font_times" value="'.$_POST['font_times'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_FONT_TIMES']))
+			echo '	<input type="hidden" name="font_times" value="'.$_SESSION['prefs']['PREF_FONT_TIMES'].'" />'."\n\r";
+
+		if (isset($_POST['fg']))
+			echo '	<input type="hidden" name="fg" value="'.$_POST['fg'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_FG_COLOUR']))
+			echo '	<input type="hidden" name="fg" value="'.$_SESSION['prefs']['PREF_FG_COLOUR'].'" />'."\n\r";
+
+		if (isset($_POST['bg']))
+			echo '	<input type="hidden" name="bg" value="'.$_POST['bg'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_BG_COLOUR']))
+			echo '	<input type="hidden" name="bg" value="'.$_SESSION['prefs']['PREF_BG_COLOUR'].'" />'."\n\r";
+
+		if (isset($_POST['hl']))
+			echo '	<input type="hidden" name="hl" value="'.$_POST['hl'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_HL_COLOUR']))
+			echo '	<input type="hidden" name="hl" value="'.$_SESSION['prefs']['PREF_HL_COLOUR'].'" />'."\n\r";
+	}
+		
+	if ($current_tab != 2) 
+	{
+		// save selected options on tab 2 (content settings)
+		if (isset($_POST['use_alternative_to_text']))
+			echo '	<input type="hidden" name="use_alternative_to_text" value="'.$_POST['use_alternative_to_text'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_USE_ALTERNATIVE_TO_TEXT']))
+			echo '	<input type="hidden" name="use_alternative_to_text" value="'.$_SESSION['prefs']['PREF_USE_ALTERNATIVE_TO_TEXT'].'" />'."\n\r";
+
+		if (isset($_POST['preferred_alt_to_text']))
+			echo '	<input type="hidden" name="preferred_alt_to_text" value="'.$_POST['preferred_alt_to_text'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_ALT_TO_TEXT']))
+			echo '	<input type="hidden" name="preferred_alt_to_text" value="'.$_SESSION['prefs']['PREF_ALT_TO_TEXT'].'" />'."\n\r";
+		
+		if (isset($_POST['alt_to_text_append_or_replace']))
+		echo '	<input type="hidden" name="alt_to_text_append_or_replace" value="'.$_POST['alt_to_text_append_or_replace'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_ALT_TO_TEXT_APPEND_OR_REPLACE']))
+		echo '	<input type="hidden" name="alt_to_text_append_or_replace" value="'.$_SESSION['prefs']['PREF_ALT_TO_TEXT_APPEND_OR_REPLACE'].'" />'."\n\r";
+		
+		if (isset($_POST['alt_text_prefer_lang']))
+		echo '	<input type="hidden" name="alt_text_prefer_lang" value="'.$_POST['alt_text_prefer_lang'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_ALT_TEXT_PREFER_LANG']))
+		echo '	<input type="hidden" name="alt_text_prefer_lang" value="'.$_SESSION['prefs']['PREF_ALT_TEXT_PREFER_LANG'].'" />'."\n\r";
+		
+		if (isset($_POST['use_alternative_to_audio']))
+		echo '	<input type="hidden" name="use_alternative_to_audio" value="'.$_POST['use_alternative_to_audio'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_USE_ALTERNATIVE_TO_AUDIO']))
+		echo '	<input type="hidden" name="use_alternative_to_audio" value="'.$_SESSION['prefs']['PREF_USE_ALTERNATIVE_TO_AUDIO'].'" />'."\n\r";
+		
+		if (isset($_POST['preferred_alt_to_audio']))
+		echo '	<input type="hidden" name="preferred_alt_to_audio" value="'.$_POST['preferred_alt_to_audio'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_ALT_TO_AUDIO']))
+		echo '	<input type="hidden" name="preferred_alt_to_audio" value="'.$_SESSION['prefs']['PREF_ALT_TO_AUDIO'].'" />'."\n\r";
+		
+		if (isset($_POST['alt_to_audio_append_or_replace']))
+		echo '	<input type="hidden" name="alt_to_audio_append_or_replace" value="'.$_POST['alt_to_audio_append_or_replace'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_ALT_TO_AUDIO_APPEND_OR_REPLACE']))
+		echo '	<input type="hidden" name="alt_to_audio_append_or_replace" value="'.$_SESSION['prefs']['PREF_ALT_TO_AUDIO_APPEND_OR_REPLACE'].'" />'."\n\r";
+		
+		if (isset($_POST['alt_audio_prefer_lang']))
+		echo '	<input type="hidden" name="alt_audio_prefer_lang" value="'.$_POST['alt_audio_prefer_lang'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_ALT_AUDIO_PREFER_LANG']))
+		echo '	<input type="hidden" name="alt_audio_prefer_lang" value="'.$_SESSION['prefs']['PREF_ALT_AUDIO_PREFER_LANG'].'" />'."\n\r";
+		
+		if (isset($_POST['use_alternative_to_visual']))
+		echo '	<input type="hidden" name="use_alternative_to_visual" value="'.$_POST['use_alternative_to_visual'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_USE_ALTERNATIVE_TO_VISUAL']))
+		echo '	<input type="hidden" name="use_alternative_to_visual" value="'.$_SESSION['prefs']['PREF_USE_ALTERNATIVE_TO_VISUAL'].'" />'."\n\r";
+		
+		if (isset($_POST['preferred_alt_to_visual']))
+		echo '	<input type="hidden" name="preferred_alt_to_visual" value="'.$_POST['preferred_alt_to_visual'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_ALT_TO_VISUAL']))
+		echo '	<input type="hidden" name="preferred_alt_to_visual" value="'.$_SESSION['prefs']['PREF_ALT_TO_VISUAL'].'" />'."\n\r";
+		
+		if (isset($_POST['alt_to_visual_append_or_replace']))
+		echo '	<input type="hidden" name="alt_to_visual_append_or_replace" value="'.$_POST['alt_to_visual_append_or_replace'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_ALT_TO_VISUAL_APPEND_OR_REPLACE']))
+		echo '	<input type="hidden" name="alt_to_visual_append_or_replace" value="'.$_SESSION['prefs']['PREF_ALT_TO_VISUAL_APPEND_OR_REPLACE'].'" />'."\n\r";
+		
+		if (isset($_POST['alt_visual_prefer_lang']))
+		echo '	<input type="hidden" name="alt_visual_prefer_lang" value="'.$_POST['alt_visual_prefer_lang'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_ALT_VISUAL_PREFER_LANG']))
+		echo '	<input type="hidden" name="alt_visual_prefer_lang" value="'.$_SESSION['prefs']['PREF_ALT_VISUAL_PREFER_LANG'].'" />'."\n\r";
+	}
+
+	if ($current_tab != 3) 
+	{
+		// save selected options on tab 3 (tool settings)
+		if (isset($_POST['dictionary_val']))
+			echo '	<input type="hidden" name="dictionary_val" value="'.$_POST['dictionary_val'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_DICTIONARY']))
+			echo '	<input type="hidden" name="dictionary_val" value="'.$_SESSION['prefs']['PREF_DICTIONARY'].'" />'."\n\r";
+
+		if (isset($_POST['thesaurus_val']))
+			echo '	<input type="hidden" name="thesaurus_val" value="'.$_POST['thesaurus_val'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_THESAURUS']))
+			echo '	<input type="hidden" name="thesaurus_val" value="'.$_SESSION['prefs']['PREF_THESAURUS'].'" />'."\n\r";
+
+		if (isset($_POST['encyclopedia_val']))
+			echo '	<input type="hidden" name="encyclopedia_val" value="'.$_POST['encyclopedia_val'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_ENCYCLOPEDIA']))
+			echo '	<input type="hidden" name="encyclopedia_val" value="'.$_SESSION['prefs']['PREF_ENCYCLOPEDIA'].'" />'."\n\r";
+
+		if (isset($_POST['atlas_val']))
+			echo '	<input type="hidden" name="atlas_val" value="'.$_POST['atlas_val'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_ATLAS']))
+			echo '	<input type="hidden" name="atlas_val" value="'.$_SESSION['prefs']['PREF_ATLAS'].'" />'."\n\r";
+
+		if (isset($_POST['note_taking_val']))
+			echo '	<input type="hidden" name="note_taking_val" value="'.$_POST['note_taking_val'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_NOTE_TAKING']))
+			echo '	<input type="hidden" name="note_taking_val" value="'.$_SESSION['prefs']['PREF_NOTE_TAKING'].'" />'."\n\r";
+
+		if (isset($_POST['calculator_val']))
+			echo '	<input type="hidden" name="calculator_val" value="'.$_POST['calculator_val'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_CALCULATOR']))
+			echo '	<input type="hidden" name="calculator_val" value="'.$_SESSION['prefs']['PREF_CALCULATOR'].'" />'."\n\r";
+
+		if (isset($_POST['abacus_val']))
+			echo '	<input type="hidden" name="abacus_val" value="'.$_POST['abacus_val'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_ABACUS']))
+			echo '	<input type="hidden" name="abacus_val" value="'.$_SESSION['prefs']['PREF_ABACUS'].'" />'."\n\r";
+	}
+	
+	if ($current_tab != 4) 
+	{
+		// save selected options on tab 4 (control settings)
+		if (isset($_POST['show_contents']))
+			echo '	<input type="hidden" name="show_contents" value="'.$_POST['show_contents'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_SHOW_CONTENTS']))
+			echo '	<input type="hidden" name="show_contents" value="'.$_SESSION['prefs']['PREF_SHOW_CONTENTS'].'" />'."\n\r";
+
+		if (isset($_POST['show_next_previous_buttons']))
+			echo '	<input type="hidden" name="show_next_previous_buttons" value="'.$_POST['show_next_previous_buttons'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_SHOW_NEXT_PREVIOUS_BUTTONS']))
+			echo '	<input type="hidden" name="show_next_previous_buttons" value="'.$_SESSION['prefs']['PREF_SHOW_NEXT_PREVIOUS_BUTTONS'].'" />'."\n\r";
+
+		if (isset($_POST['show_bread_crumbs']))
+			echo '	<input type="hidden" name="show_bread_crumbs" value="'.$_POST['show_bread_crumbs'].'" />'."\n\r";
+		else if (isset($_SESSION['prefs']['PREF_SHOW_BREAD_CRUMBS']))
+			echo '	<input type="hidden" name="show_bread_crumbs" value="'.$_SESSION['prefs']['PREF_SHOW_BREAD_CRUMBS'].'" />'."\n\r";
+	}
+
+	echo '<fieldset>';
+	include(AT_INCLUDE_PATH .'../users/'.$tabs[$current_tab][1]);
+	echo '</fieldset>';
+//	include(getcwd().'/'.$tabs[$current_tab][1]);
+
+?>
+	<div class="row buttons">
+<?php 
+if ($_SESSION['course_id'] == -1) // admin login 
+{
+?>
+		<input type="submit" name="set_default" value="<?php echo _AT('factory_default'); ?>" accesskey="d" />
+<?php 
+}
+else  // user login 
+{
+?>
+		<input type="submit" name="set_default" value="<?php echo _AT('reapply_default'); ?>" accesskey="d" title="<?php echo _AT('reapply_default'); ?> - Alt-d"/>
+<?php 
+}
+?>
+		<input type="submit" name="submit" value="<?php echo _AT('apply'); ?>" accesskey="s" />
+		<input type="reset" name="reset" value="<?php echo _AT('reset'); ?>" />
+	</div>
+</div>
+</form>	
+<?php
+if($_SESSION['course_id'] == "-1"){
+echo '</div>';
+}
+
+require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
diff --git a/docs/themes/simplified-desktop/users/profile.tmpl.php b/docs/themes/simplified-desktop/users/profile.tmpl.php
new file mode 100644
index 000000000..b8d9a480c
--- /dev/null
+++ b/docs/themes/simplified-desktop/users/profile.tmpl.php
@@ -0,0 +1,131 @@
+<?php require(AT_INCLUDE_PATH.'header.inc.php'); ?>
+
+<form method="post" action="<?php echo $_SERVER['PHP_SELF']; ?>" name="form">
+<?php global $languageManager, $_config; ?>
+
+
+<div class="input-form">
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('required_information'); ?></legend>
+	<div class="row">
+		<h3><?php echo _AT('required_information'); ?></h3>
+	</div>
+
+	<div class="row">
+		<label for="login"><?php echo _AT('login_name'); ?></label><br />
+				<span id="login"><?php echo stripslashes(htmlspecialchars($_POST['login'])); ?></span>
+				<input name="member_id" type="hidden" value="<?php echo intval($_POST['member_id']); ?>" />
+				<input name="login" type="hidden" value="<?php echo stripslashes(htmlspecialchars($_POST['login'])); ?>" />
+	</div>
+
+	<div class="row">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="first_name"><?php echo _AT('first_name'); ?></label><br />
+		<input id="first_name" name="first_name" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['first_name'])); ?>" />
+	</div>
+	<div class="row">
+		<?php echo _AT('email_address'); ?><br />
+		<?php echo stripslashes(htmlspecialchars($_POST['email'])); ?>
+		<input type="checkbox" id="priv" name="private_email" value="1" <?php if ($_POST['private_email']) { echo 'checked="checked"'; } ?> /><label for="priv"><?php echo _AT('keep_email_private');?></label>
+	</div>
+
+
+	<div class="row" id="last-row1">
+		<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><label for="last_name"><?php echo _AT('last_name'); ?></label><br />
+		<input id="last_name" name="last_name" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['last_name'])); ?>" />
+	</div>
+	
+	<?php if (admin_authenticate(AT_ADMIN_PRIV_USERS, TRUE)): 
+			if ($_POST['status'] == AT_STATUS_INSTRUCTOR) {
+				$inst = ' checked="checked"';
+			} else if ($_POST['status'] == AT_STATUS_STUDENT) {
+				$stud = ' checked="checked"';
+			}  else if ($_POST['status'] == AT_STATUS_DISABLED) {
+				$disa = ' checked="checked"';
+			} else {
+				$uncon = ' checked="checked"';
+			}?>
+			<input type="hidden" name="id" value="<?php echo $_POST['member_id']; ?>" >
+			<div class="row">
+				<span class="required" title="<?php echo _AT('required_field'); ?>">*</span><?php echo _AT('account_status'); ?><br />
+
+				<input type="radio" name="status" value="0" id="disa" <?php echo $disa; ?> /><label for="disa"><?php echo _AT('disabled'); ?></label>
+				<?php if (defined('AT_EMAIL_CONFIRMATION') && AT_EMAIL_CONFIRMATION): ?>
+					<input type="radio" name="status" value="1" id="uncon" <?php echo $uncon; ?> /><label for="uncon"><?php echo _AT('unconfirmed'); ?></label>
+				<?php endif; ?>
+
+				<input type="radio" name="status" value="2" id="stud" <?php echo $stud; ?> /><label for="stud"><?php echo _AT('student'); ?></label>
+
+				<input type="radio" name="status" value="3" id="inst" <?php echo $inst; ?> /><label for="inst"><?php echo _AT('instructor'); ?></label>
+
+				<input type="hidden" name="old_status" value="<?php echo $_POST['old_status']; ?>" />
+			</div>
+	<?php endif; ?>
+	</fieldset>
+	<fieldset class="group_form"><legend class="group_form"><?php echo _AT('personal_information'); ?></legend>
+	<div class="row">
+		<h3><?php echo _AT('personal_information').' ('._AT('optional').')'; ?></h3>
+	</div>
+
+	<?php if (admin_authenticate(AT_ADMIN_PRIV_USERS, TRUE) && defined('AT_MASTER_LIST') && AT_MASTER_LIST): ?>
+		<div class="row">
+			<label for="student_id"><?php echo _AT('student_id'); ?></label><br />
+				<input type="text" name="student_id" value="<?php echo $_POST['student_id']; ?>" size="20" /><br />
+		</div>
+		<div class="row">
+			<label for="student_pin"><?php echo _AT('student_pin'); ?></label><br />
+			<input id="student_pin" name="student_pin" type="password" size="15" maxlength="15" value="<?php echo stripslashes(htmlspecialchars($_POST['student_pin'])); ?>" /><br />
+		</div>
+	<?php endif; ?>
+
+	<div class="row">
+		<?php echo _AT('date_of_birth'); ?><br />
+		<label for="year"><?php echo _AT('year'); ?>: </label><input id="year" class="formfield" name="year" type="text" size="4" maxlength="4" value="<?php echo $_POST['year']; ?>" />  <label for="month"><?php echo _AT('month'); ?>: </label><input id="month" class="formfield" name="month" type="text" size="2" maxlength="2" value="<?php echo $_POST['month']; ?>" /> <label for="day"><?php echo _AT('day'); ?>: </label><input id="day" class="formfield" name="day" type="text" size="2" maxlength="2" value="<?php echo $_POST['day']; ?>" />
+	</div>
+
+	<div class="row">
+		<?php echo _AT('gender'); ?><br />
+		<input type="radio" name="gender" id="m" value="m" <?php if ($_POST['gender'] == 'm') { echo 'checked="checked"'; } ?> /><label for="m"><?php echo _AT('male'); ?></label> <input type="radio" value="f" name="gender" id="f" <?php if ($_POST['gender'] == 'f') { echo 'checked="checked"'; } ?> /><label for="f"><?php echo _AT('female'); ?></label>  <input type="radio" value="n" name="gender" id="ns" <?php if (($_POST['gender'] == 'n') || ($_POST['gender'] == '')) { echo 'checked="checked"'; } ?> /><label for="ns"><?php echo _AT('not_specified'); ?></label>
+	</div>
+
+	<div class="row">
+		<label for="address"><?php echo _AT('street_address'); ?></label><br />
+		<input id="address" name="address" size="30" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['address'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="postal"><?php echo _AT('postal_code'); ?></label><br />
+		<input id="postal" name="postal" size="7" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['postal'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="city"><?php echo _AT('city'); ?></label><br />
+		<input id="city" name="city" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['city'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="province"><?php echo _AT('province'); ?></label><br />
+		<input id="province" name="province" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['province'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="country"><?php echo _AT('country'); ?></label><br />
+		<input id="country" name="country" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['country'])); ?>" />
+	</div>
+
+	<div class="row">
+		<label for="phone"><?php echo _AT('phone'); ?></label><br />
+		<input size="11" name="phone" type="text" value="<?php echo stripslashes(htmlspecialchars($_POST['phone'])); ?>" id="phone" />
+	</div>
+
+	<div class="row" id="last-row">
+		<label for="website"><?php echo _AT('web_site'); ?></label><br />
+		<input id="website" name="website" size="30" type="text" value="<?php if ($_POST['website'] == '') { echo 'http://'; } else { echo stripslashes(htmlspecialchars($_POST['website'])); } ?>" />
+	</div>
+	</fieldset>
+	<div class="row-buttons">
+		<input type="submit" name="submit" value=" <?php echo _AT('save'); ?> " accesskey="s" />
+		<input type="submit" name="cancel" value=" <?php echo _AT('cancel'); ?> " />
+	</div>
+</div>
+</form>
+
+<?php require(AT_INCLUDE_PATH.'footer.inc.php'); ?>
\ No newline at end of file