orbit-4-1/app/views/desktop/settings.html.erb

<div id="content">
	<div id="header" class="hh3">
		<div class="dtitle w2 hh3 hp">
			<span class="thmtxth">Settings</span>
		</div>
	</div>
	<div id="holder">
		<div class="scrollbar"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
		<div class="viewport">
			<div class="overview">
				<ul>
					<li><a href="" class="admtxt">Overview</a></li>
					<li><a href="" class="admtxt">Account</a></li>
					<li><a href="" class="admtxt">Sections</a></li>
					<li><a href="" class="admtxt">Theme</a></li>
					<li><a href="" class="admtxt">Connection</a></li>
				</ul>
				<div class="clear"></div>
<<<<<<< HEAD
=======
				<select id="change_theme">
				<option value='default'>Default Theme</option>
				<option value='snake'>Snake Theme</option>
				<option value='sexy'>Sexy Theme</option>
				<option value='vintage'>Vintage Theme</option>
				<option value='chris'>Chris Theme</option>
				</select>
				<br />
				<button onClick="od.tempFunc();">Save</button>
>>>>>>> desktop_harry
			</div>
		</div>
	</div>
</div>